diff options
| -rw-r--r-- | po/ca.po | 25 | ||||
| -rw-r--r-- | po/de.po | 6773 | ||||
| -rw-r--r-- | po/es.po | 10746 | ||||
| -rw-r--r-- | po/pt_PT.po | 6128 | ||||
| -rw-r--r-- | po/ru.po | 13534 |
5 files changed, 20600 insertions, 16606 deletions
@@ -14,7 +14,7 @@ # chunk | fragment # delta | diferència # deprecated | en desús -# dry | simulació +# dry-run | fer una prova # fatal | fatal # flush | buidar / buidatge # hook | lligam @@ -9865,7 +9865,7 @@ msgstr "Els camins següents s'ignoren per un dels vostres fitxers .gitignore:\n #: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:559 #: builtin/remote.c:1427 builtin/rm.c:242 builtin/send-pack.c:190 msgid "dry run" -msgstr "marxa en sec" +msgstr "fer una prova" #: builtin/add.c:331 msgid "interactive picking" @@ -9916,8 +9916,7 @@ msgstr "només omet els fitxers que no es poden afegir a causa d'errors" #: builtin/add.c:345 msgid "check if - even missing - files are ignored in dry run" msgstr "" -"comproveu si els fitxers - fins i tot els absents - s'ignoren en marxa en " -"sec" +"comproveu si els fitxers, fins i tot els absents, s'ignoren en una fer una prova" #: builtin/add.c:347 builtin/update-index.c:1004 msgid "override the executable bit of the listed files" @@ -13303,7 +13302,7 @@ msgid "" "with '%c' will be ignored, and an empty message aborts the commit.\n" msgstr "" "Introduïu el missatge de comissió dels vostres canvis.\n" -"S'ignoraran les línies que comencin amb «%c», i un missatge de\n" +"S'ignoraran les línies que comencin amb «%c». Un missatge de\n" "comissió buit avorta la comissió.\n" #: builtin/commit.c:876 @@ -13554,7 +13553,7 @@ msgstr "" #: builtin/commit.c:1509 msgid "the commit is authored by me now (used with -C/-c/--amend)" -msgstr "l'autor de la comissió ja sóc jo (s'usa amb -C/-c/--amend)" +msgstr "l'autor de la comissió soc jo ara (s'usa amb -C/-c/--amend)" #: builtin/commit.c:1510 builtin/log.c:1744 builtin/merge.c:301 #: builtin/pull.c:145 builtin/revert.c:110 @@ -15394,7 +15393,7 @@ msgstr "" #: builtin/gc.c:708 msgid "" "git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]" -msgstr +msgstr "" "git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]" #: builtin/gc.c:738 @@ -18758,17 +18757,17 @@ msgid "" "invocation.\n" msgstr "" "Baixar sense especificar com conciliar branques divergents està\n" -"desaconsellat. Podeu desactivar aquest missatge executant una de les següents\n" -"comandes abans de la propera baixada:\n" +"desaconsellat. Podeu desactivar aquest missatge executant una de les\n" +"següents ordres abans de la propera baixada:\n" "\n" " git config pull.rebase false # merge (estratègia per defecte)\n" " git config pull.rebase true # rebase\n" " git config pull.ff only # només fast-forward\n" "\n" -"Podeu reemplaçar «git config» per «git config --global» per a establir una preferència\n" -"per defecte per a tots els dipòsits. Podeu també usar -rebase, --no-rebase,\n" -"o --ff-only en la línia d'ordres per sobreescriure el valor per defecte configuratW\n" -"en aquesta execució.\n" +"Podeu reemplaçar «git config» per «git config --global» per a establir una\n" +"preferència per defecte per a tots els dipòsits. Podeu també usar --rebase,\n" +"--no-rebase o --ff-only en la línia d'ordres per sobreescriure el valor\n" +"per defecte configuració en aquesta execució.\n" #: builtin/pull.c:458 msgid "" @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2020-12-21 07:10+0800\n" -"PO-Revision-Date: 2020-12-19 14:01+0100\n" +"POT-Creation-Date: 2021-03-04 22:41+0800\n" +"PO-Revision-Date: 2021-03-03 20:13+0100\n" "Last-Translator: Matthias Rüster <matthias.ruester@gmail.com>\n" "Language-Team: Matthias Rüster <matthias.ruester@gmail.com>\n" "Language: de\n" @@ -17,15 +17,16 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n!=1);\n" +"X-Generator: Poedit 2.4.2\n" #: add-interactive.c:376 #, c-format msgid "Huh (%s)?" msgstr "Wie bitte (%s)?" -#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3284 -#: sequencer.c:3735 sequencer.c:3890 builtin/rebase.c:1532 -#: builtin/rebase.c:1955 +#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3292 +#: sequencer.c:3743 sequencer.c:3898 builtin/rebase.c:1538 +#: builtin/rebase.c:1963 msgid "could not read index" msgstr "Index konnte nicht gelesen werden" @@ -53,9 +54,9 @@ msgstr "Aktualisieren" msgid "could not stage '%s'" msgstr "Konnte '%s' nicht zum Commit vormerken." -#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3478 +#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3486 msgid "could not write index" -msgstr "Konnte Index nicht schreiben." +msgstr "konnte Index nicht schreiben" #: add-interactive.c:706 git-add--interactive.perl:626 #, c-format, perl-format @@ -97,7 +98,7 @@ msgstr "Keine unversionierten Dateien.\n" #: add-interactive.c:868 git-add--interactive.perl:687 msgid "Add untracked" -msgstr "unversionierte Dateien hinzufügen" +msgstr "Unversionierte Dateien hinzufügen" #: add-interactive.c:895 git-add--interactive.perl:623 #, c-format, perl-format @@ -211,7 +212,7 @@ msgstr "aus Staging-Area entfernt" #: add-interactive.c:1144 apply.c:4987 apply.c:4990 builtin/am.c:2257 #: builtin/am.c:2260 builtin/bugreport.c:134 builtin/clone.c:124 -#: builtin/fetch.c:147 builtin/merge.c:284 builtin/pull.c:190 +#: builtin/fetch.c:150 builtin/merge.c:285 builtin/pull.c:190 #: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1818 #: builtin/submodule--helper.c:1821 builtin/submodule--helper.c:2326 #: builtin/submodule--helper.c:2329 builtin/submodule--helper.c:2572 @@ -818,7 +819,7 @@ msgstr "" msgid "Exiting because of an unresolved conflict." msgstr "Beende wegen unaufgelöstem Konflikt." -#: advice.c:281 builtin/merge.c:1369 +#: advice.c:281 builtin/merge.c:1370 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Sie haben Ihren Merge nicht abgeschlossen (MERGE_HEAD existiert)." @@ -901,18 +902,15 @@ msgstr "--cached und --3way können nicht gemeinsam verwendet werden." #: apply.c:140 msgid "--3way outside a repository" -msgstr "" -"Die Option --3way kann nicht außerhalb eines Repositories verwendet werden." +msgstr "--3way kann nicht außerhalb eines Repositories verwendet werden" #: apply.c:151 msgid "--index outside a repository" -msgstr "" -"Die Option --index kann nicht außerhalb eines Repositories verwendet werden." +msgstr "--index kann nicht außerhalb eines Repositories verwendet werden" #: apply.c:154 msgid "--cached outside a repository" -msgstr "" -"Die Option --cached kann nicht außerhalb eines Repositories verwendet werden." +msgstr "--cached kann nicht außerhalb eines Repositories verwendet werden" #: apply.c:801 #, c-format @@ -927,7 +925,7 @@ msgstr "Ausführung des regulären Ausdrucks gab %d zurück. Eingabe: %s" #: apply.c:884 #, c-format msgid "unable to find filename in patch at line %d" -msgstr "Konnte keinen Dateinamen in Zeile %d des Patches finden." +msgstr "konnte keinen Dateinamen in Zeile %d des Patches finden" #: apply.c:922 #, c-format @@ -1132,7 +1130,8 @@ msgstr "Anwendung des Patches fehlgeschlagen: %s:%ld" msgid "cannot checkout %s" msgstr "kann %s nicht auschecken" -#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:73 setup.c:308 +#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:86 pack-revindex.c:213 +#: setup.c:308 #, c-format msgid "failed to read %s" msgstr "Fehler beim Lesen von %s" @@ -1293,7 +1292,7 @@ msgstr "kann internen Speicher für eben erstellte Datei %s nicht erzeugen" msgid "unable to add cache entry for %s" msgstr "kann für %s keinen Eintrag in den Zwischenspeicher hinzufügen" -#: apply.c:4374 builtin/bisect--helper.c:524 +#: apply.c:4374 builtin/bisect--helper.c:523 #, c-format msgid "failed to write to '%s'" msgstr "Fehler beim Schreiben nach '%s'" @@ -1329,7 +1328,7 @@ msgstr[1] "Wende Patch %%s mit %d Zurückweisungen an..." msgid "truncating .rej filename to %.*s.rej" msgstr "Verkürze Name von .rej Datei zu %.*s.rej" -#: apply.c:4576 builtin/fetch.c:927 builtin/fetch.c:1228 +#: apply.c:4576 builtin/fetch.c:933 builtin/fetch.c:1334 #, c-format msgid "cannot open %s" msgstr "kann '%s' nicht öffnen" @@ -1383,7 +1382,7 @@ msgid_plural "%d lines applied after fixing whitespace errors." msgstr[0] "%d Zeile nach Behebung von Whitespace-Fehlern angewendet." msgstr[1] "%d Zeilen nach Behebung von Whitespace-Fehlern angewendet." -#: apply.c:4960 builtin/add.c:618 builtin/mv.c:304 builtin/rm.c:406 +#: apply.c:4960 builtin/add.c:626 builtin/mv.c:304 builtin/rm.c:406 msgid "Unable to write new index file" msgstr "Konnte neue Index-Datei nicht schreiben." @@ -1412,8 +1411,7 @@ msgstr "hinzugefügte Zeilen des Patches ignorieren" #: apply.c:4999 msgid "instead of applying the patch, output diffstat for the input" msgstr "" -"anstatt der Anwendung des Patches, den \"diffstat\" für die Eingabe " -"ausgegeben" +"statt den Patch anzuwenden, den \"diffstat\" für die Eingabe ausgegeben" #: apply.c:5003 msgid "show number of added and deleted lines in decimal notation" @@ -1423,13 +1421,12 @@ msgstr "" #: apply.c:5005 msgid "instead of applying the patch, output a summary for the input" msgstr "" -"anstatt der Anwendung des Patches, eine Zusammenfassung für die Eingabe " -"ausgeben" +"statt den Patch anzuwenden, eine Zusammenfassung für die Eingabe ausgeben" #: apply.c:5007 msgid "instead of applying the patch, see if the patch is applicable" msgstr "" -"anstatt der Anwendung des Patches, zeige ob Patch angewendet werden kann" +"statt den Patch anzuwenden, anzeigen ob der Patch angewendet werden kann" #: apply.c:5009 msgid "make sure the patch is applicable to the current index" @@ -1463,7 +1460,7 @@ msgstr "" "einen temporären Index, basierend auf den integrierten Index-Informationen, " "erstellen" -#: apply.c:5025 builtin/checkout-index.c:182 builtin/ls-files.c:525 +#: apply.c:5025 builtin/checkout-index.c:195 builtin/ls-files.c:540 msgid "paths are separated with NUL character" msgstr "Pfade sind getrennt durch NUL Zeichen" @@ -1474,7 +1471,7 @@ msgstr "" #: apply.c:5028 builtin/am.c:2245 builtin/interpret-trailers.c:98 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 -#: builtin/pack-objects.c:3562 builtin/rebase.c:1346 +#: builtin/pack-objects.c:3577 builtin/rebase.c:1352 msgid "action" msgstr "Aktion" @@ -1503,9 +1500,9 @@ msgstr "" msgid "allow overlapping hunks" msgstr "sich überlappende Patch-Blöcke erlauben" -#: apply.c:5045 builtin/add.c:329 builtin/check-ignore.c:22 -#: builtin/commit.c:1364 builtin/count-objects.c:98 builtin/fsck.c:775 -#: builtin/log.c:2287 builtin/mv.c:123 builtin/read-tree.c:128 +#: apply.c:5045 builtin/add.c:337 builtin/check-ignore.c:22 +#: builtin/commit.c:1364 builtin/count-objects.c:98 builtin/fsck.c:757 +#: builtin/log.c:2286 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "erweiterte Ausgaben" @@ -1593,14 +1590,14 @@ msgstr "git archive --remote <Repository> [--exec <Programm>] --list" msgid "cannot read %s" msgstr "Kann %s nicht lesen." -#: archive.c:345 sequencer.c:459 sequencer.c:1736 sequencer.c:2886 -#: sequencer.c:3327 sequencer.c:3436 builtin/am.c:249 builtin/commit.c:786 -#: builtin/merge.c:1138 +#: archive.c:345 sequencer.c:459 sequencer.c:1744 sequencer.c:2894 +#: sequencer.c:3335 sequencer.c:3444 builtin/am.c:249 builtin/commit.c:786 +#: builtin/merge.c:1139 #, c-format msgid "could not read '%s'" msgstr "Konnte '%s' nicht lesen" -#: archive.c:430 builtin/add.c:181 builtin/add.c:594 builtin/rm.c:315 +#: archive.c:430 builtin/add.c:189 builtin/add.c:602 builtin/rm.c:315 #, c-format msgid "pathspec '%s' did not match any files" msgstr "Pfadspezifikation '%s' stimmt mit keinen Dateien überein" @@ -1608,7 +1605,7 @@ msgstr "Pfadspezifikation '%s' stimmt mit keinen Dateien überein" #: archive.c:454 #, c-format msgid "no such ref: %.*s" -msgstr "Keine solche Referenz: %.*s" +msgstr "Referenz nicht gefunden: %.*s" #: archive.c:460 #, c-format @@ -1642,7 +1639,7 @@ msgstr "Format" msgid "archive format" msgstr "Archivformat" -#: archive.c:556 builtin/log.c:1765 +#: archive.c:556 builtin/log.c:1764 msgid "prefix" msgstr "Präfix" @@ -1650,11 +1647,11 @@ msgstr "Präfix" msgid "prepend prefix to each pathname in the archive" msgstr "einen Präfix vor jeden Pfadnamen in dem Archiv stellen" -#: archive.c:558 archive.c:561 builtin/blame.c:886 builtin/blame.c:890 -#: builtin/blame.c:891 builtin/commit-tree.c:117 builtin/config.c:135 +#: archive.c:558 archive.c:561 builtin/blame.c:884 builtin/blame.c:888 +#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135 #: builtin/fast-export.c:1207 builtin/fast-export.c:1209 -#: builtin/fast-export.c:1213 builtin/grep.c:919 builtin/hash-object.c:105 -#: builtin/ls-files.c:561 builtin/ls-files.c:564 builtin/notes.c:412 +#: builtin/fast-export.c:1213 builtin/grep.c:920 builtin/hash-object.c:105 +#: builtin/ls-files.c:576 builtin/ls-files.c:579 builtin/notes.c:412 #: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:190 msgid "file" msgstr "Datei" @@ -1707,7 +1704,7 @@ msgstr "Unerwartete Option --remote" #: archive.c:584 msgid "Option --exec can only be used together with --remote" -msgstr "Die Option --exec kann nur zusammen mit --remote verwendet werden." +msgstr "Die Option --exec kann nur zusammen mit --remote verwendet werden" #: archive.c:586 msgid "Unexpected option --output" @@ -1716,7 +1713,7 @@ msgstr "Unerwartete Option --output" #: archive.c:588 msgid "Options --add-file and --remote cannot be used together" msgstr "" -"Die Optionen --add-file und --remote können nicht gemeinsam verwendet werden." +"Die Optionen --add-file und --remote können nicht gemeinsam verwendet werden" #: archive.c:610 #, c-format @@ -1821,12 +1818,12 @@ msgstr "binäre Suche: eine Merge-Basis muss geprüft werden\n" msgid "a %s revision is needed" msgstr "ein %s Commit wird benötigt" -#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:255 +#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:287 #, c-format msgid "could not create file '%s'" msgstr "konnte Datei '%s' nicht erstellen" -#: bisect.c:987 builtin/merge.c:152 +#: bisect.c:987 builtin/merge.c:153 #, c-format msgid "could not read file '%s'" msgstr "Konnte Datei '%s' nicht lesen" @@ -1844,10 +1841,10 @@ msgstr "%s war sowohl %s als auch %s\n" #, c-format msgid "" "No testable commit found.\n" -"Maybe you started with bad path parameters?\n" +"Maybe you started with bad path arguments?\n" msgstr "" "Kein testbarer Commit gefunden.\n" -"Vielleicht starteten Sie mit falschen Pfad-Parametern?\n" +"Vielleicht starteten Sie mit schlechten Pfad-Argumenten?\n" #: bisect.c:1095 #, c-format @@ -1882,11 +1879,11 @@ msgstr "" "endgültigen\n" "Commits" -#: blame.c:2821 bundle.c:213 ref-filter.c:2272 remote.c:2031 sequencer.c:2138 -#: sequencer.c:4633 submodule.c:855 builtin/commit.c:1045 builtin/log.c:409 -#: builtin/log.c:1023 builtin/log.c:1625 builtin/log.c:2046 builtin/log.c:2336 -#: builtin/merge.c:423 builtin/pack-objects.c:3380 builtin/pack-objects.c:3395 -#: builtin/shortlog.c:267 +#: blame.c:2821 bundle.c:213 ref-filter.c:2206 remote.c:2041 sequencer.c:2146 +#: sequencer.c:4641 submodule.c:856 builtin/commit.c:1045 builtin/log.c:411 +#: builtin/log.c:1016 builtin/log.c:1624 builtin/log.c:2045 builtin/log.c:2335 +#: builtin/merge.c:424 builtin/pack-objects.c:3395 builtin/pack-objects.c:3410 +#: builtin/shortlog.c:255 msgid "revision walk setup failed" msgstr "Einrichtung des Revisionsgangs fehlgeschlagen" @@ -1900,7 +1897,7 @@ msgstr "" #: blame.c:2850 #, c-format msgid "no such path %s in %s" -msgstr "Pfad %s nicht in %s" +msgstr "Pfad %s nicht in %s gefunden" #: blame.c:2861 #, c-format @@ -2069,7 +2066,7 @@ msgstr "'%s' sieht nicht wie eine v2 oder v3 Paketdatei aus" msgid "unrecognized header: %s%s (%d)" msgstr "nicht erkannter Kopfbereich: %s%s (%d)" -#: bundle.c:136 rerere.c:480 rerere.c:690 sequencer.c:2390 sequencer.c:3176 +#: bundle.c:136 rerere.c:464 rerere.c:674 sequencer.c:2398 sequencer.c:3184 #: builtin/commit.c:814 #, c-format msgid "could not open '%s'" @@ -2113,279 +2110,292 @@ msgstr "Konnte Paketobjekte nicht erstellen" msgid "pack-objects died" msgstr "Erstellung der Paketobjekte abgebrochen" -#: bundle.c:379 -msgid "rev-list died" -msgstr "\"rev-list\" abgebrochen" - -#: bundle.c:428 +#: bundle.c:386 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "Referenz '%s' wird durch \"rev-list\" Optionen ausgeschlossen" -#: bundle.c:498 +#: bundle.c:490 #, c-format msgid "unsupported bundle version %d" msgstr "nicht unterstützte Paket-Version %d" -#: bundle.c:500 +#: bundle.c:492 #, c-format msgid "cannot write bundle version %d with algorithm %s" msgstr "kann Paket-Version %d nicht mit Algorithmus %s schreiben" -#: bundle.c:522 builtin/log.c:209 builtin/log.c:1927 builtin/shortlog.c:408 +#: bundle.c:510 builtin/log.c:210 builtin/log.c:1926 builtin/shortlog.c:396 #, c-format msgid "unrecognized argument: %s" msgstr "nicht erkanntes Argument: %s" -#: bundle.c:530 +#: bundle.c:539 msgid "Refusing to create empty bundle." msgstr "Erstellung eines leeren Pakets zurückgewiesen." -#: bundle.c:540 +#: bundle.c:549 #, c-format msgid "cannot create '%s'" msgstr "kann '%s' nicht erstellen" -#: bundle.c:565 +#: bundle.c:574 msgid "index-pack died" msgstr "Erstellung der Paketindexdatei abgebrochen" +#: chunk-format.c:113 +msgid "terminating chunk id appears earlier than expected" +msgstr "abschließende Chunk-ID erscheint eher als erwartet" + +#: chunk-format.c:122 +#, c-format +msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>" +msgstr "unzulässige(r) Chunk-Offset(s) %<PRIx64> und %<PRIx64>" + +#: chunk-format.c:129 +#, c-format +msgid "duplicate chunk ID %<PRIx32> found" +msgstr "doppelte Chunk-ID %<PRIx32> gefunden" + +#: chunk-format.c:143 +#, c-format +msgid "final chunk has non-zero id %<PRIx32>" +msgstr "letzter Chunk hat nicht-Null ID %<PRIx32>" + #: color.c:329 #, c-format msgid "invalid color value: %.*s" msgstr "Ungültiger Farbwert: %.*s" -#: commit-graph.c:188 midx.c:47 +#: commit-graph.c:197 midx.c:46 msgid "invalid hash version" msgstr "ungültige Hash-Version" -#: commit-graph.c:246 +#: commit-graph.c:255 msgid "commit-graph file is too small" -msgstr "Commit-Graph-Datei ist zu klein." +msgstr "Commit-Graph-Datei ist zu klein" -#: commit-graph.c:311 +#: commit-graph.c:348 #, c-format msgid "commit-graph signature %X does not match signature %X" msgstr "Commit-Graph-Signatur %X stimmt nicht mit Signatur %X überein." -#: commit-graph.c:318 +#: commit-graph.c:355 #, c-format msgid "commit-graph version %X does not match version %X" msgstr "Commit-Graph-Version %X stimmt nicht mit Version %X überein." -#: commit-graph.c:325 +#: commit-graph.c:362 #, c-format msgid "commit-graph hash version %X does not match version %X" msgstr "Hash-Version des Commit-Graph %X stimmt nicht mit Version %X überein." -#: commit-graph.c:342 +#: commit-graph.c:379 #, c-format msgid "commit-graph file is too small to hold %u chunks" msgstr "Commit-Graph-Datei ist zu klein, um %u Chunks zu enthalten" -#: commit-graph.c:361 -#, c-format -msgid "commit-graph improper chunk offset %08x%08x" -msgstr "Unzulässiger Commit-Graph Chunk-Offset %08x%08x" - -#: commit-graph.c:433 -#, c-format -msgid "commit-graph chunk id %08x appears multiple times" -msgstr "Commit-Graph Chunk-Id %08x kommt mehrfach vor." - -#: commit-graph.c:499 +#: commit-graph.c:472 msgid "commit-graph has no base graphs chunk" msgstr "Commit-Graph hat keinen Basis-Graph-Chunk" -#: commit-graph.c:509 +#: commit-graph.c:482 msgid "commit-graph chain does not match" msgstr "Commit-Graph Verkettung stimmt nicht überein." -#: commit-graph.c:557 +#: commit-graph.c:530 #, c-format msgid "invalid commit-graph chain: line '%s' not a hash" msgstr "Ungültige Commit-Graph Verkettung: Zeile '%s' ist kein Hash" -#: commit-graph.c:581 +#: commit-graph.c:554 msgid "unable to find all commit-graph files" msgstr "Konnte nicht alle Commit-Graph-Dateien finden." -#: commit-graph.c:721 commit-graph.c:785 +#: commit-graph.c:735 commit-graph.c:772 msgid "invalid commit position. commit-graph is likely corrupt" msgstr "Ungültige Commit-Position. Commit-Graph ist wahrscheinlich beschädigt." -#: commit-graph.c:742 +#: commit-graph.c:756 #, c-format msgid "could not find commit %s" msgstr "Konnte Commit %s nicht finden." -#: commit-graph.c:1036 builtin/am.c:1292 +#: commit-graph.c:789 +msgid "commit-graph requires overflow generation data but has none" +msgstr "Commit-Graph erfordert Überlaufgenerierungsdaten, aber hat keine" + +#: commit-graph.c:1065 builtin/am.c:1292 #, c-format msgid "unable to parse commit %s" msgstr "Konnte Commit '%s' nicht parsen." -#: commit-graph.c:1252 builtin/pack-objects.c:2864 +#: commit-graph.c:1327 builtin/pack-objects.c:2872 #, c-format msgid "unable to get type of object %s" msgstr "Konnte Art von Objekt '%s' nicht bestimmen." -#: commit-graph.c:1283 +#: commit-graph.c:1358 msgid "Loading known commits in commit graph" msgstr "Lade bekannte Commits in Commit-Graph" -#: commit-graph.c:1300 +#: commit-graph.c:1375 msgid "Expanding reachable commits in commit graph" msgstr "Erweitere erreichbare Commits in Commit-Graph" -#: commit-graph.c:1320 +#: commit-graph.c:1395 msgid "Clearing commit marks in commit graph" msgstr "Lösche Commit-Markierungen in Commit-Graph" -#: commit-graph.c:1339 +#: commit-graph.c:1414 +msgid "Computing commit graph topological levels" +msgstr "Topologische Ebenen des Commit-Graph werden berechnet" + +#: commit-graph.c:1467 msgid "Computing commit graph generation numbers" msgstr "Commit-Graph Generationsnummern berechnen" -#: commit-graph.c:1406 +#: commit-graph.c:1548 msgid "Computing commit changed paths Bloom filters" msgstr "Berechnung der Bloom-Filter für veränderte Pfade des Commits" -#: commit-graph.c:1483 +#: commit-graph.c:1625 msgid "Collecting referenced commits" msgstr "Sammle referenzierte Commits" -#: commit-graph.c:1508 +#: commit-graph.c:1650 #, c-format msgid "Finding commits for commit graph in %d pack" msgid_plural "Finding commits for commit graph in %d packs" msgstr[0] "Suche Commits für Commit-Graph in %d Paket" msgstr[1] "Suche Commits für Commit-Graph in %d Paketen" -#: commit-graph.c:1521 +#: commit-graph.c:1663 #, c-format msgid "error adding pack %s" msgstr "Fehler beim Hinzufügen von Paket %s." -#: commit-graph.c:1525 +#: commit-graph.c:1667 #, c-format msgid "error opening index for %s" msgstr "Fehler beim Öffnen des Index für %s." -#: commit-graph.c:1562 +#: commit-graph.c:1704 msgid "Finding commits for commit graph among packed objects" msgstr "Suche Commits für Commit-Graph in gepackten Objekten" -#: commit-graph.c:1580 +#: commit-graph.c:1722 msgid "Finding extra edges in commit graph" msgstr "Suche zusätzliche Ränder in Commit-Graph" -#: commit-graph.c:1628 +#: commit-graph.c:1771 msgid "failed to write correct number of base graph ids" msgstr "Fehler beim Schreiben der korrekten Anzahl von Basis-Graph-IDs." -#: commit-graph.c:1670 midx.c:819 +#: commit-graph.c:1802 midx.c:794 #, c-format msgid "unable to create leading directories of %s" msgstr "Konnte führende Verzeichnisse von '%s' nicht erstellen." -#: commit-graph.c:1683 +#: commit-graph.c:1815 msgid "unable to create temporary graph layer" msgstr "konnte temporäre Graphen-Schicht nicht erstellen" -#: commit-graph.c:1688 +#: commit-graph.c:1820 #, c-format msgid "unable to adjust shared permissions for '%s'" msgstr "konnte geteilte Zugriffsberechtigungen für '%s' nicht ändern" -#: commit-graph.c:1758 +#: commit-graph.c:1879 #, c-format msgid "Writing out commit graph in %d pass" msgid_plural "Writing out commit graph in %d passes" msgstr[0] "Schreibe Commit-Graph in %d Durchgang" msgstr[1] "Schreibe Commit-Graph in %d Durchgängen" -#: commit-graph.c:1803 +#: commit-graph.c:1915 msgid "unable to open commit-graph chain file" msgstr "konnte Commit-Graph Chain-Datei nicht öffnen" -#: commit-graph.c:1819 +#: commit-graph.c:1931 msgid "failed to rename base commit-graph file" msgstr "konnte Basis-Commit-Graph-Datei nicht umbenennen" -#: commit-graph.c:1839 +#: commit-graph.c:1951 msgid "failed to rename temporary commit-graph file" msgstr "konnte temporäre Commit-Graph-Datei nicht umbenennen" -#: commit-graph.c:1965 +#: commit-graph.c:2084 msgid "Scanning merged commits" msgstr "Durchsuche zusammengeführte Commits" -#: commit-graph.c:2009 +#: commit-graph.c:2128 msgid "Merging commit-graph" msgstr "Zusammenführen von Commit-Graph" -#: commit-graph.c:2115 +#: commit-graph.c:2235 msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled" msgstr "" "versuche einen Commit-Graph zu schreiben, aber 'core.commitGraph' ist " "deaktiviert" -#: commit-graph.c:2214 +#: commit-graph.c:2342 msgid "too many commits to write graph" msgstr "zu viele Commits zum Schreiben des Graphen" -#: commit-graph.c:2307 +#: commit-graph.c:2440 msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "" "die Commit-Graph-Datei hat eine falsche Prüfsumme und ist wahrscheinlich " "beschädigt" -#: commit-graph.c:2317 +#: commit-graph.c:2450 #, c-format msgid "commit-graph has incorrect OID order: %s then %s" msgstr "Commit-Graph hat fehlerhafte OID-Reihenfolge: %s dann %s" -#: commit-graph.c:2327 commit-graph.c:2342 +#: commit-graph.c:2460 commit-graph.c:2475 #, c-format msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" msgstr "Commit-Graph hat fehlerhaften Fanout-Wert: fanout[%d] = %u != %u" -#: commit-graph.c:2334 +#: commit-graph.c:2467 #, c-format msgid "failed to parse commit %s from commit-graph" msgstr "konnte Commit %s von Commit-Graph nicht parsen" -#: commit-graph.c:2352 +#: commit-graph.c:2485 msgid "Verifying commits in commit graph" msgstr "Commit in Commit-Graph überprüfen" -#: commit-graph.c:2367 +#: commit-graph.c:2500 #, c-format msgid "failed to parse commit %s from object database for commit-graph" msgstr "" "Fehler beim Parsen des Commits %s von Objekt-Datenbank für Commit-Graph" -#: commit-graph.c:2374 +#: commit-graph.c:2507 #, c-format msgid "root tree OID for commit %s in commit-graph is %s != %s" msgstr "" "OID des Wurzelverzeichnisses für Commit %s in Commit-Graph ist %s != %s" -#: commit-graph.c:2384 +#: commit-graph.c:2517 #, c-format msgid "commit-graph parent list for commit %s is too long" msgstr "Commit-Graph Vorgänger-Liste für Commit %s ist zu lang" -#: commit-graph.c:2393 +#: commit-graph.c:2526 #, c-format msgid "commit-graph parent for %s is %s != %s" msgstr "Commit-Graph-Vorgänger für %s ist %s != %s" -#: commit-graph.c:2407 +#: commit-graph.c:2540 #, c-format msgid "commit-graph parent list for commit %s terminates early" msgstr "Commit-Graph Vorgänger-Liste für Commit %s endet zu früh" -#: commit-graph.c:2412 +#: commit-graph.c:2545 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" @@ -2393,7 +2403,7 @@ msgstr "" "Commit-Graph hat Generationsnummer null für Commit %s, aber sonst ungleich " "null" -#: commit-graph.c:2416 +#: commit-graph.c:2549 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" @@ -2401,18 +2411,18 @@ msgstr "" "Commit-Graph hat Generationsnummer ungleich null für Commit %s, aber sonst " "null" -#: commit-graph.c:2432 +#: commit-graph.c:2566 #, c-format -msgid "commit-graph generation for commit %s is %u != %u" -msgstr "Commit-Graph Erstellung für Commit %s ist %u != %u" +msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>" +msgstr "Commit-Graph Erstellung für Commit %s ist %<PRIuMAX> < %<PRIuMAX>" -#: commit-graph.c:2438 +#: commit-graph.c:2572 #, c-format msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" msgstr "" "Commit-Datum für Commit %s in Commit-Graph ist %<PRIuMAX> != %<PRIuMAX>" -#: commit.c:52 sequencer.c:2879 builtin/am.c:359 builtin/am.c:403 +#: commit.c:52 sequencer.c:2887 builtin/am.c:359 builtin/am.c:403 #: builtin/am.c:1371 builtin/am.c:2018 builtin/replace.c:457 #, c-format msgid "could not parse %s" @@ -2444,28 +2454,28 @@ msgstr "" "Sie können diese Meldung unterdrücken, indem Sie\n" "\"git config advice.graftFileDeprecated false\" ausführen." -#: commit.c:1172 +#: commit.c:1223 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "" "Commit %s hat eine nicht vertrauenswürdige GPG-Signatur, angeblich von %s." -#: commit.c:1176 +#: commit.c:1227 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "Commit %s hat eine ungültige GPG-Signatur, angeblich von %s." -#: commit.c:1179 +#: commit.c:1230 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "Commit %s hat keine GPG-Signatur." -#: commit.c:1182 +#: commit.c:1233 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "Commit %s hat eine gültige GPG-Signatur von %s\n" -#: commit.c:1436 +#: commit.c:1487 msgid "" "Warning: commit message did not conform to UTF-8.\n" "You may want to amend it after fixing the message, or set the config\n" @@ -2481,7 +2491,7 @@ msgstr "" msgid "memory exhausted" msgstr "Speicher verbraucht" -#: config.c:125 +#: config.c:126 #, c-format msgid "" "exceeded maximum include depth (%d) while including\n" @@ -2497,306 +2507,350 @@ msgstr "" "überschritten.\n" "Das könnte durch zirkulare Includes entstanden sein." -#: config.c:141 +#: config.c:142 #, c-format msgid "could not expand include path '%s'" msgstr "Konnte Include-Pfad '%s' nicht erweitern." -#: config.c:152 +#: config.c:153 msgid "relative config includes must come from files" msgstr "Relative Includes von Konfigurationen müssen aus Dateien kommen." -#: config.c:198 +#: config.c:199 msgid "relative config include conditionals must come from files" msgstr "" "Bedingungen für das Einbinden von Konfigurationen aus relativen Pfaden " "müssen\n" "aus Dateien kommen." -#: config.c:378 +#: config.c:396 +#, c-format +msgid "invalid config format: %s" +msgstr "ungültiges Konfigurationsformat: %s" + +#: config.c:400 +#, c-format +msgid "missing environment variable name for configuration '%.*s'" +msgstr "fehlender Name der Umgebungsvariable für Konfiguration '%.*s'" + +#: config.c:405 +#, c-format +msgid "missing environment variable '%s' for configuration '%.*s'" +msgstr "fehlende Umgebungsvariable '%s' für Konfiguration '%.*s'" + +#: config.c:442 #, c-format msgid "key does not contain a section: %s" msgstr "Schlüssel enthält keine Sektion: %s" -#: config.c:384 +#: config.c:448 #, c-format msgid "key does not contain variable name: %s" msgstr "Schlüssel enthält keinen Variablennamen: %s" -#: config.c:408 sequencer.c:2580 +#: config.c:472 sequencer.c:2588 #, c-format msgid "invalid key: %s" msgstr "Ungültiger Schlüssel: %s" -#: config.c:414 +#: config.c:478 #, c-format msgid "invalid key (newline): %s" msgstr "Ungültiger Schlüssel (neue Zeile): %s" -#: config.c:450 config.c:462 +#: config.c:511 +msgid "empty config key" +msgstr "leerer Konfigurationsschlüssel" + +#: config.c:529 config.c:541 #, c-format msgid "bogus config parameter: %s" msgstr "Fehlerhafter Konfigurationsparameter: %s" -#: config.c:497 +#: config.c:555 config.c:572 config.c:579 config.c:588 #, c-format msgid "bogus format in %s" msgstr "Fehlerhaftes Format in %s" -#: config.c:836 +#: config.c:622 +#, c-format +msgid "bogus count in %s" +msgstr "falsche Zählung in %s" + +#: config.c:626 +#, c-format +msgid "too many entries in %s" +msgstr "zu viele Einträge in %s" + +#: config.c:636 +#, c-format +msgid "missing config key %s" +msgstr "fehlender Konfigurationsschlüssel %s" + +#: config.c:644 +#, c-format +msgid "missing config value %s" +msgstr "fehlender Konfigurationswert %s" + +#: config.c:995 #, c-format msgid "bad config line %d in blob %s" msgstr "Ungültige Konfigurationszeile %d in Blob %s" -#: config.c:840 +#: config.c:999 #, c-format msgid "bad config line %d in file %s" msgstr "Ungültige Konfigurationszeile %d in Datei %s" -#: config.c:844 +#: config.c:1003 #, c-format msgid "bad config line %d in standard input" msgstr "Ungültige Konfigurationszeile %d in Standard-Eingabe" -#: config.c:848 +#: config.c:1007 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "Ungültige Konfigurationszeile %d in Submodul-Blob %s" -#: config.c:852 +#: config.c:1011 #, c-format msgid "bad config line %d in command line %s" msgstr "Ungültige Konfigurationszeile %d in Kommandozeile %s" -#: config.c:856 +#: config.c:1015 #, c-format msgid "bad config line %d in %s" msgstr "Ungültige Konfigurationszeile %d in %s" -#: config.c:993 +#: config.c:1152 msgid "out of range" msgstr "Außerhalb des Bereichs" -#: config.c:993 +#: config.c:1152 msgid "invalid unit" msgstr "Ungültige Einheit" -#: config.c:994 +#: config.c:1153 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "Ungültiger numerischer Wert '%s' für Konfiguration '%s': %s" -#: config.c:1013 +#: config.c:1163 #, c-format msgid "bad numeric config value '%s' for '%s' in blob %s: %s" msgstr "Ungültiger numerischer Wert '%s' für Konfiguration '%s' in Blob %s: %s" -#: config.c:1016 +#: config.c:1166 #, c-format msgid "bad numeric config value '%s' for '%s' in file %s: %s" msgstr "" "Ungültiger numerischer Wert '%s' für Konfiguration '%s' in Datei %s: %s" -#: config.c:1019 +#: config.c:1169 #, c-format msgid "bad numeric config value '%s' for '%s' in standard input: %s" msgstr "" "Ungültiger numerischer Wert '%s' für Konfiguration '%s' in Standard-Eingabe: " "%s" -#: config.c:1022 +#: config.c:1172 #, c-format msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" msgstr "" "Ungültiger numerischer Wert '%s' für Konfiguration '%s' in Submodul-Blob %s: " "%s" -#: config.c:1025 +#: config.c:1175 #, c-format msgid "bad numeric config value '%s' for '%s' in command line %s: %s" msgstr "" "Ungültiger numerischer Wert '%s' für Konfiguration '%s' in Befehlszeile %s: " "%s" -#: config.c:1028 +#: config.c:1178 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "Ungültiger numerischer Wert '%s' für Konfiguration '%s' in %s: %s" -#: config.c:1123 +#: config.c:1194 +#, c-format +msgid "bad boolean config value '%s' for '%s'" +msgstr "ungültiger boolescher Konfigurationswert '%s' für '%s'" + +#: config.c:1289 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "Fehler beim Erweitern des Nutzerverzeichnisses in: '%s'" -#: config.c:1132 +#: config.c:1298 #, c-format msgid "'%s' for '%s' is not a valid timestamp" msgstr "'%s' ist kein gültiger Zeitstempel für '%s'" -#: config.c:1223 +#: config.c:1391 #, c-format msgid "abbrev length out of range: %d" msgstr "Länge für Abkürzung von Commit-IDs außerhalb des Bereichs: %d" -#: config.c:1237 config.c:1248 +#: config.c:1405 config.c:1416 #, c-format msgid "bad zlib compression level %d" msgstr "ungültiger zlib Komprimierungsgrad %d" -#: config.c:1340 +#: config.c:1508 msgid "core.commentChar should only be one character" msgstr "core.commentChar sollte nur ein Zeichen sein" -#: config.c:1373 +#: config.c:1541 #, c-format msgid "invalid mode for object creation: %s" msgstr "Ungültiger Modus für Objekterstellung: %s" -#: config.c:1445 +#: config.c:1613 #, c-format msgid "malformed value for %s" msgstr "Ungültiger Wert für %s." -#: config.c:1471 +#: config.c:1639 #, c-format msgid "malformed value for %s: %s" msgstr "Ungültiger Wert für %s: %s" -#: config.c:1472 +#: config.c:1640 msgid "must be one of nothing, matching, simple, upstream or current" msgstr "" "Muss einer von diesen sein: nothing, matching, simple, upstream, current" -#: config.c:1533 builtin/pack-objects.c:3649 +#: config.c:1701 builtin/pack-objects.c:3666 #, c-format msgid "bad pack compression level %d" msgstr "ungültiger Komprimierungsgrad (%d) für Paketierung" -#: config.c:1655 +#: config.c:1823 #, c-format msgid "unable to load config blob object '%s'" msgstr "Konnte Blob-Objekt '%s' für Konfiguration nicht laden." -#: config.c:1658 +#: config.c:1826 #, c-format msgid "reference '%s' does not point to a blob" msgstr "Referenz '%s' zeigt auf keinen Blob." -#: config.c:1675 +#: config.c:1843 #, c-format msgid "unable to resolve config blob '%s'" msgstr "Konnte Blob '%s' für Konfiguration nicht auflösen." -#: config.c:1705 +#: config.c:1873 #, c-format msgid "failed to parse %s" msgstr "Fehler beim Parsen von %s." -#: config.c:1759 +#: config.c:1927 msgid "unable to parse command-line config" msgstr "" "Konnte die über die Befehlszeile angegebene Konfiguration nicht parsen." -#: config.c:2122 +#: config.c:2290 msgid "unknown error occurred while reading the configuration files" msgstr "" "Es trat ein unbekannter Fehler beim Lesen der Konfigurationsdateien auf." -#: config.c:2296 +#: config.c:2464 #, c-format msgid "Invalid %s: '%s'" msgstr "Ungültiger %s: '%s'" -#: config.c:2341 +#: config.c:2509 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "" "Der Wert '%d' von splitIndex.maxPercentChange sollte zwischen 0 und 100 " "liegen." -#: config.c:2387 +#: config.c:2555 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "" "Konnte Wert '%s' aus der über die Befehlszeile angegebenen Konfiguration\n" "nicht parsen." -#: config.c:2389 +#: config.c:2557 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "ungültige Konfigurationsvariable '%s' in Datei '%s' bei Zeile %d" -#: config.c:2473 +#: config.c:2641 #, c-format msgid "invalid section name '%s'" msgstr "Ungültiger Sektionsname '%s'" -#: config.c:2505 +#: config.c:2673 #, c-format msgid "%s has multiple values" msgstr "%s hat mehrere Werte" -#: config.c:2534 +#: config.c:2702 #, c-format msgid "failed to write new configuration file %s" msgstr "Konnte neue Konfigurationsdatei '%s' nicht schreiben." -#: config.c:2786 config.c:3112 +#: config.c:2954 config.c:3280 #, c-format msgid "could not lock config file %s" msgstr "Konnte Konfigurationsdatei '%s' nicht sperren." -#: config.c:2797 +#: config.c:2965 #, c-format msgid "opening %s" msgstr "Öffne %s" -#: config.c:2834 builtin/config.c:361 +#: config.c:3002 builtin/config.c:361 #, c-format msgid "invalid pattern: %s" msgstr "Ungültiges Muster: %s" -#: config.c:2859 +#: config.c:3027 #, c-format msgid "invalid config file %s" msgstr "Ungültige Konfigurationsdatei %s" -#: config.c:2872 config.c:3125 +#: config.c:3040 config.c:3293 #, c-format msgid "fstat on %s failed" msgstr "fstat auf %s fehlgeschlagen" -#: config.c:2883 +#: config.c:3051 #, c-format msgid "unable to mmap '%s'" msgstr "mmap für '%s' fehlgeschlagen" -#: config.c:2892 config.c:3130 +#: config.c:3060 config.c:3298 #, c-format msgid "chmod on %s failed" msgstr "chmod auf %s fehlgeschlagen" -#: config.c:2977 config.c:3227 +#: config.c:3145 config.c:3395 #, c-format msgid "could not write config file %s" msgstr "Konnte Konfigurationsdatei %s nicht schreiben." -#: config.c:3011 +#: config.c:3179 #, c-format msgid "could not set '%s' to '%s'" msgstr "Konnte '%s' nicht zu '%s' setzen." -#: config.c:3013 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863 +#: config.c:3181 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863 #, c-format msgid "could not unset '%s'" msgstr "Konnte '%s' nicht aufheben." -#: config.c:3103 +#: config.c:3271 #, c-format msgid "invalid section name: %s" msgstr "Ungültiger Sektionsname: %s" -#: config.c:3270 +#: config.c:3438 #, c-format msgid "missing value for '%s'" msgstr "Fehlender Wert für '%s'" @@ -2861,45 +2915,45 @@ msgstr "ungültiges Paket" msgid "protocol error: unexpected '%s'" msgstr "Protokollfehler: unerwartetes '%s'" -#: connect.c:473 +#: connect.c:497 #, c-format msgid "unknown object format '%s' specified by server" msgstr "unbekanntes Objekt-Format '%s' vom Server angegeben" -#: connect.c:500 +#: connect.c:526 #, c-format msgid "invalid ls-refs response: %s" msgstr "ungültige ls-refs Antwort: %s" -#: connect.c:504 +#: connect.c:530 msgid "expected flush after ref listing" msgstr "Flush nach Auflistung der Referenzen erwartet" -#: connect.c:507 +#: connect.c:533 msgid "expected response end packet after ref listing" msgstr "Antwort-Endpaket nach Auflistung der Referenzen erwartet" -#: connect.c:640 +#: connect.c:666 #, c-format msgid "protocol '%s' is not supported" msgstr "Protokoll '%s' wird nicht unterstützt" -#: connect.c:691 +#: connect.c:717 msgid "unable to set SO_KEEPALIVE on socket" msgstr "kann SO_KEEPALIVE bei Socket nicht setzen" -#: connect.c:731 connect.c:794 +#: connect.c:757 connect.c:820 #, c-format msgid "Looking up %s ... " msgstr "Suche nach %s ..." -#: connect.c:735 +#: connect.c:761 #, c-format msgid "unable to look up %s (port %s) (%s)" msgstr "Fehler bei Suche nach %s (Port %s) (%s)." #. TRANSLATORS: this is the end of "Looking up %s ... " -#: connect.c:739 connect.c:810 +#: connect.c:765 connect.c:836 #, c-format msgid "" "done.\n" @@ -2908,7 +2962,7 @@ msgstr "" "Fertig.\n" "Verbinde nach %s (Port %s) ... " -#: connect.c:761 connect.c:838 +#: connect.c:787 connect.c:864 #, c-format msgid "" "unable to connect to %s:\n" @@ -2918,62 +2972,65 @@ msgstr "" "%s" #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... " -#: connect.c:767 connect.c:844 +#: connect.c:793 connect.c:870 msgid "done." msgstr "Fertig." -#: connect.c:798 +#: connect.c:824 #, c-format msgid "unable to look up %s (%s)" msgstr "Fehler bei der Suche nach %s (%s)" -#: connect.c:804 +#: connect.c:830 #, c-format msgid "unknown port %s" msgstr "Unbekannter Port %s" -#: connect.c:941 connect.c:1271 +#: connect.c:967 connect.c:1299 #, c-format msgid "strange hostname '%s' blocked" msgstr "Merkwürdigen Hostnamen '%s' blockiert." -#: connect.c:943 +#: connect.c:969 #, c-format msgid "strange port '%s' blocked" msgstr "Merkwürdigen Port '%s' blockiert." -#: connect.c:953 +#: connect.c:979 #, c-format msgid "cannot start proxy %s" msgstr "Kann Proxy %s nicht starten." -#: connect.c:1024 +#: connect.c:1050 msgid "no path specified; see 'git help pull' for valid url syntax" -msgstr "" -"Kein Pfad angegeben; siehe 'git help pull' für eine gültige URL-Syntax." +msgstr "kein Pfad angegeben; siehe 'git help pull' für eine gültige URL-Syntax" -#: connect.c:1219 +#: connect.c:1190 +msgid "newline is forbidden in git:// hosts and repo paths" +msgstr "Zeilenumbruch ist in git:// Hosts und Repository-Pfaden verboten" + +#: connect.c:1247 msgid "ssh variant 'simple' does not support -4" -msgstr "SSH-Variante 'simple' unterstützt kein -4." +msgstr "SSH-Variante 'simple' unterstützt kein -4" -#: connect.c:1231 +#: connect.c:1259 msgid "ssh variant 'simple' does not support -6" -msgstr "SSH-Variante 'simple' unterstützt kein -6." +msgstr "SSH-Variante 'simple' unterstützt kein -6" -#: connect.c:1248 +#: connect.c:1276 msgid "ssh variant 'simple' does not support setting port" -msgstr "SSH-Variante 'simple' unterstützt nicht das Setzen eines Ports." +msgstr "SSH-Variante 'simple' unterstützt nicht das Setzen eines Ports" -#: connect.c:1360 +#: connect.c:1388 #, c-format msgid "strange pathname '%s' blocked" -msgstr "Merkwürdigen Pfadnamen '%s' blockiert." +msgstr "Merkwürdigen Pfadnamen '%s' blockiert" -#: connect.c:1408 +#: connect.c:1436 msgid "unable to fork" -msgstr "Kann Prozess nicht starten." +msgstr "kann Prozess nicht starten" -#: connected.c:108 builtin/fsck.c:209 builtin/prune.c:45 +#: connected.c:108 builtin/fsck.c:191 builtin/prune.c:45 msgid "Checking connectivity" msgstr "Prüfe Konnektivität" @@ -2997,7 +3054,7 @@ msgstr "Unerlaubte crlf_action %d" #: convert.c:207 #, c-format msgid "CRLF would be replaced by LF in %s" -msgstr "CRLF würde in %s durch LF ersetzt werden." +msgstr "CRLF würde in %s durch LF ersetzt werden" #: convert.c:209 #, c-format @@ -3012,7 +3069,7 @@ msgstr "" #: convert.c:217 #, c-format msgid "LF would be replaced by CRLF in %s" -msgstr "LF würde in %s durch CRLF ersetzt werden." +msgstr "LF würde in %s durch CRLF ersetzt werden" #: convert.c:219 #, c-format @@ -3027,7 +3084,7 @@ msgstr "" #: convert.c:284 #, c-format msgid "BOM is prohibited in '%s' if encoded as %s" -msgstr "BOM ist in '%s' unzulässig, wenn als %s codiert." +msgstr "BOM ist in '%s' unzulässig, wenn als %s codiert" #: convert.c:291 #, c-format @@ -3041,7 +3098,7 @@ msgstr "" #: convert.c:304 #, c-format msgid "BOM is required in '%s' if encoded as %s" -msgstr "BOM ist erforderlich in '%s', wenn als %s codiert." +msgstr "BOM ist erforderlich in '%s', wenn als %s codiert" #: convert.c:306 #, c-format @@ -3056,45 +3113,45 @@ msgstr "" #: convert.c:419 convert.c:490 #, c-format msgid "failed to encode '%s' from %s to %s" -msgstr "Fehler beim Codieren von '%s' von %s nach %s." +msgstr "Fehler beim Codieren von '%s' von %s nach %s" #: convert.c:462 #, c-format msgid "encoding '%s' from %s to %s and back is not the same" -msgstr "Die Codierung '%s' von %s nach %s und zurück ist nicht dasselbe." +msgstr "Codierung von '%s' von %s nach %s und zurück ist nicht dasselbe" #: convert.c:665 #, c-format msgid "cannot fork to run external filter '%s'" -msgstr "Kann externen Filter '%s' nicht starten." +msgstr "kann externen Filter '%s' nicht starten" #: convert.c:685 #, c-format msgid "cannot feed the input to external filter '%s'" -msgstr "Kann Eingaben nicht an externen Filter '%s' übergeben." +msgstr "kann Eingaben nicht an externen Filter '%s' übergeben" #: convert.c:692 #, c-format msgid "external filter '%s' failed %d" -msgstr "Externer Filter '%s' fehlgeschlagen %d" +msgstr "externer Filter '%s' fehlgeschlagen %d" #: convert.c:727 convert.c:730 #, c-format msgid "read from external filter '%s' failed" -msgstr "Lesen von externem Filter '%s' fehlgeschlagen." +msgstr "Lesen von externem Filter '%s' fehlgeschlagen" #: convert.c:733 convert.c:788 #, c-format msgid "external filter '%s' failed" -msgstr "Externer Filter '%s' fehlgeschlagen." +msgstr "externer Filter '%s' fehlgeschlagen" #: convert.c:837 msgid "unexpected filter type" -msgstr "Unerwartete Filterart." +msgstr "unerwartete Filterart" #: convert.c:848 msgid "path name too long for external filter" -msgstr "Pfadname zu lang für externen Filter." +msgstr "Pfadname zu lang für externen Filter" #: convert.c:940 #, c-format @@ -3102,21 +3159,22 @@ msgid "" "external filter '%s' is not available anymore although not all paths have " "been filtered" msgstr "" -"Externer Filter '%s' nicht mehr verfügbar. Nicht alle Pfade wurden gefiltert." +"externer Filter '%s' nicht mehr verfügbar, obwohl nicht alle Pfade gefiltert " +"wurden" #: convert.c:1240 msgid "true/false are no valid working-tree-encodings" -msgstr "true/false sind keine gültigen Codierungen im Arbeitsverzeichnis." +msgstr "true/false sind keine gültigen Codierungen im Arbeitsverzeichnis" #: convert.c:1428 convert.c:1462 #, c-format msgid "%s: clean filter '%s' failed" -msgstr "%s: clean-Filter '%s' fehlgeschlagen." +msgstr "%s: clean-Filter '%s' fehlgeschlagen" #: convert.c:1508 #, c-format msgid "%s: smudge filter %s failed" -msgstr "%s: smudge-Filter '%s' fehlgeschlagen." +msgstr "%s: smudge-Filter '%s' fehlgeschlagen" #: credential.c:96 #, c-format @@ -3241,6 +3299,11 @@ msgstr "" msgid "Marked %d islands, done.\n" msgstr "%d Delta-Islands markiert, fertig.\n" +#: diff-merges.c:70 +#, c-format +msgid "unknown value for --diff-merges: %s" +msgstr "unbekannter Wert für --diff-merges: %s" + #: diff-lib.c:534 msgid "--merge-base does not work with ranges" msgstr "--merge-base funktioniert nicht mit Bereichen" @@ -3328,31 +3391,31 @@ msgstr "" msgid "external diff died, stopping at %s" msgstr "externes Diff-Programm unerwartet beendet, angehalten bei %s" -#: diff.c:4625 +#: diff.c:4628 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "" "--name-only, --name-status, --check und -s schließen sich gegenseitig aus" -#: diff.c:4628 +#: diff.c:4631 msgid "-G, -S and --find-object are mutually exclusive" msgstr "-G, -S und --find-object schließen sich gegenseitig aus" -#: diff.c:4707 +#: diff.c:4710 msgid "--follow requires exactly one pathspec" msgstr "--follow erfordert genau eine Pfadspezifikation" -#: diff.c:4755 +#: diff.c:4758 #, c-format msgid "invalid --stat value: %s" msgstr "Ungültiger --stat Wert: %s" -#: diff.c:4760 diff.c:4765 diff.c:4770 diff.c:4775 diff.c:5303 +#: diff.c:4763 diff.c:4768 diff.c:4773 diff.c:4778 diff.c:5306 #: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180 #, c-format msgid "%s expects a numerical value" msgstr "%s erwartet einen numerischen Wert." -#: diff.c:4792 +#: diff.c:4795 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -3361,42 +3424,42 @@ msgstr "" "Fehler beim Parsen des --dirstat/-X Optionsparameters:\n" "%s" -#: diff.c:4877 +#: diff.c:4880 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "unbekannte Änderungsklasse '%c' in --diff-filter=%s" -#: diff.c:4901 +#: diff.c:4904 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "unbekannter Wert nach ws-error-highlight=%.*s" -#: diff.c:4915 +#: diff.c:4918 #, c-format msgid "unable to resolve '%s'" msgstr "konnte '%s' nicht auflösen" -#: diff.c:4965 diff.c:4971 +#: diff.c:4968 diff.c:4974 #, c-format msgid "%s expects <n>/<m> form" msgstr "%s erwartet die Form <n>/<m>" -#: diff.c:4983 +#: diff.c:4986 #, c-format msgid "%s expects a character, got '%s'" msgstr "%s erwartet ein Zeichen, '%s' bekommen" -#: diff.c:5004 +#: diff.c:5007 #, c-format msgid "bad --color-moved argument: %s" msgstr "ungültiges --color-moved Argument: %s" -#: diff.c:5023 +#: diff.c:5026 #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "ungültiger Modus '%s' in --color-moved-ws" -#: diff.c:5063 +#: diff.c:5066 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" @@ -3404,157 +3467,157 @@ msgstr "" "Option diff-algorithm akzeptiert: \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" -#: diff.c:5099 diff.c:5119 +#: diff.c:5102 diff.c:5122 #, c-format msgid "invalid argument to %s" msgstr "ungültiges Argument für %s" -#: diff.c:5223 +#: diff.c:5226 #, c-format msgid "invalid regex given to -I: '%s'" msgstr "ungültiger regulärer Ausdruck für -I gegeben: '%s'" -#: diff.c:5272 +#: diff.c:5275 #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "Fehler beim Parsen des --submodule Optionsparameters: '%s'" -#: diff.c:5328 +#: diff.c:5331 #, c-format msgid "bad --word-diff argument: %s" msgstr "ungültiges --word-diff Argument: %s" -#: diff.c:5351 +#: diff.c:5367 msgid "Diff output format options" msgstr "Diff-Optionen zu Ausgabeformaten" -#: diff.c:5353 diff.c:5359 +#: diff.c:5369 diff.c:5375 msgid "generate patch" msgstr "Patch erzeugen" -#: diff.c:5356 builtin/log.c:178 +#: diff.c:5372 builtin/log.c:179 msgid "suppress diff output" msgstr "Ausgabe der Unterschiede unterdrücken" -#: diff.c:5361 diff.c:5475 diff.c:5482 +#: diff.c:5377 diff.c:5491 diff.c:5498 msgid "<n>" msgstr "<n>" -#: diff.c:5362 diff.c:5365 +#: diff.c:5378 diff.c:5381 msgid "generate diffs with <n> lines context" msgstr "Unterschiede mit <n> Zeilen des Kontextes erstellen" -#: diff.c:5367 +#: diff.c:5383 msgid "generate the diff in raw format" msgstr "Unterschiede im Rohformat erstellen" -#: diff.c:5370 +#: diff.c:5386 msgid "synonym for '-p --raw'" msgstr "Synonym für '-p --raw'" -#: diff.c:5374 +#: diff.c:5390 msgid "synonym for '-p --stat'" msgstr "Synonym für '-p --stat'" -#: diff.c:5378 +#: diff.c:5394 msgid "machine friendly --stat" msgstr "maschinenlesbare Ausgabe von --stat" -#: diff.c:5381 +#: diff.c:5397 msgid "output only the last line of --stat" msgstr "nur die letzte Zeile von --stat ausgeben" -#: diff.c:5383 diff.c:5391 +#: diff.c:5399 diff.c:5407 msgid "<param1,param2>..." msgstr "<Parameter1,Parameter2>..." -#: diff.c:5384 +#: diff.c:5400 msgid "" "output the distribution of relative amount of changes for each sub-directory" msgstr "" "die Verteilung des relativen Umfangs der Änderungen für jedes " "Unterverzeichnis ausgeben" -#: diff.c:5388 +#: diff.c:5404 msgid "synonym for --dirstat=cumulative" msgstr "Synonym für --dirstat=cumulative" -#: diff.c:5392 +#: diff.c:5408 msgid "synonym for --dirstat=files,param1,param2..." msgstr "Synonym für --dirstat=files,Parameter1,Parameter2..." -#: diff.c:5396 +#: diff.c:5412 msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "" "warnen, wenn Änderungen Konfliktmarker oder Whitespace-Fehler einbringen" -#: diff.c:5399 +#: diff.c:5415 msgid "condensed summary such as creations, renames and mode changes" msgstr "" "gekürzte Zusammenfassung, wie z.B. Erstellungen, Umbenennungen und " "Änderungen der Datei-Rechte" -#: diff.c:5402 +#: diff.c:5418 msgid "show only names of changed files" msgstr "nur Dateinamen der geänderten Dateien anzeigen" -#: diff.c:5405 +#: diff.c:5421 msgid "show only names and status of changed files" msgstr "nur Dateinamen und Status der geänderten Dateien anzeigen" -#: diff.c:5407 +#: diff.c:5423 msgid "<width>[,<name-width>[,<count>]]" msgstr "<Breite>[,<Namens-Breite>[,<Anzahl>]]" -#: diff.c:5408 +#: diff.c:5424 msgid "generate diffstat" msgstr "Zusammenfassung der Unterschiede erzeugen" -#: diff.c:5410 diff.c:5413 diff.c:5416 +#: diff.c:5426 diff.c:5429 diff.c:5432 msgid "<width>" msgstr "<Breite>" -#: diff.c:5411 +#: diff.c:5427 msgid "generate diffstat with a given width" msgstr "Zusammenfassung der Unterschiede mit gegebener Breite erzeugen" -#: diff.c:5414 +#: diff.c:5430 msgid "generate diffstat with a given name width" msgstr "Zusammenfassung der Unterschiede mit gegebener Namens-Breite erzeugen" -#: diff.c:5417 +#: diff.c:5433 msgid "generate diffstat with a given graph width" msgstr "Zusammenfassung der Unterschiede mit gegebener Graph-Breite erzeugen" -#: diff.c:5419 +#: diff.c:5435 msgid "<count>" msgstr "<Anzahl>" -#: diff.c:5420 +#: diff.c:5436 msgid "generate diffstat with limited lines" msgstr "Zusammenfassung der Unterschiede mit begrenzten Zeilen erzeugen" -#: diff.c:5423 +#: diff.c:5439 msgid "generate compact summary in diffstat" msgstr "kompakte Zusammenstellung in Zusammenfassung der Unterschiede erzeugen" -#: diff.c:5426 +#: diff.c:5442 msgid "output a binary diff that can be applied" msgstr "eine binäre Differenz ausgeben, dass angewendet werden kann" -#: diff.c:5429 +#: diff.c:5445 msgid "show full pre- and post-image object names on the \"index\" lines" msgstr "vollständige Objekt-Namen in den \"index\"-Zeilen anzeigen" -#: diff.c:5431 +#: diff.c:5447 msgid "show colored diff" msgstr "farbige Unterschiede anzeigen" -#: diff.c:5432 +#: diff.c:5448 msgid "<kind>" msgstr "<Art>" -#: diff.c:5433 +#: diff.c:5449 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" @@ -3562,7 +3625,7 @@ msgstr "" "Whitespace-Fehler in den Zeilen 'context', 'old' oder 'new' bei den " "Unterschieden hervorheben" -#: diff.c:5436 +#: diff.c:5452 msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or " "--numstat" @@ -3570,91 +3633,91 @@ msgstr "" "die Pfadnamen nicht verschleiern und NUL-Zeichen als Schlusszeichen in " "Ausgabefeldern bei --raw oder --numstat nutzen" -#: diff.c:5439 diff.c:5442 diff.c:5445 diff.c:5554 +#: diff.c:5455 diff.c:5458 diff.c:5461 diff.c:5570 msgid "<prefix>" msgstr "<Präfix>" -#: diff.c:5440 +#: diff.c:5456 msgid "show the given source prefix instead of \"a/\"" msgstr "den gegebenen Quell-Präfix statt \"a/\" anzeigen" -#: diff.c:5443 +#: diff.c:5459 msgid "show the given destination prefix instead of \"b/\"" msgstr "den gegebenen Ziel-Präfix statt \"b/\" anzeigen" -#: diff.c:5446 +#: diff.c:5462 msgid "prepend an additional prefix to every line of output" msgstr "einen zusätzlichen Präfix bei jeder Ausgabezeile voranstellen" -#: diff.c:5449 +#: diff.c:5465 msgid "do not show any source or destination prefix" msgstr "keine Quell- oder Ziel-Präfixe anzeigen" -#: diff.c:5452 +#: diff.c:5468 msgid "show context between diff hunks up to the specified number of lines" msgstr "" "Kontext zwischen Unterschied-Blöcken bis zur angegebenen Anzahl von Zeilen " "anzeigen" -#: diff.c:5456 diff.c:5461 diff.c:5466 +#: diff.c:5472 diff.c:5477 diff.c:5482 msgid "<char>" msgstr "<Zeichen>" -#: diff.c:5457 +#: diff.c:5473 msgid "specify the character to indicate a new line instead of '+'" msgstr "das Zeichen festlegen, das eine neue Zeile kennzeichnet (statt '+')" -#: diff.c:5462 +#: diff.c:5478 msgid "specify the character to indicate an old line instead of '-'" msgstr "das Zeichen festlegen, das eine alte Zeile kennzeichnet (statt '-')" -#: diff.c:5467 +#: diff.c:5483 msgid "specify the character to indicate a context instead of ' '" msgstr "das Zeichen festlegen, das den Kontext kennzeichnet (statt ' ')" -#: diff.c:5470 +#: diff.c:5486 msgid "Diff rename options" msgstr "Diff-Optionen zur Umbenennung" -#: diff.c:5471 +#: diff.c:5487 msgid "<n>[/<m>]" msgstr "<n>[/<m>]" -#: diff.c:5472 +#: diff.c:5488 msgid "break complete rewrite changes into pairs of delete and create" msgstr "" "teile komplette Rewrite-Änderungen in Änderungen mit \"löschen\" und " "\"erstellen\"" -#: diff.c:5476 +#: diff.c:5492 msgid "detect renames" msgstr "Umbenennungen erkennen" -#: diff.c:5480 +#: diff.c:5496 msgid "omit the preimage for deletes" msgstr "Preimage für Löschungen weglassen" -#: diff.c:5483 +#: diff.c:5499 msgid "detect copies" msgstr "Kopien erkennen" -#: diff.c:5487 +#: diff.c:5503 msgid "use unmodified files as source to find copies" msgstr "ungeänderte Dateien als Quelle zum Finden von Kopien nutzen" -#: diff.c:5489 +#: diff.c:5505 msgid "disable rename detection" msgstr "Erkennung von Umbenennungen deaktivieren" -#: diff.c:5492 +#: diff.c:5508 msgid "use empty blobs as rename source" msgstr "leere Blobs als Quelle von Umbenennungen nutzen" -#: diff.c:5494 +#: diff.c:5510 msgid "continue listing the history of a file beyond renames" msgstr "Auflistung der Historie einer Datei nach Umbenennung fortführen" -#: diff.c:5497 +#: diff.c:5513 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" @@ -3662,164 +3725,164 @@ msgstr "" "Erkennung von Umbenennungen und Kopien verhindern, wenn die Anzahl der Ziele " "für Umbenennungen und Kopien das gegebene Limit überschreitet" -#: diff.c:5499 +#: diff.c:5515 msgid "Diff algorithm options" msgstr "Diff Algorithmus-Optionen" -#: diff.c:5501 +#: diff.c:5517 msgid "produce the smallest possible diff" msgstr "die kleinstmöglichen Änderungen erzeugen" -#: diff.c:5504 +#: diff.c:5520 msgid "ignore whitespace when comparing lines" msgstr "Whitespace-Änderungen beim Vergleich von Zeilen ignorieren" -#: diff.c:5507 +#: diff.c:5523 msgid "ignore changes in amount of whitespace" msgstr "Änderungen bei der Anzahl von Whitespace ignorieren" -#: diff.c:5510 +#: diff.c:5526 msgid "ignore changes in whitespace at EOL" msgstr "Whitespace-Änderungen am Zeilenende ignorieren" -#: diff.c:5513 +#: diff.c:5529 msgid "ignore carrier-return at the end of line" msgstr "den Zeilenumbruch am Ende der Zeile ignorieren" -#: diff.c:5516 +#: diff.c:5532 msgid "ignore changes whose lines are all blank" msgstr "Änderungen in leeren Zeilen ignorieren" -#: diff.c:5518 diff.c:5540 diff.c:5543 diff.c:5588 +#: diff.c:5534 diff.c:5556 diff.c:5559 diff.c:5604 msgid "<regex>" msgstr "<Regex>" -#: diff.c:5519 +#: diff.c:5535 msgid "ignore changes whose all lines match <regex>" msgstr "" "Änderungen ignorieren, bei denen alle Zeilen mit <Regex> übereinstimmen" -#: diff.c:5522 +#: diff.c:5538 msgid "heuristic to shift diff hunk boundaries for easy reading" msgstr "" "Heuristik, um Grenzen der Änderungsblöcke für bessere Lesbarkeit zu " "verschieben" -#: diff.c:5525 +#: diff.c:5541 msgid "generate diff using the \"patience diff\" algorithm" msgstr "Änderungen durch Nutzung des Algorithmus \"Patience Diff\" erzeugen" -#: diff.c:5529 +#: diff.c:5545 msgid "generate diff using the \"histogram diff\" algorithm" msgstr "Änderungen durch Nutzung des Algorithmus \"Histogram Diff\" erzeugen" -#: diff.c:5531 +#: diff.c:5547 msgid "<algorithm>" msgstr "<Algorithmus>" -#: diff.c:5532 +#: diff.c:5548 msgid "choose a diff algorithm" msgstr "einen Algorithmus für Änderungen wählen" -#: diff.c:5534 +#: diff.c:5550 msgid "<text>" msgstr "<Text>" -#: diff.c:5535 +#: diff.c:5551 msgid "generate diff using the \"anchored diff\" algorithm" msgstr "Änderungen durch Nutzung des Algorithmus \"Anchored Diff\" erzeugen" -#: diff.c:5537 diff.c:5546 diff.c:5549 +#: diff.c:5553 diff.c:5562 diff.c:5565 msgid "<mode>" msgstr "<Modus>" -#: diff.c:5538 +#: diff.c:5554 msgid "show word diff, using <mode> to delimit changed words" msgstr "Wort-Änderungen zeigen, nutze <Modus>, um Wörter abzugrenzen" -#: diff.c:5541 +#: diff.c:5557 msgid "use <regex> to decide what a word is" msgstr "<Regex> nutzen, um zu entscheiden, was ein Wort ist" -#: diff.c:5544 +#: diff.c:5560 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" msgstr "entsprechend wie --word-diff=color --word-diff-regex=<Regex>" -#: diff.c:5547 +#: diff.c:5563 msgid "moved lines of code are colored differently" msgstr "verschobene Codezeilen sind andersfarbig" -#: diff.c:5550 +#: diff.c:5566 msgid "how white spaces are ignored in --color-moved" msgstr "wie Whitespaces in --color-moved ignoriert werden" -#: diff.c:5553 +#: diff.c:5569 msgid "Other diff options" msgstr "Andere Diff-Optionen" -#: diff.c:5555 +#: diff.c:5571 msgid "when run from subdir, exclude changes outside and show relative paths" msgstr "" "wenn vom Unterverzeichnis aufgerufen, schließe Änderungen außerhalb aus und " "zeige relative Pfade an" -#: diff.c:5559 +#: diff.c:5575 msgid "treat all files as text" msgstr "alle Dateien als Text behandeln" -#: diff.c:5561 +#: diff.c:5577 msgid "swap two inputs, reverse the diff" msgstr "die beiden Eingaben vertauschen und die Änderungen umkehren" -#: diff.c:5563 +#: diff.c:5579 msgid "exit with 1 if there were differences, 0 otherwise" msgstr "" "mit Exit-Status 1 beenden, wenn Änderungen vorhanden sind, andernfalls mit 0" -#: diff.c:5565 +#: diff.c:5581 msgid "disable all output of the program" msgstr "alle Ausgaben vom Programm deaktivieren" -#: diff.c:5567 +#: diff.c:5583 msgid "allow an external diff helper to be executed" msgstr "erlaube die Ausführung eines externes Programms für Änderungen" -#: diff.c:5569 +#: diff.c:5585 msgid "run external text conversion filters when comparing binary files" msgstr "" "Führe externe Text-Konvertierungsfilter aus, wenn binäre Dateien vergleicht " "werden" -#: diff.c:5571 +#: diff.c:5587 msgid "<when>" msgstr "<wann>" -#: diff.c:5572 +#: diff.c:5588 msgid "ignore changes to submodules in the diff generation" msgstr "" "Änderungen in Submodulen während der Erstellung der Unterschiede ignorieren" -#: diff.c:5575 +#: diff.c:5591 msgid "<format>" msgstr "<Format>" -#: diff.c:5576 +#: diff.c:5592 msgid "specify how differences in submodules are shown" msgstr "angeben, wie Unterschiede in Submodulen gezeigt werden" -#: diff.c:5580 +#: diff.c:5596 msgid "hide 'git add -N' entries from the index" msgstr "'git add -N' Einträge vom Index verstecken" -#: diff.c:5583 +#: diff.c:5599 msgid "treat 'git add -N' entries as real in the index" msgstr "'git add -N' Einträge im Index als echt behandeln" -#: diff.c:5585 +#: diff.c:5601 msgid "<string>" msgstr "<Zeichenkette>" -#: diff.c:5586 +#: diff.c:5602 msgid "" "look for differences that change the number of occurrences of the specified " "string" @@ -3827,7 +3890,7 @@ msgstr "" "nach Unterschieden suchen, welche die Anzahl des Vorkommens der angegebenen " "Zeichenkette verändern" -#: diff.c:5589 +#: diff.c:5605 msgid "" "look for differences that change the number of occurrences of the specified " "regex" @@ -3835,25 +3898,37 @@ msgstr "" "nach Unterschieden suchen, welche die Anzahl des Vorkommens des angegebenen " "regulären Ausdrucks verändern" -#: diff.c:5592 +#: diff.c:5608 msgid "show all changes in the changeset with -S or -G" msgstr "alle Änderungen im Changeset mit -S oder -G anzeigen" -#: diff.c:5595 +#: diff.c:5611 msgid "treat <string> in -S as extended POSIX regular expression" msgstr "" "<Zeichenkette> bei -S als erweiterten POSIX regulären Ausdruck behandeln" -#: diff.c:5598 +#: diff.c:5614 msgid "control the order in which files appear in the output" msgstr "" "die Reihenfolge kontrollieren, in der die Dateien in der Ausgabe erscheinen" -#: diff.c:5599 +#: diff.c:5615 diff.c:5618 +msgid "<path>" +msgstr "<Pfad>" + +#: diff.c:5616 +msgid "show the change in the specified path first" +msgstr "die Änderung des angegebenen Pfades zuerst anzeigen" + +#: diff.c:5619 +msgid "skip the output to the specified path" +msgstr "überspringe die Ausgabe bis zum angegebenen Pfad" + +#: diff.c:5621 msgid "<object-id>" msgstr "<Objekt-ID>" -#: diff.c:5600 +#: diff.c:5622 msgid "" "look for differences that change the number of occurrences of the specified " "object" @@ -3861,33 +3936,33 @@ msgstr "" "nach Unterschieden suchen, welche die Anzahl des Vorkommens des angegebenen " "Objektes verändern" -#: diff.c:5602 +#: diff.c:5624 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]" -#: diff.c:5603 +#: diff.c:5625 msgid "select files by diff type" msgstr "Dateien anhand der Art der Änderung wählen" -#: diff.c:5605 +#: diff.c:5627 msgid "<file>" msgstr "<Datei>" -#: diff.c:5606 +#: diff.c:5628 msgid "Output to a specific file" msgstr "Ausgabe zu einer bestimmten Datei" -#: diff.c:6263 +#: diff.c:6285 msgid "inexact rename detection was skipped due to too many files." msgstr "" "ungenaue Erkennung für Umbenennungen wurde aufgrund zu vieler Dateien\n" "übersprungen." -#: diff.c:6266 +#: diff.c:6288 msgid "only found copies from modified paths due to too many files." msgstr "nur Kopien von geänderten Pfaden, aufgrund zu vieler Dateien, gefunden" -#: diff.c:6269 +#: diff.c:6291 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." @@ -3900,10 +3975,15 @@ msgstr "" msgid "failed to read orderfile '%s'" msgstr "Fehler beim Lesen der Reihenfolgedatei '%s'" -#: diffcore-rename.c:592 +#: diffcore-rename.c:786 msgid "Performing inexact rename detection" msgstr "Führe Erkennung für ungenaue Umbenennung aus" +#: diffcore-rotate.c:29 +#, c-format +msgid "No such path '%s' in the diff" +msgstr "Pfad '%s' nicht im Diff gefunden" + #: dir.c:578 #, c-format msgid "pathspec '%s' did not match any file(s) known to git" @@ -3950,17 +4030,17 @@ msgstr "" "Cache für unversionierte Dateien ist auf diesem System oder\n" "für dieses Verzeichnis deaktiviert" -#: dir.c:3520 +#: dir.c:3534 #, c-format msgid "index file corrupt in repo %s" msgstr "Index-Datei in Repository %s beschädigt" -#: dir.c:3565 dir.c:3570 +#: dir.c:3579 dir.c:3584 #, c-format msgid "could not create directories for %s" msgstr "Konnte Verzeichnisse für '%s' nicht erstellen" -#: dir.c:3599 +#: dir.c:3613 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "Konnte Git-Verzeichnis nicht von '%s' nach '%s' migrieren" @@ -3979,12 +4059,12 @@ msgstr "Filtere Inhalt" msgid "could not stat file '%s'" msgstr "konnte Datei '%s' nicht lesen" -#: environment.c:150 +#: environment.c:152 #, c-format msgid "bad git namespace path \"%s\"" msgstr "ungültiger Git-Namespace-Pfad \"%s\"" -#: environment.c:337 +#: environment.c:335 #, c-format msgid "could not set GIT_DIR to '%s'" msgstr "konnte GIT_DIR nicht zu '%s' setzen" @@ -4019,32 +4099,32 @@ msgstr "konnte nicht zum Remote schreiben" msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc benötigt multi_ack_detailed" -#: fetch-pack.c:378 fetch-pack.c:1406 +#: fetch-pack.c:378 fetch-pack.c:1457 #, c-format msgid "invalid shallow line: %s" msgstr "ungültige shallow-Zeile: %s" -#: fetch-pack.c:384 fetch-pack.c:1412 +#: fetch-pack.c:384 fetch-pack.c:1463 #, c-format msgid "invalid unshallow line: %s" msgstr "ungültige unshallow-Zeile: %s" -#: fetch-pack.c:386 fetch-pack.c:1414 +#: fetch-pack.c:386 fetch-pack.c:1465 #, c-format msgid "object not found: %s" msgstr "Objekt nicht gefunden: %s" -#: fetch-pack.c:389 fetch-pack.c:1417 +#: fetch-pack.c:389 fetch-pack.c:1468 #, c-format msgid "error in object: %s" msgstr "Fehler in Objekt: %s" -#: fetch-pack.c:391 fetch-pack.c:1419 +#: fetch-pack.c:391 fetch-pack.c:1470 #, c-format msgid "no shallow found: %s" msgstr "kein shallow-Objekt gefunden: %s" -#: fetch-pack.c:394 fetch-pack.c:1423 +#: fetch-pack.c:394 fetch-pack.c:1474 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "shallow/unshallow erwartet, %s bekommen" @@ -4082,171 +4162,175 @@ msgstr "Markiere %s als vollständig" msgid "already have %s (%s)" msgstr "habe %s (%s) bereits" -#: fetch-pack.c:827 +#: fetch-pack.c:844 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-pack: Fehler beim Starten des sideband demultiplexer" -#: fetch-pack.c:835 +#: fetch-pack.c:852 msgid "protocol error: bad pack header" msgstr "Protokollfehler: ungültiger Pack-Header" -#: fetch-pack.c:919 +#: fetch-pack.c:946 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-pack: konnte %s nicht starten" -#: fetch-pack.c:937 +#: fetch-pack.c:952 +msgid "fetch-pack: invalid index-pack output" +msgstr "fetch-pack: ungültige index-pack Ausgabe" + +#: fetch-pack.c:969 #, c-format msgid "%s failed" msgstr "%s fehlgeschlagen" -#: fetch-pack.c:939 +#: fetch-pack.c:971 msgid "error in sideband demultiplexer" msgstr "Fehler in sideband demultiplexer" -#: fetch-pack.c:982 +#: fetch-pack.c:1031 #, c-format msgid "Server version is %.*s" msgstr "Server-Version ist %.*s" -#: fetch-pack.c:990 fetch-pack.c:996 fetch-pack.c:999 fetch-pack.c:1005 -#: fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017 fetch-pack.c:1021 -#: fetch-pack.c:1025 fetch-pack.c:1029 fetch-pack.c:1033 fetch-pack.c:1037 -#: fetch-pack.c:1043 fetch-pack.c:1049 fetch-pack.c:1054 fetch-pack.c:1059 +#: fetch-pack.c:1039 fetch-pack.c:1045 fetch-pack.c:1048 fetch-pack.c:1054 +#: fetch-pack.c:1058 fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 +#: fetch-pack.c:1074 fetch-pack.c:1078 fetch-pack.c:1082 fetch-pack.c:1086 +#: fetch-pack.c:1092 fetch-pack.c:1098 fetch-pack.c:1103 fetch-pack.c:1108 #, c-format msgid "Server supports %s" msgstr "Server unterstützt %s" -#: fetch-pack.c:992 +#: fetch-pack.c:1041 msgid "Server does not support shallow clients" msgstr "Server unterstützt keine shallow-Clients" -#: fetch-pack.c:1052 +#: fetch-pack.c:1101 msgid "Server does not support --shallow-since" msgstr "Server unterstützt kein --shallow-since" -#: fetch-pack.c:1057 +#: fetch-pack.c:1106 msgid "Server does not support --shallow-exclude" msgstr "Server unterstützt kein --shallow-exclude" -#: fetch-pack.c:1061 +#: fetch-pack.c:1110 msgid "Server does not support --deepen" msgstr "Server unterstützt kein --deepen" -#: fetch-pack.c:1063 +#: fetch-pack.c:1112 msgid "Server does not support this repository's object format" msgstr "Server unterstützt das Objekt-Format dieses Repositories nicht" -#: fetch-pack.c:1076 +#: fetch-pack.c:1125 msgid "no common commits" msgstr "keine gemeinsamen Commits" -#: fetch-pack.c:1088 fetch-pack.c:1628 +#: fetch-pack.c:1138 fetch-pack.c:1682 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack: Abholen fehlgeschlagen." -#: fetch-pack.c:1214 +#: fetch-pack.c:1265 #, c-format msgid "mismatched algorithms: client %s; server %s" msgstr "Algorithmen stimmen nicht überein: Client %s; Server %s" -#: fetch-pack.c:1218 +#: fetch-pack.c:1269 #, c-format msgid "the server does not support algorithm '%s'" msgstr "der Server unterstützt Algorithmus '%s' nicht" -#: fetch-pack.c:1238 +#: fetch-pack.c:1289 msgid "Server does not support shallow requests" msgstr "Server unterstützt keine shallow-Anfragen" -#: fetch-pack.c:1245 +#: fetch-pack.c:1296 msgid "Server supports filter" msgstr "Server unterstützt Filter" -#: fetch-pack.c:1284 +#: fetch-pack.c:1335 msgid "unable to write request to remote" msgstr "konnte Anfrage nicht zum Remote schreiben" -#: fetch-pack.c:1302 +#: fetch-pack.c:1353 #, c-format msgid "error reading section header '%s'" msgstr "Fehler beim Lesen von Sektionskopf '%s'." -#: fetch-pack.c:1308 +#: fetch-pack.c:1359 #, c-format msgid "expected '%s', received '%s'" msgstr "'%s' erwartet, '%s' empfangen" -#: fetch-pack.c:1369 +#: fetch-pack.c:1420 #, c-format msgid "unexpected acknowledgment line: '%s'" msgstr "Unerwartete Acknowledgment-Zeile: '%s'" -#: fetch-pack.c:1374 +#: fetch-pack.c:1425 #, c-format msgid "error processing acks: %d" msgstr "Fehler beim Verarbeiten von ACKS: %d" -#: fetch-pack.c:1384 +#: fetch-pack.c:1435 msgid "expected packfile to be sent after 'ready'" msgstr "Erwartete Versand einer Packdatei nach 'ready'." -#: fetch-pack.c:1386 +#: fetch-pack.c:1437 msgid "expected no other sections to be sent after no 'ready'" msgstr "Erwartete keinen Versand einer anderen Sektion ohne 'ready'." -#: fetch-pack.c:1428 +#: fetch-pack.c:1479 #, c-format msgid "error processing shallow info: %d" msgstr "Fehler beim Verarbeiten von Shallow-Informationen: %d" -#: fetch-pack.c:1475 +#: fetch-pack.c:1526 #, c-format msgid "expected wanted-ref, got '%s'" msgstr "wanted-ref erwartet, '%s' bekommen" -#: fetch-pack.c:1480 +#: fetch-pack.c:1531 #, c-format msgid "unexpected wanted-ref: '%s'" msgstr "unerwartetes wanted-ref: '%s'" -#: fetch-pack.c:1485 +#: fetch-pack.c:1536 #, c-format msgid "error processing wanted refs: %d" msgstr "Fehler beim Verarbeiten von wanted-refs: %d" -#: fetch-pack.c:1515 +#: fetch-pack.c:1566 msgid "git fetch-pack: expected response end packet" msgstr "git fetch-pack: Antwort-Endpaket erwartet" -#: fetch-pack.c:1897 +#: fetch-pack.c:1960 msgid "no matching remote head" msgstr "kein übereinstimmender Remote-Branch" -#: fetch-pack.c:1920 builtin/clone.c:693 +#: fetch-pack.c:1983 builtin/clone.c:693 msgid "remote did not send all necessary objects" msgstr "Remote-Repository hat nicht alle erforderlichen Objekte gesendet" -#: fetch-pack.c:1947 +#: fetch-pack.c:2010 #, c-format msgid "no such remote ref %s" -msgstr "keine solche Remote-Referenz %s" +msgstr "Remote-Referenz %s nicht gefunden" -#: fetch-pack.c:1950 +#: fetch-pack.c:2013 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "Der Server lehnt Anfrage nach nicht angebotenem Objekt %s ab." -#: gpg-interface.c:272 +#: gpg-interface.c:273 msgid "could not create temporary file" msgstr "konnte temporäre Datei nicht erstellen" -#: gpg-interface.c:275 +#: gpg-interface.c:276 #, c-format msgid "failed writing detached signature to '%s'" msgstr "Fehler beim Schreiben der losgelösten Signatur nach '%s'" -#: gpg-interface.c:457 +#: gpg-interface.c:470 msgid "gpg failed to sign the data" msgstr "gpg beim Signieren der Daten fehlgeschlagen" @@ -4255,7 +4339,7 @@ msgstr "gpg beim Signieren der Daten fehlgeschlagen" msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "Ignoriere ungültige Farbe '%.*s' in log.graphColors" -#: grep.c:640 +#: grep.c:543 msgid "" "given pattern contains NULL byte (via -f <file>). This is only supported " "with -P under PCRE v2" @@ -4263,18 +4347,18 @@ msgstr "" "Angegebenes Muster enthält NULL Byte (über -f <Datei>). Das wird nur mit -" "Punter PCRE v2 unterstützt." -#: grep.c:2100 +#: grep.c:1906 #, c-format msgid "'%s': unable to read %s" msgstr "'%s': konnte %s nicht lesen" -#: grep.c:2117 setup.c:176 builtin/clone.c:412 builtin/diff.c:89 +#: grep.c:1923 setup.c:176 builtin/clone.c:412 builtin/diff.c:90 #: builtin/rm.c:135 #, c-format msgid "failed to stat '%s'" msgstr "Konnte '%s' nicht lesen" -#: grep.c:2128 +#: grep.c:1934 #, c-format msgid "'%s': short read" msgstr "'%s': read() zu kurz" @@ -4344,7 +4428,7 @@ msgstr "Vorhandene Git-Befehle anderswo in Ihrem $PATH" msgid "These are common Git commands used in various situations:" msgstr "Allgemeine Git-Befehle, verwendet in verschiedenen Situationen:" -#: help.c:365 git.c:99 +#: help.c:365 git.c:100 #, c-format msgid "unsupported command listing type '%s'" msgstr "Nicht unterstützte Art zur Befehlsauflistung '%s'." @@ -4588,11 +4672,255 @@ msgstr "" msgid "Unable to create '%s.lock': %s" msgstr "Konnte '%s.lock' nicht erstellen: %s" -#: ls-refs.c:109 +#: ls-refs.c:37 +#, c-format +msgid "invalid value '%s' for lsrefs.unborn" +msgstr "ungültiger Wert '%s' für lsrefs.unborn" + +#: ls-refs.c:167 msgid "expected flush after ls-refs arguments" msgstr "erwartete Flush nach Argumenten für die Auflistung der Referenzen" -#: merge-ort-wrappers.c:13 merge-recursive.c:3672 +#: merge-ort.c:888 merge-recursive.c:1191 +#, c-format +msgid "Failed to merge submodule %s (not checked out)" +msgstr "Fehler beim Merge von Submodul %s (nicht ausgecheckt)." + +#: merge-ort.c:897 merge-recursive.c:1198 +#, c-format +msgid "Failed to merge submodule %s (commits not present)" +msgstr "Fehler beim Merge von Submodul %s (Commits nicht vorhanden)." + +#: merge-ort.c:906 merge-recursive.c:1205 +#, c-format +msgid "Failed to merge submodule %s (commits don't follow merge-base)" +msgstr "Fehler beim Merge von Submodul %s (Commits folgen keiner Merge-Basis)" + +#: merge-ort.c:916 merge-ort.c:923 +#, c-format +msgid "Note: Fast-forwarding submodule %s to %s" +msgstr "Hinweis: Spule Submodul %s vor zu %s" + +#: merge-ort.c:944 +#, c-format +msgid "Failed to merge submodule %s" +msgstr "Fehler beim Zusammenführen von Submodul %s" + +#: merge-ort.c:951 +#, c-format +msgid "" +"Failed to merge submodule %s, but a possible merge resolution exists:\n" +"%s\n" +msgstr "" +"Fehler beim Zusammenführen von Submodul %s, aber es ist eine mögliche " +"Auflösung des Merges vorhanden:\n" +"%s\n" + +#: merge-ort.c:955 merge-recursive.c:1259 +#, c-format +msgid "" +"If this is correct simply add it to the index for example\n" +"by using:\n" +"\n" +" git update-index --cacheinfo 160000 %s \"%s\"\n" +"\n" +"which will accept this suggestion.\n" +msgstr "" +"Falls das korrekt ist, fügen Sie es einfach der Staging-Area, zum Beispiel " +"mit:\n" +"\n" +" git update-index --cacheinfo 160000 %s \"%s\"\n" +"\n" +"hinzu, um diesen Vorschlag zu akzeptieren.\n" + +#: merge-ort.c:968 +#, c-format +msgid "" +"Failed to merge submodule %s, but multiple possible merges exist:\n" +"%s" +msgstr "" +"Fehler beim Zusammenführen von Submodul %s, aber mehrere mögliche Merges " +"sind vorhanden:\n" +"%s" + +#: merge-ort.c:1127 merge-recursive.c:1341 +msgid "Failed to execute internal merge" +msgstr "Fehler bei Ausführung des internen Merges" + +#: merge-ort.c:1132 merge-recursive.c:1346 +#, c-format +msgid "Unable to add %s to database" +msgstr "Konnte %s nicht zur Datenbank hinzufügen" + +#: merge-ort.c:1139 merge-recursive.c:1378 +#, c-format +msgid "Auto-merging %s" +msgstr "automatischer Merge von %s" + +#: merge-ort.c:1278 merge-recursive.c:2100 +#, c-format +msgid "" +"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " +"implicit directory rename(s) putting the following path(s) there: %s." +msgstr "" +"KONFLIKT (implizite Verzeichnisumbenennung): Existierende Datei/Pfad bei %s " +"im\n" +"Weg von impliziter Verzeichnisumbenennung, die versucht, einen oder mehrere\n" +"Pfade dahin zu setzen: %s." + +#: merge-ort.c:1288 merge-recursive.c:2110 +#, c-format +msgid "" +"CONFLICT (implicit dir rename): Cannot map more than one path to %s; " +"implicit directory renames tried to put these paths there: %s" +msgstr "" +"KONFLIKT (implizite Verzeichnisumbenennung): Kann nicht mehr als ein Pfad " +"zu\n" +"%s mappen; implizite Verzeichnisumbenennungen versuchten diese Pfade dahin\n" +"zu setzen: %s" + +#: merge-ort.c:1471 +#, c-format +msgid "" +"CONFLICT (directory rename split): Unclear where to rename %s to; it was " +"renamed to multiple other directories, with no destination getting a " +"majority of the files." +msgstr "" +"KONFLIKT (Aufteilung Verzeichnisumbenennung): Unklar, wo %s zu platzieren " +"ist; es wurde zu mehreren anderen Verzeichnissen umbenannt, ohne dass ein " +"Ziel die Mehrheit der Dateien erhält." + +#: merge-ort.c:1637 merge-recursive.c:2447 +#, c-format +msgid "" +"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " +"renamed." +msgstr "" +"WARNUNG: Vermeide Umbenennung %s -> %s von %s, weil %s selbst umbenannt " +"wurde." + +#: merge-ort.c:1781 merge-recursive.c:3215 +#, c-format +msgid "" +"Path updated: %s added in %s inside a directory that was renamed in %s; " +"moving it to %s." +msgstr "" +"Pfad aktualisiert: %s hinzugefügt in %s innerhalb eines Verzeichnisses, das " +"umbenannt wurde in %s; Verschiebe es nach %s." + +#: merge-ort.c:1788 merge-recursive.c:3222 +#, c-format +msgid "" +"Path updated: %s renamed to %s in %s, inside a directory that was renamed in " +"%s; moving it to %s." +msgstr "" +"Pfad aktualisiert: %s umbenannt nach %s in %s, innerhalb eines " +"Verzeichnisses, das umbenannt wurde in %s; Verschiebe es nach %s." + +#: merge-ort.c:1801 merge-recursive.c:3218 +#, c-format +msgid "" +"CONFLICT (file location): %s added in %s inside a directory that was renamed " +"in %s, suggesting it should perhaps be moved to %s." +msgstr "" +"KONFLIKT (Speicherort): %s hinzugefügt in %s innerhalb eines Verzeichnisses, " +"das umbenannt wurde in %s, es sollte vielleicht nach %s verschoben werden." + +#: merge-ort.c:1809 merge-recursive.c:3225 +#, c-format +msgid "" +"CONFLICT (file location): %s renamed to %s in %s, inside a directory that " +"was renamed in %s, suggesting it should perhaps be moved to %s." +msgstr "" +"KONFLIKT (Speicherort): %s umbenannt nach %s in %s, innerhalb eines " +"Verzeichnisses, das umbenannt wurde in %s, es sollte vielleicht nach %s " +"verschoben werden." + +#: merge-ort.c:1952 +#, c-format +msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s." +msgstr "" +"KONFLIKT (umbenennen/umbenennen): %s zu %s in %s umbenannt und zu %s in %s." + +#: merge-ort.c:2047 +#, c-format +msgid "" +"CONFLICT (rename involved in collision): rename of %s -> %s has content " +"conflicts AND collides with another path; this may result in nested conflict " +"markers." +msgstr "" +"KONFLIKT (Umbenennung in Kollision beteiligt): Umbenennung von %s -> %s hat " +"Inhaltskonflikte UND kollidiert mit einem anderen Pfad; dies kann zu " +"verschachtelten Konfliktmarkierungen führen." + +#: merge-ort.c:2066 merge-ort.c:2090 +#, c-format +msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s." +msgstr "" +"KONFLIKT (umbenennen/löschen): %s zu %s in %s umbenannt, aber in %s gelöscht." + +#: merge-ort.c:2735 +#, c-format +msgid "" +"CONFLICT (file/directory): directory in the way of %s from %s; moving it to " +"%s instead." +msgstr "" +"KONFLIKT (Datei/Verzeichnis): Verzeichnis im Weg von %s aus %s; stattdessen " +"nach %s verschieben." + +#: merge-ort.c:2808 +#, c-format +msgid "" +"CONFLICT (distinct types): %s had different types on each side; renamed %s " +"of them so each can be recorded somewhere." +msgstr "" +"KONFLIKT (verschiedene Typen): %s hatte unterschiedliche Typen auf jeder " +"Seite; %s wurde(n) umbenannt, damit jeder irgendwo aufgezeichnet werden kann." + +#: merge-ort.c:2812 +msgid "both" +msgstr "beide" + +#: merge-ort.c:2812 +msgid "one" +msgstr "einer" + +#: merge-ort.c:2907 merge-recursive.c:3052 +msgid "content" +msgstr "Inhalt" + +#: merge-ort.c:2909 merge-recursive.c:3056 +msgid "add/add" +msgstr "hinzufügen/hinzufügen" + +#: merge-ort.c:2911 merge-recursive.c:3101 +msgid "submodule" +msgstr "Submodul" + +#: merge-ort.c:2913 merge-recursive.c:3102 +#, c-format +msgid "CONFLICT (%s): Merge conflict in %s" +msgstr "KONFLIKT (%s): Merge-Konflikt in %s" + +#: merge-ort.c:2938 +#, c-format +msgid "" +"CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s " +"of %s left in tree." +msgstr "" +"KONFLIKT (ändern/löschen): %s gelöscht in %s und geändert in %s. Stand %s " +"von %s wurde im Arbeitsbereich gelassen." + +#. TRANSLATORS: The %s arguments are: 1) tree hash of a merge +#. base, and 2-3) the trees for the two trees we're merging. +#. +#: merge-ort.c:3406 +#, c-format +msgid "collecting merge info failed for trees %s, %s, %s" +msgstr "" +"Sammeln von Merge-Informationen für die Referenzen %s, %s, %s fehlgeschlagen" + +#: merge-ort-wrappers.c:13 merge-recursive.c:3661 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -4667,21 +4995,6 @@ msgstr "Fehler beim Erstellen einer symbolischen Verknüpfung für '%s': %s" msgid "do not know what to do with %06o %s '%s'" msgstr "weiß nicht was mit %06o %s '%s' zu machen ist" -#: merge-recursive.c:1191 -#, c-format -msgid "Failed to merge submodule %s (not checked out)" -msgstr "Fehler beim Merge von Submodul %s (nicht ausgecheckt)." - -#: merge-recursive.c:1198 -#, c-format -msgid "Failed to merge submodule %s (commits not present)" -msgstr "Fehler beim Merge von Submodul %s (Commits nicht vorhanden)." - -#: merge-recursive.c:1205 -#, c-format -msgid "Failed to merge submodule %s (commits don't follow merge-base)" -msgstr "Fehler beim Merge von Submodul %s (Commits folgen keiner Merge-Basis)" - #: merge-recursive.c:1213 merge-recursive.c:1225 #, c-format msgid "Fast-forwarding submodule %s to the following commit:" @@ -4708,42 +5021,11 @@ msgstr "Fehler beim Merge von Submodul %s (kein Vorspulen)" msgid "Found a possible merge resolution for the submodule:\n" msgstr "Mögliche Auflösung des Merges für Submodul gefunden:\n" -#: merge-recursive.c:1259 -#, c-format -msgid "" -"If this is correct simply add it to the index for example\n" -"by using:\n" -"\n" -" git update-index --cacheinfo 160000 %s \"%s\"\n" -"\n" -"which will accept this suggestion.\n" -msgstr "" -"Falls das korrekt ist, fügen Sie es einfach der Staging-Area, zum Beispiel " -"mit:\n" -"\n" -" git update-index --cacheinfo 160000 %s \"%s\"\n" -"\n" -"hinzu, um diesen Vorschlag zu akzeptieren.\n" - #: merge-recursive.c:1268 #, c-format msgid "Failed to merge submodule %s (multiple merges found)" msgstr "Fehler beim Merge von Submodul %s (mehrere Merges gefunden)" -#: merge-recursive.c:1341 -msgid "Failed to execute internal merge" -msgstr "Fehler bei Ausführung des internen Merges" - -#: merge-recursive.c:1346 -#, c-format -msgid "Unable to add %s to database" -msgstr "Konnte %s nicht zur Datenbank hinzufügen" - -#: merge-recursive.c:1378 -#, c-format -msgid "Auto-merging %s" -msgstr "automatischer Merge von %s" - #: merge-recursive.c:1402 #, c-format msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." @@ -4859,28 +5141,6 @@ msgstr "" "wobei\n" "keines dieser Ziele die Mehrheit der Dateien erhielt." -#: merge-recursive.c:2100 -#, c-format -msgid "" -"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " -"implicit directory rename(s) putting the following path(s) there: %s." -msgstr "" -"KONFLIKT (implizite Verzeichnisumbenennung): Existierende Datei/Pfad bei %s " -"im\n" -"Weg von impliziter Verzeichnisumbenennung, die versucht, einen oder mehrere\n" -"Pfade dahin zu setzen: %s." - -#: merge-recursive.c:2110 -#, c-format -msgid "" -"CONFLICT (implicit dir rename): Cannot map more than one path to %s; " -"implicit directory renames tried to put these paths there: %s" -msgstr "" -"KONFLIKT (implizite Verzeichnisumbenennung): Kann nicht mehr als ein Pfad " -"zu\n" -"%s mappen; implizite Verzeichnisumbenennungen versuchten diese Pfade dahin\n" -"zu setzen: %s" - #: merge-recursive.c:2202 #, c-format msgid "" @@ -4890,15 +5150,6 @@ msgstr "" "KONFLIKT (umbenennen/umbenennen): Benenne Verzeichnis um %s->%s in %s.\n" "Benenne Verzeichnis um %s->%s in %s" -#: merge-recursive.c:2447 -#, c-format -msgid "" -"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " -"renamed." -msgstr "" -"WARNUNG: Vermeide Umbenennung %s -> %s von %s, weil %s selbst umbenannt " -"wurde." - #: merge-recursive.c:2973 #, c-format msgid "cannot read object %s" @@ -4917,70 +5168,16 @@ msgstr "ändern" msgid "modified" msgstr "geändert" -#: merge-recursive.c:3052 -msgid "content" -msgstr "Inhalt" - -#: merge-recursive.c:3056 -msgid "add/add" -msgstr "hinzufügen/hinzufügen" - #: merge-recursive.c:3079 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "%s ausgelassen (Ergebnis des Merges existiert bereits)" -#: merge-recursive.c:3101 -msgid "submodule" -msgstr "Submodul" - -#: merge-recursive.c:3102 -#, c-format -msgid "CONFLICT (%s): Merge conflict in %s" -msgstr "KONFLIKT (%s): Merge-Konflikt in %s" - #: merge-recursive.c:3132 #, c-format msgid "Adding as %s instead" msgstr "Füge stattdessen als %s hinzu" -#: merge-recursive.c:3215 -#, c-format -msgid "" -"Path updated: %s added in %s inside a directory that was renamed in %s; " -"moving it to %s." -msgstr "" -"Pfad aktualisiert: %s hinzugefügt in %s innerhalb eines Verzeichnisses, das " -"umbenannt wurde in %s; Verschiebe es nach %s." - -#: merge-recursive.c:3218 -#, c-format -msgid "" -"CONFLICT (file location): %s added in %s inside a directory that was renamed " -"in %s, suggesting it should perhaps be moved to %s." -msgstr "" -"KONFLIKT (Speicherort): %s hinzugefügt in %s innerhalb eines Verzeichnisses, " -"das umbenannt wurde in %s, es sollte vielleicht nach %s verschoben werden." - -#: merge-recursive.c:3222 -#, c-format -msgid "" -"Path updated: %s renamed to %s in %s, inside a directory that was renamed in " -"%s; moving it to %s." -msgstr "" -"Pfad aktualisiert: %s umbenannt nach %s in %s, innerhalb eines " -"Verzeichnisses, das umbenannt wurde in %s; Verschiebe es nach %s." - -#: merge-recursive.c:3225 -#, c-format -msgid "" -"CONFLICT (file location): %s renamed to %s in %s, inside a directory that " -"was renamed in %s, suggesting it should perhaps be moved to %s." -msgstr "" -"KONFLIKT (Speicherort): %s umbenannt nach %s in %s, innerhalb eines " -"Verzeichnisses, das umbenannt wurde in %s, es sollte vielleicht nach %s " -"verschoben werden." - #: merge-recursive.c:3339 #, c-format msgid "Removing %s" @@ -5016,27 +5213,28 @@ msgstr "KONFLIKT (hinzufügen/hinzufügen): Merge-Konflikt in %s" msgid "merging of trees %s and %s failed" msgstr "Zusammenführen der \"Tree\"-Objekte %s und %s fehlgeschlagen" -#: merge-recursive.c:3550 +#: merge-recursive.c:3539 msgid "Merging:" msgstr "Merge:" -#: merge-recursive.c:3563 +#: merge-recursive.c:3552 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "%u gemeinsamen Vorgänger-Commit gefunden" msgstr[1] "%u gemeinsame Vorgänger-Commits gefunden" -#: merge-recursive.c:3613 +#: merge-recursive.c:3602 msgid "merge returned no commit" msgstr "Merge hat keinen Commit zurückgegeben" -#: merge-recursive.c:3769 +#: merge-recursive.c:3758 #, c-format msgid "Could not parse object '%s'" msgstr "Konnte Objekt '%s' nicht parsen." -#: merge-recursive.c:3787 builtin/merge.c:711 builtin/merge.c:895 +#: merge-recursive.c:3776 builtin/merge.c:712 builtin/merge.c:896 +#: builtin/stash.c:471 msgid "Unable to write index." msgstr "Konnte Index nicht schreiben." @@ -5044,118 +5242,110 @@ msgstr "Konnte Index nicht schreiben." msgid "failed to read the cache" msgstr "Lesen des Zwischenspeichers fehlgeschlagen" -#: merge.c:109 rerere.c:720 builtin/am.c:1883 builtin/am.c:1917 -#: builtin/checkout.c:573 builtin/checkout.c:829 builtin/clone.c:817 +#: merge.c:109 rerere.c:704 builtin/am.c:1883 builtin/am.c:1917 +#: builtin/checkout.c:575 builtin/checkout.c:828 builtin/clone.c:817 #: builtin/stash.c:265 msgid "unable to write new index file" msgstr "Konnte neue Index-Datei nicht schreiben." -#: midx.c:80 +#: midx.c:62 +msgid "multi-pack-index OID fanout is of the wrong size" +msgstr "multi-pack-index OID fanout hat die falsche Größe" + +#: midx.c:93 #, c-format msgid "multi-pack-index file %s is too small" msgstr "multi-pack-index-Datei %s ist zu klein." -#: midx.c:96 +#: midx.c:109 #, c-format msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x" msgstr "" "multi-pack-index-Signatur 0x%08x stimmt nicht mit Signatur 0x%08x überein." -#: midx.c:101 +#: midx.c:114 #, c-format msgid "multi-pack-index version %d not recognized" msgstr "multi-pack-index-Version %d nicht erkannt." -#: midx.c:106 +#: midx.c:119 #, c-format msgid "multi-pack-index hash version %u does not match version %u" msgstr "multi-pack-index Hash-Version %u stimmt nicht mit Version %u überein" -#: midx.c:123 -msgid "invalid chunk offset (too large)" -msgstr "Ungültiger Chunk-Offset (zu groß)" - -#: midx.c:147 -msgid "terminating multi-pack-index chunk id appears earlier than expected" -msgstr "Abschließende multi-pack-index Chunk-Id erscheint eher als erwartet." - -#: midx.c:160 +#: midx.c:136 msgid "multi-pack-index missing required pack-name chunk" -msgstr "multi-pack-index fehlt erforderlicher pack-name Chunk." +msgstr "multi-pack-index fehlt erforderlicher Pack-Namen Chunk" -#: midx.c:162 +#: midx.c:138 msgid "multi-pack-index missing required OID fanout chunk" -msgstr "multi-pack-index fehlt erforderlicher OID fanout Chunk." +msgstr "multi-pack-index fehlt erforderlicher OID fanout Chunk" -#: midx.c:164 +#: midx.c:140 msgid "multi-pack-index missing required OID lookup chunk" -msgstr "multi-pack-index fehlt erforderlicher OID lookup Chunk." +msgstr "multi-pack-index fehlt erforderlicher OID lookup Chunk" -#: midx.c:166 +#: midx.c:142 msgid "multi-pack-index missing required object offsets chunk" -msgstr "multi-pack-index fehlt erforderlicher object offset Chunk." +msgstr "multi-pack-index fehlt erforderlicher Objekt offset Chunk" -#: midx.c:180 +#: midx.c:158 #, c-format msgid "multi-pack-index pack names out of order: '%s' before '%s'" msgstr "Falsche Reihenfolge bei multi-pack-index Pack-Namen: '%s' vor '%s'" -#: midx.c:223 +#: midx.c:202 #, c-format msgid "bad pack-int-id: %u (%u total packs)" msgstr "Ungültige pack-int-id: %u (%u Pakete insgesamt)" -#: midx.c:273 +#: midx.c:252 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" msgstr "" -"multi-pack-index speichert einen 64-Bit Offset, aber off_t ist zu klein." +"multi-pack-index speichert einen 64-Bit Offset, aber off_t ist zu klein" -#: midx.c:480 +#: midx.c:467 #, c-format msgid "failed to add packfile '%s'" -msgstr "Fehler beim Hinzufügen von Packdatei '%s'." +msgstr "Fehler beim Hinzufügen von Packdatei '%s'" -#: midx.c:486 +#: midx.c:473 #, c-format msgid "failed to open pack-index '%s'" msgstr "Fehler beim Öffnen von pack-index '%s'" -#: midx.c:546 +#: midx.c:533 #, c-format msgid "failed to locate object %d in packfile" -msgstr "Fehler beim Lokalisieren von Objekt %d in Packdatei." +msgstr "Fehler beim Lokalisieren von Objekt %d in Packdatei" -#: midx.c:846 +#: midx.c:821 msgid "Adding packfiles to multi-pack-index" msgstr "Packdateien zum multi-pack-index hinzufügen" -#: midx.c:879 +#: midx.c:855 #, c-format msgid "did not see pack-file %s to drop" msgstr "Pack-Datei %s zum Weglassen nicht gefunden" -#: midx.c:931 +#: midx.c:904 msgid "no pack files to index." msgstr "keine Packdateien zum Indizieren." -#: midx.c:982 -msgid "Writing chunks to multi-pack-index" -msgstr "Chunks zum multi-pack-index schreiben" - -#: midx.c:1060 +#: midx.c:965 #, c-format msgid "failed to clear multi-pack-index at %s" msgstr "Fehler beim Löschen des multi-pack-index bei %s" -#: midx.c:1116 +#: midx.c:1021 msgid "multi-pack-index file exists, but failed to parse" msgstr "multi-pack-index-Datei existiert, aber das Parsen schlug fehl" -#: midx.c:1124 +#: midx.c:1029 msgid "Looking for referenced packfiles" msgstr "Suche nach referenzierten Pack-Dateien" -#: midx.c:1139 +#: midx.c:1044 #, c-format msgid "" "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" @@ -5163,69 +5353,69 @@ msgstr "" "Ungültige oid fanout Reihenfolge: fanout[%d] = %<PRIx32> > %<PRIx32> = " "fanout[%d]" -#: midx.c:1144 +#: midx.c:1049 msgid "the midx contains no oid" msgstr "das midx enthält keine oid" -#: midx.c:1153 +#: midx.c:1058 msgid "Verifying OID order in multi-pack-index" msgstr "Verifiziere OID-Reihenfolge im multi-pack-index" -#: midx.c:1162 +#: midx.c:1067 #, c-format msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" msgstr "Ungültige oid lookup Reihenfolge: oid[%d] = %s >= %s = oid[%d]" -#: midx.c:1182 +#: midx.c:1087 msgid "Sorting objects by packfile" msgstr "Sortiere Objekte nach Pack-Datei" -#: midx.c:1189 +#: midx.c:1094 msgid "Verifying object offsets" msgstr "Überprüfe Objekt-Offsets" -#: midx.c:1205 +#: midx.c:1110 #, c-format msgid "failed to load pack entry for oid[%d] = %s" msgstr "Fehler beim Laden des Pack-Eintrags für oid[%d] = %s" -#: midx.c:1211 +#: midx.c:1116 #, c-format msgid "failed to load pack-index for packfile %s" msgstr "Fehler beim Laden des Pack-Index für Packdatei %s" -#: midx.c:1220 +#: midx.c:1125 #, c-format msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>" msgstr "Falscher Objekt-Offset für oid[%d] = %s: %<PRIx64> != %<PRIx64>" -#: midx.c:1245 +#: midx.c:1150 msgid "Counting referenced objects" msgstr "Referenzierte Objekte zählen" -#: midx.c:1255 +#: midx.c:1160 msgid "Finding and deleting unreferenced packfiles" msgstr "Suchen und Löschen von unreferenzierten Pack-Dateien" -#: midx.c:1446 +#: midx.c:1351 msgid "could not start pack-objects" msgstr "Konnte 'pack-objects' nicht ausführen" -#: midx.c:1466 +#: midx.c:1371 msgid "could not finish pack-objects" msgstr "Konnte 'pack-objects' nicht beenden" -#: name-hash.c:537 +#: name-hash.c:538 #, c-format msgid "unable to create lazy_dir thread: %s" msgstr "Kann lazy_dir Thread nicht erzeugen: %s" -#: name-hash.c:559 +#: name-hash.c:560 #, c-format msgid "unable to create lazy_name thread: %s" msgstr "Kann lazy_name Thread nicht erzeugen: %s" -#: name-hash.c:565 +#: name-hash.c:566 #, c-format msgid "unable to join lazy_name thread: %s" msgstr "Kann lazy_name Thread nicht beitreten: %s" @@ -5275,6 +5465,370 @@ msgstr "" msgid "Bad %s value: '%s'" msgstr "Ungültiger %s Wert: '%s'" +#: object-file.c:480 +#, c-format +msgid "object directory %s does not exist; check .git/objects/info/alternates" +msgstr "" +"Objektverzeichnis %s existiert nicht; prüfe .git/objects/info/alternates" + +#: object-file.c:531 +#, c-format +msgid "unable to normalize alternate object path: %s" +msgstr "Konnte alternativen Objektpfad '%s' nicht normalisieren." + +#: object-file.c:603 +#, c-format +msgid "%s: ignoring alternate object stores, nesting too deep" +msgstr "%s: ignoriere alternative Objektspeicher - Verschachtelung zu tief" + +#: object-file.c:610 +#, c-format +msgid "unable to normalize object directory: %s" +msgstr "Konnte Objektverzeichnis '%s' nicht normalisieren." + +#: object-file.c:653 +msgid "unable to fdopen alternates lockfile" +msgstr "Konnte fdopen nicht auf Lock-Datei für \"alternates\" aufrufen." + +#: object-file.c:671 +msgid "unable to read alternates file" +msgstr "Konnte \"alternates\"-Datei nicht lesen." + +#: object-file.c:678 +msgid "unable to move new alternates file into place" +msgstr "Konnte neue \"alternates\"-Datei nicht übernehmen." + +#: object-file.c:713 +#, c-format +msgid "path '%s' does not exist" +msgstr "Pfad '%s' existiert nicht" + +#: object-file.c:734 +#, c-format +msgid "reference repository '%s' as a linked checkout is not supported yet." +msgstr "" +"Referenziertes Repository '%s' wird noch nicht als verknüpftes\n" +"Arbeitsverzeichnis unterstützt." + +#: object-file.c:740 +#, c-format +msgid "reference repository '%s' is not a local repository." +msgstr "Referenziertes Repository '%s' ist kein lokales Repository." + +#: object-file.c:746 +#, c-format +msgid "reference repository '%s' is shallow" +msgstr "" +"Referenziertes Repository '%s' hat eine unvollständige Historie (shallow)." + +#: object-file.c:754 +#, c-format +msgid "reference repository '%s' is grafted" +msgstr "" +"Referenziertes Repository '%s' ist mit künstlichen Vorgängern (\"grafts\") " +"eingehängt." + +#: object-file.c:814 +#, c-format +msgid "invalid line while parsing alternate refs: %s" +msgstr "Ungültige Zeile beim Parsen alternativer Referenzen: %s" + +#: object-file.c:964 +#, c-format +msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" +msgstr "Versuche mmap %<PRIuMAX> über Limit %<PRIuMAX>." + +#: object-file.c:985 +msgid "mmap failed" +msgstr "mmap fehlgeschlagen" + +#: object-file.c:1149 +#, c-format +msgid "object file %s is empty" +msgstr "Objektdatei %s ist leer." + +#: object-file.c:1284 object-file.c:2477 +#, c-format +msgid "corrupt loose object '%s'" +msgstr "Fehlerhaftes loses Objekt '%s'." + +#: object-file.c:1286 object-file.c:2481 +#, c-format +msgid "garbage at end of loose object '%s'" +msgstr "Nutzlose Daten am Ende von losem Objekt '%s'." + +#: object-file.c:1328 +msgid "invalid object type" +msgstr "ungültiger Objekt-Typ" + +#: object-file.c:1412 +#, c-format +msgid "unable to unpack %s header with --allow-unknown-type" +msgstr "Konnte %s Kopfbereich nicht mit --allow-unknown-type entpacken." + +#: object-file.c:1415 +#, c-format +msgid "unable to unpack %s header" +msgstr "Konnte %s Kopfbereich nicht entpacken." + +#: object-file.c:1421 +#, c-format +msgid "unable to parse %s header with --allow-unknown-type" +msgstr "Konnte %s Kopfbereich mit --allow-unknown-type nicht parsen." + +#: object-file.c:1424 +#, c-format +msgid "unable to parse %s header" +msgstr "Konnte %s Kopfbereich nicht parsen." + +#: object-file.c:1651 +#, c-format +msgid "failed to read object %s" +msgstr "Konnte Objekt %s nicht lesen." + +#: object-file.c:1655 +#, c-format +msgid "replacement %s not found for %s" +msgstr "Ersetzung %s für %s nicht gefunden." + +#: object-file.c:1659 +#, c-format +msgid "loose object %s (stored in %s) is corrupt" +msgstr "Loses Objekt %s (gespeichert in %s) ist beschädigt." + +#: object-file.c:1663 +#, c-format +msgid "packed object %s (stored in %s) is corrupt" +msgstr "Gepacktes Objekt %s (gespeichert in %s) ist beschädigt." + +#: object-file.c:1768 +#, c-format +msgid "unable to write file %s" +msgstr "Konnte Datei %s nicht schreiben." + +#: object-file.c:1775 +#, c-format +msgid "unable to set permission to '%s'" +msgstr "Konnte Zugriffsberechtigung auf '%s' nicht setzen." + +#: object-file.c:1782 +msgid "file write error" +msgstr "Fehler beim Schreiben einer Datei." + +#: object-file.c:1802 +msgid "error when closing loose object file" +msgstr "Fehler beim Schließen der Datei für lose Objekte." + +#: object-file.c:1867 +#, c-format +msgid "insufficient permission for adding an object to repository database %s" +msgstr "" +"Unzureichende Berechtigung zum Hinzufügen eines Objektes zur Repository-" +"Datenbank %s" + +#: object-file.c:1869 +msgid "unable to create temporary file" +msgstr "Konnte temporäre Datei nicht erstellen." + +#: object-file.c:1893 +msgid "unable to write loose object file" +msgstr "Fehler beim Schreiben der Datei für lose Objekte." + +#: object-file.c:1899 +#, c-format +msgid "unable to deflate new object %s (%d)" +msgstr "Konnte neues Objekt %s (%d) nicht komprimieren." + +#: object-file.c:1903 +#, c-format +msgid "deflateEnd on object %s failed (%d)" +msgstr "deflateEnd auf Objekt %s fehlgeschlagen (%d)" + +#: object-file.c:1907 +#, c-format +msgid "confused by unstable object source data for %s" +msgstr "Fehler wegen instabilen Objektquelldaten für %s" + +#: object-file.c:1917 builtin/pack-objects.c:1097 +#, c-format +msgid "failed utime() on %s" +msgstr "Fehler beim Aufruf von utime() auf '%s'." + +#: object-file.c:1994 +#, c-format +msgid "cannot read object for %s" +msgstr "Kann Objekt für %s nicht lesen." + +#: object-file.c:2045 +msgid "corrupt commit" +msgstr "fehlerhafter Commit" + +#: object-file.c:2053 +msgid "corrupt tag" +msgstr "fehlerhaftes Tag" + +#: object-file.c:2153 +#, c-format +msgid "read error while indexing %s" +msgstr "Lesefehler beim Indizieren von '%s'." + +#: object-file.c:2156 +#, c-format +msgid "short read while indexing %s" +msgstr "read() zu kurz beim Indizieren von '%s'." + +#: object-file.c:2229 object-file.c:2239 +#, c-format +msgid "%s: failed to insert into database" +msgstr "%s: Fehler beim Einfügen in die Datenbank" + +#: object-file.c:2245 +#, c-format +msgid "%s: unsupported file type" +msgstr "%s: nicht unterstützte Dateiart" + +#: object-file.c:2269 +#, c-format +msgid "%s is not a valid object" +msgstr "%s ist kein gültiges Objekt" + +#: object-file.c:2271 +#, c-format +msgid "%s is not a valid '%s' object" +msgstr "%s ist kein gültiges '%s' Objekt" + +#: object-file.c:2298 builtin/index-pack.c:192 +#, c-format +msgid "unable to open %s" +msgstr "kann %s nicht öffnen" + +#: object-file.c:2488 object-file.c:2541 +#, c-format +msgid "hash mismatch for %s (expected %s)" +msgstr "Hash für %s stimmt nicht überein (%s erwartet)." + +#: object-file.c:2512 +#, c-format +msgid "unable to mmap %s" +msgstr "Konnte mmap nicht auf %s ausführen." + +#: object-file.c:2517 +#, c-format +msgid "unable to unpack header of %s" +msgstr "Konnte Kopfbereich von %s nicht entpacken." + +#: object-file.c:2523 +#, c-format +msgid "unable to parse header of %s" +msgstr "Konnte Kopfbereich von %s nicht parsen." + +#: object-file.c:2534 +#, c-format +msgid "unable to unpack contents of %s" +msgstr "Konnte Inhalt von %s nicht entpacken." + +#: object-name.c:486 +#, c-format +msgid "short object ID %s is ambiguous" +msgstr "kurze Objekt-ID %s ist mehrdeutig" + +#: object-name.c:497 +msgid "The candidates are:" +msgstr "Die Kandidaten sind:" + +#: object-name.c:796 +msgid "" +"Git normally never creates a ref that ends with 40 hex characters\n" +"because it will be ignored when you just specify 40-hex. These refs\n" +"may be created by mistake. For example,\n" +"\n" +" git switch -c $br $(git rev-parse ...)\n" +"\n" +"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n" +"examine these refs and maybe delete them. Turn this message off by\n" +"running \"git config advice.objectNameWarning false\"" +msgstr "" +"Git erzeugt normalerweise keine Referenzen die mit\n" +"40 Hex-Zeichen enden, da diese ignoriert werden wenn\n" +"Sie diese angeben. Diese Referenzen könnten aus Versehen\n" +"erzeugt worden sein. Zum Beispiel,\n" +"\n" +" git switch -c $br $(git rev-parse ...)\n" +"\n" +"wobei \"$br\" leer ist und eine 40-Hex-Referenz erzeugt\n" +"wurde. Bitte prüfen Sie diese Referenzen und löschen\n" +"Sie sie gegebenenfalls. Unterdrücken Sie diese Meldung\n" +"indem Sie \"git config advice.objectNameWarning false\"\n" +"ausführen." + +#: object-name.c:916 +#, c-format +msgid "log for '%.*s' only goes back to %s" +msgstr "Log für '%.*s' geht nur bis %s zurück" + +#: object-name.c:924 +#, c-format +msgid "log for '%.*s' only has %d entries" +msgstr "Log für '%.*s' hat nur %d Einträge" + +#: object-name.c:1702 +#, c-format +msgid "path '%s' exists on disk, but not in '%.*s'" +msgstr "Pfad '%s' befindet sich im Dateisystem, aber nicht in '%.*s'" + +#: object-name.c:1708 +#, c-format +msgid "" +"path '%s' exists, but not '%s'\n" +"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?" +msgstr "" +"Pfad '%s' existiert, aber nicht '%s'\n" +"Hinweis: Meinten Sie '%.*s:%s' auch bekannt als '%.*s:./%s'?" + +#: object-name.c:1717 +#, c-format +msgid "path '%s' does not exist in '%.*s'" +msgstr "Pfad '%s' existiert nicht in '%.*s'" + +#: object-name.c:1745 +#, c-format +msgid "" +"path '%s' is in the index, but not at stage %d\n" +"hint: Did you mean ':%d:%s'?" +msgstr "" +"Pfad '%s' ist im Index, aber nicht in Stufe %d\n" +"Hinweis: Meinten Sie ':%d:%s'?" + +#: object-name.c:1761 +#, c-format +msgid "" +"path '%s' is in the index, but not '%s'\n" +"hint: Did you mean ':%d:%s' aka ':%d:./%s'?" +msgstr "" +"Pfad '%s' ist im Index, aber nicht '%s'\n" +"Hinweis: Meinten Sie ':%d:%s' auch bekannt als ':%d:./%s'?" + +#: object-name.c:1769 +#, c-format +msgid "path '%s' exists on disk, but not in the index" +msgstr "Pfad '%s' existiert im Dateisystem, aber nicht im Index" + +#: object-name.c:1771 +#, c-format +msgid "path '%s' does not exist (neither on disk nor in the index)" +msgstr "Pfad '%s' existiert nicht (weder im Dateisystem noch im Index)" + +#: object-name.c:1784 +msgid "relative path syntax can't be used outside working tree" +msgstr "" +"Die Syntax für relative Pfade kann nicht außerhalb des Arbeitsverzeichnisses " +"benutzt werden." + +#: object-name.c:1922 +#, c-format +msgid "invalid object name '%.*s'." +msgstr "ungültiger Objektname '%.*s'." + #: object.c:53 #, c-format msgid "invalid object type \"%s\"" @@ -5300,21 +5854,71 @@ msgstr "Konnte Objekt '%s' nicht parsen." msgid "hash mismatch %s" msgstr "Hash stimmt nicht mit %s überein." -#: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2216 +#: pack-bitmap.c:843 pack-bitmap.c:849 builtin/pack-objects.c:2226 #, c-format msgid "unable to get size of %s" msgstr "Konnte Größe von %s nicht bestimmen." -#: packfile.c:615 +#: pack-bitmap.c:1489 builtin/rev-list.c:92 +#, c-format +msgid "unable to get disk usage of %s" +msgstr "konnte Festplattennutzung von %s nicht bekommen" + +#: pack-revindex.c:220 +#, c-format +msgid "reverse-index file %s is too small" +msgstr "Reverse-Index-Datei %s ist zu klein" + +#: pack-revindex.c:225 +#, c-format +msgid "reverse-index file %s is corrupt" +msgstr "Reverse-Index-Datei %s ist beschädigt" + +#: pack-revindex.c:233 +#, c-format +msgid "reverse-index file %s has unknown signature" +msgstr "Reverse-Index-Datei %s hat eine unbekannte Signatur" + +#: pack-revindex.c:237 +#, c-format +msgid "reverse-index file %s has unsupported version %<PRIu32>" +msgstr "Reverse-Index-Datei %s hat nicht unterstützte Version %<PRIu32>" + +#: pack-revindex.c:242 +#, c-format +msgid "reverse-index file %s has unsupported hash id %<PRIu32>" +msgstr "Reverse-Index-Datei %s hat nicht unterstützte Hash-ID %<PRIu32>" + +#: pack-write.c:236 +msgid "cannot both write and verify reverse index" +msgstr "" +"Reverse-Index kann nicht gleichzeitig geschrieben und verifiziert werden" + +#: pack-write.c:257 +#, c-format +msgid "could not stat: %s" +msgstr "konnte nicht lesen: %s" + +#: pack-write.c:269 +#, c-format +msgid "failed to make %s readable" +msgstr "Fehler beim lesbar machen von %s" + +#: pack-write.c:508 +#, c-format +msgid "could not write '%s' promisor file" +msgstr "konnte Promisor-Datei '%s' nicht schreiben" + +#: packfile.c:625 msgid "offset before end of packfile (broken .idx?)" msgstr "Offset vor Ende der Packdatei (fehlerhafte Indexdatei?)" -#: packfile.c:1907 +#: packfile.c:1934 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "Offset vor Beginn des Pack-Index für %s (beschädigter Index?)" -#: packfile.c:1911 +#: packfile.c:1938 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "Offset hinter Ende des Pack-Index für %s (abgeschnittener Index?)" @@ -5569,16 +6173,16 @@ msgstr "Protokollfehler: ungültige Zeilenlänge %d" msgid "remote error: %s" msgstr "Fehler am anderen Ende: %s" -#: preload-index.c:119 +#: preload-index.c:125 msgid "Refreshing index" msgstr "Aktualisiere Index" -#: preload-index.c:138 +#: preload-index.c:144 #, c-format msgid "unable to create threaded lstat: %s" msgstr "Kann Thread für lstat nicht erzeugen: %s" -#: pretty.c:983 +#: pretty.c:984 msgid "unable to parse --pretty format" msgstr "Konnte --pretty Format nicht parsen." @@ -5605,20 +6209,20 @@ msgstr "Promisor-Remote-Name kann nicht mit '/' beginnen: %s" msgid "Removing duplicate objects" msgstr "Lösche doppelte Objekte" -#: range-diff.c:77 +#: range-diff.c:78 msgid "could not start `log`" msgstr "Konnte `log` nicht starten." -#: range-diff.c:79 +#: range-diff.c:80 msgid "could not read `log` output" msgstr "Konnte Ausgabe von `log` nicht lesen." -#: range-diff.c:98 sequencer.c:5310 +#: range-diff.c:101 sequencer.c:5318 #, c-format msgid "could not parse commit '%s'" msgstr "Konnte Commit '%s' nicht parsen." -#: range-diff.c:112 +#: range-diff.c:115 #, c-format msgid "" "could not parse first line of `log` output: did not start with 'commit ': " @@ -5627,16 +6231,20 @@ msgstr "" "konnte erste Zeile der Ausgabe von `log` nicht parsen: fängt nicht mit " "'commit ' an: '%s'" -#: range-diff.c:137 +#: range-diff.c:140 #, c-format msgid "could not parse git header '%.*s'" msgstr "Konnte Git-Header '%.*s' nicht parsen." -#: range-diff.c:299 +#: range-diff.c:306 msgid "failed to generate diff" msgstr "Fehler beim Generieren des Diffs." -#: range-diff.c:532 range-diff.c:534 +#: range-diff.c:558 +msgid "--left-only and --right-only are mutually exclusive" +msgstr "--left-only und --right-only schließen sich gegenseitig aus" + +#: range-diff.c:561 range-diff.c:563 #, c-format msgid "could not parse log for '%s'" msgstr "Konnte Log für '%s' nicht parsen." @@ -5676,18 +6284,18 @@ msgstr "Konnte '%s' nicht dem Index hinzufügen." #: read-cache.c:807 #, c-format msgid "unable to stat '%s'" -msgstr "Konnte '%s' nicht lesen." +msgstr "konnte '%s' nicht lesen" #: read-cache.c:1318 #, c-format msgid "'%s' appears as both a file and as a directory" -msgstr "'%s' scheint eine Datei und ein Verzeichnis zu sein." +msgstr "'%s' scheint eine Datei und ein Verzeichnis zu sein" -#: read-cache.c:1524 +#: read-cache.c:1532 msgid "Refresh index" msgstr "Aktualisiere Index" -#: read-cache.c:1639 +#: read-cache.c:1657 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -5696,7 +6304,7 @@ msgstr "" "index.version gesetzt, aber Wert ungültig.\n" "Verwende Version %i" -#: read-cache.c:1649 +#: read-cache.c:1667 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -5705,139 +6313,139 @@ msgstr "" "GIT_INDEX_VERSION gesetzt, aber Wert ungültig.\n" "Verwende Version %i" -#: read-cache.c:1705 +#: read-cache.c:1723 #, c-format msgid "bad signature 0x%08x" msgstr "Ungültige Signatur 0x%08x" -#: read-cache.c:1708 +#: read-cache.c:1726 #, c-format msgid "bad index version %d" msgstr "Ungültige Index-Version %d" -#: read-cache.c:1717 +#: read-cache.c:1735 msgid "bad index file sha1 signature" msgstr "Ungültige SHA1-Signatur der Index-Datei." -#: read-cache.c:1747 +#: read-cache.c:1765 #, c-format msgid "index uses %.4s extension, which we do not understand" msgstr "Index verwendet Erweiterung %.4s, welche wir nicht unterstützen." -#: read-cache.c:1749 +#: read-cache.c:1767 #, c-format msgid "ignoring %.4s extension" msgstr "Ignoriere Erweiterung %.4s" -#: read-cache.c:1786 +#: read-cache.c:1804 #, c-format msgid "unknown index entry format 0x%08x" msgstr "Unbekanntes Format für Index-Eintrag 0x%08x" -#: read-cache.c:1802 +#: read-cache.c:1820 #, c-format msgid "malformed name field in the index, near path '%s'" msgstr "Ungültiges Namensfeld im Index, in der Nähe von Pfad '%s'." -#: read-cache.c:1859 +#: read-cache.c:1877 msgid "unordered stage entries in index" msgstr "Ungeordnete Stage-Einträge im Index." -#: read-cache.c:1862 +#: read-cache.c:1880 #, c-format msgid "multiple stage entries for merged file '%s'" msgstr "Mehrere Stage-Einträge für zusammengeführte Datei '%s'." -#: read-cache.c:1865 +#: read-cache.c:1883 #, c-format msgid "unordered stage entries for '%s'" msgstr "Ungeordnete Stage-Einträge für '%s'." -#: read-cache.c:1971 read-cache.c:2262 rerere.c:565 rerere.c:599 rerere.c:1111 -#: submodule.c:1628 builtin/add.c:538 builtin/check-ignore.c:181 -#: builtin/checkout.c:502 builtin/checkout.c:688 builtin/clean.c:991 -#: builtin/commit.c:364 builtin/diff-tree.c:122 builtin/grep.c:507 +#: read-cache.c:1989 read-cache.c:2280 rerere.c:549 rerere.c:583 rerere.c:1095 +#: submodule.c:1634 builtin/add.c:546 builtin/check-ignore.c:181 +#: builtin/checkout.c:504 builtin/checkout.c:690 builtin/clean.c:991 +#: builtin/commit.c:364 builtin/diff-tree.c:122 builtin/grep.c:505 #: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:290 #: builtin/submodule--helper.c:332 msgid "index file corrupt" msgstr "Index-Datei beschädigt" -#: read-cache.c:2115 +#: read-cache.c:2133 #, c-format msgid "unable to create load_cache_entries thread: %s" msgstr "Kann Thread für load_cache_entries nicht erzeugen: %s" -#: read-cache.c:2128 +#: read-cache.c:2146 #, c-format msgid "unable to join load_cache_entries thread: %s" msgstr "Kann Thread für load_cache_entries nicht erzeugen: %s" -#: read-cache.c:2161 +#: read-cache.c:2179 #, c-format msgid "%s: index file open failed" msgstr "%s: Öffnen der Index-Datei fehlgeschlagen." -#: read-cache.c:2165 +#: read-cache.c:2183 #, c-format msgid "%s: cannot stat the open index" msgstr "%s: Kann geöffneten Index nicht lesen." -#: read-cache.c:2169 +#: read-cache.c:2187 #, c-format msgid "%s: index file smaller than expected" msgstr "%s: Index-Datei ist kleiner als erwartet." -#: read-cache.c:2173 +#: read-cache.c:2191 #, c-format msgid "%s: unable to map index file" msgstr "%s: Konnte Index-Datei nicht einlesen." -#: read-cache.c:2215 +#: read-cache.c:2233 #, c-format msgid "unable to create load_index_extensions thread: %s" msgstr "Kann Thread für load_index_extensions nicht erzeugen: %s" -#: read-cache.c:2242 +#: read-cache.c:2260 #, c-format msgid "unable to join load_index_extensions thread: %s" msgstr "Kann Thread für load_index_extensions nicht beitreten: %s" -#: read-cache.c:2274 +#: read-cache.c:2292 #, c-format msgid "could not freshen shared index '%s'" msgstr "Konnte geteilten Index '%s' nicht aktualisieren." -#: read-cache.c:2321 +#: read-cache.c:2339 #, c-format msgid "broken index, expect %s in %s, got %s" msgstr "Fehlerhafter Index. Erwartete %s in %s, erhielt %s." -#: read-cache.c:3017 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1140 +#: read-cache.c:3035 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1141 #, c-format msgid "could not close '%s'" msgstr "Konnte '%s' nicht schließen." -#: read-cache.c:3120 sequencer.c:2479 sequencer.c:4231 +#: read-cache.c:3138 sequencer.c:2487 sequencer.c:4239 #, c-format msgid "could not stat '%s'" msgstr "Konnte '%s' nicht lesen." -#: read-cache.c:3133 +#: read-cache.c:3151 #, c-format msgid "unable to open git dir: %s" msgstr "konnte Git-Verzeichnis nicht öffnen: %s" -#: read-cache.c:3145 +#: read-cache.c:3163 #, c-format msgid "unable to unlink: %s" msgstr "Konnte '%s' nicht entfernen." -#: read-cache.c:3170 +#: read-cache.c:3188 #, c-format msgid "cannot fix permission bits on '%s'" msgstr "Konnte Zugriffsberechtigung auf '%s' nicht setzen." -#: read-cache.c:3319 +#: read-cache.c:3337 #, c-format msgid "%s: cannot drop to stage #0" msgstr "%s: Kann nicht auf Stufe #0 wechseln." @@ -5953,14 +6561,14 @@ msgstr "" "Wenn Sie jedoch alles löschen, wird der Rebase abgebrochen.\n" "\n" -#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3607 -#: sequencer.c:3633 sequencer.c:5416 builtin/fsck.c:347 builtin/rebase.c:270 +#: rebase-interactive.c:110 rerere.c:469 rerere.c:676 sequencer.c:3615 +#: sequencer.c:3641 sequencer.c:5424 builtin/fsck.c:329 builtin/rebase.c:272 #, c-format msgid "could not write '%s'" msgstr "Konnte '%s' nicht schreiben." -#: rebase-interactive.c:116 builtin/rebase.c:202 builtin/rebase.c:228 -#: builtin/rebase.c:252 +#: rebase-interactive.c:116 builtin/rebase.c:204 builtin/rebase.c:230 +#: builtin/rebase.c:254 #, c-format msgid "could not write '%s'." msgstr "Konnte '%s' nicht schreiben." @@ -5991,14 +6599,14 @@ msgstr "" "Warnungen zu ändern.\n" "Die möglichen Verhaltensweisen sind: ignore, warn, error.\n" -#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2394 -#: builtin/rebase.c:188 builtin/rebase.c:213 builtin/rebase.c:239 -#: builtin/rebase.c:264 +#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2402 +#: builtin/rebase.c:190 builtin/rebase.c:215 builtin/rebase.c:241 +#: builtin/rebase.c:266 #, c-format msgid "could not read '%s'." msgstr "Konnte '%s' nicht lesen." -#: ref-filter.c:42 wt-status.c:1973 +#: ref-filter.c:42 wt-status.c:1975 msgid "gone" msgstr "entfernt" @@ -6017,233 +6625,248 @@ msgstr "%d hinterher" msgid "ahead %d, behind %d" msgstr "%d voraus, %d hinterher" -#: ref-filter.c:169 +#: ref-filter.c:175 #, c-format msgid "expected format: %%(color:<color>)" msgstr "Erwartetes Format: %%(color:<Farbe>)" -#: ref-filter.c:171 +#: ref-filter.c:177 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "nicht erkannte Farbe: %%(color:%s)" -#: ref-filter.c:193 +#: ref-filter.c:199 #, c-format msgid "Integer value expected refname:lstrip=%s" msgstr "Positiver Wert erwartet refname:lstrip=%s" -#: ref-filter.c:197 +#: ref-filter.c:203 #, c-format msgid "Integer value expected refname:rstrip=%s" msgstr "Positiver Wert erwartet refname:rstrip=%s" -#: ref-filter.c:199 +#: ref-filter.c:205 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "nicht erkanntes %%(%s) Argument: %s" -#: ref-filter.c:254 +#: ref-filter.c:260 #, c-format msgid "%%(objecttype) does not take arguments" msgstr "%%(objecttype) akzeptiert keine Argumente" -#: ref-filter.c:276 +#: ref-filter.c:282 #, c-format msgid "unrecognized %%(objectsize) argument: %s" msgstr "nicht erkanntes %%(objectsize) Argument: %s" -#: ref-filter.c:284 +#: ref-filter.c:290 #, c-format msgid "%%(deltabase) does not take arguments" msgstr "%%(deltabase) akzeptiert keine Argumente" -#: ref-filter.c:296 +#: ref-filter.c:302 #, c-format msgid "%%(body) does not take arguments" msgstr "%%(body) akzeptiert keine Argumente" -#: ref-filter.c:309 +#: ref-filter.c:315 #, c-format msgid "unrecognized %%(subject) argument: %s" msgstr "nicht erkanntes %%(subject) Argument: %s" -#: ref-filter.c:330 +#: ref-filter.c:334 +#, c-format +msgid "expected %%(trailers:key=<value>)" +msgstr "%%(trailers:key=<Wert>) erwartet" + +#: ref-filter.c:336 #, c-format msgid "unknown %%(trailers) argument: %s" msgstr "unbekanntes %%(trailers) Argument: %s" -#: ref-filter.c:363 +#: ref-filter.c:367 #, c-format msgid "positive value expected contents:lines=%s" msgstr "Positiver Wert erwartet contents:lines=%s" -#: ref-filter.c:365 +#: ref-filter.c:369 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "nicht erkanntes %%(contents) Argument: %s" -#: ref-filter.c:380 +#: ref-filter.c:384 #, c-format msgid "positive value expected '%s' in %%(%s)" msgstr "positiver Wert erwartet '%s' in %%(%s)" -#: ref-filter.c:384 +#: ref-filter.c:388 #, c-format msgid "unrecognized argument '%s' in %%(%s)" msgstr "nicht erkanntes Argument '%s' in %%(%s)" -#: ref-filter.c:398 +#: ref-filter.c:402 #, c-format msgid "unrecognized email option: %s" msgstr "nicht erkannte E-Mail Option: %s" -#: ref-filter.c:428 +#: ref-filter.c:432 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "erwartetes Format: %%(align:<Breite>,<Position>)" -#: ref-filter.c:440 +#: ref-filter.c:444 #, c-format msgid "unrecognized position:%s" msgstr "nicht erkannte Position:%s" -#: ref-filter.c:447 +#: ref-filter.c:451 #, c-format msgid "unrecognized width:%s" msgstr "nicht erkannte Breite:%s" -#: ref-filter.c:456 +#: ref-filter.c:460 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "nicht erkanntes %%(align) Argument: %s" -#: ref-filter.c:464 +#: ref-filter.c:468 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "Positive Breitenangabe für %%(align) erwartet" -#: ref-filter.c:482 +#: ref-filter.c:486 #, c-format msgid "unrecognized %%(if) argument: %s" msgstr "nicht erkanntes %%(if) Argument: %s" -#: ref-filter.c:584 +#: ref-filter.c:588 #, c-format msgid "malformed field name: %.*s" msgstr "Fehlerhafter Feldname: %.*s" -#: ref-filter.c:611 +#: ref-filter.c:615 #, c-format msgid "unknown field name: %.*s" msgstr "Unbekannter Feldname: %.*s" -#: ref-filter.c:615 +#: ref-filter.c:619 #, c-format msgid "" "not a git repository, but the field '%.*s' requires access to object data" msgstr "" "Kein Git-Repository, aber das Feld '%.*s' erfordert Zugriff auf Objektdaten." -#: ref-filter.c:739 +#: ref-filter.c:743 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "format: %%(if) Atom ohne ein %%(then) Atom verwendet" -#: ref-filter.c:802 +#: ref-filter.c:806 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "format: %%(then) Atom ohne ein %%(if) Atom verwendet" -#: ref-filter.c:804 +#: ref-filter.c:808 #, c-format msgid "format: %%(then) atom used more than once" msgstr "format: %%(then) Atom mehr als einmal verwendet" -#: ref-filter.c:806 +#: ref-filter.c:810 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "format: %%(then) Atom nach %%(else) verwendet" -#: ref-filter.c:834 +#: ref-filter.c:838 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "format: %%(else) Atom ohne ein %%(if) Atom verwendet" -#: ref-filter.c:836 +#: ref-filter.c:840 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "Format: %%(else) Atom ohne ein %%(then) Atom verwendet" -#: ref-filter.c:838 +#: ref-filter.c:842 #, c-format msgid "format: %%(else) atom used more than once" msgstr "Format: %%(end) Atom mehr als einmal verwendet" -#: ref-filter.c:853 +#: ref-filter.c:857 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "Format: %%(end) Atom ohne zugehöriges Atom verwendet" -#: ref-filter.c:910 +#: ref-filter.c:914 #, c-format msgid "malformed format string %s" msgstr "Fehlerhafter Formatierungsstring %s" -#: ref-filter.c:1549 +#: ref-filter.c:1555 #, c-format -msgid "no branch, rebasing %s" -msgstr "kein Branch, Rebase von %s" +msgid "(no branch, rebasing %s)" +msgstr "(kein Branch, Rebase von %s)" -#: ref-filter.c:1552 +#: ref-filter.c:1558 #, c-format -msgid "no branch, rebasing detached HEAD %s" -msgstr "kein Branch, Rebase von losgelöstem HEAD %s" +msgid "(no branch, rebasing detached HEAD %s)" +msgstr "(kein Branch, Rebase von losgelöstem HEAD %s)" -#: ref-filter.c:1555 +#: ref-filter.c:1561 #, c-format -msgid "no branch, bisect started on %s" -msgstr "kein Branch, binäre Suche begonnen bei %s" +msgid "(no branch, bisect started on %s)" +msgstr "(kein Branch, binäre Suche begonnen bei %s)" #: ref-filter.c:1565 -msgid "no branch" -msgstr "kein Branch" +#, c-format +msgid "(HEAD detached at %s)" +msgstr "(HEAD losgelöst bei %s)" -#: ref-filter.c:1599 ref-filter.c:1808 +#: ref-filter.c:1568 +#, c-format +msgid "(HEAD detached from %s)" +msgstr "(HEAD losgelöst von %s)" + +#: ref-filter.c:1571 +msgid "(no branch)" +msgstr "(kein Branch)" + +#: ref-filter.c:1603 ref-filter.c:1812 #, c-format msgid "missing object %s for %s" msgstr "Objekt %s fehlt für %s" -#: ref-filter.c:1609 +#: ref-filter.c:1613 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "parse_object_buffer bei %s für %s fehlgeschlagen" -#: ref-filter.c:2062 +#: ref-filter.c:1996 #, c-format msgid "malformed object at '%s'" msgstr "fehlerhaftes Objekt bei '%s'" -#: ref-filter.c:2151 +#: ref-filter.c:2085 #, c-format msgid "ignoring ref with broken name %s" msgstr "Ignoriere Referenz mit fehlerhaftem Namen %s" -#: ref-filter.c:2156 refs.c:676 +#: ref-filter.c:2090 refs.c:676 #, c-format msgid "ignoring broken ref %s" msgstr "Ignoriere fehlerhafte Referenz %s" -#: ref-filter.c:2472 +#: ref-filter.c:2430 #, c-format msgid "format: %%(end) atom missing" msgstr "Format: %%(end) Atom fehlt" -#: ref-filter.c:2571 +#: ref-filter.c:2529 #, c-format msgid "malformed object name %s" msgstr "missgebildeter Objektname %s" -#: ref-filter.c:2576 +#: ref-filter.c:2534 #, c-format msgid "option `%s' must point to a commit" msgstr "die Option `%s' muss auf einen Commit zeigen" @@ -6295,52 +6918,52 @@ msgstr "ungültiger Branchname: %s = %s" msgid "ignoring dangling symref %s" msgstr "Ignoriere unreferenzierte symbolische Referenz %s" -#: refs.c:911 +#: refs.c:922 #, c-format msgid "log for ref %s has gap after %s" msgstr "Log für Referenz %s hat eine Lücke nach %s." -#: refs.c:917 +#: refs.c:929 #, c-format msgid "log for ref %s unexpectedly ended on %s" msgstr "Log für Referenz %s unerwartet bei %s beendet." -#: refs.c:976 +#: refs.c:994 #, c-format msgid "log for %s is empty" msgstr "Log für %s ist leer." -#: refs.c:1068 +#: refs.c:1086 #, c-format msgid "refusing to update ref with bad name '%s'" msgstr "verweigere Aktualisierung einer Referenz mit fehlerhaftem Namen '%s'" -#: refs.c:1139 +#: refs.c:1157 #, c-format msgid "update_ref failed for ref '%s': %s" msgstr "update_ref für Referenz '%s' fehlgeschlagen: %s" -#: refs.c:1963 +#: refs.c:2051 #, c-format msgid "multiple updates for ref '%s' not allowed" msgstr "mehrere Aktualisierungen für Referenz '%s' nicht erlaubt" -#: refs.c:2043 +#: refs.c:2131 msgid "ref updates forbidden inside quarantine environment" msgstr "" "Aktualisierungen von Referenzen ist innerhalb der Quarantäne-Umgebung " "verboten" -#: refs.c:2054 +#: refs.c:2142 msgid "ref updates aborted by hook" msgstr "Aktualisierungen von Referenzen durch Hook abgebrochen" -#: refs.c:2154 refs.c:2184 +#: refs.c:2242 refs.c:2272 #, c-format msgid "'%s' exists; cannot create '%s'" msgstr "'%s' existiert; kann '%s' nicht erstellen" -#: refs.c:2160 refs.c:2195 +#: refs.c:2248 refs.c:2283 #, c-format msgid "cannot process '%s' and '%s' at the same time" msgstr "kann '%s' und '%s' nicht zur selben Zeit verarbeiten" @@ -6406,12 +7029,12 @@ msgstr "Schlüssel '%s' des Musters hatte kein '*'." msgid "value '%s' of pattern has no '*'" msgstr "Wert '%s' des Musters hat kein '*'." -#: remote.c:1073 +#: remote.c:1083 #, c-format msgid "src refspec %s does not match any" msgstr "Src-Refspec %s entspricht keiner Referenz." -#: remote.c:1078 +#: remote.c:1088 #, c-format msgid "src refspec %s matches more than one" msgstr "Src-Refspec %s entspricht mehr als einer Referenz." @@ -6420,7 +7043,7 @@ msgstr "Src-Refspec %s entspricht mehr als einer Referenz." #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is #. the <src>. #. -#: remote.c:1093 +#: remote.c:1103 #, c-format msgid "" "The destination you provided is not a full refname (i.e.,\n" @@ -6447,7 +7070,7 @@ msgstr "" "Keines hat funktioniert, sodass wir aufgegeben haben. Sie müssen die\n" "Referenz mit vollqualifizierten Namen angeben." -#: remote.c:1113 +#: remote.c:1123 #, c-format msgid "" "The <src> part of the refspec is a commit object.\n" @@ -6458,7 +7081,7 @@ msgstr "" "Meinten Sie, einen neuen Branch mittels Push nach\n" "'%s:refs/heads/%s' zu erstellen?" -#: remote.c:1118 +#: remote.c:1128 #, c-format msgid "" "The <src> part of the refspec is a tag object.\n" @@ -6469,7 +7092,7 @@ msgstr "" "Meinten Sie, einen neuen Tag mittels Push nach\n" "'%s:refs/tags/%s' zu erstellen?" -#: remote.c:1123 +#: remote.c:1133 #, c-format msgid "" "The <src> part of the refspec is a tree object.\n" @@ -6480,7 +7103,7 @@ msgstr "" "Meinten Sie, einen Tag für ein neues Tree-Objekt\n" "mittels Push nach '%s:refs/tags/'%s' zu erstellen?" -#: remote.c:1128 +#: remote.c:1138 #, c-format msgid "" "The <src> part of the refspec is a blob object.\n" @@ -6491,117 +7114,117 @@ msgstr "" "Meinten Sie, einen Tag für ein neues Blob-Objekt\n" "mittels Push nach '%s:refs/tags/%s' zu erstellen?" -#: remote.c:1164 +#: remote.c:1174 #, c-format msgid "%s cannot be resolved to branch" msgstr "%s kann nicht zu Branch aufgelöst werden." -#: remote.c:1175 +#: remote.c:1185 #, c-format msgid "unable to delete '%s': remote ref does not exist" msgstr "Konnte '%s' nicht löschen: Remote-Referenz existiert nicht." -#: remote.c:1187 +#: remote.c:1197 #, c-format msgid "dst refspec %s matches more than one" msgstr "Dst-Refspec %s entspricht mehr als einer Referenz." -#: remote.c:1194 +#: remote.c:1204 #, c-format msgid "dst ref %s receives from more than one src" msgstr "Dst-Referenz %s empfängt von mehr als einer Quelle" -#: remote.c:1714 remote.c:1815 +#: remote.c:1724 remote.c:1825 msgid "HEAD does not point to a branch" msgstr "HEAD zeigt auf keinen Branch" -#: remote.c:1723 +#: remote.c:1733 #, c-format msgid "no such branch: '%s'" -msgstr "Kein solcher Branch: '%s'" +msgstr "Branch nicht gefunden: '%s'" -#: remote.c:1726 +#: remote.c:1736 #, c-format msgid "no upstream configured for branch '%s'" msgstr "Kein Upstream-Branch für Branch '%s' konfiguriert." -#: remote.c:1732 +#: remote.c:1742 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "Upstream-Branch '%s' nicht als Remote-Tracking-Branch gespeichert" -#: remote.c:1747 +#: remote.c:1757 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "" "Ziel für \"push\" '%s' auf Remote-Repository '%s' hat keinen lokal gefolgten " "Branch" -#: remote.c:1759 +#: remote.c:1769 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "Branch '%s' hat keinen Upstream-Branch gesetzt" -#: remote.c:1769 +#: remote.c:1779 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "Push-Refspecs für '%s' beinhalten nicht '%s'" -#: remote.c:1782 +#: remote.c:1792 msgid "push has no destination (push.default is 'nothing')" msgstr "kein Ziel für \"push\" (push.default ist 'nothing')" -#: remote.c:1804 +#: remote.c:1814 msgid "cannot resolve 'simple' push to a single destination" msgstr "kann einzelnes Ziel für \"push\" im Modus 'simple' nicht auflösen" -#: remote.c:1933 +#: remote.c:1943 #, c-format msgid "couldn't find remote ref %s" msgstr "Konnte Remote-Referenz %s nicht finden." -#: remote.c:1946 +#: remote.c:1956 #, c-format msgid "* Ignoring funny ref '%s' locally" msgstr "* Ignoriere sonderbare Referenz '%s' lokal" -#: remote.c:2109 +#: remote.c:2119 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "" "Ihr Branch basiert auf '%s', aber der Upstream-Branch wurde entfernt.\n" -#: remote.c:2113 +#: remote.c:2123 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (benutzen Sie \"git branch --unset-upstream\" zum Beheben)\n" -#: remote.c:2116 +#: remote.c:2126 #, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "Ihr Branch ist auf demselben Stand wie '%s'.\n" -#: remote.c:2120 +#: remote.c:2130 #, c-format msgid "Your branch and '%s' refer to different commits.\n" msgstr "Ihr Branch und '%s' zeigen auf unterschiedliche Commits.\n" -#: remote.c:2123 +#: remote.c:2133 #, c-format msgid " (use \"%s\" for details)\n" msgstr " (benutzen Sie \"%s\" für Details)\n" -#: remote.c:2127 +#: remote.c:2137 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "Ihr Branch ist %2$d Commit vor '%1$s'.\n" msgstr[1] "Ihr Branch ist %2$d Commits vor '%1$s'.\n" -#: remote.c:2133 +#: remote.c:2143 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (benutzen Sie \"git push\", um lokale Commits zu publizieren)\n" -#: remote.c:2136 +#: remote.c:2146 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -6611,12 +7234,12 @@ msgstr[0] "" msgstr[1] "" "Ihr Branch ist %2$d Commits hinter '%1$s', und kann vorgespult werden.\n" -#: remote.c:2144 +#: remote.c:2154 msgid " (use \"git pull\" to update your local branch)\n" msgstr "" " (benutzen Sie \"git pull\", um Ihren lokalen Branch zu aktualisieren)\n" -#: remote.c:2147 +#: remote.c:2157 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -6631,13 +7254,13 @@ msgstr[1] "" "Ihr Branch und '%s' sind divergiert,\n" "und haben jeweils %d und %d unterschiedliche Commits.\n" -#: remote.c:2157 +#: remote.c:2167 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr "" " (benutzen Sie \"git pull\", um Ihren Branch mit dem Remote-Branch " "zusammenzuführen)\n" -#: remote.c:2349 +#: remote.c:2359 #, c-format msgid "cannot parse expected object name '%s'" msgstr "Kann erwarteten Objektnamen '%s' nicht parsen." @@ -6657,96 +7280,96 @@ msgstr "doppelte ersetzende Referenz: %s" msgid "replace depth too high for object %s" msgstr "Ersetzungstiefe zu hoch für Objekt %s" -#: rerere.c:217 rerere.c:226 rerere.c:229 +#: rerere.c:201 rerere.c:210 rerere.c:213 msgid "corrupt MERGE_RR" msgstr "Fehlerhaftes MERGE_RR" -#: rerere.c:264 rerere.c:269 +#: rerere.c:248 rerere.c:253 msgid "unable to write rerere record" msgstr "Konnte Rerere-Eintrag nicht schreiben." -#: rerere.c:495 +#: rerere.c:479 #, c-format msgid "there were errors while writing '%s' (%s)" msgstr "Fehler beim Schreiben von '%s' (%s)." -#: rerere.c:498 +#: rerere.c:482 #, c-format msgid "failed to flush '%s'" msgstr "Flush bei '%s' fehlgeschlagen." -#: rerere.c:503 rerere.c:1039 +#: rerere.c:487 rerere.c:1023 #, c-format msgid "could not parse conflict hunks in '%s'" msgstr "Konnte Konflikt-Blöcke in '%s' nicht parsen." -#: rerere.c:684 +#: rerere.c:668 #, c-format msgid "failed utime() on '%s'" msgstr "Fehler beim Aufruf von utime() auf '%s'." -#: rerere.c:694 +#: rerere.c:678 #, c-format msgid "writing '%s' failed" msgstr "Schreiben von '%s' fehlgeschlagen." -#: rerere.c:714 +#: rerere.c:698 #, c-format msgid "Staged '%s' using previous resolution." msgstr "'%s' mit vorheriger Konfliktauflösung zum Commit vorgemerkt." -#: rerere.c:753 +#: rerere.c:737 #, c-format msgid "Recorded resolution for '%s'." msgstr "Konfliktauflösung für '%s' aufgezeichnet." -#: rerere.c:788 +#: rerere.c:772 #, c-format msgid "Resolved '%s' using previous resolution." msgstr "Konflikte in '%s' mit vorheriger Konfliktauflösung beseitigt." -#: rerere.c:803 +#: rerere.c:787 #, c-format msgid "cannot unlink stray '%s'" msgstr "Kann '%s' nicht löschen." -#: rerere.c:807 +#: rerere.c:791 #, c-format msgid "Recorded preimage for '%s'" msgstr "Preimage für '%s' aufgezeichnet." -#: rerere.c:881 submodule.c:2082 builtin/log.c:1992 +#: rerere.c:865 submodule.c:2088 builtin/log.c:1991 #: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890 #, c-format msgid "could not create directory '%s'" msgstr "Konnte Verzeichnis '%s' nicht erstellen." -#: rerere.c:1057 +#: rerere.c:1041 #, c-format msgid "failed to update conflicted state in '%s'" msgstr "Fehler beim Aktualisieren des Konflikt-Status in '%s'." -#: rerere.c:1068 rerere.c:1075 +#: rerere.c:1052 rerere.c:1059 #, c-format msgid "no remembered resolution for '%s'" msgstr "Keine aufgezeichnete Konfliktauflösung für '%s'." -#: rerere.c:1077 +#: rerere.c:1061 #, c-format msgid "cannot unlink '%s'" msgstr "Kann '%s' nicht löschen." -#: rerere.c:1087 +#: rerere.c:1071 #, c-format msgid "Updated preimage for '%s'" msgstr "Preimage für '%s' aktualisiert." -#: rerere.c:1096 +#: rerere.c:1080 #, c-format msgid "Forgot resolution for '%s'\n" msgstr "Aufgezeichnete Konfliktauflösung für '%s' gelöscht.\n" -#: rerere.c:1199 +#: rerere.c:1191 msgid "unable to open rr-cache directory" msgstr "Konnte rr-cache Verzeichnis nicht öffnen." @@ -6754,43 +7377,38 @@ msgstr "Konnte rr-cache Verzeichnis nicht öffnen." msgid "could not determine HEAD revision" msgstr "Konnte HEAD-Commit nicht bestimmen." -#: reset.c:70 reset.c:76 sequencer.c:3460 +#: reset.c:70 reset.c:76 sequencer.c:3468 #, c-format msgid "failed to find tree of %s" msgstr "Fehler beim Finden des \"Tree\"-Objektes von %s." -#: revision.c:2336 +#: revision.c:2338 msgid "--unpacked=<packfile> no longer supported" msgstr "--unpacked=<Pack-Datei> wird nicht länger unterstützt" -#: revision.c:2356 -#, c-format -msgid "unknown value for --diff-merges: %s" -msgstr "unbekannter Wert für --diff-merges: %s" - -#: revision.c:2694 +#: revision.c:2668 msgid "your current branch appears to be broken" msgstr "Ihr aktueller Branch scheint fehlerhaft zu sein." -#: revision.c:2697 +#: revision.c:2671 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "Ihr aktueller Branch '%s' hat noch keine Commits." -#: revision.c:2907 +#: revision.c:2877 msgid "-L does not yet support diff formats besides -p and -s" msgstr "-L unterstützt noch keine anderen Diff-Formate außer -p und -s" -#: run-command.c:764 +#: run-command.c:767 msgid "open /dev/null failed" msgstr "Öffnen von /dev/null fehlgeschlagen" -#: run-command.c:1271 +#: run-command.c:1274 #, c-format msgid "cannot create async thread: %s" msgstr "Konnte Thread für async nicht erzeugen: %s" -#: run-command.c:1335 +#: run-command.c:1338 #, c-format msgid "" "The '%s' hook was ignored because it's not set as executable.\n" @@ -6854,7 +7472,7 @@ msgstr "Ungültiger \"cleanup\"-Modus '%s' für Commit-Beschreibungen." msgid "could not delete '%s'" msgstr "Konnte '%s' nicht löschen." -#: sequencer.c:343 builtin/rebase.c:755 builtin/rebase.c:1596 builtin/rm.c:385 +#: sequencer.c:343 builtin/rebase.c:757 builtin/rebase.c:1602 builtin/rm.c:385 #, c-format msgid "could not remove '%s'" msgstr "Konnte '%s' nicht löschen" @@ -6894,13 +7512,13 @@ msgstr "" "mit 'git add <Pfade>' oder 'git rm <Pfade>' und tragen Sie das Ergebnis mit\n" "'git commit' ein" -#: sequencer.c:434 sequencer.c:3062 +#: sequencer.c:434 sequencer.c:3070 #, c-format msgid "could not lock '%s'" msgstr "Konnte '%s' nicht sperren" -#: sequencer.c:436 sequencer.c:2861 sequencer.c:3066 sequencer.c:3080 -#: sequencer.c:3337 sequencer.c:5326 strbuf.c:1168 wrapper.c:631 +#: sequencer.c:436 sequencer.c:2869 sequencer.c:3074 sequencer.c:3088 +#: sequencer.c:3345 sequencer.c:5334 strbuf.c:1168 wrapper.c:631 #, c-format msgid "could not write to '%s'" msgstr "Konnte nicht nach '%s' schreiben." @@ -6910,8 +7528,8 @@ msgstr "Konnte nicht nach '%s' schreiben." msgid "could not write eol to '%s'" msgstr "Konnte EOL nicht nach '%s' schreiben." -#: sequencer.c:446 sequencer.c:2866 sequencer.c:3068 sequencer.c:3082 -#: sequencer.c:3345 +#: sequencer.c:446 sequencer.c:2874 sequencer.c:3076 sequencer.c:3090 +#: sequencer.c:3353 #, c-format msgid "failed to finalize '%s'" msgstr "Fehler beim Fertigstellen von '%s'." @@ -6931,7 +7549,7 @@ msgstr "" msgid "%s: fast-forward" msgstr "%s: Vorspulen" -#: sequencer.c:560 builtin/tag.c:566 +#: sequencer.c:560 builtin/tag.c:598 #, c-format msgid "Invalid cleanup mode %s" msgstr "Ungültiger \"cleanup\" Modus %s" @@ -6944,60 +7562,60 @@ msgstr "Ungültiger \"cleanup\" Modus %s" msgid "%s: Unable to write new index file" msgstr "%s: Konnte neue Index-Datei nicht schreiben" -#: sequencer.c:687 +#: sequencer.c:684 msgid "unable to update cache tree" msgstr "Konnte Cache-Verzeichnis nicht aktualisieren." -#: sequencer.c:701 +#: sequencer.c:698 msgid "could not resolve HEAD commit" msgstr "Konnte HEAD-Commit nicht auflösen." -#: sequencer.c:781 +#: sequencer.c:778 #, c-format msgid "no key present in '%.*s'" msgstr "Kein Schlüssel in '%.*s' vorhanden." -#: sequencer.c:792 +#: sequencer.c:789 #, c-format msgid "unable to dequote value of '%s'" msgstr "Konnte Anführungszeichen von '%s' nicht entfernen." -#: sequencer.c:829 wrapper.c:201 wrapper.c:371 builtin/am.c:710 -#: builtin/am.c:802 builtin/merge.c:1135 builtin/rebase.c:908 +#: sequencer.c:826 wrapper.c:201 wrapper.c:371 builtin/am.c:710 +#: builtin/am.c:802 builtin/merge.c:1136 builtin/rebase.c:910 #, c-format msgid "could not open '%s' for reading" msgstr "Konnte '%s' nicht zum Lesen öffnen." -#: sequencer.c:839 +#: sequencer.c:836 msgid "'GIT_AUTHOR_NAME' already given" msgstr "'GIT_AUTHOR_NAME' bereits angegeben." -#: sequencer.c:844 +#: sequencer.c:841 msgid "'GIT_AUTHOR_EMAIL' already given" msgstr "'GIT_AUTHOR_EMAIL' bereits angegeben." -#: sequencer.c:849 +#: sequencer.c:846 msgid "'GIT_AUTHOR_DATE' already given" msgstr "'GIT_AUTHOR_DATE' bereits angegeben." -#: sequencer.c:853 +#: sequencer.c:850 #, c-format msgid "unknown variable '%s'" msgstr "Unbekannte Variable '%s'" -#: sequencer.c:858 +#: sequencer.c:855 msgid "missing 'GIT_AUTHOR_NAME'" msgstr "'GIT_AUTHOR_NAME' fehlt." -#: sequencer.c:860 +#: sequencer.c:857 msgid "missing 'GIT_AUTHOR_EMAIL'" msgstr "'GIT_AUTHOR_EMAIL' fehlt." -#: sequencer.c:862 +#: sequencer.c:859 msgid "missing 'GIT_AUTHOR_DATE'" msgstr "'GIT_AUTHOR_DATE' fehlt." -#: sequencer.c:927 +#: sequencer.c:924 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -7028,11 +7646,11 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:1208 +#: sequencer.c:1211 msgid "'prepare-commit-msg' hook failed" msgstr "'prepare-commit-msg' Hook fehlgeschlagen." -#: sequencer.c:1214 +#: sequencer.c:1217 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -7060,7 +7678,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1227 +#: sequencer.c:1230 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -7086,340 +7704,340 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1269 +#: sequencer.c:1272 msgid "couldn't look up newly created commit" msgstr "Konnte neu erstellten Commit nicht nachschlagen." -#: sequencer.c:1271 +#: sequencer.c:1274 msgid "could not parse newly created commit" msgstr "Konnte neu erstellten Commit nicht analysieren." -#: sequencer.c:1317 +#: sequencer.c:1320 msgid "unable to resolve HEAD after creating commit" msgstr "Konnte HEAD nicht auflösen, nachdem der Commit erstellt wurde." -#: sequencer.c:1319 +#: sequencer.c:1322 msgid "detached HEAD" msgstr "losgelöster HEAD" -#: sequencer.c:1323 +#: sequencer.c:1326 msgid " (root-commit)" msgstr " (Root-Commit)" -#: sequencer.c:1344 +#: sequencer.c:1347 msgid "could not parse HEAD" msgstr "Konnte HEAD nicht parsen." -#: sequencer.c:1346 +#: sequencer.c:1349 #, c-format msgid "HEAD %s is not a commit!" msgstr "HEAD %s ist kein Commit!" -#: sequencer.c:1350 sequencer.c:1425 builtin/commit.c:1577 +#: sequencer.c:1353 sequencer.c:1431 builtin/commit.c:1577 msgid "could not parse HEAD commit" msgstr "Konnte Commit von HEAD nicht analysieren." -#: sequencer.c:1403 sequencer.c:2100 +#: sequencer.c:1409 sequencer.c:2108 msgid "unable to parse commit author" msgstr "Konnte Commit-Autor nicht parsen." -#: sequencer.c:1414 builtin/am.c:1566 builtin/merge.c:701 +#: sequencer.c:1420 builtin/am.c:1566 builtin/merge.c:702 msgid "git write-tree failed to write a tree" msgstr "\"git write-tree\" schlug beim Schreiben eines \"Tree\"-Objektes fehl" -#: sequencer.c:1447 sequencer.c:1565 +#: sequencer.c:1453 sequencer.c:1573 #, c-format msgid "unable to read commit message from '%s'" msgstr "Konnte Commit-Beschreibung von '%s' nicht lesen." -#: sequencer.c:1476 sequencer.c:1508 +#: sequencer.c:1484 sequencer.c:1516 #, c-format msgid "invalid author identity '%s'" msgstr "ungültige Autor-Identität '%s'" -#: sequencer.c:1482 +#: sequencer.c:1490 msgid "corrupt author: missing date information" msgstr "unbrauchbarer Autor: Datumsinformationen fehlen" -#: sequencer.c:1521 builtin/am.c:1593 builtin/commit.c:1678 builtin/merge.c:904 -#: builtin/merge.c:929 t/helper/test-fast-rebase.c:78 +#: sequencer.c:1529 builtin/am.c:1593 builtin/commit.c:1678 builtin/merge.c:905 +#: builtin/merge.c:930 t/helper/test-fast-rebase.c:78 msgid "failed to write commit object" msgstr "Fehler beim Schreiben des Commit-Objektes." -#: sequencer.c:1548 sequencer.c:4283 t/helper/test-fast-rebase.c:198 +#: sequencer.c:1556 sequencer.c:4291 t/helper/test-fast-rebase.c:198 #, c-format msgid "could not update %s" msgstr "Konnte %s nicht aktualisieren." -#: sequencer.c:1597 +#: sequencer.c:1605 #, c-format msgid "could not parse commit %s" msgstr "Konnte Commit %s nicht parsen." -#: sequencer.c:1602 +#: sequencer.c:1610 #, c-format msgid "could not parse parent commit %s" msgstr "Konnte Eltern-Commit %s nicht parsen." -#: sequencer.c:1685 sequencer.c:1796 +#: sequencer.c:1693 sequencer.c:1804 #, c-format msgid "unknown command: %d" msgstr "Unbekannter Befehl: %d" -#: sequencer.c:1743 sequencer.c:1768 +#: sequencer.c:1751 sequencer.c:1776 #, c-format msgid "This is a combination of %d commits." msgstr "Das ist eine Kombination aus %d Commits." -#: sequencer.c:1753 +#: sequencer.c:1761 msgid "need a HEAD to fixup" msgstr "benötige HEAD für fixup" -#: sequencer.c:1755 sequencer.c:3372 +#: sequencer.c:1763 sequencer.c:3380 msgid "could not read HEAD" msgstr "Konnte HEAD nicht lesen" -#: sequencer.c:1757 +#: sequencer.c:1765 msgid "could not read HEAD's commit message" msgstr "Konnte Commit-Beschreibung von HEAD nicht lesen" -#: sequencer.c:1763 +#: sequencer.c:1771 #, c-format msgid "cannot write '%s'" msgstr "kann '%s' nicht schreiben" -#: sequencer.c:1770 git-rebase--preserve-merges.sh:486 +#: sequencer.c:1778 git-rebase--preserve-merges.sh:486 msgid "This is the 1st commit message:" msgstr "Das ist die erste Commit-Beschreibung:" -#: sequencer.c:1778 +#: sequencer.c:1786 #, c-format msgid "could not read commit message of %s" msgstr "Konnte Commit-Beschreibung von %s nicht lesen." -#: sequencer.c:1785 +#: sequencer.c:1793 #, c-format msgid "This is the commit message #%d:" msgstr "Das ist Commit-Beschreibung #%d:" -#: sequencer.c:1791 +#: sequencer.c:1799 #, c-format msgid "The commit message #%d will be skipped:" msgstr "Die Commit-Beschreibung #%d wird ausgelassen:" -#: sequencer.c:1879 +#: sequencer.c:1887 msgid "your index file is unmerged." msgstr "Ihre Index-Datei ist nicht zusammengeführt." -#: sequencer.c:1886 +#: sequencer.c:1894 msgid "cannot fixup root commit" msgstr "kann fixup nicht auf Root-Commit anwenden" -#: sequencer.c:1905 +#: sequencer.c:1913 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "Commit %s ist ein Merge, aber die Option -m wurde nicht angegeben." -#: sequencer.c:1913 sequencer.c:1921 +#: sequencer.c:1921 sequencer.c:1929 #, c-format msgid "commit %s does not have parent %d" msgstr "Commit %s hat keinen Eltern-Commit %d" -#: sequencer.c:1927 +#: sequencer.c:1935 #, c-format msgid "cannot get commit message for %s" msgstr "Kann keine Commit-Beschreibung für %s bekommen." #. TRANSLATORS: The first %s will be a "todo" command like #. "revert" or "pick", the second %s a SHA1. -#: sequencer.c:1946 +#: sequencer.c:1954 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: kann Eltern-Commit %s nicht parsen" -#: sequencer.c:2011 +#: sequencer.c:2019 #, c-format msgid "could not rename '%s' to '%s'" msgstr "Konnte '%s' nicht zu '%s' umbenennen." -#: sequencer.c:2071 +#: sequencer.c:2079 #, c-format msgid "could not revert %s... %s" msgstr "Konnte \"revert\" nicht auf %s... (%s) ausführen" -#: sequencer.c:2072 +#: sequencer.c:2080 #, c-format msgid "could not apply %s... %s" msgstr "Konnte %s... (%s) nicht anwenden" -#: sequencer.c:2092 +#: sequencer.c:2100 #, c-format msgid "dropping %s %s -- patch contents already upstream\n" msgstr "Weglassen von %s %s -- Patch-Inhalte sind bereits im Upstream-Branch\n" -#: sequencer.c:2150 +#: sequencer.c:2158 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: Fehler beim Lesen des Index" -#: sequencer.c:2157 +#: sequencer.c:2165 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: Fehler beim Aktualisieren des Index" -#: sequencer.c:2234 +#: sequencer.c:2242 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "%s akzeptiert keine Argumente: '%s'" -#: sequencer.c:2243 +#: sequencer.c:2251 #, c-format msgid "missing arguments for %s" msgstr "Fehlende Argumente für %s." -#: sequencer.c:2274 +#: sequencer.c:2282 #, c-format msgid "could not parse '%s'" msgstr "Konnte '%s' nicht parsen." -#: sequencer.c:2335 +#: sequencer.c:2343 #, c-format msgid "invalid line %d: %.*s" msgstr "Ungültige Zeile %d: %.*s" -#: sequencer.c:2346 +#: sequencer.c:2354 #, c-format msgid "cannot '%s' without a previous commit" msgstr "Kann '%s' nicht ohne vorherigen Commit ausführen" -#: sequencer.c:2432 +#: sequencer.c:2440 msgid "cancelling a cherry picking in progress" msgstr "Abbrechen eines laufenden \"cherry-pick\"" -#: sequencer.c:2441 +#: sequencer.c:2449 msgid "cancelling a revert in progress" msgstr "Abbrechen eines laufenden \"revert\"" -#: sequencer.c:2485 +#: sequencer.c:2493 msgid "please fix this using 'git rebase --edit-todo'." msgstr "" "Bitte beheben Sie dieses, indem Sie 'git rebase --edit-todo' ausführen." -#: sequencer.c:2487 +#: sequencer.c:2495 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "Unbenutzbares Instruktionsblatt: '%s'" -#: sequencer.c:2492 +#: sequencer.c:2500 msgid "no commits parsed." msgstr "Keine Commits geparst." -#: sequencer.c:2503 +#: sequencer.c:2511 msgid "cannot cherry-pick during a revert." msgstr "Kann Cherry-Pick nicht während eines Reverts ausführen." -#: sequencer.c:2505 +#: sequencer.c:2513 msgid "cannot revert during a cherry-pick." msgstr "Kann Revert nicht während eines Cherry-Picks ausführen." -#: sequencer.c:2583 +#: sequencer.c:2591 #, c-format msgid "invalid value for %s: %s" msgstr "Ungültiger Wert für %s: %s" -#: sequencer.c:2690 +#: sequencer.c:2698 msgid "unusable squash-onto" msgstr "Unbenutzbares squash-onto." -#: sequencer.c:2710 +#: sequencer.c:2718 #, c-format msgid "malformed options sheet: '%s'" msgstr "Fehlerhaftes Optionsblatt: '%s'" -#: sequencer.c:2803 sequencer.c:4636 +#: sequencer.c:2811 sequencer.c:4644 msgid "empty commit set passed" msgstr "leere Menge von Commits übergeben" -#: sequencer.c:2820 +#: sequencer.c:2828 msgid "revert is already in progress" msgstr "\"revert\" ist bereits im Gange" -#: sequencer.c:2822 +#: sequencer.c:2830 #, c-format msgid "try \"git revert (--continue | %s--abort | --quit)\"" msgstr "Versuchen Sie \"git revert (--continue | %s--abort | --quit)\"" -#: sequencer.c:2825 +#: sequencer.c:2833 msgid "cherry-pick is already in progress" msgstr "\"cherry-pick\" wird bereits durchgeführt" -#: sequencer.c:2827 +#: sequencer.c:2835 #, c-format msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" msgstr "Versuchen Sie \"git cherry-pick (--continue | %s--abort | --quit)\"" -#: sequencer.c:2841 +#: sequencer.c:2849 #, c-format msgid "could not create sequencer directory '%s'" msgstr "Konnte \"sequencer\"-Verzeichnis '%s' nicht erstellen." -#: sequencer.c:2856 +#: sequencer.c:2864 msgid "could not lock HEAD" msgstr "Konnte HEAD nicht sperren" -#: sequencer.c:2916 sequencer.c:4371 +#: sequencer.c:2924 sequencer.c:4379 msgid "no cherry-pick or revert in progress" msgstr "kein \"cherry-pick\" oder \"revert\" im Gange" -#: sequencer.c:2918 sequencer.c:2929 +#: sequencer.c:2926 sequencer.c:2937 msgid "cannot resolve HEAD" msgstr "kann HEAD nicht auflösen" -#: sequencer.c:2920 sequencer.c:2964 +#: sequencer.c:2928 sequencer.c:2972 msgid "cannot abort from a branch yet to be born" msgstr "kann nicht abbrechen: bin auf einem Branch, der noch nicht geboren ist" -#: sequencer.c:2950 builtin/grep.c:756 +#: sequencer.c:2958 builtin/grep.c:757 #, c-format msgid "cannot open '%s'" msgstr "kann '%s' nicht öffnen" -#: sequencer.c:2952 +#: sequencer.c:2960 #, c-format msgid "cannot read '%s': %s" msgstr "Kann '%s' nicht lesen: %s" -#: sequencer.c:2953 +#: sequencer.c:2961 msgid "unexpected end of file" msgstr "Unerwartetes Dateiende" -#: sequencer.c:2959 +#: sequencer.c:2967 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "gespeicherte \"pre-cherry-pick\" HEAD Datei '%s' ist beschädigt" -#: sequencer.c:2970 +#: sequencer.c:2978 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "" "Sie scheinen HEAD verändert zu haben. Keine Rückspulung, prüfen Sie HEAD." -#: sequencer.c:3011 +#: sequencer.c:3019 msgid "no revert in progress" msgstr "Kein Revert im Gange" -#: sequencer.c:3020 +#: sequencer.c:3028 msgid "no cherry-pick in progress" msgstr "kein \"cherry-pick\" im Gange" -#: sequencer.c:3030 +#: sequencer.c:3038 msgid "failed to skip the commit" msgstr "Überspringen des Commits fehlgeschlagen" -#: sequencer.c:3037 +#: sequencer.c:3045 msgid "there is nothing to skip" msgstr "Nichts zum Überspringen vorhanden" -#: sequencer.c:3040 +#: sequencer.c:3048 #, c-format msgid "" "have you committed already?\n" @@ -7428,16 +8046,16 @@ msgstr "" "Haben Sie bereits committet?\n" "Versuchen Sie \"git %s --continue\"" -#: sequencer.c:3202 sequencer.c:4263 +#: sequencer.c:3210 sequencer.c:4271 msgid "cannot read HEAD" msgstr "Kann HEAD nicht lesen" -#: sequencer.c:3219 +#: sequencer.c:3227 #, c-format msgid "unable to copy '%s' to '%s'" msgstr "Konnte '%s' nicht nach '%s' kopieren." -#: sequencer.c:3227 +#: sequencer.c:3235 #, c-format msgid "" "You can amend the commit now, with\n" @@ -7456,27 +8074,27 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:3237 +#: sequencer.c:3245 #, c-format msgid "Could not apply %s... %.*s" msgstr "Konnte %s... (%.*s) nicht anwenden" -#: sequencer.c:3244 +#: sequencer.c:3252 #, c-format msgid "Could not merge %.*s" msgstr "Konnte \"%.*s\" nicht zusammenführen." -#: sequencer.c:3258 sequencer.c:3262 builtin/difftool.c:640 +#: sequencer.c:3266 sequencer.c:3270 builtin/difftool.c:640 #, c-format msgid "could not copy '%s' to '%s'" msgstr "Konnte '%s' nicht nach '%s' kopieren." -#: sequencer.c:3274 +#: sequencer.c:3282 #, c-format msgid "Executing: %s\n" msgstr "Führe aus: %s\n" -#: sequencer.c:3289 +#: sequencer.c:3297 #, c-format msgid "" "execution failed: %s\n" @@ -7492,11 +8110,11 @@ msgstr "" "\n" "ausführen.\n" -#: sequencer.c:3295 +#: sequencer.c:3303 msgid "and made changes to the index and/or the working tree\n" msgstr "Der Index und/oder das Arbeitsverzeichnis wurde geändert.\n" -#: sequencer.c:3301 +#: sequencer.c:3309 #, c-format msgid "" "execution succeeded: %s\n" @@ -7514,91 +8132,91 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3362 +#: sequencer.c:3370 #, c-format msgid "illegal label name: '%.*s'" msgstr "Unerlaubter Beschriftungsname: '%.*s'" -#: sequencer.c:3416 +#: sequencer.c:3424 msgid "writing fake root commit" msgstr "unechten Root-Commit schreiben" -#: sequencer.c:3421 +#: sequencer.c:3429 msgid "writing squash-onto" msgstr "squash-onto schreiben" -#: sequencer.c:3505 +#: sequencer.c:3513 #, c-format msgid "could not resolve '%s'" msgstr "Konnte '%s' nicht auflösen." -#: sequencer.c:3538 +#: sequencer.c:3546 msgid "cannot merge without a current revision" msgstr "Kann nicht ohne einen aktuellen Commit mergen." -#: sequencer.c:3560 +#: sequencer.c:3568 #, c-format msgid "unable to parse '%.*s'" msgstr "Konnte '%.*s' nicht parsen." -#: sequencer.c:3569 +#: sequencer.c:3577 #, c-format msgid "nothing to merge: '%.*s'" msgstr "Nichts zum Zusammenführen: '%.*s'" -#: sequencer.c:3581 +#: sequencer.c:3589 msgid "octopus merge cannot be executed on top of a [new root]" msgstr "" "Oktopus-Merge kann nicht auf Basis von [neuem Root-Commit] ausgeführt werden." -#: sequencer.c:3597 +#: sequencer.c:3605 #, c-format msgid "could not get commit message of '%s'" msgstr "Konnte keine Commit-Beschreibung von '%s' bekommen." -#: sequencer.c:3780 +#: sequencer.c:3788 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "Konnte nicht einmal versuchen '%.*s' zu mergen." -#: sequencer.c:3796 +#: sequencer.c:3804 msgid "merge: Unable to write new index file" msgstr "merge: Konnte neue Index-Datei nicht schreiben." -#: sequencer.c:3870 +#: sequencer.c:3878 msgid "Cannot autostash" msgstr "Kann automatischen Stash nicht erzeugen." -#: sequencer.c:3873 +#: sequencer.c:3881 #, c-format msgid "Unexpected stash response: '%s'" msgstr "Unerwartete 'stash'-Antwort: '%s'" -#: sequencer.c:3879 +#: sequencer.c:3887 #, c-format msgid "Could not create directory for '%s'" msgstr "Konnte Verzeichnis für '%s' nicht erstellen." -#: sequencer.c:3882 +#: sequencer.c:3890 #, c-format msgid "Created autostash: %s\n" msgstr "Automatischen Stash erzeugt: %s\n" -#: sequencer.c:3886 +#: sequencer.c:3894 msgid "could not reset --hard" msgstr "Konnte 'reset --hard' nicht ausführen." -#: sequencer.c:3911 +#: sequencer.c:3919 #, c-format msgid "Applied autostash.\n" msgstr "Automatischen Stash angewendet.\n" -#: sequencer.c:3923 +#: sequencer.c:3931 #, c-format msgid "cannot store %s" msgstr "kann %s nicht speichern" -#: sequencer.c:3926 +#: sequencer.c:3934 #, c-format msgid "" "%s\n" @@ -7609,29 +8227,29 @@ msgstr "" "Ihre Änderungen sind im Stash sicher.\n" "Sie können jederzeit \"git stash pop\" oder \"git stash drop\" ausführen.\n" -#: sequencer.c:3931 +#: sequencer.c:3939 msgid "Applying autostash resulted in conflicts." msgstr "Beim Anwenden des automatischen Stash traten Konflikte auf." -#: sequencer.c:3932 +#: sequencer.c:3940 msgid "Autostash exists; creating a new stash entry." msgstr "Automatischer Stash existiert; ein neuer Stash-Eintrag wird erstellt." -#: sequencer.c:4025 git-rebase--preserve-merges.sh:769 +#: sequencer.c:4033 git-rebase--preserve-merges.sh:769 msgid "could not detach HEAD" msgstr "Konnte HEAD nicht loslösen" -#: sequencer.c:4040 +#: sequencer.c:4048 #, c-format msgid "Stopped at HEAD\n" msgstr "Angehalten bei HEAD\n" -#: sequencer.c:4042 +#: sequencer.c:4050 #, c-format msgid "Stopped at %s\n" msgstr "Angehalten bei %s\n" -#: sequencer.c:4050 +#: sequencer.c:4058 #, c-format msgid "" "Could not execute the todo command\n" @@ -7653,60 +8271,60 @@ msgstr "" " git rebase --edit-todo\n" " git rebase --continue\n" -#: sequencer.c:4096 +#: sequencer.c:4104 #, c-format msgid "Rebasing (%d/%d)%s" msgstr "Rebase (%d/%d)%s" -#: sequencer.c:4141 +#: sequencer.c:4149 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "Angehalten bei %s... %.*s\n" -#: sequencer.c:4212 +#: sequencer.c:4220 #, c-format msgid "unknown command %d" msgstr "Unbekannter Befehl %d" -#: sequencer.c:4271 +#: sequencer.c:4279 msgid "could not read orig-head" msgstr "Konnte orig-head nicht lesen." -#: sequencer.c:4276 +#: sequencer.c:4284 msgid "could not read 'onto'" msgstr "Konnte 'onto' nicht lesen." -#: sequencer.c:4290 +#: sequencer.c:4298 #, c-format msgid "could not update HEAD to %s" msgstr "Konnte HEAD nicht auf %s aktualisieren." -#: sequencer.c:4350 +#: sequencer.c:4358 #, c-format msgid "Successfully rebased and updated %s.\n" msgstr "Erfolgreich Rebase ausgeführt und %s aktualisiert.\n" -#: sequencer.c:4383 +#: sequencer.c:4391 msgid "cannot rebase: You have unstaged changes." msgstr "" "Rebase nicht möglich: Sie haben Änderungen, die nicht zum Commit\n" "vorgemerkt sind." -#: sequencer.c:4392 +#: sequencer.c:4400 msgid "cannot amend non-existing commit" msgstr "Kann nicht existierenden Commit nicht nachbessern." -#: sequencer.c:4394 +#: sequencer.c:4402 #, c-format msgid "invalid file: '%s'" msgstr "Ungültige Datei: '%s'" -#: sequencer.c:4396 +#: sequencer.c:4404 #, c-format msgid "invalid contents: '%s'" msgstr "Ungültige Inhalte: '%s'" -#: sequencer.c:4399 +#: sequencer.c:4407 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -7717,50 +8335,50 @@ msgstr "" "committen Sie diese zuerst und führen Sie dann 'git rebase --continue'\n" "erneut aus." -#: sequencer.c:4435 sequencer.c:4474 +#: sequencer.c:4443 sequencer.c:4482 #, c-format msgid "could not write file: '%s'" msgstr "Konnte Datei nicht schreiben: '%s'" -#: sequencer.c:4490 +#: sequencer.c:4498 msgid "could not remove CHERRY_PICK_HEAD" msgstr "Konnte CHERRY_PICK_HEAD nicht löschen." -#: sequencer.c:4497 +#: sequencer.c:4505 msgid "could not commit staged changes." msgstr "Konnte Änderungen aus der Staging-Area nicht committen." -#: sequencer.c:4613 +#: sequencer.c:4621 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: %s kann nicht in \"cherry-pick\" benutzt werden" -#: sequencer.c:4617 +#: sequencer.c:4625 #, c-format msgid "%s: bad revision" msgstr "%s: ungültiger Commit" -#: sequencer.c:4652 +#: sequencer.c:4660 msgid "can't revert as initial commit" msgstr "Kann nicht als allerersten Commit einen Revert ausführen." -#: sequencer.c:5129 +#: sequencer.c:5137 msgid "make_script: unhandled options" msgstr "make_script: unbehandelte Optionen" -#: sequencer.c:5132 +#: sequencer.c:5140 msgid "make_script: error preparing revisions" msgstr "make_script: Fehler beim Vorbereiten der Commits" -#: sequencer.c:5374 sequencer.c:5391 +#: sequencer.c:5382 sequencer.c:5399 msgid "nothing to do" msgstr "Nichts zu tun." -#: sequencer.c:5410 +#: sequencer.c:5418 msgid "could not skip unnecessary pick commands" msgstr "Konnte unnötige \"pick\"-Befehle nicht auslassen." -#: sequencer.c:5504 +#: sequencer.c:5512 msgid "the script was already rearranged." msgstr "Das Script wurde bereits umgeordnet." @@ -7775,7 +8393,7 @@ msgid "" "%s: no such path in the working tree.\n" "Use 'git <command> -- <path>...' to specify paths that do not exist locally." msgstr "" -"%s: kein solcher Pfad im Arbeitsverzeichnis.\n" +"%s: Pfad nicht im Arbeitsverzeichnis gefunden.\n" "Benutzen Sie 'git <Befehl> -- <Pfad>...' zur Angabe von Pfaden, die lokal\n" "nicht existieren." @@ -7929,370 +8547,6 @@ msgstr "fork fehlgeschlagen" msgid "setsid failed" msgstr "setsid fehlgeschlagen" -#: sha1-file.c:480 -#, c-format -msgid "object directory %s does not exist; check .git/objects/info/alternates" -msgstr "" -"Objektverzeichnis %s existiert nicht; prüfe .git/objects/info/alternates" - -#: sha1-file.c:531 -#, c-format -msgid "unable to normalize alternate object path: %s" -msgstr "Konnte alternativen Objektpfad '%s' nicht normalisieren." - -#: sha1-file.c:603 -#, c-format -msgid "%s: ignoring alternate object stores, nesting too deep" -msgstr "%s: ignoriere alternative Objektspeicher - Verschachtelung zu tief" - -#: sha1-file.c:610 -#, c-format -msgid "unable to normalize object directory: %s" -msgstr "Konnte Objektverzeichnis '%s' nicht normalisieren." - -#: sha1-file.c:653 -msgid "unable to fdopen alternates lockfile" -msgstr "Konnte fdopen nicht auf Lock-Datei für \"alternates\" aufrufen." - -#: sha1-file.c:671 -msgid "unable to read alternates file" -msgstr "Konnte \"alternates\"-Datei nicht lesen." - -#: sha1-file.c:678 -msgid "unable to move new alternates file into place" -msgstr "Konnte neue \"alternates\"-Datei nicht übernehmen." - -#: sha1-file.c:713 -#, c-format -msgid "path '%s' does not exist" -msgstr "Pfad '%s' existiert nicht" - -#: sha1-file.c:734 -#, c-format -msgid "reference repository '%s' as a linked checkout is not supported yet." -msgstr "" -"Referenziertes Repository '%s' wird noch nicht als verknüpftes\n" -"Arbeitsverzeichnis unterstützt." - -#: sha1-file.c:740 -#, c-format -msgid "reference repository '%s' is not a local repository." -msgstr "Referenziertes Repository '%s' ist kein lokales Repository." - -#: sha1-file.c:746 -#, c-format -msgid "reference repository '%s' is shallow" -msgstr "" -"Referenziertes Repository '%s' hat eine unvollständige Historie (shallow)." - -#: sha1-file.c:754 -#, c-format -msgid "reference repository '%s' is grafted" -msgstr "" -"Referenziertes Repository '%s' ist mit künstlichen Vorgängern (\"grafts\") " -"eingehängt." - -#: sha1-file.c:814 -#, c-format -msgid "invalid line while parsing alternate refs: %s" -msgstr "Ungültige Zeile beim Parsen alternativer Referenzen: %s" - -#: sha1-file.c:964 -#, c-format -msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" -msgstr "Versuche mmap %<PRIuMAX> über Limit %<PRIuMAX>." - -#: sha1-file.c:985 -msgid "mmap failed" -msgstr "mmap fehlgeschlagen" - -#: sha1-file.c:1149 -#, c-format -msgid "object file %s is empty" -msgstr "Objektdatei %s ist leer." - -#: sha1-file.c:1284 sha1-file.c:2477 -#, c-format -msgid "corrupt loose object '%s'" -msgstr "Fehlerhaftes loses Objekt '%s'." - -#: sha1-file.c:1286 sha1-file.c:2481 -#, c-format -msgid "garbage at end of loose object '%s'" -msgstr "Nutzlose Daten am Ende von losem Objekt '%s'." - -#: sha1-file.c:1328 -msgid "invalid object type" -msgstr "ungültiger Objekt-Typ" - -#: sha1-file.c:1412 -#, c-format -msgid "unable to unpack %s header with --allow-unknown-type" -msgstr "Konnte %s Kopfbereich nicht mit --allow-unknown-type entpacken." - -#: sha1-file.c:1415 -#, c-format -msgid "unable to unpack %s header" -msgstr "Konnte %s Kopfbereich nicht entpacken." - -#: sha1-file.c:1421 -#, c-format -msgid "unable to parse %s header with --allow-unknown-type" -msgstr "Konnte %s Kopfbereich mit --allow-unknown-type nicht parsen." - -#: sha1-file.c:1424 -#, c-format -msgid "unable to parse %s header" -msgstr "Konnte %s Kopfbereich nicht parsen." - -#: sha1-file.c:1651 -#, c-format -msgid "failed to read object %s" -msgstr "Konnte Objekt %s nicht lesen." - -#: sha1-file.c:1655 -#, c-format -msgid "replacement %s not found for %s" -msgstr "Ersetzung %s für %s nicht gefunden." - -#: sha1-file.c:1659 -#, c-format -msgid "loose object %s (stored in %s) is corrupt" -msgstr "Loses Objekt %s (gespeichert in %s) ist beschädigt." - -#: sha1-file.c:1663 -#, c-format -msgid "packed object %s (stored in %s) is corrupt" -msgstr "Gepacktes Objekt %s (gespeichert in %s) ist beschädigt." - -#: sha1-file.c:1768 -#, c-format -msgid "unable to write file %s" -msgstr "Konnte Datei %s nicht schreiben." - -#: sha1-file.c:1775 -#, c-format -msgid "unable to set permission to '%s'" -msgstr "Konnte Zugriffsberechtigung auf '%s' nicht setzen." - -#: sha1-file.c:1782 -msgid "file write error" -msgstr "Fehler beim Schreiben einer Datei." - -#: sha1-file.c:1802 -msgid "error when closing loose object file" -msgstr "Fehler beim Schließen der Datei für lose Objekte." - -#: sha1-file.c:1867 -#, c-format -msgid "insufficient permission for adding an object to repository database %s" -msgstr "" -"Unzureichende Berechtigung zum Hinzufügen eines Objektes zur Repository-" -"Datenbank %s" - -#: sha1-file.c:1869 -msgid "unable to create temporary file" -msgstr "Konnte temporäre Datei nicht erstellen." - -#: sha1-file.c:1893 -msgid "unable to write loose object file" -msgstr "Fehler beim Schreiben der Datei für lose Objekte." - -#: sha1-file.c:1899 -#, c-format -msgid "unable to deflate new object %s (%d)" -msgstr "Konnte neues Objekt %s (%d) nicht komprimieren." - -#: sha1-file.c:1903 -#, c-format -msgid "deflateEnd on object %s failed (%d)" -msgstr "deflateEnd auf Objekt %s fehlgeschlagen (%d)" - -#: sha1-file.c:1907 -#, c-format -msgid "confused by unstable object source data for %s" -msgstr "Fehler wegen instabilen Objektquelldaten für %s" - -#: sha1-file.c:1917 builtin/pack-objects.c:1086 -#, c-format -msgid "failed utime() on %s" -msgstr "Fehler beim Aufruf von utime() auf '%s'." - -#: sha1-file.c:1994 -#, c-format -msgid "cannot read object for %s" -msgstr "Kann Objekt für %s nicht lesen." - -#: sha1-file.c:2045 -msgid "corrupt commit" -msgstr "fehlerhafter Commit" - -#: sha1-file.c:2053 -msgid "corrupt tag" -msgstr "fehlerhaftes Tag" - -#: sha1-file.c:2153 -#, c-format -msgid "read error while indexing %s" -msgstr "Lesefehler beim Indizieren von '%s'." - -#: sha1-file.c:2156 -#, c-format -msgid "short read while indexing %s" -msgstr "read() zu kurz beim Indizieren von '%s'." - -#: sha1-file.c:2229 sha1-file.c:2239 -#, c-format -msgid "%s: failed to insert into database" -msgstr "%s: Fehler beim Einfügen in die Datenbank" - -#: sha1-file.c:2245 -#, c-format -msgid "%s: unsupported file type" -msgstr "%s: nicht unterstützte Dateiart" - -#: sha1-file.c:2269 -#, c-format -msgid "%s is not a valid object" -msgstr "%s ist kein gültiges Objekt" - -#: sha1-file.c:2271 -#, c-format -msgid "%s is not a valid '%s' object" -msgstr "%s ist kein gültiges '%s' Objekt" - -#: sha1-file.c:2298 builtin/index-pack.c:192 -#, c-format -msgid "unable to open %s" -msgstr "kann %s nicht öffnen" - -#: sha1-file.c:2488 sha1-file.c:2541 -#, c-format -msgid "hash mismatch for %s (expected %s)" -msgstr "Hash für %s stimmt nicht überein (%s erwartet)." - -#: sha1-file.c:2512 -#, c-format -msgid "unable to mmap %s" -msgstr "Konnte mmap nicht auf %s ausführen." - -#: sha1-file.c:2517 -#, c-format -msgid "unable to unpack header of %s" -msgstr "Konnte Kopfbereich von %s nicht entpacken." - -#: sha1-file.c:2523 -#, c-format -msgid "unable to parse header of %s" -msgstr "Konnte Kopfbereich von %s nicht parsen." - -#: sha1-file.c:2534 -#, c-format -msgid "unable to unpack contents of %s" -msgstr "Konnte Inhalt von %s nicht entpacken." - -#: sha1-name.c:486 -#, c-format -msgid "short SHA1 %s is ambiguous" -msgstr "Kurzer SHA-1 %s ist mehrdeutig." - -#: sha1-name.c:497 -msgid "The candidates are:" -msgstr "Die Kandidaten sind:" - -#: sha1-name.c:796 -msgid "" -"Git normally never creates a ref that ends with 40 hex characters\n" -"because it will be ignored when you just specify 40-hex. These refs\n" -"may be created by mistake. For example,\n" -"\n" -" git switch -c $br $(git rev-parse ...)\n" -"\n" -"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n" -"examine these refs and maybe delete them. Turn this message off by\n" -"running \"git config advice.objectNameWarning false\"" -msgstr "" -"Git erzeugt normalerweise keine Referenzen die mit\n" -"40 Hex-Zeichen enden, da diese ignoriert werden wenn\n" -"Sie diese angeben. Diese Referenzen könnten aus Versehen\n" -"erzeugt worden sein. Zum Beispiel,\n" -"\n" -" git switch -c $br $(git rev-parse ...)\n" -"\n" -"wobei \"$br\" leer ist und eine 40-Hex-Referenz erzeugt\n" -"wurde. Bitte prüfen Sie diese Referenzen und löschen\n" -"Sie sie gegebenenfalls. Unterdrücken Sie diese Meldung\n" -"indem Sie \"git config advice.objectNameWarning false\"\n" -"ausführen." - -#: sha1-name.c:916 -#, c-format -msgid "log for '%.*s' only goes back to %s" -msgstr "Log für '%.*s' geht nur bis %s zurück" - -#: sha1-name.c:924 -#, c-format -msgid "log for '%.*s' only has %d entries" -msgstr "Log für '%.*s' hat nur %d Einträge" - -#: sha1-name.c:1702 -#, c-format -msgid "path '%s' exists on disk, but not in '%.*s'" -msgstr "Pfad '%s' befindet sich im Dateisystem, aber nicht in '%.*s'" - -#: sha1-name.c:1708 -#, c-format -msgid "" -"path '%s' exists, but not '%s'\n" -"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?" -msgstr "" -"Pfad '%s' existiert, aber nicht '%s'\n" -"Hinweis: Meinten Sie '%.*s:%s' auch bekannt als '%.*s:./%s'?" - -#: sha1-name.c:1717 -#, c-format -msgid "path '%s' does not exist in '%.*s'" -msgstr "Pfad '%s' existiert nicht in '%.*s'" - -#: sha1-name.c:1745 -#, c-format -msgid "" -"path '%s' is in the index, but not at stage %d\n" -"hint: Did you mean ':%d:%s'?" -msgstr "" -"Pfad '%s' ist im Index, aber nicht in Stufe %d\n" -"Hinweis: Meinten Sie ':%d:%s'?" - -#: sha1-name.c:1761 -#, c-format -msgid "" -"path '%s' is in the index, but not '%s'\n" -"hint: Did you mean ':%d:%s' aka ':%d:./%s'?" -msgstr "" -"Pfad '%s' ist im Index, aber nicht '%s'\n" -"Hinweis: Meinten Sie ':%d:%s' auch bekannt als ':%d:./%s'?" - -#: sha1-name.c:1769 -#, c-format -msgid "path '%s' exists on disk, but not in the index" -msgstr "Pfad '%s' existiert im Dateisystem, aber nicht im Index" - -#: sha1-name.c:1771 -#, c-format -msgid "path '%s' does not exist (neither on disk nor in the index)" -msgstr "Pfad '%s' existiert nicht (weder im Dateisystem noch im Index)" - -#: sha1-name.c:1784 -msgid "relative path syntax can't be used outside working tree" -msgstr "" -"Die Syntax für relative Pfade kann nicht außerhalb des Arbeitsverzeichnisses " -"benutzt werden." - -#: sha1-name.c:1922 -#, c-format -msgid "invalid object name '%.*s'." -msgstr "ungültiger Objektname '%.*s'." - #. TRANSLATORS: IEC 80000-13:2008 gibibyte #: strbuf.c:848 #, c-format @@ -8346,7 +8600,7 @@ msgstr[0] "%u Byte/s" msgstr[1] "%u Bytes/s" #: strbuf.c:1166 wrapper.c:199 wrapper.c:369 builtin/am.c:719 -#: builtin/rebase.c:864 +#: builtin/rebase.c:866 #, c-format msgid "could not open '%s' for writing" msgstr "Konnte '%s' nicht zum Schreiben öffnen." @@ -8412,12 +8666,12 @@ msgstr "In nicht ausgechecktem Submodul '%s'." msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "Pfadspezifikation '%s' befindet sich in Submodul '%.*s'" -#: submodule.c:434 +#: submodule.c:435 #, c-format msgid "bad --ignore-submodules argument: %s" msgstr "ungültiges --ignore-submodules Argument: %s" -#: submodule.c:816 +#: submodule.c:817 #, c-format msgid "" "Submodule in commit %s at path: '%s' collides with a submodule named the " @@ -8426,12 +8680,12 @@ msgstr "" "Submodul in Commit %s beim Pfad: '%s' hat den gleichen Namen wie ein " "Submodul. Wird übersprungen." -#: submodule.c:919 +#: submodule.c:920 #, c-format msgid "submodule entry '%s' (%s) is a %s, not a commit" msgstr "Submodul-Eintrag '%s' (%s) ist ein %s, kein Commit." -#: submodule.c:1004 +#: submodule.c:1005 #, c-format msgid "" "Could not run 'git rev-list <commits> --not --remotes -n 1' command in " @@ -8440,36 +8694,36 @@ msgstr "" "Konnte 'git rev-list <Commits> --not --remotes -n 1' nicht in Submodul '%s' " "ausführen." -#: submodule.c:1127 +#: submodule.c:1128 #, c-format msgid "process for submodule '%s' failed" msgstr "Prozess für Submodul '%s' fehlgeschlagen" -#: submodule.c:1156 builtin/branch.c:680 builtin/submodule--helper.c:2469 +#: submodule.c:1157 builtin/branch.c:689 builtin/submodule--helper.c:2469 msgid "Failed to resolve HEAD as a valid ref." msgstr "Konnte HEAD nicht als gültige Referenz auflösen." -#: submodule.c:1167 +#: submodule.c:1168 #, c-format msgid "Pushing submodule '%s'\n" msgstr "Pushe Submodul '%s'\n" -#: submodule.c:1170 +#: submodule.c:1171 #, c-format msgid "Unable to push submodule '%s'\n" msgstr "Kann Push für Submodul '%s' nicht ausführen\n" -#: submodule.c:1462 +#: submodule.c:1463 #, c-format msgid "Fetching submodule %s%s\n" msgstr "Anfordern des Submoduls %s%s\n" -#: submodule.c:1492 +#: submodule.c:1497 #, c-format msgid "Could not access submodule '%s'\n" msgstr "Konnte nicht auf Submodul '%s' zugreifen\n" -#: submodule.c:1646 +#: submodule.c:1652 #, c-format msgid "" "Errors during submodule fetch:\n" @@ -8478,62 +8732,62 @@ msgstr "" "Fehler während des Anforderns der Submodule:\n" "%s" -#: submodule.c:1671 +#: submodule.c:1677 #, c-format msgid "'%s' not recognized as a git repository" msgstr "'%s' nicht als Git-Repository erkannt" -#: submodule.c:1688 +#: submodule.c:1694 #, c-format msgid "Could not run 'git status --porcelain=2' in submodule %s" msgstr "Konnte 'git status --porcelain=2' nicht in Submodul %s ausführen" -#: submodule.c:1729 +#: submodule.c:1735 #, c-format msgid "'git status --porcelain=2' failed in submodule %s" msgstr "'git status --porcelain=2' ist in Submodul %s fehlgeschlagen" -#: submodule.c:1804 +#: submodule.c:1810 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "Konnte 'git status' in Submodul '%s' nicht starten." -#: submodule.c:1817 +#: submodule.c:1823 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "Konnte 'git status' in Submodul '%s' nicht ausführen." -#: submodule.c:1832 +#: submodule.c:1838 #, c-format msgid "Could not unset core.worktree setting in submodule '%s'" msgstr "Konnte core.worktree Einstellung in Submodul '%s' nicht aufheben." -#: submodule.c:1859 submodule.c:2169 +#: submodule.c:1865 submodule.c:2175 #, c-format msgid "could not recurse into submodule '%s'" msgstr "Fehler bei Rekursion in Submodul-Pfad '%s'" -#: submodule.c:1880 +#: submodule.c:1886 msgid "could not reset submodule index" msgstr "konnte Index des Submoduls nicht zurücksetzen" -#: submodule.c:1922 +#: submodule.c:1928 #, c-format msgid "submodule '%s' has dirty index" msgstr "Submodul '%s' hat einen geänderten Index." -#: submodule.c:1974 +#: submodule.c:1980 #, c-format msgid "Submodule '%s' could not be updated." msgstr "Submodule '%s' konnte nicht aktualisiert werden." -#: submodule.c:2042 +#: submodule.c:2048 #, c-format msgid "submodule git dir '%s' is inside git dir '%.*s'" msgstr "" "Git-Verzeichnis des Submoduls '%s' ist im Git-Verzeichnis '%.*s' enthalten." -#: submodule.c:2063 +#: submodule.c:2069 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" @@ -8541,17 +8795,17 @@ msgstr "" "relocate_gitdir für Submodul '%s' mit mehr als einem Arbeitsverzeichnis\n" "wird nicht unterstützt" -#: submodule.c:2075 submodule.c:2134 +#: submodule.c:2081 submodule.c:2140 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "Konnte Name für Submodul '%s' nicht nachschlagen." -#: submodule.c:2079 +#: submodule.c:2085 #, c-format msgid "refusing to move '%s' into an existing git dir" msgstr "Verschieben von '%s' in ein existierendes Git-Verzeichnis verweigert." -#: submodule.c:2086 +#: submodule.c:2092 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -8562,11 +8816,11 @@ msgstr "" "'%s' nach\n" "'%s'\n" -#: submodule.c:2214 +#: submodule.c:2220 msgid "could not start ls-files in .." msgstr "Konnte 'ls-files' nicht in .. starten" -#: submodule.c:2254 +#: submodule.c:2260 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree mit unerwartetem Rückgabewert %d beendet" @@ -8597,7 +8851,7 @@ msgstr "leerer Anhang-Token in Anhang '%.*s'" msgid "could not read input file '%s'" msgstr "Konnte Eingabe-Datei '%s' nicht lesen" -#: trailer.c:751 +#: trailer.c:751 builtin/mktag.c:91 msgid "could not read from stdin" msgstr "konnte nicht von der Standard-Eingabe lesen" @@ -8671,7 +8925,7 @@ msgstr "konnte \"fast-import\" nicht ausführen" msgid "error while running fast-import" msgstr "Fehler beim Ausführen von 'fast-import'." -#: transport-helper.c:549 transport-helper.c:1236 +#: transport-helper.c:549 transport-helper.c:1237 #, c-format msgid "could not read ref %s" msgstr "konnte Referenz %s nicht lesen" @@ -8690,7 +8944,7 @@ msgstr "" msgid "invalid remote service path" msgstr "ungültiger Remote-Service Pfad." -#: transport-helper.c:661 transport.c:1446 +#: transport-helper.c:661 transport.c:1447 msgid "operation not supported by protocol" msgstr "die Operation wird von dem Protokoll nicht unterstützt" @@ -8769,52 +9023,52 @@ msgstr "" "Keine gemeinsamen Referenzen und nichts spezifiziert; keine Ausführung.\n" "Vielleicht sollten Sie einen Branch angeben.\n" -#: transport-helper.c:1213 +#: transport-helper.c:1214 #, c-format msgid "unsupported object format '%s'" msgstr "nicht unterstütztes Objekt-Format '%s'" -#: transport-helper.c:1222 +#: transport-helper.c:1223 #, c-format msgid "malformed response in ref list: %s" msgstr "Ungültige Antwort in Referenzliste: %s" -#: transport-helper.c:1374 +#: transport-helper.c:1375 #, c-format msgid "read(%s) failed" msgstr "Lesen von %s fehlgeschlagen." -#: transport-helper.c:1401 +#: transport-helper.c:1402 #, c-format msgid "write(%s) failed" msgstr "Schreiben von %s fehlgeschlagen." -#: transport-helper.c:1450 +#: transport-helper.c:1451 #, c-format msgid "%s thread failed" msgstr "Thread %s fehlgeschlagen." -#: transport-helper.c:1454 +#: transport-helper.c:1455 #, c-format msgid "%s thread failed to join: %s" msgstr "Fehler beim Beitreten zu Thread %s: %s" -#: transport-helper.c:1473 transport-helper.c:1477 +#: transport-helper.c:1474 transport-helper.c:1478 #, c-format msgid "can't start thread for copying data: %s" msgstr "Kann Thread zum Kopieren von Daten nicht starten: %s" -#: transport-helper.c:1514 +#: transport-helper.c:1515 #, c-format msgid "%s process failed to wait" msgstr "Fehler beim Warten von Prozess %s." -#: transport-helper.c:1518 +#: transport-helper.c:1519 #, c-format msgid "%s process failed" msgstr "Prozess %s fehlgeschlagen" -#: transport-helper.c:1536 transport-helper.c:1545 +#: transport-helper.c:1537 transport-helper.c:1546 msgid "can't start thread for copying data" msgstr "Kann Thread zum Kopieren von Daten nicht starten." @@ -8903,23 +9157,23 @@ msgstr "" msgid "Aborting." msgstr "Abbruch." -#: transport.c:1315 +#: transport.c:1316 msgid "failed to push all needed submodules" msgstr "Fehler beim Versand aller erforderlichen Submodule." -#: tree-walk.c:32 +#: tree-walk.c:33 msgid "too-short tree object" msgstr "zu kurzes Tree-Objekt" -#: tree-walk.c:38 +#: tree-walk.c:39 msgid "malformed mode in tree entry" msgstr "fehlerhafter Modus in Tree-Eintrag" -#: tree-walk.c:42 +#: tree-walk.c:43 msgid "empty filename in tree entry" msgstr "leerer Dateiname in Tree-Eintrag" -#: tree-walk.c:117 +#: tree-walk.c:118 msgid "too-short tree file" msgstr "zu kurze Tree-Datei" @@ -9197,7 +9451,7 @@ msgstr "" msgid "Updating index flags" msgstr "Aktualisiere Index-Markierungen" -#: upload-pack.c:1550 +#: upload-pack.c:1543 msgid "expected flush after fetch arguments" msgstr "erwartete Flush nach Abrufen der Argumente" @@ -9234,72 +9488,103 @@ msgstr "ungültiges '..' Pfadsegment" msgid "Fetching objects" msgstr "Anfordern der Objekte" -#: worktree.c:236 builtin/am.c:2103 +#: worktree.c:238 builtin/am.c:2103 #, c-format msgid "failed to read '%s'" msgstr "Fehler beim Lesen von '%s'" -#: worktree.c:283 +#: worktree.c:304 #, c-format msgid "'%s' at main working tree is not the repository directory" msgstr "'%s' im Hauptarbeitsverzeichnis ist nicht das Repository-Verzeichnis." -#: worktree.c:294 +#: worktree.c:315 #, c-format msgid "'%s' file does not contain absolute path to the working tree location" msgstr "'%s' Datei enthält nicht den absoluten Pfad zum Arbeitsverzeichnis." -#: worktree.c:306 +#: worktree.c:327 #, c-format msgid "'%s' does not exist" msgstr "'%s' existiert nicht." -#: worktree.c:312 +#: worktree.c:333 #, c-format msgid "'%s' is not a .git file, error code %d" msgstr "'%s' ist keine .git-Datei, Fehlercode %d" -#: worktree.c:321 +#: worktree.c:342 #, c-format msgid "'%s' does not point back to '%s'" msgstr "'%s' zeigt nicht zurück auf '%s'" -#: worktree.c:587 +#: worktree.c:608 msgid "not a directory" msgstr "kein Verzeichnis" -#: worktree.c:596 +#: worktree.c:617 msgid ".git is not a file" msgstr ".git ist keine Datei" -#: worktree.c:598 +#: worktree.c:619 msgid ".git file broken" msgstr ".git-Datei kaputt" -#: worktree.c:600 +#: worktree.c:621 msgid ".git file incorrect" msgstr ".git-Datei fehlerhaft" -#: worktree.c:670 +#: worktree.c:727 msgid "not a valid path" msgstr "kein gültiger Pfad" -#: worktree.c:676 +#: worktree.c:733 msgid "unable to locate repository; .git is not a file" msgstr "Konnte Repository nicht finden; .git ist keine Datei" -#: worktree.c:679 +#: worktree.c:737 +msgid "unable to locate repository; .git file does not reference a repository" +msgstr "" +"konnte Repository nicht finden; .git-Datei referenziert kein Repository" + +#: worktree.c:741 msgid "unable to locate repository; .git file broken" msgstr "Konnte Repository nicht finden; .git-Datei ist kaputt" -#: worktree.c:685 +#: worktree.c:747 msgid "gitdir unreadable" msgstr "gitdir nicht lesbar" -#: worktree.c:689 +#: worktree.c:751 msgid "gitdir incorrect" msgstr "gitdir fehlerhaft" +#: worktree.c:776 +msgid "not a valid directory" +msgstr "kein gültiges Verzeichnis" + +#: worktree.c:782 +msgid "gitdir file does not exist" +msgstr "gitdir-Datei existiert nicht" + +#: worktree.c:787 worktree.c:796 +#, c-format +msgid "unable to read gitdir file (%s)" +msgstr "konnte gitdir-Datei nicht lesen (%s)" + +#: worktree.c:806 +#, c-format +msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)" +msgstr "read() zu kurz (%<PRIuMAX> Bytes erwartet, %<PRIuMAX> gelesen)" + +#: worktree.c:814 +msgid "invalid gitdir file" +msgstr "ungültige gitdir-Datei" + +#: worktree.c:822 +msgid "gitdir file points to non-existent location" +msgstr "gitdir-Datei verweist auf nicht existierenden Ort" + #: wrapper.c:197 wrapper.c:367 #, c-format msgid "could not open '%s' for reading and writing" @@ -9353,11 +9638,11 @@ msgid " (use \"git rm <file>...\" to mark resolution)" msgstr "" " (benutzen Sie \"git add/rm <Datei>...\", um die Auflösung zu markieren)" -#: wt-status.c:211 wt-status.c:1070 +#: wt-status.c:211 wt-status.c:1072 msgid "Changes to be committed:" msgstr "Zum Commit vorgemerkte Änderungen:" -#: wt-status.c:234 wt-status.c:1079 +#: wt-status.c:234 wt-status.c:1081 msgid "Changes not staged for commit:" msgstr "Änderungen, die nicht zum Commit vorgemerkt sind:" @@ -9465,22 +9750,22 @@ msgstr "geänderter Inhalt, " msgid "untracked content, " msgstr "unversionierter Inhalt, " -#: wt-status.c:903 +#: wt-status.c:905 #, c-format msgid "Your stash currently has %d entry" msgid_plural "Your stash currently has %d entries" msgstr[0] "Ihr Stash hat gerade %d Eintrag" msgstr[1] "Ihr Stash hat gerade %d Einträge" -#: wt-status.c:934 +#: wt-status.c:936 msgid "Submodules changed but not updated:" msgstr "Submodule geändert, aber nicht aktualisiert:" -#: wt-status.c:936 +#: wt-status.c:938 msgid "Submodule changes to be committed:" msgstr "Änderungen in Submodul zum Committen:" -#: wt-status.c:1018 +#: wt-status.c:1020 msgid "" "Do not modify or remove the line above.\n" "Everything below it will be ignored." @@ -9488,7 +9773,7 @@ msgstr "" "Ändern oder entfernen Sie nicht die obige Zeile.\n" "Alles unterhalb von ihr wird ignoriert." -#: wt-status.c:1110 +#: wt-status.c:1112 #, c-format msgid "" "\n" @@ -9500,114 +9785,114 @@ msgstr "" "berechnen.\n" "Sie können '--no-ahead-behind' benutzen, um das zu verhindern.\n" -#: wt-status.c:1140 +#: wt-status.c:1142 msgid "You have unmerged paths." msgstr "Sie haben nicht zusammengeführte Pfade." -#: wt-status.c:1143 +#: wt-status.c:1145 msgid " (fix conflicts and run \"git commit\")" msgstr " (beheben Sie die Konflikte und führen Sie \"git commit\" aus)" -#: wt-status.c:1145 +#: wt-status.c:1147 msgid " (use \"git merge --abort\" to abort the merge)" msgstr " (benutzen Sie \"git merge --abort\", um den Merge abzubrechen)" -#: wt-status.c:1149 +#: wt-status.c:1151 msgid "All conflicts fixed but you are still merging." msgstr "Alle Konflikte sind behoben, aber Sie sind immer noch beim Merge." -#: wt-status.c:1152 +#: wt-status.c:1154 msgid " (use \"git commit\" to conclude merge)" msgstr " (benutzen Sie \"git commit\", um den Merge abzuschließen)" -#: wt-status.c:1161 +#: wt-status.c:1163 msgid "You are in the middle of an am session." msgstr "Eine \"am\"-Sitzung ist im Gange." -#: wt-status.c:1164 +#: wt-status.c:1166 msgid "The current patch is empty." msgstr "Der aktuelle Patch ist leer." -#: wt-status.c:1168 +#: wt-status.c:1170 msgid " (fix conflicts and then run \"git am --continue\")" msgstr "" " (beheben Sie die Konflikte und führen Sie dann \"git am --continue\" aus)" -#: wt-status.c:1170 +#: wt-status.c:1172 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (benutzen Sie \"git am --skip\", um diesen Patch auszulassen)" -#: wt-status.c:1172 +#: wt-status.c:1174 msgid " (use \"git am --abort\" to restore the original branch)" msgstr "" " (benutzen Sie \"git am --abort\", um den ursprünglichen Branch " "wiederherzustellen)" -#: wt-status.c:1305 +#: wt-status.c:1307 msgid "git-rebase-todo is missing." msgstr "git-rebase-todo fehlt." -#: wt-status.c:1307 +#: wt-status.c:1309 msgid "No commands done." msgstr "Keine Befehle ausgeführt." -#: wt-status.c:1310 +#: wt-status.c:1312 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" msgstr[0] "Zuletzt ausgeführter Befehl (%d Befehl ausgeführt):" msgstr[1] "Zuletzt ausgeführte Befehle (%d Befehle ausgeführt):" -#: wt-status.c:1321 +#: wt-status.c:1323 #, c-format msgid " (see more in file %s)" msgstr " (mehr Informationen in Datei %s)" -#: wt-status.c:1326 +#: wt-status.c:1328 msgid "No commands remaining." msgstr "Keine Befehle verbleibend." -#: wt-status.c:1329 +#: wt-status.c:1331 #, c-format msgid "Next command to do (%d remaining command):" msgid_plural "Next commands to do (%d remaining commands):" msgstr[0] "Nächster auszuführender Befehl (%d Befehle verbleibend):" msgstr[1] "Nächste auszuführende Befehle (%d Befehle verbleibend):" -#: wt-status.c:1337 +#: wt-status.c:1339 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr " (benutzen Sie \"git rebase --edit-todo\" zum Ansehen und Bearbeiten)" -#: wt-status.c:1349 +#: wt-status.c:1351 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "Sie sind gerade beim Rebase von Branch '%s' auf '%s'." -#: wt-status.c:1354 +#: wt-status.c:1356 msgid "You are currently rebasing." msgstr "Sie sind gerade beim Rebase." -#: wt-status.c:1367 +#: wt-status.c:1369 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr "" " (beheben Sie die Konflikte und führen Sie dann \"git rebase --continue\" " "aus)" -#: wt-status.c:1369 +#: wt-status.c:1371 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (benutzen Sie \"git rebase --skip\", um diesen Patch auszulassen)" -#: wt-status.c:1371 +#: wt-status.c:1373 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr "" " (benutzen Sie \"git rebase --abort\", um den ursprünglichen Branch " "auszuchecken)" -#: wt-status.c:1378 +#: wt-status.c:1380 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (alle Konflikte behoben: führen Sie \"git rebase --continue\" aus)" -#: wt-status.c:1382 +#: wt-status.c:1384 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." @@ -9615,162 +9900,170 @@ msgstr "" "Sie teilen gerade einen Commit auf, während ein Rebase von Branch '%s' auf " "'%s' im Gange ist." -#: wt-status.c:1387 +#: wt-status.c:1389 msgid "You are currently splitting a commit during a rebase." msgstr "Sie teilen gerade einen Commit während eines Rebase auf." -#: wt-status.c:1390 +#: wt-status.c:1392 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" " (Sobald Ihr Arbeitsverzeichnis unverändert ist, führen Sie \"git rebase --" "continue\" aus)" -#: wt-status.c:1394 +#: wt-status.c:1396 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" "Sie editieren gerade einen Commit während eines Rebase von Branch '%s' auf " "'%s'." -#: wt-status.c:1399 +#: wt-status.c:1401 msgid "You are currently editing a commit during a rebase." msgstr "Sie editieren gerade einen Commit während eines Rebase." -#: wt-status.c:1402 +#: wt-status.c:1404 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr "" " (benutzen Sie \"git commit --amend\", um den aktuellen Commit " "nachzubessern)" -#: wt-status.c:1404 +#: wt-status.c:1406 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" " (benutzen Sie \"git rebase --continue\" sobald Ihre Änderungen " "abgeschlossen sind)" -#: wt-status.c:1415 +#: wt-status.c:1417 msgid "Cherry-pick currently in progress." msgstr "Cherry-pick zurzeit im Gange." -#: wt-status.c:1418 +#: wt-status.c:1420 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "Sie führen gerade \"cherry-pick\" von Commit %s aus." -#: wt-status.c:1425 +#: wt-status.c:1427 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr "" " (beheben Sie die Konflikte und führen Sie dann \"git cherry-pick --continue" "\" aus)" -#: wt-status.c:1428 +#: wt-status.c:1430 msgid " (run \"git cherry-pick --continue\" to continue)" msgstr " (Führen Sie \"git cherry-pick --continue\" aus, um weiterzumachen)" -#: wt-status.c:1431 +#: wt-status.c:1433 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" " (alle Konflikte behoben: führen Sie \"git cherry-pick --continue\" aus)" -#: wt-status.c:1433 +#: wt-status.c:1435 msgid " (use \"git cherry-pick --skip\" to skip this patch)" msgstr "" " (benutzen Sie \"git cherry-pick --skip\", um diesen Patch auszulassen)" -#: wt-status.c:1435 +#: wt-status.c:1437 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" " (benutzen Sie \"git cherry-pick --abort\", um die Cherry-Pick-Operation " "abzubrechen)" -#: wt-status.c:1445 +#: wt-status.c:1447 msgid "Revert currently in progress." msgstr "Revert zurzeit im Gange." -#: wt-status.c:1448 +#: wt-status.c:1450 #, c-format msgid "You are currently reverting commit %s." msgstr "Sie sind gerade beim Revert von Commit '%s'." -#: wt-status.c:1454 +#: wt-status.c:1456 msgid " (fix conflicts and run \"git revert --continue\")" msgstr "" " (beheben Sie die Konflikte und führen Sie dann \"git revert --continue\" " "aus)" -#: wt-status.c:1457 +#: wt-status.c:1459 msgid " (run \"git revert --continue\" to continue)" msgstr " (Führen Sie \"git revert --continue\", um weiterzumachen)" -#: wt-status.c:1460 +#: wt-status.c:1462 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (alle Konflikte behoben: führen Sie \"git revert --continue\" aus)" -#: wt-status.c:1462 +#: wt-status.c:1464 msgid " (use \"git revert --skip\" to skip this patch)" msgstr " (benutzen Sie \"git revert --skip\", um diesen Patch auszulassen)" -#: wt-status.c:1464 +#: wt-status.c:1466 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr "" " (benutzen Sie \"git revert --abort\", um die Revert-Operation abzubrechen)" -#: wt-status.c:1474 +#: wt-status.c:1476 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "Sie sind gerade bei einer binären Suche, gestartet von Branch '%s'." -#: wt-status.c:1478 +#: wt-status.c:1480 msgid "You are currently bisecting." msgstr "Sie sind gerade bei einer binären Suche." -#: wt-status.c:1481 +#: wt-status.c:1483 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr "" " (benutzen Sie \"git bisect reset\", um zum ursprünglichen Branch " "zurückzukehren)" -#: wt-status.c:1492 +#: wt-status.c:1494 #, c-format msgid "You are in a sparse checkout with %d%% of tracked files present." msgstr "" "Sie sind in einem partiellen Checkout mit %d%% vorhandenen versionierten " "Dateien." -#: wt-status.c:1731 +#: wt-status.c:1733 msgid "On branch " msgstr "Auf Branch " -#: wt-status.c:1738 +#: wt-status.c:1740 msgid "interactive rebase in progress; onto " msgstr "interaktives Rebase im Gange; auf " -#: wt-status.c:1740 +#: wt-status.c:1742 msgid "rebase in progress; onto " msgstr "Rebase im Gange; auf " -#: wt-status.c:1750 +#: wt-status.c:1747 +msgid "HEAD detached at " +msgstr "HEAD losgelöst bei " + +#: wt-status.c:1749 +msgid "HEAD detached from " +msgstr "HEAD losgelöst von " + +#: wt-status.c:1752 msgid "Not currently on any branch." msgstr "Im Moment auf keinem Branch." -#: wt-status.c:1767 +#: wt-status.c:1769 msgid "Initial commit" msgstr "Initialer Commit" -#: wt-status.c:1768 +#: wt-status.c:1770 msgid "No commits yet" msgstr "Noch keine Commits" -#: wt-status.c:1782 +#: wt-status.c:1784 msgid "Untracked files" msgstr "Unversionierte Dateien" -#: wt-status.c:1784 +#: wt-status.c:1786 msgid "Ignored files" msgstr "Ignorierte Dateien" -#: wt-status.c:1788 +#: wt-status.c:1790 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -9781,32 +10074,32 @@ msgstr "" "'status -uno' könnte das beschleunigen, aber Sie müssen darauf achten,\n" "neue Dateien selbstständig hinzuzufügen (siehe 'git help status')." -#: wt-status.c:1794 +#: wt-status.c:1796 #, c-format msgid "Untracked files not listed%s" msgstr "Unversionierte Dateien nicht aufgelistet%s" -#: wt-status.c:1796 +#: wt-status.c:1798 msgid " (use -u option to show untracked files)" msgstr " (benutzen Sie die Option -u, um unversionierte Dateien anzuzeigen)" -#: wt-status.c:1802 +#: wt-status.c:1804 msgid "No changes" msgstr "Keine Änderungen" -#: wt-status.c:1807 +#: wt-status.c:1809 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" "keine Änderungen zum Commit vorgemerkt (benutzen Sie \"git add\" und/oder " "\"git commit -a\")\n" -#: wt-status.c:1811 +#: wt-status.c:1813 #, c-format msgid "no changes added to commit\n" msgstr "keine Änderungen zum Commit vorgemerkt\n" -#: wt-status.c:1815 +#: wt-status.c:1817 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -9815,67 +10108,67 @@ msgstr "" "nichts zum Commit vorgemerkt, aber es gibt unversionierte Dateien\n" "(benutzen Sie \"git add\" zum Versionieren)\n" -#: wt-status.c:1819 +#: wt-status.c:1821 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "nichts zum Commit vorgemerkt, aber es gibt unversionierte Dateien\n" -#: wt-status.c:1823 +#: wt-status.c:1825 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" "nichts zu committen (erstellen/kopieren Sie Dateien und benutzen\n" "Sie \"git add\" zum Versionieren)\n" -#: wt-status.c:1827 wt-status.c:1833 +#: wt-status.c:1829 wt-status.c:1835 #, c-format msgid "nothing to commit\n" msgstr "nichts zu committen\n" -#: wt-status.c:1830 +#: wt-status.c:1832 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" "nichts zu committen (benutzen Sie die Option -u, um unversionierte Dateien " "anzuzeigen)\n" -#: wt-status.c:1835 +#: wt-status.c:1837 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "nichts zu committen, Arbeitsverzeichnis unverändert\n" -#: wt-status.c:1940 +#: wt-status.c:1942 msgid "No commits yet on " msgstr "Noch keine Commits in " -#: wt-status.c:1944 +#: wt-status.c:1946 msgid "HEAD (no branch)" msgstr "HEAD (kein Branch)" -#: wt-status.c:1975 +#: wt-status.c:1977 msgid "different" msgstr "unterschiedlich" -#: wt-status.c:1977 wt-status.c:1985 +#: wt-status.c:1979 wt-status.c:1987 msgid "behind " msgstr "hinterher " -#: wt-status.c:1980 wt-status.c:1983 +#: wt-status.c:1982 wt-status.c:1985 msgid "ahead " msgstr "voraus " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2505 +#: wt-status.c:2507 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "" "%s nicht möglich: Sie haben Änderungen, die nicht zum Commit vorgemerkt sind." -#: wt-status.c:2511 +#: wt-status.c:2513 msgid "additionally, your index contains uncommitted changes." msgstr "Zusätzlich enthält die Staging-Area nicht committete Änderungen." -#: wt-status.c:2513 +#: wt-status.c:2515 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "" @@ -9890,134 +10183,139 @@ msgstr "Konnte '%s' nicht entfernen." msgid "git add [<options>] [--] <pathspec>..." msgstr "git add [<Optionen>] [--] <Pfadspezifikation>..." -#: builtin/add.c:88 +#: builtin/add.c:58 +#, c-format +msgid "cannot chmod %cx '%s'" +msgstr "kann chmod %cx '%s' nicht ausführen" + +#: builtin/add.c:96 #, c-format msgid "unexpected diff status %c" msgstr "unerwarteter Differenz-Status %c" -#: builtin/add.c:93 builtin/commit.c:285 +#: builtin/add.c:101 builtin/commit.c:285 msgid "updating files failed" msgstr "Aktualisierung der Dateien fehlgeschlagen" -#: builtin/add.c:103 +#: builtin/add.c:111 #, c-format msgid "remove '%s'\n" msgstr "lösche '%s'\n" -#: builtin/add.c:178 +#: builtin/add.c:186 msgid "Unstaged changes after refreshing the index:" msgstr "" "Nicht zum Commit vorgemerkte Änderungen nach Aktualisierung der Staging-Area:" -#: builtin/add.c:272 builtin/rev-parse.c:908 +#: builtin/add.c:280 builtin/rev-parse.c:991 msgid "Could not read the index" msgstr "Konnte den Index nicht lesen" -#: builtin/add.c:283 +#: builtin/add.c:291 #, c-format msgid "Could not open '%s' for writing." msgstr "Konnte '%s' nicht zum Schreiben öffnen." -#: builtin/add.c:287 +#: builtin/add.c:295 msgid "Could not write patch" msgstr "Konnte Patch nicht schreiben" -#: builtin/add.c:290 +#: builtin/add.c:298 msgid "editing patch failed" msgstr "Bearbeitung des Patches fehlgeschlagen" -#: builtin/add.c:293 +#: builtin/add.c:301 #, c-format msgid "Could not stat '%s'" msgstr "Konnte Verzeichnis '%s' nicht lesen" -#: builtin/add.c:295 +#: builtin/add.c:303 msgid "Empty patch. Aborted." msgstr "Leerer Patch. Abgebrochen." -#: builtin/add.c:300 +#: builtin/add.c:308 #, c-format msgid "Could not apply '%s'" msgstr "Konnte '%s' nicht anwenden." -#: builtin/add.c:308 +#: builtin/add.c:316 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" "Die folgenden Pfade werden durch eine Ihrer \".gitignore\" Dateien " "ignoriert:\n" -#: builtin/add.c:328 builtin/clean.c:904 builtin/fetch.c:166 builtin/mv.c:124 +#: builtin/add.c:336 builtin/clean.c:904 builtin/fetch.c:169 builtin/mv.c:124 #: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:559 #: builtin/remote.c:1427 builtin/rm.c:242 builtin/send-pack.c:190 msgid "dry run" msgstr "Probelauf" -#: builtin/add.c:331 +#: builtin/add.c:339 msgid "interactive picking" msgstr "interaktives Auswählen" -#: builtin/add.c:332 builtin/checkout.c:1547 builtin/reset.c:308 +#: builtin/add.c:340 builtin/checkout.c:1546 builtin/reset.c:308 msgid "select hunks interactively" msgstr "Blöcke interaktiv auswählen" -#: builtin/add.c:333 +#: builtin/add.c:341 msgid "edit current diff and apply" msgstr "aktuelle Unterschiede editieren und anwenden" -#: builtin/add.c:334 +#: builtin/add.c:342 msgid "allow adding otherwise ignored files" msgstr "das Hinzufügen andernfalls ignorierter Dateien erlauben" -#: builtin/add.c:335 +#: builtin/add.c:343 msgid "update tracked files" msgstr "versionierte Dateien aktualisieren" -#: builtin/add.c:336 +#: builtin/add.c:344 msgid "renormalize EOL of tracked files (implies -u)" msgstr "" "erneutes Normalisieren der Zeilenenden von versionierten Dateien (impliziert " "-u)" -#: builtin/add.c:337 +#: builtin/add.c:345 msgid "record only the fact that the path will be added later" msgstr "nur speichern, dass der Pfad später hinzugefügt werden soll" -#: builtin/add.c:338 +#: builtin/add.c:346 msgid "add changes from all tracked and untracked files" msgstr "" "Änderungen von allen versionierten und unversionierten Dateien hinzufügen" -#: builtin/add.c:341 +#: builtin/add.c:349 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "gelöschte Pfade im Arbeitsverzeichnis ignorieren (genau wie --no-all)" -#: builtin/add.c:343 +#: builtin/add.c:351 msgid "don't add, only refresh the index" msgstr "nichts hinzufügen, nur den Index aktualisieren" -#: builtin/add.c:344 +#: builtin/add.c:352 msgid "just skip files which cannot be added because of errors" msgstr "" "Dateien überspringen, die aufgrund von Fehlern nicht hinzugefügt werden " "konnten" -#: builtin/add.c:345 +#: builtin/add.c:353 msgid "check if - even missing - files are ignored in dry run" msgstr "prüfen ob - auch fehlende - Dateien im Probelauf ignoriert werden" -#: builtin/add.c:347 builtin/update-index.c:1004 +#: builtin/add.c:355 builtin/update-index.c:1004 msgid "override the executable bit of the listed files" msgstr "das \"ausführbar\"-Bit der aufgelisteten Dateien überschreiben" -#: builtin/add.c:349 +#: builtin/add.c:357 msgid "warn when adding an embedded repository" msgstr "warnen wenn eingebettetes Repository hinzugefügt wird" -#: builtin/add.c:351 +#: builtin/add.c:359 msgid "backend for `git stash -p`" msgstr "Backend für `git stash -p`" -#: builtin/add.c:369 +#: builtin/add.c:377 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -10051,12 +10349,12 @@ msgstr "" "\n" "Siehe \"git help submodule\" für weitere Informationen." -#: builtin/add.c:397 +#: builtin/add.c:405 #, c-format msgid "adding embedded git repository: %s" msgstr "Füge eingebettetes Repository hinzu: %s" -#: builtin/add.c:416 +#: builtin/add.c:424 msgid "" "Use -f if you really want to add them.\n" "Turn this message off by running\n" @@ -10066,52 +10364,48 @@ msgstr "" "Um diese Meldung abzuschalten, führen Sie folgenden Befehl aus:\n" "\"git config advice.addIgnoredFile false\"" -#: builtin/add.c:425 +#: builtin/add.c:433 msgid "adding files failed" msgstr "Hinzufügen von Dateien fehlgeschlagen" -#: builtin/add.c:453 builtin/commit.c:345 +#: builtin/add.c:461 builtin/commit.c:345 msgid "--pathspec-from-file is incompatible with --interactive/--patch" -msgstr "" -"Die Optionen --pathspec-from-file und --interactive/--patch sind " -"inkompatibel." +msgstr "--pathspec-from-file und --interactive/--patch sind inkompatibel" -#: builtin/add.c:470 +#: builtin/add.c:478 msgid "--pathspec-from-file is incompatible with --edit" -msgstr "Die Optionen --pathspec-from-file und --edit sind inkompatibel." +msgstr "--pathspec-from-file und --edit sind inkompatibel" -#: builtin/add.c:482 +#: builtin/add.c:490 msgid "-A and -u are mutually incompatible" -msgstr "Die Optionen -A und -u sind zueinander inkompatibel." +msgstr "-A und -u sind zueinander inkompatibel" -#: builtin/add.c:485 +#: builtin/add.c:493 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "" -"Die Option --ignore-missing kann nur zusammen mit --dry-run verwendet werden." +"Die Option --ignore-missing kann nur zusammen mit --dry-run verwendet werden" -#: builtin/add.c:489 +#: builtin/add.c:497 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "--chmod Parameter '%s' muss entweder -x oder +x sein" -#: builtin/add.c:507 builtin/checkout.c:1715 builtin/commit.c:351 -#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1502 +#: builtin/add.c:515 builtin/checkout.c:1714 builtin/commit.c:351 +#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1569 msgid "--pathspec-from-file is incompatible with pathspec arguments" -msgstr "" -"Die Option --pathspec-from-file ist inkompatibel mit\n" -"Pfadspezifikation-Argumenten." +msgstr "--pathspec-from-file ist inkompatibel mit Pfadspezifikation-Argumenten" -#: builtin/add.c:514 builtin/checkout.c:1727 builtin/commit.c:357 -#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1508 +#: builtin/add.c:522 builtin/checkout.c:1726 builtin/commit.c:357 +#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1575 msgid "--pathspec-file-nul requires --pathspec-from-file" -msgstr "Die Option --pathspec-file-nul benötigt --pathspec-from-file" +msgstr "--pathspec-file-nul benötigt --pathspec-from-file" -#: builtin/add.c:518 +#: builtin/add.c:526 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "Nichts spezifiziert, nichts hinzugefügt.\n" -#: builtin/add.c:520 +#: builtin/add.c:528 msgid "" "Maybe you wanted to say 'git add .'?\n" "Turn this message off by running\n" @@ -10375,7 +10669,7 @@ msgid "allow fall back on 3way merging if needed" msgstr "erlaube, falls notwendig, das Zurückfallen auf einen 3-Wege-Merge" #: builtin/am.c:2225 builtin/init-db.c:560 builtin/prune-packed.c:16 -#: builtin/repack.c:335 builtin/stash.c:815 +#: builtin/repack.c:334 builtin/stash.c:882 msgid "be quiet" msgstr "weniger Ausgaben" @@ -10418,17 +10712,17 @@ msgid "pass it through git-apply" msgstr "an git-apply übergeben" #: builtin/am.c:2263 builtin/commit.c:1395 builtin/fmt-merge-msg.c:17 -#: builtin/fmt-merge-msg.c:20 builtin/grep.c:903 builtin/merge.c:260 +#: builtin/fmt-merge-msg.c:20 builtin/grep.c:904 builtin/merge.c:261 #: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217 -#: builtin/rebase.c:1341 builtin/repack.c:346 builtin/repack.c:350 -#: builtin/repack.c:352 builtin/show-branch.c:650 builtin/show-ref.c:172 -#: builtin/tag.c:404 parse-options.h:154 parse-options.h:175 +#: builtin/rebase.c:1347 builtin/repack.c:345 builtin/repack.c:349 +#: builtin/repack.c:351 builtin/show-branch.c:650 builtin/show-ref.c:172 +#: builtin/tag.c:436 parse-options.h:154 parse-options.h:175 #: parse-options.h:316 msgid "n" msgstr "Anzahl" -#: builtin/am.c:2269 builtin/branch.c:661 builtin/bugreport.c:136 -#: builtin/for-each-ref.c:38 builtin/replace.c:556 builtin/tag.c:438 +#: builtin/am.c:2269 builtin/branch.c:670 builtin/bugreport.c:136 +#: builtin/for-each-ref.c:38 builtin/replace.c:556 builtin/tag.c:470 #: builtin/verify-tag.c:38 msgid "format" msgstr "Format" @@ -10454,12 +10748,12 @@ msgid "skip the current patch" msgstr "den aktuellen Patch auslassen" #: builtin/am.c:2287 -msgid "restore the original branch and abort the patching operation." +msgid "restore the original branch and abort the patching operation" msgstr "" "ursprünglichen Branch wiederherstellen und Anwendung der Patches abbrechen" #: builtin/am.c:2290 -msgid "abort the patching operation but keep HEAD where it is." +msgid "abort the patching operation but keep HEAD where it is" msgstr "Patch-Operation abbrechen, aber HEAD an aktueller Stelle belassen" #: builtin/am.c:2294 @@ -10475,12 +10769,12 @@ msgid "use current timestamp for author date" msgstr "aktuellen Zeitstempel als Autor-Datum verwenden" #: builtin/am.c:2303 builtin/commit-tree.c:120 builtin/commit.c:1515 -#: builtin/merge.c:297 builtin/pull.c:175 builtin/rebase.c:536 -#: builtin/rebase.c:1394 builtin/revert.c:117 builtin/tag.c:419 +#: builtin/merge.c:298 builtin/pull.c:175 builtin/rebase.c:538 +#: builtin/rebase.c:1400 builtin/revert.c:117 builtin/tag.c:451 msgid "key-id" msgstr "GPG-Schlüsselkennung" -#: builtin/am.c:2304 builtin/rebase.c:537 builtin/rebase.c:1395 +#: builtin/am.c:2304 builtin/rebase.c:539 builtin/rebase.c:1401 msgid "GPG-sign commits" msgstr "Commits mit GPG signieren" @@ -10561,28 +10855,12 @@ msgid "git bisect--helper --bisect-reset [<commit>]" msgstr "git bisect--helper --bisect-reset [<Commit>]" #: builtin/bisect--helper.c:24 -msgid "" -"git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> " -"<bad_term>" -msgstr "" -"git bisect--helper --bisect-write [--no-log] <Zustand> <Revision> " -"<Begriff_gut> <Begriff_schlecht>" - -#: builtin/bisect--helper.c:25 -msgid "" -"git bisect--helper --bisect-check-and-set-terms <command> <good_term> " -"<bad_term>" -msgstr "" -"git bisect--helper --bisect-check-and-set-terms <Befehl> <Begriff_gut> " -"<Begriff_schlecht>" - -#: builtin/bisect--helper.c:26 msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]" msgstr "" "git bisect--helper --bisect-next-check <Begriff_gut> <Begriff_schlecht> " "[<Begriff>]" -#: builtin/bisect--helper.c:27 +#: builtin/bisect--helper.c:25 msgid "" "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --" "term-new]" @@ -10590,7 +10868,7 @@ msgstr "" "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --" "term-new]" -#: builtin/bisect--helper.c:28 +#: builtin/bisect--helper.c:26 msgid "" "git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}" "=<term>] [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] " @@ -10600,62 +10878,66 @@ msgstr "" "good}=<Begriff>] [--no-checkout] [--first-parent] [<schlecht> [<gut>...]] " "[--] [<Pfade>...]" -#: builtin/bisect--helper.c:30 +#: builtin/bisect--helper.c:28 msgid "git bisect--helper --bisect-next" msgstr "git bisect--helper --bisect-next" -#: builtin/bisect--helper.c:31 -msgid "git bisect--helper --bisect-auto-next" -msgstr "git bisect--helper --bisect-auto-next" - -#: builtin/bisect--helper.c:32 +#: builtin/bisect--helper.c:29 msgid "git bisect--helper --bisect-state (bad|new) [<rev>]" msgstr "git bisect--helper --bisect-state (bad|new) [<Commit>]" -#: builtin/bisect--helper.c:33 +#: builtin/bisect--helper.c:30 msgid "git bisect--helper --bisect-state (good|old) [<rev>...]" msgstr "git bisect--helper --bisect-state (good|old) [<Commit>...]" -#: builtin/bisect--helper.c:108 +#: builtin/bisect--helper.c:31 +msgid "git bisect--helper --bisect-replay <filename>" +msgstr "git bisect--helper --bisect-replay <Dateiname>" + +#: builtin/bisect--helper.c:32 +msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]" +msgstr "git bisect--helper --bisect-skip [(<Commit>|<Bereich>)...]" + +#: builtin/bisect--helper.c:107 #, c-format msgid "cannot open file '%s' in mode '%s'" msgstr "kann Datei '%s' nicht im Modus '%s' öffnen" -#: builtin/bisect--helper.c:115 +#: builtin/bisect--helper.c:114 #, c-format msgid "could not write to file '%s'" msgstr "konnte nicht in Datei '%s' schreiben" -#: builtin/bisect--helper.c:154 +#: builtin/bisect--helper.c:153 #, c-format msgid "'%s' is not a valid term" msgstr "'%s' ist kein gültiger Begriff" -#: builtin/bisect--helper.c:158 +#: builtin/bisect--helper.c:157 #, c-format msgid "can't use the builtin command '%s' as a term" msgstr "kann den eingebauten Befehl '%s' nicht als Begriff verwenden" -#: builtin/bisect--helper.c:168 +#: builtin/bisect--helper.c:167 #, c-format msgid "can't change the meaning of the term '%s'" msgstr "kann die Bedeutung von dem Begriff '%s' nicht ändern" -#: builtin/bisect--helper.c:178 +#: builtin/bisect--helper.c:177 msgid "please use two different terms" msgstr "bitte verwenden Sie zwei verschiedene Begriffe" -#: builtin/bisect--helper.c:194 +#: builtin/bisect--helper.c:193 #, c-format msgid "We are not bisecting.\n" msgstr "Keine binäre Suche im Gange.\n" -#: builtin/bisect--helper.c:202 +#: builtin/bisect--helper.c:201 #, c-format msgid "'%s' is not a valid commit" msgstr "'%s' ist kein gültiger Commit" -#: builtin/bisect--helper.c:211 +#: builtin/bisect--helper.c:210 #, c-format msgid "" "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'." @@ -10663,27 +10945,27 @@ msgstr "" "Konnte den ursprünglichen HEAD '%s' nicht auschecken.\n" "Versuchen Sie 'git bisect reset <Commit>'." -#: builtin/bisect--helper.c:255 +#: builtin/bisect--helper.c:254 #, c-format msgid "Bad bisect_write argument: %s" msgstr "Ungültiges \"bisect_write\" Argument: %s" -#: builtin/bisect--helper.c:260 +#: builtin/bisect--helper.c:259 #, c-format msgid "couldn't get the oid of the rev '%s'" -msgstr "Konnte die OID der Revision '%s' nicht erhalten." +msgstr "konnte die OID der Revision '%s' nicht erhalten" -#: builtin/bisect--helper.c:272 +#: builtin/bisect--helper.c:271 #, c-format msgid "couldn't open the file '%s'" -msgstr "Konnte die Datei '%s' nicht öffnen." +msgstr "konnte die Datei '%s' nicht öffnen" -#: builtin/bisect--helper.c:298 +#: builtin/bisect--helper.c:297 #, c-format msgid "Invalid command: you're currently in a %s/%s bisect" -msgstr "Ungültiger Befehl: Sie sind gerade bei einer binären %s/%s Suche." +msgstr "Ungültiger Befehl: Sie sind gerade innerhalb einer binären %s/%s Suche" -#: builtin/bisect--helper.c:325 +#: builtin/bisect--helper.c:324 #, c-format msgid "" "You need to give me at least one %s and %s revision.\n" @@ -10692,7 +10974,7 @@ msgstr "" "Sie müssen mindestens einen \"%s\" und einen \"%s\" Commit angeben.\n" "Sie können dafür \"git bisect %s\" und \"git bisect %s\" benutzen." -#: builtin/bisect--helper.c:329 +#: builtin/bisect--helper.c:328 #, c-format msgid "" "You need to start by \"git bisect start\".\n" @@ -10703,24 +10985,24 @@ msgstr "" "Danach müssen Sie mindestens einen \"%s\" und einen \"%s\" Commit angeben.\n" "Sie können dafür \"git bisect %s\" und \"git bisect %s\" benutzen." -#: builtin/bisect--helper.c:349 +#: builtin/bisect--helper.c:348 #, c-format msgid "bisecting only with a %s commit" -msgstr "Binäre Suche nur mit einem %s Commit." +msgstr "binäre Suche nur mit einem %s Commit" #. TRANSLATORS: Make sure to include [Y] and [n] in your #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect--helper.c:357 +#: builtin/bisect--helper.c:356 msgid "Are you sure [Y/n]? " msgstr "Sind Sie sicher [Y/n]? " -#: builtin/bisect--helper.c:418 +#: builtin/bisect--helper.c:417 msgid "no terms defined" -msgstr "Keine Begriffe definiert." +msgstr "keine Begriffe definiert" -#: builtin/bisect--helper.c:421 +#: builtin/bisect--helper.c:420 #, c-format msgid "" "Your current terms are %s for the old state\n" @@ -10729,7 +11011,7 @@ msgstr "" "Ihre aktuellen Begriffe sind %s für den alten Zustand\n" "und %s für den neuen Zustand.\n" -#: builtin/bisect--helper.c:431 +#: builtin/bisect--helper.c:430 #, c-format msgid "" "invalid argument %s for 'git bisect terms'.\n" @@ -10738,55 +11020,55 @@ msgstr "" "Ungültiges Argument %s für 'git bisect terms'.\n" "Unterstützte Optionen sind: --term-good|--term-old und --term-bad|--term-new." -#: builtin/bisect--helper.c:498 +#: builtin/bisect--helper.c:497 builtin/bisect--helper.c:1014 msgid "revision walk setup failed\n" msgstr "Einrichtung des Revisionsgangs fehlgeschlagen\n" -#: builtin/bisect--helper.c:520 +#: builtin/bisect--helper.c:519 #, c-format msgid "could not open '%s' for appending" msgstr "konnte '%s' nicht zum Anhängen öffnen" -#: builtin/bisect--helper.c:639 builtin/bisect--helper.c:652 +#: builtin/bisect--helper.c:638 builtin/bisect--helper.c:651 msgid "'' is not a valid term" msgstr "'' ist kein gültiger Begriff" -#: builtin/bisect--helper.c:662 +#: builtin/bisect--helper.c:661 #, c-format msgid "unrecognized option: '%s'" msgstr "nicht erkannte Option: '%s'" -#: builtin/bisect--helper.c:666 +#: builtin/bisect--helper.c:665 #, c-format msgid "'%s' does not appear to be a valid revision" msgstr "'%s' scheint kein gültiger Commit zu sein" -#: builtin/bisect--helper.c:697 +#: builtin/bisect--helper.c:696 msgid "bad HEAD - I need a HEAD" msgstr "ungültiger HEAD - HEAD wird benötigt" -#: builtin/bisect--helper.c:712 +#: builtin/bisect--helper.c:711 #, c-format msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'." msgstr "" "Auschecken von '%s' fehlgeschlagen. Versuchen Sie 'git bisect start " "<gültiger-Branch>'." -#: builtin/bisect--helper.c:733 +#: builtin/bisect--helper.c:732 msgid "won't bisect on cg-seek'ed tree" msgstr "" "binäre Suche auf einem durch 'cg-seek' geändertem Verzeichnis nicht möglich" -#: builtin/bisect--helper.c:736 +#: builtin/bisect--helper.c:735 msgid "bad HEAD - strange symbolic ref" msgstr "ungültiger HEAD - merkwürdige symbolische Referenz" -#: builtin/bisect--helper.c:756 +#: builtin/bisect--helper.c:755 #, c-format msgid "invalid ref: '%s'" msgstr "ungültige Referenz: '%s'" -#: builtin/bisect--helper.c:814 +#: builtin/bisect--helper.c:813 msgid "You need to start by \"git bisect start\"\n" msgstr "Sie müssen mit \"git bisect start\" beginnen\n" @@ -10794,93 +11076,101 @@ msgstr "Sie müssen mit \"git bisect start\" beginnen\n" #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect--helper.c:825 +#: builtin/bisect--helper.c:824 msgid "Do you want me to do it for you [Y/n]? " msgstr "Wollen Sie, dass ich es für Sie mache [Y/n]? " -#: builtin/bisect--helper.c:843 +#: builtin/bisect--helper.c:842 msgid "Please call `--bisect-state` with at least one argument" msgstr "Bitte führen Sie `--bisect-state` mit mindestens einem Argument aus" -#: builtin/bisect--helper.c:856 +#: builtin/bisect--helper.c:855 #, c-format msgid "'git bisect %s' can take only one argument." msgstr "'git bisect %s' kann nur ein Argument entgegennehmen." -#: builtin/bisect--helper.c:868 builtin/bisect--helper.c:879 +#: builtin/bisect--helper.c:867 builtin/bisect--helper.c:878 #, c-format msgid "Bad rev input: %s" msgstr "Ungültige Referenz-Eingabe: %s" -#: builtin/bisect--helper.c:924 -msgid "reset the bisection state" -msgstr "den Zustand der binären Suche zurücksetzen" +#: builtin/bisect--helper.c:912 +msgid "We are not bisecting." +msgstr "Keine binäre Suche im Gange." + +#: builtin/bisect--helper.c:962 +#, c-format +msgid "'%s'?? what are you talking about?" +msgstr "'%s'?? Was reden Sie da?" -#: builtin/bisect--helper.c:926 -msgid "write out the bisection state in BISECT_LOG" -msgstr "den Zustand der binären Suche nach BISECT_LOG schreiben" +#: builtin/bisect--helper.c:974 +#, c-format +msgid "cannot read file '%s' for replaying" +msgstr "kann Datei '%s' nicht für die Wiederholung lesen" -#: builtin/bisect--helper.c:928 -msgid "check and set terms in a bisection state" -msgstr "Begriffe innerhalb einer binären Suche prüfen und setzen" +#: builtin/bisect--helper.c:1047 +msgid "reset the bisection state" +msgstr "den Zustand der binären Suche zurücksetzen" -#: builtin/bisect--helper.c:930 +#: builtin/bisect--helper.c:1049 msgid "check whether bad or good terms exist" msgstr "prüfen, ob Begriffe für gute und schlechte Commits existieren" -#: builtin/bisect--helper.c:932 +#: builtin/bisect--helper.c:1051 msgid "print out the bisect terms" msgstr "die Begriffe für die binäre Suche ausgeben" -#: builtin/bisect--helper.c:934 +#: builtin/bisect--helper.c:1053 msgid "start the bisect session" msgstr "Sitzung für binäre Suche starten" -#: builtin/bisect--helper.c:936 +#: builtin/bisect--helper.c:1055 msgid "find the next bisection commit" msgstr "nächsten Commit für die binäre Suche finden" -#: builtin/bisect--helper.c:938 -msgid "verify the next bisection state then checkout the next bisection commit" -msgstr "" -"überprüfe den nächsten Zustand der binären Suche, checke dann den nächsten " -"Commit der binären Suche aus" - -#: builtin/bisect--helper.c:940 +#: builtin/bisect--helper.c:1057 msgid "mark the state of ref (or refs)" msgstr "den Status der Referenz(en) markieren" -#: builtin/bisect--helper.c:942 +#: builtin/bisect--helper.c:1059 +msgid "list the bisection steps so far" +msgstr "die bisherigen Schritte der binären Suche auflisten" + +#: builtin/bisect--helper.c:1061 +msgid "replay the bisection process from the given file" +msgstr "binäre Suche aus der angegebenen Datei wiederholen" + +#: builtin/bisect--helper.c:1063 +msgid "skip some commits for checkout" +msgstr "einige Commits für das Auschecken überspringen" + +#: builtin/bisect--helper.c:1065 msgid "no log for BISECT_WRITE" msgstr "kein Log für BISECT_WRITE" -#: builtin/bisect--helper.c:957 +#: builtin/bisect--helper.c:1080 msgid "--bisect-reset requires either no argument or a commit" msgstr "--bisect-reset benötigt entweder kein Argument oder ein Commit" -#: builtin/bisect--helper.c:961 -msgid "--bisect-write requires either 4 or 5 arguments" -msgstr "--bisect-write benötigt entweder 4 oder 5 Argumente" - -#: builtin/bisect--helper.c:967 -msgid "--check-and-set-terms requires 3 arguments" -msgstr "--check-and-set-terms benötigt 3 Argumente" - -#: builtin/bisect--helper.c:973 +#: builtin/bisect--helper.c:1085 msgid "--bisect-next-check requires 2 or 3 arguments" msgstr "--bisect-next-check benötigt 2 oder 3 Argumente" -#: builtin/bisect--helper.c:979 +#: builtin/bisect--helper.c:1091 msgid "--bisect-terms requires 0 or 1 argument" msgstr "--bisect-terms benötigt 0 oder 1 Argument" -#: builtin/bisect--helper.c:988 +#: builtin/bisect--helper.c:1100 msgid "--bisect-next requires 0 arguments" msgstr "--bisect-next benötigt 0 Argumente" -#: builtin/bisect--helper.c:994 -msgid "--bisect-auto-next requires 0 arguments" -msgstr "--bisect-auto-next benötigt 0 Argumente" +#: builtin/bisect--helper.c:1111 +msgid "--bisect-log requires 0 arguments" +msgstr "--bisect-log benötigt 0 Argumente" + +#: builtin/bisect--helper.c:1116 +msgid "no logfile given" +msgstr "keine Log-Datei angegeben" #: builtin/blame.c:32 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" @@ -10899,142 +11189,146 @@ msgstr "erwarte eine Farbe: %s" msgid "must end with a color" msgstr "muss mit einer Farbe enden" -#: builtin/blame.c:730 +#: builtin/blame.c:728 #, c-format msgid "invalid color '%s' in color.blame.repeatedLines" msgstr "ungültige Farbe '%s' in color.blame.repeatedLines" -#: builtin/blame.c:748 +#: builtin/blame.c:746 msgid "invalid value for blame.coloring" msgstr "ungültiger Wert für blame.coloring" -#: builtin/blame.c:847 +#: builtin/blame.c:845 #, c-format msgid "cannot find revision %s to ignore" msgstr "konnte Commit %s zum Ignorieren nicht finden" -#: builtin/blame.c:869 -msgid "Show blame entries as we find them, incrementally" -msgstr "\"blame\"-Einträge schrittweise anzeigen, während wir sie generieren" +#: builtin/blame.c:867 +msgid "show blame entries as we find them, incrementally" +msgstr "\"blame\"-Einträge schrittweise anzeigen, während wir sie finden" -#: builtin/blame.c:870 -msgid "Do not show object names of boundary commits (Default: off)" -msgstr "Zeige keine Objektnamen für Grenz-Commits an (Standard: aus)" +#: builtin/blame.c:868 +msgid "do not show object names of boundary commits (Default: off)" +msgstr "keine Objektnamen für Grenz-Commits anzeigen (Standard: aus)" -#: builtin/blame.c:871 -msgid "Do not treat root commits as boundaries (Default: off)" +#: builtin/blame.c:869 +msgid "do not treat root commits as boundaries (Default: off)" msgstr "Root-Commits nicht als Grenzen behandeln (Standard: aus)" -#: builtin/blame.c:872 -msgid "Show work cost statistics" +#: builtin/blame.c:870 +msgid "show work cost statistics" msgstr "Statistiken zum Arbeitsaufwand anzeigen" -#: builtin/blame.c:873 -msgid "Force progress reporting" +#: builtin/blame.c:871 builtin/checkout.c:1503 builtin/clone.c:92 +#: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:175 +#: builtin/merge.c:297 builtin/multi-pack-index.c:27 builtin/pull.c:119 +#: builtin/push.c:575 builtin/send-pack.c:198 +msgid "force progress reporting" msgstr "Fortschrittsanzeige erzwingen" -#: builtin/blame.c:874 -msgid "Show output score for blame entries" +#: builtin/blame.c:872 +msgid "show output score for blame entries" msgstr "Ausgabebewertung für \"blame\"-Einträge anzeigen" -#: builtin/blame.c:875 -msgid "Show original filename (Default: auto)" +#: builtin/blame.c:873 +msgid "show original filename (Default: auto)" msgstr "ursprünglichen Dateinamen anzeigen (Standard: auto)" -#: builtin/blame.c:876 -msgid "Show original linenumber (Default: off)" +#: builtin/blame.c:874 +msgid "show original linenumber (Default: off)" msgstr "ursprüngliche Zeilennummer anzeigen (Standard: aus)" -#: builtin/blame.c:877 -msgid "Show in a format designed for machine consumption" +#: builtin/blame.c:875 +msgid "show in a format designed for machine consumption" msgstr "Anzeige in einem Format für maschinelle Auswertung" -#: builtin/blame.c:878 -msgid "Show porcelain format with per-line commit information" +#: builtin/blame.c:876 +msgid "show porcelain format with per-line commit information" msgstr "" "Anzeige in Format für Fremdprogramme mit Commit-Informationen pro Zeile" -#: builtin/blame.c:879 -msgid "Use the same output mode as git-annotate (Default: off)" +#: builtin/blame.c:877 +msgid "use the same output mode as git-annotate (Default: off)" msgstr "" -"Den gleichen Ausgabemodus benutzen wie \"git-annotate\" (Standard: aus)" +"den gleichen Ausgabemodus benutzen wie \"git-annotate\" (Standard: aus)" -#: builtin/blame.c:880 -msgid "Show raw timestamp (Default: off)" -msgstr "Unbearbeiteten Zeitstempel anzeigen (Standard: aus)" +#: builtin/blame.c:878 +msgid "show raw timestamp (Default: off)" +msgstr "unbearbeiteten Zeitstempel anzeigen (Standard: aus)" -#: builtin/blame.c:881 -msgid "Show long commit SHA1 (Default: off)" -msgstr "Langen Commit-SHA1 anzeigen (Standard: aus)" +#: builtin/blame.c:879 +msgid "show long commit SHA1 (Default: off)" +msgstr "langen Commit-SHA1 anzeigen (Standard: aus)" -#: builtin/blame.c:882 -msgid "Suppress author name and timestamp (Default: off)" -msgstr "Den Namen des Autors und den Zeitstempel unterdrücken (Standard: aus)" +#: builtin/blame.c:880 +msgid "suppress author name and timestamp (Default: off)" +msgstr "den Namen des Autors und den Zeitstempel unterdrücken (Standard: aus)" -#: builtin/blame.c:883 -msgid "Show author email instead of name (Default: off)" +#: builtin/blame.c:881 +msgid "show author email instead of name (Default: off)" msgstr "" -"Anstatt des Namens die E-Mail-Adresse des Autors anzeigen (Standard: aus)" +"statt des Namens die E-Mail-Adresse des Autors anzeigen (Standard: aus)" -#: builtin/blame.c:884 -msgid "Ignore whitespace differences" -msgstr "Unterschiede im Whitespace ignorieren" +#: builtin/blame.c:882 +msgid "ignore whitespace differences" +msgstr "Whitespace-Unterschiede ignorieren" -#: builtin/blame.c:885 builtin/log.c:1813 +#: builtin/blame.c:883 builtin/log.c:1812 msgid "rev" msgstr "Commit" -#: builtin/blame.c:885 -msgid "Ignore <rev> when blaming" -msgstr "Ignoriere <Commit> beim Ausführen von 'blame'" +#: builtin/blame.c:883 +msgid "ignore <rev> when blaming" +msgstr "ignoriere <Commit> beim Ausführen von 'blame'" -#: builtin/blame.c:886 -msgid "Ignore revisions from <file>" -msgstr "Ignoriere Commits aus <Datei>" +#: builtin/blame.c:884 +msgid "ignore revisions from <file>" +msgstr "ignoriere Commits aus <Datei>" -#: builtin/blame.c:887 +#: builtin/blame.c:885 msgid "color redundant metadata from previous line differently" msgstr "redundante Metadaten der vorherigen Zeile unterschiedlich einfärben" -#: builtin/blame.c:888 +#: builtin/blame.c:886 msgid "color lines by age" msgstr "Zeilen nach Alter einfärben" -#: builtin/blame.c:889 -msgid "Spend extra cycles to find better match" -msgstr "Länger arbeiten, um bessere Übereinstimmungen zu finden" +#: builtin/blame.c:887 +msgid "spend extra cycles to find better match" +msgstr "" +"mehr Arbeitsschritte ausführen, um eine bessere Übereinstimmung zu finden" -#: builtin/blame.c:890 -msgid "Use revisions from <file> instead of calling git-rev-list" -msgstr "Commits von <Datei> benutzen, anstatt \"git-rev-list\" aufzurufen" +#: builtin/blame.c:888 +msgid "use revisions from <file> instead of calling git-rev-list" +msgstr "Commits von <Datei> benutzen, statt \"git-rev-list\" aufzurufen" -#: builtin/blame.c:891 -msgid "Use <file>'s contents as the final image" +#: builtin/blame.c:889 +msgid "use <file>'s contents as the final image" msgstr "Inhalte der <Datei>en als endgültiges Abbild benutzen" -#: builtin/blame.c:892 builtin/blame.c:893 +#: builtin/blame.c:890 builtin/blame.c:891 msgid "score" msgstr "Bewertung" -#: builtin/blame.c:892 -msgid "Find line copies within and across files" +#: builtin/blame.c:890 +msgid "find line copies within and across files" msgstr "kopierte Zeilen innerhalb oder zwischen Dateien finden" -#: builtin/blame.c:893 -msgid "Find line movements within and across files" +#: builtin/blame.c:891 +msgid "find line movements within and across files" msgstr "verschobene Zeilen innerhalb oder zwischen Dateien finden" -#: builtin/blame.c:894 +#: builtin/blame.c:892 msgid "range" msgstr "Bereich" -#: builtin/blame.c:895 -msgid "Process only line range <start>,<end> or function :<funcname>" +#: builtin/blame.c:893 +msgid "process only line range <start>,<end> or function :<funcname>" msgstr "" -"Nur Zeilen im Bereich <Start>,<Ende> oder Funktion :<Funktionsname> " +"nur Zeilen im Bereich <Start>,<Ende> oder Funktion :<Funktionsname> " "verarbeiten" -#: builtin/blame.c:947 +#: builtin/blame.c:945 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "" "--progress kann nicht mit --incremental oder Formaten für Fremdprogramme\n" @@ -11048,18 +11342,18 @@ msgstr "" #. your language may need more or fewer display #. columns. #. -#: builtin/blame.c:998 +#: builtin/blame.c:996 msgid "4 years, 11 months ago" msgstr "vor 4 Jahren und 11 Monaten" -#: builtin/blame.c:1114 +#: builtin/blame.c:1112 #, c-format msgid "file %s has only %lu line" msgid_plural "file %s has only %lu lines" msgstr[0] "Datei %s hat nur %lu Zeile" msgstr[1] "Datei %s hat nur %lu Zeilen" -#: builtin/blame.c:1159 +#: builtin/blame.c:1157 msgid "Blaming lines" msgstr "Verarbeite Zeilen" @@ -11128,124 +11422,114 @@ msgstr "" msgid "Update of config-file failed" msgstr "Aktualisierung der Konfigurationsdatei fehlgeschlagen." -#: builtin/branch.c:220 +#: builtin/branch.c:223 msgid "cannot use -a with -d" msgstr "kann -a nicht mit -d benutzen" -#: builtin/branch.c:226 +#: builtin/branch.c:230 msgid "Couldn't look up commit object for HEAD" msgstr "Konnte Commit-Objekt für HEAD nicht nachschlagen." -#: builtin/branch.c:240 +#: builtin/branch.c:244 #, c-format msgid "Cannot delete branch '%s' checked out at '%s'" msgstr "Kann Branch '%s' nicht entfernen, ausgecheckt in '%s'." -#: builtin/branch.c:255 +#: builtin/branch.c:259 #, c-format msgid "remote-tracking branch '%s' not found." msgstr "Remote-Tracking-Branch '%s' nicht gefunden" -#: builtin/branch.c:256 +#: builtin/branch.c:260 #, c-format msgid "branch '%s' not found." msgstr "Branch '%s' nicht gefunden." -#: builtin/branch.c:271 -#, c-format -msgid "Error deleting remote-tracking branch '%s'" -msgstr "Fehler beim Entfernen des Remote-Tracking-Branches '%s'" - -#: builtin/branch.c:272 -#, c-format -msgid "Error deleting branch '%s'" -msgstr "Fehler beim Entfernen des Branches '%s'" - -#: builtin/branch.c:279 +#: builtin/branch.c:291 #, c-format msgid "Deleted remote-tracking branch %s (was %s).\n" msgstr "Remote-Tracking-Branch %s entfernt (war %s).\n" -#: builtin/branch.c:280 +#: builtin/branch.c:292 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "Branch %s entfernt (war %s).\n" -#: builtin/branch.c:429 builtin/tag.c:61 +#: builtin/branch.c:438 builtin/tag.c:61 msgid "unable to parse format string" msgstr "Konnte Formatierungsstring nicht parsen." -#: builtin/branch.c:460 +#: builtin/branch.c:469 msgid "could not resolve HEAD" msgstr "Konnte HEAD-Commit nicht auflösen." -#: builtin/branch.c:466 +#: builtin/branch.c:475 #, c-format msgid "HEAD (%s) points outside of refs/heads/" msgstr "HEAD (%s) wurde nicht unter \"refs/heads/\" gefunden!" -#: builtin/branch.c:481 +#: builtin/branch.c:490 #, c-format msgid "Branch %s is being rebased at %s" msgstr "Branch %s wird auf %s umgesetzt" -#: builtin/branch.c:485 +#: builtin/branch.c:494 #, c-format msgid "Branch %s is being bisected at %s" msgstr "Binäre Suche von Branch %s zu %s im Gange" -#: builtin/branch.c:502 +#: builtin/branch.c:511 msgid "cannot copy the current branch while not on any." msgstr "" "Kann den aktuellen Branch nicht kopieren, solange Sie sich auf keinem " "befinden." -#: builtin/branch.c:504 +#: builtin/branch.c:513 msgid "cannot rename the current branch while not on any." msgstr "" "Kann aktuellen Branch nicht umbenennen, solange Sie sich auf keinem befinden." -#: builtin/branch.c:515 +#: builtin/branch.c:524 #, c-format msgid "Invalid branch name: '%s'" msgstr "Ungültiger Branchname: '%s'" -#: builtin/branch.c:544 +#: builtin/branch.c:553 msgid "Branch rename failed" msgstr "Umbenennung des Branches fehlgeschlagen" -#: builtin/branch.c:546 +#: builtin/branch.c:555 msgid "Branch copy failed" msgstr "Kopie des Branches fehlgeschlagen" -#: builtin/branch.c:550 +#: builtin/branch.c:559 #, c-format msgid "Created a copy of a misnamed branch '%s'" msgstr "Kopie eines falsch benannten Branches '%s' erstellt." -#: builtin/branch.c:553 +#: builtin/branch.c:562 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "falsch benannten Branch '%s' umbenannt" -#: builtin/branch.c:559 +#: builtin/branch.c:568 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "Branch umbenannt zu %s, aber HEAD ist nicht aktualisiert!" -#: builtin/branch.c:568 +#: builtin/branch.c:577 msgid "Branch is renamed, but update of config-file failed" msgstr "" "Branch ist umbenannt, aber die Aktualisierung der Konfigurationsdatei ist " "fehlgeschlagen." -#: builtin/branch.c:570 +#: builtin/branch.c:579 msgid "Branch is copied, but update of config-file failed" msgstr "" "Branch wurde kopiert, aber die Aktualisierung der Konfigurationsdatei ist\n" "fehlgeschlagen." -#: builtin/branch.c:586 +#: builtin/branch.c:595 #, c-format msgid "" "Please edit the description for the branch\n" @@ -11256,181 +11540,181 @@ msgstr "" " %s\n" "Zeilen, die mit '%c' beginnen, werden entfernt.\n" -#: builtin/branch.c:620 +#: builtin/branch.c:629 msgid "Generic options" msgstr "Allgemeine Optionen" -#: builtin/branch.c:622 +#: builtin/branch.c:631 msgid "show hash and subject, give twice for upstream branch" msgstr "Hash und Betreff anzeigen; -vv: zusätzlich Upstream-Branch" -#: builtin/branch.c:623 +#: builtin/branch.c:632 msgid "suppress informational messages" msgstr "Informationsmeldungen unterdrücken" -#: builtin/branch.c:624 +#: builtin/branch.c:633 msgid "set up tracking mode (see git-pull(1))" msgstr "Modus zum Folgen von Branches einstellen (siehe git-pull(1))" -#: builtin/branch.c:626 +#: builtin/branch.c:635 msgid "do not use" msgstr "nicht verwenden" -#: builtin/branch.c:628 builtin/rebase.c:532 +#: builtin/branch.c:637 builtin/rebase.c:534 msgid "upstream" msgstr "Upstream" -#: builtin/branch.c:628 +#: builtin/branch.c:637 msgid "change the upstream info" msgstr "Informationen zum Upstream-Branch ändern" -#: builtin/branch.c:629 +#: builtin/branch.c:638 msgid "unset the upstream info" msgstr "Informationen zum Upstream-Branch entfernen" -#: builtin/branch.c:630 +#: builtin/branch.c:639 msgid "use colored output" msgstr "farbige Ausgaben verwenden" -#: builtin/branch.c:631 +#: builtin/branch.c:640 msgid "act on remote-tracking branches" msgstr "auf Remote-Tracking-Branches wirken" -#: builtin/branch.c:633 builtin/branch.c:635 +#: builtin/branch.c:642 builtin/branch.c:644 msgid "print only branches that contain the commit" msgstr "nur Branches ausgeben, die diesen Commit enthalten" -#: builtin/branch.c:634 builtin/branch.c:636 +#: builtin/branch.c:643 builtin/branch.c:645 msgid "print only branches that don't contain the commit" msgstr "nur Branches ausgeben, die diesen Commit nicht enthalten" -#: builtin/branch.c:639 +#: builtin/branch.c:648 msgid "Specific git-branch actions:" msgstr "spezifische Aktionen für \"git-branch\":" -#: builtin/branch.c:640 +#: builtin/branch.c:649 msgid "list both remote-tracking and local branches" msgstr "Remote-Tracking und lokale Branches auflisten" -#: builtin/branch.c:642 +#: builtin/branch.c:651 msgid "delete fully merged branch" msgstr "vollständig zusammengeführten Branch entfernen" -#: builtin/branch.c:643 +#: builtin/branch.c:652 msgid "delete branch (even if not merged)" msgstr "Branch löschen (auch wenn nicht zusammengeführt)" -#: builtin/branch.c:644 +#: builtin/branch.c:653 msgid "move/rename a branch and its reflog" msgstr "einen Branch und dessen Reflog verschieben/umbenennen" -#: builtin/branch.c:645 +#: builtin/branch.c:654 msgid "move/rename a branch, even if target exists" msgstr "" "einen Branch verschieben/umbenennen, auch wenn das Ziel bereits existiert" -#: builtin/branch.c:646 +#: builtin/branch.c:655 msgid "copy a branch and its reflog" msgstr "einen Branch und dessen Reflog kopieren" -#: builtin/branch.c:647 +#: builtin/branch.c:656 msgid "copy a branch, even if target exists" msgstr "einen Branch kopieren, auch wenn das Ziel bereits existiert" -#: builtin/branch.c:648 +#: builtin/branch.c:657 msgid "list branch names" msgstr "Branchnamen auflisten" -#: builtin/branch.c:649 +#: builtin/branch.c:658 msgid "show current branch name" msgstr "Zeige aktuellen Branch-Namen." -#: builtin/branch.c:650 +#: builtin/branch.c:659 msgid "create the branch's reflog" msgstr "das Reflog des Branches erzeugen" -#: builtin/branch.c:652 +#: builtin/branch.c:661 msgid "edit the description for the branch" msgstr "die Beschreibung für den Branch bearbeiten" -#: builtin/branch.c:653 +#: builtin/branch.c:662 msgid "force creation, move/rename, deletion" msgstr "Erstellung, Verschiebung/Umbenennung oder Löschung erzwingen" -#: builtin/branch.c:654 +#: builtin/branch.c:663 msgid "print only branches that are merged" msgstr "nur zusammengeführte Branches ausgeben" -#: builtin/branch.c:655 +#: builtin/branch.c:664 msgid "print only branches that are not merged" msgstr "nur nicht zusammengeführte Branches ausgeben" -#: builtin/branch.c:656 +#: builtin/branch.c:665 msgid "list branches in columns" msgstr "Branches in Spalten auflisten" -#: builtin/branch.c:658 builtin/for-each-ref.c:42 builtin/notes.c:415 +#: builtin/branch.c:667 builtin/for-each-ref.c:42 builtin/notes.c:415 #: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584 -#: builtin/tag.c:434 +#: builtin/tag.c:466 msgid "object" msgstr "Objekt" -#: builtin/branch.c:659 +#: builtin/branch.c:668 msgid "print only branches of the object" msgstr "nur Branches von diesem Objekt ausgeben" -#: builtin/branch.c:660 builtin/for-each-ref.c:48 builtin/tag.c:441 +#: builtin/branch.c:669 builtin/for-each-ref.c:48 builtin/tag.c:473 msgid "sorting and filtering are case insensitive" msgstr "Sortierung und Filterung sind unabhängig von Groß- und Kleinschreibung" -#: builtin/branch.c:661 builtin/for-each-ref.c:38 builtin/tag.c:439 +#: builtin/branch.c:670 builtin/for-each-ref.c:38 builtin/tag.c:471 #: builtin/verify-tag.c:38 msgid "format to use for the output" msgstr "für die Ausgabe zu verwendendes Format" -#: builtin/branch.c:684 builtin/clone.c:790 +#: builtin/branch.c:693 builtin/clone.c:790 msgid "HEAD not found below refs/heads!" msgstr "HEAD wurde nicht unter \"refs/heads\" gefunden!" -#: builtin/branch.c:708 +#: builtin/branch.c:717 msgid "--column and --verbose are incompatible" -msgstr "Die Optionen --column und --verbose sind inkompatibel." +msgstr "--column und --verbose sind inkompatibel" -#: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786 +#: builtin/branch.c:732 builtin/branch.c:788 builtin/branch.c:797 msgid "branch name required" msgstr "Branchname erforderlich" -#: builtin/branch.c:753 +#: builtin/branch.c:764 msgid "Cannot give description to detached HEAD" msgstr "zu losgelöstem HEAD kann keine Beschreibung hinterlegt werden" -#: builtin/branch.c:758 +#: builtin/branch.c:769 msgid "cannot edit description of more than one branch" msgstr "Beschreibung von mehr als einem Branch kann nicht bearbeitet werden" -#: builtin/branch.c:765 +#: builtin/branch.c:776 #, c-format msgid "No commit on branch '%s' yet." msgstr "Noch kein Commit in Branch '%s'." -#: builtin/branch.c:768 +#: builtin/branch.c:779 #, c-format msgid "No branch named '%s'." msgstr "Branch '%s' nicht vorhanden." -#: builtin/branch.c:783 +#: builtin/branch.c:794 msgid "too many branches for a copy operation" msgstr "zu viele Branches für eine Kopieroperation angegeben" -#: builtin/branch.c:792 +#: builtin/branch.c:803 msgid "too many arguments for a rename operation" msgstr "zu viele Argumente für eine Umbenennen-Operation angegeben" -#: builtin/branch.c:797 +#: builtin/branch.c:808 msgid "too many arguments to set new upstream" msgstr "zu viele Argumente angegeben, um Upstream-Branch zu setzen" -#: builtin/branch.c:801 +#: builtin/branch.c:812 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." @@ -11438,34 +11722,34 @@ msgstr "" "Konnte keinen neuen Upstream-Branch von HEAD zu %s setzen, da dieser auf\n" "keinen Branch zeigt." -#: builtin/branch.c:804 builtin/branch.c:827 +#: builtin/branch.c:815 builtin/branch.c:838 #, c-format msgid "no such branch '%s'" -msgstr "Kein solcher Branch '%s'" +msgstr "Branch '%s' nicht gefunden" -#: builtin/branch.c:808 +#: builtin/branch.c:819 #, c-format msgid "branch '%s' does not exist" msgstr "Branch '%s' existiert nicht" -#: builtin/branch.c:821 +#: builtin/branch.c:832 msgid "too many arguments to unset upstream" msgstr "" "zu viele Argumente angegeben, um Konfiguration zu Upstream-Branch zu " "entfernen" -#: builtin/branch.c:825 +#: builtin/branch.c:836 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" "Konnte Konfiguration zu Upstream-Branch von HEAD nicht entfernen, da dieser\n" "auf keinen Branch zeigt." -#: builtin/branch.c:831 +#: builtin/branch.c:842 #, c-format msgid "Branch '%s' has no upstream information" msgstr "Branch '%s' hat keinen Upstream-Branch gesetzt" -#: builtin/branch.c:841 +#: builtin/branch.c:852 msgid "" "The -a, and -r, options to 'git branch' do not take a branch name.\n" "Did you mean to use: -a|-r --list <pattern>?" @@ -11474,7 +11758,7 @@ msgstr "" "verwendet werden.\n" "Wollten Sie -a|-r --list <Muster> benutzen?" -#: builtin/branch.c:845 +#: builtin/branch.c:856 msgid "" "the '--set-upstream' option is no longer supported. Please use '--track' or " "'--set-upstream-to' instead." @@ -11596,19 +11880,19 @@ msgstr "git bundle list-heads <Datei> [<Referenzname>...]" msgid "git bundle unbundle <file> [<refname>...]" msgstr "git bundle unbundle <Datei> [<Referenzname>...]" -#: builtin/bundle.c:67 builtin/pack-objects.c:3480 +#: builtin/bundle.c:67 builtin/pack-objects.c:3495 msgid "do not show progress meter" msgstr "keine Fortschrittsanzeige anzeigen" -#: builtin/bundle.c:69 builtin/pack-objects.c:3482 +#: builtin/bundle.c:69 builtin/pack-objects.c:3497 msgid "show progress meter" msgstr "Fortschrittsanzeige anzeigen" -#: builtin/bundle.c:71 builtin/pack-objects.c:3484 +#: builtin/bundle.c:71 builtin/pack-objects.c:3499 msgid "show progress meter during object writing phase" msgstr "Forschrittsanzeige während des Schreibens von Objekten anzeigen" -#: builtin/bundle.c:74 builtin/pack-objects.c:3487 +#: builtin/bundle.c:74 builtin/pack-objects.c:3502 msgid "similar to --all-progress when progress meter is shown" msgstr "ähnlich zu --all-progress wenn Fortschrittsanzeige darstellt wird" @@ -11755,8 +12039,8 @@ msgstr "Dateinamen von der Standard-Eingabe lesen" msgid "terminate input and output records by a NUL character" msgstr "Einträge von Ein- und Ausgabe mit NUL-Zeichen abschließen" -#: builtin/check-ignore.c:21 builtin/checkout.c:1500 builtin/gc.c:541 -#: builtin/worktree.c:561 +#: builtin/check-ignore.c:21 builtin/checkout.c:1499 builtin/gc.c:549 +#: builtin/worktree.c:489 msgid "suppress progress reporting" msgstr "Fortschrittsanzeige unterdrücken" @@ -11774,7 +12058,7 @@ msgstr "Angabe von Pfadnamen kann nicht gemeinsam mit --stdin verwendet werden" #: builtin/check-ignore.c:166 msgid "-z only makes sense with --stdin" -msgstr "Die Option -z kann nur mit --stdin verwendet werden." +msgstr "-z kann nur mit --stdin verwendet werden" #: builtin/check-ignore.c:168 msgid "no path specified" @@ -11782,12 +12066,11 @@ msgstr "kein Pfad angegeben" #: builtin/check-ignore.c:172 msgid "--quiet is only valid with a single pathname" -msgstr "Die Option --quiet ist nur mit einem einzelnen Pfadnamen gültig." +msgstr "--quiet ist nur mit einem einzelnen Pfadnamen gültig" #: builtin/check-ignore.c:174 msgid "cannot have both --quiet and --verbose" -msgstr "" -"Die Optionen --quiet und --verbose können nicht gemeinsam verwendet werden." +msgstr "--quiet und --verbose können nicht gemeinsam verwendet werden" #: builtin/check-ignore.c:177 msgid "--non-matching is only valid with --verbose" @@ -11810,57 +12093,57 @@ msgstr "Konnte Kontakt '%s' nicht parsen." msgid "no contacts specified" msgstr "keine Kontakte angegeben" -#: builtin/checkout-index.c:139 +#: builtin/checkout-index.c:152 msgid "git checkout-index [<options>] [--] [<file>...]" msgstr "git checkout-index [<Optionen>] [--] [<Datei>...]" -#: builtin/checkout-index.c:156 +#: builtin/checkout-index.c:169 msgid "stage should be between 1 and 3 or all" msgstr "--stage sollte zwischen 1 und 3 oder 'all' sein" -#: builtin/checkout-index.c:173 +#: builtin/checkout-index.c:186 msgid "check out all files in the index" msgstr "alle Dateien im Index auschecken" -#: builtin/checkout-index.c:174 +#: builtin/checkout-index.c:187 msgid "force overwrite of existing files" msgstr "das Überschreiben bereits existierender Dateien erzwingen" -#: builtin/checkout-index.c:176 +#: builtin/checkout-index.c:189 msgid "no warning for existing files and files not in index" msgstr "" "keine Warnung für existierende Dateien, und Dateien, die sich nicht im Index " "befinden" -#: builtin/checkout-index.c:178 +#: builtin/checkout-index.c:191 msgid "don't checkout new files" msgstr "keine neuen Dateien auschecken" -#: builtin/checkout-index.c:180 +#: builtin/checkout-index.c:193 msgid "update stat information in the index file" msgstr "Dateiinformationen in der Index-Datei aktualisieren" -#: builtin/checkout-index.c:184 +#: builtin/checkout-index.c:197 msgid "read list of paths from the standard input" msgstr "eine Liste von Pfaden von der Standard-Eingabe lesen" -#: builtin/checkout-index.c:186 +#: builtin/checkout-index.c:199 msgid "write the content to temporary files" msgstr "den Inhalt in temporäre Dateien schreiben" -#: builtin/checkout-index.c:187 builtin/column.c:31 +#: builtin/checkout-index.c:200 builtin/column.c:31 #: builtin/submodule--helper.c:1824 builtin/submodule--helper.c:1827 #: builtin/submodule--helper.c:1835 builtin/submodule--helper.c:2333 -#: builtin/worktree.c:757 +#: builtin/worktree.c:717 msgid "string" msgstr "Zeichenkette" -#: builtin/checkout-index.c:188 +#: builtin/checkout-index.c:201 msgid "when creating files, prepend <string>" msgstr "" "wenn Dateien erzeugt werden, stelle <Zeichenkette> dem Dateinamen voran" -#: builtin/checkout-index.c:190 +#: builtin/checkout-index.c:203 msgid "copy out the files from named stage" msgstr "Dateien von dem benannten Stand kopieren" @@ -11963,16 +12246,16 @@ msgstr "'%s' kann nur genutzt werden, wenn '%s' nicht verwendet wird" msgid "'%s' or '%s' cannot be used with %s" msgstr "'%s' oder '%s' kann nicht mit %s verwendet werden" -#: builtin/checkout.c:541 builtin/checkout.c:548 +#: builtin/checkout.c:543 builtin/checkout.c:550 #, c-format msgid "path '%s' is unmerged" msgstr "Pfad '%s' ist nicht zusammengeführt." -#: builtin/checkout.c:716 +#: builtin/checkout.c:718 msgid "you need to resolve your current index first" msgstr "Sie müssen zuerst die Konflikte in Ihrem aktuellen Index auflösen." -#: builtin/checkout.c:770 +#: builtin/checkout.c:772 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" @@ -11981,50 +12264,50 @@ msgstr "" "Kann nicht mit vorgemerkten Änderungen in folgenden Dateien fortsetzen:\n" "%s" -#: builtin/checkout.c:866 +#: builtin/checkout.c:865 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "Kann \"reflog\" für '%s' nicht durchführen: %s\n" -#: builtin/checkout.c:908 +#: builtin/checkout.c:907 msgid "HEAD is now at" msgstr "HEAD ist jetzt bei" -#: builtin/checkout.c:912 builtin/clone.c:721 t/helper/test-fast-rebase.c:202 +#: builtin/checkout.c:911 builtin/clone.c:721 t/helper/test-fast-rebase.c:202 msgid "unable to update HEAD" msgstr "Konnte HEAD nicht aktualisieren." -#: builtin/checkout.c:916 +#: builtin/checkout.c:915 #, c-format msgid "Reset branch '%s'\n" msgstr "Setze Branch '%s' neu\n" -#: builtin/checkout.c:919 +#: builtin/checkout.c:918 #, c-format msgid "Already on '%s'\n" msgstr "Bereits auf '%s'\n" -#: builtin/checkout.c:923 +#: builtin/checkout.c:922 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Zu umgesetztem Branch '%s' gewechselt\n" -#: builtin/checkout.c:925 builtin/checkout.c:1356 +#: builtin/checkout.c:924 builtin/checkout.c:1355 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Zu neuem Branch '%s' gewechselt\n" -#: builtin/checkout.c:927 +#: builtin/checkout.c:926 #, c-format msgid "Switched to branch '%s'\n" msgstr "Zu Branch '%s' gewechselt\n" -#: builtin/checkout.c:978 +#: builtin/checkout.c:977 #, c-format msgid " ... and %d more.\n" msgstr " ... und %d weitere.\n" -#: builtin/checkout.c:984 +#: builtin/checkout.c:983 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -12047,7 +12330,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:1003 +#: builtin/checkout.c:1002 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -12074,19 +12357,19 @@ msgstr[1] "" " git branch <neuer-Branchname> %s\n" "\n" -#: builtin/checkout.c:1038 +#: builtin/checkout.c:1037 msgid "internal error in revision walk" msgstr "interner Fehler im Revisionsgang" -#: builtin/checkout.c:1042 +#: builtin/checkout.c:1041 msgid "Previous HEAD position was" msgstr "Vorherige Position von HEAD war" -#: builtin/checkout.c:1082 builtin/checkout.c:1351 +#: builtin/checkout.c:1081 builtin/checkout.c:1350 msgid "You are on a branch yet to be born" msgstr "Sie sind auf einem Branch, der noch nicht geboren ist" -#: builtin/checkout.c:1164 +#: builtin/checkout.c:1163 #, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" @@ -12096,7 +12379,7 @@ msgstr "" "Bitte benutzen Sie -- (und optional --no-guess), um diese\n" "eindeutig voneinander zu unterscheiden." -#: builtin/checkout.c:1171 +#: builtin/checkout.c:1170 msgid "" "If you meant to check out a remote tracking branch on, e.g. 'origin',\n" "you can do so by fully qualifying the name with the --track option:\n" @@ -12119,51 +12402,51 @@ msgstr "" "bevorzugen möchten, z.B. 'origin', können Sie die Einstellung\n" "checkout.defaultRemote=origin in Ihrer Konfiguration setzen." -#: builtin/checkout.c:1181 +#: builtin/checkout.c:1180 #, c-format msgid "'%s' matched multiple (%d) remote tracking branches" msgstr "'%s' entspricht mehreren (%d) Remote-Tracking-Branches" -#: builtin/checkout.c:1247 +#: builtin/checkout.c:1246 msgid "only one reference expected" msgstr "nur eine Referenz erwartet" -#: builtin/checkout.c:1264 +#: builtin/checkout.c:1263 #, c-format msgid "only one reference expected, %d given." msgstr "nur eine Referenz erwartet, %d gegeben." -#: builtin/checkout.c:1310 builtin/worktree.c:342 builtin/worktree.c:510 +#: builtin/checkout.c:1309 builtin/worktree.c:270 builtin/worktree.c:438 #, c-format msgid "invalid reference: %s" msgstr "Ungültige Referenz: %s" -#: builtin/checkout.c:1323 builtin/checkout.c:1689 +#: builtin/checkout.c:1322 builtin/checkout.c:1688 #, c-format msgid "reference is not a tree: %s" msgstr "Referenz ist kein \"Tree\"-Objekt: %s" -#: builtin/checkout.c:1370 +#: builtin/checkout.c:1369 #, c-format msgid "a branch is expected, got tag '%s'" msgstr "Ein Branch wird erwartet, Tag '%s' bekommen" -#: builtin/checkout.c:1372 +#: builtin/checkout.c:1371 #, c-format msgid "a branch is expected, got remote branch '%s'" msgstr "Ein Branch wird erwartet, Remote-Branch '%s' bekommen" -#: builtin/checkout.c:1373 builtin/checkout.c:1381 +#: builtin/checkout.c:1372 builtin/checkout.c:1380 #, c-format msgid "a branch is expected, got '%s'" msgstr "Ein Branch wird erwartet, '%s' bekommen" -#: builtin/checkout.c:1376 +#: builtin/checkout.c:1375 #, c-format msgid "a branch is expected, got commit '%s'" msgstr "Ein Branch wird erwartet, Commit '%s' bekommen" -#: builtin/checkout.c:1392 +#: builtin/checkout.c:1391 msgid "" "cannot switch branch while merging\n" "Consider \"git merge --quit\" or \"git worktree add\"." @@ -12171,7 +12454,7 @@ msgstr "" "Der Branch kann nicht während eines Merges gewechselt werden.\n" "Ziehen Sie \"git merge --quit\" oder \"git worktree add\" in Betracht." -#: builtin/checkout.c:1396 +#: builtin/checkout.c:1395 msgid "" "cannot switch branch in the middle of an am session\n" "Consider \"git am --quit\" or \"git worktree add\"." @@ -12180,7 +12463,7 @@ msgstr "" "werden.\n" "Ziehen Sie \"git am --quit\" oder \"git worktree add\" in Betracht." -#: builtin/checkout.c:1400 +#: builtin/checkout.c:1399 msgid "" "cannot switch branch while rebasing\n" "Consider \"git rebase --quit\" or \"git worktree add\"." @@ -12189,7 +12472,7 @@ msgstr "" "werden.\n" "Ziehen Sie \"git rebase --quit\" oder \"git worktree add\" in Betracht." -#: builtin/checkout.c:1404 +#: builtin/checkout.c:1403 msgid "" "cannot switch branch while cherry-picking\n" "Consider \"git cherry-pick --quit\" or \"git worktree add\"." @@ -12198,7 +12481,7 @@ msgstr "" "gewechselt werden.\n" "Ziehen Sie \"git cherry-pick --quit\" oder \"git worktree add\" in Betracht." -#: builtin/checkout.c:1408 +#: builtin/checkout.c:1407 msgid "" "cannot switch branch while reverting\n" "Consider \"git revert --quit\" or \"git worktree add\"." @@ -12207,147 +12490,140 @@ msgstr "" "werden.\n" "Ziehen Sie \"git revert --quit\" oder \"git worktree add\" in Betracht." -#: builtin/checkout.c:1412 +#: builtin/checkout.c:1411 msgid "you are switching branch while bisecting" msgstr "Sie wechseln den Branch während einer binären Suche" -#: builtin/checkout.c:1419 +#: builtin/checkout.c:1418 msgid "paths cannot be used with switching branches" msgstr "Pfade können nicht beim Wechseln von Branches verwendet werden" -#: builtin/checkout.c:1422 builtin/checkout.c:1426 builtin/checkout.c:1430 +#: builtin/checkout.c:1421 builtin/checkout.c:1425 builtin/checkout.c:1429 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "'%s' kann nicht beim Wechseln von Branches verwendet werden" -#: builtin/checkout.c:1434 builtin/checkout.c:1437 builtin/checkout.c:1440 -#: builtin/checkout.c:1445 builtin/checkout.c:1450 +#: builtin/checkout.c:1433 builtin/checkout.c:1436 builtin/checkout.c:1439 +#: builtin/checkout.c:1444 builtin/checkout.c:1449 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' kann nicht mit '%s' verwendet werden" -#: builtin/checkout.c:1447 +#: builtin/checkout.c:1446 #, c-format msgid "'%s' cannot take <start-point>" msgstr "'%s' kann nicht <Startpunkt> bekommen" -#: builtin/checkout.c:1455 +#: builtin/checkout.c:1454 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "Kann Branch nicht zu Nicht-Commit '%s' wechseln" -#: builtin/checkout.c:1462 +#: builtin/checkout.c:1461 msgid "missing branch or commit argument" msgstr "Branch- oder Commit-Argument fehlt" -#: builtin/checkout.c:1504 builtin/clone.c:92 builtin/commit-graph.c:84 -#: builtin/commit-graph.c:222 builtin/fetch.c:172 builtin/merge.c:296 -#: builtin/multi-pack-index.c:27 builtin/pull.c:119 builtin/push.c:575 -#: builtin/send-pack.c:198 -msgid "force progress reporting" -msgstr "Fortschrittsanzeige erzwingen" - -#: builtin/checkout.c:1505 +#: builtin/checkout.c:1504 msgid "perform a 3-way merge with the new branch" msgstr "einen 3-Wege-Merge mit dem neuen Branch ausführen" -#: builtin/checkout.c:1506 builtin/log.c:1800 parse-options.h:322 +#: builtin/checkout.c:1505 builtin/log.c:1799 parse-options.h:322 msgid "style" msgstr "Stil" -#: builtin/checkout.c:1507 +#: builtin/checkout.c:1506 msgid "conflict style (merge or diff3)" msgstr "Konfliktstil (merge oder diff3)" -#: builtin/checkout.c:1519 builtin/worktree.c:558 +#: builtin/checkout.c:1518 builtin/worktree.c:486 msgid "detach HEAD at named commit" msgstr "HEAD bei benanntem Commit loslösen" -#: builtin/checkout.c:1520 +#: builtin/checkout.c:1519 msgid "set upstream info for new branch" msgstr "Informationen zum Upstream-Branch für den neuen Branch setzen" -#: builtin/checkout.c:1522 +#: builtin/checkout.c:1521 msgid "force checkout (throw away local modifications)" msgstr "Auschecken erzwingen (verwirft lokale Änderungen)" -#: builtin/checkout.c:1524 +#: builtin/checkout.c:1523 msgid "new-branch" msgstr "neuer Branch" -#: builtin/checkout.c:1524 +#: builtin/checkout.c:1523 msgid "new unparented branch" msgstr "neuer Branch ohne Eltern-Commit" -#: builtin/checkout.c:1526 builtin/merge.c:300 +#: builtin/checkout.c:1525 builtin/merge.c:301 msgid "update ignored files (default)" msgstr "ignorierte Dateien aktualisieren (Standard)" -#: builtin/checkout.c:1529 +#: builtin/checkout.c:1528 msgid "do not check if another worktree is holding the given ref" msgstr "" "Prüfung, ob die Referenz bereits in einem anderen Arbeitsverzeichnis " "ausgecheckt wurde, deaktivieren" -#: builtin/checkout.c:1542 +#: builtin/checkout.c:1541 msgid "checkout our version for unmerged files" msgstr "unsere Variante für nicht zusammengeführte Dateien auschecken" -#: builtin/checkout.c:1545 +#: builtin/checkout.c:1544 msgid "checkout their version for unmerged files" msgstr "ihre Variante für nicht zusammengeführte Dateien auschecken" -#: builtin/checkout.c:1549 +#: builtin/checkout.c:1548 msgid "do not limit pathspecs to sparse entries only" msgstr "keine Einschränkung bei Pfadspezifikationen zum partiellen Auschecken" -#: builtin/checkout.c:1604 +#: builtin/checkout.c:1603 #, c-format msgid "-%c, -%c and --orphan are mutually exclusive" -msgstr "die Optionen -%c, -%c und --orphan schließen sich gegenseitig aus" +msgstr "-%c, -%c und --orphan schließen sich gegenseitig aus" -#: builtin/checkout.c:1608 +#: builtin/checkout.c:1607 msgid "-p and --overlay are mutually exclusive" -msgstr "-p und --overlay schließen sich gegenseitig aus." +msgstr "-p und --overlay schließen sich gegenseitig aus" -#: builtin/checkout.c:1645 +#: builtin/checkout.c:1644 msgid "--track needs a branch name" -msgstr "Bei der Option --track muss ein Branchname angegeben werden." +msgstr "--track benötigt ein Branchname" -#: builtin/checkout.c:1650 +#: builtin/checkout.c:1649 #, c-format msgid "missing branch name; try -%c" msgstr "kein Branchname; versuchen Sie -%c" -#: builtin/checkout.c:1682 +#: builtin/checkout.c:1681 #, c-format msgid "could not resolve %s" -msgstr "Konnte %s nicht auflösen." +msgstr "konnte %s nicht auflösen" -#: builtin/checkout.c:1698 +#: builtin/checkout.c:1697 msgid "invalid path specification" msgstr "ungültige Pfadspezifikation" -#: builtin/checkout.c:1705 +#: builtin/checkout.c:1704 #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "" "'%s' ist kein Commit und es kann kein Branch '%s' aus diesem erstellt werden." -#: builtin/checkout.c:1709 +#: builtin/checkout.c:1708 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: --detach nimmt kein Pfad-Argument '%s'" -#: builtin/checkout.c:1718 +#: builtin/checkout.c:1717 msgid "--pathspec-from-file is incompatible with --detach" -msgstr "Die Optionen --pathspec-from-file und --detach sind inkompatibel." +msgstr "--pathspec-from-file und --detach sind inkompatibel" -#: builtin/checkout.c:1721 builtin/reset.c:325 builtin/stash.c:1499 +#: builtin/checkout.c:1720 builtin/reset.c:325 builtin/stash.c:1566 msgid "--pathspec-from-file is incompatible with --patch" -msgstr "Die Optionen --pathspec-from-file und --patch sind inkompatibel." +msgstr "--pathspec-from-file und --patch sind inkompatibel" -#: builtin/checkout.c:1734 +#: builtin/checkout.c:1733 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -12355,70 +12631,70 @@ msgstr "" "git checkout: --ours/--theirs, --force und --merge sind inkompatibel wenn\n" "Sie aus dem Index auschecken." -#: builtin/checkout.c:1739 +#: builtin/checkout.c:1738 msgid "you must specify path(s) to restore" msgstr "Sie müssen Pfad(e) zur Wiederherstellung angeben." -#: builtin/checkout.c:1765 builtin/checkout.c:1767 builtin/checkout.c:1816 -#: builtin/checkout.c:1818 builtin/clone.c:122 builtin/remote.c:170 -#: builtin/remote.c:172 builtin/submodule--helper.c:2719 builtin/worktree.c:554 -#: builtin/worktree.c:556 +#: builtin/checkout.c:1764 builtin/checkout.c:1766 builtin/checkout.c:1815 +#: builtin/checkout.c:1817 builtin/clone.c:122 builtin/remote.c:170 +#: builtin/remote.c:172 builtin/submodule--helper.c:2719 builtin/worktree.c:482 +#: builtin/worktree.c:484 msgid "branch" msgstr "Branch" -#: builtin/checkout.c:1766 +#: builtin/checkout.c:1765 msgid "create and checkout a new branch" msgstr "einen neuen Branch erzeugen und auschecken" -#: builtin/checkout.c:1768 +#: builtin/checkout.c:1767 msgid "create/reset and checkout a branch" msgstr "einen Branch erstellen/umsetzen und auschecken" -#: builtin/checkout.c:1769 +#: builtin/checkout.c:1768 msgid "create reflog for new branch" msgstr "das Reflog für den neuen Branch erzeugen" -#: builtin/checkout.c:1771 +#: builtin/checkout.c:1770 msgid "second guess 'git checkout <no-such-branch>' (default)" msgstr "Zweite Vermutung 'git checkout <kein-solcher-Branch>' (Standard)" -#: builtin/checkout.c:1772 +#: builtin/checkout.c:1771 msgid "use overlay mode (default)" msgstr "benutze Overlay-Modus (Standard)" -#: builtin/checkout.c:1817 +#: builtin/checkout.c:1816 msgid "create and switch to a new branch" msgstr "einen neuen Branch erzeugen und dahin wechseln" -#: builtin/checkout.c:1819 +#: builtin/checkout.c:1818 msgid "create/reset and switch to a branch" msgstr "einen Branch erstellen/umsetzen und dahin wechseln" -#: builtin/checkout.c:1821 +#: builtin/checkout.c:1820 msgid "second guess 'git switch <no-such-branch>'" msgstr "Zweite Vermutung 'git switch <kein-solcher-Branch>'" -#: builtin/checkout.c:1823 +#: builtin/checkout.c:1822 msgid "throw away local modifications" msgstr "lokale Änderungen verwerfen" -#: builtin/checkout.c:1857 +#: builtin/checkout.c:1856 msgid "which tree-ish to checkout from" msgstr "Von welcher Commit-Referenz ausgecheckt werden soll" -#: builtin/checkout.c:1859 +#: builtin/checkout.c:1858 msgid "restore the index" msgstr "Index wiederherstellen" -#: builtin/checkout.c:1861 +#: builtin/checkout.c:1860 msgid "restore the working tree (default)" msgstr "das Arbeitsverzeichnis wiederherstellen (Standard)" -#: builtin/checkout.c:1863 +#: builtin/checkout.c:1862 msgid "ignore unmerged entries" msgstr "ignoriere nicht zusammengeführte Einträge" -#: builtin/checkout.c:1864 +#: builtin/checkout.c:1863 msgid "use overlay mode" msgstr "benutze Overlay-Modus" @@ -12563,8 +12839,8 @@ msgid "remove whole directories" msgstr "ganze Verzeichnisse löschen" #: builtin/clean.c:909 builtin/describe.c:565 builtin/describe.c:567 -#: builtin/grep.c:921 builtin/log.c:183 builtin/log.c:185 -#: builtin/ls-files.c:558 builtin/name-rev.c:526 builtin/name-rev.c:528 +#: builtin/grep.c:922 builtin/log.c:184 builtin/log.c:186 +#: builtin/ls-files.c:573 builtin/name-rev.c:526 builtin/name-rev.c:528 #: builtin/show-ref.c:179 msgid "pattern" msgstr "Muster" @@ -12599,7 +12875,7 @@ msgstr "" #: builtin/clean.c:944 msgid "-x and -X cannot be used together" -msgstr "Die Optionen -x und -X können nicht gemeinsam verwendet werden." +msgstr "-x und -X können nicht gemeinsam verwendet werden" #: builtin/clone.c:45 msgid "git clone [<options>] [--] <repo> [<dir>]" @@ -12660,7 +12936,7 @@ msgid "use --reference only while cloning" msgstr "--reference nur während des Klonens benutzen" #: builtin/clone.c:120 builtin/column.c:27 builtin/init-db.c:563 -#: builtin/merge-file.c:46 builtin/pack-objects.c:3546 builtin/repack.c:358 +#: builtin/merge-file.c:46 builtin/pack-objects.c:3561 builtin/repack.c:357 msgid "name" msgstr "Name" @@ -12676,7 +12952,7 @@ msgstr "<Branch> auschecken, anstatt HEAD des Remote-Repositories" msgid "path to git-upload-pack on the remote" msgstr "Pfad zu \"git-upload-pack\" auf der Gegenseite" -#: builtin/clone.c:126 builtin/fetch.c:173 builtin/grep.c:860 +#: builtin/clone.c:126 builtin/fetch.c:176 builtin/grep.c:861 #: builtin/pull.c:208 msgid "depth" msgstr "Tiefe" @@ -12686,7 +12962,7 @@ msgid "create a shallow clone of that depth" msgstr "" "einen Klon mit unvollständiger Historie (shallow) in dieser Tiefe erstellen" -#: builtin/clone.c:128 builtin/fetch.c:175 builtin/pack-objects.c:3535 +#: builtin/clone.c:128 builtin/fetch.c:178 builtin/pack-objects.c:3550 #: builtin/pull.c:211 msgid "time" msgstr "Zeit" @@ -12698,12 +12974,12 @@ msgstr "" "Zeit\n" "erstellen" -#: builtin/clone.c:130 builtin/fetch.c:177 builtin/fetch.c:200 -#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1317 +#: builtin/clone.c:130 builtin/fetch.c:180 builtin/fetch.c:203 +#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1323 msgid "revision" msgstr "Commit" -#: builtin/clone.c:131 builtin/fetch.c:178 builtin/pull.c:215 +#: builtin/clone.c:131 builtin/fetch.c:181 builtin/pull.c:215 msgid "deepen history of shallow clone, excluding rev" msgstr "" "die Historie eines Klons mit unvollständiger Historie (shallow) mittels\n" @@ -12738,22 +13014,22 @@ msgstr "Schlüssel=Wert" msgid "set config inside the new repository" msgstr "Konfiguration innerhalb des neuen Repositories setzen" -#: builtin/clone.c:143 builtin/fetch.c:195 builtin/ls-remote.c:76 +#: builtin/clone.c:143 builtin/fetch.c:198 builtin/ls-remote.c:77 #: builtin/pull.c:230 builtin/push.c:584 builtin/send-pack.c:196 msgid "server-specific" msgstr "serverspezifisch" -#: builtin/clone.c:143 builtin/fetch.c:195 builtin/ls-remote.c:76 +#: builtin/clone.c:143 builtin/fetch.c:198 builtin/ls-remote.c:77 #: builtin/pull.c:231 builtin/push.c:584 builtin/send-pack.c:197 msgid "option to transmit" msgstr "Option übertragen" -#: builtin/clone.c:144 builtin/fetch.c:196 builtin/pull.c:234 +#: builtin/clone.c:144 builtin/fetch.c:199 builtin/pull.c:234 #: builtin/push.c:585 msgid "use IPv4 addresses only" msgstr "nur IPv4-Adressen benutzen" -#: builtin/clone.c:146 builtin/fetch.c:198 builtin/pull.c:237 +#: builtin/clone.c:146 builtin/fetch.c:201 builtin/pull.c:237 #: builtin/push.c:587 msgid "use IPv6 addresses only" msgstr "nur IPv6-Adressen benutzen" @@ -12857,71 +13133,71 @@ msgstr "Kann \"repack\" zum Aufräumen nicht aufrufen" msgid "cannot unlink temporary alternates file" msgstr "Kann temporäre \"alternates\"-Datei nicht entfernen" -#: builtin/clone.c:992 builtin/receive-pack.c:2493 +#: builtin/clone.c:993 builtin/receive-pack.c:2493 msgid "Too many arguments." msgstr "Zu viele Argumente." -#: builtin/clone.c:996 +#: builtin/clone.c:997 msgid "You must specify a repository to clone." msgstr "Sie müssen ein Repository zum Klonen angeben." -#: builtin/clone.c:1009 +#: builtin/clone.c:1010 #, c-format msgid "--bare and --origin %s options are incompatible." -msgstr "Die Optionen --bare und --origin %s sind inkompatibel." +msgstr "--bare und --origin %s sind inkompatibel." -#: builtin/clone.c:1012 +#: builtin/clone.c:1013 msgid "--bare and --separate-git-dir are incompatible." -msgstr "Die Optionen --bare und --separate-git-dir sind inkompatibel." +msgstr "--bare und --separate-git-dir sind inkompatibel." -#: builtin/clone.c:1025 +#: builtin/clone.c:1026 #, c-format msgid "repository '%s' does not exist" -msgstr "Repository '%s' existiert nicht." +msgstr "Repository '%s' existiert nicht" -#: builtin/clone.c:1029 builtin/fetch.c:1841 +#: builtin/clone.c:1030 builtin/fetch.c:1951 #, c-format msgid "depth %s is not a positive number" msgstr "Tiefe %s ist keine positive Zahl" -#: builtin/clone.c:1039 +#: builtin/clone.c:1040 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "Zielpfad '%s' existiert bereits und ist kein leeres Verzeichnis." -#: builtin/clone.c:1045 +#: builtin/clone.c:1046 #, c-format msgid "repository path '%s' already exists and is not an empty directory." msgstr "" "Pfad des Repositories '%s' existiert bereits und ist kein leeres Verzeichnis." -#: builtin/clone.c:1059 +#: builtin/clone.c:1060 #, c-format msgid "working tree '%s' already exists." msgstr "Arbeitsverzeichnis '%s' existiert bereits." -#: builtin/clone.c:1074 builtin/clone.c:1095 builtin/difftool.c:271 -#: builtin/log.c:1987 builtin/worktree.c:354 builtin/worktree.c:386 +#: builtin/clone.c:1075 builtin/clone.c:1096 builtin/difftool.c:271 +#: builtin/log.c:1986 builtin/worktree.c:282 builtin/worktree.c:314 #, c-format msgid "could not create leading directories of '%s'" msgstr "Konnte führende Verzeichnisse von '%s' nicht erstellen." -#: builtin/clone.c:1079 +#: builtin/clone.c:1080 #, c-format msgid "could not create work tree dir '%s'" msgstr "Konnte Arbeitsverzeichnis '%s' nicht erstellen" -#: builtin/clone.c:1099 +#: builtin/clone.c:1100 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Klone in Bare-Repository '%s' ...\n" -#: builtin/clone.c:1101 +#: builtin/clone.c:1102 #, c-format msgid "Cloning into '%s'...\n" msgstr "Klone nach '%s' ...\n" -#: builtin/clone.c:1125 +#: builtin/clone.c:1126 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" @@ -12929,50 +13205,51 @@ msgstr "" "'clone --recursive' ist nicht kompatibel mit --reference und --reference-if-" "able" -#: builtin/clone.c:1169 builtin/remote.c:200 builtin/remote.c:705 +#: builtin/clone.c:1170 builtin/remote.c:200 builtin/remote.c:705 #, c-format msgid "'%s' is not a valid remote name" msgstr "'%s' ist kein gültiger Name für ein Remote-Repository" -#: builtin/clone.c:1210 +#: builtin/clone.c:1211 msgid "--depth is ignored in local clones; use file:// instead." msgstr "" -"Die Option --depth wird in lokalen Klonen ignoriert; benutzen Sie " -"stattdessen file://" +"--depth wird in lokalen Klonen ignoriert; benutzen Sie stattdessen \"file://" +"\"." -#: builtin/clone.c:1212 +#: builtin/clone.c:1213 msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "" "--shallow-since wird in lokalen Klonen ignoriert; benutzen Sie stattdessen " -"file://" +"\"file://\"." -#: builtin/clone.c:1214 +#: builtin/clone.c:1215 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "" "--shallow-exclude wird in lokalen Klonen ignoriert; benutzen Sie stattdessen " -"file://" +"\"file://\"." -#: builtin/clone.c:1216 +#: builtin/clone.c:1217 msgid "--filter is ignored in local clones; use file:// instead." msgstr "" -"--filter wird in lokalen Klonen ignoriert; benutzen Sie stattdessen file://" +"--filter wird in lokalen Klonen ignoriert; benutzen Sie stattdessen \"file://" +"\"." -#: builtin/clone.c:1219 +#: builtin/clone.c:1220 msgid "source repository is shallow, ignoring --local" msgstr "" "Quelle ist ein Repository mit unvollständiger Historie (shallow),\n" "ignoriere --local" -#: builtin/clone.c:1224 +#: builtin/clone.c:1225 msgid "--local is ignored" msgstr "--local wird ignoriert" -#: builtin/clone.c:1311 builtin/clone.c:1319 +#: builtin/clone.c:1315 builtin/clone.c:1323 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Remote-Branch %s nicht im Upstream-Repository %s gefunden" -#: builtin/clone.c:1322 +#: builtin/clone.c:1326 msgid "You appear to have cloned an empty repository." msgstr "Sie scheinen ein leeres Repository geklont zu haben." @@ -13006,7 +13283,7 @@ msgstr "Abstand zwischen Spalten" #: builtin/column.c:51 msgid "--command must be the first argument" -msgstr "Die Option --command muss an erster Stelle stehen." +msgstr "--command muss an erster Stelle stehen" #: builtin/commit-graph.c:13 builtin/commit-graph.c:22 msgid "" @@ -13031,14 +13308,14 @@ msgid "could not find object directory matching %s" msgstr "konnte Objekt-Verzeichnis nicht finden, dass '%s' entsprechen soll" #: builtin/commit-graph.c:80 builtin/commit-graph.c:210 -#: builtin/commit-graph.c:316 builtin/fetch.c:184 builtin/log.c:1769 +#: builtin/commit-graph.c:316 builtin/fetch.c:187 builtin/log.c:1768 msgid "dir" msgstr "Verzeichnis" #: builtin/commit-graph.c:81 builtin/commit-graph.c:211 #: builtin/commit-graph.c:317 -msgid "The object directory to store the graph" -msgstr "Das Objektverzeichnis zum Speichern des Graphen." +msgid "the object directory to store the graph" +msgstr "das Objektverzeichnis zum Speichern des Graphen" #: builtin/commit-graph.c:83 msgid "if the commit-graph is split, only verify the tip file" @@ -13132,7 +13409,7 @@ msgstr "" msgid "duplicate parent %s ignored" msgstr "doppelter Vorgänger %s ignoriert" -#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:555 +#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:557 #, c-format msgid "not a valid object name %s" msgstr "Kein gültiger Objektname: %s" @@ -13160,9 +13437,9 @@ msgstr "Eltern-Commit" msgid "id of a parent commit object" msgstr "ID eines Eltern-Commit-Objektes." -#: builtin/commit-tree.c:114 builtin/commit.c:1504 builtin/merge.c:281 -#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1470 -#: builtin/tag.c:413 +#: builtin/commit-tree.c:114 builtin/commit.c:1504 builtin/merge.c:282 +#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1537 +#: builtin/tag.c:445 msgid "message" msgstr "Beschreibung" @@ -13174,7 +13451,7 @@ msgstr "Commit-Beschreibung" msgid "read commit log message from file" msgstr "Commit-Beschreibung von Datei lesen" -#: builtin/commit-tree.c:121 builtin/commit.c:1516 builtin/merge.c:298 +#: builtin/commit-tree.c:121 builtin/commit.c:1516 builtin/merge.c:299 #: builtin/pull.c:176 builtin/revert.c:118 msgid "GPG sign commit" msgstr "Commit mit GPG signieren" @@ -13330,7 +13607,7 @@ msgstr "" msgid "could not lookup commit %s" msgstr "Konnte Commit %s nicht nachschlagen" -#: builtin/commit.c:729 builtin/shortlog.c:425 +#: builtin/commit.c:729 builtin/shortlog.c:413 #, c-format msgid "(reading log message from standard input)\n" msgstr "(lese Log-Nachricht von Standard-Eingabe)\n" @@ -13430,7 +13707,7 @@ msgstr "Kann Index nicht lesen" msgid "Error building trees" msgstr "Fehler beim Erzeugen der \"Tree\"-Objekte" -#: builtin/commit.c:1011 builtin/tag.c:276 +#: builtin/commit.c:1011 builtin/tag.c:308 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "" @@ -13455,13 +13732,11 @@ msgstr "Ungültiger Modus '%s' für unversionierte Dateien" #: builtin/commit.c:1127 msgid "--long and -z are incompatible" -msgstr "Die Optionen --long und -z sind inkompatibel." +msgstr "--long und -z sind inkompatibel" #: builtin/commit.c:1171 msgid "Using both --reset-author and --author does not make sense" -msgstr "" -"Die Optionen --reset-author und --author können nicht gemeinsam verwendet " -"werden." +msgstr "--reset-author und --author können nicht gemeinsam verwendet werden" #: builtin/commit.c:1180 msgid "You have nothing to amend." @@ -13482,7 +13757,7 @@ msgstr "Ein Rebase ist im Gange -- kann \"--amend\" nicht ausführen." #: builtin/commit.c:1190 msgid "Options --squash and --fixup cannot be used together" msgstr "" -"Die Optionen --squash und --fixup können nicht gemeinsam verwendet werden." +"Die Optionen --squash und --fixup können nicht gemeinsam verwendet werden" #: builtin/commit.c:1200 msgid "Only one of -c/-C/-F/--fixup can be used." @@ -13494,8 +13769,7 @@ msgstr "Die Option -m kann nicht mit -c/-C/-F kombiniert werden." #: builtin/commit.c:1211 msgid "--reset-author can be used only with -C, -c or --amend." -msgstr "" -"Die Option --reset--author kann nur mit -C, -c oder --amend verwendet werden." +msgstr "--reset--author kann nur mit -C, -c oder --amend verwendet werden" #: builtin/commit.c:1229 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." @@ -13529,7 +13803,7 @@ msgid "version" msgstr "Version" #: builtin/commit.c:1374 builtin/commit.c:1533 builtin/push.c:560 -#: builtin/worktree.c:725 +#: builtin/worktree.c:679 msgid "machine-readable output" msgstr "maschinenlesbare Ausgabe" @@ -13543,7 +13817,7 @@ msgstr "Einträge mit NUL-Zeichen abschließen" #: builtin/commit.c:1382 builtin/commit.c:1386 builtin/commit.c:1541 #: builtin/fast-export.c:1198 builtin/fast-export.c:1201 -#: builtin/fast-export.c:1204 builtin/rebase.c:1406 parse-options.h:336 +#: builtin/fast-export.c:1204 builtin/rebase.c:1412 parse-options.h:336 msgid "mode" msgstr "Modus" @@ -13602,7 +13876,7 @@ msgstr "Unterschiede in Commit-Beschreibungsvorlage anzeigen" msgid "Commit message options" msgstr "Optionen für Commit-Beschreibung" -#: builtin/commit.c:1501 builtin/merge.c:285 builtin/tag.c:415 +#: builtin/commit.c:1501 builtin/merge.c:286 builtin/tag.c:447 msgid "read message from file" msgstr "Beschreibung von Datei lesen" @@ -13614,7 +13888,7 @@ msgstr "Autor" msgid "override author for commit" msgstr "Autor eines Commits überschreiben" -#: builtin/commit.c:1503 builtin/gc.c:542 +#: builtin/commit.c:1503 builtin/gc.c:550 msgid "date" msgstr "Datum" @@ -13623,7 +13897,7 @@ msgid "override date for commit" msgstr "Datum eines Commits überschreiben" #: builtin/commit.c:1505 builtin/commit.c:1506 builtin/commit.c:1507 -#: builtin/commit.c:1508 parse-options.h:328 ref-filter.h:87 +#: builtin/commit.c:1508 parse-options.h:328 ref-filter.h:90 msgid "commit" msgstr "Commit" @@ -13651,7 +13925,7 @@ msgstr "" msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "Sie als Autor des Commits setzen (verwendet mit -C/-c/--amend)" -#: builtin/commit.c:1510 builtin/log.c:1744 builtin/merge.c:301 +#: builtin/commit.c:1510 builtin/log.c:1743 builtin/merge.c:302 #: builtin/pull.c:145 builtin/revert.c:110 msgid "add a Signed-off-by trailer" msgstr "eine Signed-off-by Zeile hinzufügen" @@ -14079,7 +14353,7 @@ msgstr "" #: builtin/config.c:943 builtin/config.c:954 #, c-format msgid "no such section: %s" -msgstr "Keine solche Sektion: %s" +msgstr "Sektion nicht gefunden: %s" #: builtin/count-objects.c:90 msgid "git count-objects [-v] [-H | --human-readable]" @@ -14278,7 +14552,7 @@ msgstr "" #: builtin/describe.c:593 msgid "--long is incompatible with --abbrev=0" -msgstr "Die Optionen --long und --abbrev=0 sind inkompatibel." +msgstr "--long und --abbrev=0 sind inkompatibel" #: builtin/describe.c:622 msgid "No names found, cannot describe anything." @@ -14286,11 +14560,11 @@ msgstr "Keine Namen gefunden, kann nichts beschreiben." #: builtin/describe.c:673 msgid "--dirty is incompatible with commit-ishes" -msgstr "Die Option --dirty kann nicht mit Commits verwendet werden." +msgstr "--dirty kann nicht mit Commits verwendet werden" #: builtin/describe.c:675 msgid "--broken is incompatible with commit-ishes" -msgstr "Die Option --broken kann nicht mit Commits verwendet werden." +msgstr "--broken kann nicht mit Commits verwendet werden" #: builtin/diff-tree.c:155 msgid "--stdin and --merge-base are mutually exclusive" @@ -14300,41 +14574,41 @@ msgstr "--stdin und --merge-base schließen sich gegenseitig aus" msgid "--merge-base only works with two commits" msgstr "--merge-base funktioniert nur mit zwei Commits" -#: builtin/diff.c:91 +#: builtin/diff.c:92 #, c-format msgid "'%s': not a regular file or symlink" msgstr "'%s': keine reguläre Datei oder symbolische Verknüpfung" -#: builtin/diff.c:258 +#: builtin/diff.c:259 #, c-format msgid "invalid option: %s" msgstr "Ungültige Option: %s" -#: builtin/diff.c:375 +#: builtin/diff.c:376 #, c-format msgid "%s...%s: no merge base" msgstr "%s...%s: keine Merge-Basis" -#: builtin/diff.c:485 +#: builtin/diff.c:486 msgid "Not a git repository" msgstr "Kein Git-Repository" -#: builtin/diff.c:530 builtin/grep.c:681 +#: builtin/diff.c:532 builtin/grep.c:682 #, c-format msgid "invalid object '%s' given." msgstr "Objekt '%s' ist ungültig." -#: builtin/diff.c:541 +#: builtin/diff.c:543 #, c-format msgid "more than two blobs given: '%s'" msgstr "Mehr als zwei Blobs angegeben: '%s'" -#: builtin/diff.c:546 +#: builtin/diff.c:548 #, c-format msgid "unhandled object '%s' given." msgstr "unbehandeltes Objekt '%s' angegeben" -#: builtin/diff.c:580 +#: builtin/diff.c:582 #, c-format msgid "%s...%s: multiple merge bases, using %s" msgstr "%s...%s: mehrere Merge-Basen, nutze %s" @@ -14391,7 +14665,7 @@ msgstr "Sie könnten diese aufräumen oder wiederherstellen." #: builtin/difftool.c:696 msgid "use `diff.guitool` instead of `diff.tool`" -msgstr "`diff.guitool` anstatt `diff.tool` benutzen" +msgstr "`diff.guitool` statt `diff.tool` benutzen" #: builtin/difftool.c:698 msgid "perform a full-directory diff" @@ -14519,39 +14793,39 @@ msgstr "" "Auswählen der Behandlung von Commit-Beschreibungen bei wechselndem Encoding" #: builtin/fast-export.c:1208 -msgid "Dump marks to this file" +msgid "dump marks to this file" msgstr "Markierungen in diese Datei schreiben" #: builtin/fast-export.c:1210 -msgid "Import marks from this file" +msgid "import marks from this file" msgstr "Markierungen von dieser Datei importieren" #: builtin/fast-export.c:1214 -msgid "Import marks from this file if it exists" +msgid "import marks from this file if it exists" msgstr "Markierungen von dieser Datei importieren, wenn diese existiert" #: builtin/fast-export.c:1216 -msgid "Fake a tagger when tags lack one" -msgstr "künstlich einen Tag-Ersteller erzeugen, wenn das Tag keinen hat" +msgid "fake a tagger when tags lack one" +msgstr "einen Tag-Ersteller vortäuschen, wenn das Tag keinen hat" #: builtin/fast-export.c:1218 -msgid "Output full tree for each commit" +msgid "output full tree for each commit" msgstr "für jeden Commit das gesamte Verzeichnis ausgeben" #: builtin/fast-export.c:1220 -msgid "Use the done feature to terminate the stream" +msgid "use the done feature to terminate the stream" msgstr "die \"done\"-Funktion benutzen, um den Datenstrom abzuschließen" #: builtin/fast-export.c:1221 -msgid "Skip output of blob data" +msgid "skip output of blob data" msgstr "Ausgabe von Blob-Daten überspringen" -#: builtin/fast-export.c:1222 builtin/log.c:1816 +#: builtin/fast-export.c:1222 builtin/log.c:1815 msgid "refspec" msgstr "Refspec" #: builtin/fast-export.c:1223 -msgid "Apply refspec to exported refs" +msgid "apply refspec to exported refs" msgstr "Refspec auf exportierte Referenzen anwenden" #: builtin/fast-export.c:1224 @@ -14567,17 +14841,17 @@ msgid "convert <from> to <to> in anonymized output" msgstr "konvertiere <von> zu <nach> in anonymisierter Ausgabe" #: builtin/fast-export.c:1229 -msgid "Reference parents which are not in fast-export stream by object id" +msgid "reference parents which are not in fast-export stream by object id" msgstr "" "Eltern, die nicht im Fast-Export-Stream sind, anhand ihrer Objekt-ID " "referenzieren" #: builtin/fast-export.c:1231 -msgid "Show original object ids of blobs/commits" +msgid "show original object ids of blobs/commits" msgstr "originale Objekt-IDs von Blobs/Commits anzeigen" #: builtin/fast-export.c:1233 -msgid "Label tags with mark ids" +msgid "label tags with mark ids" msgstr "Tags mit Markierungs-IDs beschriften" #: builtin/fast-export.c:1256 @@ -14619,7 +14893,7 @@ msgstr "Format 'Name:Dateiname' für Submodul-Rewrite-Option erwartet" msgid "feature '%s' forbidden in input without --allow-unsafe-features" msgstr "Feature '%s' verboten in Eingabe ohne Option --allow-unsafe-features" -#: builtin/fetch-pack.c:241 +#: builtin/fetch-pack.c:242 #, c-format msgid "Lockfile created but not reported: %s" msgstr "Lock-Datei erstellt, aber nicht gemeldet: %s" @@ -14640,100 +14914,104 @@ msgstr "git fetch --multiple [<Optionen>] [(<Repository> | <Gruppe>)...]" msgid "git fetch --all [<options>]" msgstr "git fetch --all [<Optionen>]" -#: builtin/fetch.c:119 +#: builtin/fetch.c:120 msgid "fetch.parallel cannot be negative" msgstr "fetch.parallel kann nicht negativ sein" -#: builtin/fetch.c:142 builtin/pull.c:185 +#: builtin/fetch.c:143 builtin/pull.c:185 msgid "fetch from all remotes" msgstr "fordert von allen Remote-Repositories an" -#: builtin/fetch.c:144 builtin/pull.c:245 +#: builtin/fetch.c:145 builtin/pull.c:245 msgid "set upstream for git pull/fetch" msgstr "Upstream für \"git pull/fetch\" setzen" -#: builtin/fetch.c:146 builtin/pull.c:188 +#: builtin/fetch.c:147 builtin/pull.c:188 msgid "append to .git/FETCH_HEAD instead of overwriting" -msgstr "an .git/FETCH_HEAD anhängen, anstatt zu überschreiben" +msgstr "an .git/FETCH_HEAD anhängen statt zu überschreiben" + +#: builtin/fetch.c:149 +msgid "use atomic transaction to update references" +msgstr "atomare Transaktionen nutzen, um Referenzen zu aktualisieren" -#: builtin/fetch.c:148 builtin/pull.c:191 +#: builtin/fetch.c:151 builtin/pull.c:191 msgid "path to upload pack on remote end" msgstr "Pfad des Programms zum Hochladen von Paketen auf der Gegenseite" -#: builtin/fetch.c:149 +#: builtin/fetch.c:152 msgid "force overwrite of local reference" msgstr "das Überschreiben einer lokalen Referenz erzwingen" -#: builtin/fetch.c:151 +#: builtin/fetch.c:154 msgid "fetch from multiple remotes" msgstr "von mehreren Remote-Repositories anfordern" -#: builtin/fetch.c:153 builtin/pull.c:195 +#: builtin/fetch.c:156 builtin/pull.c:195 msgid "fetch all tags and associated objects" msgstr "alle Tags und verbundene Objekte anfordern" -#: builtin/fetch.c:155 +#: builtin/fetch.c:158 msgid "do not fetch all tags (--no-tags)" msgstr "nicht alle Tags anfordern (--no-tags)" -#: builtin/fetch.c:157 +#: builtin/fetch.c:160 msgid "number of submodules fetched in parallel" msgstr "Anzahl der parallel anzufordernden Submodule" -#: builtin/fetch.c:159 builtin/pull.c:198 +#: builtin/fetch.c:162 builtin/pull.c:198 msgid "prune remote-tracking branches no longer on remote" msgstr "" "Remote-Tracking-Branches entfernen, die sich nicht mehr im Remote-Repository " "befinden" -#: builtin/fetch.c:161 +#: builtin/fetch.c:164 msgid "prune local tags no longer on remote and clobber changed tags" msgstr "" "lokale Tags entfernen, die sich nicht mehr im Remote-Repository befinden, " "und geänderte Tags aktualisieren" -#: builtin/fetch.c:162 builtin/fetch.c:187 builtin/pull.c:122 +#: builtin/fetch.c:165 builtin/fetch.c:190 builtin/pull.c:122 msgid "on-demand" msgstr "bei-Bedarf" -#: builtin/fetch.c:163 +#: builtin/fetch.c:166 msgid "control recursive fetching of submodules" msgstr "rekursive Anforderungen von Submodulen kontrollieren" -#: builtin/fetch.c:168 +#: builtin/fetch.c:171 msgid "write fetched references to the FETCH_HEAD file" msgstr "schreibe angeforderte Referenzen in die FETCH_HEAD-Datei" -#: builtin/fetch.c:169 builtin/pull.c:206 +#: builtin/fetch.c:172 builtin/pull.c:206 msgid "keep downloaded pack" msgstr "heruntergeladenes Paket behalten" -#: builtin/fetch.c:171 +#: builtin/fetch.c:174 msgid "allow updating of HEAD ref" msgstr "Aktualisierung der \"HEAD\"-Referenz erlauben" -#: builtin/fetch.c:174 builtin/fetch.c:180 builtin/pull.c:209 +#: builtin/fetch.c:177 builtin/fetch.c:183 builtin/pull.c:209 #: builtin/pull.c:218 msgid "deepen history of shallow clone" msgstr "" "die Historie eines Klons mit unvollständiger Historie (shallow) vertiefen" -#: builtin/fetch.c:176 builtin/pull.c:212 +#: builtin/fetch.c:179 builtin/pull.c:212 msgid "deepen history of shallow repository based on time" msgstr "" "die Historie eines Klons mit unvollständiger Historie (shallow) auf " "Zeitbasis\n" "vertiefen" -#: builtin/fetch.c:182 builtin/pull.c:221 +#: builtin/fetch.c:185 builtin/pull.c:221 msgid "convert to a complete repository" msgstr "zu einem vollständigen Repository konvertieren" -#: builtin/fetch.c:185 +#: builtin/fetch.c:188 msgid "prepend this to submodule path output" msgstr "dies an die Ausgabe der Submodul-Pfade voranstellen" -#: builtin/fetch.c:188 +#: builtin/fetch.c:191 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" @@ -14741,100 +15019,100 @@ msgstr "" "Standard für die rekursive Anforderung von Submodulen (geringere Priorität\n" "als Konfigurationsdateien)" -#: builtin/fetch.c:192 builtin/pull.c:224 +#: builtin/fetch.c:195 builtin/pull.c:224 msgid "accept refs that update .git/shallow" msgstr "Referenzen, die .git/shallow aktualisieren, akzeptieren" -#: builtin/fetch.c:193 builtin/pull.c:226 +#: builtin/fetch.c:196 builtin/pull.c:226 msgid "refmap" msgstr "Refmap" -#: builtin/fetch.c:194 builtin/pull.c:227 +#: builtin/fetch.c:197 builtin/pull.c:227 msgid "specify fetch refmap" msgstr "Refmap für 'fetch' angeben" -#: builtin/fetch.c:201 builtin/pull.c:240 +#: builtin/fetch.c:204 builtin/pull.c:240 msgid "report that we have only objects reachable from this object" msgstr "" "ausgeben, dass wir nur Objekte haben, die von diesem Objekt aus erreichbar " "sind" -#: builtin/fetch.c:204 builtin/fetch.c:206 +#: builtin/fetch.c:207 builtin/fetch.c:209 msgid "run 'maintenance --auto' after fetching" msgstr "führe 'maintenance --auto' nach \"fetch\" aus" -#: builtin/fetch.c:208 builtin/pull.c:243 +#: builtin/fetch.c:211 builtin/pull.c:243 msgid "check for forced-updates on all updated branches" msgstr "Prüfe auf erzwungene Aktualisierungen in allen aktualisierten Branches" -#: builtin/fetch.c:210 +#: builtin/fetch.c:213 msgid "write the commit-graph after fetching" msgstr "Schreibe den Commit-Graph nach \"fetch\"" -#: builtin/fetch.c:212 +#: builtin/fetch.c:215 msgid "accept refspecs from stdin" msgstr "akzeptiere Refspecs von der Standard-Eingabe" -#: builtin/fetch.c:523 +#: builtin/fetch.c:526 msgid "Couldn't find remote ref HEAD" msgstr "Konnte Remote-Referenz von HEAD nicht finden." -#: builtin/fetch.c:677 +#: builtin/fetch.c:697 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "Konfiguration fetch.output enthält ungültigen Wert %s" -#: builtin/fetch.c:775 +#: builtin/fetch.c:796 #, c-format msgid "object %s not found" msgstr "Objekt %s nicht gefunden" -#: builtin/fetch.c:779 +#: builtin/fetch.c:800 msgid "[up to date]" msgstr "[aktuell]" -#: builtin/fetch.c:792 builtin/fetch.c:808 builtin/fetch.c:880 +#: builtin/fetch.c:813 builtin/fetch.c:829 builtin/fetch.c:901 msgid "[rejected]" msgstr "[zurückgewiesen]" -#: builtin/fetch.c:793 +#: builtin/fetch.c:814 msgid "can't fetch in current branch" msgstr "kann \"fetch\" im aktuellen Branch nicht ausführen" -#: builtin/fetch.c:803 +#: builtin/fetch.c:824 msgid "[tag update]" msgstr "[Tag Aktualisierung]" -#: builtin/fetch.c:804 builtin/fetch.c:841 builtin/fetch.c:863 -#: builtin/fetch.c:875 +#: builtin/fetch.c:825 builtin/fetch.c:862 builtin/fetch.c:884 +#: builtin/fetch.c:896 msgid "unable to update local ref" msgstr "kann lokale Referenz nicht aktualisieren" -#: builtin/fetch.c:808 +#: builtin/fetch.c:829 msgid "would clobber existing tag" msgstr "würde bestehende Tags verändern" -#: builtin/fetch.c:830 +#: builtin/fetch.c:851 msgid "[new tag]" msgstr "[neues Tag]" -#: builtin/fetch.c:833 +#: builtin/fetch.c:854 msgid "[new branch]" msgstr "[neuer Branch]" -#: builtin/fetch.c:836 +#: builtin/fetch.c:857 msgid "[new ref]" msgstr "[neue Referenz]" -#: builtin/fetch.c:875 +#: builtin/fetch.c:896 msgid "forced update" msgstr "Aktualisierung erzwungen" -#: builtin/fetch.c:880 +#: builtin/fetch.c:901 msgid "non-fast-forward" msgstr "kein Vorspulen" -#: builtin/fetch.c:901 +#: builtin/fetch.c:1005 msgid "" "Fetch normally indicates which branches had a forced update,\n" "but that check has been disabled. To re-enable, use '--show-forced-updates'\n" @@ -14845,7 +15123,7 @@ msgstr "" "aktivieren, nutzen Sie die Option '--show-forced-updated' oder führen\n" "Sie 'git config fetch.showForcedUpdates true' aus." -#: builtin/fetch.c:905 +#: builtin/fetch.c:1009 #, c-format msgid "" "It took %.2f seconds to check forced updates. You can use\n" @@ -14858,12 +15136,12 @@ msgstr "" "'git config fetch.showForcedUpdates false' ausführen, um diese Überprüfung\n" "zu umgehen.\n" -#: builtin/fetch.c:939 +#: builtin/fetch.c:1041 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s hat nicht alle erforderlichen Objekte gesendet\n" -#: builtin/fetch.c:960 +#: builtin/fetch.c:1069 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "" @@ -14871,12 +15149,12 @@ msgstr "" "unvollständiger\n" "Historie (shallow) nicht aktualisiert werden dürfen." -#: builtin/fetch.c:1053 builtin/fetch.c:1191 +#: builtin/fetch.c:1146 builtin/fetch.c:1297 #, c-format msgid "From %.*s\n" msgstr "Von %.*s\n" -#: builtin/fetch.c:1064 +#: builtin/fetch.c:1168 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -14885,58 +15163,58 @@ msgstr "" "Einige lokale Referenzen konnten nicht aktualisiert werden; versuchen Sie\n" "'git remote prune %s', um jeden älteren, widersprüchlichen Branch zu löschen." -#: builtin/fetch.c:1161 +#: builtin/fetch.c:1267 #, c-format msgid " (%s will become dangling)" msgstr " (%s wird unreferenziert)" -#: builtin/fetch.c:1162 +#: builtin/fetch.c:1268 #, c-format msgid " (%s has become dangling)" msgstr " (%s wurde unreferenziert)" -#: builtin/fetch.c:1194 +#: builtin/fetch.c:1300 msgid "[deleted]" msgstr "[gelöscht]" -#: builtin/fetch.c:1195 builtin/remote.c:1118 +#: builtin/fetch.c:1301 builtin/remote.c:1118 msgid "(none)" msgstr "(nichts)" -#: builtin/fetch.c:1218 +#: builtin/fetch.c:1324 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "" "Der \"fetch\" in den aktuellen Branch %s von einem Nicht-Bare-Repository " "wurde verweigert." -#: builtin/fetch.c:1237 +#: builtin/fetch.c:1343 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "Option \"%s\" Wert \"%s\" ist nicht gültig für %s" -#: builtin/fetch.c:1240 +#: builtin/fetch.c:1346 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "Option \"%s\" wird ignoriert für %s\n" -#: builtin/fetch.c:1448 +#: builtin/fetch.c:1558 msgid "multiple branches detected, incompatible with --set-upstream" msgstr "Mehrere Branches erkannt, inkompatibel mit --set-upstream" -#: builtin/fetch.c:1463 +#: builtin/fetch.c:1573 msgid "not setting upstream for a remote remote-tracking branch" msgstr "Setze keinen Upstream für einen entfernten Remote-Tracking-Branch." -#: builtin/fetch.c:1465 +#: builtin/fetch.c:1575 msgid "not setting upstream for a remote tag" msgstr "Setze keinen Upstream für einen Tag eines Remote-Repositories." -#: builtin/fetch.c:1467 +#: builtin/fetch.c:1577 msgid "unknown branch type" msgstr "Unbekannter Branch-Typ" -#: builtin/fetch.c:1469 +#: builtin/fetch.c:1579 msgid "" "no source branch found.\n" "you need to specify exactly one branch with the --set-upstream option." @@ -14944,22 +15222,22 @@ msgstr "" "Keinen Quell-Branch gefunden.\n" "Sie müssen bei der Option --set-upstream genau einen Branch angeben." -#: builtin/fetch.c:1598 builtin/fetch.c:1661 +#: builtin/fetch.c:1708 builtin/fetch.c:1771 #, c-format msgid "Fetching %s\n" msgstr "Fordere an von %s\n" -#: builtin/fetch.c:1608 builtin/fetch.c:1663 builtin/remote.c:101 +#: builtin/fetch.c:1718 builtin/fetch.c:1773 builtin/remote.c:101 #, c-format msgid "Could not fetch %s" msgstr "Konnte nicht von %s anfordern" -#: builtin/fetch.c:1620 +#: builtin/fetch.c:1730 #, c-format msgid "could not fetch '%s' (exit code: %d)\n" msgstr "Konnte '%s' nicht anfordern (Exit-Code: %d)\n" -#: builtin/fetch.c:1724 +#: builtin/fetch.c:1834 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -14968,49 +15246,48 @@ msgstr "" "oder den Namen des Remote-Repositories an, von welchem neue\n" "Commits angefordert werden sollen." -#: builtin/fetch.c:1760 +#: builtin/fetch.c:1870 msgid "You need to specify a tag name." msgstr "Sie müssen den Namen des Tags angeben." -#: builtin/fetch.c:1825 +#: builtin/fetch.c:1935 msgid "Negative depth in --deepen is not supported" msgstr "Negative Tiefe wird von --deepen nicht unterstützt." -#: builtin/fetch.c:1827 +#: builtin/fetch.c:1937 msgid "--deepen and --depth are mutually exclusive" msgstr "--deepen und --depth schließen sich gegenseitig aus" -#: builtin/fetch.c:1832 +#: builtin/fetch.c:1942 msgid "--depth and --unshallow cannot be used together" -msgstr "" -"Die Optionen --depth und --unshallow können nicht gemeinsam verwendet werden." +msgstr "--depth und --unshallow können nicht gemeinsam verwendet werden" -#: builtin/fetch.c:1834 +#: builtin/fetch.c:1944 msgid "--unshallow on a complete repository does not make sense" msgstr "" -"Die Option --unshallow kann nicht in einem Repository mit vollständiger " -"Historie verwendet werden." +"--unshallow kann nicht in einem Repository mit vollständiger Historie " +"verwendet werden" -#: builtin/fetch.c:1851 +#: builtin/fetch.c:1961 msgid "fetch --all does not take a repository argument" msgstr "fetch --all akzeptiert kein Repository als Argument" -#: builtin/fetch.c:1853 +#: builtin/fetch.c:1963 msgid "fetch --all does not make sense with refspecs" -msgstr "fetch --all kann nicht mit Refspecs verwendet werden." +msgstr "fetch --all kann nicht mit Refspecs verwendet werden" -#: builtin/fetch.c:1862 +#: builtin/fetch.c:1972 #, c-format msgid "No such remote or remote group: %s" -msgstr "Kein Remote-Repository (einzeln oder Gruppe): %s" +msgstr "Remote-Repository (einzeln oder Gruppe) nicht gefunden: %s" -#: builtin/fetch.c:1869 +#: builtin/fetch.c:1979 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "" "Das Abholen einer Gruppe von Remote-Repositories kann nicht mit der Angabe\n" "von Refspecs verwendet werden." -#: builtin/fetch.c:1887 +#: builtin/fetch.c:1997 msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" @@ -15018,11 +15295,17 @@ msgstr "" "--filter kann nur mit den Remote-Repositories verwendet werden,\n" "die in extensions.partialclone konfiguriert sind" -#: builtin/fetch.c:1891 +#: builtin/fetch.c:2001 +msgid "--atomic can only be used when fetching from one remote" +msgstr "" +"--atomic kann nur verwendet werden, wenn nur von einem Remote-Repository " +"abgefragt wird" + +#: builtin/fetch.c:2005 msgid "--stdin can only be used when fetching from one remote" msgstr "" -"die Option --stdin kann nur verwendet werden, wenn nur von einem Remote-\n" -"Repository abgefragt wird" +"--stdin kann nur verwendet werden, wenn nur von einem Remote-Repository " +"abgefragt wird" #: builtin/fmt-merge-msg.c:7 msgid "" @@ -15087,7 +15370,7 @@ msgstr "Platzhalter als Tcl-String formatieren" msgid "show only <n> matched refs" msgstr "nur <n> passende Referenzen anzeigen" -#: builtin/for-each-ref.c:39 builtin/tag.c:440 +#: builtin/for-each-ref.c:39 builtin/tag.c:472 msgid "respect format colors" msgstr "Formatfarben beachten" @@ -15127,32 +15410,32 @@ msgstr "Konfigurationsschlüssel für eine Liste von Repository-Pfaden" msgid "missing --config=<config>" msgstr "Option --config=<Konfiguration> fehlt" -#: builtin/fsck.c:69 builtin/fsck.c:148 builtin/fsck.c:149 +#: builtin/fsck.c:69 builtin/fsck.c:130 builtin/fsck.c:131 msgid "unknown" msgstr "unbekannt" #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation> -#: builtin/fsck.c:101 builtin/fsck.c:121 +#: builtin/fsck.c:83 builtin/fsck.c:103 #, c-format msgid "error in %s %s: %s" msgstr "Fehler in %s %s: %s" #. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation> -#: builtin/fsck.c:115 +#: builtin/fsck.c:97 #, c-format msgid "warning in %s %s: %s" msgstr "Warnung in %s %s: %s" -#: builtin/fsck.c:144 builtin/fsck.c:147 +#: builtin/fsck.c:126 builtin/fsck.c:129 #, c-format msgid "broken link from %7s %s" msgstr "fehlerhafte Verknüpfung von %7s %s" -#: builtin/fsck.c:156 +#: builtin/fsck.c:138 msgid "wrong object type in link" msgstr "falscher Objekttyp in Verknüpfung" -#: builtin/fsck.c:172 +#: builtin/fsck.c:154 #, c-format msgid "" "broken link from %7s %s\n" @@ -15161,211 +15444,211 @@ msgstr "" "fehlerhafte Verknüpfung von %7s %s\n" " nach %7s %s" -#: builtin/fsck.c:283 +#: builtin/fsck.c:265 #, c-format msgid "missing %s %s" msgstr "%s %s fehlt" -#: builtin/fsck.c:310 +#: builtin/fsck.c:292 #, c-format msgid "unreachable %s %s" msgstr "%s %s nicht erreichbar" -#: builtin/fsck.c:330 +#: builtin/fsck.c:312 #, c-format msgid "dangling %s %s" msgstr "%s %s unreferenziert" -#: builtin/fsck.c:340 +#: builtin/fsck.c:322 msgid "could not create lost-found" msgstr "Konnte lost-found nicht erstellen." -#: builtin/fsck.c:351 +#: builtin/fsck.c:333 #, c-format msgid "could not finish '%s'" msgstr "Konnte '%s' nicht abschließen." -#: builtin/fsck.c:368 +#: builtin/fsck.c:350 #, c-format msgid "Checking %s" msgstr "Prüfe %s" -#: builtin/fsck.c:406 +#: builtin/fsck.c:388 #, c-format msgid "Checking connectivity (%d objects)" msgstr "Prüfe Konnektivität (%d Objekte)" -#: builtin/fsck.c:425 +#: builtin/fsck.c:407 #, c-format msgid "Checking %s %s" msgstr "Prüfe %s %s" -#: builtin/fsck.c:430 +#: builtin/fsck.c:412 msgid "broken links" msgstr "Fehlerhafte Verknüpfungen" -#: builtin/fsck.c:439 +#: builtin/fsck.c:421 #, c-format msgid "root %s" msgstr "Wurzel %s" -#: builtin/fsck.c:447 +#: builtin/fsck.c:429 #, c-format msgid "tagged %s %s (%s) in %s" msgstr "%s %s (%s) in %s getaggt" -#: builtin/fsck.c:476 +#: builtin/fsck.c:458 #, c-format msgid "%s: object corrupt or missing" msgstr "%s: Objekt fehlerhaft oder nicht vorhanden" -#: builtin/fsck.c:501 +#: builtin/fsck.c:483 #, c-format msgid "%s: invalid reflog entry %s" msgstr "%s: Ungültiger Reflog-Eintrag %s" -#: builtin/fsck.c:515 +#: builtin/fsck.c:497 #, c-format msgid "Checking reflog %s->%s" msgstr "Prüfe Reflog %s->%s" -#: builtin/fsck.c:549 +#: builtin/fsck.c:531 #, c-format msgid "%s: invalid sha1 pointer %s" msgstr "%s: Ungültiger SHA1-Zeiger %s" -#: builtin/fsck.c:556 +#: builtin/fsck.c:538 #, c-format msgid "%s: not a commit" msgstr "%s: kein Commit" -#: builtin/fsck.c:610 +#: builtin/fsck.c:592 msgid "notice: No default references" msgstr "Notiz: Keine Standardreferenzen" -#: builtin/fsck.c:625 +#: builtin/fsck.c:607 #, c-format msgid "%s: object corrupt or missing: %s" msgstr "%s: Objekt fehlerhaft oder nicht vorhanden: %s" -#: builtin/fsck.c:638 +#: builtin/fsck.c:620 #, c-format msgid "%s: object could not be parsed: %s" msgstr "%s: Objekt konnte nicht geparst werden: %s" -#: builtin/fsck.c:658 +#: builtin/fsck.c:640 #, c-format msgid "bad sha1 file: %s" msgstr "Ungültige SHA1-Datei: %s" -#: builtin/fsck.c:673 +#: builtin/fsck.c:655 msgid "Checking object directory" msgstr "Prüfe Objekt-Verzeichnis" -#: builtin/fsck.c:676 +#: builtin/fsck.c:658 msgid "Checking object directories" msgstr "Prüfe Objekt-Verzeichnisse" -#: builtin/fsck.c:691 +#: builtin/fsck.c:673 #, c-format msgid "Checking %s link" msgstr "Prüfe %s Verknüpfung" -#: builtin/fsck.c:696 builtin/index-pack.c:865 +#: builtin/fsck.c:678 builtin/index-pack.c:865 #, c-format msgid "invalid %s" msgstr "Ungültiger Objekt-Typ %s" -#: builtin/fsck.c:703 +#: builtin/fsck.c:685 #, c-format msgid "%s points to something strange (%s)" msgstr "%s zeigt auf etwas seltsames (%s)" -#: builtin/fsck.c:709 +#: builtin/fsck.c:691 #, c-format msgid "%s: detached HEAD points at nothing" msgstr "%s: losgelöster HEAD zeigt auf nichts" -#: builtin/fsck.c:713 +#: builtin/fsck.c:695 #, c-format msgid "notice: %s points to an unborn branch (%s)" msgstr "Notiz: %s zeigt auf einen ungeborenen Branch (%s)" -#: builtin/fsck.c:725 +#: builtin/fsck.c:707 msgid "Checking cache tree" msgstr "Prüfe Cache-Verzeichnis" -#: builtin/fsck.c:730 +#: builtin/fsck.c:712 #, c-format msgid "%s: invalid sha1 pointer in cache-tree" msgstr "%s: Ungültiger SHA1-Zeiger in Cache-Verzeichnis" -#: builtin/fsck.c:739 +#: builtin/fsck.c:721 msgid "non-tree in cache-tree" msgstr "non-tree in Cache-Verzeichnis" -#: builtin/fsck.c:770 +#: builtin/fsck.c:752 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<Optionen>] [<Objekt>...]" -#: builtin/fsck.c:776 +#: builtin/fsck.c:758 msgid "show unreachable objects" msgstr "unerreichbare Objekte anzeigen" -#: builtin/fsck.c:777 +#: builtin/fsck.c:759 msgid "show dangling objects" msgstr "unreferenzierte Objekte anzeigen" -#: builtin/fsck.c:778 +#: builtin/fsck.c:760 msgid "report tags" msgstr "Tags melden" -#: builtin/fsck.c:779 +#: builtin/fsck.c:761 msgid "report root nodes" msgstr "Hauptwurzeln melden" -#: builtin/fsck.c:780 +#: builtin/fsck.c:762 msgid "make index objects head nodes" msgstr "Index-Objekte in Erreichbarkeitsprüfung einbeziehen" -#: builtin/fsck.c:781 +#: builtin/fsck.c:763 msgid "make reflogs head nodes (default)" msgstr "Reflogs in Erreichbarkeitsprüfung einbeziehen (Standard)" -#: builtin/fsck.c:782 +#: builtin/fsck.c:764 msgid "also consider packs and alternate objects" msgstr "ebenso Pakete und alternative Objekte betrachten" -#: builtin/fsck.c:783 +#: builtin/fsck.c:765 msgid "check only connectivity" msgstr "nur Konnektivität prüfen" -#: builtin/fsck.c:784 +#: builtin/fsck.c:766 builtin/mktag.c:78 msgid "enable more strict checking" msgstr "genauere Prüfung aktivieren" -#: builtin/fsck.c:786 +#: builtin/fsck.c:768 msgid "write dangling objects in .git/lost-found" msgstr "unreferenzierte Objekte nach .git/lost-found schreiben" -#: builtin/fsck.c:787 builtin/prune.c:134 +#: builtin/fsck.c:769 builtin/prune.c:134 msgid "show progress" msgstr "Fortschrittsanzeige anzeigen" -#: builtin/fsck.c:788 +#: builtin/fsck.c:770 msgid "show verbose names for reachable objects" msgstr "ausführliche Namen für erreichbare Objekte anzeigen" -#: builtin/fsck.c:847 builtin/index-pack.c:261 +#: builtin/fsck.c:829 builtin/index-pack.c:261 msgid "Checking objects" msgstr "Prüfe Objekte" -#: builtin/fsck.c:875 +#: builtin/fsck.c:857 #, c-format msgid "%s: object missing" msgstr "%s: Objekt nicht vorhanden" -#: builtin/fsck.c:886 +#: builtin/fsck.c:868 #, c-format msgid "invalid parameter: expected sha1, got '%s'" msgstr "Ungültiger Parameter: SHA-1 erwartet, '%s' bekommen" @@ -15374,27 +15657,27 @@ msgstr "Ungültiger Parameter: SHA-1 erwartet, '%s' bekommen" msgid "git gc [<options>]" msgstr "git gc [<Optionen>]" -#: builtin/gc.c:94 +#: builtin/gc.c:93 #, c-format msgid "Failed to fstat %s: %s" msgstr "Konnte '%s' nicht lesen: %s" -#: builtin/gc.c:130 +#: builtin/gc.c:129 #, c-format msgid "failed to parse '%s' value '%s'" msgstr "Fehler beim Parsen von '%s' mit dem Wert '%s'" -#: builtin/gc.c:479 builtin/init-db.c:58 +#: builtin/gc.c:487 builtin/init-db.c:58 #, c-format msgid "cannot stat '%s'" msgstr "Kann '%s' nicht lesen" -#: builtin/gc.c:488 builtin/notes.c:240 builtin/tag.c:530 +#: builtin/gc.c:496 builtin/notes.c:240 builtin/tag.c:562 #, c-format msgid "cannot read '%s'" msgstr "kann '%s' nicht lesen" -#: builtin/gc.c:495 +#: builtin/gc.c:503 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -15410,58 +15693,58 @@ msgstr "" "\n" "%s" -#: builtin/gc.c:543 +#: builtin/gc.c:551 msgid "prune unreferenced objects" msgstr "unreferenzierte Objekte entfernen" -#: builtin/gc.c:545 +#: builtin/gc.c:553 msgid "be more thorough (increased runtime)" msgstr "mehr Gründlichkeit (erhöht Laufzeit)" -#: builtin/gc.c:546 +#: builtin/gc.c:554 msgid "enable auto-gc mode" msgstr "\"auto-gc\" Modus aktivieren" -#: builtin/gc.c:549 +#: builtin/gc.c:557 msgid "force running gc even if there may be another gc running" msgstr "" "Ausführung von \"git gc\" erzwingen, selbst wenn ein anderes\n" "\"git gc\" bereits ausgeführt wird" -#: builtin/gc.c:552 +#: builtin/gc.c:560 msgid "repack all other packs except the largest pack" msgstr "alle anderen Pakete, außer das größte Paket, neu packen" -#: builtin/gc.c:569 +#: builtin/gc.c:576 #, c-format msgid "failed to parse gc.logexpiry value %s" msgstr "Fehler beim Parsen des Wertes '%s' von gc.logexpiry." -#: builtin/gc.c:580 +#: builtin/gc.c:587 #, c-format msgid "failed to parse prune expiry value %s" msgstr "Fehler beim Parsen des \"prune expiry\" Wertes %s" -#: builtin/gc.c:600 +#: builtin/gc.c:607 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "" "Die Datenbank des Repositories wird für eine optimale Performance im\n" "Hintergrund komprimiert.\n" -#: builtin/gc.c:602 +#: builtin/gc.c:609 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "" "Die Datenbank des Projektarchivs wird für eine optimale Performance " "komprimiert.\n" -#: builtin/gc.c:603 +#: builtin/gc.c:610 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "Siehe \"git help gc\" für manuelles Aufräumen.\n" -#: builtin/gc.c:643 +#: builtin/gc.c:650 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" @@ -15469,149 +15752,176 @@ msgstr "" "\"git gc\" wird bereits auf Maschine '%s' pid %<PRIuMAX> ausgeführt\n" "(benutzen Sie --force falls nicht)" -#: builtin/gc.c:698 +#: builtin/gc.c:705 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" "Es gibt zu viele unerreichbare lose Objekte; führen Sie 'git prune' aus, um " "diese zu löschen." -#: builtin/gc.c:708 +#: builtin/gc.c:715 msgid "" "git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]" msgstr "" "git maintenance run [--auto] [--[no-]quiet] [--task=<Aufgabe>] [--schedule]" -#: builtin/gc.c:738 +#: builtin/gc.c:745 msgid "--no-schedule is not allowed" msgstr "--no-schedule ist nicht erlaubt" -#: builtin/gc.c:743 +#: builtin/gc.c:750 #, c-format msgid "unrecognized --schedule argument '%s'" msgstr "nicht erkanntes --schedule Argument '%s'" -#: builtin/gc.c:862 +#: builtin/gc.c:869 msgid "failed to write commit-graph" msgstr "Fehler beim Schreiben des Commit-Graph" -#: builtin/gc.c:901 +#: builtin/gc.c:914 msgid "failed to fill remotes" msgstr "Fehler beim Eintragen der Remote-Repositories" -#: builtin/gc.c:1024 +#: builtin/gc.c:1037 msgid "failed to start 'git pack-objects' process" msgstr "konnte 'git pack-objects' Prozess nicht starten" -#: builtin/gc.c:1041 +#: builtin/gc.c:1054 msgid "failed to finish 'git pack-objects' process" msgstr "konnte 'git pack-objects' Prozess nicht beenden" -#: builtin/gc.c:1093 +#: builtin/gc.c:1106 msgid "failed to write multi-pack-index" msgstr "Fehler beim Schreiben des multi-pack-index" -#: builtin/gc.c:1111 +#: builtin/gc.c:1124 msgid "'git multi-pack-index expire' failed" msgstr "Fehler beim Ausführen von 'git multi-pack-index expire'" -#: builtin/gc.c:1172 +#: builtin/gc.c:1185 msgid "'git multi-pack-index repack' failed" msgstr "Fehler beim Ausführen von 'git multi-pack-index repack'" -#: builtin/gc.c:1181 +#: builtin/gc.c:1194 msgid "" "skipping incremental-repack task because core.multiPackIndex is disabled" msgstr "" "Überspringen der Aufgabe 'incremental-repack', weil core.multiPackIndex " "deaktiviert ist" -#: builtin/gc.c:1279 +#: builtin/gc.c:1298 #, c-format msgid "lock file '%s' exists, skipping maintenance" msgstr "Sperrdatei '%s' existiert, Wartung wird übersprungen" -#: builtin/gc.c:1309 +#: builtin/gc.c:1328 #, c-format msgid "task '%s' failed" msgstr "Aufgabe '%s' fehlgeschlagen" -#: builtin/gc.c:1389 +#: builtin/gc.c:1410 #, c-format msgid "'%s' is not a valid task" msgstr "'%s' ist keine gültige Aufgabe" -#: builtin/gc.c:1394 +#: builtin/gc.c:1415 #, c-format msgid "task '%s' cannot be selected multiple times" msgstr "Aufgabe '%s' kann nicht mehrfach ausgewählt werden" -#: builtin/gc.c:1409 +#: builtin/gc.c:1430 msgid "run tasks based on the state of the repository" msgstr "Aufgaben abhängig vom Zustand des Repositories ausführen" -#: builtin/gc.c:1410 +#: builtin/gc.c:1431 msgid "frequency" msgstr "Häufigkeit" -#: builtin/gc.c:1411 +#: builtin/gc.c:1432 msgid "run tasks based on frequency" msgstr "Aufgaben abhängig von der Häufigkeit ausführen" -#: builtin/gc.c:1414 +#: builtin/gc.c:1435 msgid "do not report progress or other information over stderr" msgstr "zeige keinen Fortschritt oder andere Informationen über stderr" -#: builtin/gc.c:1415 +#: builtin/gc.c:1436 msgid "task" msgstr "Aufgabe" -#: builtin/gc.c:1416 +#: builtin/gc.c:1437 msgid "run a specific task" msgstr "eine bestimmte Aufgabe ausführen" -#: builtin/gc.c:1433 +#: builtin/gc.c:1454 msgid "use at most one of --auto and --schedule=<frequency>" msgstr "" "nutzen Sie höchstens eine der Optionen --auto oder --schedule=<Häufigkeit>" -#: builtin/gc.c:1467 +#: builtin/gc.c:1497 msgid "failed to run 'git config'" msgstr "Fehler beim Ausführen von 'git config'" -#: builtin/gc.c:1512 -msgid "another process is scheduling background maintenance" -msgstr "ein anderer Prozess plant die Hintergrundwartung" +#: builtin/gc.c:1562 +#, c-format +msgid "failed to expand path '%s'" +msgstr "Fehler beim Erweitern des Pfades '%s'" + +#: builtin/gc.c:1591 +msgid "failed to start launchctl" +msgstr "konnte launchctl nicht starten" + +#: builtin/gc.c:1628 +#, c-format +msgid "failed to create directories for '%s'" +msgstr "Fehler beim Erstellen von Verzeichnissen für '%s'" + +#: builtin/gc.c:1689 +#, c-format +msgid "failed to bootstrap service %s" +msgstr "Fehler beim Laden des Services %s" + +#: builtin/gc.c:1760 +msgid "failed to create temp xml file" +msgstr "Fehler beim Erstellen der temporären XML-Datei" -#: builtin/gc.c:1525 +#: builtin/gc.c:1850 +msgid "failed to start schtasks" +msgstr "Fehler beim Starten von schtasks" + +#: builtin/gc.c:1894 msgid "failed to run 'crontab -l'; your system might not support 'cron'" msgstr "" "Fehler beim Ausführen von 'crontab -l'; Ihr System unterstützt eventuell " "'cron' nicht" -#: builtin/gc.c:1544 +#: builtin/gc.c:1911 msgid "failed to run 'crontab'; your system might not support 'cron'" msgstr "" "Fehler beim Ausführen von 'crontab'; Ihr System unterstützt eventuell 'cron' " "nicht" -#: builtin/gc.c:1550 +#: builtin/gc.c:1915 msgid "failed to open stdin of 'crontab'" msgstr "Fehler beim Öffnen der Standard-Eingabe von 'crontab'" -#: builtin/gc.c:1592 +#: builtin/gc.c:1956 msgid "'crontab' died" msgstr "'crontab' abgebrochen" -#: builtin/gc.c:1605 +#: builtin/gc.c:1990 +msgid "another process is scheduling background maintenance" +msgstr "ein anderer Prozess plant die Hintergrundwartung" + +#: builtin/gc.c:2009 msgid "failed to add repo to global config" msgstr "Repository konnte nicht zur globalen Konfiguration hinzugefügt werden" -#: builtin/gc.c:1615 +#: builtin/gc.c:2019 msgid "git maintenance <subcommand> [<options>]" msgstr "git maintenance <Unterbefehl> [<Optionen>]" -#: builtin/gc.c:1634 +#: builtin/gc.c:2038 #, c-format msgid "invalid subcommand: %s" msgstr "ungültiger Unterbefehl: %s" @@ -15620,12 +15930,12 @@ msgstr "ungültiger Unterbefehl: %s" msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "git grep [<Optionen>] [-e] <Muster> [<Commit>...] [[--] <Pfad>...]" -#: builtin/grep.c:225 +#: builtin/grep.c:223 #, c-format msgid "grep: failed to create thread: %s" msgstr "grep: Fehler beim Erzeugen eines Thread: %s" -#: builtin/grep.c:279 +#: builtin/grep.c:277 #, c-format msgid "invalid number of threads specified (%d) for %s" msgstr "ungültige Anzahl von Threads (%d) für %s angegeben" @@ -15634,266 +15944,266 @@ msgstr "ungültige Anzahl von Threads (%d) für %s angegeben" #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c:287 builtin/index-pack.c:1576 builtin/index-pack.c:1766 -#: builtin/pack-objects.c:2936 +#: builtin/grep.c:285 builtin/index-pack.c:1589 builtin/index-pack.c:1808 +#: builtin/pack-objects.c:2944 #, c-format msgid "no threads support, ignoring %s" msgstr "keine Unterstützung von Threads, '%s' wird ignoriert" -#: builtin/grep.c:475 builtin/grep.c:600 builtin/grep.c:640 +#: builtin/grep.c:473 builtin/grep.c:601 builtin/grep.c:641 #, c-format msgid "unable to read tree (%s)" msgstr "konnte \"Tree\"-Objekt (%s) nicht lesen" -#: builtin/grep.c:655 +#: builtin/grep.c:656 #, c-format msgid "unable to grep from object of type %s" msgstr "kann \"grep\" nicht mit Objekten des Typs %s durchführen" -#: builtin/grep.c:736 +#: builtin/grep.c:737 #, c-format msgid "switch `%c' expects a numerical value" msgstr "Schalter '%c' erwartet einen numerischen Wert" -#: builtin/grep.c:835 +#: builtin/grep.c:836 msgid "search in index instead of in the work tree" -msgstr "im Index anstatt im Arbeitsverzeichnis suchen" +msgstr "im Index statt im Arbeitsverzeichnis suchen" -#: builtin/grep.c:837 +#: builtin/grep.c:838 msgid "find in contents not managed by git" msgstr "auch in Inhalten finden, die nicht von Git verwaltet werden" -#: builtin/grep.c:839 +#: builtin/grep.c:840 msgid "search in both tracked and untracked files" msgstr "in versionierten und unversionierten Dateien suchen" -#: builtin/grep.c:841 +#: builtin/grep.c:842 msgid "ignore files specified via '.gitignore'" msgstr "Dateien, die über '.gitignore' angegeben sind, ignorieren" -#: builtin/grep.c:843 +#: builtin/grep.c:844 msgid "recursively search in each submodule" msgstr "rekursive Suche in jedem Submodul" -#: builtin/grep.c:846 +#: builtin/grep.c:847 msgid "show non-matching lines" msgstr "Zeilen ohne Übereinstimmungen anzeigen" -#: builtin/grep.c:848 +#: builtin/grep.c:849 msgid "case insensitive matching" msgstr "Übereinstimmungen unabhängig von Groß- und Kleinschreibung finden" -#: builtin/grep.c:850 +#: builtin/grep.c:851 msgid "match patterns only at word boundaries" msgstr "nur ganze Wörter suchen" -#: builtin/grep.c:852 +#: builtin/grep.c:853 msgid "process binary files as text" msgstr "binäre Dateien als Text verarbeiten" -#: builtin/grep.c:854 +#: builtin/grep.c:855 msgid "don't match patterns in binary files" msgstr "keine Muster in Binärdateien finden" -#: builtin/grep.c:857 +#: builtin/grep.c:858 msgid "process binary files with textconv filters" msgstr "binäre Dateien mit \"textconv\"-Filtern verarbeiten" -#: builtin/grep.c:859 +#: builtin/grep.c:860 msgid "search in subdirectories (default)" msgstr "in Unterverzeichnissen suchen (Standard)" -#: builtin/grep.c:861 +#: builtin/grep.c:862 msgid "descend at most <depth> levels" msgstr "höchstens <Tiefe> Ebenen durchlaufen" -#: builtin/grep.c:865 +#: builtin/grep.c:866 msgid "use extended POSIX regular expressions" msgstr "erweiterte reguläre Ausdrücke aus POSIX verwenden" -#: builtin/grep.c:868 +#: builtin/grep.c:869 msgid "use basic POSIX regular expressions (default)" msgstr "grundlegende reguläre Ausdrücke aus POSIX verwenden (Standard)" -#: builtin/grep.c:871 +#: builtin/grep.c:872 msgid "interpret patterns as fixed strings" msgstr "Muster als feste Zeichenketten interpretieren" -#: builtin/grep.c:874 +#: builtin/grep.c:875 msgid "use Perl-compatible regular expressions" msgstr "Perl-kompatible reguläre Ausdrücke verwenden" -#: builtin/grep.c:877 +#: builtin/grep.c:878 msgid "show line numbers" msgstr "Zeilennummern anzeigen" -#: builtin/grep.c:878 +#: builtin/grep.c:879 msgid "show column number of first match" msgstr "Nummer der Spalte des ersten Treffers anzeigen" -#: builtin/grep.c:879 +#: builtin/grep.c:880 msgid "don't show filenames" msgstr "keine Dateinamen anzeigen" -#: builtin/grep.c:880 +#: builtin/grep.c:881 msgid "show filenames" msgstr "Dateinamen anzeigen" -#: builtin/grep.c:882 +#: builtin/grep.c:883 msgid "show filenames relative to top directory" msgstr "Dateinamen relativ zum Projektverzeichnis anzeigen" -#: builtin/grep.c:884 +#: builtin/grep.c:885 msgid "show only filenames instead of matching lines" msgstr "nur Dateinamen anzeigen anstatt übereinstimmende Zeilen" -#: builtin/grep.c:886 +#: builtin/grep.c:887 msgid "synonym for --files-with-matches" msgstr "Synonym für --files-with-matches" -#: builtin/grep.c:889 +#: builtin/grep.c:890 msgid "show only the names of files without match" msgstr "nur die Dateinamen ohne Übereinstimmungen anzeigen" -#: builtin/grep.c:891 +#: builtin/grep.c:892 msgid "print NUL after filenames" msgstr "NUL-Zeichen nach Dateinamen ausgeben" -#: builtin/grep.c:894 +#: builtin/grep.c:895 msgid "show only matching parts of a line" msgstr "nur übereinstimmende Teile der Zeile anzeigen" -#: builtin/grep.c:896 +#: builtin/grep.c:897 msgid "show the number of matches instead of matching lines" msgstr "anstatt der Zeilen, die Anzahl der übereinstimmenden Zeilen anzeigen" -#: builtin/grep.c:897 +#: builtin/grep.c:898 msgid "highlight matches" msgstr "Übereinstimmungen hervorheben" -#: builtin/grep.c:899 +#: builtin/grep.c:900 msgid "print empty line between matches from different files" msgstr "" "eine Leerzeile zwischen Übereinstimmungen in verschiedenen Dateien ausgeben" -#: builtin/grep.c:901 +#: builtin/grep.c:902 msgid "show filename only once above matches from same file" msgstr "" "den Dateinamen nur einmal oberhalb der Übereinstimmungen aus dieser Datei " "anzeigen" -#: builtin/grep.c:904 +#: builtin/grep.c:905 msgid "show <n> context lines before and after matches" msgstr "<n> Zeilen vor und nach den Übereinstimmungen anzeigen" -#: builtin/grep.c:907 +#: builtin/grep.c:908 msgid "show <n> context lines before matches" msgstr "<n> Zeilen vor den Übereinstimmungen anzeigen" -#: builtin/grep.c:909 +#: builtin/grep.c:910 msgid "show <n> context lines after matches" msgstr "<n> Zeilen nach den Übereinstimmungen anzeigen" -#: builtin/grep.c:911 +#: builtin/grep.c:912 msgid "use <n> worker threads" msgstr "<n> Threads benutzen" -#: builtin/grep.c:912 +#: builtin/grep.c:913 msgid "shortcut for -C NUM" msgstr "Kurzform für -C NUM" -#: builtin/grep.c:915 +#: builtin/grep.c:916 msgid "show a line with the function name before matches" msgstr "eine Zeile mit dem Funktionsnamen vor Übereinstimmungen anzeigen" -#: builtin/grep.c:917 +#: builtin/grep.c:918 msgid "show the surrounding function" msgstr "die umgebende Funktion anzeigen" -#: builtin/grep.c:920 +#: builtin/grep.c:921 msgid "read patterns from file" msgstr "Muster von einer Datei lesen" -#: builtin/grep.c:922 +#: builtin/grep.c:923 msgid "match <pattern>" msgstr "<Muster> finden" -#: builtin/grep.c:924 +#: builtin/grep.c:925 msgid "combine patterns specified with -e" msgstr "Muster kombinieren, die mit -e angegeben wurden" -#: builtin/grep.c:936 +#: builtin/grep.c:937 msgid "indicate hit with exit status without output" msgstr "Übereinstimmungen nur durch Beendigungsstatus anzeigen" -#: builtin/grep.c:938 +#: builtin/grep.c:939 msgid "show only matches from files that match all patterns" msgstr "" "nur Übereinstimmungen von Dateien anzeigen, die allen Mustern entsprechen" -#: builtin/grep.c:940 -msgid "show parse tree for grep expression" -msgstr "geparstes Verzeichnis für \"grep\"-Ausdruck anzeigen" - -#: builtin/grep.c:944 +#: builtin/grep.c:942 msgid "pager" msgstr "Anzeigeprogramm" -#: builtin/grep.c:944 +#: builtin/grep.c:942 msgid "show matching files in the pager" msgstr "Dateien mit Übereinstimmungen im Anzeigeprogramm anzeigen" -#: builtin/grep.c:948 +#: builtin/grep.c:946 msgid "allow calling of grep(1) (ignored by this build)" msgstr "den Aufruf von grep(1) erlauben (von dieser Programmversion ignoriert)" -#: builtin/grep.c:1014 +#: builtin/grep.c:1012 msgid "no pattern given" msgstr "Kein Muster angegeben." -#: builtin/grep.c:1050 +#: builtin/grep.c:1048 msgid "--no-index or --untracked cannot be used with revs" msgstr "--no-index oder --untracked können nicht mit Commits verwendet werden" -#: builtin/grep.c:1058 +#: builtin/grep.c:1056 #, c-format msgid "unable to resolve revision: %s" msgstr "Konnte Commit nicht auflösen: %s" -#: builtin/grep.c:1088 +#: builtin/grep.c:1086 msgid "--untracked not supported with --recurse-submodules" msgstr "--untracked zusammen mit --recurse-submodules wird nicht unterstützt" -#: builtin/grep.c:1092 +#: builtin/grep.c:1090 msgid "invalid option combination, ignoring --threads" msgstr "Ungültige Kombination von Optionen, --threads wird ignoriert." -#: builtin/grep.c:1095 builtin/pack-objects.c:3655 +#: builtin/grep.c:1093 builtin/pack-objects.c:3672 msgid "no threads support, ignoring --threads" msgstr "Keine Unterstützung für Threads, --threads wird ignoriert." -#: builtin/grep.c:1098 builtin/index-pack.c:1573 builtin/pack-objects.c:2933 +#: builtin/grep.c:1096 builtin/index-pack.c:1586 builtin/pack-objects.c:2941 #, c-format msgid "invalid number of threads specified (%d)" msgstr "ungültige Anzahl von Threads angegeben (%d)" -#: builtin/grep.c:1132 +#: builtin/grep.c:1130 msgid "--open-files-in-pager only works on the worktree" msgstr "" -"Die Option --open-files-in-pager kann nur innerhalb des " -"Arbeitsverzeichnisses verwendet werden." +"--open-files-in-pager kann nur innerhalb des Arbeitsverzeichnisses verwendet " +"werden" -#: builtin/grep.c:1158 +#: builtin/grep.c:1156 msgid "--cached or --untracked cannot be used with --no-index" -msgstr "--cached und --untracked können nicht mit --no-index verwendet werden." +msgstr "--cached und --untracked können nicht mit --no-index verwendet werden" + +#: builtin/grep.c:1159 +msgid "--untracked cannot be used with --cached" +msgstr "--untracked kann nicht mit --cached verwendet werden" -#: builtin/grep.c:1164 +#: builtin/grep.c:1165 msgid "--[no-]exclude-standard cannot be used for tracked contents" msgstr "" "--[no-]exclude-standard kann nicht mit versionierten Inhalten verwendet " -"werden." +"werden" -#: builtin/grep.c:1172 +#: builtin/grep.c:1173 msgid "both --cached and trees are given" msgstr "--cached und \"Tree\"-Objekte angegeben" @@ -16026,12 +16336,12 @@ msgstr "kein Handbuch-Betrachter konnte mit dieser Anfrage umgehen" msgid "no info viewer handled the request" msgstr "kein Informations-Betrachter konnte mit dieser Anfrage umgehen" -#: builtin/help.c:520 builtin/help.c:531 git.c:337 +#: builtin/help.c:520 builtin/help.c:531 git.c:340 #, c-format msgid "'%s' is aliased to '%s'" msgstr "Für '%s' wurde der Alias '%s' angelegt." -#: builtin/help.c:534 git.c:369 +#: builtin/help.c:534 git.c:372 #, c-format msgid "bad alias.%s string: %s" msgstr "Ungültiger alias.%s String: %s" @@ -16079,7 +16389,7 @@ msgstr "Fehler beim Lesen der Eingabe" msgid "used more bytes than were available" msgstr "verwendete mehr Bytes als verfügbar waren" -#: builtin/index-pack.c:324 builtin/pack-objects.c:619 +#: builtin/index-pack.c:324 builtin/pack-objects.c:624 msgid "pack too large for current definition of off_t" msgstr "Paket ist zu groß für die aktuelle Definition von off_t" @@ -16087,7 +16397,7 @@ msgstr "Paket ist zu groß für die aktuelle Definition von off_t" msgid "pack exceeds maximum allowed size" msgstr "Paket überschreitet die maximal erlaubte Größe" -#: builtin/index-pack.c:342 builtin/repack.c:286 +#: builtin/index-pack.c:342 #, c-format msgid "unable to create '%s'" msgstr "konnte '%s' nicht erstellen" @@ -16213,7 +16523,7 @@ msgstr "Fehler beim Ausführen von \"parse_pack_objects()\"" msgid "Resolving deltas" msgstr "Löse Unterschiede auf" -#: builtin/index-pack.c:1249 builtin/pack-objects.c:2697 +#: builtin/index-pack.c:1249 builtin/pack-objects.c:2707 #, c-format msgid "unable to create thread: %s" msgstr "kann Thread nicht erzeugen: %s" @@ -16251,10 +16561,10 @@ msgstr "Konnte angehängtes Objekt (%d) nicht komprimieren" msgid "local object %s is corrupt" msgstr "lokales Objekt %s ist beschädigt" -#: builtin/index-pack.c:1444 +#: builtin/index-pack.c:1445 #, c-format -msgid "packfile name '%s' does not end with '.pack'" -msgstr "Name der Paketdatei '%s' endet nicht mit '.pack'" +msgid "packfile name '%s' does not end with '.%s'" +msgstr "Name der Paketdatei '%s' endet nicht mit '.%s'" #: builtin/index-pack.c:1469 #, c-format @@ -16266,79 +16576,83 @@ msgstr "Kann %s Datei '%s' nicht schreiben." msgid "cannot close written %s file '%s'" msgstr "Kann eben geschriebene %s Datei '%s' nicht schließen." -#: builtin/index-pack.c:1501 +#: builtin/index-pack.c:1503 msgid "error while closing pack file" msgstr "Fehler beim Schließen der Paketdatei" -#: builtin/index-pack.c:1515 +#: builtin/index-pack.c:1517 msgid "cannot store pack file" msgstr "Kann Paketdatei nicht speichern" -#: builtin/index-pack.c:1523 +#: builtin/index-pack.c:1525 msgid "cannot store index file" msgstr "Kann Indexdatei nicht speichern" -#: builtin/index-pack.c:1567 builtin/pack-objects.c:2944 +#: builtin/index-pack.c:1534 +msgid "cannot store reverse index file" +msgstr "kann Reverse-Index-Datei nicht speichern" + +#: builtin/index-pack.c:1580 builtin/pack-objects.c:2952 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "\"pack.indexversion=%<PRIu32>\" ist ungültig" -#: builtin/index-pack.c:1631 +#: builtin/index-pack.c:1650 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Kann existierende Paketdatei '%s' nicht öffnen" -#: builtin/index-pack.c:1633 +#: builtin/index-pack.c:1652 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "Kann existierende Indexdatei für Paket '%s' nicht öffnen" -#: builtin/index-pack.c:1681 +#: builtin/index-pack.c:1700 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "kein Unterschied: %d Objekt" msgstr[1] "kein Unterschied: %d Objekte" -#: builtin/index-pack.c:1688 +#: builtin/index-pack.c:1707 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "Länge der Objekt-Liste = %d: %lu Objekt" msgstr[1] "Länge der Objekt-Liste = %d: %lu Objekte" -#: builtin/index-pack.c:1728 +#: builtin/index-pack.c:1765 msgid "Cannot come back to cwd" msgstr "Kann nicht zurück zum Arbeitsverzeichnis wechseln" -#: builtin/index-pack.c:1777 builtin/index-pack.c:1780 -#: builtin/index-pack.c:1796 builtin/index-pack.c:1800 +#: builtin/index-pack.c:1819 builtin/index-pack.c:1822 +#: builtin/index-pack.c:1838 builtin/index-pack.c:1842 #, c-format msgid "bad %s" msgstr "%s ist ungültig" -#: builtin/index-pack.c:1806 builtin/init-db.c:392 builtin/init-db.c:625 +#: builtin/index-pack.c:1848 builtin/init-db.c:392 builtin/init-db.c:625 #, c-format msgid "unknown hash algorithm '%s'" msgstr "unbekannter Hash-Algorithmus '%s'" -#: builtin/index-pack.c:1821 +#: builtin/index-pack.c:1867 msgid "--fix-thin cannot be used without --stdin" -msgstr "Die Option --fix-thin kann nicht ohne --stdin verwendet werden." +msgstr "--fix-thin kann nicht ohne --stdin verwendet werden" -#: builtin/index-pack.c:1823 +#: builtin/index-pack.c:1869 msgid "--stdin requires a git repository" msgstr "--stdin erfordert ein Git-Repository" -#: builtin/index-pack.c:1825 +#: builtin/index-pack.c:1871 msgid "--object-format cannot be used with --stdin" -msgstr "Die Option --object-format kann nicht mit --stdin verwendet werden." +msgstr "--object-format kann nicht mit --stdin verwendet werden" -#: builtin/index-pack.c:1831 +#: builtin/index-pack.c:1886 msgid "--verify with no packfile name given" -msgstr "Die Option --verify wurde ohne Namen der Paketdatei angegeben." +msgstr "--verify wurde ohne Namen der Paketdatei angegeben" -#: builtin/index-pack.c:1892 builtin/unpack-objects.c:582 +#: builtin/index-pack.c:1956 builtin/unpack-objects.c:582 msgid "fsck error in pack objects" msgstr "fsck Fehler beim Packen von Objekten" @@ -16549,139 +16863,137 @@ msgstr "Anhang/Anhänge hinzufügen" #: builtin/interpret-trailers.c:123 msgid "--trailer with --only-input does not make sense" -msgstr "" -"Die Optionen --trailer und --only-input können nicht gemeinsam verwendet " -"werden." +msgstr "--trailer und --only-input können nicht gemeinsam verwendet werden" #: builtin/interpret-trailers.c:133 msgid "no input file given for in-place editing" msgstr "keine Datei zur direkten Bearbeitung angegeben" -#: builtin/log.c:58 +#: builtin/log.c:59 msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "git log [<Optionen>] [<Commitbereich>] [[--] <Pfad>...]" -#: builtin/log.c:59 +#: builtin/log.c:60 msgid "git show [<options>] <object>..." msgstr "git show [<Optionen>] <Objekt>..." -#: builtin/log.c:112 +#: builtin/log.c:113 #, c-format msgid "invalid --decorate option: %s" msgstr "Ungültige Option für --decorate: %s" -#: builtin/log.c:179 +#: builtin/log.c:180 msgid "show source" msgstr "Quelle anzeigen" -#: builtin/log.c:180 -msgid "Use mail map file" +#: builtin/log.c:181 +msgid "use mail map file" msgstr "\"mailmap\"-Datei verwenden" -#: builtin/log.c:183 +#: builtin/log.c:184 msgid "only decorate refs that match <pattern>" msgstr "\"decorate\" nur bei Referenzen anwenden, die <Muster> entsprechen" -#: builtin/log.c:185 +#: builtin/log.c:186 msgid "do not decorate refs that match <pattern>" msgstr "\"decorate\" nicht bei Referenzen anwenden, die <Muster> entsprechen" -#: builtin/log.c:186 +#: builtin/log.c:187 msgid "decorate options" msgstr "decorate-Optionen" -#: builtin/log.c:189 +#: builtin/log.c:190 msgid "" -"Trace the evolution of line range <start>,<end> or function :<funcname> in " +"trace the evolution of line range <start>,<end> or function :<funcname> in " "<file>" msgstr "" "Entwicklung der Zeilen vom Bereich <Start>,<Ende> oder Funktion :" "<Funktionsname> in <Datei> verfolgen" -#: builtin/log.c:212 +#: builtin/log.c:213 msgid "-L<range>:<file> cannot be used with pathspec" msgstr "-L<Bereich>:<Datei> kann nicht mit Pfadspezifikation verwendet werden" -#: builtin/log.c:302 +#: builtin/log.c:303 #, c-format msgid "Final output: %d %s\n" msgstr "letzte Ausgabe: %d %s\n" -#: builtin/log.c:564 +#: builtin/log.c:566 #, c-format msgid "git show %s: bad file" msgstr "git show %s: ungültige Datei" -#: builtin/log.c:579 builtin/log.c:674 +#: builtin/log.c:581 builtin/log.c:671 #, c-format msgid "could not read object %s" msgstr "Konnte Objekt %s nicht lesen." -#: builtin/log.c:699 +#: builtin/log.c:696 #, c-format msgid "unknown type: %d" msgstr "Unbekannter Typ: %d" -#: builtin/log.c:848 +#: builtin/log.c:841 #, c-format msgid "%s: invalid cover from description mode" msgstr "" "%s: Ungültiger Modus für Erstellung des Deckblattes aus der Beschreibung" -#: builtin/log.c:855 +#: builtin/log.c:848 msgid "format.headers without value" msgstr "format.headers ohne Wert" -#: builtin/log.c:984 +#: builtin/log.c:977 #, c-format msgid "cannot open patch file %s" msgstr "Kann Patch-Datei %s nicht öffnen" -#: builtin/log.c:1001 +#: builtin/log.c:994 msgid "need exactly one range" msgstr "Brauche genau einen Commit-Bereich." -#: builtin/log.c:1011 +#: builtin/log.c:1004 msgid "not a range" msgstr "Kein Commit-Bereich." -#: builtin/log.c:1175 +#: builtin/log.c:1168 msgid "cover letter needs email format" msgstr "Anschreiben benötigt E-Mail-Format" -#: builtin/log.c:1181 +#: builtin/log.c:1174 msgid "failed to create cover-letter file" msgstr "Fehler beim Erstellen der Datei für das Anschreiben." -#: builtin/log.c:1262 +#: builtin/log.c:1261 #, c-format msgid "insane in-reply-to: %s" msgstr "ungültiges in-reply-to: %s" -#: builtin/log.c:1289 +#: builtin/log.c:1288 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<Optionen>] [<seit> | <Commitbereich>]" -#: builtin/log.c:1347 +#: builtin/log.c:1346 msgid "two output directories?" msgstr "Zwei Ausgabeverzeichnisse?" -#: builtin/log.c:1498 builtin/log.c:2318 builtin/log.c:2320 builtin/log.c:2332 +#: builtin/log.c:1497 builtin/log.c:2317 builtin/log.c:2319 builtin/log.c:2331 #, c-format msgid "unknown commit %s" msgstr "Unbekannter Commit %s" -#: builtin/log.c:1509 builtin/replace.c:58 builtin/replace.c:207 +#: builtin/log.c:1508 builtin/replace.c:58 builtin/replace.c:207 #: builtin/replace.c:210 #, c-format msgid "failed to resolve '%s' as a valid ref" msgstr "Konnte '%s' nicht als gültige Referenz auflösen." -#: builtin/log.c:1518 +#: builtin/log.c:1517 msgid "could not find exact merge base" msgstr "Konnte keine exakte Merge-Basis finden." -#: builtin/log.c:1528 +#: builtin/log.c:1527 msgid "" "failed to get upstream, if you want to record base commit automatically,\n" "please use git branch --set-upstream-to to track a remote branch.\n" @@ -16692,291 +17004,291 @@ msgstr "" "'git branch --set-upstream-to', um einem Remote-Branch zu folgen.\n" "Oder geben Sie den Basis-Commit mit '--base=<Basis-Commit-Id>' manuell an." -#: builtin/log.c:1551 +#: builtin/log.c:1550 msgid "failed to find exact merge base" msgstr "Fehler beim Finden einer exakten Merge-Basis." -#: builtin/log.c:1568 +#: builtin/log.c:1567 msgid "base commit should be the ancestor of revision list" msgstr "Basis-Commit sollte der Vorgänger der Revisionsliste sein." -#: builtin/log.c:1578 +#: builtin/log.c:1577 msgid "base commit shouldn't be in revision list" msgstr "Basis-Commit sollte nicht in der Revisionsliste enthalten sein." -#: builtin/log.c:1636 +#: builtin/log.c:1635 msgid "cannot get patch id" msgstr "kann Patch-Id nicht lesen" -#: builtin/log.c:1693 +#: builtin/log.c:1692 msgid "failed to infer range-diff origin of current series" msgstr "Fehler beim Ableiten des range-diff Ursprungs der aktuellen Serie" -#: builtin/log.c:1695 +#: builtin/log.c:1694 #, c-format msgid "using '%s' as range-diff origin of current series" msgstr "nutze '%s' als range-diff Ursprung der aktuellen Serie" -#: builtin/log.c:1739 +#: builtin/log.c:1738 msgid "use [PATCH n/m] even with a single patch" msgstr "[PATCH n/m] auch mit einzelnem Patch verwenden" -#: builtin/log.c:1742 +#: builtin/log.c:1741 msgid "use [PATCH] even with multiple patches" msgstr "[PATCH] auch mit mehreren Patches verwenden" -#: builtin/log.c:1746 +#: builtin/log.c:1745 msgid "print patches to standard out" msgstr "Ausgabe der Patches in Standard-Ausgabe" -#: builtin/log.c:1748 +#: builtin/log.c:1747 msgid "generate a cover letter" msgstr "ein Deckblatt erzeugen" -#: builtin/log.c:1750 +#: builtin/log.c:1749 msgid "use simple number sequence for output file names" msgstr "einfache Nummernfolge für die Namen der Ausgabedateien verwenden" -#: builtin/log.c:1751 +#: builtin/log.c:1750 msgid "sfx" msgstr "Dateiendung" -#: builtin/log.c:1752 +#: builtin/log.c:1751 msgid "use <sfx> instead of '.patch'" -msgstr "<Dateiendung> anstatt '.patch' verwenden" +msgstr "<Dateiendung> statt '.patch' verwenden" -#: builtin/log.c:1754 +#: builtin/log.c:1753 msgid "start numbering patches at <n> instead of 1" -msgstr "die Nummerierung der Patches bei <n> anstatt bei 1 beginnen" +msgstr "die Nummerierung der Patches bei <n> statt bei 1 beginnen" -#: builtin/log.c:1756 +#: builtin/log.c:1755 msgid "mark the series as Nth re-roll" msgstr "die Serie als n-te Fassung kennzeichnen" -#: builtin/log.c:1758 +#: builtin/log.c:1757 msgid "max length of output filename" msgstr "maximale Länge des Dateinamens für die Ausgabe" -#: builtin/log.c:1760 -msgid "Use [RFC PATCH] instead of [PATCH]" -msgstr "[RFC PATCH] anstatt [PATCH] verwenden" +#: builtin/log.c:1759 +msgid "use [RFC PATCH] instead of [PATCH]" +msgstr "[RFC PATCH] statt [PATCH] verwenden" -#: builtin/log.c:1763 +#: builtin/log.c:1762 msgid "cover-from-description-mode" msgstr "Modus für Erstellung des Deckblattes aus der Beschreibung" -#: builtin/log.c:1764 +#: builtin/log.c:1763 msgid "generate parts of a cover letter based on a branch's description" msgstr "" "Erzeuge Teile des Deckblattes basierend auf der Beschreibung des Branches" -#: builtin/log.c:1766 -msgid "Use [<prefix>] instead of [PATCH]" -msgstr "Nutze [<Präfix>] statt [PATCH]" +#: builtin/log.c:1765 +msgid "use [<prefix>] instead of [PATCH]" +msgstr "nutze [<Präfix>] statt [PATCH]" -#: builtin/log.c:1769 +#: builtin/log.c:1768 msgid "store resulting files in <dir>" msgstr "erzeugte Dateien in <Verzeichnis> speichern" -#: builtin/log.c:1772 +#: builtin/log.c:1771 msgid "don't strip/add [PATCH]" msgstr "[PATCH] nicht entfernen/hinzufügen" -#: builtin/log.c:1775 +#: builtin/log.c:1774 msgid "don't output binary diffs" msgstr "keine binären Unterschiede ausgeben" -#: builtin/log.c:1777 +#: builtin/log.c:1776 msgid "output all-zero hash in From header" msgstr "Hash mit Nullen in \"From\"-Header ausgeben" -#: builtin/log.c:1779 +#: builtin/log.c:1778 msgid "don't include a patch matching a commit upstream" msgstr "" "keine Patches einschließen, die einem Commit im Upstream-Branch entsprechen" -#: builtin/log.c:1781 +#: builtin/log.c:1780 msgid "show patch format instead of default (patch + stat)" msgstr "Patchformat anstatt des Standards anzeigen (Patch + Zusammenfassung)" -#: builtin/log.c:1783 +#: builtin/log.c:1782 msgid "Messaging" msgstr "E-Mail-Einstellungen" -#: builtin/log.c:1784 +#: builtin/log.c:1783 msgid "header" msgstr "Header" -#: builtin/log.c:1785 +#: builtin/log.c:1784 msgid "add email header" msgstr "E-Mail-Header hinzufügen" -#: builtin/log.c:1786 builtin/log.c:1787 +#: builtin/log.c:1785 builtin/log.c:1786 msgid "email" msgstr "E-Mail" -#: builtin/log.c:1786 +#: builtin/log.c:1785 msgid "add To: header" msgstr "\"To:\"-Header hinzufügen" -#: builtin/log.c:1787 +#: builtin/log.c:1786 msgid "add Cc: header" msgstr "\"Cc:\"-Header hinzufügen" -#: builtin/log.c:1788 +#: builtin/log.c:1787 msgid "ident" msgstr "Ident" -#: builtin/log.c:1789 +#: builtin/log.c:1788 msgid "set From address to <ident> (or committer ident if absent)" msgstr "" "\"From\"-Adresse auf <Ident> setzen (oder Ident des Commit-Erstellers, wenn " "fehlend)" -#: builtin/log.c:1791 +#: builtin/log.c:1790 msgid "message-id" msgstr "message-id" -#: builtin/log.c:1792 +#: builtin/log.c:1791 msgid "make first mail a reply to <message-id>" msgstr "aus erster E-Mail eine Antwort zu <message-id> machen" -#: builtin/log.c:1793 builtin/log.c:1796 +#: builtin/log.c:1792 builtin/log.c:1795 msgid "boundary" msgstr "Grenze" -#: builtin/log.c:1794 +#: builtin/log.c:1793 msgid "attach the patch" msgstr "den Patch anhängen" -#: builtin/log.c:1797 +#: builtin/log.c:1796 msgid "inline the patch" msgstr "den Patch direkt in die Nachricht einfügen" -#: builtin/log.c:1801 +#: builtin/log.c:1800 msgid "enable message threading, styles: shallow, deep" msgstr "Nachrichtenverkettung aktivieren, Stile: shallow, deep" -#: builtin/log.c:1803 +#: builtin/log.c:1802 msgid "signature" msgstr "Signatur" -#: builtin/log.c:1804 +#: builtin/log.c:1803 msgid "add a signature" msgstr "eine Signatur hinzufügen" -#: builtin/log.c:1805 +#: builtin/log.c:1804 msgid "base-commit" msgstr "Basis-Commit" -#: builtin/log.c:1806 +#: builtin/log.c:1805 msgid "add prerequisite tree info to the patch series" msgstr "erforderliche Revisions-Informationen der Patch-Serie hinzufügen" -#: builtin/log.c:1809 +#: builtin/log.c:1808 msgid "add a signature from a file" msgstr "eine Signatur aus einer Datei hinzufügen" -#: builtin/log.c:1810 +#: builtin/log.c:1809 msgid "don't print the patch filenames" msgstr "keine Dateinamen der Patches anzeigen" -#: builtin/log.c:1812 +#: builtin/log.c:1811 msgid "show progress while generating patches" msgstr "Forschrittsanzeige während der Erzeugung der Patches" -#: builtin/log.c:1814 +#: builtin/log.c:1813 msgid "show changes against <rev> in cover letter or single patch" msgstr "" "Änderungen gegenüber <Commit> im Deckblatt oder einzelnem Patch anzeigen" -#: builtin/log.c:1817 +#: builtin/log.c:1816 msgid "show changes against <refspec> in cover letter or single patch" msgstr "" "Änderungen gegenüber <Refspec> im Deckblatt oder einzelnem Patch anzeigen" -#: builtin/log.c:1819 +#: builtin/log.c:1818 msgid "percentage by which creation is weighted" msgstr "Prozentsatz mit welchem Erzeugung gewichtet wird" -#: builtin/log.c:1905 +#: builtin/log.c:1904 #, c-format msgid "invalid ident line: %s" msgstr "Ungültige Identifikationszeile: %s" -#: builtin/log.c:1920 +#: builtin/log.c:1919 msgid "-n and -k are mutually exclusive" msgstr "-n und -k schließen sich gegenseitig aus" -#: builtin/log.c:1922 +#: builtin/log.c:1921 msgid "--subject-prefix/--rfc and -k are mutually exclusive" msgstr "--subject-prefix/--rfc und -k schließen sich gegenseitig aus" -#: builtin/log.c:1930 +#: builtin/log.c:1929 msgid "--name-only does not make sense" -msgstr "die Option --name-only kann nicht verwendet werden" +msgstr "--name-only kann nicht verwendet werden" -#: builtin/log.c:1932 +#: builtin/log.c:1931 msgid "--name-status does not make sense" -msgstr "die Option --name-status kann nicht verwendet werden" +msgstr "--name-status kann nicht verwendet werden" -#: builtin/log.c:1934 +#: builtin/log.c:1933 msgid "--check does not make sense" -msgstr "die Option --check kann nicht verwendet werden" +msgstr "--check kann nicht verwendet werden" -#: builtin/log.c:1956 +#: builtin/log.c:1955 msgid "--stdout, --output, and --output-directory are mutually exclusive" msgstr "" "--stdout, --output und --output-directory schließen sich gegenseitig aus" -#: builtin/log.c:2079 +#: builtin/log.c:2078 msgid "--interdiff requires --cover-letter or single patch" msgstr "--interdiff erfordert --cover-letter oder einzelnen Patch" -#: builtin/log.c:2083 +#: builtin/log.c:2082 msgid "Interdiff:" msgstr "Interdiff:" -#: builtin/log.c:2084 +#: builtin/log.c:2083 #, c-format msgid "Interdiff against v%d:" msgstr "Interdiff gegen v%d:" -#: builtin/log.c:2090 +#: builtin/log.c:2089 msgid "--creation-factor requires --range-diff" msgstr "--creation-factor erfordert --range-diff" -#: builtin/log.c:2094 +#: builtin/log.c:2093 msgid "--range-diff requires --cover-letter or single patch" msgstr "--range-diff erfordert --cover-letter oder einzelnen Patch." -#: builtin/log.c:2102 +#: builtin/log.c:2101 msgid "Range-diff:" msgstr "Range-Diff:" -#: builtin/log.c:2103 +#: builtin/log.c:2102 #, c-format msgid "Range-diff against v%d:" msgstr "Range-Diff gegen v%d:" -#: builtin/log.c:2114 +#: builtin/log.c:2113 #, c-format msgid "unable to read signature file '%s'" msgstr "Konnte Signatur-Datei '%s' nicht lesen" -#: builtin/log.c:2150 +#: builtin/log.c:2149 msgid "Generating patches" msgstr "Erzeuge Patches" -#: builtin/log.c:2194 +#: builtin/log.c:2193 msgid "failed to create output files" msgstr "Fehler beim Erstellen der Ausgabedateien." -#: builtin/log.c:2253 +#: builtin/log.c:2252 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<Upstream> [<Branch> [<Limit>]]]" -#: builtin/log.c:2307 +#: builtin/log.c:2306 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -16984,115 +17296,119 @@ msgstr "" "Konnte gefolgten Remote-Branch nicht finden, bitte geben Sie <Upstream> " "manuell an.\n" -#: builtin/ls-files.c:471 +#: builtin/ls-files.c:486 msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<Optionen>] [<Datei>...]" -#: builtin/ls-files.c:527 +#: builtin/ls-files.c:542 msgid "identify the file status with tags" msgstr "den Dateistatus mit Tags anzeigen" -#: builtin/ls-files.c:529 +#: builtin/ls-files.c:544 msgid "use lowercase letters for 'assume unchanged' files" msgstr "" "Kleinbuchstaben für Dateien mit 'assume unchanged' Markierung verwenden" -#: builtin/ls-files.c:531 +#: builtin/ls-files.c:546 msgid "use lowercase letters for 'fsmonitor clean' files" msgstr "Kleinbuchstaben für 'fsmonitor clean' Dateien verwenden" -#: builtin/ls-files.c:533 +#: builtin/ls-files.c:548 msgid "show cached files in the output (default)" msgstr "zwischengespeicherte Dateien in der Ausgabe anzeigen (Standard)" -#: builtin/ls-files.c:535 +#: builtin/ls-files.c:550 msgid "show deleted files in the output" msgstr "entfernte Dateien in der Ausgabe anzeigen" -#: builtin/ls-files.c:537 +#: builtin/ls-files.c:552 msgid "show modified files in the output" msgstr "geänderte Dateien in der Ausgabe anzeigen" -#: builtin/ls-files.c:539 +#: builtin/ls-files.c:554 msgid "show other files in the output" msgstr "sonstige Dateien in der Ausgabe anzeigen" -#: builtin/ls-files.c:541 +#: builtin/ls-files.c:556 msgid "show ignored files in the output" msgstr "ignorierte Dateien in der Ausgabe anzeigen" -#: builtin/ls-files.c:544 +#: builtin/ls-files.c:559 msgid "show staged contents' object name in the output" msgstr "" "Objektnamen von Inhalten, die zum Commit vorgemerkt sind, in der Ausgabe " "anzeigen" -#: builtin/ls-files.c:546 +#: builtin/ls-files.c:561 msgid "show files on the filesystem that need to be removed" msgstr "Dateien im Dateisystem, die gelöscht werden müssen, anzeigen" -#: builtin/ls-files.c:548 +#: builtin/ls-files.c:563 msgid "show 'other' directories' names only" msgstr "nur Namen von 'sonstigen' Verzeichnissen anzeigen" -#: builtin/ls-files.c:550 +#: builtin/ls-files.c:565 msgid "show line endings of files" msgstr "Zeilenenden von Dateien anzeigen" -#: builtin/ls-files.c:552 +#: builtin/ls-files.c:567 msgid "don't show empty directories" msgstr "keine leeren Verzeichnisse anzeigen" -#: builtin/ls-files.c:555 +#: builtin/ls-files.c:570 msgid "show unmerged files in the output" msgstr "nicht zusammengeführte Dateien in der Ausgabe anzeigen" -#: builtin/ls-files.c:557 +#: builtin/ls-files.c:572 msgid "show resolve-undo information" msgstr "'resolve-undo' Informationen anzeigen" -#: builtin/ls-files.c:559 +#: builtin/ls-files.c:574 msgid "skip files matching pattern" msgstr "Dateien auslassen, die einem Muster entsprechen" -#: builtin/ls-files.c:562 +#: builtin/ls-files.c:577 msgid "exclude patterns are read from <file>" msgstr "Muster, gelesen von <Datei>, ausschließen" -#: builtin/ls-files.c:565 +#: builtin/ls-files.c:580 msgid "read additional per-directory exclude patterns in <file>" msgstr "zusätzliche pro-Verzeichnis Auschlussmuster aus <Datei> auslesen" -#: builtin/ls-files.c:567 +#: builtin/ls-files.c:582 msgid "add the standard git exclusions" msgstr "die standardmäßigen Git-Ausschlüsse hinzufügen" -#: builtin/ls-files.c:571 +#: builtin/ls-files.c:586 msgid "make the output relative to the project top directory" msgstr "Ausgabe relativ zum Projektverzeichnis" -#: builtin/ls-files.c:574 +#: builtin/ls-files.c:589 msgid "recurse through submodules" msgstr "Rekursion in Submodulen durchführen" -#: builtin/ls-files.c:576 +#: builtin/ls-files.c:591 msgid "if any <file> is not in the index, treat this as an error" msgstr "als Fehler behandeln, wenn sich eine <Datei> nicht im Index befindet" -#: builtin/ls-files.c:577 +#: builtin/ls-files.c:592 msgid "tree-ish" msgstr "Commit-Referenz" -#: builtin/ls-files.c:578 +#: builtin/ls-files.c:593 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "" "vorgeben, dass Pfade, die seit <Commit-Referenz> gelöscht wurden, immer noch " "vorhanden sind" -#: builtin/ls-files.c:580 +#: builtin/ls-files.c:595 msgid "show debugging data" msgstr "Ausgaben zur Fehlersuche anzeigen" +#: builtin/ls-files.c:597 +msgid "suppress duplicate entries" +msgstr "doppelte Einträge unterdrücken" + #: builtin/ls-remote.c:9 msgid "" "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" @@ -17103,41 +17419,41 @@ msgstr "" " [-q | --quiet] [--exit-code] [--get-url]\n" " [--symref] [<Repository> [<Referenzen>...]]" -#: builtin/ls-remote.c:59 +#: builtin/ls-remote.c:60 msgid "do not print remote URL" msgstr "URL des Remote-Repositories nicht ausgeben" -#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1398 +#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1404 msgid "exec" msgstr "Programm" -#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 +#: builtin/ls-remote.c:62 builtin/ls-remote.c:64 msgid "path of git-upload-pack on the remote host" msgstr "Pfad zu \"git-upload-pack\" auf der Gegenseite" -#: builtin/ls-remote.c:65 +#: builtin/ls-remote.c:66 msgid "limit to tags" msgstr "auf Tags einschränken" -#: builtin/ls-remote.c:66 +#: builtin/ls-remote.c:67 msgid "limit to heads" msgstr "auf Branches einschränken" -#: builtin/ls-remote.c:67 +#: builtin/ls-remote.c:68 msgid "do not show peeled tags" msgstr "keine Tags anzeigen, die andere Tags enthalten" -#: builtin/ls-remote.c:69 +#: builtin/ls-remote.c:70 msgid "take url.<base>.insteadOf into account" msgstr "url.<Basis>.insteadOf berücksichtigen" -#: builtin/ls-remote.c:72 +#: builtin/ls-remote.c:73 msgid "exit with exit code 2 if no matching refs are found" msgstr "" "mit Exit-Code 2 beenden, wenn keine übereinstimmenden Referenzen\n" "gefunden wurden" -#: builtin/ls-remote.c:75 +#: builtin/ls-remote.c:76 msgid "show underlying ref in addition to the object pointed by it" msgstr "zusätzlich zum Objekt die darauf verweisenden Referenzen anzeigen" @@ -17295,194 +17611,194 @@ msgstr "Konnte Referenz '%s' nicht auflösen" msgid "Merging %s with %s\n" msgstr "Führe %s mit %s zusammen\n" -#: builtin/merge.c:57 +#: builtin/merge.c:58 msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<Optionen>] [<Commit>...]" -#: builtin/merge.c:58 +#: builtin/merge.c:59 msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:59 +#: builtin/merge.c:60 msgid "git merge --continue" msgstr "git merge --continue" -#: builtin/merge.c:122 +#: builtin/merge.c:123 msgid "switch `m' requires a value" msgstr "Schalter 'm' erfordert einen Wert." -#: builtin/merge.c:145 +#: builtin/merge.c:146 #, c-format msgid "option `%s' requires a value" msgstr "Option `%s' erfordert einen Wert." -#: builtin/merge.c:198 +#: builtin/merge.c:199 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "Konnte Merge-Strategie '%s' nicht finden.\n" -#: builtin/merge.c:199 +#: builtin/merge.c:200 #, c-format msgid "Available strategies are:" msgstr "Verfügbare Strategien sind:" -#: builtin/merge.c:204 +#: builtin/merge.c:205 #, c-format msgid "Available custom strategies are:" msgstr "Verfügbare benutzerdefinierte Strategien sind:" -#: builtin/merge.c:255 builtin/pull.c:133 +#: builtin/merge.c:256 builtin/pull.c:133 msgid "do not show a diffstat at the end of the merge" msgstr "keine Zusammenfassung der Unterschiede am Schluss des Merges anzeigen" -#: builtin/merge.c:258 builtin/pull.c:136 +#: builtin/merge.c:259 builtin/pull.c:136 msgid "show a diffstat at the end of the merge" msgstr "eine Zusammenfassung der Unterschiede am Schluss des Merges anzeigen" -#: builtin/merge.c:259 builtin/pull.c:139 +#: builtin/merge.c:260 builtin/pull.c:139 msgid "(synonym to --stat)" msgstr "(Synonym für --stat)" -#: builtin/merge.c:261 builtin/pull.c:142 +#: builtin/merge.c:262 builtin/pull.c:142 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" "(höchstens <n>) Einträge von \"shortlog\" zur Beschreibung des Merge-Commits " "hinzufügen" -#: builtin/merge.c:264 builtin/pull.c:148 +#: builtin/merge.c:265 builtin/pull.c:148 msgid "create a single commit instead of doing a merge" -msgstr "einen einzelnen Commit anstatt eines Merges erzeugen" +msgstr "einen einzelnen Commit erzeugen statt einen Merge durchzuführen" -#: builtin/merge.c:266 builtin/pull.c:151 +#: builtin/merge.c:267 builtin/pull.c:151 msgid "perform a commit if the merge succeeds (default)" msgstr "einen Commit durchführen, wenn der Merge erfolgreich war (Standard)" -#: builtin/merge.c:268 builtin/pull.c:154 +#: builtin/merge.c:269 builtin/pull.c:154 msgid "edit message before committing" msgstr "Bearbeitung der Beschreibung vor dem Commit" -#: builtin/merge.c:270 +#: builtin/merge.c:271 msgid "allow fast-forward (default)" msgstr "Vorspulen erlauben (Standard)" -#: builtin/merge.c:272 builtin/pull.c:161 +#: builtin/merge.c:273 builtin/pull.c:161 msgid "abort if fast-forward is not possible" msgstr "abbrechen, wenn kein Vorspulen möglich ist" -#: builtin/merge.c:276 builtin/pull.c:164 +#: builtin/merge.c:277 builtin/pull.c:164 msgid "verify that the named commit has a valid GPG signature" msgstr "den genannten Commit auf eine gültige GPG-Signatur überprüfen" -#: builtin/merge.c:277 builtin/notes.c:787 builtin/pull.c:168 -#: builtin/rebase.c:539 builtin/rebase.c:1412 builtin/revert.c:114 +#: builtin/merge.c:278 builtin/notes.c:787 builtin/pull.c:168 +#: builtin/rebase.c:541 builtin/rebase.c:1418 builtin/revert.c:114 msgid "strategy" msgstr "Strategie" -#: builtin/merge.c:278 builtin/pull.c:169 +#: builtin/merge.c:279 builtin/pull.c:169 msgid "merge strategy to use" msgstr "zu verwendende Merge-Strategie" -#: builtin/merge.c:279 builtin/pull.c:172 +#: builtin/merge.c:280 builtin/pull.c:172 msgid "option=value" msgstr "Option=Wert" -#: builtin/merge.c:280 builtin/pull.c:173 +#: builtin/merge.c:281 builtin/pull.c:173 msgid "option for selected merge strategy" msgstr "Option für ausgewählte Merge-Strategie" -#: builtin/merge.c:282 +#: builtin/merge.c:283 msgid "merge commit message (for a non-fast-forward merge)" msgstr "" "Commit-Beschreibung zusammenführen (für einen Merge, der kein Vorspulen war)" -#: builtin/merge.c:289 +#: builtin/merge.c:290 msgid "abort the current in-progress merge" msgstr "den sich im Gange befindlichen Merge abbrechen" -#: builtin/merge.c:291 +#: builtin/merge.c:292 msgid "--abort but leave index and working tree alone" msgstr "--abort, aber Index und Arbeitsverzeichnis unverändert lassen" -#: builtin/merge.c:293 +#: builtin/merge.c:294 msgid "continue the current in-progress merge" msgstr "den sich im Gange befindlichen Merge fortsetzen" -#: builtin/merge.c:295 builtin/pull.c:180 +#: builtin/merge.c:296 builtin/pull.c:180 msgid "allow merging unrelated histories" msgstr "erlaube das Zusammenführen von nicht zusammenhängenden Historien" -#: builtin/merge.c:302 +#: builtin/merge.c:303 msgid "bypass pre-merge-commit and commit-msg hooks" msgstr "Hooks pre-merge-commit und commit-msg umgehen" -#: builtin/merge.c:319 +#: builtin/merge.c:320 msgid "could not run stash." msgstr "Konnte \"stash\" nicht ausführen." -#: builtin/merge.c:324 +#: builtin/merge.c:325 msgid "stash failed" msgstr "\"stash\" fehlgeschlagen" -#: builtin/merge.c:329 +#: builtin/merge.c:330 #, c-format msgid "not a valid object: %s" msgstr "kein gültiges Objekt: %s" -#: builtin/merge.c:351 builtin/merge.c:368 +#: builtin/merge.c:352 builtin/merge.c:369 msgid "read-tree failed" msgstr "read-tree fehlgeschlagen" -#: builtin/merge.c:398 +#: builtin/merge.c:399 msgid " (nothing to squash)" msgstr " (nichts zu quetschen)" -#: builtin/merge.c:409 +#: builtin/merge.c:410 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Quetsche Commit -- HEAD wird nicht aktualisiert\n" -#: builtin/merge.c:459 +#: builtin/merge.c:460 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "Keine Merge-Commit-Beschreibung -- HEAD wird nicht aktualisiert\n" -#: builtin/merge.c:510 +#: builtin/merge.c:511 #, c-format msgid "'%s' does not point to a commit" msgstr "'%s' zeigt auf keinen Commit" -#: builtin/merge.c:597 +#: builtin/merge.c:598 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Ungültiger branch.%s.mergeoptions String: %s" -#: builtin/merge.c:723 +#: builtin/merge.c:724 msgid "Not handling anything other than two heads merge." msgstr "Es wird nur der Merge von zwei Branches behandelt." -#: builtin/merge.c:736 +#: builtin/merge.c:737 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Unbekannte Option für merge-recursive: -X%s" -#: builtin/merge.c:755 t/helper/test-fast-rebase.c:209 +#: builtin/merge.c:756 t/helper/test-fast-rebase.c:209 #, c-format msgid "unable to write %s" msgstr "konnte %s nicht schreiben" -#: builtin/merge.c:807 +#: builtin/merge.c:808 #, c-format msgid "Could not read from '%s'" msgstr "konnte nicht von '%s' lesen" -#: builtin/merge.c:816 +#: builtin/merge.c:817 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" "Merge wurde nicht committet; benutzen Sie 'git commit', um den Merge " "abzuschließen.\n" -#: builtin/merge.c:822 +#: builtin/merge.c:823 msgid "" "Please enter a commit message to explain why this merge is necessary,\n" "especially if it merges an updated upstream into a topic branch.\n" @@ -17493,11 +17809,11 @@ msgstr "" "Upstream-Branch mit einem Thema-Branch zusammenführt.\n" "\n" -#: builtin/merge.c:827 +#: builtin/merge.c:828 msgid "An empty message aborts the commit.\n" msgstr "Eine leere Commit-Beschreibung bricht den Commit ab.\n" -#: builtin/merge.c:830 +#: builtin/merge.c:831 #, c-format msgid "" "Lines starting with '%c' will be ignored, and an empty message aborts\n" @@ -17506,75 +17822,75 @@ msgstr "" "Zeilen, die mit '%c' beginnen, werden ignoriert,\n" "und eine leere Beschreibung bricht den Commit ab.\n" -#: builtin/merge.c:883 +#: builtin/merge.c:884 msgid "Empty commit message." msgstr "Leere Commit-Beschreibung" -#: builtin/merge.c:898 +#: builtin/merge.c:899 #, c-format msgid "Wonderful.\n" msgstr "Wunderbar.\n" -#: builtin/merge.c:959 +#: builtin/merge.c:960 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" "Automatischer Merge fehlgeschlagen; beheben Sie die Konflikte und committen " "Sie dann das Ergebnis.\n" -#: builtin/merge.c:998 +#: builtin/merge.c:999 msgid "No current branch." msgstr "Sie befinden sich auf keinem Branch." -#: builtin/merge.c:1000 +#: builtin/merge.c:1001 msgid "No remote for the current branch." msgstr "Kein Remote-Repository für den aktuellen Branch." -#: builtin/merge.c:1002 +#: builtin/merge.c:1003 msgid "No default upstream defined for the current branch." msgstr "" "Es ist kein Standard-Upstream-Branch für den aktuellen Branch definiert." -#: builtin/merge.c:1007 +#: builtin/merge.c:1008 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "Kein Remote-Tracking-Branch für %s von %s" -#: builtin/merge.c:1064 +#: builtin/merge.c:1065 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Fehlerhafter Wert '%s' in Umgebungsvariable '%s'" -#: builtin/merge.c:1167 +#: builtin/merge.c:1168 #, c-format msgid "not something we can merge in %s: %s" msgstr "nichts was wir in %s zusammenführen können: %s" -#: builtin/merge.c:1201 +#: builtin/merge.c:1202 msgid "not something we can merge" msgstr "nichts was wir zusammenführen können" -#: builtin/merge.c:1311 +#: builtin/merge.c:1312 msgid "--abort expects no arguments" msgstr "--abort akzeptiert keine Argumente" -#: builtin/merge.c:1315 +#: builtin/merge.c:1316 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "Es gibt keinen Merge abzubrechen (MERGE_HEAD fehlt)" -#: builtin/merge.c:1333 +#: builtin/merge.c:1334 msgid "--quit expects no arguments" msgstr "--quit erwartet keine Argumente" -#: builtin/merge.c:1346 +#: builtin/merge.c:1347 msgid "--continue expects no arguments" msgstr "--continue erwartet keine Argumente" -#: builtin/merge.c:1350 +#: builtin/merge.c:1351 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "Es ist kein Merge im Gange (MERGE_HEAD fehlt)." -#: builtin/merge.c:1366 +#: builtin/merge.c:1367 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -17582,7 +17898,7 @@ msgstr "" "Sie haben Ihren Merge nicht abgeschlossen (MERGE_HEAD existiert).\n" "Bitte committen Sie Ihre Änderungen, bevor Sie den Merge ausführen." -#: builtin/merge.c:1373 +#: builtin/merge.c:1374 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -17590,105 +17906,147 @@ msgstr "" "Sie haben \"cherry-pick\" nicht abgeschlossen (CHERRY_PICK_HEAD existiert).\n" "Bitte committen Sie Ihre Änderungen, bevor Sie den Merge ausführen." -#: builtin/merge.c:1376 +#: builtin/merge.c:1377 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "" "Sie haben \"cherry-pick\" nicht abgeschlossen (CHERRY_PICK_HEAD existiert)." -#: builtin/merge.c:1390 +#: builtin/merge.c:1391 msgid "You cannot combine --squash with --no-ff." msgstr "Sie können --squash nicht mit --no-ff kombinieren." -#: builtin/merge.c:1392 +#: builtin/merge.c:1393 msgid "You cannot combine --squash with --commit." msgstr "Sie können --squash nicht mit --commit kombinieren." -#: builtin/merge.c:1408 +#: builtin/merge.c:1409 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "Kein Commit angegeben und merge.defaultToUpstream ist nicht gesetzt." -#: builtin/merge.c:1425 +#: builtin/merge.c:1426 msgid "Squash commit into empty head not supported yet" msgstr "" "Bin auf einem Commit, der noch geboren wird; kann \"squash\" nicht ausführen." -#: builtin/merge.c:1427 +#: builtin/merge.c:1428 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "" "Nicht vorzuspulender Commit kann nicht in einem leeren Branch verwendet " "werden." -#: builtin/merge.c:1432 +#: builtin/merge.c:1433 #, c-format msgid "%s - not something we can merge" msgstr "%s - nichts was wir zusammenführen können" -#: builtin/merge.c:1434 +#: builtin/merge.c:1435 msgid "Can merge only exactly one commit into empty head" msgstr "Kann nur exakt einen Commit in einem leeren Branch zusammenführen." -#: builtin/merge.c:1515 +#: builtin/merge.c:1516 msgid "refusing to merge unrelated histories" msgstr "Verweigere den Merge von nicht zusammenhängenden Historien." -#: builtin/merge.c:1524 +#: builtin/merge.c:1525 msgid "Already up to date." msgstr "Bereits aktuell." -#: builtin/merge.c:1534 +#: builtin/merge.c:1535 #, c-format msgid "Updating %s..%s\n" msgstr "Aktualisiere %s..%s\n" -#: builtin/merge.c:1580 +#: builtin/merge.c:1581 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Probiere wirklich trivialen \"in-index\"-Merge ...\n" -#: builtin/merge.c:1587 +#: builtin/merge.c:1588 #, c-format msgid "Nope.\n" msgstr "Nein.\n" -#: builtin/merge.c:1612 +#: builtin/merge.c:1613 msgid "Already up to date. Yeeah!" msgstr "Bereits aktuell." -#: builtin/merge.c:1618 +#: builtin/merge.c:1619 msgid "Not possible to fast-forward, aborting." msgstr "Vorspulen nicht möglich, breche ab." -#: builtin/merge.c:1646 builtin/merge.c:1711 +#: builtin/merge.c:1647 builtin/merge.c:1712 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Rücklauf des Verzeichnisses bis zum Ursprung ...\n" -#: builtin/merge.c:1650 +#: builtin/merge.c:1651 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Probiere Merge-Strategie %s ...\n" -#: builtin/merge.c:1702 +#: builtin/merge.c:1703 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Keine Merge-Strategie behandelt diesen Merge.\n" -#: builtin/merge.c:1704 +#: builtin/merge.c:1705 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Merge mit Strategie %s fehlgeschlagen.\n" -#: builtin/merge.c:1713 +#: builtin/merge.c:1714 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "Benutzen Sie \"%s\", um die Auflösung per Hand vorzubereiten.\n" -#: builtin/merge.c:1727 +#: builtin/merge.c:1728 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" "Automatischer Merge abgeschlossen; halte, wie gewünscht, vor dem Commit an\n" +#: builtin/mktag.c:10 +msgid "git mktag" +msgstr "git mktag" + +#: builtin/mktag.c:30 +#, c-format +msgid "warning: tag input does not pass fsck: %s" +msgstr "Warnung: Tag-Eingabe ungültig für fsck: %s" + +#: builtin/mktag.c:41 +#, c-format +msgid "error: tag input does not pass fsck: %s" +msgstr "Fehler: Tag-Eingabe ungültig für fsck: %s" + +#: builtin/mktag.c:44 +#, c-format +msgid "%d (FSCK_IGNORE?) should never trigger this callback" +msgstr "%d (FSCK_IGNORE?) sollte diesen Aufruf niemals auslösen" + +#: builtin/mktag.c:59 +#, c-format +msgid "could not read tagged object '%s'" +msgstr "konnte getaggtes Objekt '%s' nicht lesen" + +#: builtin/mktag.c:62 +#, c-format +msgid "object '%s' tagged as '%s', but is a '%s' type" +msgstr "Objekt '%s' als '%s' getaggt, aber ist ein '%s' Typ" + +#: builtin/mktag.c:99 +msgid "tag on stdin did not pass our strict fsck check" +msgstr "" +"Tag von der Standardeingabe für unsere strenge Überprüfung bei fsck ungültig" + +#: builtin/mktag.c:102 +msgid "tag on stdin did not refer to a valid object" +msgstr "Tag von der Standard-Eingabe verweiste nicht auf gültiges Objekt" + +#: builtin/mktag.c:105 builtin/tag.c:232 +msgid "unable to write tag file" +msgstr "konnte Tag-Datei nicht schreiben" + #: builtin/mktree.c:66 msgid "git mktree [-z] [--missing] [--batch]" msgstr "git mktree [-z] [--missing] [--batch]" @@ -17726,7 +18084,10 @@ msgstr "" "Während des Umpackens, sammle Paket-Dateien von geringerer Größe in " "einenStapel, welcher größer ist als diese Größe" -#: builtin/multi-pack-index.c:50 builtin/prune-packed.c:25 +#: builtin/multi-pack-index.c:50 builtin/notes.c:376 builtin/notes.c:431 +#: builtin/notes.c:509 builtin/notes.c:521 builtin/notes.c:598 +#: builtin/notes.c:665 builtin/notes.c:815 builtin/notes.c:963 +#: builtin/notes.c:985 builtin/prune-packed.c:25 builtin/tag.c:575 msgid "too many arguments" msgstr "Zu viele Argumente." @@ -17833,7 +18194,7 @@ msgstr "%s, Quelle=%s, Ziel=%s" msgid "Renaming %s to %s\n" msgstr "Benenne %s nach %s um\n" -#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:484 +#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:483 #, c-format msgid "renaming '%s' failed" msgstr "Umbenennung von '%s' fehlgeschlagen" @@ -18026,7 +18387,7 @@ msgstr "Konnte Notiz-Objekt nicht schreiben" msgid "the note contents have been left in %s" msgstr "Die Notiz-Inhalte wurden in %s belassen." -#: builtin/notes.c:242 builtin/tag.c:533 +#: builtin/notes.c:242 builtin/tag.c:565 #, c-format msgid "could not open or read '%s'" msgstr "konnte '%s' nicht öffnen oder lesen" @@ -18068,12 +18429,6 @@ msgstr "" "Ausführung von %s auf Notizen in %s (außerhalb von refs/notes/) " "zurückgewiesen" -#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509 -#: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665 -#: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985 -msgid "too many parameters" -msgstr "zu viele Parameter" - #: builtin/notes.c:389 builtin/notes.c:678 #, c-format msgid "no note found for object %s." @@ -18133,8 +18488,8 @@ msgstr "" "stdin)" #: builtin/notes.c:517 -msgid "too few parameters" -msgstr "zu wenig Parameter" +msgid "too few arguments" +msgstr "zu wenige Argumente" #: builtin/notes.c:538 #, c-format @@ -18266,7 +18621,7 @@ msgstr "" "commit',\n" "oder brechen Sie den Merge mit 'git notes merge --abort' ab.\n" -#: builtin/notes.c:897 builtin/tag.c:546 +#: builtin/notes.c:897 builtin/tag.c:578 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "Konnte '%s' nicht als gültige Referenz auflösen." @@ -18284,7 +18639,7 @@ msgstr "der Versuch, eine nicht existierende Notiz zu löschen, ist kein Fehler" msgid "read object names from the standard input" msgstr "Objektnamen von der Standard-Eingabe lesen" -#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:220 +#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:148 msgid "do not remove, show only" msgstr "nicht löschen, nur anzeigen" @@ -18300,7 +18655,7 @@ msgstr "Notiz-Referenz" msgid "use notes from <notes-ref>" msgstr "Notizen von <Notiz-Referenz> verwenden" -#: builtin/notes.c:1034 builtin/stash.c:1604 +#: builtin/notes.c:1034 builtin/stash.c:1671 #, c-format msgid "unknown subcommand: %s" msgstr "Unbekannter Unterbefehl: %s" @@ -18319,106 +18674,120 @@ msgstr "" "git pack-objects [<Optionen>...] <Basis-Name> [< <Referenzliste> | < " "<Objektliste>]" -#: builtin/pack-objects.c:443 +#: builtin/pack-objects.c:440 +#, c-format +msgid "" +"write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in " +"pack %s" +msgstr "" +"write_reuse_object: konnte %s nicht finden, erwartet bei Offset %<PRIuMAX> " +"in Paket %s" + +#: builtin/pack-objects.c:448 #, c-format msgid "bad packed object CRC for %s" msgstr "Ungültiges CRC für gepacktes Objekt %s." -#: builtin/pack-objects.c:454 +#: builtin/pack-objects.c:459 #, c-format msgid "corrupt packed object for %s" msgstr "Fehlerhaftes gepacktes Objekt für %s." -#: builtin/pack-objects.c:585 +#: builtin/pack-objects.c:590 #, c-format msgid "recursive delta detected for object %s" msgstr "Rekursiver Unterschied für Objekt %s festgestellt." -#: builtin/pack-objects.c:796 +#: builtin/pack-objects.c:801 #, c-format msgid "ordered %u objects, expected %<PRIu32>" msgstr "%u Objekte geordnet, %<PRIu32> erwartet." -#: builtin/pack-objects.c:1004 +#: builtin/pack-objects.c:896 +#, c-format +msgid "expected object at offset %<PRIuMAX> in pack %s" +msgstr "Objekt beim Offset %<PRIuMAX> in Paket %s erwartet" + +#: builtin/pack-objects.c:1015 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "" "Deaktiviere Schreiben der Bitmap, Pakete wurden durch pack.packSizeLimit\n" "aufgetrennt." -#: builtin/pack-objects.c:1017 +#: builtin/pack-objects.c:1028 msgid "Writing objects" msgstr "Schreibe Objekte" -#: builtin/pack-objects.c:1078 builtin/update-index.c:90 +#: builtin/pack-objects.c:1089 builtin/update-index.c:90 #, c-format msgid "failed to stat %s" msgstr "Konnte '%s' nicht lesen" -#: builtin/pack-objects.c:1131 +#: builtin/pack-objects.c:1141 #, c-format msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" msgstr "Schrieb %<PRIu32> Objekte während %<PRIu32> erwartet waren." -#: builtin/pack-objects.c:1348 +#: builtin/pack-objects.c:1358 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" "Deaktiviere Schreiben der Bitmap, da einige Objekte nicht in eine Pack-" "Datei\n" "geschrieben wurden." -#: builtin/pack-objects.c:1796 +#: builtin/pack-objects.c:1806 #, c-format msgid "delta base offset overflow in pack for %s" msgstr "\"delta base offset\" Überlauf in Paket für %s" -#: builtin/pack-objects.c:1805 +#: builtin/pack-objects.c:1815 #, c-format msgid "delta base offset out of bound for %s" msgstr "\"delta base offset\" liegt außerhalb des gültigen Bereichs für %s" -#: builtin/pack-objects.c:2086 +#: builtin/pack-objects.c:2096 msgid "Counting objects" msgstr "Zähle Objekte" -#: builtin/pack-objects.c:2231 +#: builtin/pack-objects.c:2241 #, c-format msgid "unable to parse object header of %s" msgstr "Konnte Kopfbereich von Objekt '%s' nicht parsen." -#: builtin/pack-objects.c:2301 builtin/pack-objects.c:2317 -#: builtin/pack-objects.c:2327 +#: builtin/pack-objects.c:2311 builtin/pack-objects.c:2327 +#: builtin/pack-objects.c:2337 #, c-format msgid "object %s cannot be read" msgstr "Objekt %s kann nicht gelesen werden." -#: builtin/pack-objects.c:2304 builtin/pack-objects.c:2331 +#: builtin/pack-objects.c:2314 builtin/pack-objects.c:2341 #, c-format msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)" msgstr "Inkonsistente Objektlänge bei Objekt %s (%<PRIuMAX> vs %<PRIuMAX>)" -#: builtin/pack-objects.c:2341 +#: builtin/pack-objects.c:2351 msgid "suboptimal pack - out of memory" msgstr "ungünstiges Packet - Speicher voll" -#: builtin/pack-objects.c:2656 +#: builtin/pack-objects.c:2666 #, c-format msgid "Delta compression using up to %d threads" msgstr "Delta-Kompression verwendet bis zu %d Threads." -#: builtin/pack-objects.c:2795 +#: builtin/pack-objects.c:2805 #, c-format msgid "unable to pack objects reachable from tag %s" msgstr "Konnte keine Objekte packen, die von Tag %s erreichbar sind." -#: builtin/pack-objects.c:2883 +#: builtin/pack-objects.c:2891 msgid "Compressing objects" msgstr "Komprimiere Objekte" -#: builtin/pack-objects.c:2889 +#: builtin/pack-objects.c:2897 msgid "inconsistency with delta count" msgstr "Inkonsistenz mit der Anzahl von Deltas" -#: builtin/pack-objects.c:2961 +#: builtin/pack-objects.c:2976 #, c-format msgid "" "value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-" @@ -18427,7 +18796,7 @@ msgstr "" "Wert für uploadpack.blobpackfileuri muss in der Form '<Objekt-Hash> <Pack-" "Hash> <URI>' vorliegen ('%s' erhalten)" -#: builtin/pack-objects.c:2964 +#: builtin/pack-objects.c:2979 #, c-format msgid "" "object already configured in another uploadpack.blobpackfileuri (got '%s')" @@ -18435,7 +18804,7 @@ msgstr "" "Objekt bereits in einem anderen uploadpack.blobpackfileuri konfiguriert " "('%s' erhalten)" -#: builtin/pack-objects.c:2993 +#: builtin/pack-objects.c:3008 #, c-format msgid "" "expected edge object ID, got garbage:\n" @@ -18444,7 +18813,7 @@ msgstr "" "erwartete Randobjekt-ID, erhielt nutzlose Daten:\n" " %s" -#: builtin/pack-objects.c:2999 +#: builtin/pack-objects.c:3014 #, c-format msgid "" "expected object ID, got garbage:\n" @@ -18453,250 +18822,250 @@ msgstr "" "erwartete Objekt-ID, erhielt nutzlose Daten:\n" " %s" -#: builtin/pack-objects.c:3097 +#: builtin/pack-objects.c:3112 msgid "invalid value for --missing" msgstr "ungültiger Wert für --missing" -#: builtin/pack-objects.c:3156 builtin/pack-objects.c:3264 +#: builtin/pack-objects.c:3171 builtin/pack-objects.c:3279 msgid "cannot open pack index" msgstr "kann Paketindex nicht öffnen" -#: builtin/pack-objects.c:3187 +#: builtin/pack-objects.c:3202 #, c-format msgid "loose object at %s could not be examined" msgstr "loses Objekt bei %s konnte nicht untersucht werden" -#: builtin/pack-objects.c:3272 +#: builtin/pack-objects.c:3287 msgid "unable to force loose object" msgstr "konnte loses Objekt nicht erzwingen" -#: builtin/pack-objects.c:3365 +#: builtin/pack-objects.c:3380 #, c-format msgid "not a rev '%s'" msgstr "'%s' ist kein Commit" -#: builtin/pack-objects.c:3368 +#: builtin/pack-objects.c:3383 #, c-format msgid "bad revision '%s'" msgstr "ungültiger Commit '%s'" -#: builtin/pack-objects.c:3393 +#: builtin/pack-objects.c:3408 msgid "unable to add recent objects" msgstr "konnte neuere Objekte nicht hinzufügen" -#: builtin/pack-objects.c:3446 +#: builtin/pack-objects.c:3461 #, c-format msgid "unsupported index version %s" msgstr "nicht unterstützte Index-Version %s" -#: builtin/pack-objects.c:3450 +#: builtin/pack-objects.c:3465 #, c-format msgid "bad index version '%s'" msgstr "ungültige Index-Version '%s'" -#: builtin/pack-objects.c:3488 +#: builtin/pack-objects.c:3503 msgid "<version>[,<offset>]" msgstr "<Version>[,<Offset>]" -#: builtin/pack-objects.c:3489 +#: builtin/pack-objects.c:3504 msgid "write the pack index file in the specified idx format version" msgstr "" "die Index-Datei des Paketes in der angegebenen Indexformat-Version schreiben" -#: builtin/pack-objects.c:3492 +#: builtin/pack-objects.c:3507 msgid "maximum size of each output pack file" msgstr "maximale Größe für jede ausgegebene Paketdatei" -#: builtin/pack-objects.c:3494 +#: builtin/pack-objects.c:3509 msgid "ignore borrowed objects from alternate object store" msgstr "geliehene Objekte von alternativem Objektspeicher ignorieren" -#: builtin/pack-objects.c:3496 +#: builtin/pack-objects.c:3511 msgid "ignore packed objects" msgstr "gepackte Objekte ignorieren" -#: builtin/pack-objects.c:3498 +#: builtin/pack-objects.c:3513 msgid "limit pack window by objects" msgstr "Paketfenster durch Objekte begrenzen" -#: builtin/pack-objects.c:3500 +#: builtin/pack-objects.c:3515 msgid "limit pack window by memory in addition to object limit" msgstr "" "Paketfenster, zusätzlich zur Objektbegrenzung, durch Speicher begrenzen" -#: builtin/pack-objects.c:3502 +#: builtin/pack-objects.c:3517 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "" "maximale Länge der erlaubten Differenzverkettung im resultierenden Paket" -#: builtin/pack-objects.c:3504 +#: builtin/pack-objects.c:3519 msgid "reuse existing deltas" msgstr "existierende Unterschiede wiederverwenden" -#: builtin/pack-objects.c:3506 +#: builtin/pack-objects.c:3521 msgid "reuse existing objects" msgstr "existierende Objekte wiederverwenden" -#: builtin/pack-objects.c:3508 +#: builtin/pack-objects.c:3523 msgid "use OFS_DELTA objects" msgstr "OFS_DELTA Objekte verwenden" -#: builtin/pack-objects.c:3510 +#: builtin/pack-objects.c:3525 msgid "use threads when searching for best delta matches" msgstr "" "Threads bei der Suche nach den besten Übereinstimmungen bei Unterschieden " "verwenden" -#: builtin/pack-objects.c:3512 +#: builtin/pack-objects.c:3527 msgid "do not create an empty pack output" msgstr "keine leeren Pakete erzeugen" -#: builtin/pack-objects.c:3514 +#: builtin/pack-objects.c:3529 msgid "read revision arguments from standard input" msgstr "Argumente bezüglich Commits von der Standard-Eingabe lesen" -#: builtin/pack-objects.c:3516 +#: builtin/pack-objects.c:3531 msgid "limit the objects to those that are not yet packed" msgstr "die Objekte zu solchen, die noch nicht gepackt wurden, begrenzen" -#: builtin/pack-objects.c:3519 +#: builtin/pack-objects.c:3534 msgid "include objects reachable from any reference" msgstr "Objekte einschließen, die von jeder Referenz erreichbar sind" -#: builtin/pack-objects.c:3522 +#: builtin/pack-objects.c:3537 msgid "include objects referred by reflog entries" msgstr "" "Objekte einschließen, die von Einträgen des Reflogs referenziert werden" -#: builtin/pack-objects.c:3525 +#: builtin/pack-objects.c:3540 msgid "include objects referred to by the index" msgstr "Objekte einschließen, die vom Index referenziert werden" -#: builtin/pack-objects.c:3528 +#: builtin/pack-objects.c:3543 msgid "output pack to stdout" msgstr "Paket in die Standard-Ausgabe schreiben" -#: builtin/pack-objects.c:3530 +#: builtin/pack-objects.c:3545 msgid "include tag objects that refer to objects to be packed" msgstr "Tag-Objekte einschließen, die auf gepackte Objekte referenzieren" -#: builtin/pack-objects.c:3532 +#: builtin/pack-objects.c:3547 msgid "keep unreachable objects" msgstr "nicht erreichbare Objekte behalten" -#: builtin/pack-objects.c:3534 +#: builtin/pack-objects.c:3549 msgid "pack loose unreachable objects" msgstr "nicht erreichbare lose Objekte packen" -#: builtin/pack-objects.c:3536 +#: builtin/pack-objects.c:3551 msgid "unpack unreachable objects newer than <time>" msgstr "nicht erreichbare Objekte entpacken, die neuer als <Zeit> sind" -#: builtin/pack-objects.c:3539 +#: builtin/pack-objects.c:3554 msgid "use the sparse reachability algorithm" msgstr "den \"sparse\" Algorithmus zur Bestimmung der Erreichbarkeit benutzen" -#: builtin/pack-objects.c:3541 +#: builtin/pack-objects.c:3556 msgid "create thin packs" msgstr "dünnere Pakete erzeugen" -#: builtin/pack-objects.c:3543 +#: builtin/pack-objects.c:3558 msgid "create packs suitable for shallow fetches" msgstr "" "Pakete geeignet für Abholung mit unvollständiger Historie (shallow) erzeugen" -#: builtin/pack-objects.c:3545 +#: builtin/pack-objects.c:3560 msgid "ignore packs that have companion .keep file" msgstr "Pakete ignorieren, die .keep Dateien haben" -#: builtin/pack-objects.c:3547 +#: builtin/pack-objects.c:3562 msgid "ignore this pack" msgstr "dieses Paket ignorieren" -#: builtin/pack-objects.c:3549 +#: builtin/pack-objects.c:3564 msgid "pack compression level" msgstr "Komprimierungsgrad für Paketierung" -#: builtin/pack-objects.c:3551 +#: builtin/pack-objects.c:3566 msgid "do not hide commits by grafts" msgstr "keine künstlichen Vorgänger-Commits (\"grafts\") verbergen" -#: builtin/pack-objects.c:3553 +#: builtin/pack-objects.c:3568 msgid "use a bitmap index if available to speed up counting objects" msgstr "" "Bitmap-Index (falls verfügbar) zur Optimierung der Objektzählung benutzen" -#: builtin/pack-objects.c:3555 +#: builtin/pack-objects.c:3570 msgid "write a bitmap index together with the pack index" msgstr "Bitmap-Index zusammen mit Pack-Index schreiben" -#: builtin/pack-objects.c:3559 +#: builtin/pack-objects.c:3574 msgid "write a bitmap index if possible" msgstr "Bitmap-Index schreiben, wenn möglich" -#: builtin/pack-objects.c:3563 +#: builtin/pack-objects.c:3578 msgid "handling for missing objects" msgstr "Behandlung für fehlende Objekte" -#: builtin/pack-objects.c:3566 +#: builtin/pack-objects.c:3581 msgid "do not pack objects in promisor packfiles" msgstr "" "keine Objekte aus Packdateien von partiell geklonten Remote-Repositories " "packen" -#: builtin/pack-objects.c:3568 +#: builtin/pack-objects.c:3583 msgid "respect islands during delta compression" msgstr "Delta-Islands bei Delta-Kompression beachten" -#: builtin/pack-objects.c:3570 +#: builtin/pack-objects.c:3585 msgid "protocol" msgstr "Protokoll" -#: builtin/pack-objects.c:3571 +#: builtin/pack-objects.c:3586 msgid "exclude any configured uploadpack.blobpackfileuri with this protocol" msgstr "" "jegliche konfigurierte uploadpack.blobpackfileuri für dieses Protkoll " "ausschließen" -#: builtin/pack-objects.c:3600 +#: builtin/pack-objects.c:3617 #, c-format msgid "delta chain depth %d is too deep, forcing %d" msgstr "Tiefe für Verkettung von Unterschieden %d ist zu tief, erzwinge %d" -#: builtin/pack-objects.c:3605 +#: builtin/pack-objects.c:3622 #, c-format msgid "pack.deltaCacheLimit is too high, forcing %d" msgstr "pack.deltaCacheLimit ist zu hoch, erzwinge %d" -#: builtin/pack-objects.c:3659 +#: builtin/pack-objects.c:3676 msgid "--max-pack-size cannot be used to build a pack for transfer" msgstr "" "--max-pack-size kann nicht für die Erstellung eines Pakets für eine " "Übertragung\n" "benutzt werden." -#: builtin/pack-objects.c:3661 +#: builtin/pack-objects.c:3678 msgid "minimum pack size limit is 1 MiB" msgstr "Minimales Limit für die Paketgröße ist 1 MiB." -#: builtin/pack-objects.c:3666 +#: builtin/pack-objects.c:3683 msgid "--thin cannot be used to build an indexable pack" msgstr "" "--thin kann nicht benutzt werden, um ein indizierbares Paket zu erstellen." -#: builtin/pack-objects.c:3669 +#: builtin/pack-objects.c:3686 msgid "--keep-unreachable and --unpack-unreachable are incompatible" msgstr "--keep-unreachable und --unpack-unreachable sind inkompatibel" -#: builtin/pack-objects.c:3675 +#: builtin/pack-objects.c:3692 msgid "cannot use --filter without --stdout" msgstr "Kann --filter nicht ohne --stdout benutzen." -#: builtin/pack-objects.c:3735 +#: builtin/pack-objects.c:3752 msgid "Enumerating objects" msgstr "Objekte aufzählen" -#: builtin/pack-objects.c:3766 +#: builtin/pack-objects.c:3783 #, c-format msgid "" "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-" @@ -18705,6 +19074,21 @@ msgstr "" "Gesamt %<PRIu32> (Delta %<PRIu32>), Wiederverwendet %<PRIu32> (Delta " "%<PRIu32>), Pack wiederverwendet %<PRIu32>" +#: builtin/pack-redundant.c:601 +msgid "" +"'git pack-redundant' is nominated for removal.\n" +"If you still use this command, please add an extra\n" +"option, '--i-still-use-this', on the command line\n" +"and let us know you still use it by sending an e-mail\n" +"to <git@vger.kernel.org>. Thanks.\n" +msgstr "" +"'git pack-redundant' ist für die Entfernung vorgesehen.\n" +"Wenn Sie diesen Befehl weiterhin verwenden, fügen Sie\n" +"bitte eine zusätzliche Option '--i-still-use-this' in\n" +"der Befehlszeile hinzu und lassen Sie uns wissen, dass\n" +"Sie es immer noch verwenden, indem Sie eine E-Mail an\n" +"<git@vger.kernel.org> senden. Danke.\n" + #: builtin/pack-refs.c:8 msgid "git pack-refs [<options>]" msgstr "git pack-refs [<Optionen>]" @@ -18764,7 +19148,7 @@ msgstr "Optionen bezogen auf Merge" msgid "incorporate changes by rebasing rather than merging" msgstr "Integration von Änderungen durch Rebase statt Merge" -#: builtin/pull.c:158 builtin/rebase.c:490 builtin/revert.c:126 +#: builtin/pull.c:158 builtin/rebase.c:492 builtin/revert.c:126 msgid "allow fast-forward" msgstr "Vorspulen erlauben" @@ -18789,37 +19173,7 @@ msgstr "Anzahl der parallel mit 'pull' zu verarbeitenden Submodule" msgid "Invalid value for pull.ff: %s" msgstr "Ungültiger Wert für pull.ff: %s" -#: builtin/pull.c:348 -msgid "" -"Pulling without specifying how to reconcile divergent branches is\n" -"discouraged. You can squelch this message by running one of the following\n" -"commands sometime before your next pull:\n" -"\n" -" git config pull.rebase false # merge (the default strategy)\n" -" git config pull.rebase true # rebase\n" -" git config pull.ff only # fast-forward only\n" -"\n" -"You can replace \"git config\" with \"git config --global\" to set a " -"default\n" -"preference for all repositories. You can also pass --rebase, --no-rebase,\n" -"or --ff-only on the command line to override the configured default per\n" -"invocation.\n" -msgstr "" -"Es wird davon abgeraten zu Pullen, ohne anzugeben, wie mit abweichenden\n" -"Branches umgegangen werden soll. Sie können diese Nachricht unterdrücken,\n" -"indem Sie einen der folgenden Befehle ausführen, bevor der nächste Pull\n" -"ausgeführt wird:\n" -"\n" -" git config pull.rebase false # Merge (Standard-Strategie)\n" -" git config pull.rebase true # Rebase\n" -" git config pull.ff only # ausschließlich Vorspulen\n" -"\n" -"Sie können statt \"git config\" auch \"git config --global\" nutzen, um\n" -"einen Standard für alle Repositories festzulegen. Sie können auch die\n" -"Option --rebase, --no-rebase oder --ff-only auf der Kommandozeile nutzen,\n" -"um das konfigurierte Standardverhalten pro Aufruf zu überschreiben.\n" - -#: builtin/pull.c:458 +#: builtin/pull.c:445 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." @@ -18827,14 +19181,14 @@ msgstr "" "Es gibt keinen Kandidaten für Rebase innerhalb der Referenzen, die eben " "angefordert wurden." -#: builtin/pull.c:460 +#: builtin/pull.c:447 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "" "Es gibt keine Kandidaten für Merge innerhalb der Referenzen, die eben " "angefordert wurden." -#: builtin/pull.c:461 +#: builtin/pull.c:448 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." @@ -18842,7 +19196,7 @@ msgstr "" "Im Allgemeinen bedeutet das, dass Sie einen Refspec mit Wildcards angegeben\n" "haben, der auf der Gegenseite mit keinen Referenzen übereinstimmt." -#: builtin/pull.c:464 +#: builtin/pull.c:451 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -18854,38 +19208,38 @@ msgstr "" "Repository für den aktuellen Branch ist, müssen Sie einen Branch auf\n" "der Befehlszeile angeben." -#: builtin/pull.c:469 builtin/rebase.c:1246 +#: builtin/pull.c:456 builtin/rebase.c:1253 msgid "You are not currently on a branch." msgstr "Im Moment auf keinem Branch." -#: builtin/pull.c:471 builtin/pull.c:486 +#: builtin/pull.c:458 builtin/pull.c:473 msgid "Please specify which branch you want to rebase against." msgstr "" "Bitte geben Sie den Branch an, gegen welchen Sie \"rebase\" ausführen " "möchten." -#: builtin/pull.c:473 builtin/pull.c:488 +#: builtin/pull.c:460 builtin/pull.c:475 msgid "Please specify which branch you want to merge with." msgstr "Bitte geben Sie den Branch an, welchen Sie zusammenführen möchten." -#: builtin/pull.c:474 builtin/pull.c:489 +#: builtin/pull.c:461 builtin/pull.c:476 msgid "See git-pull(1) for details." msgstr "Siehe git-pull(1) für weitere Details." -#: builtin/pull.c:476 builtin/pull.c:482 builtin/pull.c:491 -#: builtin/rebase.c:1252 +#: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478 +#: builtin/rebase.c:1259 msgid "<remote>" msgstr "<Remote-Repository>" -#: builtin/pull.c:476 builtin/pull.c:491 builtin/pull.c:496 +#: builtin/pull.c:463 builtin/pull.c:478 builtin/pull.c:483 msgid "<branch>" msgstr "<Branch>" -#: builtin/pull.c:484 builtin/rebase.c:1244 +#: builtin/pull.c:471 builtin/rebase.c:1251 msgid "There is no tracking information for the current branch." msgstr "Es gibt keine Tracking-Informationen für den aktuellen Branch." -#: builtin/pull.c:493 +#: builtin/pull.c:480 msgid "" "If you wish to set tracking information for this branch you can do so with:" msgstr "" @@ -18893,7 +19247,7 @@ msgstr "" "Sie\n" "dies tun mit:" -#: builtin/pull.c:498 +#: builtin/pull.c:485 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -18903,30 +19257,60 @@ msgstr "" "des Remote-Repositories durchzuführen, aber diese Referenz\n" "wurde nicht angefordert." -#: builtin/pull.c:609 +#: builtin/pull.c:596 #, c-format msgid "unable to access commit %s" msgstr "Konnte nicht auf Commit '%s' zugreifen." -#: builtin/pull.c:915 +#: builtin/pull.c:902 msgid "ignoring --verify-signatures for rebase" msgstr "Ignoriere --verify-signatures für Rebase" -#: builtin/pull.c:972 +#: builtin/pull.c:930 +msgid "" +"Pulling without specifying how to reconcile divergent branches is\n" +"discouraged. You can squelch this message by running one of the following\n" +"commands sometime before your next pull:\n" +"\n" +" git config pull.rebase false # merge (the default strategy)\n" +" git config pull.rebase true # rebase\n" +" git config pull.ff only # fast-forward only\n" +"\n" +"You can replace \"git config\" with \"git config --global\" to set a " +"default\n" +"preference for all repositories. You can also pass --rebase, --no-rebase,\n" +"or --ff-only on the command line to override the configured default per\n" +"invocation.\n" +msgstr "" +"Es wird davon abgeraten zu Pullen, ohne anzugeben, wie mit abweichenden\n" +"Branches umgegangen werden soll. Sie können diese Nachricht unterdrücken,\n" +"indem Sie einen der folgenden Befehle ausführen, bevor der nächste Pull\n" +"ausgeführt wird:\n" +"\n" +" git config pull.rebase false # Merge (Standard-Strategie)\n" +" git config pull.rebase true # Rebase\n" +" git config pull.ff only # ausschließlich Vorspulen\n" +"\n" +"Sie können statt \"git config\" auch \"git config --global\" nutzen, um\n" +"einen Standard für alle Repositories festzulegen. Sie können auch die\n" +"Option --rebase, --no-rebase oder --ff-only auf der Kommandozeile nutzen,\n" +"um das konfigurierte Standardverhalten pro Aufruf zu überschreiben.\n" + +#: builtin/pull.c:991 msgid "Updating an unborn branch with changes added to the index." msgstr "" "Aktualisiere einen ungeborenen Branch mit Änderungen, die zum Commit " "vorgemerkt sind." -#: builtin/pull.c:976 +#: builtin/pull.c:995 msgid "pull with rebase" msgstr "Pull mit Rebase" -#: builtin/pull.c:977 +#: builtin/pull.c:996 msgid "please commit or stash them." msgstr "Bitte committen Sie die Änderungen oder benutzen Sie \"stash\"." -#: builtin/pull.c:1002 +#: builtin/pull.c:1021 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -18936,7 +19320,7 @@ msgstr "" "\"fetch\" aktualisierte die Spitze des aktuellen Branches.\n" "Spule Ihr Arbeitsverzeichnis von Commit %s vor." -#: builtin/pull.c:1008 +#: builtin/pull.c:1027 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -18953,15 +19337,15 @@ msgstr "" "$ git reset --hard\n" "zur Wiederherstellung aus." -#: builtin/pull.c:1023 +#: builtin/pull.c:1042 msgid "Cannot merge multiple branches into empty head." msgstr "Kann nicht mehrere Branches in einen leeren Branch zusammenführen." -#: builtin/pull.c:1027 +#: builtin/pull.c:1046 msgid "Cannot rebase onto multiple branches." msgstr "Kann Rebase nicht auf mehrere Branches ausführen." -#: builtin/pull.c:1041 +#: builtin/pull.c:1067 msgid "cannot rebase with locally recorded submodule modifications" msgstr "" "Kann Rebase nicht mit lokal aufgezeichneten Änderungen in Submodulen " @@ -18977,7 +19361,7 @@ msgstr "Kurzschrift für Tag ohne <Tag>" #: builtin/push.c:119 msgid "--delete only accepts plain target ref names" -msgstr "Die Option --delete akzeptiert nur reine Referenznamen als Ziel." +msgstr "--delete akzeptiert nur reine Referenznamen als Ziel" #: builtin/push.c:164 msgid "" @@ -19227,11 +19611,11 @@ msgstr "Referenzen atomar versenden" #: builtin/push.c:601 msgid "--delete is incompatible with --all, --mirror and --tags" -msgstr "Die Option --delete ist inkompatibel mit --all, --mirror und --tags." +msgstr "--delete ist inkompatibel mit --all, --mirror und --tags" #: builtin/push.c:603 msgid "--delete doesn't make sense without any refs" -msgstr "Die Option --delete kann nur mit Referenzen verwendet werden." +msgstr "--delete kann nur mit Referenzen verwendet werden" #: builtin/push.c:623 #, c-format @@ -19262,68 +19646,76 @@ msgstr "" #: builtin/push.c:639 msgid "--all and --tags are incompatible" -msgstr "Die Optionen --all und --tags sind inkompatibel." +msgstr "--all und --tags sind inkompatibel" #: builtin/push.c:641 msgid "--all can't be combined with refspecs" -msgstr "Die Option --all kann nicht mit Refspecs kombiniert werden." +msgstr "--all kann nicht mit Refspecs kombiniert werden" #: builtin/push.c:645 msgid "--mirror and --tags are incompatible" -msgstr "Die Optionen --mirror und --tags sind inkompatibel." +msgstr "--mirror und --tags sind inkompatibel" #: builtin/push.c:647 msgid "--mirror can't be combined with refspecs" -msgstr "Die Option --mirror kann nicht mit Refspecs kombiniert werden." +msgstr "--mirror kann nicht mit Refspecs kombiniert werden" #: builtin/push.c:650 msgid "--all and --mirror are incompatible" -msgstr "Die Optionen --all und --mirror sind inkompatibel." +msgstr "--all und --mirror sind inkompatibel" #: builtin/push.c:657 msgid "push options must not have new line characters" msgstr "Push-Optionen dürfen keine Zeilenvorschubzeichen haben" -#: builtin/range-diff.c:8 +#: builtin/range-diff.c:9 msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>" msgstr "" "git range-diff [<Optionen>] <alte-Basis>..<alte-Spitze> <neue-Basis>..<neue-" "Spitze>" -#: builtin/range-diff.c:9 +#: builtin/range-diff.c:10 msgid "git range-diff [<options>] <old-tip>...<new-tip>" msgstr "git range-diff [<Optionen>] <alte-Spitze>...<neue-Spitze>" -#: builtin/range-diff.c:10 +#: builtin/range-diff.c:11 msgid "git range-diff [<options>] <base> <old-tip> <new-tip>" msgstr "git range-diff [<Optionen>] <Basis> <alte-Spitze> <neue-Spitze>" -#: builtin/range-diff.c:22 +#: builtin/range-diff.c:28 msgid "Percentage by which creation is weighted" msgstr "Prozentsatz mit welchem Erzeugung gewichtet wird" -#: builtin/range-diff.c:24 +#: builtin/range-diff.c:30 msgid "use simple diff colors" msgstr "einfache Diff-Farben benutzen" -#: builtin/range-diff.c:26 +#: builtin/range-diff.c:32 msgid "notes" msgstr "Notizen" -#: builtin/range-diff.c:26 +#: builtin/range-diff.c:32 msgid "passed to 'git log'" msgstr "an 'git log' übergeben" -#: builtin/range-diff.c:50 builtin/range-diff.c:54 +#: builtin/range-diff.c:35 +msgid "only emit output related to the first range" +msgstr "nur Ausgaben anzeigen, die sich auf den ersten Bereich beziehen" + +#: builtin/range-diff.c:37 +msgid "only emit output related to the second range" +msgstr "nur Ausgaben anzeigen, die sich auf den zweiten Bereich beziehen" + +#: builtin/range-diff.c:60 builtin/range-diff.c:64 #, c-format -msgid "no .. in range: '%s'" -msgstr "Kein .. im Bereich: '%s'" +msgid "not a commit range: '%s'" +msgstr "kein Commit-Bereich: '%s'" -#: builtin/range-diff.c:64 +#: builtin/range-diff.c:74 msgid "single arg format must be symmetric range" msgstr "Format mit einfachem Argument muss symmetrischer Bereich sein." -#: builtin/range-diff.c:79 +#: builtin/range-diff.c:89 msgid "need two commit ranges" msgstr "Benötige zwei Commit-Bereiche." @@ -19429,194 +19821,194 @@ msgstr "" msgid "git rebase --continue | --abort | --skip | --edit-todo" msgstr "git rebase --continue | --abort | --skip | --edit-todo" -#: builtin/rebase.c:193 builtin/rebase.c:217 builtin/rebase.c:244 +#: builtin/rebase.c:195 builtin/rebase.c:219 builtin/rebase.c:246 #, c-format msgid "unusable todo list: '%s'" msgstr "Unbenutzbare TODO-Liste: '%s'" -#: builtin/rebase.c:310 +#: builtin/rebase.c:312 #, c-format msgid "could not create temporary %s" msgstr "Konnte temporäres Verzeichnis '%s' nicht erstellen." -#: builtin/rebase.c:316 +#: builtin/rebase.c:318 msgid "could not mark as interactive" msgstr "Markierung auf interaktiven Rebase fehlgeschlagen." -#: builtin/rebase.c:369 +#: builtin/rebase.c:371 msgid "could not generate todo list" msgstr "Konnte TODO-Liste nicht erzeugen." -#: builtin/rebase.c:411 +#: builtin/rebase.c:413 msgid "a base commit must be provided with --upstream or --onto" msgstr "Ein Basis-Commit muss mit --upstream oder --onto angegeben werden." -#: builtin/rebase.c:480 +#: builtin/rebase.c:482 msgid "git rebase--interactive [<options>]" msgstr "git rebase--interactive [<Optionen>]" -#: builtin/rebase.c:493 builtin/rebase.c:1388 +#: builtin/rebase.c:495 builtin/rebase.c:1394 msgid "keep commits which start empty" msgstr "behalte Commits, die leer beginnen" -#: builtin/rebase.c:497 builtin/revert.c:128 +#: builtin/rebase.c:499 builtin/revert.c:128 msgid "allow commits with empty messages" msgstr "Commits mit leerer Beschreibung erlauben" -#: builtin/rebase.c:499 +#: builtin/rebase.c:501 msgid "rebase merge commits" msgstr "Rebase auf Merge-Commits ausführen" -#: builtin/rebase.c:501 +#: builtin/rebase.c:503 msgid "keep original branch points of cousins" msgstr "originale Branch-Punkte der Cousins behalten" -#: builtin/rebase.c:503 +#: builtin/rebase.c:505 msgid "move commits that begin with squash!/fixup!" msgstr "Commits verschieben, die mit squash!/fixup! beginnen" -#: builtin/rebase.c:504 +#: builtin/rebase.c:506 msgid "sign commits" msgstr "Commits signieren" -#: builtin/rebase.c:506 builtin/rebase.c:1327 +#: builtin/rebase.c:508 builtin/rebase.c:1333 msgid "display a diffstat of what changed upstream" msgstr "" "Zusammenfassung der Unterschiede gegenüber dem Upstream-Branch anzeigen" -#: builtin/rebase.c:508 +#: builtin/rebase.c:510 msgid "continue rebase" msgstr "Rebase fortsetzen" -#: builtin/rebase.c:510 +#: builtin/rebase.c:512 msgid "skip commit" msgstr "Commit auslassen" -#: builtin/rebase.c:511 +#: builtin/rebase.c:513 msgid "edit the todo list" msgstr "die TODO-Liste bearbeiten" -#: builtin/rebase.c:513 +#: builtin/rebase.c:515 msgid "show the current patch" msgstr "den aktuellen Patch anzeigen" -#: builtin/rebase.c:516 +#: builtin/rebase.c:518 msgid "shorten commit ids in the todo list" msgstr "Commit-IDs in der TODO-Liste verkürzen" -#: builtin/rebase.c:518 +#: builtin/rebase.c:520 msgid "expand commit ids in the todo list" msgstr "Commit-IDs in der TODO-Liste erweitern" -#: builtin/rebase.c:520 +#: builtin/rebase.c:522 msgid "check the todo list" msgstr "die TODO-Liste prüfen" -#: builtin/rebase.c:522 +#: builtin/rebase.c:524 msgid "rearrange fixup/squash lines" msgstr "fixup/squash-Zeilen umordnen" -#: builtin/rebase.c:524 +#: builtin/rebase.c:526 msgid "insert exec commands in todo list" msgstr "\"exec\"-Befehle in TODO-Liste einfügen" -#: builtin/rebase.c:525 +#: builtin/rebase.c:527 msgid "onto" msgstr "auf" -#: builtin/rebase.c:528 +#: builtin/rebase.c:530 msgid "restrict-revision" msgstr "Begrenzungscommit" -#: builtin/rebase.c:528 +#: builtin/rebase.c:530 msgid "restrict revision" msgstr "Begrenzungscommit" -#: builtin/rebase.c:530 +#: builtin/rebase.c:532 msgid "squash-onto" msgstr "squash-onto" -#: builtin/rebase.c:531 +#: builtin/rebase.c:533 msgid "squash onto" msgstr "squash onto" -#: builtin/rebase.c:533 +#: builtin/rebase.c:535 msgid "the upstream commit" msgstr "der Upstream-Commit" -#: builtin/rebase.c:535 +#: builtin/rebase.c:537 msgid "head-name" msgstr "head-Name" -#: builtin/rebase.c:535 +#: builtin/rebase.c:537 msgid "head name" msgstr "head-Name" -#: builtin/rebase.c:540 +#: builtin/rebase.c:542 msgid "rebase strategy" msgstr "Rebase-Strategie" -#: builtin/rebase.c:541 +#: builtin/rebase.c:543 msgid "strategy-opts" msgstr "Strategie-Optionen" -#: builtin/rebase.c:542 +#: builtin/rebase.c:544 msgid "strategy options" msgstr "Strategie-Optionen" -#: builtin/rebase.c:543 +#: builtin/rebase.c:545 msgid "switch-to" msgstr "wechseln zu" -#: builtin/rebase.c:544 +#: builtin/rebase.c:546 msgid "the branch or commit to checkout" msgstr "der Branch oder Commit zum Auschecken" -#: builtin/rebase.c:545 +#: builtin/rebase.c:547 msgid "onto-name" msgstr "onto-Name" -#: builtin/rebase.c:545 +#: builtin/rebase.c:547 msgid "onto name" msgstr "onto-Name" -#: builtin/rebase.c:546 +#: builtin/rebase.c:548 msgid "cmd" msgstr "Befehl" -#: builtin/rebase.c:546 +#: builtin/rebase.c:548 msgid "the command to run" msgstr "auszuführender Befehl" -#: builtin/rebase.c:549 builtin/rebase.c:1421 +#: builtin/rebase.c:551 builtin/rebase.c:1427 msgid "automatically re-schedule any `exec` that fails" msgstr "jeden fehlgeschlagenen `exec`-Befehl neu ansetzen" -#: builtin/rebase.c:565 +#: builtin/rebase.c:567 msgid "--[no-]rebase-cousins has no effect without --rebase-merges" msgstr "--[no-]rebase-cousins hat ohne --rebase-merges keine Auswirkung" -#: builtin/rebase.c:581 +#: builtin/rebase.c:583 #, c-format msgid "%s requires the merge backend" msgstr "%s erfordert das Merge-Backend" -#: builtin/rebase.c:624 +#: builtin/rebase.c:626 #, c-format msgid "could not get 'onto': '%s'" msgstr "Konnte 'onto' nicht bestimmen: '%s'" -#: builtin/rebase.c:641 +#: builtin/rebase.c:643 #, c-format msgid "invalid orig-head: '%s'" msgstr "Ungültiges orig-head: '%s'" -#: builtin/rebase.c:666 +#: builtin/rebase.c:668 #, c-format msgid "ignoring invalid allow_rerere_autoupdate: '%s'" msgstr "Ignoriere ungültiges allow_rerere_autoupdate: '%s'" -#: builtin/rebase.c:811 git-rebase--preserve-merges.sh:81 +#: builtin/rebase.c:813 git-rebase--preserve-merges.sh:81 msgid "" "Resolve all conflicts manually, mark them as resolved with\n" "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n" @@ -19632,7 +20024,7 @@ msgstr "" "Um abzubrechen und zurück zum Zustand vor \"git rebase\" zu gelangen,\n" "führen Sie \"git rebase --abort\" aus." -#: builtin/rebase.c:894 +#: builtin/rebase.c:896 #, c-format msgid "" "\n" @@ -19652,7 +20044,7 @@ msgstr "" "Infolge dessen kann Git auf diesen Revisionen Rebase nicht\n" "ausführen." -#: builtin/rebase.c:1220 +#: builtin/rebase.c:1227 #, c-format msgid "" "unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask" @@ -19661,7 +20053,7 @@ msgstr "" "nicht erkannter leerer Typ '%s'; Gültige Werte sind \"drop\", \"keep\", und " "\"ask\"." -#: builtin/rebase.c:1238 +#: builtin/rebase.c:1245 #, c-format msgid "" "%s\n" @@ -19679,7 +20071,7 @@ msgstr "" " git rebase '<Branch>'\n" "\n" -#: builtin/rebase.c:1254 +#: builtin/rebase.c:1261 #, c-format msgid "" "If you wish to set tracking information for this branch you can do so with:\n" @@ -19693,154 +20085,152 @@ msgstr "" " git branch --set-upstream-to=%s/<Branch> %s\n" "\n" -#: builtin/rebase.c:1284 +#: builtin/rebase.c:1291 msgid "exec commands cannot contain newlines" msgstr "\"exec\"-Befehle können keine neuen Zeilen enthalten" -#: builtin/rebase.c:1288 +#: builtin/rebase.c:1295 msgid "empty exec command" msgstr "Leerer \"exec\"-Befehl." -#: builtin/rebase.c:1318 +#: builtin/rebase.c:1324 msgid "rebase onto given branch instead of upstream" msgstr "Rebase auf angegebenen Branch anstelle des Upstream-Branches ausführen" -#: builtin/rebase.c:1320 +#: builtin/rebase.c:1326 msgid "use the merge-base of upstream and branch as the current base" msgstr "Nutze die Merge-Basis von Upstream und Branch als die aktuelle Basis" -#: builtin/rebase.c:1322 +#: builtin/rebase.c:1328 msgid "allow pre-rebase hook to run" msgstr "Ausführung des pre-rebase-Hooks erlauben" -#: builtin/rebase.c:1324 +#: builtin/rebase.c:1330 msgid "be quiet. implies --no-stat" msgstr "weniger Ausgaben (impliziert --no-stat)" -#: builtin/rebase.c:1330 +#: builtin/rebase.c:1336 msgid "do not show diffstat of what changed upstream" msgstr "" "Zusammenfassung der Unterschiede gegenüber dem Upstream-Branch verbergen" -#: builtin/rebase.c:1333 +#: builtin/rebase.c:1339 msgid "add a Signed-off-by trailer to each commit" msgstr "eine Signed-off-by Zeile zu jedem Commit hinzufügen" -#: builtin/rebase.c:1336 +#: builtin/rebase.c:1342 msgid "make committer date match author date" msgstr "Datum des Commit-Erstellers soll mit Datum des Autors übereinstimmen" -#: builtin/rebase.c:1338 +#: builtin/rebase.c:1344 msgid "ignore author date and use current date" msgstr "ignoriere Autor-Datum und nutze aktuelles Datum" -#: builtin/rebase.c:1340 +#: builtin/rebase.c:1346 msgid "synonym of --reset-author-date" msgstr "Synonym für --reset-author-date" -#: builtin/rebase.c:1342 builtin/rebase.c:1346 +#: builtin/rebase.c:1348 builtin/rebase.c:1352 msgid "passed to 'git apply'" msgstr "an 'git apply' übergeben" -#: builtin/rebase.c:1344 +#: builtin/rebase.c:1350 msgid "ignore changes in whitespace" msgstr "Whitespace-Änderungen ignorieren" -#: builtin/rebase.c:1348 builtin/rebase.c:1351 +#: builtin/rebase.c:1354 builtin/rebase.c:1357 msgid "cherry-pick all commits, even if unchanged" msgstr "" "Cherry-Pick auf alle Commits ausführen, auch wenn diese unverändert sind" -#: builtin/rebase.c:1353 +#: builtin/rebase.c:1359 msgid "continue" msgstr "fortsetzen" -#: builtin/rebase.c:1356 +#: builtin/rebase.c:1362 msgid "skip current patch and continue" msgstr "den aktuellen Patch auslassen und fortfahren" -#: builtin/rebase.c:1358 +#: builtin/rebase.c:1364 msgid "abort and check out the original branch" msgstr "abbrechen und den ursprünglichen Branch auschecken" -#: builtin/rebase.c:1361 +#: builtin/rebase.c:1367 msgid "abort but keep HEAD where it is" msgstr "abbrechen, aber HEAD an aktueller Stelle belassen" -#: builtin/rebase.c:1362 +#: builtin/rebase.c:1368 msgid "edit the todo list during an interactive rebase" msgstr "TODO-Liste während eines interaktiven Rebase bearbeiten" -#: builtin/rebase.c:1365 +#: builtin/rebase.c:1371 msgid "show the patch file being applied or merged" msgstr "den Patch, der gerade angewendet oder zusammengeführt wird, anzeigen" -#: builtin/rebase.c:1368 +#: builtin/rebase.c:1374 msgid "use apply strategies to rebase" msgstr "Strategien von 'git am' bei Rebase verwenden" -#: builtin/rebase.c:1372 +#: builtin/rebase.c:1378 msgid "use merging strategies to rebase" msgstr "Merge-Strategien beim Rebase verwenden" -#: builtin/rebase.c:1376 +#: builtin/rebase.c:1382 msgid "let the user edit the list of commits to rebase" msgstr "den Benutzer die Liste der Commits für den Rebase bearbeiten lassen" -#: builtin/rebase.c:1380 +#: builtin/rebase.c:1386 msgid "(DEPRECATED) try to recreate merges instead of ignoring them" -msgstr "" -"(VERALTET) Versuche, Merges wiederherzustellen anstatt sie zu ignorieren" +msgstr "(VERALTET) Versuche, Merges wiederherzustellen statt sie zu ignorieren" -#: builtin/rebase.c:1385 +#: builtin/rebase.c:1391 msgid "how to handle commits that become empty" msgstr "wie sollen Commits behandelt werden, die leer werden" -#: builtin/rebase.c:1392 +#: builtin/rebase.c:1398 msgid "move commits that begin with squash!/fixup! under -i" msgstr "bei -i Commits verschieben, die mit squash!/fixup! beginnen" -#: builtin/rebase.c:1399 +#: builtin/rebase.c:1405 msgid "add exec lines after each commit of the editable list" msgstr "exec-Zeilen nach jedem Commit der editierbaren Liste hinzufügen" -#: builtin/rebase.c:1403 +#: builtin/rebase.c:1409 msgid "allow rebasing commits with empty messages" msgstr "Rebase von Commits mit leerer Beschreibung erlauben" -#: builtin/rebase.c:1407 +#: builtin/rebase.c:1413 msgid "try to rebase merges instead of skipping them" -msgstr "" -"versuchen, Rebase mit Merges auszuführen, anstatt diese zu überspringen" +msgstr "versuchen, Rebase mit Merges auszuführen, statt diese zu überspringen" -#: builtin/rebase.c:1410 +#: builtin/rebase.c:1416 msgid "use 'merge-base --fork-point' to refine upstream" msgstr "" "'git merge-base --fork-point' benutzen, um Upstream-Branch zu bestimmen" -#: builtin/rebase.c:1412 +#: builtin/rebase.c:1418 msgid "use the given merge strategy" msgstr "angegebene Merge-Strategie verwenden" -#: builtin/rebase.c:1414 builtin/revert.c:115 +#: builtin/rebase.c:1420 builtin/revert.c:115 msgid "option" msgstr "Option" -#: builtin/rebase.c:1415 +#: builtin/rebase.c:1421 msgid "pass the argument through to the merge strategy" msgstr "Argument zur Merge-Strategie durchreichen" -#: builtin/rebase.c:1418 +#: builtin/rebase.c:1424 msgid "rebase all reachable commits up to the root(s)" msgstr "Rebase auf alle erreichbaren Commits bis zum Root-Commit ausführen" -#: builtin/rebase.c:1423 +#: builtin/rebase.c:1429 msgid "apply all changes, even those already present upstream" msgstr "" "alle Änderungen anwenden, auch jene, die bereits im Upstream-Branch " "vorhanden sind" -#: builtin/rebase.c:1440 +#: builtin/rebase.c:1446 msgid "" "the rebase.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." @@ -19848,44 +20238,44 @@ msgstr "" "Die Unterstützung für rebase.useBuiltin wurde entfernt!\n" "Siehe dessen Eintrag in 'git help config' für Details." -#: builtin/rebase.c:1446 +#: builtin/rebase.c:1452 msgid "It looks like 'git am' is in progress. Cannot rebase." msgstr "'git-am' scheint im Gange zu sein. Kann Rebase nicht durchführen." -#: builtin/rebase.c:1487 +#: builtin/rebase.c:1493 msgid "" "git rebase --preserve-merges is deprecated. Use --rebase-merges instead." msgstr "" "'git rebase --preserve-merges' ist veraltet. Benutzen Sie stattdessen '--" "rebase-merges'." -#: builtin/rebase.c:1492 +#: builtin/rebase.c:1498 msgid "cannot combine '--keep-base' with '--onto'" msgstr "'--keep-base' kann nicht mit '--onto' kombiniert werden" -#: builtin/rebase.c:1494 +#: builtin/rebase.c:1500 msgid "cannot combine '--keep-base' with '--root'" msgstr "'--keep-base' kann nicht mit '--root' kombiniert werden" -#: builtin/rebase.c:1498 +#: builtin/rebase.c:1504 msgid "cannot combine '--root' with '--fork-point'" msgstr "'--root' kann nicht mit '--fork-point' kombiniert werden" -#: builtin/rebase.c:1501 +#: builtin/rebase.c:1507 msgid "No rebase in progress?" msgstr "Kein Rebase im Gange?" -#: builtin/rebase.c:1505 +#: builtin/rebase.c:1511 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "" "Die --edit-todo Aktion kann nur während eines interaktiven Rebase verwendet " "werden." -#: builtin/rebase.c:1528 t/helper/test-fast-rebase.c:123 +#: builtin/rebase.c:1534 t/helper/test-fast-rebase.c:123 msgid "Cannot read HEAD" msgstr "Kann HEAD nicht lesen" -#: builtin/rebase.c:1540 +#: builtin/rebase.c:1546 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -19893,16 +20283,16 @@ msgstr "" "Sie müssen alle Merge-Konflikte editieren und diese dann\n" "mittels \"git add\" als aufgelöst markieren" -#: builtin/rebase.c:1559 +#: builtin/rebase.c:1565 msgid "could not discard worktree changes" msgstr "Konnte Änderungen im Arbeitsverzeichnis nicht verwerfen." -#: builtin/rebase.c:1578 +#: builtin/rebase.c:1584 #, c-format msgid "could not move back to %s" msgstr "Konnte nicht zu %s zurückgehen." -#: builtin/rebase.c:1624 +#: builtin/rebase.c:1630 #, c-format msgid "" "It seems that there is already a %s directory, and\n" @@ -19923,138 +20313,138 @@ msgstr "" "und führen Sie diesen Befehl nochmal aus. Es wird angehalten, falls noch\n" "etwas Schützenswertes vorhanden ist.\n" -#: builtin/rebase.c:1652 +#: builtin/rebase.c:1658 msgid "switch `C' expects a numerical value" msgstr "Schalter `C' erwartet einen numerischen Wert." -#: builtin/rebase.c:1694 +#: builtin/rebase.c:1700 #, c-format msgid "Unknown mode: %s" msgstr "Unbekannter Modus: %s" -#: builtin/rebase.c:1733 +#: builtin/rebase.c:1739 msgid "--strategy requires --merge or --interactive" msgstr "--strategy erfordert --merge oder --interactive" -#: builtin/rebase.c:1763 +#: builtin/rebase.c:1769 msgid "cannot combine apply options with merge options" msgstr "" "Optionen für \"am\" können nicht mit Optionen für \"merge\" kombiniert " "werden." -#: builtin/rebase.c:1776 +#: builtin/rebase.c:1782 #, c-format msgid "Unknown rebase backend: %s" msgstr "Unbekanntes Rebase-Backend: %s" -#: builtin/rebase.c:1806 +#: builtin/rebase.c:1812 msgid "--reschedule-failed-exec requires --exec or --interactive" msgstr "--reschedule-failed-exec erfordert --exec oder --interactive" -#: builtin/rebase.c:1826 +#: builtin/rebase.c:1832 msgid "cannot combine '--preserve-merges' with '--rebase-merges'" msgstr "" "'--preserve-merges' kann nicht mit '--rebase-merges' kombiniert werden." -#: builtin/rebase.c:1830 +#: builtin/rebase.c:1836 msgid "" "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'" msgstr "" "Fehler: '--preserve-merges' kann nicht mit '--reschedule-failed-exec' " "kombiniert werden." -#: builtin/rebase.c:1854 +#: builtin/rebase.c:1860 #, c-format msgid "invalid upstream '%s'" msgstr "Ungültiger Upstream '%s'" -#: builtin/rebase.c:1860 +#: builtin/rebase.c:1866 msgid "Could not create new root commit" msgstr "Konnte neuen Root-Commit nicht erstellen." -#: builtin/rebase.c:1886 +#: builtin/rebase.c:1892 #, c-format msgid "'%s': need exactly one merge base with branch" msgstr "'%s': benötige genau eine Merge-Basis mit dem Branch" -#: builtin/rebase.c:1889 +#: builtin/rebase.c:1895 #, c-format msgid "'%s': need exactly one merge base" msgstr "'%s': benötige genau eine Merge-Basis" -#: builtin/rebase.c:1897 +#: builtin/rebase.c:1903 #, c-format msgid "Does not point to a valid commit '%s'" msgstr "'%s' zeigt auf keinen gültigen Commit." -#: builtin/rebase.c:1923 +#: builtin/rebase.c:1931 #, c-format msgid "fatal: no such branch/commit '%s'" msgstr "fatal: Branch/Commit '%s' nicht gefunden" -#: builtin/rebase.c:1931 builtin/submodule--helper.c:40 +#: builtin/rebase.c:1939 builtin/submodule--helper.c:40 #: builtin/submodule--helper.c:2414 #, c-format msgid "No such ref: %s" msgstr "Referenz nicht gefunden: %s" -#: builtin/rebase.c:1942 +#: builtin/rebase.c:1950 msgid "Could not resolve HEAD to a revision" msgstr "Konnte HEAD zu keinem Commit auflösen." -#: builtin/rebase.c:1963 +#: builtin/rebase.c:1971 msgid "Please commit or stash them." msgstr "Bitte committen Sie die Änderungen oder benutzen Sie \"stash\"." -#: builtin/rebase.c:1999 +#: builtin/rebase.c:2007 #, c-format msgid "could not switch to %s" msgstr "Konnte nicht zu %s wechseln." -#: builtin/rebase.c:2010 +#: builtin/rebase.c:2018 msgid "HEAD is up to date." msgstr "HEAD ist aktuell." -#: builtin/rebase.c:2012 +#: builtin/rebase.c:2020 #, c-format msgid "Current branch %s is up to date.\n" msgstr "Aktueller Branch %s ist auf dem neuesten Stand.\n" -#: builtin/rebase.c:2020 +#: builtin/rebase.c:2028 msgid "HEAD is up to date, rebase forced." msgstr "HEAD ist aktuell, Rebase erzwungen." -#: builtin/rebase.c:2022 +#: builtin/rebase.c:2030 #, c-format msgid "Current branch %s is up to date, rebase forced.\n" msgstr "Aktueller Branch %s ist auf dem neuesten Stand, Rebase erzwungen.\n" -#: builtin/rebase.c:2030 +#: builtin/rebase.c:2038 msgid "The pre-rebase hook refused to rebase." msgstr "Der \"pre-rebase hook\" hat den Rebase zurückgewiesen." -#: builtin/rebase.c:2037 +#: builtin/rebase.c:2045 #, c-format msgid "Changes to %s:\n" msgstr "Änderungen zu %s:\n" -#: builtin/rebase.c:2040 +#: builtin/rebase.c:2048 #, c-format msgid "Changes from %s to %s:\n" msgstr "Änderungen von %s zu %s:\n" -#: builtin/rebase.c:2065 +#: builtin/rebase.c:2073 #, c-format msgid "First, rewinding head to replay your work on top of it...\n" msgstr "" "Zunächst wird der Branch zurückgespult, um Ihre Änderungen darauf neu " "anzuwenden...\n" -#: builtin/rebase.c:2074 +#: builtin/rebase.c:2082 msgid "Could not detach HEAD" msgstr "Konnte HEAD nicht loslösen." -#: builtin/rebase.c:2083 +#: builtin/rebase.c:2091 #, c-format msgid "Fast-forwarded %s to %s.\n" msgstr "Spule %s vor zu %s.\n" @@ -20151,36 +20541,36 @@ msgstr "git reflog exists <Referenz>" msgid "'%s' is not a valid timestamp" msgstr "'%s' ist kein gültiger Zeitstempel" -#: builtin/reflog.c:606 +#: builtin/reflog.c:609 #, c-format msgid "Marking reachable objects..." msgstr "Markiere nicht erreichbare Objekte..." -#: builtin/reflog.c:644 +#: builtin/reflog.c:647 #, c-format msgid "%s points nowhere!" msgstr "%s zeigt auf nichts!" -#: builtin/reflog.c:696 +#: builtin/reflog.c:699 msgid "no reflog specified to delete" msgstr "Kein Reflog zum Löschen angegeben." -#: builtin/reflog.c:705 +#: builtin/reflog.c:708 #, c-format msgid "not a reflog: %s" msgstr "Kein Reflog: %s" -#: builtin/reflog.c:710 +#: builtin/reflog.c:713 #, c-format msgid "no reflog for '%s'" msgstr "Kein Reflog für '%s'." -#: builtin/reflog.c:756 +#: builtin/reflog.c:759 #, c-format msgid "invalid ref format: %s" msgstr "Ungültiges Format für Referenzen: %s" -#: builtin/reflog.c:765 +#: builtin/reflog.c:768 msgid "git reflog [ show | expire | delete | exists ]" msgstr "git reflog [ show | expire | delete | exists ]" @@ -20313,19 +20703,18 @@ msgstr "" #: builtin/remote.c:186 msgid "specifying a master branch makes no sense with --mirror" msgstr "" -"Die Option --mirror kann nicht mit der Angabe eines Hauptbranches verwendet " -"werden." +"--mirror kann nicht mit der Angabe eines Hauptbranches verwendet werden" #: builtin/remote.c:188 msgid "specifying branches to track makes sense only with fetch mirrors" msgstr "" -"Die Angabe von zu folgenden Branches kann nur mit dem Anfordern von " -"Spiegelarchiven verwendet werden." +"die Angabe von zu folgenden Branches kann nur mit dem Anfordern von " +"Spiegelarchiven verwendet werden" #: builtin/remote.c:195 builtin/remote.c:700 #, c-format msgid "remote %s already exists." -msgstr "externes Repository %s existiert bereits" +msgstr "externes Repository %s existiert bereits." #: builtin/remote.c:240 #, c-format @@ -20364,7 +20753,7 @@ msgstr "" #: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:946 #, c-format msgid "No such remote: '%s'" -msgstr "Kein solches Remote-Repository: '%s'" +msgstr "Remote-Repository nicht gefunden: '%s'" #: builtin/remote.c:710 #, c-format @@ -20651,7 +21040,7 @@ msgstr "entferne veraltete Branches im Remote-Repository nach \"fetch\"" #: builtin/remote.c:1521 builtin/remote.c:1577 builtin/remote.c:1647 #, c-format msgid "No such remote '%s'" -msgstr "Kein solches Remote-Repository '%s'" +msgstr "Remote-Repository '%s' nicht gefunden" #: builtin/remote.c:1539 msgid "add branch" @@ -20688,8 +21077,7 @@ msgstr "URLs löschen" #: builtin/remote.c:1632 msgid "--add --delete doesn't make sense" -msgstr "" -"Die Optionen --add und --delete können nicht gemeinsam verwendet werden." +msgstr "--add und --delete können nicht gemeinsam verwendet werden" #: builtin/remote.c:1673 #, c-format @@ -20699,17 +21087,17 @@ msgstr "ungültiges altes URL Format: %s" #: builtin/remote.c:1681 #, c-format msgid "No such URL found: %s" -msgstr "Keine solche URL gefunden: %s" +msgstr "URL nicht gefunden: %s" #: builtin/remote.c:1683 msgid "Will not delete all non-push URLs" msgstr "Werde keine URLs entfernen, die nicht für \"push\" bestimmt sind" -#: builtin/repack.c:25 +#: builtin/repack.c:26 msgid "git repack [<options>]" msgstr "git repack [<Optionen>]" -#: builtin/repack.c:30 +#: builtin/repack.c:31 msgid "" "Incremental repacks are incompatible with bitmap indexes. Use\n" "--no-write-bitmap-index or disable the pack.writebitmaps configuration." @@ -20718,124 +21106,124 @@ msgstr "" "--no-write-bitmap-index oder deaktivieren Sie die pack.writebitmaps\n" "Konfiguration." -#: builtin/repack.c:197 +#: builtin/repack.c:198 msgid "could not start pack-objects to repack promisor objects" msgstr "" "Konnte 'pack-objects' für das Neupacken von Objekten aus partiell geklonten\n" "Remote-Repositories nicht starten." -#: builtin/repack.c:268 builtin/repack.c:447 +#: builtin/repack.c:270 builtin/repack.c:446 msgid "repack: Expecting full hex object ID lines only from pack-objects." msgstr "" "repack: Erwarte Zeilen mit vollständiger Hex-Objekt-ID nur von pack-objects." -#: builtin/repack.c:295 +#: builtin/repack.c:294 msgid "could not finish pack-objects to repack promisor objects" msgstr "" "Konnte 'pack-objects' für das Neupacken von Objekten aus partiell geklonten\n" "Remote-Repositories nicht abschließen." -#: builtin/repack.c:323 +#: builtin/repack.c:322 msgid "pack everything in a single pack" msgstr "alles in eine einzige Pack-Datei packen" -#: builtin/repack.c:325 +#: builtin/repack.c:324 msgid "same as -a, and turn unreachable objects loose" msgstr "genau wie -a, unerreichbare Objekte werden aber nicht gelöscht" -#: builtin/repack.c:328 +#: builtin/repack.c:327 msgid "remove redundant packs, and run git-prune-packed" msgstr "redundante Pakete entfernen und \"git-prune-packed\" ausführen" -#: builtin/repack.c:330 +#: builtin/repack.c:329 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "--no-reuse-delta an git-pack-objects übergeben" -#: builtin/repack.c:332 +#: builtin/repack.c:331 msgid "pass --no-reuse-object to git-pack-objects" msgstr "--no-reuse-object an git-pack-objects übergeben" -#: builtin/repack.c:334 +#: builtin/repack.c:333 msgid "do not run git-update-server-info" msgstr "git-update-server-info nicht ausführen" -#: builtin/repack.c:337 +#: builtin/repack.c:336 msgid "pass --local to git-pack-objects" msgstr "--local an git-pack-objects übergeben" -#: builtin/repack.c:339 +#: builtin/repack.c:338 msgid "write bitmap index" msgstr "Bitmap-Index schreiben" -#: builtin/repack.c:341 +#: builtin/repack.c:340 msgid "pass --delta-islands to git-pack-objects" msgstr "--delta-islands an git-pack-objects übergeben" -#: builtin/repack.c:342 +#: builtin/repack.c:341 msgid "approxidate" msgstr "Datumsangabe" -#: builtin/repack.c:343 +#: builtin/repack.c:342 msgid "with -A, do not loosen objects older than this" msgstr "mit -A, keine Objekte älter als dieses Datum löschen" -#: builtin/repack.c:345 +#: builtin/repack.c:344 msgid "with -a, repack unreachable objects" msgstr "mit -a, nicht erreichbare Objekte neu packen" -#: builtin/repack.c:347 +#: builtin/repack.c:346 msgid "size of the window used for delta compression" msgstr "Größe des Fensters für die Delta-Kompression" -#: builtin/repack.c:348 builtin/repack.c:354 +#: builtin/repack.c:347 builtin/repack.c:353 msgid "bytes" msgstr "Bytes" -#: builtin/repack.c:349 +#: builtin/repack.c:348 msgid "same as the above, but limit memory size instead of entries count" msgstr "" -"gleiches wie oben, aber die Speichergröße anstatt der\n" -"Anzahl der Einträge limitieren" +"gleiches wie oben, aber die Speichergröße statt der Anzahl der Einträge " +"limitieren" -#: builtin/repack.c:351 +#: builtin/repack.c:350 msgid "limits the maximum delta depth" msgstr "die maximale Delta-Tiefe limitieren" -#: builtin/repack.c:353 +#: builtin/repack.c:352 msgid "limits the maximum number of threads" msgstr "maximale Anzahl von Threads limitieren" -#: builtin/repack.c:355 +#: builtin/repack.c:354 msgid "maximum size of each packfile" msgstr "maximale Größe für jede Paketdatei" -#: builtin/repack.c:357 +#: builtin/repack.c:356 msgid "repack objects in packs marked with .keep" msgstr "" "Objekte umpacken, die sich in mit .keep markierten Pack-Dateien befinden" -#: builtin/repack.c:359 +#: builtin/repack.c:358 msgid "do not repack this pack" msgstr "dieses Paket nicht neu packen" -#: builtin/repack.c:369 +#: builtin/repack.c:368 msgid "cannot delete packs in a precious-objects repo" msgstr "kann Pack-Dateien in precious-objects Repository nicht löschen" -#: builtin/repack.c:373 +#: builtin/repack.c:372 msgid "--keep-unreachable and -A are incompatible" msgstr "--keep-unreachable und -A sind inkompatibel" -#: builtin/repack.c:456 +#: builtin/repack.c:455 msgid "Nothing new to pack." msgstr "Nichts Neues zum Packen." -#: builtin/repack.c:486 +#: builtin/repack.c:485 #, c-format msgid "missing required file: %s" msgstr "benötigte Datei fehlt: %s" -#: builtin/repack.c:488 +#: builtin/repack.c:487 #, c-format msgid "could not unlink: %s" msgstr "konnte nicht löschen: %s" @@ -20986,7 +21374,7 @@ msgid "" "instead of --graft" msgstr "" "Der ursprüngliche Commit '%s' enthält Merge-Tag '%s', der verworfen\n" -"wird; benutzen Sie --edit anstatt --graft" +"wird; benutzen Sie --edit statt --graft" #: builtin/replace.c:469 #, c-format @@ -21170,8 +21558,8 @@ msgstr "HEAD ist jetzt bei %s" msgid "Cannot do a %s reset in the middle of a merge." msgstr "Kann keinen '%s'-Reset durchführen, während ein Merge im Gange ist." -#: builtin/reset.c:295 builtin/stash.c:520 builtin/stash.c:594 -#: builtin/stash.c:618 +#: builtin/reset.c:295 builtin/stash.c:587 builtin/stash.c:661 +#: builtin/stash.c:685 msgid "be quiet, only report errors" msgstr "weniger Ausgaben, nur Fehler melden" @@ -21256,20 +21644,20 @@ msgstr "Konnte Index-Datei nicht zu Commit '%s' setzen." msgid "Could not write new index file." msgstr "Konnte neue Index-Datei nicht schreiben." -#: builtin/rev-list.c:499 +#: builtin/rev-list.c:534 msgid "cannot combine --exclude-promisor-objects and --missing" msgstr "" "--exclude-promisor-objects und --missing können nicht kombiniert werden." -#: builtin/rev-list.c:560 +#: builtin/rev-list.c:595 msgid "object filtering requires --objects" msgstr "Das Filtern von Objekten erfordert --objects." -#: builtin/rev-list.c:610 +#: builtin/rev-list.c:651 msgid "rev-list does not support display of notes" msgstr "rev-list unterstützt keine Anzeige von Notizen" -#: builtin/rev-list.c:615 +#: builtin/rev-list.c:656 msgid "marked counting is incompatible with --objects" msgstr "markiertes Zählen ist inkompatibel mit der Option --objects" @@ -21518,53 +21906,53 @@ msgstr "git shortlog [<Optionen>] [<Commitbereich>] [[--] <Pfad>...]" msgid "git log --pretty=short | git shortlog [<options>]" msgstr "git log --pretty=short | git shortlog [<Optionen>]" -#: builtin/shortlog.c:135 +#: builtin/shortlog.c:123 msgid "using multiple --group options with stdin is not supported" msgstr "mehrere Optionen --group mit Standard-Eingabe wird nicht unterstützt" -#: builtin/shortlog.c:145 +#: builtin/shortlog.c:133 msgid "using --group=trailer with stdin is not supported" msgstr "" "Nutzung von --group=trailer mit Standard-Eingabe wird nicht unterstützt" -#: builtin/shortlog.c:335 +#: builtin/shortlog.c:323 #, c-format msgid "unknown group type: %s" msgstr "unbekannter Gruppen-Typ: %s" -#: builtin/shortlog.c:363 -msgid "Group by committer rather than author" -msgstr "über Commit-Ersteller anstatt Autor gruppieren" +#: builtin/shortlog.c:351 +msgid "group by committer rather than author" +msgstr "nach Commit-Ersteller statt Autor gruppieren" -#: builtin/shortlog.c:366 +#: builtin/shortlog.c:354 msgid "sort output according to the number of commits per author" msgstr "die Ausgabe entsprechend der Anzahl von Commits pro Autor sortieren" -#: builtin/shortlog.c:368 -msgid "Suppress commit descriptions, only provides commit count" +#: builtin/shortlog.c:356 +msgid "suppress commit descriptions, only provides commit count" msgstr "Commit-Beschreibungen unterdrücken, nur Anzahl der Commits liefern" -#: builtin/shortlog.c:370 -msgid "Show the email address of each author" -msgstr "die E-Mail-Adresse von jedem Autor anzeigen" +#: builtin/shortlog.c:358 +msgid "show the email address of each author" +msgstr "die E-Mail-Adresse jedes Autors anzeigen" -#: builtin/shortlog.c:371 +#: builtin/shortlog.c:359 msgid "<w>[,<i1>[,<i2>]]" msgstr "<w>[,<i1>[,<i2>]]" -#: builtin/shortlog.c:372 -msgid "Linewrap output" +#: builtin/shortlog.c:360 +msgid "linewrap output" msgstr "Ausgabe mit Zeilenumbrüchen" -#: builtin/shortlog.c:374 +#: builtin/shortlog.c:362 msgid "field" msgstr "Feld" -#: builtin/shortlog.c:375 -msgid "Group by field" -msgstr "Gruppieren über Feld" +#: builtin/shortlog.c:363 +msgid "group by field" +msgstr "Gruppieren nach Feld" -#: builtin/shortlog.c:403 +#: builtin/shortlog.c:391 msgid "too many arguments given outside repository" msgstr "zu viele Argumente außerhalb des Repositories angegeben" @@ -21674,14 +22062,14 @@ msgstr "keine Branches angegeben, und HEAD ist ungültig" #: builtin/show-branch.c:738 msgid "--reflog option needs one branch name" -msgstr "Die Option --reflog benötigt einen Branchnamen." +msgstr "die Option --reflog benötigt einen Branchnamen" #: builtin/show-branch.c:741 #, c-format msgid "only %d entry can be shown at one time." msgid_plural "only %d entries can be shown at one time." -msgstr[0] "nur %d Eintrag kann zur selben Zeit angezeigt werden" -msgstr[1] "nur %d Einträge können zur selben Zeit angezeigt werden" +msgstr[0] "nur %d Eintrag kann zur selben Zeit angezeigt werden." +msgstr[1] "nur %d Einträge können zur selben Zeit angezeigt werden." #: builtin/show-branch.c:745 #, c-format @@ -21765,76 +22153,76 @@ msgstr "" msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>" msgstr "git sparse-checkout (init|list|set|add|reapply|disable) <Optionen>" -#: builtin/sparse-checkout.c:50 +#: builtin/sparse-checkout.c:45 msgid "git sparse-checkout list" msgstr "git sparse-checkout list" -#: builtin/sparse-checkout.c:76 +#: builtin/sparse-checkout.c:71 msgid "this worktree is not sparse (sparse-checkout file may not exist)" msgstr "" "dieses Arbeitsverzeichnis ist nicht partiell (Datei für partieller Checkout " "existiert eventuell nicht)" -#: builtin/sparse-checkout.c:228 +#: builtin/sparse-checkout.c:223 msgid "failed to create directory for sparse-checkout file" msgstr "" "Fehler beim Erstellen eines Verzeichnisses für Datei eines partiellen " "Checkouts" -#: builtin/sparse-checkout.c:269 +#: builtin/sparse-checkout.c:264 msgid "unable to upgrade repository format to enable worktreeConfig" msgstr "" "Repository-Format konnte nicht erweitert werden, um worktreeConfig zu " "aktivieren" -#: builtin/sparse-checkout.c:271 +#: builtin/sparse-checkout.c:266 msgid "failed to set extensions.worktreeConfig setting" msgstr "Einstellung für extensions.worktreeConfig konnte nicht gesetzt werden" -#: builtin/sparse-checkout.c:288 +#: builtin/sparse-checkout.c:283 msgid "git sparse-checkout init [--cone]" msgstr "git sparse-checkout init [--cone]" -#: builtin/sparse-checkout.c:307 +#: builtin/sparse-checkout.c:302 msgid "initialize the sparse-checkout in cone mode" msgstr "initialisiere den partiellen Checkout im Cone-Modus" -#: builtin/sparse-checkout.c:344 +#: builtin/sparse-checkout.c:339 #, c-format msgid "failed to open '%s'" msgstr "Fehler beim Öffnen von '%s'" -#: builtin/sparse-checkout.c:401 +#: builtin/sparse-checkout.c:396 #, c-format msgid "could not normalize path %s" msgstr "konnte Pfad '%s' nicht normalisieren" -#: builtin/sparse-checkout.c:413 +#: builtin/sparse-checkout.c:408 msgid "git sparse-checkout (set|add) (--stdin | <patterns>)" msgstr "git sparse-checkout (set|add) (--stdin | <Muster>)" -#: builtin/sparse-checkout.c:438 +#: builtin/sparse-checkout.c:433 #, c-format msgid "unable to unquote C-style string '%s'" msgstr "konnte Anführungszeichen von C-Style Zeichenkette '%s' nicht entfernen" -#: builtin/sparse-checkout.c:492 builtin/sparse-checkout.c:516 +#: builtin/sparse-checkout.c:487 builtin/sparse-checkout.c:511 msgid "unable to load existing sparse-checkout patterns" msgstr "konnte die existierenden Muster des partiellen Checkouts nicht laden" -#: builtin/sparse-checkout.c:561 +#: builtin/sparse-checkout.c:556 msgid "read patterns from standard in" msgstr "Muster von der Standard-Eingabe lesen" -#: builtin/sparse-checkout.c:576 +#: builtin/sparse-checkout.c:571 msgid "git sparse-checkout reapply" msgstr "git sparse-checkout reapply" -#: builtin/sparse-checkout.c:595 +#: builtin/sparse-checkout.c:590 msgid "git sparse-checkout disable" msgstr "git sparse-checkout disable" -#: builtin/sparse-checkout.c:623 +#: builtin/sparse-checkout.c:618 msgid "error while refreshing working directory" msgstr "Fehler während der Aktualisierung des Arbeitsverzeichnisses." @@ -21924,156 +22312,168 @@ msgid "%s is not a valid reference" msgstr "'%s' ist kein gültiger Referenzname." #: builtin/stash.c:225 -msgid "git stash clear with parameters is unimplemented" +msgid "git stash clear with arguments is unimplemented" msgstr "git stash clear mit Parametern ist nicht implementiert" -#: builtin/stash.c:404 +#: builtin/stash.c:429 +#, c-format +msgid "" +"WARNING: Untracked file in way of tracked file! Renaming\n" +" %s -> %s\n" +" to make room.\n" +msgstr "" +"WARNUNG: Nicht versionierte Datei im Weg von versionierter Datei! " +"Umbenennung\n" +" %s -> %s\n" +" um Platz zu schaffen.\n" + +#: builtin/stash.c:490 msgid "cannot apply a stash in the middle of a merge" msgstr "Kann Stash nicht anwenden, solange ein Merge im Gange ist" -#: builtin/stash.c:415 +#: builtin/stash.c:501 #, c-format msgid "could not generate diff %s^!." msgstr "Konnte keinen Diff erzeugen %s^!." -#: builtin/stash.c:422 +#: builtin/stash.c:508 msgid "conflicts in index. Try without --index." msgstr "Konflikte im Index. Versuchen Sie es ohne --index." -#: builtin/stash.c:428 +#: builtin/stash.c:514 msgid "could not save index tree" msgstr "Konnte Index-Verzeichnis nicht speichern" -#: builtin/stash.c:437 +#: builtin/stash.c:523 msgid "could not restore untracked files from stash" msgstr "Konnte unversionierte Dateien vom Stash nicht wiederherstellen." -#: builtin/stash.c:451 +#: builtin/stash.c:537 #, c-format msgid "Merging %s with %s" msgstr "Führe %s mit %s zusammen" -#: builtin/stash.c:461 +#: builtin/stash.c:547 msgid "Index was not unstashed." msgstr "Index wurde nicht aus dem Stash zurückgeladen." -#: builtin/stash.c:522 builtin/stash.c:620 +#: builtin/stash.c:589 builtin/stash.c:687 msgid "attempt to recreate the index" msgstr "Versuche Index wiederherzustellen." -#: builtin/stash.c:566 +#: builtin/stash.c:633 #, c-format msgid "Dropped %s (%s)" msgstr "%s (%s) gelöscht" -#: builtin/stash.c:569 +#: builtin/stash.c:636 #, c-format msgid "%s: Could not drop stash entry" msgstr "%s: Konnte Stash-Eintrag nicht löschen" -#: builtin/stash.c:582 +#: builtin/stash.c:649 #, c-format msgid "'%s' is not a stash reference" msgstr "'%s' ist keine Stash-Referenz" -#: builtin/stash.c:632 +#: builtin/stash.c:699 msgid "The stash entry is kept in case you need it again." msgstr "" "Der Stash-Eintrag wird für den Fall behalten, dass Sie diesen nochmal " "benötigen." -#: builtin/stash.c:655 +#: builtin/stash.c:722 msgid "No branch name specified" msgstr "Kein Branchname spezifiziert" -#: builtin/stash.c:799 builtin/stash.c:836 +#: builtin/stash.c:866 builtin/stash.c:903 #, c-format msgid "Cannot update %s with %s" msgstr "Kann nicht %s mit %s aktualisieren." -#: builtin/stash.c:817 builtin/stash.c:1471 builtin/stash.c:1536 +#: builtin/stash.c:884 builtin/stash.c:1538 builtin/stash.c:1603 msgid "stash message" msgstr "Stash-Beschreibung" -#: builtin/stash.c:827 +#: builtin/stash.c:894 msgid "\"git stash store\" requires one <commit> argument" msgstr "\"git stash store\" erwartet ein Argument <Commit>" -#: builtin/stash.c:1042 +#: builtin/stash.c:1109 msgid "No changes selected" msgstr "Keine Änderungen ausgewählt" -#: builtin/stash.c:1142 +#: builtin/stash.c:1209 msgid "You do not have the initial commit yet" msgstr "Sie haben bisher noch keinen initialen Commit" -#: builtin/stash.c:1169 +#: builtin/stash.c:1236 msgid "Cannot save the current index state" msgstr "Kann den aktuellen Zustand des Index nicht speichern" -#: builtin/stash.c:1178 +#: builtin/stash.c:1245 msgid "Cannot save the untracked files" msgstr "Kann die unversionierten Dateien nicht speichern" -#: builtin/stash.c:1189 builtin/stash.c:1198 +#: builtin/stash.c:1256 builtin/stash.c:1265 msgid "Cannot save the current worktree state" msgstr "Kann den aktuellen Zustand des Arbeitsverzeichnisses nicht speichern" -#: builtin/stash.c:1226 +#: builtin/stash.c:1293 msgid "Cannot record working tree state" msgstr "Kann Zustand des Arbeitsverzeichnisses nicht aufzeichnen" -#: builtin/stash.c:1275 +#: builtin/stash.c:1342 msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "" "Kann nicht gleichzeitig --patch und --include-untracked oder --all verwenden" -#: builtin/stash.c:1291 +#: builtin/stash.c:1358 msgid "Did you forget to 'git add'?" msgstr "Haben Sie vielleicht 'git add' vergessen?" -#: builtin/stash.c:1306 +#: builtin/stash.c:1373 msgid "No local changes to save" msgstr "Keine lokalen Änderungen zum Speichern" -#: builtin/stash.c:1313 +#: builtin/stash.c:1380 msgid "Cannot initialize stash" msgstr "Kann \"stash\" nicht initialisieren" -#: builtin/stash.c:1328 +#: builtin/stash.c:1395 msgid "Cannot save the current status" msgstr "Kann den aktuellen Status nicht speichern" -#: builtin/stash.c:1333 +#: builtin/stash.c:1400 #, c-format msgid "Saved working directory and index state %s" msgstr "Arbeitsverzeichnis und Index-Status %s gespeichert." -#: builtin/stash.c:1423 +#: builtin/stash.c:1490 msgid "Cannot remove worktree changes" msgstr "Kann Änderungen im Arbeitsverzeichnis nicht löschen" -#: builtin/stash.c:1462 builtin/stash.c:1527 +#: builtin/stash.c:1529 builtin/stash.c:1594 msgid "keep index" msgstr "behalte Index" -#: builtin/stash.c:1464 builtin/stash.c:1529 +#: builtin/stash.c:1531 builtin/stash.c:1596 msgid "stash in patch mode" msgstr "Stash in Patch-Modus" -#: builtin/stash.c:1465 builtin/stash.c:1530 +#: builtin/stash.c:1532 builtin/stash.c:1597 msgid "quiet mode" msgstr "weniger Ausgaben" -#: builtin/stash.c:1467 builtin/stash.c:1532 +#: builtin/stash.c:1534 builtin/stash.c:1599 msgid "include untracked files in stash" msgstr "unversionierte Dateien in Stash einbeziehen" -#: builtin/stash.c:1469 builtin/stash.c:1534 +#: builtin/stash.c:1536 builtin/stash.c:1601 msgid "include ignore files" msgstr "ignorierte Dateien einbeziehen" -#: builtin/stash.c:1569 +#: builtin/stash.c:1636 msgid "" "the stash.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." @@ -22154,13 +22554,12 @@ msgstr "" "." #: builtin/submodule--helper.c:565 -msgid "Suppress output of entering each submodule command" -msgstr "" -"Ausgaben beim Betreten und der Befehlsausführung in einem Submodul " -"unterdrücken" +msgid "suppress output of entering each submodule command" +msgstr "Ausgaben beim Betreten eines Submodul-Befehls unterdrücken" -#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1487 -msgid "Recurse into nested submodules" +#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:888 +#: builtin/submodule--helper.c:1487 +msgid "recurse into nested submodules" msgstr "Rekursion in verschachtelte Submodule durchführen" #: builtin/submodule--helper.c:572 @@ -22200,7 +22599,7 @@ msgstr "" "Konfiguration." #: builtin/submodule--helper.c:709 -msgid "Suppress output for initializing a submodule" +msgid "suppress output for initializing a submodule" msgstr "Ausgaben bei Initialisierung eines Submoduls unterdrücken" #: builtin/submodule--helper.c:714 @@ -22223,19 +22622,15 @@ msgid "failed to recurse into submodule '%s'" msgstr "Fehler bei Rekursion in Submodul '%s'." #: builtin/submodule--helper.c:886 builtin/submodule--helper.c:1623 -msgid "Suppress submodule status output" -msgstr "Ausgabe über Submodul-Status unterdrücken" +msgid "suppress submodule status output" +msgstr "Ausgabe des Submodul-Status unterdrücken" #: builtin/submodule--helper.c:887 msgid "" -"Use commit stored in the index instead of the one stored in the submodule " +"use commit stored in the index instead of the one stored in the submodule " "HEAD" msgstr "" -"Benutze den Commit, der im Index gespeichert ist, statt den im Submodul HEAD" - -#: builtin/submodule--helper.c:888 -msgid "recurse into nested submodules" -msgstr "Rekursion in verschachtelte Submodule durchführen" +"den Commit benutzen, der im Index gespeichert ist, statt den im Submodul HEAD" #: builtin/submodule--helper.c:893 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" @@ -22321,7 +22716,7 @@ msgid "failed to update remote for submodule '%s'" msgstr "Fehler beim Aktualisieren des Remote-Repositories für Submodul '%s'" #: builtin/submodule--helper.c:1485 -msgid "Suppress output of synchronizing submodule url" +msgid "suppress output of synchronizing submodule url" msgstr "Ausgaben bei der Synchronisierung der Submodul-URLs unterdrücken" #: builtin/submodule--helper.c:1492 @@ -22368,13 +22763,13 @@ msgid "Submodule '%s' (%s) unregistered for path '%s'\n" msgstr "Submodul '%s' (%s) für Pfad '%s' ausgetragen.\n" #: builtin/submodule--helper.c:1624 -msgid "Remove submodule working trees even if they contain local changes" +msgid "remove submodule working trees even if they contain local changes" msgstr "" "Arbeitsverzeichnisse von Submodulen löschen, auch wenn lokale Änderungen " "vorliegen" #: builtin/submodule--helper.c:1625 -msgid "Unregister all submodules" +msgid "unregister all submodules" msgstr "alle Submodule austragen" #: builtin/submodule--helper.c:1630 @@ -22527,11 +22922,10 @@ msgid "rebase, merge, checkout or none" msgstr "rebase, merge, checkout oder none" #: builtin/submodule--helper.c:2340 -msgid "Create a shallow clone truncated to the specified number of revisions" +msgid "create a shallow clone truncated to the specified number of revisions" msgstr "" -"Erstellung eines Klons mit unvollständiger Historie (shallow), abgeschnitten " -"bei\n" -"der angegebenen Anzahl von Commits." +"einen Klon mit unvollständiger Historie (shallow) erstellen, abgeschnitten " +"bei der angegebenen Anzahl von Commits" #: builtin/submodule--helper.c:2343 msgid "parallel jobs" @@ -22605,7 +22999,7 @@ msgstr "" "Arbeitsverzeichnis befindet." #: builtin/submodule--helper.c:2681 -msgid "Suppress output for setting url of a submodule" +msgid "suppress output for setting url of a submodule" msgstr "Ausgaben beim Setzen der URL eines Submoduls unterdrücken" #: builtin/submodule--helper.c:2685 @@ -22638,7 +23032,7 @@ msgstr "Option --branch oder --default erforderlich" msgid "--branch and --default are mutually exclusive" msgstr "--branch und --default schließen sich gegenseitig aus" -#: builtin/submodule--helper.c:2792 git.c:438 git.c:711 +#: builtin/submodule--helper.c:2792 git.c:441 git.c:714 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s unterstützt kein --super-prefix" @@ -22710,12 +23104,12 @@ msgstr "git tag -v [--format=<Format>] <Tagname>..." msgid "tag '%s' not found." msgstr "Tag '%s' nicht gefunden." -#: builtin/tag.c:105 +#: builtin/tag.c:124 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "Tag '%s' gelöscht (war %s)\n" -#: builtin/tag.c:135 +#: builtin/tag.c:159 #, c-format msgid "" "\n" @@ -22728,7 +23122,7 @@ msgstr "" " %s\n" "ein. Zeilen, die mit '%c' beginnen, werden ignoriert.\n" -#: builtin/tag.c:139 +#: builtin/tag.c:163 #, c-format msgid "" "\n" @@ -22743,15 +23137,11 @@ msgstr "" "ein. Zeilen, die mit '%c' beginnen, werden behalten; Sie dürfen diese\n" "selbst entfernen wenn Sie möchten.\n" -#: builtin/tag.c:198 +#: builtin/tag.c:230 msgid "unable to sign the tag" msgstr "konnte Tag nicht signieren" -#: builtin/tag.c:200 -msgid "unable to write tag file" -msgstr "konnte Tag-Datei nicht schreiben" - -#: builtin/tag.c:216 +#: builtin/tag.c:248 #, c-format msgid "" "You have created a nested tag. The object referred to by your new tag is\n" @@ -22765,138 +23155,134 @@ msgstr "" "\n" "\tgit tag -f %s %s^{}" -#: builtin/tag.c:232 +#: builtin/tag.c:264 msgid "bad object type." msgstr "ungültiger Objekt-Typ" -#: builtin/tag.c:285 +#: builtin/tag.c:317 msgid "no tag message?" msgstr "keine Tag-Beschreibung?" -#: builtin/tag.c:292 +#: builtin/tag.c:324 #, c-format msgid "The tag message has been left in %s\n" msgstr "Die Tag-Beschreibung wurde in %s gelassen\n" -#: builtin/tag.c:403 +#: builtin/tag.c:435 msgid "list tag names" msgstr "Tagnamen auflisten" -#: builtin/tag.c:405 +#: builtin/tag.c:437 msgid "print <n> lines of each tag message" msgstr "<n> Zeilen jeder Tag-Beschreibung anzeigen" -#: builtin/tag.c:407 +#: builtin/tag.c:439 msgid "delete tags" msgstr "Tags löschen" -#: builtin/tag.c:408 +#: builtin/tag.c:440 msgid "verify tags" msgstr "Tags überprüfen" -#: builtin/tag.c:410 +#: builtin/tag.c:442 msgid "Tag creation options" msgstr "Optionen für Erstellung von Tags" -#: builtin/tag.c:412 +#: builtin/tag.c:444 msgid "annotated tag, needs a message" msgstr "annotiertes Tag, benötigt eine Beschreibung" -#: builtin/tag.c:414 +#: builtin/tag.c:446 msgid "tag message" msgstr "Tag-Beschreibung" -#: builtin/tag.c:416 +#: builtin/tag.c:448 msgid "force edit of tag message" msgstr "Bearbeitung der Tag-Beschreibung erzwingen" -#: builtin/tag.c:417 +#: builtin/tag.c:449 msgid "annotated and GPG-signed tag" msgstr "annotiertes und GPG-signiertes Tag" -#: builtin/tag.c:420 +#: builtin/tag.c:452 msgid "use another key to sign the tag" msgstr "einen anderen Schlüssel verwenden, um das Tag zu signieren" -#: builtin/tag.c:421 +#: builtin/tag.c:453 msgid "replace the tag if exists" msgstr "das Tag ersetzen, wenn es existiert" -#: builtin/tag.c:422 builtin/update-ref.c:505 +#: builtin/tag.c:454 builtin/update-ref.c:505 msgid "create a reflog" msgstr "Reflog erstellen" -#: builtin/tag.c:424 +#: builtin/tag.c:456 msgid "Tag listing options" msgstr "Optionen für Auflistung der Tags" -#: builtin/tag.c:425 +#: builtin/tag.c:457 msgid "show tag list in columns" msgstr "Liste der Tags in Spalten anzeigen" -#: builtin/tag.c:426 builtin/tag.c:428 +#: builtin/tag.c:458 builtin/tag.c:460 msgid "print only tags that contain the commit" msgstr "nur Tags ausgeben, die diesen Commit beinhalten" -#: builtin/tag.c:427 builtin/tag.c:429 +#: builtin/tag.c:459 builtin/tag.c:461 msgid "print only tags that don't contain the commit" msgstr "nur Tags ausgeben, die diesen Commit nicht enthalten" -#: builtin/tag.c:430 +#: builtin/tag.c:462 msgid "print only tags that are merged" msgstr "nur Tags ausgeben, die gemerged wurden" -#: builtin/tag.c:431 +#: builtin/tag.c:463 msgid "print only tags that are not merged" msgstr "nur Tags ausgeben, die nicht gemerged wurden" -#: builtin/tag.c:435 +#: builtin/tag.c:467 msgid "print only tags of the object" msgstr "nur Tags von dem Objekt ausgeben" -#: builtin/tag.c:483 +#: builtin/tag.c:515 msgid "--column and -n are incompatible" msgstr "--column und -n sind inkompatibel" -#: builtin/tag.c:505 +#: builtin/tag.c:537 msgid "-n option is only allowed in list mode" -msgstr "Die Option -n ist nur im Listenmodus erlaubt." +msgstr "die Option -n ist nur im Listenmodus erlaubt" -#: builtin/tag.c:507 +#: builtin/tag.c:539 msgid "--contains option is only allowed in list mode" -msgstr "Die Option --contains ist nur im Listenmodus erlaubt." +msgstr "--contains ist nur im Listenmodus erlaubt" -#: builtin/tag.c:509 +#: builtin/tag.c:541 msgid "--no-contains option is only allowed in list mode" -msgstr "Die Option --no-contains ist nur im Listenmodus erlaubt." +msgstr "--no-contains ist nur im Listenmodus erlaubt" -#: builtin/tag.c:511 +#: builtin/tag.c:543 msgid "--points-at option is only allowed in list mode" -msgstr "Die Option --points-at ist nur im Listenmodus erlaubt." +msgstr "--points-at ist nur im Listenmodus erlaubt" -#: builtin/tag.c:513 +#: builtin/tag.c:545 msgid "--merged and --no-merged options are only allowed in list mode" -msgstr "Die Optionen --merged und --no-merged sind nur im Listenmodus erlaubt." +msgstr "--merged und --no-merged sind nur im Listenmodus erlaubt" -#: builtin/tag.c:524 +#: builtin/tag.c:556 msgid "only one -F or -m option is allowed." msgstr "nur eine -F oder -m Option ist erlaubt." -#: builtin/tag.c:543 -msgid "too many params" -msgstr "zu viele Parameter" - -#: builtin/tag.c:549 +#: builtin/tag.c:581 #, c-format msgid "'%s' is not a valid tag name." msgstr "'%s' ist kein gültiger Tagname." -#: builtin/tag.c:554 +#: builtin/tag.c:586 #, c-format msgid "tag '%s' already exists" msgstr "Tag '%s' existiert bereits" -#: builtin/tag.c:585 +#: builtin/tag.c:617 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "Tag '%s' aktualisiert (war %s)\n" @@ -23122,24 +23508,24 @@ msgid "" "core.splitIndex is set to false; remove or change it, if you really want to " "enable split index" msgstr "" -"core.splitIndex ist auf 'false' gesetzt. Entfernen oder ändern Sie dies,\n" -"wenn sie wirklich das Splitting des Index aktivieren möchten." +"core.splitIndex ist auf 'false' gesetzt; entfernen oder ändern Sie dies,\n" +"wenn sie wirklich das Splitting des Index aktivieren möchten" #: builtin/update-index.c:1182 msgid "" "core.splitIndex is set to true; remove or change it, if you really want to " "disable split index" msgstr "" -"core.splitIndex ist auf 'true' gesetzt. Entfernen oder ändern Sie dies,\n" -"wenn Sie wirklich das Splitting des Index deaktivieren möchten." +"core.splitIndex ist auf 'true' gesetzt; entfernen oder ändern Sie dies,\n" +"wenn Sie wirklich das Splitting des Index deaktivieren möchten" #: builtin/update-index.c:1194 msgid "" "core.untrackedCache is set to true; remove or change it, if you really want " "to disable the untracked cache" msgstr "" -"core.untrackedCache ist auf 'true' gesetzt. Entfernen oder ändern Sie dies,\n" -"wenn Sie wirklich den Cache für unversionierte Dateien deaktivieren möchten." +"core.untrackedCache ist auf 'true' gesetzt; entfernen oder ändern Sie dies,\n" +"wenn Sie wirklich den Cache für unversionierte Dateien deaktivieren möchten" #: builtin/update-index.c:1198 msgid "Untracked cache disabled" @@ -23150,9 +23536,9 @@ msgid "" "core.untrackedCache is set to false; remove or change it, if you really want " "to enable the untracked cache" msgstr "" -"core.untrackedCache ist auf 'false' gesetzt. Entfernen oder ändern Sie " +"core.untrackedCache ist auf 'false' gesetzt; entfernen oder ändern Sie " "dies,\n" -"wenn sie wirklich den Cache für unversionierte Dateien aktivieren möchten." +"wenn sie wirklich den Cache für unversionierte Dateien aktivieren möchten" #: builtin/update-index.c:1210 #, c-format @@ -23162,9 +23548,9 @@ msgstr "Cache für unversionierte Dateien für '%s' aktiviert" #: builtin/update-index.c:1218 msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor" msgstr "" -"core.fsmonitor nicht gesetzt. Setzen Sie es, wenn Sie den Dateisystem-" +"core.fsmonitor nicht gesetzt; setzen Sie es, wenn Sie den Dateisystem-" "Monitor\n" -"wirklich aktivieren möchten." +"wirklich aktivieren möchten" #: builtin/update-index.c:1222 msgid "fsmonitor enabled" @@ -23174,7 +23560,7 @@ msgstr "Dateisystem-Monitor aktiviert" msgid "" "core.fsmonitor is set; remove it if you really want to disable fsmonitor" msgstr "" -"core.fsmonitor ist gesetzt. Löschen Sie es, wenn Sie den Dateisystem-" +"core.fsmonitor ist gesetzt; löschen Sie es, wenn Sie den Dateisystem-" "Monitor\n" "wirklich deaktivieren möchten." @@ -23273,89 +23659,63 @@ msgstr "git verify-tag [-v | --verbose] [--format=<Format>] <Tag>..." msgid "print tag contents" msgstr "Tag-Inhalte ausgeben" -#: builtin/worktree.c:17 +#: builtin/worktree.c:18 msgid "git worktree add [<options>] <path> [<commit-ish>]" msgstr "git worktree add [<Optionen>] <Pfad> [<Commit-Angabe>]" -#: builtin/worktree.c:18 +#: builtin/worktree.c:19 msgid "git worktree list [<options>]" msgstr "git worktree list [<Optionen>]" -#: builtin/worktree.c:19 +#: builtin/worktree.c:20 msgid "git worktree lock [<options>] <path>" msgstr "git worktree lock [<Optionen>] <Pfad>" -#: builtin/worktree.c:20 +#: builtin/worktree.c:21 msgid "git worktree move <worktree> <new-path>" msgstr "git worktree move <Arbeitsverzeichnis> <neuer-Pfad>" -#: builtin/worktree.c:21 +#: builtin/worktree.c:22 msgid "git worktree prune [<options>]" msgstr "git worktree prune [<Optionen>]" -#: builtin/worktree.c:22 +#: builtin/worktree.c:23 msgid "git worktree remove [<options>] <worktree>" msgstr "git worktree remove [<Optionen>] <Arbeitsverzeichnis>" -#: builtin/worktree.c:23 +#: builtin/worktree.c:24 msgid "git worktree unlock <path>" msgstr "git worktree unlock <Pfad>" -#: builtin/worktree.c:60 builtin/worktree.c:973 +#: builtin/worktree.c:61 builtin/worktree.c:933 #, c-format msgid "failed to delete '%s'" msgstr "Fehler beim Löschen von '%s'" -#: builtin/worktree.c:85 -msgid "not a valid directory" -msgstr "kein gültiges Verzeichnis" - -#: builtin/worktree.c:91 -msgid "gitdir file does not exist" -msgstr "gitdir-Datei existiert nicht" - -#: builtin/worktree.c:96 builtin/worktree.c:105 -#, c-format -msgid "unable to read gitdir file (%s)" -msgstr "konnte gitdir-Datei nicht lesen (%s)" - -#: builtin/worktree.c:115 -#, c-format -msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)" -msgstr "read() zu kurz (%<PRIuMAX> Bytes erwartet, %<PRIuMAX> gelesen)" - -#: builtin/worktree.c:123 -msgid "invalid gitdir file" -msgstr "ungültige gitdir-Datei" - -#: builtin/worktree.c:131 -msgid "gitdir file points to non-existent location" -msgstr "gitdir-Datei verweist auf nicht existierenden Ort" - -#: builtin/worktree.c:146 +#: builtin/worktree.c:74 #, c-format msgid "Removing %s/%s: %s" msgstr "Entferne %s/%s: %s" -#: builtin/worktree.c:221 +#: builtin/worktree.c:149 msgid "report pruned working trees" msgstr "entfernte Arbeitsverzeichnisse ausgeben" -#: builtin/worktree.c:223 +#: builtin/worktree.c:151 msgid "expire working trees older than <time>" msgstr "Arbeitsverzeichnisse älter als <Zeit> verfallen lassen" -#: builtin/worktree.c:293 +#: builtin/worktree.c:221 #, c-format msgid "'%s' already exists" msgstr "'%s' existiert bereits" -#: builtin/worktree.c:302 +#: builtin/worktree.c:230 #, c-format msgid "unusable worktree destination '%s'" msgstr "nicht nutzbares Ziel des Arbeitsverzeichnisses '%s'" -#: builtin/worktree.c:307 +#: builtin/worktree.c:235 #, c-format msgid "" "'%s' is a missing but locked worktree;\n" @@ -23365,7 +23725,7 @@ msgstr "" "Benutzen Sie '%s -f -f' zum Überschreiben, oder 'unlock' und 'prune'\n" "oder 'remove' zum Löschen." -#: builtin/worktree.c:309 +#: builtin/worktree.c:237 #, c-format msgid "" "'%s' is a missing but already registered worktree;\n" @@ -23375,124 +23735,137 @@ msgstr "" "Benutzen Sie '%s -f' zum Überschreiben, oder 'prune' oder 'remove' zum\n" "Löschen." -#: builtin/worktree.c:360 +#: builtin/worktree.c:288 #, c-format msgid "could not create directory of '%s'" msgstr "Konnte Verzeichnis '%s' nicht erstellen." -#: builtin/worktree.c:494 builtin/worktree.c:500 +#: builtin/worktree.c:422 builtin/worktree.c:428 #, c-format msgid "Preparing worktree (new branch '%s')" msgstr "Bereite Arbeitsverzeichnis vor (neuer Branch '%s')" -#: builtin/worktree.c:496 +#: builtin/worktree.c:424 #, c-format msgid "Preparing worktree (resetting branch '%s'; was at %s)" msgstr "Bereite Arbeitsverzeichnis vor (setze Branch '%s' um; war bei %s)" -#: builtin/worktree.c:505 +#: builtin/worktree.c:433 #, c-format msgid "Preparing worktree (checking out '%s')" msgstr "Bereite Arbeitsverzeichnis vor (checke '%s' aus)" -#: builtin/worktree.c:511 +#: builtin/worktree.c:439 #, c-format msgid "Preparing worktree (detached HEAD %s)" msgstr "Bereite Arbeitsverzeichnis vor (losgelöster HEAD %s)" -#: builtin/worktree.c:552 +#: builtin/worktree.c:480 msgid "checkout <branch> even if already checked out in other worktree" msgstr "" "<Branch> auschecken, auch wenn dieser bereits in einem anderen " "Arbeitsverzeichnis ausgecheckt ist" -#: builtin/worktree.c:555 +#: builtin/worktree.c:483 msgid "create a new branch" msgstr "neuen Branch erstellen" -#: builtin/worktree.c:557 +#: builtin/worktree.c:485 msgid "create or reset a branch" msgstr "Branch erstellen oder umsetzen" -#: builtin/worktree.c:559 +#: builtin/worktree.c:487 msgid "populate the new working tree" msgstr "das neue Arbeitsverzeichnis auschecken" -#: builtin/worktree.c:560 +#: builtin/worktree.c:488 msgid "keep the new working tree locked" msgstr "das neue Arbeitsverzeichnis gesperrt lassen" -#: builtin/worktree.c:563 +#: builtin/worktree.c:491 msgid "set up tracking mode (see git-branch(1))" msgstr "Modus zum Folgen von Branches einstellen (siehe git-branch(1))" -#: builtin/worktree.c:566 +#: builtin/worktree.c:494 msgid "try to match the new branch name with a remote-tracking branch" msgstr "" "versuchen, eine Übereinstimmung des Branch-Namens mit einem\n" "Remote-Tracking-Branch herzustellen" -#: builtin/worktree.c:574 +#: builtin/worktree.c:502 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b, -B und --detach schließen sich gegenseitig aus" -#: builtin/worktree.c:635 +#: builtin/worktree.c:563 msgid "--[no-]track can only be used if a new branch is created" msgstr "" "--[no]-track kann nur verwendet werden, wenn ein neuer Branch erstellt wird." -#: builtin/worktree.c:758 +#: builtin/worktree.c:680 +msgid "show extended annotations and reasons, if available" +msgstr "erweiterte Anmerkungen und Gründe anzeigen, falls vorhanden" + +#: builtin/worktree.c:682 +msgid "add 'prunable' annotation to worktrees older than <time>" +msgstr "" +"'prunable'-Anmerkung zu Arbeitsverzeichnissen älter als <Zeit> hinzufügen" + +#: builtin/worktree.c:691 +msgid "--verbose and --porcelain are mutually exclusive" +msgstr "--verbose und --porcelain schließen sich gegenseitig aus" + +#: builtin/worktree.c:718 msgid "reason for locking" msgstr "Sperrgrund" -#: builtin/worktree.c:770 builtin/worktree.c:803 builtin/worktree.c:877 -#: builtin/worktree.c:1001 +#: builtin/worktree.c:730 builtin/worktree.c:763 builtin/worktree.c:837 +#: builtin/worktree.c:961 #, c-format msgid "'%s' is not a working tree" msgstr "'%s' ist kein Arbeitsverzeichnis" -#: builtin/worktree.c:772 builtin/worktree.c:805 +#: builtin/worktree.c:732 builtin/worktree.c:765 msgid "The main working tree cannot be locked or unlocked" msgstr "Das Hauptarbeitsverzeichnis kann nicht gesperrt oder entsperrt werden." -#: builtin/worktree.c:777 +#: builtin/worktree.c:737 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "'%s' ist bereits gesperrt, Grund: %s" -#: builtin/worktree.c:779 +#: builtin/worktree.c:739 #, c-format msgid "'%s' is already locked" msgstr "'%s' ist bereits gesperrt" -#: builtin/worktree.c:807 +#: builtin/worktree.c:767 #, c-format msgid "'%s' is not locked" msgstr "'%s' ist nicht gesperrt" -#: builtin/worktree.c:848 +#: builtin/worktree.c:808 msgid "working trees containing submodules cannot be moved or removed" msgstr "" "Arbeitsverzeichnisse, die Submodule enthalten, können nicht verschoben oder\n" "entfernt werden." -#: builtin/worktree.c:856 +#: builtin/worktree.c:816 msgid "force move even if worktree is dirty or locked" msgstr "" "Verschieben erzwingen, auch wenn das Arbeitsverzeichnis geändert oder " "gesperrt ist" -#: builtin/worktree.c:879 builtin/worktree.c:1003 +#: builtin/worktree.c:839 builtin/worktree.c:963 #, c-format msgid "'%s' is a main working tree" msgstr "'%s' ist ein Hauptarbeitsverzeichnis" -#: builtin/worktree.c:884 +#: builtin/worktree.c:844 #, c-format msgid "could not figure out destination name from '%s'" msgstr "Konnte Zielname aus '%s' nicht bestimmen." -#: builtin/worktree.c:897 +#: builtin/worktree.c:857 #, c-format msgid "" "cannot move a locked working tree, lock reason: %s\n" @@ -23502,7 +23875,7 @@ msgstr "" "Benutzen Sie 'move -f -f' zum Überschreiben oder entsperren Sie zuerst\n" "das Arbeitsverzeichnis." -#: builtin/worktree.c:899 +#: builtin/worktree.c:859 msgid "" "cannot move a locked working tree;\n" "use 'move -f -f' to override or unlock first" @@ -23511,40 +23884,40 @@ msgstr "" "Benutzen Sie 'move -f -f' zum Überschreiben oder entsperren Sie zuerst\n" "das Arbeitsverzeichnis." -#: builtin/worktree.c:902 +#: builtin/worktree.c:862 #, c-format msgid "validation failed, cannot move working tree: %s" msgstr "Validierung fehlgeschlagen, kann Arbeitszeichnis nicht verschieben: %s" -#: builtin/worktree.c:907 +#: builtin/worktree.c:867 #, c-format msgid "failed to move '%s' to '%s'" msgstr "Fehler beim Verschieben von '%s' nach '%s'" -#: builtin/worktree.c:953 +#: builtin/worktree.c:913 #, c-format msgid "failed to run 'git status' on '%s'" msgstr "Fehler beim Ausführen von 'git status' auf '%s'" -#: builtin/worktree.c:957 +#: builtin/worktree.c:917 #, c-format msgid "'%s' contains modified or untracked files, use --force to delete it" msgstr "" "'%s' enthält geänderte oder nicht versionierte Dateien, benutzen Sie --force " "zum Löschen" -#: builtin/worktree.c:962 +#: builtin/worktree.c:922 #, c-format msgid "failed to run 'git status' on '%s', code %d" msgstr "Fehler beim Ausführen von 'git status' auf '%s'. Code: %d" -#: builtin/worktree.c:985 +#: builtin/worktree.c:945 msgid "force removal even if worktree is dirty or locked" msgstr "" "Löschen erzwingen, auch wenn das Arbeitsverzeichnis geändert oder gesperrt " "ist" -#: builtin/worktree.c:1008 +#: builtin/worktree.c:968 #, c-format msgid "" "cannot remove a locked working tree, lock reason: %s\n" @@ -23554,7 +23927,7 @@ msgstr "" "Benutzen Sie 'remove -f -f' zum Überschreiben oder entsperren Sie zuerst\n" "das Arbeitsverzeichnis." -#: builtin/worktree.c:1010 +#: builtin/worktree.c:970 msgid "" "cannot remove a locked working tree;\n" "use 'remove -f -f' to override or unlock first" @@ -23563,17 +23936,17 @@ msgstr "" "Benutzen Sie 'remove -f -f' zum Überschreiben oder entsperren Sie zuerst\n" "das Arbeitsverzeichnis." -#: builtin/worktree.c:1013 +#: builtin/worktree.c:973 #, c-format msgid "validation failed, cannot remove working tree: %s" msgstr "Validierung fehlgeschlagen, kann Arbeitsverzeichnis nicht löschen: %s" -#: builtin/worktree.c:1037 +#: builtin/worktree.c:997 #, c-format msgid "repair: %s: %s" msgstr "repariere: %s: %s" -#: builtin/worktree.c:1040 +#: builtin/worktree.c:1000 #, c-format msgid "error: %s: %s" msgstr "Fehler: %s: %s" @@ -23594,15 +23967,23 @@ msgstr "das Tree-Objekt für ein Unterverzeichnis <Präfix> schreiben" msgid "only useful for debugging" msgstr "nur nützlich für Fehlersuche" -#: http-fetch.c:114 +#: http-fetch.c:118 #, c-format msgid "argument to --packfile must be a valid hash (got '%s')" msgstr "Argument für --packfile muss ein gültiger Hash sein ('%s' erhalten)" -#: http-fetch.c:122 +#: http-fetch.c:128 msgid "not a git repository" msgstr "kein Git-Repository" +#: http-fetch.c:134 +msgid "--packfile requires --index-pack-args" +msgstr "--packfile benötigt --index-pack-args" + +#: http-fetch.c:143 +msgid "--index-pack-args can only be used with --packfile" +msgstr "--index-pack-args kann nur mit --packfile benutzt werden" + #: t/helper/test-fast-rebase.c:141 msgid "unhandled options" msgstr "unbehandelte Optionen" @@ -23635,6 +24016,7 @@ msgid "" " [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--" "bare]\n" " [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n" +" [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n" " <command> [<args>]" msgstr "" "git [--version] [--help] [-C <Pfad>] [-c <Name>=<Wert>]\n" @@ -23642,9 +24024,10 @@ msgstr "" " [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--" "bare]\n" " [--git-dir=<Pfad>] [--work-tree=<Pfad>] [--namespace=<Name>]\n" +" [--super-prefix=<Pfad>] [--config-env=<Name>=<Variable>]\n" " <Befehl> [<Argumente>]" -#: git.c:35 +#: git.c:36 msgid "" "'git help -a' and 'git help -g' list available subcommands and some\n" "concept guides. See 'git help <command>' or 'git help <concept>'\n" @@ -23657,47 +24040,47 @@ msgstr "" "Konzept zu erfahren.\n" "Benutzen Sie 'git help git' für einen Überblick des Systems." -#: git.c:187 +#: git.c:188 #, c-format msgid "no directory given for --git-dir\n" msgstr "Kein Verzeichnis für --git-dir angegeben.\n" -#: git.c:201 +#: git.c:202 #, c-format msgid "no namespace given for --namespace\n" msgstr "Kein Namespace für --namespace angegeben.\n" -#: git.c:215 +#: git.c:216 #, c-format msgid "no directory given for --work-tree\n" msgstr "Kein Verzeichnis für --work-tree angegeben.\n" -#: git.c:229 +#: git.c:230 #, c-format msgid "no prefix given for --super-prefix\n" msgstr "Kein Präfix für --super-prefix angegeben.\n" -#: git.c:251 +#: git.c:252 #, c-format msgid "-c expects a configuration string\n" msgstr "-c erwartet einen Konfigurationsstring.\n" -#: git.c:289 +#: git.c:292 #, c-format msgid "no directory given for -C\n" msgstr "Kein Verzeichnis für -C angegeben.\n" -#: git.c:315 +#: git.c:318 #, c-format msgid "unknown option: %s\n" msgstr "Unbekannte Option: %s\n" -#: git.c:364 +#: git.c:367 #, c-format msgid "while expanding alias '%s': '%s'" msgstr "beim Erweitern von Alias '%s': '%s'" -#: git.c:373 +#: git.c:376 #, c-format msgid "" "alias '%s' changes environment variables.\n" @@ -23706,39 +24089,39 @@ msgstr "" "Alias '%s' ändert Umgebungsvariablen.\n" "Sie können '!git' im Alias benutzen, um dies zu tun." -#: git.c:380 +#: git.c:383 #, c-format msgid "empty alias for %s" msgstr "leerer Alias für %s" -#: git.c:383 +#: git.c:386 #, c-format msgid "recursive alias: %s" msgstr "rekursiver Alias: %s" -#: git.c:465 +#: git.c:468 msgid "write failure on standard output" msgstr "Fehler beim Schreiben in die Standard-Ausgabe." -#: git.c:467 +#: git.c:470 msgid "unknown write failure on standard output" msgstr "Unbekannter Fehler beim Schreiben in die Standard-Ausgabe." -#: git.c:469 +#: git.c:472 msgid "close failed on standard output" msgstr "Fehler beim Schließen der Standard-Ausgabe." -#: git.c:820 +#: git.c:823 #, c-format msgid "alias loop detected: expansion of '%s' does not terminate:%s" msgstr "Alias-Schleife erkannt: Erweiterung von '%s' schließt nicht ab:%s" -#: git.c:870 +#: git.c:873 #, c-format msgid "cannot handle %s as a builtin" msgstr "Kann %s nicht als eingebauten Befehl behandeln." -#: git.c:883 +#: git.c:886 #, c-format msgid "" "usage: %s\n" @@ -23747,12 +24130,12 @@ msgstr "" "Verwendung: %s\n" "\n" -#: git.c:903 +#: git.c:906 #, c-format msgid "expansion of alias '%s' failed; '%s' is not a git command\n" -msgstr "Erweiterung von Alias '%s' fehlgeschlagen; '%s' ist kein Git-Befehl.\n" +msgstr "Erweiterung von Alias '%s' fehlgeschlagen; '%s' ist kein Git-Befehl\n" -#: git.c:915 +#: git.c:918 #, c-format msgid "failed to run command '%s': %s\n" msgstr "Fehler beim Ausführen von Befehl '%s': %s\n" @@ -23819,17 +24202,17 @@ msgstr "%sinfo/refs nicht gültig: Ist das ein Git-Repository?" #: remote-curl.c:408 msgid "invalid server response; expected service, got flush packet" -msgstr "Ungültige Antwort des Servers. Service erwartet, Flush-Paket bekommen" +msgstr "ungültige Antwort des Servers; Service erwartet, Flush-Paket bekommen" #: remote-curl.c:439 #, c-format msgid "invalid server response; got '%s'" -msgstr "Ungültige Serverantwort; '%s' bekommen" +msgstr "ungültige Serverantwort; '%s' bekommen" #: remote-curl.c:499 #, c-format msgid "repository '%s' not found" -msgstr "Repository '%s' nicht gefunden." +msgstr "Repository '%s' nicht gefunden" #: remote-curl.c:503 #, c-format @@ -23992,11 +24375,11 @@ msgid "" msgstr "" "Mit der Option --pathspec-from-file sind Pfade durch NUL-Zeichen getrennt" -#: ref-filter.h:96 +#: ref-filter.h:99 msgid "key" msgstr "Schüssel" -#: ref-filter.h:96 +#: ref-filter.h:99 msgid "field name to sort on" msgstr "sortiere nach diesem Feld" @@ -24005,14 +24388,6 @@ msgid "update the index with reused conflict resolution if possible" msgstr "" "Index, wenn möglich, mit wiederverwendeter Konfliktauflösung aktualisieren" -#: wt-status.h:80 -msgid "HEAD detached at " -msgstr "HEAD losgelöst bei " - -#: wt-status.h:81 -msgid "HEAD detached from " -msgstr "HEAD losgelöst von " - #: command-list.h:50 msgid "Add file contents to the index" msgstr "Dateiinhalte zum Commit vormerken" @@ -24365,8 +24740,8 @@ msgid "Write and verify multi-pack-indexes" msgstr "multi-pack-indexes schreiben und überprüfen" #: command-list.h:132 -msgid "Creates a tag object" -msgstr "ein Tag-Objekt erstellen" +msgid "Creates a tag object with extra validation" +msgstr "Erstellt ein Tag-Objekt mit zusätzlicher Validierung" #: command-list.h:133 msgid "Build a tree-object from ls-tree formatted text" @@ -24683,69 +25058,55 @@ msgid "Specifies intentionally untracked files to ignore" msgstr "Spezifikation von bewusst ignorierten, unversionierten Dateien" #: command-list.h:209 +msgid "Map author/committer names and/or E-Mail addresses" +msgstr "Autor/Commit-Ersteller und/oder E-Mail-Adressen zuordnen" + +#: command-list.h:210 msgid "Defining submodule properties" msgstr "Definition von Submodul-Eigenschaften" -#: command-list.h:210 +#: command-list.h:211 msgid "Git namespaces" msgstr "Git Namensbereiche" -#: command-list.h:211 +#: command-list.h:212 msgid "Helper programs to interact with remote repositories" msgstr "Hilfsprogramme zur Interaktion mit Remote-Repositories" -#: command-list.h:212 +#: command-list.h:213 msgid "Git Repository Layout" msgstr "Git Repository Aufbau" -#: command-list.h:213 +#: command-list.h:214 msgid "Specifying revisions and ranges for Git" msgstr "Spezifikation von Commits und Bereichen für Git" -#: command-list.h:214 +#: command-list.h:215 msgid "Mounting one repository inside another" msgstr "Einbinden eines Repositories in ein anderes" -#: command-list.h:215 +#: command-list.h:216 msgid "A tutorial introduction to Git: part two" msgstr "eine einführende Anleitung zu Git: Teil zwei" -#: command-list.h:216 +#: command-list.h:217 msgid "A tutorial introduction to Git" msgstr "eine einführende Anleitung zu Git" -#: command-list.h:217 +#: command-list.h:218 msgid "An overview of recommended workflows with Git" msgstr "Eine Übersicht über empfohlene Arbeitsabläufe mit Git" -#: git-bisect.sh:48 -#, sh-format -msgid "Bad rev input: $arg" -msgstr "Ungültige Referenz-Eingabe: $arg" - -#: git-bisect.sh:82 -msgid "No logfile given" -msgstr "Keine Log-Datei gegeben" - -#: git-bisect.sh:83 -#, sh-format -msgid "cannot read $file for replaying" -msgstr "kann $file nicht für das Abspielen lesen" - -#: git-bisect.sh:105 -msgid "?? what are you talking about?" -msgstr "?? Was reden Sie da?" - -#: git-bisect.sh:115 +#: git-bisect.sh:68 msgid "bisect run failed: no command provided." msgstr "'bisect run' fehlgeschlagen: kein Befehl angegeben." -#: git-bisect.sh:120 +#: git-bisect.sh:73 #, sh-format msgid "running $command" msgstr "führe $command aus" -#: git-bisect.sh:127 +#: git-bisect.sh:80 #, sh-format msgid "" "bisect run failed:\n" @@ -24754,11 +25115,11 @@ msgstr "" "'bisect run' fehlgeschlagen:\n" "Exit-Code $res von '$command' ist < 0 oder >= 128" -#: git-bisect.sh:152 +#: git-bisect.sh:105 msgid "bisect run cannot continue any more" msgstr "'bisect run' kann nicht mehr fortgesetzt werden" -#: git-bisect.sh:158 +#: git-bisect.sh:111 #, sh-format msgid "" "bisect run failed:\n" @@ -24767,14 +25128,10 @@ msgstr "" "'bisect run' fehlgeschlagen:\n" "'bisect-state $state' wurde mit Fehlerwert $res beendet" -#: git-bisect.sh:165 +#: git-bisect.sh:118 msgid "bisect run success" msgstr "'bisect run' erfolgreich ausgeführt" -#: git-bisect.sh:173 -msgid "We are not bisecting." -msgstr "Keine binäre Suche im Gange." - #: git-merge-octopus.sh:46 msgid "" "Error: Your local changes to the following files would be overwritten by " @@ -25842,7 +26199,7 @@ msgstr "" "\n" " * \"./%s\" angeben, wenn Sie eine Datei meinen, oder\n" " * die Option --format-patch angeben, wenn Sie einen Commit-Bereich " -"meinen\n" +"meinen.\n" #: git-send-email.perl:678 #, perl-format @@ -25856,7 +26213,7 @@ msgid "" "warning: no patches were sent\n" msgstr "" "fatal: %s: %s\n" -"Warnung: Es wurden keine Patches versendet.\n" +"Warnung: Es wurden keine Patches versendet\n" #: git-send-email.perl:713 msgid "" @@ -25865,7 +26222,7 @@ msgid "" "\n" msgstr "" "\n" -"keine Patch-Dateien angegeben!\n" +"Keine Patch-Dateien angegeben!\n" "\n" #: git-send-email.perl:726 @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2020-07-10 09:53+0800\n" -"PO-Revision-Date: 2020-07-26 10:11-0500\n" +"POT-Creation-Date: 2021-03-04 22:41+0800\n" +"PO-Revision-Date: 2021-03-07 18:29-0500\n" "Last-Translator: christopher.diaz.riv@gmail.com\n" "Language-Team: CodeLabora <codelabora@gmail.com>\n" "Language: es\n" @@ -16,235 +16,235 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 2.3\n" +"X-Generator: Poedit 2.4.1\n" -#: add-interactive.c:368 +#: add-interactive.c:376 #, c-format msgid "Huh (%s)?" msgstr "¿Ahh (%s)?" -#: add-interactive.c:521 add-interactive.c:822 reset.c:65 sequencer.c:3142 -#: sequencer.c:3581 sequencer.c:3723 builtin/rebase.c:1518 -#: builtin/rebase.c:1919 +#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3292 +#: sequencer.c:3743 sequencer.c:3898 builtin/rebase.c:1538 +#: builtin/rebase.c:1963 msgid "could not read index" msgstr "no se pudo leer índice" -#: add-interactive.c:576 git-add--interactive.perl:269 +#: add-interactive.c:584 git-add--interactive.perl:269 #: git-add--interactive.perl:294 msgid "binary" msgstr "binario" -#: add-interactive.c:634 git-add--interactive.perl:278 +#: add-interactive.c:642 git-add--interactive.perl:278 #: git-add--interactive.perl:332 msgid "nothing" msgstr "nada" -#: add-interactive.c:635 git-add--interactive.perl:314 +#: add-interactive.c:643 git-add--interactive.perl:314 #: git-add--interactive.perl:329 msgid "unchanged" msgstr "sin cambios" -#: add-interactive.c:672 git-add--interactive.perl:643 +#: add-interactive.c:680 git-add--interactive.perl:641 msgid "Update" msgstr "Actualizar" -#: add-interactive.c:689 add-interactive.c:877 +#: add-interactive.c:697 add-interactive.c:885 #, c-format msgid "could not stage '%s'" msgstr "no se pudo poner en stage '%s'" -#: add-interactive.c:695 add-interactive.c:884 reset.c:89 sequencer.c:3336 +#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3486 msgid "could not write index" msgstr "no se pudo escribir índice" -#: add-interactive.c:698 git-add--interactive.perl:628 +#: add-interactive.c:706 git-add--interactive.perl:626 #, c-format, perl-format msgid "updated %d path\n" msgid_plural "updated %d paths\n" msgstr[0] "actualizada %d ruta\n" msgstr[1] "actualizadas %d rutas\n" -#: add-interactive.c:716 git-add--interactive.perl:678 +#: add-interactive.c:724 git-add--interactive.perl:676 #, c-format, perl-format msgid "note: %s is untracked now.\n" msgstr "nota: %s no es rastreado ahora.\n" -#: add-interactive.c:721 apply.c:4110 builtin/checkout.c:294 +#: add-interactive.c:729 apply.c:4125 builtin/checkout.c:295 #: builtin/reset.c:145 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "make_cache_entry falló para la ruta '%s'" -#: add-interactive.c:751 git-add--interactive.perl:655 +#: add-interactive.c:759 git-add--interactive.perl:653 msgid "Revert" msgstr "Revertir" -#: add-interactive.c:767 +#: add-interactive.c:775 msgid "Could not parse HEAD^{tree}" -msgstr "no se pudo analizar HEAD^{tree}" +msgstr "No se pudo analizar HEAD^{tree}" -#: add-interactive.c:805 git-add--interactive.perl:631 +#: add-interactive.c:813 git-add--interactive.perl:629 #, c-format, perl-format msgid "reverted %d path\n" msgid_plural "reverted %d paths\n" msgstr[0] "revertida %d ruta\n" msgstr[1] "revertidas %d rutas\n" -#: add-interactive.c:856 git-add--interactive.perl:695 +#: add-interactive.c:864 git-add--interactive.perl:693 #, c-format msgid "No untracked files.\n" msgstr "No hay archivos sin rastrear.\n" -#: add-interactive.c:860 git-add--interactive.perl:689 +#: add-interactive.c:868 git-add--interactive.perl:687 msgid "Add untracked" msgstr "Agregar no rastreados" -#: add-interactive.c:887 git-add--interactive.perl:625 +#: add-interactive.c:895 git-add--interactive.perl:623 #, c-format, perl-format msgid "added %d path\n" msgid_plural "added %d paths\n" msgstr[0] "agregada %d ruta\n" msgstr[1] "agregadas %d rutas\n" -#: add-interactive.c:917 +#: add-interactive.c:925 #, c-format msgid "ignoring unmerged: %s" msgstr "ignorando lo no fusionado: %s" -#: add-interactive.c:929 add-patch.c:1691 git-add--interactive.perl:1368 +#: add-interactive.c:937 add-patch.c:1751 git-add--interactive.perl:1369 #, c-format msgid "Only binary files changed.\n" msgstr "Solo cambiaron archivos binarios.\n" -#: add-interactive.c:931 add-patch.c:1689 git-add--interactive.perl:1370 +#: add-interactive.c:939 add-patch.c:1749 git-add--interactive.perl:1371 #, c-format msgid "No changes.\n" msgstr "Sin cambios.\n" -#: add-interactive.c:935 git-add--interactive.perl:1378 +#: add-interactive.c:943 git-add--interactive.perl:1379 msgid "Patch update" msgstr "Actualización del parche" -#: add-interactive.c:974 git-add--interactive.perl:1771 +#: add-interactive.c:982 git-add--interactive.perl:1792 msgid "Review diff" msgstr "Revisión de diff" -#: add-interactive.c:1002 +#: add-interactive.c:1010 msgid "show paths with changes" msgstr "mostrar rutas con cambios" -#: add-interactive.c:1004 +#: add-interactive.c:1012 msgid "add working tree state to the staged set of changes" msgstr "agregar estado del árbol de trabajo al conjunto de cambios en stage" -#: add-interactive.c:1006 +#: add-interactive.c:1014 msgid "revert staged set of changes back to the HEAD version" msgstr "revertir conjunto de cambios en stage a la versión de HEAD" -#: add-interactive.c:1008 +#: add-interactive.c:1016 msgid "pick hunks and update selectively" msgstr "elegir hunks y actualizar de forma selectiva" -#: add-interactive.c:1010 +#: add-interactive.c:1018 msgid "view diff between HEAD and index" msgstr "ver diff entre HEAD e index" -#: add-interactive.c:1012 +#: add-interactive.c:1020 msgid "add contents of untracked files to the staged set of changes" msgstr "" "agregar contenidos de archivos sin rastrear al conjunto de cambios de stage" -#: add-interactive.c:1020 add-interactive.c:1069 +#: add-interactive.c:1028 add-interactive.c:1077 msgid "Prompt help:" msgstr "Mostrar ayuda:" -#: add-interactive.c:1022 +#: add-interactive.c:1030 msgid "select a single item" msgstr "selecciona un único objeto" -#: add-interactive.c:1024 +#: add-interactive.c:1032 msgid "select a range of items" msgstr "selecciona un rango de objetos" -#: add-interactive.c:1026 +#: add-interactive.c:1034 msgid "select multiple ranges" msgstr "selecciona multiples rangos" -#: add-interactive.c:1028 add-interactive.c:1073 +#: add-interactive.c:1036 add-interactive.c:1081 msgid "select item based on unique prefix" msgstr "seleccionar objeto basado en prefijo único" -#: add-interactive.c:1030 +#: add-interactive.c:1038 msgid "unselect specified items" msgstr "quitar objetos especificados" -#: add-interactive.c:1032 +#: add-interactive.c:1040 msgid "choose all items" msgstr "escoger todos los objetos" -#: add-interactive.c:1034 +#: add-interactive.c:1042 msgid "(empty) finish selecting" msgstr "(vacío) finalizar selección" -#: add-interactive.c:1071 +#: add-interactive.c:1079 msgid "select a numbered item" msgstr "selecciona un objeto numerado" -#: add-interactive.c:1075 +#: add-interactive.c:1083 msgid "(empty) select nothing" msgstr "(vacío) selecciona nada" -#: add-interactive.c:1083 builtin/clean.c:816 git-add--interactive.perl:1868 +#: add-interactive.c:1091 builtin/clean.c:816 git-add--interactive.perl:1896 msgid "*** Commands ***" msgstr "*** Comandos ***" -#: add-interactive.c:1084 builtin/clean.c:817 git-add--interactive.perl:1865 +#: add-interactive.c:1092 builtin/clean.c:817 git-add--interactive.perl:1893 msgid "What now" msgstr "Ahora que" -#: add-interactive.c:1136 git-add--interactive.perl:213 +#: add-interactive.c:1144 git-add--interactive.perl:213 msgid "staged" msgstr "rastreado" -#: add-interactive.c:1136 git-add--interactive.perl:213 +#: add-interactive.c:1144 git-add--interactive.perl:213 msgid "unstaged" msgstr "no rastreado" -#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2250 -#: builtin/am.c:2253 builtin/clone.c:123 builtin/fetch.c:145 -#: builtin/merge.c:276 builtin/pull.c:190 builtin/submodule--helper.c:409 -#: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397 -#: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905 -#: builtin/submodule--helper.c:2148 bugreport.c:135 +#: add-interactive.c:1144 apply.c:4987 apply.c:4990 builtin/am.c:2257 +#: builtin/am.c:2260 builtin/bugreport.c:134 builtin/clone.c:124 +#: builtin/fetch.c:150 builtin/merge.c:285 builtin/pull.c:190 +#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1818 +#: builtin/submodule--helper.c:1821 builtin/submodule--helper.c:2326 +#: builtin/submodule--helper.c:2329 builtin/submodule--helper.c:2572 #: git-add--interactive.perl:213 msgid "path" msgstr "ruta" -#: add-interactive.c:1143 +#: add-interactive.c:1151 msgid "could not refresh index" msgstr "no se pudo refrescar el index" -#: add-interactive.c:1157 builtin/clean.c:781 git-add--interactive.perl:1782 +#: add-interactive.c:1165 builtin/clean.c:781 git-add--interactive.perl:1803 #, c-format msgid "Bye.\n" msgstr "Adiós.\n" -#: add-patch.c:34 git-add--interactive.perl:1430 +#: add-patch.c:34 git-add--interactive.perl:1431 #, c-format, perl-format msgid "Stage mode change [y,n,q,a,d%s,?]? " msgstr "¿Cambio de modo de stage [y,n,q,a,d%s,?]? " -#: add-patch.c:35 git-add--interactive.perl:1431 +#: add-patch.c:35 git-add--interactive.perl:1432 #, c-format, perl-format msgid "Stage deletion [y,n,q,a,d%s,?]? " msgstr "¿Aplicar stage al borrado [y,n,q,a,d%s,?]? " -#: add-patch.c:36 git-add--interactive.perl:1432 +#: add-patch.c:36 git-add--interactive.perl:1433 #, c-format, perl-format msgid "Stage addition [y,n,q,a,d%s,?]? " msgstr "¿Agregar al stage [y,n,q,a,d%s,?]? " -#: add-patch.c:37 git-add--interactive.perl:1433 +#: add-patch.c:37 git-add--interactive.perl:1434 #, c-format, perl-format msgid "Stage this hunk [y,n,q,a,d%s,?]? " msgstr "¿Aplicar stage a este hunk [y,n,q,a,d%s,?]? " @@ -272,22 +272,22 @@ msgstr "" "d - no aplicar stage a este hunk o a ninguno de los posteriores en este " "archivo\n" -#: add-patch.c:56 git-add--interactive.perl:1436 +#: add-patch.c:56 git-add--interactive.perl:1437 #, c-format, perl-format msgid "Stash mode change [y,n,q,a,d%s,?]? " msgstr "¿Aplicar stash al cambio de modo [y,n,q,a,d%s,?]? " -#: add-patch.c:57 git-add--interactive.perl:1437 +#: add-patch.c:57 git-add--interactive.perl:1438 #, c-format, perl-format msgid "Stash deletion [y,n,q,a,d%s,?]? " msgstr "¿Aplicar stash al borrado [y,n,q,a,d%s,?]? " -#: add-patch.c:58 git-add--interactive.perl:1438 +#: add-patch.c:58 git-add--interactive.perl:1439 #, c-format, perl-format msgid "Stash addition [y,n,q,a,d%s,?]? " msgstr "¿Agregar al stash [y,n,q,a,d%s,?]? " -#: add-patch.c:59 git-add--interactive.perl:1439 +#: add-patch.c:59 git-add--interactive.perl:1440 #, c-format, perl-format msgid "Stash this hunk [y,n,q,a,d%s,?]? " msgstr "¿Aplicar stash a este hunk [y,n,q,a,d%s,?]? " @@ -314,22 +314,22 @@ msgstr "" "a - aplicar stash a este hunk y a todos los posteriores en el archivo\n" "d - no aplicar stash a este hunk o ninguno de los posteriores en el archivo\n" -#: add-patch.c:80 git-add--interactive.perl:1442 +#: add-patch.c:80 git-add--interactive.perl:1443 #, c-format, perl-format msgid "Unstage mode change [y,n,q,a,d%s,?]? " msgstr "¿Sacar cambio de modo del stage [y,n,q,a,d%s,?]? " -#: add-patch.c:81 git-add--interactive.perl:1443 +#: add-patch.c:81 git-add--interactive.perl:1444 #, c-format, perl-format msgid "Unstage deletion [y,n,q,a,d%s,?]? " msgstr "¿Sacar borrado del stage [y,n,q,a,d%s,?]? " -#: add-patch.c:82 git-add--interactive.perl:1444 +#: add-patch.c:82 git-add--interactive.perl:1445 #, c-format, perl-format msgid "Unstage addition [y,n,q,a,d%s,?]? " msgstr "¿Quitar adición al stage [y,n,q,a,d%s,?]? " -#: add-patch.c:83 git-add--interactive.perl:1445 +#: add-patch.c:83 git-add--interactive.perl:1446 #, c-format, perl-format msgid "Unstage this hunk [y,n,q,a,d%s,?]? " msgstr "¿Sacar este hunk del stage [y,n,q,a,d%s,?]? " @@ -357,22 +357,22 @@ msgstr "" "d - no sacar del area de stage este hunk o ninguno de los posteriores en el " "archivo\n" -#: add-patch.c:103 git-add--interactive.perl:1448 +#: add-patch.c:103 git-add--interactive.perl:1449 #, c-format, perl-format msgid "Apply mode change to index [y,n,q,a,d%s,?]? " msgstr "¿Aplicar cambio de modo al índice [y,n,q,a,d%s,?]? " -#: add-patch.c:104 git-add--interactive.perl:1449 +#: add-patch.c:104 git-add--interactive.perl:1450 #, c-format, perl-format msgid "Apply deletion to index [y,n,q,a,d%s,?]? " msgstr "¿Aplicar borrado al índice [y,n,q,a,d%s,?]? " -#: add-patch.c:105 git-add--interactive.perl:1450 +#: add-patch.c:105 git-add--interactive.perl:1451 #, c-format, perl-format msgid "Apply addition to index [y,n,q,a,d%s,?]? " msgstr "¿Aplicar adición al índice [y,n,q,a,d%s,?]? " -#: add-patch.c:106 git-add--interactive.perl:1451 +#: add-patch.c:106 git-add--interactive.perl:1452 #, c-format, perl-format msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " msgstr "¿Aplicar este hunk al índice [y,n,q,a,d%s,?]? " @@ -399,26 +399,26 @@ msgstr "" "a - aplicar este hunk y todos los posteriores en el archivo\n" "d - no aplicar este hunko ninguno de los posteriores en el archivo\n" -#: add-patch.c:126 git-add--interactive.perl:1454 -#: git-add--interactive.perl:1472 +#: add-patch.c:126 git-add--interactive.perl:1455 +#: git-add--interactive.perl:1473 #, c-format, perl-format msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " msgstr "¿Descartar cambio de modo del árbol de trabajo [y,n,q,a,d%s,?]? " -#: add-patch.c:127 git-add--interactive.perl:1455 -#: git-add--interactive.perl:1473 +#: add-patch.c:127 git-add--interactive.perl:1456 +#: git-add--interactive.perl:1474 #, c-format, perl-format msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " msgstr "¿Descartar borrado del árbol de trabajo [y,n,q,a,d%s,?]? " -#: add-patch.c:128 git-add--interactive.perl:1456 -#: git-add--interactive.perl:1474 +#: add-patch.c:128 git-add--interactive.perl:1457 +#: git-add--interactive.perl:1475 #, c-format, perl-format msgid "Discard addition from worktree [y,n,q,a,d%s,?]? " msgstr "¿Descartar adición del árbol de trabajo [y,n,q,a,d%s,?]? " -#: add-patch.c:129 git-add--interactive.perl:1457 -#: git-add--interactive.perl:1475 +#: add-patch.c:129 git-add--interactive.perl:1458 +#: git-add--interactive.perl:1476 #, c-format, perl-format msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " msgstr "¿Descartar este hunk del árbol de trabajo [y,n,q,a,d%s,?]? " @@ -445,23 +445,23 @@ msgstr "" "a - descartar este hunk y todos los posteriores en este archivo\n" "d - no descartar este hunk o ninguno de los posteriores en el archivo\n" -#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1460 +#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461 #, c-format, perl-format msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " msgstr "" "¿Descartar cambio de modo del índice y el árbol de trabajo [y,n,q,a,d%s,?]? " -#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1461 +#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1462 #, c-format, perl-format msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " msgstr "¿Descartar borrado del índice y el árbol de trabajo [y,n,q,a,d%s,?]? " -#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1462 +#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1463 #, c-format, perl-format msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? " msgstr "¿Descartar adición del índice y el árbol de trabajo [y,n,q,a,d%s,?]? " -#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1463 +#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1464 #, c-format, perl-format msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " msgstr "" @@ -481,24 +481,24 @@ msgstr "" "a - descartar este hunk y todos los posteriores en este archivo\n" "d - no descartar este hunk o ninguno posterior en el archivo\n" -#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1466 +#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467 #, c-format, perl-format msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " msgstr "" "¿Aplicar cambio de modo para el índice y el árbol de trabajo [y,n,q,a,d" "%s,?]? " -#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1467 +#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1468 #, c-format, perl-format msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " msgstr "¿Aplicar borrado al índice y al árbol de trabajo [y,n,q,a,d%s,?]? " -#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1468 +#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1469 #, c-format, perl-format msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? " msgstr "¿Aplicar adición al índice y al árbol de trabajo [y,n,q,a,d%s,?]? " -#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1469 +#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1470 #, c-format, perl-format msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " msgstr "¿Aplicar este hunk al índice y árbol de trabajo [y,n,q,a,d,/%s,?]? " @@ -531,34 +531,34 @@ msgstr "" "a - aplicar este hunk y todos los posteriores en el archivo\n" "d - no aplicar este hunk o ninguno de los siguientes en este archivo\n" -#: add-patch.c:328 +#: add-patch.c:342 #, c-format msgid "could not parse hunk header '%.*s'" msgstr "no se puede analizar hunk header '%.*s'" -#: add-patch.c:347 add-patch.c:351 +#: add-patch.c:361 add-patch.c:365 #, c-format msgid "could not parse colored hunk header '%.*s'" msgstr "no se puede analizar hunk header '%.*s'" -#: add-patch.c:405 +#: add-patch.c:419 msgid "could not parse diff" msgstr "no se puede analizar diff" -#: add-patch.c:424 +#: add-patch.c:438 msgid "could not parse colored diff" msgstr "no se pudo analizar diff a colores" -#: add-patch.c:438 +#: add-patch.c:452 #, c-format msgid "failed to run '%s'" msgstr "falló al ejecutar '%s'" -#: add-patch.c:602 +#: add-patch.c:611 msgid "mismatched output from interactive.diffFilter" msgstr "output de interactive.diffFilter no concuerda" -#: add-patch.c:603 +#: add-patch.c:612 msgid "" "Your filter must maintain a one-to-one correspondence\n" "between its input and output lines." @@ -566,7 +566,7 @@ msgstr "" "Tu filtro tiene que mantener correspondencia de uno a uno\n" "entre las líneas de entrada y salida." -#: add-patch.c:776 +#: add-patch.c:790 #, c-format msgid "" "expected context line #%d in\n" @@ -575,7 +575,7 @@ msgstr "" "se esperaba línea de contexto #%d en\n" "%.*s" -#: add-patch.c:791 +#: add-patch.c:805 #, c-format msgid "" "hunks do not overlap:\n" @@ -588,11 +588,11 @@ msgstr "" "\tno acaba con:\n" "%.*s" -#: add-patch.c:1067 git-add--interactive.perl:1114 +#: add-patch.c:1081 git-add--interactive.perl:1115 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" msgstr "Modo de edición manual de hunk -- vea abajo para una guía rápida.\n" -#: add-patch.c:1071 +#: add-patch.c:1085 #, c-format msgid "" "---\n" @@ -606,7 +606,7 @@ msgstr "" "Lineas comenzando con %c serán eliminadas.\n" #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. -#: add-patch.c:1085 git-add--interactive.perl:1128 +#: add-patch.c:1099 git-add--interactive.perl:1129 msgid "" "If it does not apply cleanly, you will be given an opportunity to\n" "edit again. If all lines of the hunk are removed, then the edit is\n" @@ -616,11 +616,11 @@ msgstr "" "editar nuevamente. Si todas las líneas del hunk son eliminadas, entonces \n" "la edición es abortada y el hunk queda sin cambios.\n" -#: add-patch.c:1118 +#: add-patch.c:1132 msgid "could not parse hunk header" msgstr "no se puede analizar hunk header" -#: add-patch.c:1163 +#: add-patch.c:1177 msgid "'git apply --cached' failed" msgstr "falló 'git apply --cached'" @@ -636,26 +636,26 @@ msgstr "falló 'git apply --cached'" #. Consider translating (saying "no" discards!) as #. (saying "n" for "no" discards!) if the translation #. of the word "no" does not start with n. -#: add-patch.c:1232 git-add--interactive.perl:1241 +#: add-patch.c:1246 git-add--interactive.perl:1242 msgid "" "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " msgstr "" "Tu hunk editado no aplica. ¿Editar nuevamente (¡decir \"no\" descarta!) [y/" "n]? " -#: add-patch.c:1275 +#: add-patch.c:1289 msgid "The selected hunks do not apply to the index!" msgstr "¡Los hunks seleccionados no aplican al índice!" -#: add-patch.c:1276 git-add--interactive.perl:1345 +#: add-patch.c:1290 git-add--interactive.perl:1346 msgid "Apply them to the worktree anyway? " msgstr "¿Aplicarlos al árbol de trabajo de todas maneras? " -#: add-patch.c:1283 git-add--interactive.perl:1348 +#: add-patch.c:1297 git-add--interactive.perl:1349 msgid "Nothing was applied.\n" msgstr "Nada fue aplicado.\n" -#: add-patch.c:1340 +#: add-patch.c:1354 msgid "" "j - leave this hunk undecided, see next undecided hunk\n" "J - leave this hunk undecided, see next hunk\n" @@ -677,73 +677,73 @@ msgstr "" "e - editar manualmente el hunk actual\n" "? - imprimir ayuda\n" -#: add-patch.c:1463 add-patch.c:1473 +#: add-patch.c:1516 add-patch.c:1526 msgid "No previous hunk" msgstr "No el anterior hunk" -#: add-patch.c:1468 add-patch.c:1478 +#: add-patch.c:1521 add-patch.c:1531 msgid "No next hunk" msgstr "No el siguiente hunk" -#: add-patch.c:1484 +#: add-patch.c:1537 msgid "No other hunks to goto" msgstr "No hay más pedazos para el ir" -#: add-patch.c:1495 git-add--interactive.perl:1594 +#: add-patch.c:1548 git-add--interactive.perl:1606 msgid "go to which hunk (<ret> to see more)? " msgstr "¿a que hunk ir (<enter> para ver más)? " -#: add-patch.c:1496 git-add--interactive.perl:1596 +#: add-patch.c:1549 git-add--interactive.perl:1608 msgid "go to which hunk? " msgstr "¿a que hunk ir? " -#: add-patch.c:1507 +#: add-patch.c:1560 #, c-format msgid "Invalid number: '%s'" msgstr "Numero inválido: '%s'" -#: add-patch.c:1512 +#: add-patch.c:1565 #, c-format msgid "Sorry, only %d hunk available." msgid_plural "Sorry, only %d hunks available." msgstr[0] "Lo siento, solo %d hunk disponible." msgstr[1] "Lo siento, solo %d hunks disponibles." -#: add-patch.c:1521 +#: add-patch.c:1574 msgid "No other hunks to search" msgstr "No hay más pedazos para buscar" -#: add-patch.c:1527 git-add--interactive.perl:1640 +#: add-patch.c:1580 git-add--interactive.perl:1661 msgid "search for regex? " msgstr "¿buscar para regexp? " -#: add-patch.c:1542 +#: add-patch.c:1595 #, c-format msgid "Malformed search regexp %s: %s" msgstr "Regexp para la búsqueda mal formado %s: %s" -#: add-patch.c:1559 +#: add-patch.c:1612 msgid "No hunk matches the given pattern" -msgstr "No hay hunks que concuerden con el patrón entregado." +msgstr "No hay hunks que concuerden con el patrón entregado" -#: add-patch.c:1566 +#: add-patch.c:1619 msgid "Sorry, cannot split this hunk" msgstr "Perdón, no se puede dividir este pedazo" -#: add-patch.c:1570 +#: add-patch.c:1623 #, c-format msgid "Split into %d hunks." msgstr "Cortar en %d hunk." -#: add-patch.c:1574 +#: add-patch.c:1627 msgid "Sorry, cannot edit this hunk" msgstr "Perdón, no se puede editar este pedazo" -#: add-patch.c:1625 +#: add-patch.c:1679 msgid "'git apply' failed" msgstr "falló 'git apply'" -#: advice.c:140 +#: advice.c:143 #, c-format msgid "" "\n" @@ -752,38 +752,38 @@ msgstr "" "\n" "Desactivar este mensaje con \"git config advice.%s false\"" -#: advice.c:156 +#: advice.c:159 #, c-format msgid "%shint: %.*s%s\n" msgstr "%sayuda: %.*s%s\n" -#: advice.c:247 +#: advice.c:250 msgid "Cherry-picking is not possible because you have unmerged files." msgstr "" "No es posible ejecutar cherry-picking porque tienes archivos sin fusionar." -#: advice.c:249 +#: advice.c:252 msgid "Committing is not possible because you have unmerged files." msgstr "No es posible realizar un commit porque tienes archivos sin fusionar." -#: advice.c:251 +#: advice.c:254 msgid "Merging is not possible because you have unmerged files." msgstr "No es posible hacer merge porque tienes archivos sin fusionar." -#: advice.c:253 +#: advice.c:256 msgid "Pulling is not possible because you have unmerged files." msgstr "No es posible hacer pull porque tienes archivos sin fusionar." -#: advice.c:255 +#: advice.c:258 msgid "Reverting is not possible because you have unmerged files." msgstr "No es posible revertir porque tienes archivos sin fusionar." -#: advice.c:257 +#: advice.c:260 #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "No es posible %s porque tienes archivos sin fusionar." -#: advice.c:265 +#: advice.c:268 msgid "" "Fix them up in the work tree, and then use 'git add/rm <file>'\n" "as appropriate to mark resolution and make a commit." @@ -791,23 +791,23 @@ msgstr "" "Corrígelos en el árbol de trabajo y entonces usa 'git add/rm <archivo>',\n" "como sea apropiado, para marcar la resolución y realizar un commit." -#: advice.c:273 +#: advice.c:276 msgid "Exiting because of an unresolved conflict." msgstr "Saliendo porque existe un conflicto sin resolver." -#: advice.c:278 builtin/merge.c:1353 +#: advice.c:281 builtin/merge.c:1370 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "No has concluido tu fusión (MERGE_HEAD existe)." -#: advice.c:280 +#: advice.c:283 msgid "Please, commit your changes before merging." msgstr "Por favor, realiza un commit antes de fusionar." -#: advice.c:281 +#: advice.c:284 msgid "Exiting because of unfinished merge." msgstr "Saliendo por una fusión inconclusa." -#: advice.c:287 +#: advice.c:290 #, c-format msgid "" "Note: switching to '%s'.\n" @@ -1107,7 +1107,8 @@ msgstr "el parche falló: %s:%ld" msgid "cannot checkout %s" msgstr "no se puede hacer checkout a %s" -#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:61 setup.c:308 +#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:86 pack-revindex.c:213 +#: setup.c:308 #, c-format msgid "failed to read %s" msgstr "no se pudo leer %s" @@ -1127,7 +1128,7 @@ msgstr "la ruta %s ha sido renombrada/suprimida" msgid "%s: does not exist in index" msgstr "%s: no existe en el índice" -#: apply.c:3537 apply.c:3708 +#: apply.c:3537 apply.c:3708 apply.c:3952 #, c-format msgid "%s: does not match index" msgstr "%s: no concuerda con el índice" @@ -1177,182 +1178,182 @@ msgstr "%s: tipo incorrecto" msgid "%s has type %o, expected %o" msgstr "%s tiene tipo %o, se esperaba %o" -#: apply.c:3878 apply.c:3880 read-cache.c:830 read-cache.c:856 -#: read-cache.c:1325 +#: apply.c:3892 apply.c:3894 read-cache.c:832 read-cache.c:858 +#: read-cache.c:1313 #, c-format msgid "invalid path '%s'" msgstr "ruta inválida '%s'" -#: apply.c:3936 +#: apply.c:3950 #, c-format msgid "%s: already exists in index" msgstr "%s: ya existe en el índice" -#: apply.c:3939 +#: apply.c:3954 #, c-format msgid "%s: already exists in working directory" msgstr "%s: ya existe en el directorio de trabajo" -#: apply.c:3959 +#: apply.c:3974 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "nuevo modo (%o) de %s no concuerda con el viejo modo (%o)" -#: apply.c:3964 +#: apply.c:3979 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "nuevo modo (%o) de %s no concuerda con el viejo modo (%o) de %s" -#: apply.c:3984 +#: apply.c:3999 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "archivo afectado '%s' está tras un enlace simbólico" -#: apply.c:3988 +#: apply.c:4003 #, c-format msgid "%s: patch does not apply" msgstr "%s: el parche no aplica" -#: apply.c:4003 +#: apply.c:4018 #, c-format msgid "Checking patch %s..." msgstr "Revisando el parche %s..." -#: apply.c:4095 +#: apply.c:4110 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "falta información del sha1 o es inútil para el submódulo %s" -#: apply.c:4102 +#: apply.c:4117 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "modo cambiado para %s, el cual no se encuentra en el HEAD actual" -#: apply.c:4105 +#: apply.c:4120 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "falta información sha1 o es inútil (%s)." -#: apply.c:4114 +#: apply.c:4129 #, c-format msgid "could not add %s to temporary index" msgstr "no se pudo añadir %s al índice temporal" -#: apply.c:4124 +#: apply.c:4139 #, c-format msgid "could not write temporary index to %s" msgstr "no se pudo escribir un índice temporal para %s" -#: apply.c:4262 +#: apply.c:4277 #, c-format msgid "unable to remove %s from index" msgstr "no se puede eliminar %s del índice" -#: apply.c:4296 +#: apply.c:4311 #, c-format msgid "corrupt patch for submodule %s" msgstr "parche corrupto para el submódulo %s" -#: apply.c:4302 +#: apply.c:4317 #, c-format msgid "unable to stat newly created file '%s'" msgstr "no es posible establecer el archivo recién creado '%s'" -#: apply.c:4310 +#: apply.c:4325 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" "no es posible crear una copia de seguridad para el archivo recién creado %s" -#: apply.c:4316 apply.c:4461 +#: apply.c:4331 apply.c:4476 #, c-format msgid "unable to add cache entry for %s" msgstr "no es posible agregar una entrada en el cache para %s" -#: apply.c:4359 +#: apply.c:4374 builtin/bisect--helper.c:523 #, c-format msgid "failed to write to '%s'" msgstr "falló escribir para '%s'" -#: apply.c:4363 +#: apply.c:4378 #, c-format msgid "closing file '%s'" msgstr "cerrando archivo '%s'" -#: apply.c:4433 +#: apply.c:4448 #, c-format msgid "unable to write file '%s' mode %o" msgstr "no es posible escribir el archivo '%s' modo %o" -#: apply.c:4531 +#: apply.c:4546 #, c-format msgid "Applied patch %s cleanly." msgstr "Parche %s aplicado limpiamente." -#: apply.c:4539 +#: apply.c:4554 msgid "internal error" msgstr "error interno" -#: apply.c:4542 +#: apply.c:4557 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "Aplicando parche %%s con %d rechazo..." msgstr[1] "Aplicando parche %%s con %d rechazos..." -#: apply.c:4553 +#: apply.c:4568 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "truncando el nombre de archivo .rej a %.*s.rej" -#: apply.c:4561 builtin/fetch.c:902 builtin/fetch.c:1195 +#: apply.c:4576 builtin/fetch.c:933 builtin/fetch.c:1334 #, c-format msgid "cannot open %s" msgstr "no se puede abrir %s" -#: apply.c:4575 +#: apply.c:4590 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Hunk #%d aplicado limpiamente." -#: apply.c:4579 +#: apply.c:4594 #, c-format msgid "Rejected hunk #%d." msgstr "Hunk #%d rechazado." -#: apply.c:4698 +#: apply.c:4718 #, c-format msgid "Skipped patch '%s'." msgstr "Parche '%s' saltado." -#: apply.c:4706 +#: apply.c:4726 msgid "unrecognized input" msgstr "input no reconocido" -#: apply.c:4726 +#: apply.c:4746 msgid "unable to read index file" msgstr "no es posible leer el archivo índice" -#: apply.c:4883 +#: apply.c:4903 #, c-format msgid "can't open patch '%s': %s" msgstr "no se puede abrir el parche '%s': %s" -#: apply.c:4910 +#: apply.c:4930 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "%d error de espacios en blanco aplastado" msgstr[1] "%d errores de espacios en blanco aplastados" -#: apply.c:4916 apply.c:4931 +#: apply.c:4936 apply.c:4951 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "%d línea agrega errores de espacios en blanco." msgstr[1] "%d líneas agregan errores de espacios en blanco." -#: apply.c:4924 +#: apply.c:4944 #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." @@ -1361,185 +1362,180 @@ msgstr[0] "" msgstr[1] "" "%d líneas aplicadas después de arreglar los errores de espacios en blanco." -#: apply.c:4940 builtin/add.c:612 builtin/mv.c:301 builtin/rm.c:406 +#: apply.c:4960 builtin/add.c:626 builtin/mv.c:304 builtin/rm.c:406 msgid "Unable to write new index file" msgstr "No es posible escribir el archivo índice" -#: apply.c:4968 +#: apply.c:4988 msgid "don't apply changes matching the given path" msgstr "no aplicar cambios que concuerden con la ruta suministrada" -#: apply.c:4971 +#: apply.c:4991 msgid "apply changes matching the given path" msgstr "aplicar cambios que concuerden con la ruta suministrada" -#: apply.c:4973 builtin/am.c:2259 +#: apply.c:4993 builtin/am.c:2266 msgid "num" msgstr "num" -#: apply.c:4974 +#: apply.c:4994 msgid "remove <num> leading slashes from traditional diff paths" msgstr "eliminar <num> slashes iniciales de las rutas diff tradicionales" -#: apply.c:4977 +#: apply.c:4997 msgid "ignore additions made by the patch" msgstr "ignorar adiciones hechas por el parche" -#: apply.c:4979 +#: apply.c:4999 msgid "instead of applying the patch, output diffstat for the input" msgstr "en lugar de aplicar el parche, mostrar diffstat para la entrada" -#: apply.c:4983 +#: apply.c:5003 msgid "show number of added and deleted lines in decimal notation" msgstr "mostrar el numero de líneas agregadas y eliminadas en notación decimal" -#: apply.c:4985 +#: apply.c:5005 msgid "instead of applying the patch, output a summary for the input" msgstr "en lugar de aplicar el parche, mostrar un resumen para la entrada" -#: apply.c:4987 +#: apply.c:5007 msgid "instead of applying the patch, see if the patch is applicable" msgstr "en lugar de aplicar el parche, ver si el parche es aplicable" -#: apply.c:4989 +#: apply.c:5009 msgid "make sure the patch is applicable to the current index" msgstr "asegurar que el parche es aplicable al índice actual" -#: apply.c:4991 +#: apply.c:5011 msgid "mark new files with `git add --intent-to-add`" msgstr "marca los nuevos archivos con `git add --intent-to-add`" -#: apply.c:4993 +#: apply.c:5013 msgid "apply a patch without touching the working tree" msgstr "aplicar un parche sin tocar el árbol de trabajo" -#: apply.c:4995 +#: apply.c:5015 msgid "accept a patch that touches outside the working area" msgstr "aceptar un parche que toca fuera del área de trabajo" -#: apply.c:4998 +#: apply.c:5018 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "también aplicar el parche ( usar con --stat/--summary/--check" -#: apply.c:5000 +#: apply.c:5020 msgid "attempt three-way merge if a patch does not apply" msgstr "intentar merge de tres-vías si el parche no aplica" -#: apply.c:5002 +#: apply.c:5022 msgid "build a temporary index based on embedded index information" msgstr "" "construir un índice temporal basado en la información del índice incrustado" -#: apply.c:5005 builtin/checkout-index.c:173 builtin/ls-files.c:525 +#: apply.c:5025 builtin/checkout-index.c:195 builtin/ls-files.c:540 msgid "paths are separated with NUL character" msgstr "rutas están separadas con un carácter NULL" -#: apply.c:5007 +#: apply.c:5027 msgid "ensure at least <n> lines of context match" msgstr "asegurar que al menos concuerden <n> líneas del contexto concuerden" -#: apply.c:5008 builtin/am.c:2238 builtin/interpret-trailers.c:98 +#: apply.c:5028 builtin/am.c:2245 builtin/interpret-trailers.c:98 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 -#: builtin/pack-objects.c:3530 builtin/rebase.c:1332 +#: builtin/pack-objects.c:3577 builtin/rebase.c:1352 msgid "action" msgstr "acción" -#: apply.c:5009 +#: apply.c:5029 msgid "detect new or modified lines that have whitespace errors" msgstr "" "detectar líneas nuevas o modificadas que contienen errores de espacios en " "blanco" -#: apply.c:5012 apply.c:5015 +#: apply.c:5032 apply.c:5035 msgid "ignore changes in whitespace when finding context" msgstr "" "ignorar cambios en los espacios en blanco cuando se encuentra el contexto" -#: apply.c:5018 +#: apply.c:5038 msgid "apply the patch in reverse" msgstr "aplicar el parche en reversa" -#: apply.c:5020 +#: apply.c:5040 msgid "don't expect at least one line of context" msgstr "no espera al menos una línea del contexto" -#: apply.c:5022 +#: apply.c:5042 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "dejar los hunks rechazados en los archivos *.rej correspontientes" -#: apply.c:5024 +#: apply.c:5044 msgid "allow overlapping hunks" msgstr "permitir solapamiento de hunks" -#: apply.c:5025 builtin/add.c:323 builtin/check-ignore.c:22 -#: builtin/commit.c:1366 builtin/count-objects.c:98 builtin/fsck.c:775 -#: builtin/log.c:2186 builtin/mv.c:123 builtin/read-tree.c:128 +#: apply.c:5045 builtin/add.c:337 builtin/check-ignore.c:22 +#: builtin/commit.c:1364 builtin/count-objects.c:98 builtin/fsck.c:757 +#: builtin/log.c:2286 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "ser verboso" -#: apply.c:5027 +#: apply.c:5047 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" "tolerar nuevas líneas faltantes detectadas incorrectamente al final del " "archivo" -#: apply.c:5030 +#: apply.c:5050 msgid "do not trust the line counts in the hunk headers" msgstr "no confiar en el conteo de líneas en los headers del hunk" -#: apply.c:5032 builtin/am.c:2247 +#: apply.c:5052 builtin/am.c:2254 msgid "root" msgstr "raíz" -#: apply.c:5033 +#: apply.c:5053 msgid "prepend <root> to all filenames" msgstr "anteponer <root> a todos los nombres de archivos" -#: archive-tar.c:125 archive-zip.c:351 +#: archive-tar.c:125 archive-zip.c:345 #, c-format msgid "cannot stream blob %s" msgstr "no se puede transmitir el blob %s" -#: archive-tar.c:266 archive-zip.c:369 +#: archive-tar.c:265 archive-zip.c:358 #, c-format msgid "unsupported file mode: 0%o (SHA1: %s)" msgstr "modo de archivo no soportado: 0%o (SHA1: %s)" -#: archive-tar.c:293 archive-zip.c:359 -#, c-format -msgid "cannot read %s" -msgstr "no se puede leer %s" - -#: archive-tar.c:465 +#: archive-tar.c:450 #, c-format msgid "unable to start '%s' filter" msgstr "no se puede comenzar filtro '%s'" -#: archive-tar.c:468 +#: archive-tar.c:453 msgid "unable to redirect descriptor" msgstr "incapaz de redirigir descriptor" -#: archive-tar.c:475 +#: archive-tar.c:460 #, c-format msgid "'%s' filter reported error" msgstr "filtro '%s' reportó un error" -#: archive-zip.c:319 +#: archive-zip.c:318 #, c-format msgid "path is not valid UTF-8: %s" msgstr "ruta no válida UTF-8: %s" -#: archive-zip.c:323 +#: archive-zip.c:322 #, c-format msgid "path too long (%d chars, SHA1: %s): %s" msgstr "ruta muy larga (%d chars, SHA1: %s): %s" -#: archive-zip.c:480 builtin/pack-objects.c:243 builtin/pack-objects.c:246 +#: archive-zip.c:469 builtin/pack-objects.c:244 builtin/pack-objects.c:247 #, c-format msgid "deflate error (%d)" msgstr "error al desinflar (%d)" -#: archive-zip.c:615 +#: archive-zip.c:603 #, c-format msgid "timestamp too large for this system: %<PRIuMAX>" msgstr "timestamp muy largo para este sistema: %<PRIuMAX>" @@ -1563,134 +1559,156 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <repo> [--exec <comando>] --list" -#: archive.c:377 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315 +#: archive.c:192 +#, c-format +msgid "cannot read %s" +msgstr "no se puede leer %s" + +#: archive.c:345 sequencer.c:459 sequencer.c:1744 sequencer.c:2894 +#: sequencer.c:3335 sequencer.c:3444 builtin/am.c:249 builtin/commit.c:786 +#: builtin/merge.c:1139 +#, c-format +msgid "could not read '%s'" +msgstr "no se pudo leer '%s'" + +#: archive.c:430 builtin/add.c:189 builtin/add.c:602 builtin/rm.c:315 #, c-format msgid "pathspec '%s' did not match any files" msgstr "ruta especificada '%s' no concordó con ninguna carpeta" -#: archive.c:401 +#: archive.c:454 #, c-format msgid "no such ref: %.*s" msgstr "no existe el ref: %.*s" -#: archive.c:407 +#: archive.c:460 #, c-format msgid "not a valid object name: %s" msgstr "nombre de objeto no válido: %s" -#: archive.c:420 +#: archive.c:473 #, c-format msgid "not a tree object: %s" msgstr "no es un objeto tree: %s" -#: archive.c:432 +#: archive.c:485 msgid "current working directory is untracked" msgstr "directorio de trabajo actual no rastreado" -#: archive.c:464 +#: archive.c:526 +#, c-format +msgid "File not found: %s" +msgstr "Archivo no encontrado: %s" + +#: archive.c:528 +#, c-format +msgid "Not a regular file: %s" +msgstr "No es un archivo regular: %s" + +#: archive.c:555 msgid "fmt" msgstr "fmt" -#: archive.c:464 +#: archive.c:555 msgid "archive format" msgstr "formato del archivo" -#: archive.c:465 builtin/log.c:1674 +#: archive.c:556 builtin/log.c:1764 msgid "prefix" msgstr "prefijo" -#: archive.c:466 +#: archive.c:557 msgid "prepend prefix to each pathname in the archive" msgstr "anteponer prefijo a cada ruta en el archivo" -#: archive.c:467 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866 -#: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1208 -#: builtin/fast-export.c:1210 builtin/fast-export.c:1214 builtin/grep.c:907 -#: builtin/hash-object.c:105 builtin/ls-files.c:561 builtin/ls-files.c:564 -#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123 -#: parse-options.h:190 +#: archive.c:558 archive.c:561 builtin/blame.c:884 builtin/blame.c:888 +#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135 +#: builtin/fast-export.c:1207 builtin/fast-export.c:1209 +#: builtin/fast-export.c:1213 builtin/grep.c:920 builtin/hash-object.c:105 +#: builtin/ls-files.c:576 builtin/ls-files.c:579 builtin/notes.c:412 +#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:190 msgid "file" msgstr "carpeta" -#: archive.c:468 builtin/archive.c:90 +#: archive.c:559 +msgid "add untracked file to archive" +msgstr "incluir archivos sin seguimiento al archivo" + +#: archive.c:562 builtin/archive.c:90 msgid "write the archive to this file" msgstr "escribe el archivo en esta carpeta" -#: archive.c:470 +#: archive.c:564 msgid "read .gitattributes in working directory" msgstr "leer .gitattributes en el directorio de trabajo" -#: archive.c:471 +#: archive.c:565 msgid "report archived files on stderr" msgstr "reportar archivos archivados por stderr" -#: archive.c:472 -msgid "store only" -msgstr "solo guardar" - -#: archive.c:473 -msgid "compress faster" -msgstr "comprimir más rápido" - -#: archive.c:481 -msgid "compress better" -msgstr "comprimir mejor" +#: archive.c:567 +msgid "set compression level" +msgstr "configurar nivel de compresión" -#: archive.c:484 +#: archive.c:570 msgid "list supported archive formats" msgstr "listar los formatos de carpeta soportados" -#: archive.c:486 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116 -#: builtin/submodule--helper.c:1406 builtin/submodule--helper.c:1911 +#: archive.c:572 builtin/archive.c:91 builtin/clone.c:114 builtin/clone.c:117 +#: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335 msgid "repo" msgstr "repo" -#: archive.c:487 builtin/archive.c:92 +#: archive.c:573 builtin/archive.c:92 msgid "retrieve the archive from remote repository <repo>" msgstr "obtener la carpeta del repositorio remoto <repo>" -#: archive.c:488 builtin/archive.c:93 builtin/difftool.c:715 +#: archive.c:574 builtin/archive.c:93 builtin/difftool.c:714 #: builtin/notes.c:498 msgid "command" msgstr "comando" -#: archive.c:489 builtin/archive.c:94 +#: archive.c:575 builtin/archive.c:94 msgid "path to the remote git-upload-archive command" msgstr "ruta para el comando git-upload-archivo remoto" -#: archive.c:496 +#: archive.c:582 msgid "Unexpected option --remote" msgstr "Opción inesperada --remote" -#: archive.c:498 +#: archive.c:584 msgid "Option --exec can only be used together with --remote" msgstr "Opción --exec solo puede ser utilizada con --remote" -#: archive.c:500 +#: archive.c:586 msgid "Unexpected option --output" msgstr "Opción inesperada --output" -#: archive.c:522 +#: archive.c:588 +msgid "Options --add-file and --remote cannot be used together" +msgstr "Opciones --add-file y --remote no pueden ser usadas juntas" + +#: archive.c:610 #, c-format msgid "Unknown archive format '%s'" msgstr "Formato de carpeta desconocido '%s'" -#: archive.c:529 +#: archive.c:619 #, c-format msgid "Argument not supported for format '%s': -%d" msgstr "Argumento no soportado para formato '%s': -%d" -#: attr.c:212 +#: attr.c:202 #, c-format msgid "%.*s is not a valid attribute name" msgstr "%.*s no es un nombre de atributo válido" -#: attr.c:369 +#: attr.c:359 #, c-format msgid "%s not allowed: %s:%d" msgstr "%s no permitido: %s:%d" -#: attr.c:409 +#: attr.c:399 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -1698,22 +1716,22 @@ msgstr "" "Los patrones negativos son ignorados en los atributos de git\n" "Usa '\\!' para comenzar literalmente con exclamación." -#: bisect.c:468 +#: bisect.c:489 #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "Revisa las comillas en el archivo '%s': %s" -#: bisect.c:678 +#: bisect.c:699 #, c-format msgid "We cannot bisect more!\n" msgstr "¡No podemos biseccionar más!\n" -#: bisect.c:745 +#: bisect.c:766 #, c-format msgid "Not a valid commit name %s" msgstr "No es un nombre de commit válido %s" -#: bisect.c:770 +#: bisect.c:791 #, c-format msgid "" "The merge base %s is bad.\n" @@ -1722,7 +1740,7 @@ msgstr "" "La base de fisión %s está mal.\n" "Esto quiere decir que el bug ha sido arreglado entre %s y [%s].\n" -#: bisect.c:775 +#: bisect.c:796 #, c-format msgid "" "The merge base %s is new.\n" @@ -1731,7 +1749,7 @@ msgstr "" "La base de fisión %s es nueva.\n" "Esta propiedad ha cambiado entre %s y [%s].\n" -#: bisect.c:780 +#: bisect.c:801 #, c-format msgid "" "The merge base %s is %s.\n" @@ -1740,7 +1758,7 @@ msgstr "" "La base de fisión %s es %s.\n" "Esto quiere decir que el primer '%s' commit está entre %s y [%s].\n" -#: bisect.c:788 +#: bisect.c:809 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -1751,7 +1769,7 @@ msgstr "" "git bisect no puede trabajar bien en este caso.\n" "¿Tal vez confundiste la revisión %s y %s?\n" -#: bisect.c:801 +#: bisect.c:822 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -1762,45 +1780,45 @@ msgstr "" "Así que no podemos estar seguros que el primer %s commit está entre%s y %s.\n" "Vamos a continuar de todas maneras." -#: bisect.c:840 +#: bisect.c:861 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "Biseccionando: una base de fisión debe ser probada\n" -#: bisect.c:890 +#: bisect.c:911 #, c-format msgid "a %s revision is needed" msgstr "una %s revisión es necesaria" -#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:255 +#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:287 #, c-format msgid "could not create file '%s'" msgstr "no se pudo crear el archivo '%s'" -#: bisect.c:966 builtin/merge.c:151 +#: bisect.c:987 builtin/merge.c:153 #, c-format msgid "could not read file '%s'" msgstr "no se pudo leer el archivo '%s'" -#: bisect.c:997 +#: bisect.c:1027 msgid "reading bisect refs failed" msgstr "falló leer las refs de bisect" -#: bisect.c:1019 +#: bisect.c:1057 #, c-format msgid "%s was both %s and %s\n" msgstr "%s fue tanto %s como %s\n" -#: bisect.c:1028 +#: bisect.c:1066 #, c-format msgid "" "No testable commit found.\n" -"Maybe you started with bad path parameters?\n" +"Maybe you started with bad path arguments?\n" msgstr "" "No se encontró commit que se pueda probar.\n" "¿Quizás iniciaste con parámetros de rutas incorrectos?\n" -#: bisect.c:1057 +#: bisect.c:1095 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -1810,7 +1828,7 @@ msgstr[1] "(aproximadamente %d pasos)" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. -#: bisect.c:1063 +#: bisect.c:1101 #, c-format msgid "Bisecting: %d revision left to test after this %s\n" msgid_plural "Bisecting: %d revisions left to test after this %s\n" @@ -1830,11 +1848,11 @@ msgid "--reverse and --first-parent together require specified latest commit" msgstr "" "--reverse y --first-parent juntos requieren especificar el último commit" -#: blame.c:2821 bundle.c:187 ref-filter.c:2200 remote.c:1924 sequencer.c:2018 -#: sequencer.c:4466 submodule.c:847 builtin/commit.c:1047 builtin/log.c:405 -#: builtin/log.c:1012 builtin/log.c:1541 builtin/log.c:1945 builtin/log.c:2235 -#: builtin/merge.c:415 builtin/pack-objects.c:3348 builtin/pack-objects.c:3363 -#: builtin/shortlog.c:192 +#: blame.c:2821 bundle.c:213 ref-filter.c:2206 remote.c:2041 sequencer.c:2146 +#: sequencer.c:4641 submodule.c:856 builtin/commit.c:1045 builtin/log.c:411 +#: builtin/log.c:1016 builtin/log.c:1624 builtin/log.c:2045 builtin/log.c:2335 +#: builtin/merge.c:424 builtin/pack-objects.c:3395 builtin/pack-objects.c:3410 +#: builtin/shortlog.c:255 msgid "revision walk setup failed" msgstr "falló la configuración del camino de revisión" @@ -2004,366 +2022,384 @@ msgstr "'%s' ya ha sido marcado en '%s'" msgid "HEAD of working tree %s is not updated" msgstr "HEAD del árbol de trabajo %s no está actualizada" -#: bundle.c:47 +#: bundle.c:41 +#, c-format +msgid "unrecognized bundle hash algorithm: %s" +msgstr "algoritmo bundle hash desconocido %s" + +#: bundle.c:45 #, c-format -msgid "'%s' does not look like a v2 bundle file" -msgstr "'%s' no se ve como un archivo bundle v2" +msgid "unknown capability '%s'" +msgstr "capacidad desconocida '%s'" -#: bundle.c:69 -msgid "unknown hash algorithm length" -msgstr "largo del algoritmo hash desconocido" +#: bundle.c:71 +#, c-format +msgid "'%s' does not look like a v2 or v3 bundle file" +msgstr "'%s' no se ve como un archivo bundle v2 o v3" -#: bundle.c:84 +#: bundle.c:110 #, c-format msgid "unrecognized header: %s%s (%d)" msgstr "header no reconocido %s%s (%d)" -#: bundle.c:110 rerere.c:480 rerere.c:690 sequencer.c:2270 sequencer.c:3034 +#: bundle.c:136 rerere.c:464 rerere.c:674 sequencer.c:2398 sequencer.c:3184 #: builtin/commit.c:814 #, c-format msgid "could not open '%s'" msgstr "no se pudo abrir '%s'" -#: bundle.c:163 +#: bundle.c:189 msgid "Repository lacks these prerequisite commits:" msgstr "Al repositorio le falta estos commits prerrequisito:" -#: bundle.c:166 +#: bundle.c:192 msgid "need a repository to verify a bundle" msgstr "se necesita un repositorio para verificar un bundle" -#: bundle.c:217 +#: bundle.c:243 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" msgstr[0] "El bundle contiene esta referencia:" msgstr[1] "El bundle contiene estas %d referencias:" -#: bundle.c:224 +#: bundle.c:250 msgid "The bundle records a complete history." msgstr "El bundle registra una historia completa." -#: bundle.c:226 +#: bundle.c:252 #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" msgstr[0] "El bundle requiere esta referencia:" msgstr[1] "El bundle requiere estas %d referencias:" -#: bundle.c:293 +#: bundle.c:319 msgid "unable to dup bundle descriptor" msgstr "incapaz de duplicar bundle descriptor" -#: bundle.c:300 +#: bundle.c:326 msgid "Could not spawn pack-objects" msgstr "No se pudo crear los pack-objetcts" -#: bundle.c:311 +#: bundle.c:337 msgid "pack-objects died" msgstr "pack-objects murió" -#: bundle.c:353 -msgid "rev-list died" -msgstr "rev-list murió" - -#: bundle.c:402 +#: bundle.c:386 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "referencia '%s' es excluida por las opciones de rev-list" -#: bundle.c:481 builtin/log.c:208 builtin/log.c:1834 builtin/shortlog.c:306 +#: bundle.c:490 +#, c-format +msgid "unsupported bundle version %d" +msgstr "versión de bundle no soportada %d" + +#: bundle.c:492 +#, c-format +msgid "cannot write bundle version %d with algorithm %s" +msgstr "no se puede escribir la versión de paquete %d con el algoritmo %s" + +#: bundle.c:510 builtin/log.c:210 builtin/log.c:1926 builtin/shortlog.c:396 #, c-format msgid "unrecognized argument: %s" msgstr "argumento no reconocido: %s" -#: bundle.c:489 +#: bundle.c:539 msgid "Refusing to create empty bundle." msgstr "Rechazando crear un bundle vacío." -#: bundle.c:499 +#: bundle.c:549 #, c-format msgid "cannot create '%s'" msgstr "no se puede crear '%s'" -#: bundle.c:524 +#: bundle.c:574 msgid "index-pack died" msgstr "index-pack murió" +#: chunk-format.c:113 +msgid "terminating chunk id appears earlier than expected" +msgstr "terminando porque el id del chunk aparece antes de lo esperado" + +#: chunk-format.c:122 +#, c-format +msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>" +msgstr "offset para chunk incorrecto %<PRIx64> y %<PRIx64>" + +#: chunk-format.c:129 +#, c-format +msgid "duplicate chunk ID %<PRIx32> found" +msgstr "se encontró ID de chuck %<PRIx32> duplicado" + +#: chunk-format.c:143 +#, c-format +msgid "final chunk has non-zero id %<PRIx32>" +msgstr "chunk final tiene un id distinto de cero %<PRIx32>" + #: color.c:329 #, c-format msgid "invalid color value: %.*s" msgstr "color inválido: %.*s" -#: commit-graph.c:238 +#: commit-graph.c:197 midx.c:46 +msgid "invalid hash version" +msgstr "versión de hash inválida" + +#: commit-graph.c:255 msgid "commit-graph file is too small" msgstr "archivo commit-graph es muy pequeño" -#: commit-graph.c:303 +#: commit-graph.c:348 #, c-format msgid "commit-graph signature %X does not match signature %X" msgstr "firma %X en commit-graph no concuerda con firma %X" -#: commit-graph.c:310 +#: commit-graph.c:355 #, c-format msgid "commit-graph version %X does not match version %X" msgstr "versión de commit-graph %X no concuerda con versión %X" -#: commit-graph.c:317 +#: commit-graph.c:362 #, c-format msgid "commit-graph hash version %X does not match version %X" msgstr "versión de hash de commit-graph %X no concuerda con versión %X" -#: commit-graph.c:339 -msgid "commit-graph chunk lookup table entry missing; file may be incomplete" -msgstr "" -"falta tabla de lookup del chunk en commit-graph; el archivo puede estar " -"incompleto" - -#: commit-graph.c:349 -#, c-format -msgid "commit-graph improper chunk offset %08x%08x" -msgstr "offset del chunk de commit-graph inapropiado %08x%08x" - -#: commit-graph.c:417 +#: commit-graph.c:379 #, c-format -msgid "commit-graph chunk id %08x appears multiple times" -msgstr "id de chunk de commit-graph %08x parece tener múltiples tiempos" +msgid "commit-graph file is too small to hold %u chunks" +msgstr "commit-graph file es demasiado pequeño para almacenar %u chunks" -#: commit-graph.c:491 +#: commit-graph.c:472 msgid "commit-graph has no base graphs chunk" msgstr "commit-graph no tiene una chunk base de graphs" -#: commit-graph.c:501 +#: commit-graph.c:482 msgid "commit-graph chain does not match" msgstr "cadena commit-graph no concuerda" -#: commit-graph.c:549 +#: commit-graph.c:530 #, c-format msgid "invalid commit-graph chain: line '%s' not a hash" msgstr "cadena de commit-graph inválida: línea '%s' no es un hash" -#: commit-graph.c:573 +#: commit-graph.c:554 msgid "unable to find all commit-graph files" msgstr "no es posible encontrar los archivos commit-graph" -#: commit-graph.c:706 commit-graph.c:770 +#: commit-graph.c:735 commit-graph.c:772 msgid "invalid commit position. commit-graph is likely corrupt" msgstr "posición de commit inválida. commit-graph está probablemente corrupto" -#: commit-graph.c:727 +#: commit-graph.c:756 #, c-format msgid "could not find commit %s" msgstr "no se pudo encontrar commit %s" -#: commit-graph.c:1009 builtin/am.c:1292 +#: commit-graph.c:789 +msgid "commit-graph requires overflow generation data but has none" +msgstr "" +"commit-graph requiere datos de generación de desbordamiento pero no tiene " +"ninguno" + +#: commit-graph.c:1065 builtin/am.c:1292 #, c-format msgid "unable to parse commit %s" msgstr "no es posible analizar el commit %s" -#: commit-graph.c:1157 -msgid "Writing changed paths Bloom filters index" -msgstr "Escribiendo cambios de ruta del índice de filtros Bloom" - -#: commit-graph.c:1182 -msgid "Writing changed paths Bloom filters data" -msgstr "Escribiendo cambios de ruta de datos de filtros Bloom" - -#: commit-graph.c:1221 builtin/pack-objects.c:2832 +#: commit-graph.c:1327 builtin/pack-objects.c:2872 #, c-format msgid "unable to get type of object %s" msgstr "incapaz de obtener el tipo de objeto: %s" -#: commit-graph.c:1257 +#: commit-graph.c:1358 msgid "Loading known commits in commit graph" msgstr "Cargando commits conocidos en commit graph" -#: commit-graph.c:1274 +#: commit-graph.c:1375 msgid "Expanding reachable commits in commit graph" msgstr "Expandiendo commits alcanzables en commit graph" -#: commit-graph.c:1294 +#: commit-graph.c:1395 msgid "Clearing commit marks in commit graph" msgstr "Limpiando marcas de commits en commit graph" -#: commit-graph.c:1313 +#: commit-graph.c:1414 +msgid "Computing commit graph topological levels" +msgstr "Calculando niveles topológicos de commit graph" + +#: commit-graph.c:1467 msgid "Computing commit graph generation numbers" msgstr "Calculando números de generación de commit graph" -#: commit-graph.c:1367 +#: commit-graph.c:1548 msgid "Computing commit changed paths Bloom filters" msgstr "Calculando números de generación de commit graph" -#: commit-graph.c:1423 +#: commit-graph.c:1625 msgid "Collecting referenced commits" msgstr "Recolectando commits referenciados" -#: commit-graph.c:1447 +#: commit-graph.c:1650 #, c-format msgid "Finding commits for commit graph in %d pack" msgid_plural "Finding commits for commit graph in %d packs" msgstr[0] "Encontrando commits para commit graph en %d pack" msgstr[1] "Encontrando commits para commit graph en %d packs" -#: commit-graph.c:1460 +#: commit-graph.c:1663 #, c-format msgid "error adding pack %s" msgstr "error agregando pack %s" -#: commit-graph.c:1464 +#: commit-graph.c:1667 #, c-format msgid "error opening index for %s" msgstr "error abriendo index para %s" -#: commit-graph.c:1503 +#: commit-graph.c:1704 msgid "Finding commits for commit graph among packed objects" msgstr "Encontrando commits para commit graph entre los objetos empaquetados" -#: commit-graph.c:1518 -msgid "Counting distinct commits in commit graph" -msgstr "Contando commits distintos en commit graph" - -#: commit-graph.c:1550 +#: commit-graph.c:1722 msgid "Finding extra edges in commit graph" msgstr "Encontrando esquinas extra en commit graph" -#: commit-graph.c:1599 +#: commit-graph.c:1771 msgid "failed to write correct number of base graph ids" msgstr "falló al escribir el número correcto de ids de base graph" -#: commit-graph.c:1633 midx.c:812 +#: commit-graph.c:1802 midx.c:794 #, c-format msgid "unable to create leading directories of %s" msgstr "no se pudo crear directorios principales para %s" -#: commit-graph.c:1646 +#: commit-graph.c:1815 msgid "unable to create temporary graph layer" msgstr "no es posible crear un una capa de gráfico temporal" -#: commit-graph.c:1651 +#: commit-graph.c:1820 #, c-format msgid "unable to adjust shared permissions for '%s'" msgstr "no se pudo poner permisos a '%s'" -#: commit-graph.c:1728 +#: commit-graph.c:1879 #, c-format msgid "Writing out commit graph in %d pass" msgid_plural "Writing out commit graph in %d passes" msgstr[0] "Escribiendo commit graph en %d paso" msgstr[1] "Escribiendo commit graph en %d pasos" -#: commit-graph.c:1773 +#: commit-graph.c:1915 msgid "unable to open commit-graph chain file" msgstr "no se pudo abrir la cadena de archivos commit-graph" -#: commit-graph.c:1789 +#: commit-graph.c:1931 msgid "failed to rename base commit-graph file" msgstr "no se pudo renombrar el archivo base commit-graph" -#: commit-graph.c:1809 +#: commit-graph.c:1951 msgid "failed to rename temporary commit-graph file" msgstr "falló al renombrar el archivo temporal commit-graph" -#: commit-graph.c:1935 +#: commit-graph.c:2084 msgid "Scanning merged commits" msgstr "Escaneando commits fusionados" -#: commit-graph.c:1946 -#, c-format -msgid "unexpected duplicate commit id %s" -msgstr "id de commit duplicado inesperado %s" - -#: commit-graph.c:1969 +#: commit-graph.c:2128 msgid "Merging commit-graph" msgstr "Fusionando commit-graph" -#: commit-graph.c:2156 -#, c-format -msgid "the commit graph format cannot write %d commits" -msgstr "el formato de gráficos de commit no pudede escribir %d commits" +#: commit-graph.c:2235 +msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled" +msgstr "" +"intentando escribir un commit-graph, pero 'core.commitGraph' está " +"deshabilitado" -#: commit-graph.c:2167 +#: commit-graph.c:2342 msgid "too many commits to write graph" msgstr "demasiados commits para escribir el gráfico" -#: commit-graph.c:2260 +#: commit-graph.c:2440 msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "" "el archivo de commit-graph tiene checksums incorrectos y probablemente está " "corrupto" -#: commit-graph.c:2270 +#: commit-graph.c:2450 #, c-format msgid "commit-graph has incorrect OID order: %s then %s" msgstr "commit-graph tiene un orden de OID incorrecto: %s luego %s" -#: commit-graph.c:2280 commit-graph.c:2295 +#: commit-graph.c:2460 commit-graph.c:2475 #, c-format msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" msgstr "commit-graph tiene un valor fanout incorrecto: fanout[%d] = %u != %u" -#: commit-graph.c:2287 +#: commit-graph.c:2467 #, c-format msgid "failed to parse commit %s from commit-graph" msgstr "falló al analizar commit %s para commit-graph" -#: commit-graph.c:2305 +#: commit-graph.c:2485 msgid "Verifying commits in commit graph" msgstr "Verificando commits en commit graph" -#: commit-graph.c:2320 +#: commit-graph.c:2500 #, c-format msgid "failed to parse commit %s from object database for commit-graph" msgstr "" "falló al analizar el commit %s de la base de datos de objetos para commit-" "graph" -#: commit-graph.c:2327 +#: commit-graph.c:2507 #, c-format msgid "root tree OID for commit %s in commit-graph is %s != %s" msgstr "árbol raíz OID para commit %s en commit-graph es %s != %s" -#: commit-graph.c:2337 +#: commit-graph.c:2517 #, c-format msgid "commit-graph parent list for commit %s is too long" msgstr "lista padre de commit-graph para commit %s es muy larga" -#: commit-graph.c:2346 +#: commit-graph.c:2526 #, c-format msgid "commit-graph parent for %s is %s != %s" msgstr "padre de commit-graph para %s es %s != %s" -#: commit-graph.c:2360 +#: commit-graph.c:2540 #, c-format msgid "commit-graph parent list for commit %s terminates early" msgstr "lista padre de commit-graph para commit %s termina antes" -#: commit-graph.c:2365 +#: commit-graph.c:2545 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" msgstr "" "commit-graph ha generado número cero para %s, pero no-cero para los demás" -#: commit-graph.c:2369 +#: commit-graph.c:2549 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" msgstr "" "commit-graph tiene generación no-cero para %s, pero cero para los demás" -#: commit-graph.c:2385 +#: commit-graph.c:2566 #, c-format -msgid "commit-graph generation for commit %s is %u != %u" -msgstr "generación commit-graph para commit %s es %u != %u" +msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>" +msgstr "generación commit-graph para commit %s es %<PRIuMAX> < %<PRIuMAX>" -#: commit-graph.c:2391 +#: commit-graph.c:2572 #, c-format msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" msgstr "" "fecha de commit para commit %s en commit-graph es %<PRIuMAX> != %<PRIuMAX>" -#: commit.c:52 sequencer.c:2739 builtin/am.c:359 builtin/am.c:403 -#: builtin/am.c:1371 builtin/am.c:2013 builtin/replace.c:457 +#: commit.c:52 sequencer.c:2887 builtin/am.c:359 builtin/am.c:403 +#: builtin/am.c:1371 builtin/am.c:2018 builtin/replace.c:457 #, c-format msgid "could not parse %s" msgstr "no se puede analizar %s" @@ -2393,27 +2429,27 @@ msgstr "" "Apapa este mensaje ejecutando\n" "\"git config advice.graftFileDeprecated false\"" -#: commit.c:1172 +#: commit.c:1223 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "Commit %s tiene una firma GPG no confiable, pretendidamente por %s." -#: commit.c:1176 +#: commit.c:1227 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "Commit %s tiene una mala firma GPG pretendidamente por %s." -#: commit.c:1179 +#: commit.c:1230 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "Commit %s no tiene una firma GPG." -#: commit.c:1182 +#: commit.c:1233 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "El Commit %s tiene una buena firma GPG por %s\n" -#: commit.c:1436 +#: commit.c:1487 msgid "" "Warning: commit message did not conform to UTF-8.\n" "You may want to amend it after fixing the message, or set the config\n" @@ -2428,7 +2464,7 @@ msgstr "" msgid "memory exhausted" msgstr "memoria agotada" -#: config.c:125 +#: config.c:126 #, c-format msgid "" "exceeded maximum include depth (%d) while including\n" @@ -2443,293 +2479,337 @@ msgstr "" "\t%s\n" "Esto puede ser causado por inclusiones circulares." -#: config.c:141 +#: config.c:142 #, c-format msgid "could not expand include path '%s'" msgstr "no se pudo expandir rutas de inclusión '%s'" -#: config.c:152 +#: config.c:153 msgid "relative config includes must come from files" msgstr "inclusiones de configuración relativas tienen que venir de archivos" -#: config.c:198 +#: config.c:199 msgid "relative config include conditionals must come from files" msgstr "" "la configuración relativa incluye condicionales que deben venir de archivos" -#: config.c:378 +#: config.c:396 +#, c-format +msgid "invalid config format: %s" +msgstr "formato config inválido: %s" + +#: config.c:400 +#, c-format +msgid "missing environment variable name for configuration '%.*s'" +msgstr "falta el nombre de la variable de entorno para la configuración '%.*s'" + +#: config.c:405 +#, c-format +msgid "missing environment variable '%s' for configuration '%.*s'" +msgstr "Falta la variable de entorno '%s' para la configuración '%.*s'" + +#: config.c:442 #, c-format msgid "key does not contain a section: %s" msgstr "llave no contiene una sección: %s" -#: config.c:384 +#: config.c:448 #, c-format msgid "key does not contain variable name: %s" msgstr "llave no contiene el nombre de variable: %s" -#: config.c:408 sequencer.c:2456 +#: config.c:472 sequencer.c:2588 #, c-format msgid "invalid key: %s" msgstr "llave inválida: %s" -#: config.c:414 +#: config.c:478 #, c-format msgid "invalid key (newline): %s" msgstr "llave inválida (nueva línea): %s" -#: config.c:450 config.c:462 +#: config.c:511 +msgid "empty config key" +msgstr "clave de config vacía" + +#: config.c:529 config.c:541 #, c-format msgid "bogus config parameter: %s" msgstr "parámetro de configuración malogrado: %s" -#: config.c:497 +#: config.c:555 config.c:572 config.c:579 config.c:588 #, c-format msgid "bogus format in %s" msgstr "formato malogrado en %s" -#: config.c:836 +#: config.c:622 +#, c-format +msgid "bogus count in %s" +msgstr "conteo malogrado en %s" + +#: config.c:626 +#, c-format +msgid "too many entries in %s" +msgstr "demasiadas entradas en %s" + +#: config.c:636 +#, c-format +msgid "missing config key %s" +msgstr "llave de configuración faltante %s" + +#: config.c:644 +#, c-format +msgid "missing config value %s" +msgstr "valor de config faltante para %s" + +#: config.c:995 #, c-format msgid "bad config line %d in blob %s" msgstr "mala línea de config %d en el blob %s" -#: config.c:840 +#: config.c:999 #, c-format msgid "bad config line %d in file %s" msgstr "mala línea de config %d en el archivo %s" -#: config.c:844 +#: config.c:1003 #, c-format msgid "bad config line %d in standard input" msgstr "mala línea de config %d en la entrada standard" -#: config.c:848 +#: config.c:1007 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "mala línea de config %d en el submódulo-blob %s" -#: config.c:852 +#: config.c:1011 #, c-format msgid "bad config line %d in command line %s" msgstr "mala línea de config %d en la línea de comando %s" -#: config.c:856 +#: config.c:1015 #, c-format msgid "bad config line %d in %s" msgstr "mala línea de config %d en %s" -#: config.c:993 +#: config.c:1152 msgid "out of range" msgstr "fuera de rango" -#: config.c:993 +#: config.c:1152 msgid "invalid unit" msgstr "unidad inválida" -#: config.c:994 +#: config.c:1153 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "mal valor de config numérica '%s' para '%s': %s" -#: config.c:1013 +#: config.c:1163 #, c-format msgid "bad numeric config value '%s' for '%s' in blob %s: %s" msgstr "mal valor de config numérica '%s' para '%s' en el blob %s: %s" -#: config.c:1016 +#: config.c:1166 #, c-format msgid "bad numeric config value '%s' for '%s' in file %s: %s" msgstr "mal valor de config numérica '%s' para '%s' en el archivo %s: %s" -#: config.c:1019 +#: config.c:1169 #, c-format msgid "bad numeric config value '%s' for '%s' in standard input: %s" msgstr "mal valor de config numérica '%s' para '%s' en la entrada standard: %s" -#: config.c:1022 +#: config.c:1172 #, c-format msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" msgstr "" "mal valor de config numérica '%s' para '%s' en el submódulo-blob %s: %s" -#: config.c:1025 +#: config.c:1175 #, c-format msgid "bad numeric config value '%s' for '%s' in command line %s: %s" msgstr "" "mal valor de config numérica '%s' para '%s' en la línea de comando %s: %s" -#: config.c:1028 +#: config.c:1178 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "mal valor de config numérica '%s' para '%s' en %s: %s" -#: config.c:1123 +#: config.c:1194 +#, c-format +msgid "bad boolean config value '%s' for '%s'" +msgstr "mal valor de config booleana '%s' para '%s'" + +#: config.c:1289 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "falló al expandir el directorio de usuario en: '%s'" -#: config.c:1132 +#: config.c:1298 #, c-format msgid "'%s' for '%s' is not a valid timestamp" msgstr "'%s' para '%s' no es una marca de tiempo válida" -#: config.c:1223 +#: config.c:1391 #, c-format msgid "abbrev length out of range: %d" msgstr "largo de abreviatura fuera de rango: %d" -#: config.c:1237 config.c:1248 +#: config.c:1405 config.c:1416 #, c-format msgid "bad zlib compression level %d" msgstr "nivel de compresión de zlib erróneo %d" -#: config.c:1340 +#: config.c:1508 msgid "core.commentChar should only be one character" msgstr "core.commentChar debería tener solo un caracter" -#: config.c:1373 +#: config.c:1541 #, c-format msgid "invalid mode for object creation: %s" msgstr "modo inválido de creación de objetos: %s" -#: config.c:1445 +#: config.c:1613 #, c-format msgid "malformed value for %s" msgstr "valor malformado para %s" -#: config.c:1471 +#: config.c:1639 #, c-format msgid "malformed value for %s: %s" msgstr "valor malformado para %s: %s" -#: config.c:1472 +#: config.c:1640 msgid "must be one of nothing, matching, simple, upstream or current" msgstr "debe ser uno de nothing, matching, simple, upstream o current" -#: config.c:1533 builtin/pack-objects.c:3617 +#: config.c:1701 builtin/pack-objects.c:3666 #, c-format msgid "bad pack compression level %d" msgstr "nivel de compresión de pack erróneo %d" -#: config.c:1655 +#: config.c:1823 #, c-format msgid "unable to load config blob object '%s'" msgstr "incapaz de cargar configuración de objeto blob '%s'" -#: config.c:1658 +#: config.c:1826 #, c-format msgid "reference '%s' does not point to a blob" msgstr "referencia '%s' no apunta a un blob" -#: config.c:1675 +#: config.c:1843 #, c-format msgid "unable to resolve config blob '%s'" msgstr "no se posible resolver configuración de blob '%s'" -#: config.c:1705 +#: config.c:1873 #, c-format msgid "failed to parse %s" msgstr "no se pudo analizar %s" -#: config.c:1759 +#: config.c:1927 msgid "unable to parse command-line config" msgstr "no es posible analizar la configuración de la línea de comando" -#: config.c:2113 +#: config.c:2290 msgid "unknown error occurred while reading the configuration files" msgstr "" "error desconocido ocurrió mientras se leían los archivos de configuración" -#: config.c:2283 +#: config.c:2464 #, c-format msgid "Invalid %s: '%s'" msgstr "Inválido %s: '%s'" -#: config.c:2328 +#: config.c:2509 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "valor splitIndex.maxPercentChange '%d' debe estar entre 0 y 100" -#: config.c:2374 +#: config.c:2555 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "no es posible analizar '%s' de la configuración de la línea de comando" -#: config.c:2376 +#: config.c:2557 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "mala variable de config '%s' en el archivo '%s' en la línea %d" -#: config.c:2457 +#: config.c:2641 #, c-format msgid "invalid section name '%s'" msgstr "nombre de sección inválido '%s'" -#: config.c:2489 +#: config.c:2673 #, c-format msgid "%s has multiple values" msgstr "%s tiene múltiples valores" -#: config.c:2518 +#: config.c:2702 #, c-format msgid "failed to write new configuration file %s" msgstr "falló al escribir nuevo archivo de configuración %s" -#: config.c:2770 config.c:3094 +#: config.c:2954 config.c:3280 #, c-format msgid "could not lock config file %s" msgstr "no se pudo bloquear archivo de configuración %s" -#: config.c:2781 +#: config.c:2965 #, c-format msgid "opening %s" msgstr "abriendo %s" -#: config.c:2816 builtin/config.c:344 +#: config.c:3002 builtin/config.c:361 #, c-format msgid "invalid pattern: %s" msgstr "patrón inválido: %s" -#: config.c:2841 +#: config.c:3027 #, c-format msgid "invalid config file %s" msgstr "archivo de configuración inválido: %s" -#: config.c:2854 config.c:3107 +#: config.c:3040 config.c:3293 #, c-format msgid "fstat on %s failed" msgstr "fstat en %s falló" -#: config.c:2865 +#: config.c:3051 #, c-format msgid "unable to mmap '%s'" msgstr "no es posible hacer mmap '%s'" -#: config.c:2874 config.c:3112 +#: config.c:3060 config.c:3298 #, c-format msgid "chmod on %s failed" msgstr "chmod en %s falló" -#: config.c:2959 config.c:3209 +#: config.c:3145 config.c:3395 #, c-format msgid "could not write config file %s" msgstr "no se pudo escribir el archivo de configuración %s" -#: config.c:2993 +#: config.c:3179 #, c-format msgid "could not set '%s' to '%s'" msgstr "no se pudo configurar '%s' a '%s'" -#: config.c:2995 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857 +#: config.c:3181 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863 #, c-format msgid "could not unset '%s'" msgstr "no se pudo desactivar '%s'" -#: config.c:3085 +#: config.c:3271 #, c-format msgid "invalid section name: %s" msgstr "sección de nombre inválida: %s" -#: config.c:3252 +#: config.c:3438 #, c-format msgid "missing value for '%s'" msgstr "valor faltante para '%s'" @@ -2791,45 +2871,45 @@ msgstr "paquete inválido" msgid "protocol error: unexpected '%s'" msgstr "error de protocolo: '%s' inesperado" -#: connect.c:473 +#: connect.c:497 #, c-format msgid "unknown object format '%s' specified by server" msgstr "formato de objeto desconocido '%s' ha sido provisto por el servidor" -#: connect.c:500 +#: connect.c:526 #, c-format msgid "invalid ls-refs response: %s" msgstr "respuesta de referencias ls-refs inválida: %s" -#: connect.c:504 +#: connect.c:530 msgid "expected flush after ref listing" msgstr "flush esperado tras listado de refs" -#: connect.c:507 +#: connect.c:533 msgid "expected response end packet after ref listing" msgstr "se esperaba un paquete final luego del ref listing" -#: connect.c:640 +#: connect.c:666 #, c-format msgid "protocol '%s' is not supported" msgstr "protocolo '%s' no es soportado" -#: connect.c:691 +#: connect.c:717 msgid "unable to set SO_KEEPALIVE on socket" msgstr "no es posible configurar SO_KEEPALIVE en el socket" -#: connect.c:731 connect.c:794 +#: connect.c:757 connect.c:820 #, c-format msgid "Looking up %s ... " msgstr "Revisando %s... " -#: connect.c:735 +#: connect.c:761 #, c-format msgid "unable to look up %s (port %s) (%s)" msgstr "no se puede revisar %s (puerto %s) (%s)" #. TRANSLATORS: this is the end of "Looking up %s ... " -#: connect.c:739 connect.c:810 +#: connect.c:765 connect.c:836 #, c-format msgid "" "done.\n" @@ -2838,7 +2918,7 @@ msgstr "" "hecho.\n" "Conectando a %s (puerto %s) ... " -#: connect.c:761 connect.c:838 +#: connect.c:787 connect.c:864 #, c-format msgid "" "unable to connect to %s:\n" @@ -2848,74 +2928,78 @@ msgstr "" "%s" #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... " -#: connect.c:767 connect.c:844 +#: connect.c:793 connect.c:870 msgid "done." msgstr "hecho." -#: connect.c:798 +#: connect.c:824 #, c-format msgid "unable to look up %s (%s)" msgstr "no es posible revisar %s (%s)" -#: connect.c:804 +#: connect.c:830 #, c-format msgid "unknown port %s" msgstr "puerto desconocido %s" -#: connect.c:941 connect.c:1271 +#: connect.c:967 connect.c:1299 #, c-format msgid "strange hostname '%s' blocked" msgstr "hostname extraño '%s' bloqueado" -#: connect.c:943 +#: connect.c:969 #, c-format msgid "strange port '%s' blocked" msgstr "puerto extraño '%s' bloqueado" -#: connect.c:953 +#: connect.c:979 #, c-format msgid "cannot start proxy %s" msgstr "no se puede comenzar proxy %s" -#: connect.c:1024 +#: connect.c:1050 msgid "no path specified; see 'git help pull' for valid url syntax" msgstr "" "no hay ruta especificada; vea 'git help pull' para sintaxis de url válidas" -#: connect.c:1219 +#: connect.c:1190 +msgid "newline is forbidden in git:// hosts and repo paths" +msgstr "la nueva línea está prohibida en git://hosts y rutas de repositorio" + +#: connect.c:1247 msgid "ssh variant 'simple' does not support -4" msgstr "variante 'simple' de ssh no soporta -4" -#: connect.c:1231 +#: connect.c:1259 msgid "ssh variant 'simple' does not support -6" msgstr "variante 'simple' de ssh no soporta -6" -#: connect.c:1248 +#: connect.c:1276 msgid "ssh variant 'simple' does not support setting port" msgstr "variante ssh 'simple' no soporta configurar puerto" -#: connect.c:1360 +#: connect.c:1388 #, c-format msgid "strange pathname '%s' blocked" msgstr "ruta extraña '%s' bloqueada" -#: connect.c:1407 +#: connect.c:1436 msgid "unable to fork" msgstr "no es posible hacer fork" -#: connected.c:109 builtin/fsck.c:209 builtin/prune.c:45 +#: connected.c:108 builtin/fsck.c:191 builtin/prune.c:45 msgid "Checking connectivity" msgstr "Verificando conectividad" -#: connected.c:121 +#: connected.c:120 msgid "Could not run 'git rev-list'" msgstr "No se pudo correr 'git rev-list'" -#: connected.c:141 +#: connected.c:144 msgid "failed write to rev-list" msgstr "falló escribir a rev-list" -#: connected.c:148 +#: connected.c:149 msgid "failed to close rev-list's stdin" msgstr "falló al cerrar la entrada standard de rev-list" @@ -2990,40 +3074,40 @@ msgstr "falló al codificar '%s' de %s a %s" msgid "encoding '%s' from %s to %s and back is not the same" msgstr "codificación '%s' de %s a %s y de vuelta no son iguales" -#: convert.c:668 +#: convert.c:665 #, c-format msgid "cannot fork to run external filter '%s'" msgstr "no se puede hacer fork para ejecutar filtros externos '%s'" -#: convert.c:688 +#: convert.c:685 #, c-format msgid "cannot feed the input to external filter '%s'" msgstr "no se pueden alimentar de input a los filtros externos '%s'" -#: convert.c:695 +#: convert.c:692 #, c-format msgid "external filter '%s' failed %d" msgstr "filtro externo '%s' falló %d" -#: convert.c:730 convert.c:733 +#: convert.c:727 convert.c:730 #, c-format msgid "read from external filter '%s' failed" msgstr "lectura de filtro externo '%s' falló" -#: convert.c:736 convert.c:791 +#: convert.c:733 convert.c:788 #, c-format msgid "external filter '%s' failed" msgstr "filtro externo '%s' falló" -#: convert.c:840 +#: convert.c:837 msgid "unexpected filter type" msgstr "tipo de filtro inesperado" -#: convert.c:851 +#: convert.c:848 msgid "path name too long for external filter" msgstr "nombre de ruta muy largo para filtro externo" -#: convert.c:943 +#: convert.c:940 #, c-format msgid "" "external filter '%s' is not available anymore although not all paths have " @@ -3032,16 +3116,16 @@ msgstr "" "filtro externo '%s' ya no está disponible aunque no todas las rutas han sido " "filtradas" -#: convert.c:1243 +#: convert.c:1240 msgid "true/false are no valid working-tree-encodings" msgstr "true/false no son working-tree-encodings válidos" -#: convert.c:1431 convert.c:1465 +#: convert.c:1428 convert.c:1462 #, c-format msgid "%s: clean filter '%s' failed" msgstr "%s: falló al limpiar filtro '%s'" -#: convert.c:1511 +#: convert.c:1508 #, c-format msgid "%s: smudge filter %s failed" msgstr "%s: filtro smudge %s falló" @@ -3059,17 +3143,17 @@ msgstr "rehusando trabajar con credenciales faltantes en el campo host" msgid "refusing to work with credential missing protocol field" msgstr "rehusando trabajar con credenciales faltantes en el campo protocolo" -#: credential.c:396 +#: credential.c:394 #, c-format msgid "url contains a newline in its %s component: %s" msgstr "url contiene un espace de línea en su componente %s: %s" -#: credential.c:440 +#: credential.c:438 #, c-format msgid "url has no scheme: %s" msgstr "url no tiene scheme: %s" -#: credential.c:513 +#: credential.c:511 #, c-format msgid "credential url cannot be parsed: %s" msgstr "url credencial no puede ser analizada: %s" @@ -3166,6 +3250,31 @@ msgstr "regex isla de config tiene muchos grupos de captura (max=%d)" msgid "Marked %d islands, done.\n" msgstr "%d islas marcadas, listo.\n" +#: diff-merges.c:70 +#, c-format +msgid "unknown value for --diff-merges: %s" +msgstr "valor desconocido para --diff-merges: %s" + +#: diff-lib.c:534 +msgid "--merge-base does not work with ranges" +msgstr "--merge-base no funciona con rangos" + +#: diff-lib.c:536 +msgid "--merge-base only works with commits" +msgstr "--merge-base solo funciona con confirmaciones" + +#: diff-lib.c:553 +msgid "unable to get HEAD" +msgstr "no es posible obtener HEAD" + +#: diff-lib.c:560 +msgid "no merge base found" +msgstr "no se encontró base de fusión" + +#: diff-lib.c:562 +msgid "multiple merge bases found" +msgstr "múltiples bases de fusión encontradas" + #: diff-no-index.c:238 msgid "git diff --no-index [<options>] <path> <path>" msgstr "git diff --no-index [<opciones>] <path> <path>" @@ -3229,35 +3338,35 @@ msgstr "" "Errores en la variable de config 'diff.dirstat' encontrados:\n" "%s" -#: diff.c:4243 +#: diff.c:4276 #, c-format msgid "external diff died, stopping at %s" msgstr "diff externo murió, deteniendo en %s" -#: diff.c:4589 +#: diff.c:4628 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-only, --name-status, --check y -s son mutuamente exclusivas" -#: diff.c:4592 +#: diff.c:4631 msgid "-G, -S and --find-object are mutually exclusive" msgstr "-G, -S y --find-object son mutuamente exclusivas" -#: diff.c:4670 +#: diff.c:4710 msgid "--follow requires exactly one pathspec" msgstr "--follow requiere exactamente un pathspec" -#: diff.c:4718 +#: diff.c:4758 #, c-format msgid "invalid --stat value: %s" msgstr "valor --stat inválido: %s" -#: diff.c:4723 diff.c:4728 diff.c:4733 diff.c:4738 diff.c:5250 -#: parse-options.c:197 parse-options.c:201 +#: diff.c:4763 diff.c:4768 diff.c:4773 diff.c:4778 diff.c:5306 +#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180 #, c-format msgid "%s expects a numerical value" msgstr "%s espera un valor numérico" -#: diff.c:4755 +#: diff.c:4795 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -3266,42 +3375,42 @@ msgstr "" "Falló al analizar parámetro de opción --dirstat/-X:\n" "%s" -#: diff.c:4840 +#: diff.c:4880 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "cambio de clase desconocido '%c' en --diff-filter=%s" -#: diff.c:4864 +#: diff.c:4904 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "valor desconocido luego de ws-error-highlight=%.*s" -#: diff.c:4878 +#: diff.c:4918 #, c-format msgid "unable to resolve '%s'" msgstr "no se puede resolver '%s'" -#: diff.c:4928 diff.c:4934 +#: diff.c:4968 diff.c:4974 #, c-format msgid "%s expects <n>/<m> form" msgstr "%s espera forma <n>/<m>" -#: diff.c:4946 +#: diff.c:4986 #, c-format msgid "%s expects a character, got '%s'" msgstr "%s esperaba un char, se obtuvo '%s'" -#: diff.c:4967 +#: diff.c:5007 #, c-format msgid "bad --color-moved argument: %s" msgstr "mal argumento --color-moved: %s" -#: diff.c:4986 +#: diff.c:5026 #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "modo inválido '%s' en --color-moved-ws" -#: diff.c:5026 +#: diff.c:5066 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" @@ -3309,154 +3418,159 @@ msgstr "" "opción diff-algorithm acepta \"myers\", \"minimal\", \"patience\" e " "\"histogram\"" -#: diff.c:5062 diff.c:5082 +#: diff.c:5102 diff.c:5122 #, c-format msgid "invalid argument to %s" msgstr "argumento inválido para %s" -#: diff.c:5219 +#: diff.c:5226 +#, c-format +msgid "invalid regex given to -I: '%s'" +msgstr "regex inválido para -I: '%s'" + +#: diff.c:5275 #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "falló al analizar parámetro de opción --submodule: '%s'" -#: diff.c:5275 +#: diff.c:5331 #, c-format msgid "bad --word-diff argument: %s" msgstr "mal argumento --word-diff: %s" -#: diff.c:5298 +#: diff.c:5367 msgid "Diff output format options" msgstr "Opciones de formato de salida para diff" -#: diff.c:5300 diff.c:5306 +#: diff.c:5369 diff.c:5375 msgid "generate patch" msgstr "generar parche" -#: diff.c:5303 builtin/log.c:177 +#: diff.c:5372 builtin/log.c:179 msgid "suppress diff output" msgstr "suprimir salida de diff" -#: diff.c:5308 diff.c:5422 diff.c:5429 +#: diff.c:5377 diff.c:5491 diff.c:5498 msgid "<n>" msgstr "<n>" -#: diff.c:5309 diff.c:5312 +#: diff.c:5378 diff.c:5381 msgid "generate diffs with <n> lines context" msgstr "genera diffs con <n> líneas de contexto" -#: diff.c:5314 +#: diff.c:5383 msgid "generate the diff in raw format" msgstr "genera el diff en formato raw" -#: diff.c:5317 +#: diff.c:5386 msgid "synonym for '-p --raw'" msgstr "sinónimo para '-p --stat'" -#: diff.c:5321 +#: diff.c:5390 msgid "synonym for '-p --stat'" msgstr "sinónimo para '-p --stat'" -#: diff.c:5325 +#: diff.c:5394 msgid "machine friendly --stat" msgstr "--stat amigable para máquina" -#: diff.c:5328 +#: diff.c:5397 msgid "output only the last line of --stat" msgstr "mostrar solo la última línea para --stat" -#: diff.c:5330 diff.c:5338 +#: diff.c:5399 diff.c:5407 msgid "<param1,param2>..." msgstr "<param1,param2>..." -#: diff.c:5331 +#: diff.c:5400 msgid "" "output the distribution of relative amount of changes for each sub-directory" msgstr "" "muestra la distribución de cantidades de cambios relativa para cada " "subdirectorio" -#: diff.c:5335 +#: diff.c:5404 msgid "synonym for --dirstat=cumulative" msgstr "sinónimo para --dirstat=cumulative" -#: diff.c:5339 +#: diff.c:5408 msgid "synonym for --dirstat=files,param1,param2..." msgstr "sinonimo para --dirstat=archivos,param1,param2..." -#: diff.c:5343 +#: diff.c:5412 msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "" "advierte si cambios introducen conflictos de markers o errores de espacios " "en blanco" -#: diff.c:5346 +#: diff.c:5415 msgid "condensed summary such as creations, renames and mode changes" msgstr "" "resumen condensado de creaciones, cambios de nombres y cambios de modos" -#: diff.c:5349 +#: diff.c:5418 msgid "show only names of changed files" msgstr "mostrar solo nombres de archivos cambiados" -#: diff.c:5352 +#: diff.c:5421 msgid "show only names and status of changed files" msgstr "mostrar solo nombres y estados de archivos cambiados" -#: diff.c:5354 +#: diff.c:5423 msgid "<width>[,<name-width>[,<count>]]" msgstr "<ancho>[,<nombre-ancho>[,<cantidad>]]" -#: diff.c:5355 +#: diff.c:5424 msgid "generate diffstat" msgstr "generar diffstat" -#: diff.c:5357 diff.c:5360 diff.c:5363 +#: diff.c:5426 diff.c:5429 diff.c:5432 msgid "<width>" msgstr "<ancho>" -#: diff.c:5358 +#: diff.c:5427 msgid "generate diffstat with a given width" msgstr "genera diffstat con un ancho dado" -#: diff.c:5361 +#: diff.c:5430 msgid "generate diffstat with a given name width" msgstr "genera diffstat con un nombre de ancho dado" -#: diff.c:5364 +#: diff.c:5433 msgid "generate diffstat with a given graph width" msgstr "genera diffstat con un ancho de graph dado" -#: diff.c:5366 +#: diff.c:5435 msgid "<count>" msgstr "<cantidad>" -#: diff.c:5367 +#: diff.c:5436 msgid "generate diffstat with limited lines" msgstr "genera diffstat con líneas limitadas" -#: diff.c:5370 +#: diff.c:5439 msgid "generate compact summary in diffstat" msgstr "genera un resumen compacto de diffstat" -#: diff.c:5373 +#: diff.c:5442 msgid "output a binary diff that can be applied" msgstr "muestra un diff binario que puede ser aplicado" -#: diff.c:5376 +#: diff.c:5445 msgid "show full pre- and post-image object names on the \"index\" lines" msgstr "" "mostrar todo un pre- y post-image de nombres de objetos en las líneas \"index" "\"" -#: diff.c:5378 +#: diff.c:5447 msgid "show colored diff" msgstr "mostrar diff colorido" -#: diff.c:5379 +#: diff.c:5448 msgid "<kind>" msgstr "<tipo>" -#: diff.c:5380 +#: diff.c:5449 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" @@ -3464,7 +3578,7 @@ msgstr "" "resaltar errores de espacios en blanco en las líneas 'context', 'old' o " "'new' del diff" -#: diff.c:5383 +#: diff.c:5452 msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or " "--numstat" @@ -3472,89 +3586,89 @@ msgstr "" "no consolidar los pathnames y usar NULs como terminadores de campos en --raw " "o --numstat" -#: diff.c:5386 diff.c:5389 diff.c:5392 diff.c:5498 +#: diff.c:5455 diff.c:5458 diff.c:5461 diff.c:5570 msgid "<prefix>" msgstr "<prefijo>" -#: diff.c:5387 +#: diff.c:5456 msgid "show the given source prefix instead of \"a/\"" msgstr "mostrar el prefijo de fuente dado en lugar de \"a/\"" -#: diff.c:5390 +#: diff.c:5459 msgid "show the given destination prefix instead of \"b/\"" msgstr "mostrar el prefijo de destino en lugar de \"b/\"" -#: diff.c:5393 +#: diff.c:5462 msgid "prepend an additional prefix to every line of output" msgstr "anteponer un prefijo adicional a cada línea mostrada" -#: diff.c:5396 +#: diff.c:5465 msgid "do not show any source or destination prefix" msgstr "no mostrar ningún prefijo de fuente o destino" -#: diff.c:5399 +#: diff.c:5468 msgid "show context between diff hunks up to the specified number of lines" msgstr "" "muestra el contexto entre hunks de diff hasta el número especificado de " "líneas" -#: diff.c:5403 diff.c:5408 diff.c:5413 +#: diff.c:5472 diff.c:5477 diff.c:5482 msgid "<char>" msgstr "<char>" -#: diff.c:5404 +#: diff.c:5473 msgid "specify the character to indicate a new line instead of '+'" msgstr "especifica el char para indicar una nueva línea en lugar de '+'" -#: diff.c:5409 +#: diff.c:5478 msgid "specify the character to indicate an old line instead of '-'" msgstr "especifica el char para indicar una línea vieja en lugar de '-'" -#: diff.c:5414 +#: diff.c:5483 msgid "specify the character to indicate a context instead of ' '" msgstr "especifica el char para indicar un contexto en lugar de ' '" -#: diff.c:5417 +#: diff.c:5486 msgid "Diff rename options" msgstr "Opciones de diff rename" -#: diff.c:5418 +#: diff.c:5487 msgid "<n>[/<m>]" msgstr "<n>[/<m>]" -#: diff.c:5419 +#: diff.c:5488 msgid "break complete rewrite changes into pairs of delete and create" msgstr "descomponer los cambios de reescritura en pares de borrar y crear" -#: diff.c:5423 +#: diff.c:5492 msgid "detect renames" msgstr "detectar renombrados" -#: diff.c:5427 +#: diff.c:5496 msgid "omit the preimage for deletes" msgstr "omite la preimage para borrados" -#: diff.c:5430 +#: diff.c:5499 msgid "detect copies" msgstr "detectar copias" -#: diff.c:5434 +#: diff.c:5503 msgid "use unmodified files as source to find copies" msgstr "usa archivos no modificados como fuente para encontrar copias" -#: diff.c:5436 +#: diff.c:5505 msgid "disable rename detection" msgstr "deshabilita detección de renombres" -#: diff.c:5439 +#: diff.c:5508 msgid "use empty blobs as rename source" msgstr "usa blobs vacíos como fuente de renombre" -#: diff.c:5441 +#: diff.c:5510 msgid "continue listing the history of a file beyond renames" msgstr "continua listando el historial de un archivo más allá de renombres" -#: diff.c:5444 +#: diff.c:5513 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" @@ -3562,155 +3676,159 @@ msgstr "" "previene detección de renombre/copias si el número de objetivos para " "renombres/copias excede el límite dado" -#: diff.c:5446 +#: diff.c:5515 msgid "Diff algorithm options" msgstr "Opciones de algoritmos de diff" -#: diff.c:5448 +#: diff.c:5517 msgid "produce the smallest possible diff" msgstr "produce el diff más pequeño posible" -#: diff.c:5451 +#: diff.c:5520 msgid "ignore whitespace when comparing lines" msgstr "ignorar espacios en blanco cuando comparando líneas" -#: diff.c:5454 +#: diff.c:5523 msgid "ignore changes in amount of whitespace" msgstr "ignorar cambios en la cantidad de líneas en blanco" -#: diff.c:5457 +#: diff.c:5526 msgid "ignore changes in whitespace at EOL" msgstr "ignorar cambios en espacios en blanco en EOL" -#: diff.c:5460 +#: diff.c:5529 msgid "ignore carrier-return at the end of line" msgstr "ignora carrier-return al final de la línea" -#: diff.c:5463 +#: diff.c:5532 msgid "ignore changes whose lines are all blank" msgstr "ignora cambios cuyas líneas son todas en blanco" -#: diff.c:5466 +#: diff.c:5534 diff.c:5556 diff.c:5559 diff.c:5604 +msgid "<regex>" +msgstr "<regex>" + +#: diff.c:5535 +msgid "ignore changes whose all lines match <regex>" +msgstr "ignora cambios cuyas líneas concuerdan con <regex>" + +#: diff.c:5538 msgid "heuristic to shift diff hunk boundaries for easy reading" msgstr "heurística para cambiar los límites de hunk para una fácil lectura" -#: diff.c:5469 +#: diff.c:5541 msgid "generate diff using the \"patience diff\" algorithm" msgstr "genera un diff usando algoritmo \"patience diff\"" -#: diff.c:5473 +#: diff.c:5545 msgid "generate diff using the \"histogram diff\" algorithm" msgstr "genera un diff usando algoritmo \"histogram diff\"" -#: diff.c:5475 +#: diff.c:5547 msgid "<algorithm>" msgstr "<algoritmo>" -#: diff.c:5476 +#: diff.c:5548 msgid "choose a diff algorithm" msgstr "escoge un algoritmo para diff" -#: diff.c:5478 +#: diff.c:5550 msgid "<text>" msgstr "<texto>" -#: diff.c:5479 +#: diff.c:5551 msgid "generate diff using the \"anchored diff\" algorithm" msgstr "genera un diff usando algoritmo \"anchored diff\"" -#: diff.c:5481 diff.c:5490 diff.c:5493 +#: diff.c:5553 diff.c:5562 diff.c:5565 msgid "<mode>" msgstr "<modo>" -#: diff.c:5482 +#: diff.c:5554 msgid "show word diff, using <mode> to delimit changed words" msgstr "" "muestra diff por palabras usando <modo> para delimitar las palabras cambiadas" -#: diff.c:5484 diff.c:5487 diff.c:5532 -msgid "<regex>" -msgstr "<regex>" - -#: diff.c:5485 +#: diff.c:5557 msgid "use <regex> to decide what a word is" msgstr "usa <regex> para decidir que palabra es" -#: diff.c:5488 +#: diff.c:5560 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" msgstr "equivalente a --word-diff=color --word-diff-regex=<regex>" -#: diff.c:5491 +#: diff.c:5563 msgid "moved lines of code are colored differently" msgstr "líneas movidas de código están coloreadas diferente" -#: diff.c:5494 +#: diff.c:5566 msgid "how white spaces are ignored in --color-moved" msgstr "como espacios en blanco son ignorados en --color-moved" -#: diff.c:5497 +#: diff.c:5569 msgid "Other diff options" msgstr "Otras opciones de diff" -#: diff.c:5499 +#: diff.c:5571 msgid "when run from subdir, exclude changes outside and show relative paths" msgstr "" "cuando ejecutado desde un subdir, excluye cambios del exterior y muestra " "paths relativos" -#: diff.c:5503 +#: diff.c:5575 msgid "treat all files as text" msgstr "tratar todos los archivos como texto" -#: diff.c:5505 +#: diff.c:5577 msgid "swap two inputs, reverse the diff" msgstr "cambia dos inputs, invierte el diff" -#: diff.c:5507 +#: diff.c:5579 msgid "exit with 1 if there were differences, 0 otherwise" msgstr "termina con 1 si hubieron diferencias, de lo contrario con 0" -#: diff.c:5509 +#: diff.c:5581 msgid "disable all output of the program" msgstr "deshabilita todo el output del programa" -#: diff.c:5511 +#: diff.c:5583 msgid "allow an external diff helper to be executed" msgstr "permite la ejecución de un diff helper externo" -#: diff.c:5513 +#: diff.c:5585 msgid "run external text conversion filters when comparing binary files" msgstr "" "ejecuta filtros de conversión de texto externos cuando comparando binarios" -#: diff.c:5515 +#: diff.c:5587 msgid "<when>" msgstr "<cuando>" -#: diff.c:5516 +#: diff.c:5588 msgid "ignore changes to submodules in the diff generation" msgstr "ignorar cambios a submódulos en la generación de diff" -#: diff.c:5519 +#: diff.c:5591 msgid "<format>" msgstr "<formato>" -#: diff.c:5520 +#: diff.c:5592 msgid "specify how differences in submodules are shown" msgstr "especifica como son mostradas las diferencias en submódulos" -#: diff.c:5524 +#: diff.c:5596 msgid "hide 'git add -N' entries from the index" msgstr "ocultar entradas 'git add -N' del index" -#: diff.c:5527 +#: diff.c:5599 msgid "treat 'git add -N' entries as real in the index" msgstr "trata entradas 'git add -N' como reales en el index" -#: diff.c:5529 +#: diff.c:5601 msgid "<string>" msgstr "<string>" -#: diff.c:5530 +#: diff.c:5602 msgid "" "look for differences that change the number of occurrences of the specified " "string" @@ -3718,7 +3836,7 @@ msgstr "" "busca por diferencias que cambien el número de ocurrencias para el string " "especificado" -#: diff.c:5533 +#: diff.c:5605 msgid "" "look for differences that change the number of occurrences of the specified " "regex" @@ -3726,23 +3844,35 @@ msgstr "" "busca por diferencias que cambien el número de ocurrencias para el regex " "especificado" -#: diff.c:5536 +#: diff.c:5608 msgid "show all changes in the changeset with -S or -G" msgstr "mostrar todos los cambios en el changeset con -S o -G" -#: diff.c:5539 +#: diff.c:5611 msgid "treat <string> in -S as extended POSIX regular expression" msgstr "tratar <string> en -S como una expresión regular extendida de POSIX" -#: diff.c:5542 +#: diff.c:5614 msgid "control the order in which files appear in the output" msgstr "controlar el orden en el que los archivos aparecen en la salida" -#: diff.c:5543 +#: diff.c:5615 diff.c:5618 +msgid "<path>" +msgstr "<ruta>" + +#: diff.c:5616 +msgid "show the change in the specified path first" +msgstr "mostrar el cambio en la ruta especificada primero" + +#: diff.c:5619 +msgid "skip the output to the specified path" +msgstr "saltar el output de la ruta especificada" + +#: diff.c:5621 msgid "<object-id>" msgstr "<id-objeto>" -#: diff.c:5544 +#: diff.c:5622 msgid "" "look for differences that change the number of occurrences of the specified " "object" @@ -3750,33 +3880,33 @@ msgstr "" "busca por diferencias que cambien el número de ocurrencias para el objeto " "especificado" -#: diff.c:5546 +#: diff.c:5624 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]" -#: diff.c:5547 +#: diff.c:5625 msgid "select files by diff type" msgstr "selecciona archivos por tipo de diff" -#: diff.c:5549 +#: diff.c:5627 msgid "<file>" msgstr "<archivo>" -#: diff.c:5550 +#: diff.c:5628 msgid "Output to a specific file" msgstr "Output a un archivo específico" -#: diff.c:6205 +#: diff.c:6285 msgid "inexact rename detection was skipped due to too many files." msgstr "" "detección de cambio de nombre inexacta fue saltada por haber muchos archivos." -#: diff.c:6208 +#: diff.c:6288 msgid "only found copies from modified paths due to too many files." msgstr "" "solo se encontraron copias de rutas modificadas por haber muchos archivos." -#: diff.c:6211 +#: diff.c:6291 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." @@ -3789,65 +3919,70 @@ msgstr "" msgid "failed to read orderfile '%s'" msgstr "falló al leer orden de archivos '%s'" -#: diffcore-rename.c:592 +#: diffcore-rename.c:786 msgid "Performing inexact rename detection" msgstr "Realizando una detección de cambios de nombre inexacta" -#: dir.c:573 +#: diffcore-rotate.c:29 +#, c-format +msgid "No such path '%s' in the diff" +msgstr "No hay ruta '%s' en el diff" + +#: dir.c:578 #, c-format msgid "pathspec '%s' did not match any file(s) known to git" msgstr "" "ruta especificada '%s' no concordó con ningún archivo(s) conocido por git" -#: dir.c:713 dir.c:742 dir.c:755 +#: dir.c:718 dir.c:747 dir.c:760 #, c-format msgid "unrecognized pattern: '%s'" msgstr "patrón desconocido: '%s'" -#: dir.c:772 dir.c:786 +#: dir.c:777 dir.c:791 #, c-format msgid "unrecognized negative pattern: '%s'" msgstr "patrón negativo no reconocido: '%s'" -#: dir.c:804 +#: dir.c:809 #, c-format msgid "your sparse-checkout file may have issues: pattern '%s' is repeated" msgstr "" "tu archivo sparse-checkout tal vez tenga errores: patrón '%s' está repetido" -#: dir.c:814 +#: dir.c:819 msgid "disabling cone pattern matching" msgstr "deshabilitar coincidencia de patrónes cono" -#: dir.c:1191 +#: dir.c:1198 #, c-format msgid "cannot use %s as an exclude file" msgstr "no se puede usar %s como archivo de exclusión" -#: dir.c:2296 +#: dir.c:2305 #, c-format msgid "could not open directory '%s'" msgstr "no se pudo abrir el directorio '%s'" -#: dir.c:2596 +#: dir.c:2605 msgid "failed to get kernel name and information" msgstr "falló al conseguir la información y nombre del kernel" -#: dir.c:2720 +#: dir.c:2729 msgid "untracked cache is disabled on this system or location" msgstr "untracked cache está desactivado en este sistema o ubicación" -#: dir.c:3502 +#: dir.c:3534 #, c-format msgid "index file corrupt in repo %s" msgstr "archivo índice corrompido en repositorio %s" -#: dir.c:3547 dir.c:3552 +#: dir.c:3579 dir.c:3584 #, c-format msgid "could not create directories for %s" msgstr "no se pudo crear directorios para %s" -#: dir.c:3581 +#: dir.c:3613 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "no se pudo migrar el directorio git de '%s' a '%s'" @@ -3866,12 +4001,12 @@ msgstr "Filtrando contenido" msgid "could not stat file '%s'" msgstr "no se pudo establecer el archivo '%s'" -#: environment.c:150 +#: environment.c:152 #, c-format msgid "bad git namespace path \"%s\"" msgstr "ruta de namespace de git mala \"%s\"" -#: environment.c:337 +#: environment.c:335 #, c-format msgid "could not set GIT_DIR to '%s'" msgstr "no se pudo configurar GIT_DIR a '%s'" @@ -3881,260 +4016,264 @@ msgstr "no se pudo configurar GIT_DIR a '%s'" msgid "too many args to run %s" msgstr "demasiados argumentos para correr %s" -#: fetch-pack.c:152 +#: fetch-pack.c:177 msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack: lista poco profunda esperada" -#: fetch-pack.c:155 +#: fetch-pack.c:180 msgid "git fetch-pack: expected a flush packet after shallow list" msgstr "" "git fetch-pack: se esperaba un flush packet luego de la lista superficial" -#: fetch-pack.c:166 +#: fetch-pack.c:191 msgid "git fetch-pack: expected ACK/NAK, got a flush packet" msgstr "git fetch-pack: se esperaba ACK/NAK, se obtuvo un flush packet" -#: fetch-pack.c:186 +#: fetch-pack.c:211 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "git fetch-pack: se esperaba ACK/NAK, se obtuvo '%s'" -#: fetch-pack.c:197 +#: fetch-pack.c:222 msgid "unable to write to remote" msgstr "no se puede escribir al remoto" -#: fetch-pack.c:259 +#: fetch-pack.c:283 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc requiere multi_ack_detailed" -#: fetch-pack.c:358 fetch-pack.c:1408 +#: fetch-pack.c:378 fetch-pack.c:1457 #, c-format msgid "invalid shallow line: %s" msgstr "línea poco profunda inválida: %s" -#: fetch-pack.c:364 fetch-pack.c:1414 +#: fetch-pack.c:384 fetch-pack.c:1463 #, c-format msgid "invalid unshallow line: %s" msgstr "línea superficial inválida: %s" -#: fetch-pack.c:366 fetch-pack.c:1416 +#: fetch-pack.c:386 fetch-pack.c:1465 #, c-format msgid "object not found: %s" msgstr "objeto no encontrado: %s" -#: fetch-pack.c:369 fetch-pack.c:1419 +#: fetch-pack.c:389 fetch-pack.c:1468 #, c-format msgid "error in object: %s" msgstr "error en objeto: %s" -#: fetch-pack.c:371 fetch-pack.c:1421 +#: fetch-pack.c:391 fetch-pack.c:1470 #, c-format msgid "no shallow found: %s" msgstr "superficie no encontrada: %s" -#: fetch-pack.c:374 fetch-pack.c:1425 +#: fetch-pack.c:394 fetch-pack.c:1474 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "se esperaba shallow/unshallow, se obtuvo %s" -#: fetch-pack.c:416 +#: fetch-pack.c:434 #, c-format msgid "got %s %d %s" msgstr "se obtuvo %s %d %s" -#: fetch-pack.c:433 +#: fetch-pack.c:451 #, c-format msgid "invalid commit %s" msgstr "commit inválido %s" -#: fetch-pack.c:464 +#: fetch-pack.c:482 msgid "giving up" msgstr "rindiéndose" -#: fetch-pack.c:477 progress.c:336 +#: fetch-pack.c:495 progress.c:339 msgid "done" msgstr "listo" -#: fetch-pack.c:489 +#: fetch-pack.c:507 #, c-format msgid "got %s (%d) %s" msgstr "se obtuvo %s (%d) %s" -#: fetch-pack.c:535 +#: fetch-pack.c:543 #, c-format msgid "Marking %s as complete" msgstr "Marcando %s como completa" -#: fetch-pack.c:756 +#: fetch-pack.c:758 #, c-format msgid "already have %s (%s)" msgstr "ya se tiene %s (%s)" -#: fetch-pack.c:821 +#: fetch-pack.c:844 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-pack: no se puede extraer un demultiplexor de banda lateral" -#: fetch-pack.c:829 +#: fetch-pack.c:852 msgid "protocol error: bad pack header" msgstr "error de protocolo: paquete de header erróneo" -#: fetch-pack.c:910 +#: fetch-pack.c:946 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-pack: no se puede quitar %s" -#: fetch-pack.c:927 +#: fetch-pack.c:952 +msgid "fetch-pack: invalid index-pack output" +msgstr "fetch-pack: salida de paquete de índice no válida" + +#: fetch-pack.c:969 #, c-format msgid "%s failed" msgstr "%s falló" -#: fetch-pack.c:929 +#: fetch-pack.c:971 msgid "error in sideband demultiplexer" msgstr "error en demultiplexor de banda lateral" -#: fetch-pack.c:976 +#: fetch-pack.c:1031 #, c-format msgid "Server version is %.*s" msgstr "Versión de servidor es %.*s" -#: fetch-pack.c:981 fetch-pack.c:987 fetch-pack.c:990 fetch-pack.c:996 -#: fetch-pack.c:1000 fetch-pack.c:1004 fetch-pack.c:1008 fetch-pack.c:1012 -#: fetch-pack.c:1016 fetch-pack.c:1020 fetch-pack.c:1024 fetch-pack.c:1028 -#: fetch-pack.c:1034 fetch-pack.c:1040 fetch-pack.c:1045 fetch-pack.c:1050 +#: fetch-pack.c:1039 fetch-pack.c:1045 fetch-pack.c:1048 fetch-pack.c:1054 +#: fetch-pack.c:1058 fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 +#: fetch-pack.c:1074 fetch-pack.c:1078 fetch-pack.c:1082 fetch-pack.c:1086 +#: fetch-pack.c:1092 fetch-pack.c:1098 fetch-pack.c:1103 fetch-pack.c:1108 #, c-format msgid "Server supports %s" msgstr "El servidor soporta %s" -#: fetch-pack.c:983 +#: fetch-pack.c:1041 msgid "Server does not support shallow clients" msgstr "El servidor no soporta clientes superficiales" -#: fetch-pack.c:1043 +#: fetch-pack.c:1101 msgid "Server does not support --shallow-since" msgstr "El servidor no soporta --shalow-since" -#: fetch-pack.c:1048 +#: fetch-pack.c:1106 msgid "Server does not support --shallow-exclude" msgstr "El servidor no soporta --shalow-exclude" -#: fetch-pack.c:1052 +#: fetch-pack.c:1110 msgid "Server does not support --deepen" msgstr "El servidor no soporta --deepen" -#: fetch-pack.c:1054 +#: fetch-pack.c:1112 msgid "Server does not support this repository's object format" msgstr "El servidor no soporta el formato de objetos de este repositorio" -#: fetch-pack.c:1071 +#: fetch-pack.c:1125 msgid "no common commits" msgstr "no hay commits comunes" -#: fetch-pack.c:1083 fetch-pack.c:1639 +#: fetch-pack.c:1138 fetch-pack.c:1682 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack: fetch falló." -#: fetch-pack.c:1211 +#: fetch-pack.c:1265 #, c-format msgid "mismatched algorithms: client %s; server %s" msgstr "algoritmos no compatibles: cliente %s; servidor %s" -#: fetch-pack.c:1215 +#: fetch-pack.c:1269 #, c-format msgid "the server does not support algorithm '%s'" msgstr "servidor no soporta el algoritmo '%s'" -#: fetch-pack.c:1235 +#: fetch-pack.c:1289 msgid "Server does not support shallow requests" msgstr "El servidor no soporta peticiones superficiales" -#: fetch-pack.c:1242 +#: fetch-pack.c:1296 msgid "Server supports filter" msgstr "El servidor soporta filtro" -#: fetch-pack.c:1286 +#: fetch-pack.c:1335 msgid "unable to write request to remote" msgstr "no se puede escribir request al remoto" -#: fetch-pack.c:1304 +#: fetch-pack.c:1353 #, c-format msgid "error reading section header '%s'" msgstr "error leyendo sección header '%s'" -#: fetch-pack.c:1310 +#: fetch-pack.c:1359 #, c-format msgid "expected '%s', received '%s'" msgstr "se esperaba '%s', se recibió '%s'" -#: fetch-pack.c:1371 +#: fetch-pack.c:1420 #, c-format msgid "unexpected acknowledgment line: '%s'" msgstr "línea de confirmación inesperada: '%s'" -#: fetch-pack.c:1376 +#: fetch-pack.c:1425 #, c-format msgid "error processing acks: %d" msgstr "error procesando acks: %d" -#: fetch-pack.c:1386 +#: fetch-pack.c:1435 msgid "expected packfile to be sent after 'ready'" msgstr "espere que el packfile sea mandado luego del 'listo'" -#: fetch-pack.c:1388 +#: fetch-pack.c:1437 msgid "expected no other sections to be sent after no 'ready'" msgstr "espere que ninguna otra sección sea enviada luego del 'listo'" -#: fetch-pack.c:1430 +#: fetch-pack.c:1479 #, c-format msgid "error processing shallow info: %d" msgstr "error procesando información superficial: %d" -#: fetch-pack.c:1477 +#: fetch-pack.c:1526 #, c-format msgid "expected wanted-ref, got '%s'" msgstr "se esperaba wanted-ref, se obtuvo '%s'" -#: fetch-pack.c:1482 +#: fetch-pack.c:1531 #, c-format msgid "unexpected wanted-ref: '%s'" msgstr "wanted-ref inesperado: '%s'" -#: fetch-pack.c:1487 +#: fetch-pack.c:1536 #, c-format msgid "error processing wanted refs: %d" msgstr "error procesando refs deseadas: %d" -#: fetch-pack.c:1517 +#: fetch-pack.c:1566 msgid "git fetch-pack: expected response end packet" msgstr "git fetch-pack: se espera un paquete final de respuesta" -#: fetch-pack.c:1921 +#: fetch-pack.c:1960 msgid "no matching remote head" msgstr "no concuerda el head remoto" -#: fetch-pack.c:1944 builtin/clone.c:692 +#: fetch-pack.c:1983 builtin/clone.c:693 msgid "remote did not send all necessary objects" msgstr "remoto no mando todos los objetos necesarios" -#: fetch-pack.c:1971 +#: fetch-pack.c:2010 #, c-format msgid "no such remote ref %s" msgstr "no existe ref remota %s" -#: fetch-pack.c:1974 +#: fetch-pack.c:2013 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "El servidor no permite solicitudes de objetos inadvertidos %s" -#: gpg-interface.c:272 +#: gpg-interface.c:273 msgid "could not create temporary file" msgstr "no se pudo crear archivo temporal" -#: gpg-interface.c:275 +#: gpg-interface.c:276 #, c-format msgid "failed writing detached signature to '%s'" msgstr "falló al escribir la firma separada para '%s'" -#: gpg-interface.c:457 +#: gpg-interface.c:470 msgid "gpg failed to sign the data" msgstr "gpg falló al firmar la data" @@ -4143,7 +4282,7 @@ msgstr "gpg falló al firmar la data" msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "ignora color inválido '%.*s' en log.graphColors" -#: grep.c:668 +#: grep.c:543 msgid "" "given pattern contains NULL byte (via -f <file>). This is only supported " "with -P under PCRE v2" @@ -4151,18 +4290,18 @@ msgstr "" "el patrón provisto contiene bytes NULL (via -f <archivo>). Esto solo es " "soportado con -P bajo PCRE v2" -#: grep.c:2128 +#: grep.c:1906 #, c-format msgid "'%s': unable to read %s" msgstr "'%s': no es posible leer %s" -#: grep.c:2145 setup.c:176 builtin/clone.c:411 builtin/diff.c:89 +#: grep.c:1923 setup.c:176 builtin/clone.c:412 builtin/diff.c:90 #: builtin/rm.c:135 #, c-format msgid "failed to stat '%s'" msgstr "falló al marcar '%s'" -#: grep.c:2156 +#: grep.c:1934 #, c-format msgid "'%s': short read" msgstr "'%s': lectura corta" @@ -4219,41 +4358,41 @@ msgstr "Comandos de bajo nivel / Sincronización de repositorios" msgid "Low-level Commands / Internal Helpers" msgstr "Comandos de bajo nivel / Auxiliares internos" -#: help.c:298 +#: help.c:300 #, c-format msgid "available git commands in '%s'" msgstr "comandos disponibles de git en '%s'" -#: help.c:305 +#: help.c:307 msgid "git commands available from elsewhere on your $PATH" msgstr "comandos disponibles de git desde otro lugar en tu $PATH" -#: help.c:314 +#: help.c:316 msgid "These are common Git commands used in various situations:" msgstr "Estos son comandos comunes de Git usados en varias situaciones:" -#: help.c:363 git.c:99 +#: help.c:365 git.c:100 #, c-format msgid "unsupported command listing type '%s'" msgstr "comando de listado de tipos no soportado '%s'" -#: help.c:403 -msgid "The common Git guides are:" -msgstr "Las guías comunes de Git son:" +#: help.c:405 +msgid "The Git concept guides are:" +msgstr "Las guías de conceptos de Git son:" -#: help.c:427 +#: help.c:429 msgid "See 'git help <command>' to read about a specific subcommand" msgstr "Vea 'git help <comando>' para leer sobre los subcomandos específicos" -#: help.c:432 +#: help.c:434 msgid "External commands" msgstr "Comandos externos" -#: help.c:447 +#: help.c:449 msgid "Command aliases" msgstr "Aliases de comando" -#: help.c:511 +#: help.c:527 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" @@ -4262,31 +4401,31 @@ msgstr "" "'%s' parece ser un comando de git, pero no hemos\n" "podido ejecutarlo. ¿Tal vez git-%s se ha roto?" -#: help.c:570 +#: help.c:543 help.c:631 +#, c-format +msgid "git: '%s' is not a git command. See 'git --help'." +msgstr "git: '%s'no es un comando de git. Mira 'git --help'." + +#: help.c:591 msgid "Uh oh. Your system reports no Git commands at all." msgstr "Oh oh. Tu sistema no reporta ningún comando de Git." -#: help.c:592 +#: help.c:613 #, c-format msgid "WARNING: You called a Git command named '%s', which does not exist." msgstr "PELIGRO: Has llamado a un comando de Git '%s', el cual no existe." -#: help.c:597 +#: help.c:618 #, c-format msgid "Continuing under the assumption that you meant '%s'." msgstr "Continuando asumiendo que quisiste decir '%s'." -#: help.c:602 +#: help.c:623 #, c-format msgid "Continuing in %0.1f seconds, assuming that you meant '%s'." msgstr "Continuando en %0.1f segundos, asumiendo que tu dijiste '%s'." -#: help.c:610 -#, c-format -msgid "git: '%s' is not a git command. See 'git --help'." -msgstr "git: '%s'no es un comando de git. Mira 'git --help'." - -#: help.c:614 +#: help.c:635 msgid "" "\n" "The most similar command is" @@ -4300,16 +4439,16 @@ msgstr[1] "" "\n" "Los comandos más similares son" -#: help.c:654 +#: help.c:675 msgid "git version [<options>]" msgstr "git versión [<opciones>]" -#: help.c:709 +#: help.c:730 #, c-format msgid "%s: %s - %s" msgstr "%s: %s - %s" -#: help.c:713 +#: help.c:734 msgid "" "\n" "Did you mean this?" @@ -4323,7 +4462,15 @@ msgstr[1] "" "\n" "¿Quisiste decir alguno de estos?" -#: ident.c:349 +#: ident.c:353 +msgid "Author identity unknown\n" +msgstr "Identidad del autor desconocido\n" + +#: ident.c:356 +msgid "Committer identity unknown\n" +msgstr "Se desconoce la identidad del autor\n" + +#: ident.c:362 msgid "" "\n" "*** Please tell me who you are.\n" @@ -4349,66 +4496,66 @@ msgstr "" "Omite --global para configurar tu identidad solo en este repositorio.\n" "\n" -#: ident.c:379 +#: ident.c:397 msgid "no email was given and auto-detection is disabled" msgstr "no se entrego ningún email y la detección automática está desactivada" -#: ident.c:384 +#: ident.c:402 #, c-format msgid "unable to auto-detect email address (got '%s')" msgstr "no es posible auto-detectar la dirección de correo (se obtuvo '%s')" -#: ident.c:401 +#: ident.c:419 msgid "no name was given and auto-detection is disabled" msgstr "no se entrego ningún nombre y la detección automática está desactivada" -#: ident.c:407 +#: ident.c:425 #, c-format msgid "unable to auto-detect name (got '%s')" msgstr "no es posible auto-detectar el nombre (se obtuvo '%s')" -#: ident.c:415 +#: ident.c:433 #, c-format msgid "empty ident name (for <%s>) not allowed" msgstr "no se puede tener un nombre vacío (para <%s>)" -#: ident.c:421 +#: ident.c:439 #, c-format msgid "name consists only of disallowed characters: %s" msgstr "el nombre consiste solo de caracteres no permitidos: %s" -#: ident.c:436 builtin/commit.c:634 +#: ident.c:454 builtin/commit.c:634 #, c-format msgid "invalid date format: %s" msgstr "formato de fecha inválido: %s" -#: list-objects-filter-options.c:58 +#: list-objects-filter-options.c:81 msgid "expected 'tree:<depth>'" msgstr "se esperaba 'tree:<depth>'" -#: list-objects-filter-options.c:73 +#: list-objects-filter-options.c:96 msgid "sparse:path filters support has been dropped" msgstr "soporte para filtros sparse:path ha sido discontinuado" -#: list-objects-filter-options.c:86 +#: list-objects-filter-options.c:109 #, c-format msgid "invalid filter-spec '%s'" msgstr "filtro -spec inválido '%s'" -#: list-objects-filter-options.c:102 +#: list-objects-filter-options.c:125 #, c-format msgid "must escape char in sub-filter-spec: '%c'" msgstr "tienes que escapar el caracter en sub-filter-spec: '%c'" -#: list-objects-filter-options.c:144 +#: list-objects-filter-options.c:167 msgid "expected something after combine:" msgstr "se espera algo luego de combine:" -#: list-objects-filter-options.c:226 +#: list-objects-filter-options.c:249 msgid "multiple filter-specs cannot be combined" msgstr "no se pueden combinar múltiples tipos de especificaciones de filtro" -#: list-objects-filter-options.c:330 +#: list-objects-filter-options.c:361 msgid "unable to upgrade repository format to support partial clone" msgstr "" "no es posible actualizar el formato del repositorio para soportar clonado " @@ -4464,10 +4611,266 @@ msgstr "" msgid "Unable to create '%s.lock': %s" msgstr "No se pudo crear '%s.lock': %s" -#: ls-refs.c:109 +#: ls-refs.c:37 +#, c-format +msgid "invalid value '%s' for lsrefs.unborn" +msgstr "valor inválido '%s' para lsrefs.unborn" + +#: ls-refs.c:167 msgid "expected flush after ls-refs arguments" msgstr "se esperaba un flush luego de argumentos ls-refs" +#: merge-ort.c:888 merge-recursive.c:1191 +#, c-format +msgid "Failed to merge submodule %s (not checked out)" +msgstr "Falló al fusionar el submódulo %s (no revisado)" + +#: merge-ort.c:897 merge-recursive.c:1198 +#, c-format +msgid "Failed to merge submodule %s (commits not present)" +msgstr "Falló al fusionar el submódulo %s (commits no presentes)" + +#: merge-ort.c:906 merge-recursive.c:1205 +#, c-format +msgid "Failed to merge submodule %s (commits don't follow merge-base)" +msgstr "Falló el fusionar submódulo %s (commits no siguen la fusión base)" + +#: merge-ort.c:916 merge-ort.c:923 +#, c-format +msgid "Note: Fast-forwarding submodule %s to %s" +msgstr "Nota: Fast-forward de submódulo %s a %s" + +#: merge-ort.c:944 +#, c-format +msgid "Failed to merge submodule %s" +msgstr "falló al fusionar el submódulo %s" + +#: merge-ort.c:951 +#, c-format +msgid "" +"Failed to merge submodule %s, but a possible merge resolution exists:\n" +"%s\n" +msgstr "" +"Falló al fusionar el submódulo %s, pero existen posibles soluciones de " +"fusión:\n" +"%s\n" + +#: merge-ort.c:955 merge-recursive.c:1259 +#, c-format +msgid "" +"If this is correct simply add it to the index for example\n" +"by using:\n" +"\n" +" git update-index --cacheinfo 160000 %s \"%s\"\n" +"\n" +"which will accept this suggestion.\n" +msgstr "" +"Si esto es correcto simplemente agrégalo al índice por ejemplo\n" +"usando:\n" +"\n" +" git update-index --cacheinfo 160000 %s \"%s\"\n" +"\n" +"el cual aceptará esta sugerencia.\n" + +#: merge-ort.c:968 +#, c-format +msgid "" +"Failed to merge submodule %s, but multiple possible merges exist:\n" +"%s" +msgstr "" +"Falló al fusionar el submódulo %s, pero existen múltipes fusiones posibles:\n" +"%s" + +#: merge-ort.c:1127 merge-recursive.c:1341 +msgid "Failed to execute internal merge" +msgstr "Falló al ejecutar la fusión interna" + +#: merge-ort.c:1132 merge-recursive.c:1346 +#, c-format +msgid "Unable to add %s to database" +msgstr "No es posible agregar %s a la base de datos" + +#: merge-ort.c:1139 merge-recursive.c:1378 +#, c-format +msgid "Auto-merging %s" +msgstr "Auto-fusionando %s" + +#: merge-ort.c:1278 merge-recursive.c:2100 +#, c-format +msgid "" +"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " +"implicit directory rename(s) putting the following path(s) there: %s." +msgstr "" +"CONFLICTO (cambio de nombre de directorio implícito): Archivo/directorio " +"existente en %s se interpone con el cambio de nombres implícito, poniendo " +"la(s) siguiente(s) ruta(s) aquí: %s." + +#: merge-ort.c:1288 merge-recursive.c:2110 +#, c-format +msgid "" +"CONFLICT (implicit dir rename): Cannot map more than one path to %s; " +"implicit directory renames tried to put these paths there: %s" +msgstr "" +"CONFLICTO (cambio de nombre implícito): No se puede mapear más de una ruta " +"para %s; cambio de nombre implícito intentó poner estas rutas: %s" + +#: merge-ort.c:1471 +#, c-format +msgid "" +"CONFLICT (directory rename split): Unclear where to rename %s to; it was " +"renamed to multiple other directories, with no destination getting a " +"majority of the files." +msgstr "" +"CONFLICTO (división de cambio de nombre de directorio): No está claro dónde " +"cambiar el nombre de %s; se le cambió el nombre a varios otros directorios, " +"sin que ningún destino obtenga la mayoría de los archivos." + +#: merge-ort.c:1637 merge-recursive.c:2447 +#, c-format +msgid "" +"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " +"renamed." +msgstr "" +"PELIGRO: Evitando aplicar %s -> %s renombrado a %s, porque %s mismo fue " +"renombrado." + +#: merge-ort.c:1781 merge-recursive.c:3215 +#, c-format +msgid "" +"Path updated: %s added in %s inside a directory that was renamed in %s; " +"moving it to %s." +msgstr "" +"Path actualizado: %s agregado en %s dentro de un directorio que fue " +"renombrado en %s; moviéndolo a %s." + +#: merge-ort.c:1788 merge-recursive.c:3222 +#, c-format +msgid "" +"Path updated: %s renamed to %s in %s, inside a directory that was renamed in " +"%s; moving it to %s." +msgstr "" +"Path actualizado: %s renombrado a %s en %s, dentro de un directorio que fue " +"renombrado en %s; moviéndolo a %s." + +#: merge-ort.c:1801 merge-recursive.c:3218 +#, c-format +msgid "" +"CONFLICT (file location): %s added in %s inside a directory that was renamed " +"in %s, suggesting it should perhaps be moved to %s." +msgstr "" +"CONFLICTO (ubicación de archivo): %s agregado en %s dentro de un directorio " +"que fue renombrado en %s, sugerimos que debería ser movido a %s." + +#: merge-ort.c:1809 merge-recursive.c:3225 +#, c-format +msgid "" +"CONFLICT (file location): %s renamed to %s in %s, inside a directory that " +"was renamed in %s, suggesting it should perhaps be moved to %s." +msgstr "" +"CONFLICTO (ubicación de archivo): %s renombrado a %s en %s, dentro de un " +"directorio que fue renombrado en %s, sugiriendo que tal vez debería ser " +"movido a %s." + +#: merge-ort.c:1952 +#, c-format +msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s." +msgstr "" +"CONFLICTO (renombrar / renombrar): %s renombrado a %s en %s y %s en %s." + +#: merge-ort.c:2047 +#, c-format +msgid "" +"CONFLICT (rename involved in collision): rename of %s -> %s has content " +"conflicts AND collides with another path; this may result in nested conflict " +"markers." +msgstr "" +"CONFLICTO (cambio de nombre involucrado en colisión): cambio de nombre de%s -" +">%s tiene conflictos de contenido Y colisiona con otra ruta; esto puede " +"resultar en marcadores de conflicto anidados." + +#: merge-ort.c:2066 merge-ort.c:2090 +#, c-format +msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s." +msgstr "" +"CONFLICTO (renombrar / eliminar): %s renombrado a %s en %s, pero eliminado " +"en %s." + +#: merge-ort.c:2735 +#, c-format +msgid "" +"CONFLICT (file/directory): directory in the way of %s from %s; moving it to " +"%s instead." +msgstr "" +"CONFLICTO (archivo / directorio): directorio en el camino de%s de%s; " +"moviéndolo a%s en su lugar." + +#: merge-ort.c:2808 +#, c-format +msgid "" +"CONFLICT (distinct types): %s had different types on each side; renamed %s " +"of them so each can be recorded somewhere." +msgstr "" +"CONFLICTO (tipos distintos):%s tenía tipos diferentes en cada lado; " +"renombrado%s de ellos para que cada uno pueda ser grabado en algún lugar." + +#: merge-ort.c:2812 +msgid "both" +msgstr "ambos" + +#: merge-ort.c:2812 +msgid "one" +msgstr "uno" + +#: merge-ort.c:2907 merge-recursive.c:3052 +msgid "content" +msgstr "contenido" + +#: merge-ort.c:2909 merge-recursive.c:3056 +msgid "add/add" +msgstr "agregar/agregar" + +#: merge-ort.c:2911 merge-recursive.c:3101 +msgid "submodule" +msgstr "submódulo" + +#: merge-ort.c:2913 merge-recursive.c:3102 +#, c-format +msgid "CONFLICT (%s): Merge conflict in %s" +msgstr "CONFLICTO (%s): Conflicto de fusión en %s" + +#: merge-ort.c:2938 +#, c-format +msgid "" +"CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s " +"of %s left in tree." +msgstr "" +"CONFLICTO (modificar / eliminar): %s eliminado en %s y modificado en %s. " +"Versión %s de %s restante en el árbol." + +#. TRANSLATORS: The %s arguments are: 1) tree hash of a merge +#. base, and 2-3) the trees for the two trees we're merging. +#. +#: merge-ort.c:3406 +#, c-format +msgid "collecting merge info failed for trees %s, %s, %s" +msgstr "" +"La recopilación de información de fusión falló para los árboles %s, %s, %s" + +#: merge-ort-wrappers.c:13 merge-recursive.c:3661 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +" %s" +msgstr "" +"Los cambios locales de los siguientes archivos serán sobreescritos por " +"merge:\n" +" %s" + +#: merge-ort-wrappers.c:33 merge-recursive.c:3436 +#, c-format +msgid "Already up to date!" +msgstr "¡Ya está actualizado!" + #: merge-recursive.c:356 msgid "(bad commit)\n" msgstr "(commit erróneo)\n" @@ -4526,21 +4929,6 @@ msgstr "falló al crear el enlace simbólico '%s': %s" msgid "do not know what to do with %06o %s '%s'" msgstr "no se que hacer con %06o %s '%s'" -#: merge-recursive.c:1191 -#, c-format -msgid "Failed to merge submodule %s (not checked out)" -msgstr "Falló al fusionar el submódulo %s (no revisado)" - -#: merge-recursive.c:1198 -#, c-format -msgid "Failed to merge submodule %s (commits not present)" -msgstr "Falló al fusionar el submódulo %s (commits no presentes)" - -#: merge-recursive.c:1205 -#, c-format -msgid "Failed to merge submodule %s (commits don't follow merge-base)" -msgstr "Falló el fusionar submódulo %s (commits no siguen la fusión base)" - #: merge-recursive.c:1213 merge-recursive.c:1225 #, c-format msgid "Fast-forwarding submodule %s to the following commit:" @@ -4566,42 +4954,11 @@ msgstr "Falló al fusionar el submódulo %s (no es posible avance rápido)" msgid "Found a possible merge resolution for the submodule:\n" msgstr "Se encontró una posible solución de fusión para el submódulo:\n" -#: merge-recursive.c:1259 -#, c-format -msgid "" -"If this is correct simply add it to the index for example\n" -"by using:\n" -"\n" -" git update-index --cacheinfo 160000 %s \"%s\"\n" -"\n" -"which will accept this suggestion.\n" -msgstr "" -"Si esto es correcto simplemente agrégalo al índice por ejemplo\n" -"usando:\n" -"\n" -" git update-index --cacheinfo 160000 %s \"%s\"\n" -"\n" -"el cual aceptará esta sugerencia.\n" - #: merge-recursive.c:1268 #, c-format msgid "Failed to merge submodule %s (multiple merges found)" msgstr "Falló al fusionar el submódulo %s (fusiones múltiples encontradas)" -#: merge-recursive.c:1341 -msgid "Failed to execute internal merge" -msgstr "Falló al ejecutar la fusión interna" - -#: merge-recursive.c:1346 -#, c-format -msgid "Unable to add %s to database" -msgstr "No es posible agregar %s a la base de datos" - -#: merge-recursive.c:1378 -#, c-format -msgid "Auto-merging %s" -msgstr "Auto-fusionando %s" - #: merge-recursive.c:1402 #, c-format msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." @@ -4713,25 +5070,6 @@ msgstr "" "colocar %s porque el directorio %s fue renombrado a otros múltiples " "directorios, sin ningún que contenga la mayoría de archivos." -#: merge-recursive.c:2100 -#, c-format -msgid "" -"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " -"implicit directory rename(s) putting the following path(s) there: %s." -msgstr "" -"CONFLICTO (cambio de nombre de directorio implícito): Archivo/directorio " -"existente en %s se interpone con el cambio de nombres implícito, poniendo " -"la(s) siguiente(s) ruta(s) aquí: %s." - -#: merge-recursive.c:2110 -#, c-format -msgid "" -"CONFLICT (implicit dir rename): Cannot map more than one path to %s; " -"implicit directory renames tried to put these paths there: %s" -msgstr "" -"CONFLICTO (cambio de nombre implícito): No se puede mapear más de una ruta " -"para %s; cambio de nombre implícito intentó poner estas rutas: %s" - #: merge-recursive.c:2202 #, c-format msgid "" @@ -4741,15 +5079,6 @@ msgstr "" "CONFLICTO (renombrar/renombrar): Renombrar directorio %s->%s en %s. " "Renombrar directorio %s->%s en %s" -#: merge-recursive.c:2447 -#, c-format -msgid "" -"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " -"renamed." -msgstr "" -"PELIGRO: Evitando aplicar %s -> %s renombrado a %s, porque %s mismo fue " -"renombrado." - #: merge-recursive.c:2973 #, c-format msgid "cannot read object %s" @@ -4768,70 +5097,16 @@ msgstr "modificar" msgid "modified" msgstr "modificado" -#: merge-recursive.c:3052 -msgid "content" -msgstr "contenido" - -#: merge-recursive.c:3056 -msgid "add/add" -msgstr "agregar/agregar" - #: merge-recursive.c:3079 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "Saltado %s (fusionado como existente)" -#: merge-recursive.c:3101 git-submodule.sh:959 -msgid "submodule" -msgstr "submódulo" - -#: merge-recursive.c:3102 -#, c-format -msgid "CONFLICT (%s): Merge conflict in %s" -msgstr "CONFLICTO (%s): Conflicto de fusión en %s" - #: merge-recursive.c:3132 #, c-format msgid "Adding as %s instead" msgstr "Agregando más bien como %s" -#: merge-recursive.c:3215 -#, c-format -msgid "" -"Path updated: %s added in %s inside a directory that was renamed in %s; " -"moving it to %s." -msgstr "" -"Path actualizado: %s agregado en %s dentro de un directorio que fue " -"renombrado en %s; moviéndolo a %s." - -#: merge-recursive.c:3218 -#, c-format -msgid "" -"CONFLICT (file location): %s added in %s inside a directory that was renamed " -"in %s, suggesting it should perhaps be moved to %s." -msgstr "" -"CONFLICTO (ubicación de archivo): %s agregado en %s dentro de un directorio " -"que fue renombrado en %s, sugerimos que debería ser movido a %s." - -#: merge-recursive.c:3222 -#, c-format -msgid "" -"Path updated: %s renamed to %s in %s, inside a directory that was renamed in " -"%s; moving it to %s." -msgstr "" -"Path actualizado: %s renombrado a %s en %s, dentro de un directorio que fue " -"renombrado en %s; moviéndolo a %s." - -#: merge-recursive.c:3225 -#, c-format -msgid "" -"CONFLICT (file location): %s renamed to %s in %s, inside a directory that " -"was renamed in %s, suggesting it should perhaps be moved to %s." -msgstr "" -"CONFLICTO (ubicación de archivo): %s renombrado a %s en %s, dentro de un " -"directorio que fue renombrado en %s, sugiriendo que tal vez debería ser " -"movido a %s." - #: merge-recursive.c:3339 #, c-format msgid "Removing %s" @@ -4862,46 +5137,33 @@ msgstr "Agregando %s" msgid "CONFLICT (add/add): Merge conflict in %s" msgstr "CONFLICTO (add/add): Conflicto de merge en %s" -#: merge-recursive.c:3436 -msgid "Already up to date!" -msgstr "¡Ya está actualizado!" - #: merge-recursive.c:3445 #, c-format msgid "merging of trees %s and %s failed" msgstr "falló la fusión de los árboles %s y %s" -#: merge-recursive.c:3549 +#: merge-recursive.c:3539 msgid "Merging:" msgstr "Fusionando:" -#: merge-recursive.c:3562 +#: merge-recursive.c:3552 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "se encontró %u ancestro común:" msgstr[1] "se encontraron %u ancestros comunes:" -#: merge-recursive.c:3612 +#: merge-recursive.c:3602 msgid "merge returned no commit" msgstr "la fusión no devolvió ningún commit" -#: merge-recursive.c:3671 -#, c-format -msgid "" -"Your local changes to the following files would be overwritten by merge:\n" -" %s" -msgstr "" -"Los cambios locales de los siguientes archivos serán sobreescritos por " -"merge:\n" -" %s" - -#: merge-recursive.c:3768 +#: merge-recursive.c:3758 #, c-format msgid "Could not parse object '%s'" msgstr "No se pudo analizar el objeto '%s'" -#: merge-recursive.c:3786 builtin/merge.c:705 builtin/merge.c:885 +#: merge-recursive.c:3776 builtin/merge.c:712 builtin/merge.c:896 +#: builtin/stash.c:471 msgid "Unable to write index." msgstr "Incapaz de escribir el índice." @@ -4909,187 +5171,181 @@ msgstr "Incapaz de escribir el índice." msgid "failed to read the cache" msgstr "falló al leer la cache" -#: merge.c:108 rerere.c:720 builtin/am.c:1878 builtin/am.c:1912 -#: builtin/checkout.c:559 builtin/checkout.c:822 builtin/clone.c:816 +#: merge.c:109 rerere.c:704 builtin/am.c:1883 builtin/am.c:1917 +#: builtin/checkout.c:575 builtin/checkout.c:828 builtin/clone.c:817 #: builtin/stash.c:265 msgid "unable to write new index file" msgstr "no es posible escribir el archivo índice" -#: midx.c:68 +#: midx.c:62 +msgid "multi-pack-index OID fanout is of the wrong size" +msgstr "" +"El abanico de OID de índice de paquetes múltiples es del tamaño incorrecto" + +#: midx.c:93 #, c-format msgid "multi-pack-index file %s is too small" msgstr "archivo multi-pack-index %s es muy pequeño" -#: midx.c:84 +#: midx.c:109 #, c-format msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x" msgstr "firma de multi-pack-index 0x%08x no concuerda con firma 0x%08x" -#: midx.c:89 +#: midx.c:114 #, c-format msgid "multi-pack-index version %d not recognized" msgstr "versión %d de multi-pack-index no reconocida" -#: midx.c:94 +#: midx.c:119 #, c-format -msgid "hash version %u does not match" -msgstr "versión de hash %u no concuerda" - -#: midx.c:108 -msgid "invalid chunk offset (too large)" -msgstr "offset inválido del conjunto (muy grande)" - -#: midx.c:132 -msgid "terminating multi-pack-index chunk id appears earlier than expected" +msgid "multi-pack-index hash version %u does not match version %u" msgstr "" -"terminando multi-pack-index porque el id del conjunto aparece antes de lo " -"esperado" +"La versión de hash de índice de paquetes múltiples %u no coincide con la " +"versión %u" -#: midx.c:145 +#: midx.c:136 msgid "multi-pack-index missing required pack-name chunk" msgstr "multi-pack-index le falta el conjunto pack-name requerido" -#: midx.c:147 +#: midx.c:138 msgid "multi-pack-index missing required OID fanout chunk" msgstr "multi-pack-index le falta el conjunto OID fanout requerido" -#: midx.c:149 +#: midx.c:140 msgid "multi-pack-index missing required OID lookup chunk" msgstr "multi-pack-index le falta el conjunto OID fanout requerido" -#: midx.c:151 +#: midx.c:142 msgid "multi-pack-index missing required object offsets chunk" msgstr "multi-pack-index le falta el conjunto de offset del objeto requerido" -#: midx.c:165 +#: midx.c:158 #, c-format msgid "multi-pack-index pack names out of order: '%s' before '%s'" msgstr "multi-pack-index nombres de paquete fuera de orden:'%s' antes '%s'" -#: midx.c:208 +#: midx.c:202 #, c-format msgid "bad pack-int-id: %u (%u total packs)" msgstr "mal pack-int-id: %u (%u paquetes totales)" -#: midx.c:258 +#: midx.c:252 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" msgstr "multi-pack-index guarda un offset de 64-bit, pero off_t es muy pequeño" -#: midx.c:286 -msgid "error preparing packfile from multi-pack-index" -msgstr "error preparando packfile de multi-pack-index" - -#: midx.c:470 +#: midx.c:467 #, c-format msgid "failed to add packfile '%s'" msgstr "falló al agregar packfile '%s'" -#: midx.c:476 +#: midx.c:473 #, c-format msgid "failed to open pack-index '%s'" msgstr "falló al abrir pack-index '%s'" -#: midx.c:536 +#: midx.c:533 #, c-format msgid "failed to locate object %d in packfile" msgstr "falló al ubicar objeto %d en packfile" -#: midx.c:840 +#: midx.c:821 msgid "Adding packfiles to multi-pack-index" msgstr "Agregando packfiles a multi-pack-index" -#: midx.c:873 +#: midx.c:855 #, c-format msgid "did not see pack-file %s to drop" msgstr "no se vió pack-file %s caer" -#: midx.c:925 +#: midx.c:904 msgid "no pack files to index." msgstr "no hay archivos pack para indexar." -#: midx.c:977 -msgid "Writing chunks to multi-pack-index" -msgstr "Escribiendo chunks a multi-pack-index" - -#: midx.c:1056 +#: midx.c:965 #, c-format msgid "failed to clear multi-pack-index at %s" msgstr "falló al limpiar multi-pack-index en %s" -#: midx.c:1112 +#: midx.c:1021 +msgid "multi-pack-index file exists, but failed to parse" +msgstr "" +"El archivo de índice de paquetes múltiples existe, pero no se pudo analizar" + +#: midx.c:1029 msgid "Looking for referenced packfiles" msgstr "Buscando por packfiles referidos" -#: midx.c:1127 +#: midx.c:1044 #, c-format msgid "" "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" msgstr "" "oid fanout fuera de orden: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" -#: midx.c:1132 +#: midx.c:1049 msgid "the midx contains no oid" msgstr "el midx no contiene oid" -#: midx.c:1141 +#: midx.c:1058 msgid "Verifying OID order in multi-pack-index" msgstr "Verificando orden de OID en multi-pack-index" -#: midx.c:1150 +#: midx.c:1067 #, c-format msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" msgstr "oid lookup fuera de orden: oid[%d] = %s >= %s = oid[%d]" -#: midx.c:1170 +#: midx.c:1087 msgid "Sorting objects by packfile" msgstr "Ordenando objetos por packfile" -#: midx.c:1177 +#: midx.c:1094 msgid "Verifying object offsets" msgstr "Verificando offsets de objetos" -#: midx.c:1193 +#: midx.c:1110 #, c-format msgid "failed to load pack entry for oid[%d] = %s" msgstr "fallo al cargar entrada pack para oid[%d] = %s" -#: midx.c:1199 +#: midx.c:1116 #, c-format msgid "failed to load pack-index for packfile %s" msgstr "falló al cargar el pack-index para packfile %s" -#: midx.c:1208 +#: midx.c:1125 #, c-format msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>" msgstr "offset para objeto incorrecto oid[%d] = %s: %<PRIx64> != %<PRIx64>" -#: midx.c:1233 +#: midx.c:1150 msgid "Counting referenced objects" msgstr "Contando objetos no referenciados" -#: midx.c:1243 +#: midx.c:1160 msgid "Finding and deleting unreferenced packfiles" msgstr "Encontrando y borrando packfiles sin referencias" -#: midx.c:1433 +#: midx.c:1351 msgid "could not start pack-objects" msgstr "no se pudo empezar los pack-objetcts" -#: midx.c:1452 +#: midx.c:1371 msgid "could not finish pack-objects" msgstr "no se pudo finalizar pack-objetcts" -#: name-hash.c:537 +#: name-hash.c:538 #, c-format msgid "unable to create lazy_dir thread: %s" msgstr "no es posible crear hilo lazy_dir: %s" -#: name-hash.c:559 +#: name-hash.c:560 #, c-format msgid "unable to create lazy_name thread: %s" msgstr "no es posible crear hilo lazy_name: %s" -#: name-hash.c:565 +#: name-hash.c:566 #, c-format msgid "unable to join lazy_name thread: %s" msgstr "no es posible unir hilo lazy_name: %s" @@ -5136,6 +5392,363 @@ msgstr "Rehusando reescribir notas en %s (fuera de refs/notes/)" msgid "Bad %s value: '%s'" msgstr "Valor erróneo para %s: '%s'" +#: object-file.c:480 +#, c-format +msgid "object directory %s does not exist; check .git/objects/info/alternates" +msgstr "objeto directorio %s no existe; revisa .git/objects/info/alternates" + +#: object-file.c:531 +#, c-format +msgid "unable to normalize alternate object path: %s" +msgstr "incapaz de normalizar la ruta de objeto alterno: %s" + +#: object-file.c:603 +#, c-format +msgid "%s: ignoring alternate object stores, nesting too deep" +msgstr "%s: ignorando espacios de objetos alternos, anidado muy profundo" + +#: object-file.c:610 +#, c-format +msgid "unable to normalize object directory: %s" +msgstr "incapaz de normalizar directorio de objeto: %s" + +#: object-file.c:653 +msgid "unable to fdopen alternates lockfile" +msgstr "no es posible hacer fdopen en lockfile alternos" + +#: object-file.c:671 +msgid "unable to read alternates file" +msgstr "no es posible leer archivos alternos" + +#: object-file.c:678 +msgid "unable to move new alternates file into place" +msgstr "no es posible mover archivos alternos en el lugar" + +#: object-file.c:713 +#, c-format +msgid "path '%s' does not exist" +msgstr "ruta '%s' no existe" + +#: object-file.c:734 +#, c-format +msgid "reference repository '%s' as a linked checkout is not supported yet." +msgstr "" +"repositorio de referencia '%s' como un checkout vinculado no es soportado " +"todavía." + +#: object-file.c:740 +#, c-format +msgid "reference repository '%s' is not a local repository." +msgstr "repositorio de referencia '%s' no es un repositorio local." + +#: object-file.c:746 +#, c-format +msgid "reference repository '%s' is shallow" +msgstr "repositorio de referencia '%s' es superficial (shallow)" + +#: object-file.c:754 +#, c-format +msgid "reference repository '%s' is grafted" +msgstr "repositorio de referencia '% s' está injertado" + +#: object-file.c:814 +#, c-format +msgid "invalid line while parsing alternate refs: %s" +msgstr "línea inválida mientras se analizaban refs alternas: %s" + +#: object-file.c:964 +#, c-format +msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" +msgstr "intentando usar mmap %<PRIuMAX> sobre límite %<PRIuMAX>" + +#: object-file.c:985 +msgid "mmap failed" +msgstr "mmap falló" + +#: object-file.c:1149 +#, c-format +msgid "object file %s is empty" +msgstr "archivo de objeto %s está vacío" + +#: object-file.c:1284 object-file.c:2477 +#, c-format +msgid "corrupt loose object '%s'" +msgstr "objeto perdido corrupto '%s'" + +#: object-file.c:1286 object-file.c:2481 +#, c-format +msgid "garbage at end of loose object '%s'" +msgstr "basura al final del objeto perdido '%s'" + +#: object-file.c:1328 +msgid "invalid object type" +msgstr "tipo de objeto inválido" + +#: object-file.c:1412 +#, c-format +msgid "unable to unpack %s header with --allow-unknown-type" +msgstr "no es posible desempacar header %s con --allow-unknown-type" + +#: object-file.c:1415 +#, c-format +msgid "unable to unpack %s header" +msgstr "incapaz de desempaquetar header %s" + +#: object-file.c:1421 +#, c-format +msgid "unable to parse %s header with --allow-unknown-type" +msgstr "no es posible analizar header %s con --allow-unknown-type" + +#: object-file.c:1424 +#, c-format +msgid "unable to parse %s header" +msgstr "incapaz de analizar header %s" + +#: object-file.c:1651 +#, c-format +msgid "failed to read object %s" +msgstr "falló al leer objeto %s" + +#: object-file.c:1655 +#, c-format +msgid "replacement %s not found for %s" +msgstr "reemplazo %s no encontrado para %s" + +#: object-file.c:1659 +#, c-format +msgid "loose object %s (stored in %s) is corrupt" +msgstr "objeto perdido %s (guardado en %s) está corrompido" + +#: object-file.c:1663 +#, c-format +msgid "packed object %s (stored in %s) is corrupt" +msgstr "paquete de objeto %s (guardado en %s) está corrompido" + +#: object-file.c:1768 +#, c-format +msgid "unable to write file %s" +msgstr "no es posible escribir archivo %s" + +#: object-file.c:1775 +#, c-format +msgid "unable to set permission to '%s'" +msgstr "no se pudo poner permisos a '%s'" + +#: object-file.c:1782 +msgid "file write error" +msgstr "falló de escritura" + +#: object-file.c:1802 +msgid "error when closing loose object file" +msgstr "error cerrando el archivo de objeto suelto" + +#: object-file.c:1867 +#, c-format +msgid "insufficient permission for adding an object to repository database %s" +msgstr "" +"permisos insuficientes para agregar un objeto a la base de datos del " +"repositorio %s" + +#: object-file.c:1869 +msgid "unable to create temporary file" +msgstr "no es posible crear un archivo temporal" + +#: object-file.c:1893 +msgid "unable to write loose object file" +msgstr "no es posible escribir el archivo de objeto suelto" + +#: object-file.c:1899 +#, c-format +msgid "unable to deflate new object %s (%d)" +msgstr "no es posible desinflar el objeto nuevo %s (%d)" + +#: object-file.c:1903 +#, c-format +msgid "deflateEnd on object %s failed (%d)" +msgstr "deflateEnd en objeto %s falló (%d)" + +#: object-file.c:1907 +#, c-format +msgid "confused by unstable object source data for %s" +msgstr "confundido por fuente de data de objetos inestable para %s" + +#: object-file.c:1917 builtin/pack-objects.c:1097 +#, c-format +msgid "failed utime() on %s" +msgstr "falló utime() en %s" + +#: object-file.c:1994 +#, c-format +msgid "cannot read object for %s" +msgstr "no se pudo leer el objeto para %s" + +#: object-file.c:2045 +msgid "corrupt commit" +msgstr "commit corrupto" + +#: object-file.c:2053 +msgid "corrupt tag" +msgstr "tag corrupto" + +#: object-file.c:2153 +#, c-format +msgid "read error while indexing %s" +msgstr "error leyendo al indexar %s" + +#: object-file.c:2156 +#, c-format +msgid "short read while indexing %s" +msgstr "lectura corta al indexar %s" + +#: object-file.c:2229 object-file.c:2239 +#, c-format +msgid "%s: failed to insert into database" +msgstr "%s: falló al insertar en la base de datos" + +#: object-file.c:2245 +#, c-format +msgid "%s: unsupported file type" +msgstr "%s: tipo de archivo no soportado" + +#: object-file.c:2269 +#, c-format +msgid "%s is not a valid object" +msgstr "%s no es objeto válido" + +#: object-file.c:2271 +#, c-format +msgid "%s is not a valid '%s' object" +msgstr "%s no es un objeto '%s' válido" + +#: object-file.c:2298 builtin/index-pack.c:192 +#, c-format +msgid "unable to open %s" +msgstr "no es posible abrir %s" + +#: object-file.c:2488 object-file.c:2541 +#, c-format +msgid "hash mismatch for %s (expected %s)" +msgstr "hash no concuerda para %s (se esperaba %s)" + +#: object-file.c:2512 +#, c-format +msgid "unable to mmap %s" +msgstr "no es posible hacer mmap a %s" + +#: object-file.c:2517 +#, c-format +msgid "unable to unpack header of %s" +msgstr "incapaz de desempaquetar header de %s" + +#: object-file.c:2523 +#, c-format +msgid "unable to parse header of %s" +msgstr "incapaz de analizar header de %s" + +#: object-file.c:2534 +#, c-format +msgid "unable to unpack contents of %s" +msgstr "no es posible desempaquetar contenidos de %s" + +#: object-name.c:486 +#, c-format +msgid "short object ID %s is ambiguous" +msgstr "El ID de objeto corto %s es ambiguo" + +#: object-name.c:497 +msgid "The candidates are:" +msgstr "Los candidatos son:" + +#: object-name.c:796 +msgid "" +"Git normally never creates a ref that ends with 40 hex characters\n" +"because it will be ignored when you just specify 40-hex. These refs\n" +"may be created by mistake. For example,\n" +"\n" +" git switch -c $br $(git rev-parse ...)\n" +"\n" +"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n" +"examine these refs and maybe delete them. Turn this message off by\n" +"running \"git config advice.objectNameWarning false\"" +msgstr "" +"Git normalmente nunca crea una ref que termine con 40 caracteres hex\n" +"porque esto sería ignorado cuando solo se especifiquen 40-hex. Estas refs\n" +"tal vez sean creadas por error. Por ejemplo,\n" +"\n" +" git switch -c $br $(git rev-parse ...)\n" +"\n" +"donde \"$br\" está de alguna manera vacía y una ref de 40-hex es creada. Por " +"favor\n" +"examina estas refs y tal vez bórralas. Silencia este mensaje \n" +"ejecutando \"git config advice.objectNameWarning false\"" + +#: object-name.c:916 +#, c-format +msgid "log for '%.*s' only goes back to %s" +msgstr "log para '%.*s' solo va hasta %s" + +#: object-name.c:924 +#, c-format +msgid "log for '%.*s' only has %d entries" +msgstr "log para '%.*s' solo tiene %d entradas" + +#: object-name.c:1702 +#, c-format +msgid "path '%s' exists on disk, but not in '%.*s'" +msgstr "la ruta '%s' existe en disco, pero no en '%.*s'" + +#: object-name.c:1708 +#, c-format +msgid "" +"path '%s' exists, but not '%s'\n" +"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?" +msgstr "" +"ruta '%s' existe, pero no '%s'\n" +"ayuda: ¿Quisiste decir '%.*s:%s' o '%.*s:./%s'?" + +#: object-name.c:1717 +#, c-format +msgid "path '%s' does not exist in '%.*s'" +msgstr "ruta '%s' no existe en '%.*s'" + +#: object-name.c:1745 +#, c-format +msgid "" +"path '%s' is in the index, but not at stage %d\n" +"hint: Did you mean ':%d:%s'?" +msgstr "" +"ruta '%s' está en el index, pero no en stage %d\n" +"ayuda:¿Quisiste decir: '%d:%s'?" + +#: object-name.c:1761 +#, c-format +msgid "" +"path '%s' is in the index, but not '%s'\n" +"hint: Did you mean ':%d:%s' aka ':%d:./%s'?" +msgstr "" +"ruta '%s' está en el index, pero no '%s'\n" +"ayuda:¿Quisiste decir ':%d:%s' o ':%d:./%s'?" + +#: object-name.c:1769 +#, c-format +msgid "path '%s' exists on disk, but not in the index" +msgstr "ruta '%s' existe en el disco, pero no en el index" + +#: object-name.c:1771 +#, c-format +msgid "path '%s' does not exist (neither on disk nor in the index)" +msgstr "ruta '%s' no existe (ni en disco ni en el index)" + +#: object-name.c:1784 +msgid "relative path syntax can't be used outside working tree" +msgstr "" +"la sintaxis de ruta relativa no se puede usar fuera del directorio de trabajo" + +#: object-name.c:1922 +#, c-format +msgid "invalid object name '%.*s'." +msgstr "nombre de objeto no válido: '%.*s'." + #: object.c:53 #, c-format msgid "invalid object type \"%s\"" @@ -5161,22 +5774,71 @@ msgstr "incapaz de analizar objeto: %s" msgid "hash mismatch %s" msgstr "hash no concuerda %s" -#: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2184 +#: pack-bitmap.c:843 pack-bitmap.c:849 builtin/pack-objects.c:2226 #, c-format msgid "unable to get size of %s" msgstr "no se pudo obtener el tamaño de %s" -#: packfile.c:630 +#: pack-bitmap.c:1489 builtin/rev-list.c:92 +#, c-format +msgid "unable to get disk usage of %s" +msgstr "no se puede obtener el uso de disco de %s" + +#: pack-revindex.c:220 +#, c-format +msgid "reverse-index file %s is too small" +msgstr "El archivo de índice inverso %s es demasiado pequeño" + +#: pack-revindex.c:225 +#, c-format +msgid "reverse-index file %s is corrupt" +msgstr "El archivo de índice inverso %s está dañado" + +#: pack-revindex.c:233 +#, c-format +msgid "reverse-index file %s has unknown signature" +msgstr "El archivo de índice inverso %s tiene una firma desconocida" + +#: pack-revindex.c:237 +#, c-format +msgid "reverse-index file %s has unsupported version %<PRIu32>" +msgstr "archivo reverse-index %s tiene una versión no soportada %<PRIu32>" + +#: pack-revindex.c:242 +#, c-format +msgid "reverse-index file %s has unsupported hash id %<PRIu32>" +msgstr "archivo reverse-index %s tiene un id de hash no soportado %<PRIu32>" + +#: pack-write.c:236 +msgid "cannot both write and verify reverse index" +msgstr "no puede escribir y verificar el índice inverso" + +#: pack-write.c:257 +#, c-format +msgid "could not stat: %s" +msgstr "no se pudo estad: %s" + +#: pack-write.c:269 +#, c-format +msgid "failed to make %s readable" +msgstr "no pudo hacer %s legible" + +#: pack-write.c:508 +#, c-format +msgid "could not write '%s' promisor file" +msgstr "no se pudo escribir el archivo promisor '%s'" + +#: packfile.c:625 msgid "offset before end of packfile (broken .idx?)" msgstr "offset antes del final del paquete (broken .idx?)" -#: packfile.c:1900 +#: packfile.c:1934 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "" "offset antes del comienzo del índice del paquete para %s (¿índice corrupto?)" -#: packfile.c:1904 +#: packfile.c:1938 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "" @@ -5197,7 +5859,7 @@ msgstr "fecha de expiración mal formada: '%s'" msgid "option `%s' expects \"always\", \"auto\", or \"never\"" msgstr "opción `%s' puede usar \"always\", \"auto\", o \"never\"" -#: parse-options-cb.c:130 parse-options-cb.c:147 +#: parse-options-cb.c:132 parse-options-cb.c:149 #, c-format msgid "malformed object name '%s'" msgstr "nombre de objeto mal formado '%s'" @@ -5242,31 +5904,31 @@ msgstr "opción ambigua: %s (puede ser --%s%s o --%s%s)" msgid "did you mean `--%s` (with two dashes)?" msgstr "¿quisiste decir `--%s` (con dos guiones)?" -#: parse-options.c:663 parse-options.c:963 +#: parse-options.c:666 parse-options.c:971 #, c-format msgid "alias of --%s" msgstr "alias de --%s" -#: parse-options.c:854 +#: parse-options.c:862 #, c-format msgid "unknown option `%s'" msgstr "opción `%s' desconocida" -#: parse-options.c:856 +#: parse-options.c:864 #, c-format msgid "unknown switch `%c'" msgstr "switch desconocido `%c'" -#: parse-options.c:858 +#: parse-options.c:866 #, c-format msgid "unknown non-ascii option in string: `%s'" msgstr "opción desconocida en string no ascii: `%s'" -#: parse-options.c:882 +#: parse-options.c:890 msgid "..." msgstr "..." -#: parse-options.c:901 +#: parse-options.c:909 #, c-format msgid "usage: %s" msgstr "uso: %s" @@ -5274,17 +5936,17 @@ msgstr "uso: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c:907 +#: parse-options.c:915 #, c-format msgid " or: %s" msgstr " o: %s" -#: parse-options.c:910 +#: parse-options.c:918 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:949 +#: parse-options.c:957 msgid "-NUM" msgstr "-NUM" @@ -5423,29 +6085,37 @@ msgstr "error de protocolo: mal caracter de largo de línea: %.4s" msgid "protocol error: bad line length %d" msgstr "error de protocolo: mal largo de línea %d" -#: pkt-line.c:373 +#: pkt-line.c:373 sideband.c:165 #, c-format msgid "remote error: %s" msgstr "error remoto: %s" -#: preload-index.c:119 +#: preload-index.c:125 msgid "Refreshing index" msgstr "Refrescando index" -#: preload-index.c:138 +#: preload-index.c:144 #, c-format msgid "unable to create threaded lstat: %s" msgstr "no es posible crear lstat hilado: %s" -#: pretty.c:982 +#: pretty.c:984 msgid "unable to parse --pretty format" msgstr "incapaz de analizar el formato --pretty" -#: promisor-remote.c:23 -msgid "Remote with no URL" -msgstr "Remoto sin URL" +#: promisor-remote.c:30 +msgid "promisor-remote: unable to fork off fetch subprocess" +msgstr "promisor-remote: no se puede bifurcar el subproceso de recuperación" -#: promisor-remote.c:58 +#: promisor-remote.c:35 promisor-remote.c:37 +msgid "promisor-remote: could not write to fetch subprocess" +msgstr "proiso-remote: no se pudo escribir para recuperar el subproceso" + +#: promisor-remote.c:41 +msgid "promisor-remote: could not close stdin to fetch subprocess" +msgstr "promisor-remote: no se pudo cerrar stdin para recuperar el subproceso" + +#: promisor-remote.c:53 #, c-format msgid "promisor remote name cannot begin with '/': %s" msgstr "nombre remoto promisor no puede comenzar con '/': %s" @@ -5454,20 +6124,20 @@ msgstr "nombre remoto promisor no puede comenzar con '/': %s" msgid "Removing duplicate objects" msgstr "Removiendo objetos duplicados" -#: range-diff.c:77 +#: range-diff.c:78 msgid "could not start `log`" msgstr "no se pudo comenzar `log`" -#: range-diff.c:79 +#: range-diff.c:80 msgid "could not read `log` output" msgstr "no se pudo leer output de `log`" -#: range-diff.c:98 sequencer.c:5143 +#: range-diff.c:101 sequencer.c:5318 #, c-format msgid "could not parse commit '%s'" msgstr "no se pudo analizar commit '%s'" -#: range-diff.c:112 +#: range-diff.c:115 #, c-format msgid "" "could not parse first line of `log` output: did not start with 'commit ': " @@ -5476,65 +6146,69 @@ msgstr "" "no se pudo leer la primera línea de salida `log`: no comienza con 'commit ': " "'%s'" -#: range-diff.c:137 +#: range-diff.c:140 #, c-format msgid "could not parse git header '%.*s'" msgstr "no se puede analizar git header '%.*s'" -#: range-diff.c:301 +#: range-diff.c:306 msgid "failed to generate diff" msgstr "falló al generar diff" -#: range-diff.c:534 range-diff.c:536 +#: range-diff.c:558 +msgid "--left-only and --right-only are mutually exclusive" +msgstr "--left-only y --right-only son mutuamente exclusivas" + +#: range-diff.c:561 range-diff.c:563 #, c-format msgid "could not parse log for '%s'" msgstr "no se pudo leer el log para '%s'" -#: read-cache.c:680 +#: read-cache.c:682 #, c-format msgid "will not add file alias '%s' ('%s' already exists in index)" msgstr "no agregará alias de archivo '%s' ('%s' ya existe en el index)" -#: read-cache.c:696 +#: read-cache.c:698 msgid "cannot create an empty blob in the object database" msgstr "no se puede crear un blob vacío en la base de datos de objetos" -#: read-cache.c:718 +#: read-cache.c:720 #, c-format msgid "%s: can only add regular files, symbolic links or git-directories" msgstr "" "%s: solo puede agregar archivos regulares, symbolic links o git-directories" -#: read-cache.c:723 +#: read-cache.c:725 #, c-format msgid "'%s' does not have a commit checked out" msgstr "'%s' no tiene un commit checked out" -#: read-cache.c:775 +#: read-cache.c:777 #, c-format msgid "unable to index file '%s'" msgstr "no es posible indexar archivo '%s'" -#: read-cache.c:794 +#: read-cache.c:796 #, c-format msgid "unable to add '%s' to index" msgstr "no es posible agregar '%s' al index" -#: read-cache.c:805 +#: read-cache.c:807 #, c-format msgid "unable to stat '%s'" msgstr "incapaz de correr stat en '%s'" -#: read-cache.c:1330 +#: read-cache.c:1318 #, c-format msgid "'%s' appears as both a file and as a directory" msgstr "'%s' parece ser un directorio y un archivo a la vez" -#: read-cache.c:1536 +#: read-cache.c:1532 msgid "Refresh index" msgstr "Refrescar index" -#: read-cache.c:1651 +#: read-cache.c:1657 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -5543,7 +6217,7 @@ msgstr "" "index.version configurado, pero el valor no es válido.\n" "Usando versión %i" -#: read-cache.c:1661 +#: read-cache.c:1667 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -5552,139 +6226,139 @@ msgstr "" "GIT_INDEX_VERSION configurado, pero el valor no es válido.\n" "Usando versión %i" -#: read-cache.c:1717 +#: read-cache.c:1723 #, c-format msgid "bad signature 0x%08x" msgstr "mala firma 0x%08x" -#: read-cache.c:1720 +#: read-cache.c:1726 #, c-format msgid "bad index version %d" msgstr "mala versión del índice %d" -#: read-cache.c:1729 +#: read-cache.c:1735 msgid "bad index file sha1 signature" msgstr "mala firma sha1 del archivo index" -#: read-cache.c:1759 +#: read-cache.c:1765 #, c-format msgid "index uses %.4s extension, which we do not understand" msgstr "index usa %.4s extensiones, cosa que no entendemos" -#: read-cache.c:1761 +#: read-cache.c:1767 #, c-format msgid "ignoring %.4s extension" msgstr "ignorando extensión %.4s" -#: read-cache.c:1798 +#: read-cache.c:1804 #, c-format msgid "unknown index entry format 0x%08x" msgstr "formato de index desconocido 0x%08x" -#: read-cache.c:1814 +#: read-cache.c:1820 #, c-format msgid "malformed name field in the index, near path '%s'" msgstr "campo nombre malformado en el index, cerca a ruta '%s'" -#: read-cache.c:1871 +#: read-cache.c:1877 msgid "unordered stage entries in index" msgstr "entradas en stage desordenadas en index" -#: read-cache.c:1874 +#: read-cache.c:1880 #, c-format msgid "multiple stage entries for merged file '%s'" msgstr "múltiples entradas extrañas para archivo fusionado '%s'" -#: read-cache.c:1877 +#: read-cache.c:1883 #, c-format msgid "unordered stage entries for '%s'" msgstr "entradas de stage desordenadas para '%s'" -#: read-cache.c:1983 read-cache.c:2271 rerere.c:565 rerere.c:599 rerere.c:1111 -#: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181 -#: builtin/checkout.c:488 builtin/checkout.c:674 builtin/clean.c:991 -#: builtin/commit.c:364 builtin/diff-tree.c:121 builtin/grep.c:507 -#: builtin/mv.c:145 builtin/reset.c:247 builtin/rm.c:290 +#: read-cache.c:1989 read-cache.c:2280 rerere.c:549 rerere.c:583 rerere.c:1095 +#: submodule.c:1634 builtin/add.c:546 builtin/check-ignore.c:181 +#: builtin/checkout.c:504 builtin/checkout.c:690 builtin/clean.c:991 +#: builtin/commit.c:364 builtin/diff-tree.c:122 builtin/grep.c:505 +#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:290 #: builtin/submodule--helper.c:332 msgid "index file corrupt" msgstr "archivo índice corrompido" -#: read-cache.c:2124 +#: read-cache.c:2133 #, c-format msgid "unable to create load_cache_entries thread: %s" msgstr "no es posible crear hilo load_cache_entries: %s" -#: read-cache.c:2137 +#: read-cache.c:2146 #, c-format msgid "unable to join load_cache_entries thread: %s" msgstr "no es posible unir hilo load_cache_entires: %s" -#: read-cache.c:2170 +#: read-cache.c:2179 #, c-format msgid "%s: index file open failed" msgstr "%s: falló al abrir el archivo index" -#: read-cache.c:2174 +#: read-cache.c:2183 #, c-format msgid "%s: cannot stat the open index" msgstr "%s: no se puede hacer stat del index abierto" -#: read-cache.c:2178 +#: read-cache.c:2187 #, c-format msgid "%s: index file smaller than expected" msgstr "%s: archivo index más pequeño de lo esperado" -#: read-cache.c:2182 +#: read-cache.c:2191 #, c-format msgid "%s: unable to map index file" msgstr "%s: no se pudo mapear el archivo index" -#: read-cache.c:2224 +#: read-cache.c:2233 #, c-format msgid "unable to create load_index_extensions thread: %s" msgstr "no es posible crear hilo load_index_extensions: %s" -#: read-cache.c:2251 +#: read-cache.c:2260 #, c-format msgid "unable to join load_index_extensions thread: %s" msgstr "no es posible unir hilo load_index_extensions: %s" -#: read-cache.c:2283 +#: read-cache.c:2292 #, c-format msgid "could not freshen shared index '%s'" msgstr "no se pudo refrescar el index compartido '%s'" -#: read-cache.c:2330 +#: read-cache.c:2339 #, c-format msgid "broken index, expect %s in %s, got %s" msgstr "index roto, se esperaba %s en %s, se obtuvo %s" -#: read-cache.c:3026 strbuf.c:1171 wrapper.c:630 builtin/merge.c:1130 +#: read-cache.c:3035 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1141 #, c-format msgid "could not close '%s'" msgstr "no se pudo cerrar '%s'" -#: read-cache.c:3129 sequencer.c:2355 sequencer.c:4066 +#: read-cache.c:3138 sequencer.c:2487 sequencer.c:4239 #, c-format msgid "could not stat '%s'" msgstr "no se pudo definir '%s'" -#: read-cache.c:3142 +#: read-cache.c:3151 #, c-format msgid "unable to open git dir: %s" msgstr "no es posible abrir el directorio de git: %s" -#: read-cache.c:3154 +#: read-cache.c:3163 #, c-format msgid "unable to unlink: %s" msgstr "no es posible eliminar el vinculo: %s" -#: read-cache.c:3179 +#: read-cache.c:3188 #, c-format msgid "cannot fix permission bits on '%s'" msgstr "no se pudo arreglar bits de permisos en '%s'" -#: read-cache.c:3328 +#: read-cache.c:3337 #, c-format msgid "%s: cannot drop to stage #0" msgstr "%s: no se puede eliminar a stage #0" @@ -5755,7 +6429,7 @@ msgid_plural "Rebase %s onto %s (%d commands)" msgstr[0] "Rebase %s en %s (%d comando)" msgstr[1] "Rebase %s en %s (%d comandos)" -#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:228 +#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:218 msgid "" "\n" "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" @@ -5763,7 +6437,7 @@ msgstr "" "\n" "No eliminar ninguna línea. Usa 'drop' explícitamente para borrar un commit \n" -#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:232 +#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:222 msgid "" "\n" "If you remove a line here THAT COMMIT WILL BE LOST.\n" @@ -5771,7 +6445,7 @@ msgstr "" "\n" "Si eliminas una línea aquí EL COMMIT SE PERDERÁ.\n" -#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:871 +#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:861 msgid "" "\n" "You are editing the todo file of an ongoing interactive rebase.\n" @@ -5785,7 +6459,7 @@ msgstr "" " git rebase --continue\n" "\n" -#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:948 +#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:938 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" @@ -5795,14 +6469,14 @@ msgstr "" "Como sea, si quieres borrar todo, el rebase será abortado.\n" "\n" -#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3463 -#: sequencer.c:3489 sequencer.c:5248 builtin/fsck.c:347 builtin/rebase.c:258 +#: rebase-interactive.c:110 rerere.c:469 rerere.c:676 sequencer.c:3615 +#: sequencer.c:3641 sequencer.c:5424 builtin/fsck.c:329 builtin/rebase.c:272 #, c-format msgid "could not write '%s'" msgstr "no se pudo escribir '%s'" -#: rebase-interactive.c:116 builtin/rebase.c:190 builtin/rebase.c:216 -#: builtin/rebase.c:240 +#: rebase-interactive.c:116 builtin/rebase.c:204 builtin/rebase.c:230 +#: builtin/rebase.c:254 #, c-format msgid "could not write '%s'." msgstr "no se pudo escribir '%s'." @@ -5834,14 +6508,14 @@ msgstr "" "Los posibles comportamientos son: ignore,warn,error.\n" "\n" -#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2274 -#: builtin/rebase.c:176 builtin/rebase.c:201 builtin/rebase.c:227 -#: builtin/rebase.c:252 +#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2402 +#: builtin/rebase.c:190 builtin/rebase.c:215 builtin/rebase.c:241 +#: builtin/rebase.c:266 #, c-format msgid "could not read '%s'." msgstr "no se puede leer '%s'." -#: ref-filter.c:42 wt-status.c:1977 +#: ref-filter.c:42 wt-status.c:1975 msgid "gone" msgstr "desaparecido" @@ -5860,238 +6534,248 @@ msgstr "detrás %d" msgid "ahead %d, behind %d" msgstr "delante %d, detrás %d" -#: ref-filter.c:165 +#: ref-filter.c:175 #, c-format msgid "expected format: %%(color:<color>)" msgstr "formato esperado: %%(color:<color>)" -#: ref-filter.c:167 +#: ref-filter.c:177 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "color no reconocido: %%(color:%s)" -#: ref-filter.c:189 +#: ref-filter.c:199 #, c-format msgid "Integer value expected refname:lstrip=%s" msgstr "Valor entero esperado refname:lstrip=%s" -#: ref-filter.c:193 +#: ref-filter.c:203 #, c-format msgid "Integer value expected refname:rstrip=%s" msgstr "Valor entero esperado refname:rstrip=%s" -#: ref-filter.c:195 +#: ref-filter.c:205 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "argumento: %s no reconocido %%(%s)" -#: ref-filter.c:250 +#: ref-filter.c:260 #, c-format msgid "%%(objecttype) does not take arguments" msgstr "%%(objecttype) no toma ningún argumento" -#: ref-filter.c:272 +#: ref-filter.c:282 #, c-format msgid "unrecognized %%(objectsize) argument: %s" msgstr "%%(objectsize) no reconocido argumento: %s" -#: ref-filter.c:280 +#: ref-filter.c:290 #, c-format msgid "%%(deltabase) does not take arguments" msgstr "%%(deltabase) no toma argumentos" -#: ref-filter.c:292 +#: ref-filter.c:302 #, c-format msgid "%%(body) does not take arguments" msgstr "%%(body) no toma ningún argumento" -#: ref-filter.c:301 +#: ref-filter.c:315 #, c-format -msgid "%%(subject) does not take arguments" -msgstr "%%(subject) no toma ningún argumento" +msgid "unrecognized %%(subject) argument: %s" +msgstr "argumento %%(sujeto) no reconocido: %s" -#: ref-filter.c:323 +#: ref-filter.c:334 +#, c-format +msgid "expected %%(trailers:key=<value>)" +msgstr "se esperaba %%(trailers:key=<value>)" + +#: ref-filter.c:336 #, c-format msgid "unknown %%(trailers) argument: %s" msgstr "%%(trailers) desconocidos, argumento: %s" -#: ref-filter.c:352 +#: ref-filter.c:367 #, c-format msgid "positive value expected contents:lines=%s" msgstr "valor positivo esperado contents:lines=%s" -#: ref-filter.c:354 +#: ref-filter.c:369 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "argumento %s no reconocido %%(contents)" -#: ref-filter.c:369 +#: ref-filter.c:384 +#, c-format +msgid "positive value expected '%s' in %%(%s)" +msgstr "valor positivo esperado '%s' en %% (%s)" + +#: ref-filter.c:388 #, c-format -msgid "positive value expected objectname:short=%s" -msgstr "valor positivo esperado objectname:short=%s" +msgid "unrecognized argument '%s' in %%(%s)" +msgstr "argumento no reconocido:'%s' en %%(%s)" -#: ref-filter.c:373 +#: ref-filter.c:402 #, c-format -msgid "unrecognized %%(objectname) argument: %s" -msgstr "argumento: %s no reconocido %%(objectname)" +msgid "unrecognized email option: %s" +msgstr "opción de email desconocida: %s" -#: ref-filter.c:403 +#: ref-filter.c:432 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "formato esperado: %%(align:<ancho>,<posición>)" -#: ref-filter.c:415 +#: ref-filter.c:444 #, c-format msgid "unrecognized position:%s" msgstr "posición desconocida: %s" -#: ref-filter.c:422 +#: ref-filter.c:451 #, c-format msgid "unrecognized width:%s" msgstr "ancho desconocido: %s" -#: ref-filter.c:431 +#: ref-filter.c:460 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "argumento no reconocido para %%(align): %s" -#: ref-filter.c:439 +#: ref-filter.c:468 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "se esperaba un ancho positivo con el átomo %%(align)" -#: ref-filter.c:457 +#: ref-filter.c:486 #, c-format msgid "unrecognized %%(if) argument: %s" msgstr "argumento: %s no reconocido %%(if)" -#: ref-filter.c:559 +#: ref-filter.c:588 #, c-format msgid "malformed field name: %.*s" msgstr "nombre mal formado de campo: %.*s" -#: ref-filter.c:586 +#: ref-filter.c:615 #, c-format msgid "unknown field name: %.*s" msgstr "nombre de campo desconocido: %.*s" -#: ref-filter.c:590 +#: ref-filter.c:619 #, c-format msgid "" "not a git repository, but the field '%.*s' requires access to object data" msgstr "" "no es un repositorio git, pero el campo '%.*s' requiere acceso al objeto data" -#: ref-filter.c:714 +#: ref-filter.c:743 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "formato: átomo %%(if) usado sin un átomo %%(then)" -#: ref-filter.c:777 +#: ref-filter.c:806 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "formato: átomo %%(then) usado sin átomo %%(if)" -#: ref-filter.c:779 +#: ref-filter.c:808 #, c-format msgid "format: %%(then) atom used more than once" msgstr "formato: átomo %%(then) usado más de una vez" -#: ref-filter.c:781 +#: ref-filter.c:810 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "formato: átomo %%(then) usado después de %%(else)" -#: ref-filter.c:809 +#: ref-filter.c:838 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "formato: átomo %%(else) usado sin un átomo %%(if)" -#: ref-filter.c:811 +#: ref-filter.c:840 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "formato: átomo %%(else) usado sin un átomo %%(then)" -#: ref-filter.c:813 +#: ref-filter.c:842 #, c-format msgid "format: %%(else) atom used more than once" msgstr "formato: átomo %%(else) usado más de una vez" -#: ref-filter.c:828 +#: ref-filter.c:857 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "formato: átomo %%(end) usado sin átomo correspondiente" -#: ref-filter.c:885 +#: ref-filter.c:914 #, c-format msgid "malformed format string %s" msgstr "formato de cadena mal formado %s" -#: ref-filter.c:1486 +#: ref-filter.c:1555 +#, c-format +msgid "(no branch, rebasing %s)" +msgstr "(no hay rama, rebasando %s)" + +#: ref-filter.c:1558 #, c-format -msgid "no branch, rebasing %s" -msgstr "no hay rama, rebasando %s" +msgid "(no branch, rebasing detached HEAD %s)" +msgstr "(no una rama, rebasando con HEAD desacoplado %s)" -#: ref-filter.c:1489 +#: ref-filter.c:1561 #, c-format -msgid "no branch, rebasing detached HEAD %s" -msgstr "(o hay rama, rebasando con HEAD desacoplado %s" +msgid "(no branch, bisect started on %s)" +msgstr "(no hay rama, comenzando biseccón en %s)" -#: ref-filter.c:1492 +#: ref-filter.c:1565 #, c-format -msgid "no branch, bisect started on %s" -msgstr "no hay rama, comenzando biseccón en %s" +msgid "(HEAD detached at %s)" +msgstr "(HEAD desacoplado en %s)" -#: ref-filter.c:1502 -msgid "no branch" -msgstr "sin rama" +#: ref-filter.c:1568 +#, c-format +msgid "(HEAD detached from %s)" +msgstr "(HEAD desacoplado de %s)" + +#: ref-filter.c:1571 +msgid "(no branch)" +msgstr "(sin rama)" -#: ref-filter.c:1538 ref-filter.c:1747 +#: ref-filter.c:1603 ref-filter.c:1812 #, c-format msgid "missing object %s for %s" msgstr "falta objeto %s para %s" -#: ref-filter.c:1548 +#: ref-filter.c:1613 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "parse_object_buffer falló en %s para %s" -#: ref-filter.c:2001 +#: ref-filter.c:1996 #, c-format msgid "malformed object at '%s'" msgstr "objeto mal formado en '%s'" -#: ref-filter.c:2090 +#: ref-filter.c:2085 #, c-format msgid "ignoring ref with broken name %s" msgstr "ignorando referencia con nombre roto %s" -#: ref-filter.c:2095 refs.c:657 +#: ref-filter.c:2090 refs.c:676 #, c-format msgid "ignoring broken ref %s" msgstr "ignorando referencia rota %s" -#: ref-filter.c:2395 +#: ref-filter.c:2430 #, c-format msgid "format: %%(end) atom missing" msgstr "formato: falta átomo %%(end)" -#: ref-filter.c:2495 -#, c-format -msgid "option `%s' is incompatible with --merged" -msgstr "opción `%s' es incompatible con --merged" - -#: ref-filter.c:2498 -#, c-format -msgid "option `%s' is incompatible with --no-merged" -msgstr "opción `%s' es incompatible con --no-merged" - -#: ref-filter.c:2508 +#: ref-filter.c:2529 #, c-format msgid "malformed object name %s" msgstr "nombre de objeto mal formado %s" -#: ref-filter.c:2513 +#: ref-filter.c:2534 #, c-format msgid "option `%s' must point to a commit" msgstr "opción '%s' debe apuntar a un commit" @@ -6101,172 +6785,163 @@ msgstr "opción '%s' debe apuntar a un commit" msgid "%s does not point to a valid object!" msgstr "¡%s no apunta a ningún objeto válido!" -#: refs.c:572 +#: refs.c:566 +#, c-format +msgid "" +"Using '%s' as the name for the initial branch. This default branch name\n" +"is subject to change. To configure the initial branch name to use in all\n" +"of your new repositories, which will suppress this warning, call:\n" +"\n" +"\tgit config --global init.defaultBranch <name>\n" +"\n" +"Names commonly chosen instead of 'master' are 'main', 'trunk' and\n" +"'development'. The just-created branch can be renamed via this command:\n" +"\n" +"\tgit branch -m <name>\n" +msgstr "" +"Usando '%s' como el nombre de la rama inicial. Este nombre de rama " +"predeterminado\n" +"está sujeto a cambios. Para configurar el nombre de la rama inicial para " +"usar en todos\n" +"de sus nuevos repositorios, que suprimirán esta advertencia, llame a:\n" +"\n" +"\tgit config --global init.defaultBranch <nombre>\n" +"\n" +"Los nombres comúnmente elegidos en lugar de 'maestro' son 'principal', " +"'troncal' y\n" +"'desarrollo'. Se puede cambiar el nombre de la rama recién creada mediante " +"este comando:\n" +"\n" +"\tgit branch -m <nombre>\n" + +#: refs.c:588 #, c-format msgid "could not retrieve `%s`" msgstr "no se pudo recibir `%s`" -#: refs.c:579 +#: refs.c:598 #, c-format msgid "invalid branch name: %s = %s" -msgstr "Nombre de rama inválido: %s = %s" +msgstr "nombre de rama inválido: %s = %s" -#: refs.c:655 +#: refs.c:674 #, c-format msgid "ignoring dangling symref %s" msgstr "ignorando referencia rota %s" -#: refs.c:792 -#, c-format -msgid "could not open '%s' for writing: %s" -msgstr "no se pudo abrir '%s' para escritura: %s" - -#: refs.c:802 refs.c:853 -#, c-format -msgid "could not read ref '%s'" -msgstr "no se pudo leer la referencia '%s'" - -#: refs.c:808 -#, c-format -msgid "ref '%s' already exists" -msgstr "ref '%s' ya existe" - -#: refs.c:813 -#, c-format -msgid "unexpected object ID when writing '%s'" -msgstr "ID de objecto inesperado al escribir '%s'" - -#: refs.c:821 sequencer.c:408 sequencer.c:2721 sequencer.c:2925 -#: sequencer.c:2939 sequencer.c:3195 sequencer.c:5159 strbuf.c:1168 -#: wrapper.c:628 -#, c-format -msgid "could not write to '%s'" -msgstr "no se pudo escribir en '%s'" - -#: refs.c:848 strbuf.c:1166 wrapper.c:196 wrapper.c:366 builtin/am.c:719 -#: builtin/rebase.c:852 -#, c-format -msgid "could not open '%s' for writing" -msgstr "no se pudo abrir '%s' para escritura" - -#: refs.c:855 -#, c-format -msgid "unexpected object ID when deleting '%s'" -msgstr "ID de objecto inesperado al borrar '%s'" - -#: refs.c:986 +#: refs.c:922 #, c-format msgid "log for ref %s has gap after %s" msgstr "log de ref %s tiene un vacío tras %s" -#: refs.c:992 +#: refs.c:929 #, c-format msgid "log for ref %s unexpectedly ended on %s" msgstr "log de ref %s finalizado inesperadamente en %s" -#: refs.c:1051 +#: refs.c:994 #, c-format msgid "log for %s is empty" msgstr "log de %s está vacío" -#: refs.c:1143 +#: refs.c:1086 #, c-format msgid "refusing to update ref with bad name '%s'" msgstr "rehusando actualizar ref con mal nombre '%s'" -#: refs.c:1219 +#: refs.c:1157 #, c-format msgid "update_ref failed for ref '%s': %s" msgstr "update_ref falló para ref '%s': %s" -#: refs.c:2011 +#: refs.c:2051 #, c-format msgid "multiple updates for ref '%s' not allowed" msgstr "múltiples actualizaciones para ref '%s' no permitidas" -#: refs.c:2098 +#: refs.c:2131 msgid "ref updates forbidden inside quarantine environment" msgstr "actualizaciones de ref prohibidas dentro de ambiente de cuarentena" -#: refs.c:2109 +#: refs.c:2142 msgid "ref updates aborted by hook" msgstr "ref update abortado por el hook" -#: refs.c:2209 refs.c:2239 +#: refs.c:2242 refs.c:2272 #, c-format msgid "'%s' exists; cannot create '%s'" msgstr "'%s' existe; no se puede crear '%s'" -#: refs.c:2215 refs.c:2250 +#: refs.c:2248 refs.c:2283 #, c-format msgid "cannot process '%s' and '%s' at the same time" msgstr "no se puede procesar '%s' y '%s' al mismo tiempo" -#: refs/files-backend.c:1233 +#: refs/files-backend.c:1228 #, c-format msgid "could not remove reference %s" msgstr "no se pudo eliminar la referencia %s" -#: refs/files-backend.c:1247 refs/packed-backend.c:1541 -#: refs/packed-backend.c:1551 +#: refs/files-backend.c:1242 refs/packed-backend.c:1542 +#: refs/packed-backend.c:1552 #, c-format msgid "could not delete reference %s: %s" msgstr "no se pudo eliminar la referencia %s: %s" -#: refs/files-backend.c:1250 refs/packed-backend.c:1554 +#: refs/files-backend.c:1245 refs/packed-backend.c:1555 #, c-format msgid "could not delete references: %s" msgstr "no se pudo eliminar la referencia: %s" -#: refspec.c:137 +#: refspec.c:170 #, c-format msgid "invalid refspec '%s'" msgstr "refspec inválido: '%s'" -#: remote.c:355 +#: remote.c:351 #, c-format msgid "config remote shorthand cannot begin with '/': %s" msgstr "config remote shorthand no puede comenzar con '/': %s" -#: remote.c:403 +#: remote.c:399 msgid "more than one receivepack given, using the first" msgstr "más de un receivepack dado, usando el primero" -#: remote.c:411 +#: remote.c:407 msgid "more than one uploadpack given, using the first" msgstr "más de un uploadpack dado, usando el primero" -#: remote.c:594 +#: remote.c:590 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "No se pueden traer ambos %s y %s a %s" -#: remote.c:598 +#: remote.c:594 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s por lo general hace seguimiento a %s, no a %s" -#: remote.c:602 +#: remote.c:598 #, c-format msgid "%s tracks both %s and %s" msgstr "%s hace seguimiento tanto a %s como a %s" -#: remote.c:670 +#: remote.c:666 #, c-format msgid "key '%s' of pattern had no '*'" msgstr "llave '%s' de patrón no tuvo '*'" -#: remote.c:680 +#: remote.c:676 #, c-format msgid "value '%s' of pattern has no '*'" msgstr "valor '%s' del patrón no tiene '*'" -#: remote.c:986 +#: remote.c:1083 #, c-format msgid "src refspec %s does not match any" msgstr "src refsoec %s: no concuerda con ninguno" -#: remote.c:991 +#: remote.c:1088 #, c-format msgid "src refspec %s matches more than one" msgstr "src refspec %s concuerda con más de uno" @@ -6275,7 +6950,7 @@ msgstr "src refspec %s concuerda con más de uno" #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is #. the <src>. #. -#: remote.c:1006 +#: remote.c:1103 #, c-format msgid "" "The destination you provided is not a full refname (i.e.,\n" @@ -6299,7 +6974,7 @@ msgstr "" "Ninguno funcionó así que nos dimos por vencidos. Tienes que especificar el " "full ref." -#: remote.c:1026 +#: remote.c:1123 #, c-format msgid "" "The <src> part of the refspec is a commit object.\n" @@ -6310,7 +6985,7 @@ msgstr "" "¿Quisiste crear un branch nuevo mediante un push a\n" "'%s:refs/heads/%s'?" -#: remote.c:1031 +#: remote.c:1128 #, c-format msgid "" "The <src> part of the refspec is a tag object.\n" @@ -6321,7 +6996,7 @@ msgstr "" "Did you mean to create a new tag by pushing to\n" "'%s:refs/tags/%s'?" -#: remote.c:1036 +#: remote.c:1133 #, c-format msgid "" "The <src> part of the refspec is a tree object.\n" @@ -6332,7 +7007,7 @@ msgstr "" "¿Quisiste crear un tag nuevo mediante un push a\n" "'%s:refs/heads/%s'?" -#: remote.c:1041 +#: remote.c:1138 #, c-format msgid "" "The <src> part of the refspec is a blob object.\n" @@ -6343,115 +7018,115 @@ msgstr "" "¿Quisiste crear un tag nuevo mediante un push a\n" "'%s:refs/heads/%s'?" -#: remote.c:1077 +#: remote.c:1174 #, c-format msgid "%s cannot be resolved to branch" msgstr "%s no puede ser resolver a un branch" -#: remote.c:1088 +#: remote.c:1185 #, c-format msgid "unable to delete '%s': remote ref does not exist" msgstr "no es posible borrar '%s': ref remoto no existe" -#: remote.c:1100 +#: remote.c:1197 #, c-format msgid "dst refspec %s matches more than one" msgstr "dst refspec %s concuerda con más de uno" -#: remote.c:1107 +#: remote.c:1204 #, c-format msgid "dst ref %s receives from more than one src" msgstr "dst ref %s recibe de más de un src" -#: remote.c:1610 remote.c:1711 +#: remote.c:1724 remote.c:1825 msgid "HEAD does not point to a branch" msgstr "HEAD no apunta a ninguna rama" -#: remote.c:1619 +#: remote.c:1733 #, c-format msgid "no such branch: '%s'" msgstr "no existe tal rama: '%s'" -#: remote.c:1622 +#: remote.c:1736 #, c-format msgid "no upstream configured for branch '%s'" msgstr "no se ha configurado upstream para la rama '%s'" -#: remote.c:1628 +#: remote.c:1742 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "la rama '%s' de upstream no es guardad como rama de rastreo remoto" -#: remote.c:1643 +#: remote.c:1757 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "" "destino de push '%s' en el remoto '%s' no tiene una rama de rastreo local" -#: remote.c:1655 +#: remote.c:1769 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "la rama '%s' no tiene remoto para enviar" -#: remote.c:1665 +#: remote.c:1779 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "refspecs del push para '%s' no incluyen '%s'" -#: remote.c:1678 +#: remote.c:1792 msgid "push has no destination (push.default is 'nothing')" msgstr "push no tiene destino (push.default es 'nada')" -#: remote.c:1700 +#: remote.c:1814 msgid "cannot resolve 'simple' push to a single destination" msgstr "no se puede resolver push 'simple' para un destino único" -#: remote.c:1826 +#: remote.c:1943 #, c-format msgid "couldn't find remote ref %s" msgstr "no se puedo encontrar ref remota %s" -#: remote.c:1839 +#: remote.c:1956 #, c-format msgid "* Ignoring funny ref '%s' locally" msgstr "* Ignorando ref graciosa '%s' localmente" -#: remote.c:2002 +#: remote.c:2119 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "Tu rama está basada en '%s', pero upstream ha desaparecido.\n" -#: remote.c:2006 +#: remote.c:2123 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (usa \"git branch --unset-upstream\" para arreglar)\n" -#: remote.c:2009 +#: remote.c:2126 #, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "Tu rama está actualizada con '%s'.\n" -#: remote.c:2013 +#: remote.c:2130 #, c-format msgid "Your branch and '%s' refer to different commits.\n" msgstr "Tu rama y '%s' refieren a commits diferentes.\n" -#: remote.c:2016 +#: remote.c:2133 #, c-format msgid " (use \"%s\" for details)\n" msgstr " (usa \"%s\" para detalles)\n" -#: remote.c:2020 +#: remote.c:2137 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "Tu rama está adelantada a '%s' por %d commit.\n" msgstr[1] "Tu rama está adelantada a '%s' por %d commits.\n" -#: remote.c:2026 +#: remote.c:2143 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (usa \"git push\" para publicar tus commits locales)\n" -#: remote.c:2029 +#: remote.c:2146 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -6461,11 +7136,11 @@ msgstr[0] "" msgstr[1] "" "Tu rama está detrás de '%s' por %d commits, y puede ser avanzada rápido.\n" -#: remote.c:2037 +#: remote.c:2154 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (usa \"git pull\" para actualizar tu rama local)\n" -#: remote.c:2040 +#: remote.c:2157 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -6480,11 +7155,11 @@ msgstr[1] "" "Tu rama y '%s' han divergido,\n" "y tienen %d y %d commits diferentes cada una respectivamente.\n" -#: remote.c:2050 +#: remote.c:2167 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr " (usa \"git pull\" para fusionar la rama remota en la tuya)\n" -#: remote.c:2241 +#: remote.c:2359 #, c-format msgid "cannot parse expected object name '%s'" msgstr "no se puede leer el nombre de objeto '%s'" @@ -6504,101 +7179,96 @@ msgstr "duplicar ref de reemplazo: %s" msgid "replace depth too high for object %s" msgstr "remplazar profundiad muy elevada para objeto %s" -#: repository.c:94 builtin/init-db.c:188 -#, c-format -msgid "The hash algorithm %s is not supported in this build." -msgstr "El algoritmo hash %s no está soportado en este build." - -#: rerere.c:217 rerere.c:226 rerere.c:229 +#: rerere.c:201 rerere.c:210 rerere.c:213 msgid "corrupt MERGE_RR" msgstr "MERGE_RR corrupto" -#: rerere.c:264 rerere.c:269 +#: rerere.c:248 rerere.c:253 msgid "unable to write rerere record" msgstr "incapaz de escribir entrada rerere" -#: rerere.c:495 +#: rerere.c:479 #, c-format msgid "there were errors while writing '%s' (%s)" msgstr "hubieron errores mientras se escribía '%s' (%s)" -#: rerere.c:498 +#: rerere.c:482 #, c-format msgid "failed to flush '%s'" msgstr "falló al hacer flush '%s'" -#: rerere.c:503 rerere.c:1039 +#: rerere.c:487 rerere.c:1023 #, c-format msgid "could not parse conflict hunks in '%s'" msgstr "no se pudo analizar hunks en conflicto en '%s'" -#: rerere.c:684 +#: rerere.c:668 #, c-format msgid "failed utime() on '%s'" msgstr "falló utime() en '%s'" -#: rerere.c:694 +#: rerere.c:678 #, c-format msgid "writing '%s' failed" msgstr "escribiendo '%s' falló" -#: rerere.c:714 +#: rerere.c:698 #, c-format msgid "Staged '%s' using previous resolution." msgstr "'%s' puesto en stage usando resolución previa." -#: rerere.c:753 +#: rerere.c:737 #, c-format msgid "Recorded resolution for '%s'." msgstr "Resolución guardada para '%s'." -#: rerere.c:788 +#: rerere.c:772 #, c-format msgid "Resolved '%s' using previous resolution." msgstr "'%s' resuelto usando resolución previa." -#: rerere.c:803 +#: rerere.c:787 #, c-format msgid "cannot unlink stray '%s'" msgstr "no se puede desvincular stray '%s'" -#: rerere.c:807 +#: rerere.c:791 #, c-format msgid "Recorded preimage for '%s'" msgstr "Resolución precargada para '%s'" -#: rerere.c:881 submodule.c:2078 builtin/log.c:1891 -#: builtin/submodule--helper.c:1454 builtin/submodule--helper.c:1466 +#: rerere.c:865 submodule.c:2088 builtin/log.c:1991 +#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890 #, c-format msgid "could not create directory '%s'" msgstr "no se pudo crear el directorio '%s'" -#: rerere.c:1057 +#: rerere.c:1041 #, c-format msgid "failed to update conflicted state in '%s'" msgstr "falló al actualizar estado conflictivo en '%s'" -#: rerere.c:1068 rerere.c:1075 +#: rerere.c:1052 rerere.c:1059 #, c-format msgid "no remembered resolution for '%s'" msgstr "resolución para '%s' no recordada" -#: rerere.c:1077 +#: rerere.c:1061 #, c-format msgid "cannot unlink '%s'" msgstr "no se puede desvincular '%s'" -#: rerere.c:1087 +#: rerere.c:1071 #, c-format msgid "Updated preimage for '%s'" msgstr "Actualizada preimagen para '%s'" -#: rerere.c:1096 +#: rerere.c:1080 #, c-format msgid "Forgot resolution for '%s'\n" msgstr "Se olvidó resolución para '%s'\n" -#: rerere.c:1199 +#: rerere.c:1191 msgid "unable to open rr-cache directory" msgstr "no es posible abrir directorio rr-cache" @@ -6606,38 +7276,38 @@ msgstr "no es posible abrir directorio rr-cache" msgid "could not determine HEAD revision" msgstr "no se pudo determinar revisión HEAD" -#: reset.c:70 reset.c:76 sequencer.c:3318 +#: reset.c:70 reset.c:76 sequencer.c:3468 #, c-format msgid "failed to find tree of %s" msgstr "falló al encontrar árbol de %s" -#: revision.c:2661 +#: revision.c:2338 +msgid "--unpacked=<packfile> no longer supported" +msgstr "--unpacked=<packfile> ya no es soportado" + +#: revision.c:2668 msgid "your current branch appears to be broken" msgstr "tu rama actual parece estar rota" -#: revision.c:2664 +#: revision.c:2671 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "tu rama actual '%s' no tiene ningún commit todavía" -#: revision.c:2873 -msgid "--first-parent is incompatible with --bisect" -msgstr "--first-parent es incompatible con --bisect" - #: revision.c:2877 msgid "-L does not yet support diff formats besides -p and -s" msgstr "-L no soporta todavía formatos de diff fuera de -p y -s" -#: run-command.c:763 +#: run-command.c:767 msgid "open /dev/null failed" msgstr "falló al abrir /dev/null" -#: run-command.c:1269 +#: run-command.c:1274 #, c-format msgid "cannot create async thread: %s" msgstr "no es posible crear hilo async: %s" -#: run-command.c:1333 +#: run-command.c:1338 #, c-format msgid "" "The '%s' hook was ignored because it's not set as executable.\n" @@ -6647,34 +7317,34 @@ msgstr "" "Puedes desactivar esta advertencias con `git config advice.ignoredHook " "false`." -#: send-pack.c:145 +#: send-pack.c:146 msgid "unexpected flush packet while reading remote unpack status" msgstr "" "flush packet inesperado mientras se leía estatus de desempaquetado remoto" -#: send-pack.c:147 +#: send-pack.c:148 #, c-format msgid "unable to parse remote unpack status: %s" msgstr "no es posible analizar el estado de desempaquetado remoto: %s" -#: send-pack.c:149 +#: send-pack.c:150 #, c-format msgid "remote unpack failed: %s" msgstr "desempaquetado remoto falló: %s" -#: send-pack.c:308 +#: send-pack.c:374 msgid "failed to sign the push certificate" msgstr "falló al firmar el certificado de push" -#: send-pack.c:394 +#: send-pack.c:467 msgid "the receiving end does not support this repository's hash algorithm" msgstr "el destino no soporta el algoritmo de hash de este repositorio" -#: send-pack.c:403 +#: send-pack.c:476 msgid "the receiving end does not support --signed push" msgstr "el final receptor no soporta --signed push" -#: send-pack.c:405 +#: send-pack.c:478 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" @@ -6682,47 +7352,47 @@ msgstr "" "no se manda un certificado de push ya que el destino no soporta push firmado " "(--signed )" -#: send-pack.c:417 +#: send-pack.c:490 msgid "the receiving end does not support --atomic push" msgstr "el destino no soporta push atómicos (--atomic)" -#: send-pack.c:422 +#: send-pack.c:495 msgid "the receiving end does not support push options" msgstr "el destino no soporta opciones de push" -#: sequencer.c:192 +#: sequencer.c:195 #, c-format msgid "invalid commit message cleanup mode '%s'" msgstr "mensaje de commit inválido, modo cleanup '%s'" -#: sequencer.c:297 +#: sequencer.c:323 #, c-format msgid "could not delete '%s'" msgstr "no se pudo borrar '%s'" -#: sequencer.c:316 builtin/rebase.c:743 builtin/rebase.c:1582 builtin/rm.c:385 +#: sequencer.c:343 builtin/rebase.c:757 builtin/rebase.c:1602 builtin/rm.c:385 #, c-format msgid "could not remove '%s'" msgstr "no se pudo eliminar'%s'" -#: sequencer.c:326 +#: sequencer.c:353 msgid "revert" msgstr "revertir" -#: sequencer.c:328 +#: sequencer.c:355 msgid "cherry-pick" msgstr "cherry-pick" -#: sequencer.c:330 +#: sequencer.c:357 msgid "rebase" msgstr "rebase" -#: sequencer.c:332 +#: sequencer.c:359 #, c-format msgid "unknown action: %d" msgstr "acción desconocida: %d" -#: sequencer.c:390 +#: sequencer.c:418 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -6730,7 +7400,7 @@ msgstr "" "después de resolver los conflictos, marca las rutas corregidas\n" "con 'git add <rutas>' o 'git rm <rutas>'" -#: sequencer.c:393 +#: sequencer.c:421 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -6740,43 +7410,43 @@ msgstr "" "con 'git add <rutas>' o 'git rm <rutas>'\n" "y haz un commit del resultado con 'git commit'" -#: sequencer.c:406 sequencer.c:2921 +#: sequencer.c:434 sequencer.c:3070 #, c-format msgid "could not lock '%s'" msgstr "no se pudo bloquear '%s'" -#: sequencer.c:413 +#: sequencer.c:436 sequencer.c:2869 sequencer.c:3074 sequencer.c:3088 +#: sequencer.c:3345 sequencer.c:5334 strbuf.c:1168 wrapper.c:631 +#, c-format +msgid "could not write to '%s'" +msgstr "no se pudo escribir en '%s'" + +#: sequencer.c:441 #, c-format msgid "could not write eol to '%s'" msgstr "no se pudo escribir EOL en '%s'" -#: sequencer.c:418 sequencer.c:2726 sequencer.c:2927 sequencer.c:2941 -#: sequencer.c:3203 +#: sequencer.c:446 sequencer.c:2874 sequencer.c:3076 sequencer.c:3090 +#: sequencer.c:3353 #, c-format msgid "failed to finalize '%s'" msgstr "falló al finalizar '%s'" -#: sequencer.c:431 sequencer.c:1620 sequencer.c:2746 sequencer.c:3185 -#: sequencer.c:3294 builtin/am.c:249 builtin/commit.c:786 builtin/merge.c:1128 -#, c-format -msgid "could not read '%s'" -msgstr "no se pudo leer '%s'" - -#: sequencer.c:457 +#: sequencer.c:485 #, c-format msgid "your local changes would be overwritten by %s." msgstr "tus cambios locales serán sobreescritos por %s." -#: sequencer.c:461 +#: sequencer.c:489 msgid "commit your changes or stash them to proceed." msgstr "realiza un commit con tus cambios o aplica un stash para proceder." -#: sequencer.c:493 +#: sequencer.c:521 #, c-format msgid "%s: fast-forward" msgstr "%s: avance rápido" -#: sequencer.c:532 builtin/tag.c:566 +#: sequencer.c:560 builtin/tag.c:598 #, c-format msgid "Invalid cleanup mode %s" msgstr "Modo cleanup inválido %s" @@ -6784,65 +7454,65 @@ msgstr "Modo cleanup inválido %s" #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase". #. -#: sequencer.c:626 +#: sequencer.c:670 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: Incapaz de escribir el nuevo archivo índice" -#: sequencer.c:643 +#: sequencer.c:684 msgid "unable to update cache tree" msgstr "no es posible actualizar el árbol de la caché" -#: sequencer.c:657 +#: sequencer.c:698 msgid "could not resolve HEAD commit" msgstr "no se pudo resolver el commit de HEAD" -#: sequencer.c:737 +#: sequencer.c:778 #, c-format msgid "no key present in '%.*s'" msgstr "no hay llave presente en '%.*s'" -#: sequencer.c:748 +#: sequencer.c:789 #, c-format msgid "unable to dequote value of '%s'" msgstr "no es posible dequote para '%s'" -#: sequencer.c:785 wrapper.c:198 wrapper.c:368 builtin/am.c:710 -#: builtin/am.c:802 builtin/merge.c:1125 builtin/rebase.c:896 +#: sequencer.c:826 wrapper.c:201 wrapper.c:371 builtin/am.c:710 +#: builtin/am.c:802 builtin/merge.c:1136 builtin/rebase.c:910 #, c-format msgid "could not open '%s' for reading" msgstr "no se pudo abrir '%s' para lectura" -#: sequencer.c:795 +#: sequencer.c:836 msgid "'GIT_AUTHOR_NAME' already given" msgstr "'GIT_AUTHOR_NAME' ya proporcionado" -#: sequencer.c:800 +#: sequencer.c:841 msgid "'GIT_AUTHOR_EMAIL' already given" msgstr "'GIT_AUTHOR_EMAIL' ya proporcionado" -#: sequencer.c:805 +#: sequencer.c:846 msgid "'GIT_AUTHOR_DATE' already given" msgstr "'GIT_AUTHOR_DATE' ya proporcionado" -#: sequencer.c:809 +#: sequencer.c:850 #, c-format msgid "unknown variable '%s'" msgstr "variable desconocida '%s'" -#: sequencer.c:814 +#: sequencer.c:855 msgid "missing 'GIT_AUTHOR_NAME'" msgstr "falta 'GIT_AUTHOR_NAME'" -#: sequencer.c:816 +#: sequencer.c:857 msgid "missing 'GIT_AUTHOR_EMAIL'" msgstr "falta 'GIT_AUTHOR_EMAIL'" -#: sequencer.c:818 +#: sequencer.c:859 msgid "missing 'GIT_AUTHOR_DATE'" msgstr "falta 'GIT_AUTHOR_DATE'" -#: sequencer.c:867 +#: sequencer.c:924 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -6872,11 +7542,11 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:1141 +#: sequencer.c:1211 msgid "'prepare-commit-msg' hook failed" msgstr "hook 'prepare-commit-msg' falló" -#: sequencer.c:1147 +#: sequencer.c:1217 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6903,7 +7573,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1160 +#: sequencer.c:1230 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6927,329 +7597,338 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1202 +#: sequencer.c:1272 msgid "couldn't look up newly created commit" msgstr "no se pudo revisar el commit recién creado" -#: sequencer.c:1204 +#: sequencer.c:1274 msgid "could not parse newly created commit" msgstr "no se pudo analizar el commit recién creado" -#: sequencer.c:1250 +#: sequencer.c:1320 msgid "unable to resolve HEAD after creating commit" msgstr "no se pudo resolver HEAD tras crear el commit" -#: sequencer.c:1252 +#: sequencer.c:1322 msgid "detached HEAD" msgstr "HEAD desacoplado" -#: sequencer.c:1256 +#: sequencer.c:1326 msgid " (root-commit)" msgstr " (commit-raíz)" -#: sequencer.c:1277 +#: sequencer.c:1347 msgid "could not parse HEAD" msgstr "no se pudo analizar HEAD" -#: sequencer.c:1279 +#: sequencer.c:1349 #, c-format msgid "HEAD %s is not a commit!" msgstr "¡HEAD %s no es un commit!" -#: sequencer.c:1283 sequencer.c:1357 builtin/commit.c:1579 +#: sequencer.c:1353 sequencer.c:1431 builtin/commit.c:1577 msgid "could not parse HEAD commit" msgstr "no se pudo analizar el commit de HEAD" -#: sequencer.c:1335 sequencer.c:1980 +#: sequencer.c:1409 sequencer.c:2108 msgid "unable to parse commit author" msgstr "no es posible analizar el autor del commit" -#: sequencer.c:1346 builtin/am.c:1566 builtin/merge.c:695 +#: sequencer.c:1420 builtin/am.c:1566 builtin/merge.c:702 msgid "git write-tree failed to write a tree" msgstr "git write-tree falló al escribir el árbol" -#: sequencer.c:1379 sequencer.c:1450 +#: sequencer.c:1453 sequencer.c:1573 #, c-format msgid "unable to read commit message from '%s'" msgstr "no se puede leer el mensaje del commit de '%s'" -#: sequencer.c:1406 builtin/am.c:1588 builtin/commit.c:1680 builtin/merge.c:894 -#: builtin/merge.c:919 +#: sequencer.c:1484 sequencer.c:1516 +#, c-format +msgid "invalid author identity '%s'" +msgstr "identidad de autor inválida '%s'" + +#: sequencer.c:1490 +msgid "corrupt author: missing date information" +msgstr "autor corrupto: falta información" + +#: sequencer.c:1529 builtin/am.c:1593 builtin/commit.c:1678 builtin/merge.c:905 +#: builtin/merge.c:930 t/helper/test-fast-rebase.c:78 msgid "failed to write commit object" msgstr "falló al escribir el objeto commit" -#: sequencer.c:1433 sequencer.c:4118 +#: sequencer.c:1556 sequencer.c:4291 t/helper/test-fast-rebase.c:198 #, c-format msgid "could not update %s" msgstr "no se puede actualizar %s" -#: sequencer.c:1481 +#: sequencer.c:1605 #, c-format msgid "could not parse commit %s" msgstr "no se pudo analizar commit %s" -#: sequencer.c:1486 +#: sequencer.c:1610 #, c-format msgid "could not parse parent commit %s" msgstr "no se pudo analizar el commit padre %s" -#: sequencer.c:1569 sequencer.c:1680 +#: sequencer.c:1693 sequencer.c:1804 #, c-format msgid "unknown command: %d" msgstr "comando desconocido: %d" -#: sequencer.c:1627 sequencer.c:1652 +#: sequencer.c:1751 sequencer.c:1776 #, c-format msgid "This is a combination of %d commits." msgstr "Esta es una combinación de %d commits." -#: sequencer.c:1637 +#: sequencer.c:1761 msgid "need a HEAD to fixup" msgstr "se necesita un HEAD para arreglar" -#: sequencer.c:1639 sequencer.c:3230 +#: sequencer.c:1763 sequencer.c:3380 msgid "could not read HEAD" msgstr "no se pudo leer HEAD" -#: sequencer.c:1641 +#: sequencer.c:1765 msgid "could not read HEAD's commit message" msgstr "no se pudo leer el mensaje de commit de HEAD" -#: sequencer.c:1647 +#: sequencer.c:1771 #, c-format msgid "cannot write '%s'" msgstr "no se puede escribir '%s'" -#: sequencer.c:1654 git-rebase--preserve-merges.sh:496 +#: sequencer.c:1778 git-rebase--preserve-merges.sh:486 msgid "This is the 1st commit message:" msgstr "Este es el mensaje del 1er commit:" -#: sequencer.c:1662 +#: sequencer.c:1786 #, c-format msgid "could not read commit message of %s" msgstr "no se puede leer el mensaje del commit de %s" -#: sequencer.c:1669 +#: sequencer.c:1793 #, c-format msgid "This is the commit message #%d:" msgstr "Este es el mensaje del commit #%d:" -#: sequencer.c:1675 +#: sequencer.c:1799 #, c-format msgid "The commit message #%d will be skipped:" msgstr "El mensaje del commit #%d será saltado:" -#: sequencer.c:1763 +#: sequencer.c:1887 msgid "your index file is unmerged." msgstr "tu archivo índice no está fusionado." -#: sequencer.c:1770 +#: sequencer.c:1894 msgid "cannot fixup root commit" msgstr "no se puede arreglar el commit raíz" -#: sequencer.c:1789 +#: sequencer.c:1913 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "el commit %s es una fusión pero no se proporcionó la opción -m." -#: sequencer.c:1797 sequencer.c:1805 +#: sequencer.c:1921 sequencer.c:1929 #, c-format msgid "commit %s does not have parent %d" msgstr "el commit %s no tiene un padre %d" -#: sequencer.c:1811 +#: sequencer.c:1935 #, c-format msgid "cannot get commit message for %s" msgstr "no se puede obtener el mensaje de commit para %s" #. TRANSLATORS: The first %s will be a "todo" command like #. "revert" or "pick", the second %s a SHA1. -#: sequencer.c:1830 +#: sequencer.c:1954 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: no se puede analizar el commit padre %s" -#: sequencer.c:1895 +#: sequencer.c:2019 #, c-format msgid "could not rename '%s' to '%s'" msgstr "no se puede renombrar '%s' a '%s'" -#: sequencer.c:1952 +#: sequencer.c:2079 #, c-format msgid "could not revert %s... %s" msgstr "no se pudo revertir %s... %s" -#: sequencer.c:1953 +#: sequencer.c:2080 #, c-format msgid "could not apply %s... %s" msgstr "no se pudo aplicar %s... %s" -#: sequencer.c:1972 +#: sequencer.c:2100 #, c-format msgid "dropping %s %s -- patch contents already upstream\n" msgstr "botando $%s %s -- contenidos del parche ya están en upstream\n" -#: sequencer.c:2030 +#: sequencer.c:2158 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: falló al leer el índice" -#: sequencer.c:2037 +#: sequencer.c:2165 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: falló al refrescar el índice" -#: sequencer.c:2114 +#: sequencer.c:2242 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "%s no acepta los argumentos: '%s'" -#: sequencer.c:2123 +#: sequencer.c:2251 #, c-format msgid "missing arguments for %s" msgstr "faltan argumentos para para %s" -#: sequencer.c:2154 +#: sequencer.c:2282 #, c-format msgid "could not parse '%s'" msgstr "no se puede analizar '%s'" -#: sequencer.c:2215 +#: sequencer.c:2343 #, c-format msgid "invalid line %d: %.*s" msgstr "línea inválida %d: %.*s" -#: sequencer.c:2226 +#: sequencer.c:2354 #, c-format msgid "cannot '%s' without a previous commit" msgstr "no se puede '%s' sin un commit previo" -#: sequencer.c:2310 +#: sequencer.c:2440 msgid "cancelling a cherry picking in progress" msgstr "cancelando cherry-pick en progreso" -#: sequencer.c:2317 +#: sequencer.c:2449 msgid "cancelling a revert in progress" msgstr "cancelando revert en progreso" -#: sequencer.c:2361 +#: sequencer.c:2493 msgid "please fix this using 'git rebase --edit-todo'." msgstr "por favor arregle esto usando 'git rebase --edit-todo'." -#: sequencer.c:2363 +#: sequencer.c:2495 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "hoja de instrucciones inutilizable: '%s'" -#: sequencer.c:2368 +#: sequencer.c:2500 msgid "no commits parsed." msgstr "ningún commit analizado." -#: sequencer.c:2379 +#: sequencer.c:2511 msgid "cannot cherry-pick during a revert." msgstr "no se puede realizar cherry-pick durante un revert." -#: sequencer.c:2381 +#: sequencer.c:2513 msgid "cannot revert during a cherry-pick." msgstr "no se puede realizar un revert durante un cherry-pick." -#: sequencer.c:2459 +#: sequencer.c:2591 #, c-format msgid "invalid value for %s: %s" msgstr "valor inválido para %s: %s" -#: sequencer.c:2556 +#: sequencer.c:2698 msgid "unusable squash-onto" msgstr "squash-onto inservible" -#: sequencer.c:2576 +#: sequencer.c:2718 #, c-format msgid "malformed options sheet: '%s'" msgstr "hoja de opciones mal formada: '%s'" -#: sequencer.c:2664 sequencer.c:4469 +#: sequencer.c:2811 sequencer.c:4644 msgid "empty commit set passed" msgstr "conjunto de commits vacío entregado" -#: sequencer.c:2680 +#: sequencer.c:2828 msgid "revert is already in progress" msgstr "revert ya está en progreso" -#: sequencer.c:2682 +#: sequencer.c:2830 #, c-format msgid "try \"git revert (--continue | %s--abort | --quit)\"" msgstr "intenta \"git revert (--continue | --quit | %s --abort)\"" -#: sequencer.c:2685 +#: sequencer.c:2833 msgid "cherry-pick is already in progress" msgstr "cherry-pick ya está en progreso" -#: sequencer.c:2687 +#: sequencer.c:2835 #, c-format msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" msgstr "intenta \"git cherry-pick (--continue | --quit | %s --abort)\"" -#: sequencer.c:2701 +#: sequencer.c:2849 #, c-format msgid "could not create sequencer directory '%s'" msgstr "no se pudo crear un directorio secuenciador '%s'" -#: sequencer.c:2716 +#: sequencer.c:2864 msgid "could not lock HEAD" msgstr "no se pudo bloquear HEAD" -#: sequencer.c:2776 sequencer.c:4206 +#: sequencer.c:2924 sequencer.c:4379 msgid "no cherry-pick or revert in progress" msgstr "ningún cherry-pick o revert en progreso" -#: sequencer.c:2778 sequencer.c:2789 +#: sequencer.c:2926 sequencer.c:2937 msgid "cannot resolve HEAD" msgstr "no se puede resolver HEAD" -#: sequencer.c:2780 sequencer.c:2824 +#: sequencer.c:2928 sequencer.c:2972 msgid "cannot abort from a branch yet to be born" msgstr "no se puede abortar de una rama por nacer" -#: sequencer.c:2810 builtin/grep.c:744 +#: sequencer.c:2958 builtin/grep.c:757 #, c-format msgid "cannot open '%s'" msgstr "no se puede abrir '%s'" -#: sequencer.c:2812 +#: sequencer.c:2960 #, c-format msgid "cannot read '%s': %s" msgstr "no se puede leer '%s': %s" -#: sequencer.c:2813 +#: sequencer.c:2961 msgid "unexpected end of file" msgstr "final de archivo inesperado" -#: sequencer.c:2819 +#: sequencer.c:2967 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "archivo HEAD de pre-cherry-pick guardado '%s' está corrupto" -#: sequencer.c:2830 +#: sequencer.c:2978 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "Parece que se ha movido HEAD. No se hace rebobinado, ¡revisa tu HEAD!" -#: sequencer.c:2871 +#: sequencer.c:3019 msgid "no revert in progress" msgstr "no hay revert en progreso" -#: sequencer.c:2879 +#: sequencer.c:3028 msgid "no cherry-pick in progress" msgstr "ningún cherry-pick en progreso" -#: sequencer.c:2889 +#: sequencer.c:3038 msgid "failed to skip the commit" msgstr "falló al escribir el commit" -#: sequencer.c:2896 +#: sequencer.c:3045 msgid "there is nothing to skip" msgstr "no hay nada que saltar" -#: sequencer.c:2899 +#: sequencer.c:3048 #, c-format msgid "" "have you committed already?\n" @@ -7258,16 +7937,16 @@ msgstr "" "¿ya has hecho el commit?\n" "intenta \"git %s --continue\"" -#: sequencer.c:3060 sequencer.c:4098 +#: sequencer.c:3210 sequencer.c:4271 msgid "cannot read HEAD" msgstr "no se puede leer HEAD" -#: sequencer.c:3077 +#: sequencer.c:3227 #, c-format msgid "unable to copy '%s' to '%s'" msgstr "no se pudo copiar '%s' a '%s'" -#: sequencer.c:3085 +#: sequencer.c:3235 #, c-format msgid "" "You can amend the commit now, with\n" @@ -7286,27 +7965,27 @@ msgstr "" "\n" "\tgit rebase --continue\n" -#: sequencer.c:3095 +#: sequencer.c:3245 #, c-format msgid "Could not apply %s... %.*s" msgstr "No se pudo aplicar %s... %.*s" -#: sequencer.c:3102 +#: sequencer.c:3252 #, c-format msgid "Could not merge %.*s" msgstr "No se pudo fusionar %.*s" -#: sequencer.c:3116 sequencer.c:3120 builtin/difftool.c:641 +#: sequencer.c:3266 sequencer.c:3270 builtin/difftool.c:640 #, c-format msgid "could not copy '%s' to '%s'" msgstr "no se pudo copiar '%s' a '%s'" -#: sequencer.c:3132 +#: sequencer.c:3282 #, c-format msgid "Executing: %s\n" msgstr "Ejecutando: %s\n" -#: sequencer.c:3147 +#: sequencer.c:3297 #, c-format msgid "" "execution failed: %s\n" @@ -7321,11 +8000,11 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3153 +#: sequencer.c:3303 msgid "and made changes to the index and/or the working tree\n" msgstr "y se hicieron cambios al índice y/o árbol de trabajo\n" -#: sequencer.c:3159 +#: sequencer.c:3309 #, c-format msgid "" "execution succeeded: %s\n" @@ -7342,90 +8021,90 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3220 +#: sequencer.c:3370 #, c-format msgid "illegal label name: '%.*s'" msgstr "nombre de label ilegal: '%.*s'" -#: sequencer.c:3274 +#: sequencer.c:3424 msgid "writing fake root commit" msgstr "escribiendo commit raíz falso" -#: sequencer.c:3279 +#: sequencer.c:3429 msgid "writing squash-onto" msgstr "escribiendo squash-onto" -#: sequencer.c:3363 +#: sequencer.c:3513 #, c-format msgid "could not resolve '%s'" msgstr "no se pudo resolver '%s'" -#: sequencer.c:3394 +#: sequencer.c:3546 msgid "cannot merge without a current revision" msgstr "no se puede fusionar sin una versión actual" -#: sequencer.c:3416 +#: sequencer.c:3568 #, c-format msgid "unable to parse '%.*s'" msgstr "no se puede analizar '%.*s'" -#: sequencer.c:3425 +#: sequencer.c:3577 #, c-format msgid "nothing to merge: '%.*s'" msgstr "nada para fusionar: '%.*s'" -#: sequencer.c:3437 +#: sequencer.c:3589 msgid "octopus merge cannot be executed on top of a [new root]" msgstr "fusión octopus no puede ser ejecutada en la punta de un [nuevo root]" -#: sequencer.c:3453 +#: sequencer.c:3605 #, c-format msgid "could not get commit message of '%s'" msgstr "no se puede leer el mensaje del commit '%s'" -#: sequencer.c:3613 +#: sequencer.c:3788 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "no se pudo intentar fusionar '%.*s'" -#: sequencer.c:3629 +#: sequencer.c:3804 msgid "merge: Unable to write new index file" msgstr "fusión: No se puede escribir el nuevo archivo índice" -#: sequencer.c:3703 +#: sequencer.c:3878 msgid "Cannot autostash" msgstr "No se puede ejecutar autostash" -#: sequencer.c:3706 +#: sequencer.c:3881 #, c-format msgid "Unexpected stash response: '%s'" msgstr "Respuesta de stash inesperada: '%s'" -#: sequencer.c:3712 +#: sequencer.c:3887 #, c-format msgid "Could not create directory for '%s'" msgstr "No se pudo crear el directorio para '%s'" -#: sequencer.c:3715 +#: sequencer.c:3890 #, c-format msgid "Created autostash: %s\n" msgstr "Autostash creado: %s\n" -#: sequencer.c:3719 +#: sequencer.c:3894 msgid "could not reset --hard" msgstr "no se pudo reset --hard" -#: sequencer.c:3744 +#: sequencer.c:3919 #, c-format msgid "Applied autostash.\n" msgstr "Autostash aplicado.\n" -#: sequencer.c:3756 +#: sequencer.c:3931 #, c-format msgid "cannot store %s" msgstr "no se puede guardar %s" -#: sequencer.c:3759 +#: sequencer.c:3934 #, c-format msgid "" "%s\n" @@ -7437,34 +8116,29 @@ msgstr "" "Puedes ejecutar \"git stash pop\" o \"git stash drop\" en cualquier " "momento.\n" -#: sequencer.c:3764 +#: sequencer.c:3939 msgid "Applying autostash resulted in conflicts." msgstr "Apicar autostash resultó en conflictos." -#: sequencer.c:3765 +#: sequencer.c:3940 msgid "Autostash exists; creating a new stash entry." msgstr "Autostash existe; creando una nueva entrada stash." -#: sequencer.c:3857 -#, c-format -msgid "%s: not a valid OID" -msgstr "%s no es OID válido" - -#: sequencer.c:3862 git-rebase--preserve-merges.sh:779 +#: sequencer.c:4033 git-rebase--preserve-merges.sh:769 msgid "could not detach HEAD" msgstr "no se puede desacoplar HEAD" -#: sequencer.c:3877 +#: sequencer.c:4048 #, c-format msgid "Stopped at HEAD\n" msgstr "Detenido en HEAD\n" -#: sequencer.c:3879 +#: sequencer.c:4050 #, c-format msgid "Stopped at %s\n" msgstr "Detenido en %s\n" -#: sequencer.c:3887 +#: sequencer.c:4058 #, c-format msgid "" "Could not execute the todo command\n" @@ -7485,58 +8159,58 @@ msgstr "" " git rebase --edit-todo\n" " git rebase --continue\n" -#: sequencer.c:3931 +#: sequencer.c:4104 #, c-format msgid "Rebasing (%d/%d)%s" msgstr "Aplicando rebase (%d/%d)%s" -#: sequencer.c:3976 +#: sequencer.c:4149 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "Detenido en %s... %.*s\n" -#: sequencer.c:4047 +#: sequencer.c:4220 #, c-format msgid "unknown command %d" msgstr "comando desconocido %d" -#: sequencer.c:4106 +#: sequencer.c:4279 msgid "could not read orig-head" msgstr "no se puede leer orig-head" -#: sequencer.c:4111 +#: sequencer.c:4284 msgid "could not read 'onto'" msgstr "no se puede leer 'onto'" -#: sequencer.c:4125 +#: sequencer.c:4298 #, c-format msgid "could not update HEAD to %s" msgstr "no se puede actualizar HEAD a %s" -#: sequencer.c:4185 +#: sequencer.c:4358 #, c-format msgid "Successfully rebased and updated %s.\n" msgstr "Rebase aplicado satisfactoriamente y actualizado %s.\n" -#: sequencer.c:4218 +#: sequencer.c:4391 msgid "cannot rebase: You have unstaged changes." msgstr "no se puede realizar rebase: Tienes cambios fuera del área de stage." -#: sequencer.c:4227 +#: sequencer.c:4400 msgid "cannot amend non-existing commit" msgstr "no se puede arreglar un commit no existente" -#: sequencer.c:4229 +#: sequencer.c:4402 #, c-format msgid "invalid file: '%s'" msgstr "archivo inválido: '%s'" -#: sequencer.c:4231 +#: sequencer.c:4404 #, c-format msgid "invalid contents: '%s'" msgstr "contenido inválido: '%s'" -#: sequencer.c:4234 +#: sequencer.c:4407 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -7547,50 +8221,50 @@ msgstr "" "un commit con estos\n" "primero y luego ejecuta 'git rebase --continue' de nuevo." -#: sequencer.c:4270 sequencer.c:4309 +#: sequencer.c:4443 sequencer.c:4482 #, c-format msgid "could not write file: '%s'" msgstr "no se pudo escribir el archivo: '%s'" -#: sequencer.c:4324 +#: sequencer.c:4498 msgid "could not remove CHERRY_PICK_HEAD" msgstr "no se puede eliminar CHERRY_PICK_HEAD" -#: sequencer.c:4331 +#: sequencer.c:4505 msgid "could not commit staged changes." msgstr "no se pudo realizar el commit con los cambios en el área de stage." -#: sequencer.c:4446 +#: sequencer.c:4621 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: no se puede aplicar cherry-pick a un %s" -#: sequencer.c:4450 +#: sequencer.c:4625 #, c-format msgid "%s: bad revision" msgstr "%s: revisión errónea" -#: sequencer.c:4485 +#: sequencer.c:4660 msgid "can't revert as initial commit" msgstr "no se puede revertir como commit inicial" -#: sequencer.c:4962 +#: sequencer.c:5137 msgid "make_script: unhandled options" msgstr "make_script: opciones desconocidas" -#: sequencer.c:4965 +#: sequencer.c:5140 msgid "make_script: error preparing revisions" msgstr "make_script: error preparando revisiones" -#: sequencer.c:5206 sequencer.c:5223 +#: sequencer.c:5382 sequencer.c:5399 msgid "nothing to do" msgstr "nada que hacer" -#: sequencer.c:5242 +#: sequencer.c:5418 msgid "could not skip unnecessary pick commands" msgstr "no se pudo saltar los comandos pick innecesarios" -#: sequencer.c:5336 +#: sequencer.c:5512 msgid "the script was already rearranged." msgstr "este script ya fue reorganizado." @@ -7647,85 +8321,89 @@ msgstr "" msgid "this operation must be run in a work tree" msgstr "esta operación debe ser realizada en un árbol de trabajo" -#: setup.c:604 +#: setup.c:661 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "Se esperaba versión de git repo <= %d, encontrada %d" -#: setup.c:612 +#: setup.c:669 msgid "unknown repository extensions found:" msgstr "se encontró extensión de repositorio desconocida:" -#: setup.c:631 +#: setup.c:681 +msgid "repo version is 0, but v1-only extensions found:" +msgstr "versión de repo es 0, pero extensión v1-only encontrada:" + +#: setup.c:700 #, c-format msgid "error opening '%s'" msgstr "error abriendo '%s'" -#: setup.c:633 +#: setup.c:702 #, c-format msgid "too large to be a .git file: '%s'" msgstr "muy grande para ser un archivo .git: '%s'" -#: setup.c:635 +#: setup.c:704 #, c-format msgid "error reading %s" msgstr "error leyendo %s" -#: setup.c:637 +#: setup.c:706 #, c-format msgid "invalid gitfile format: %s" msgstr "formato gitfile inválido: %s" -#: setup.c:639 +#: setup.c:708 #, c-format msgid "no path in gitfile: %s" msgstr "no hay ruta en gitfile: %s" -#: setup.c:641 +#: setup.c:710 #, c-format msgid "not a git repository: %s" msgstr "no es un repositorio git: %s" -#: setup.c:743 +#: setup.c:812 #, c-format msgid "'$%s' too big" msgstr "'$%s' muy grande" -#: setup.c:757 +#: setup.c:826 #, c-format msgid "not a git repository: '%s'" msgstr "no es un repositorio git: '%s'" -#: setup.c:786 setup.c:788 setup.c:819 +#: setup.c:855 setup.c:857 setup.c:888 #, c-format msgid "cannot chdir to '%s'" msgstr "no se puede aplicar chdir a '%s'" -#: setup.c:791 setup.c:847 setup.c:857 setup.c:896 setup.c:904 +#: setup.c:860 setup.c:916 setup.c:926 setup.c:965 setup.c:973 msgid "cannot come back to cwd" msgstr "no se puede volver a cwd" -#: setup.c:918 +#: setup.c:987 #, c-format msgid "failed to stat '%*s%s%s'" msgstr "falló al determinar '%*s%s%s'" -#: setup.c:1156 +#: setup.c:1225 msgid "Unable to read current working directory" msgstr "Incapaz de leer el directorio de trabajo actual" -#: setup.c:1165 setup.c:1171 +#: setup.c:1234 setup.c:1240 #, c-format msgid "cannot change to '%s'" msgstr "no se puede cambiar a '%s'" -#: setup.c:1176 +#: setup.c:1245 #, c-format msgid "not a git repository (or any of the parent directories): %s" msgstr "" "no es un repositorio git (ni ninguno de los directorios superiores): %s" -#: setup.c:1182 +#: setup.c:1251 #, c-format msgid "" "not a git repository (or any parent up to mount point %s)\n" @@ -7735,7 +8413,7 @@ msgstr "" "Parando en el límite del sistema de archivos " "(GIT_DISCOVERY_ACROSS_FILESYSTEM no establecido)." -#: setup.c:1293 +#: setup.c:1362 #, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" @@ -7744,375 +8422,18 @@ msgstr "" "problema con el valor del modo de archivo core.sharedRepository (0%.3o).\n" "El dueño de los archivos tiene que tener permisos de lectura y escritura." -#: setup.c:1340 +#: setup.c:1409 msgid "open /dev/null or dup failed" msgstr "falló al abrir /dev/null o dup" -#: setup.c:1355 +#: setup.c:1424 msgid "fork failed" msgstr "falló fork" -#: setup.c:1360 +#: setup.c:1429 msgid "setsid failed" msgstr "falló setsid" -#: sha1-file.c:470 -#, c-format -msgid "object directory %s does not exist; check .git/objects/info/alternates" -msgstr "objeto directorio %s no existe; revisa .git/objects/info/alternates" - -#: sha1-file.c:521 -#, c-format -msgid "unable to normalize alternate object path: %s" -msgstr "incapaz de normalizar la ruta de objeto alterno: %s" - -#: sha1-file.c:593 -#, c-format -msgid "%s: ignoring alternate object stores, nesting too deep" -msgstr "%s: ignorando espacios de objetos alternos, anidado muy profundo" - -#: sha1-file.c:600 -#, c-format -msgid "unable to normalize object directory: %s" -msgstr "incapaz de normalizar directorio de objeto: %s" - -#: sha1-file.c:643 -msgid "unable to fdopen alternates lockfile" -msgstr "no es posible hacer fdopen en lockfile alternos" - -#: sha1-file.c:661 -msgid "unable to read alternates file" -msgstr "no es posible leer archivos alternos" - -#: sha1-file.c:668 -msgid "unable to move new alternates file into place" -msgstr "no es posible mover archivos alternos en el lugar" - -#: sha1-file.c:703 -#, c-format -msgid "path '%s' does not exist" -msgstr "ruta '%s' no existe" - -#: sha1-file.c:724 -#, c-format -msgid "reference repository '%s' as a linked checkout is not supported yet." -msgstr "" -"repositorio de referencia '%s' como un checkout vinculado no es soportado " -"todavía." - -#: sha1-file.c:730 -#, c-format -msgid "reference repository '%s' is not a local repository." -msgstr "repositorio de referencia '%s' no es un repositorio local." - -#: sha1-file.c:736 -#, c-format -msgid "reference repository '%s' is shallow" -msgstr "repositorio de referencia '%s' es superficial (shallow)" - -#: sha1-file.c:744 -#, c-format -msgid "reference repository '%s' is grafted" -msgstr "repositorio de referencia '% s' está injertado" - -#: sha1-file.c:804 -#, c-format -msgid "invalid line while parsing alternate refs: %s" -msgstr "línea inválida mientras se analizaban refs alternas: %s" - -#: sha1-file.c:954 -#, c-format -msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" -msgstr "intentando usar mmap %<PRIuMAX> sobre límite %<PRIuMAX>" - -#: sha1-file.c:975 -msgid "mmap failed" -msgstr "mmap falló" - -#: sha1-file.c:1139 -#, c-format -msgid "object file %s is empty" -msgstr "archivo de objeto %s está vacío" - -#: sha1-file.c:1274 sha1-file.c:2454 -#, c-format -msgid "corrupt loose object '%s'" -msgstr "objeto perdido corrupto '%s'" - -#: sha1-file.c:1276 sha1-file.c:2458 -#, c-format -msgid "garbage at end of loose object '%s'" -msgstr "basura al final del objeto perdido '%s'" - -#: sha1-file.c:1318 -msgid "invalid object type" -msgstr "tipo de objeto inválido" - -#: sha1-file.c:1402 -#, c-format -msgid "unable to unpack %s header with --allow-unknown-type" -msgstr "no es posible desempacar header %s con --allow-unknown-type" - -#: sha1-file.c:1405 -#, c-format -msgid "unable to unpack %s header" -msgstr "incapaz de desempaquetar header %s" - -#: sha1-file.c:1411 -#, c-format -msgid "unable to parse %s header with --allow-unknown-type" -msgstr "no es posible analizar header %s con --allow-unknown-type" - -#: sha1-file.c:1414 -#, c-format -msgid "unable to parse %s header" -msgstr "incapaz de analizar header %s" - -#: sha1-file.c:1640 -#, c-format -msgid "failed to read object %s" -msgstr "falló al leer objeto %s" - -#: sha1-file.c:1644 -#, c-format -msgid "replacement %s not found for %s" -msgstr "reemplazo %s no encontrado para %s" - -#: sha1-file.c:1648 -#, c-format -msgid "loose object %s (stored in %s) is corrupt" -msgstr "objeto perdido %s (guardado en %s) está corrompido" - -#: sha1-file.c:1652 -#, c-format -msgid "packed object %s (stored in %s) is corrupt" -msgstr "paquete de objeto %s (guardado en %s) está corrompido" - -#: sha1-file.c:1757 -#, c-format -msgid "unable to write file %s" -msgstr "no es posible escribir archivo %s" - -#: sha1-file.c:1764 -#, c-format -msgid "unable to set permission to '%s'" -msgstr "no se pudo poner permisos a '%s'" - -#: sha1-file.c:1771 -msgid "file write error" -msgstr "falló de escritura" - -#: sha1-file.c:1791 -msgid "error when closing loose object file" -msgstr "error cerrando el archivo de objeto suelto" - -#: sha1-file.c:1856 -#, c-format -msgid "insufficient permission for adding an object to repository database %s" -msgstr "" -"permisos insuficientes para agregar un objeto a la base de datos del " -"repositorio %s" - -#: sha1-file.c:1858 -msgid "unable to create temporary file" -msgstr "no es posible crear un archivo temporal" - -#: sha1-file.c:1882 -msgid "unable to write loose object file" -msgstr "no es posible escribir el archivo de objeto suelto" - -#: sha1-file.c:1888 -#, c-format -msgid "unable to deflate new object %s (%d)" -msgstr "no es posible desinflar el objeto nuevo %s (%d)" - -#: sha1-file.c:1892 -#, c-format -msgid "deflateEnd on object %s failed (%d)" -msgstr "deflateEnd en objeto %s falló (%d)" - -#: sha1-file.c:1896 -#, c-format -msgid "confused by unstable object source data for %s" -msgstr "confundido por fuente de data de objetos inestable para %s" - -#: sha1-file.c:1906 builtin/pack-objects.c:1085 -#, c-format -msgid "failed utime() on %s" -msgstr "falló utime() en %s" - -#: sha1-file.c:1983 -#, c-format -msgid "cannot read object for %s" -msgstr "no se pudo leer el objeto para %s" - -#: sha1-file.c:2022 -msgid "corrupt commit" -msgstr "commit corrupto" - -#: sha1-file.c:2030 -msgid "corrupt tag" -msgstr "tag corrupto" - -#: sha1-file.c:2130 -#, c-format -msgid "read error while indexing %s" -msgstr "error leyendo al indexar %s" - -#: sha1-file.c:2133 -#, c-format -msgid "short read while indexing %s" -msgstr "lectura corta al indexar %s" - -#: sha1-file.c:2206 sha1-file.c:2216 -#, c-format -msgid "%s: failed to insert into database" -msgstr "%s: falló al insertar en la base de datos" - -#: sha1-file.c:2222 -#, c-format -msgid "%s: unsupported file type" -msgstr "%s: tipo de archivo no soportado" - -#: sha1-file.c:2246 -#, c-format -msgid "%s is not a valid object" -msgstr "%s no es objeto válido" - -#: sha1-file.c:2248 -#, c-format -msgid "%s is not a valid '%s' object" -msgstr "%s no es un objeto '%s' válido" - -#: sha1-file.c:2275 builtin/index-pack.c:155 -#, c-format -msgid "unable to open %s" -msgstr "no es posible abrir %s" - -#: sha1-file.c:2465 sha1-file.c:2518 -#, c-format -msgid "hash mismatch for %s (expected %s)" -msgstr "hash no concuerda para %s (se esperaba %s)" - -#: sha1-file.c:2489 -#, c-format -msgid "unable to mmap %s" -msgstr "no es posible hacer mmap a %s" - -#: sha1-file.c:2494 -#, c-format -msgid "unable to unpack header of %s" -msgstr "incapaz de desempaquetar header de %s" - -#: sha1-file.c:2500 -#, c-format -msgid "unable to parse header of %s" -msgstr "incapaz de analizar header de %s" - -#: sha1-file.c:2511 -#, c-format -msgid "unable to unpack contents of %s" -msgstr "no es posible desempaquetar contenidos de %s" - -#: sha1-name.c:486 -#, c-format -msgid "short SHA1 %s is ambiguous" -msgstr "SHA1 %s corto es ambiguo" - -#: sha1-name.c:497 -msgid "The candidates are:" -msgstr "Los candidatos son:" - -#: sha1-name.c:796 -msgid "" -"Git normally never creates a ref that ends with 40 hex characters\n" -"because it will be ignored when you just specify 40-hex. These refs\n" -"may be created by mistake. For example,\n" -"\n" -" git switch -c $br $(git rev-parse ...)\n" -"\n" -"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n" -"examine these refs and maybe delete them. Turn this message off by\n" -"running \"git config advice.objectNameWarning false\"" -msgstr "" -"Git normalmente nunca crea una ref que termine con 40 caracteres hex\n" -"porque esto sería ignorado cuando solo se especifiquen 40-hex. Estas refs\n" -"tal vez sean creadas por error. Por ejemplo,\n" -"\n" -" git switch -c $br $(git rev-parse ...)\n" -"\n" -"donde \"$br\" está de alguna manera vacía y una ref de 40-hex es creada. Por " -"favor\n" -"examina estas refs y tal vez bórralas. Silencia este mensaje \n" -"ejecutando \"git config advice.objectNameWarning false\"" - -#: sha1-name.c:916 -#, c-format -msgid "log for '%.*s' only goes back to %s" -msgstr "log para '%.*s' solo va hasta %s" - -#: sha1-name.c:924 -#, c-format -msgid "log for '%.*s' only has %d entries" -msgstr "log para '%.*s' solo tiene %d entradas" - -#: sha1-name.c:1689 -#, c-format -msgid "path '%s' exists on disk, but not in '%.*s'" -msgstr "la ruta '%s' existe en disco, pero no en '%.*s'" - -#: sha1-name.c:1695 -#, c-format -msgid "" -"path '%s' exists, but not '%s'\n" -"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?" -msgstr "" -"ruta '%s' existe, pero no '%s'\n" -"ayuda: ¿Quisiste decir '%.*s:%s' o '%.*s:./%s'?" - -#: sha1-name.c:1704 -#, c-format -msgid "path '%s' does not exist in '%.*s'" -msgstr "ruta '%s' no existe en '%.*s'" - -#: sha1-name.c:1732 -#, c-format -msgid "" -"path '%s' is in the index, but not at stage %d\n" -"hint: Did you mean ':%d:%s'?" -msgstr "" -"ruta '%s' está en el index, pero no en stage %d\n" -"ayuda:¿Quisiste decir: '%d:%s'?" - -#: sha1-name.c:1748 -#, c-format -msgid "" -"path '%s' is in the index, but not '%s'\n" -"hint: Did you mean ':%d:%s' aka ':%d:./%s'?" -msgstr "" -"ruta '%s' está en el index, pero no '%s'\n" -"ayuda:¿Quisiste decir ':%d:%s' o ':%d:./%s'?" - -#: sha1-name.c:1756 -#, c-format -msgid "path '%s' exists on disk, but not in the index" -msgstr "ruta '%s' existe en el disco, pero no en el index" - -#: sha1-name.c:1758 -#, c-format -msgid "path '%s' does not exist (neither on disk nor in the index)" -msgstr "ruta '%s' no existe (ni en disco ni en el index)" - -#: sha1-name.c:1771 -msgid "relative path syntax can't be used outside working tree" -msgstr "" -"la sintaxis de ruta relativa no se puede usar fuera del directorio de trabajo" - -#: sha1-name.c:1909 -#, c-format -msgid "invalid object name '%.*s'." -msgstr "nombre de objeto no válido: '%.*s'." - #. TRANSLATORS: IEC 80000-13:2008 gibibyte #: strbuf.c:848 #, c-format @@ -8165,6 +8486,12 @@ msgid_plural "%u bytes/s" msgstr[0] "%u bytes/s" msgstr[1] "%u bytes/s" +#: strbuf.c:1166 wrapper.c:199 wrapper.c:369 builtin/am.c:719 +#: builtin/rebase.c:866 +#, c-format +msgid "could not open '%s' for writing" +msgstr "no se pudo abrir '%s' para escritura" + #: strbuf.c:1175 #, c-format msgid "could not edit '%s'" @@ -8225,12 +8552,12 @@ msgstr "en el submódulo no poblado '%s'" msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "El patrón de ruta '%s' está en el submódulo '%.*s'" -#: submodule.c:434 +#: submodule.c:435 #, c-format msgid "bad --ignore-submodules argument: %s" msgstr "mal argumento --ignore-submodules: %s" -#: submodule.c:815 +#: submodule.c:817 #, c-format msgid "" "Submodule in commit %s at path: '%s' collides with a submodule named the " @@ -8239,50 +8566,50 @@ msgstr "" "Submódulo en el commit %s en ruta: '%s' colisiona con un submódulo llamado " "igual. Saltandolo." -#: submodule.c:910 +#: submodule.c:920 #, c-format msgid "submodule entry '%s' (%s) is a %s, not a commit" msgstr "entrada de submódulo '%s' (%s) es un %s, no un commit" -#: submodule.c:995 +#: submodule.c:1005 #, c-format msgid "" "Could not run 'git rev-list <commits> --not --remotes -n 1' command in " "submodule %s" msgstr "" -"no se pudo ejecutar comando 'git rev-list <commits> --not --remotes -n 1' en " +"No se pudo ejecutar comando 'git rev-list <commits> --not --remotes -n 1' en " "el submódulo %s" -#: submodule.c:1118 +#: submodule.c:1128 #, c-format msgid "process for submodule '%s' failed" msgstr "proceso para submódulo '%s' falló" -#: submodule.c:1147 builtin/branch.c:678 builtin/submodule--helper.c:2045 +#: submodule.c:1157 builtin/branch.c:689 builtin/submodule--helper.c:2469 msgid "Failed to resolve HEAD as a valid ref." msgstr "Falló al resolver HEAD como un ref válido." -#: submodule.c:1158 +#: submodule.c:1168 #, c-format msgid "Pushing submodule '%s'\n" msgstr "Empujando submódulo '%s'\n" -#: submodule.c:1161 +#: submodule.c:1171 #, c-format msgid "Unable to push submodule '%s'\n" msgstr "No es posible hacer push al submódulo '%s'\n" -#: submodule.c:1453 +#: submodule.c:1463 #, c-format msgid "Fetching submodule %s%s\n" msgstr "Haciendo fetch al submódulo %s%s\n" -#: submodule.c:1483 +#: submodule.c:1497 #, c-format msgid "Could not access submodule '%s'\n" msgstr "No pudo acceder al submódulo '%s'\n" -#: submodule.c:1637 +#: submodule.c:1652 #, c-format msgid "" "Errors during submodule fetch:\n" @@ -8291,61 +8618,61 @@ msgstr "" "Errores durante el fetch del submódulo:\n" "%s" -#: submodule.c:1662 +#: submodule.c:1677 #, c-format msgid "'%s' not recognized as a git repository" msgstr "'%s' no reconocido como un repositorio git" -#: submodule.c:1679 +#: submodule.c:1694 #, c-format msgid "Could not run 'git status --porcelain=2' in submodule %s" msgstr "No se pudo ejecutar 'git status --procelain=2' en el submódulo %s" -#: submodule.c:1720 +#: submodule.c:1735 #, c-format msgid "'git status --porcelain=2' failed in submodule %s" msgstr "'git status --procelain=2' falló en el submódulo %s" -#: submodule.c:1800 +#: submodule.c:1810 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "no se pudo comenzar 'git status' en el submódulo '%s'" -#: submodule.c:1813 +#: submodule.c:1823 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "no se pudo ejecutar 'git status' en el submódulo '%s'" -#: submodule.c:1828 +#: submodule.c:1838 #, c-format msgid "Could not unset core.worktree setting in submodule '%s'" msgstr "No se pudo quitar configuración core.worktree en submódulo '%s'" -#: submodule.c:1855 submodule.c:2165 +#: submodule.c:1865 submodule.c:2175 #, c-format msgid "could not recurse into submodule '%s'" msgstr "no pudo recursar en el submódulo '%s'" -#: submodule.c:1876 +#: submodule.c:1886 msgid "could not reset submodule index" msgstr "no se pudo reiniciar el index del submódulo" -#: submodule.c:1918 +#: submodule.c:1928 #, c-format msgid "submodule '%s' has dirty index" msgstr "submódulo '%s' tiene un índice corrupto" -#: submodule.c:1970 +#: submodule.c:1980 #, c-format msgid "Submodule '%s' could not be updated." msgstr "Submódulo '%s' no pudo ser actualizado." -#: submodule.c:2038 +#: submodule.c:2048 #, c-format msgid "submodule git dir '%s' is inside git dir '%.*s'" msgstr "submódulo git dir '%s' esta dentro de git dir '%.*s'" -#: submodule.c:2059 +#: submodule.c:2069 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" @@ -8353,17 +8680,17 @@ msgstr "" "relocate_gitdir para el submódulo '%s' con más de un árbol de trabajo no " "soportado" -#: submodule.c:2071 submodule.c:2130 +#: submodule.c:2081 submodule.c:2140 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "no se pudo resolver el nombre para el submódulo '%s'" -#: submodule.c:2075 +#: submodule.c:2085 #, c-format msgid "refusing to move '%s' into an existing git dir" msgstr "rechazando mover '%s' dentro de un directorio git existente" -#: submodule.c:2082 +#: submodule.c:2092 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -8374,65 +8701,65 @@ msgstr "" "'%s' hacia\n" "'%s'\n" -#: submodule.c:2210 +#: submodule.c:2220 msgid "could not start ls-files in .." msgstr "no se pudo comenzar ls-files en .." -#: submodule.c:2250 +#: submodule.c:2260 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree devolvió un código %d inesperado" -#: trailer.c:238 +#: trailer.c:236 #, c-format msgid "running trailer command '%s' failed" msgstr "ejecución del comando de remolque '%s' falló" -#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553 -#: trailer.c:557 +#: trailer.c:483 trailer.c:488 trailer.c:493 trailer.c:547 trailer.c:551 +#: trailer.c:555 #, c-format msgid "unknown value '%s' for key '%s'" msgstr "valor '%s' desconocido para la clave '%s'" -#: trailer.c:539 trailer.c:544 builtin/remote.c:298 builtin/remote.c:323 +#: trailer.c:537 trailer.c:542 builtin/remote.c:299 builtin/remote.c:324 #, c-format msgid "more than one %s" msgstr "más de un %s" -#: trailer.c:730 +#: trailer.c:728 #, c-format msgid "empty trailer token in trailer '%.*s'" msgstr "token de remolque vacío en el trailer '%.*s'" -#: trailer.c:750 +#: trailer.c:748 #, c-format msgid "could not read input file '%s'" msgstr "no se pudo leer el archivo de entrada '%s'" -#: trailer.c:753 +#: trailer.c:751 builtin/mktag.c:91 msgid "could not read from stdin" msgstr "no se pudo leer desde stdin" -#: trailer.c:1011 wrapper.c:673 +#: trailer.c:1009 wrapper.c:676 #, c-format msgid "could not stat %s" msgstr "no se pudo definir %s" -#: trailer.c:1013 +#: trailer.c:1011 #, c-format msgid "file %s is not a regular file" msgstr "el archivo %s no es un archivo regular" -#: trailer.c:1015 +#: trailer.c:1013 #, c-format msgid "file %s is not writable by user" msgstr "el archivo %s no puede ser escrito por el usuario" -#: trailer.c:1027 +#: trailer.c:1025 msgid "could not open temporary file" msgstr "no se pudo abrir el archivo temporal" -#: trailer.c:1067 +#: trailer.c:1065 #, c-format msgid "could not rename temporary file to %s" msgstr "no se pudo renombrar el archivo temporal a %s" @@ -8481,7 +8808,7 @@ msgstr "no se pudo ejecutar fast-import" msgid "error while running fast-import" msgstr "error al ejecutar fast-import" -#: transport-helper.c:549 transport-helper.c:1156 +#: transport-helper.c:549 transport-helper.c:1237 #, c-format msgid "could not read ref %s" msgstr "no se pudo leer la referencia %s" @@ -8499,7 +8826,7 @@ msgstr "configurando servicio de ruta remota no soportado por el protocolo" msgid "invalid remote service path" msgstr "ruta de servicio remoto inválida" -#: transport-helper.c:661 transport.c:1347 +#: transport-helper.c:661 transport.c:1447 msgid "operation not supported by protocol" msgstr "operación no soportada por protocolo" @@ -8508,59 +8835,68 @@ msgstr "operación no soportada por protocolo" msgid "can't connect to subservice %s" msgstr "no se puede conectar al subservicio %s" -#: transport-helper.c:740 +#: transport-helper.c:745 +msgid "'option' without a matching 'ok/error' directive" +msgstr "'opción' sin una directiva correspondiente 'ok/error'" + +#: transport-helper.c:788 #, c-format msgid "expected ok/error, helper said '%s'" msgstr "se esperaba ok/error, helper dijo '%s'" -#: transport-helper.c:793 +#: transport-helper.c:845 #, c-format msgid "helper reported unexpected status of %s" msgstr "helper reportó estado inesperado de %s" -#: transport-helper.c:854 +#: transport-helper.c:928 #, c-format msgid "helper %s does not support dry-run" msgstr "helper %s no soporta dry-run" -#: transport-helper.c:857 +#: transport-helper.c:931 #, c-format msgid "helper %s does not support --signed" msgstr "helper %s no soporta --signed" -#: transport-helper.c:860 +#: transport-helper.c:934 #, c-format msgid "helper %s does not support --signed=if-asked" msgstr "helper %s no soporta --signed=if-asked" -#: transport-helper.c:865 +#: transport-helper.c:939 #, c-format msgid "helper %s does not support --atomic" msgstr "helper %s no soporta --atomic" -#: transport-helper.c:871 +#: transport-helper.c:943 +#, c-format +msgid "helper %s does not support --%s" +msgstr "helper %s no soporta --%s" + +#: transport-helper.c:950 #, c-format msgid "helper %s does not support 'push-option'" msgstr "helper %s no soporta 'push-option'" -#: transport-helper.c:970 +#: transport-helper.c:1050 msgid "remote-helper doesn't support push; refspec needed" msgstr "remote-helper no soporta push; se necesita refspec" -#: transport-helper.c:975 +#: transport-helper.c:1055 #, c-format msgid "helper %s does not support 'force'" msgstr "helper %s no soporta 'force'" -#: transport-helper.c:1022 +#: transport-helper.c:1102 msgid "couldn't run fast-export" msgstr "no se pudo ejecutar fast-export" -#: transport-helper.c:1027 +#: transport-helper.c:1107 msgid "error while running fast-export" msgstr "error al ejecutar fast-export" -#: transport-helper.c:1052 +#: transport-helper.c:1132 #, c-format msgid "" "No refs in common and none specified; doing nothing.\n" @@ -8569,52 +8905,52 @@ msgstr "" "No hay refs comunes y ninguno especificado; no se hace nada.\n" "Tal vez deberías especificar un branch.\n" -#: transport-helper.c:1133 +#: transport-helper.c:1214 #, c-format msgid "unsupported object format '%s'" msgstr "formado de objeto no soportado '%s'" -#: transport-helper.c:1142 +#: transport-helper.c:1223 #, c-format msgid "malformed response in ref list: %s" msgstr "respuesta malformada en lista de refs: %s" -#: transport-helper.c:1294 +#: transport-helper.c:1375 #, c-format msgid "read(%s) failed" msgstr "leer(%s) falló" -#: transport-helper.c:1321 +#: transport-helper.c:1402 #, c-format msgid "write(%s) failed" msgstr "escribir(%s) falló" -#: transport-helper.c:1370 +#: transport-helper.c:1451 #, c-format msgid "%s thread failed" msgstr "hilo %s falló" -#: transport-helper.c:1374 +#: transport-helper.c:1455 #, c-format msgid "%s thread failed to join: %s" msgstr "hilo %s falló al unirse: %s" -#: transport-helper.c:1393 transport-helper.c:1397 +#: transport-helper.c:1474 transport-helper.c:1478 #, c-format msgid "can't start thread for copying data: %s" msgstr "no se puede iniciar el hilo para copiar data: %s" -#: transport-helper.c:1434 +#: transport-helper.c:1515 #, c-format msgid "%s process failed to wait" msgstr "proceso %s falló al esperar" -#: transport-helper.c:1438 +#: transport-helper.c:1519 #, c-format msgid "%s process failed" msgstr "proceso %s falló" -#: transport-helper.c:1456 transport-helper.c:1465 +#: transport-helper.c:1537 transport-helper.c:1546 msgid "can't start thread for copying data" msgstr "no se puede iniciar hilo para copiar data" @@ -8633,37 +8969,37 @@ msgstr "no se pudo leer el conjunto '%s'" msgid "transport: invalid depth option '%s'" msgstr "transport: opción inválida '%s'" -#: transport.c:272 +#: transport.c:269 msgid "see protocol.version in 'git help config' for more details" msgstr "ver protocol.version en 'git help config' para más información" -#: transport.c:273 +#: transport.c:270 msgid "server options require protocol version 2 or later" msgstr "opciones del servidor requieren protocolo versión 2 o posterior" -#: transport.c:631 +#: transport.c:727 msgid "could not parse transport.color.* config" msgstr "no se pudo analizar valor de configuración transport.color.*" -#: transport.c:704 +#: transport.c:802 msgid "support for protocol v2 not implemented yet" msgstr "soporte para protocolo v2 no implementado todavía" -#: transport.c:838 +#: transport.c:936 #, c-format msgid "unknown value for config '%s': %s" msgstr "valor desconocido para configuración '%s': %s" -#: transport.c:904 +#: transport.c:1002 #, c-format msgid "transport '%s' not allowed" msgstr "transporte '%s' no permitido" -#: transport.c:957 +#: transport.c:1055 msgid "git-over-rsync is no longer supported" msgstr "git-over-rsync ya no es soportado" -#: transport.c:1059 +#: transport.c:1157 #, c-format msgid "" "The following submodule paths contain changes that can\n" @@ -8672,7 +9008,7 @@ msgstr "" "La siguiente ruta de submódulo contiene cambios que no\n" "pueden ser encontrados en ningún remoto:\n" -#: transport.c:1063 +#: transport.c:1161 #, c-format msgid "" "\n" @@ -8699,27 +9035,27 @@ msgstr "" "para hacer un push al remoto.\n" "\n" -#: transport.c:1071 +#: transport.c:1169 msgid "Aborting." msgstr "Abortando." -#: transport.c:1216 +#: transport.c:1316 msgid "failed to push all needed submodules" msgstr "falló al hacer push a todos los submódulos necesarios" -#: tree-walk.c:32 +#: tree-walk.c:33 msgid "too-short tree object" msgstr "objeto de árbol muy corto" -#: tree-walk.c:38 +#: tree-walk.c:39 msgid "malformed mode in tree entry" msgstr "modo mal formado en la entrada de árbol" -#: tree-walk.c:42 +#: tree-walk.c:43 msgid "empty filename in tree entry" msgstr "nombre de archivo vacío en la entrada de árbol" -#: tree-walk.c:117 +#: tree-walk.c:118 msgid "too-short tree file" msgstr "archivo de árbol muy corto" @@ -8992,7 +9328,7 @@ msgstr "" msgid "Updating index flags" msgstr "Actualizando flags del index" -#: upload-pack.c:1415 +#: upload-pack.c:1543 msgid "expected flush after fetch arguments" msgstr "se espera flush tras argumentos fetch" @@ -9029,50 +9365,118 @@ msgstr "segmento de ruta '..' inválido" msgid "Fetching objects" msgstr "Haciendo fetch a objetos" -#: worktree.c:248 builtin/am.c:2098 +#: worktree.c:238 builtin/am.c:2103 #, c-format msgid "failed to read '%s'" msgstr "falló al leer '%s'" -#: worktree.c:295 +#: worktree.c:304 #, c-format msgid "'%s' at main working tree is not the repository directory" msgstr "" "'%s' en el árbol de trabajo principal no es el directorio del repositorio" -#: worktree.c:306 +#: worktree.c:315 #, c-format msgid "'%s' file does not contain absolute path to the working tree location" msgstr "" "archivo '%s' no contiene una ruta absoluta a la ubicación del árbol de " "trabajo" -#: worktree.c:318 +#: worktree.c:327 #, c-format msgid "'%s' does not exist" msgstr "'%s' no existe" -#: worktree.c:324 +#: worktree.c:333 #, c-format msgid "'%s' is not a .git file, error code %d" msgstr "'%s' no es un archivo .git, código de error %d" -#: worktree.c:333 +#: worktree.c:342 #, c-format msgid "'%s' does not point back to '%s'" msgstr "'%s' no apunta de vuelta a '%s'" -#: wrapper.c:194 wrapper.c:364 +#: worktree.c:608 +msgid "not a directory" +msgstr "no es un directorio" + +#: worktree.c:617 +msgid ".git is not a file" +msgstr ".git no es un archivo" + +#: worktree.c:619 +msgid ".git file broken" +msgstr "archivo .git roto" + +#: worktree.c:621 +msgid ".git file incorrect" +msgstr "archivo .git incorrecto" + +#: worktree.c:727 +msgid "not a valid path" +msgstr "no es una ruta válida" + +#: worktree.c:733 +msgid "unable to locate repository; .git is not a file" +msgstr "no es posible ubicar el repositorio; .git no es un archivo" + +#: worktree.c:737 +msgid "unable to locate repository; .git file does not reference a repository" +msgstr "" +"incapaz de localizar el repositorio; El archivo .git no hace referencia a un " +"repositorio" + +#: worktree.c:741 +msgid "unable to locate repository; .git file broken" +msgstr "no es posible ubicar el repositorio; archivo .git roto" + +#: worktree.c:747 +msgid "gitdir unreadable" +msgstr "gitdir ilegible" + +#: worktree.c:751 +msgid "gitdir incorrect" +msgstr "gitdir incorrecto" + +#: worktree.c:776 +msgid "not a valid directory" +msgstr "no en un directorio válido" + +#: worktree.c:782 +msgid "gitdir file does not exist" +msgstr "archivo gitdir no existe" + +#: worktree.c:787 worktree.c:796 +#, c-format +msgid "unable to read gitdir file (%s)" +msgstr "no es posible leer archivo gitdir (%s)" + +#: worktree.c:806 +#, c-format +msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)" +msgstr "lectura corta (se esperaba %<PRIuMAX> bytes, se leyó %<PRIuMAX>)" + +#: worktree.c:814 +msgid "invalid gitdir file" +msgstr "archivo gitdir inválido" + +#: worktree.c:822 +msgid "gitdir file points to non-existent location" +msgstr "archivo gitdir apunta a una ubicación inexistente" + +#: wrapper.c:197 wrapper.c:367 #, c-format msgid "could not open '%s' for reading and writing" msgstr "no se pudo abrir '%s' para lectura y escritura" -#: wrapper.c:395 wrapper.c:596 +#: wrapper.c:398 wrapper.c:599 #, c-format msgid "unable to access '%s'" msgstr "no es posible acceder '%s'" -#: wrapper.c:604 +#: wrapper.c:607 msgid "unable to get current working directory" msgstr "no es posible obtener el directorio de trabajo actual" @@ -9148,79 +9552,79 @@ msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr "" " (usa \"git %s <archivo>...\" para incluirlo a lo que se será confirmado)" -#: wt-status.c:268 +#: wt-status.c:266 msgid "both deleted:" msgstr "ambos borrados:" -#: wt-status.c:270 +#: wt-status.c:268 msgid "added by us:" msgstr "agregado por nosotros:" -#: wt-status.c:272 +#: wt-status.c:270 msgid "deleted by them:" msgstr "borrados por ellos:" -#: wt-status.c:274 +#: wt-status.c:272 msgid "added by them:" msgstr "agregado por ellos:" -#: wt-status.c:276 +#: wt-status.c:274 msgid "deleted by us:" msgstr "borrado por nosotros:" -#: wt-status.c:278 +#: wt-status.c:276 msgid "both added:" msgstr "ambos agregados:" -#: wt-status.c:280 +#: wt-status.c:278 msgid "both modified:" msgstr "ambos modificados:" -#: wt-status.c:290 +#: wt-status.c:288 msgid "new file:" msgstr "nuevo archivo:" -#: wt-status.c:292 +#: wt-status.c:290 msgid "copied:" msgstr "copiado:" -#: wt-status.c:294 +#: wt-status.c:292 msgid "deleted:" msgstr "borrado:" -#: wt-status.c:296 +#: wt-status.c:294 msgid "modified:" msgstr "modificado:" -#: wt-status.c:298 +#: wt-status.c:296 msgid "renamed:" msgstr "renombrado:" -#: wt-status.c:300 +#: wt-status.c:298 msgid "typechange:" msgstr "cambio de tipo:" -#: wt-status.c:302 +#: wt-status.c:300 msgid "unknown:" msgstr "desconocido:" -#: wt-status.c:304 +#: wt-status.c:302 msgid "unmerged:" msgstr "des-fusionado:" -#: wt-status.c:384 +#: wt-status.c:382 msgid "new commits, " msgstr "nuevos commits, " -#: wt-status.c:386 +#: wt-status.c:384 msgid "modified content, " msgstr "contenido modificado, " -#: wt-status.c:388 +#: wt-status.c:386 msgid "untracked content, " msgstr "contenido no rastreado, " -#: wt-status.c:904 +#: wt-status.c:905 #, c-format msgid "Your stash currently has %d entry" msgid_plural "Your stash currently has %d entries" @@ -9484,6 +9888,14 @@ msgstr "rebase interactivo en progreso; en " msgid "rebase in progress; onto " msgstr "rebase en progreso; en " +#: wt-status.c:1747 +msgid "HEAD detached at " +msgstr "HEAD desacoplada en " + +#: wt-status.c:1749 +msgid "HEAD detached from " +msgstr "HEAD desacoplada de " + #: wt-status.c:1752 msgid "Not currently on any branch." msgstr "Actualmente no estás en ninguna rama." @@ -9534,12 +9946,12 @@ msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" "sin cambios agregados al commit (usa \"git add\" y/o \"git commit -a\")\n" -#: wt-status.c:1812 +#: wt-status.c:1813 #, c-format msgid "no changes added to commit\n" msgstr "no se agregaron cambios al commit\n" -#: wt-status.c:1815 +#: wt-status.c:1817 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -9548,72 +9960,72 @@ msgstr "" "no hay nada agregado al commit pero hay archivos sin seguimiento presentes " "(usa \"git add\" para hacerles seguimiento)\n" -#: wt-status.c:1818 +#: wt-status.c:1821 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "" "no hay nada agregado para confirmar, pero hay archivos sin seguimiento " "presentes\n" -#: wt-status.c:1821 +#: wt-status.c:1825 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" "no hay nada para confirmar (crea/copia archivos y usa \"git add\" para " "hacerles seguimiento)\n" -#: wt-status.c:1824 wt-status.c:1829 +#: wt-status.c:1829 wt-status.c:1835 #, c-format msgid "nothing to commit\n" msgstr "nada para hacer commit\n" -#: wt-status.c:1827 +#: wt-status.c:1832 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" "nada para hacer commit (usa -u para mostrar los archivos no rastreados)\n" -#: wt-status.c:1831 +#: wt-status.c:1837 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "nada para hacer commit, el árbol de trabajo está limpio\n" -#: wt-status.c:1944 +#: wt-status.c:1942 msgid "No commits yet on " msgstr "No hay commits todavía en " -#: wt-status.c:1948 +#: wt-status.c:1946 msgid "HEAD (no branch)" msgstr "HEAD (sin rama)" -#: wt-status.c:1979 +#: wt-status.c:1977 msgid "different" msgstr "diferente" -#: wt-status.c:1981 wt-status.c:1989 +#: wt-status.c:1979 wt-status.c:1987 msgid "behind " msgstr "detrás " -#: wt-status.c:1984 wt-status.c:1987 +#: wt-status.c:1982 wt-status.c:1985 msgid "ahead " msgstr "adelante " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2509 +#: wt-status.c:2507 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "no se puede %s: Tienes cambios sin marcar." -#: wt-status.c:2515 +#: wt-status.c:2513 msgid "additionally, your index contains uncommitted changes." msgstr "adicionalmente, tu índice contiene cambios que no están en un commit." -#: wt-status.c:2517 +#: wt-status.c:2515 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "no se puede %s: Tu índice contiene cambios que no están en un commit." -#: compat/precompose_utf8.c:58 builtin/clone.c:456 +#: compat/precompose_utf8.c:58 builtin/clone.c:457 #, c-format msgid "failed to unlink '%s'" msgstr "falló al desvincular '%s'" @@ -9622,128 +10034,133 @@ msgstr "falló al desvincular '%s'" msgid "git add [<options>] [--] <pathspec>..." msgstr "git add [<opción>] [--] <especificación-de-ruta>..." -#: builtin/add.c:88 +#: builtin/add.c:58 +#, c-format +msgid "cannot chmod %cx '%s'" +msgstr "no se puede aplicar chmod %cx '%s'" + +#: builtin/add.c:96 #, c-format msgid "unexpected diff status %c" msgstr "diff status inesperado %c" -#: builtin/add.c:93 builtin/commit.c:285 +#: builtin/add.c:101 builtin/commit.c:285 msgid "updating files failed" msgstr "falló la actualización de carpetas" -#: builtin/add.c:103 +#: builtin/add.c:111 #, c-format msgid "remove '%s'\n" msgstr "eliminar '%s'\n" -#: builtin/add.c:178 +#: builtin/add.c:186 msgid "Unstaged changes after refreshing the index:" msgstr "Cambios fuera del área de stage tras refrescar el índice:" -#: builtin/add.c:266 builtin/rev-parse.c:904 +#: builtin/add.c:280 builtin/rev-parse.c:991 msgid "Could not read the index" msgstr "No se pudo leer el índice" -#: builtin/add.c:277 +#: builtin/add.c:291 #, c-format msgid "Could not open '%s' for writing." msgstr "No se pudo abrir '%s' para escritura." -#: builtin/add.c:281 +#: builtin/add.c:295 msgid "Could not write patch" msgstr "No se puede escribir el parche" -#: builtin/add.c:284 +#: builtin/add.c:298 msgid "editing patch failed" msgstr "falló la edición del parche" -#: builtin/add.c:287 +#: builtin/add.c:301 #, c-format msgid "Could not stat '%s'" msgstr "No se pudo definir '%s'" -#: builtin/add.c:289 +#: builtin/add.c:303 msgid "Empty patch. Aborted." msgstr "Parche vacío. Abortado." -#: builtin/add.c:294 +#: builtin/add.c:308 #, c-format msgid "Could not apply '%s'" msgstr "No se pudo aplicar '%s'" -#: builtin/add.c:302 +#: builtin/add.c:316 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" "Las siguientes rutas son ignoradas por uno de tus archivos .gitignore:\n" -#: builtin/add.c:322 builtin/clean.c:904 builtin/fetch.c:164 builtin/mv.c:124 -#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:548 -#: builtin/remote.c:1421 builtin/rm.c:242 builtin/send-pack.c:165 +#: builtin/add.c:336 builtin/clean.c:904 builtin/fetch.c:169 builtin/mv.c:124 +#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:559 +#: builtin/remote.c:1427 builtin/rm.c:242 builtin/send-pack.c:190 msgid "dry run" msgstr "dry run ( ejecución en seco)" -#: builtin/add.c:325 +#: builtin/add.c:339 msgid "interactive picking" msgstr "selección interactiva" -#: builtin/add.c:326 builtin/checkout.c:1533 builtin/reset.c:308 +#: builtin/add.c:340 builtin/checkout.c:1546 builtin/reset.c:308 msgid "select hunks interactively" msgstr "elegir hunks de forma interactiva" -#: builtin/add.c:327 +#: builtin/add.c:341 msgid "edit current diff and apply" msgstr "editar diff actual y aplicar" -#: builtin/add.c:328 +#: builtin/add.c:342 msgid "allow adding otherwise ignored files" msgstr "permitir agregar caso contrario ignorar archivos" -#: builtin/add.c:329 +#: builtin/add.c:343 msgid "update tracked files" msgstr "actualizado las carpetas rastreadas" -#: builtin/add.c:330 +#: builtin/add.c:344 msgid "renormalize EOL of tracked files (implies -u)" msgstr "renormalizar EOL de los archivos rastreados (implica -u)" -#: builtin/add.c:331 +#: builtin/add.c:345 msgid "record only the fact that the path will be added later" msgstr "grabar solo el hecho de que la ruta será agregada después" -#: builtin/add.c:332 +#: builtin/add.c:346 msgid "add changes from all tracked and untracked files" msgstr "agregar los cambios de todas las carpetas con y sin seguimiento" -#: builtin/add.c:335 +#: builtin/add.c:349 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "" "ignorar rutas eliminadas en el árbol de trabajo (lo mismo que --no-all)" -#: builtin/add.c:337 +#: builtin/add.c:351 msgid "don't add, only refresh the index" msgstr "no agregar, solo actualizar el índice" -#: builtin/add.c:338 +#: builtin/add.c:352 msgid "just skip files which cannot be added because of errors" msgstr "saltar las carpetas que no pueden ser agregadas a causa de errores" -#: builtin/add.c:339 +#: builtin/add.c:353 msgid "check if - even missing - files are ignored in dry run" msgstr "comprobar si - incluso los archivos que faltan - se ignoran en dry run" -#: builtin/add.c:341 builtin/update-index.c:1004 +#: builtin/add.c:355 builtin/update-index.c:1004 msgid "override the executable bit of the listed files" msgstr "sobrescribir el bit ejecutable de los archivos listados" -#: builtin/add.c:343 +#: builtin/add.c:357 msgid "warn when adding an embedded repository" msgstr "avisar cuando se agrega un repositorio incrustado" -#: builtin/add.c:345 +#: builtin/add.c:359 msgid "backend for `git stash -p`" msgstr "backend para `git stash -p`" -#: builtin/add.c:363 +#: builtin/add.c:377 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -9774,12 +10191,12 @@ msgstr "" "\n" "Vea \"git help submodule\" para más información." -#: builtin/add.c:391 +#: builtin/add.c:405 #, c-format msgid "adding embedded git repository: %s" msgstr "agregando repositorio embebido: %s" -#: builtin/add.c:410 +#: builtin/add.c:424 msgid "" "Use -f if you really want to add them.\n" "Turn this message off by running\n" @@ -9789,47 +10206,47 @@ msgstr "" "Desactiva este mensaje ejecutando\n" "\"git config advice.addIgnoredFile false\"" -#: builtin/add.c:419 +#: builtin/add.c:433 msgid "adding files failed" msgstr "falló al agregar archivos" -#: builtin/add.c:447 builtin/commit.c:345 +#: builtin/add.c:461 builtin/commit.c:345 msgid "--pathspec-from-file is incompatible with --interactive/--patch" msgstr "--pathspec-from-file es incompatible con --interactive/--patch" -#: builtin/add.c:464 +#: builtin/add.c:478 msgid "--pathspec-from-file is incompatible with --edit" msgstr "--pathspec-from-file es incompatible con --edit" -#: builtin/add.c:476 +#: builtin/add.c:490 msgid "-A and -u are mutually incompatible" msgstr "-A y -u son mutuamente incompatibles" -#: builtin/add.c:479 +#: builtin/add.c:493 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "Opción --ignore-missing solo puede ser usada junto a --dry-run" -#: builtin/add.c:483 +#: builtin/add.c:497 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "El parámetro '%s' para --chmod debe ser -x ó +x" -#: builtin/add.c:501 builtin/checkout.c:1701 builtin/commit.c:351 -#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1506 +#: builtin/add.c:515 builtin/checkout.c:1714 builtin/commit.c:351 +#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1569 msgid "--pathspec-from-file is incompatible with pathspec arguments" msgstr "--pathspec-from-file es incompatible con argumentos de pathspec" -#: builtin/add.c:508 builtin/checkout.c:1713 builtin/commit.c:357 -#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1512 +#: builtin/add.c:522 builtin/checkout.c:1726 builtin/commit.c:357 +#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1575 msgid "--pathspec-file-nul requires --pathspec-from-file" msgstr "--pathspec-file-nul requiere --pathspec-from-file" -#: builtin/add.c:512 +#: builtin/add.c:526 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "Nada especificado, nada agregado.\n" -#: builtin/add.c:514 +#: builtin/add.c:528 msgid "" "Maybe you wanted to say 'git add .'?\n" "Turn this message off by running\n" @@ -9887,7 +10304,7 @@ msgstr "offset de zona horaria inválido" msgid "Patch format detection failed." msgstr "Falló al detectar el formato del parche." -#: builtin/am.c:953 builtin/clone.c:409 +#: builtin/am.c:953 builtin/clone.c:410 #, c-format msgid "failed to create directory '%s'" msgstr "falló al crear el directorio '%s'" @@ -9963,12 +10380,12 @@ msgstr "Falló al fusionar en los cambios." msgid "applying to an empty history" msgstr "aplicando a un historial vacío" -#: builtin/am.c:1621 builtin/am.c:1625 +#: builtin/am.c:1626 builtin/am.c:1630 #, c-format msgid "cannot resume: %s does not exist." msgstr "no se puede continuar: %s no existe." -#: builtin/am.c:1643 +#: builtin/am.c:1648 msgid "Commit Body is:" msgstr "Cuerpo de commit es:" @@ -9976,39 +10393,39 @@ msgstr "Cuerpo de commit es:" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1653 +#: builtin/am.c:1658 #, c-format msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "¿Aplicar? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " -#: builtin/am.c:1699 builtin/commit.c:395 +#: builtin/am.c:1704 builtin/commit.c:395 msgid "unable to write index file" msgstr "no es posible escribir en el archivo índice" -#: builtin/am.c:1703 +#: builtin/am.c:1708 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Índice sucio: no se puede aplicar parches (sucio: %s)" -#: builtin/am.c:1743 builtin/am.c:1811 +#: builtin/am.c:1748 builtin/am.c:1816 #, c-format msgid "Applying: %.*s" msgstr "Aplicando: %.*s" -#: builtin/am.c:1760 +#: builtin/am.c:1765 msgid "No changes -- Patch already applied." msgstr "Sin cambios -- parche ya aplicado." -#: builtin/am.c:1766 +#: builtin/am.c:1771 #, c-format msgid "Patch failed at %s %.*s" msgstr "El parche falló en %s %.*s" -#: builtin/am.c:1770 +#: builtin/am.c:1775 msgid "Use 'git am --show-current-patch=diff' to see the failed patch" msgstr "Use 'git am --show-current-patch=diff' para ver el parche fallido" -#: builtin/am.c:1814 +#: builtin/am.c:1819 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -10018,7 +10435,7 @@ msgstr "" "Si no hay nada en el área de stage, las posibilidad es que algo mas\n" "ya haya introducido el mismo cambio; tal vez quieras omitir este parche." -#: builtin/am.c:1821 +#: builtin/am.c:1826 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -10031,17 +10448,17 @@ msgstr "" "Se puede ejecutar `git rm` en el archivo para aceptar \"borrado por ellos\" " "en él." -#: builtin/am.c:1928 builtin/am.c:1932 builtin/am.c:1944 builtin/reset.c:347 +#: builtin/am.c:1933 builtin/am.c:1937 builtin/am.c:1949 builtin/reset.c:347 #: builtin/reset.c:355 #, c-format msgid "Could not parse object '%s'." msgstr "No se pudo analizar el objeto '%s'." -#: builtin/am.c:1980 +#: builtin/am.c:1985 msgid "failed to clean index" msgstr "falló al limpiar el índice" -#: builtin/am.c:2024 +#: builtin/am.c:2029 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -10049,156 +10466,156 @@ msgstr "" "Parece haber movido HEAD desde el último falló 'am'.\n" "No rebobinando a ORIG_HEAD" -#: builtin/am.c:2131 +#: builtin/am.c:2136 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Valor inválido para --patch-format: %s" -#: builtin/am.c:2171 +#: builtin/am.c:2178 #, c-format msgid "Invalid value for --show-current-patch: %s" msgstr "Valor inválido para --show-current-patch: %s" -#: builtin/am.c:2175 +#: builtin/am.c:2182 #, c-format msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s" msgstr "--show-current-patch=%s es incompatible con --show-current-patch=%s" -#: builtin/am.c:2206 +#: builtin/am.c:2213 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<opciones>] [(<mbox> | <Directorio-de-correo>)...]" -#: builtin/am.c:2207 +#: builtin/am.c:2214 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<opciones>] (--continue | --skip | --abort)" -#: builtin/am.c:2213 +#: builtin/am.c:2220 msgid "run interactively" msgstr "ejecutar de manera interactiva" -#: builtin/am.c:2215 +#: builtin/am.c:2222 msgid "historical option -- no-op" msgstr "opción histórica -- no-op" -#: builtin/am.c:2217 +#: builtin/am.c:2224 msgid "allow fall back on 3way merging if needed" msgstr "permitir retroceso en fusión de 3-vías si es necesario" -#: builtin/am.c:2218 builtin/init-db.c:559 builtin/prune-packed.c:16 -#: builtin/repack.c:306 builtin/stash.c:816 +#: builtin/am.c:2225 builtin/init-db.c:560 builtin/prune-packed.c:16 +#: builtin/repack.c:334 builtin/stash.c:882 msgid "be quiet" msgstr "ser silencioso" -#: builtin/am.c:2220 -msgid "add a Signed-off-by line to the commit message" +#: builtin/am.c:2227 +msgid "add a Signed-off-by trailer to the commit message" msgstr "agregar una línea \"Firmado-por\" al mensaje del commit" -#: builtin/am.c:2223 +#: builtin/am.c:2230 msgid "recode into utf8 (default)" msgstr "recodificar en utf8 (default)" -#: builtin/am.c:2225 +#: builtin/am.c:2232 msgid "pass -k flag to git-mailinfo" msgstr "pasar flag -k a git-mailinfo" -#: builtin/am.c:2227 +#: builtin/am.c:2234 msgid "pass -b flag to git-mailinfo" msgstr "pasar flag -b a git-mailinfo" -#: builtin/am.c:2229 +#: builtin/am.c:2236 msgid "pass -m flag to git-mailinfo" msgstr "pasar flag -m a git-mailinfo" -#: builtin/am.c:2231 +#: builtin/am.c:2238 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "pasar flag --keep-cr a git-mailsplit para formato mbox" -#: builtin/am.c:2234 +#: builtin/am.c:2241 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "" "no pasar flag --keep-cr a git-mailsplit independientemente de am.keepcr" -#: builtin/am.c:2237 +#: builtin/am.c:2244 msgid "strip everything before a scissors line" msgstr "descubrir todo antes de una línea de tijeras" -#: builtin/am.c:2239 builtin/am.c:2242 builtin/am.c:2245 builtin/am.c:2248 -#: builtin/am.c:2251 builtin/am.c:2254 builtin/am.c:2257 builtin/am.c:2260 -#: builtin/am.c:2266 +#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255 +#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267 +#: builtin/am.c:2273 msgid "pass it through git-apply" msgstr "pasarlo a través de git-apply" -#: builtin/am.c:2256 builtin/commit.c:1397 builtin/fmt-merge-msg.c:17 -#: builtin/fmt-merge-msg.c:20 builtin/grep.c:891 builtin/merge.c:252 +#: builtin/am.c:2263 builtin/commit.c:1395 builtin/fmt-merge-msg.c:17 +#: builtin/fmt-merge-msg.c:20 builtin/grep.c:904 builtin/merge.c:261 #: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217 -#: builtin/rebase.c:1329 builtin/repack.c:317 builtin/repack.c:321 -#: builtin/repack.c:323 builtin/show-branch.c:650 builtin/show-ref.c:172 -#: builtin/tag.c:404 parse-options.h:154 parse-options.h:175 +#: builtin/rebase.c:1347 builtin/repack.c:345 builtin/repack.c:349 +#: builtin/repack.c:351 builtin/show-branch.c:650 builtin/show-ref.c:172 +#: builtin/tag.c:436 parse-options.h:154 parse-options.h:175 #: parse-options.h:316 msgid "n" msgstr "n" -#: builtin/am.c:2262 builtin/branch.c:659 builtin/for-each-ref.c:38 -#: builtin/replace.c:556 builtin/tag.c:438 builtin/verify-tag.c:38 -#: bugreport.c:137 +#: builtin/am.c:2269 builtin/branch.c:670 builtin/bugreport.c:136 +#: builtin/for-each-ref.c:38 builtin/replace.c:556 builtin/tag.c:470 +#: builtin/verify-tag.c:38 msgid "format" msgstr "formato" -#: builtin/am.c:2263 +#: builtin/am.c:2270 msgid "format the patch(es) are in" msgstr "formatear el parche(s)" -#: builtin/am.c:2269 +#: builtin/am.c:2276 msgid "override error message when patch failure occurs" msgstr "sobrescribir mensajes de error cuando fallos de parchado ocurran" -#: builtin/am.c:2271 +#: builtin/am.c:2278 msgid "continue applying patches after resolving a conflict" msgstr "continuar aplicando los parches tras resolver conflictos" -#: builtin/am.c:2274 +#: builtin/am.c:2281 msgid "synonyms for --continue" msgstr "sinónimos para --continue" -#: builtin/am.c:2277 +#: builtin/am.c:2284 msgid "skip the current patch" msgstr "saltar el parche actual" -#: builtin/am.c:2280 -msgid "restore the original branch and abort the patching operation." -msgstr "restaurar la rama original y abortar la operación de parchado." +#: builtin/am.c:2287 +msgid "restore the original branch and abort the patching operation" +msgstr "restaurar la rama original y abortar la operación de parcheo" -#: builtin/am.c:2283 -msgid "abort the patching operation but keep HEAD where it is." -msgstr "abortar la operación de parchado pero mantener HEAD donde está." +#: builtin/am.c:2290 +msgid "abort the patching operation but keep HEAD where it is" +msgstr "abortar la operación de parcheo pero mantener HEAD donde está" -#: builtin/am.c:2287 +#: builtin/am.c:2294 msgid "show the patch being applied" msgstr "muestra el parche siendo aplicado" -#: builtin/am.c:2292 +#: builtin/am.c:2299 msgid "lie about committer date" msgstr "mentir sobre la fecha del committer" -#: builtin/am.c:2294 +#: builtin/am.c:2301 msgid "use current timestamp for author date" msgstr "usar el timestamp actual para la fecha del autor" -#: builtin/am.c:2296 builtin/commit-tree.c:120 builtin/commit.c:1517 -#: builtin/merge.c:289 builtin/pull.c:175 builtin/rebase.c:524 -#: builtin/rebase.c:1380 builtin/revert.c:117 builtin/tag.c:419 +#: builtin/am.c:2303 builtin/commit-tree.c:120 builtin/commit.c:1515 +#: builtin/merge.c:298 builtin/pull.c:175 builtin/rebase.c:538 +#: builtin/rebase.c:1400 builtin/revert.c:117 builtin/tag.c:451 msgid "key-id" msgstr "key-id" -#: builtin/am.c:2297 builtin/rebase.c:525 builtin/rebase.c:1381 +#: builtin/am.c:2304 builtin/rebase.c:539 builtin/rebase.c:1401 msgid "GPG-sign commits" msgstr "Commits con firma GPG" -#: builtin/am.c:2300 +#: builtin/am.c:2307 msgid "(internal use for git-rebase)" msgstr "(uso interno para git-rebase)" -#: builtin/am.c:2318 +#: builtin/am.c:2325 msgid "" "The -b/--binary option has been a no-op for long time, and\n" "it will be removed. Please do not use it anymore." @@ -10206,16 +10623,16 @@ msgstr "" "La opción -b/--binary ha estado deshabilitada por mucho tiempo, y\n" "será eliminada. Por favor no la use más." -#: builtin/am.c:2325 +#: builtin/am.c:2332 msgid "failed to read the index" msgstr "falló al leer el índice" -#: builtin/am.c:2340 +#: builtin/am.c:2347 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "directorio de rebase previo %s todavía existe en el mbox dado." -#: builtin/am.c:2364 +#: builtin/am.c:2371 #, c-format msgid "" "Stray %s directory found.\n" @@ -10224,11 +10641,11 @@ msgstr "" "Directorio extraviado %s encontrado.\n" "Use \"git am --abort\" para borrarlo." -#: builtin/am.c:2370 +#: builtin/am.c:2377 msgid "Resolve operation not in progress, we are not resuming." msgstr "Operación de resolución no está en progreso, no vamos a continuar." -#: builtin/am.c:2380 +#: builtin/am.c:2387 msgid "interactive mode requires patches on the command line" msgstr "modo interactivo requiere parches en la línea de comando" @@ -10266,43 +10683,15 @@ msgstr "git archive: error de protocolo" msgid "git archive: expected a flush" msgstr "git archive: se esperaba un flush" -#: builtin/bisect--helper.c:22 -msgid "git bisect--helper --next-all [--no-checkout]" -msgstr "git bisect--helper --next-all [--no-checkout]" - #: builtin/bisect--helper.c:23 -msgid "git bisect--helper --write-terms <bad_term> <good_term>" -msgstr "git bisect--helper --write-terms <mal_término> <buen_término>" - -#: builtin/bisect--helper.c:24 -msgid "git bisect--helper --bisect-clean-state" -msgstr "git bisect--helper --bisect-clean-state" - -#: builtin/bisect--helper.c:25 msgid "git bisect--helper --bisect-reset [<commit>]" msgstr "git bisect--helper --bisect-reset [<commit>]" -#: builtin/bisect--helper.c:26 -msgid "" -"git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> " -"<bad_term>" -msgstr "" -"git bisect--helper --bisect-write [--no-log] <estado> <revision> <buen_term> " -"<mal_term>" - -#: builtin/bisect--helper.c:27 -msgid "" -"git bisect--helper --bisect-check-and-set-terms <command> <good_term> " -"<bad_term>" -msgstr "" -"git bisect--helper --bisect-check-and-set-terms <comando> <buen_term> " -"<mal_term>" - -#: builtin/bisect--helper.c:28 +#: builtin/bisect--helper.c:24 msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]" msgstr "git bisect--helper --bisect-next-check <buen_term> <mal_term> [<term>]" -#: builtin/bisect--helper.c:29 +#: builtin/bisect--helper.c:25 msgid "" "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --" "term-new]" @@ -10310,48 +10699,76 @@ msgstr "" "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --" "term-new]" -#: builtin/bisect--helper.c:30 +#: builtin/bisect--helper.c:26 msgid "" -"git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}" -"=<term>][--no-checkout] [<bad> [<good>...]] [--] [<paths>...]" +"git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}" +"=<term>] [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] " +"[<paths>...]" msgstr "" -"git bisect--helper --bisect-start [--term-{old,good}=<término> --term-{new," -"bad}=<término>][--no-checkout] [<malo> [<bueno>...]] [--] [<rutas>...]" +"git bisect--helper --bisect-start [--term-{new,bad}=<término> --term-{old," +"good}=<término>] [--no-checkout] [--first-parent] [<malo> [<bueno>...]] [--] " +"[<rutas>...]" + +#: builtin/bisect--helper.c:28 +msgid "git bisect--helper --bisect-next" +msgstr "git bisect--helper --bisect-next" + +#: builtin/bisect--helper.c:29 +msgid "git bisect--helper --bisect-state (bad|new) [<rev>]" +msgstr "git bisect--helper --bisect-state (bad|new) [<rev>]" + +#: builtin/bisect--helper.c:30 +msgid "git bisect--helper --bisect-state (good|old) [<rev>...]" +msgstr "git bisect--helper --bisect-state (good|old) [<rev>...]" + +#: builtin/bisect--helper.c:31 +msgid "git bisect--helper --bisect-replay <filename>" +msgstr "git bisect--helper --bisect-replay <archivio>" + +#: builtin/bisect--helper.c:32 +msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]" +msgstr "git bisect--helper --bisect-skip [(<rev>|<rango>)...]" -#: builtin/bisect--helper.c:86 +#: builtin/bisect--helper.c:107 +#, c-format +msgid "cannot open file '%s' in mode '%s'" +msgstr "no se puede abrir archivo '%s' en modo '%s'" + +#: builtin/bisect--helper.c:114 +#, c-format +msgid "could not write to file '%s'" +msgstr "no se pudo escribir al archivo '%s'" + +#: builtin/bisect--helper.c:153 #, c-format msgid "'%s' is not a valid term" msgstr "'%s' no es un término válido" -#: builtin/bisect--helper.c:90 +#: builtin/bisect--helper.c:157 #, c-format msgid "can't use the builtin command '%s' as a term" msgstr "no se puede usar el comando nativo '%s' como un término" -#: builtin/bisect--helper.c:100 +#: builtin/bisect--helper.c:167 #, c-format msgid "can't change the meaning of the term '%s'" msgstr "no se puede cambiar el significado del término '%s'" -#: builtin/bisect--helper.c:111 +#: builtin/bisect--helper.c:177 msgid "please use two different terms" msgstr "por favor use dos términos diferentes" -#: builtin/bisect--helper.c:118 -msgid "could not open the file BISECT_TERMS" -msgstr "no se pudo abrir el archivo BISECT_TERMS" - -#: builtin/bisect--helper.c:155 +#: builtin/bisect--helper.c:193 #, c-format msgid "We are not bisecting.\n" msgstr "No estamos bisecando.\n" -#: builtin/bisect--helper.c:163 +#: builtin/bisect--helper.c:201 #, c-format msgid "'%s' is not a valid commit" msgstr "'%s' no es un commit válido" -#: builtin/bisect--helper.c:172 +#: builtin/bisect--helper.c:210 #, c-format msgid "" "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'." @@ -10359,27 +10776,27 @@ msgstr "" "no se pudo hacer check out al HEAD original '%s'. Intenta 'git bisect reset " "<commit>'." -#: builtin/bisect--helper.c:216 +#: builtin/bisect--helper.c:254 #, c-format msgid "Bad bisect_write argument: %s" msgstr "Mal argumento bisect_write: %s" -#: builtin/bisect--helper.c:221 +#: builtin/bisect--helper.c:259 #, c-format msgid "couldn't get the oid of the rev '%s'" msgstr "no se puede obtener el oid de la rev '%s'" -#: builtin/bisect--helper.c:233 +#: builtin/bisect--helper.c:271 #, c-format msgid "couldn't open the file '%s'" msgstr "no se pudo abrir el archivo '%s'" -#: builtin/bisect--helper.c:259 +#: builtin/bisect--helper.c:297 #, c-format msgid "Invalid command: you're currently in a %s/%s bisect" msgstr "Comando inválido: actualmente se encuentra en un bisect %s/%s" -#: builtin/bisect--helper.c:286 +#: builtin/bisect--helper.c:324 #, c-format msgid "" "You need to give me at least one %s and %s revision.\n" @@ -10388,7 +10805,7 @@ msgstr "" "Tienes que dar al menos un %s y un %s revision.\n" "Se puede ver \"git bisect %s\" y \"git bisect %s\" para eso." -#: builtin/bisect--helper.c:290 +#: builtin/bisect--helper.c:328 #, c-format msgid "" "You need to start by \"git bisect start\".\n" @@ -10399,7 +10816,7 @@ msgstr "" "Después tienes que entregar al menos un %s y una revision %s.\n" "Puedes usar \"git bisect %s\" y \"git bisect %s\" para eso." -#: builtin/bisect--helper.c:310 +#: builtin/bisect--helper.c:348 #, c-format msgid "bisecting only with a %s commit" msgstr "haciendo bisect solo con un commit %s" @@ -10408,15 +10825,15 @@ msgstr "haciendo bisect solo con un commit %s" #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect--helper.c:318 +#: builtin/bisect--helper.c:356 msgid "Are you sure [Y/n]? " msgstr "¿Estás seguro [Y/n]? " -#: builtin/bisect--helper.c:379 +#: builtin/bisect--helper.c:417 msgid "no terms defined" msgstr "no hay términos definidos" -#: builtin/bisect--helper.c:382 +#: builtin/bisect--helper.c:420 #, c-format msgid "" "Your current terms are %s for the old state\n" @@ -10425,7 +10842,7 @@ msgstr "" "Tus términos actuales son %s para el estado viejo\n" "y %s para el estado nuevo.\n" -#: builtin/bisect--helper.c:392 +#: builtin/bisect--helper.c:430 #, c-format msgid "" "invalid argument %s for 'git bisect terms'.\n" @@ -10434,267 +10851,308 @@ msgstr "" "argumento inválido %s para 'git bisect terms'.\n" "Las opciones soportadas son: --term-good|--term-old y --term-bad|--term-new." -#: builtin/bisect--helper.c:460 builtin/bisect--helper.c:473 +#: builtin/bisect--helper.c:497 builtin/bisect--helper.c:1014 +msgid "revision walk setup failed\n" +msgstr "la configuración del recorrido de revisión falló\n" + +#: builtin/bisect--helper.c:519 +#, c-format +msgid "could not open '%s' for appending" +msgstr "no se pudo abrir '%s' en modo append" + +#: builtin/bisect--helper.c:638 builtin/bisect--helper.c:651 msgid "'' is not a valid term" msgstr "'' no es un término válido" -#: builtin/bisect--helper.c:483 +#: builtin/bisect--helper.c:661 #, c-format msgid "unrecognized option: '%s'" msgstr "opción desconocida: '%s'" -#: builtin/bisect--helper.c:487 +#: builtin/bisect--helper.c:665 #, c-format msgid "'%s' does not appear to be a valid revision" msgstr "'%s' no parece ser una revisión válida" -#: builtin/bisect--helper.c:519 +#: builtin/bisect--helper.c:696 msgid "bad HEAD - I need a HEAD" msgstr "mal HEAD - Necesito un HEAD" -#: builtin/bisect--helper.c:534 +#: builtin/bisect--helper.c:711 #, c-format msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'." msgstr "" "error al hacer checkout '%s'. Intente 'git bisect start <rama-válida>'." -#: builtin/bisect--helper.c:555 +#: builtin/bisect--helper.c:732 msgid "won't bisect on cg-seek'ed tree" msgstr "no se bisecará en un árbol con cg-seek" -#: builtin/bisect--helper.c:558 +#: builtin/bisect--helper.c:735 msgid "bad HEAD - strange symbolic ref" msgstr "mal HEAD - ref simbólico extraño" -#: builtin/bisect--helper.c:582 +#: builtin/bisect--helper.c:755 #, c-format msgid "invalid ref: '%s'" msgstr "ref inválido: '%s'" -#: builtin/bisect--helper.c:638 -msgid "perform 'git bisect next'" -msgstr "realiza 'git bisect next'" +#: builtin/bisect--helper.c:813 +msgid "You need to start by \"git bisect start\"\n" +msgstr "Debes iniciar con \"git bisect start\"\n" -#: builtin/bisect--helper.c:640 -msgid "write the terms to .git/BISECT_TERMS" -msgstr "escribe los términos a .git/BISECT_TERMS" +#. TRANSLATORS: Make sure to include [Y] and [n] in your +#. translation. The program will only accept English input +#. at this point. +#. +#: builtin/bisect--helper.c:824 +msgid "Do you want me to do it for you [Y/n]? " +msgstr "¿Quieres que lo haga por ti [Y/n]? " -#: builtin/bisect--helper.c:642 -msgid "cleanup the bisection state" -msgstr "limpiar el estado de bisección" +#: builtin/bisect--helper.c:842 +msgid "Please call `--bisect-state` with at least one argument" +msgstr "Llame a `--bisect-state` con al menos un argumento" -#: builtin/bisect--helper.c:644 -msgid "check for expected revs" -msgstr "revisar por revs esperados" +#: builtin/bisect--helper.c:855 +#, c-format +msgid "'git bisect %s' can take only one argument." +msgstr "'git bisect %s' solo puede tomar un argumento." -#: builtin/bisect--helper.c:646 -msgid "reset the bisection state" -msgstr "reiniciar el estado de bisect" +#: builtin/bisect--helper.c:867 builtin/bisect--helper.c:878 +#, c-format +msgid "Bad rev input: %s" +msgstr "Mala entrada rev: %s" + +#: builtin/bisect--helper.c:912 +msgid "We are not bisecting." +msgstr "No estamos bisecando." -#: builtin/bisect--helper.c:648 -msgid "write out the bisection state in BISECT_LOG" -msgstr "escribir el estado de bisect en BISECT_LOG" +#: builtin/bisect--helper.c:962 +#, c-format +msgid "'%s'?? what are you talking about?" +msgstr "'%s'?? ¿De qué estás hablando?" + +#: builtin/bisect--helper.c:974 +#, c-format +msgid "cannot read file '%s' for replaying" +msgstr "no se puede leer '%s' para reproducir" -#: builtin/bisect--helper.c:650 -msgid "check and set terms in a bisection state" -msgstr "revisar y configurar los terms en el estado de bisect" +#: builtin/bisect--helper.c:1047 +msgid "reset the bisection state" +msgstr "reiniciar el estado de bisect" -#: builtin/bisect--helper.c:652 +#: builtin/bisect--helper.c:1049 msgid "check whether bad or good terms exist" msgstr "revisar si existen términos malos o buenos" -#: builtin/bisect--helper.c:654 +#: builtin/bisect--helper.c:1051 msgid "print out the bisect terms" msgstr "imprimir los terms del bisect" -#: builtin/bisect--helper.c:656 +#: builtin/bisect--helper.c:1053 msgid "start the bisect session" msgstr "comenzar la sesión de bisect" -#: builtin/bisect--helper.c:658 -msgid "update BISECT_HEAD instead of checking out the current commit" -msgstr "actualiza BISECT_HEAD en lugar de revisar el commit actual" +#: builtin/bisect--helper.c:1055 +msgid "find the next bisection commit" +msgstr "encontrar el siguiente commit de bisección" -#: builtin/bisect--helper.c:660 -msgid "no log for BISECT_WRITE" -msgstr "no hay log para BISECT_WRITE" +#: builtin/bisect--helper.c:1057 +msgid "mark the state of ref (or refs)" +msgstr "marcar el estado de ref (o refs)" -#: builtin/bisect--helper.c:678 -msgid "--write-terms requires two arguments" -msgstr "--write-terms requiere dos argumentos" +#: builtin/bisect--helper.c:1059 +msgid "list the bisection steps so far" +msgstr "listar los pasos de bisección hasta ahora" -#: builtin/bisect--helper.c:682 -msgid "--bisect-clean-state requires no arguments" -msgstr "--bisect-clean-state no requiere argumentos" +#: builtin/bisect--helper.c:1061 +msgid "replay the bisection process from the given file" +msgstr "reproducir el proceso de bisección del archivo dado" -#: builtin/bisect--helper.c:689 -msgid "--bisect-reset requires either no argument or a commit" -msgstr "--bisect-reset requiere un commit o ningún argumento" +#: builtin/bisect--helper.c:1063 +msgid "skip some commits for checkout" +msgstr "saltar algunos commits para checkout" -#: builtin/bisect--helper.c:693 -msgid "--bisect-write requires either 4 or 5 arguments" -msgstr "--bisect-write requiere entre 4 o 5 argumentos" +#: builtin/bisect--helper.c:1065 +msgid "no log for BISECT_WRITE" +msgstr "no hay log para BISECT_WRITE" -#: builtin/bisect--helper.c:699 -msgid "--check-and-set-terms requires 3 arguments" -msgstr "--bisect-clean-state no requiere argumentos" +#: builtin/bisect--helper.c:1080 +msgid "--bisect-reset requires either no argument or a commit" +msgstr "--bisect-reset requiere un commit o ningún argumento" -#: builtin/bisect--helper.c:705 +#: builtin/bisect--helper.c:1085 msgid "--bisect-next-check requires 2 or 3 arguments" msgstr "--bisect-next-check requiere 2 o 3 argumentos" -#: builtin/bisect--helper.c:711 +#: builtin/bisect--helper.c:1091 msgid "--bisect-terms requires 0 or 1 argument" msgstr "--bisect-terms requiere 0 o 1 argumentos" -#: builtin/blame.c:31 +#: builtin/bisect--helper.c:1100 +msgid "--bisect-next requires 0 arguments" +msgstr "--bisect-next requiere 0 argumentos" + +#: builtin/bisect--helper.c:1111 +msgid "--bisect-log requires 0 arguments" +msgstr "--bisect-log requiere 0 argumentos" + +#: builtin/bisect--helper.c:1116 +msgid "no logfile given" +msgstr "ningún logfile proporcionado" + +#: builtin/blame.c:32 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "git blame [<opciones>] [<opciones-rev>] [<revision>] [--] <archivo>" -#: builtin/blame.c:36 +#: builtin/blame.c:37 msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "<rev-opts> están documentadas en git-rev-list(1)" -#: builtin/blame.c:409 +#: builtin/blame.c:410 #, c-format msgid "expecting a color: %s" msgstr "esperando un color: %s" -#: builtin/blame.c:416 +#: builtin/blame.c:417 msgid "must end with a color" msgstr "tiene que terminar con un color" -#: builtin/blame.c:729 +#: builtin/blame.c:728 #, c-format msgid "invalid color '%s' in color.blame.repeatedLines" msgstr "color inválido '%s' en color.blame.repeatedLines" -#: builtin/blame.c:747 +#: builtin/blame.c:746 msgid "invalid value for blame.coloring" msgstr "valor inválido para blame.coloring" -#: builtin/blame.c:822 +#: builtin/blame.c:845 #, c-format msgid "cannot find revision %s to ignore" msgstr "no se pudo encontrar revision %s para ignorar" -#: builtin/blame.c:844 -msgid "Show blame entries as we find them, incrementally" -msgstr "Mostrar las entradas blame como las encontramos, incrementalmente" +#: builtin/blame.c:867 +msgid "show blame entries as we find them, incrementally" +msgstr "mostrar las entradas blame como las encontramos, incrementalmente" -#: builtin/blame.c:845 -msgid "Show blank SHA-1 for boundary commits (Default: off)" -msgstr "Mostrar SHA-1 en blanco para commits extremos (Default: off)" +#: builtin/blame.c:868 +msgid "do not show object names of boundary commits (Default: off)" +msgstr "no mostrar nombres de objetos de commits extremos (Default: off)" -#: builtin/blame.c:846 -msgid "Do not treat root commits as boundaries (Default: off)" -msgstr "No tratar commits raíces como extremos (Default: off)" +#: builtin/blame.c:869 +msgid "do not treat root commits as boundaries (Default: off)" +msgstr "no tratar commits raíces como extremos (Default: off)" -#: builtin/blame.c:847 -msgid "Show work cost statistics" -msgstr "Mostrar estadísticas de costo de trabajo" +#: builtin/blame.c:870 +msgid "show work cost statistics" +msgstr "mostrar estadísticas de costo de trabajo" -#: builtin/blame.c:848 -msgid "Force progress reporting" -msgstr "Forzar el reporte de progreso" +#: builtin/blame.c:871 builtin/checkout.c:1503 builtin/clone.c:92 +#: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:175 +#: builtin/merge.c:297 builtin/multi-pack-index.c:27 builtin/pull.c:119 +#: builtin/push.c:575 builtin/send-pack.c:198 +msgid "force progress reporting" +msgstr "forzar el reporte de progreso" -#: builtin/blame.c:849 -msgid "Show output score for blame entries" -msgstr "Mostrar la puntuación de salida de las entradas de blame" +#: builtin/blame.c:872 +msgid "show output score for blame entries" +msgstr "mostrar la puntuación de salida de las entradas de blame" -#: builtin/blame.c:850 -msgid "Show original filename (Default: auto)" -msgstr "Mostrar nombre original del archivo (Default: auto)" +#: builtin/blame.c:873 +msgid "show original filename (Default: auto)" +msgstr "mostrar nombre original del archivo (Default: auto)" -#: builtin/blame.c:851 -msgid "Show original linenumber (Default: off)" -msgstr "Mostrar número de línea original (Default: off)" +#: builtin/blame.c:874 +msgid "show original linenumber (Default: off)" +msgstr "mostrar número de línea original (Default: off)" -#: builtin/blame.c:852 -msgid "Show in a format designed for machine consumption" -msgstr "Mostrar en un formato diseñado para consumo de máquina" +#: builtin/blame.c:875 +msgid "show in a format designed for machine consumption" +msgstr "mostrar en un formato diseñado para consumo de máquina" -#: builtin/blame.c:853 -msgid "Show porcelain format with per-line commit information" -msgstr "Mostrar en formato porcelana con información de commit por línea" +#: builtin/blame.c:876 +msgid "show porcelain format with per-line commit information" +msgstr "mostrar en formato porcelana con información de commit por línea" -#: builtin/blame.c:854 -msgid "Use the same output mode as git-annotate (Default: off)" -msgstr "Usar el mismo modo salida como git-annotate (Default: off)" +#: builtin/blame.c:877 +msgid "use the same output mode as git-annotate (Default: off)" +msgstr "usar el mismo modo salida como git-annotate (Default: off)" -#: builtin/blame.c:855 -msgid "Show raw timestamp (Default: off)" -msgstr "Mostrar timestamp en formato raw (Default: off)" +#: builtin/blame.c:878 +msgid "show raw timestamp (Default: off)" +msgstr "mostrar timestamp en formato raw (Default: off)" -#: builtin/blame.c:856 -msgid "Show long commit SHA1 (Default: off)" -msgstr "Mostrar SHA1 del commit en formato largo (Default: off)" +#: builtin/blame.c:879 +msgid "show long commit SHA1 (Default: off)" +msgstr "mostrar SHA1 del commit en formato largo (Default: off)" -#: builtin/blame.c:857 -msgid "Suppress author name and timestamp (Default: off)" -msgstr "Suprimir nombre del autor y timestamp (Default: off)" +#: builtin/blame.c:880 +msgid "suppress author name and timestamp (Default: off)" +msgstr "suprimir nombre del autor y timestamp (Default: off)" -#: builtin/blame.c:858 -msgid "Show author email instead of name (Default: off)" -msgstr "Mostrar en cambio el email del autor (Default: off)" +#: builtin/blame.c:881 +msgid "show author email instead of name (Default: off)" +msgstr "mostrar en cambio el email del autor (Default: off)" -#: builtin/blame.c:859 -msgid "Ignore whitespace differences" -msgstr "Ignorar diferencias de espacios en blanco" +#: builtin/blame.c:882 +msgid "ignore whitespace differences" +msgstr "ignorar diferencias de espacios en blanco" -#: builtin/blame.c:860 builtin/log.c:1721 +#: builtin/blame.c:883 builtin/log.c:1812 msgid "rev" msgstr "rev" -#: builtin/blame.c:860 -msgid "Ignore <rev> when blaming" -msgstr "Ignorar <rev> durante el blame" +#: builtin/blame.c:883 +msgid "ignore <rev> when blaming" +msgstr "ignorar <rev> durante el blame" -#: builtin/blame.c:861 -msgid "Ignore revisions from <file>" -msgstr "Ignorar revisiones de <archivo>" +#: builtin/blame.c:884 +msgid "ignore revisions from <file>" +msgstr "ignorar revisiones de <archivo>" -#: builtin/blame.c:862 +#: builtin/blame.c:885 msgid "color redundant metadata from previous line differently" msgstr "colorear metadata redundante de líneas previas de manera diferente" -#: builtin/blame.c:863 +#: builtin/blame.c:886 msgid "color lines by age" msgstr "colorear líneas por edad" -#: builtin/blame.c:864 -msgid "Spend extra cycles to find better match" -msgstr "Ocupo más ciclos para encontrar mejoras resultados" +#: builtin/blame.c:887 +msgid "spend extra cycles to find better match" +msgstr "ocupar más ciclos para encontrar mejoras resultados" -#: builtin/blame.c:865 -msgid "Use revisions from <file> instead of calling git-rev-list" -msgstr "Use revisiones desde <archivo> en lugar de llamar git-rev-list" +#: builtin/blame.c:888 +msgid "use revisions from <file> instead of calling git-rev-list" +msgstr "use revisiones desde <archivo> en lugar de llamar git-rev-list" -#: builtin/blame.c:866 -msgid "Use <file>'s contents as the final image" -msgstr "Usar contenido de <archivo> como imagen final" +#: builtin/blame.c:889 +msgid "use <file>'s contents as the final image" +msgstr "usar contenido de <archivo> como imagen final" -#: builtin/blame.c:867 builtin/blame.c:868 +#: builtin/blame.c:890 builtin/blame.c:891 msgid "score" msgstr "puntaje" -#: builtin/blame.c:867 -msgid "Find line copies within and across files" -msgstr "Encontrar copias de líneas entre y a través de archivos" +#: builtin/blame.c:890 +msgid "find line copies within and across files" +msgstr "encontrar copias de líneas entre y a través de archivos" -#: builtin/blame.c:868 -msgid "Find line movements within and across files" -msgstr "Encontrar movimientos de líneas entre y a través de archivos" +#: builtin/blame.c:891 +msgid "find line movements within and across files" +msgstr "encontrar movimientos de líneas entre y a través de archivos" -#: builtin/blame.c:869 -msgid "n,m" -msgstr "n,m" +#: builtin/blame.c:892 +msgid "range" +msgstr "rango" -#: builtin/blame.c:869 -msgid "Process only line range n,m, counting from 1" -msgstr "Procesar solo el rango de líneas n,m, contando desde 1" +#: builtin/blame.c:893 +msgid "process only line range <start>,<end> or function :<funcname>" +msgstr "" +"Procesar solo el rango de líneas <inicio>,<fin> o función: <nombre-función>" -#: builtin/blame.c:921 +#: builtin/blame.c:945 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "--progress no puede ser usado con --incremental o formatos porcelana" @@ -10706,24 +11164,24 @@ msgstr "--progress no puede ser usado con --incremental o formatos porcelana" #. your language may need more or fewer display #. columns. #. -#: builtin/blame.c:972 +#: builtin/blame.c:996 msgid "4 years, 11 months ago" msgstr "hace 4 años, 11 meses" -#: builtin/blame.c:1087 +#: builtin/blame.c:1112 #, c-format msgid "file %s has only %lu line" msgid_plural "file %s has only %lu lines" msgstr[0] "archivo %s tiene solo %lu línea" msgstr[1] "archivo %s tiene solo %lu líneas" -#: builtin/blame.c:1133 +#: builtin/blame.c:1157 msgid "Blaming lines" msgstr "Blaming a líneas" #: builtin/branch.c:29 -msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" -msgstr "git branch [<opciones>] [-r | -a] [--merged | --no-merged]" +msgid "git branch [<options>] [-r | -a] [--merged] [--no-merged]" +msgstr "git branch [<opciones>] [-r | -a] [--merged] [--no-merged]" #: builtin/branch.c:30 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" @@ -10785,121 +11243,111 @@ msgstr "" msgid "Update of config-file failed" msgstr "Falló de actualización de config-file" -#: builtin/branch.c:220 +#: builtin/branch.c:223 msgid "cannot use -a with -d" msgstr "no se puede usar-a con -d" -#: builtin/branch.c:226 +#: builtin/branch.c:230 msgid "Couldn't look up commit object for HEAD" msgstr "No se pudo revisar el objeto commit para HEAD" -#: builtin/branch.c:240 +#: builtin/branch.c:244 #, c-format msgid "Cannot delete branch '%s' checked out at '%s'" msgstr "No se puede borrar rama '%s' que cuenta con checkout en '%s'" -#: builtin/branch.c:255 +#: builtin/branch.c:259 #, c-format msgid "remote-tracking branch '%s' not found." msgstr "rama de rastreo remoto '%s' no encontrada." -#: builtin/branch.c:256 +#: builtin/branch.c:260 #, c-format msgid "branch '%s' not found." msgstr "rama '%s' no encontrada." -#: builtin/branch.c:271 -#, c-format -msgid "Error deleting remote-tracking branch '%s'" -msgstr "Error al eliminar la rama de rastreo remota '%s'" - -#: builtin/branch.c:272 -#, c-format -msgid "Error deleting branch '%s'" -msgstr "Error al eliminar la rama '%s'" - -#: builtin/branch.c:279 +#: builtin/branch.c:291 #, c-format msgid "Deleted remote-tracking branch %s (was %s).\n" msgstr "Eliminada la rama de rastreo remota %s (era %s).\n" -#: builtin/branch.c:280 +#: builtin/branch.c:292 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "Eliminada la rama %s (era %s)..\n" -#: builtin/branch.c:429 builtin/tag.c:61 +#: builtin/branch.c:438 builtin/tag.c:61 msgid "unable to parse format string" msgstr "no es posible analizar el string de formato" -#: builtin/branch.c:460 +#: builtin/branch.c:469 msgid "could not resolve HEAD" msgstr "no se pudo resolver HEAD" -#: builtin/branch.c:466 +#: builtin/branch.c:475 #, c-format msgid "HEAD (%s) points outside of refs/heads/" msgstr "HEAD (%s) apunta fuera de refs/heads/" -#: builtin/branch.c:481 +#: builtin/branch.c:490 #, c-format msgid "Branch %s is being rebased at %s" msgstr "Rama %s está siendo rebasada en %s" -#: builtin/branch.c:485 +#: builtin/branch.c:494 #, c-format msgid "Branch %s is being bisected at %s" msgstr "Rama %s está siendo bisecada en %s" -#: builtin/branch.c:502 +#: builtin/branch.c:511 msgid "cannot copy the current branch while not on any." msgstr "no se puede copiar la rama actual mientras no se está en ninguna." -#: builtin/branch.c:504 +#: builtin/branch.c:513 msgid "cannot rename the current branch while not on any." msgstr "no se puede renombrar la rama actual mientras no se está en ninguna." -#: builtin/branch.c:515 +#: builtin/branch.c:524 #, c-format msgid "Invalid branch name: '%s'" msgstr "Nombre de rama inválido: '%s'" -#: builtin/branch.c:542 +#: builtin/branch.c:553 msgid "Branch rename failed" msgstr "Cambio de nombre de rama fallido" -#: builtin/branch.c:544 +#: builtin/branch.c:555 msgid "Branch copy failed" msgstr "Copiado de rama fallido" -#: builtin/branch.c:548 +#: builtin/branch.c:559 #, c-format msgid "Created a copy of a misnamed branch '%s'" msgstr "Copia creada de la rama malnombrada '%s'" -#: builtin/branch.c:551 +#: builtin/branch.c:562 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "Rama mal llamada '%s' renombrada" -#: builtin/branch.c:557 +#: builtin/branch.c:568 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "¡Rama renombrada a %s, pero HEAD no está actualizado!" -#: builtin/branch.c:566 +#: builtin/branch.c:577 msgid "Branch is renamed, but update of config-file failed" msgstr "" "La rama está renombrada, pero falló la actualización del archivo de " "configuración" -#: builtin/branch.c:568 +#: builtin/branch.c:579 msgid "Branch is copied, but update of config-file failed" msgstr "" "La rama está copiada, pero falló la actualización del archivo de " "configuración" -#: builtin/branch.c:584 +#: builtin/branch.c:595 #, c-format msgid "" "Please edit the description for the branch\n" @@ -10910,180 +11358,180 @@ msgstr "" "%s\n" "Las líneas que comiencen con '%c' serán eliminadas.\n" -#: builtin/branch.c:618 +#: builtin/branch.c:629 msgid "Generic options" msgstr "Opciones genéricas" -#: builtin/branch.c:620 +#: builtin/branch.c:631 msgid "show hash and subject, give twice for upstream branch" msgstr "mostrar hash y tema, dar dos veces para rama upstream" -#: builtin/branch.c:621 +#: builtin/branch.c:632 msgid "suppress informational messages" msgstr "suprimir mensajes informativos" -#: builtin/branch.c:622 +#: builtin/branch.c:633 msgid "set up tracking mode (see git-pull(1))" msgstr "configurando modo tracking (mirar git-pull(1))" -#: builtin/branch.c:624 +#: builtin/branch.c:635 msgid "do not use" msgstr "no usar" -#: builtin/branch.c:626 builtin/rebase.c:520 +#: builtin/branch.c:637 builtin/rebase.c:534 msgid "upstream" msgstr "upstream" -#: builtin/branch.c:626 +#: builtin/branch.c:637 msgid "change the upstream info" msgstr "cambiar info de upstream" -#: builtin/branch.c:627 +#: builtin/branch.c:638 msgid "unset the upstream info" msgstr "desconfigurando la info de upstream" -#: builtin/branch.c:628 +#: builtin/branch.c:639 msgid "use colored output" msgstr "usar salida con colores" -#: builtin/branch.c:629 +#: builtin/branch.c:640 msgid "act on remote-tracking branches" msgstr "actuar en ramas de traqueo remoto" -#: builtin/branch.c:631 builtin/branch.c:633 +#: builtin/branch.c:642 builtin/branch.c:644 msgid "print only branches that contain the commit" msgstr "mostrar solo ramas que contienen el commit" -#: builtin/branch.c:632 builtin/branch.c:634 +#: builtin/branch.c:643 builtin/branch.c:645 msgid "print only branches that don't contain the commit" msgstr "mostrar solo ramas que no contienen el commit" -#: builtin/branch.c:637 +#: builtin/branch.c:648 msgid "Specific git-branch actions:" msgstr "Acciones específicas de git-branch:" -#: builtin/branch.c:638 +#: builtin/branch.c:649 msgid "list both remote-tracking and local branches" msgstr "listar ramas de remote-tracking y locales" -#: builtin/branch.c:640 +#: builtin/branch.c:651 msgid "delete fully merged branch" msgstr "borrar ramas totalmente fusionadas" -#: builtin/branch.c:641 +#: builtin/branch.c:652 msgid "delete branch (even if not merged)" msgstr "borrar rama (incluso si no está fusionada)" -#: builtin/branch.c:642 +#: builtin/branch.c:653 msgid "move/rename a branch and its reflog" msgstr "mover/renombrar una rama y su reflog" -#: builtin/branch.c:643 +#: builtin/branch.c:654 msgid "move/rename a branch, even if target exists" msgstr "mover/renombrar una rama, incluso si el destino existe" -#: builtin/branch.c:644 +#: builtin/branch.c:655 msgid "copy a branch and its reflog" msgstr "copiar una rama y su reflog" -#: builtin/branch.c:645 +#: builtin/branch.c:656 msgid "copy a branch, even if target exists" msgstr "copiar una rama, incluso si el objetivo existe" -#: builtin/branch.c:646 +#: builtin/branch.c:657 msgid "list branch names" msgstr "listar nombres de ramas" -#: builtin/branch.c:647 +#: builtin/branch.c:658 msgid "show current branch name" msgstr "muestra el nombre de branch actual" -#: builtin/branch.c:648 +#: builtin/branch.c:659 msgid "create the branch's reflog" msgstr "crea el reflog de la rama" -#: builtin/branch.c:650 +#: builtin/branch.c:661 msgid "edit the description for the branch" msgstr "edita la descripción de la rama" -#: builtin/branch.c:651 +#: builtin/branch.c:662 msgid "force creation, move/rename, deletion" msgstr "fuerza la creación,movimiento/renombrado,borrado" -#: builtin/branch.c:652 +#: builtin/branch.c:663 msgid "print only branches that are merged" msgstr "muestra solo ramas que han sido fusionadas" -#: builtin/branch.c:653 +#: builtin/branch.c:664 msgid "print only branches that are not merged" msgstr "muestra solo ramas que no han sido fusionadas" -#: builtin/branch.c:654 +#: builtin/branch.c:665 msgid "list branches in columns" msgstr "muestra las ramas en columnas" -#: builtin/branch.c:656 builtin/for-each-ref.c:42 builtin/notes.c:415 +#: builtin/branch.c:667 builtin/for-each-ref.c:42 builtin/notes.c:415 #: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584 -#: builtin/tag.c:434 +#: builtin/tag.c:466 msgid "object" msgstr "objeto" -#: builtin/branch.c:657 +#: builtin/branch.c:668 msgid "print only branches of the object" msgstr "imprimir sólo las ramas del objeto" -#: builtin/branch.c:658 builtin/for-each-ref.c:48 builtin/tag.c:441 +#: builtin/branch.c:669 builtin/for-each-ref.c:48 builtin/tag.c:473 msgid "sorting and filtering are case insensitive" msgstr "ordenamiento y filtrado son case-insensitive" -#: builtin/branch.c:659 builtin/for-each-ref.c:38 builtin/tag.c:439 +#: builtin/branch.c:670 builtin/for-each-ref.c:38 builtin/tag.c:471 #: builtin/verify-tag.c:38 msgid "format to use for the output" msgstr "formato para usar para el output" -#: builtin/branch.c:682 builtin/clone.c:789 +#: builtin/branch.c:693 builtin/clone.c:790 msgid "HEAD not found below refs/heads!" msgstr "¡HEAD no encontrado abajo de refs/heads!" -#: builtin/branch.c:706 +#: builtin/branch.c:717 msgid "--column and --verbose are incompatible" msgstr "--column y --verbose son incompatibles" -#: builtin/branch.c:721 builtin/branch.c:775 builtin/branch.c:784 +#: builtin/branch.c:732 builtin/branch.c:788 builtin/branch.c:797 msgid "branch name required" msgstr "se necesita el nombre de la rama" -#: builtin/branch.c:751 +#: builtin/branch.c:764 msgid "Cannot give description to detached HEAD" msgstr "No se puede dar descripción al HEAD desacoplado" -#: builtin/branch.c:756 +#: builtin/branch.c:769 msgid "cannot edit description of more than one branch" msgstr "no se puede editar la descripción de más de una rama" -#: builtin/branch.c:763 +#: builtin/branch.c:776 #, c-format msgid "No commit on branch '%s' yet." msgstr "Aún no hay commits en la rama '%s'." -#: builtin/branch.c:766 +#: builtin/branch.c:779 #, c-format msgid "No branch named '%s'." msgstr "No hay ninguna rama llamada '%s'." -#: builtin/branch.c:781 +#: builtin/branch.c:794 msgid "too many branches for a copy operation" msgstr "demasiadas ramas para una operación de copiado" -#: builtin/branch.c:790 +#: builtin/branch.c:803 msgid "too many arguments for a rename operation" msgstr "demasiados argumentos para una operación de renombrado" -#: builtin/branch.c:795 +#: builtin/branch.c:808 msgid "too many arguments to set new upstream" msgstr "demasiados argumentos para configurar un nuevo upstream" -#: builtin/branch.c:799 +#: builtin/branch.c:812 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." @@ -11091,32 +11539,32 @@ msgstr "" "no se pudo configurar upstream de HEAD a %s cuando este no apunta a ninguna " "rama." -#: builtin/branch.c:802 builtin/branch.c:825 +#: builtin/branch.c:815 builtin/branch.c:838 #, c-format msgid "no such branch '%s'" msgstr "no hay tal rama '%s'" -#: builtin/branch.c:806 +#: builtin/branch.c:819 #, c-format msgid "branch '%s' does not exist" msgstr "la rama '%s' no existe" -#: builtin/branch.c:819 +#: builtin/branch.c:832 msgid "too many arguments to unset upstream" msgstr "demasiados argumentos para desconfigurar upstream" -#: builtin/branch.c:823 +#: builtin/branch.c:836 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" "no se puede desconfigurar upstream de HEAD cuando este no apunta a ninguna " "rama." -#: builtin/branch.c:829 +#: builtin/branch.c:842 #, c-format msgid "Branch '%s' has no upstream information" msgstr "Rama '%s' no tiene información de upstream" -#: builtin/branch.c:839 +#: builtin/branch.c:852 msgid "" "The -a, and -r, options to 'git branch' do not take a branch name.\n" "Did you mean to use: -a|-r --list <pattern>?" @@ -11124,7 +11572,7 @@ msgstr "" "Las opciones -a, y -r, de 'git branch' no toman un nombre de rama.\n" "¿Quisiste usar: -a|-r --list <patrón>?" -#: builtin/branch.c:843 +#: builtin/branch.c:856 msgid "" "the '--set-upstream' option is no longer supported. Please use '--track' or " "'--set-upstream-to' instead." @@ -11132,6 +11580,104 @@ msgstr "" "la opción '--set-upstream' ya no es soportada. Considere usar '--track' o '--" "set-upstream-to' en cambio." +#: builtin/bugreport.c:15 +msgid "git version:\n" +msgstr "versión de git:\n" + +#: builtin/bugreport.c:21 +#, c-format +msgid "uname() failed with error '%s' (%d)\n" +msgstr "uname() falló con error '%s' (%d)\n" + +#: builtin/bugreport.c:31 +msgid "compiler info: " +msgstr "información del compilador: " + +#: builtin/bugreport.c:34 +msgid "libc info: " +msgstr "información de libc: " + +#: builtin/bugreport.c:80 +msgid "not run from a git repository - no hooks to show\n" +msgstr "no ejecutado desde un repositorio git - no hay hooks para mostrar\n" + +#: builtin/bugreport.c:90 +msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]" +msgstr "" +"git bugreport [-o|--output-directory <archivo>] [-s|--suffix <formato>]" + +#: builtin/bugreport.c:97 +msgid "" +"Thank you for filling out a Git bug report!\n" +"Please answer the following questions to help us understand your issue.\n" +"\n" +"What did you do before the bug happened? (Steps to reproduce your issue)\n" +"\n" +"What did you expect to happen? (Expected behavior)\n" +"\n" +"What happened instead? (Actual behavior)\n" +"\n" +"What's different between what you expected and what actually happened?\n" +"\n" +"Anything else you want to add:\n" +"\n" +"Please review the rest of the bug report below.\n" +"You can delete any lines you don't wish to share.\n" +msgstr "" +"¡Gracias por prepara un reporte de bug de Git!\n" +"Por favor responde las siguientes preguntas para ayudarnos a entender el " +"problema.\n" +"\n" +"¿Qué hiciste antes de que sucediera el bug? (Pasos para reproducir el " +"problema)\n" +"\n" +"¿Qué esperabas que sucediera? (Comportamiento esperado)\n" +"\n" +"¿Qué sucedio en lugar de eso? (Comportamiento real)\n" +"\n" +"¿Qué es diferente entre lo que esperabas y lo que pasó?\n" +"\n" +"Cualquier cosa que quieras agregar:\n" +"\n" +"Por favor revisa el resto del reporte abajo.\n" +"Puedes borrar cualquier línea que no desees compartir.\n" + +#: builtin/bugreport.c:135 +msgid "specify a destination for the bugreport file" +msgstr "especificar el destino para el archivo de reporte de bug" + +#: builtin/bugreport.c:137 +msgid "specify a strftime format suffix for the filename" +msgstr "especificar el sufijo formato strftime para el nombre del archivo" + +#: builtin/bugreport.c:159 +#, c-format +msgid "could not create leading directories for '%s'" +msgstr "no se pudo crear directorios principales para '%s'" + +#: builtin/bugreport.c:166 +msgid "System Info" +msgstr "Información del sistema" + +#: builtin/bugreport.c:169 +msgid "Enabled Hooks" +msgstr "Activar Hooks" + +#: builtin/bugreport.c:176 +#, c-format +msgid "couldn't create a new file at '%s'" +msgstr "no se pudo crear un archivo en '%s'" + +#: builtin/bugreport.c:179 +#, c-format +msgid "unable to write to %s" +msgstr "no es posible escribir en %s" + +#: builtin/bugreport.c:189 +#, c-format +msgid "Created new report at '%s'.\n" +msgstr "Crear un nuevo reporte en '%s'.\n" + #: builtin/bundle.c:15 builtin/bundle.c:23 msgid "git bundle create [<options>] <file> <git-rev-list args>" msgstr "git bundle create [<opciones>] <file> <git-rev-list args>" @@ -11148,44 +11694,48 @@ msgstr "git bundle list-heads <archivo> [<nombre-de-ref>...]" msgid "git bundle unbundle <file> [<refname>...]" msgstr "git bundle unbundle <archivo> [<nombre-de-ref>...]" -#: builtin/bundle.c:66 builtin/pack-objects.c:3448 +#: builtin/bundle.c:67 builtin/pack-objects.c:3495 msgid "do not show progress meter" msgstr "no mostrar medidor de progreso" -#: builtin/bundle.c:68 builtin/pack-objects.c:3450 +#: builtin/bundle.c:69 builtin/pack-objects.c:3497 msgid "show progress meter" msgstr "mostrar medidor de progreso" -#: builtin/bundle.c:70 builtin/pack-objects.c:3452 +#: builtin/bundle.c:71 builtin/pack-objects.c:3499 msgid "show progress meter during object writing phase" msgstr "mostrar medidor de progreso durante la fase de escritura de objeto" -#: builtin/bundle.c:73 builtin/pack-objects.c:3455 +#: builtin/bundle.c:74 builtin/pack-objects.c:3502 msgid "similar to --all-progress when progress meter is shown" msgstr "similar a --all-progress cuando medidor de progreso es mostrado" -#: builtin/bundle.c:93 +#: builtin/bundle.c:76 +msgid "specify bundle format version" +msgstr "especificar la versión del formato del paquete" + +#: builtin/bundle.c:96 msgid "Need a repository to create a bundle." msgstr "Se necesita un repositorio para agrupar." -#: builtin/bundle.c:104 +#: builtin/bundle.c:107 msgid "do not show bundle details" msgstr "no mostrar detalles del bundle" -#: builtin/bundle.c:119 +#: builtin/bundle.c:122 #, c-format msgid "%s is okay\n" msgstr "%s está bien\n" -#: builtin/bundle.c:160 +#: builtin/bundle.c:163 msgid "Need a repository to unbundle." msgstr "Se necesita un repositorio para desagrupar." -#: builtin/bundle.c:168 builtin/remote.c:1686 +#: builtin/bundle.c:171 builtin/remote.c:1700 msgid "be verbose; must be placed before a subcommand" msgstr "ser verboso; tiene que ser agregado antes de un subcomando" -#: builtin/bundle.c:190 builtin/remote.c:1717 +#: builtin/bundle.c:193 builtin/remote.c:1731 #, c-format msgid "Unknown subcommand: %s" msgstr "Sub-comando desconocido: %s" @@ -11238,7 +11788,7 @@ msgstr "para objetos blob, ejecuta textconv en el contenido del objeto" msgid "for blob objects, run filters on object's content" msgstr "para objetos blob, ejecuta filters en el contenido del objeto" -#: builtin/cat-file.c:648 git-submodule.sh:958 +#: builtin/cat-file.c:648 msgid "blob" msgstr "blob" @@ -11299,8 +11849,8 @@ msgstr "leer nombres de archivos de stdin" msgid "terminate input and output records by a NUL character" msgstr "terminar registros de entrada y salida con un carácter NUL" -#: builtin/check-ignore.c:21 builtin/checkout.c:1486 builtin/gc.c:537 -#: builtin/worktree.c:561 +#: builtin/check-ignore.c:21 builtin/checkout.c:1499 builtin/gc.c:549 +#: builtin/worktree.c:489 msgid "suppress progress reporting" msgstr "suprimir el reporte de progreso" @@ -11353,56 +11903,56 @@ msgstr "no es posible analizar el contacto: %s" msgid "no contacts specified" msgstr "contactos no especificados" -#: builtin/checkout-index.c:131 +#: builtin/checkout-index.c:152 msgid "git checkout-index [<options>] [--] [<file>...]" msgstr "git checkout-index [<opciones>] [--] [<archivo>...]" -#: builtin/checkout-index.c:148 +#: builtin/checkout-index.c:169 msgid "stage should be between 1 and 3 or all" msgstr "stage tiene que estar entre 1 y 3 o all" -#: builtin/checkout-index.c:164 +#: builtin/checkout-index.c:186 msgid "check out all files in the index" msgstr "revisar todos los archivos en el índice" -#: builtin/checkout-index.c:165 +#: builtin/checkout-index.c:187 msgid "force overwrite of existing files" msgstr "forzar sobreescritura de los archivos existentes" -#: builtin/checkout-index.c:167 +#: builtin/checkout-index.c:189 msgid "no warning for existing files and files not in index" msgstr "" "no hay advertencias para los archivos existentes y los archivos no están en " "el índice" -#: builtin/checkout-index.c:169 +#: builtin/checkout-index.c:191 msgid "don't checkout new files" msgstr "no revisar archivos nuevos" -#: builtin/checkout-index.c:171 +#: builtin/checkout-index.c:193 msgid "update stat information in the index file" msgstr "actualizar información de estado en el archivo índice" -#: builtin/checkout-index.c:175 +#: builtin/checkout-index.c:197 msgid "read list of paths from the standard input" msgstr "leer lista de rutas desde standard input" -#: builtin/checkout-index.c:177 +#: builtin/checkout-index.c:199 msgid "write the content to temporary files" msgstr "escribir el contenido en un archivo temporal" -#: builtin/checkout-index.c:178 builtin/column.c:31 -#: builtin/submodule--helper.c:1400 builtin/submodule--helper.c:1403 -#: builtin/submodule--helper.c:1411 builtin/submodule--helper.c:1909 -#: builtin/worktree.c:754 +#: builtin/checkout-index.c:200 builtin/column.c:31 +#: builtin/submodule--helper.c:1824 builtin/submodule--helper.c:1827 +#: builtin/submodule--helper.c:1835 builtin/submodule--helper.c:2333 +#: builtin/worktree.c:717 msgid "string" msgstr "string" -#: builtin/checkout-index.c:179 +#: builtin/checkout-index.c:201 msgid "when creating files, prepend <string>" msgstr "cuando cree archivos, anteponer <string>" -#: builtin/checkout-index.c:181 +#: builtin/checkout-index.c:203 msgid "copy out the files from named stage" msgstr "copiar los archivos del stage nombrado" @@ -11437,83 +11987,83 @@ msgstr "ruta '%s' no tiene su versión" msgid "path '%s' does not have all necessary versions" msgstr "ruta '%s' no tiene todas las versiones necesarias" -#: builtin/checkout.c:256 +#: builtin/checkout.c:258 #, c-format msgid "path '%s' does not have necessary versions" msgstr "ruta '%s' no tiene versiones necesarias" -#: builtin/checkout.c:274 +#: builtin/checkout.c:275 #, c-format msgid "path '%s': cannot merge" msgstr "ruta '%s': no se puede fusionar" -#: builtin/checkout.c:290 +#: builtin/checkout.c:291 #, c-format msgid "Unable to add merge result for '%s'" msgstr "Incapaz de agregar resultados de fusión a '%s'" -#: builtin/checkout.c:395 +#: builtin/checkout.c:396 #, c-format msgid "Recreated %d merge conflict" msgid_plural "Recreated %d merge conflicts" msgstr[0] "Recreado %d conflicto de merge" msgstr[1] "Recreados %d conflictos de merge" -#: builtin/checkout.c:400 +#: builtin/checkout.c:401 #, c-format msgid "Updated %d path from %s" msgid_plural "Updated %d paths from %s" msgstr[0] "Actualizada %d ruta para %s" msgstr[1] "Actualizadas %d rutas para %s" -#: builtin/checkout.c:407 +#: builtin/checkout.c:408 #, c-format msgid "Updated %d path from the index" msgid_plural "Updated %d paths from the index" msgstr[0] "Actualizada %d ruta desde el index" msgstr[1] "Actualizadas %d rutas desde el index" -#: builtin/checkout.c:430 builtin/checkout.c:433 builtin/checkout.c:436 -#: builtin/checkout.c:440 +#: builtin/checkout.c:431 builtin/checkout.c:434 builtin/checkout.c:437 +#: builtin/checkout.c:441 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "'%s' no puede ser usada con rutas actualizadas" -#: builtin/checkout.c:443 builtin/checkout.c:446 +#: builtin/checkout.c:444 builtin/checkout.c:447 #, c-format msgid "'%s' cannot be used with %s" msgstr "'%s' no puede ser usado con %s" -#: builtin/checkout.c:450 +#: builtin/checkout.c:451 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "No se puede actualizar rutas y cambiar a la rama '%s' al mismo tiempo." -#: builtin/checkout.c:454 +#: builtin/checkout.c:455 #, c-format msgid "neither '%s' or '%s' is specified" msgstr "ni '%s' o '%s' están especificados" -#: builtin/checkout.c:458 +#: builtin/checkout.c:459 #, c-format msgid "'%s' must be used when '%s' is not specified" msgstr "'%s' tiene que ser usado cuando '%s' no es especificado" -#: builtin/checkout.c:463 builtin/checkout.c:468 +#: builtin/checkout.c:464 builtin/checkout.c:469 #, c-format msgid "'%s' or '%s' cannot be used with %s" msgstr "'%s' o '%s' no puede ser usado con %s" -#: builtin/checkout.c:527 builtin/checkout.c:534 +#: builtin/checkout.c:543 builtin/checkout.c:550 #, c-format msgid "path '%s' is unmerged" msgstr "ruta '%s' no esta fusionada" -#: builtin/checkout.c:702 +#: builtin/checkout.c:718 msgid "you need to resolve your current index first" msgstr "necesitas resolver tu índice actual primero" -#: builtin/checkout.c:756 +#: builtin/checkout.c:772 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" @@ -11522,50 +12072,50 @@ msgstr "" "no se puede continuar con los cambios en stage en los siguientes archivos:\n" "%s" -#: builtin/checkout.c:859 +#: builtin/checkout.c:865 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "No se puede hacer reflog para '%s': %s\n" -#: builtin/checkout.c:901 +#: builtin/checkout.c:907 msgid "HEAD is now at" msgstr "HEAD está ahora en" -#: builtin/checkout.c:905 builtin/clone.c:720 +#: builtin/checkout.c:911 builtin/clone.c:721 t/helper/test-fast-rebase.c:202 msgid "unable to update HEAD" msgstr "no es posible actualizar HEAD" -#: builtin/checkout.c:909 +#: builtin/checkout.c:915 #, c-format msgid "Reset branch '%s'\n" msgstr "Reiniciar rama '%s'\n" -#: builtin/checkout.c:912 +#: builtin/checkout.c:918 #, c-format msgid "Already on '%s'\n" msgstr "Ya en '%s'\n" -#: builtin/checkout.c:916 +#: builtin/checkout.c:922 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Rama reiniciada y cambiada a '%s'\n" -#: builtin/checkout.c:918 builtin/checkout.c:1342 +#: builtin/checkout.c:924 builtin/checkout.c:1355 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Cambiado a nueva rama '%s'\n" -#: builtin/checkout.c:920 +#: builtin/checkout.c:926 #, c-format msgid "Switched to branch '%s'\n" msgstr "Cambiado a rama '%s'\n" -#: builtin/checkout.c:971 +#: builtin/checkout.c:977 #, c-format msgid " ... and %d more.\n" msgstr " ... y %d más.\n" -#: builtin/checkout.c:977 +#: builtin/checkout.c:983 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -11588,7 +12138,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:996 +#: builtin/checkout.c:1002 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -11615,19 +12165,19 @@ msgstr[1] "" " git branch <nombre-de-rama> %s\n" "\n" -#: builtin/checkout.c:1031 +#: builtin/checkout.c:1037 msgid "internal error in revision walk" msgstr "error interno en camino de revisión" -#: builtin/checkout.c:1035 +#: builtin/checkout.c:1041 msgid "Previous HEAD position was" msgstr "La posición previa de HEAD era" -#: builtin/checkout.c:1075 builtin/checkout.c:1337 +#: builtin/checkout.c:1081 builtin/checkout.c:1350 msgid "You are on a branch yet to be born" msgstr "Estás en una rama por nacer" -#: builtin/checkout.c:1150 +#: builtin/checkout.c:1163 #, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" @@ -11636,7 +12186,7 @@ msgstr "" "'%s' puede ser tanto un archivo local como una rama de rastreo.\n" "Por favor use -- (y opcionalmente --no-guess) para desambiguar" -#: builtin/checkout.c:1157 +#: builtin/checkout.c:1170 msgid "" "If you meant to check out a remote tracking branch on, e.g. 'origin',\n" "you can do so by fully qualifying the name with the --track option:\n" @@ -11657,51 +12207,51 @@ msgstr "" "de nombre <nombre> remota, como 'origin', considera configurar\n" "checkout.defaultRemote=origin en tu configuración." -#: builtin/checkout.c:1167 +#: builtin/checkout.c:1180 #, c-format msgid "'%s' matched multiple (%d) remote tracking branches" msgstr "'%s' concordó con multiples (%d) ramas de rastreo remoto" -#: builtin/checkout.c:1233 +#: builtin/checkout.c:1246 msgid "only one reference expected" msgstr "solo una referencia esperada" -#: builtin/checkout.c:1250 +#: builtin/checkout.c:1263 #, c-format msgid "only one reference expected, %d given." msgstr "solo una referencia esperada, %d entregadas." -#: builtin/checkout.c:1296 builtin/worktree.c:342 builtin/worktree.c:510 +#: builtin/checkout.c:1309 builtin/worktree.c:270 builtin/worktree.c:438 #, c-format msgid "invalid reference: %s" msgstr "referencia inválida: %s" -#: builtin/checkout.c:1309 builtin/checkout.c:1675 +#: builtin/checkout.c:1322 builtin/checkout.c:1688 #, c-format msgid "reference is not a tree: %s" msgstr "la referencia no es n árbol: %s" -#: builtin/checkout.c:1356 +#: builtin/checkout.c:1369 #, c-format msgid "a branch is expected, got tag '%s'" msgstr "se esperaba un branch, se obtuvo tag '%s'" -#: builtin/checkout.c:1358 +#: builtin/checkout.c:1371 #, c-format msgid "a branch is expected, got remote branch '%s'" msgstr "se espera una rama, se obtuvo una rama remota '%s'" -#: builtin/checkout.c:1359 builtin/checkout.c:1367 +#: builtin/checkout.c:1372 builtin/checkout.c:1380 #, c-format msgid "a branch is expected, got '%s'" msgstr "se esperaba branch, se obuto '%s'" -#: builtin/checkout.c:1362 +#: builtin/checkout.c:1375 #, c-format msgid "a branch is expected, got commit '%s'" msgstr "se espera una rama, se obtuvo commit '%s'" -#: builtin/checkout.c:1378 +#: builtin/checkout.c:1391 msgid "" "cannot switch branch while merging\n" "Consider \"git merge --quit\" or \"git worktree add\"." @@ -11709,7 +12259,7 @@ msgstr "" "no se puede cambiar de branch durante un merge\n" "Considera \"git merge --quit\" o \"git worktree add\"." -#: builtin/checkout.c:1382 +#: builtin/checkout.c:1395 msgid "" "cannot switch branch in the middle of an am session\n" "Consider \"git am --quit\" or \"git worktree add\"." @@ -11717,7 +12267,7 @@ msgstr "" "no se puede cambiar de branch en medio de una sesión de am\n" "Considera \"git am --quit\" o \"git worktree add\"." -#: builtin/checkout.c:1386 +#: builtin/checkout.c:1399 msgid "" "cannot switch branch while rebasing\n" "Consider \"git rebase --quit\" or \"git worktree add\"." @@ -11725,7 +12275,7 @@ msgstr "" "no se puede cambiar de branch durante un rebase\n" "Considera \"git rebase --quit\" o \"git worktree add\"." -#: builtin/checkout.c:1390 +#: builtin/checkout.c:1403 msgid "" "cannot switch branch while cherry-picking\n" "Consider \"git cherry-pick --quit\" or \"git worktree add\"." @@ -11733,7 +12283,7 @@ msgstr "" "no se puede cambiar de branch durante un cherry-pick\n" "Considera \"git cherry-pick --quit\" o \"git worktree add\"." -#: builtin/checkout.c:1394 +#: builtin/checkout.c:1407 msgid "" "cannot switch branch while reverting\n" "Consider \"git revert --quit\" or \"git worktree add\"." @@ -11741,144 +12291,137 @@ msgstr "" "no se puede cambiar de branch durante un revert\n" "Considera \"git revert --quit\" o \"git worktree add\"." -#: builtin/checkout.c:1398 +#: builtin/checkout.c:1411 msgid "you are switching branch while bisecting" msgstr "estás cambiando ramas durante un bisect" -#: builtin/checkout.c:1405 +#: builtin/checkout.c:1418 msgid "paths cannot be used with switching branches" msgstr "rutas no pueden ser usadas con cambios de rama" -#: builtin/checkout.c:1408 builtin/checkout.c:1412 builtin/checkout.c:1416 +#: builtin/checkout.c:1421 builtin/checkout.c:1425 builtin/checkout.c:1429 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "'%s' no puede ser usado con cambios de ramas" -#: builtin/checkout.c:1420 builtin/checkout.c:1423 builtin/checkout.c:1426 -#: builtin/checkout.c:1431 builtin/checkout.c:1436 +#: builtin/checkout.c:1433 builtin/checkout.c:1436 builtin/checkout.c:1439 +#: builtin/checkout.c:1444 builtin/checkout.c:1449 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' no puede ser usado con '%s'" -#: builtin/checkout.c:1433 +#: builtin/checkout.c:1446 #, c-format msgid "'%s' cannot take <start-point>" msgstr "'%s' no puede tomar <punto de partida>" -#: builtin/checkout.c:1441 +#: builtin/checkout.c:1454 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "No se puede cambiar rama a un '%s' sin commits" -#: builtin/checkout.c:1448 +#: builtin/checkout.c:1461 msgid "missing branch or commit argument" msgstr "falta branch o commit como argumento" -#: builtin/checkout.c:1490 builtin/clone.c:91 builtin/commit-graph.c:82 -#: builtin/commit-graph.c:189 builtin/fetch.c:168 builtin/merge.c:288 -#: builtin/multi-pack-index.c:27 builtin/pull.c:119 builtin/push.c:561 -#: builtin/send-pack.c:173 -msgid "force progress reporting" -msgstr "forzar el reporte de progreso" - -#: builtin/checkout.c:1491 +#: builtin/checkout.c:1504 msgid "perform a 3-way merge with the new branch" msgstr "realizar una fusión de tres vías con la rama nueva" -#: builtin/checkout.c:1492 builtin/log.c:1709 parse-options.h:322 +#: builtin/checkout.c:1505 builtin/log.c:1799 parse-options.h:322 msgid "style" msgstr "estilo" -#: builtin/checkout.c:1493 +#: builtin/checkout.c:1506 msgid "conflict style (merge or diff3)" msgstr "conflicto de estilos (merge o diff3)" -#: builtin/checkout.c:1505 builtin/worktree.c:558 +#: builtin/checkout.c:1518 builtin/worktree.c:486 msgid "detach HEAD at named commit" msgstr "desacoplar HEAD en el commit nombrado" -#: builtin/checkout.c:1506 +#: builtin/checkout.c:1519 msgid "set upstream info for new branch" msgstr "configurar info de upstream para una rama nueva" -#: builtin/checkout.c:1508 +#: builtin/checkout.c:1521 msgid "force checkout (throw away local modifications)" msgstr "forzar el checkout (descartar modificaciones locales)" -#: builtin/checkout.c:1510 +#: builtin/checkout.c:1523 msgid "new-branch" msgstr "nueva-rama" -#: builtin/checkout.c:1510 +#: builtin/checkout.c:1523 msgid "new unparented branch" msgstr "nueva rama no emparentada" -#: builtin/checkout.c:1512 builtin/merge.c:292 +#: builtin/checkout.c:1525 builtin/merge.c:301 msgid "update ignored files (default)" msgstr "actualizar archivos ignorados (default)" -#: builtin/checkout.c:1515 +#: builtin/checkout.c:1528 msgid "do not check if another worktree is holding the given ref" msgstr "no revise si otro árbol de trabajo contiene la ref entregada" -#: builtin/checkout.c:1528 +#: builtin/checkout.c:1541 msgid "checkout our version for unmerged files" msgstr "hacer checkout a nuestra versión para archivos sin fusionar" -#: builtin/checkout.c:1531 +#: builtin/checkout.c:1544 msgid "checkout their version for unmerged files" msgstr "hacer checkout a su versión para los archivos sin fusionar" -#: builtin/checkout.c:1535 +#: builtin/checkout.c:1548 msgid "do not limit pathspecs to sparse entries only" msgstr "no limitar pathspecs a dispersar entradas solamente" -#: builtin/checkout.c:1590 +#: builtin/checkout.c:1603 #, c-format msgid "-%c, -%c and --orphan are mutually exclusive" msgstr "-%c, -%c y --orphan son mutuamente exclusivas" -#: builtin/checkout.c:1594 +#: builtin/checkout.c:1607 msgid "-p and --overlay are mutually exclusive" msgstr "-p y --overlay son mutuamente exclusivas" -#: builtin/checkout.c:1631 +#: builtin/checkout.c:1644 msgid "--track needs a branch name" msgstr "--track necesita el nombre de una rama" -#: builtin/checkout.c:1636 +#: builtin/checkout.c:1649 #, c-format msgid "missing branch name; try -%c" msgstr "falta nombre de rama; prueba -%c" -#: builtin/checkout.c:1668 +#: builtin/checkout.c:1681 #, c-format msgid "could not resolve %s" msgstr "no se pudo resolver %s" -#: builtin/checkout.c:1684 +#: builtin/checkout.c:1697 msgid "invalid path specification" msgstr "especificación de ruta inválida" -#: builtin/checkout.c:1691 +#: builtin/checkout.c:1704 #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "'%s' no es un commit y una rama '%s' no puede ser creada desde este" -#: builtin/checkout.c:1695 +#: builtin/checkout.c:1708 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: --detach no toma un argumento de ruta '%s'" -#: builtin/checkout.c:1704 +#: builtin/checkout.c:1717 msgid "--pathspec-from-file is incompatible with --detach" msgstr "--pathspec-from-file es incompatible con --detach" -#: builtin/checkout.c:1707 builtin/reset.c:325 builtin/stash.c:1503 +#: builtin/checkout.c:1720 builtin/reset.c:325 builtin/stash.c:1566 msgid "--pathspec-from-file is incompatible with --patch" msgstr "--pathspec-from-file es incompatible con --patch" -#: builtin/checkout.c:1718 +#: builtin/checkout.c:1733 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -11886,70 +12429,70 @@ msgstr "" "git checkout: --ours/--theirs, --force y --merge son incompatibles cuando\n" "se revisa fuera del índice." -#: builtin/checkout.c:1723 +#: builtin/checkout.c:1738 msgid "you must specify path(s) to restore" msgstr "debes especificar path(s) para restaurar" -#: builtin/checkout.c:1749 builtin/checkout.c:1751 builtin/checkout.c:1800 -#: builtin/checkout.c:1802 builtin/clone.c:121 builtin/remote.c:170 -#: builtin/remote.c:172 builtin/submodule--helper.c:2295 builtin/worktree.c:554 -#: builtin/worktree.c:556 +#: builtin/checkout.c:1764 builtin/checkout.c:1766 builtin/checkout.c:1815 +#: builtin/checkout.c:1817 builtin/clone.c:122 builtin/remote.c:170 +#: builtin/remote.c:172 builtin/submodule--helper.c:2719 builtin/worktree.c:482 +#: builtin/worktree.c:484 msgid "branch" msgstr "rama" -#: builtin/checkout.c:1750 +#: builtin/checkout.c:1765 msgid "create and checkout a new branch" msgstr "crear y hacer checkout a una nueva rama" -#: builtin/checkout.c:1752 +#: builtin/checkout.c:1767 msgid "create/reset and checkout a branch" msgstr "crear/reiniciar y hacer checkout a una rama" -#: builtin/checkout.c:1753 +#: builtin/checkout.c:1768 msgid "create reflog for new branch" msgstr "crear un reflog para una nueva rama" -#: builtin/checkout.c:1755 +#: builtin/checkout.c:1770 msgid "second guess 'git checkout <no-such-branch>' (default)" msgstr "adivinar segunda opción 'git checkout <no-hay-tal-rama>' (default)" -#: builtin/checkout.c:1756 +#: builtin/checkout.c:1771 msgid "use overlay mode (default)" msgstr "usar modo overlay (default)" -#: builtin/checkout.c:1801 +#: builtin/checkout.c:1816 msgid "create and switch to a new branch" msgstr "crear y hacer switch a una nueva rama" -#: builtin/checkout.c:1803 +#: builtin/checkout.c:1818 msgid "create/reset and switch to a branch" msgstr "crear/reiniciar y hacer switch a una rama" -#: builtin/checkout.c:1805 +#: builtin/checkout.c:1820 msgid "second guess 'git switch <no-such-branch>'" msgstr "adivinar segunda opción 'git checkout <no-hay-tal-rama>'" -#: builtin/checkout.c:1807 +#: builtin/checkout.c:1822 msgid "throw away local modifications" msgstr "descartar modificaciones locales" -#: builtin/checkout.c:1841 +#: builtin/checkout.c:1856 msgid "which tree-ish to checkout from" msgstr "de qué árbol hacer el checkout" -#: builtin/checkout.c:1843 +#: builtin/checkout.c:1858 msgid "restore the index" msgstr "restaurar el index" -#: builtin/checkout.c:1845 +#: builtin/checkout.c:1860 msgid "restore the working tree (default)" msgstr "restaurar el árbol de trabajo (default)" -#: builtin/checkout.c:1847 +#: builtin/checkout.c:1862 msgid "ignore unmerged entries" msgstr "ignorar entradas no fusionadas" -#: builtin/checkout.c:1848 +#: builtin/checkout.c:1863 msgid "use overlay mode" msgstr "usar modo overlay" @@ -11989,7 +12532,7 @@ msgstr "falló al borrar %s" msgid "could not lstat %s\n" msgstr "no se pudo lstat %s\n" -#: builtin/clean.c:302 git-add--interactive.perl:595 +#: builtin/clean.c:302 git-add--interactive.perl:593 #, c-format msgid "" "Prompt help:\n" @@ -12002,7 +12545,7 @@ msgstr "" "foo - selecciona un objeto basado en un prefijo único\n" " - (vacío) no elegir nada\n" -#: builtin/clean.c:306 git-add--interactive.perl:604 +#: builtin/clean.c:306 git-add--interactive.perl:602 #, c-format msgid "" "Prompt help:\n" @@ -12023,8 +12566,8 @@ msgstr "" "* - escoger todos los objetos\n" " - (vacío) terminar selección\n" -#: builtin/clean.c:521 git-add--interactive.perl:570 -#: git-add--interactive.perl:575 +#: builtin/clean.c:521 git-add--interactive.perl:568 +#: git-add--interactive.perl:573 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "¿Ahh (%s)?\n" @@ -12094,8 +12637,8 @@ msgid "remove whole directories" msgstr "borrar directorios completos" #: builtin/clean.c:909 builtin/describe.c:565 builtin/describe.c:567 -#: builtin/grep.c:909 builtin/log.c:182 builtin/log.c:184 -#: builtin/ls-files.c:558 builtin/name-rev.c:526 builtin/name-rev.c:528 +#: builtin/grep.c:922 builtin/log.c:184 builtin/log.c:186 +#: builtin/ls-files.c:573 builtin/name-rev.c:526 builtin/name-rev.c:528 #: builtin/show-ref.c:179 msgid "pattern" msgstr "patrón" @@ -12136,163 +12679,163 @@ msgstr "-x y -X no pueden ser usadas juntas" msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<opciones>] [--] <repo> [<directorio>]" -#: builtin/clone.c:93 +#: builtin/clone.c:94 msgid "don't create a checkout" msgstr "no crear checkout" -#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:554 +#: builtin/clone.c:95 builtin/clone.c:97 builtin/init-db.c:555 msgid "create a bare repository" msgstr "crear un repositorio vacío" -#: builtin/clone.c:98 +#: builtin/clone.c:99 msgid "create a mirror repository (implies bare)" msgstr "crear un repositorio espejo (implica vacío)" -#: builtin/clone.c:100 +#: builtin/clone.c:101 msgid "to clone from a local repository" msgstr "clonar de un repositorio local" -#: builtin/clone.c:102 +#: builtin/clone.c:103 msgid "don't use local hardlinks, always copy" msgstr "no usar hardlinks, siempre copiar" -#: builtin/clone.c:104 +#: builtin/clone.c:105 msgid "setup as shared repository" msgstr "configurar como repositorio compartido" -#: builtin/clone.c:106 +#: builtin/clone.c:107 msgid "pathspec" msgstr "pathspec" -#: builtin/clone.c:106 +#: builtin/clone.c:107 msgid "initialize submodules in the clone" msgstr "inicializar submódulos en el clonado" -#: builtin/clone.c:110 +#: builtin/clone.c:111 msgid "number of submodules cloned in parallel" msgstr "numero de submódulos clonados en paralelo" -#: builtin/clone.c:111 builtin/init-db.c:551 +#: builtin/clone.c:112 builtin/init-db.c:552 msgid "template-directory" msgstr "directorio-template" -#: builtin/clone.c:112 builtin/init-db.c:552 +#: builtin/clone.c:113 builtin/init-db.c:553 msgid "directory from which templates will be used" msgstr "directorio del cual los templates serán usados" -#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1407 -#: builtin/submodule--helper.c:1912 +#: builtin/clone.c:115 builtin/clone.c:117 builtin/submodule--helper.c:1831 +#: builtin/submodule--helper.c:2336 msgid "reference repository" msgstr "repositorio de referencia" -#: builtin/clone.c:118 builtin/submodule--helper.c:1409 -#: builtin/submodule--helper.c:1914 +#: builtin/clone.c:119 builtin/submodule--helper.c:1833 +#: builtin/submodule--helper.c:2338 msgid "use --reference only while cloning" msgstr "usa--reference solamente si estás clonado" -#: builtin/clone.c:119 builtin/column.c:27 builtin/init-db.c:562 -#: builtin/merge-file.c:46 builtin/pack-objects.c:3514 builtin/repack.c:329 +#: builtin/clone.c:120 builtin/column.c:27 builtin/init-db.c:563 +#: builtin/merge-file.c:46 builtin/pack-objects.c:3561 builtin/repack.c:357 msgid "name" msgstr "nombre" -#: builtin/clone.c:120 +#: builtin/clone.c:121 msgid "use <name> instead of 'origin' to track upstream" msgstr "use <nombre> en lugar de 'origin' para rastrear upstream" -#: builtin/clone.c:122 +#: builtin/clone.c:123 msgid "checkout <branch> instead of the remote's HEAD" msgstr "checkout <rama> en lugar de HEAD remota" -#: builtin/clone.c:124 +#: builtin/clone.c:125 msgid "path to git-upload-pack on the remote" msgstr "ruta para git-upload-pack en el remoto" -#: builtin/clone.c:125 builtin/fetch.c:169 builtin/grep.c:848 +#: builtin/clone.c:126 builtin/fetch.c:176 builtin/grep.c:861 #: builtin/pull.c:208 msgid "depth" msgstr "profundidad" -#: builtin/clone.c:126 +#: builtin/clone.c:127 msgid "create a shallow clone of that depth" msgstr "crear un clon superficial para esa profundidad" -#: builtin/clone.c:127 builtin/fetch.c:171 builtin/pack-objects.c:3503 +#: builtin/clone.c:128 builtin/fetch.c:178 builtin/pack-objects.c:3550 #: builtin/pull.c:211 msgid "time" msgstr "tiempo" -#: builtin/clone.c:128 +#: builtin/clone.c:129 msgid "create a shallow clone since a specific time" msgstr "crear un clon superficial desde el tiempo específico" -#: builtin/clone.c:129 builtin/fetch.c:173 builtin/fetch.c:196 -#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1304 +#: builtin/clone.c:130 builtin/fetch.c:180 builtin/fetch.c:203 +#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1323 msgid "revision" msgstr "revision" -#: builtin/clone.c:130 builtin/fetch.c:174 builtin/pull.c:215 +#: builtin/clone.c:131 builtin/fetch.c:181 builtin/pull.c:215 msgid "deepen history of shallow clone, excluding rev" msgstr "ahondando historia de clon superficial, excluyendo rev" -#: builtin/clone.c:132 builtin/submodule--helper.c:1419 -#: builtin/submodule--helper.c:1928 +#: builtin/clone.c:133 builtin/submodule--helper.c:1843 +#: builtin/submodule--helper.c:2352 msgid "clone only one branch, HEAD or --branch" msgstr "clonar solo una rama,HEAD o --branch" -#: builtin/clone.c:134 +#: builtin/clone.c:135 msgid "don't clone any tags, and make later fetches not to follow them" msgstr "no clonar ningún tag, y hacer que los subsiguientes fetch no los sigan" -#: builtin/clone.c:136 +#: builtin/clone.c:137 msgid "any cloned submodules will be shallow" msgstr "cualquier submódulo clonado será superficial" -#: builtin/clone.c:137 builtin/init-db.c:560 +#: builtin/clone.c:138 builtin/init-db.c:561 msgid "gitdir" msgstr "gitdir" -#: builtin/clone.c:138 builtin/init-db.c:561 +#: builtin/clone.c:139 builtin/init-db.c:562 msgid "separate git dir from working tree" msgstr "separa git dir del árbol de trabajo" -#: builtin/clone.c:139 +#: builtin/clone.c:140 msgid "key=value" msgstr "llave=valor" -#: builtin/clone.c:140 +#: builtin/clone.c:141 msgid "set config inside the new repository" msgstr "configurar config dentro del nuevo repositorio" -#: builtin/clone.c:142 builtin/fetch.c:191 builtin/ls-remote.c:76 -#: builtin/pull.c:230 builtin/push.c:570 builtin/send-pack.c:171 +#: builtin/clone.c:143 builtin/fetch.c:198 builtin/ls-remote.c:77 +#: builtin/pull.c:230 builtin/push.c:584 builtin/send-pack.c:196 msgid "server-specific" msgstr "especifico-de-servidor" -#: builtin/clone.c:142 builtin/fetch.c:191 builtin/ls-remote.c:76 -#: builtin/pull.c:231 builtin/push.c:570 builtin/send-pack.c:172 +#: builtin/clone.c:143 builtin/fetch.c:198 builtin/ls-remote.c:77 +#: builtin/pull.c:231 builtin/push.c:584 builtin/send-pack.c:197 msgid "option to transmit" msgstr "opción para trasmitir" -#: builtin/clone.c:143 builtin/fetch.c:192 builtin/pull.c:234 -#: builtin/push.c:571 +#: builtin/clone.c:144 builtin/fetch.c:199 builtin/pull.c:234 +#: builtin/push.c:585 msgid "use IPv4 addresses only" msgstr "solo usar direcciones IPv4" -#: builtin/clone.c:145 builtin/fetch.c:194 builtin/pull.c:237 -#: builtin/push.c:573 +#: builtin/clone.c:146 builtin/fetch.c:201 builtin/pull.c:237 +#: builtin/push.c:587 msgid "use IPv6 addresses only" msgstr "solo usar direcciones IPv6" -#: builtin/clone.c:149 +#: builtin/clone.c:150 msgid "any cloned submodules will use their remote-tracking branch" msgstr "cualquier submódulo clonado usará su branch de rastreo remoto" -#: builtin/clone.c:151 +#: builtin/clone.c:152 msgid "initialize sparse-checkout file to include only files at root" msgstr "" "inicializar archivo sparse-checkout para incluir solo archivos en la raíz" -#: builtin/clone.c:287 +#: builtin/clone.c:288 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -12300,42 +12843,42 @@ msgstr "" "No se pudo adivinar ningún nombre de directorio.\n" "Por favor especifique un directorio en la línea de comando" -#: builtin/clone.c:340 +#: builtin/clone.c:341 #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "info: No se pudo agregar un alterno para '%s': %s\n" -#: builtin/clone.c:413 +#: builtin/clone.c:414 #, c-format msgid "%s exists and is not a directory" msgstr "%s existe pero no es un directorio" -#: builtin/clone.c:431 +#: builtin/clone.c:432 #, c-format msgid "failed to start iterator over '%s'" msgstr "falló al iniciar el iterador sobre '%s'" -#: builtin/clone.c:462 +#: builtin/clone.c:463 #, c-format msgid "failed to create link '%s'" msgstr "falló al crear link '%s'" -#: builtin/clone.c:466 +#: builtin/clone.c:467 #, c-format msgid "failed to copy file to '%s'" msgstr "falló al copiar archivo a '%s'" -#: builtin/clone.c:471 +#: builtin/clone.c:472 #, c-format msgid "failed to iterate over '%s'" msgstr "falló al iterar sobre '%s'" -#: builtin/clone.c:498 +#: builtin/clone.c:499 #, c-format msgid "done.\n" msgstr "hecho.\n" -#: builtin/clone.c:512 +#: builtin/clone.c:513 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -12345,100 +12888,105 @@ msgstr "" "Puedes inspeccionar a qué se hizo checkout con 'git status'\n" "y volver a intentarlo con 'git restore --source=HEAD :/'\n" -#: builtin/clone.c:589 +#: builtin/clone.c:590 #, c-format msgid "Could not find remote branch %s to clone." msgstr "No se pudo encontrar la rama remota %s para clonar." -#: builtin/clone.c:708 +#: builtin/clone.c:709 #, c-format msgid "unable to update %s" msgstr "incapaz de actualizar %s" -#: builtin/clone.c:756 +#: builtin/clone.c:757 msgid "failed to initialize sparse-checkout" msgstr "falló al inicializar sparse-checkout" -#: builtin/clone.c:779 +#: builtin/clone.c:780 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" "remoto HEAD refiere a un ref inexistente, no se puede hacer checkout.\n" -#: builtin/clone.c:811 +#: builtin/clone.c:812 msgid "unable to checkout working tree" msgstr "no es posible realizar checkout en el árbol de trabajo" -#: builtin/clone.c:868 +#: builtin/clone.c:887 msgid "unable to write parameters to config file" msgstr "no es posible escribir parámetros al archivo config" -#: builtin/clone.c:931 +#: builtin/clone.c:950 msgid "cannot repack to clean up" msgstr "no se puede reempaquetar para limpiar" -#: builtin/clone.c:933 +#: builtin/clone.c:952 msgid "cannot unlink temporary alternates file" msgstr "no se puede desvincular archivos alternos temporales" -#: builtin/clone.c:971 builtin/receive-pack.c:1982 +#: builtin/clone.c:993 builtin/receive-pack.c:2493 msgid "Too many arguments." msgstr "Muchos argumentos." -#: builtin/clone.c:975 +#: builtin/clone.c:997 msgid "You must specify a repository to clone." msgstr "Tienes que especificar un repositorio para clonar." -#: builtin/clone.c:988 +#: builtin/clone.c:1010 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "Las opciones --bare y --origin %s son incompatibles." -#: builtin/clone.c:991 +#: builtin/clone.c:1013 msgid "--bare and --separate-git-dir are incompatible." msgstr "--bare y --separate-git-dir son incompatibles." -#: builtin/clone.c:1007 +#: builtin/clone.c:1026 #, c-format msgid "repository '%s' does not exist" msgstr "repositorio '%s' no existe" -#: builtin/clone.c:1011 builtin/fetch.c:1794 +#: builtin/clone.c:1030 builtin/fetch.c:1951 #, c-format msgid "depth %s is not a positive number" msgstr "profundidad %s no es un numero positivo" -#: builtin/clone.c:1021 +#: builtin/clone.c:1040 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "la ruta de destino '%s' ya existe y no es un directorio vacío." -#: builtin/clone.c:1033 +#: builtin/clone.c:1046 +#, c-format +msgid "repository path '%s' already exists and is not an empty directory." +msgstr "La ruta del repositorio '%s' ya existe y no es un directorio vacío." + +#: builtin/clone.c:1060 #, c-format msgid "working tree '%s' already exists." msgstr "directorio de trabajo '%s' ya existe." -#: builtin/clone.c:1048 builtin/clone.c:1069 builtin/difftool.c:271 -#: builtin/log.c:1886 builtin/worktree.c:354 builtin/worktree.c:386 +#: builtin/clone.c:1075 builtin/clone.c:1096 builtin/difftool.c:271 +#: builtin/log.c:1986 builtin/worktree.c:282 builtin/worktree.c:314 #, c-format msgid "could not create leading directories of '%s'" msgstr "no se pudo crear directorios principales de '%s'" -#: builtin/clone.c:1053 +#: builtin/clone.c:1080 #, c-format msgid "could not create work tree dir '%s'" msgstr "no se pudo crear un árbol de trabajo '%s'" -#: builtin/clone.c:1073 +#: builtin/clone.c:1100 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Clonando en un repositorio vacío '%s'...\n" -#: builtin/clone.c:1075 +#: builtin/clone.c:1102 #, c-format msgid "Cloning into '%s'...\n" msgstr "Clonando en '%s'...\n" -#: builtin/clone.c:1099 +#: builtin/clone.c:1126 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" @@ -12446,36 +12994,41 @@ msgstr "" "clone --recursive no es compatible con --reference y --reference-if-able al " "mismo tiempo" -#: builtin/clone.c:1164 +#: builtin/clone.c:1170 builtin/remote.c:200 builtin/remote.c:705 +#, c-format +msgid "'%s' is not a valid remote name" +msgstr "'%s' no es un nombre remoto válido" + +#: builtin/clone.c:1211 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth es ignorada en clonaciones locales; usa file:// más bien." -#: builtin/clone.c:1166 +#: builtin/clone.c:1213 msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "--shallow-since es ignorado en el clon local; use file:// ." -#: builtin/clone.c:1168 +#: builtin/clone.c:1215 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "--shallow-exclude es ignorado en clones locales; use file://." -#: builtin/clone.c:1170 +#: builtin/clone.c:1217 msgid "--filter is ignored in local clones; use file:// instead." msgstr "--filter es ignorado en clones locales; usa file:// en su lugar." -#: builtin/clone.c:1173 +#: builtin/clone.c:1220 msgid "source repository is shallow, ignoring --local" msgstr "repositorio fuente es superficial, ignorando --local" -#: builtin/clone.c:1178 +#: builtin/clone.c:1225 msgid "--local is ignored" msgstr "--local es ignorado" -#: builtin/clone.c:1262 builtin/clone.c:1270 +#: builtin/clone.c:1315 builtin/clone.c:1323 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Rama remota %s no encontrada en upstream %s" -#: builtin/clone.c:1273 +#: builtin/clone.c:1326 msgid "You appear to have cloned an empty repository." msgstr "Pareces haber clonado un repositorio sin contenido." @@ -12511,102 +13064,106 @@ msgstr "Realizando padding entre columnas" msgid "--command must be the first argument" msgstr "--command debe ser el primer argumento" -#: builtin/commit-graph.c:13 builtin/commit-graph.c:21 +#: builtin/commit-graph.c:13 builtin/commit-graph.c:22 msgid "" "git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]" msgstr "" "git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]" -#: builtin/commit-graph.c:14 builtin/commit-graph.c:26 +#: builtin/commit-graph.c:14 builtin/commit-graph.c:27 msgid "" "git commit-graph write [--object-dir <objdir>] [--append] [--" "split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-" -"paths] [--[no-]progress] <split options>" +"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <split options>" msgstr "" -"git commit-graph write [--object-dir <objeto dir>] [--append] [--" +"git commit-graph write [--object-dir <objdir>] [--append] [--" "split[=<estrategia>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-" -"paths] [--[no-]progress] <opciones de split>" +"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <opciones de split>" -#: builtin/commit-graph.c:62 +#: builtin/commit-graph.c:64 #, c-format msgid "could not find object directory matching %s" msgstr "no se pudo entoncrar el objeto directorio concordante con %s" -#: builtin/commit-graph.c:78 builtin/commit-graph.c:177 -#: builtin/commit-graph.c:276 builtin/fetch.c:180 builtin/log.c:1678 +#: builtin/commit-graph.c:80 builtin/commit-graph.c:210 +#: builtin/commit-graph.c:316 builtin/fetch.c:187 builtin/log.c:1768 msgid "dir" msgstr "dir" -#: builtin/commit-graph.c:79 builtin/commit-graph.c:178 -#: builtin/commit-graph.c:277 -msgid "The object directory to store the graph" -msgstr "El directorio de objetos para guardar el gráfico" +#: builtin/commit-graph.c:81 builtin/commit-graph.c:211 +#: builtin/commit-graph.c:317 +msgid "the object directory to store the graph" +msgstr "el directorio de objetos para guardar el gráfico" -#: builtin/commit-graph.c:81 +#: builtin/commit-graph.c:83 msgid "if the commit-graph is split, only verify the tip file" msgstr "si el commit-graph está cortado, solo verifica la punta del archivo" -#: builtin/commit-graph.c:104 +#: builtin/commit-graph.c:106 #, c-format msgid "Could not open commit-graph '%s'" msgstr "No se pudo abrir commit-graph '%s'" -#: builtin/commit-graph.c:138 +#: builtin/commit-graph.c:142 #, c-format msgid "unrecognized --split argument, %s" msgstr "argumento --split no reconocido, %s" -#: builtin/commit-graph.c:151 +#: builtin/commit-graph.c:155 #, c-format msgid "unexpected non-hex object ID: %s" msgstr "ID de objeto no hex inesperado :%s" -#: builtin/commit-graph.c:156 +#: builtin/commit-graph.c:160 #, c-format msgid "invalid object: %s" msgstr "no es un objeto válido: %s" -#: builtin/commit-graph.c:180 +#: builtin/commit-graph.c:213 msgid "start walk at all refs" msgstr "comenzar caminata en todas las refs" -#: builtin/commit-graph.c:182 +#: builtin/commit-graph.c:215 msgid "scan pack-indexes listed by stdin for commits" msgstr "escanear paquete de índices por stdin por commits" -#: builtin/commit-graph.c:184 +#: builtin/commit-graph.c:217 msgid "start walk at commits listed by stdin" msgstr "comenzar a caminar a los commits listados por stdin" -#: builtin/commit-graph.c:186 +#: builtin/commit-graph.c:219 msgid "include all commits already in the commit-graph file" msgstr "inclye todos los commits que ya están en el archivo commit-graph" -#: builtin/commit-graph.c:188 +#: builtin/commit-graph.c:221 msgid "enable computation for changed paths" msgstr "habilitar computación para rutas cambiadas" -#: builtin/commit-graph.c:191 +#: builtin/commit-graph.c:224 msgid "allow writing an incremental commit-graph file" msgstr "permitir escribir un archivo commit-graph incremental" -#: builtin/commit-graph.c:195 +#: builtin/commit-graph.c:228 msgid "maximum number of commits in a non-base split commit-graph" msgstr "máximo número de commits en un commit-graph sin base cortada" -#: builtin/commit-graph.c:197 +#: builtin/commit-graph.c:230 msgid "maximum ratio between two levels of a split commit-graph" msgstr "radio máximo entre dos niveles de corte de commit-graph" -#: builtin/commit-graph.c:199 +#: builtin/commit-graph.c:232 msgid "only expire files older than a given date-time" msgstr "expirar objetos más viejos a una fecha dada" -#: builtin/commit-graph.c:215 +#: builtin/commit-graph.c:234 +msgid "maximum number of changed-path Bloom filters to compute" +msgstr "número máximo de cambios de ruta de filtro Bloom para computar" + +#: builtin/commit-graph.c:255 msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" msgstr "use como máximo uno de --reachable, --stdin-commits, o --stdin-packs" -#: builtin/commit-graph.c:245 +#: builtin/commit-graph.c:287 msgid "Collecting commits from input" msgstr "Recolectando commits del input" @@ -12623,7 +13180,7 @@ msgstr "" msgid "duplicate parent %s ignored" msgstr "padre duplicado %s ignorado" -#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:547 +#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:557 #, c-format msgid "not a valid object name %s" msgstr "no es un nombre de objeto válido %s" @@ -12651,13 +13208,13 @@ msgstr "padre" msgid "id of a parent commit object" msgstr "id del objeto commit padre" -#: builtin/commit-tree.c:114 builtin/commit.c:1506 builtin/merge.c:273 -#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1474 -#: builtin/tag.c:413 +#: builtin/commit-tree.c:114 builtin/commit.c:1504 builtin/merge.c:282 +#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1537 +#: builtin/tag.c:445 msgid "message" msgstr "mensaje" -#: builtin/commit-tree.c:115 builtin/commit.c:1506 +#: builtin/commit-tree.c:115 builtin/commit.c:1504 msgid "commit message" msgstr "mensaje del commit" @@ -12665,7 +13222,7 @@ msgstr "mensaje del commit" msgid "read commit log message from file" msgstr "leer mensaje de commit desde un archivo" -#: builtin/commit-tree.c:121 builtin/commit.c:1518 builtin/merge.c:290 +#: builtin/commit-tree.c:121 builtin/commit.c:1516 builtin/merge.c:299 #: builtin/pull.c:176 builtin/revert.c:118 msgid "GPG sign commit" msgstr "Firmar commit con GPG" @@ -12815,12 +13372,12 @@ msgstr "" "no es posible seleccionar un carácter de comentario que no es usado\n" "en el mensaje de commit actual" -#: builtin/commit.c:717 builtin/commit.c:750 builtin/commit.c:1099 +#: builtin/commit.c:717 builtin/commit.c:750 builtin/commit.c:1097 #, c-format msgid "could not lookup commit %s" msgstr "no se pudo revisar el commit %s" -#: builtin/commit.c:729 builtin/shortlog.c:319 +#: builtin/commit.c:729 builtin/shortlog.c:413 #, c-format msgid "(reading log message from standard input)\n" msgstr "(leyendo mensajes de logs desde standard input)\n" @@ -12846,37 +13403,35 @@ msgstr "no se pudo leer MERGE_MSG" msgid "could not write commit template" msgstr "no se pudo escribir el template del commit" -#: builtin/commit.c:852 -#, c-format +#: builtin/commit.c:853 msgid "" "\n" "It looks like you may be committing a merge.\n" -"If this is not correct, please remove the file\n" -"\t%s\n" +"If this is not correct, please run\n" +"\tgit update-ref -d MERGE_HEAD\n" "and try again.\n" msgstr "" "\n" -"Parece que estás haciendo un commit con una fusión dentro.\n" -"Si esto no es correcto, por favor elimina el archivo\n" -"\t%s\n" -"y vuelve a intentar.\n" +"Parece que está realizando una fusión.\n" +"Si esto no es correcto, ejecute\n" +"\tgit update-ref -d MERGE_HEAD\n" +"e intenta de nuevo.\n" -#: builtin/commit.c:857 -#, c-format +#: builtin/commit.c:858 msgid "" "\n" "It looks like you may be committing a cherry-pick.\n" -"If this is not correct, please remove the file\n" -"\t%s\n" +"If this is not correct, please run\n" +"\tgit update-ref -d CHERRY_PICK_HEAD\n" "and try again.\n" msgstr "" "\n" -"Parece que puedes estar haciendo un commit a un cherry-pick.\n" -"Si esto no es correcto, por favor elimina el archivo\n" -"\t%s\n" -"y vuelve a intentar.\n" +"Parece que puede estar cometiendo una selección de cerebros.\n" +"Si esto no es correcto, ejecute\n" +"\tgit update-ref -d CHERRY_PICK_HEAD\n" +"e intenta de nuevo.\n" -#: builtin/commit.c:870 +#: builtin/commit.c:868 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -12886,7 +13441,7 @@ msgstr "" " líneas que comiencen con '%c' serán ignoradas, y un mensaje\n" " vacío aborta el commit.\n" -#: builtin/commit.c:878 +#: builtin/commit.c:876 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -12898,147 +13453,147 @@ msgstr "" " usted mismo si lo desea.\n" "Un mensaje vacío aborta el commit.\n" -#: builtin/commit.c:895 +#: builtin/commit.c:893 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sAutor: %.*s <%.*s>" -#: builtin/commit.c:903 +#: builtin/commit.c:901 #, c-format msgid "%sDate: %s" msgstr "%sFecha: %s" -#: builtin/commit.c:910 +#: builtin/commit.c:908 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sCommitter: %.*s <%.*s>" -#: builtin/commit.c:928 +#: builtin/commit.c:926 msgid "Cannot read index" msgstr "No se puede leer el índice" -#: builtin/commit.c:999 +#: builtin/commit.c:997 msgid "Error building trees" msgstr "Error al construir los árboles" -#: builtin/commit.c:1013 builtin/tag.c:276 +#: builtin/commit.c:1011 builtin/tag.c:308 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Por favor suministra el mensaje usando las opciones -m o -F.\n" -#: builtin/commit.c:1057 +#: builtin/commit.c:1055 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "" "--author '%s' no está en el formato 'Name <email>' y no concuerda con ningún " "autor existente" -#: builtin/commit.c:1071 +#: builtin/commit.c:1069 #, c-format msgid "Invalid ignored mode '%s'" msgstr "Modo ignorado inválido '%s'" -#: builtin/commit.c:1089 builtin/commit.c:1333 +#: builtin/commit.c:1087 builtin/commit.c:1331 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Modo inválido de los archivos no rastreados '%s'" -#: builtin/commit.c:1129 +#: builtin/commit.c:1127 msgid "--long and -z are incompatible" msgstr "--long y -z son incompatibles" -#: builtin/commit.c:1173 +#: builtin/commit.c:1171 msgid "Using both --reset-author and --author does not make sense" msgstr "Usar ambos --reset-author y --author no tiene sentido" -#: builtin/commit.c:1182 +#: builtin/commit.c:1180 msgid "You have nothing to amend." msgstr "No tienes nada que enmendar." -#: builtin/commit.c:1185 +#: builtin/commit.c:1183 msgid "You are in the middle of a merge -- cannot amend." msgstr "Estás en medio de una fusión -- no puedes enmendar." -#: builtin/commit.c:1187 +#: builtin/commit.c:1185 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "Está en medio de un cherry-pick -- no se puede enmendar." -#: builtin/commit.c:1189 +#: builtin/commit.c:1187 msgid "You are in the middle of a rebase -- cannot amend." msgstr "Estás en medio de una fusión -- no puedes enmendar." -#: builtin/commit.c:1192 +#: builtin/commit.c:1190 msgid "Options --squash and --fixup cannot be used together" msgstr "Opciones --squash y --fixup no pueden ser usadas juntas" -#: builtin/commit.c:1202 +#: builtin/commit.c:1200 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "Solo uno de -c/-C/-F/--fixup puede ser usado." -#: builtin/commit.c:1204 +#: builtin/commit.c:1202 msgid "Option -m cannot be combined with -c/-C/-F." msgstr "La opción -m no puede ser combinada con -c/-C/-F." -#: builtin/commit.c:1213 +#: builtin/commit.c:1211 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author sólo puede ser usada con -C, -c o --amend." -#: builtin/commit.c:1231 +#: builtin/commit.c:1229 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" "Solo uno de --include/--only/--all/--interactive/--patch puede ser usado." -#: builtin/commit.c:1237 +#: builtin/commit.c:1235 #, c-format msgid "paths '%s ...' with -a does not make sense" msgstr "paths '%s ...' con -a no tiene sentido" -#: builtin/commit.c:1368 builtin/commit.c:1529 +#: builtin/commit.c:1366 builtin/commit.c:1527 msgid "show status concisely" msgstr "mostrar status de manera concisa" -#: builtin/commit.c:1370 builtin/commit.c:1531 +#: builtin/commit.c:1368 builtin/commit.c:1529 msgid "show branch information" msgstr "mostrar información de la rama" -#: builtin/commit.c:1372 +#: builtin/commit.c:1370 msgid "show stash information" msgstr "mostrar información del stash" -#: builtin/commit.c:1374 builtin/commit.c:1533 +#: builtin/commit.c:1372 builtin/commit.c:1531 msgid "compute full ahead/behind values" msgstr "calcular todos los valores delante/atrás" -#: builtin/commit.c:1376 +#: builtin/commit.c:1374 msgid "version" msgstr "version" -#: builtin/commit.c:1376 builtin/commit.c:1535 builtin/push.c:549 -#: builtin/worktree.c:722 +#: builtin/commit.c:1374 builtin/commit.c:1533 builtin/push.c:560 +#: builtin/worktree.c:679 msgid "machine-readable output" msgstr "output formato-maquina" -#: builtin/commit.c:1379 builtin/commit.c:1537 +#: builtin/commit.c:1377 builtin/commit.c:1535 msgid "show status in long format (default)" msgstr "mostrar status en formato largo (default)" -#: builtin/commit.c:1382 builtin/commit.c:1540 +#: builtin/commit.c:1380 builtin/commit.c:1538 msgid "terminate entries with NUL" msgstr "terminar entradas con NUL" -#: builtin/commit.c:1384 builtin/commit.c:1388 builtin/commit.c:1543 -#: builtin/fast-export.c:1199 builtin/fast-export.c:1202 -#: builtin/fast-export.c:1205 builtin/rebase.c:1392 parse-options.h:336 +#: builtin/commit.c:1382 builtin/commit.c:1386 builtin/commit.c:1541 +#: builtin/fast-export.c:1198 builtin/fast-export.c:1201 +#: builtin/fast-export.c:1204 builtin/rebase.c:1412 parse-options.h:336 msgid "mode" msgstr "modo" -#: builtin/commit.c:1385 builtin/commit.c:1543 +#: builtin/commit.c:1383 builtin/commit.c:1541 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" "mostrar archivos sin seguimiento, modos opcionales: all, normal, no. " "(Predeterminado: all)" -#: builtin/commit.c:1389 +#: builtin/commit.c:1387 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" @@ -13046,11 +13601,11 @@ msgstr "" "mostrar archivos ignorados, modos opcionales: traditional, matching, no. " "(Predeterminado: traditional)" -#: builtin/commit.c:1391 parse-options.h:192 +#: builtin/commit.c:1389 parse-options.h:192 msgid "when" msgstr "cuando" -#: builtin/commit.c:1392 +#: builtin/commit.c:1390 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -13058,173 +13613,173 @@ msgstr "" "ignorar cambios en submódulos, opcional cuando: all,dirty,untracked. " "(Default: all)" -#: builtin/commit.c:1394 +#: builtin/commit.c:1392 msgid "list untracked files in columns" msgstr "listar en columnas los archivos sin seguimiento" -#: builtin/commit.c:1395 +#: builtin/commit.c:1393 msgid "do not detect renames" msgstr "no detectar renombrados" -#: builtin/commit.c:1397 +#: builtin/commit.c:1395 msgid "detect renames, optionally set similarity index" msgstr "detectar renombres, opcionalmente configurar similaridad de índice" -#: builtin/commit.c:1417 +#: builtin/commit.c:1415 msgid "Unsupported combination of ignored and untracked-files arguments" msgstr "" "Combinación de argumentos de archivos ignorados y no rastreados no soportada" -#: builtin/commit.c:1499 +#: builtin/commit.c:1497 msgid "suppress summary after successful commit" msgstr "suprime summary tras un commit exitoso" -#: builtin/commit.c:1500 +#: builtin/commit.c:1498 msgid "show diff in commit message template" msgstr "mostrar diff en el template del mensaje de commit" -#: builtin/commit.c:1502 +#: builtin/commit.c:1500 msgid "Commit message options" msgstr "Opciones para el mensaje del commit" -#: builtin/commit.c:1503 builtin/merge.c:277 builtin/tag.c:415 +#: builtin/commit.c:1501 builtin/merge.c:286 builtin/tag.c:447 msgid "read message from file" msgstr "leer mensaje desde un archivo" -#: builtin/commit.c:1504 +#: builtin/commit.c:1502 msgid "author" msgstr "autor" -#: builtin/commit.c:1504 +#: builtin/commit.c:1502 msgid "override author for commit" msgstr "sobrescribe el autor del commit" -#: builtin/commit.c:1505 builtin/gc.c:538 +#: builtin/commit.c:1503 builtin/gc.c:550 msgid "date" msgstr "fecha" -#: builtin/commit.c:1505 +#: builtin/commit.c:1503 msgid "override date for commit" msgstr "sobrescribe la fecha del commit" -#: builtin/commit.c:1507 builtin/commit.c:1508 builtin/commit.c:1509 -#: builtin/commit.c:1510 parse-options.h:328 ref-filter.h:92 +#: builtin/commit.c:1505 builtin/commit.c:1506 builtin/commit.c:1507 +#: builtin/commit.c:1508 parse-options.h:328 ref-filter.h:90 msgid "commit" msgstr "confirmar" -#: builtin/commit.c:1507 +#: builtin/commit.c:1505 msgid "reuse and edit message from specified commit" msgstr "reusar y editar el mensaje de un commit especifico" -#: builtin/commit.c:1508 +#: builtin/commit.c:1506 msgid "reuse message from specified commit" msgstr "reusar el mensaje de un commit especifico" -#: builtin/commit.c:1509 +#: builtin/commit.c:1507 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "usar mensaje de formato autosquash para arreglar el commit especificado" -#: builtin/commit.c:1510 +#: builtin/commit.c:1508 msgid "use autosquash formatted message to squash specified commit" msgstr "" "usar el mensaje de formato autosquash para realizar squash al commit " "especificado" -#: builtin/commit.c:1511 +#: builtin/commit.c:1509 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "el autor del commit soy yo ahora (usado con -C/-c/--amend)" -#: builtin/commit.c:1512 builtin/log.c:1655 builtin/merge.c:293 +#: builtin/commit.c:1510 builtin/log.c:1743 builtin/merge.c:302 #: builtin/pull.c:145 builtin/revert.c:110 -msgid "add Signed-off-by:" -msgstr "agregar Signed-off-by: (firmado por)" +msgid "add a Signed-off-by trailer" +msgstr "agregar un firmado por al final" -#: builtin/commit.c:1513 +#: builtin/commit.c:1511 msgid "use specified template file" msgstr "usar archivo de template especificado" -#: builtin/commit.c:1514 +#: builtin/commit.c:1512 msgid "force edit of commit" msgstr "forzar la edición del commit" -#: builtin/commit.c:1516 +#: builtin/commit.c:1514 msgid "include status in commit message template" msgstr "incluir status en el template del mensaje de commit" -#: builtin/commit.c:1521 +#: builtin/commit.c:1519 msgid "Commit contents options" msgstr "Opciones para el contenido del commit" -#: builtin/commit.c:1522 +#: builtin/commit.c:1520 msgid "commit all changed files" msgstr "confirmar todos los archivos cambiados" -#: builtin/commit.c:1523 +#: builtin/commit.c:1521 msgid "add specified files to index for commit" msgstr "agregar archivos específicos al índice para confirmar" -#: builtin/commit.c:1524 +#: builtin/commit.c:1522 msgid "interactively add files" msgstr "agregar archivos interactivamente" -#: builtin/commit.c:1525 +#: builtin/commit.c:1523 msgid "interactively add changes" msgstr "agregar cambios interactivamente" -#: builtin/commit.c:1526 +#: builtin/commit.c:1524 msgid "commit only specified files" msgstr "sólo confirmar archivos específicos" -#: builtin/commit.c:1527 +#: builtin/commit.c:1525 msgid "bypass pre-commit and commit-msg hooks" msgstr "evitar los capturadores (hooks) de pre-commit y commit-msg" -#: builtin/commit.c:1528 +#: builtin/commit.c:1526 msgid "show what would be committed" msgstr "mostrar lo que sería incluido en el commit" -#: builtin/commit.c:1541 +#: builtin/commit.c:1539 msgid "amend previous commit" msgstr "enmendar commit previo" -#: builtin/commit.c:1542 +#: builtin/commit.c:1540 msgid "bypass post-rewrite hook" msgstr "gancho bypass post reescritura" -#: builtin/commit.c:1549 +#: builtin/commit.c:1547 msgid "ok to record an empty change" msgstr "ok al grabar un cambio vacío" -#: builtin/commit.c:1551 +#: builtin/commit.c:1549 msgid "ok to record a change with an empty message" msgstr "ok al grabar un cambio con un mensaje vacío" -#: builtin/commit.c:1624 +#: builtin/commit.c:1622 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Archivo MERGE_HEAD (%s) corrupto" -#: builtin/commit.c:1631 +#: builtin/commit.c:1629 msgid "could not read MERGE_MODE" msgstr "no se pudo leer MERGE_MODE" -#: builtin/commit.c:1652 +#: builtin/commit.c:1650 #, c-format msgid "could not read commit message: %s" msgstr "no se pudo leer el mensaje de commit: %s" -#: builtin/commit.c:1659 +#: builtin/commit.c:1657 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Abortando commit debido que el mensaje está en blanco.\n" -#: builtin/commit.c:1664 +#: builtin/commit.c:1662 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "Abortando commit; no se ha editado el mensaje\n" -#: builtin/commit.c:1698 +#: builtin/commit.c:1696 msgid "" "repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -13238,212 +13793,220 @@ msgstr "" msgid "git config [<options>]" msgstr "git config [<opciones>]" -#: builtin/config.c:104 builtin/env--helper.c:23 +#: builtin/config.c:109 builtin/env--helper.c:27 #, c-format msgid "unrecognized --type argument, %s" msgstr "argumento --type no reconocido, %s" -#: builtin/config.c:116 +#: builtin/config.c:121 msgid "only one type at a time" msgstr "solo un tipo a la vez" -#: builtin/config.c:125 +#: builtin/config.c:130 msgid "Config file location" msgstr "Ubicación del archivo configuración" -#: builtin/config.c:126 +#: builtin/config.c:131 msgid "use global config file" msgstr "usar archivo de config global" -#: builtin/config.c:127 +#: builtin/config.c:132 msgid "use system config file" msgstr "usar archivo de config del sistema" -#: builtin/config.c:128 +#: builtin/config.c:133 msgid "use repository config file" msgstr "usar archivo de config del repositorio" -#: builtin/config.c:129 +#: builtin/config.c:134 msgid "use per-worktree config file" msgstr "usar un archivo de config por árbol de trabajo" -#: builtin/config.c:130 +#: builtin/config.c:135 msgid "use given config file" msgstr "usar archivo config especificado" -#: builtin/config.c:131 +#: builtin/config.c:136 msgid "blob-id" msgstr "blob-id" -#: builtin/config.c:131 +#: builtin/config.c:136 msgid "read config from given blob object" msgstr "leer config del objeto blob suministrado" -#: builtin/config.c:132 +#: builtin/config.c:137 msgid "Action" msgstr "Acción" -#: builtin/config.c:133 -msgid "get value: name [value-regex]" -msgstr "obtener valor: nombre [valor-regex]" +#: builtin/config.c:138 +msgid "get value: name [value-pattern]" +msgstr "obtener valor: nombre [patrón de valor]" -#: builtin/config.c:134 -msgid "get all values: key [value-regex]" -msgstr "obtener todos los valores: llave [valores-regex]" +#: builtin/config.c:139 +msgid "get all values: key [value-pattern]" +msgstr "obtener todos los valores: clave [patrón de valor]" -#: builtin/config.c:135 -msgid "get values for regexp: name-regex [value-regex]" -msgstr "obtener valores para una regexp: nombre-regex [valor-regex]" +#: builtin/config.c:140 +msgid "get values for regexp: name-regex [value-pattern]" +msgstr "obtener valores para regexp: name-regex [value-pattern]" -#: builtin/config.c:136 +#: builtin/config.c:141 msgid "get value specific for the URL: section[.var] URL" msgstr "obtener valor especifico para el URL: sección[.var] URL" -#: builtin/config.c:137 -msgid "replace all matching variables: name value [value_regex]" +#: builtin/config.c:142 +msgid "replace all matching variables: name value [value-pattern]" msgstr "" -"remplazar todas las variables que concuerden: nombre valor [valor_regex]" +"reemplazar todas las variables coincidentes: nombre valor [valor-patrón]" -#: builtin/config.c:138 +#: builtin/config.c:143 msgid "add a new variable: name value" msgstr "agregar nueva variable: nombre valor" -#: builtin/config.c:139 -msgid "remove a variable: name [value-regex]" -msgstr "borrar una variable. nombre [valor-regex]" +#: builtin/config.c:144 +msgid "remove a variable: name [value-pattern]" +msgstr "eliminar una variable: nombre [patrón de valor]" -#: builtin/config.c:140 -msgid "remove all matches: name [value-regex]" -msgstr "borrar todas las concurrencias: nombre [valor-regex]" +#: builtin/config.c:145 +msgid "remove all matches: name [value-pattern]" +msgstr "eliminar todas las coincidencias: nombre [patrón de valor]" -#: builtin/config.c:141 +#: builtin/config.c:146 msgid "rename section: old-name new-name" msgstr "renombrar sección: nombre-viejo nombre-nuevo" -#: builtin/config.c:142 +#: builtin/config.c:147 msgid "remove a section: name" msgstr "borrar una sección: nombre" -#: builtin/config.c:143 +#: builtin/config.c:148 msgid "list all" msgstr "listar todo" -#: builtin/config.c:144 +#: builtin/config.c:149 +msgid "use string equality when comparing values to 'value-pattern'" +msgstr "use la igualdad de cadenas al comparar valores con 'patrón de valor'" + +#: builtin/config.c:150 msgid "open an editor" msgstr "abrir el editor" -#: builtin/config.c:145 +#: builtin/config.c:151 msgid "find the color configured: slot [default]" msgstr "encontrar el color configurado: slot [default]" -#: builtin/config.c:146 +#: builtin/config.c:152 msgid "find the color setting: slot [stdout-is-tty]" msgstr "encontrar las opciones del color: slot [stdout-es-tty]" -#: builtin/config.c:147 +#: builtin/config.c:153 msgid "Type" msgstr "Tipo" -#: builtin/config.c:148 builtin/env--helper.c:38 +#: builtin/config.c:154 builtin/env--helper.c:43 msgid "value is given this type" msgstr "al valor se ha dado este tipo" -#: builtin/config.c:149 +#: builtin/config.c:155 msgid "value is \"true\" or \"false\"" msgstr "valor es \"true\" o \"false\"" -#: builtin/config.c:150 +#: builtin/config.c:156 msgid "value is decimal number" msgstr "valor es un numero decimal" -#: builtin/config.c:151 +#: builtin/config.c:157 msgid "value is --bool or --int" msgstr "valor es --bool o --int" -#: builtin/config.c:152 +#: builtin/config.c:158 +msgid "value is --bool or string" +msgstr "el valor es --bool o cadena" + +#: builtin/config.c:159 msgid "value is a path (file or directory name)" msgstr "valor es una ruta (archivo o nombre de directorio)" -#: builtin/config.c:153 +#: builtin/config.c:160 msgid "value is an expiry date" msgstr "valor es una fecha de expiración" -#: builtin/config.c:154 +#: builtin/config.c:161 msgid "Other" msgstr "Otro" -#: builtin/config.c:155 +#: builtin/config.c:162 msgid "terminate values with NUL byte" msgstr "terminar valores con un byte NULL" -#: builtin/config.c:156 +#: builtin/config.c:163 msgid "show variable names only" msgstr "mostrar solo nombres de variables" -#: builtin/config.c:157 +#: builtin/config.c:164 msgid "respect include directives on lookup" msgstr "respetar directivas include en la búsqueda" -#: builtin/config.c:158 +#: builtin/config.c:165 msgid "show origin of config (file, standard input, blob, command line)" msgstr "mostrar el origen de configuración (archivo, stdin, blob, comando)" -#: builtin/config.c:159 +#: builtin/config.c:166 msgid "show scope of config (worktree, local, global, system, command)" msgstr "" "mostrar el scope de la configuración (worktree, local, global, system, " "command)" -#: builtin/config.c:160 builtin/env--helper.c:40 +#: builtin/config.c:167 builtin/env--helper.c:45 msgid "value" msgstr "valor" -#: builtin/config.c:160 +#: builtin/config.c:167 msgid "with --get, use default value when missing entry" msgstr "con --get, usa el valor por defecto cuando falta una entrada" -#: builtin/config.c:174 +#: builtin/config.c:181 #, c-format msgid "wrong number of arguments, should be %d" msgstr "número de argumentos inválidos, deberían ser %d" -#: builtin/config.c:176 +#: builtin/config.c:183 #, c-format msgid "wrong number of arguments, should be from %d to %d" msgstr "número de argumentos inválidos, deberían ser de %d a %d" -#: builtin/config.c:324 +#: builtin/config.c:339 #, c-format msgid "invalid key pattern: %s" msgstr "patrón de llave inválido: %s" -#: builtin/config.c:360 +#: builtin/config.c:377 #, c-format msgid "failed to format default config value: %s" msgstr "falló al formatear el valor por defecto de configuración: %s" -#: builtin/config.c:417 +#: builtin/config.c:441 #, c-format msgid "cannot parse color '%s'" msgstr "no se analizar color '%s'" -#: builtin/config.c:459 +#: builtin/config.c:483 msgid "unable to parse default color value" msgstr "no es posible analizar el valor por defecto de color" -#: builtin/config.c:512 builtin/config.c:768 +#: builtin/config.c:536 builtin/config.c:833 msgid "not in a git directory" msgstr "no en un directorio git" -#: builtin/config.c:515 +#: builtin/config.c:539 msgid "writing to stdin is not supported" msgstr "escribir en stdin no está soportado" -#: builtin/config.c:518 +#: builtin/config.c:542 msgid "writing config blobs is not supported" msgstr "escribir blobs de configuración no está soportado" -#: builtin/config.c:603 +#: builtin/config.c:627 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -13458,23 +14021,27 @@ msgstr "" "#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c:627 +#: builtin/config.c:652 msgid "only one config file at a time" msgstr "solo un archivo de configuración a la vez" -#: builtin/config.c:632 +#: builtin/config.c:658 msgid "--local can only be used inside a git repository" msgstr "--local solo puedo ser usado dentro de un repositorio" -#: builtin/config.c:635 +#: builtin/config.c:660 msgid "--blob can only be used inside a git repository" msgstr "--blob solo puede ser usado dentro de un repositorio" -#: builtin/config.c:655 +#: builtin/config.c:662 +msgid "--worktree can only be used inside a git repository" +msgstr "--worktree solo se puede usar dentro de un repositorio de git" + +#: builtin/config.c:684 msgid "$HOME not set" msgstr "$HOME no está configurado" -#: builtin/config.c:679 +#: builtin/config.c:708 msgid "" "--worktree cannot be used with multiple working trees unless the config\n" "extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n" @@ -13486,52 +14053,56 @@ msgstr "" "\"\n" "en \"git help worktree\" para más detalles" -#: builtin/config.c:714 +#: builtin/config.c:743 msgid "--get-color and variable type are incoherent" msgstr "--get-color y tipo de variable incoherente" -#: builtin/config.c:719 +#: builtin/config.c:748 msgid "only one action at a time" msgstr "solo una acción a la vez" -#: builtin/config.c:732 +#: builtin/config.c:761 msgid "--name-only is only applicable to --list or --get-regexp" msgstr "--name-only solo es aplicable para --list o --get-regexp" -#: builtin/config.c:738 +#: builtin/config.c:767 msgid "" "--show-origin is only applicable to --get, --get-all, --get-regexp, and --" "list" msgstr "" "--show-origin solo es aplicable para --get, --get-all, --get-regexp, y --list" -#: builtin/config.c:744 +#: builtin/config.c:773 msgid "--default is only applicable to --get" msgstr "--default solo es aplicable para --get" -#: builtin/config.c:757 +#: builtin/config.c:806 +msgid "--fixed-value only applies with 'value-pattern'" +msgstr "--fixed-value solo se aplica con 'value-pattern'" + +#: builtin/config.c:822 #, c-format msgid "unable to read config file '%s'" msgstr "no se puede leer el archivo de configuración '%s'" -#: builtin/config.c:760 +#: builtin/config.c:825 msgid "error processing config file(s)" msgstr "error al procesar archivo(s) de configuración" -#: builtin/config.c:770 +#: builtin/config.c:835 msgid "editing stdin is not supported" msgstr "editar stdin no está soportado" -#: builtin/config.c:772 +#: builtin/config.c:837 msgid "editing blobs is not supported" msgstr "editar blobs no está soportado" -#: builtin/config.c:786 +#: builtin/config.c:851 #, c-format msgid "cannot create configuration file %s" msgstr "no se puede crear el archivo de configuración %s" -#: builtin/config.c:799 +#: builtin/config.c:864 #, c-format msgid "" "cannot overwrite multiple values with a single value\n" @@ -13540,7 +14111,7 @@ msgstr "" "no se puede sobrescribir múltiples valores con un único valor\n" "\tUse una regexp, --add o --replace-all para cambiar %s." -#: builtin/config.c:873 builtin/config.c:884 +#: builtin/config.c:943 builtin/config.c:954 #, c-format msgid "no such section: %s" msgstr "no existe la sección: %s" @@ -13553,6 +14124,38 @@ msgstr "git count-objects [-v] [-H | --human-readable]" msgid "print sizes in human readable format" msgstr "mostrar tamaños en formato legible para humano" +#: builtin/credential-cache--daemon.c:226 +#, c-format +msgid "" +"The permissions on your socket directory are too loose; other\n" +"users may be able to read your cached credentials. Consider running:\n" +"\n" +"\tchmod 0700 %s" +msgstr "" +"Los permisos en tu directorio de socket son demasiado flojos; otros\n" +"usuarios pueden leer sus credenciales almacenadas en caché. Considera " +"ejecutar:\n" +"\n" +"\tchmod 0700 %s" + +#: builtin/credential-cache--daemon.c:275 +msgid "print debugging messages to stderr" +msgstr "mostrar mensajes de debug en stderr" + +#: builtin/credential-cache--daemon.c:315 +msgid "credential-cache--daemon unavailable; no unix socket support" +msgstr "credential-cache--daemon no disponible; sin soporte de socket Unix" + +#: builtin/credential-cache.c:154 +msgid "credential-cache unavailable; no unix socket support" +msgstr "credential-cache no disponible; sin soporte de socket Unix" + +#: builtin/credential-store.c:66 +#, c-format +msgid "unable to get credential storage lock in %d ms" +msgstr "" +"no se puede obtener el bloqueo de almacenamiento de credenciales en %d ms" + #: builtin/describe.c:26 msgid "git describe [<options>] [<commit-ish>...]" msgstr "git describe [<opciones>] [<commit-ish>...]" @@ -13717,41 +14320,49 @@ msgstr "--dirty es incompatible con commit-ismos" msgid "--broken is incompatible with commit-ishes" msgstr "--broken es incompatible con commit-ismos" -#: builtin/diff.c:91 +#: builtin/diff-tree.c:155 +msgid "--stdin and --merge-base are mutually exclusive" +msgstr "--stdin and --merge-baseson mutuamente exclusivas" + +#: builtin/diff-tree.c:157 +msgid "--merge-base only works with two commits" +msgstr "--merge-base solo funciona con dos commits" + +#: builtin/diff.c:92 #, c-format msgid "'%s': not a regular file or symlink" msgstr "'%s': no es un archivo regular o un enlace simbólico" -#: builtin/diff.c:242 +#: builtin/diff.c:259 #, c-format msgid "invalid option: %s" msgstr "opción inválida: %s" -#: builtin/diff.c:359 +#: builtin/diff.c:376 #, c-format msgid "%s...%s: no merge base" msgstr "%s...%s: se neceista una base de fusión" -#: builtin/diff.c:469 +#: builtin/diff.c:486 msgid "Not a git repository" msgstr "No es un repositorio git" -#: builtin/diff.c:514 +#: builtin/diff.c:532 builtin/grep.c:682 #, c-format msgid "invalid object '%s' given." msgstr "objeto '%s' entregado no es válido." -#: builtin/diff.c:525 +#: builtin/diff.c:543 #, c-format msgid "more than two blobs given: '%s'" msgstr "más de dos blobs entregados: '%s'" -#: builtin/diff.c:530 +#: builtin/diff.c:548 #, c-format msgid "unhandled object '%s' given." msgstr "objeto no manejado '%s' entregado." -#: builtin/diff.c:564 +#: builtin/diff.c:582 #, c-format msgid "%s...%s: multiple merge bases, using %s" msgstr "%s...%s: múltiples bases de fusión, usando %s" @@ -13780,7 +14391,7 @@ msgstr "no se pudo leer el archivo symlink %s" msgid "could not read object %s for symlink %s" msgstr "no se pudo leer el objeto %s para el symlink %s" -#: builtin/difftool.c:413 +#: builtin/difftool.c:412 msgid "" "combined diff formats('-c' and '--cc') are not supported in\n" "directory diff mode('-d' and '--dir-diff')." @@ -13788,54 +14399,54 @@ msgstr "" "formatos combinados de diff ('-c' y '--cc') no soportados en\n" "modo diff para directorio('-d' y '--dir-diff')." -#: builtin/difftool.c:634 +#: builtin/difftool.c:633 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "ambos archivos modificados: '%s' y '%s'." -#: builtin/difftool.c:636 +#: builtin/difftool.c:635 msgid "working tree file has been left." msgstr "archivo del árbol de trabajo ha sido dejado." -#: builtin/difftool.c:647 +#: builtin/difftool.c:646 #, c-format msgid "temporary files exist in '%s'." msgstr "archivo temporal existe en '%s'." -#: builtin/difftool.c:648 +#: builtin/difftool.c:647 msgid "you may want to cleanup or recover these." msgstr "tal vez desees limpiar o recuperar estos." -#: builtin/difftool.c:697 +#: builtin/difftool.c:696 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "use `diff.guitool` en lugar de `diff.tool`" -#: builtin/difftool.c:699 +#: builtin/difftool.c:698 msgid "perform a full-directory diff" msgstr "realizar un diff de todo el directorio" -#: builtin/difftool.c:701 +#: builtin/difftool.c:700 msgid "do not prompt before launching a diff tool" msgstr "no mostrar antes de lanzar una herramienta de diff" -#: builtin/difftool.c:706 +#: builtin/difftool.c:705 msgid "use symlinks in dir-diff mode" msgstr "usar enlaces simbólicos en modo dir-diff" -#: builtin/difftool.c:707 +#: builtin/difftool.c:706 msgid "tool" msgstr "herramienta" -#: builtin/difftool.c:708 +#: builtin/difftool.c:707 msgid "use the specified diff tool" msgstr "usar la herramienta de diff especificada" -#: builtin/difftool.c:710 +#: builtin/difftool.c:709 msgid "print a list of diff tools that may be used with `--tool`" msgstr "" "mostrar una lista de herramientas de diff que pueden ser usadas con `--tool`" -#: builtin/difftool.c:713 +#: builtin/difftool.c:712 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " "code" @@ -13843,31 +14454,31 @@ msgstr "" "hacer que 'git-difftool' salga cuando una herramienta de diff retorne un " "código de salida distinto de cero" -#: builtin/difftool.c:716 +#: builtin/difftool.c:715 msgid "specify a custom command for viewing diffs" msgstr "especificar un comando personalizado para ver diffs" -#: builtin/difftool.c:717 +#: builtin/difftool.c:716 msgid "passed to `diff`" msgstr "pasado a `diff`" -#: builtin/difftool.c:732 +#: builtin/difftool.c:731 msgid "difftool requires worktree or --no-index" msgstr "difftool requiere un árbol de trabajo o --no-index" -#: builtin/difftool.c:739 +#: builtin/difftool.c:738 msgid "--dir-diff is incompatible with --no-index" msgstr "--dirty-diff es incompatible con --no-index" -#: builtin/difftool.c:742 +#: builtin/difftool.c:741 msgid "--gui, --tool and --extcmd are mutually exclusive" msgstr "--gui, --tool y --extcmd son mutuamente exclusivas" -#: builtin/difftool.c:750 +#: builtin/difftool.c:749 msgid "no <tool> given for --tool=<tool>" msgstr "no se ha proporcionado <herramienta> para --tool=<herramienta>" -#: builtin/difftool.c:757 +#: builtin/difftool.c:756 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "no se ha entregado <comando> para --extcmd=<comando>" @@ -13875,24 +14486,24 @@ msgstr "no se ha entregado <comando> para --extcmd=<comando>" msgid "git env--helper --type=[bool|ulong] <options> <env-var>" msgstr "git env--helper --type=[bool|ulong] <opciones> <env-var>" -#: builtin/env--helper.c:37 builtin/hash-object.c:98 +#: builtin/env--helper.c:42 builtin/hash-object.c:98 msgid "type" msgstr "tipo" -#: builtin/env--helper.c:41 +#: builtin/env--helper.c:46 msgid "default for git_env_*(...) to fall back on" msgstr "default para git_env_*(...) es hacer fallback en" -#: builtin/env--helper.c:43 +#: builtin/env--helper.c:48 msgid "be quiet only use git_env_*() value as exit code" msgstr "ser silencioso solo usar valor git_env_*() como código de salida" -#: builtin/env--helper.c:62 +#: builtin/env--helper.c:67 #, c-format msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`" msgstr "opción `--default' espera un valor boolean con `--type=bool`, no `%s`" -#: builtin/env--helper.c:77 +#: builtin/env--helper.c:82 #, c-format msgid "" "option `--default' expects an unsigned long value with `--type=ulong`, not `" @@ -13910,96 +14521,127 @@ msgstr "" "Error: No se puede exportar los tags anidados a menos que --mark-tags sea " "especificado." -#: builtin/fast-export.c:1178 +#: builtin/fast-export.c:1177 msgid "--anonymize-map token cannot be empty" msgstr "token --anonymize-map no puede estar vacío" -#: builtin/fast-export.c:1198 +#: builtin/fast-export.c:1197 msgid "show progress after <n> objects" msgstr "mostrar progreso después de <n> objetos" -#: builtin/fast-export.c:1200 +#: builtin/fast-export.c:1199 msgid "select handling of signed tags" msgstr "seleccionar el manejo de tags firmados" -#: builtin/fast-export.c:1203 +#: builtin/fast-export.c:1202 msgid "select handling of tags that tag filtered objects" msgstr "seleccionar el manejo de tags que son tags de objetos filtrados" -#: builtin/fast-export.c:1206 +#: builtin/fast-export.c:1205 msgid "select handling of commit messages in an alternate encoding" msgstr "seleccionar el manejo de mensajes de commit en un encoding diferente" -#: builtin/fast-export.c:1209 -msgid "Dump marks to this file" -msgstr "Volcar marcas a este archivo" +#: builtin/fast-export.c:1208 +msgid "dump marks to this file" +msgstr "volcar marcas a este archivo" -#: builtin/fast-export.c:1211 -msgid "Import marks from this file" -msgstr "Importar marcas de este archivo" +#: builtin/fast-export.c:1210 +msgid "import marks from this file" +msgstr "importar marcas de este archivo" -#: builtin/fast-export.c:1215 -msgid "Import marks from this file if it exists" -msgstr "Importar marcas de este archivo si existe" +#: builtin/fast-export.c:1214 +msgid "import marks from this file if it exists" +msgstr "importar marcas de este archivo si existe" -#: builtin/fast-export.c:1217 -msgid "Fake a tagger when tags lack one" -msgstr "Falsificar un tagger cuando les falta uno" +#: builtin/fast-export.c:1216 +msgid "fake a tagger when tags lack one" +msgstr "falsificar un tagger cuando les falta uno" -#: builtin/fast-export.c:1219 -msgid "Output full tree for each commit" -msgstr "Mostrar todo el árbol para cada commit" +#: builtin/fast-export.c:1218 +msgid "output full tree for each commit" +msgstr "mostrar todo el árbol para cada commit" -#: builtin/fast-export.c:1221 -msgid "Use the done feature to terminate the stream" -msgstr "Use el feature done para terminar el stream" +#: builtin/fast-export.c:1220 +msgid "use the done feature to terminate the stream" +msgstr "use el feature done para terminar el stream" -#: builtin/fast-export.c:1222 -msgid "Skip output of blob data" -msgstr "Saltar el output de data blob" +#: builtin/fast-export.c:1221 +msgid "skip output of blob data" +msgstr "saltar el output de data blob" -#: builtin/fast-export.c:1223 builtin/log.c:1724 +#: builtin/fast-export.c:1222 builtin/log.c:1815 msgid "refspec" msgstr "refspec" -#: builtin/fast-export.c:1224 -msgid "Apply refspec to exported refs" -msgstr "Aplicar refspec para los refs exportados" +#: builtin/fast-export.c:1223 +msgid "apply refspec to exported refs" +msgstr "aplicar refspec para los refs exportados" -#: builtin/fast-export.c:1225 +#: builtin/fast-export.c:1224 msgid "anonymize output" msgstr "anonimizar la salida" -#: builtin/fast-export.c:1226 +#: builtin/fast-export.c:1225 msgid "from:to" msgstr "de:para" -#: builtin/fast-export.c:1227 +#: builtin/fast-export.c:1226 msgid "convert <from> to <to> in anonymized output" msgstr "convertir <de> a <para> en output anonimizado" -#: builtin/fast-export.c:1230 -msgid "Reference parents which are not in fast-export stream by object id" +#: builtin/fast-export.c:1229 +msgid "reference parents which are not in fast-export stream by object id" msgstr "" -"Padres de la referencia que no estan en fast-export stream por id de objeto" +"padres de la referencia que no estan en fast-export stream por id de objeto" -#: builtin/fast-export.c:1232 -msgid "Show original object ids of blobs/commits" -msgstr "Mostrar ids de objetos originales para blobs/commits" +#: builtin/fast-export.c:1231 +msgid "show original object ids of blobs/commits" +msgstr "mostrar ids de objetos originales para blobs/commits" -#: builtin/fast-export.c:1234 -msgid "Label tags with mark ids" -msgstr "Marcar tags con ids de mark" +#: builtin/fast-export.c:1233 +msgid "label tags with mark ids" +msgstr "marcar tags con ids de mark" -#: builtin/fast-export.c:1257 +#: builtin/fast-export.c:1256 msgid "--anonymize-map without --anonymize does not make sense" msgstr "--anonymize-map sin --anonymize no tiene sentido" -#: builtin/fast-export.c:1272 +#: builtin/fast-export.c:1271 msgid "Cannot pass both --import-marks and --import-marks-if-exists" msgstr "No se puede pasar ambos --import-marks y --import-marks-if-exists" -#: builtin/fetch-pack.c:245 +#: builtin/fast-import.c:3088 +#, c-format +msgid "Missing from marks for submodule '%s'" +msgstr "Faltan marcas from para el submódulo '%s'" + +#: builtin/fast-import.c:3090 +#, c-format +msgid "Missing to marks for submodule '%s'" +msgstr "Faltan marcas to para el submódulo '%s'" + +#: builtin/fast-import.c:3225 +#, c-format +msgid "Expected 'mark' command, got %s" +msgstr "Se esperaba comando 'mark', se obtuvo %s" + +#: builtin/fast-import.c:3230 +#, c-format +msgid "Expected 'to' command, got %s" +msgstr "Se esperaba comando 'to', se obtuvo %s" + +#: builtin/fast-import.c:3322 +msgid "Expected format name:filename for submodule rewrite option" +msgstr "" +"Formato esperado de nombre:nombre de archivo para la opción de sobreescribir " +"submódulo" + +#: builtin/fast-import.c:3377 +#, c-format +msgid "feature '%s' forbidden in input without --allow-unsafe-features" +msgstr "característica '%s' prohibida en input sin --allow-unsafe-features" + +#: builtin/fetch-pack.c:242 #, c-format msgid "Lockfile created but not reported: %s" msgstr "Lockfile creado pero no reportado: %s" @@ -14020,90 +14662,98 @@ msgstr "git fetch --multiple [<opciones>] [(<repositorio> | <grupo>)...]" msgid "git fetch --all [<options>]" msgstr "git fetch --all [<opciones>]" -#: builtin/fetch.c:117 +#: builtin/fetch.c:120 msgid "fetch.parallel cannot be negative" msgstr "fetch.parallel no puede ser negativo" -#: builtin/fetch.c:140 builtin/pull.c:185 +#: builtin/fetch.c:143 builtin/pull.c:185 msgid "fetch from all remotes" msgstr "extraer de todos los remotos" -#: builtin/fetch.c:142 builtin/pull.c:245 +#: builtin/fetch.c:145 builtin/pull.c:245 msgid "set upstream for git pull/fetch" msgstr "configurar upstream para git pulll/fetch" -#: builtin/fetch.c:144 builtin/pull.c:188 +#: builtin/fetch.c:147 builtin/pull.c:188 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "adjuntar a .git/FETCH_HEAD en lugar de sobrescribir" -#: builtin/fetch.c:146 builtin/pull.c:191 +#: builtin/fetch.c:149 +msgid "use atomic transaction to update references" +msgstr "usar transacción atómica para actualizar referencias" + +#: builtin/fetch.c:151 builtin/pull.c:191 msgid "path to upload pack on remote end" msgstr "ruta para cargar el paquete al final del remoto" -#: builtin/fetch.c:147 +#: builtin/fetch.c:152 msgid "force overwrite of local reference" msgstr "forzar sobrescritura de referencia local" -#: builtin/fetch.c:149 +#: builtin/fetch.c:154 msgid "fetch from multiple remotes" msgstr "extraer de múltiples remotos" -#: builtin/fetch.c:151 builtin/pull.c:195 +#: builtin/fetch.c:156 builtin/pull.c:195 msgid "fetch all tags and associated objects" msgstr "extraer todos los tags y objetos asociados" -#: builtin/fetch.c:153 +#: builtin/fetch.c:158 msgid "do not fetch all tags (--no-tags)" msgstr "no extraer todos los tags (--no-tags)" -#: builtin/fetch.c:155 +#: builtin/fetch.c:160 msgid "number of submodules fetched in parallel" msgstr "número de submódulos extraídos en paralelo" -#: builtin/fetch.c:157 builtin/pull.c:198 +#: builtin/fetch.c:162 builtin/pull.c:198 msgid "prune remote-tracking branches no longer on remote" msgstr "limpiar ramas remotas rastreadas que ya no están en el remoto" -#: builtin/fetch.c:159 +#: builtin/fetch.c:164 msgid "prune local tags no longer on remote and clobber changed tags" msgstr "" "limpiar tags locales que no se encuentran en el remoto y eliminar tags " "cambiados" -#: builtin/fetch.c:160 builtin/fetch.c:183 builtin/pull.c:122 +#: builtin/fetch.c:165 builtin/fetch.c:190 builtin/pull.c:122 msgid "on-demand" msgstr "en demanda" -#: builtin/fetch.c:161 +#: builtin/fetch.c:166 msgid "control recursive fetching of submodules" msgstr "controlar extracción recursiva de submódulos" -#: builtin/fetch.c:165 builtin/pull.c:206 +#: builtin/fetch.c:171 +msgid "write fetched references to the FETCH_HEAD file" +msgstr "escribir referencias obtenidas en el archivo FETCH_HEAD" + +#: builtin/fetch.c:172 builtin/pull.c:206 msgid "keep downloaded pack" msgstr "mantener el paquete descargado" -#: builtin/fetch.c:167 +#: builtin/fetch.c:174 msgid "allow updating of HEAD ref" msgstr "permitir actualizar la ref HEAD" -#: builtin/fetch.c:170 builtin/fetch.c:176 builtin/pull.c:209 +#: builtin/fetch.c:177 builtin/fetch.c:183 builtin/pull.c:209 #: builtin/pull.c:218 msgid "deepen history of shallow clone" msgstr "historia profunda de un clon superficial" -#: builtin/fetch.c:172 builtin/pull.c:212 +#: builtin/fetch.c:179 builtin/pull.c:212 msgid "deepen history of shallow repository based on time" msgstr "historia profunda de un repositorio superficial basado en tiempo" -#: builtin/fetch.c:178 builtin/pull.c:221 +#: builtin/fetch.c:185 builtin/pull.c:221 msgid "convert to a complete repository" msgstr "convertir a un repositorio completo" -#: builtin/fetch.c:181 +#: builtin/fetch.c:188 msgid "prepend this to submodule path output" msgstr "anteponer esto a salida de la ruta del submódulo" -#: builtin/fetch.c:184 +#: builtin/fetch.c:191 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" @@ -14111,94 +14761,98 @@ msgstr "" "default para extracción recursiva de submódulos (menor prioridad que " "archivos de configuración)" -#: builtin/fetch.c:188 builtin/pull.c:224 +#: builtin/fetch.c:195 builtin/pull.c:224 msgid "accept refs that update .git/shallow" msgstr "aceptar refs que actualicen .git/shallow" -#: builtin/fetch.c:189 builtin/pull.c:226 +#: builtin/fetch.c:196 builtin/pull.c:226 msgid "refmap" msgstr "refmap" -#: builtin/fetch.c:190 builtin/pull.c:227 +#: builtin/fetch.c:197 builtin/pull.c:227 msgid "specify fetch refmap" msgstr "especificar extracción de refmap" -#: builtin/fetch.c:197 builtin/pull.c:240 +#: builtin/fetch.c:204 builtin/pull.c:240 msgid "report that we have only objects reachable from this object" msgstr "reporta que solo tenemos objetos alcanzables de este objeto" -#: builtin/fetch.c:200 -msgid "run 'gc --auto' after fetching" -msgstr "ejecutar 'gc --auto' tras el fetch" +#: builtin/fetch.c:207 builtin/fetch.c:209 +msgid "run 'maintenance --auto' after fetching" +msgstr "ejecute 'maintenance --auto' después de buscar" -#: builtin/fetch.c:202 builtin/pull.c:243 +#: builtin/fetch.c:211 builtin/pull.c:243 msgid "check for forced-updates on all updated branches" msgstr "verificar updates forzados en todos los branch actualizados" -#: builtin/fetch.c:204 +#: builtin/fetch.c:213 msgid "write the commit-graph after fetching" msgstr "escribir commit-graph luego del fetch" -#: builtin/fetch.c:514 +#: builtin/fetch.c:215 +msgid "accept refspecs from stdin" +msgstr "aceptar refspecs de stdin" + +#: builtin/fetch.c:526 msgid "Couldn't find remote ref HEAD" msgstr "No se puedo encontrar ref remota HEAD" -#: builtin/fetch.c:654 +#: builtin/fetch.c:697 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "la configuración fetch.output contiene el valor inválido %s" -#: builtin/fetch.c:752 +#: builtin/fetch.c:796 #, c-format msgid "object %s not found" msgstr "objeto %s no encontrado" -#: builtin/fetch.c:756 +#: builtin/fetch.c:800 msgid "[up to date]" msgstr "[actualizado]" -#: builtin/fetch.c:769 builtin/fetch.c:785 builtin/fetch.c:857 +#: builtin/fetch.c:813 builtin/fetch.c:829 builtin/fetch.c:901 msgid "[rejected]" msgstr "[rechazado]" -#: builtin/fetch.c:770 +#: builtin/fetch.c:814 msgid "can't fetch in current branch" msgstr "no se puede traer en la rama actual" -#: builtin/fetch.c:780 +#: builtin/fetch.c:824 msgid "[tag update]" msgstr "[actualización de tag]" -#: builtin/fetch.c:781 builtin/fetch.c:818 builtin/fetch.c:840 -#: builtin/fetch.c:852 +#: builtin/fetch.c:825 builtin/fetch.c:862 builtin/fetch.c:884 +#: builtin/fetch.c:896 msgid "unable to update local ref" msgstr "no se posible actualizar el ref local" -#: builtin/fetch.c:785 +#: builtin/fetch.c:829 msgid "would clobber existing tag" msgstr "podría golpear tag existente" -#: builtin/fetch.c:807 +#: builtin/fetch.c:851 msgid "[new tag]" msgstr "[nuevo tag]" -#: builtin/fetch.c:810 +#: builtin/fetch.c:854 msgid "[new branch]" msgstr "[nueva rama]" -#: builtin/fetch.c:813 +#: builtin/fetch.c:857 msgid "[new ref]" msgstr "[nueva referencia]" -#: builtin/fetch.c:852 +#: builtin/fetch.c:896 msgid "forced update" msgstr "actualización forzada" -#: builtin/fetch.c:857 +#: builtin/fetch.c:901 msgid "non-fast-forward" msgstr "avance lento" -#: builtin/fetch.c:878 +#: builtin/fetch.c:1005 msgid "" "Fetch normally indicates which branches had a forced update,\n" "but that check has been disabled. To re-enable, use '--show-forced-updates'\n" @@ -14209,7 +14863,7 @@ msgstr "" "show-forced-updates'\n" "o ejecute 'git config fetch.showForcedUpdates true'." -#: builtin/fetch.c:882 +#: builtin/fetch.c:1009 #, c-format msgid "" "It took %.2f seconds to check forced updates. You can use\n" @@ -14222,22 +14876,22 @@ msgstr "" "false'\n" "para evitar esta validación.\n" -#: builtin/fetch.c:914 +#: builtin/fetch.c:1041 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s no envió todos los objetos necesarios\n" -#: builtin/fetch.c:935 +#: builtin/fetch.c:1069 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "rechazado %s porque raíces superficiales no pueden ser actualizadas" -#: builtin/fetch.c:1020 builtin/fetch.c:1158 +#: builtin/fetch.c:1146 builtin/fetch.c:1297 #, c-format msgid "From %.*s\n" msgstr "Desde %.*s\n" -#: builtin/fetch.c:1031 +#: builtin/fetch.c:1168 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -14246,56 +14900,56 @@ msgstr "" "algunos refs locales no pudieron ser actualizados; intente ejecutar\n" " 'git remote prune %s' para eliminar cualquier rama vieja o conflictiva" -#: builtin/fetch.c:1128 +#: builtin/fetch.c:1267 #, c-format msgid " (%s will become dangling)" msgstr " (%s se pondrá colgado)" -#: builtin/fetch.c:1129 +#: builtin/fetch.c:1268 #, c-format msgid " (%s has become dangling)" msgstr " (%s se ha colgado)" -#: builtin/fetch.c:1161 +#: builtin/fetch.c:1300 msgid "[deleted]" msgstr "[eliminado]" -#: builtin/fetch.c:1162 builtin/remote.c:1112 +#: builtin/fetch.c:1301 builtin/remote.c:1118 msgid "(none)" msgstr "(nada)" -#: builtin/fetch.c:1185 +#: builtin/fetch.c:1324 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "Rehusando extraer en la rama actual %s de un repositorio no vacío" -#: builtin/fetch.c:1204 +#: builtin/fetch.c:1343 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "Opción \"%s\" valor \"%s\" no es válido para %s" -#: builtin/fetch.c:1207 +#: builtin/fetch.c:1346 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "Opción \"%s\" es ignorada por %s\n" -#: builtin/fetch.c:1415 +#: builtin/fetch.c:1558 msgid "multiple branches detected, incompatible with --set-upstream" msgstr "múltiples ramas detectadas, incompatible con --set-upstream" -#: builtin/fetch.c:1430 +#: builtin/fetch.c:1573 msgid "not setting upstream for a remote remote-tracking branch" msgstr "no configurar upstream para una rama de rastreo remoto" -#: builtin/fetch.c:1432 +#: builtin/fetch.c:1575 msgid "not setting upstream for a remote tag" msgstr "no configurar upstream para un tag remoto" -#: builtin/fetch.c:1434 +#: builtin/fetch.c:1577 msgid "unknown branch type" msgstr "tipo de branch desconocido" -#: builtin/fetch.c:1436 +#: builtin/fetch.c:1579 msgid "" "no source branch found.\n" "you need to specify exactly one branch with the --set-upstream option." @@ -14303,22 +14957,22 @@ msgstr "" "no se encontró rama fuente.\n" "tienes que especificar exactamente una rama con la opción --set-upstream." -#: builtin/fetch.c:1562 builtin/fetch.c:1625 +#: builtin/fetch.c:1708 builtin/fetch.c:1771 #, c-format msgid "Fetching %s\n" msgstr "Extrayendo %s\n" -#: builtin/fetch.c:1572 builtin/fetch.c:1627 builtin/remote.c:101 +#: builtin/fetch.c:1718 builtin/fetch.c:1773 builtin/remote.c:101 #, c-format msgid "Could not fetch %s" msgstr "No se pudo extraer %s" -#: builtin/fetch.c:1584 +#: builtin/fetch.c:1730 #, c-format msgid "could not fetch '%s' (exit code: %d)\n" msgstr "no se pudo hacer fetch a '%s' (código de salida: %d)\n" -#: builtin/fetch.c:1687 +#: builtin/fetch.c:1834 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -14326,44 +14980,44 @@ msgstr "" "No hay repositorio remoto especificado. Por favor, especifique un URL o un\n" "nombre remoto del cual las nuevas revisiones deben ser extraídas." -#: builtin/fetch.c:1724 +#: builtin/fetch.c:1870 msgid "You need to specify a tag name." msgstr "Tienes que especificar un nombre de tag." -#: builtin/fetch.c:1778 +#: builtin/fetch.c:1935 msgid "Negative depth in --deepen is not supported" msgstr "Profundidad negativa en --deepen no soportada" -#: builtin/fetch.c:1780 +#: builtin/fetch.c:1937 msgid "--deepen and --depth are mutually exclusive" msgstr "--deepen y --depth son mutuamente exclusivas" -#: builtin/fetch.c:1785 +#: builtin/fetch.c:1942 msgid "--depth and --unshallow cannot be used together" msgstr "--depth y --unshallow no pueden ser usadas juntas" -#: builtin/fetch.c:1787 +#: builtin/fetch.c:1944 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow no tiene sentido en un repositorio completo" -#: builtin/fetch.c:1800 +#: builtin/fetch.c:1961 msgid "fetch --all does not take a repository argument" msgstr "fetch --all no toma un argumento de repositorio" -#: builtin/fetch.c:1802 +#: builtin/fetch.c:1963 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all no tiene sentido con refspecs" -#: builtin/fetch.c:1811 +#: builtin/fetch.c:1972 #, c-format msgid "No such remote or remote group: %s" msgstr "No existe el remoto o grupo remoto: %s" -#: builtin/fetch.c:1818 +#: builtin/fetch.c:1979 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Extraer un grupo y especificar un refspecs no tiene sentido" -#: builtin/fetch.c:1836 +#: builtin/fetch.c:1997 msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" @@ -14371,6 +15025,14 @@ msgstr "" "--filter solo puede ser usado con el remoto configurado en extensions." "partialClone" +#: builtin/fetch.c:2001 +msgid "--atomic can only be used when fetching from one remote" +msgstr "--atomic solo se puede usar cuando se busca desde un control remoto" + +#: builtin/fetch.c:2005 +msgid "--stdin can only be used when fetching from one remote" +msgstr "--stdin solo se puede usar cuando se busca desde un control remoto" + #: builtin/fmt-merge-msg.c:7 msgid "" "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" @@ -14406,8 +15068,8 @@ msgid "git for-each-ref [--points-at <object>]" msgstr "git for-each-ref [--points-at <objeto>]" #: builtin/for-each-ref.c:12 -msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]" -msgstr "git for-each-ref [(--merged | --no-merged) [<commit>]]" +msgid "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]" +msgstr "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]" #: builtin/for-each-ref.c:13 msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]" @@ -14433,7 +15095,7 @@ msgstr "cite los marcadores de posición adecuadamente para Tcl" msgid "show only <n> matched refs" msgstr "mostrar solo <n> refs encontradas" -#: builtin/for-each-ref.c:39 builtin/tag.c:440 +#: builtin/for-each-ref.c:39 builtin/tag.c:472 msgid "respect format colors" msgstr "respetar el formato de colores" @@ -14457,32 +15119,48 @@ msgstr "mostrar solo refs que contienen el commit" msgid "print only refs which don't contain the commit" msgstr "mostrar solo refs que no contienen el commit" -#: builtin/fsck.c:69 builtin/fsck.c:148 builtin/fsck.c:149 +#: builtin/for-each-repo.c:9 +msgid "git for-each-repo --config=<config> <command-args>" +msgstr "git for-each-repo --config=<config> <argumetnos-de-comando>" + +#: builtin/for-each-repo.c:37 +msgid "config" +msgstr "config" + +#: builtin/for-each-repo.c:38 +msgid "config key storing a list of repository paths" +msgstr "clave de configuración que almacena una lista de rutas de repositorio" + +#: builtin/for-each-repo.c:46 +msgid "missing --config=<config>" +msgstr "falta --config=<config>" + +#: builtin/fsck.c:69 builtin/fsck.c:130 builtin/fsck.c:131 msgid "unknown" msgstr "desconocido" #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation> -#: builtin/fsck.c:101 builtin/fsck.c:121 +#: builtin/fsck.c:83 builtin/fsck.c:103 #, c-format msgid "error in %s %s: %s" msgstr "error en %s %s: %s" #. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation> -#: builtin/fsck.c:115 +#: builtin/fsck.c:97 #, c-format msgid "warning in %s %s: %s" msgstr "peligro en %s %s: %s" -#: builtin/fsck.c:144 builtin/fsck.c:147 +#: builtin/fsck.c:126 builtin/fsck.c:129 #, c-format msgid "broken link from %7s %s" msgstr "link roto de %7s %s" -#: builtin/fsck.c:156 +#: builtin/fsck.c:138 msgid "wrong object type in link" msgstr "tipo de objeto equivocado en link" -#: builtin/fsck.c:172 +#: builtin/fsck.c:154 #, c-format msgid "" "broken link from %7s %s\n" @@ -14491,240 +15169,240 @@ msgstr "" "link roto de %7s %s\n" " a %7s %s" -#: builtin/fsck.c:283 +#: builtin/fsck.c:265 #, c-format msgid "missing %s %s" msgstr "faltan %s %s" -#: builtin/fsck.c:310 +#: builtin/fsck.c:292 #, c-format msgid "unreachable %s %s" msgstr "inalcanzable %s %s" -#: builtin/fsck.c:330 +#: builtin/fsck.c:312 #, c-format msgid "dangling %s %s" msgstr "actualizando %s %s" -#: builtin/fsck.c:340 +#: builtin/fsck.c:322 msgid "could not create lost-found" msgstr "no se pudo crear lost-found" -#: builtin/fsck.c:351 +#: builtin/fsck.c:333 #, c-format msgid "could not finish '%s'" msgstr "no se pudo finalizar '%s'" -#: builtin/fsck.c:368 +#: builtin/fsck.c:350 #, c-format msgid "Checking %s" msgstr "Revisando %s" -#: builtin/fsck.c:406 +#: builtin/fsck.c:388 #, c-format msgid "Checking connectivity (%d objects)" msgstr "Verificando conectividad (%d objetos)" -#: builtin/fsck.c:425 +#: builtin/fsck.c:407 #, c-format msgid "Checking %s %s" msgstr "Revisando %s %s" -#: builtin/fsck.c:430 +#: builtin/fsck.c:412 msgid "broken links" msgstr "links rotos" -#: builtin/fsck.c:439 +#: builtin/fsck.c:421 #, c-format msgid "root %s" msgstr "raíz %s" -#: builtin/fsck.c:447 +#: builtin/fsck.c:429 #, c-format msgid "tagged %s %s (%s) in %s" msgstr "tag %s %s (%s) en %s" -#: builtin/fsck.c:476 +#: builtin/fsck.c:458 #, c-format msgid "%s: object corrupt or missing" msgstr "%s: objecto corrupto o faltante" -#: builtin/fsck.c:501 +#: builtin/fsck.c:483 #, c-format msgid "%s: invalid reflog entry %s" msgstr "%s: referencia inválida %s" -#: builtin/fsck.c:515 +#: builtin/fsck.c:497 #, c-format msgid "Checking reflog %s->%s" msgstr "Revisando reflog %s->%s" -#: builtin/fsck.c:549 +#: builtin/fsck.c:531 #, c-format msgid "%s: invalid sha1 pointer %s" msgstr "%s: puntero sha1 inválido %s" -#: builtin/fsck.c:556 +#: builtin/fsck.c:538 #, c-format msgid "%s: not a commit" msgstr "%s: no es un commit" -#: builtin/fsck.c:610 +#: builtin/fsck.c:592 msgid "notice: No default references" msgstr "aviso: No hay referencias por defecto" -#: builtin/fsck.c:625 +#: builtin/fsck.c:607 #, c-format msgid "%s: object corrupt or missing: %s" msgstr "%s: objeto corrupto o no encontrado: %s" -#: builtin/fsck.c:638 +#: builtin/fsck.c:620 #, c-format msgid "%s: object could not be parsed: %s" msgstr "%s: no se puede analizar objeto: %s" -#: builtin/fsck.c:658 +#: builtin/fsck.c:640 #, c-format msgid "bad sha1 file: %s" msgstr "mal sha1 de archivo: %s" -#: builtin/fsck.c:673 +#: builtin/fsck.c:655 msgid "Checking object directory" msgstr "Revisando directorio de objetos" -#: builtin/fsck.c:676 +#: builtin/fsck.c:658 msgid "Checking object directories" msgstr "Revisando objetos directorios" -#: builtin/fsck.c:691 +#: builtin/fsck.c:673 #, c-format msgid "Checking %s link" msgstr "Revisando link %s" -#: builtin/fsck.c:696 builtin/index-pack.c:843 +#: builtin/fsck.c:678 builtin/index-pack.c:865 #, c-format msgid "invalid %s" msgstr "%s inválido" -#: builtin/fsck.c:703 +#: builtin/fsck.c:685 #, c-format msgid "%s points to something strange (%s)" msgstr "%s apunta a algo extraño (%s)" -#: builtin/fsck.c:709 +#: builtin/fsck.c:691 #, c-format msgid "%s: detached HEAD points at nothing" msgstr "%s: HEAD desacoplado apunta a nada" -#: builtin/fsck.c:713 +#: builtin/fsck.c:695 #, c-format msgid "notice: %s points to an unborn branch (%s)" msgstr "aviso: %s apunta a un branch no nacido (%s)" -#: builtin/fsck.c:725 +#: builtin/fsck.c:707 msgid "Checking cache tree" msgstr "Revisando el cache tree" -#: builtin/fsck.c:730 +#: builtin/fsck.c:712 #, c-format msgid "%s: invalid sha1 pointer in cache-tree" msgstr "%s: puntero inválido sha1 en cache-tree" -#: builtin/fsck.c:739 +#: builtin/fsck.c:721 msgid "non-tree in cache-tree" msgstr "non-tree en cache-tree" -#: builtin/fsck.c:770 +#: builtin/fsck.c:752 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<opciones>] [<objeto>...]" -#: builtin/fsck.c:776 +#: builtin/fsck.c:758 msgid "show unreachable objects" msgstr "mostrar objetos ilegibles" -#: builtin/fsck.c:777 +#: builtin/fsck.c:759 msgid "show dangling objects" msgstr "mostrar objetos colgados" -#: builtin/fsck.c:778 +#: builtin/fsck.c:760 msgid "report tags" msgstr "reportar tags" -#: builtin/fsck.c:779 +#: builtin/fsck.c:761 msgid "report root nodes" msgstr "reportar nodos raíz" -#: builtin/fsck.c:780 +#: builtin/fsck.c:762 msgid "make index objects head nodes" msgstr "hacer objetos índices cabezas de nodos" -#: builtin/fsck.c:781 +#: builtin/fsck.c:763 msgid "make reflogs head nodes (default)" msgstr "hacer reflogs cabeza de nodos (default)" -#: builtin/fsck.c:782 +#: builtin/fsck.c:764 msgid "also consider packs and alternate objects" msgstr "también considerar paquetes y objetos alternos" -#: builtin/fsck.c:783 +#: builtin/fsck.c:765 msgid "check only connectivity" msgstr "revisar solo conectividad" -#: builtin/fsck.c:784 +#: builtin/fsck.c:766 builtin/mktag.c:78 msgid "enable more strict checking" msgstr "habilitar revisión más estricta" -#: builtin/fsck.c:786 +#: builtin/fsck.c:768 msgid "write dangling objects in .git/lost-found" msgstr "escribir objetos colgados en .git/lost-found" -#: builtin/fsck.c:787 builtin/prune.c:134 +#: builtin/fsck.c:769 builtin/prune.c:134 msgid "show progress" msgstr "mostrar progreso" -#: builtin/fsck.c:788 +#: builtin/fsck.c:770 msgid "show verbose names for reachable objects" msgstr "mostrar nombres verboso para objetos alcanzables" -#: builtin/fsck.c:847 builtin/index-pack.c:225 +#: builtin/fsck.c:829 builtin/index-pack.c:261 msgid "Checking objects" msgstr "Revisando objetos" -#: builtin/fsck.c:875 +#: builtin/fsck.c:857 #, c-format msgid "%s: object missing" msgstr "%s: objeto faltante" -#: builtin/fsck.c:886 +#: builtin/fsck.c:868 #, c-format msgid "invalid parameter: expected sha1, got '%s'" msgstr "parámetro inválido: sha1 esperado, se obtuvo '%s'" -#: builtin/gc.c:35 +#: builtin/gc.c:39 msgid "git gc [<options>]" msgstr "git gc [<opciones>]" -#: builtin/gc.c:90 +#: builtin/gc.c:93 #, c-format msgid "Failed to fstat %s: %s" msgstr "Falló el fstat %s: %s" -#: builtin/gc.c:126 +#: builtin/gc.c:129 #, c-format msgid "failed to parse '%s' value '%s'" msgstr "falló al analizar '%s' valor '%s'" -#: builtin/gc.c:475 builtin/init-db.c:57 +#: builtin/gc.c:487 builtin/init-db.c:58 #, c-format msgid "cannot stat '%s'" msgstr "no se pudo definir '%s'" -#: builtin/gc.c:484 builtin/notes.c:240 builtin/tag.c:530 +#: builtin/gc.c:496 builtin/notes.c:240 builtin/tag.c:562 #, c-format msgid "cannot read '%s'" msgstr "no se puede leer '%s'" -#: builtin/gc.c:491 +#: builtin/gc.c:503 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -14739,54 +15417,54 @@ msgstr "" "\n" "%s" -#: builtin/gc.c:539 +#: builtin/gc.c:551 msgid "prune unreferenced objects" msgstr "limpiar objetos no referenciados" -#: builtin/gc.c:541 +#: builtin/gc.c:553 msgid "be more thorough (increased runtime)" msgstr "ser más exhaustivo (aumentar runtime)" -#: builtin/gc.c:542 +#: builtin/gc.c:554 msgid "enable auto-gc mode" msgstr "habilitar modo auto-gc" -#: builtin/gc.c:545 +#: builtin/gc.c:557 msgid "force running gc even if there may be another gc running" msgstr "forzar la ejecución de gc incluso si puede haber otro gc ejecutándose" -#: builtin/gc.c:548 +#: builtin/gc.c:560 msgid "repack all other packs except the largest pack" msgstr "reempaquetar todos los otros paquetes excepto el paquete más grande" -#: builtin/gc.c:565 +#: builtin/gc.c:576 #, c-format msgid "failed to parse gc.logexpiry value %s" msgstr "falló al analizar valor %s de gc.logexpirity" -#: builtin/gc.c:576 +#: builtin/gc.c:587 #, c-format msgid "failed to parse prune expiry value %s" msgstr "falló al analizar valor %s de prune expiry" -#: builtin/gc.c:596 +#: builtin/gc.c:607 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "" "Auto empaquetado del repositorio en segundo plano para un performance " "óptimo.\n" -#: builtin/gc.c:598 +#: builtin/gc.c:609 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "Auto empaquetado del repositorio para performance óptimo.\n" -#: builtin/gc.c:599 +#: builtin/gc.c:610 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "Vea \"git help gc\" para limpieza manual.\n" -#: builtin/gc.c:639 +#: builtin/gc.c:650 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" @@ -14794,23 +15472,187 @@ msgstr "" "gc ya está ejecutándose en la máquina '%s' pid %<PRIuMAX> (use --force so no " "es así)" -#: builtin/gc.c:694 +#: builtin/gc.c:705 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" "Hay muchos objetos sueltos inalcanzables; ejecute 'git prune' para " "eliminarlos." +#: builtin/gc.c:715 +msgid "" +"git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]" +msgstr "" +"git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]" + +#: builtin/gc.c:745 +msgid "--no-schedule is not allowed" +msgstr "--no-schedule no está permitido" + +#: builtin/gc.c:750 +#, c-format +msgid "unrecognized --schedule argument '%s'" +msgstr "argumento --schedule no reconocido, '%s'" + +#: builtin/gc.c:869 +msgid "failed to write commit-graph" +msgstr "no se pudo escribir el commit-graph" + +#: builtin/gc.c:914 +msgid "failed to fill remotes" +msgstr "falló al borrar remotos" + +#: builtin/gc.c:1037 +msgid "failed to start 'git pack-objects' process" +msgstr "no pudo iniciar el proceso 'git pack-objects'" + +#: builtin/gc.c:1054 +msgid "failed to finish 'git pack-objects' process" +msgstr "no pudo finalizar el proceso 'git pack-objects'" + +#: builtin/gc.c:1106 +msgid "failed to write multi-pack-index" +msgstr "no se pudo escribir el índice de paquetes múltiples" + +#: builtin/gc.c:1124 +msgid "'git multi-pack-index expire' failed" +msgstr "'git multi-pack-index expire' falló" + +#: builtin/gc.c:1185 +msgid "'git multi-pack-index repack' failed" +msgstr "'git multi-pack-index repack' falló" + +#: builtin/gc.c:1194 +msgid "" +"skipping incremental-repack task because core.multiPackIndex is disabled" +msgstr "" +"omitiendo la tarea de reempaquetado incremental porque core.multiPackIndex " +"está deshabilitado" + +#: builtin/gc.c:1298 +#, c-format +msgid "lock file '%s' exists, skipping maintenance" +msgstr "el archivo de bloqueo '%s' existe, omitiendo el mantenimiento" + +#: builtin/gc.c:1328 +#, c-format +msgid "task '%s' failed" +msgstr "tarea '%s' falló" + +#: builtin/gc.c:1410 +#, c-format +msgid "'%s' is not a valid task" +msgstr "'%s' no es una tarea válida" + +#: builtin/gc.c:1415 +#, c-format +msgid "task '%s' cannot be selected multiple times" +msgstr "tarea '%s' no puede ser seleccionada múltipes veces" + +#: builtin/gc.c:1430 +msgid "run tasks based on the state of the repository" +msgstr "ejecutar tareas basadas en el estado del repositorio" + +#: builtin/gc.c:1431 +msgid "frequency" +msgstr "frecuencia" + +#: builtin/gc.c:1432 +msgid "run tasks based on frequency" +msgstr "ejecutar tareas basado en frecuencia" + +#: builtin/gc.c:1435 +msgid "do not report progress or other information over stderr" +msgstr "no reportar progreso u otra información por medio de stderr" + +#: builtin/gc.c:1436 +msgid "task" +msgstr "tarea" + +#: builtin/gc.c:1437 +msgid "run a specific task" +msgstr "ruta a tarea específica" + +#: builtin/gc.c:1454 +msgid "use at most one of --auto and --schedule=<frequency>" +msgstr "usar como máximo una entre --auto y --schedule=<frecuencia>" + +#: builtin/gc.c:1497 +msgid "failed to run 'git config'" +msgstr "no pudo ejecutar 'git config'" + +#: builtin/gc.c:1562 +#, c-format +msgid "failed to expand path '%s'" +msgstr "falló al expandir la ruta '%s'" + +#: builtin/gc.c:1591 +msgid "failed to start launchctl" +msgstr "Falló al iniciar launchctl." + +#: builtin/gc.c:1628 +#, c-format +msgid "failed to create directories for '%s'" +msgstr "falló al crear directorios para '%s'" + +#: builtin/gc.c:1689 +#, c-format +msgid "failed to bootstrap service %s" +msgstr "falló al generar el servicio %s" + +#: builtin/gc.c:1760 +msgid "failed to create temp xml file" +msgstr "no se pudo crear el archivo temp xml" + +#: builtin/gc.c:1850 +msgid "failed to start schtasks" +msgstr "no pudo iniciar schtasks" + +#: builtin/gc.c:1894 +msgid "failed to run 'crontab -l'; your system might not support 'cron'" +msgstr "" +"no pudo ejecutar 'crontab -l'; es posible que su sistema no soporte 'cron'" + +#: builtin/gc.c:1911 +msgid "failed to run 'crontab'; your system might not support 'cron'" +msgstr "" +"no pudo ejecutar 'crontab'; es posible que su sistema no soporte 'cron'" + +#: builtin/gc.c:1915 +msgid "failed to open stdin of 'crontab'" +msgstr "no pudo abrir stdin de 'crontab'" + +#: builtin/gc.c:1956 +msgid "'crontab' died" +msgstr "'crontab' murió" + +#: builtin/gc.c:1990 +msgid "another process is scheduling background maintenance" +msgstr "otro proceso está programando el mantenimiento en segundo plano" + +#: builtin/gc.c:2009 +msgid "failed to add repo to global config" +msgstr "no se pudo agregar el repositorio a la configuración global" + +#: builtin/gc.c:2019 +msgid "git maintenance <subcommand> [<options>]" +msgstr "git maintenance <subcomando> [<opciones>]" + +#: builtin/gc.c:2038 +#, c-format +msgid "invalid subcommand: %s" +msgstr "subcomando no válido: %s" + #: builtin/grep.c:30 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "git grep [<opciones>] [-e] <patrón> [<rev>...] [[--] <ruta>...]" -#: builtin/grep.c:225 +#: builtin/grep.c:223 #, c-format msgid "grep: failed to create thread: %s" msgstr "grep: falló al crear el hilo: %s" -#: builtin/grep.c:279 +#: builtin/grep.c:277 #, c-format msgid "invalid number of threads specified (%d) for %s" msgstr "número inválido de hilos especificado (%d) para %s" @@ -14819,262 +15661,262 @@ msgstr "número inválido de hilos especificado (%d) para %s" #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c:287 builtin/index-pack.c:1537 builtin/index-pack.c:1727 -#: builtin/pack-objects.c:2904 +#: builtin/grep.c:285 builtin/index-pack.c:1589 builtin/index-pack.c:1808 +#: builtin/pack-objects.c:2944 #, c-format msgid "no threads support, ignoring %s" msgstr "no hay soporte para hilos, ignorando %s" -#: builtin/grep.c:475 builtin/grep.c:600 builtin/grep.c:640 +#: builtin/grep.c:473 builtin/grep.c:601 builtin/grep.c:641 #, c-format msgid "unable to read tree (%s)" msgstr "no es posible leer el árbol (%s)" -#: builtin/grep.c:655 +#: builtin/grep.c:656 #, c-format msgid "unable to grep from object of type %s" msgstr "no es posible realizar grep del objeto de tipo %s" -#: builtin/grep.c:724 +#: builtin/grep.c:737 #, c-format msgid "switch `%c' expects a numerical value" msgstr "switch `%c' espera un valor numérico" -#: builtin/grep.c:823 +#: builtin/grep.c:836 msgid "search in index instead of in the work tree" msgstr "buscar en el índice en lugar del árbol de trabajo" -#: builtin/grep.c:825 +#: builtin/grep.c:838 msgid "find in contents not managed by git" msgstr "encontrar en contenidos no manejados por git" -#: builtin/grep.c:827 +#: builtin/grep.c:840 msgid "search in both tracked and untracked files" msgstr "buscar en archivos rastreados y no rastreados" -#: builtin/grep.c:829 +#: builtin/grep.c:842 msgid "ignore files specified via '.gitignore'" msgstr "ignorar archivos especificados via '.gitignore'" -#: builtin/grep.c:831 +#: builtin/grep.c:844 msgid "recursively search in each submodule" msgstr "búsqueda recursiva en cada submódulo" -#: builtin/grep.c:834 +#: builtin/grep.c:847 msgid "show non-matching lines" msgstr "mostrar líneas que no concuerdan" -#: builtin/grep.c:836 +#: builtin/grep.c:849 msgid "case insensitive matching" msgstr "búsqueda insensible a mayúsculas" -#: builtin/grep.c:838 +#: builtin/grep.c:851 msgid "match patterns only at word boundaries" msgstr "concordar patrón solo a los límites de las palabras" -#: builtin/grep.c:840 +#: builtin/grep.c:853 msgid "process binary files as text" msgstr "procesar archivos binarios como texto" -#: builtin/grep.c:842 +#: builtin/grep.c:855 msgid "don't match patterns in binary files" msgstr "no concordar patrones en archivos binarios" -#: builtin/grep.c:845 +#: builtin/grep.c:858 msgid "process binary files with textconv filters" msgstr "procesar archivos binarios con filtros textconv" -#: builtin/grep.c:847 +#: builtin/grep.c:860 msgid "search in subdirectories (default)" msgstr "buscar en subdirectorios (default)" -#: builtin/grep.c:849 +#: builtin/grep.c:862 msgid "descend at most <depth> levels" msgstr "descender como máximo <valor-de-profundiad> niveles" -#: builtin/grep.c:853 +#: builtin/grep.c:866 msgid "use extended POSIX regular expressions" msgstr "usar expresiones regulares POSIX extendidas" -#: builtin/grep.c:856 +#: builtin/grep.c:869 msgid "use basic POSIX regular expressions (default)" msgstr "usar expresiones regulares POSIX (default)" -#: builtin/grep.c:859 +#: builtin/grep.c:872 msgid "interpret patterns as fixed strings" msgstr "interpretar patrones como strings arreglados" -#: builtin/grep.c:862 +#: builtin/grep.c:875 msgid "use Perl-compatible regular expressions" msgstr "usar expresiones regulares compatibles con Perl" -#: builtin/grep.c:865 +#: builtin/grep.c:878 msgid "show line numbers" msgstr "mostrar números de línea" -#: builtin/grep.c:866 +#: builtin/grep.c:879 msgid "show column number of first match" msgstr "mostrar el número de columna de la primer coincidencia" -#: builtin/grep.c:867 +#: builtin/grep.c:880 msgid "don't show filenames" msgstr "no mostrar nombres de archivo" -#: builtin/grep.c:868 +#: builtin/grep.c:881 msgid "show filenames" msgstr "mostrar nombres de archivo" -#: builtin/grep.c:870 +#: builtin/grep.c:883 msgid "show filenames relative to top directory" msgstr "mostrar nombres de archivo relativos al directorio superior" -#: builtin/grep.c:872 +#: builtin/grep.c:885 msgid "show only filenames instead of matching lines" msgstr "mostrar solo nombres de archivos en lugar de líneas encontradas" -#: builtin/grep.c:874 +#: builtin/grep.c:887 msgid "synonym for --files-with-matches" msgstr "sinónimo para --files-with-matches" -#: builtin/grep.c:877 +#: builtin/grep.c:890 msgid "show only the names of files without match" msgstr "mostrar solo los nombres de archivos sin coincidencias" -#: builtin/grep.c:879 +#: builtin/grep.c:892 msgid "print NUL after filenames" msgstr "imprimir NUL después del nombre de archivo" -#: builtin/grep.c:882 +#: builtin/grep.c:895 msgid "show only matching parts of a line" msgstr "mostrar solo partes que concuerdan de una línea" -#: builtin/grep.c:884 +#: builtin/grep.c:897 msgid "show the number of matches instead of matching lines" msgstr "mostrar el número de concordancias en lugar de las líneas concordantes" -#: builtin/grep.c:885 +#: builtin/grep.c:898 msgid "highlight matches" msgstr "resaltar concordancias" -#: builtin/grep.c:887 +#: builtin/grep.c:900 msgid "print empty line between matches from different files" msgstr "imprimir una línea vacía entre coincidencias de diferentes archivos" -#: builtin/grep.c:889 +#: builtin/grep.c:902 msgid "show filename only once above matches from same file" msgstr "" "mostrar el nombre de archivo solo una vez para concordancias en el mismo " "archivo" -#: builtin/grep.c:892 +#: builtin/grep.c:905 msgid "show <n> context lines before and after matches" msgstr "mostrar <n> líneas de contexto antes y después de la concordancia" -#: builtin/grep.c:895 +#: builtin/grep.c:908 msgid "show <n> context lines before matches" msgstr "mostrar <n> líneas de contexto antes de las concordancias" -#: builtin/grep.c:897 +#: builtin/grep.c:910 msgid "show <n> context lines after matches" msgstr "mostrar <n> líneas de context después de las concordancias" -#: builtin/grep.c:899 +#: builtin/grep.c:912 msgid "use <n> worker threads" msgstr "usar <n> hilos de trabajo" -#: builtin/grep.c:900 +#: builtin/grep.c:913 msgid "shortcut for -C NUM" msgstr "atajo para -C NUM" -#: builtin/grep.c:903 +#: builtin/grep.c:916 msgid "show a line with the function name before matches" msgstr "" "mostrar una línea con el nombre de la función antes de las concordancias" -#: builtin/grep.c:905 +#: builtin/grep.c:918 msgid "show the surrounding function" msgstr "mostrar la función circundante" -#: builtin/grep.c:908 +#: builtin/grep.c:921 msgid "read patterns from file" msgstr "leer patrones del archivo" -#: builtin/grep.c:910 +#: builtin/grep.c:923 msgid "match <pattern>" msgstr "concordar <patrón>" -#: builtin/grep.c:912 +#: builtin/grep.c:925 msgid "combine patterns specified with -e" msgstr "combinar patrones especificados con -e" -#: builtin/grep.c:924 +#: builtin/grep.c:937 msgid "indicate hit with exit status without output" msgstr "indicar concordancia con exit status sin output" -#: builtin/grep.c:926 +#: builtin/grep.c:939 msgid "show only matches from files that match all patterns" msgstr "" "mostrar solo concordancias con archivos que concuerdan todos los patrones" -#: builtin/grep.c:928 -msgid "show parse tree for grep expression" -msgstr "mostrar árbol analizado para la expresión grep" - -#: builtin/grep.c:932 +#: builtin/grep.c:942 msgid "pager" msgstr "paginador" -#: builtin/grep.c:932 +#: builtin/grep.c:942 msgid "show matching files in the pager" msgstr "mostrar archivos concordantes en el paginador" -#: builtin/grep.c:936 +#: builtin/grep.c:946 msgid "allow calling of grep(1) (ignored by this build)" msgstr "permitir el llamado de grep(1) (ignorado por esta build)" -#: builtin/grep.c:1003 +#: builtin/grep.c:1012 msgid "no pattern given" msgstr "no se ha entregado patrón" -#: builtin/grep.c:1039 +#: builtin/grep.c:1048 msgid "--no-index or --untracked cannot be used with revs" msgstr "--no-index o --untracked no se puede usar con revs" -#: builtin/grep.c:1047 +#: builtin/grep.c:1056 #, c-format msgid "unable to resolve revision: %s" msgstr "no se posible resolver revisión: %s" -#: builtin/grep.c:1077 +#: builtin/grep.c:1086 msgid "--untracked not supported with --recurse-submodules" msgstr "--untracked no es soportada con --recurse-submodules" -#: builtin/grep.c:1081 +#: builtin/grep.c:1090 msgid "invalid option combination, ignoring --threads" msgstr "combinación de opciones inválida, ignorando --threads" -#: builtin/grep.c:1084 builtin/pack-objects.c:3623 +#: builtin/grep.c:1093 builtin/pack-objects.c:3672 msgid "no threads support, ignoring --threads" msgstr "no se soportan hilos, ignorando --threads" -#: builtin/grep.c:1087 builtin/index-pack.c:1534 builtin/pack-objects.c:2901 +#: builtin/grep.c:1096 builtin/index-pack.c:1586 builtin/pack-objects.c:2941 #, c-format msgid "invalid number of threads specified (%d)" msgstr "número inválido de hilos especificado (%d)" -#: builtin/grep.c:1121 +#: builtin/grep.c:1130 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager solo funciona en el árbol de trabajo" -#: builtin/grep.c:1147 +#: builtin/grep.c:1156 msgid "--cached or --untracked cannot be used with --no-index" msgstr "--cached o --untracked no pueden ser usadas con --no-index" -#: builtin/grep.c:1153 +#: builtin/grep.c:1159 +msgid "--untracked cannot be used with --cached" +msgstr "--untracked no se puede usar con --cached" + +#: builtin/grep.c:1165 msgid "--[no-]exclude-standard cannot be used for tracked contents" msgstr "--[no-]exclude-standard no puede ser usada para contenido rastreado" -#: builtin/grep.c:1161 +#: builtin/grep.c:1173 msgid "both --cached and trees are given" msgstr "--cached y árboles han sido entregados" @@ -15207,12 +16049,12 @@ msgstr "ningún visualizador de manual proceso la petición" msgid "no info viewer handled the request" msgstr "ningún visor de info manejo la petición" -#: builtin/help.c:520 builtin/help.c:531 git.c:337 +#: builtin/help.c:520 builtin/help.c:531 git.c:340 #, c-format msgid "'%s' is aliased to '%s'" msgstr "'%s' tiene el alias '%s'" -#: builtin/help.c:534 git.c:367 +#: builtin/help.c:534 git.c:372 #, c-format msgid "bad alias.%s string: %s" msgstr "mal alias.%s string: %s" @@ -15226,353 +16068,357 @@ msgstr "uso: %s%s" msgid "'git help config' for more information" msgstr "'git help config' para más información" -#: builtin/index-pack.c:185 +#: builtin/index-pack.c:221 #, c-format msgid "object type mismatch at %s" msgstr "el tipo del objeto no concuerda en %s" -#: builtin/index-pack.c:205 +#: builtin/index-pack.c:241 #, c-format msgid "did not receive expected object %s" msgstr "no se recibió el objeto esperado %s" -#: builtin/index-pack.c:208 +#: builtin/index-pack.c:244 #, c-format msgid "object %s: expected type %s, found %s" msgstr "objeto %s: tipo esperado %s, encontrado %s" -#: builtin/index-pack.c:258 +#: builtin/index-pack.c:294 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "no se puede llenar %d byte" msgstr[1] "no se pueden llenar %d bytes" -#: builtin/index-pack.c:268 +#: builtin/index-pack.c:304 msgid "early EOF" msgstr "EOF temprano" -#: builtin/index-pack.c:269 +#: builtin/index-pack.c:305 msgid "read error on input" msgstr "leer error en input" -#: builtin/index-pack.c:281 +#: builtin/index-pack.c:317 msgid "used more bytes than were available" msgstr "se usaron más bytes de los disponibles" -#: builtin/index-pack.c:288 builtin/pack-objects.c:618 +#: builtin/index-pack.c:324 builtin/pack-objects.c:624 msgid "pack too large for current definition of off_t" msgstr "paquete muy grande para la definición actual de off_t" -#: builtin/index-pack.c:291 builtin/unpack-objects.c:95 +#: builtin/index-pack.c:327 builtin/unpack-objects.c:95 msgid "pack exceeds maximum allowed size" msgstr "paquete excede el máximo tamaño permitido" -#: builtin/index-pack.c:306 builtin/repack.c:250 +#: builtin/index-pack.c:342 #, c-format msgid "unable to create '%s'" msgstr "no se puede crear '%s'" -#: builtin/index-pack.c:312 +#: builtin/index-pack.c:348 #, c-format msgid "cannot open packfile '%s'" msgstr "no se puede abrir el archivo de paquete '%s'" -#: builtin/index-pack.c:326 +#: builtin/index-pack.c:362 msgid "pack signature mismatch" msgstr "firma del paquete no concuerda" -#: builtin/index-pack.c:328 +#: builtin/index-pack.c:364 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "versión de paquete %<PRIu32> no soportada" -#: builtin/index-pack.c:346 +#: builtin/index-pack.c:382 #, c-format msgid "pack has bad object at offset %<PRIuMAX>: %s" msgstr "paquete tiene un mal objeto en el offset %<PRIuMAX>: %s" -#: builtin/index-pack.c:466 +#: builtin/index-pack.c:488 #, c-format msgid "inflate returned %d" msgstr "inflate devolvió %d" -#: builtin/index-pack.c:515 +#: builtin/index-pack.c:537 msgid "offset value overflow for delta base object" msgstr "valor de offset desbordado para el objeto base delta" -#: builtin/index-pack.c:523 +#: builtin/index-pack.c:545 msgid "delta base offset is out of bound" msgstr "offset de base delta está fuera de límites" -#: builtin/index-pack.c:531 +#: builtin/index-pack.c:553 #, c-format msgid "unknown object type %d" msgstr "tipo de objeto %d desconocido" -#: builtin/index-pack.c:562 +#: builtin/index-pack.c:584 msgid "cannot pread pack file" msgstr "no se puede propagar el paquete" -#: builtin/index-pack.c:564 +#: builtin/index-pack.c:586 #, c-format msgid "premature end of pack file, %<PRIuMAX> byte missing" msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing" msgstr[0] "final prematuro de archivo de paquete, %<PRIuMAX> byte faltante" msgstr[1] "final prematuro de archivo de paquete, %<PRIuMAX> bytes faltantes" -#: builtin/index-pack.c:590 +#: builtin/index-pack.c:612 msgid "serious inflate inconsistency" msgstr "inconsistencia seria en inflate" -#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:765 -#: builtin/index-pack.c:804 builtin/index-pack.c:813 +#: builtin/index-pack.c:757 builtin/index-pack.c:763 builtin/index-pack.c:787 +#: builtin/index-pack.c:826 builtin/index-pack.c:835 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "¡COLISIÓN DE TIPO SHA1 ENCONTRADA CON %s !" -#: builtin/index-pack.c:738 builtin/pack-objects.c:170 -#: builtin/pack-objects.c:230 builtin/pack-objects.c:325 +#: builtin/index-pack.c:760 builtin/pack-objects.c:171 +#: builtin/pack-objects.c:231 builtin/pack-objects.c:326 #, c-format msgid "unable to read %s" msgstr "no se posible leer %s" -#: builtin/index-pack.c:802 +#: builtin/index-pack.c:824 #, c-format msgid "cannot read existing object info %s" msgstr "no se puede leer la información existente del objeto %s" -#: builtin/index-pack.c:810 +#: builtin/index-pack.c:832 #, c-format msgid "cannot read existing object %s" msgstr "no se puede leer el objeto existente %s" -#: builtin/index-pack.c:824 +#: builtin/index-pack.c:846 #, c-format msgid "invalid blob object %s" msgstr "objeto blob %s inválido" -#: builtin/index-pack.c:827 builtin/index-pack.c:846 +#: builtin/index-pack.c:849 builtin/index-pack.c:868 msgid "fsck error in packed object" msgstr "error de fsck en el objeto empaquetado" -#: builtin/index-pack.c:848 +#: builtin/index-pack.c:870 #, c-format msgid "Not all child objects of %s are reachable" msgstr "No todos los objetos hijos de %s son alcanzables" -#: builtin/index-pack.c:920 builtin/index-pack.c:951 +#: builtin/index-pack.c:931 builtin/index-pack.c:978 msgid "failed to apply delta" msgstr "falló al aplicar delta" -#: builtin/index-pack.c:1121 +#: builtin/index-pack.c:1161 msgid "Receiving objects" msgstr "Recibiendo objetos" -#: builtin/index-pack.c:1121 +#: builtin/index-pack.c:1161 msgid "Indexing objects" msgstr "Indexando objetos" -#: builtin/index-pack.c:1155 +#: builtin/index-pack.c:1195 msgid "pack is corrupted (SHA1 mismatch)" msgstr "paquete está corrompido (SHA1 no concuerda)" -#: builtin/index-pack.c:1160 +#: builtin/index-pack.c:1200 msgid "cannot fstat packfile" msgstr "no se puede fstat al archivo de paquete" -#: builtin/index-pack.c:1163 +#: builtin/index-pack.c:1203 msgid "pack has junk at the end" msgstr "el paquete tiene basura al final" -#: builtin/index-pack.c:1175 +#: builtin/index-pack.c:1215 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "confusión más allá de la locura en parse_pack_objects()" -#: builtin/index-pack.c:1198 +#: builtin/index-pack.c:1238 msgid "Resolving deltas" msgstr "Resolviendo deltas" -#: builtin/index-pack.c:1208 builtin/pack-objects.c:2665 +#: builtin/index-pack.c:1249 builtin/pack-objects.c:2707 #, c-format msgid "unable to create thread: %s" msgstr "no es posible crear hilo: %s" -#: builtin/index-pack.c:1249 +#: builtin/index-pack.c:1282 msgid "confusion beyond insanity" msgstr "confusión más allá de la locura" -#: builtin/index-pack.c:1255 +#: builtin/index-pack.c:1288 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" msgstr[0] "completado con %d objeto local" msgstr[1] "completado con %d objetos locales" -#: builtin/index-pack.c:1267 +#: builtin/index-pack.c:1300 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "Tail checksum para %s inesperada (¿corrupción de disco?)" -#: builtin/index-pack.c:1271 +#: builtin/index-pack.c:1304 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "paquete tiene %d delta sin resolver" msgstr[1] "paquete tiene %d deltas sin resolver" -#: builtin/index-pack.c:1295 +#: builtin/index-pack.c:1328 #, c-format msgid "unable to deflate appended object (%d)" msgstr "no es posible desinflar el objeto adjunto (%d)" -#: builtin/index-pack.c:1391 +#: builtin/index-pack.c:1424 #, c-format msgid "local object %s is corrupt" msgstr "objeto local %s está corrompido" -#: builtin/index-pack.c:1405 +#: builtin/index-pack.c:1445 #, c-format -msgid "packfile name '%s' does not end with '.pack'" -msgstr "nombre '%s' de archivo de paquete no termina con '.pack'" +msgid "packfile name '%s' does not end with '.%s'" +msgstr "el nombre del archivo de paquete '%s' no termina con '.%s'" -#: builtin/index-pack.c:1430 +#: builtin/index-pack.c:1469 #, c-format msgid "cannot write %s file '%s'" msgstr "no se puede escribir %s en el archivo '%s'" -#: builtin/index-pack.c:1438 +#: builtin/index-pack.c:1477 #, c-format msgid "cannot close written %s file '%s'" msgstr "no se puede cerrar escrito %s en archivo '%s'" -#: builtin/index-pack.c:1462 +#: builtin/index-pack.c:1503 msgid "error while closing pack file" msgstr "error mientras se cierra el archivo paquete" -#: builtin/index-pack.c:1476 +#: builtin/index-pack.c:1517 msgid "cannot store pack file" msgstr "no se puede guardar el archivo paquete" -#: builtin/index-pack.c:1484 +#: builtin/index-pack.c:1525 msgid "cannot store index file" msgstr "no se puede guardar el archivo índice" -#: builtin/index-pack.c:1528 builtin/pack-objects.c:2912 +#: builtin/index-pack.c:1534 +msgid "cannot store reverse index file" +msgstr "no se puede almacenar el archivo de índice inverso" + +#: builtin/index-pack.c:1580 builtin/pack-objects.c:2952 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "mal pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1592 +#: builtin/index-pack.c:1650 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "No se puede abrir el archivo paquete existente '%s'" -#: builtin/index-pack.c:1594 +#: builtin/index-pack.c:1652 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "No se puede abrir el índice del archivo paquete para '%s'" -#: builtin/index-pack.c:1642 +#: builtin/index-pack.c:1700 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "no delta: %d objeto" msgstr[1] "no delta: %d objetos" -#: builtin/index-pack.c:1649 +#: builtin/index-pack.c:1707 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "largo de cadena = %d: %lu objeto" msgstr[1] "largo de cadena = %d: %lu objetos" -#: builtin/index-pack.c:1689 +#: builtin/index-pack.c:1765 msgid "Cannot come back to cwd" msgstr "No se puede regresar a cwd" -#: builtin/index-pack.c:1738 builtin/index-pack.c:1741 -#: builtin/index-pack.c:1757 builtin/index-pack.c:1761 +#: builtin/index-pack.c:1819 builtin/index-pack.c:1822 +#: builtin/index-pack.c:1838 builtin/index-pack.c:1842 #, c-format msgid "bad %s" msgstr "mal %s" -#: builtin/index-pack.c:1767 builtin/init-db.c:392 builtin/init-db.c:621 +#: builtin/index-pack.c:1848 builtin/init-db.c:392 builtin/init-db.c:625 #, c-format msgid "unknown hash algorithm '%s'" msgstr "algoritmo hash desconocido '%s'" -#: builtin/index-pack.c:1782 +#: builtin/index-pack.c:1867 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin no puede ser usada sin --stdin" -#: builtin/index-pack.c:1784 +#: builtin/index-pack.c:1869 msgid "--stdin requires a git repository" msgstr "--stdin requiere un repositorio git" -#: builtin/index-pack.c:1786 +#: builtin/index-pack.c:1871 msgid "--object-format cannot be used with --stdin" msgstr "--object-format no se puede usar con --stdin" -#: builtin/index-pack.c:1792 +#: builtin/index-pack.c:1886 msgid "--verify with no packfile name given" msgstr "--verify no recibió ningún nombre de archivo de paquete" -#: builtin/index-pack.c:1840 builtin/unpack-objects.c:582 +#: builtin/index-pack.c:1956 builtin/unpack-objects.c:582 msgid "fsck error in pack objects" msgstr "error de fsck en objetos paquete" -#: builtin/init-db.c:63 +#: builtin/init-db.c:64 #, c-format msgid "cannot stat template '%s'" msgstr "no se pudo definir template '%s'" -#: builtin/init-db.c:68 +#: builtin/init-db.c:69 #, c-format msgid "cannot opendir '%s'" msgstr "no se puede abrir directorio '%s'" -#: builtin/init-db.c:80 +#: builtin/init-db.c:81 #, c-format msgid "cannot readlink '%s'" msgstr "no se puede leer link '%s'" -#: builtin/init-db.c:82 +#: builtin/init-db.c:83 #, c-format msgid "cannot symlink '%s' '%s'" msgstr "no se puede crear symlink '%s' '%s'" -#: builtin/init-db.c:88 +#: builtin/init-db.c:89 #, c-format msgid "cannot copy '%s' to '%s'" msgstr "no se puede copiar '%s' a '%s'" -#: builtin/init-db.c:92 +#: builtin/init-db.c:93 #, c-format msgid "ignoring template %s" msgstr "ignorando template %s" -#: builtin/init-db.c:123 +#: builtin/init-db.c:124 #, c-format msgid "templates not found in %s" msgstr "template no encontrado en %s" -#: builtin/init-db.c:138 +#: builtin/init-db.c:139 #, c-format msgid "not copying templates from '%s': %s" msgstr "no se copian templates de '%s': %s" -#: builtin/init-db.c:276 +#: builtin/init-db.c:275 #, c-format msgid "invalid initial branch name: '%s'" msgstr "nombre de rama inicial inválido: '%s'" -#: builtin/init-db.c:368 +#: builtin/init-db.c:367 #, c-format msgid "unable to handle file type %d" msgstr "no es posible manejar el tipo de archivo %d" -#: builtin/init-db.c:371 +#: builtin/init-db.c:370 #, c-format msgid "unable to move %s to %s" msgstr "no se puede mover %s a %s" @@ -15586,32 +16432,32 @@ msgstr "intentar reinicializar el repositorio con un hash diferente" msgid "%s already exists" msgstr "%s ya existe" -#: builtin/init-db.c:444 +#: builtin/init-db.c:445 #, c-format msgid "re-init: ignored --initial-branch=%s" msgstr "re-init: ignorando --initial-branch=%s" -#: builtin/init-db.c:475 +#: builtin/init-db.c:476 #, c-format msgid "Reinitialized existing shared Git repository in %s%s\n" msgstr "Reinicializado el repositorio Git compartido existente en %s%s\n" -#: builtin/init-db.c:476 +#: builtin/init-db.c:477 #, c-format msgid "Reinitialized existing Git repository in %s%s\n" msgstr "Reinicializado el repositorio Git existente en %s%s\n" -#: builtin/init-db.c:480 +#: builtin/init-db.c:481 #, c-format msgid "Initialized empty shared Git repository in %s%s\n" msgstr "Inicializado repositorio Git compartido vacío en %s%s\n" -#: builtin/init-db.c:481 +#: builtin/init-db.c:482 #, c-format msgid "Initialized empty Git repository in %s%s\n" msgstr "Inicializado repositorio Git vacío en %s%s\n" -#: builtin/init-db.c:530 +#: builtin/init-db.c:531 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" @@ -15619,38 +16465,42 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=<directorio-template>] [--" "shared[=<permisos>]] [<directorio>]" -#: builtin/init-db.c:556 +#: builtin/init-db.c:557 msgid "permissions" msgstr "permisos" -#: builtin/init-db.c:557 +#: builtin/init-db.c:558 msgid "specify that the git repository is to be shared amongst several users" msgstr "" "especifica que el repositorio de git será compartido entre varios usuarios" -#: builtin/init-db.c:563 +#: builtin/init-db.c:564 msgid "override the name of the initial branch" msgstr "sobrescribir el nombre de la rama inicial" -#: builtin/init-db.c:564 +#: builtin/init-db.c:565 builtin/verify-pack.c:74 msgid "hash" msgstr "hash" -#: builtin/init-db.c:565 builtin/show-index.c:22 +#: builtin/init-db.c:566 builtin/show-index.c:22 builtin/verify-pack.c:75 msgid "specify the hash algorithm to use" msgstr "especificar el algoritmo hash a usar" -#: builtin/init-db.c:598 builtin/init-db.c:603 +#: builtin/init-db.c:573 +msgid "--separate-git-dir and --bare are mutually exclusive" +msgstr "--separate-git-dir y --bare son mutuamente excluyentes" + +#: builtin/init-db.c:602 builtin/init-db.c:607 #, c-format msgid "cannot mkdir %s" msgstr "no se pude crear directorio %s" -#: builtin/init-db.c:607 +#: builtin/init-db.c:611 builtin/init-db.c:666 #, c-format msgid "cannot chdir to %s" msgstr "no se puede aplicar chdir a %s" -#: builtin/init-db.c:634 +#: builtin/init-db.c:638 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" @@ -15659,11 +16509,15 @@ msgstr "" "%s (o --work-tree=<directorio>) no se permite sin especificar %s (o --git-" "dir=<directorio>)" -#: builtin/init-db.c:662 +#: builtin/init-db.c:690 #, c-format msgid "Cannot access work tree '%s'" msgstr "No se puede acceder al árbol de trabajo '%s'" +#: builtin/init-db.c:695 +msgid "--separate-git-dir incompatible with bare repository" +msgstr "--separate-git-dir incompatible con el repositorio desnudo" + #: builtin/interpret-trailers.c:16 msgid "" "git interpret-trailers [--in-place] [--trim-empty] [(--trailer " @@ -15728,126 +16582,130 @@ msgstr "--trailer con --only-input no tiene sentido" msgid "no input file given for in-place editing" msgstr "no se entregó archivo de entrada para edición en lugar" -#: builtin/log.c:57 +#: builtin/log.c:59 msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "git log [<opciones>] [<rango-de-revisión>] [[--] <ruta>...]" -#: builtin/log.c:58 +#: builtin/log.c:60 msgid "git show [<options>] <object>..." msgstr "git show [<opciones>] <objeto>..." -#: builtin/log.c:111 +#: builtin/log.c:113 #, c-format msgid "invalid --decorate option: %s" msgstr "opción --decorate inválida: %s" -#: builtin/log.c:178 +#: builtin/log.c:180 msgid "show source" msgstr "mostrar fuente" -#: builtin/log.c:179 -msgid "Use mail map file" -msgstr "Usar archivo de mapa de mail" +#: builtin/log.c:181 +msgid "use mail map file" +msgstr "usar archivo de mapa de mail" -#: builtin/log.c:182 +#: builtin/log.c:184 msgid "only decorate refs that match <pattern>" msgstr "solo decorar refs que concuerden con <patrón>" -#: builtin/log.c:184 +#: builtin/log.c:186 msgid "do not decorate refs that match <pattern>" msgstr "no decorar refs que concuerden con <patrón>" -#: builtin/log.c:185 +#: builtin/log.c:187 msgid "decorate options" msgstr "opciones de decorado" -#: builtin/log.c:188 -msgid "Process line range n,m in file, counting from 1" -msgstr "Procesar rango de líneas n,m en archivo, contando desde 1" +#: builtin/log.c:190 +msgid "" +"trace the evolution of line range <start>,<end> or function :<funcname> in " +"<file>" +msgstr "" +"rastrear la evolución del rango de línea <inicio>, <fin> o función: <nombre-" +"funcion> en <archivo>" + +#: builtin/log.c:213 +msgid "-L<range>:<file> cannot be used with pathspec" +msgstr "-L<rango>:<archivo> no se puede usar con pathspec" -#: builtin/log.c:298 +#: builtin/log.c:303 #, c-format msgid "Final output: %d %s\n" msgstr "Salida final: %d %s\n" -#: builtin/log.c:556 +#: builtin/log.c:566 #, c-format msgid "git show %s: bad file" msgstr "git show %s: mal archivo" -#: builtin/log.c:571 builtin/log.c:666 +#: builtin/log.c:581 builtin/log.c:671 #, c-format msgid "could not read object %s" msgstr "no se pudo leer objeto %s" -#: builtin/log.c:691 +#: builtin/log.c:696 #, c-format msgid "unknown type: %d" msgstr "tipo desconocido: %d" -#: builtin/log.c:835 +#: builtin/log.c:841 #, c-format msgid "%s: invalid cover from description mode" msgstr "%s: modo cover from description inválido" -#: builtin/log.c:842 +#: builtin/log.c:848 msgid "format.headers without value" msgstr "formate.headers. sin valor" -#: builtin/log.c:957 -msgid "name of output directory is too long" -msgstr "nombre del directorio de salida es muy largo" - -#: builtin/log.c:973 +#: builtin/log.c:977 #, c-format msgid "cannot open patch file %s" msgstr "no se puede abrir archivo patch %s" -#: builtin/log.c:990 +#: builtin/log.c:994 msgid "need exactly one range" msgstr "necesita exactamente un rango" -#: builtin/log.c:1000 +#: builtin/log.c:1004 msgid "not a range" msgstr "no es un rango" -#: builtin/log.c:1164 +#: builtin/log.c:1168 msgid "cover letter needs email format" msgstr "letras de portada necesita formato email" -#: builtin/log.c:1170 +#: builtin/log.c:1174 msgid "failed to create cover-letter file" msgstr "falló al crear los archivos cover-letter" -#: builtin/log.c:1249 +#: builtin/log.c:1261 #, c-format msgid "insane in-reply-to: %s" msgstr "insano in-reply-to: %s" -#: builtin/log.c:1276 +#: builtin/log.c:1288 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<opciones>] [<desde> | <rango-de-revisiones>]" -#: builtin/log.c:1334 +#: builtin/log.c:1346 msgid "two output directories?" msgstr "¿dos directorios de salida?" -#: builtin/log.c:1445 builtin/log.c:2217 builtin/log.c:2219 builtin/log.c:2231 +#: builtin/log.c:1497 builtin/log.c:2317 builtin/log.c:2319 builtin/log.c:2331 #, c-format msgid "unknown commit %s" msgstr "commit desconocido %s" -#: builtin/log.c:1455 builtin/replace.c:58 builtin/replace.c:207 +#: builtin/log.c:1508 builtin/replace.c:58 builtin/replace.c:207 #: builtin/replace.c:210 #, c-format msgid "failed to resolve '%s' as a valid ref" msgstr "falló al resolver '%s' como ref válida" -#: builtin/log.c:1460 +#: builtin/log.c:1517 msgid "could not find exact merge base" msgstr "no se pudo encontrar una base de fusión exacta" -#: builtin/log.c:1464 +#: builtin/log.c:1527 msgid "" "failed to get upstream, if you want to record base commit automatically,\n" "please use git branch --set-upstream-to to track a remote branch.\n" @@ -15859,281 +16717,290 @@ msgstr "" "O puedes especificar un commit base mediante --base=<id-commit-base> " "manualmente" -#: builtin/log.c:1484 +#: builtin/log.c:1550 msgid "failed to find exact merge base" msgstr "falló al encontrar una base de fusión exacta" -#: builtin/log.c:1495 +#: builtin/log.c:1567 msgid "base commit should be the ancestor of revision list" msgstr "el commit base debe ser el ancestro de la lista de revisión" -#: builtin/log.c:1499 +#: builtin/log.c:1577 msgid "base commit shouldn't be in revision list" msgstr "el commit base no debe estar en la lista de revisión" -#: builtin/log.c:1552 +#: builtin/log.c:1635 msgid "cannot get patch id" msgstr "no se puede obtener id de patch" -#: builtin/log.c:1604 -msgid "failed to infer range-diff ranges" -msgstr "falló al inferir rangos range-diff" +#: builtin/log.c:1692 +msgid "failed to infer range-diff origin of current series" +msgstr "falló al inferir rangos range-diff de la serie actual" + +#: builtin/log.c:1694 +#, c-format +msgid "using '%s' as range-diff origin of current series" +msgstr "usando '%s' como origen de diferencia de rango de la serie actual" -#: builtin/log.c:1650 +#: builtin/log.c:1738 msgid "use [PATCH n/m] even with a single patch" msgstr "use [PATCH n/m] incluso con un único parche" -#: builtin/log.c:1653 +#: builtin/log.c:1741 msgid "use [PATCH] even with multiple patches" msgstr "use [PATCH] incluso con múltiples parches" -#: builtin/log.c:1657 +#: builtin/log.c:1745 msgid "print patches to standard out" msgstr "mostrar parches en standard out" -#: builtin/log.c:1659 +#: builtin/log.c:1747 msgid "generate a cover letter" msgstr "generar letra de cover" -#: builtin/log.c:1661 +#: builtin/log.c:1749 msgid "use simple number sequence for output file names" msgstr "" "usar una secuencia simple de números para salida de nombres de archivos" -#: builtin/log.c:1662 +#: builtin/log.c:1750 msgid "sfx" msgstr "sfx" -#: builtin/log.c:1663 +#: builtin/log.c:1751 msgid "use <sfx> instead of '.patch'" msgstr "use <sfx> en lugar de '.patch'" -#: builtin/log.c:1665 +#: builtin/log.c:1753 msgid "start numbering patches at <n> instead of 1" msgstr "comenzar a numerar los parches desde <n> en lugar de 1" -#: builtin/log.c:1667 +#: builtin/log.c:1755 msgid "mark the series as Nth re-roll" msgstr "marcar las series como Nth re-roll" -#: builtin/log.c:1669 -msgid "Use [RFC PATCH] instead of [PATCH]" -msgstr "Use [RFC PATCH] en lugar de [PATCH]" +#: builtin/log.c:1757 +msgid "max length of output filename" +msgstr "tamaño máximo de nombre de archivo resultante" -#: builtin/log.c:1672 +#: builtin/log.c:1759 +msgid "use [RFC PATCH] instead of [PATCH]" +msgstr "use [RFC PATCH] en lugar de [PATCH]" + +#: builtin/log.c:1762 msgid "cover-from-description-mode" msgstr "modo-cover-from-description" -#: builtin/log.c:1673 +#: builtin/log.c:1763 msgid "generate parts of a cover letter based on a branch's description" msgstr "" "genera partes de una carta de presentación basado en la descripción de la " "rama" -#: builtin/log.c:1675 -msgid "Use [<prefix>] instead of [PATCH]" -msgstr "Use [<prefijo>] en lugar de [PATCH]" +#: builtin/log.c:1765 +msgid "use [<prefix>] instead of [PATCH]" +msgstr "use [<prefijo>] en lugar de [PATCH]" -#: builtin/log.c:1678 +#: builtin/log.c:1768 msgid "store resulting files in <dir>" msgstr "guardar archivos resultantes en <dir>" -#: builtin/log.c:1681 +#: builtin/log.c:1771 msgid "don't strip/add [PATCH]" msgstr "no cortar/agregar [PATCH]" -#: builtin/log.c:1684 +#: builtin/log.c:1774 msgid "don't output binary diffs" msgstr "no mostrar diffs binarios" -#: builtin/log.c:1686 +#: builtin/log.c:1776 msgid "output all-zero hash in From header" msgstr "salida como hash de todos-ceros en la cabecera From" -#: builtin/log.c:1688 +#: builtin/log.c:1778 msgid "don't include a patch matching a commit upstream" msgstr "no incluya un parche que coincida con un commit en upstream" -#: builtin/log.c:1690 +#: builtin/log.c:1780 msgid "show patch format instead of default (patch + stat)" msgstr "mostrar formato de parche en lugar del default (parche + stat)" -#: builtin/log.c:1692 +#: builtin/log.c:1782 msgid "Messaging" msgstr "Mensajeando" -#: builtin/log.c:1693 +#: builtin/log.c:1783 msgid "header" msgstr "cabezal" -#: builtin/log.c:1694 +#: builtin/log.c:1784 msgid "add email header" msgstr "agregar cabecera email" -#: builtin/log.c:1695 builtin/log.c:1696 +#: builtin/log.c:1785 builtin/log.c:1786 msgid "email" msgstr "email" -#: builtin/log.c:1695 +#: builtin/log.c:1785 msgid "add To: header" msgstr "agregar cabecera To:" -#: builtin/log.c:1696 +#: builtin/log.c:1786 msgid "add Cc: header" msgstr "agregar cabecera Cc:" -#: builtin/log.c:1697 +#: builtin/log.c:1787 msgid "ident" msgstr "ident" -#: builtin/log.c:1698 +#: builtin/log.c:1788 msgid "set From address to <ident> (or committer ident if absent)" msgstr "" "configurar dirección From a <ident> ( o identidad de committer si está " "ausente)" -#: builtin/log.c:1700 +#: builtin/log.c:1790 msgid "message-id" msgstr "id de mensaje" -#: builtin/log.c:1701 +#: builtin/log.c:1791 msgid "make first mail a reply to <message-id>" msgstr "hacer primer mail una respuesta a <id de mensaje>" -#: builtin/log.c:1702 builtin/log.c:1705 +#: builtin/log.c:1792 builtin/log.c:1795 msgid "boundary" msgstr "límite" -#: builtin/log.c:1703 +#: builtin/log.c:1793 msgid "attach the patch" msgstr "adjuntar el parche" -#: builtin/log.c:1706 +#: builtin/log.c:1796 msgid "inline the patch" msgstr "poner el parche en línea" -#: builtin/log.c:1710 +#: builtin/log.c:1800 msgid "enable message threading, styles: shallow, deep" msgstr "habilitar hilos de mensajes, estilos: superficial, profundo" -#: builtin/log.c:1712 +#: builtin/log.c:1802 msgid "signature" msgstr "firma" -#: builtin/log.c:1713 +#: builtin/log.c:1803 msgid "add a signature" msgstr "agregar una firma" -#: builtin/log.c:1714 +#: builtin/log.c:1804 msgid "base-commit" msgstr "commit-base" -#: builtin/log.c:1715 +#: builtin/log.c:1805 msgid "add prerequisite tree info to the patch series" msgstr "" "agregar información de árbol de requisitos previos a la serie de parches" -#: builtin/log.c:1717 +#: builtin/log.c:1808 msgid "add a signature from a file" msgstr "agregar una firma de un archivo" -#: builtin/log.c:1718 +#: builtin/log.c:1809 msgid "don't print the patch filenames" msgstr "no mostrar los nombres de archivos de los parches" -#: builtin/log.c:1720 +#: builtin/log.c:1811 msgid "show progress while generating patches" msgstr "mostrar medidor de progreso mientras se generan los parches" -#: builtin/log.c:1722 +#: builtin/log.c:1813 msgid "show changes against <rev> in cover letter or single patch" msgstr "muestra cambios contra <rev> en cover letter o en un solo parche" -#: builtin/log.c:1725 +#: builtin/log.c:1816 msgid "show changes against <refspec> in cover letter or single patch" msgstr "muestra cambios contra <refspec> en cover letter o en un solo parche" -#: builtin/log.c:1727 +#: builtin/log.c:1818 msgid "percentage by which creation is weighted" msgstr "porcentaje por el cual la creación es pesada" -#: builtin/log.c:1812 +#: builtin/log.c:1904 #, c-format msgid "invalid ident line: %s" msgstr "línea de identificación inválida: %s" -#: builtin/log.c:1827 +#: builtin/log.c:1919 msgid "-n and -k are mutually exclusive" msgstr "-n y -k son mutuamente exclusivas" -#: builtin/log.c:1829 +#: builtin/log.c:1921 msgid "--subject-prefix/--rfc and -k are mutually exclusive" msgstr "--subject-prefix/--rfc y -k son mutuamente exclusivos" -#: builtin/log.c:1837 +#: builtin/log.c:1929 msgid "--name-only does not make sense" msgstr "--name-only no tiene sentido" -#: builtin/log.c:1839 +#: builtin/log.c:1931 msgid "--name-status does not make sense" msgstr "--name-status no tiene sentido" -#: builtin/log.c:1841 +#: builtin/log.c:1933 msgid "--check does not make sense" msgstr "--check no tiene sentido" -#: builtin/log.c:1874 -msgid "standard output, or directory, which one?" -msgstr "¿salida standard, o directorio, cual?" +#: builtin/log.c:1955 +msgid "--stdout, --output, and --output-directory are mutually exclusive" +msgstr "--stdout, --output, and --output-directory son mutuamente exclusivas" -#: builtin/log.c:1978 +#: builtin/log.c:2078 msgid "--interdiff requires --cover-letter or single patch" msgstr "--interdiff requiere --cover-letter o un parche único" -#: builtin/log.c:1982 +#: builtin/log.c:2082 msgid "Interdiff:" msgstr "Interdiff:" -#: builtin/log.c:1983 +#: builtin/log.c:2083 #, c-format msgid "Interdiff against v%d:" msgstr "Interdiff contra v%d:" -#: builtin/log.c:1989 +#: builtin/log.c:2089 msgid "--creation-factor requires --range-diff" msgstr "--creation-factor requiere --range-diff" -#: builtin/log.c:1993 +#: builtin/log.c:2093 msgid "--range-diff requires --cover-letter or single patch" msgstr "--range-diff requiere --cover-letter o parche único" -#: builtin/log.c:2001 +#: builtin/log.c:2101 msgid "Range-diff:" msgstr "Range-diff:" -#: builtin/log.c:2002 +#: builtin/log.c:2102 #, c-format msgid "Range-diff against v%d:" msgstr "Range-diff contra v%d:" -#: builtin/log.c:2013 +#: builtin/log.c:2113 #, c-format msgid "unable to read signature file '%s'" msgstr "no se puede leer la firma del archivo '%s'" -#: builtin/log.c:2049 +#: builtin/log.c:2149 msgid "Generating patches" msgstr "Generando parches" -#: builtin/log.c:2093 +#: builtin/log.c:2193 msgid "failed to create output files" msgstr "falló al crear los archivos de salida" -#: builtin/log.c:2152 +#: builtin/log.c:2252 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<upstream> [<head> [<límite>]]]" -#: builtin/log.c:2206 +#: builtin/log.c:2306 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -16141,114 +17008,118 @@ msgstr "" "No se pudo encontrar una rama remota rastreada, por favor especifique " "<upstream> manualmente.\n" -#: builtin/ls-files.c:471 +#: builtin/ls-files.c:486 msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<opciones>] [<archivo>...]" -#: builtin/ls-files.c:527 +#: builtin/ls-files.c:542 msgid "identify the file status with tags" msgstr "identifique el estado del archivo con tags" -#: builtin/ls-files.c:529 +#: builtin/ls-files.c:544 msgid "use lowercase letters for 'assume unchanged' files" msgstr "usar letras minúsculas para archivos 'asumidos sin cambios'" -#: builtin/ls-files.c:531 +#: builtin/ls-files.c:546 msgid "use lowercase letters for 'fsmonitor clean' files" msgstr "usar letras minúsculas para archivos de 'fsmonitor clean'" -#: builtin/ls-files.c:533 +#: builtin/ls-files.c:548 msgid "show cached files in the output (default)" msgstr "mostrar archivos en caché en la salida (default)" -#: builtin/ls-files.c:535 +#: builtin/ls-files.c:550 msgid "show deleted files in the output" msgstr "mostrar archivos borrados en la salida" -#: builtin/ls-files.c:537 +#: builtin/ls-files.c:552 msgid "show modified files in the output" msgstr "mostrar archivos modificados en la salida" -#: builtin/ls-files.c:539 +#: builtin/ls-files.c:554 msgid "show other files in the output" msgstr "mostrar otros archivos en la salida" -#: builtin/ls-files.c:541 +#: builtin/ls-files.c:556 msgid "show ignored files in the output" msgstr "mostrar archivos ignorados en la salida" -#: builtin/ls-files.c:544 +#: builtin/ls-files.c:559 msgid "show staged contents' object name in the output" msgstr "" "mostrar contenido de nombres de objetos en el área de stage en la salida" -#: builtin/ls-files.c:546 +#: builtin/ls-files.c:561 msgid "show files on the filesystem that need to be removed" msgstr "mostrar archivos en el filesystem que necesitan ser borrados" -#: builtin/ls-files.c:548 +#: builtin/ls-files.c:563 msgid "show 'other' directories' names only" msgstr "mostrar solo nombres de 'directorios otros'" -#: builtin/ls-files.c:550 +#: builtin/ls-files.c:565 msgid "show line endings of files" msgstr "mostrar finales de línea de archivos" -#: builtin/ls-files.c:552 +#: builtin/ls-files.c:567 msgid "don't show empty directories" msgstr "no mostrar directorios vacíos" -#: builtin/ls-files.c:555 +#: builtin/ls-files.c:570 msgid "show unmerged files in the output" msgstr "mostrar archivos no fusionados en la salida" -#: builtin/ls-files.c:557 +#: builtin/ls-files.c:572 msgid "show resolve-undo information" msgstr "mostrar información resolver-deshacer" -#: builtin/ls-files.c:559 +#: builtin/ls-files.c:574 msgid "skip files matching pattern" msgstr "saltar archivos que concuerden con el patrón" -#: builtin/ls-files.c:562 +#: builtin/ls-files.c:577 msgid "exclude patterns are read from <file>" msgstr "excluir patrones leídos de <archivo>" -#: builtin/ls-files.c:565 +#: builtin/ls-files.c:580 msgid "read additional per-directory exclude patterns in <file>" msgstr "" "leer patrones de exclusión de manera adicional por directorio en <archivo>" -#: builtin/ls-files.c:567 +#: builtin/ls-files.c:582 msgid "add the standard git exclusions" msgstr "agregar las exclusiones standard de git" -#: builtin/ls-files.c:571 +#: builtin/ls-files.c:586 msgid "make the output relative to the project top directory" msgstr "hacer la salida relativa al directorio principal del proyecto" -#: builtin/ls-files.c:574 +#: builtin/ls-files.c:589 msgid "recurse through submodules" msgstr "recurrir a través de submódulos" -#: builtin/ls-files.c:576 +#: builtin/ls-files.c:591 msgid "if any <file> is not in the index, treat this as an error" msgstr "si cualquier <archivo> no está en el índice, tratarlo como un error" -#: builtin/ls-files.c:577 +#: builtin/ls-files.c:592 msgid "tree-ish" msgstr "árbol-ismo" -#: builtin/ls-files.c:578 +#: builtin/ls-files.c:593 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "" "fingir que las rutas han sido borradas ya que todavía hay <árbol-ismos> " "presentes" -#: builtin/ls-files.c:580 +#: builtin/ls-files.c:595 msgid "show debugging data" msgstr "mostrar data de debug" +#: builtin/ls-files.c:597 +msgid "suppress duplicate entries" +msgstr "suprimir entradas duplicadas" + #: builtin/ls-remote.c:9 msgid "" "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" @@ -16259,39 +17130,39 @@ msgstr "" " [-q | --quiet] [--exit-code] [--get-url]\n" " [--symref] [<repositorio> [<refs>...]]" -#: builtin/ls-remote.c:59 +#: builtin/ls-remote.c:60 msgid "do not print remote URL" msgstr "no mostrar el URL remoto" -#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1384 +#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1404 msgid "exec" msgstr "ejecutar" -#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 +#: builtin/ls-remote.c:62 builtin/ls-remote.c:64 msgid "path of git-upload-pack on the remote host" msgstr "ruta de git-upload-pack en el host remoto" -#: builtin/ls-remote.c:65 +#: builtin/ls-remote.c:66 msgid "limit to tags" msgstr "limitar a tags" -#: builtin/ls-remote.c:66 +#: builtin/ls-remote.c:67 msgid "limit to heads" msgstr "limitar a heads" -#: builtin/ls-remote.c:67 +#: builtin/ls-remote.c:68 msgid "do not show peeled tags" msgstr "no mostrar tags pelados" -#: builtin/ls-remote.c:69 +#: builtin/ls-remote.c:70 msgid "take url.<base>.insteadOf into account" msgstr "tomar url.<base>.insteadOf en cuenta" -#: builtin/ls-remote.c:72 +#: builtin/ls-remote.c:73 msgid "exit with exit code 2 if no matching refs are found" msgstr "salir con código de salida 2 si no se encuentran refs que concuerden" -#: builtin/ls-remote.c:75 +#: builtin/ls-remote.c:76 msgid "show underlying ref in addition to the object pointed by it" msgstr "mostrar ref subyacente en adición al objeto apuntado por él" @@ -16448,193 +17319,193 @@ msgstr "no se pudo resolver ref '%s'" msgid "Merging %s with %s\n" msgstr "Fusionando %s con %s\n" -#: builtin/merge.c:56 +#: builtin/merge.c:58 msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<opciones>] [<commit>...]" -#: builtin/merge.c:57 +#: builtin/merge.c:59 msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:58 +#: builtin/merge.c:60 msgid "git merge --continue" msgstr "git merge --continue" -#: builtin/merge.c:121 +#: builtin/merge.c:123 msgid "switch `m' requires a value" msgstr "cambiar `m' requiere un valor" -#: builtin/merge.c:144 +#: builtin/merge.c:146 #, c-format msgid "option `%s' requires a value" msgstr "opción `%s' requiere un valor" -#: builtin/merge.c:190 +#: builtin/merge.c:199 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "No se pudo encontrar estrategia de fusión '%s'.\n" -#: builtin/merge.c:191 +#: builtin/merge.c:200 #, c-format msgid "Available strategies are:" msgstr "Estrategias disponibles son:" -#: builtin/merge.c:196 +#: builtin/merge.c:205 #, c-format msgid "Available custom strategies are:" msgstr "Estrategias personalizadas disponibles son:" -#: builtin/merge.c:247 builtin/pull.c:133 +#: builtin/merge.c:256 builtin/pull.c:133 msgid "do not show a diffstat at the end of the merge" msgstr "no mostrar un diffstat al final de la fusión" -#: builtin/merge.c:250 builtin/pull.c:136 +#: builtin/merge.c:259 builtin/pull.c:136 msgid "show a diffstat at the end of the merge" msgstr "mostrar un diffstat al final de la fusión" -#: builtin/merge.c:251 builtin/pull.c:139 +#: builtin/merge.c:260 builtin/pull.c:139 msgid "(synonym to --stat)" msgstr "(sinónimo para --stat)" -#: builtin/merge.c:253 builtin/pull.c:142 +#: builtin/merge.c:262 builtin/pull.c:142 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" "agregar (como máximo <n>) entradas del shortlog al mensaje del commit de " "fusión" -#: builtin/merge.c:256 builtin/pull.c:148 +#: builtin/merge.c:265 builtin/pull.c:148 msgid "create a single commit instead of doing a merge" msgstr "crear un commit único en lugar de hacer una fusión" -#: builtin/merge.c:258 builtin/pull.c:151 +#: builtin/merge.c:267 builtin/pull.c:151 msgid "perform a commit if the merge succeeds (default)" msgstr "realizar un commit si la fusión es exitosa (default)" -#: builtin/merge.c:260 builtin/pull.c:154 +#: builtin/merge.c:269 builtin/pull.c:154 msgid "edit message before committing" msgstr "editar mensaje antes de realizar commit" -#: builtin/merge.c:262 +#: builtin/merge.c:271 msgid "allow fast-forward (default)" msgstr "permitir fast-forwars (default)" -#: builtin/merge.c:264 builtin/pull.c:161 +#: builtin/merge.c:273 builtin/pull.c:161 msgid "abort if fast-forward is not possible" msgstr "abortar si fast-forward no es posible" -#: builtin/merge.c:268 builtin/pull.c:164 +#: builtin/merge.c:277 builtin/pull.c:164 msgid "verify that the named commit has a valid GPG signature" msgstr "verificar que el commit nombrado tiene una firma GPG válida" -#: builtin/merge.c:269 builtin/notes.c:787 builtin/pull.c:168 -#: builtin/rebase.c:527 builtin/rebase.c:1398 builtin/revert.c:114 +#: builtin/merge.c:278 builtin/notes.c:787 builtin/pull.c:168 +#: builtin/rebase.c:541 builtin/rebase.c:1418 builtin/revert.c:114 msgid "strategy" msgstr "estrategia" -#: builtin/merge.c:270 builtin/pull.c:169 +#: builtin/merge.c:279 builtin/pull.c:169 msgid "merge strategy to use" msgstr "estrategia de fusión para usar" -#: builtin/merge.c:271 builtin/pull.c:172 +#: builtin/merge.c:280 builtin/pull.c:172 msgid "option=value" msgstr "opción=valor" -#: builtin/merge.c:272 builtin/pull.c:173 +#: builtin/merge.c:281 builtin/pull.c:173 msgid "option for selected merge strategy" msgstr "opción para la estrategia de fusión seleccionada" -#: builtin/merge.c:274 +#: builtin/merge.c:283 msgid "merge commit message (for a non-fast-forward merge)" msgstr "fusionar mensaje de commit (para una fusión no fast-forward)" -#: builtin/merge.c:281 +#: builtin/merge.c:290 msgid "abort the current in-progress merge" msgstr "abortar la fusión en progreso actual" -#: builtin/merge.c:283 +#: builtin/merge.c:292 msgid "--abort but leave index and working tree alone" msgstr "--abort pero deja el índice y el árbol de trabajo solos" -#: builtin/merge.c:285 +#: builtin/merge.c:294 msgid "continue the current in-progress merge" msgstr "continuar la fusión en progreso actual" -#: builtin/merge.c:287 builtin/pull.c:180 +#: builtin/merge.c:296 builtin/pull.c:180 msgid "allow merging unrelated histories" msgstr "permitir fusionar historias no relacionadas" -#: builtin/merge.c:294 +#: builtin/merge.c:303 msgid "bypass pre-merge-commit and commit-msg hooks" msgstr "hacer un bypass a hooks pre-merge-commit y commit-msg" -#: builtin/merge.c:311 +#: builtin/merge.c:320 msgid "could not run stash." msgstr "no se pudo ejecutar stash." -#: builtin/merge.c:316 +#: builtin/merge.c:325 msgid "stash failed" msgstr "stash falló" -#: builtin/merge.c:321 +#: builtin/merge.c:330 #, c-format msgid "not a valid object: %s" msgstr "no es un objeto válido: %s" -#: builtin/merge.c:343 builtin/merge.c:360 +#: builtin/merge.c:352 builtin/merge.c:369 msgid "read-tree failed" msgstr "lectura de árbol falló" -#: builtin/merge.c:390 +#: builtin/merge.c:399 msgid " (nothing to squash)" msgstr " (nada para hacer squash)" -#: builtin/merge.c:401 +#: builtin/merge.c:410 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Commit de squash -- no actualizando HEAD\n" -#: builtin/merge.c:451 +#: builtin/merge.c:460 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "No hay mensaje de fusión -- no actualizando HEAD\n" -#: builtin/merge.c:502 +#: builtin/merge.c:511 #, c-format msgid "'%s' does not point to a commit" msgstr "'%s' no apunta a ningún commit" -#: builtin/merge.c:589 +#: builtin/merge.c:598 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Mal string branch.%s.mergeoptions: %s" -#: builtin/merge.c:716 +#: builtin/merge.c:724 msgid "Not handling anything other than two heads merge." msgstr "No manejando nada más que fusión de dos heads." -#: builtin/merge.c:730 +#: builtin/merge.c:737 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Opción desconocida para merge-recursive: -X%s" -#: builtin/merge.c:745 +#: builtin/merge.c:756 t/helper/test-fast-rebase.c:209 #, c-format msgid "unable to write %s" msgstr "no es posible escribir %s" -#: builtin/merge.c:797 +#: builtin/merge.c:808 #, c-format msgid "Could not read from '%s'" msgstr "No se puedo leer de '%s'" -#: builtin/merge.c:806 +#: builtin/merge.c:817 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" "No se realiza commit de la fusión; use 'git commit' para completar la " "fusión.\n" -#: builtin/merge.c:812 +#: builtin/merge.c:823 msgid "" "Please enter a commit message to explain why this merge is necessary,\n" "especially if it merges an updated upstream into a topic branch.\n" @@ -16646,11 +17517,11 @@ msgstr "" "tópico.\n" "\n" -#: builtin/merge.c:817 +#: builtin/merge.c:828 msgid "An empty message aborts the commit.\n" msgstr "Un mensaje vacío aborta el commit.\n" -#: builtin/merge.c:820 +#: builtin/merge.c:831 #, c-format msgid "" "Lines starting with '%c' will be ignored, and an empty message aborts\n" @@ -16659,74 +17530,74 @@ msgstr "" "Líneas comenzando con '%c' serán ignoradas, y un mensaje vacío aborta\n" " el commit.\n" -#: builtin/merge.c:873 +#: builtin/merge.c:884 msgid "Empty commit message." msgstr "Mensaje de commit vacío." -#: builtin/merge.c:888 +#: builtin/merge.c:899 #, c-format msgid "Wonderful.\n" msgstr "Maravilloso.\n" -#: builtin/merge.c:949 +#: builtin/merge.c:960 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" "Fusión automática falló; arregle los conflictos y luego realice un commit " "con el resultado.\n" -#: builtin/merge.c:988 +#: builtin/merge.c:999 msgid "No current branch." msgstr "No rama actual." -#: builtin/merge.c:990 +#: builtin/merge.c:1001 msgid "No remote for the current branch." msgstr "No hay remoto para la rama actual." -#: builtin/merge.c:992 +#: builtin/merge.c:1003 msgid "No default upstream defined for the current branch." msgstr "Por defecto, no hay un upstream definido para la rama actual." -#: builtin/merge.c:997 +#: builtin/merge.c:1008 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "No hay rama de rastreo remoto para %s de %s" -#: builtin/merge.c:1054 +#: builtin/merge.c:1065 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Valor erróneo '%s' en el entorno '%s'" -#: builtin/merge.c:1157 +#: builtin/merge.c:1168 #, c-format msgid "not something we can merge in %s: %s" msgstr "nada que podamos fusionar en %s: %s" -#: builtin/merge.c:1191 +#: builtin/merge.c:1202 msgid "not something we can merge" msgstr "nada que podamos fusionar" -#: builtin/merge.c:1295 +#: builtin/merge.c:1312 msgid "--abort expects no arguments" msgstr "--abort no espera argumentos" -#: builtin/merge.c:1299 +#: builtin/merge.c:1316 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "No hay una fusión para abortar (falta MERGE_HEAD)" -#: builtin/merge.c:1317 +#: builtin/merge.c:1334 msgid "--quit expects no arguments" msgstr "--quit no espera argumentos" -#: builtin/merge.c:1330 +#: builtin/merge.c:1347 msgid "--continue expects no arguments" msgstr "--continue no espera argumentos" -#: builtin/merge.c:1334 +#: builtin/merge.c:1351 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "No hay fusión en progreso (falta MERGE_HEAD)." -#: builtin/merge.c:1350 +#: builtin/merge.c:1367 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -16734,7 +17605,7 @@ msgstr "" "No has concluido la fusión (existe MERGE_HEAD).\n" "Por favor, realiza un commit con los cambios antes de fusionar." -#: builtin/merge.c:1357 +#: builtin/merge.c:1374 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -16742,102 +17613,143 @@ msgstr "" "No has concluido el cherry-pick (existe CHERRY_PICK_HEAD).\n" "Por favor, realiza un commit con los cambios antes de fusionar." -#: builtin/merge.c:1360 +#: builtin/merge.c:1377 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "No has concluido el cherry-pick (existe CHERRY_PICK_HEAD)." -#: builtin/merge.c:1374 +#: builtin/merge.c:1391 msgid "You cannot combine --squash with --no-ff." msgstr "No se puede combinar --squash con --no-ff." -#: builtin/merge.c:1376 +#: builtin/merge.c:1393 msgid "You cannot combine --squash with --commit." msgstr "No se puede combinar --squash con --commit." -#: builtin/merge.c:1392 +#: builtin/merge.c:1409 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" "No hay commit especificado y merge.defaultToUpstream no está configurado." -#: builtin/merge.c:1409 +#: builtin/merge.c:1426 msgid "Squash commit into empty head not supported yet" msgstr "Commit aplastado dentro de un head vacío no es soportado todavía" -#: builtin/merge.c:1411 +#: builtin/merge.c:1428 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "Commit no fast-forward no tiene sentido dentro de un head vacío" -#: builtin/merge.c:1416 +#: builtin/merge.c:1433 #, c-format msgid "%s - not something we can merge" msgstr "%s - nada que podamos fusionar" -#: builtin/merge.c:1418 +#: builtin/merge.c:1435 msgid "Can merge only exactly one commit into empty head" msgstr "Solo se puede fusionar exactamente un commit en un head vacío" -#: builtin/merge.c:1499 +#: builtin/merge.c:1516 msgid "refusing to merge unrelated histories" msgstr "rehusando fusionar historias no relacionadas" -#: builtin/merge.c:1508 +#: builtin/merge.c:1525 msgid "Already up to date." msgstr "Ya está actualizado." -#: builtin/merge.c:1518 +#: builtin/merge.c:1535 #, c-format msgid "Updating %s..%s\n" msgstr "Actualizando %s..%s\n" -#: builtin/merge.c:1564 +#: builtin/merge.c:1581 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Intentando fusión en índice realmente trivial...\n" -#: builtin/merge.c:1571 +#: builtin/merge.c:1588 #, c-format msgid "Nope.\n" msgstr "Nop.\n" -#: builtin/merge.c:1596 +#: builtin/merge.c:1613 msgid "Already up to date. Yeeah!" msgstr "Ya está actualizado. ¡Oh, yeaahh!" -#: builtin/merge.c:1602 +#: builtin/merge.c:1619 msgid "Not possible to fast-forward, aborting." msgstr "No es posible hacer fast-forward, abortando." -#: builtin/merge.c:1630 builtin/merge.c:1695 +#: builtin/merge.c:1647 builtin/merge.c:1712 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Rebobinando el árbol a original...\n" -#: builtin/merge.c:1634 +#: builtin/merge.c:1651 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Intentando estrategia de fusión %s...\n" -#: builtin/merge.c:1686 +#: builtin/merge.c:1703 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Ninguna estrategia de fusión manejó la fusión.\n" -#: builtin/merge.c:1688 +#: builtin/merge.c:1705 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Fusionar con estrategia %s falló.\n" -#: builtin/merge.c:1697 +#: builtin/merge.c:1714 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "Usando el %s para preparar resolución a mano.\n" -#: builtin/merge.c:1711 +#: builtin/merge.c:1728 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" "Fusión automática fue bien; detenida antes del commit como se solicitó\n" +#: builtin/mktag.c:10 +msgid "git mktag" +msgstr "git mktag" + +#: builtin/mktag.c:30 +#, c-format +msgid "warning: tag input does not pass fsck: %s" +msgstr "peligro: información de tag no pasa fsck: %s" + +#: builtin/mktag.c:41 +#, c-format +msgid "error: tag input does not pass fsck: %s" +msgstr "error: valor de tag no pasa fsck: %s" + +#: builtin/mktag.c:44 +#, c-format +msgid "%d (FSCK_IGNORE?) should never trigger this callback" +msgstr "%d (FSCK_IGNORE?) nunca debería activar esta devolución de llamada" + +#: builtin/mktag.c:59 +#, c-format +msgid "could not read tagged object '%s'" +msgstr "no se pudo leer objeto de tag '%s'" + +#: builtin/mktag.c:62 +#, c-format +msgid "object '%s' tagged as '%s', but is a '%s' type" +msgstr "objeto '%s' es taggeado como '%s', pero es un tipo '%s'" + +#: builtin/mktag.c:99 +msgid "tag on stdin did not pass our strict fsck check" +msgstr "etiqueta en stdin no pasó nuestro estricto control fsck" + +#: builtin/mktag.c:102 +msgid "tag on stdin did not refer to a valid object" +msgstr "tag en stdin no se refería a un objeto válido" + +#: builtin/mktag.c:105 builtin/tag.c:232 +msgid "unable to write tag file" +msgstr "incapaz de escribir el archivo de tag" + #: builtin/mktree.c:66 msgid "git mktree [-z] [--missing] [--batch]" msgstr "git mktree [-z] [--missing] [--batch]" @@ -16874,7 +17786,10 @@ msgstr "" "durante el repack, recolectar los pack-files de tamaño menor en un batch que " "es más grande que este tamaño" -#: builtin/multi-pack-index.c:50 builtin/prune-packed.c:25 +#: builtin/multi-pack-index.c:50 builtin/notes.c:376 builtin/notes.c:431 +#: builtin/notes.c:509 builtin/notes.c:521 builtin/notes.c:598 +#: builtin/notes.c:665 builtin/notes.c:815 builtin/notes.c:963 +#: builtin/notes.c:985 builtin/prune-packed.c:25 builtin/tag.c:575 msgid "too many arguments" msgstr "muchos argumentos" @@ -16915,68 +17830,72 @@ msgstr "forzar mover/renombrar incluso si el objetivo existe" msgid "skip move/rename errors" msgstr "saltar errores de mover/renombrar" -#: builtin/mv.c:169 +#: builtin/mv.c:170 #, c-format msgid "destination '%s' is not a directory" msgstr "destino '%s' no es un directorio" -#: builtin/mv.c:180 +#: builtin/mv.c:181 #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "Revisando cambio de nombre de '%s' a '%s'\n" -#: builtin/mv.c:184 +#: builtin/mv.c:185 msgid "bad source" msgstr "mala fuente" -#: builtin/mv.c:187 +#: builtin/mv.c:188 msgid "can not move directory into itself" msgstr "no se pude mover un directorio en sí mismo" -#: builtin/mv.c:190 +#: builtin/mv.c:191 msgid "cannot move directory over file" msgstr "no se puede mover un directorio dentro de un archivo" -#: builtin/mv.c:199 +#: builtin/mv.c:200 msgid "source directory is empty" msgstr "directorio de fuente está vacío" -#: builtin/mv.c:224 +#: builtin/mv.c:225 msgid "not under version control" msgstr "no se encuentra bajo control de versión" #: builtin/mv.c:227 +msgid "conflicted" +msgstr "en conflicto" + +#: builtin/mv.c:230 msgid "destination exists" msgstr "destino existe" -#: builtin/mv.c:235 +#: builtin/mv.c:238 #, c-format msgid "overwriting '%s'" msgstr "sobrescribiendo '%s'" -#: builtin/mv.c:238 +#: builtin/mv.c:241 msgid "Cannot overwrite" msgstr "No se puede sobrescribir" -#: builtin/mv.c:241 +#: builtin/mv.c:244 msgid "multiple sources for the same target" msgstr "múltiples fuentes para el mismo objetivo" -#: builtin/mv.c:243 +#: builtin/mv.c:246 msgid "destination directory does not exist" msgstr "el directorio de destino no existe" -#: builtin/mv.c:250 +#: builtin/mv.c:253 #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s, fuente=%s, destino=%s" -#: builtin/mv.c:271 +#: builtin/mv.c:274 #, c-format msgid "Renaming %s to %s\n" msgstr "Renombrando %s a %s\n" -#: builtin/mv.c:277 builtin/remote.c:781 builtin/repack.c:520 +#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:483 #, c-format msgid "renaming '%s' failed" msgstr "renombrando '%s' falló" @@ -16994,8 +17913,8 @@ msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [<opciones>] --stdin" #: builtin/name-rev.c:524 -msgid "print only names (no SHA-1)" -msgstr "imprimir sólo nombres (sin SHA-1)" +msgid "print only ref-based names (no object names)" +msgstr "imprimir solo nombres basados en referencias (sin nombres de objetos)" #: builtin/name-rev.c:525 msgid "only use tags to name the commits" @@ -17170,7 +18089,7 @@ msgstr "incapaz de escribir el objeto de nota" msgid "the note contents have been left in %s" msgstr "los contenidos de nota han sido dejados en %s" -#: builtin/notes.c:242 builtin/tag.c:533 +#: builtin/notes.c:242 builtin/tag.c:565 #, c-format msgid "could not open or read '%s'" msgstr "no se pudo abrir o leer '%s'" @@ -17210,12 +18129,6 @@ msgstr "falló al copiar notas de '%s' a '%s'" msgid "refusing to %s notes in %s (outside of refs/notes/)" msgstr "rechazando %s notas en %s (fuera de refs/notes/)" -#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509 -#: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665 -#: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985 -msgid "too many parameters" -msgstr "demasiados parámetros" - #: builtin/notes.c:389 builtin/notes.c:678 #, c-format msgid "no note found for object %s." @@ -17273,8 +18186,8 @@ msgid "load rewriting config for <command> (implies --stdin)" msgstr "cargar configuración de reescritura para <comando> (implica --stdin)" #: builtin/notes.c:517 -msgid "too few parameters" -msgstr "muy pocos parámetros" +msgid "too few arguments" +msgstr "muy pocos argumentos" #: builtin/notes.c:538 #, c-format @@ -17403,7 +18316,7 @@ msgstr "" "commit con el resultado 'git notes merge --commit', o aborte la fusión con " "'git notes merge --abort'.\n" -#: builtin/notes.c:897 builtin/tag.c:546 +#: builtin/notes.c:897 builtin/tag.c:578 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "Falló al resolver '%s' como una ref válida." @@ -17421,7 +18334,7 @@ msgstr "intentar eliminar una nota no existente no es un error" msgid "read object names from the standard input" msgstr "leer nombres de objetos de standard input" -#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:220 +#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:148 msgid "do not remove, show only" msgstr "no eliminar, solo mostrar" @@ -17437,125 +18350,139 @@ msgstr "referencia-de-notas" msgid "use notes from <notes-ref>" msgstr "usar notas desde <referencia-de-notas>" -#: builtin/notes.c:1034 builtin/stash.c:1608 +#: builtin/notes.c:1034 builtin/stash.c:1671 #, c-format msgid "unknown subcommand: %s" msgstr "subcomando desconocido: %s" -#: builtin/pack-objects.c:53 +#: builtin/pack-objects.c:54 msgid "" "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" msgstr "" "git pack-objects --stdout [<opciones>...] [< <lista-de-ref> | < <lista-de-" "objetos>]" -#: builtin/pack-objects.c:54 +#: builtin/pack-objects.c:55 msgid "" "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" msgstr "" "git pack-objects [<opciones>...] <nombre-base> [< <lista-de-refs> | < <lista-" "de-objetos>]" -#: builtin/pack-objects.c:442 +#: builtin/pack-objects.c:440 +#, c-format +msgid "" +"write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in " +"pack %s" +msgstr "" +"write_reuse_object: no se pudo localizar %s, se esperaba en el " +"desplazamiento %<PRIuMAX> en el paquete %s" + +#: builtin/pack-objects.c:448 #, c-format msgid "bad packed object CRC for %s" msgstr "mal paquete de objeto CRC para %s" -#: builtin/pack-objects.c:453 +#: builtin/pack-objects.c:459 #, c-format msgid "corrupt packed object for %s" msgstr "objeto empaquetado corrupto para %s" -#: builtin/pack-objects.c:584 +#: builtin/pack-objects.c:590 #, c-format msgid "recursive delta detected for object %s" msgstr "delta recursivo encontrado para objeto %s" -#: builtin/pack-objects.c:795 +#: builtin/pack-objects.c:801 #, c-format msgid "ordered %u objects, expected %<PRIu32>" msgstr "%u objetos ordenados, esperados %<PRIu32>" -#: builtin/pack-objects.c:1003 +#: builtin/pack-objects.c:896 +#, c-format +msgid "expected object at offset %<PRIuMAX> in pack %s" +msgstr "objeto esperado en el desplazamiento %<PRIuMAX> en el paquete %s" + +#: builtin/pack-objects.c:1015 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "" "deshabilitando escritura bitmap, paquetes son divididos debido a pack." "packSizeLimit" -#: builtin/pack-objects.c:1016 +#: builtin/pack-objects.c:1028 msgid "Writing objects" msgstr "Escribiendo objetos" -#: builtin/pack-objects.c:1077 builtin/update-index.c:90 +#: builtin/pack-objects.c:1089 builtin/update-index.c:90 #, c-format msgid "failed to stat %s" msgstr "falló al iniciar %s" -#: builtin/pack-objects.c:1130 +#: builtin/pack-objects.c:1141 #, c-format msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" msgstr "%<PRIu32> objetos escritos mientras se esperaban %<PRIu32>" -#: builtin/pack-objects.c:1347 +#: builtin/pack-objects.c:1358 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" "deshabilitando escritura bitmap, ya que algunos objetos no están siendo " "empaquetados" -#: builtin/pack-objects.c:1774 +#: builtin/pack-objects.c:1806 #, c-format msgid "delta base offset overflow in pack for %s" msgstr "overflow de offset en la base de delta en paquete para %s" -#: builtin/pack-objects.c:1783 +#: builtin/pack-objects.c:1815 #, c-format msgid "delta base offset out of bound for %s" msgstr "outbound de offset en la base de delta para %s" -#: builtin/pack-objects.c:2054 +#: builtin/pack-objects.c:2096 msgid "Counting objects" msgstr "Contando objetos" -#: builtin/pack-objects.c:2199 +#: builtin/pack-objects.c:2241 #, c-format msgid "unable to parse object header of %s" msgstr "incapaz de analizar header del objeto %s" -#: builtin/pack-objects.c:2269 builtin/pack-objects.c:2285 -#: builtin/pack-objects.c:2295 +#: builtin/pack-objects.c:2311 builtin/pack-objects.c:2327 +#: builtin/pack-objects.c:2337 #, c-format msgid "object %s cannot be read" msgstr "objeto %s no puede ser leído" -#: builtin/pack-objects.c:2272 builtin/pack-objects.c:2299 +#: builtin/pack-objects.c:2314 builtin/pack-objects.c:2341 #, c-format msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)" msgstr "" "objeto %s inconsistente con el largo del objeto (%<PRIuMAX> vs %<PRIuMAX>)" -#: builtin/pack-objects.c:2309 +#: builtin/pack-objects.c:2351 msgid "suboptimal pack - out of memory" msgstr "suboptimal pack - fuera de memoria" -#: builtin/pack-objects.c:2624 +#: builtin/pack-objects.c:2666 #, c-format msgid "Delta compression using up to %d threads" msgstr "Compresión delta usando hasta %d hilos" -#: builtin/pack-objects.c:2763 +#: builtin/pack-objects.c:2805 #, c-format msgid "unable to pack objects reachable from tag %s" msgstr "no es posible empaquetar objetos alcanzables desde tag %s" -#: builtin/pack-objects.c:2851 +#: builtin/pack-objects.c:2891 msgid "Compressing objects" msgstr "Comprimiendo objetos" -#: builtin/pack-objects.c:2857 +#: builtin/pack-objects.c:2897 msgid "inconsistency with delta count" msgstr "inconsistencia con la cuenta de delta" -#: builtin/pack-objects.c:2929 +#: builtin/pack-objects.c:2976 #, c-format msgid "" "value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-" @@ -17564,7 +18491,7 @@ msgstr "" "valor para uploadpack.blobpackfileuri tiene que ser de la forma '<hash-de-" "objeto> <hash-de-pack> <uri>' (se tuvo '%s')" -#: builtin/pack-objects.c:2932 +#: builtin/pack-objects.c:2979 #, c-format msgid "" "object already configured in another uploadpack.blobpackfileuri (got '%s')" @@ -17572,7 +18499,7 @@ msgstr "" "objeto ya está configurado en otro uploadpack.blobpackfileuri (se obtuvo " "'%s')" -#: builtin/pack-objects.c:2961 +#: builtin/pack-objects.c:3008 #, c-format msgid "" "expected edge object ID, got garbage:\n" @@ -17581,7 +18508,7 @@ msgstr "" "se espseraba ID de objeto al borde, se obtuvo basura:\n" "%s" -#: builtin/pack-objects.c:2967 +#: builtin/pack-objects.c:3014 #, c-format msgid "" "expected object ID, got garbage:\n" @@ -17590,240 +18517,240 @@ msgstr "" "se esperaba ID de objeto, se obtuvo basuta:\n" "%s" -#: builtin/pack-objects.c:3065 +#: builtin/pack-objects.c:3112 msgid "invalid value for --missing" msgstr "valor inválido para --missing" -#: builtin/pack-objects.c:3124 builtin/pack-objects.c:3232 +#: builtin/pack-objects.c:3171 builtin/pack-objects.c:3279 msgid "cannot open pack index" msgstr "no se puede abrir índice de paquetes" -#: builtin/pack-objects.c:3155 +#: builtin/pack-objects.c:3202 #, c-format msgid "loose object at %s could not be examined" msgstr "objeto perdido en %s no pudo ser examinado" -#: builtin/pack-objects.c:3240 +#: builtin/pack-objects.c:3287 msgid "unable to force loose object" msgstr "incapaz de forzar un objeto perdido" -#: builtin/pack-objects.c:3333 +#: builtin/pack-objects.c:3380 #, c-format msgid "not a rev '%s'" msgstr "no es una rev '%s'" -#: builtin/pack-objects.c:3336 +#: builtin/pack-objects.c:3383 #, c-format msgid "bad revision '%s'" msgstr "mala revisión '%s'" -#: builtin/pack-objects.c:3361 +#: builtin/pack-objects.c:3408 msgid "unable to add recent objects" msgstr "incapaz de añadir objetos recientes" -#: builtin/pack-objects.c:3414 +#: builtin/pack-objects.c:3461 #, c-format msgid "unsupported index version %s" msgstr "versión de índice no soportada %s" -#: builtin/pack-objects.c:3418 +#: builtin/pack-objects.c:3465 #, c-format msgid "bad index version '%s'" msgstr "mala versión del índice '%s'" -#: builtin/pack-objects.c:3456 +#: builtin/pack-objects.c:3503 msgid "<version>[,<offset>]" msgstr "<versión>[,<offset>]" -#: builtin/pack-objects.c:3457 +#: builtin/pack-objects.c:3504 msgid "write the pack index file in the specified idx format version" msgstr "" "escribir el índice de paquete en la versión de formato idx especificado" -#: builtin/pack-objects.c:3460 +#: builtin/pack-objects.c:3507 msgid "maximum size of each output pack file" msgstr "tamaño máximo de cada paquete resultante" -#: builtin/pack-objects.c:3462 +#: builtin/pack-objects.c:3509 msgid "ignore borrowed objects from alternate object store" msgstr "ignorar objetos prestados de otros almacenes de objetos" -#: builtin/pack-objects.c:3464 +#: builtin/pack-objects.c:3511 msgid "ignore packed objects" msgstr "ignorar objetos paquete" -#: builtin/pack-objects.c:3466 +#: builtin/pack-objects.c:3513 msgid "limit pack window by objects" msgstr "limitar ventana de paquete por objetos" -#: builtin/pack-objects.c:3468 +#: builtin/pack-objects.c:3515 msgid "limit pack window by memory in addition to object limit" msgstr "limitar ventana de paquete por memoria en adición a límite de objetos" -#: builtin/pack-objects.c:3470 +#: builtin/pack-objects.c:3517 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "longitud máxima de cadena delta permitida en el paquete resultante" -#: builtin/pack-objects.c:3472 +#: builtin/pack-objects.c:3519 msgid "reuse existing deltas" msgstr "reusar deltas existentes" -#: builtin/pack-objects.c:3474 +#: builtin/pack-objects.c:3521 msgid "reuse existing objects" msgstr "reutilizar objetos existentes" -#: builtin/pack-objects.c:3476 +#: builtin/pack-objects.c:3523 msgid "use OFS_DELTA objects" msgstr "usar objetos OFS_DELTA" -#: builtin/pack-objects.c:3478 +#: builtin/pack-objects.c:3525 msgid "use threads when searching for best delta matches" msgstr "usar hilos cuando se busque para mejores concordancias de delta" -#: builtin/pack-objects.c:3480 +#: builtin/pack-objects.c:3527 msgid "do not create an empty pack output" msgstr "no crear un paquete resultante vacío" -#: builtin/pack-objects.c:3482 +#: builtin/pack-objects.c:3529 msgid "read revision arguments from standard input" msgstr "leer argumentos de revisión de standard input" -#: builtin/pack-objects.c:3484 +#: builtin/pack-objects.c:3531 msgid "limit the objects to those that are not yet packed" msgstr "limitar los objetos a aquellos que no han sido empaquetados todavía" -#: builtin/pack-objects.c:3487 +#: builtin/pack-objects.c:3534 msgid "include objects reachable from any reference" msgstr "incluir objetos alcanzables por cualquier referencia" -#: builtin/pack-objects.c:3490 +#: builtin/pack-objects.c:3537 msgid "include objects referred by reflog entries" msgstr "incluir objetos referidos por entradas de reflog" -#: builtin/pack-objects.c:3493 +#: builtin/pack-objects.c:3540 msgid "include objects referred to by the index" msgstr "incluir objetos referidos por el índice" -#: builtin/pack-objects.c:3496 +#: builtin/pack-objects.c:3543 msgid "output pack to stdout" msgstr "mostrar paquete en stdout" -#: builtin/pack-objects.c:3498 +#: builtin/pack-objects.c:3545 msgid "include tag objects that refer to objects to be packed" msgstr "incluir objetos tag que refieren a objetos a ser empaquetados" -#: builtin/pack-objects.c:3500 +#: builtin/pack-objects.c:3547 msgid "keep unreachable objects" msgstr "mantener objetos inalcanzables" -#: builtin/pack-objects.c:3502 +#: builtin/pack-objects.c:3549 msgid "pack loose unreachable objects" msgstr "empaquetar objetos sueltos inalcanzables" -#: builtin/pack-objects.c:3504 +#: builtin/pack-objects.c:3551 msgid "unpack unreachable objects newer than <time>" msgstr "desempaquetar objetos inalcanzables más nuevos que <tiempo>" -#: builtin/pack-objects.c:3507 +#: builtin/pack-objects.c:3554 msgid "use the sparse reachability algorithm" msgstr "usar el algoritmo sparse reachability" -#: builtin/pack-objects.c:3509 +#: builtin/pack-objects.c:3556 msgid "create thin packs" msgstr "crear paquetes delgados" -#: builtin/pack-objects.c:3511 +#: builtin/pack-objects.c:3558 msgid "create packs suitable for shallow fetches" msgstr "crear paquetes adecuados para fetches superficiales" -#: builtin/pack-objects.c:3513 +#: builtin/pack-objects.c:3560 msgid "ignore packs that have companion .keep file" msgstr "ignorar paquetes que tienen un archivo .keep acompañante" -#: builtin/pack-objects.c:3515 +#: builtin/pack-objects.c:3562 msgid "ignore this pack" msgstr "ignorar este paquete" -#: builtin/pack-objects.c:3517 +#: builtin/pack-objects.c:3564 msgid "pack compression level" msgstr "nivel de compresión del paquete" -#: builtin/pack-objects.c:3519 +#: builtin/pack-objects.c:3566 msgid "do not hide commits by grafts" msgstr "no ocultar commits por injertos" -#: builtin/pack-objects.c:3521 +#: builtin/pack-objects.c:3568 msgid "use a bitmap index if available to speed up counting objects" msgstr "" "usar un índice bitmap si está disponible para acelerar la cuenta de objetos" -#: builtin/pack-objects.c:3523 +#: builtin/pack-objects.c:3570 msgid "write a bitmap index together with the pack index" msgstr "escribir un índice de bitmap junto al índice de paquete" -#: builtin/pack-objects.c:3527 +#: builtin/pack-objects.c:3574 msgid "write a bitmap index if possible" msgstr "escribir un índice de bitmap si es posible" -#: builtin/pack-objects.c:3531 +#: builtin/pack-objects.c:3578 msgid "handling for missing objects" msgstr "manejo de objetos perdidos" -#: builtin/pack-objects.c:3534 +#: builtin/pack-objects.c:3581 msgid "do not pack objects in promisor packfiles" msgstr "no se puede empaquetar objetos en packfiles promisores" -#: builtin/pack-objects.c:3536 +#: builtin/pack-objects.c:3583 msgid "respect islands during delta compression" msgstr "respetar islas durante la compresión delta" -#: builtin/pack-objects.c:3538 +#: builtin/pack-objects.c:3585 msgid "protocol" msgstr "protocolo" -#: builtin/pack-objects.c:3539 +#: builtin/pack-objects.c:3586 msgid "exclude any configured uploadpack.blobpackfileuri with this protocol" msgstr "" "excluyendo cualquier uploadpack.blobpackfileuri configurado con este " "protocolo" -#: builtin/pack-objects.c:3568 +#: builtin/pack-objects.c:3617 #, c-format msgid "delta chain depth %d is too deep, forcing %d" msgstr "profundidad de cadena de delta %d es muy profunda, forzando %d" -#: builtin/pack-objects.c:3573 +#: builtin/pack-objects.c:3622 #, c-format msgid "pack.deltaCacheLimit is too high, forcing %d" msgstr "pack.deltaCacheLimit es muy grande, forzando %d" -#: builtin/pack-objects.c:3627 +#: builtin/pack-objects.c:3676 msgid "--max-pack-size cannot be used to build a pack for transfer" msgstr "" "--max-pack-size no puede ser usado para construir un paquete para " "transferencia" -#: builtin/pack-objects.c:3629 +#: builtin/pack-objects.c:3678 msgid "minimum pack size limit is 1 MiB" msgstr "tamaño mínimo del paquete es 1 MiB" -#: builtin/pack-objects.c:3634 +#: builtin/pack-objects.c:3683 msgid "--thin cannot be used to build an indexable pack" msgstr "--thin no puede ser usado para construir un paquete indexable" -#: builtin/pack-objects.c:3637 +#: builtin/pack-objects.c:3686 msgid "--keep-unreachable and --unpack-unreachable are incompatible" msgstr "--keep-unreachable y --unpack-unreachable son incompatibles" -#: builtin/pack-objects.c:3643 +#: builtin/pack-objects.c:3692 msgid "cannot use --filter without --stdout" msgstr "no se puede usar--filter sin --stdout" -#: builtin/pack-objects.c:3703 +#: builtin/pack-objects.c:3752 msgid "Enumerating objects" msgstr "Enumerando objetos" -#: builtin/pack-objects.c:3734 +#: builtin/pack-objects.c:3783 #, c-format msgid "" "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-" @@ -17832,6 +18759,20 @@ msgstr "" "Total %<PRIu32> (delta %<PRIu32>), reusado %<PRIu32> (delta %<PRIu32>), pack-" "reusado %<PRIu32>" +#: builtin/pack-redundant.c:601 +msgid "" +"'git pack-redundant' is nominated for removal.\n" +"If you still use this command, please add an extra\n" +"option, '--i-still-use-this', on the command line\n" +"and let us know you still use it by sending an e-mail\n" +"to <git@vger.kernel.org>. Thanks.\n" +msgstr "" +"'git pack-redundant' está nominado para su eliminación.\n" +"Si todavía usa este comando, agregue un extra\n" +"opción, '--i-still-use-this', en la línea de comando\n" +"y háganos saber que todavía lo usa enviando un correo electrónico\n" +"a <git@vger.kernel.org>. Gracias.\n" + #: builtin/pack-refs.c:8 msgid "git pack-refs [<options>]" msgstr "git pack-refs [<opciones>]" @@ -17890,7 +18831,7 @@ msgstr "Opciones relacionadas a fusión" msgid "incorporate changes by rebasing rather than merging" msgstr "incorporar cambios por rebase en lugar de fusión" -#: builtin/pull.c:158 builtin/rebase.c:478 builtin/revert.c:126 +#: builtin/pull.c:158 builtin/rebase.c:492 builtin/revert.c:126 msgid "allow fast-forward" msgstr "permitir fast-forward" @@ -17915,49 +18856,19 @@ msgstr "número de submódulos que realizan pull en paralelo" msgid "Invalid value for pull.ff: %s" msgstr "Valor inválido para pull.ff: %s" -#: builtin/pull.c:349 -msgid "" -"Pulling without specifying how to reconcile divergent branches is\n" -"discouraged. You can squelch this message by running one of the following\n" -"commands sometime before your next pull:\n" -"\n" -" git config pull.rebase false # merge (the default strategy)\n" -" git config pull.rebase true # rebase\n" -" git config pull.ff only # fast-forward only\n" -"\n" -"You can replace \"git config\" with \"git config --global\" to set a " -"default\n" -"preference for all repositories. You can also pass --rebase, --no-rebase,\n" -"or --ff-only on the command line to override the configured default per\n" -"invocation.\n" -msgstr "" -"Hacer un pull sin especificar cómo reconciliar las ramas es poco\n" -"recomendable. Puedes eliminar este mensaje usando uno de los\n" -"siguientes comandos antes de tu siguiente pull:\n" -"\n" -" git config pull.rebase false # hacer merge (estrategia por defecto)\n" -" git config pull.rebase true # aplicar rebase\n" -" git config pull.ff only # aplicar solo fast-forward\n" -"\n" -"Puedes reemplazar \"git config\" con \"git config --global\" para aplicar\n" -"la preferencia en todos los repositorios. Puedes también pasar --rebase,\n" -"--no-rebase, o --ff-only en el comando para sobreescribir la configuración\n" -"por defecto en cada invocación.\n" -"\n" - -#: builtin/pull.c:459 +#: builtin/pull.c:445 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." msgstr "No hay candidato para rebasar entre las refs que has bajado con fetch." -#: builtin/pull.c:461 +#: builtin/pull.c:447 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "" "No hay candidatos para fusionar entre las refs que has bajado con fetch." -#: builtin/pull.c:462 +#: builtin/pull.c:448 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." @@ -17966,7 +18877,7 @@ msgstr "" "tiene\n" "concordancia en el final remoto." -#: builtin/pull.c:465 +#: builtin/pull.c:451 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -17977,44 +18888,43 @@ msgstr "" "una rama. Porque este no es el remoto configurado por default\n" "para tu rama actual, tienes que especificar una rama en la línea de comando." -#: builtin/pull.c:470 builtin/rebase.c:1234 git-parse-remote.sh:73 +#: builtin/pull.c:456 builtin/rebase.c:1253 msgid "You are not currently on a branch." msgstr "No te encuentras actualmente en la rama." -#: builtin/pull.c:472 builtin/pull.c:487 git-parse-remote.sh:79 +#: builtin/pull.c:458 builtin/pull.c:473 msgid "Please specify which branch you want to rebase against." msgstr "Por favor especifica a qué rama quieres rebasar." -#: builtin/pull.c:474 builtin/pull.c:489 git-parse-remote.sh:82 +#: builtin/pull.c:460 builtin/pull.c:475 msgid "Please specify which branch you want to merge with." msgstr "Por favor especifica a qué rama quieres fusionar." -#: builtin/pull.c:475 builtin/pull.c:490 +#: builtin/pull.c:461 builtin/pull.c:476 msgid "See git-pull(1) for details." msgstr "Ver git-pull(1) para detalles." -#: builtin/pull.c:477 builtin/pull.c:483 builtin/pull.c:492 -#: builtin/rebase.c:1240 git-parse-remote.sh:64 +#: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478 +#: builtin/rebase.c:1259 msgid "<remote>" msgstr "<remoto>" -#: builtin/pull.c:477 builtin/pull.c:492 builtin/pull.c:497 -#: git-parse-remote.sh:65 +#: builtin/pull.c:463 builtin/pull.c:478 builtin/pull.c:483 msgid "<branch>" msgstr "<rama>" -#: builtin/pull.c:485 builtin/rebase.c:1232 git-parse-remote.sh:75 +#: builtin/pull.c:471 builtin/rebase.c:1251 msgid "There is no tracking information for the current branch." msgstr "No hay información de rastreo para la rama actual." -#: builtin/pull.c:494 git-parse-remote.sh:95 +#: builtin/pull.c:480 msgid "" "If you wish to set tracking information for this branch you can do so with:" msgstr "" "Si deseas configurar el rastreo de información para esta rama, puedes " "hacerlo con:" -#: builtin/pull.c:499 +#: builtin/pull.c:485 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -18023,28 +18933,58 @@ msgstr "" "Tu configuración especifica fusionar con la ref '%s'\n" "de tu remoto, pero no se pudo hacer fetch a esa ref." -#: builtin/pull.c:610 +#: builtin/pull.c:596 #, c-format msgid "unable to access commit %s" msgstr "no es posible acceder al commit %s" -#: builtin/pull.c:895 +#: builtin/pull.c:902 msgid "ignoring --verify-signatures for rebase" msgstr "ignorando --verify-signatures para rebase" -#: builtin/pull.c:955 +#: builtin/pull.c:930 +msgid "" +"Pulling without specifying how to reconcile divergent branches is\n" +"discouraged. You can squelch this message by running one of the following\n" +"commands sometime before your next pull:\n" +"\n" +" git config pull.rebase false # merge (the default strategy)\n" +" git config pull.rebase true # rebase\n" +" git config pull.ff only # fast-forward only\n" +"\n" +"You can replace \"git config\" with \"git config --global\" to set a " +"default\n" +"preference for all repositories. You can also pass --rebase, --no-rebase,\n" +"or --ff-only on the command line to override the configured default per\n" +"invocation.\n" +msgstr "" +"Hacer un pull sin especificar cómo reconciliar las ramas es poco\n" +"recomendable. Puedes eliminar este mensaje usando uno de los\n" +"siguientes comandos antes de tu siguiente pull:\n" +"\n" +" git config pull.rebase false # hacer merge (estrategia por defecto)\n" +" git config pull.rebase true # aplicar rebase\n" +" git config pull.ff only # aplicar solo fast-forward\n" +"\n" +"Puedes reemplazar \"git config\" con \"git config --global\" para aplicar\n" +"la preferencia en todos los repositorios. Puedes también pasar --rebase,\n" +"--no-rebase, o --ff-only en el comando para sobreescribir la configuración\n" +"por defecto en cada invocación.\n" +"\n" + +#: builtin/pull.c:991 msgid "Updating an unborn branch with changes added to the index." msgstr "Actualizando una rama no nata con cambios agregados al índice." -#: builtin/pull.c:959 +#: builtin/pull.c:995 msgid "pull with rebase" msgstr "pull con rebase" -#: builtin/pull.c:960 +#: builtin/pull.c:996 msgid "please commit or stash them." msgstr "por favor realiza un commit o un stash con ellos." -#: builtin/pull.c:985 +#: builtin/pull.c:1021 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -18055,7 +18995,7 @@ msgstr "" "realizando fast-forward al árbol de trabajo\n" "desde commit %s." -#: builtin/pull.c:991 +#: builtin/pull.c:1027 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -18072,15 +19012,15 @@ msgstr "" "$ git reset --hard\n" "para recuperar." -#: builtin/pull.c:1006 +#: builtin/pull.c:1042 msgid "Cannot merge multiple branches into empty head." msgstr "No se puede fusionar múltiples ramas en un head vacío." -#: builtin/pull.c:1010 +#: builtin/pull.c:1046 msgid "Cannot rebase onto multiple branches." msgstr "No se puede rebasar en múltiples ramas." -#: builtin/pull.c:1018 +#: builtin/pull.c:1067 msgid "cannot rebase with locally recorded submodule modifications" msgstr "" "no se puede rebasar con modificaciones de submódulos grabadas localmente" @@ -18090,15 +19030,15 @@ msgid "git push [<options>] [<repository> [<refspec>...]]" msgstr "" "git push [<opciones>] [<repositorio> [<especificaciones-de-referencia>...]]" -#: builtin/push.c:112 +#: builtin/push.c:111 msgid "tag shorthand without <tag>" msgstr "taquigrafía de tag sin <tag>" -#: builtin/push.c:122 +#: builtin/push.c:119 msgid "--delete only accepts plain target ref names" msgstr "--delete solo acepta como objetivos nombres de ref planos" -#: builtin/push.c:168 +#: builtin/push.c:164 msgid "" "\n" "To choose either option permanently, see push.default in 'git help config'." @@ -18107,7 +19047,7 @@ msgstr "" "Para elegir si la opción es permanente, mira push.default en 'git help " "config'." -#: builtin/push.c:171 +#: builtin/push.c:167 #, c-format msgid "" "The upstream branch of your current branch does not match\n" @@ -18132,7 +19072,7 @@ msgstr "" " git push %s HEAD\n" "%s" -#: builtin/push.c:186 +#: builtin/push.c:182 #, c-format msgid "" "You are not currently on a branch.\n" @@ -18147,7 +19087,7 @@ msgstr "" "\n" "\tgit push %s HEAD:<nombre-de-rama-remota>\n" -#: builtin/push.c:200 +#: builtin/push.c:194 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -18161,12 +19101,12 @@ msgstr "" "\n" "\tgit push --set-upstream %s %s\n" -#: builtin/push.c:208 +#: builtin/push.c:202 #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." msgstr "La rama actual %s tiene múltiples ramas upstream, rechazando el push." -#: builtin/push.c:211 +#: builtin/push.c:205 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -18177,13 +19117,13 @@ msgstr "" "la rama actual '%s', sin decirme qué poner en el push\n" "para actualizar en qué rama de remoto." -#: builtin/push.c:270 +#: builtin/push.c:260 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "" "No se especificó ningún refspecs para hacer push, y push.default es \"nada\"." -#: builtin/push.c:277 +#: builtin/push.c:267 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -18195,7 +19135,7 @@ msgstr "" "'git pull ...') antes de hacer push de nuevo.\n" "Mira 'Note about fast-forwards' en 'git push --help' para más detalles." -#: builtin/push.c:283 +#: builtin/push.c:273 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. Check out this branch and integrate the remote changes\n" @@ -18208,7 +19148,7 @@ msgstr "" "(ejem. 'git pull ...') antes de volver a hacer push.\n" "Vea las 'Notes about fast-forwards' en 'git push --help' para más detalles." -#: builtin/push.c:289 +#: builtin/push.c:279 msgid "" "Updates were rejected because the remote contains work that you do\n" "not have locally. This is usually caused by another repository pushing\n" @@ -18222,12 +19162,12 @@ msgstr "" "remotos (ej. 'git pull ...') antes de volver a hacer push.\n" "Vea 'Notes about fast-forwards0 en 'git push --help' para detalles." -#: builtin/push.c:296 +#: builtin/push.c:286 msgid "Updates were rejected because the tag already exists in the remote." msgstr "" "Actualizaciones fueron rechazadas porque el tag ya existe en el remoto." -#: builtin/push.c:299 +#: builtin/push.c:289 msgid "" "You cannot update a remote ref that points at a non-commit object,\n" "or update a remote ref to make it point at a non-commit object,\n" @@ -18237,99 +19177,117 @@ msgstr "" "o actualizar un ref remoto para hacer que apunte a un objeto no-commit,\n" "sin usar la opción '--force'.\n" -#: builtin/push.c:361 +#: builtin/push.c:294 +msgid "" +"Updates were rejected because the tip of the remote-tracking\n" +"branch has been updated since the last checkout. You may want\n" +"to integrate those changes locally (e.g., 'git pull ...')\n" +"before forcing an update.\n" +msgstr "" +"Las actualizaciones se rechazaron porque la sugerencia del seguimiento " +"remoto\n" +"rama se ha actualizado desde la última vez que se realizó la compra. Es " +"posible que desee\n" +"para integrar esos cambios localmente (por ejemplo, 'git pull ...')\n" +"antes de forzar una actualización.\n" + +#: builtin/push.c:364 #, c-format msgid "Pushing to %s\n" msgstr "Haciendo push a %s\n" -#: builtin/push.c:368 +#: builtin/push.c:371 #, c-format msgid "failed to push some refs to '%s'" msgstr "falló el push de algunas referencias a '%s'" -#: builtin/push.c:542 +#: builtin/push.c:553 msgid "repository" msgstr "repositorio" -#: builtin/push.c:543 builtin/send-pack.c:164 +#: builtin/push.c:554 builtin/send-pack.c:189 msgid "push all refs" msgstr "realizar push a todas las refs" -#: builtin/push.c:544 builtin/send-pack.c:166 +#: builtin/push.c:555 builtin/send-pack.c:191 msgid "mirror all refs" msgstr "realizar mirror a todas las refs" -#: builtin/push.c:546 +#: builtin/push.c:557 msgid "delete refs" msgstr "borrar refs" -#: builtin/push.c:547 +#: builtin/push.c:558 msgid "push tags (can't be used with --all or --mirror)" msgstr "realizar push a tags (no puede ser usado con --all o --mirror)" -#: builtin/push.c:550 builtin/send-pack.c:167 +#: builtin/push.c:561 builtin/send-pack.c:192 msgid "force updates" msgstr "forzar actualizaciones" -#: builtin/push.c:551 builtin/send-pack.c:179 +#: builtin/push.c:562 builtin/send-pack.c:204 msgid "<refname>:<expect>" msgstr "<refname>:<expect>" -#: builtin/push.c:552 builtin/send-pack.c:180 +#: builtin/push.c:563 builtin/send-pack.c:205 msgid "require old value of ref to be at this value" msgstr "requiere haber valor viejo de ref en este valor" -#: builtin/push.c:555 +#: builtin/push.c:566 builtin/send-pack.c:208 +msgid "require remote updates to be integrated locally" +msgstr "requieren que las actualizaciones remotas se integren localmente" + +#: builtin/push.c:569 msgid "control recursive pushing of submodules" msgstr "controlar push recursivo de submódulos" -#: builtin/push.c:556 builtin/send-pack.c:174 +#: builtin/push.c:570 builtin/send-pack.c:199 msgid "use thin pack" msgstr "usar empaquetado delgado" -#: builtin/push.c:557 builtin/push.c:558 builtin/send-pack.c:161 -#: builtin/send-pack.c:162 +#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:186 +#: builtin/send-pack.c:187 msgid "receive pack program" msgstr "recibir programa de paquete" -#: builtin/push.c:559 +#: builtin/push.c:573 msgid "set upstream for git pull/status" msgstr "configurar upstream para git pulll/status" -#: builtin/push.c:562 +#: builtin/push.c:576 msgid "prune locally removed refs" msgstr "recortando refs eliminadas localmente" -#: builtin/push.c:564 +#: builtin/push.c:578 msgid "bypass pre-push hook" msgstr "hacer un bypass al hook pre-push" -#: builtin/push.c:565 +#: builtin/push.c:579 msgid "push missing but relevant tags" msgstr "realizar push de tags faltantes pero relevantes" -#: builtin/push.c:567 builtin/send-pack.c:168 +#: builtin/push.c:581 builtin/send-pack.c:193 msgid "GPG sign the push" msgstr "Firmar con GPG el push" -#: builtin/push.c:569 builtin/send-pack.c:175 +#: builtin/push.c:583 builtin/send-pack.c:200 msgid "request atomic transaction on remote side" msgstr "solicitar transacción atómica en el lado remoto" -#: builtin/push.c:587 +#: builtin/push.c:601 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete es incompatible con --all, --mirror y --tags" -#: builtin/push.c:589 +#: builtin/push.c:603 msgid "--delete doesn't make sense without any refs" msgstr "--delete no tiene sentido sin ninguna referencia" -#: builtin/push.c:609 +#: builtin/push.c:623 #, c-format msgid "bad repository '%s'" msgstr "mal repositorio '%s'" -#: builtin/push.c:610 +#: builtin/push.c:624 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -18351,70 +19309,78 @@ msgstr "" "\n" " git push <nombre>\n" -#: builtin/push.c:625 +#: builtin/push.c:639 msgid "--all and --tags are incompatible" msgstr "--all y --tags son incompatibles" -#: builtin/push.c:627 +#: builtin/push.c:641 msgid "--all can't be combined with refspecs" msgstr "--all no puede ser combinada con refspecs" -#: builtin/push.c:631 +#: builtin/push.c:645 msgid "--mirror and --tags are incompatible" msgstr "--mirror y --tags son incompatibles" -#: builtin/push.c:633 +#: builtin/push.c:647 msgid "--mirror can't be combined with refspecs" msgstr "--mirror no puede ser combinado con refspecs" -#: builtin/push.c:636 +#: builtin/push.c:650 msgid "--all and --mirror are incompatible" msgstr "--all y --mirror son incompatibles" -#: builtin/push.c:640 +#: builtin/push.c:657 msgid "push options must not have new line characters" msgstr "opciones de push no pueden tener caracteres de línea nueva" -#: builtin/range-diff.c:8 +#: builtin/range-diff.c:9 msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>" msgstr "" "git range-diff [<opciones>] <base-vieja>..<punta-vieja> <base-nueva>..<punta-" "nueva>" -#: builtin/range-diff.c:9 +#: builtin/range-diff.c:10 msgid "git range-diff [<options>] <old-tip>...<new-tip>" msgstr "git range-diff [<opciones>] <punta-vieja>...<punta-nueva>" -#: builtin/range-diff.c:10 +#: builtin/range-diff.c:11 msgid "git range-diff [<options>] <base> <old-tip> <new-tip>" msgstr "git range-diff [<opciones>] <base> <punta-vieja> <punta-nueva>" -#: builtin/range-diff.c:22 +#: builtin/range-diff.c:28 msgid "Percentage by which creation is weighted" msgstr "Porcentaje por el cual la creación es pesada" -#: builtin/range-diff.c:24 +#: builtin/range-diff.c:30 msgid "use simple diff colors" msgstr "usar colores simples de diff" -#: builtin/range-diff.c:26 +#: builtin/range-diff.c:32 msgid "notes" msgstr "notas" -#: builtin/range-diff.c:26 +#: builtin/range-diff.c:32 msgid "passed to 'git log'" msgstr "pasado a 'git log'" -#: builtin/range-diff.c:50 builtin/range-diff.c:54 +#: builtin/range-diff.c:35 +msgid "only emit output related to the first range" +msgstr "solo emite salida relacionada con el primer rango" + +#: builtin/range-diff.c:37 +msgid "only emit output related to the second range" +msgstr "solo emite salida relacionada con el segundo rango" + +#: builtin/range-diff.c:60 builtin/range-diff.c:64 #, c-format -msgid "no .. in range: '%s'" -msgstr "no .. en rango: '%s'" +msgid "not a commit range: '%s'" +msgstr "no es un rango de commit: '%s'" -#: builtin/range-diff.c:64 +#: builtin/range-diff.c:74 msgid "single arg format must be symmetric range" msgstr "argumento único de formato debe ser un rango simétrico" -#: builtin/range-diff.c:79 +#: builtin/range-diff.c:89 msgid "need two commit ranges" msgstr "se necesitan dos rangos de commits" @@ -18519,193 +19485,193 @@ msgstr "" msgid "git rebase --continue | --abort | --skip | --edit-todo" msgstr "git rebase --continue | --abort | --skip | --edit-todo" -#: builtin/rebase.c:181 builtin/rebase.c:205 builtin/rebase.c:232 +#: builtin/rebase.c:195 builtin/rebase.c:219 builtin/rebase.c:246 #, c-format msgid "unusable todo list: '%s'" msgstr "lista de pendientes inutilizable: '%s'" -#: builtin/rebase.c:298 +#: builtin/rebase.c:312 #, c-format msgid "could not create temporary %s" msgstr "no se pudo crear archivo temporal %s" -#: builtin/rebase.c:304 +#: builtin/rebase.c:318 msgid "could not mark as interactive" msgstr "no se pudo marcar como interactivo" -#: builtin/rebase.c:358 +#: builtin/rebase.c:371 msgid "could not generate todo list" msgstr "no se pudo generar lista de pendientes" -#: builtin/rebase.c:399 +#: builtin/rebase.c:413 msgid "a base commit must be provided with --upstream or --onto" msgstr "un commit base tiene que ser provisto con --upstream o --onto" -#: builtin/rebase.c:468 +#: builtin/rebase.c:482 msgid "git rebase--interactive [<options>]" msgstr "git rebase--interactive [<opciones>]" -#: builtin/rebase.c:481 builtin/rebase.c:1374 +#: builtin/rebase.c:495 builtin/rebase.c:1394 msgid "keep commits which start empty" msgstr "mantener commits que comienzan con vacío" -#: builtin/rebase.c:485 builtin/revert.c:128 +#: builtin/rebase.c:499 builtin/revert.c:128 msgid "allow commits with empty messages" msgstr "permitir commits con mensajes vacíos" -#: builtin/rebase.c:487 +#: builtin/rebase.c:501 msgid "rebase merge commits" msgstr "rebasando commits de fusión" -#: builtin/rebase.c:489 +#: builtin/rebase.c:503 msgid "keep original branch points of cousins" msgstr "mantener puntos originales de la rama de sus primos" -#: builtin/rebase.c:491 +#: builtin/rebase.c:505 msgid "move commits that begin with squash!/fixup!" msgstr "mover commits que comienzan con squash!/fixup!" -#: builtin/rebase.c:492 +#: builtin/rebase.c:506 msgid "sign commits" msgstr "firmar commits" -#: builtin/rebase.c:494 builtin/rebase.c:1314 +#: builtin/rebase.c:508 builtin/rebase.c:1333 msgid "display a diffstat of what changed upstream" msgstr "mostrar un diffstat de lo que cambió en upstream" -#: builtin/rebase.c:496 +#: builtin/rebase.c:510 msgid "continue rebase" msgstr "continuar rebase" -#: builtin/rebase.c:498 +#: builtin/rebase.c:512 msgid "skip commit" msgstr "saltar commit" -#: builtin/rebase.c:499 +#: builtin/rebase.c:513 msgid "edit the todo list" msgstr "editar la lista de pendientes" -#: builtin/rebase.c:501 +#: builtin/rebase.c:515 msgid "show the current patch" msgstr "mostrar el parche actual" -#: builtin/rebase.c:504 +#: builtin/rebase.c:518 msgid "shorten commit ids in the todo list" msgstr "ids de commits cortos en la lista de pendientes" -#: builtin/rebase.c:506 +#: builtin/rebase.c:520 msgid "expand commit ids in the todo list" msgstr "expandir ids de commits en la lista de pendientes" -#: builtin/rebase.c:508 +#: builtin/rebase.c:522 msgid "check the todo list" msgstr "revisar la lista de pendientes" -#: builtin/rebase.c:510 +#: builtin/rebase.c:524 msgid "rearrange fixup/squash lines" msgstr "reorganizar líneas fixup/squash" -#: builtin/rebase.c:512 +#: builtin/rebase.c:526 msgid "insert exec commands in todo list" msgstr "insertar comando exec en la lista de pendientes" -#: builtin/rebase.c:513 +#: builtin/rebase.c:527 msgid "onto" msgstr "hacia" -#: builtin/rebase.c:516 +#: builtin/rebase.c:530 msgid "restrict-revision" msgstr "restrict-revision" -#: builtin/rebase.c:516 +#: builtin/rebase.c:530 msgid "restrict revision" msgstr "restringir revision" -#: builtin/rebase.c:518 +#: builtin/rebase.c:532 msgid "squash-onto" msgstr "squash-onto" -#: builtin/rebase.c:519 +#: builtin/rebase.c:533 msgid "squash onto" msgstr "squash hacia" -#: builtin/rebase.c:521 +#: builtin/rebase.c:535 msgid "the upstream commit" msgstr "el commit de upstream" -#: builtin/rebase.c:523 +#: builtin/rebase.c:537 msgid "head-name" msgstr "head-name" -#: builtin/rebase.c:523 +#: builtin/rebase.c:537 msgid "head name" msgstr "nombre de head" -#: builtin/rebase.c:528 +#: builtin/rebase.c:542 msgid "rebase strategy" msgstr "estrategia de rebase" -#: builtin/rebase.c:529 +#: builtin/rebase.c:543 msgid "strategy-opts" msgstr "strategy-opts" -#: builtin/rebase.c:530 +#: builtin/rebase.c:544 msgid "strategy options" msgstr "opciones de estrategia" -#: builtin/rebase.c:531 +#: builtin/rebase.c:545 msgid "switch-to" msgstr "cambiar a" -#: builtin/rebase.c:532 +#: builtin/rebase.c:546 msgid "the branch or commit to checkout" msgstr "la rama o commit para hacer checkout" -#: builtin/rebase.c:533 +#: builtin/rebase.c:547 msgid "onto-name" msgstr "hacia-nombre" -#: builtin/rebase.c:533 +#: builtin/rebase.c:547 msgid "onto name" msgstr "hacia nombre" -#: builtin/rebase.c:534 +#: builtin/rebase.c:548 msgid "cmd" msgstr "cmd" -#: builtin/rebase.c:534 +#: builtin/rebase.c:548 msgid "the command to run" msgstr "el comando para ejecutar" -#: builtin/rebase.c:537 builtin/rebase.c:1407 +#: builtin/rebase.c:551 builtin/rebase.c:1427 msgid "automatically re-schedule any `exec` that fails" msgstr "reprogramar automaticamente cualquier `exec` que falle" -#: builtin/rebase.c:553 +#: builtin/rebase.c:567 msgid "--[no-]rebase-cousins has no effect without --rebase-merges" msgstr "--[no-]rebase-cousins no tiene efecto sin --rebase-merges" -#: builtin/rebase.c:569 +#: builtin/rebase.c:583 #, c-format msgid "%s requires the merge backend" msgstr "%s requiere un backend de fusión" -#: builtin/rebase.c:612 +#: builtin/rebase.c:626 #, c-format msgid "could not get 'onto': '%s'" msgstr "no se pudo conseguir 'onto': '%s'" -#: builtin/rebase.c:629 +#: builtin/rebase.c:643 #, c-format msgid "invalid orig-head: '%s'" msgstr "orig-head inválido: '%s'" -#: builtin/rebase.c:654 +#: builtin/rebase.c:668 #, c-format msgid "ignoring invalid allow_rerere_autoupdate: '%s'" msgstr "ignorando inválido allow_rerere_autoupdate: '%s'" -#: builtin/rebase.c:799 git-rebase--preserve-merges.sh:81 +#: builtin/rebase.c:813 git-rebase--preserve-merges.sh:81 msgid "" "Resolve all conflicts manually, mark them as resolved with\n" "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n" @@ -18720,7 +19686,7 @@ msgstr "" "Para abortar y regresar al estado previo al \"git rebase\", ejecuta \"git " "rebase --abort\"." -#: builtin/rebase.c:882 +#: builtin/rebase.c:896 #, c-format msgid "" "\n" @@ -18739,7 +19705,7 @@ msgstr "" "\n" "Como resultado, git no puede hacer rebase con ellos." -#: builtin/rebase.c:1208 +#: builtin/rebase.c:1227 #, c-format msgid "" "unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask" @@ -18748,7 +19714,7 @@ msgstr "" "tipo '%s' vacío y desconocido; valores válidos son \"drop\", \"keep\", y " "\"ask\"." -#: builtin/rebase.c:1226 +#: builtin/rebase.c:1245 #, c-format msgid "" "%s\n" @@ -18765,7 +19731,7 @@ msgstr "" " git rebase '<rama>'\n" "\n" -#: builtin/rebase.c:1242 +#: builtin/rebase.c:1261 #, c-format msgid "" "If you wish to set tracking information for this branch you can do so with:\n" @@ -18778,137 +19744,149 @@ msgstr "" " git branch --set-upstream-to=%s/<rama> %s\n" "\n" -#: builtin/rebase.c:1272 +#: builtin/rebase.c:1291 msgid "exec commands cannot contain newlines" msgstr "comandos exec no pueden contener newlines" -#: builtin/rebase.c:1276 +#: builtin/rebase.c:1295 msgid "empty exec command" msgstr "comando exec vacío" -#: builtin/rebase.c:1305 +#: builtin/rebase.c:1324 msgid "rebase onto given branch instead of upstream" msgstr "haciendo rebase hacia rama dada en lugar de upstream" -#: builtin/rebase.c:1307 +#: builtin/rebase.c:1326 msgid "use the merge-base of upstream and branch as the current base" msgstr "usar la base de fusión de upstream y la rama como base actual" -#: builtin/rebase.c:1309 +#: builtin/rebase.c:1328 msgid "allow pre-rebase hook to run" msgstr "permitir ejecutar hook pre-rebase" -#: builtin/rebase.c:1311 +#: builtin/rebase.c:1330 msgid "be quiet. implies --no-stat" msgstr "ser silencioso implica --no-stat" -#: builtin/rebase.c:1317 +#: builtin/rebase.c:1336 msgid "do not show diffstat of what changed upstream" msgstr "no mostrar un diffstat de lo que cambió en upstream" -#: builtin/rebase.c:1320 -msgid "add a Signed-off-by: line to each commit" +#: builtin/rebase.c:1339 +msgid "add a Signed-off-by trailer to each commit" msgstr "agregar una línea \"Firmado-por\" al mensaje de cada commit" -#: builtin/rebase.c:1322 builtin/rebase.c:1326 builtin/rebase.c:1328 -msgid "passed to 'git am'" -msgstr "pasado a 'git am'" +#: builtin/rebase.c:1342 +msgid "make committer date match author date" +msgstr "hacer que la fecha del commit concuerde con la fecha de autoría" -#: builtin/rebase.c:1330 builtin/rebase.c:1332 +#: builtin/rebase.c:1344 +msgid "ignore author date and use current date" +msgstr "ignorar la fecha del autor y usar la fecha actual" + +#: builtin/rebase.c:1346 +msgid "synonym of --reset-author-date" +msgstr "sinónimo para --reset-author-date" + +#: builtin/rebase.c:1348 builtin/rebase.c:1352 msgid "passed to 'git apply'" msgstr "pasado a 'git-apply'" -#: builtin/rebase.c:1334 builtin/rebase.c:1337 +#: builtin/rebase.c:1350 +msgid "ignore changes in whitespace" +msgstr "ignorar cambios en espacios en blanco" + +#: builtin/rebase.c:1354 builtin/rebase.c:1357 msgid "cherry-pick all commits, even if unchanged" msgstr "cherry-pick todos los commits, incluso si no han cambiado" -#: builtin/rebase.c:1339 +#: builtin/rebase.c:1359 msgid "continue" msgstr "continuar" -#: builtin/rebase.c:1342 +#: builtin/rebase.c:1362 msgid "skip current patch and continue" msgstr "saltar el parche y continuar" -#: builtin/rebase.c:1344 +#: builtin/rebase.c:1364 msgid "abort and check out the original branch" msgstr "aborta y revisa la rama original" -#: builtin/rebase.c:1347 +#: builtin/rebase.c:1367 msgid "abort but keep HEAD where it is" msgstr "aborta pero mantiene HEAD donde está" -#: builtin/rebase.c:1348 +#: builtin/rebase.c:1368 msgid "edit the todo list during an interactive rebase" msgstr "editar la lista de pendientes durante el rebase interactivo" -#: builtin/rebase.c:1351 +#: builtin/rebase.c:1371 msgid "show the patch file being applied or merged" msgstr "muestra el archivo parche siendo aplicado o fusionado" -#: builtin/rebase.c:1354 +#: builtin/rebase.c:1374 msgid "use apply strategies to rebase" msgstr "usar estrategias de apply para el rebase" -#: builtin/rebase.c:1358 +#: builtin/rebase.c:1378 msgid "use merging strategies to rebase" msgstr "usar estrategias de fusión para el rebase" -#: builtin/rebase.c:1362 +#: builtin/rebase.c:1382 msgid "let the user edit the list of commits to rebase" msgstr "permitir al usuario editar la lista de commits para rebasar" -#: builtin/rebase.c:1366 +#: builtin/rebase.c:1386 msgid "(DEPRECATED) try to recreate merges instead of ignoring them" msgstr "(DEPRECADO) intentar recrear merges en lugar de ignorarlos" -#: builtin/rebase.c:1371 +#: builtin/rebase.c:1391 msgid "how to handle commits that become empty" msgstr "como manejar commits que se vuelven vacíos" -#: builtin/rebase.c:1378 +#: builtin/rebase.c:1398 msgid "move commits that begin with squash!/fixup! under -i" msgstr "mover commits que comienzan con squash!/fixup! bajo -i" -#: builtin/rebase.c:1385 +#: builtin/rebase.c:1405 msgid "add exec lines after each commit of the editable list" msgstr "agregar líneas exec tras cada acommit de la lista editable" -#: builtin/rebase.c:1389 +#: builtin/rebase.c:1409 msgid "allow rebasing commits with empty messages" msgstr "permitir rebase commits con mensajes vacíos" -#: builtin/rebase.c:1393 +#: builtin/rebase.c:1413 msgid "try to rebase merges instead of skipping them" msgstr "intentar fusiones por rebase en lugar de saltarlas" -#: builtin/rebase.c:1396 +#: builtin/rebase.c:1416 msgid "use 'merge-base --fork-point' to refine upstream" msgstr "use 'merge-base --fork-point' para refinar upstream" -#: builtin/rebase.c:1398 +#: builtin/rebase.c:1418 msgid "use the given merge strategy" msgstr "usar la estrategia de merge dada" -#: builtin/rebase.c:1400 builtin/revert.c:115 +#: builtin/rebase.c:1420 builtin/revert.c:115 msgid "option" msgstr "opción" -#: builtin/rebase.c:1401 +#: builtin/rebase.c:1421 msgid "pass the argument through to the merge strategy" msgstr "pasar el argumento para la estrategia de fusión" -#: builtin/rebase.c:1404 +#: builtin/rebase.c:1424 msgid "rebase all reachable commits up to the root(s)" msgstr "hacer rebase a todos los commits alcanzables hasta la raíz(raíces)" -#: builtin/rebase.c:1409 +#: builtin/rebase.c:1429 msgid "apply all changes, even those already present upstream" msgstr "" "aplicar todos los cambios, incluso aquellos que ya están presentes en " "upstream" -#: builtin/rebase.c:1426 +#: builtin/rebase.c:1446 msgid "" "the rebase.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." @@ -18916,42 +19894,42 @@ msgstr "" "el soporte para rebase.useBuiltin ha sido eliminado!\n" "Vea su entrada en 'git help config' para detalles." -#: builtin/rebase.c:1432 +#: builtin/rebase.c:1452 msgid "It looks like 'git am' is in progress. Cannot rebase." msgstr "Parece que 'git am' está en progreso. No se puede rebasar." -#: builtin/rebase.c:1473 +#: builtin/rebase.c:1493 msgid "" "git rebase --preserve-merges is deprecated. Use --rebase-merges instead." msgstr "" "git rebase --preserve-merges está deprecado. Use --rebase-merges en su lugar." -#: builtin/rebase.c:1478 +#: builtin/rebase.c:1498 msgid "cannot combine '--keep-base' with '--onto'" msgstr "no se puede combinar '--keep-base' con '--onto'" -#: builtin/rebase.c:1480 +#: builtin/rebase.c:1500 msgid "cannot combine '--keep-base' with '--root'" msgstr "no se puede combinar '--keep-base' con '--root'" -#: builtin/rebase.c:1484 +#: builtin/rebase.c:1504 msgid "cannot combine '--root' with '--fork-point'" msgstr "no se puede combinar '--root' con '--fork-point'" -#: builtin/rebase.c:1487 +#: builtin/rebase.c:1507 msgid "No rebase in progress?" msgstr "¿No hay rebase en progreso?" -#: builtin/rebase.c:1491 +#: builtin/rebase.c:1511 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "" "La acción --edit-todo sólo puede ser usada al rebasar interactivamente." -#: builtin/rebase.c:1514 +#: builtin/rebase.c:1534 t/helper/test-fast-rebase.c:123 msgid "Cannot read HEAD" msgstr "No se puede leer el HEAD" -#: builtin/rebase.c:1526 +#: builtin/rebase.c:1546 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -18959,16 +19937,16 @@ msgstr "" "Tienes que editar todos los conflictos de fusión y luego\n" "marcarlos como resueltos usando git add" -#: builtin/rebase.c:1545 +#: builtin/rebase.c:1565 msgid "could not discard worktree changes" msgstr "no se pudo descartar los cambios del árbol de trabajo" -#: builtin/rebase.c:1564 +#: builtin/rebase.c:1584 #, c-format msgid "could not move back to %s" msgstr "no se puede regresar a %s" -#: builtin/rebase.c:1610 +#: builtin/rebase.c:1630 #, c-format msgid "" "It seems that there is already a %s directory, and\n" @@ -18989,135 +19967,135 @@ msgstr "" "y ejecútame nuevamente. Me estoy deteniendo en caso de que tengas\n" "algo de valor ahí.\n" -#: builtin/rebase.c:1638 +#: builtin/rebase.c:1658 msgid "switch `C' expects a numerical value" msgstr "switch `C' espera un valor numérico" -#: builtin/rebase.c:1680 +#: builtin/rebase.c:1700 #, c-format msgid "Unknown mode: %s" msgstr "Modo desconocido: %s" -#: builtin/rebase.c:1702 +#: builtin/rebase.c:1739 msgid "--strategy requires --merge or --interactive" msgstr "--strategy requiere --merge o --interactive" -#: builtin/rebase.c:1732 +#: builtin/rebase.c:1769 msgid "cannot combine apply options with merge options" msgstr "no se pueden combinar opciones de apply con opciones de merge" -#: builtin/rebase.c:1745 +#: builtin/rebase.c:1782 #, c-format msgid "Unknown rebase backend: %s" msgstr "Backend de rebase desconocido: %s" -#: builtin/rebase.c:1770 +#: builtin/rebase.c:1812 msgid "--reschedule-failed-exec requires --exec or --interactive" msgstr "--reschedule-failed-exec requiere --exec o --interactive" -#: builtin/rebase.c:1790 +#: builtin/rebase.c:1832 msgid "cannot combine '--preserve-merges' with '--rebase-merges'" msgstr "no se puede combinar '--preserve-merges' con '--rebase-merges'" -#: builtin/rebase.c:1794 +#: builtin/rebase.c:1836 msgid "" "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'" msgstr "" "error: no se puede combinar '--preserve-merges' con '--reschedule-failed-" "exec'" -#: builtin/rebase.c:1818 +#: builtin/rebase.c:1860 #, c-format msgid "invalid upstream '%s'" msgstr "upstream inválido '%s'" -#: builtin/rebase.c:1824 +#: builtin/rebase.c:1866 msgid "Could not create new root commit" msgstr "No se pudo crear commit raíz nuevo" -#: builtin/rebase.c:1850 +#: builtin/rebase.c:1892 #, c-format msgid "'%s': need exactly one merge base with branch" msgstr "'%s': necesita exactamente una base de fusión con rama" -#: builtin/rebase.c:1853 +#: builtin/rebase.c:1895 #, c-format msgid "'%s': need exactly one merge base" msgstr "'%s': necesita exactamente una base de fusión" -#: builtin/rebase.c:1861 +#: builtin/rebase.c:1903 #, c-format msgid "Does not point to a valid commit '%s'" msgstr "No apunta a un commit válido '%s'" -#: builtin/rebase.c:1887 +#: builtin/rebase.c:1931 #, c-format msgid "fatal: no such branch/commit '%s'" msgstr "fatal: no existe la rama/commit: '%s'" -#: builtin/rebase.c:1895 builtin/submodule--helper.c:40 -#: builtin/submodule--helper.c:1990 +#: builtin/rebase.c:1939 builtin/submodule--helper.c:40 +#: builtin/submodule--helper.c:2414 #, c-format msgid "No such ref: %s" msgstr "No existe ref: %s" -#: builtin/rebase.c:1906 +#: builtin/rebase.c:1950 msgid "Could not resolve HEAD to a revision" msgstr "No se pudo resolver HEAD a una revisión" -#: builtin/rebase.c:1927 +#: builtin/rebase.c:1971 msgid "Please commit or stash them." msgstr "Por favor, confírmalos o guárdalos." -#: builtin/rebase.c:1963 +#: builtin/rebase.c:2007 #, c-format msgid "could not switch to %s" msgstr "no se pudo cambiar a %s" -#: builtin/rebase.c:1974 +#: builtin/rebase.c:2018 msgid "HEAD is up to date." msgstr "HEAD está actualizado." -#: builtin/rebase.c:1976 +#: builtin/rebase.c:2020 #, c-format msgid "Current branch %s is up to date.\n" msgstr "La rama actual %s está actualizada.\n" -#: builtin/rebase.c:1984 +#: builtin/rebase.c:2028 msgid "HEAD is up to date, rebase forced." msgstr "HEAD está actualizado, rebase forzado." -#: builtin/rebase.c:1986 +#: builtin/rebase.c:2030 #, c-format msgid "Current branch %s is up to date, rebase forced.\n" msgstr "Rama actual %s está actualizada, rebase forzado.\n" -#: builtin/rebase.c:1994 +#: builtin/rebase.c:2038 msgid "The pre-rebase hook refused to rebase." msgstr "El hook pre-rebase rechazó el rebase." -#: builtin/rebase.c:2001 +#: builtin/rebase.c:2045 #, c-format msgid "Changes to %s:\n" msgstr "Cambios a %s:\n" -#: builtin/rebase.c:2004 +#: builtin/rebase.c:2048 #, c-format msgid "Changes from %s to %s:\n" msgstr "Cambios desde %s a %s:\n" -#: builtin/rebase.c:2029 +#: builtin/rebase.c:2073 #, c-format msgid "First, rewinding head to replay your work on top of it...\n" msgstr "" "En primer lugar, rebobinando HEAD para después reproducir tus cambios encima " "de ésta...\n" -#: builtin/rebase.c:2038 +#: builtin/rebase.c:2082 msgid "Could not detach HEAD" msgstr "No se puede desacoplar HEAD" -#: builtin/rebase.c:2047 +#: builtin/rebase.c:2091 #, c-format msgid "Fast-forwarded %s to %s.\n" msgstr "Avance rápido de %s a %s.\n" @@ -19126,7 +20104,7 @@ msgstr "Avance rápido de %s a %s.\n" msgid "git receive-pack <git-dir>" msgstr "git receive-pack <git-dir>" -#: builtin/receive-pack.c:844 +#: builtin/receive-pack.c:1276 msgid "" "By default, updating the current branch in a non-bare repository\n" "is denied, because it will make the index and work tree inconsistent\n" @@ -19159,7 +20137,7 @@ msgstr "" "Para suprimir este mensaje y mantener el comportamiento predeterminado,\n" "configura 'receive.denyCurrentBranch' a 'refuse'." -#: builtin/receive-pack.c:864 +#: builtin/receive-pack.c:1296 msgid "" "By default, deleting the current branch is denied, because the next\n" "'git clone' won't result in any file checked out, causing confusion.\n" @@ -19180,11 +20158,11 @@ msgstr "" "\n" "Para suprimir este mensaje, puedes configurarlo en 'refuse'." -#: builtin/receive-pack.c:1970 +#: builtin/receive-pack.c:2481 msgid "quiet" msgstr "tranquilo" -#: builtin/receive-pack.c:1984 +#: builtin/receive-pack.c:2495 msgid "You must specify a directory." msgstr "Se tiene que especificar un directorio." @@ -19215,36 +20193,36 @@ msgstr "git reflog existe <ref>" msgid "'%s' is not a valid timestamp" msgstr "'%s' no es una marca de tiempo válida" -#: builtin/reflog.c:606 +#: builtin/reflog.c:609 #, c-format msgid "Marking reachable objects..." msgstr "Marcando objectos alcanzables..." -#: builtin/reflog.c:644 +#: builtin/reflog.c:647 #, c-format msgid "%s points nowhere!" msgstr "¡%s apunta a ningún lado!" -#: builtin/reflog.c:696 +#: builtin/reflog.c:699 msgid "no reflog specified to delete" msgstr "no reflog especificado para borrar" -#: builtin/reflog.c:705 +#: builtin/reflog.c:708 #, c-format msgid "not a reflog: %s" msgstr "no es una reflog: %s" -#: builtin/reflog.c:710 +#: builtin/reflog.c:713 #, c-format msgid "no reflog for '%s'" msgstr "no reflog para '%s'" -#: builtin/reflog.c:756 +#: builtin/reflog.c:759 #, c-format msgid "invalid ref format: %s" msgstr "formato inválido: %s" -#: builtin/reflog.c:765 +#: builtin/reflog.c:768 msgid "git reflog [ show | expire | delete | exists ]" msgstr "git reflog [ show | expire | delete | exists ]" @@ -19382,40 +20360,35 @@ msgstr "especificar una rama master no tiene sentido con --mirror" msgid "specifying branches to track makes sense only with fetch mirrors" msgstr "especificar ramas para rastrear solo tiene sentido con fetch mirrors" -#: builtin/remote.c:195 builtin/remote.c:696 +#: builtin/remote.c:195 builtin/remote.c:700 #, c-format msgid "remote %s already exists." msgstr "remoto %s ya existe." -#: builtin/remote.c:199 builtin/remote.c:700 -#, c-format -msgid "'%s' is not a valid remote name" -msgstr "'%s' no es un nombre remoto válido" - -#: builtin/remote.c:239 +#: builtin/remote.c:240 #, c-format msgid "Could not setup master '%s'" msgstr "No se pudo configurar master '%s'" -#: builtin/remote.c:354 +#: builtin/remote.c:355 #, c-format msgid "Could not get fetch map for refspec %s" msgstr "No se pudo realizar el fetch al mapa para refspec %s" -#: builtin/remote.c:453 builtin/remote.c:461 +#: builtin/remote.c:454 builtin/remote.c:462 msgid "(matching)" msgstr "(concordando)" -#: builtin/remote.c:465 +#: builtin/remote.c:466 msgid "(delete)" msgstr "(eliminar)" -#: builtin/remote.c:653 +#: builtin/remote.c:655 #, c-format msgid "could not set '%s'" msgstr "no se pudo configurar '%s'" -#: builtin/remote.c:658 +#: builtin/remote.c:660 #, c-format msgid "" "The %s configuration remote.pushDefault in:\n" @@ -19426,17 +20399,17 @@ msgstr "" "\t%s:%d\n" "ahora nombra al remoto inexistente '%s'" -#: builtin/remote.c:689 builtin/remote.c:832 builtin/remote.c:940 +#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:946 #, c-format msgid "No such remote: '%s'" msgstr "No existe el remoto '%s'" -#: builtin/remote.c:706 +#: builtin/remote.c:710 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "No se pudo renombrar la sección de configuración '%s' a '%s'" -#: builtin/remote.c:726 +#: builtin/remote.c:730 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -19447,17 +20420,17 @@ msgstr "" "\t%s\n" "\tPor favor actualice la configuración manualmente si es necesario." -#: builtin/remote.c:766 +#: builtin/remote.c:770 #, c-format msgid "deleting '%s' failed" msgstr "borrando '%s' falló" -#: builtin/remote.c:800 +#: builtin/remote.c:804 #, c-format msgid "creating '%s' failed" msgstr "creando '%s' falló" -#: builtin/remote.c:876 +#: builtin/remote.c:882 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -19472,118 +20445,118 @@ msgstr[1] "" "eliminadas;\n" "para borrarlas, use:" -#: builtin/remote.c:890 +#: builtin/remote.c:896 #, c-format msgid "Could not remove config section '%s'" msgstr "No se pudo borrar la sección de configuración '%s'" -#: builtin/remote.c:993 +#: builtin/remote.c:999 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " nuevo (siguiente fetch se guardará en remotes/%s)" -#: builtin/remote.c:996 +#: builtin/remote.c:1002 msgid " tracked" msgstr " rastreada" -#: builtin/remote.c:998 +#: builtin/remote.c:1004 msgid " stale (use 'git remote prune' to remove)" msgstr " viejo ( use 'git remote prune' para eliminar)" -#: builtin/remote.c:1000 +#: builtin/remote.c:1006 msgid " ???" msgstr " ???" -#: builtin/remote.c:1041 +#: builtin/remote.c:1047 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "inválido branch.%s.merge; no se puede rebasar en > 1 rama" -#: builtin/remote.c:1050 +#: builtin/remote.c:1056 #, c-format msgid "rebases interactively onto remote %s" msgstr "rebasa interactivamente en remoto %s" -#: builtin/remote.c:1052 +#: builtin/remote.c:1058 #, c-format msgid "rebases interactively (with merges) onto remote %s" msgstr "rebasa interactivamente (con fusiones) en remoto %s" -#: builtin/remote.c:1055 +#: builtin/remote.c:1061 #, c-format msgid "rebases onto remote %s" msgstr "rebasa sobre el remoto %s" -#: builtin/remote.c:1059 +#: builtin/remote.c:1065 #, c-format msgid " merges with remote %s" msgstr " se fusiona con remoto %s" -#: builtin/remote.c:1062 +#: builtin/remote.c:1068 #, c-format msgid "merges with remote %s" msgstr "fusiona con remoto %s" -#: builtin/remote.c:1065 +#: builtin/remote.c:1071 #, c-format msgid "%-*s and with remote %s\n" msgstr "%-*s y con el remoto %s\n" -#: builtin/remote.c:1108 +#: builtin/remote.c:1114 msgid "create" msgstr "crear" -#: builtin/remote.c:1111 +#: builtin/remote.c:1117 msgid "delete" msgstr "borrar" -#: builtin/remote.c:1115 +#: builtin/remote.c:1121 msgid "up to date" msgstr "actualizado" -#: builtin/remote.c:1118 +#: builtin/remote.c:1124 msgid "fast-forwardable" msgstr "puede realizar fast-forward" -#: builtin/remote.c:1121 +#: builtin/remote.c:1127 msgid "local out of date" msgstr "desactualizado local" -#: builtin/remote.c:1128 +#: builtin/remote.c:1134 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s fuerza a %-*s (%s)" -#: builtin/remote.c:1131 +#: builtin/remote.c:1137 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s publica a %-*s (%s)" -#: builtin/remote.c:1135 +#: builtin/remote.c:1141 #, c-format msgid " %-*s forces to %s" msgstr " %-*s fuerza a %s" -#: builtin/remote.c:1138 +#: builtin/remote.c:1144 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s publica a %s" -#: builtin/remote.c:1206 +#: builtin/remote.c:1212 msgid "do not query remotes" msgstr "no consultar remotos" -#: builtin/remote.c:1233 +#: builtin/remote.c:1239 #, c-format msgid "* remote %s" msgstr "* remoto %s" -#: builtin/remote.c:1234 +#: builtin/remote.c:1240 #, c-format msgid " Fetch URL: %s" msgstr " URL para obtener: %s" -#: builtin/remote.c:1235 builtin/remote.c:1251 builtin/remote.c:1390 +#: builtin/remote.c:1241 builtin/remote.c:1257 builtin/remote.c:1396 msgid "(no URL)" msgstr "(sin URL)" @@ -19591,185 +20564,185 @@ msgstr "(sin URL)" #. with the one in " Fetch URL: %s" #. translation. #. -#: builtin/remote.c:1249 builtin/remote.c:1251 +#: builtin/remote.c:1255 builtin/remote.c:1257 #, c-format msgid " Push URL: %s" msgstr " URL para publicar: %s" -#: builtin/remote.c:1253 builtin/remote.c:1255 builtin/remote.c:1257 +#: builtin/remote.c:1259 builtin/remote.c:1261 builtin/remote.c:1263 #, c-format msgid " HEAD branch: %s" msgstr " Rama HEAD: %s" -#: builtin/remote.c:1253 +#: builtin/remote.c:1259 msgid "(not queried)" msgstr "(no consultado)" -#: builtin/remote.c:1255 +#: builtin/remote.c:1261 msgid "(unknown)" msgstr "(desconocido)" -#: builtin/remote.c:1259 +#: builtin/remote.c:1265 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" msgstr "" " HEAD en rama ( HEAD remoto es ambiguo, puede ser uno de los siguientes):\n" -#: builtin/remote.c:1271 +#: builtin/remote.c:1277 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " Rama remota:%s" msgstr[1] " Ramas remotas:%s" -#: builtin/remote.c:1274 builtin/remote.c:1300 +#: builtin/remote.c:1280 builtin/remote.c:1306 msgid " (status not queried)" msgstr " (estado no consultado)" -#: builtin/remote.c:1283 +#: builtin/remote.c:1289 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] " Rama local configurada para 'git pull':" msgstr[1] " Ramas locales configuradas para 'git pull':" -#: builtin/remote.c:1291 +#: builtin/remote.c:1297 msgid " Local refs will be mirrored by 'git push'" msgstr " Las referencias locales serán reflejadas por 'git push'" -#: builtin/remote.c:1297 +#: builtin/remote.c:1303 #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" msgstr[0] " Referencia local configurada para 'git push'%s:" msgstr[1] " Referencias locales configuradas para 'git push'%s:" -#: builtin/remote.c:1318 +#: builtin/remote.c:1324 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "configurar refs/remotes/<nombre>/HEAD de acuerdo al remoto" -#: builtin/remote.c:1320 +#: builtin/remote.c:1326 msgid "delete refs/remotes/<name>/HEAD" msgstr "borrar refs/remotos/<nombre>/HEAD" -#: builtin/remote.c:1335 +#: builtin/remote.c:1341 msgid "Cannot determine remote HEAD" msgstr "No se puede determinar el HEAD remoto" -#: builtin/remote.c:1337 +#: builtin/remote.c:1343 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "Múltiples ramas HEAD remotas. Por favor escoja una explícitamente con:" -#: builtin/remote.c:1347 +#: builtin/remote.c:1353 #, c-format msgid "Could not delete %s" msgstr "No se pudo borrar %s" -#: builtin/remote.c:1355 +#: builtin/remote.c:1361 #, c-format msgid "Not a valid ref: %s" msgstr "No es un ref válido: %s" -#: builtin/remote.c:1357 +#: builtin/remote.c:1363 #, c-format msgid "Could not setup %s" msgstr "No se pudo configurar %s" -#: builtin/remote.c:1375 +#: builtin/remote.c:1381 #, c-format msgid " %s will become dangling!" msgstr " ¡%s será colgado!" -#: builtin/remote.c:1376 +#: builtin/remote.c:1382 #, c-format msgid " %s has become dangling!" msgstr " ¡%s ha sido colgado!" -#: builtin/remote.c:1386 +#: builtin/remote.c:1392 #, c-format msgid "Pruning %s" msgstr "Recortando %s" -#: builtin/remote.c:1387 +#: builtin/remote.c:1393 #, c-format msgid "URL: %s" msgstr "URL: %s" -#: builtin/remote.c:1403 +#: builtin/remote.c:1409 #, c-format msgid " * [would prune] %s" msgstr " * [ejecutará prune] %s" -#: builtin/remote.c:1406 +#: builtin/remote.c:1412 #, c-format msgid " * [pruned] %s" msgstr " * [prune realizado] %s" -#: builtin/remote.c:1451 +#: builtin/remote.c:1457 msgid "prune remotes after fetching" msgstr "recortar remotos tras realizar fetch" -#: builtin/remote.c:1514 builtin/remote.c:1568 builtin/remote.c:1636 +#: builtin/remote.c:1521 builtin/remote.c:1577 builtin/remote.c:1647 #, c-format msgid "No such remote '%s'" msgstr "No existe el remoto '%s'" -#: builtin/remote.c:1530 +#: builtin/remote.c:1539 msgid "add branch" msgstr "agregar rama" -#: builtin/remote.c:1537 +#: builtin/remote.c:1546 msgid "no remote specified" msgstr "no hay remotos especificados" -#: builtin/remote.c:1554 +#: builtin/remote.c:1563 msgid "query push URLs rather than fetch URLs" msgstr "consultar URLs de push en lugar de URLs de fetch" -#: builtin/remote.c:1556 +#: builtin/remote.c:1565 msgid "return all URLs" msgstr "retornar todos los URLs" -#: builtin/remote.c:1584 +#: builtin/remote.c:1595 #, c-format msgid "no URLs configured for remote '%s'" msgstr "no hay URLs configurados para remoto '%s'" -#: builtin/remote.c:1610 +#: builtin/remote.c:1621 msgid "manipulate push URLs" msgstr "manipular URLs de push" -#: builtin/remote.c:1612 +#: builtin/remote.c:1623 msgid "add URL" msgstr "agregar URL" -#: builtin/remote.c:1614 +#: builtin/remote.c:1625 msgid "delete URLs" msgstr "borrar URLs" -#: builtin/remote.c:1621 +#: builtin/remote.c:1632 msgid "--add --delete doesn't make sense" msgstr "--add --delete no tiene sentido" -#: builtin/remote.c:1660 +#: builtin/remote.c:1673 #, c-format msgid "Invalid old URL pattern: %s" msgstr "Patrón de URL viejo inválido: %s" -#: builtin/remote.c:1668 +#: builtin/remote.c:1681 #, c-format msgid "No such URL found: %s" msgstr "No se encontró URL: %s" -#: builtin/remote.c:1670 +#: builtin/remote.c:1683 msgid "Will not delete all non-push URLs" msgstr "No borrará todos los URLs de no-push" -#: builtin/repack.c:25 +#: builtin/repack.c:26 msgid "git repack [<options>]" msgstr "git repack [<opciones>]" -#: builtin/repack.c:30 +#: builtin/repack.c:31 msgid "" "Incremental repacks are incompatible with bitmap indexes. Use\n" "--no-write-bitmap-index or disable the pack.writebitmaps configuration." @@ -19777,137 +20750,123 @@ msgstr "" "Re empaquetados incrementales son incompatibles con índices bitmap. Use \n" "--no-write-bitmap-index o deshabilite la configuración pack.writebitmaps." -#: builtin/repack.c:193 +#: builtin/repack.c:198 msgid "could not start pack-objects to repack promisor objects" msgstr "no se puede iniciar pack-objects para reempaquetar objetos promisores" -#: builtin/repack.c:232 builtin/repack.c:418 +#: builtin/repack.c:270 builtin/repack.c:446 msgid "repack: Expecting full hex object ID lines only from pack-objects." msgstr "" "repack: Esperando líneas de ID de objeto en full hex solo desde pack-objects." -#: builtin/repack.c:256 +#: builtin/repack.c:294 msgid "could not finish pack-objects to repack promisor objects" msgstr "" "no se puede finalizar pack-objects para reempaquetar objetos promisores" -#: builtin/repack.c:294 +#: builtin/repack.c:322 msgid "pack everything in a single pack" msgstr "empaquetar todo en un único paquete" -#: builtin/repack.c:296 +#: builtin/repack.c:324 msgid "same as -a, and turn unreachable objects loose" msgstr "lo mismo que -a, y pierde objetos inaccesibles" -#: builtin/repack.c:299 +#: builtin/repack.c:327 msgid "remove redundant packs, and run git-prune-packed" msgstr "eliminar paquetes redundantes, y ejecutar git-prune-packed" -#: builtin/repack.c:301 +#: builtin/repack.c:329 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "pasar --no-reuse-delta a git-pack-objects" -#: builtin/repack.c:303 +#: builtin/repack.c:331 msgid "pass --no-reuse-object to git-pack-objects" msgstr "pasar --no-reuse-object a git-pack-objects" -#: builtin/repack.c:305 +#: builtin/repack.c:333 msgid "do not run git-update-server-info" msgstr "no ejecutar git-update-server-info" -#: builtin/repack.c:308 +#: builtin/repack.c:336 msgid "pass --local to git-pack-objects" msgstr "pasar --local a git-pack-objects" -#: builtin/repack.c:310 +#: builtin/repack.c:338 msgid "write bitmap index" msgstr "escribir un índice de bitmap" -#: builtin/repack.c:312 +#: builtin/repack.c:340 msgid "pass --delta-islands to git-pack-objects" msgstr "pasar --delta-islands a git-pack-objects" -#: builtin/repack.c:313 +#: builtin/repack.c:341 msgid "approxidate" msgstr "aproxime" -#: builtin/repack.c:314 +#: builtin/repack.c:342 msgid "with -A, do not loosen objects older than this" msgstr "con -A, no perder objetos más antiguos que este" -#: builtin/repack.c:316 +#: builtin/repack.c:344 msgid "with -a, repack unreachable objects" msgstr "con -a, re empaquetar objetos inalcanzables" -#: builtin/repack.c:318 +#: builtin/repack.c:346 msgid "size of the window used for delta compression" msgstr "tamaño de la ventana usado para la compresión delta" -#: builtin/repack.c:319 builtin/repack.c:325 +#: builtin/repack.c:347 builtin/repack.c:353 msgid "bytes" msgstr "bytes" -#: builtin/repack.c:320 +#: builtin/repack.c:348 msgid "same as the above, but limit memory size instead of entries count" msgstr "" "lo mismo que arriba, pero limita el tamaño de memoria en lugar de contar " "entradas" -#: builtin/repack.c:322 +#: builtin/repack.c:350 msgid "limits the maximum delta depth" msgstr "limita la profundidad máxima del delta" -#: builtin/repack.c:324 +#: builtin/repack.c:352 msgid "limits the maximum number of threads" msgstr "limita el número máximo de hilos" -#: builtin/repack.c:326 +#: builtin/repack.c:354 msgid "maximum size of each packfile" msgstr "tamaño máximo de cada paquete" -#: builtin/repack.c:328 +#: builtin/repack.c:356 msgid "repack objects in packs marked with .keep" msgstr "re-empaquetar objetos en paquetes marcados con .keep" -#: builtin/repack.c:330 +#: builtin/repack.c:358 msgid "do not repack this pack" msgstr "no reempaquetar este paquete" -#: builtin/repack.c:340 +#: builtin/repack.c:368 msgid "cannot delete packs in a precious-objects repo" msgstr "no se pueden borrar paquetes en un repositorio de objetos-preciosos" -#: builtin/repack.c:344 +#: builtin/repack.c:372 msgid "--keep-unreachable and -A are incompatible" msgstr "--keep-unreachable y -A son incompatibles" -#: builtin/repack.c:427 +#: builtin/repack.c:455 msgid "Nothing new to pack." msgstr "Nada nuevo para empaquetar." -#: builtin/repack.c:488 +#: builtin/repack.c:485 #, c-format -msgid "" -"WARNING: Some packs in use have been renamed by\n" -"WARNING: prefixing old- to their name, in order to\n" -"WARNING: replace them with the new version of the\n" -"WARNING: file. But the operation failed, and the\n" -"WARNING: attempt to rename them back to their\n" -"WARNING: original names also failed.\n" -"WARNING: Please rename them in %s manually:\n" -msgstr "" -"WARNING: Algunos packs en uso han sido renombrados\n" -"WARNING: agregando el prefijo old- a sus nombres,para\n" -"WARNING: reemplazarlos con la nueva versión del\n" -"WARNING: archivo. Pero la operación falló, y el intento\n" -"WARNING: de renombrarlos a sus nombres originales\n" -"WARNING: también falló.\n" -"WARNING: Por favor renombralos en %s manualmente:\n" +msgid "missing required file: %s" +msgstr "falta archivo requerido: %s" -#: builtin/repack.c:536 +#: builtin/repack.c:487 #, c-format -msgid "failed to remove '%s'" -msgstr "falló al eliminar'%s'" +msgid "could not unlink: %s" +msgstr "no se pudo desvincular: %s" #: builtin/replace.c:22 msgid "git replace [-f] <object> <replacement>" @@ -20237,8 +21196,8 @@ msgstr "HEAD está ahora en %s" msgid "Cannot do a %s reset in the middle of a merge." msgstr "No se puede realziar un reset %s en medio de una fusión." -#: builtin/reset.c:295 builtin/stash.c:520 builtin/stash.c:595 -#: builtin/stash.c:619 +#: builtin/reset.c:295 builtin/stash.c:587 builtin/stash.c:661 +#: builtin/stash.c:685 msgid "be quiet, only report errors" msgstr "ser silencioso, solo reportar errores" @@ -20323,19 +21282,19 @@ msgstr "No se puede reiniciar el índice a la revisión '%s'." msgid "Could not write new index file." msgstr "No se puede escribir un nuevo archivo índice." -#: builtin/rev-list.c:499 +#: builtin/rev-list.c:534 msgid "cannot combine --exclude-promisor-objects and --missing" msgstr "no se puede combinar --exclude-promisor-objects y --missing" -#: builtin/rev-list.c:560 +#: builtin/rev-list.c:595 msgid "object filtering requires --objects" msgstr "filtrado de objetos requiere --objects" -#: builtin/rev-list.c:610 +#: builtin/rev-list.c:651 msgid "rev-list does not support display of notes" msgstr "rev-list no soporta mostrar notas" -#: builtin/rev-list.c:615 +#: builtin/rev-list.c:656 msgid "marked counting is incompatible with --objects" msgstr "conteo de marcas es incompatible con --objects" @@ -20448,11 +21407,11 @@ msgstr "preservar commits iniciales vacíos" msgid "keep redundant, empty commits" msgstr "mantener commits redundantes, vacíos" -#: builtin/revert.c:232 +#: builtin/revert.c:239 msgid "revert failed" msgstr "falló al revertir" -#: builtin/revert.c:245 +#: builtin/revert.c:252 msgid "cherry-pick failed" msgstr "cherry-pick falló" @@ -20554,55 +21513,76 @@ msgstr "" "[<ref>...]\n" " --all y especificaciones <ref> explícitas son mutuamente exclusivas." -#: builtin/send-pack.c:163 +#: builtin/send-pack.c:188 msgid "remote name" msgstr "nombre remoto" -#: builtin/send-pack.c:176 +#: builtin/send-pack.c:201 msgid "use stateless RPC protocol" msgstr "usar protocolo RPC sin estado" -#: builtin/send-pack.c:177 +#: builtin/send-pack.c:202 msgid "read refs from stdin" msgstr "leer refs de stdin" -#: builtin/send-pack.c:178 +#: builtin/send-pack.c:203 msgid "print status from remote helper" msgstr "mostrar status del remote helper" -#: builtin/shortlog.c:14 +#: builtin/shortlog.c:16 msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]" msgstr "git shortlog [<opciones>] [<rango-de-revisión>] [[--] <ruta>...]" -#: builtin/shortlog.c:15 +#: builtin/shortlog.c:17 msgid "git log --pretty=short | git shortlog [<options>]" msgstr "git log --pretty=short | git shorlog [<opciones>]" -#: builtin/shortlog.c:264 -msgid "Group by committer rather than author" -msgstr "Agrupar por committer en lugar de autor" +#: builtin/shortlog.c:123 +msgid "using multiple --group options with stdin is not supported" +msgstr "no se admite el uso de múltiples opciones de grupo --group con stdin" + +#: builtin/shortlog.c:133 +msgid "using --group=trailer with stdin is not supported" +msgstr "el uso de --group = trailer con stdin no es compatible" + +#: builtin/shortlog.c:323 +#, c-format +msgid "unknown group type: %s" +msgstr "tipo de grupo desconocido: %s" + +#: builtin/shortlog.c:351 +msgid "group by committer rather than author" +msgstr "agrupar por committer en lugar de autor" -#: builtin/shortlog.c:266 +#: builtin/shortlog.c:354 msgid "sort output according to the number of commits per author" msgstr "ordenar salida de acuerdo al número de commits por autor" -#: builtin/shortlog.c:268 -msgid "Suppress commit descriptions, only provides commit count" -msgstr "Suprimir descripción de commits, solo proveer cuenta de commits" +#: builtin/shortlog.c:356 +msgid "suppress commit descriptions, only provides commit count" +msgstr "suprimir descripción de commits, solo proveer cuenta de commits" -#: builtin/shortlog.c:270 -msgid "Show the email address of each author" -msgstr "Mostrar la dirección de correo de cada autor" +#: builtin/shortlog.c:358 +msgid "show the email address of each author" +msgstr "mostrar la dirección de correo de cada autor" -#: builtin/shortlog.c:271 +#: builtin/shortlog.c:359 msgid "<w>[,<i1>[,<i2>]]" msgstr "<w>[,<i1>[,<i2>]]" -#: builtin/shortlog.c:272 -msgid "Linewrap output" -msgstr "Salida de línea" +#: builtin/shortlog.c:360 +msgid "linewrap output" +msgstr "salida de línea" + +#: builtin/shortlog.c:362 +msgid "field" +msgstr "campo" + +#: builtin/shortlog.c:363 +msgid "group by field" +msgstr "agrupar por campo" -#: builtin/shortlog.c:301 +#: builtin/shortlog.c:391 msgid "too many arguments given outside repository" msgstr "demasiados argumentos dados fuera del repositorio" @@ -20797,62 +21777,74 @@ msgstr "mostrar refs de stdin que no están en el repositorio local" msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>" msgstr "git sparse-checkout (init|list|set|add|reapply|disable) <opciones>" -#: builtin/sparse-checkout.c:64 +#: builtin/sparse-checkout.c:45 +msgid "git sparse-checkout list" +msgstr "git sparse-checkout list" + +#: builtin/sparse-checkout.c:71 msgid "this worktree is not sparse (sparse-checkout file may not exist)" msgstr "" "este árbol de trabajo no tiene sparse (archivo sparese-checkout tal vez no " "existe)" -#: builtin/sparse-checkout.c:216 +#: builtin/sparse-checkout.c:223 msgid "failed to create directory for sparse-checkout file" msgstr "falló al crear directorio para el archivo sparse-checkout" -#: builtin/sparse-checkout.c:257 +#: builtin/sparse-checkout.c:264 msgid "unable to upgrade repository format to enable worktreeConfig" msgstr "" "no es posible actualizar el formato de repositorio para habilitar " "worktreeConfig" -#: builtin/sparse-checkout.c:259 +#: builtin/sparse-checkout.c:266 msgid "failed to set extensions.worktreeConfig setting" msgstr "falló al configurar opción extensions.worktreeConfig" -#: builtin/sparse-checkout.c:276 +#: builtin/sparse-checkout.c:283 msgid "git sparse-checkout init [--cone]" msgstr "git sparse-checkout init [--cone]" -#: builtin/sparse-checkout.c:295 +#: builtin/sparse-checkout.c:302 msgid "initialize the sparse-checkout in cone mode" msgstr "inicializa el sparse-checkout en modo cono" -#: builtin/sparse-checkout.c:332 +#: builtin/sparse-checkout.c:339 #, c-format msgid "failed to open '%s'" msgstr "falló al abrir '%s'" -#: builtin/sparse-checkout.c:389 +#: builtin/sparse-checkout.c:396 #, c-format msgid "could not normalize path %s" msgstr "no se pudo normalizar la ruta %s" -#: builtin/sparse-checkout.c:401 +#: builtin/sparse-checkout.c:408 msgid "git sparse-checkout (set|add) (--stdin | <patterns>)" msgstr "git sparse-checkout (set|add) (--stdin | <patrones>)" -#: builtin/sparse-checkout.c:426 +#: builtin/sparse-checkout.c:433 #, c-format msgid "unable to unquote C-style string '%s'" msgstr "no es posible dequote para la cadena de estilo C '%s'" -#: builtin/sparse-checkout.c:480 builtin/sparse-checkout.c:504 +#: builtin/sparse-checkout.c:487 builtin/sparse-checkout.c:511 msgid "unable to load existing sparse-checkout patterns" msgstr "no se pudo cargar patrones de sparse-checkout existentes" -#: builtin/sparse-checkout.c:549 +#: builtin/sparse-checkout.c:556 msgid "read patterns from standard in" msgstr "leer patrones de standard in" -#: builtin/sparse-checkout.c:586 +#: builtin/sparse-checkout.c:571 +msgid "git sparse-checkout reapply" +msgstr "git sparse-checkout reapply" + +#: builtin/sparse-checkout.c:590 +msgid "git sparse-checkout disable" +msgstr "git sparse-checkout disable" + +#: builtin/sparse-checkout.c:618 msgid "error while refreshing working directory" msgstr "error al refrescar directorio de trabajo" @@ -20942,153 +21934,165 @@ msgid "%s is not a valid reference" msgstr "%s no es una referencia válida" #: builtin/stash.c:225 -msgid "git stash clear with parameters is unimplemented" -msgstr "git stash clear con parámetros no está implementado" +msgid "git stash clear with arguments is unimplemented" +msgstr "git stash clear con argumentos no está implementado" + +#: builtin/stash.c:429 +#, c-format +msgid "" +"WARNING: Untracked file in way of tracked file! Renaming\n" +" %s -> %s\n" +" to make room.\n" +msgstr "" +"ADVERTENCIA: Archivo sin seguimiento en forma de archivo con seguimiento. " +"Renombrar\n" +" %s ->%s\n" +" Para hacer espacio.\n" -#: builtin/stash.c:404 +#: builtin/stash.c:490 msgid "cannot apply a stash in the middle of a merge" msgstr "no se puede aplicar un stash en medio de un merge" -#: builtin/stash.c:415 +#: builtin/stash.c:501 #, c-format msgid "could not generate diff %s^!." msgstr "no se pudo generar diff %s^!." -#: builtin/stash.c:422 -msgid "conflicts in index.Try without --index." +#: builtin/stash.c:508 +msgid "conflicts in index. Try without --index." msgstr "conflictos en índice. Intente sin --index." -#: builtin/stash.c:428 +#: builtin/stash.c:514 msgid "could not save index tree" msgstr "no se puede guardar el índice del árbol" -#: builtin/stash.c:437 +#: builtin/stash.c:523 msgid "could not restore untracked files from stash" msgstr "no se pueden restaurar archivos no rastreados de la entrada stash" -#: builtin/stash.c:451 +#: builtin/stash.c:537 #, c-format msgid "Merging %s with %s" msgstr "Fusionando %s con %s" -#: builtin/stash.c:461 +#: builtin/stash.c:547 msgid "Index was not unstashed." msgstr "El índice no fue sacado de stash." -#: builtin/stash.c:522 builtin/stash.c:621 +#: builtin/stash.c:589 builtin/stash.c:687 msgid "attempt to recreate the index" msgstr "intento de recrear el index" -#: builtin/stash.c:555 +#: builtin/stash.c:633 #, c-format msgid "Dropped %s (%s)" msgstr "Botado %s (%s)" -#: builtin/stash.c:558 +#: builtin/stash.c:636 #, c-format msgid "%s: Could not drop stash entry" msgstr "%s: No se pudo borrar entrada stash" -#: builtin/stash.c:583 +#: builtin/stash.c:649 #, c-format msgid "'%s' is not a stash reference" msgstr "'%s' no es una referencia stash" -#: builtin/stash.c:633 +#: builtin/stash.c:699 msgid "The stash entry is kept in case you need it again." msgstr "La entrada de stash se guardó en caso de ser necesario nuevamente." -#: builtin/stash.c:656 +#: builtin/stash.c:722 msgid "No branch name specified" msgstr "No se especificó el nombre de la rama" -#: builtin/stash.c:800 builtin/stash.c:837 +#: builtin/stash.c:866 builtin/stash.c:903 #, c-format msgid "Cannot update %s with %s" msgstr "No se puede actualizar %s con %s" -#: builtin/stash.c:818 builtin/stash.c:1475 builtin/stash.c:1540 +#: builtin/stash.c:884 builtin/stash.c:1538 builtin/stash.c:1603 msgid "stash message" msgstr "mensaje de stash" -#: builtin/stash.c:828 +#: builtin/stash.c:894 msgid "\"git stash store\" requires one <commit> argument" msgstr "\"git stash store\" requiere un argumento <commit>" -#: builtin/stash.c:1046 +#: builtin/stash.c:1109 msgid "No changes selected" msgstr "Sin cambios seleccionados" -#: builtin/stash.c:1146 +#: builtin/stash.c:1209 msgid "You do not have the initial commit yet" msgstr "Aún no tienes un commit inicial" -#: builtin/stash.c:1173 +#: builtin/stash.c:1236 msgid "Cannot save the current index state" msgstr "No se puede guardar el estado actual del índice" -#: builtin/stash.c:1182 +#: builtin/stash.c:1245 msgid "Cannot save the untracked files" msgstr "No se pueden guardar los archivos no rastreados" -#: builtin/stash.c:1193 builtin/stash.c:1202 +#: builtin/stash.c:1256 builtin/stash.c:1265 msgid "Cannot save the current worktree state" msgstr "No se puede guardar el estado actual del árbol de trabajo" -#: builtin/stash.c:1230 +#: builtin/stash.c:1293 msgid "Cannot record working tree state" msgstr "No se puede grabar el estado del árbol de trabajo" -#: builtin/stash.c:1279 +#: builtin/stash.c:1342 msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "No se puede usar --patch y --include-untracked o --all al mismo tiempo" -#: builtin/stash.c:1295 +#: builtin/stash.c:1358 msgid "Did you forget to 'git add'?" msgstr "¿Olvidaste 'git add'?" -#: builtin/stash.c:1310 +#: builtin/stash.c:1373 msgid "No local changes to save" msgstr "No hay cambios locales para guardar" -#: builtin/stash.c:1317 +#: builtin/stash.c:1380 msgid "Cannot initialize stash" msgstr "No se puede inicializar stash" -#: builtin/stash.c:1332 +#: builtin/stash.c:1395 msgid "Cannot save the current status" msgstr "No se puede guardar el estado actual" -#: builtin/stash.c:1337 +#: builtin/stash.c:1400 #, c-format msgid "Saved working directory and index state %s" msgstr "Directorio de trabajo guardado y estado de índice %s" -#: builtin/stash.c:1427 +#: builtin/stash.c:1490 msgid "Cannot remove worktree changes" msgstr "No se pueden eliminar cambios del árbol de trabajo" -#: builtin/stash.c:1466 builtin/stash.c:1531 +#: builtin/stash.c:1529 builtin/stash.c:1594 msgid "keep index" msgstr "mantener index" -#: builtin/stash.c:1468 builtin/stash.c:1533 +#: builtin/stash.c:1531 builtin/stash.c:1596 msgid "stash in patch mode" msgstr "stash en modo patch" -#: builtin/stash.c:1469 builtin/stash.c:1534 +#: builtin/stash.c:1532 builtin/stash.c:1597 msgid "quiet mode" msgstr "modo tranquilo" -#: builtin/stash.c:1471 builtin/stash.c:1536 +#: builtin/stash.c:1534 builtin/stash.c:1599 msgid "include untracked files in stash" msgstr "incluir archivos sin seguimiento en stash" -#: builtin/stash.c:1473 builtin/stash.c:1538 +#: builtin/stash.c:1536 builtin/stash.c:1601 msgid "include ignore files" msgstr "incluir archivos ignorados" -#: builtin/stash.c:1573 +#: builtin/stash.c:1636 msgid "" "the stash.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." @@ -21113,7 +22117,7 @@ msgstr "" msgid "prepend comment character and space to each line" msgstr "anteponer carácter de comentario y espacio a cada línea" -#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:1999 +#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:2423 #, c-format msgid "Expecting a full ref name, got %s" msgstr "Se esperaba un nombre de ref completo, se obtuvo %s" @@ -21127,7 +22131,7 @@ msgstr "subomdule--helper print-default-remote no toma argumentos" msgid "cannot strip one component off url '%s'" msgstr "no se puede quitar un componente del url '%s'" -#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1395 +#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1819 msgid "alternative anchor for relative paths" msgstr "ancho alternativo para rutas relativas" @@ -21135,8 +22139,8 @@ msgstr "ancho alternativo para rutas relativas" msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<ruta>] [<ruta>...]" -#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:630 -#: builtin/submodule--helper.c:653 +#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:629 +#: builtin/submodule--helper.c:652 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "No se encontró url para la ruta del submódulo '%s' en .gitmodules" @@ -21167,12 +22171,13 @@ msgstr "" "." #: builtin/submodule--helper.c:565 -msgid "Suppress output of entering each submodule command" -msgstr "Suprime la salida al inicializar cada comando de submódulo" +msgid "suppress output of entering each submodule command" +msgstr "suprime la salida al inicializar cada comando de submódulo" -#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1063 -msgid "Recurse into nested submodules" -msgstr "Recursar en submódulos anidados" +#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:888 +#: builtin/submodule--helper.c:1487 +msgid "recurse into nested submodules" +msgstr "recursar en submódulos anidados" #: builtin/submodule--helper.c:572 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>" @@ -21187,105 +22192,158 @@ msgstr "" "no se pudo encontrar configuración '%s'. Asumiendo que este repositorio es " "su propio upstream autoritativo." -#: builtin/submodule--helper.c:667 +#: builtin/submodule--helper.c:666 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "Falló al registrar el url para la ruta del submódulo '%s'" -#: builtin/submodule--helper.c:671 +#: builtin/submodule--helper.c:670 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "Submódulo '%s' (%s) registrado para ruta '%s'\n" -#: builtin/submodule--helper.c:681 +#: builtin/submodule--helper.c:680 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" msgstr "" "peligro: modo de actualización de comandos sugerido para el submódulo '%s'\n" -#: builtin/submodule--helper.c:688 +#: builtin/submodule--helper.c:687 #, c-format msgid "Failed to register update mode for submodule path '%s'" msgstr "" "Error al registrar el modo de actualización para la ruta del submódulo '%s'" -#: builtin/submodule--helper.c:710 -msgid "Suppress output for initializing a submodule" -msgstr "Suprime la salida para inicializar un submódulo" +#: builtin/submodule--helper.c:709 +msgid "suppress output for initializing a submodule" +msgstr "suprime la salida para inicializar un submódulo" -#: builtin/submodule--helper.c:715 +#: builtin/submodule--helper.c:714 msgid "git submodule--helper init [<options>] [<path>]" msgstr "git submodule--helper init [<opciones>] [<path>]" -#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924 +#: builtin/submodule--helper.c:787 builtin/submodule--helper.c:922 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "" "no se ha encontrado mapeo de submódulos en .gitmodules para la ruta '%s'" -#: builtin/submodule--helper.c:837 +#: builtin/submodule--helper.c:835 #, c-format msgid "could not resolve HEAD ref inside the submodule '%s'" msgstr "no pudo resolver ref de HEAD dentro del submódulo '%s'" -#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1033 +#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1457 #, c-format msgid "failed to recurse into submodule '%s'" msgstr "falló al recursar en el submódulo '%s'" -#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1199 -msgid "Suppress submodule status output" -msgstr "Suprimir output del estado del submódulo" +#: builtin/submodule--helper.c:886 builtin/submodule--helper.c:1623 +msgid "suppress submodule status output" +msgstr "suprimir output del estado del submódulo" -#: builtin/submodule--helper.c:889 +#: builtin/submodule--helper.c:887 msgid "" -"Use commit stored in the index instead of the one stored in the submodule " +"use commit stored in the index instead of the one stored in the submodule " "HEAD" msgstr "" -"Usar el commit guardado en el índice en lugar del guardado en el submódulo " +"usar el commit guardado en el índice en lugar del guardado en el submódulo " "HEAD" -#: builtin/submodule--helper.c:890 -msgid "recurse into nested submodules" -msgstr "recursar en submódulos anidados" - -#: builtin/submodule--helper.c:895 +#: builtin/submodule--helper.c:893 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" msgstr "git submodule status [--quiet] [--cached] [--recursive] [<ruta>...]" -#: builtin/submodule--helper.c:919 +#: builtin/submodule--helper.c:917 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name <ruta>" -#: builtin/submodule--helper.c:983 +#: builtin/submodule--helper.c:989 +#, c-format +msgid "* %s %s(blob)->%s(submodule)" +msgstr "* %s %s(blob)->%s(submodule)" + +#: builtin/submodule--helper.c:992 +#, c-format +msgid "* %s %s(submodule)->%s(blob)" +msgstr "* %s %s(submodule)->%s(blob)" + +#: builtin/submodule--helper.c:1005 +#, c-format +msgid "%s" +msgstr "%s" + +#: builtin/submodule--helper.c:1055 +#, c-format +msgid "couldn't hash object from '%s'" +msgstr "no se pudo realizar hash del objeto '%s'" + +#: builtin/submodule--helper.c:1059 +#, c-format +msgid "unexpected mode %o\n" +msgstr "modo %o inesperado\n" + +#: builtin/submodule--helper.c:1300 +msgid "use the commit stored in the index instead of the submodule HEAD" +msgstr "" +"usar el commit guardado en el índice en lugar del guardado en el submódulo " +"HEAD" + +#: builtin/submodule--helper.c:1302 +msgid "to compare the commit in the index with that in the submodule HEAD" +msgstr "" +"usar el commit guardado en el índice para comparar con el guardado en el " +"submódulo HEAD" + +#: builtin/submodule--helper.c:1304 +msgid "skip submodules with 'ignore_config' value set to 'all'" +msgstr "omitir submódulos con el valor 'ignore_config' establecido en 'all'" + +#: builtin/submodule--helper.c:1306 +msgid "limit the summary size" +msgstr "limitar el tamaño de resumen" + +#: builtin/submodule--helper.c:1311 +msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]" +msgstr "git submodule--helper summary [<options>] [<commit>] [--] [<path>]" + +#: builtin/submodule--helper.c:1335 +msgid "could not fetch a revision for HEAD" +msgstr "no se puede obtener la revisión para HEAD" + +#: builtin/submodule--helper.c:1340 +msgid "--cached and --files are mutually exclusive" +msgstr "--cached y --files son mutuamente exclusivos" + +#: builtin/submodule--helper.c:1407 #, c-format msgid "Synchronizing submodule url for '%s'\n" msgstr "Sincronizando url del submódulo para '%s'\n" -#: builtin/submodule--helper.c:989 +#: builtin/submodule--helper.c:1413 #, c-format msgid "failed to register url for submodule path '%s'" msgstr "falló al registrar el url para la ruta del submódulo '%s'" -#: builtin/submodule--helper.c:1003 +#: builtin/submodule--helper.c:1427 #, c-format msgid "failed to get the default remote for submodule '%s'" msgstr "error al conseguir el remoto por defecto para el submódulo '%s'" -#: builtin/submodule--helper.c:1014 +#: builtin/submodule--helper.c:1438 #, c-format msgid "failed to update remote for submodule '%s'" msgstr "error al actualizar el remoto para el submódulo '%s'" -#: builtin/submodule--helper.c:1061 -msgid "Suppress output of synchronizing submodule url" -msgstr "Suprime la salida del url del submódulo que se sincroniza" +#: builtin/submodule--helper.c:1485 +msgid "suppress output of synchronizing submodule url" +msgstr "suprime la salida del url del submódulo que se sincroniza" -#: builtin/submodule--helper.c:1068 +#: builtin/submodule--helper.c:1492 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" msgstr "git submodule--helper sync [--quiet] [--recursive] [<ruta>]" -#: builtin/submodule--helper.c:1122 +#: builtin/submodule--helper.c:1546 #, c-format msgid "" "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " @@ -21294,7 +22352,7 @@ msgstr "" "El árbol de trabajo del submódulo '%s' contiene un directorio .git (use 'rm -" "rf' si realmente quieres eliminarlo incluyendo todo en su historia)" -#: builtin/submodule--helper.c:1134 +#: builtin/submodule--helper.c:1558 #, c-format msgid "" "Submodule work tree '%s' contains local modifications; use '-f' to discard " @@ -21303,46 +22361,46 @@ msgstr "" "El árbol de trabajo del submódulo '%s' contiene modificaciones locales; usa " "'-f' para descartarlas" -#: builtin/submodule--helper.c:1142 +#: builtin/submodule--helper.c:1566 #, c-format msgid "Cleared directory '%s'\n" msgstr "Directorio '%s' limpiado\n" -#: builtin/submodule--helper.c:1144 +#: builtin/submodule--helper.c:1568 #, c-format msgid "Could not remove submodule work tree '%s'\n" msgstr "No se pudo eliminar el árbol de trabajo del submódulo '%s'\n" -#: builtin/submodule--helper.c:1155 +#: builtin/submodule--helper.c:1579 #, c-format msgid "could not create empty submodule directory %s" msgstr "no se pudo crear directorio vacío de submódulo %s" -#: builtin/submodule--helper.c:1171 +#: builtin/submodule--helper.c:1595 #, c-format msgid "Submodule '%s' (%s) unregistered for path '%s'\n" msgstr "Submódulo '%s' (%s) no registrado para ruta '%s'\n" -#: builtin/submodule--helper.c:1200 -msgid "Remove submodule working trees even if they contain local changes" +#: builtin/submodule--helper.c:1624 +msgid "remove submodule working trees even if they contain local changes" msgstr "" -"Remover árboles de trabajo de submódulos incluso si contienen cambios locales" +"remover árboles de trabajo de submódulos incluso si contienen cambios locales" -#: builtin/submodule--helper.c:1201 -msgid "Unregister all submodules" -msgstr "Quitar todos los submódulos" +#: builtin/submodule--helper.c:1625 +msgid "unregister all submodules" +msgstr "quitar todos los submódulos" -#: builtin/submodule--helper.c:1206 +#: builtin/submodule--helper.c:1630 msgid "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" msgstr "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<ruta>...]]" -#: builtin/submodule--helper.c:1220 +#: builtin/submodule--helper.c:1644 msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "Usa '--all' si realmente quieres des-inicializar todos los submódulos" -#: builtin/submodule--helper.c:1289 +#: builtin/submodule--helper.c:1713 msgid "" "An alternate computed from a superproject's alternate is invalid.\n" "To allow Git to clone without an alternate in such a case, set\n" @@ -21356,46 +22414,46 @@ msgstr "" "con\n" "'--reference-if-able' en lugar de '--reference'." -#: builtin/submodule--helper.c:1328 builtin/submodule--helper.c:1331 +#: builtin/submodule--helper.c:1752 builtin/submodule--helper.c:1755 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "submódulo '%s' no puede agregar alterno: %s" -#: builtin/submodule--helper.c:1367 +#: builtin/submodule--helper.c:1791 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "Valor '%s' para submodule.alternateErrorStrategy no es reconocido" -#: builtin/submodule--helper.c:1374 +#: builtin/submodule--helper.c:1798 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "Valor '%s' para submodule.alternateLocation no es reconocido" -#: builtin/submodule--helper.c:1398 +#: builtin/submodule--helper.c:1822 msgid "where the new submodule will be cloned to" msgstr "a donde el nuevo submódulo será clonado" -#: builtin/submodule--helper.c:1401 +#: builtin/submodule--helper.c:1825 msgid "name of the new submodule" msgstr "nombre del nuevo submódulo" -#: builtin/submodule--helper.c:1404 +#: builtin/submodule--helper.c:1828 msgid "url where to clone the submodule from" msgstr "url de dónde clonar el submódulo" -#: builtin/submodule--helper.c:1412 +#: builtin/submodule--helper.c:1836 msgid "depth for shallow clones" msgstr "profundidad para clones superficiales" -#: builtin/submodule--helper.c:1415 builtin/submodule--helper.c:1924 +#: builtin/submodule--helper.c:1839 builtin/submodule--helper.c:2348 msgid "force cloning progress" msgstr "forzar el proceso de clonado" -#: builtin/submodule--helper.c:1417 builtin/submodule--helper.c:1926 +#: builtin/submodule--helper.c:1841 builtin/submodule--helper.c:2350 msgid "disallow cloning into non-empty directory" msgstr "no permitir clonar en directorios no vacíos" -#: builtin/submodule--helper.c:1424 +#: builtin/submodule--helper.c:1848 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url " @@ -21405,104 +22463,104 @@ msgstr "" "<repositorio>] [--name <nombre>] [--depth <profundidad>] [--single-branch] --" "url <url> --path <ruta>" -#: builtin/submodule--helper.c:1449 +#: builtin/submodule--helper.c:1873 #, c-format msgid "refusing to create/use '%s' in another submodule's git dir" msgstr "rechazando crear/usar '%s' en el directorio de git de otro submódulo" -#: builtin/submodule--helper.c:1460 +#: builtin/submodule--helper.c:1884 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "clon de '%s' en la ruta de submódulo '%s' falló" -#: builtin/submodule--helper.c:1464 +#: builtin/submodule--helper.c:1888 #, c-format msgid "directory not empty: '%s'" msgstr "directorio no está vacío: '%s'" -#: builtin/submodule--helper.c:1476 +#: builtin/submodule--helper.c:1900 #, c-format msgid "could not get submodule directory for '%s'" msgstr "no se pudo obtener el directorio de submódulo para '%s'" -#: builtin/submodule--helper.c:1512 +#: builtin/submodule--helper.c:1936 #, c-format msgid "Invalid update mode '%s' for submodule path '%s'" msgstr "Modo de actualización inválido '%s' para ruta de submódulo '%s'" -#: builtin/submodule--helper.c:1516 +#: builtin/submodule--helper.c:1940 #, c-format msgid "Invalid update mode '%s' configured for submodule path '%s'" msgstr "" "Modo de actualización inválido '%s' configurado para ruta de submódulo '%s'" -#: builtin/submodule--helper.c:1617 +#: builtin/submodule--helper.c:2041 #, c-format msgid "Submodule path '%s' not initialized" msgstr "Ruta de submódulo '%s' no inicializada" -#: builtin/submodule--helper.c:1621 +#: builtin/submodule--helper.c:2045 msgid "Maybe you want to use 'update --init'?" msgstr "¿Tal vez quieres usar 'update --init'?" -#: builtin/submodule--helper.c:1651 +#: builtin/submodule--helper.c:2075 #, c-format msgid "Skipping unmerged submodule %s" msgstr "Saltando submódulo %s no fusionado" -#: builtin/submodule--helper.c:1680 +#: builtin/submodule--helper.c:2104 #, c-format msgid "Skipping submodule '%s'" msgstr "Saltando submódulo '%s'" -#: builtin/submodule--helper.c:1830 +#: builtin/submodule--helper.c:2254 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "Falló al clonar '%s'. Reintento programado" -#: builtin/submodule--helper.c:1841 +#: builtin/submodule--helper.c:2265 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "Falló al clonar '%s' una segunda vez, abortando" -#: builtin/submodule--helper.c:1903 builtin/submodule--helper.c:2149 +#: builtin/submodule--helper.c:2327 builtin/submodule--helper.c:2573 msgid "path into the working tree" msgstr "ruta hacia el árbol de trabajo" -#: builtin/submodule--helper.c:1906 +#: builtin/submodule--helper.c:2330 msgid "path into the working tree, across nested submodule boundaries" msgstr "" "ruta hacia el árbol de trabajo, a través de extremos de submódulos anidados" -#: builtin/submodule--helper.c:1910 +#: builtin/submodule--helper.c:2334 msgid "rebase, merge, checkout or none" msgstr "rebase, merge, checkout o none" -#: builtin/submodule--helper.c:1916 -msgid "Create a shallow clone truncated to the specified number of revisions" -msgstr "Crea un clon superficial truncado al número especificado de revisión" +#: builtin/submodule--helper.c:2340 +msgid "create a shallow clone truncated to the specified number of revisions" +msgstr "crea un clon superficial truncado al número especificado de revisión" -#: builtin/submodule--helper.c:1919 +#: builtin/submodule--helper.c:2343 msgid "parallel jobs" msgstr "trabajos paralelos" -#: builtin/submodule--helper.c:1921 +#: builtin/submodule--helper.c:2345 msgid "whether the initial clone should follow the shallow recommendation" msgstr "si el clon inicial debe seguir la recomendación superficial" -#: builtin/submodule--helper.c:1922 +#: builtin/submodule--helper.c:2346 msgid "don't print cloning progress" msgstr "no mostrar el progreso de clonado" -#: builtin/submodule--helper.c:1933 +#: builtin/submodule--helper.c:2357 msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]" msgstr "git submodule--helper update-clone [--prefix=<ruta>] [<ruta>...]" -#: builtin/submodule--helper.c:1946 +#: builtin/submodule--helper.c:2370 msgid "bad value for update parameter" msgstr "mal valor para parámetro update" -#: builtin/submodule--helper.c:1994 +#: builtin/submodule--helper.c:2418 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " @@ -21511,85 +22569,85 @@ msgstr "" "Rama de submódulo (%s) configurada para heredar rama del superproyecto, pero " "el superproyecto no está en ninguna rama" -#: builtin/submodule--helper.c:2117 +#: builtin/submodule--helper.c:2541 #, c-format msgid "could not get a repository handle for submodule '%s'" msgstr "no se pudo conseguir un handle para el submódulo '%s'" -#: builtin/submodule--helper.c:2150 +#: builtin/submodule--helper.c:2574 msgid "recurse into submodules" msgstr "recurrir a submódulos" -#: builtin/submodule--helper.c:2156 +#: builtin/submodule--helper.c:2580 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" msgstr "git submodule--helper absorb-git-dirs [<opciones>] [<path>...]" -#: builtin/submodule--helper.c:2212 +#: builtin/submodule--helper.c:2636 msgid "check if it is safe to write to the .gitmodules file" msgstr "revisar is es seguro escribir el archivo .gitmodules" -#: builtin/submodule--helper.c:2215 +#: builtin/submodule--helper.c:2639 msgid "unset the config in the .gitmodules file" msgstr "desconfigura la opción en elarchivo .gitmodules" -#: builtin/submodule--helper.c:2220 +#: builtin/submodule--helper.c:2644 msgid "git submodule--helper config <name> [<value>]" msgstr "git submodule--helper config <nombre> [<valor>]" -#: builtin/submodule--helper.c:2221 +#: builtin/submodule--helper.c:2645 msgid "git submodule--helper config --unset <name>" msgstr "git submodule--helper config --unset <nombre>" -#: builtin/submodule--helper.c:2222 +#: builtin/submodule--helper.c:2646 msgid "git submodule--helper config --check-writeable" msgstr "git submodule--helper config --check-writeable" -#: builtin/submodule--helper.c:2241 git-submodule.sh:176 +#: builtin/submodule--helper.c:2665 git-submodule.sh:150 #, sh-format msgid "please make sure that the .gitmodules file is in the working tree" msgstr "" "por favor asegúrate que el archivo .gitmodules está en el árbol de trabajo" -#: builtin/submodule--helper.c:2257 -msgid "Suppress output for setting url of a submodule" -msgstr "Suprime la salida para inicializar la url de un submódulo" +#: builtin/submodule--helper.c:2681 +msgid "suppress output for setting url of a submodule" +msgstr "suprime la salida para inicializar la url de un submódulo" -#: builtin/submodule--helper.c:2261 +#: builtin/submodule--helper.c:2685 msgid "git submodule--helper set-url [--quiet] <path> <newurl>" msgstr "git submodule--helper set-url [--quiet] <ruta> <nueva url>" -#: builtin/submodule--helper.c:2294 +#: builtin/submodule--helper.c:2718 msgid "set the default tracking branch to master" msgstr "configurar la rama de rastreo por defecto a master" -#: builtin/submodule--helper.c:2296 +#: builtin/submodule--helper.c:2720 msgid "set the default tracking branch" msgstr "configurar la rama de rastreo por defecto" -#: builtin/submodule--helper.c:2300 +#: builtin/submodule--helper.c:2724 msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>" msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <ruta>" -#: builtin/submodule--helper.c:2301 +#: builtin/submodule--helper.c:2725 msgid "" "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>" msgstr "" "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <rama> <ruta>" -#: builtin/submodule--helper.c:2308 +#: builtin/submodule--helper.c:2732 msgid "--branch or --default required" msgstr "--branch o --default requeridos" -#: builtin/submodule--helper.c:2311 +#: builtin/submodule--helper.c:2735 msgid "--branch and --default are mutually exclusive" msgstr "--branch y --default son mutuamente exclusivos" -#: builtin/submodule--helper.c:2367 git.c:436 git.c:683 +#: builtin/submodule--helper.c:2792 git.c:441 git.c:714 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s no soporta --super-prefix" -#: builtin/submodule--helper.c:2373 +#: builtin/submodule--helper.c:2798 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "'%s' no es un comando submodule--helper válido" @@ -21614,11 +22672,11 @@ msgstr "eliminar referencia simbólica" msgid "shorten ref output" msgstr "salida de referencia más corta" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:486 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:499 msgid "reason" msgstr "razón" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:486 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:499 msgid "reason of the update" msgstr "razón de la actualización" @@ -21638,11 +22696,13 @@ msgstr "git tag -d <nombre-de-tag>..." msgid "" "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--" "points-at <object>]\n" -"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]" +"\t\t[--format=<format>] [--merged <commit>] [--no-merged <commit>] " +"[<pattern>...]" msgstr "" "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--" "points-at <objeto>]\n" -"\t\t[--format=<formato>] [--[no-]merged [<commit>]] [<patrón>...]" +"\t\t[--format=<formato>] [--merged <commit>] [--no-merged <commit>] " +"[<patrón>...]" #: builtin/tag.c:30 msgid "git tag -v [--format=<format>] <tagname>..." @@ -21653,12 +22713,12 @@ msgstr "git tag -v [--format=<formato>] <nombre-de-tag>..." msgid "tag '%s' not found." msgstr "tag '%s' no encontrado." -#: builtin/tag.c:105 +#: builtin/tag.c:124 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "Etiqueta '%s' eliminada (era %s)\n" -#: builtin/tag.c:135 +#: builtin/tag.c:159 #, c-format msgid "" "\n" @@ -21671,7 +22731,7 @@ msgstr "" " %s\n" "Las líneas que comienzan con '%c' serán ignoradas.\n" -#: builtin/tag.c:139 +#: builtin/tag.c:163 #, c-format msgid "" "\n" @@ -21686,15 +22746,11 @@ msgstr "" "Las líneas que comienzan con '%c' serán conservadas; puedes eliminarlas por " "ti mismo si quieres hacerlo.\n" -#: builtin/tag.c:198 +#: builtin/tag.c:230 msgid "unable to sign the tag" msgstr "incapaz de firmar tag" -#: builtin/tag.c:200 -msgid "unable to write tag file" -msgstr "incapaz de escribir el archivo de tag" - -#: builtin/tag.c:216 +#: builtin/tag.c:248 #, c-format msgid "" "You have created a nested tag. The object referred to by your new tag is\n" @@ -21707,138 +22763,134 @@ msgstr "" "\n" "\tgit tag -f %s %s^{}" -#: builtin/tag.c:232 +#: builtin/tag.c:264 msgid "bad object type." msgstr "tipo de objeto erróneo." -#: builtin/tag.c:285 +#: builtin/tag.c:317 msgid "no tag message?" msgstr "¿Sin mensaje de tag?" -#: builtin/tag.c:292 +#: builtin/tag.c:324 #, c-format msgid "The tag message has been left in %s\n" msgstr "El mensaje del tag ha sido dejado en %s\n" -#: builtin/tag.c:403 +#: builtin/tag.c:435 msgid "list tag names" msgstr "listar nombres de tags" -#: builtin/tag.c:405 +#: builtin/tag.c:437 msgid "print <n> lines of each tag message" msgstr "imprimir <n> líneas de cada mensaje de tag" -#: builtin/tag.c:407 +#: builtin/tag.c:439 msgid "delete tags" msgstr "eliminar tags" -#: builtin/tag.c:408 +#: builtin/tag.c:440 msgid "verify tags" msgstr "verificar tags" -#: builtin/tag.c:410 +#: builtin/tag.c:442 msgid "Tag creation options" msgstr "Opciones de creación de tags" -#: builtin/tag.c:412 +#: builtin/tag.c:444 msgid "annotated tag, needs a message" msgstr "tags anotadas necesitan un mensaje" -#: builtin/tag.c:414 +#: builtin/tag.c:446 msgid "tag message" msgstr "mensaje de tag" -#: builtin/tag.c:416 +#: builtin/tag.c:448 msgid "force edit of tag message" msgstr "forzar la edición del mensaje de tag" -#: builtin/tag.c:417 +#: builtin/tag.c:449 msgid "annotated and GPG-signed tag" msgstr "tag anotado y firmado con GPG" -#: builtin/tag.c:420 +#: builtin/tag.c:452 msgid "use another key to sign the tag" msgstr "usar otra clave para firmar el tag" -#: builtin/tag.c:421 +#: builtin/tag.c:453 msgid "replace the tag if exists" msgstr "remplazar tag si existe" -#: builtin/tag.c:422 builtin/update-ref.c:492 +#: builtin/tag.c:454 builtin/update-ref.c:505 msgid "create a reflog" msgstr "crear un reflog" -#: builtin/tag.c:424 +#: builtin/tag.c:456 msgid "Tag listing options" msgstr "Opciones de listado de tag" -#: builtin/tag.c:425 +#: builtin/tag.c:457 msgid "show tag list in columns" msgstr "mostrar lista de tags en columnas" -#: builtin/tag.c:426 builtin/tag.c:428 +#: builtin/tag.c:458 builtin/tag.c:460 msgid "print only tags that contain the commit" msgstr "mostrar solo tags que contienen el commit" -#: builtin/tag.c:427 builtin/tag.c:429 +#: builtin/tag.c:459 builtin/tag.c:461 msgid "print only tags that don't contain the commit" msgstr "mostrar solo tags que no contienen el commit" -#: builtin/tag.c:430 +#: builtin/tag.c:462 msgid "print only tags that are merged" msgstr "sólo imprimir las tags que están fusionadas" -#: builtin/tag.c:431 +#: builtin/tag.c:463 msgid "print only tags that are not merged" msgstr "sólo imprimir las tags que no están fusionadas" -#: builtin/tag.c:435 +#: builtin/tag.c:467 msgid "print only tags of the object" msgstr "sólo imprimir tags de el objeto" -#: builtin/tag.c:483 +#: builtin/tag.c:515 msgid "--column and -n are incompatible" msgstr "--column y -n son incompatibles" -#: builtin/tag.c:505 +#: builtin/tag.c:537 msgid "-n option is only allowed in list mode" msgstr "opción -n solo es permitida en modo lista" -#: builtin/tag.c:507 +#: builtin/tag.c:539 msgid "--contains option is only allowed in list mode" msgstr "opción --contains solo es permitido en modo lista" -#: builtin/tag.c:509 +#: builtin/tag.c:541 msgid "--no-contains option is only allowed in list mode" msgstr "opción --no-contains solo es permitida en modo lista" -#: builtin/tag.c:511 +#: builtin/tag.c:543 msgid "--points-at option is only allowed in list mode" msgstr "opción --points-at solo es permitida en modo lista" -#: builtin/tag.c:513 +#: builtin/tag.c:545 msgid "--merged and --no-merged options are only allowed in list mode" msgstr "opciones --merged y --no-merged solo están permitidas en modo lista" -#: builtin/tag.c:524 +#: builtin/tag.c:556 msgid "only one -F or -m option is allowed." msgstr "sólo se permite una de las opciones, -m ó -F." -#: builtin/tag.c:543 -msgid "too many params" -msgstr "demasiados parámetros" - -#: builtin/tag.c:549 +#: builtin/tag.c:581 #, c-format msgid "'%s' is not a valid tag name." msgstr "'%s' no es un nombre de tag válido." -#: builtin/tag.c:554 +#: builtin/tag.c:586 #, c-format msgid "tag '%s' already exists" msgstr "el tag '%s' ya existe" -#: builtin/tag.c:585 +#: builtin/tag.c:617 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "Etiqueta '%s' actualizada (era %s)\n" @@ -22123,19 +23175,19 @@ msgstr "" msgid "git update-ref [<options>] --stdin [-z]" msgstr "git update-ref [<opciones>] --stdin [-z]" -#: builtin/update-ref.c:487 +#: builtin/update-ref.c:500 msgid "delete the reference" msgstr "eliminar la referencia" -#: builtin/update-ref.c:489 +#: builtin/update-ref.c:502 msgid "update <refname> not the one it points to" msgstr "actualiza <refname> no a lo que apunta" -#: builtin/update-ref.c:490 +#: builtin/update-ref.c:503 msgid "stdin has NUL-terminated arguments" msgstr "stdin tiene argumentos terminados en NUL" -#: builtin/update-ref.c:491 +#: builtin/update-ref.c:504 msgid "read updates from stdin" msgstr "lee actualizaciones de stdin" @@ -22179,15 +23231,15 @@ msgstr "imprimir contenido del commit" msgid "print raw gpg status output" msgstr "muestra la salida de status gpg en formato raw" -#: builtin/verify-pack.c:55 +#: builtin/verify-pack.c:59 msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <paquete>..." -#: builtin/verify-pack.c:65 +#: builtin/verify-pack.c:70 msgid "verbose" msgstr "verboso" -#: builtin/verify-pack.c:67 +#: builtin/verify-pack.c:72 msgid "show statistics only" msgstr "solo mostrar estadísticas" @@ -22199,89 +23251,63 @@ msgstr "git verify-tag [-v | --verbose] [--format=<formato>] <tag>..." msgid "print tag contents" msgstr "imprimir contenido del tag" -#: builtin/worktree.c:17 +#: builtin/worktree.c:18 msgid "git worktree add [<options>] <path> [<commit-ish>]" msgstr "git worktree add [<opciones>] <ruta> [<commit-ish>]" -#: builtin/worktree.c:18 +#: builtin/worktree.c:19 msgid "git worktree list [<options>]" msgstr "git worktree list [<opciones>]" -#: builtin/worktree.c:19 +#: builtin/worktree.c:20 msgid "git worktree lock [<options>] <path>" msgstr "git worktree lock [<opciones>] <ruta>" -#: builtin/worktree.c:20 +#: builtin/worktree.c:21 msgid "git worktree move <worktree> <new-path>" msgstr "git worktree move <worktree> <nueva-ruta>" -#: builtin/worktree.c:21 +#: builtin/worktree.c:22 msgid "git worktree prune [<options>]" msgstr "git worktree prune [<opciones>]" -#: builtin/worktree.c:22 +#: builtin/worktree.c:23 msgid "git worktree remove [<options>] <worktree>" msgstr "git worktree remove [<opciones>] <worktree>" -#: builtin/worktree.c:23 +#: builtin/worktree.c:24 msgid "git worktree unlock <path>" msgstr "git worktree unlock <ruta>" -#: builtin/worktree.c:60 builtin/worktree.c:972 +#: builtin/worktree.c:61 builtin/worktree.c:933 #, c-format msgid "failed to delete '%s'" msgstr "falló al borrar '%s'" -#: builtin/worktree.c:85 -msgid "not a valid directory" -msgstr "no en un directorio válido" - -#: builtin/worktree.c:91 -msgid "gitdir file does not exist" -msgstr "archivo gitdir no existe" - -#: builtin/worktree.c:96 builtin/worktree.c:105 -#, c-format -msgid "unable to read gitdir file (%s)" -msgstr "no es posible leer archivo gitdir (%s)" - -#: builtin/worktree.c:115 -#, c-format -msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)" -msgstr "lectura corta (se esperaba %<PRIuMAX> bytes, se leyó %<PRIuMAX>)" - -#: builtin/worktree.c:123 -msgid "invalid gitdir file" -msgstr "archivo gitdir inválido" - -#: builtin/worktree.c:131 -msgid "gitdir file points to non-existent location" -msgstr "archivo gitdir apunta a una ubicación inexistente" - -#: builtin/worktree.c:146 +#: builtin/worktree.c:74 #, c-format msgid "Removing %s/%s: %s" msgstr "Eliminando %s/%s: %s" -#: builtin/worktree.c:221 +#: builtin/worktree.c:149 msgid "report pruned working trees" msgstr "reporta árboles de trabajo recortados" -#: builtin/worktree.c:223 +#: builtin/worktree.c:151 msgid "expire working trees older than <time>" msgstr "expirar árboles de trabajo más viejos a <tiempo>" -#: builtin/worktree.c:293 +#: builtin/worktree.c:221 #, c-format msgid "'%s' already exists" msgstr "'%s' ya existe" -#: builtin/worktree.c:302 +#: builtin/worktree.c:230 #, c-format msgid "unusable worktree destination '%s'" msgstr "destino de worktree inutilizable '%s'" -#: builtin/worktree.c:307 +#: builtin/worktree.c:235 #, c-format msgid "" "'%s' is a missing but locked worktree;\n" @@ -22291,7 +23317,7 @@ msgstr "" "usa '%s -f -f' para sobreescribir, o 'unlock' y 'prune' o 'remove' para " "limpiar" -#: builtin/worktree.c:309 +#: builtin/worktree.c:237 #, c-format msgid "" "'%s' is a missing but already registered worktree;\n" @@ -22300,119 +23326,132 @@ msgstr "" "'%s' es un árbol de trabajo faltante pero ya registrado;\n" "usa '%s -f' para sobreescribir, o 'prune' o 'remove' para limpiar" -#: builtin/worktree.c:360 +#: builtin/worktree.c:288 #, c-format msgid "could not create directory of '%s'" msgstr "no se pudo crear directorio de '%s'" -#: builtin/worktree.c:494 builtin/worktree.c:500 +#: builtin/worktree.c:422 builtin/worktree.c:428 #, c-format msgid "Preparing worktree (new branch '%s')" msgstr "Preparando árbol de trabajo (nueva rama '%s')" -#: builtin/worktree.c:496 +#: builtin/worktree.c:424 #, c-format msgid "Preparing worktree (resetting branch '%s'; was at %s)" msgstr "Preparando árbol de trabajo (reiniciando rama '%s'; estaba en %s)" -#: builtin/worktree.c:505 +#: builtin/worktree.c:433 #, c-format msgid "Preparing worktree (checking out '%s')" msgstr "Preparando árbol de trabajo (haciendo checkout a '%s')" -#: builtin/worktree.c:511 +#: builtin/worktree.c:439 #, c-format msgid "Preparing worktree (detached HEAD %s)" msgstr "Preparando árbol de trabajo (HEAD desacoplado %s)" -#: builtin/worktree.c:552 +#: builtin/worktree.c:480 msgid "checkout <branch> even if already checked out in other worktree" msgstr "" "hacer checkout a <rama> incluso si ya ha hecho checkout en otro árbol de " "trabajo" -#: builtin/worktree.c:555 +#: builtin/worktree.c:483 msgid "create a new branch" msgstr "crear una nueva rama" -#: builtin/worktree.c:557 +#: builtin/worktree.c:485 msgid "create or reset a branch" msgstr "crear o restablecer una rama" -#: builtin/worktree.c:559 +#: builtin/worktree.c:487 msgid "populate the new working tree" msgstr "popular el nuevo árbol de trabajo" -#: builtin/worktree.c:560 +#: builtin/worktree.c:488 msgid "keep the new working tree locked" msgstr "mantener el nuevo árbol de trabajo bloqueado" -#: builtin/worktree.c:563 +#: builtin/worktree.c:491 msgid "set up tracking mode (see git-branch(1))" msgstr "configurando modo tracking (mirar git-branch(1))" -#: builtin/worktree.c:566 +#: builtin/worktree.c:494 msgid "try to match the new branch name with a remote-tracking branch" msgstr "" "intentar emparejar el nuevo nombre de rama con una rama de rastreo remoto" -#: builtin/worktree.c:574 +#: builtin/worktree.c:502 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b, -B, y --detach son mutuamente exclusivas" -#: builtin/worktree.c:635 +#: builtin/worktree.c:563 msgid "--[no-]track can only be used if a new branch is created" msgstr "--[no-]track solo puede ser usado si una nueva rama es creada" -#: builtin/worktree.c:755 +#: builtin/worktree.c:680 +msgid "show extended annotations and reasons, if available" +msgstr "mostrar anotaciones ampliadas y motivos, si están disponibles" + +#: builtin/worktree.c:682 +msgid "add 'prunable' annotation to worktrees older than <time>" +msgstr "" +"agregue la anotación 'podable' a los árboles de trabajo anteriores a <tiempo>" + +#: builtin/worktree.c:691 +msgid "--verbose and --porcelain are mutually exclusive" +msgstr "--verbose and --porcelain son mutuamente exclusivas" + +#: builtin/worktree.c:718 msgid "reason for locking" msgstr "razón para bloquear" -#: builtin/worktree.c:767 builtin/worktree.c:800 builtin/worktree.c:874 -#: builtin/worktree.c:1000 +#: builtin/worktree.c:730 builtin/worktree.c:763 builtin/worktree.c:837 +#: builtin/worktree.c:961 #, c-format msgid "'%s' is not a working tree" msgstr "'%s' no es un árbol de trabajo" -#: builtin/worktree.c:769 builtin/worktree.c:802 +#: builtin/worktree.c:732 builtin/worktree.c:765 msgid "The main working tree cannot be locked or unlocked" msgstr "El árbol de trabajo principal no puede ser bloqueado ni desbloqueado" -#: builtin/worktree.c:774 +#: builtin/worktree.c:737 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "'%s' ya está bloqueado; razón: %s" -#: builtin/worktree.c:776 +#: builtin/worktree.c:739 #, c-format msgid "'%s' is already locked" msgstr "'%s' ya está bloqueado" -#: builtin/worktree.c:804 +#: builtin/worktree.c:767 #, c-format msgid "'%s' is not locked" msgstr "'%s' no está bloqueado" -#: builtin/worktree.c:845 +#: builtin/worktree.c:808 msgid "working trees containing submodules cannot be moved or removed" msgstr "" "árboles de trabajo conteniendo submódulos no puede ser movidos o eliminado" -#: builtin/worktree.c:853 +#: builtin/worktree.c:816 msgid "force move even if worktree is dirty or locked" msgstr "forzar move incluso si el árbol de trabajo está sucio o bloqueado" -#: builtin/worktree.c:876 builtin/worktree.c:1002 +#: builtin/worktree.c:839 builtin/worktree.c:963 #, c-format msgid "'%s' is a main working tree" msgstr "'%s' es un árbol de trabajo principal" -#: builtin/worktree.c:881 +#: builtin/worktree.c:844 #, c-format msgid "could not figure out destination name from '%s'" msgstr "no se pudo descubrir el nombre de destino de '%s'" -#: builtin/worktree.c:894 +#: builtin/worktree.c:857 #, c-format msgid "" "cannot move a locked working tree, lock reason: %s\n" @@ -22421,7 +23460,7 @@ msgstr "" "no se puede mover un árbol de trabajo bloqueado, motivo del bloqueo: %s\n" "use 'move -f -f' para sobreescribir o desbloquear primero" -#: builtin/worktree.c:896 +#: builtin/worktree.c:859 msgid "" "cannot move a locked working tree;\n" "use 'move -f -f' to override or unlock first" @@ -22429,37 +23468,37 @@ msgstr "" "no se puede mover un árbol de trabajo bloqueado;\n" "use 'move -f -f' para sobreescribir o desbloquear primero" -#: builtin/worktree.c:899 +#: builtin/worktree.c:862 #, c-format msgid "validation failed, cannot move working tree: %s" msgstr "falló validación, no se puede mover el árbol de trabajo: %s" -#: builtin/worktree.c:904 +#: builtin/worktree.c:867 #, c-format msgid "failed to move '%s' to '%s'" msgstr "falló al mover '%s' a '%s'" -#: builtin/worktree.c:952 +#: builtin/worktree.c:913 #, c-format msgid "failed to run 'git status' on '%s'" msgstr "falló al ejecutar 'git status' en '%s'" -#: builtin/worktree.c:956 +#: builtin/worktree.c:917 #, c-format msgid "'%s' contains modified or untracked files, use --force to delete it" msgstr "" "'%s' contiene archivos no rastreados o modificados, use --force para borrarlo" -#: builtin/worktree.c:961 +#: builtin/worktree.c:922 #, c-format msgid "failed to run 'git status' on '%s', code %d" msgstr "no se pudo ejecutar 'git status' en '%s', código %d" -#: builtin/worktree.c:984 +#: builtin/worktree.c:945 msgid "force removal even if worktree is dirty or locked" msgstr "forzar remoción incluso si el árbol de trabajo está sucio o bloqueado" -#: builtin/worktree.c:1007 +#: builtin/worktree.c:968 #, c-format msgid "" "cannot remove a locked working tree, lock reason: %s\n" @@ -22468,7 +23507,7 @@ msgstr "" "no se pueden eliminar árbol de trabajo bloqueado, razón del bloqueo: %s\n" "use 'remove -f -f' para sobreescribir o desbloquear primero" -#: builtin/worktree.c:1009 +#: builtin/worktree.c:970 msgid "" "cannot remove a locked working tree;\n" "use 'remove -f -f' to override or unlock first" @@ -22476,11 +23515,21 @@ msgstr "" "no se pueden eliminar árbol de trabajo bloqueado;\n" "use 'remove -f -f' para sobreescribir o desbloquear primero" -#: builtin/worktree.c:1012 +#: builtin/worktree.c:973 #, c-format msgid "validation failed, cannot remove working tree: %s" msgstr "falló validación, no se puede eliminar árbol de trabajo: %s" +#: builtin/worktree.c:997 +#, c-format +msgid "repair: %s: %s" +msgstr "reparar: %s: %s" + +#: builtin/worktree.c:1000 +#, c-format +msgid "error: %s: %s" +msgstr "error: %s: %s" + #: builtin/write-tree.c:15 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" msgstr "git write-tree [--missing-ok] [--prefix=<prefijo>/]" @@ -22497,164 +23546,37 @@ msgstr "escribir objeto de árbol para un subdirectorio <prefijo>" msgid "only useful for debugging" msgstr "sólo útil para depurar" -#: bugreport.c:15 -msgid "git version:\n" -msgstr "versión de git:\n" - -#: bugreport.c:21 -#, c-format -msgid "uname() failed with error '%s' (%d)\n" -msgstr "uname() falló con error '%s' (%d)\n" - -#: bugreport.c:31 -msgid "compiler info: " -msgstr "información del compilador: " - -#: bugreport.c:34 -msgid "libc info: " -msgstr "información de libc: " - -#: bugreport.c:80 -msgid "not run from a git repository - no hooks to show\n" -msgstr "no ejecutado desde un repositorio git - no hay hooks para mostrar\n" - -#: bugreport.c:90 -msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]" -msgstr "" -"git bugreport [-o|--output-directory <archivo>] [-s|--suffix <formato>]" - -#: bugreport.c:97 -msgid "" -"Thank you for filling out a Git bug report!\n" -"Please answer the following questions to help us understand your issue.\n" -"\n" -"What did you do before the bug happened? (Steps to reproduce your issue)\n" -"\n" -"What did you expect to happen? (Expected behavior)\n" -"\n" -"What happened instead? (Actual behavior)\n" -"\n" -"What's different between what you expected and what actually happened?\n" -"\n" -"Anything else you want to add:\n" -"\n" -"Please review the rest of the bug report below.\n" -"You can delete any lines you don't wish to share.\n" -msgstr "" -"¡Gracias por prepara un reporte de bug de Git!\n" -"Por favor responde las siguientes preguntas para ayudarnos a entender el " -"problema.\n" -"\n" -"¿Qué hiciste antes de que sucediera el bug? (Pasos para reproducir el " -"problema)\n" -"\n" -"¿Qué esperabas que sucediera? (Comportamiento esperado)\n" -"\n" -"¿Qué sucedio en lugar de eso? (Comportamiento real)\n" -"\n" -"¿Qué es diferente entre lo que esperabas y lo que pasó?\n" -"\n" -"Cualquier cosa que quieras agregar:\n" -"\n" -"Por favor revisa el resto del reporte abajo.\n" -"Puedes borrar cualquier línea que no desees compartir.\n" - -#: bugreport.c:136 -msgid "specify a destination for the bugreport file" -msgstr "especificar el destino para el archivo de reporte de bug" - -#: bugreport.c:138 -msgid "specify a strftime format suffix for the filename" -msgstr "especificar el sufijo formato strftime para el nombre del archivo." - -#: bugreport.c:162 -#, c-format -msgid "could not create leading directories for '%s'" -msgstr "no se pudo crear directorios principales para '%s'" - -#: bugreport.c:169 -msgid "System Info" -msgstr "Información del sistema" - -#: bugreport.c:172 -msgid "Enabled Hooks" -msgstr "Activar Hooks" - -#: bugreport.c:180 +#: http-fetch.c:118 #, c-format -msgid "couldn't create a new file at '%s'" -msgstr "no se pudo crear un archivo en '%s'" - -#: bugreport.c:184 -#, c-format -msgid "unable to write to %s" -msgstr "no es posible escribir en %s" - -#: bugreport.c:194 -#, c-format -msgid "Created new report at '%s'.\n" -msgstr "Crear un nuevo reporte en '%s'.\n" - -#: fast-import.c:3100 -#, c-format -msgid "Missing from marks for submodule '%s'" -msgstr "Faltan marcas from para el submódulo '%s'" - -#: fast-import.c:3102 -#, c-format -msgid "Missing to marks for submodule '%s'" -msgstr "Faltan marcas to para el submódulo '%s'" - -#: fast-import.c:3237 -#, c-format -msgid "Expected 'mark' command, got %s" -msgstr "Se esperaba comando 'mark', se obtuvo %s" - -#: fast-import.c:3242 -#, c-format -msgid "Expected 'to' command, got %s" -msgstr "Se esperaba comando 'to', se obtuvo %s" +msgid "argument to --packfile must be a valid hash (got '%s')" +msgstr "argumento para --packfile tiene que se un hash válido (se obtuvo '%s')" -#: fast-import.c:3334 -msgid "Expected format name:filename for submodule rewrite option" -msgstr "" -"Formato esperado de nombre:nombre de archivo para la opción de sobreescribir " -"submódulo" +#: http-fetch.c:128 +msgid "not a git repository" +msgstr "no es un repositorio git" -#: fast-import.c:3388 -#, c-format -msgid "feature '%s' forbidden in input without --allow-unsafe-features" -msgstr "característica '%s' prohibida en input sin --allow-unsafe-features" +#: http-fetch.c:134 +msgid "--packfile requires --index-pack-args" +msgstr "--packfile requiere --index-pack-args" -#: http-fetch.c:111 -#, c-format -msgid "argument to --packfile must be a valid hash (got '%s')" -msgstr "argumento para --packfile tiene que se un hash válido (se obtuvo '%s')" +#: http-fetch.c:143 +msgid "--index-pack-args can only be used with --packfile" +msgstr "--index-pack-args solo se puede usar con --packfile" -#: credential-cache--daemon.c:223 -#, c-format -msgid "" -"The permissions on your socket directory are too loose; other\n" -"users may be able to read your cached credentials. Consider running:\n" -"\n" -"\tchmod 0700 %s" -msgstr "" -"Los permisos en tu directorio de socket son demasiado flojos; otros\n" -"usuarios pueden leer sus credenciales almacenadas en caché. Considera " -"ejecutar:\n" -"\n" -"\tchmod 0700 %s" +#: t/helper/test-fast-rebase.c:141 +msgid "unhandled options" +msgstr "opciones no manejadas" -#: credential-cache--daemon.c:272 -msgid "print debugging messages to stderr" -msgstr "mostrar mensajes de debug en stderr" +#: t/helper/test-fast-rebase.c:146 +msgid "error preparing revisions" +msgstr "error al preparar revisiones" -#: t/helper/test-reach.c:152 +#: t/helper/test-reach.c:154 #, c-format msgid "commit %s is not marked reachable" msgstr "commit %s no está marcado como alcanzable" -#: t/helper/test-reach.c:162 +#: t/helper/test-reach.c:164 msgid "too many commits marked reachable" msgstr "demasiados commits marcados como alcanzables" @@ -22673,16 +23595,19 @@ msgid "" " [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--" "bare]\n" " [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n" +" [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n" " <command> [<args>]" msgstr "" "git [--version] [--help] [-C <ruta>] [-c <nombre>=<valor>]\n" -" [--exec-path[=<ruta>]] [--html-path] [--man-path] [--info-path]\n" -" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--" +" [--exec-path [= <path>]] [--html-path] [--man-path] [--info-" +"path]\n" +" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--" "bare]\n" -" [--git-dir=<ruta>] [--work-tree=<ruta>] [--namespace=<nombre>]\n" -" <comando> [<args>]" +" [--git-dir=<ruta>] [--work-tree=<ruta>] [--namespace=<nombre>]\n" +" [--super-prefix=<ruta>] [--config-env=<nombre>=<envvar>]\n" +" <comando> [<args>]" -#: git.c:35 +#: git.c:36 msgid "" "'git help -a' and 'git help -g' list available subcommands and some\n" "concept guides. See 'git help <command>' or 'git help <concept>'\n" @@ -22694,47 +23619,47 @@ msgstr "" "para leer sobre un subcomando o concepto específico.\n" "Mira 'git help git' para una vista general del sistema." -#: git.c:187 +#: git.c:188 #, c-format msgid "no directory given for --git-dir\n" msgstr "no se entregó directorio para --git-dir\n" -#: git.c:201 +#: git.c:202 #, c-format msgid "no namespace given for --namespace\n" msgstr "no se entregó namespace para --namespace\n" -#: git.c:215 +#: git.c:216 #, c-format msgid "no directory given for --work-tree\n" msgstr "no se entregó directorio para --work-tree\n" -#: git.c:229 +#: git.c:230 #, c-format msgid "no prefix given for --super-prefix\n" msgstr "no se entregó prefijo para --super-prefix\n" -#: git.c:251 +#: git.c:252 #, c-format msgid "-c expects a configuration string\n" msgstr "-c espera un string de configuración\n" -#: git.c:289 +#: git.c:292 #, c-format msgid "no directory given for -C\n" msgstr "no se entregó directorio para -C\n" -#: git.c:315 +#: git.c:318 #, c-format msgid "unknown option: %s\n" msgstr "opción %s desconocida\n" -#: git.c:362 +#: git.c:367 #, c-format msgid "while expanding alias '%s': '%s'" msgstr "al expandir el alias '%s':'%s'" -#: git.c:371 +#: git.c:376 #, c-format msgid "" "alias '%s' changes environment variables.\n" @@ -22743,39 +23668,39 @@ msgstr "" "alias '%s' cambia las variables de entorno.\n" "Puedes usar '!git' en el alias para hacer esto" -#: git.c:378 +#: git.c:383 #, c-format msgid "empty alias for %s" msgstr "alias vacío para %s" -#: git.c:381 +#: git.c:386 #, c-format msgid "recursive alias: %s" msgstr "alias recursivo: %s" -#: git.c:463 +#: git.c:468 msgid "write failure on standard output" msgstr "error de escritura en standard output" -#: git.c:465 +#: git.c:470 msgid "unknown write failure on standard output" msgstr "error desconocido de escritura en standard output" -#: git.c:467 +#: git.c:472 msgid "close failed on standard output" msgstr "cierre falló en standard output" -#: git.c:792 +#: git.c:823 #, c-format msgid "alias loop detected: expansion of '%s' does not terminate:%s" msgstr "bucle de alias detectado: expansión de '%s' no termina: %s" -#: git.c:842 +#: git.c:873 #, c-format msgid "cannot handle %s as a builtin" msgstr "no se puede manejar %s como un builtin" -#: git.c:855 +#: git.c:886 #, c-format msgid "" "usage: %s\n" @@ -22786,12 +23711,12 @@ msgstr "" "\n" "\n" -#: git.c:875 +#: git.c:906 #, c-format msgid "expansion of alias '%s' failed; '%s' is not a git command\n" msgstr "expansión del alias '%s' falló; '%s' no es un comando de git\n" -#: git.c:887 +#: git.c:918 #, c-format msgid "failed to run command '%s': %s\n" msgstr "falló al ejecutar comando '%s': %s\n" @@ -22845,137 +23770,137 @@ msgstr "" " preguntaba por: %s\n" " redireccionamiento: %s" -#: remote-curl.c:168 +#: remote-curl.c:183 #, c-format msgid "invalid quoting in push-option value: '%s'" msgstr "quoting inválido en valor de push-option: '%s'" -#: remote-curl.c:295 +#: remote-curl.c:307 #, c-format msgid "%sinfo/refs not valid: is this a git repository?" msgstr "%sinfo/refs no es válido: ¿es este un repositorio git?" -#: remote-curl.c:396 +#: remote-curl.c:408 msgid "invalid server response; expected service, got flush packet" msgstr "" "respuesta de servidor inválida; se esperaba servicio, se obtuvo un flush " "packet" -#: remote-curl.c:427 +#: remote-curl.c:439 #, c-format msgid "invalid server response; got '%s'" msgstr "respuesta de servidor inválida; se obtuvo '%s'" -#: remote-curl.c:487 +#: remote-curl.c:499 #, c-format msgid "repository '%s' not found" msgstr "repositorio '%s' no encontrado" -#: remote-curl.c:491 +#: remote-curl.c:503 #, c-format msgid "Authentication failed for '%s'" msgstr "Autenticación falló para '%s'" -#: remote-curl.c:495 +#: remote-curl.c:507 #, c-format msgid "unable to access '%s': %s" msgstr "no es posible acceder '%s':%s" -#: remote-curl.c:501 +#: remote-curl.c:513 #, c-format msgid "redirecting to %s" msgstr "redirigiendo a %s" -#: remote-curl.c:630 +#: remote-curl.c:642 msgid "shouldn't have EOF when not gentle on EOF" msgstr "no debería tener EOF cuando no es gentil en EOF" -#: remote-curl.c:642 +#: remote-curl.c:654 msgid "remote server sent stateless separator" msgstr "el servidor remoto envió un separador sin estado (stateless)" -#: remote-curl.c:712 +#: remote-curl.c:724 msgid "unable to rewind rpc post data - try increasing http.postBuffer" msgstr "" "no es posible rebobinar rpc post data - intenta incrementando http.postBuffer" -#: remote-curl.c:742 +#: remote-curl.c:754 #, c-format msgid "remote-curl: bad line length character: %.4s" msgstr "remote-curl: mal caracter de largo de línea: %.4s" -#: remote-curl.c:744 +#: remote-curl.c:756 msgid "remote-curl: unexpected response end packet" msgstr "remote-curl: packet de respuesta final inesperado" -#: remote-curl.c:820 +#: remote-curl.c:832 #, c-format msgid "RPC failed; %s" msgstr "RPC falló; %s" -#: remote-curl.c:860 +#: remote-curl.c:872 msgid "cannot handle pushes this big" msgstr "no se puede manejar pushes tan grandes" -#: remote-curl.c:975 +#: remote-curl.c:987 #, c-format msgid "cannot deflate request; zlib deflate error %d" msgstr "no se puede desinflar el request; zlib deflate error %d" -#: remote-curl.c:979 +#: remote-curl.c:991 #, c-format msgid "cannot deflate request; zlib end error %d" msgstr "no se puede desinflar el request; zlib end error %d" -#: remote-curl.c:1029 +#: remote-curl.c:1041 #, c-format msgid "%d bytes of length header were received" msgstr "%d bytes de header de longitud fueron recibidos" -#: remote-curl.c:1031 +#: remote-curl.c:1043 #, c-format msgid "%d bytes of body are still expected" msgstr "%d bytes de cuerpo se siguen esperando" -#: remote-curl.c:1120 +#: remote-curl.c:1132 msgid "dumb http transport does not support shallow capabilities" msgstr "dump http transport no soporta capacidades superficiales" -#: remote-curl.c:1135 +#: remote-curl.c:1147 msgid "fetch failed." msgstr "fetch falló." -#: remote-curl.c:1183 +#: remote-curl.c:1193 msgid "cannot fetch by sha1 over smart http" msgstr "no se puede hacer fetch por sha1 sobre smart http" -#: remote-curl.c:1227 remote-curl.c:1233 +#: remote-curl.c:1237 remote-curl.c:1243 #, c-format msgid "protocol error: expected sha/ref, got '%s'" msgstr "error de protocolo: se esperaba sha/ref, se obtuvo '%s'" -#: remote-curl.c:1245 remote-curl.c:1360 +#: remote-curl.c:1255 remote-curl.c:1373 #, c-format msgid "http transport does not support %s" msgstr "http transport no soporta %s" -#: remote-curl.c:1281 +#: remote-curl.c:1291 msgid "git-http-push failed" msgstr "git-http-push falló" -#: remote-curl.c:1466 +#: remote-curl.c:1479 msgid "remote-curl: usage: git remote-curl <remote> [<url>]" msgstr "remote-curl: uso: git remote-curl <remote> [<url>]" -#: remote-curl.c:1498 +#: remote-curl.c:1511 msgid "remote-curl: error reading command stream from git" msgstr "remote-curl: error leyendo command stream de git" -#: remote-curl.c:1505 +#: remote-curl.c:1518 msgid "remote-curl: fetch attempted without a local repo" msgstr "remote-curl: fetch intentado sin un repositorio local" -#: remote-curl.c:1546 +#: remote-curl.c:1559 #, c-format msgid "remote-curl: unknown command '%s' from git" msgstr "remote-curl: comando '%s' desconocido de git" @@ -22988,11 +23913,11 @@ msgstr "no hay información disponible del compilador\n" msgid "no libc information available\n" msgstr "no hay información disponible de libc\n" -#: list-objects-filter-options.h:85 +#: list-objects-filter-options.h:91 msgid "args" msgstr "args" -#: list-objects-filter-options.h:86 +#: list-objects-filter-options.h:92 msgid "object filtering" msgstr "filtrado de objeto" @@ -23013,8 +23938,8 @@ msgid "be more quiet" msgstr "ser más discreto" #: parse-options.h:317 -msgid "use <n> digits to display SHA-1s" -msgstr "usa <n> dígitos para mostrar SHA-1s" +msgid "use <n> digits to display object names" +msgstr "use <n> dígitos para mostrar los nombres de los objetos" #: parse-options.h:336 msgid "how to strip spaces and #comments from message" @@ -23031,11 +23956,11 @@ msgstr "" "con --pathspec-from-file, elementos de pathspec son separados con caracter " "NUL" -#: ref-filter.h:101 +#: ref-filter.h:99 msgid "key" msgstr "clave" -#: ref-filter.h:101 +#: ref-filter.h:99 msgid "field name to sort on" msgstr "nombre del campo por el cuál ordenar" @@ -23045,14 +23970,6 @@ msgstr "" "actualizar el índice con la resolución de conflictos reutilizada si es " "posible" -#: wt-status.h:80 -msgid "HEAD detached at " -msgstr "HEAD desacoplada en " - -#: wt-status.h:81 -msgid "HEAD detached from " -msgstr "HEAD desacoplada de " - #: command-list.h:50 msgid "Add file contents to the index" msgstr "Agrega contenido de carpetas al índice" @@ -23256,533 +24173,505 @@ msgid "Output information on each ref" msgstr "Información de output en cada ref" #: command-list.h:99 +msgid "Run a Git command on a list of repositories" +msgstr "Ejecute un comando de Git en una lista de repositorios" + +#: command-list.h:100 msgid "Prepare patches for e-mail submission" msgstr "Prepara parches para ser enviados por e-mail" -#: command-list.h:100 +#: command-list.h:101 msgid "Verifies the connectivity and validity of the objects in the database" msgstr "" "Verifica la conectividad y disponibilidad de los objetos en la base de datos" -#: command-list.h:101 +#: command-list.h:102 msgid "Cleanup unnecessary files and optimize the local repository" msgstr "Limpia archivos innecesarios y optimiza el repositorio local" -#: command-list.h:102 +#: command-list.h:103 msgid "Extract commit ID from an archive created using git-archive" msgstr "Extrae el ID de commit de un archivo creado usando git-archive" -#: command-list.h:103 +#: command-list.h:104 msgid "Print lines matching a pattern" msgstr "Imprime las líneas que concuerdan con el patron" -#: command-list.h:104 +#: command-list.h:105 msgid "A portable graphical interface to Git" msgstr "Una interfaz gráfica portátil para Git" -#: command-list.h:105 +#: command-list.h:106 msgid "Compute object ID and optionally creates a blob from a file" msgstr "Computa ID de objeto y, opcionalmente, crea un blob de un archivo" -#: command-list.h:106 +#: command-list.h:107 msgid "Display help information about Git" msgstr "Mostrar información sobre Git" -#: command-list.h:107 +#: command-list.h:108 msgid "Server side implementation of Git over HTTP" msgstr "Implementación de lado de servidor de Git por HTTP" -#: command-list.h:108 +#: command-list.h:109 msgid "Download from a remote Git repository via HTTP" msgstr "Descarga de un repositorio Git remoto vía HTTP" -#: command-list.h:109 +#: command-list.h:110 msgid "Push objects over HTTP/DAV to another repository" msgstr "Empuja objetos por HTTP/DAV a otro repositorio" -#: command-list.h:110 +#: command-list.h:111 msgid "Send a collection of patches from stdin to an IMAP folder" msgstr "Enviar una colección de parches de stdin a una carpeta IMAP" -#: command-list.h:111 +#: command-list.h:112 msgid "Build pack index file for an existing packed archive" msgstr "Constuye un archivo de índice para un archivo empaquetado existente" -#: command-list.h:112 +#: command-list.h:113 msgid "Create an empty Git repository or reinitialize an existing one" msgstr "Crea un repositorio de Git vacío o reinicia el que ya existe" -#: command-list.h:113 +#: command-list.h:114 msgid "Instantly browse your working repository in gitweb" msgstr "Buscar instantáneamente tu repositorio de trabajo en gitweb" -#: command-list.h:114 +#: command-list.h:115 msgid "Add or parse structured information in commit messages" msgstr "Agregar o analizar información estructurada en mensajes de commit" -#: command-list.h:115 +#: command-list.h:116 msgid "The Git repository browser" msgstr "El navegador de repositorio Git" -#: command-list.h:116 +#: command-list.h:117 msgid "Show commit logs" msgstr "Muestra los logs de los commits" -#: command-list.h:117 +#: command-list.h:118 msgid "Show information about files in the index and the working tree" msgstr "Muestra información sobre archivos in el índice y el árbol de trabajo" -#: command-list.h:118 +#: command-list.h:119 msgid "List references in a remote repository" msgstr "Lista referencias en un repositorio remoto" -#: command-list.h:119 +#: command-list.h:120 msgid "List the contents of a tree object" msgstr "Lista los contenidos de un objeto árbol" -#: command-list.h:120 +#: command-list.h:121 msgid "Extracts patch and authorship from a single e-mail message" msgstr "Extraer parche y autoría de un único mensaje de e-mail" -#: command-list.h:121 +#: command-list.h:122 msgid "Simple UNIX mbox splitter program" msgstr "Programa divisor de mbox simple de UNIX" -#: command-list.h:122 +#: command-list.h:123 +msgid "Run tasks to optimize Git repository data" +msgstr "Ejecute tareas para optimizar los datos del repositorio de Git" + +#: command-list.h:124 msgid "Join two or more development histories together" msgstr "Junta dos o más historiales de desarrollo juntos" -#: command-list.h:123 +#: command-list.h:125 msgid "Find as good common ancestors as possible for a merge" msgstr "Encuentra un ancestro común bueno para una posible fusión" -#: command-list.h:124 +#: command-list.h:126 msgid "Run a three-way file merge" msgstr "Ejecuta una fusión de tres vías en un archivo" -#: command-list.h:125 +#: command-list.h:127 msgid "Run a merge for files needing merging" msgstr "Ejecuta una fusión para archivos que la necesitan" -#: command-list.h:126 +#: command-list.h:128 msgid "The standard helper program to use with git-merge-index" msgstr "El programa de ayuda estándar para usar con git-merge-index" -#: command-list.h:127 +#: command-list.h:129 msgid "Run merge conflict resolution tools to resolve merge conflicts" msgstr "" "Ejecuta las herramientas de fusión de resolución de conflictos para resolver " "conflictos de fusión" -#: command-list.h:128 +#: command-list.h:130 msgid "Show three-way merge without touching index" msgstr "Mostrar fusión de tres vías sin tocar el índice" -#: command-list.h:129 +#: command-list.h:131 msgid "Write and verify multi-pack-indexes" msgstr "Escribe y verifica archivos multi-pack-index" -#: command-list.h:130 -msgid "Creates a tag object" -msgstr "Crea un objeto tag" +#: command-list.h:132 +msgid "Creates a tag object with extra validation" +msgstr "Crea un objeto de etiqueta con validación adicional" -#: command-list.h:131 +#: command-list.h:133 msgid "Build a tree-object from ls-tree formatted text" msgstr "Construir un objeto árbol de un texto en formato ls-tree" -#: command-list.h:132 +#: command-list.h:134 msgid "Move or rename a file, a directory, or a symlink" msgstr "Mueve o cambia el nombre a archivos, directorios o enlaces simbólicos" -#: command-list.h:133 +#: command-list.h:135 msgid "Find symbolic names for given revs" msgstr "Encontrar nombres simbólicos para revs dados" -#: command-list.h:134 +#: command-list.h:136 msgid "Add or inspect object notes" msgstr "Agrega o inspecciona objetos nota" -#: command-list.h:135 +#: command-list.h:137 msgid "Import from and submit to Perforce repositories" msgstr "Importar desde y enviar a repositorios Perforce" -#: command-list.h:136 +#: command-list.h:138 msgid "Create a packed archive of objects" msgstr "Crea un archivo de objetos empaquetados" -#: command-list.h:137 +#: command-list.h:139 msgid "Find redundant pack files" msgstr "Encuentra archivos empaquetados de manera redundante" -#: command-list.h:138 +#: command-list.h:140 msgid "Pack heads and tags for efficient repository access" msgstr "Empaqueta heads y tags para un acceso eficiente al repositorio" -#: command-list.h:139 -msgid "Routines to help parsing remote repository access parameters" -msgstr "" -"Rutinas para ayudar a analizar los parámetros de acceso del repositorio " -"remoto" - -#: command-list.h:140 +#: command-list.h:141 msgid "Compute unique ID for a patch" msgstr "Calcular ID único para un parche" -#: command-list.h:141 +#: command-list.h:142 msgid "Prune all unreachable objects from the object database" msgstr "Limpia todos los objetos no alcanzables de la base de datos de objetos" -#: command-list.h:142 +#: command-list.h:143 msgid "Remove extra objects that are already in pack files" msgstr "Remover objetos extra que ya están en archivos empaquetados" -#: command-list.h:143 +#: command-list.h:144 msgid "Fetch from and integrate with another repository or a local branch" msgstr "Realiza un fetch e integra con otro repositorio o rama local" -#: command-list.h:144 +#: command-list.h:145 msgid "Update remote refs along with associated objects" msgstr "Actualiza referencias remotas junto con sus objetos asociados" -#: command-list.h:145 +#: command-list.h:146 msgid "Applies a quilt patchset onto the current branch" msgstr "Aplica un parche quilt en la rama actual" -#: command-list.h:146 +#: command-list.h:147 msgid "Compare two commit ranges (e.g. two versions of a branch)" msgstr "Compara dos rangos de commits (por ejemplo dos versions de un branch)" -#: command-list.h:147 +#: command-list.h:148 msgid "Reads tree information into the index" msgstr "Lee información del ábol en el índice" -#: command-list.h:148 +#: command-list.h:149 msgid "Reapply commits on top of another base tip" msgstr "Vuelve a aplicar commits en la punta de otra rama" -#: command-list.h:149 +#: command-list.h:150 msgid "Receive what is pushed into the repository" msgstr "Recibir lo que es empujado en el respositorio" -#: command-list.h:150 +#: command-list.h:151 msgid "Manage reflog information" msgstr "Gestionar información de reflog" -#: command-list.h:151 +#: command-list.h:152 msgid "Manage set of tracked repositories" msgstr "Gestiona un conjunto de repositorios rastreados" -#: command-list.h:152 +#: command-list.h:153 msgid "Pack unpacked objects in a repository" msgstr "Empaquetar objetos no empaquetados en un repositorio" -#: command-list.h:153 +#: command-list.h:154 msgid "Create, list, delete refs to replace objects" msgstr "Crea, lista, borra referencias para reemplazar objetos" -#: command-list.h:154 +#: command-list.h:155 msgid "Generates a summary of pending changes" msgstr "Genera un resumen de cambios pendientes" -#: command-list.h:155 +#: command-list.h:156 msgid "Reuse recorded resolution of conflicted merges" msgstr "Reutilizar la resolución registrada de fusiones conflictivas" -#: command-list.h:156 +#: command-list.h:157 msgid "Reset current HEAD to the specified state" msgstr "Reinicia el HEAD actual a un estado especifico" -#: command-list.h:157 +#: command-list.h:158 msgid "Restore working tree files" msgstr "Restaurar archivos de árboles de trabajo" -#: command-list.h:158 +#: command-list.h:159 msgid "Revert some existing commits" msgstr "Revierte algunos commits existentes" -#: command-list.h:159 +#: command-list.h:160 msgid "Lists commit objects in reverse chronological order" msgstr "Lista objetos commit en orden cronológico inverso" -#: command-list.h:160 +#: command-list.h:161 msgid "Pick out and massage parameters" msgstr "Seleccionar y masajear los parámetros" -#: command-list.h:161 +#: command-list.h:162 msgid "Remove files from the working tree and from the index" msgstr "Borra archivos del árbol de trabajo y del índice" -#: command-list.h:162 +#: command-list.h:163 msgid "Send a collection of patches as emails" msgstr "Envía una colección de parches como e-mails" -#: command-list.h:163 +#: command-list.h:164 msgid "Push objects over Git protocol to another repository" msgstr "Empujar objetos por protocolo Git a otro repositorio" -#: command-list.h:164 +#: command-list.h:165 msgid "Restricted login shell for Git-only SSH access" msgstr "Shell de inicio de sesión restringido para acceso SSH exclusivo de Git" -#: command-list.h:165 +#: command-list.h:166 msgid "Summarize 'git log' output" msgstr "Resumir la salida 'git log'" -#: command-list.h:166 +#: command-list.h:167 msgid "Show various types of objects" msgstr "Muestra varios tipos de objetos" -#: command-list.h:167 +#: command-list.h:168 msgid "Show branches and their commits" msgstr "Mostrar ramas y sus commits" -#: command-list.h:168 +#: command-list.h:169 msgid "Show packed archive index" msgstr "Mostrar el índice de archivo empaquetado" -#: command-list.h:169 +#: command-list.h:170 msgid "List references in a local repository" msgstr "Listar referencias en el repositorio local" -#: command-list.h:170 +#: command-list.h:171 msgid "Git's i18n setup code for shell scripts" msgstr "El código de configuración i18n de Git para scripts de shell" -#: command-list.h:171 +#: command-list.h:172 msgid "Common Git shell script setup code" msgstr "Código de configuración de script de shell común de Git" -#: command-list.h:172 +#: command-list.h:173 msgid "Initialize and modify the sparse-checkout" msgstr "Inicializa y modifica el sparse-checkout" -#: command-list.h:173 +#: command-list.h:174 msgid "Stash the changes in a dirty working directory away" msgstr "" "Poner en un stash los cambios en un directorio de trabajo sucio de todas " "maneras" -#: command-list.h:174 +#: command-list.h:175 msgid "Add file contents to the staging area" msgstr "Agrega contenidos de un archivo al área de staging" -#: command-list.h:175 +#: command-list.h:176 msgid "Show the working tree status" msgstr "Muestra el estado del árbol de trabajo" -#: command-list.h:176 +#: command-list.h:177 msgid "Remove unnecessary whitespace" msgstr "Eliminar el espacio en blanco innecesario" -#: command-list.h:177 +#: command-list.h:178 msgid "Initialize, update or inspect submodules" msgstr "Inicializa, actualiza o inspecciona submódulos" -#: command-list.h:178 +#: command-list.h:179 msgid "Bidirectional operation between a Subversion repository and Git" msgstr "Operación bidireccional entre un repositorio Subversion y Git" -#: command-list.h:179 +#: command-list.h:180 msgid "Switch branches" msgstr "Cambiar branches" -#: command-list.h:180 +#: command-list.h:181 msgid "Read, modify and delete symbolic refs" msgstr "Lee, modifica y borra referencias simbólicas" -#: command-list.h:181 +#: command-list.h:182 msgid "Create, list, delete or verify a tag object signed with GPG" msgstr "Crea, lista, borra o verifica un tag de objeto firmado con GPG" -#: command-list.h:182 +#: command-list.h:183 msgid "Creates a temporary file with a blob's contents" msgstr "Crea un archivo temporal con contenidos de un blob" -#: command-list.h:183 +#: command-list.h:184 msgid "Unpack objects from a packed archive" msgstr "Desempaqueta objetos de un archivo empaquetado" -#: command-list.h:184 +#: command-list.h:185 msgid "Register file contents in the working tree to the index" msgstr "Registra contenidos de archivos en el árbol de trabajo al índice" -#: command-list.h:185 +#: command-list.h:186 msgid "Update the object name stored in a ref safely" msgstr "" "Actualiza el nombre del objeto almacenado en una referencia de forma segura" -#: command-list.h:186 +#: command-list.h:187 msgid "Update auxiliary info file to help dumb servers" msgstr "" "Actualiza el archivo de información auxiliar para ayudar a los servidores " "dumb" -#: command-list.h:187 +#: command-list.h:188 msgid "Send archive back to git-archive" msgstr "Enviar archivo a git-archive" -#: command-list.h:188 +#: command-list.h:189 msgid "Send objects packed back to git-fetch-pack" msgstr "Enviar objetos empaquetados a git-fetch-pack" -#: command-list.h:189 +#: command-list.h:190 msgid "Show a Git logical variable" msgstr "Mostrar una variable lógica de Git" -#: command-list.h:190 +#: command-list.h:191 msgid "Check the GPG signature of commits" msgstr "Verificar firma GPG de commits" -#: command-list.h:191 +#: command-list.h:192 msgid "Validate packed Git archive files" msgstr "Valida archivos Git empaquetados" -#: command-list.h:192 +#: command-list.h:193 msgid "Check the GPG signature of tags" msgstr "Verifica la firma GPG de etiquetas" -#: command-list.h:193 +#: command-list.h:194 msgid "Git web interface (web frontend to Git repositories)" msgstr "Interfaz web Git (interfaz web para repositorios Git)" -#: command-list.h:194 +#: command-list.h:195 msgid "Show logs with difference each commit introduces" msgstr "Muestra logs con las diferencias que cada commit introduce" -#: command-list.h:195 +#: command-list.h:196 msgid "Manage multiple working trees" msgstr "Gestiona múltiples árboles de trabajo" -#: command-list.h:196 +#: command-list.h:197 msgid "Create a tree object from the current index" msgstr "Crea un objeto árbol del índice actual" -#: command-list.h:197 +#: command-list.h:198 msgid "Defining attributes per path" msgstr "Definiendo atributos por ruta" -#: command-list.h:198 +#: command-list.h:199 msgid "Git command-line interface and conventions" msgstr "Interfaz y convenciones de línea de comandos de Git" -#: command-list.h:199 +#: command-list.h:200 msgid "A Git core tutorial for developers" msgstr "Un tutorial básico de Git para desarrolladores" -#: command-list.h:200 +#: command-list.h:201 +msgid "Providing usernames and passwords to Git" +msgstr "Proporcionar nombres de usuario y contraseñas a Git" + +#: command-list.h:202 msgid "Git for CVS users" msgstr "Git para usuarios CVS" -#: command-list.h:201 +#: command-list.h:203 msgid "Tweaking diff output" msgstr "Afinar la salida de diff" -#: command-list.h:202 +#: command-list.h:204 msgid "A useful minimum set of commands for Everyday Git" msgstr "Un conjunto mínimo útil de comandos diarios de Git" -#: command-list.h:203 +#: command-list.h:205 msgid "Frequently asked questions about using Git" msgstr "Preguntas frecuentes sobre el uso de Git" -#: command-list.h:204 +#: command-list.h:206 msgid "A Git Glossary" msgstr "Un Glosario de Git" -#: command-list.h:205 +#: command-list.h:207 msgid "Hooks used by Git" msgstr "Hooks utilizados por Git" -#: command-list.h:206 +#: command-list.h:208 msgid "Specifies intentionally untracked files to ignore" msgstr "Especifica de forma intencional archivos sin seguimiento a ignorar" -#: command-list.h:207 +#: command-list.h:209 +msgid "Map author/committer names and/or E-Mail addresses" +msgstr "" +"Mapear nombres de autor/ nombre de commiter y/o direcciones de correo " +"electrónico" + +#: command-list.h:210 msgid "Defining submodule properties" msgstr "Definiendo las propiedades del submódulo" -#: command-list.h:208 +#: command-list.h:211 msgid "Git namespaces" msgstr "Namespaces de Git" -#: command-list.h:209 +#: command-list.h:212 +msgid "Helper programs to interact with remote repositories" +msgstr "Programas de ayuda para interactuar con repositorios remotos" + +#: command-list.h:213 msgid "Git Repository Layout" msgstr "Disposición del repositorio Git" -#: command-list.h:210 +#: command-list.h:214 msgid "Specifying revisions and ranges for Git" msgstr "Especificando revisiones y rangos para Git" -#: command-list.h:211 +#: command-list.h:215 msgid "Mounting one repository inside another" msgstr "Montando un repositorio dentro de otro" -#: command-list.h:212 +#: command-list.h:216 msgid "A tutorial introduction to Git: part two" msgstr "Un tutorial de introducción a Git: parte dos" -#: command-list.h:213 +#: command-list.h:217 msgid "A tutorial introduction to Git" msgstr "Un tutorial de introducción para Git" -#: command-list.h:214 +#: command-list.h:218 msgid "An overview of recommended workflows with Git" msgstr "Una visión general de flujos de trabajo recomendados con Git" -#: git-bisect.sh:54 -msgid "You need to start by \"git bisect start\"" -msgstr "Debes iniciar con \"git bisect start\"" - -#. TRANSLATORS: Make sure to include [Y] and [n] in your -#. translation. The program will only accept English input -#. at this point. -#: git-bisect.sh:60 -msgid "Do you want me to do it for you [Y/n]? " -msgstr "¿Quieres que lo haga por ti [Y/n]? " - -#: git-bisect.sh:101 -#, sh-format -msgid "Bad rev input: $arg" -msgstr "Mala entrada rev: $arg" - -#: git-bisect.sh:121 -#, sh-format -msgid "Bad rev input: $bisected_head" -msgstr "Mala entrada rev: $bisected_head" - -#: git-bisect.sh:130 -#, sh-format -msgid "Bad rev input: $rev" -msgstr "Mala entrada rev: $rev" - -#: git-bisect.sh:139 -#, sh-format -msgid "'git bisect $TERM_BAD' can take only one argument." -msgstr "'git bisect $TERM_BAD' solo puede tomar un argumento." - -#: git-bisect.sh:209 -msgid "No logfile given" -msgstr "Ningún logfile proporcionado" - -#: git-bisect.sh:210 -#, sh-format -msgid "cannot read $file for replaying" -msgstr "no se puede leer $file para reproducir" - -#: git-bisect.sh:233 -msgid "?? what are you talking about?" -msgstr "?? ¿De qué estás hablando?" - -#: git-bisect.sh:243 +#: git-bisect.sh:68 msgid "bisect run failed: no command provided." msgstr "bisect falló: no se proveyó comando." -#: git-bisect.sh:248 +#: git-bisect.sh:73 #, sh-format msgid "running $command" msgstr "ejecutando $command" -#: git-bisect.sh:255 +#: git-bisect.sh:80 #, sh-format msgid "" "bisect run failed:\n" @@ -23791,27 +24680,23 @@ msgstr "" "bisect falló:\n" "código de salida $res de '$command' es <0 o >=128" -#: git-bisect.sh:281 +#: git-bisect.sh:105 msgid "bisect run cannot continue any more" msgstr "bisect no puede seguir continuando" -#: git-bisect.sh:287 +#: git-bisect.sh:111 #, sh-format msgid "" "bisect run failed:\n" -"'bisect_state $state' exited with error code $res" +"'bisect-state $state' exited with error code $res" msgstr "" -"bisect falló:\n" -"'bisect_state $state' salió con código de error $res" +"bisect run falló:\n" +"'bisect-state $state' salió con el código de error $res" -#: git-bisect.sh:294 +#: git-bisect.sh:118 msgid "bisect run success" msgstr "bisect exitoso" -#: git-bisect.sh:302 -msgid "We are not bisecting." -msgstr "No estamos bisecando." - #: git-merge-octopus.sh:46 msgid "" "Error: Your local changes to the following files would be overwritten by " @@ -23852,50 +24737,50 @@ msgstr "Intentando fusión simple con $pretty_name" msgid "Simple merge did not work, trying automatic merge." msgstr "Fusión simple no funcionó, intentando fusión automática." -#: git-submodule.sh:205 +#: git-submodule.sh:179 msgid "Relative path can only be used from the toplevel of the working tree" msgstr "" "La ruta relativa sólo se puede usar desde el nivel superior del árbol de " "trabajo" -#: git-submodule.sh:215 +#: git-submodule.sh:189 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "repo URL: '$repo' debe ser absoluta o iniciar con ./|../" -#: git-submodule.sh:234 +#: git-submodule.sh:208 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "'$sm_path' ya existe en el índice" -#: git-submodule.sh:237 +#: git-submodule.sh:211 #, sh-format msgid "'$sm_path' already exists in the index and is not a submodule" msgstr "'$sm_path' ya existe en el índice y no es un submódulo" -#: git-submodule.sh:244 +#: git-submodule.sh:218 #, sh-format msgid "'$sm_path' does not have a commit checked out" msgstr "'$sm_path' no tiene un commit checked out" -#: git-submodule.sh:275 +#: git-submodule.sh:249 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "Agregando el repositorio existente en '$sm_path' al índice" -#: git-submodule.sh:277 +#: git-submodule.sh:251 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "'$sm_path' ya existe y no es un repositorio git válido" -#: git-submodule.sh:285 +#: git-submodule.sh:259 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "" "Se encontró localmente un directorio git para '$sm_name' con el(los) " "remoto(s):" -#: git-submodule.sh:287 +#: git-submodule.sh:261 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from\n" @@ -23912,39 +24797,39 @@ msgstr "" "o no estás seguro de lo que esto significa, escoge otro nombre con la opción " "'--name'." -#: git-submodule.sh:293 +#: git-submodule.sh:267 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "Reactivar directorio git local para el submódulo '$sm_name'." -#: git-submodule.sh:305 +#: git-submodule.sh:279 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "No es posible hacer checkout al submódulo '$sm_path'" -#: git-submodule.sh:310 +#: git-submodule.sh:284 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "Falló al agregar el submódulo '$sm_path'" -#: git-submodule.sh:319 +#: git-submodule.sh:293 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "Falló al registrar el submódulo '$sm_path'" -#: git-submodule.sh:592 +#: git-submodule.sh:568 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "" "No se pudo encontrar la revisión actual en la ruta de submódulo " "'$displaypath'" -#: git-submodule.sh:602 +#: git-submodule.sh:578 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "No es posible realizar fetch en la ruta de submódulo '$sm_path'" -#: git-submodule.sh:607 +#: git-submodule.sh:583 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " @@ -23953,7 +24838,7 @@ msgstr "" "No es posible encontrar revisión actual ${remote_name}/${branch} en la ruta " "de submódulo '$sm_path'" -#: git-submodule.sh:625 +#: git-submodule.sh:601 #, sh-format msgid "" "Unable to fetch in submodule path '$displaypath'; trying to directly fetch " @@ -23962,7 +24847,7 @@ msgstr "" "No es posible realizar fetch en la ruta de submódulo '$displaypath'; " "intentando hacer un fetch directo $sha1:" -#: git-submodule.sh:631 +#: git-submodule.sh:607 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " @@ -23971,85 +24856,55 @@ msgstr "" "Fetch realizado en ruta de submódulo '$displaypath', pero no contenía $sha1. " "Fetch directo del commit falló." -#: git-submodule.sh:638 +#: git-submodule.sh:614 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "No es posible revisar '$sha1' en la ruta de submódulo '$displaypath'" -#: git-submodule.sh:639 +#: git-submodule.sh:615 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "Ruta de submódulo '$displaypath': check out realizado a '$sha1'" -#: git-submodule.sh:643 +#: git-submodule.sh:619 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "" "No se posible ejecutar rebase a '$sha1' en la ruta de submódulo " "'$displaypath'" -#: git-submodule.sh:644 +#: git-submodule.sh:620 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "Ruta de submódulo '$displaypath': rebasada en '$sha1'" -#: git-submodule.sh:649 +#: git-submodule.sh:625 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "Incapaz de fusionar '$sha1' en la ruta del submódulo '$displaypath'" -#: git-submodule.sh:650 +#: git-submodule.sh:626 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "Ruta de submódulo '$displaypath': fusionada en '$sha1'" -#: git-submodule.sh:655 +#: git-submodule.sh:631 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "" "Falló la ejecución de '$command $sha1' en la ruta de submódulo " "'$displaypath'" -#: git-submodule.sh:656 +#: git-submodule.sh:632 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "Ruta de submódulo '$displaypath': '$command $sha1'" -#: git-submodule.sh:687 +#: git-submodule.sh:663 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "Falló al recurrir en la ruta de submódulo '$displaypath'" -#: git-submodule.sh:852 -msgid "The --cached option cannot be used with the --files option" -msgstr "La opción --cached no puede ser usada con la opción --files" - -#: git-submodule.sh:904 -#, sh-format -msgid "unexpected mode $mod_dst" -msgstr "modo $mod_dst inesperado" - -#: git-submodule.sh:924 -#, sh-format -msgid " Warn: $display_name doesn't contain commit $sha1_src" -msgstr " Advertencia: $display_name no contiene el commit $sha1_src" - -#: git-submodule.sh:927 -#, sh-format -msgid " Warn: $display_name doesn't contain commit $sha1_dst" -msgstr " Advertencia: $display_name no contiene el commit $sha1_dst" - -#: git-submodule.sh:930 -#, sh-format -msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" -msgstr "" -" Advertencia: $display_name no contiene los commits $sha1_src y $sha1_dst" - -#: git-parse-remote.sh:89 -#, sh-format -msgid "See git-${cmd}(1) for details." -msgstr "Véase git-${cmd}(1) para más detalles." - #: git-rebase--preserve-merges.sh:109 msgid "Applied autostash." msgstr "Autostash aplicado." @@ -24075,7 +24930,7 @@ msgstr "" msgid "Rebasing ($new_count/$total)" msgstr "Rebasando ($new_count/$total)" -#: git-rebase--preserve-merges.sh:207 +#: git-rebase--preserve-merges.sh:197 msgid "" "\n" "Commands:\n" @@ -24115,7 +24970,7 @@ msgstr "" "Estas líneas pueden ser reordenadas; son ejecutadas desde arriba hacia " "abajo.\n" -#: git-rebase--preserve-merges.sh:270 +#: git-rebase--preserve-merges.sh:260 #, sh-format msgid "" "You can amend the commit now, with\n" @@ -24134,83 +24989,83 @@ msgstr "" "\n" "\tgit rebase --continue" -#: git-rebase--preserve-merges.sh:295 +#: git-rebase--preserve-merges.sh:285 #, sh-format msgid "$sha1: not a commit that can be picked" msgstr "$sha1: no es un commit que pueda ser cogido" -#: git-rebase--preserve-merges.sh:334 +#: git-rebase--preserve-merges.sh:324 #, sh-format msgid "Invalid commit name: $sha1" msgstr "Nombre de commit inválido: $sha1" -#: git-rebase--preserve-merges.sh:364 +#: git-rebase--preserve-merges.sh:354 msgid "Cannot write current commit's replacement sha1" msgstr "No se puede escribir el remplazo sha1 del commit actual" -#: git-rebase--preserve-merges.sh:415 +#: git-rebase--preserve-merges.sh:405 #, sh-format msgid "Fast-forward to $sha1" msgstr "Avance rápido a $sha1" -#: git-rebase--preserve-merges.sh:417 +#: git-rebase--preserve-merges.sh:407 #, sh-format msgid "Cannot fast-forward to $sha1" msgstr "No se puede realizar avance rápido a $sha1" -#: git-rebase--preserve-merges.sh:426 +#: git-rebase--preserve-merges.sh:416 #, sh-format msgid "Cannot move HEAD to $first_parent" msgstr "No se puede mover HEAD a $first_parent" -#: git-rebase--preserve-merges.sh:431 +#: git-rebase--preserve-merges.sh:421 #, sh-format msgid "Refusing to squash a merge: $sha1" msgstr "Rehusando a ejecutar squash en fusión: $sha1" -#: git-rebase--preserve-merges.sh:449 +#: git-rebase--preserve-merges.sh:439 #, sh-format msgid "Error redoing merge $sha1" msgstr "Error rehaciendo fusión $sha1" -#: git-rebase--preserve-merges.sh:458 +#: git-rebase--preserve-merges.sh:448 #, sh-format msgid "Could not pick $sha1" msgstr "No se pudo coger $sha1" -#: git-rebase--preserve-merges.sh:467 +#: git-rebase--preserve-merges.sh:457 #, sh-format msgid "This is the commit message #${n}:" msgstr "Este es el mensaje del commit #${n}:" -#: git-rebase--preserve-merges.sh:472 +#: git-rebase--preserve-merges.sh:462 #, sh-format msgid "The commit message #${n} will be skipped:" msgstr "El mensaje del commit #${n} será ignorado:" -#: git-rebase--preserve-merges.sh:483 +#: git-rebase--preserve-merges.sh:473 #, sh-format msgid "This is a combination of $count commit." msgid_plural "This is a combination of $count commits." msgstr[0] "Esta es una combinación de $count commit." msgstr[1] "Esta es la combinación de $count commits." -#: git-rebase--preserve-merges.sh:492 +#: git-rebase--preserve-merges.sh:482 #, sh-format msgid "Cannot write $fixup_msg" msgstr "No se puede escribir $fixup_msg" -#: git-rebase--preserve-merges.sh:495 +#: git-rebase--preserve-merges.sh:485 msgid "This is a combination of 2 commits." msgstr "Esto es una combinación de 2 commits." -#: git-rebase--preserve-merges.sh:536 git-rebase--preserve-merges.sh:579 -#: git-rebase--preserve-merges.sh:582 +#: git-rebase--preserve-merges.sh:526 git-rebase--preserve-merges.sh:569 +#: git-rebase--preserve-merges.sh:572 #, sh-format msgid "Could not apply $sha1... $rest" msgstr "No se puede aplicar $sha1... $rest" -#: git-rebase--preserve-merges.sh:611 +#: git-rebase--preserve-merges.sh:601 #, sh-format msgid "" "Could not amend commit after successfully picking $sha1... $rest\n" @@ -24227,31 +25082,31 @@ msgstr "" "problema antes\n" "de que sea capaz de reformular el commit." -#: git-rebase--preserve-merges.sh:626 +#: git-rebase--preserve-merges.sh:616 #, sh-format msgid "Stopped at $sha1_abbrev... $rest" msgstr "Detenido en $sha1_abbrev... $rest" -#: git-rebase--preserve-merges.sh:641 +#: git-rebase--preserve-merges.sh:631 #, sh-format msgid "Cannot '$squash_style' without a previous commit" msgstr "No se puede '$squash_style' sin un commit previo" -#: git-rebase--preserve-merges.sh:683 +#: git-rebase--preserve-merges.sh:673 #, sh-format msgid "Executing: $rest" msgstr "Ejecutando: $rest" -#: git-rebase--preserve-merges.sh:691 +#: git-rebase--preserve-merges.sh:681 #, sh-format msgid "Execution failed: $rest" msgstr "Ejecución fallida: $rest" -#: git-rebase--preserve-merges.sh:693 +#: git-rebase--preserve-merges.sh:683 msgid "and made changes to the index and/or the working tree" msgstr "y hizo cambios al índice y/o al árbol de trabajo" -#: git-rebase--preserve-merges.sh:695 +#: git-rebase--preserve-merges.sh:685 msgid "" "You can fix the problem, and then run\n" "\n" @@ -24262,7 +25117,7 @@ msgstr "" "\tgit rebase --continue" #. TRANSLATORS: after these lines is a command to be issued by the user -#: git-rebase--preserve-merges.sh:708 +#: git-rebase--preserve-merges.sh:698 #, sh-format msgid "" "Execution succeeded: $rest\n" @@ -24277,25 +25132,25 @@ msgstr "" "\n" "\tgit rebase --continue" -#: git-rebase--preserve-merges.sh:719 +#: git-rebase--preserve-merges.sh:709 #, sh-format msgid "Unknown command: $command $sha1 $rest" msgstr "Comando desconocido: $command $sha1 $rest" -#: git-rebase--preserve-merges.sh:720 +#: git-rebase--preserve-merges.sh:710 msgid "Please fix this using 'git rebase --edit-todo'." msgstr "Por favor, corrige esto usando 'git rebase --edit-todo'." -#: git-rebase--preserve-merges.sh:755 +#: git-rebase--preserve-merges.sh:745 #, sh-format msgid "Successfully rebased and updated $head_name." msgstr "$head_name rebasado y actualizado satisfactoriamente." -#: git-rebase--preserve-merges.sh:812 +#: git-rebase--preserve-merges.sh:802 msgid "Could not remove CHERRY_PICK_HEAD" msgstr "No se pudo eliminar CHERRY_PICK_HEAD" -#: git-rebase--preserve-merges.sh:817 +#: git-rebase--preserve-merges.sh:807 #, sh-format msgid "" "You have staged changes in your working tree.\n" @@ -24326,12 +25181,12 @@ msgstr "" "\n" " git rebase --continue\n" -#: git-rebase--preserve-merges.sh:834 +#: git-rebase--preserve-merges.sh:824 msgid "Error trying to find the author identity to amend commit" msgstr "" "Error tratando de encontrar la identidad del autor para remediar el commit" -#: git-rebase--preserve-merges.sh:839 +#: git-rebase--preserve-merges.sh:829 msgid "" "You have uncommitted changes in your working tree. Please commit them\n" "first and then run 'git rebase --continue' again." @@ -24339,44 +25194,44 @@ msgstr "" "Tienes cambios sin confirmar en tu árbol de trabajo. Por favor, confírmalos\n" "primero y entonces ejecuta 'git rebase --continue' de nuevo." -#: git-rebase--preserve-merges.sh:844 git-rebase--preserve-merges.sh:848 +#: git-rebase--preserve-merges.sh:834 git-rebase--preserve-merges.sh:838 msgid "Could not commit staged changes." msgstr "No se pudo realizar el commit con los cambios en el área de stage." -#: git-rebase--preserve-merges.sh:879 git-rebase--preserve-merges.sh:965 +#: git-rebase--preserve-merges.sh:869 git-rebase--preserve-merges.sh:955 msgid "Could not execute editor" msgstr "No se pudo ejecutar el editor" -#: git-rebase--preserve-merges.sh:900 +#: git-rebase--preserve-merges.sh:890 #, sh-format msgid "Could not checkout $switch_to" msgstr "No se pudo actualizar el árbol de trabajo a $switch_to" -#: git-rebase--preserve-merges.sh:907 +#: git-rebase--preserve-merges.sh:897 msgid "No HEAD?" msgstr "¿Sin HEAD?" -#: git-rebase--preserve-merges.sh:908 +#: git-rebase--preserve-merges.sh:898 #, sh-format msgid "Could not create temporary $state_dir" msgstr "No se pudo crear $state_dir temporalmente" -#: git-rebase--preserve-merges.sh:911 +#: git-rebase--preserve-merges.sh:901 msgid "Could not mark as interactive" msgstr "No se pudo marcar como interactivo" -#: git-rebase--preserve-merges.sh:943 +#: git-rebase--preserve-merges.sh:933 #, sh-format msgid "Rebase $shortrevisions onto $shortonto ($todocount command)" msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" msgstr[0] "Rebase $shortrevisions en $shortonto ($todocount comando)" msgstr[1] "Rebase $shortrevisions en $shortonto ($todocount comandos)" -#: git-rebase--preserve-merges.sh:955 +#: git-rebase--preserve-merges.sh:945 msgid "Note that empty commits are commented out" msgstr "Tenga en cuenta que los commits vacíos están comentados" -#: git-rebase--preserve-merges.sh:997 git-rebase--preserve-merges.sh:1002 +#: git-rebase--preserve-merges.sh:987 git-rebase--preserve-merges.sh:992 msgid "Could not init rewritten commits" msgstr "No se puede inicializar los commits reescritos" @@ -24455,14 +25310,14 @@ msgstr "Incapaz de determinar la ruta absoluta del directorio git" msgid "%12s %12s %s" msgstr "%12s %12s %s" -#: git-add--interactive.perl:634 +#: git-add--interactive.perl:632 #, perl-format msgid "touched %d path\n" msgid_plural "touched %d paths\n" msgstr[0] "touch hecho a %d ruta\n" msgstr[1] "touch hecho a %d rutas\n" -#: git-add--interactive.perl:1055 +#: git-add--interactive.perl:1056 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for staging." @@ -24470,7 +25325,7 @@ msgstr "" "Si el parche aplica limpiamente, el hunk editado sera marcado\n" "inmediatamente para el área de stage." -#: git-add--interactive.perl:1058 +#: git-add--interactive.perl:1059 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for stashing." @@ -24478,7 +25333,7 @@ msgstr "" "Si el parche aplica limpiamente, el hunk editado sera marcado\n" "inmediatamente para aplicar stash." -#: git-add--interactive.perl:1061 +#: git-add--interactive.perl:1062 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for unstaging." @@ -24486,8 +25341,8 @@ msgstr "" "Si el parche aplica limpiamente, el hunk editado sera marcado\n" "inmediatamente para sacar del área de stage." -#: git-add--interactive.perl:1064 git-add--interactive.perl:1073 -#: git-add--interactive.perl:1079 +#: git-add--interactive.perl:1065 git-add--interactive.perl:1074 +#: git-add--interactive.perl:1080 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for applying." @@ -24495,8 +25350,8 @@ msgstr "" "Si el parche aplica de forma limpia, el hunk editado sera marcado \n" "inmediatamente para aplicar." -#: git-add--interactive.perl:1067 git-add--interactive.perl:1070 -#: git-add--interactive.perl:1076 +#: git-add--interactive.perl:1068 git-add--interactive.perl:1071 +#: git-add--interactive.perl:1077 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for discarding." @@ -24504,12 +25359,12 @@ msgstr "" "Si el parche aplica de forma limpia, el hunk editado sera marcado\n" "inmediatamente para descarte." -#: git-add--interactive.perl:1113 +#: git-add--interactive.perl:1114 #, perl-format msgid "failed to open hunk edit file for writing: %s" msgstr "falló al abrir el archivo de adición del hunk para escritura: %s" -#: git-add--interactive.perl:1120 +#: git-add--interactive.perl:1121 #, perl-format msgid "" "---\n" @@ -24522,12 +25377,12 @@ msgstr "" "Para eliminar '%s' líneas, bórrelas.\n" "Lineas comenzando con %s serán eliminadas.\n" -#: git-add--interactive.perl:1142 +#: git-add--interactive.perl:1143 #, perl-format msgid "failed to open hunk edit file for reading: %s" msgstr "falló al abrir el archivo de edición del hunk para lectura: %s" -#: git-add--interactive.perl:1250 +#: git-add--interactive.perl:1251 msgid "" "y - stage this hunk\n" "n - do not stage this hunk\n" @@ -24542,7 +25397,7 @@ msgstr "" "d - no aplicar stage a este hunk o a ninguno de los posteriores en este " "archivo" -#: git-add--interactive.perl:1256 +#: git-add--interactive.perl:1257 msgid "" "y - stash this hunk\n" "n - do not stash this hunk\n" @@ -24556,7 +25411,7 @@ msgstr "" "a - aplicar stash a este hunk y a todos los posteriores en el archivo\n" "d - no aplicar stash a este hunk o ninguno de los posteriores en el archivo" -#: git-add--interactive.perl:1262 +#: git-add--interactive.perl:1263 msgid "" "y - unstage this hunk\n" "n - do not unstage this hunk\n" @@ -24571,7 +25426,7 @@ msgstr "" "d - no sacar del area de stage este hunk o ninguno de los posteriores en el " "archivo" -#: git-add--interactive.perl:1268 +#: git-add--interactive.perl:1269 msgid "" "y - apply this hunk to index\n" "n - do not apply this hunk to index\n" @@ -24585,7 +25440,7 @@ msgstr "" "a - aplicar este hunk y todos los posteriores en el archivo\n" "d - no aplicar este hunko ninguno de los posteriores en el archivo" -#: git-add--interactive.perl:1274 git-add--interactive.perl:1292 +#: git-add--interactive.perl:1275 git-add--interactive.perl:1293 msgid "" "y - discard this hunk from worktree\n" "n - do not discard this hunk from worktree\n" @@ -24599,7 +25454,7 @@ msgstr "" "a - descartar este hunk y todos los posteriores en este archivo\n" "d - no descartar este hunk o ninguno de los posteriores en el archivo" -#: git-add--interactive.perl:1280 +#: git-add--interactive.perl:1281 msgid "" "y - discard this hunk from index and worktree\n" "n - do not discard this hunk from index and worktree\n" @@ -24613,7 +25468,7 @@ msgstr "" "a - descartar este hunk y todos los posteriores en este archivo\n" "d - no descartar este hunk o ninguno posterior en el archivo" -#: git-add--interactive.perl:1286 +#: git-add--interactive.perl:1287 msgid "" "y - apply this hunk to index and worktree\n" "n - do not apply this hunk to index and worktree\n" @@ -24627,7 +25482,7 @@ msgstr "" "a - aplicar este hunk y todos los posteriores en el archivo\n" "d - no aplicar este hunk o ninguno de los siguientes en este archivo" -#: git-add--interactive.perl:1298 +#: git-add--interactive.perl:1299 msgid "" "y - apply this hunk to worktree\n" "n - do not apply this hunk to worktree\n" @@ -24641,7 +25496,7 @@ msgstr "" "a - aplicar este hunk y todos los posteriores en el archivo\n" "d - no aplicar este hunk o ninguno de los siguientes en este archivo" -#: git-add--interactive.perl:1313 +#: git-add--interactive.perl:1314 msgid "" "g - select a hunk to go to\n" "/ - search for a hunk matching the given regex\n" @@ -24663,90 +25518,90 @@ msgstr "" "e - editar manualmente el hunk actual\n" "? - imprimir ayuda\n" -#: git-add--interactive.perl:1344 +#: git-add--interactive.perl:1345 msgid "The selected hunks do not apply to the index!\n" msgstr "¡Los hunks seleccionados no aplican al índice!\n" -#: git-add--interactive.perl:1359 +#: git-add--interactive.perl:1360 #, perl-format msgid "ignoring unmerged: %s\n" msgstr "ignorando lo no fusionado: %s\n" -#: git-add--interactive.perl:1478 +#: git-add--interactive.perl:1479 #, perl-format msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? " msgstr "¿Aplicar cambio de modo para el árbol de trabajo [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1479 +#: git-add--interactive.perl:1480 #, perl-format msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " msgstr "¿Aplicar borrado al árbol de trabajo [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1480 +#: git-add--interactive.perl:1481 #, perl-format msgid "Apply addition to worktree [y,n,q,a,d%s,?]? " msgstr "¿Aplicar adición al árbol de trabajo [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1481 +#: git-add--interactive.perl:1482 #, perl-format msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? " msgstr "¿Aplicar este hunk al árbol de trabajo [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1587 +#: git-add--interactive.perl:1599 msgid "No other hunks to goto\n" msgstr "No hay más pedazos para el ir\n" -#: git-add--interactive.perl:1605 +#: git-add--interactive.perl:1617 #, perl-format msgid "Invalid number: '%s'\n" msgstr "Numero inválido: '%s'\n" -#: git-add--interactive.perl:1610 +#: git-add--interactive.perl:1622 #, perl-format msgid "Sorry, only %d hunk available.\n" msgid_plural "Sorry, only %d hunks available.\n" msgstr[0] "Lo siento, solo %d hunk disponible.\n" msgstr[1] "Lo siento, solo %d hunks disponibles.\n" -#: git-add--interactive.perl:1636 +#: git-add--interactive.perl:1657 msgid "No other hunks to search\n" msgstr "No hay más pedazos para buscar\n" -#: git-add--interactive.perl:1653 +#: git-add--interactive.perl:1674 #, perl-format msgid "Malformed search regexp %s: %s\n" msgstr "Regexp para la búsqueda mal formado %s: %s\n" -#: git-add--interactive.perl:1663 +#: git-add--interactive.perl:1684 msgid "No hunk matches the given pattern\n" msgstr "No hay hunks que concuerden con el patrón entregado.\n" -#: git-add--interactive.perl:1675 git-add--interactive.perl:1697 +#: git-add--interactive.perl:1696 git-add--interactive.perl:1718 msgid "No previous hunk\n" msgstr "No el anterior hunk\n" -#: git-add--interactive.perl:1684 git-add--interactive.perl:1703 +#: git-add--interactive.perl:1705 git-add--interactive.perl:1724 msgid "No next hunk\n" msgstr "No el siguiente hunk\n" -#: git-add--interactive.perl:1709 +#: git-add--interactive.perl:1730 msgid "Sorry, cannot split this hunk\n" msgstr "Perdón, no se puede dividir este pedazo\n" -#: git-add--interactive.perl:1715 +#: git-add--interactive.perl:1736 #, perl-format msgid "Split into %d hunk.\n" msgid_plural "Split into %d hunks.\n" msgstr[0] "Cortar en %d hunk.\n" msgstr[1] "Cortar en %d hunks.\n" -#: git-add--interactive.perl:1725 +#: git-add--interactive.perl:1746 msgid "Sorry, cannot edit this hunk\n" msgstr "Perdón, no se puede editar este pedazo\n" #. TRANSLATORS: please do not translate the command names #. 'status', 'update', 'revert', etc. -#: git-add--interactive.perl:1790 +#: git-add--interactive.perl:1811 msgid "" "status - show paths with changes\n" "update - add working tree state to the staged set of changes\n" @@ -24766,19 +25621,19 @@ msgstr "" "add untracked - agrega contenidos de archivos no rastreados al grupo de " "cambios del area de stage\n" -#: git-add--interactive.perl:1807 git-add--interactive.perl:1812 -#: git-add--interactive.perl:1815 git-add--interactive.perl:1822 -#: git-add--interactive.perl:1825 git-add--interactive.perl:1832 -#: git-add--interactive.perl:1836 git-add--interactive.perl:1842 +#: git-add--interactive.perl:1828 git-add--interactive.perl:1840 +#: git-add--interactive.perl:1843 git-add--interactive.perl:1850 +#: git-add--interactive.perl:1853 git-add--interactive.perl:1860 +#: git-add--interactive.perl:1864 git-add--interactive.perl:1870 msgid "missing --" msgstr "falta --" -#: git-add--interactive.perl:1838 +#: git-add--interactive.perl:1866 #, perl-format msgid "unknown --patch mode: %s" msgstr "modo --patch desconocido: %s" -#: git-add--interactive.perl:1844 git-add--interactive.perl:1850 +#: git-add--interactive.perl:1872 git-add--interactive.perl:1878 #, perl-format msgid "invalid argument %s, expecting --" msgstr "argumento inválido %s, se esperaba --" @@ -24795,27 +25650,39 @@ msgstr "el offset del tiempo local es mayor o igual a 24 horas\n" msgid "the editor exited uncleanly, aborting everything" msgstr "el editor se cerro inapropiadamente, abortando todo" -#: git-send-email.perl:310 +#: git-send-email.perl:312 #, perl-format msgid "" "'%s' contains an intermediate version of the email you were composing.\n" msgstr "" "'%s' contiene una versión intermedia del correo que se estaba generando.\n" -#: git-send-email.perl:315 +#: git-send-email.perl:317 #, perl-format msgid "'%s.final' contains the composed email.\n" msgstr "'%s.final' contiene el email generado.\n" -#: git-send-email.perl:408 +#: git-send-email.perl:410 msgid "--dump-aliases incompatible with other options\n" msgstr "--dump-aliases no es compatible con otras opciones.\n" -#: git-send-email.perl:481 git-send-email.perl:683 +#: git-send-email.perl:484 +msgid "" +"fatal: found configuration options for 'sendmail'\n" +"git-send-email is configured with the sendemail.* options - note the 'e'.\n" +"Set sendemail.forbidSendmailVariables to false to disable this check.\n" +msgstr "" +"fatal: opciones de configuración encontradas para 'sendmail'\n" +"git-send-email está configurado con las opciones sendemail. * - tenga en " +"cuenta la 'e'.\n" +"Establezca sendemail.forbidSendmailVariables en false para deshabilitar esta " +"verificación.\n" + +#: git-send-email.perl:489 git-send-email.perl:691 msgid "Cannot run git format-patch from outside a repository\n" msgstr "No se puede ejecutar git format-patch desde fuera del repositorio.\n" -#: git-send-email.perl:484 +#: git-send-email.perl:492 msgid "" "`batch-size` and `relogin` must be specified together (via command-line or " "configuration option)\n" @@ -24823,37 +25690,37 @@ msgstr "" "`batch-size` y `relogin` deben ser especificados juntos (via la línea de " "comando o por opción de configuración)\n" -#: git-send-email.perl:497 +#: git-send-email.perl:505 #, perl-format msgid "Unknown --suppress-cc field: '%s'\n" msgstr "Campo --suppress-cc desconocido: '%s'\n" -#: git-send-email.perl:528 +#: git-send-email.perl:536 #, perl-format msgid "Unknown --confirm setting: '%s'\n" msgstr "Configuración --confirm desconocida: '%s'\n" -#: git-send-email.perl:556 +#: git-send-email.perl:564 #, perl-format msgid "warning: sendmail alias with quotes is not supported: %s\n" msgstr "peligro: alias de sendmail con comillas no es soportado: %s\n" -#: git-send-email.perl:558 +#: git-send-email.perl:566 #, perl-format msgid "warning: `:include:` not supported: %s\n" msgstr "peligro: `:include:` no soportado: %s\n" -#: git-send-email.perl:560 +#: git-send-email.perl:568 #, perl-format msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" msgstr "advertencia: redirección `/file` o `|pipe` no soportada : %s\n" -#: git-send-email.perl:565 +#: git-send-email.perl:573 #, perl-format msgid "warning: sendmail line is not recognized: %s\n" msgstr "advertencia: línea sendmail no reconocida: %s\n" -#: git-send-email.perl:649 +#: git-send-email.perl:657 #, perl-format msgid "" "File '%s' exists but it could also be the range of commits\n" @@ -24868,12 +25735,12 @@ msgstr "" " * Diciendo \"./%s\" si se quiere decir un archivo; o\n" " * Agregando la opción --format-patch si se quiere decir un rango.\n" -#: git-send-email.perl:670 +#: git-send-email.perl:678 #, perl-format msgid "Failed to opendir %s: %s" msgstr "Falló al abrir directorio %s: %s" -#: git-send-email.perl:694 +#: git-send-email.perl:702 #, perl-format msgid "" "fatal: %s: %s\n" @@ -24882,7 +25749,7 @@ msgstr "" "fatal: %s: %s\n" "peligro: no se mandaron parches\n" -#: git-send-email.perl:705 +#: git-send-email.perl:713 msgid "" "\n" "No patch files specified!\n" @@ -24892,17 +25759,17 @@ msgstr "" "No se especificaron parches!\n" "\n" -#: git-send-email.perl:718 +#: git-send-email.perl:726 #, perl-format msgid "No subject line in %s?" msgstr "¿No hay línea de subject en %s?" -#: git-send-email.perl:728 +#: git-send-email.perl:736 #, perl-format msgid "Failed to open for writing %s: %s" msgstr "Falló al abrir para escritura %s: %s" -#: git-send-email.perl:739 +#: git-send-email.perl:747 msgid "" "Lines beginning in \"GIT:\" will be removed.\n" "Consider including an overall diffstat or table of contents\n" @@ -24916,27 +25783,27 @@ msgstr "" "\n" "Limpiar el contenido de body si no deseas mandar un resumen.\n" -#: git-send-email.perl:763 +#: git-send-email.perl:771 #, perl-format msgid "Failed to open %s: %s" msgstr "Falló al abrir %s: %s" -#: git-send-email.perl:780 +#: git-send-email.perl:788 #, perl-format msgid "Failed to open %s.final: %s" msgstr "Falló al abrir %s.final: %s" -#: git-send-email.perl:823 +#: git-send-email.perl:831 msgid "Summary email is empty, skipping it\n" msgstr "Archivo de resumen está vacío, saltando al siguiente\n" #. TRANSLATORS: please keep [y/N] as is. -#: git-send-email.perl:858 +#: git-send-email.perl:866 #, perl-format msgid "Are you sure you want to use <%s> [y/N]? " msgstr "¿Estás seguro de que deseas usar <%s> [y/N]? " -#: git-send-email.perl:913 +#: git-send-email.perl:921 msgid "" "The following files are 8bit, but do not declare a Content-Transfer-" "Encoding.\n" @@ -24944,11 +25811,11 @@ msgstr "" "Los siguientes archivos son 8bit, pero no declaran un Content-Transfer-" "Encoding.\n" -#: git-send-email.perl:918 +#: git-send-email.perl:926 msgid "Which 8bit encoding should I declare [UTF-8]? " msgstr "¿Que codificación de 8bit debería declarar [UTF-8]? " -#: git-send-email.perl:926 +#: git-send-email.perl:934 #, perl-format msgid "" "Refusing to send because the patch\n" @@ -24961,22 +25828,22 @@ msgstr "" "tiene el template '*** SUBJECT HERE ***'. Agrega --force si realmente lo " "deseas mandar.\n" -#: git-send-email.perl:945 +#: git-send-email.perl:953 msgid "To whom should the emails be sent (if anyone)?" msgstr "¿A quien se deben mandar los correos (si existe)?" -#: git-send-email.perl:963 +#: git-send-email.perl:971 #, perl-format msgid "fatal: alias '%s' expands to itself\n" msgstr "fatal: alias '%s' se expande a si mismo\n" -#: git-send-email.perl:975 +#: git-send-email.perl:983 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? " msgstr "" "¿Qué id de mensaje será usado como En-Respuesta-Para en el primer email (si " "existe alguno)? " -#: git-send-email.perl:1033 git-send-email.perl:1041 +#: git-send-email.perl:1041 git-send-email.perl:1049 #, perl-format msgid "error: unable to extract a valid address from: %s\n" msgstr "error: no es posible extraer una dirección válida de %s\n" @@ -24984,16 +25851,16 @@ msgstr "error: no es posible extraer una dirección válida de %s\n" #. TRANSLATORS: Make sure to include [q] [d] [e] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:1045 +#: git-send-email.perl:1053 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " msgstr "¿Que hacer con esta dirección? ([q]salir|[d]botar|[e]ditar): " -#: git-send-email.perl:1362 +#: git-send-email.perl:1370 #, perl-format msgid "CA path \"%s\" does not exist" msgstr "Ruta CA \"%s\" no existe" -#: git-send-email.perl:1445 +#: git-send-email.perl:1453 msgid "" " The Cc list above has been expanded by additional\n" " addresses found in the patch commit message. By default\n" @@ -25021,134 +25888,397 @@ msgstr "" #. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:1460 +#: git-send-email.perl:1468 msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): " msgstr "¿Mandar este email? ([y]si||[n]o|[e]editar|[q]salir|[a]todo): " -#: git-send-email.perl:1463 +#: git-send-email.perl:1471 msgid "Send this email reply required" msgstr "Necesitas mandar esta respuesta de email" -#: git-send-email.perl:1491 +#: git-send-email.perl:1499 msgid "The required SMTP server is not properly defined." msgstr "El servidor SMTP no esta definido adecuadamente." -#: git-send-email.perl:1538 +#: git-send-email.perl:1546 #, perl-format msgid "Server does not support STARTTLS! %s" msgstr "¡El servidor no soporta STARTTLS! %s" -#: git-send-email.perl:1543 git-send-email.perl:1547 +#: git-send-email.perl:1551 git-send-email.perl:1555 #, perl-format msgid "STARTTLS failed! %s" msgstr "¡Falló STARTTLS! %s" -#: git-send-email.perl:1556 +#: git-send-email.perl:1564 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." msgstr "" "No es posible inicializar SMTP adecuadamente. Verificar config y usar ---" "smtp-debug." -#: git-send-email.perl:1574 +#: git-send-email.perl:1582 #, perl-format msgid "Failed to send %s\n" msgstr "Falló al enviar %s\n" -#: git-send-email.perl:1577 +#: git-send-email.perl:1585 #, perl-format msgid "Dry-Sent %s\n" msgstr "Dry-Sent %s\n" -#: git-send-email.perl:1577 +#: git-send-email.perl:1585 #, perl-format msgid "Sent %s\n" msgstr "Enviado %s\n" -#: git-send-email.perl:1579 +#: git-send-email.perl:1587 msgid "Dry-OK. Log says:\n" msgstr "Dry-OK. Log dice:\n" -#: git-send-email.perl:1579 +#: git-send-email.perl:1587 msgid "OK. Log says:\n" msgstr "OK. Log dice:\n" -#: git-send-email.perl:1591 +#: git-send-email.perl:1599 msgid "Result: " msgstr "Resultado: " -#: git-send-email.perl:1594 +#: git-send-email.perl:1602 msgid "Result: OK\n" msgstr "Resultado: OK\n" -#: git-send-email.perl:1612 +#: git-send-email.perl:1620 #, perl-format msgid "can't open file %s" msgstr "no se puede abrir el archivo %s" -#: git-send-email.perl:1659 git-send-email.perl:1679 +#: git-send-email.perl:1667 git-send-email.perl:1687 #, perl-format msgid "(mbox) Adding cc: %s from line '%s'\n" msgstr "(mbox) Agregando cc: %s de línea '%s'\n" -#: git-send-email.perl:1665 +#: git-send-email.perl:1673 #, perl-format msgid "(mbox) Adding to: %s from line '%s'\n" msgstr "(mbox) Agregando para: %s de la línea '%s'\n" -#: git-send-email.perl:1722 +#: git-send-email.perl:1730 #, perl-format msgid "(non-mbox) Adding cc: %s from line '%s'\n" msgstr "(non-mbox) Agregando cc: %s de la línea '%s'\n" -#: git-send-email.perl:1757 +#: git-send-email.perl:1765 #, perl-format msgid "(body) Adding cc: %s from line '%s'\n" msgstr "(body) Agregando cc: %s de la línea '%s'\n" -#: git-send-email.perl:1868 +#: git-send-email.perl:1876 #, perl-format msgid "(%s) Could not execute '%s'" msgstr "(%s) no se pudo ejecutar '%s'" -#: git-send-email.perl:1875 +#: git-send-email.perl:1883 #, perl-format msgid "(%s) Adding %s: %s from: '%s'\n" msgstr "(%s) Agregando %s: %s de: '%s'\n" -#: git-send-email.perl:1879 +#: git-send-email.perl:1887 #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "(%s) falló al cerrar el pipe para '%s'" -#: git-send-email.perl:1909 +#: git-send-email.perl:1917 msgid "cannot send message as 7bit" msgstr "no se puede mandar mensaje como 7bit" -#: git-send-email.perl:1917 +#: git-send-email.perl:1925 msgid "invalid transfer encoding" msgstr "codificación de transferencia inválida" -#: git-send-email.perl:1958 git-send-email.perl:2010 git-send-email.perl:2020 +#: git-send-email.perl:1966 git-send-email.perl:2018 git-send-email.perl:2028 #, perl-format msgid "unable to open %s: %s\n" msgstr "no es posible abrir %s: %s\n" -#: git-send-email.perl:1961 +#: git-send-email.perl:1969 #, perl-format msgid "%s: patch contains a line longer than 998 characters" msgstr "%s: el parche contiene una línea con más de 998 caracteres" -#: git-send-email.perl:1978 +#: git-send-email.perl:1986 #, perl-format msgid "Skipping %s with backup suffix '%s'.\n" msgstr "Saltando %s con el sufijo de backup '%s'.\n" #. TRANSLATORS: please keep "[y|N]" as is. -#: git-send-email.perl:1982 +#: git-send-email.perl:1990 #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "¿Realmente deseas mandar %s?[y|N]: " +#~ msgid "store only" +#~ msgstr "solo guardar" + +#~ msgid "compress faster" +#~ msgstr "comprimir más rápido" + +#~ msgid "compress better" +#~ msgstr "comprimir mejor" + +#~ msgid "unknown hash algorithm length" +#~ msgstr "largo del algoritmo hash desconocido" + +#~ msgid "rev-list died" +#~ msgstr "rev-list murió" + +#~ msgid "" +#~ "commit-graph chunk lookup table entry missing; file may be incomplete" +#~ msgstr "" +#~ "falta tabla de lookup del chunk en commit-graph; el archivo puede estar " +#~ "incompleto" + +#, c-format +#~ msgid "commit-graph improper chunk offset %08x%08x" +#~ msgstr "offset del chunk de commit-graph inapropiado %08x%08x" + +#, c-format +#~ msgid "commit-graph chunk id %08x appears multiple times" +#~ msgstr "id de chunk de commit-graph %08x parece tener múltiples tiempos" + +#~ msgid "Writing changed paths Bloom filters index" +#~ msgstr "Escribiendo cambios de ruta del índice de filtros Bloom" + +#~ msgid "Counting distinct commits in commit graph" +#~ msgstr "Contando commits distintos en commit graph" + +#, c-format +#~ msgid "unexpected duplicate commit id %s" +#~ msgstr "id de commit duplicado inesperado %s" + +#, c-format +#~ msgid "the commit graph format cannot write %d commits" +#~ msgstr "el formato de gráficos de commit no pudede escribir %d commits" + +#, c-format +#~ msgid "hash version %u does not match" +#~ msgstr "versión de hash %u no concuerda" + +#~ msgid "invalid chunk offset (too large)" +#~ msgstr "offset inválido del conjunto (muy grande)" + +#~ msgid "error preparing packfile from multi-pack-index" +#~ msgstr "error preparando packfile de multi-pack-index" + +#~ msgid "Writing chunks to multi-pack-index" +#~ msgstr "Escribiendo chunks a multi-pack-index" + +#~ msgid "Remote with no URL" +#~ msgstr "Remoto sin URL" + +#, c-format +#~ msgid "%%(subject) does not take arguments" +#~ msgstr "%%(subject) no toma ningún argumento" + +#, c-format +#~ msgid "positive value expected objectname:short=%s" +#~ msgstr "valor positivo esperado objectname:short=%s" + +#, c-format +#~ msgid "unrecognized %%(objectname) argument: %s" +#~ msgstr "argumento: %s no reconocido %%(objectname)" + +#, c-format +#~ msgid "option `%s' is incompatible with --merged" +#~ msgstr "opción `%s' es incompatible con --merged" + +#, c-format +#~ msgid "option `%s' is incompatible with --no-merged" +#~ msgstr "opción `%s' es incompatible con --no-merged" + +#, c-format +#~ msgid "could not open '%s' for writing: %s" +#~ msgstr "no se pudo abrir '%s' para escritura: %s" + +#, c-format +#~ msgid "could not read ref '%s'" +#~ msgstr "no se pudo leer la referencia '%s'" + +#, c-format +#~ msgid "ref '%s' already exists" +#~ msgstr "ref '%s' ya existe" + +#, c-format +#~ msgid "unexpected object ID when writing '%s'" +#~ msgstr "ID de objecto inesperado al escribir '%s'" + +#, c-format +#~ msgid "unexpected object ID when deleting '%s'" +#~ msgstr "ID de objecto inesperado al borrar '%s'" + +#, c-format +#~ msgid "The hash algorithm %s is not supported in this build." +#~ msgstr "El algoritmo hash %s no está soportado en este build." + +#, c-format +#~ msgid "%s: not a valid OID" +#~ msgstr "%s no es OID válido" + +#~ msgid "git bisect--helper --next-all [--no-checkout]" +#~ msgstr "git bisect--helper --next-all [--no-checkout]" + +#~ msgid "git bisect--helper --write-terms <bad_term> <good_term>" +#~ msgstr "git bisect--helper --write-terms <mal_término> <buen_término>" + +#~ msgid "" +#~ "git bisect--helper --bisect-write [--no-log] <state> <revision> " +#~ "<good_term> <bad_term>" +#~ msgstr "" +#~ "git bisect--helper --bisect-write [--no-log] <estado> <revision> " +#~ "<buen_term> <mal_term>" + +#~ msgid "" +#~ "git bisect--helper --bisect-check-and-set-terms <command> <good_term> " +#~ "<bad_term>" +#~ msgstr "" +#~ "git bisect--helper --bisect-check-and-set-terms <comando> <buen_term> " +#~ "<mal_term>" + +#~ msgid "could not open the file BISECT_TERMS" +#~ msgstr "no se pudo abrir el archivo BISECT_TERMS" + +#~ msgid "perform 'git bisect next'" +#~ msgstr "realiza 'git bisect next'" + +#~ msgid "write the terms to .git/BISECT_TERMS" +#~ msgstr "escribe los términos a .git/BISECT_TERMS" + +#~ msgid "cleanup the bisection state" +#~ msgstr "limpiar el estado de bisección" + +#~ msgid "check for expected revs" +#~ msgstr "revisar por revs esperados" + +#~ msgid "write out the bisection state in BISECT_LOG" +#~ msgstr "escribir el estado de bisect en BISECT_LOG" + +#~ msgid "check and set terms in a bisection state" +#~ msgstr "revisar y configurar los terms en el estado de bisect" + +#~ msgid "update BISECT_HEAD instead of checking out the current commit" +#~ msgstr "actualiza BISECT_HEAD en lugar de revisar el commit actual" + +#~ msgid "--write-terms requires two arguments" +#~ msgstr "--write-terms requiere dos argumentos" + +#~ msgid "--bisect-clean-state requires no arguments" +#~ msgstr "--bisect-clean-state no requiere argumentos" + +#~ msgid "--bisect-write requires either 4 or 5 arguments" +#~ msgstr "--bisect-write requiere entre 4 o 5 argumentos" + +#~ msgid "--check-and-set-terms requires 3 arguments" +#~ msgstr "--bisect-clean-state no requiere argumentos" + +#~ msgid "Force progress reporting" +#~ msgstr "Forzar el reporte de progreso" + +#~ msgid "n,m" +#~ msgstr "n,m" + +#, c-format +#~ msgid "Error deleting remote-tracking branch '%s'" +#~ msgstr "Error al eliminar la rama de rastreo remota '%s'" + +#, c-format +#~ msgid "Error deleting branch '%s'" +#~ msgstr "Error al eliminar la rama '%s'" + +#~ msgid "show parse tree for grep expression" +#~ msgstr "mostrar árbol analizado para la expresión grep" + +#~ msgid "Process line range n,m in file, counting from 1" +#~ msgstr "Procesar rango de líneas n,m en archivo, contando desde 1" + +#~ msgid "name of output directory is too long" +#~ msgstr "nombre del directorio de salida es muy largo" + +#~ msgid "standard output, or directory, which one?" +#~ msgstr "¿salida standard, o directorio, cual?" + +#~ msgid "print only names (no SHA-1)" +#~ msgstr "imprimir sólo nombres (sin SHA-1)" + +#~ msgid "too many parameters" +#~ msgstr "demasiados parámetros" + +#~ msgid "too few parameters" +#~ msgstr "muy pocos parámetros" + +#~ msgid "passed to 'git am'" +#~ msgstr "pasado a 'git am'" + +#, c-format +#~ msgid "" +#~ "WARNING: Some packs in use have been renamed by\n" +#~ "WARNING: prefixing old- to their name, in order to\n" +#~ "WARNING: replace them with the new version of the\n" +#~ "WARNING: file. But the operation failed, and the\n" +#~ "WARNING: attempt to rename them back to their\n" +#~ "WARNING: original names also failed.\n" +#~ "WARNING: Please rename them in %s manually:\n" +#~ msgstr "" +#~ "WARNING: Algunos packs en uso han sido renombrados\n" +#~ "WARNING: agregando el prefijo old- a sus nombres,para\n" +#~ "WARNING: reemplazarlos con la nueva versión del\n" +#~ "WARNING: archivo. Pero la operación falló, y el intento\n" +#~ "WARNING: de renombrarlos a sus nombres originales\n" +#~ "WARNING: también falló.\n" +#~ "WARNING: Por favor renombralos en %s manualmente:\n" + +#, c-format +#~ msgid "failed to remove '%s'" +#~ msgstr "falló al eliminar'%s'" + +#~ msgid "Recurse into nested submodules" +#~ msgstr "Recursar en submódulos anidados" + +#~ msgid "too many params" +#~ msgstr "demasiados parámetros" + +#~ msgid "Routines to help parsing remote repository access parameters" +#~ msgstr "" +#~ "Rutinas para ayudar a analizar los parámetros de acceso del repositorio " +#~ "remoto" + +#, sh-format +#~ msgid "Bad rev input: $bisected_head" +#~ msgstr "Mala entrada rev: $bisected_head" + +#, sh-format +#~ msgid "Bad rev input: $rev" +#~ msgstr "Mala entrada rev: $rev" + +#~ msgid "The --cached option cannot be used with the --files option" +#~ msgstr "La opción --cached no puede ser usada con la opción --files" + +#, sh-format +#~ msgid " Warn: $display_name doesn't contain commit $sha1_src" +#~ msgstr " Advertencia: $display_name no contiene el commit $sha1_src" + +#, sh-format +#~ msgid " Warn: $display_name doesn't contain commit $sha1_dst" +#~ msgstr " Advertencia: $display_name no contiene el commit $sha1_dst" + +#, sh-format +#~ msgid "" +#~ " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" +#~ msgstr "" +#~ " Advertencia: $display_name no contiene los commits $sha1_src y $sha1_dst" + +#, sh-format +#~ msgid "See git-${cmd}(1) for details." +#~ msgstr "Véase git-${cmd}(1) para más detalles." + #, c-format #~ msgid "Finding commits for commit graph from %d ref" #~ msgid_plural "Finding commits for commit graph from %d refs" @@ -25346,9 +26476,6 @@ msgstr "¿Realmente deseas mandar %s?[y|N]: " #~ msgid "malformed ident line" #~ msgstr "línea de entrada mal formada" -#~ msgid "corrupted author without date information" -#~ msgstr "autor corrupto sin información de fecha" - #, c-format #~ msgid "could not parse '%.*s'" #~ msgstr "no se puede analizar '%.*s'" @@ -25386,18 +26513,6 @@ msgstr "¿Realmente deseas mandar %s?[y|N]: " #~ msgid "no HEAD?" #~ msgstr "¿Sin HEAD?" -#~ msgid "make committer date match author date" -#~ msgstr "hacer que la fecha del commit concuerde con la fecha de autoría" - -#~ msgid "ignore author date and use current date" -#~ msgstr "ignorar la fecha del autor y usar la fecha actual" - -#~ msgid "synonym of --reset-author-date" -#~ msgstr "sinónimo para --reset-author-date" - -#~ msgid "ignore changes in whitespace" -#~ msgstr "ignorar cambios en espacios en blanco" - #~ msgid "preserve empty commits during rebase" #~ msgstr "preservar commits vacíos durante el rebase" @@ -25414,10 +26529,6 @@ msgstr "¿Realmente deseas mandar %s?[y|N]: " #~ "$sm_path\n" #~ "Usa -f si en verdad quieres agregarlo." -#, c-format -#~ msgid "unable to get tree for %s" -#~ msgstr "no se pudo obtener árbol para %s" - #~ msgid "Use an experimental heuristic to improve diffs" #~ msgstr "Usar un heurístico experimental para mejorar los diffs" @@ -25489,12 +26600,6 @@ msgstr "¿Realmente deseas mandar %s?[y|N]: " #~ msgid "Server supports ofs-delta" #~ msgstr "El servidor soporta ofs-delta" -#~ msgid "(HEAD detached at %s)" -#~ msgstr "(HEAD desacoplado en %s)" - -#~ msgid "(HEAD detached from %s)" -#~ msgstr "(HEAD desacoplado de %s)" - #~ msgid "Checking out files" #~ msgstr "Revisando archivos" @@ -25522,9 +26627,6 @@ msgstr "¿Realmente deseas mandar %s?[y|N]: " #~ msgid "unrecognized verb: %s" #~ msgstr "verbo no reconocido: %s" -#~ msgid "hash version %X does not match version %X" -#~ msgstr "versión de hash %X no concuerda con versión %X" - #~ msgid "option '%s' requires a value" #~ msgstr "opción '%s' requiere un valor" diff --git a/po/pt_PT.po b/po/pt_PT.po index 61ff13f028..c76a5facef 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -1,264 +1,388 @@ -# Portuguese translations for Git package. -# Copyright (C) 2012 Marco Sousa <marcomsousa AT gmail.com> -# Copyright (C) 2016 Vasco Almeida <vascomalmeida@sapo.pt> +# Portugual's Portuguese translations for Git package. +# Copyright (C) 2020 Daniel Santos <hello@brighterdan.com> # This file is distributed under the same license as the Git package. # Contributors: -# - Marco Sousa <marcomsousa AT gmail.com> -# Vasco Almeida <vascomalmeida@sapo.pt>, 2016, 2017. +# - Daniel Santos <hello@brighterdan.com> +# Past Contributors: +# - Marco Sousa <marcomsousa AT gmail.com> +# - Vasco Almeida <vascomalmeida@sapo.pt>, 2016, 2017. +# +# Git glossary for Portuguese translators +# +# English | Portuguese +# ---------------------------------+-------------------------------------- +# 3-way merge | junção-de-3 +# abbreviate | +# alternate object database | +# amend | +# ancestor | +# annotated tag | +# bare repository | +# bisect | +# blob object | +# bloom filter | +# branch | ramo +# bundle | +# bypass | +# cache | index +# chain | +# changeset | +# checkout | +# checksum | +# cherry-picking | +# clean | +# clone | +# commit | memorizar +# commit message | mensagem de memória +# commit object | objeto da memória +# commit-ish (also committish) | mnemónica +# conflict | conflito +# core Git | +# cover letter | +# DAG | +# dangling object | DAG +# detached HEAD | HEAD solta +# directory | pasta +# dirty | +# dumb HTTP protocol | +# evil merge | +# fast-forward | +# fetch | +# file system | +# fork | +# Git archive | +# gitfile | +# grafts | +# hash | +# HEAD | HEAD +# head | +# head ref | +# header | início +# hook | +# hunk | pedaço +# index | +# index entry | +# loose object | +# loose refs | +# master | +# merge | junção +# object | +# object database | +# object identifier | +# object name | +# object type | +# octopus | +# origin | +# pack | +# pack index | +# packfile | +# parent | +# patch | +# pathspec | +# pattern | +# pickaxe | +# plumbing | +# porcelain | +# precious-objects repo | +# prune | +# pull | agarrar +# push | atirar +# reachable | +# rebase | +# ref | +# reflog | +# refspec | +# remote | +# remote-tracking branch | +# replay | +# repo | repo +# repository | repositório +# resolve | +# revert | reverter +# revision | revisão +# rewind | +# SCM | +# SHA-1 | SHA-1 +# shallow repository | +# signed tag | +# smart HTTP protocol | +# squash | +# stage | +# stash | arrumos +# submodule | +# symref | +# tag | +# tag object | +# tagger | +# topic branch | +# track | +# trailer | +# tree | +# tree object | +# tree-ish (also treeish) | +# unmerged index | +# unpack | +# unreachable object | +# unstage | +# upstream | upstream +# upstream branch | ramo upstream +# working tree | +# msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2020-10-10 09:32+0800\n" -"PO-Revision-Date: 2017-05-01 21:17+0000\n" -"Last-Translator: Vasco Almeida <vascomalmeida@sapo.pt>\n" -"Language-Team: Portuguese\n" -"Language: pt\n" +"POT-Creation-Date: 2020-12-15 16:27+0800\n" +"PO-Revision-Date: 2020-10-14 11:43+0100\n" +"Last-Translator: Daniel Santos <hello@brighterdan.com>\n" +"Language-Team: Git L10N Português <https://github.com/git-l10n-pt-PT/>\n" +"Language: pt-PT\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Virtaal 0.7.1\n" -#: add-interactive.c:368 +#: add-interactive.c:376 #, fuzzy, c-format msgid "Huh (%s)?" -msgstr "O quê (%s)?\n" +msgstr "O quê (%s)?" -#: add-interactive.c:521 add-interactive.c:822 reset.c:65 sequencer.c:3250 -#: sequencer.c:3698 sequencer.c:3840 builtin/rebase.c:1526 -#: builtin/rebase.c:1944 +#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3284 +#: sequencer.c:3735 sequencer.c:3890 builtin/rebase.c:1532 +#: builtin/rebase.c:1955 msgid "could not read index" -msgstr "não foi possível ler o índice" +msgstr "incapaz de ler index" -#: add-interactive.c:576 git-add--interactive.perl:269 +#: add-interactive.c:584 git-add--interactive.perl:269 #: git-add--interactive.perl:294 msgid "binary" msgstr "binário" -#: add-interactive.c:634 git-add--interactive.perl:278 +#: add-interactive.c:642 git-add--interactive.perl:278 #: git-add--interactive.perl:332 msgid "nothing" msgstr "nada" -#: add-interactive.c:635 git-add--interactive.perl:314 +#: add-interactive.c:643 git-add--interactive.perl:314 #: git-add--interactive.perl:329 msgid "unchanged" -msgstr "não alterado" +msgstr "inalterado" -#: add-interactive.c:672 git-add--interactive.perl:643 +#: add-interactive.c:680 git-add--interactive.perl:641 msgid "Update" msgstr "Atualizar" -#: add-interactive.c:689 add-interactive.c:877 +#: add-interactive.c:697 add-interactive.c:885 #, fuzzy, c-format msgid "could not stage '%s'" -msgstr "não foi possível obter stat de '%s'" +msgstr "inacapaz de stage '%s'" -#: add-interactive.c:695 add-interactive.c:884 reset.c:89 sequencer.c:3444 +#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3478 #, fuzzy msgid "could not write index" -msgstr "não foi possível ler o índice" +msgstr "incapaz de escrever index" -#: add-interactive.c:698 git-add--interactive.perl:628 +#: add-interactive.c:706 git-add--interactive.perl:626 #, c-format, perl-format msgid "updated %d path\n" msgid_plural "updated %d paths\n" -msgstr[0] "%d caminho atualizado\n" -msgstr[1] "%d caminhos atualizados\n" +msgstr[0] "actualizou %d path\n" +msgstr[1] "actualizou %d paths\n" -#: add-interactive.c:716 git-add--interactive.perl:678 +#: add-interactive.c:724 git-add--interactive.perl:676 #, c-format, perl-format msgid "note: %s is untracked now.\n" -msgstr "nota: %s é agora não controlado.\n" +msgstr "nota: %s agora está untracked.\n" -#: add-interactive.c:721 apply.c:4127 builtin/checkout.c:295 +#: add-interactive.c:729 apply.c:4127 builtin/checkout.c:295 #: builtin/reset.c:145 #, c-format msgid "make_cache_entry failed for path '%s'" -msgstr "falha ao invocar make_cache_entry em '%s'" +msgstr "make_cache_entry falhou para path '%s'" -#: add-interactive.c:751 git-add--interactive.perl:655 +#: add-interactive.c:759 git-add--interactive.perl:653 msgid "Revert" msgstr "Reverter" -#: add-interactive.c:767 +#: add-interactive.c:775 #, fuzzy msgid "Could not parse HEAD^{tree}" -msgstr "não foi possível analisar o commit HEAD" +msgstr "Incapaz de parse HEAD^{tree}" -#: add-interactive.c:805 git-add--interactive.perl:631 +#: add-interactive.c:813 git-add--interactive.perl:629 #, c-format, perl-format msgid "reverted %d path\n" msgid_plural "reverted %d paths\n" -msgstr[0] "%d caminho revertido\n" -msgstr[1] "%d caminhos revertidos\n" +msgstr[0] "reverti %d path\n" +msgstr[1] "reverti %d paths\n" -#: add-interactive.c:856 git-add--interactive.perl:695 +#: add-interactive.c:864 git-add--interactive.perl:693 #, c-format msgid "No untracked files.\n" -msgstr "Nenhum ficheiros não controlado.\n" +msgstr "Nenhuns ficheiros untracked.\n" -#: add-interactive.c:860 git-add--interactive.perl:689 +#: add-interactive.c:868 git-add--interactive.perl:687 msgid "Add untracked" -msgstr "Adicionar não controlados" +msgstr "Adiciona untracked" -#: add-interactive.c:887 git-add--interactive.perl:625 +#: add-interactive.c:895 git-add--interactive.perl:623 #, c-format, perl-format msgid "added %d path\n" msgid_plural "added %d paths\n" -msgstr[0] "%d caminho adicionar\n" -msgstr[1] "%d caminhos adicionados\n" +msgstr[0] "adicionei %d path\n" +msgstr[1] "adicionei %d paths\n" -#: add-interactive.c:917 +#: add-interactive.c:925 #, fuzzy, c-format msgid "ignoring unmerged: %s" -msgstr "ignorado não integrado: %s\n" +msgstr "ignorando unmerged: %s" -#: add-interactive.c:929 add-patch.c:1738 git-add--interactive.perl:1371 +#: add-interactive.c:937 add-patch.c:1751 git-add--interactive.perl:1369 #, c-format msgid "Only binary files changed.\n" -msgstr "Apenas ficheiros binários alterados.\n" +msgstr "Apenas ficheiros binários mudaram.\n" -#: add-interactive.c:931 add-patch.c:1736 git-add--interactive.perl:1373 +#: add-interactive.c:939 add-patch.c:1749 git-add--interactive.perl:1371 #, c-format msgid "No changes.\n" -msgstr "Sem alterações.\n" +msgstr "Sem modificação.\n" -#: add-interactive.c:935 git-add--interactive.perl:1381 +#: add-interactive.c:943 git-add--interactive.perl:1379 msgid "Patch update" msgstr "Atualizar patch" -#: add-interactive.c:974 git-add--interactive.perl:1794 +#: add-interactive.c:982 git-add--interactive.perl:1792 msgid "Review diff" msgstr "Rever diff" -#: add-interactive.c:1002 +#: add-interactive.c:1010 #, fuzzy msgid "show paths with changes" -msgstr "mostrar ficheiros com correspondências no paginador" +msgstr "mostrar paths modificados" -#: add-interactive.c:1004 +#: add-interactive.c:1012 msgid "add working tree state to the staged set of changes" -msgstr "" +msgstr "adicionar estado de working tree para conjunto das modificações staged" -#: add-interactive.c:1006 +#: add-interactive.c:1014 msgid "revert staged set of changes back to the HEAD version" -msgstr "" +msgstr "reverter conjunto das modificações staged de volta para a versão HEAD" -#: add-interactive.c:1008 +#: add-interactive.c:1016 #, fuzzy msgid "pick hunks and update selectively" -msgstr "selecionar blocos interativamente" +msgstr "apanha os pedaços e atualiza selectivamente" -#: add-interactive.c:1010 +#: add-interactive.c:1018 #, fuzzy msgid "view diff between HEAD and index" -msgstr "repor HEAD e índice" +msgstr "ver diff entre HEAD e índex" -#: add-interactive.c:1012 +#: add-interactive.c:1020 msgid "add contents of untracked files to the staged set of changes" msgstr "" +"adiciona conteúdo de ficheiros untracked para conjunto das modificações " +"staged" -#: add-interactive.c:1020 add-interactive.c:1069 +#: add-interactive.c:1028 add-interactive.c:1077 msgid "Prompt help:" -msgstr "" +msgstr "Prompt ajuda:" -#: add-interactive.c:1022 +#: add-interactive.c:1030 #, fuzzy msgid "select a single item" -msgstr "selecionar pai principal" +msgstr "seleciona um único item" -#: add-interactive.c:1024 +#: add-interactive.c:1032 #, fuzzy msgid "select a range of items" -msgstr "selecionar o tratamento de tags assinadas" +msgstr "seleciona um conjunto de items" -#: add-interactive.c:1026 +#: add-interactive.c:1034 #, fuzzy msgid "select multiple ranges" -msgstr "%s tem múltiplos valores" +msgstr "seleciona múltiplos conjuntos" -#: add-interactive.c:1028 add-interactive.c:1073 +#: add-interactive.c:1036 add-interactive.c:1081 msgid "select item based on unique prefix" -msgstr "" +msgstr "seleciona item tendo base o prefixo único" -#: add-interactive.c:1030 +#: add-interactive.c:1038 #, fuzzy msgid "unselect specified items" -msgstr "usar ficheiro de modelo especificado" +msgstr "tira a seleção de items especificados" -#: add-interactive.c:1032 +#: add-interactive.c:1040 msgid "choose all items" -msgstr "" +msgstr "escolhe todos items" -#: add-interactive.c:1034 +#: add-interactive.c:1042 msgid "(empty) finish selecting" -msgstr "" +msgstr "(vazio) acaba de selecionar" -#: add-interactive.c:1071 +#: add-interactive.c:1079 msgid "select a numbered item" -msgstr "" +msgstr "seleciona item numerado" -#: add-interactive.c:1075 +#: add-interactive.c:1083 msgid "(empty) select nothing" -msgstr "" +msgstr "(vazio) seleciona nada" -#: add-interactive.c:1083 builtin/clean.c:816 git-add--interactive.perl:1891 +#: add-interactive.c:1091 builtin/clean.c:816 git-add--interactive.perl:1896 msgid "*** Commands ***" msgstr "*** Comandos ***" -#: add-interactive.c:1084 builtin/clean.c:817 git-add--interactive.perl:1888 +#: add-interactive.c:1092 builtin/clean.c:817 git-add--interactive.perl:1893 msgid "What now" msgstr "E agora" -#: add-interactive.c:1136 git-add--interactive.perl:213 +#: add-interactive.c:1144 git-add--interactive.perl:213 msgid "staged" -msgstr "preparado" +msgstr "staged" -#: add-interactive.c:1136 git-add--interactive.perl:213 +#: add-interactive.c:1144 git-add--interactive.perl:213 msgid "unstaged" -msgstr "não preparado" +msgstr "unstaged" -#: add-interactive.c:1136 apply.c:4984 apply.c:4987 builtin/am.c:2270 -#: builtin/am.c:2273 builtin/bugreport.c:133 builtin/clone.c:123 -#: builtin/fetch.c:147 builtin/merge.c:275 builtin/pull.c:190 +#: add-interactive.c:1144 apply.c:4989 apply.c:4992 builtin/am.c:2257 +#: builtin/am.c:2260 builtin/bugreport.c:134 builtin/clone.c:124 +#: builtin/fetch.c:147 builtin/merge.c:284 builtin/pull.c:190 #: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1818 #: builtin/submodule--helper.c:1821 builtin/submodule--helper.c:2326 #: builtin/submodule--helper.c:2329 builtin/submodule--helper.c:2572 #: git-add--interactive.perl:213 msgid "path" -msgstr "caminho" +msgstr "path" -#: add-interactive.c:1143 +#: add-interactive.c:1151 #, fuzzy msgid "could not refresh index" -msgstr "não foi possível ler o índice" +msgstr "incapaz de reactualizar o index" -#: add-interactive.c:1157 builtin/clean.c:781 git-add--interactive.perl:1805 +#: add-interactive.c:1165 builtin/clean.c:781 git-add--interactive.perl:1803 #, c-format msgid "Bye.\n" msgstr "Adeus.\n" -#: add-patch.c:34 git-add--interactive.perl:1433 +#: add-patch.c:34 git-add--interactive.perl:1431 #, fuzzy, c-format, perl-format msgid "Stage mode change [y,n,q,a,d%s,?]? " -msgstr "Preparar alteração de modo [y,n,q,a,d,/%s,?]? " +msgstr "Stage modo de modificação [y,n,q,a,d%s,?]? " -#: add-patch.c:35 git-add--interactive.perl:1434 +#: add-patch.c:35 git-add--interactive.perl:1432 #, fuzzy, c-format, perl-format msgid "Stage deletion [y,n,q,a,d%s,?]? " -msgstr "Preparar eliminação [y,n,q,a,d,/%s,?]? " +msgstr "Eliminação stage [y,n,q,a,d%s,?]? " -#: add-patch.c:36 git-add--interactive.perl:1435 +#: add-patch.c:36 git-add--interactive.perl:1433 #, fuzzy, c-format, perl-format msgid "Stage addition [y,n,q,a,d%s,?]? " -msgstr "Preparar eliminação [y,n,q,a,d,/%s,?]? " +msgstr "Adição stage [y,n,q,a,d%s,?]? " -#: add-patch.c:37 git-add--interactive.perl:1436 +#: add-patch.c:37 git-add--interactive.perl:1434 #, fuzzy, c-format, perl-format msgid "Stage this hunk [y,n,q,a,d%s,?]? " -msgstr "Preparar este excerto [y,n,q,a,d,/%s,?]? " +msgstr "Stage este pedaço [y,n,q,a,d%s,?]? " #: add-patch.c:39 #, fuzzy @@ -266,8 +390,8 @@ msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "staging." msgstr "" -"Se o patch se aplicar corretamente, o excerto editado será marcado\n" -"como preparado imediatamente." +"Se o patch submete-se corretamente, o pedaço editado será marcado para stage " +"imediatamente." #: add-patch.c:42 #, fuzzy @@ -278,31 +402,31 @@ msgid "" "a - stage this hunk and all later hunks in the file\n" "d - do not stage this hunk or any of the later hunks in the file\n" msgstr "" -"y - preparar este excerto\n" -"n - não preparar este excerto\n" -"q - sair; não preparar este excerto nem os restantes\n" -"a - preparar este excerto e todos os excertos seguintes no ficheiro\n" -"d - não preparar este excerto nem os excertos seguintes no ficheiro" +"y - stage este pedaço\n" +"n - o stage deste pedaço será retirado\n" +"q - sair; retirar de stage este pedaço e qualquer um dos que permaneçam\n" +"a - stage este pedaço e qualquer próximo pedaço neste ficheiro\n" +"d - retirar o stage deste pedaço e qualquer próximo pedaço neste ficheiro\n" -#: add-patch.c:56 git-add--interactive.perl:1439 +#: add-patch.c:56 git-add--interactive.perl:1437 #, fuzzy, c-format, perl-format msgid "Stash mode change [y,n,q,a,d%s,?]? " -msgstr "Esconder alteração de modo [y,n,q,a,d,/%s,?]? " +msgstr "Esconder modo de modificação [y,n,q,a,d%s,?]? " -#: add-patch.c:57 git-add--interactive.perl:1440 +#: add-patch.c:57 git-add--interactive.perl:1438 #, fuzzy, c-format, perl-format msgid "Stash deletion [y,n,q,a,d%s,?]? " -msgstr "Esconder eliminação [y,n,q,a,d,/%s,?]? " +msgstr "Eliminação da arrumação [y,n,q,a,d%s,?]? " -#: add-patch.c:58 git-add--interactive.perl:1441 +#: add-patch.c:58 git-add--interactive.perl:1439 #, fuzzy, c-format, perl-format msgid "Stash addition [y,n,q,a,d%s,?]? " -msgstr "Esconder eliminação [y,n,q,a,d,/%s,?]? " +msgstr "Adição da arrumação [y,n,q,a,d%s,?]? " -#: add-patch.c:59 git-add--interactive.perl:1442 +#: add-patch.c:59 git-add--interactive.perl:1440 #, fuzzy, c-format, perl-format msgid "Stash this hunk [y,n,q,a,d%s,?]? " -msgstr "Esconder este excerto [y,n,q,a,d,/%s,?]? " +msgstr "Esconde este pedaço [y,n,q,a,d%s,?]? " #: add-patch.c:61 #, fuzzy @@ -310,8 +434,8 @@ msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "stashing." msgstr "" -"Se o patch se aplicar corretamente, o excerto editado será marcado\n" -"como escondido imediatamente." +"Se o patch submete-se corretamente, o pedaço editado será marcado para " +"arrumação imediatamente." #: add-patch.c:64 #, fuzzy @@ -322,31 +446,31 @@ msgid "" "a - stash this hunk and all later hunks in the file\n" "d - do not stash this hunk or any of the later hunks in the file\n" msgstr "" -"y - esconder este excerto\n" -"n - não esconder este excerto\n" -"q - sair; não esconder este excerto nem os restantes\n" -"a - esconder este excerto e todos os seguintes no ficheiro\n" -"d - não esconder este excerto nem os excertos seguintes no ficheiro" +"y - arrumar este pedaço\n" +"n - mostrar este pedaço\n" +"q - sair; mostrar este pedaço e qualquer outro restante\n" +"a - arrumar este pedaço e qualquer próximo deste ficheiro\n" +"d - mostrar este pedaço e qualquer próximo deste ficheiro\n" -#: add-patch.c:80 git-add--interactive.perl:1445 +#: add-patch.c:80 git-add--interactive.perl:1443 #, fuzzy, c-format, perl-format msgid "Unstage mode change [y,n,q,a,d%s,?]? " -msgstr "Não preparar alteração de modo [y,n,q,a,d,/%s,?]? " +msgstr "Unstage modo de modificação [y,n,q,a,d%s,?]? " -#: add-patch.c:81 git-add--interactive.perl:1446 +#: add-patch.c:81 git-add--interactive.perl:1444 #, fuzzy, c-format, perl-format msgid "Unstage deletion [y,n,q,a,d%s,?]? " -msgstr "Não preparar eliminação [y,n,q,a,d,/%s,?]? " +msgstr "Eliminação do unstage [y,n,q,a,d%s,?]? " -#: add-patch.c:82 git-add--interactive.perl:1447 +#: add-patch.c:82 git-add--interactive.perl:1445 #, fuzzy, c-format, perl-format msgid "Unstage addition [y,n,q,a,d%s,?]? " -msgstr "Não preparar eliminação [y,n,q,a,d,/%s,?]? " +msgstr "Adição do unstage [y,n,q,a,d%s,?]? " -#: add-patch.c:83 git-add--interactive.perl:1448 +#: add-patch.c:83 git-add--interactive.perl:1446 #, fuzzy, c-format, perl-format msgid "Unstage this hunk [y,n,q,a,d%s,?]? " -msgstr "Não preparar este excerto [y,n,q,a,d,/%s,?]? " +msgstr "Unstage este pedaço [y,n,q,a,d%s,?]? " #: add-patch.c:85 #, fuzzy @@ -354,8 +478,8 @@ msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "unstaging." msgstr "" -"Se o patch se aplicar corretamente, o excerto editado será marcado\n" -"como não preparado imediatamente." +"Se patch submete-se corretamente, o pedaço editado será imediatamente " +"marcado para unstage." #: add-patch.c:88 #, fuzzy @@ -366,31 +490,32 @@ msgid "" "a - unstage this hunk and all later hunks in the file\n" "d - do not unstage this hunk or any of the later hunks in the file\n" msgstr "" -"y - despreparar este excerto\n" -"n - não despreparar este excerto\n" -"q - sair; não despreparar este excerto nem outros restantes\n" -"a - despreparar este excerto e todos os excertos seguintes no ficheiro\n" -"d - não despreparar este excerto nem os excertos seguintes no ficheiro" +"y - unstage este pedaço\n" +"n - o unstage deste pedaço será retirado\n" +"q - sair; retirar de unstage este pedaço e qualquer outro restante\n" +"a - unstage este pedaço e todos próximos pedaços deste ficheiro\n" +"d - retirar este pedaço da arrumação e qualquer próximo pedaço deste " +"ficheiro\n" -#: add-patch.c:103 git-add--interactive.perl:1451 +#: add-patch.c:103 git-add--interactive.perl:1449 #, fuzzy, c-format, perl-format msgid "Apply mode change to index [y,n,q,a,d%s,?]? " -msgstr "Aplicar alteração de modo ao índice [y,n,q,a,d,/%s,?]? " +msgstr "Submeter modo de modificação para index [y,n,q,a,d%s,?]? " -#: add-patch.c:104 git-add--interactive.perl:1452 +#: add-patch.c:104 git-add--interactive.perl:1450 #, fuzzy, c-format, perl-format msgid "Apply deletion to index [y,n,q,a,d%s,?]? " -msgstr "Aplicar eliminação ao índice [y,n,q,a,d,/%s,?]? " +msgstr "Submeter eliminação para index [y,n,q,a,d%s,?]? " -#: add-patch.c:105 git-add--interactive.perl:1453 +#: add-patch.c:105 git-add--interactive.perl:1451 #, fuzzy, c-format, perl-format msgid "Apply addition to index [y,n,q,a,d%s,?]? " -msgstr "Aplicar eliminação ao índice [y,n,q,a,d,/%s,?]? " +msgstr "Submeter adição para index [y,n,q,a,d%s,?]? " -#: add-patch.c:106 git-add--interactive.perl:1454 +#: add-patch.c:106 git-add--interactive.perl:1452 #, fuzzy, c-format, perl-format msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " -msgstr "Aplicar este excerto ao índice [y,n,q,a,d,/%s,?]? " +msgstr "Submeter este pedaço para index [y,n,q,a,d%s,?]? " #: add-patch.c:108 add-patch.c:176 add-patch.c:221 #, fuzzy @@ -398,8 +523,8 @@ msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "applying." msgstr "" -"Se o patch se aplicar corretamente, o excerto editado será marcado\n" -"para ser aplicado imediatamente." +"Se o patch aplica-se corretamente, o pedaço editado será marcado para a " +"submissão imediatamente." #: add-patch.c:111 #, fuzzy @@ -410,35 +535,35 @@ msgid "" "a - apply this hunk and all later hunks in the file\n" "d - do not apply this hunk or any of the later hunks in the file\n" msgstr "" -"y - aplicar este excerto ao índice\n" -"n - não aplicar este excerto ao índice\n" -"q - sair; não aplicar este excerto nem os restantes\n" -"a - aplicar este excerto e todos os excertos seguintes no ficheiro\n" -"d - não aplicar este excerto nem os excertos seguintes no ficheiro" +"y - submeter este pedaço para index\n" +"n - declinar este pedaço para index\n" +"q - sair; declinar este pedaço e qualquer outro restante\n" +"a - submeter este pedaço e qualquer próximo deste ficheiro\n" +"d - declinar este pedaço e qualquer próximo deste ficheiro\n" -#: add-patch.c:126 git-add--interactive.perl:1457 -#: git-add--interactive.perl:1475 +#: add-patch.c:126 git-add--interactive.perl:1455 +#: git-add--interactive.perl:1473 #, fuzzy, c-format, perl-format msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " -msgstr "Descartar alteração de modo da árvore de trabalho [y,n,q,a,d,/%s,?]? " +msgstr "Descartar modo de modificação da worktree [y,n,q,a,d%s,?]? " -#: add-patch.c:127 git-add--interactive.perl:1458 -#: git-add--interactive.perl:1476 +#: add-patch.c:127 git-add--interactive.perl:1456 +#: git-add--interactive.perl:1474 #, fuzzy, c-format, perl-format msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " -msgstr "Descartar eliminação da árvore de trabalho [y,n,q,a,d,/%s,?]? " +msgstr "Descartar eliminação da worktree [y,n,q,a,d%s,?]? " -#: add-patch.c:128 git-add--interactive.perl:1459 -#: git-add--interactive.perl:1477 +#: add-patch.c:128 git-add--interactive.perl:1457 +#: git-add--interactive.perl:1475 #, fuzzy, c-format, perl-format msgid "Discard addition from worktree [y,n,q,a,d%s,?]? " -msgstr "Descartar eliminação da árvore de trabalho [y,n,q,a,d,/%s,?]? " +msgstr "Descartar adição da worktree [y,n,q,a,d%s,?]? " -#: add-patch.c:129 git-add--interactive.perl:1460 -#: git-add--interactive.perl:1478 +#: add-patch.c:129 git-add--interactive.perl:1458 +#: git-add--interactive.perl:1476 #, fuzzy, c-format, perl-format msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " -msgstr "Descartar este excerto da árvore de trabalho [y,n,q,a,d,/%s,?]? " +msgstr "Descartar este pedaço da worktree [y,n,q,a,d%s,?]? " #: add-patch.c:131 add-patch.c:154 add-patch.c:199 #, fuzzy @@ -446,8 +571,8 @@ msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "discarding." msgstr "" -"Se o patch se aplicar corretamente, o excerto editado será marcado\n" -"para ser descartado imediatamente." +"Se o patch aplica-se corretamente, o pedaço editado será marcado para ser " +"descartado imediatamente." #: add-patch.c:134 add-patch.c:202 #, fuzzy @@ -458,36 +583,31 @@ msgid "" "a - discard this hunk and all later hunks in the file\n" "d - do not discard this hunk or any of the later hunks in the file\n" msgstr "" -"y - descartar este excerto da árvore de trabalho\n" -"n - não descartar este excerto da árvore de trabalho\n" -"q - sair; não descartar este excerto nem os restantes\n" -"a - descartar este excerto e todos os excertos seguintes no ficheiro\n" -"d - não descartar este excerto nem os excertos seguintes no ficheiro" +"y - descartar este pedaço de worktree\n" +"n - aceitar este pedaço de worktree\n" +"q - sair; aceitar este pedaço e qualquer outro restante\n" +"a - descartar este pedaço e qualquer próximo deste ficheiro\n" +"d - aceitar este pedaço e qualquer próximo deste ficheiro\n" -#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1463 +#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461 #, fuzzy, c-format, perl-format msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " -msgstr "" -"Descartar alteração de modo do índice e da árvore de trabalho [y,n,q,a,d,/" -"%s,?]? " +msgstr "Descartar modo de modficação de index e worktree [y,n,q,a,d%s,?]?" -#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1464 +#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1462 #, fuzzy, c-format, perl-format msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " -msgstr "" -"Descartar eliminação do índice e da árvore de trabalho [y,n,q,a,d,/%s,?]? " +msgstr "Descartar eliminação de index e worktree [y,n,q,a,d%s,?]? " -#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1465 +#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1463 #, fuzzy, c-format, perl-format msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? " -msgstr "" -"Descartar eliminação do índice e da árvore de trabalho [y,n,q,a,d,/%s,?]? " +msgstr "Descartar adição de index e worktree [y,n,q,a,d%s,?]? " -#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1466 +#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1464 #, fuzzy, c-format, perl-format msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " -msgstr "" -"Descartar este excerto do índice e da árvore de trabalho [y,n,q,a,d,/%s,?]? " +msgstr "Descartar este pedaço de index e worktree [y,n,q,a,d%s,?]? " #: add-patch.c:157 #, fuzzy @@ -498,36 +618,31 @@ msgid "" "a - discard this hunk and all later hunks in the file\n" "d - do not discard this hunk or any of the later hunks in the file\n" msgstr "" -"y - descartar este excerto do índice e da árvore de trabalho\n" -"n - não descartar este excerto do índice nem da árvore de trabalho\n" -"q - sair; não descartar este excerto nem nenhum dos restantes\n" -"a - descartar este excerto e todos os excertos seguintes no ficheiro\n" -"d - não descartar este excerto nem os excertos seguintes no ficheiro" +"y - descartar este pedaço de index e worktree\n" +"n - aceitar este pedaço de index e worktree\n" +"q - sair; aceitar este pedaço e qualquer outro restante\n" +"a - descartar este pedaço e qualquer próximo deste ficheiro\n" +"d - aceitar este pedaço e qualquer próximo deste ficheiro\n" -#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1469 +#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467 #, fuzzy, c-format, perl-format msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " -msgstr "" -"Aplicar alteração de modo ao índice e à árvore de trabalho [y,n,q,a,d,/" -"%s,?]? " +msgstr "Submeter modo de modificação para index e worktree [y,n,q,a,d%s,?]? " -#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1470 +#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1468 #, fuzzy, c-format, perl-format msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " -msgstr "" -"Aplicar eliminação ao índice e à árvore de trabalho [y,n,q,a,d,/%s,?]? " +msgstr "Submeter eliminação para index e worktree [y,n,q,a,d%s,?]? " -#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1471 +#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1469 #, fuzzy, c-format, perl-format msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? " -msgstr "" -"Aplicar eliminação ao índice e à árvore de trabalho [y,n,q,a,d,/%s,?]? " +msgstr "Submeter adição para index e worktree [y,n,q,a,d%s,?]? " -#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1472 +#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1470 #, fuzzy, c-format, perl-format msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " -msgstr "" -"Aplicar este excerto ao índice e à árvore de trabalho [y,n,q,a,d,/%s,?]? " +msgstr "Submeter este pedaço para index e worktree [y,n,q,a,d%s,?]? " #: add-patch.c:179 #, fuzzy @@ -538,11 +653,11 @@ msgid "" "a - apply this hunk and all later hunks in the file\n" "d - do not apply this hunk or any of the later hunks in the file\n" msgstr "" -"y - aplicar este excerto ao índice e à árvore de trabalho\n" -"n - não aplicar este excerto ao índice e à árvore de trabalho\n" -"q - sair; não aplicar este excerto ou restantes\n" -"a - aplicar este excerto e todos os excertos seguintes no ficheiro\n" -"d - não aplicar este excerto nem os excertos seguintes no ficheiro" +"y - submeter este pedaço para index e worktree\n" +"n - declinar este pedaço para index e worktree\n" +"q - sair; declinar este pedaço e qualquer outro restante\n" +"a - submeter este pedaço e qualquer próximo deste ficheiro\n" +"d - declinar este pedaço e qualquer próximo deste ficheiro\n" #: add-patch.c:224 #, fuzzy @@ -553,55 +668,59 @@ msgid "" "a - apply this hunk and all later hunks in the file\n" "d - do not apply this hunk or any of the later hunks in the file\n" msgstr "" -"y - aplicar este excerto ao índice e à árvore de trabalho\n" -"n - não aplicar este excerto ao índice e à árvore de trabalho\n" -"q - sair; não aplicar este excerto ou restantes\n" -"a - aplicar este excerto e todos os excertos seguintes no ficheiro\n" -"d - não aplicar este excerto nem os excertos seguintes no ficheiro" +"y - submeter este pedaço para worktree\n" +"n - declinar este pedaço para worktree\n" +"q - sair; declinar este pedaço e qualquer outro restantes\n" +"a - submeter este pedaço e qualquer próximo deste ficheiro\n" +"d - declinar este pedaço e qualquer próximo deste ficheiro\n" #: add-patch.c:342 #, fuzzy, c-format msgid "could not parse hunk header '%.*s'" -msgstr "não foi possível analisar o patch '%s'" +msgstr "incapaz de analisar ínicio de pedaço '%s'" #: add-patch.c:361 add-patch.c:365 #, fuzzy, c-format msgid "could not parse colored hunk header '%.*s'" -msgstr "não foi possível abrir ou ler '%s'" +msgstr "incapaz de analizar início de pedaço colorido '%.*s'" #: add-patch.c:419 #, fuzzy msgid "could not parse diff" -msgstr "não foi possível analisar %s" +msgstr "incapaz de analisar diff" #: add-patch.c:438 #, fuzzy msgid "could not parse colored diff" -msgstr "Não foi possível analisar a linha %d." +msgstr "incapaz de analisar diff colorido" #: add-patch.c:452 #, fuzzy, c-format msgid "failed to run '%s'" -msgstr "falha ao invocar unlink de '%s'" +msgstr "falha ao executar '%s'" #: add-patch.c:611 msgid "mismatched output from interactive.diffFilter" -msgstr "" +msgstr "sem match de output de interactive.diffFilter" #: add-patch.c:612 msgid "" "Your filter must maintain a one-to-one correspondence\n" "between its input and output lines." msgstr "" +"O teu filtro tem de manter uma correspondência exata\n" +"entre seu input e linhas output." -#: add-patch.c:785 +#: add-patch.c:790 #, fuzzy, c-format msgid "" "expected context line #%d in\n" "%.*s" -msgstr "linha de configuração %d incorreta em %s" +msgstr "" +"linha de contexto esperada #%d em\n" +"%.*s" -#: add-patch.c:800 +#: add-patch.c:805 #, c-format msgid "" "hunks do not overlap:\n" @@ -609,12 +728,16 @@ msgid "" "\tdoes not end with:\n" "%.*s" msgstr "" +"pedaços sem overlap:\n" +"%.*s\n" +"\ttermina sem:\n" +"%.*s" -#: add-patch.c:1076 git-add--interactive.perl:1117 +#: add-patch.c:1081 git-add--interactive.perl:1115 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" -msgstr "Modo de edição manual de excerto -- ver guia rápido abaixo no final.\n" +msgstr "Modo de edição manual de pedaço -- ver final para guia rápido.\n" -#: add-patch.c:1080 +#: add-patch.c:1085 #, fuzzy, c-format msgid "" "---\n" @@ -623,29 +746,29 @@ msgid "" "Lines starting with %c will be removed.\n" msgstr "" "---\n" -"Para remover linhas '%s', torne-as linhas ' ' (contexto).\n" -"Para remover linhas '%s', elimine-as.\n" -"Linhas começadas com %s serão removidas.\n" +"Para remover '%c' linhas, torna-as linhas ' ' (contexto).\n" +"Para remover '%c' linhas, elimina-as.\n" +"Linhas começadas com %c serão removidas.\n" #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. -#: add-patch.c:1094 git-add--interactive.perl:1131 +#: add-patch.c:1099 git-add--interactive.perl:1129 msgid "" "If it does not apply cleanly, you will be given an opportunity to\n" "edit again. If all lines of the hunk are removed, then the edit is\n" "aborted and the hunk is left unchanged.\n" msgstr "" -"Se não se aplicar corretamente, ser-lhe-á dada oportunidade para editar\n" -"de novo. Se todas as linhas do excerto forem removidas, a edição é\n" -"abortada e o exceto é deixado inalterado.\n" +"Se falha na submissão correta, ser-lhe-á dada nova oportunidade para\n" +"editar. Se todas as linhas deste pedaço forem removidas, então a edição\n" +"é abortada e este pedaço é deixado inalterado.\n" -#: add-patch.c:1127 +#: add-patch.c:1132 #, fuzzy msgid "could not parse hunk header" -msgstr "não foi possível analisar %s" +msgstr "incapaz interpretar início de pedaço" -#: add-patch.c:1172 +#: add-patch.c:1177 msgid "'git apply --cached' failed" -msgstr "" +msgstr "'git apply --cached' falhou" #. TRANSLATORS: do not translate [y/n] #. The program will only accept that input at this point. @@ -659,27 +782,27 @@ msgstr "" #. Consider translating (saying "no" discards!) as #. (saying "n" for "no" discards!) if the translation #. of the word "no" does not start with n. -#: add-patch.c:1241 git-add--interactive.perl:1244 +#: add-patch.c:1246 git-add--interactive.perl:1242 msgid "" "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " msgstr "" -"O excerto que editou não aplica.\n" -"Edite de novo (responder \"não\" descarta!) [y/n]? " +"Problema na submissão de pedaço editado. Editar de novo (responder \"não\" descarta!) " +"[y/n]? " -#: add-patch.c:1284 +#: add-patch.c:1289 #, fuzzy msgid "The selected hunks do not apply to the index!" -msgstr "Os excertos selecionados não aplicam ao índice!\n" +msgstr "Submissão incorreta de pedaços selecionados para index!" -#: add-patch.c:1285 git-add--interactive.perl:1348 +#: add-patch.c:1290 git-add--interactive.perl:1346 msgid "Apply them to the worktree anyway? " -msgstr "Aplicá-los à árvore de trabalho mesmo assim? " +msgstr "Submetê-los para worktree mesmo assim? " -#: add-patch.c:1292 git-add--interactive.perl:1351 +#: add-patch.c:1297 git-add--interactive.perl:1349 msgid "Nothing was applied.\n" -msgstr "Não foi aplicado nada.\n" +msgstr "Nada foi submetido.\n" -#: add-patch.c:1349 +#: add-patch.c:1354 #, fuzzy msgid "" "j - leave this hunk undecided, see next undecided hunk\n" @@ -692,149 +815,150 @@ msgid "" "e - manually edit the current hunk\n" "? - print help\n" msgstr "" -"g - selecionar um excerto para ir\n" -"/ - procurar por um excerto correspondendo à regex dada\n" -"j - deixar este excerto indecidido, ver excerto seguinte indecidido\n" -"J - deixar este excerto indecidido, ver excerto seguinte\n" -"k - deixar este excerto indecidido, ver excerto anterior indecidido\n" -"K - deixar este excerto indecidido, ver excerto anterior\n" -"s - dividir o excerto atual em excertos mais pequenos\n" -"e - editar manualmente o excerto atual\n" -"? - imprimir ajuda\n" +"j - deixar este pedaço indecidido, ver próximo pedaço indecidido\n" +"J - deixar este pedaço indecidido, ver próximo pedaço\n" +"k - deixar este pedaço indecidido, ver pedaço indecidido anterior\n" +"K - deixar este pedaço indecidido, ver pedaço anterior\n" +"g - selecionar próximo pedaço\n" +"/ - procurar por pedaço correspondendo à regex\n" +"s - dividir o pedaço atual em pedaços mais pequenos\n" +"e - editar manualmente o pedaço atual\n" +"? - mostrar ajuda\n" -#: add-patch.c:1511 add-patch.c:1521 +#: add-patch.c:1516 add-patch.c:1526 #, fuzzy msgid "No previous hunk" -msgstr "Nenhum excerto anterior\n" +msgstr "Sem pedaço anterior" -#: add-patch.c:1516 add-patch.c:1526 +#: add-patch.c:1521 add-patch.c:1531 #, fuzzy msgid "No next hunk" -msgstr "Nenhum excerto seguinte\n" +msgstr "Sem próximo pedaço" -#: add-patch.c:1532 +#: add-patch.c:1537 msgid "No other hunks to goto" -msgstr "" +msgstr "Sem qualquer outro pedaço" -#: add-patch.c:1543 git-add--interactive.perl:1608 +#: add-patch.c:1548 git-add--interactive.perl:1606 msgid "go to which hunk (<ret> to see more)? " -msgstr "ir para que excerto (<ret> para ver mais)? " +msgstr "ir para qual pedaço (<ret> para ver mais)? " -#: add-patch.c:1544 git-add--interactive.perl:1610 +#: add-patch.c:1549 git-add--interactive.perl:1608 msgid "go to which hunk? " -msgstr "ir para que excerto? " +msgstr "ir para qual pedaço? " -#: add-patch.c:1555 +#: add-patch.c:1560 #, fuzzy, c-format msgid "Invalid number: '%s'" -msgstr "Número inválido: '%s'\n" +msgstr "Número inválido: '%s'" -#: add-patch.c:1560 +#: add-patch.c:1565 #, fuzzy, c-format msgid "Sorry, only %d hunk available." msgid_plural "Sorry, only %d hunks available." -msgstr[0] "Lamento, apenas %d excerto disponível.\n" -msgstr[1] "Lamento, apenas %d excertos disponíveis.\n" +msgstr[0] "Lamento, apenas %d pedaço disponível." +msgstr[1] "Lamento, apenas %d pedaços disponíveis." -#: add-patch.c:1569 +#: add-patch.c:1574 msgid "No other hunks to search" -msgstr "" +msgstr "Sem outro pedaço a procurar" -#: add-patch.c:1575 git-add--interactive.perl:1663 +#: add-patch.c:1580 git-add--interactive.perl:1661 msgid "search for regex? " msgstr "procurar por regex? " -#: add-patch.c:1590 +#: add-patch.c:1595 #, fuzzy, c-format msgid "Malformed search regexp %s: %s" -msgstr "Regexp de pesquisa malformada %s: %s\n" +msgstr "Pesquisa regexp deformada %s: %s" -#: add-patch.c:1607 +#: add-patch.c:1612 #, fuzzy msgid "No hunk matches the given pattern" -msgstr "Nenhum excerto corresponde ao padrão fornecido\n" +msgstr "Sem pedaço correspondente ao padrão fornecido" -#: add-patch.c:1614 +#: add-patch.c:1619 msgid "Sorry, cannot split this hunk" -msgstr "" +msgstr "Lamento, incapaz de dividir este pedaço" -#: add-patch.c:1618 +#: add-patch.c:1623 #, fuzzy, c-format msgid "Split into %d hunks." -msgstr "Dividir em %d excerto.\n" +msgstr "Dividir em %d pedaços." -#: add-patch.c:1622 +#: add-patch.c:1627 msgid "Sorry, cannot edit this hunk" -msgstr "" +msgstr "Lamento, incapaz de editar este pedaço" -#: add-patch.c:1674 +#: add-patch.c:1679 #, fuzzy msgid "'git apply' failed" -msgstr "falha ao executar o comando stash" +msgstr "'git apply' falhou" -#: advice.c:140 +#: advice.c:143 #, c-format msgid "" "\n" "Disable this message with \"git config advice.%s false\"" msgstr "" +"\n" +"Desative este mensagem com \"git config advice.%s false\"" -#: advice.c:156 +#: advice.c:159 #, fuzzy, c-format msgid "%shint: %.*s%s\n" -msgstr "dica: %.*s\n" +msgstr "%sdica: %.*s%s\n" -#: advice.c:247 +#: advice.c:250 msgid "Cherry-picking is not possible because you have unmerged files." -msgstr "" -"Não é possível efetuar cherry-pick porque tem ficheiros não integrados." +msgstr "Cherry-picking é impossível porque tem ficheiros em separado." -#: advice.c:249 +#: advice.c:252 msgid "Committing is not possible because you have unmerged files." -msgstr "Não é possível submeter porque tem ficheiros não integrados." +msgstr "Cometer é impossível porque tem ficheiros em separado." -#: advice.c:251 +#: advice.c:254 msgid "Merging is not possible because you have unmerged files." -msgstr "Não é possível integrar porque tem ficheiros não integrados." +msgstr "Juntar é impossível porque tem ficheiros em separado." -#: advice.c:253 +#: advice.c:256 msgid "Pulling is not possible because you have unmerged files." -msgstr "Não é possível puxar porque tem ficheiros não integrados." +msgstr "Puxar é impossível porque tem ficheiros em separado." -#: advice.c:255 +#: advice.c:258 msgid "Reverting is not possible because you have unmerged files." -msgstr "Não é possível reverte porque tem ficheiros não integrados." +msgstr "Reverter é impossível porque tem ficheiros em separado." -#: advice.c:257 +#: advice.c:260 #, c-format msgid "It is not possible to %s because you have unmerged files." -msgstr "Não é possível efetuar %s porque tem ficheiros não integrados." +msgstr "É impossível fazer %s porque tem ficheiros em separado." -#: advice.c:265 +#: advice.c:268 msgid "" "Fix them up in the work tree, and then use 'git add/rm <file>'\n" "as appropriate to mark resolution and make a commit." msgstr "" -"Corrija-os na árvore de trabalho e use 'git add/rm <ficheiro>'\n" -"conforme apropriado para marcá-los como resolvidos e submeta." +"Corrija-os em worktree, e use 'git add/rm <ficheiro>' apropriadamente\n" +"para marcar resolução e fazer uma memória." -#: advice.c:273 +#: advice.c:276 msgid "Exiting because of an unresolved conflict." -msgstr "A terminar devido a conflito não resolvido." +msgstr "Saindo devido a conflito por resolver." -#: advice.c:278 builtin/merge.c:1349 +#: advice.c:281 builtin/merge.c:1369 msgid "You have not concluded your merge (MERGE_HEAD exists)." -msgstr "Não concluído a integração (MERGE_HEAD presente)." +msgstr "O teu juntar ficou por concluír (MERGE_HEAD presente)." -#: advice.c:280 +#: advice.c:283 msgid "Please, commit your changes before merging." -msgstr "Submeta as suas alterações antes de integrar." +msgstr "Por favor, memoriza as tuas modificações antes de juntar." -#: advice.c:281 +#: advice.c:284 msgid "Exiting because of unfinished merge." -msgstr "A terminar devido a integração incompleta." +msgstr "Saindo devido a juntar inacabado." -#: advice.c:287 +#: advice.c:290 #, fuzzy, c-format msgid "" "Note: switching to '%s'.\n" @@ -856,44 +980,51 @@ msgid "" "false\n" "\n" msgstr "" -"Nota: a extrair '%s'.\n" +"Nota: trocando para '%s'.\n" +"\n" +"Está em 'HEAD solta'. Podes olhar, fazer mudanças experimentais e\n" +"memorizá-las, e, neste estado, podes descartar qualquer memória que faças\n" +"sem interferir em qualquer ramo fazendo um switch de ramos.\n" "\n" -"Encontra-se em estado 'HEAD destacada'. Pode inspecionar, fazer alterações\n" -"experimentais e submetê-las e pode descartar qualquer commit que faça neste\n" -"estado sem interferir outro ramo se extrair outro ramo.\n" +"Se queres criar um novo ramo para reter as memórias que criaste, podes\n" +"fazer (agora ou mais tarde) usando -c com o comando switch. Exemplo:\n" "\n" -"Se deseja criar um novo ramo para reter os commits que criou, pode fazê-lo\n" -"(agora ou mais tarde) usando -b com o comando checkout outra vez. Exemplo:\n" +" git switch -c <novo-nome-de-branch>\n" "\n" -" git checkout -b <novo-nome-ramo>\n" +"Ou desfazer esta operação com:\n" +"\n" +" git switch -\n" +"\n" +"Desliga este conselho pondo a variável de config advice.detachedHead em" +"false\n" "\n" #: alias.c:50 #, fuzzy msgid "cmdline ends with \\" -msgstr "terminar entradas com NUL" +msgstr "cmdline termina com \\" #: alias.c:51 msgid "unclosed quote" -msgstr "" +msgstr "aspa aberta" #: apply.c:69 #, c-format msgid "unrecognized whitespace option '%s'" -msgstr "opção de espaço em branco não reconhecida '%s'" +msgstr "opção de whitespace desconhecida '%s'" #: apply.c:85 #, c-format msgid "unrecognized whitespace ignore option '%s'" -msgstr "opção de ignorar espaço em branco não reconhecida '%s'" +msgstr "opção de ignorar whitespace desconhecida '%s'" #: apply.c:135 msgid "--reject and --3way cannot be used together." -msgstr "--reject e --3way não podem ser usados juntos." +msgstr "--reject e --3way só podem ser usados separadamente." #: apply.c:137 msgid "--cached and --3way cannot be used together." -msgstr "--cached e --3way não podem ser usados juntos." +msgstr "--cached e --3way só podem ser usados separadamente." #: apply.c:140 msgid "--3way outside a repository" @@ -910,53 +1041,50 @@ msgstr "--cached fora de um repositório" #: apply.c:801 #, c-format msgid "Cannot prepare timestamp regexp %s" -msgstr "Não é possível preparar a regexp de carimbo de data/hora %s" +msgstr "Incapaz preparar timestamp de regexp %s" #: apply.c:810 #, c-format msgid "regexec returned %d for input: %s" -msgstr "regexec retornou %d para a entra: %s" +msgstr "regexec devolveu %d para input: %s" #: apply.c:884 #, c-format msgid "unable to find filename in patch at line %d" -msgstr "não foi possível encontrar o nome do ficheiro no patch na linha %d" +msgstr "incapaz de encontrar o nome do ficheiro no patch da linha %d" #: apply.c:922 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" -msgstr "" -"git apply: git-diff incorreto - esperava-se /dev/null, obteve-se %s na linha " +msgstr "git apply: git-diff incorreto - esperava /dev/null, tive %s na linha " "%d" #: apply.c:928 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" -msgstr "" -"git apply: git-diff incorreto - o nome do novo ficheiro na linha %d é " -"inconsistente" +msgstr "git apply: git-diff incorreto - novo nome de ficheiro inconsistente " +"na linha %d" #: apply.c:929 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" -msgstr "" -"git apply: git-diff incorreto - o nome do ficheiro antigo na linha %d é " -"inconsistente" +msgstr "git apply: git-diff incorreto - antigo nome de ficheiro inconsistente " +"na linha %d" #: apply.c:934 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" -msgstr "git apply: git-diff incorreto - esperava-se /dev/null na linha %d" +msgstr "git apply: git-diff incorreto - esperava /dev/null na linha %d" #: apply.c:963 #, fuzzy, c-format msgid "invalid mode on line %d: %s" -msgstr "linha de identidade inválida: %s" +msgstr "modo inválido na linha %d: %s" #: apply.c:1282 #, c-format msgid "inconsistent header lines %d and %d" -msgstr "" +msgstr "linhas de cabeçalho %d e %d inconsistentes" #: apply.c:1372 #, c-format @@ -967,16 +1095,16 @@ msgid_plural "" "git diff header lacks filename information when removing %d leading pathname " "components (line %d)" msgstr[0] "" -"o cabeçalho do git diff não revelou o nome do ficheiro depois de se remover " -"%d componente do caminho (linha %d)" +"cabeçalho do git diff falta informação de nome de ficheiro quando removendo" +"%d componente do pathname (linha %d)" msgstr[1] "" -"o cabeçalho do git diff não revelou o nome do ficheiro depois de se remover " -"%d componentes de caminho (linha %d)" +"cabeçalho do git diff falta informação de nome de ficheiro quando removendo " +"%d componentes do pathname (linha %d)" #: apply.c:1385 #, c-format msgid "git diff header lacks filename information (line %d)" -msgstr "o cabeçalho do git diff não revela o nome do ficheiro (linha %d)" +msgstr "cabeçalho do git diff falta informação de nome de ficheiro (linha %d)" #: apply.c:1481 #, c-format @@ -990,56 +1118,56 @@ msgstr "fragmento de patch sem cabeçalho na linha %d: %.*s" #: apply.c:1753 msgid "new file depends on old contents" -msgstr "o novo ficheiro depende de conteúdos antigos" +msgstr "novo ficheiro depende de conteúdos antigos" #: apply.c:1755 msgid "deleted file still has contents" -msgstr "o ficheiro eliminado ainda tem conteúdos" +msgstr "ficheiro eliminado ainda tem conteúdos" #: apply.c:1789 #, c-format msgid "corrupt patch at line %d" -msgstr "patch corrompido na linha %d" +msgstr "patch roto na linha %d" #: apply.c:1826 #, c-format msgid "new file %s depends on old contents" -msgstr "o novo ficheiro %s depende de conteúdos antigos" +msgstr "novo ficheiro %s depende de conteúdos antigos" #: apply.c:1828 #, c-format msgid "deleted file %s still has contents" -msgstr "o ficheiro eliminado %s ainda tem conteúdos" +msgstr "ficheiro apagado %s ainda tem conteúdos" #: apply.c:1831 #, c-format msgid "** warning: file %s becomes empty but is not deleted" -msgstr "** aviso: o ficheiro %s ficará vazio, mas não será eliminado" +msgstr "** aviso: ficheiro %s fica vazio e mantêm-se" #: apply.c:1978 #, c-format msgid "corrupt binary patch at line %d: %.*s" -msgstr "patch binário corrompido na linha %d: %.*s" +msgstr "patch binário roto na linha %d: %.*s" #: apply.c:2015 #, c-format msgid "unrecognized binary patch at line %d" -msgstr "patch binário não reconhecido na linha %d" +msgstr "patch binário irreconhecível na linha %d" #: apply.c:2177 #, c-format msgid "patch with only garbage at line %d" -msgstr "patch incompreensível na linha %d" +msgstr "patch com apenas lixo na linha %d" #: apply.c:2263 #, c-format msgid "unable to read symlink %s" -msgstr "não é possível ler a ligação simbólica %s" +msgstr "incapaz de ler ligação simbólica %s" #: apply.c:2267 #, c-format msgid "unable to open or read %s" -msgstr "não é possível abrir ou ler %s" +msgstr "incapaz de abrir ou ler %s" #: apply.c:2936 #, c-format @@ -1050,13 +1178,13 @@ msgstr "início de linha inválido: '%c'" #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." -msgstr[0] "Excerto nº%d bem sucedido na linha %d (%d linha deslocada)." -msgstr[1] "Excerto nº%d bem sucedido na linha %d (%d linhas deslocadas)." +msgstr[0] "Pedaço #%d apareceu em %d (%d offset de linha)." +msgstr[1] "Pedaço #%d apareceu em %d (%d offset de linhas)." #: apply.c:3069 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" -msgstr "Contexto reduzido para (%ld/%ld) para aplicar o fragmento em %d" +msgstr "Contexto reduzido a (%ld/%ld) para submeter fragmento em %d" #: apply.c:3075 #, c-format @@ -1064,96 +1192,91 @@ msgid "" "while searching for:\n" "%.*s" msgstr "" -"ao procura por:\n" +"procurando por:\n" "%.*s" #: apply.c:3097 #, c-format msgid "missing binary patch data for '%s'" -msgstr "falta de dados do patch binário '%s'" +msgstr "faltando patch binário para '%s'" #: apply.c:3105 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" -msgstr "" -"não é possível aplicar o reverso de um patch binário a '%s' sem o excerto " -"reverso" +msgstr "incapaz submeter-inversamente patch binário sem pedaço " +"inverso a '%s'" #: apply.c:3152 #, c-format msgid "cannot apply binary patch to '%s' without full index line" -msgstr "" -"não é possível aplicar patch binário a '%s' sem linha de índice completa" +msgstr "incapaz submeter patch binário a '%s' sem a linha completa de index" #: apply.c:3163 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." msgstr "" -"o patch aplica-se a '%s' (%s), que não corresponde aos conteúdos atuais." +"o patch submete-se a '%s' (%s), que corresponde a conteúdo actual nenhum." #: apply.c:3171 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" -msgstr "o patch aplica-se a um '%s' vazio mas não está vazio" +msgstr "o patch submete-se a um '%s' vazio mas tem conteúdo" #: apply.c:3189 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" -msgstr "não é possível ler a postimage necessária %s de '%s'" +msgstr "incapaz ler a postimage necessária %s para '%s'" #: apply.c:3202 #, c-format msgid "binary patch does not apply to '%s'" -msgstr "o patch binário não foi aplicado corretamente a '%s'" +msgstr "path binário submete-se a '%s' de maneira nenhuma" #: apply.c:3209 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" -msgstr "" -"o patch binário aplicado a '%s' gera resultados incorretos (esperava-se %s, " -"obteve-se %s)" +msgstr "patch binário para '%s' cria resultado incorreto (esperei %s, " +"recebi %s)" #: apply.c:3230 #, c-format msgid "patch failed: %s:%ld" -msgstr "falha ao aplicar o patch: %s:%ld" +msgstr "patch falhou: %s:%ld" #: apply.c:3353 #, c-format msgid "cannot checkout %s" -msgstr "não é possível extrair %s" +msgstr "incapaz de checkout %s" -#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:72 setup.c:308 +#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:73 setup.c:308 #, c-format msgid "failed to read %s" -msgstr "falha ao ler %s" +msgstr "falha a ler %s" #: apply.c:3413 #, c-format msgid "reading from '%s' beyond a symbolic link" -msgstr "a ler '%s' indicado por uma ligação simbólica" +msgstr "lendo '%s' além de uma ligação simbólica" #: apply.c:3442 apply.c:3685 #, c-format msgid "path %s has been renamed/deleted" -msgstr "o caminho %s foi eliminado ou mudou de nome" +msgstr "path %s mudou de nome ou foi eliminado" #: apply.c:3528 apply.c:3700 #, c-format msgid "%s: does not exist in index" -msgstr "%s: não existe no índice" +msgstr "%s: tem inexistência no index" #: apply.c:3537 apply.c:3708 apply.c:3953 #, c-format msgid "%s: does not match index" -msgstr "%s: não tem correspondência no índice" +msgstr "%s: tem correspondência nenhuma no index" #: apply.c:3572 msgid "repository lacks the necessary blob to fall back on 3-way merge." -msgstr "" -"o repositório não tem o blob necessário para recorrer a integração com 3 " -"pontos." +msgstr "repositório falta o blob necessário para recorrer à junção-de-3." #: apply.c:3575 #, c-format @@ -1286,7 +1409,7 @@ msgstr "" msgid "unable to add cache entry for %s" msgstr "não é possível adicionar %s à cache" -#: apply.c:4376 builtin/bisect--helper.c:537 +#: apply.c:4376 builtin/bisect--helper.c:524 #, c-format msgid "failed to write to '%s'" msgstr "falha ao escrever para '%s'" @@ -1337,172 +1460,172 @@ msgstr "Excerto nº%d aplicado com sucesso." msgid "Rejected hunk #%d." msgstr "Excerto nº%d rejeitado." -#: apply.c:4715 +#: apply.c:4720 #, c-format msgid "Skipped patch '%s'." msgstr "Patch '%s' ignorado." -#: apply.c:4723 +#: apply.c:4728 msgid "unrecognized input" msgstr "entrada não reconhecida" -#: apply.c:4743 +#: apply.c:4748 msgid "unable to read index file" msgstr "não foi possível ler o ficheiro de índice" -#: apply.c:4900 +#: apply.c:4905 #, c-format msgid "can't open patch '%s': %s" msgstr "não é possível abrir o patch '%s': %s" -#: apply.c:4927 +#: apply.c:4932 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "%d erro de espaço em branco reprimido" msgstr[1] "%d erros de espaço em branco reprimidos" -#: apply.c:4933 apply.c:4948 +#: apply.c:4938 apply.c:4953 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "%d linha adiciona erros de espaço em branco." msgstr[1] "%d linhas adicionam erros de espaço em branco." -#: apply.c:4941 +#: apply.c:4946 #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." msgstr[0] "%d linha aplicada depois de corrigir erros de espaço em branco." msgstr[1] "%d linhas aplicadas depois de corrigir erros de espaço em branco." -#: apply.c:4957 builtin/add.c:618 builtin/mv.c:304 builtin/rm.c:406 +#: apply.c:4962 builtin/add.c:618 builtin/mv.c:304 builtin/rm.c:406 msgid "Unable to write new index file" msgstr "Não foi possível escrever novo ficheiro de índice" -#: apply.c:4985 +#: apply.c:4990 msgid "don't apply changes matching the given path" msgstr "não aplicar alterações que correspondam ao caminho fornecido" -#: apply.c:4988 +#: apply.c:4993 msgid "apply changes matching the given path" msgstr "aplicar alterações que correspondam ao caminho fornecido" -#: apply.c:4990 builtin/am.c:2279 +#: apply.c:4995 builtin/am.c:2266 msgid "num" msgstr "num" -#: apply.c:4991 +#: apply.c:4996 msgid "remove <num> leading slashes from traditional diff paths" msgstr "remover <num> barras à esquerda dos caminhos de diff tradicional" -#: apply.c:4994 +#: apply.c:4999 msgid "ignore additions made by the patch" msgstr "ignorar adições feitas pelo patch" -#: apply.c:4996 +#: apply.c:5001 msgid "instead of applying the patch, output diffstat for the input" -msgstr "em vez de aplicar o patch, mostrar o diffstat da entrada" +msgstr "invés aplicada patch, output diffstat para " -#: apply.c:5000 +#: apply.c:5005 msgid "show number of added and deleted lines in decimal notation" msgstr "mostrar número de linhas adicionadas e removidas em notação decimal" -#: apply.c:5002 +#: apply.c:5007 msgid "instead of applying the patch, output a summary for the input" msgstr "em vez de aplicar o patch, mostrar um resumo da entrada" -#: apply.c:5004 +#: apply.c:5009 msgid "instead of applying the patch, see if the patch is applicable" msgstr "em vez de aplicar o patch, verificar se o patch pode ser aplicado" -#: apply.c:5006 +#: apply.c:5011 msgid "make sure the patch is applicable to the current index" msgstr "garantir que o patch pode ser aplicado ao índice atual" -#: apply.c:5008 +#: apply.c:5013 msgid "mark new files with `git add --intent-to-add`" msgstr "" -#: apply.c:5010 +#: apply.c:5015 msgid "apply a patch without touching the working tree" msgstr "aplicar um patch sem tocar na árvore de trabalho" -#: apply.c:5012 +#: apply.c:5017 msgid "accept a patch that touches outside the working area" msgstr "aceitar patches que alteram ficheiros fora da área de trabalho" -#: apply.c:5015 +#: apply.c:5020 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "aplicar o patch também (use com --stat/--summary/--check)" -#: apply.c:5017 +#: apply.c:5022 msgid "attempt three-way merge if a patch does not apply" msgstr "tentar integração com três pontos se um patch não se aplica com êxito" -#: apply.c:5019 +#: apply.c:5024 msgid "build a temporary index based on embedded index information" msgstr "" "construir um índice temporário baseado na informação incorporada do índice" -#: apply.c:5022 builtin/checkout-index.c:173 builtin/ls-files.c:525 +#: apply.c:5027 builtin/checkout-index.c:182 builtin/ls-files.c:525 msgid "paths are separated with NUL character" msgstr "os caminhos estão separados por caracteres NUL" -#: apply.c:5024 +#: apply.c:5029 msgid "ensure at least <n> lines of context match" msgstr "garantir que, pelo menos, <n> linhas de contexto coincidem" -#: apply.c:5025 builtin/am.c:2258 builtin/interpret-trailers.c:98 +#: apply.c:5030 builtin/am.c:2245 builtin/interpret-trailers.c:98 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 -#: builtin/pack-objects.c:3562 builtin/rebase.c:1340 +#: builtin/pack-objects.c:3562 builtin/rebase.c:1346 msgid "action" msgstr "ação" -#: apply.c:5026 +#: apply.c:5031 msgid "detect new or modified lines that have whitespace errors" msgstr "detetar linhas novas ou modificadas que tenham espaços em branco" -#: apply.c:5029 apply.c:5032 +#: apply.c:5034 apply.c:5037 msgid "ignore changes in whitespace when finding context" msgstr "ignorar alterações de espaço em branco ao procurar contexto" -#: apply.c:5035 +#: apply.c:5040 msgid "apply the patch in reverse" msgstr "aplicar o patch em reverso" -#: apply.c:5037 +#: apply.c:5042 msgid "don't expect at least one line of context" -msgstr "não esperar nenhuma linha de contexto" +msgstr "conta com linha de contexto nenhuma" -#: apply.c:5039 +#: apply.c:5044 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "deixar os excertos rejeitados nos respetivos ficheiros *.rej" -#: apply.c:5041 +#: apply.c:5046 msgid "allow overlapping hunks" msgstr "permitir a sobreposição de excertos" -#: apply.c:5042 builtin/add.c:329 builtin/check-ignore.c:22 +#: apply.c:5047 builtin/add.c:329 builtin/check-ignore.c:22 #: builtin/commit.c:1364 builtin/count-objects.c:98 builtin/fsck.c:775 -#: builtin/log.c:2270 builtin/mv.c:123 builtin/read-tree.c:128 +#: builtin/log.c:2287 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "ser verboso" -#: apply.c:5044 +#: apply.c:5049 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" "tolerar deteções incorretas de falta de nova linha no final do ficheiro" -#: apply.c:5047 +#: apply.c:5052 msgid "do not trust the line counts in the hunk headers" msgstr "não confiar na contagem de linhas no cabeçalho dos excertos" -#: apply.c:5049 builtin/am.c:2267 +#: apply.c:5054 builtin/am.c:2254 msgid "root" msgstr "raiz" -#: apply.c:5050 +#: apply.c:5055 msgid "prepend <root> to all filenames" msgstr "preceder <root> a todos os nomes de ficheiro" @@ -1516,17 +1639,17 @@ msgstr "não é possível guardar %s" msgid "unsupported file mode: 0%o (SHA1: %s)" msgstr "versão de índice %s não suportada" -#: archive-tar.c:449 +#: archive-tar.c:450 #, fuzzy, c-format msgid "unable to start '%s' filter" msgstr "não foi possível criar '%s'" -#: archive-tar.c:452 +#: archive-tar.c:453 #, fuzzy msgid "unable to redirect descriptor" msgstr "não foi possível refrescar o índice" -#: archive-tar.c:459 +#: archive-tar.c:460 #, c-format msgid "'%s' filter reported error" msgstr "" @@ -1575,9 +1698,9 @@ msgstr "git archive --remote <repo> [--exec <cmd>] --list" msgid "cannot read %s" msgstr "não é possível ler '%s'" -#: archive.c:345 sequencer.c:445 sequencer.c:1706 sequencer.c:2852 -#: sequencer.c:3293 sequencer.c:3402 builtin/am.c:263 builtin/commit.c:786 -#: builtin/merge.c:1124 +#: archive.c:345 sequencer.c:459 sequencer.c:1736 sequencer.c:2886 +#: sequencer.c:3327 sequencer.c:3436 builtin/am.c:249 builtin/commit.c:786 +#: builtin/merge.c:1138 #, c-format msgid "could not read '%s'" msgstr "não foi possível ler '%s'" @@ -1585,7 +1708,7 @@ msgstr "não foi possível ler '%s'" #: archive.c:430 builtin/add.c:181 builtin/add.c:594 builtin/rm.c:315 #, c-format msgid "pathspec '%s' did not match any files" -msgstr "o especificador de caminho '%s' não corresponde a nenhum ficheiro" +msgstr "especificador de path '%s' correspondeu a ficheiro nenhum" #: archive.c:454 #, fuzzy, c-format @@ -1617,120 +1740,113 @@ msgstr "objeto não encontrado: %s" msgid "Not a regular file: %s" msgstr "o ficheiro %s não é um ficheiro regular" -#: archive.c:553 +#: archive.c:555 msgid "fmt" msgstr "fmt" -#: archive.c:553 +#: archive.c:555 msgid "archive format" msgstr "formato do arquivo" -#: archive.c:554 builtin/log.c:1760 +#: archive.c:556 builtin/log.c:1765 msgid "prefix" msgstr "prefixo" -#: archive.c:555 +#: archive.c:557 msgid "prepend prefix to each pathname in the archive" msgstr "preceder o prefixo a cada nome de caminho dentro do arquivo" -#: archive.c:556 archive.c:559 builtin/blame.c:884 builtin/blame.c:888 -#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:133 +#: archive.c:558 archive.c:561 builtin/blame.c:886 builtin/blame.c:890 +#: builtin/blame.c:891 builtin/commit-tree.c:117 builtin/config.c:135 #: builtin/fast-export.c:1208 builtin/fast-export.c:1210 -#: builtin/fast-export.c:1214 builtin/grep.c:908 builtin/hash-object.c:105 +#: builtin/fast-export.c:1214 builtin/grep.c:919 builtin/hash-object.c:105 #: builtin/ls-files.c:561 builtin/ls-files.c:564 builtin/notes.c:412 #: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:190 msgid "file" msgstr "ficheiro" -#: archive.c:557 +#: archive.c:559 #, fuzzy msgid "add untracked file to archive" msgstr "Modo inválido de ficheiros não controlados '%s'" -#: archive.c:560 builtin/archive.c:90 +#: archive.c:562 builtin/archive.c:90 msgid "write the archive to this file" msgstr "escrever o arquivo para este ficheiro" -#: archive.c:562 +#: archive.c:564 msgid "read .gitattributes in working directory" msgstr "ler .gitattributes do diretório de trabalho" -#: archive.c:563 +#: archive.c:565 msgid "report archived files on stderr" msgstr "listar ficheiros arquivados para stderr" -#: archive.c:564 -msgid "store only" -msgstr "armazenar apenas" - -#: archive.c:565 -msgid "compress faster" -msgstr "compressão rápida" - -#: archive.c:573 -msgid "compress better" -msgstr "compressão ótima" +#: archive.c:567 +#, fuzzy +msgid "set compression level" +msgstr "nível de compactação do pacote" -#: archive.c:576 +#: archive.c:570 msgid "list supported archive formats" msgstr "listar formatos de arquivo suportados" -#: archive.c:578 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116 +#: archive.c:572 builtin/archive.c:91 builtin/clone.c:114 builtin/clone.c:117 #: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335 msgid "repo" msgstr "repo" -#: archive.c:579 builtin/archive.c:92 +#: archive.c:573 builtin/archive.c:92 msgid "retrieve the archive from remote repository <repo>" msgstr "obter o arquivo a partir do repositório remoto <repo>" -#: archive.c:580 builtin/archive.c:93 builtin/difftool.c:715 +#: archive.c:574 builtin/archive.c:93 builtin/difftool.c:714 #: builtin/notes.c:498 msgid "command" msgstr "comando" -#: archive.c:581 builtin/archive.c:94 +#: archive.c:575 builtin/archive.c:94 msgid "path to the remote git-upload-archive command" msgstr "caminho para o comando git-upload-archive no remoto" -#: archive.c:588 +#: archive.c:582 msgid "Unexpected option --remote" msgstr "Opção inesperada --remote" -#: archive.c:590 +#: archive.c:584 msgid "Option --exec can only be used together with --remote" msgstr "A opção --exec só pode ser usada em conjunto com --remote" -#: archive.c:592 +#: archive.c:586 msgid "Unexpected option --output" msgstr "Opção inesperada --output" -#: archive.c:594 +#: archive.c:588 #, fuzzy msgid "Options --add-file and --remote cannot be used together" msgstr "As opções --squash e --fixup não podem ser usadas juntas" -#: archive.c:616 +#: archive.c:610 #, c-format msgid "Unknown archive format '%s'" msgstr "Formato de arquivo desconhecido '%s'" -#: archive.c:623 +#: archive.c:619 #, c-format msgid "Argument not supported for format '%s': -%d" msgstr "Argumento não suportado para o formato '%s': -%d" -#: attr.c:212 +#: attr.c:202 #, c-format msgid "%.*s is not a valid attribute name" msgstr "%.*s não é um nome de atributo válido" -#: attr.c:369 +#: attr.c:359 #, fuzzy, c-format msgid "%s not allowed: %s:%d" msgstr "falha ao aplicar o patch: %s:%ld" -#: attr.c:409 +#: attr.c:399 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -1738,22 +1854,22 @@ msgstr "" "Os padrões negativos são ignorados nos atributos do git\n" "Use '\\!' para uma exclamação literal à esquerda." -#: bisect.c:476 +#: bisect.c:489 #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "Conteúdo incorretamente citado no ficheiro '%s': %s" -#: bisect.c:686 +#: bisect.c:699 #, c-format msgid "We cannot bisect more!\n" msgstr "Não se está a bissetar mais!\n" -#: bisect.c:753 +#: bisect.c:766 #, c-format msgid "Not a valid commit name %s" msgstr "%s não é um nome de commit válido" -#: bisect.c:778 +#: bisect.c:791 #, c-format msgid "" "The merge base %s is bad.\n" @@ -1762,7 +1878,7 @@ msgstr "" "A base de integração %s é má (bad).\n" "Significa que o bug foi corrigido entre %s e [%s].\n" -#: bisect.c:783 +#: bisect.c:796 #, c-format msgid "" "The merge base %s is new.\n" @@ -1771,7 +1887,7 @@ msgstr "" "A base de integração %s é nova (new).\n" "A propriedade foi mudada entre %s e [%s].\n" -#: bisect.c:788 +#: bisect.c:801 #, c-format msgid "" "The merge base %s is %s.\n" @@ -1780,7 +1896,7 @@ msgstr "" "A base de integração %s é %s.\n" "Significa que o primeiro commit '%s' está entre %s e [%s].\n" -#: bisect.c:796 +#: bisect.c:809 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -1791,7 +1907,7 @@ msgstr "" "git bisect não pode funcionar corretamente nesta situação.\n" "Talvez confundiu revisões %s e %s?\n" -#: bisect.c:809 +#: bisect.c:822 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -1803,36 +1919,36 @@ msgstr "" "%s.\n" "Continua-se de qualquer maneira." -#: bisect.c:848 +#: bisect.c:861 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "A bissetar: uma base de integração tem de ser testada\n" -#: bisect.c:898 +#: bisect.c:911 #, c-format msgid "a %s revision is needed" msgstr "precisa-se de uma revisão %s" -#: bisect.c:928 builtin/notes.c:177 builtin/tag.c:255 +#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:255 #, c-format msgid "could not create file '%s'" msgstr "não foi possível criar o ficheiro '%s'" -#: bisect.c:974 builtin/merge.c:150 +#: bisect.c:987 builtin/merge.c:152 #, c-format msgid "could not read file '%s'" msgstr "não foi possível ler o ficheiro '%s'" -#: bisect.c:1014 +#: bisect.c:1027 msgid "reading bisect refs failed" msgstr "falha ao ler referências bissetadas" -#: bisect.c:1044 +#: bisect.c:1057 #, c-format msgid "%s was both %s and %s\n" msgstr "%s era %s e %s em simultâneo\n" -#: bisect.c:1053 +#: bisect.c:1066 #, c-format msgid "" "No testable commit found.\n" @@ -1841,7 +1957,7 @@ msgstr "" "Nenhum commit testável encontrado.\n" "Talvez tenha começado com parâmetros de caminho incorretos?\n" -#: bisect.c:1082 +#: bisect.c:1095 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -1851,46 +1967,46 @@ msgstr[1] "(aproximadamente %d passos)" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. -#: bisect.c:1088 +#: bisect.c:1101 #, c-format msgid "Bisecting: %d revision left to test after this %s\n" msgid_plural "Bisecting: %d revisions left to test after this %s\n" msgstr[0] "A bissetar: falta %d revisão para testar depois desta %s\n" msgstr[1] "A bissetar: faltam %d revisões para testar depois desta %s\n" -#: blame.c:2778 +#: blame.c:2777 msgid "--contents and --reverse do not blend well." msgstr "--contents e --reverse não se misturam bem." -#: blame.c:2792 +#: blame.c:2791 msgid "cannot use --contents with final commit object name" msgstr "não é possível usar --contents com nome de objeto commit final" -#: blame.c:2813 +#: blame.c:2812 msgid "--reverse and --first-parent together require specified latest commit" msgstr "" "--reverse e --first-parent juntos requer que se especifique o último commit" -#: blame.c:2822 bundle.c:213 ref-filter.c:2264 remote.c:2020 sequencer.c:2105 -#: sequencer.c:4606 submodule.c:855 builtin/commit.c:1045 builtin/log.c:404 -#: builtin/log.c:1020 builtin/log.c:1622 builtin/log.c:2029 builtin/log.c:2319 -#: builtin/merge.c:414 builtin/pack-objects.c:3380 builtin/pack-objects.c:3395 -#: builtin/shortlog.c:320 +#: blame.c:2821 bundle.c:213 ref-filter.c:2272 remote.c:2031 sequencer.c:2138 +#: sequencer.c:4633 submodule.c:855 builtin/commit.c:1045 builtin/log.c:409 +#: builtin/log.c:1023 builtin/log.c:1625 builtin/log.c:2046 builtin/log.c:2336 +#: builtin/merge.c:423 builtin/pack-objects.c:3380 builtin/pack-objects.c:3395 +#: builtin/shortlog.c:267 msgid "revision walk setup failed" msgstr "falha ao configurar percurso de revisões" -#: blame.c:2840 +#: blame.c:2839 msgid "" "--reverse --first-parent together require range along first-parent chain" msgstr "" "--reverse --first-parent juntos requer intervalo ao longo do primeiro-pai" -#: blame.c:2851 +#: blame.c:2850 #, c-format msgid "no such path %s in %s" msgstr "o caminho %s não existe em %s" -#: blame.c:2862 +#: blame.c:2861 #, c-format msgid "cannot read blob %s for path %s" msgstr "não é possível ler o blob %s do caminho %s" @@ -2003,7 +2119,7 @@ msgstr "" "a montante que já existe no remoto, pode ser necessário\n" "executar \"git fetch\" para obtê-lo.\n" "\n" -"Se pretende publicar um novo ramo local que irá seguir\n" +"Se pretende atirar um novo ramo local que irá seguir\n" "o seu homólogo remoto, pode usar \"git push -u\" para configurar\n" "o respetivo ramo a montante, ao mesmo tempo que publica." @@ -2052,7 +2168,7 @@ msgstr "'%s' não parece ser um ficheiro bundle v2" msgid "unrecognized header: %s%s (%d)" msgstr "cabeçalho não reconhecido: %s%s (%d)" -#: bundle.c:136 rerere.c:480 rerere.c:690 sequencer.c:2357 sequencer.c:3142 +#: bundle.c:136 rerere.c:480 rerere.c:690 sequencer.c:2390 sequencer.c:3176 #: builtin/commit.c:814 #, c-format msgid "could not open '%s'" @@ -2117,7 +2233,7 @@ msgstr "versão de índice %s não suportada" msgid "cannot write bundle version %d with algorithm %s" msgstr "" -#: bundle.c:522 builtin/log.c:207 builtin/log.c:1918 builtin/shortlog.c:461 +#: bundle.c:522 builtin/log.c:209 builtin/log.c:1927 builtin/shortlog.c:408 #, c-format msgid "unrecognized argument: %s" msgstr "argumento não reconhecido: %s" @@ -2140,7 +2256,7 @@ msgstr "index-pack terminou inesperadamente" msgid "invalid color value: %.*s" msgstr "valor de cor inválido: %.*s" -#: commit-graph.c:188 midx.c:46 +#: commit-graph.c:188 midx.c:47 #, fuzzy msgid "invalid hash version" msgstr "especificação de caminho inválida" @@ -2204,9 +2320,9 @@ msgstr "" #: commit-graph.c:742 #, fuzzy, c-format msgid "could not find commit %s" -msgstr "não foi possível analisar o commit %s\n" +msgstr "não foi possível analisar o commit %s" -#: commit-graph.c:1042 builtin/am.c:1306 +#: commit-graph.c:1042 builtin/am.c:1292 #, c-format msgid "unable to parse commit %s" msgstr "não foi possível analisar o commit %s" @@ -2274,7 +2390,7 @@ msgstr "" msgid "failed to write correct number of base graph ids" msgstr "" -#: commit-graph.c:1720 midx.c:826 +#: commit-graph.c:1720 midx.c:819 #, fuzzy, c-format msgid "unable to create leading directories of %s" msgstr "não foi possível criar os diretórios superiores de '%s'" @@ -2316,97 +2432,96 @@ msgstr "não é possível escrever ficheiro de índice temporário" msgid "Scanning merged commits" msgstr "A adicionar %s integrado" -#: commit-graph.c:2026 -#, fuzzy, c-format -msgid "unexpected duplicate commit id %s" -msgstr "não foi possível analisar o commit %s" - -#: commit-graph.c:2049 +#: commit-graph.c:2059 msgid "Merging commit-graph" msgstr "" -#: commit-graph.c:2259 +#: commit-graph.c:2165 +msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled" +msgstr "" + +#: commit-graph.c:2274 #, c-format msgid "the commit graph format cannot write %d commits" msgstr "" -#: commit-graph.c:2270 +#: commit-graph.c:2285 #, fuzzy msgid "too many commits to write graph" msgstr "mostrar apenas commits não presentes no primeiro ramo" -#: commit-graph.c:2363 +#: commit-graph.c:2378 msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "" -#: commit-graph.c:2373 +#: commit-graph.c:2388 #, c-format msgid "commit-graph has incorrect OID order: %s then %s" msgstr "" -#: commit-graph.c:2383 commit-graph.c:2398 +#: commit-graph.c:2398 commit-graph.c:2413 #, c-format msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" msgstr "" -#: commit-graph.c:2390 +#: commit-graph.c:2405 #, fuzzy, c-format msgid "failed to parse commit %s from commit-graph" msgstr "não foi possível analisar o commit %s" -#: commit-graph.c:2408 +#: commit-graph.c:2423 msgid "Verifying commits in commit graph" msgstr "" -#: commit-graph.c:2423 +#: commit-graph.c:2438 #, c-format msgid "failed to parse commit %s from object database for commit-graph" msgstr "" -#: commit-graph.c:2430 +#: commit-graph.c:2445 #, c-format msgid "root tree OID for commit %s in commit-graph is %s != %s" msgstr "" -#: commit-graph.c:2440 +#: commit-graph.c:2455 #, c-format msgid "commit-graph parent list for commit %s is too long" msgstr "" -#: commit-graph.c:2449 +#: commit-graph.c:2464 #, c-format msgid "commit-graph parent for %s is %s != %s" msgstr "" -#: commit-graph.c:2463 +#: commit-graph.c:2478 #, c-format msgid "commit-graph parent list for commit %s terminates early" msgstr "" -#: commit-graph.c:2468 +#: commit-graph.c:2483 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" msgstr "" -#: commit-graph.c:2472 +#: commit-graph.c:2487 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" msgstr "" -#: commit-graph.c:2488 +#: commit-graph.c:2503 #, c-format msgid "commit-graph generation for commit %s is %u != %u" msgstr "" -#: commit-graph.c:2494 +#: commit-graph.c:2509 #, c-format msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" msgstr "" -#: commit.c:52 sequencer.c:2845 builtin/am.c:373 builtin/am.c:417 -#: builtin/am.c:1385 builtin/am.c:2031 builtin/replace.c:457 +#: commit.c:52 sequencer.c:2879 builtin/am.c:359 builtin/am.c:403 +#: builtin/am.c:1371 builtin/am.c:2018 builtin/replace.c:457 #, c-format msgid "could not parse %s" msgstr "não foi possível analisar %s" @@ -2502,7 +2617,7 @@ msgstr "Não foi possível remover a secção de configuração '%s'" msgid "key does not contain variable name: %s" msgstr "" -#: config.c:408 sequencer.c:2547 +#: config.c:408 sequencer.c:2580 #, c-format msgid "invalid key: %s" msgstr "chave inválida: %s" @@ -2696,77 +2811,77 @@ msgstr "não é possível analisar '%s' da configuração de linha de comandos" msgid "bad config variable '%s' in file '%s' at line %d" msgstr "variável de configuração '%s' incorreta no ficheiro '%s' na linha %d" -#: config.c:2470 +#: config.c:2473 #, fuzzy, c-format msgid "invalid section name '%s'" msgstr "conteúdo inválido: '%s'" -#: config.c:2502 +#: config.c:2505 #, c-format msgid "%s has multiple values" msgstr "%s tem múltiplos valores" -#: config.c:2531 +#: config.c:2534 #, fuzzy, c-format msgid "failed to write new configuration file %s" msgstr "não é possível criar o ficheiro de configuração %s" -#: config.c:2783 config.c:3107 +#: config.c:2786 config.c:3112 #, fuzzy, c-format msgid "could not lock config file %s" msgstr "não é possível fechar o ficheiro %s" -#: config.c:2794 +#: config.c:2797 #, fuzzy, c-format msgid "opening %s" msgstr "A eliminar %s" -#: config.c:2829 builtin/config.c:354 +#: config.c:2834 builtin/config.c:361 #, fuzzy, c-format msgid "invalid pattern: %s" msgstr "opção inválida: %s" -#: config.c:2854 +#: config.c:2859 #, fuzzy, c-format msgid "invalid config file %s" msgstr "ficheiro inválido: '%s'" -#: config.c:2867 config.c:3120 +#: config.c:2872 config.c:3125 #, c-format msgid "fstat on %s failed" msgstr "falha de fstat de %s" -#: config.c:2878 +#: config.c:2883 #, fuzzy, c-format msgid "unable to mmap '%s'" msgstr "não é possível aceder a '%s'" -#: config.c:2887 config.c:3125 +#: config.c:2892 config.c:3130 #, fuzzy, c-format msgid "chmod on %s failed" msgstr "falha de fstat de %s" -#: config.c:2972 config.c:3222 +#: config.c:2977 config.c:3227 #, fuzzy, c-format msgid "could not write config file %s" msgstr "não é possível ler o ficheiro de log '%s'" -#: config.c:3006 +#: config.c:3011 #, c-format msgid "could not set '%s' to '%s'" msgstr "não foi possível definir '%s' como '%s'" -#: config.c:3008 builtin/remote.c:656 builtin/remote.c:850 builtin/remote.c:858 +#: config.c:3013 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863 #, c-format msgid "could not unset '%s'" msgstr "não foi possível reiniciar '%s'" -#: config.c:3098 +#: config.c:3103 #, fuzzy, c-format msgid "invalid section name: %s" msgstr "opção inválida: %s" -#: config.c:3265 +#: config.c:3270 #, fuzzy, c-format msgid "missing value for '%s'" msgstr "valor inválido de %s" @@ -2833,7 +2948,7 @@ msgstr "erro de protocolo: cabeçalho de pacote incorreto" #: connect.c:473 #, c-format msgid "unknown object format '%s' specified by server" -msgstr "" +msgstr "objeto desconhecido '%s' pelo formato em servidor." #: connect.c:500 #, fuzzy, c-format @@ -2880,18 +2995,20 @@ msgstr "" msgid "" "unable to connect to %s:\n" "%s" -msgstr "não é possível abrir %s: %s\n" +msgstr "" +"impossível conetar a %s:\n" +"%s" #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... " #: connect.c:767 connect.c:844 #, fuzzy msgid "done." -msgstr "concluído.\n" +msgstr "concluído." #: connect.c:798 #, fuzzy, c-format msgid "unable to look up %s (%s)" -msgstr "não é possível abrir %s: %s\n" +msgstr "não é possível abrir %s: %s" #: connect.c:804 #, fuzzy, c-format @@ -3198,6 +3315,27 @@ msgstr "" msgid "Marked %d islands, done.\n" msgstr "" +#: diff-lib.c:534 +msgid "--merge-base does not work with ranges" +msgstr "" + +#: diff-lib.c:536 +msgid "--merge-base only works with commits" +msgstr "" + +#: diff-lib.c:553 +#, fuzzy +msgid "unable to get HEAD" +msgstr "não foi possível atualizar HEAD" + +#: diff-lib.c:560 +msgid "no merge base found" +msgstr "" + +#: diff-lib.c:562 +msgid "multiple merge bases found" +msgstr "" + #: diff-no-index.c:238 #, fuzzy msgid "git diff --no-index [<options>] <path> <path>" @@ -3252,36 +3390,36 @@ msgstr "" "Erros encontrados na variável de configuração 'diff.dirstat':\n" "%s" -#: diff.c:4269 +#: diff.c:4276 #, c-format msgid "external diff died, stopping at %s" msgstr "o diff externo terminou inesperadamente, interrompido em %s" -#: diff.c:4618 +#: diff.c:4625 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-only, --name-status, --check e -s são mutuamente exclusivos" -#: diff.c:4621 +#: diff.c:4628 #, fuzzy msgid "-G, -S and --find-object are mutually exclusive" msgstr "-b, -B e --detach são mutuamente exclusivos" -#: diff.c:4699 +#: diff.c:4706 msgid "--follow requires exactly one pathspec" msgstr "--follow requer exatamente um único especificador de caminho" -#: diff.c:4747 +#: diff.c:4754 #, fuzzy, c-format msgid "invalid --stat value: %s" msgstr "valor de cor inválido: %.*s" -#: diff.c:4752 diff.c:4757 diff.c:4762 diff.c:4767 diff.c:5279 +#: diff.c:4759 diff.c:4764 diff.c:4769 diff.c:4774 diff.c:5302 #: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180 #, fuzzy, c-format msgid "%s expects a numerical value" msgstr "a opção '%c' espera um valor numérico" -#: diff.c:4784 +#: diff.c:4791 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -3290,529 +3428,539 @@ msgstr "" "Falha ao analisar parâmetro da opção --dirstat/-X:\n" "%s" -#: diff.c:4869 +#: diff.c:4876 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "" -#: diff.c:4893 +#: diff.c:4900 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "" -#: diff.c:4907 +#: diff.c:4914 #, fuzzy, c-format msgid "unable to resolve '%s'" msgstr "não foi possível criar '%s'" -#: diff.c:4957 diff.c:4963 +#: diff.c:4964 diff.c:4970 #, c-format msgid "%s expects <n>/<m> form" msgstr "" -#: diff.c:4975 +#: diff.c:4982 #, c-format msgid "%s expects a character, got '%s'" msgstr "" -#: diff.c:4996 +#: diff.c:5003 #, fuzzy, c-format msgid "bad --color-moved argument: %s" msgstr "argumento não reconhecido: %s" -#: diff.c:5015 +#: diff.c:5022 #, fuzzy, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "objeto inválido '%s' fornecido." -#: diff.c:5055 +#: diff.c:5062 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" msgstr "" -#: diff.c:5091 diff.c:5111 +#: diff.c:5098 diff.c:5118 #, fuzzy, c-format msgid "invalid argument to %s" msgstr "valor inválido de %s" -#: diff.c:5248 +#: diff.c:5222 +#, fuzzy, c-format +msgid "invalid regex given to -I: '%s'" +msgstr "valor inválido de %s" + +#: diff.c:5271 #, fuzzy, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "Falha ao analisar parâmetro da opção --submodule: '%s'" -#: diff.c:5304 +#: diff.c:5327 #, c-format msgid "bad --word-diff argument: %s" msgstr "" -#: diff.c:5327 +#: diff.c:5350 msgid "Diff output format options" msgstr "" -#: diff.c:5329 diff.c:5335 +#: diff.c:5352 diff.c:5358 #, fuzzy msgid "generate patch" msgstr "incorporar o patch" -#: diff.c:5332 builtin/log.c:176 +#: diff.c:5355 builtin/log.c:178 msgid "suppress diff output" msgstr "suprimir saída do diff" -#: diff.c:5337 diff.c:5451 diff.c:5458 +#: diff.c:5360 diff.c:5474 diff.c:5481 msgid "<n>" msgstr "" -#: diff.c:5338 diff.c:5341 +#: diff.c:5361 diff.c:5364 #, fuzzy msgid "generate diffs with <n> lines context" msgstr "garantir que, pelo menos, <n> linhas de contexto coincidem" -#: diff.c:5343 +#: diff.c:5366 msgid "generate the diff in raw format" msgstr "" -#: diff.c:5346 +#: diff.c:5369 #, fuzzy msgid "synonym for '-p --raw'" msgstr "(sinónimo de --stat)" -#: diff.c:5350 +#: diff.c:5373 #, fuzzy msgid "synonym for '-p --stat'" msgstr "(sinónimo de --stat)" -#: diff.c:5354 +#: diff.c:5377 #, fuzzy msgid "machine friendly --stat" msgstr "saída inteligível por máquina" -#: diff.c:5357 +#: diff.c:5380 msgid "output only the last line of --stat" msgstr "" -#: diff.c:5359 diff.c:5367 +#: diff.c:5382 diff.c:5390 msgid "<param1,param2>..." msgstr "" -#: diff.c:5360 +#: diff.c:5383 msgid "" "output the distribution of relative amount of changes for each sub-directory" msgstr "" -#: diff.c:5364 +#: diff.c:5387 #, fuzzy msgid "synonym for --dirstat=cumulative" msgstr "sinónimo de --files-with-matches" -#: diff.c:5368 +#: diff.c:5391 msgid "synonym for --dirstat=files,param1,param2..." msgstr "" -#: diff.c:5372 +#: diff.c:5395 msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "" -#: diff.c:5375 +#: diff.c:5398 msgid "condensed summary such as creations, renames and mode changes" msgstr "" -#: diff.c:5378 +#: diff.c:5401 #, fuzzy msgid "show only names of changed files" msgstr "mostrar apenas nomes de ficheiro em vez de linhas correspondidas" -#: diff.c:5381 +#: diff.c:5404 #, fuzzy msgid "show only names and status of changed files" msgstr "mostrar apenas nomes de ficheiro em vez de linhas correspondidas" -#: diff.c:5383 +#: diff.c:5406 msgid "<width>[,<name-width>[,<count>]]" msgstr "" -#: diff.c:5384 +#: diff.c:5407 #, fuzzy msgid "generate diffstat" msgstr "diff status inesperado %c" -#: diff.c:5386 diff.c:5389 diff.c:5392 +#: diff.c:5409 diff.c:5412 diff.c:5415 msgid "<width>" msgstr "" -#: diff.c:5387 +#: diff.c:5410 msgid "generate diffstat with a given width" msgstr "" -#: diff.c:5390 +#: diff.c:5413 msgid "generate diffstat with a given name width" msgstr "" -#: diff.c:5393 +#: diff.c:5416 msgid "generate diffstat with a given graph width" msgstr "" -#: diff.c:5395 +#: diff.c:5418 msgid "<count>" msgstr "" -#: diff.c:5396 +#: diff.c:5419 msgid "generate diffstat with limited lines" msgstr "" -#: diff.c:5399 +#: diff.c:5422 msgid "generate compact summary in diffstat" msgstr "" -#: diff.c:5402 +#: diff.c:5425 msgid "output a binary diff that can be applied" msgstr "" -#: diff.c:5405 +#: diff.c:5428 msgid "show full pre- and post-image object names on the \"index\" lines" msgstr "" -#: diff.c:5407 +#: diff.c:5430 #, fuzzy msgid "show colored diff" msgstr "mostrar ficheiros ignorados" -#: diff.c:5408 +#: diff.c:5431 msgid "<kind>" msgstr "" -#: diff.c:5409 +#: diff.c:5432 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" msgstr "" -#: diff.c:5412 +#: diff.c:5435 msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or " "--numstat" msgstr "" -#: diff.c:5415 diff.c:5418 diff.c:5421 diff.c:5527 +#: diff.c:5438 diff.c:5441 diff.c:5444 diff.c:5553 #, fuzzy msgid "<prefix>" msgstr "<prefixo>/" -#: diff.c:5416 +#: diff.c:5439 msgid "show the given source prefix instead of \"a/\"" msgstr "" -#: diff.c:5419 +#: diff.c:5442 msgid "show the given destination prefix instead of \"b/\"" msgstr "" -#: diff.c:5422 +#: diff.c:5445 #, fuzzy msgid "prepend an additional prefix to every line of output" msgstr "preceder o nomebase do projeto pai na saída" -#: diff.c:5425 +#: diff.c:5448 msgid "do not show any source or destination prefix" msgstr "" -#: diff.c:5428 +#: diff.c:5451 #, fuzzy msgid "show context between diff hunks up to the specified number of lines" msgstr "criar um clone raso, truncado ao número especificado de revisões" -#: diff.c:5432 diff.c:5437 diff.c:5442 +#: diff.c:5455 diff.c:5460 diff.c:5465 msgid "<char>" msgstr "" -#: diff.c:5433 +#: diff.c:5456 msgid "specify the character to indicate a new line instead of '+'" msgstr "" -#: diff.c:5438 +#: diff.c:5461 msgid "specify the character to indicate an old line instead of '-'" msgstr "" -#: diff.c:5443 +#: diff.c:5466 msgid "specify the character to indicate a context instead of ' '" msgstr "" -#: diff.c:5446 +#: diff.c:5469 #, fuzzy msgid "Diff rename options" msgstr "Opções genéricas" -#: diff.c:5447 +#: diff.c:5470 #, fuzzy msgid "<n>[/<m>]" msgstr "<n>[,<base>]" -#: diff.c:5448 +#: diff.c:5471 msgid "break complete rewrite changes into pairs of delete and create" msgstr "" -#: diff.c:5452 +#: diff.c:5475 #, fuzzy msgid "detect renames" msgstr "nome do remoto" -#: diff.c:5456 +#: diff.c:5479 msgid "omit the preimage for deletes" msgstr "" -#: diff.c:5459 +#: diff.c:5482 msgid "detect copies" msgstr "" -#: diff.c:5463 +#: diff.c:5486 msgid "use unmodified files as source to find copies" msgstr "" -#: diff.c:5465 +#: diff.c:5488 #, fuzzy msgid "disable rename detection" msgstr "Deteção de mudança de nome inexata em curso" -#: diff.c:5468 +#: diff.c:5491 msgid "use empty blobs as rename source" msgstr "" -#: diff.c:5470 +#: diff.c:5493 msgid "continue listing the history of a file beyond renames" msgstr "" -#: diff.c:5473 +#: diff.c:5496 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" msgstr "" -#: diff.c:5475 +#: diff.c:5498 #, fuzzy msgid "Diff algorithm options" msgstr "opção inválida: %s" -#: diff.c:5477 +#: diff.c:5500 msgid "produce the smallest possible diff" msgstr "" -#: diff.c:5480 +#: diff.c:5503 #, fuzzy msgid "ignore whitespace when comparing lines" msgstr "ignorar alterações de espaço em branco ao procurar contexto" -#: diff.c:5483 +#: diff.c:5506 #, fuzzy msgid "ignore changes in amount of whitespace" msgstr "ignorar alterações de espaço em branco ao procurar contexto" -#: diff.c:5486 +#: diff.c:5509 #, fuzzy msgid "ignore changes in whitespace at EOL" msgstr "ignorar alterações de espaço em branco ao procurar contexto" -#: diff.c:5489 +#: diff.c:5512 msgid "ignore carrier-return at the end of line" msgstr "" -#: diff.c:5492 +#: diff.c:5515 msgid "ignore changes whose lines are all blank" msgstr "" -#: diff.c:5495 +#: diff.c:5517 diff.c:5539 diff.c:5542 diff.c:5587 +msgid "<regex>" +msgstr "" + +#: diff.c:5518 +#, fuzzy +msgid "ignore changes whose all lines match <regex>" +msgstr "ignorar alterações de espaço em branco ao procurar contexto" + +#: diff.c:5521 msgid "heuristic to shift diff hunk boundaries for easy reading" msgstr "" -#: diff.c:5498 +#: diff.c:5524 msgid "generate diff using the \"patience diff\" algorithm" msgstr "" -#: diff.c:5502 +#: diff.c:5528 msgid "generate diff using the \"histogram diff\" algorithm" msgstr "" -#: diff.c:5504 +#: diff.c:5530 msgid "<algorithm>" msgstr "" -#: diff.c:5505 +#: diff.c:5531 msgid "choose a diff algorithm" msgstr "" -#: diff.c:5507 +#: diff.c:5533 #, fuzzy msgid "<text>" msgstr "texto" -#: diff.c:5508 +#: diff.c:5534 msgid "generate diff using the \"anchored diff\" algorithm" msgstr "" -#: diff.c:5510 diff.c:5519 diff.c:5522 +#: diff.c:5536 diff.c:5545 diff.c:5548 #, fuzzy msgid "<mode>" msgstr "modo" -#: diff.c:5511 +#: diff.c:5537 msgid "show word diff, using <mode> to delimit changed words" msgstr "" -#: diff.c:5513 diff.c:5516 diff.c:5561 -msgid "<regex>" -msgstr "" - -#: diff.c:5514 +#: diff.c:5540 msgid "use <regex> to decide what a word is" msgstr "" -#: diff.c:5517 +#: diff.c:5543 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" msgstr "" -#: diff.c:5520 +#: diff.c:5546 msgid "moved lines of code are colored differently" msgstr "" -#: diff.c:5523 +#: diff.c:5549 msgid "how white spaces are ignored in --color-moved" msgstr "" -#: diff.c:5526 +#: diff.c:5552 #, fuzzy msgid "Other diff options" msgstr "Opções genéricas" -#: diff.c:5528 +#: diff.c:5554 msgid "when run from subdir, exclude changes outside and show relative paths" msgstr "" -#: diff.c:5532 +#: diff.c:5558 #, fuzzy msgid "treat all files as text" msgstr "processar ficheiros binários como texto" -#: diff.c:5534 +#: diff.c:5560 msgid "swap two inputs, reverse the diff" msgstr "" -#: diff.c:5536 +#: diff.c:5562 msgid "exit with 1 if there were differences, 0 otherwise" msgstr "" -#: diff.c:5538 +#: diff.c:5564 msgid "disable all output of the program" msgstr "" -#: diff.c:5540 +#: diff.c:5566 msgid "allow an external diff helper to be executed" msgstr "" -#: diff.c:5542 +#: diff.c:5568 msgid "run external text conversion filters when comparing binary files" msgstr "" -#: diff.c:5544 +#: diff.c:5570 #, fuzzy msgid "<when>" msgstr "quando" -#: diff.c:5545 +#: diff.c:5571 #, fuzzy msgid "ignore changes to submodules in the diff generation" msgstr "" "ignorar alterações em submódulos, quando é opcional: all, dirty, untracked. " "(Predefinição: all)" -#: diff.c:5548 +#: diff.c:5574 #, fuzzy msgid "<format>" msgstr "formato" -#: diff.c:5549 +#: diff.c:5575 msgid "specify how differences in submodules are shown" msgstr "" -#: diff.c:5553 +#: diff.c:5579 #, fuzzy msgid "hide 'git add -N' entries from the index" msgstr "usar .gitattributes apenas a partir do índice" -#: diff.c:5556 +#: diff.c:5582 msgid "treat 'git add -N' entries as real in the index" msgstr "" -#: diff.c:5558 +#: diff.c:5584 #, fuzzy msgid "<string>" msgstr "cadeia" -#: diff.c:5559 +#: diff.c:5585 msgid "" "look for differences that change the number of occurrences of the specified " "string" msgstr "" -#: diff.c:5562 +#: diff.c:5588 msgid "" "look for differences that change the number of occurrences of the specified " "regex" msgstr "" -#: diff.c:5565 +#: diff.c:5591 #, fuzzy msgid "show all changes in the changeset with -S or -G" msgstr "mostrar ficheiros com correspondências no paginador" -#: diff.c:5568 +#: diff.c:5594 #, fuzzy msgid "treat <string> in -S as extended POSIX regular expression" msgstr "usar expressões regulares estendidas do POSIX" -#: diff.c:5571 +#: diff.c:5597 #, fuzzy msgid "control the order in which files appear in the output" msgstr "mostrar outros ficheiros na saída" -#: diff.c:5572 +#: diff.c:5598 #, fuzzy msgid "<object-id>" msgstr "objeto" -#: diff.c:5573 +#: diff.c:5599 msgid "" "look for differences that change the number of occurrences of the specified " "object" msgstr "" -#: diff.c:5575 +#: diff.c:5601 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "" -#: diff.c:5576 +#: diff.c:5602 msgid "select files by diff type" msgstr "" -#: diff.c:5578 +#: diff.c:5604 #, fuzzy msgid "<file>" msgstr "ficheiro" -#: diff.c:5579 +#: diff.c:5605 #, fuzzy msgid "Output to a specific file" msgstr "submeter somente os ficheiros especificados" -#: diff.c:6236 +#: diff.c:6262 msgid "inexact rename detection was skipped due to too many files." msgstr "" "a deteção mudança de nome inexata foi omitida devido a demasiados ficheiros." -#: diff.c:6239 +#: diff.c:6265 msgid "only found copies from modified paths due to too many files." msgstr "" "só foram encontradas cópias de caminhos modificados devido a demasiados " "ficheiros." -#: diff.c:6242 +#: diff.c:6268 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." @@ -3831,7 +3979,8 @@ msgstr "Deteção de mudança de nome inexata em curso" #: dir.c:578 #, fuzzy, c-format msgid "pathspec '%s' did not match any file(s) known to git" -msgstr "o especificador de caminho '%s' não corresponde a nenhum ficheiro" +msgstr "especificador de path '%s' correspondeu a ficheiro nenhum " +"conhecido pelo git" #: dir.c:718 dir.c:747 dir.c:760 #, fuzzy, c-format @@ -3916,253 +4065,253 @@ msgstr "não foi possível definir '%s' como '%s'" msgid "too many args to run %s" msgstr "Demasiados argumentos." -#: fetch-pack.c:176 +#: fetch-pack.c:177 msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack: esperava-se lista rasa" -#: fetch-pack.c:179 +#: fetch-pack.c:180 #, fuzzy msgid "git fetch-pack: expected a flush packet after shallow list" msgstr "git fetch-pack: esperava-se lista rasa" -#: fetch-pack.c:190 +#: fetch-pack.c:191 #, fuzzy msgid "git fetch-pack: expected ACK/NAK, got a flush packet" msgstr "git fetch-pack: esperava-se ACK/NAK, obteve-se '%s'" -#: fetch-pack.c:210 +#: fetch-pack.c:211 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "git fetch-pack: esperava-se ACK/NAK, obteve-se '%s'" -#: fetch-pack.c:221 +#: fetch-pack.c:222 #, fuzzy msgid "unable to write to remote" msgstr "não foi possível escrever o ficheiro da tag" -#: fetch-pack.c:282 +#: fetch-pack.c:283 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc requer multi_ack_detailed" -#: fetch-pack.c:375 fetch-pack.c:1397 +#: fetch-pack.c:378 fetch-pack.c:1406 #, c-format msgid "invalid shallow line: %s" msgstr "linha rasa inválida: %s" -#: fetch-pack.c:381 fetch-pack.c:1403 +#: fetch-pack.c:384 fetch-pack.c:1412 #, c-format msgid "invalid unshallow line: %s" msgstr "linha para aprofundar inválida: %s" -#: fetch-pack.c:383 fetch-pack.c:1405 +#: fetch-pack.c:386 fetch-pack.c:1414 #, c-format msgid "object not found: %s" msgstr "objeto não encontrado: %s" -#: fetch-pack.c:386 fetch-pack.c:1408 +#: fetch-pack.c:389 fetch-pack.c:1417 #, c-format msgid "error in object: %s" msgstr "erro no objeto: %s" -#: fetch-pack.c:388 fetch-pack.c:1410 +#: fetch-pack.c:391 fetch-pack.c:1419 #, c-format msgid "no shallow found: %s" msgstr "raso não encontrado: %s" -#: fetch-pack.c:391 fetch-pack.c:1414 +#: fetch-pack.c:394 fetch-pack.c:1423 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "esperava-se raso/aprofundar, obteve-se %s" -#: fetch-pack.c:431 +#: fetch-pack.c:434 #, c-format msgid "got %s %d %s" msgstr "obteve-se %s %d %s" -#: fetch-pack.c:448 +#: fetch-pack.c:451 #, c-format msgid "invalid commit %s" msgstr "commit inválido %s" -#: fetch-pack.c:479 +#: fetch-pack.c:482 msgid "giving up" msgstr "desistência" -#: fetch-pack.c:492 progress.c:339 +#: fetch-pack.c:495 progress.c:339 msgid "done" msgstr "concluído" -#: fetch-pack.c:504 +#: fetch-pack.c:507 #, c-format msgid "got %s (%d) %s" msgstr "obteve-se %s (%d) %s" -#: fetch-pack.c:540 +#: fetch-pack.c:543 #, c-format msgid "Marking %s as complete" msgstr "Marcado %s como completo" -#: fetch-pack.c:755 +#: fetch-pack.c:758 #, c-format msgid "already have %s (%s)" msgstr "já se tem %s (%s)" -#: fetch-pack.c:824 +#: fetch-pack.c:827 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-pack: não é possível efetuar fork de sideband demultiplexer" -#: fetch-pack.c:832 +#: fetch-pack.c:835 msgid "protocol error: bad pack header" msgstr "erro de protocolo: cabeçalho de pacote incorreto" -#: fetch-pack.c:916 +#: fetch-pack.c:919 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-pack: não é possível criar processo filho %s" -#: fetch-pack.c:933 +#: fetch-pack.c:937 #, c-format msgid "%s failed" msgstr "%s falhou" -#: fetch-pack.c:935 +#: fetch-pack.c:939 msgid "error in sideband demultiplexer" msgstr "erro no sideband demultiplexer" -#: fetch-pack.c:978 +#: fetch-pack.c:982 #, c-format msgid "Server version is %.*s" msgstr "A versão do servidor é %.*s" -#: fetch-pack.c:983 fetch-pack.c:989 fetch-pack.c:992 fetch-pack.c:998 -#: fetch-pack.c:1002 fetch-pack.c:1006 fetch-pack.c:1010 fetch-pack.c:1014 -#: fetch-pack.c:1018 fetch-pack.c:1022 fetch-pack.c:1026 fetch-pack.c:1030 -#: fetch-pack.c:1036 fetch-pack.c:1042 fetch-pack.c:1047 fetch-pack.c:1052 +#: fetch-pack.c:990 fetch-pack.c:996 fetch-pack.c:999 fetch-pack.c:1005 +#: fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017 fetch-pack.c:1021 +#: fetch-pack.c:1025 fetch-pack.c:1029 fetch-pack.c:1033 fetch-pack.c:1037 +#: fetch-pack.c:1043 fetch-pack.c:1049 fetch-pack.c:1054 fetch-pack.c:1059 #, fuzzy, c-format msgid "Server supports %s" msgstr "O servidor suporta side-band" -#: fetch-pack.c:985 +#: fetch-pack.c:992 msgid "Server does not support shallow clients" msgstr "O servidor não suporta clientes rasos" -#: fetch-pack.c:1045 +#: fetch-pack.c:1052 msgid "Server does not support --shallow-since" msgstr "O servidor não suporta --shallow-since" -#: fetch-pack.c:1050 +#: fetch-pack.c:1057 msgid "Server does not support --shallow-exclude" msgstr "O servidor não suporta --shallow-exclude" -#: fetch-pack.c:1054 +#: fetch-pack.c:1061 msgid "Server does not support --deepen" msgstr "O servidor não suporta --deepen" -#: fetch-pack.c:1056 +#: fetch-pack.c:1063 #, fuzzy msgid "Server does not support this repository's object format" msgstr "O servidor não suporta --deepen" -#: fetch-pack.c:1069 +#: fetch-pack.c:1076 msgid "no common commits" -msgstr "nenhum commit em comum" +msgstr "commits comuns nenhuns" -#: fetch-pack.c:1081 fetch-pack.c:1619 +#: fetch-pack.c:1088 fetch-pack.c:1628 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack: falha ao obter." -#: fetch-pack.c:1205 +#: fetch-pack.c:1214 #, c-format msgid "mismatched algorithms: client %s; server %s" msgstr "" -#: fetch-pack.c:1209 +#: fetch-pack.c:1218 #, fuzzy, c-format msgid "the server does not support algorithm '%s'" msgstr "O servidor não suporta clientes rasos" -#: fetch-pack.c:1229 +#: fetch-pack.c:1238 #, fuzzy msgid "Server does not support shallow requests" msgstr "O servidor não suporta clientes rasos" -#: fetch-pack.c:1236 +#: fetch-pack.c:1245 #, fuzzy msgid "Server supports filter" msgstr "O servidor suporta ofs-delta" -#: fetch-pack.c:1275 +#: fetch-pack.c:1284 #, fuzzy msgid "unable to write request to remote" msgstr "não foi possível escrever os parâmetros no ficheiro de configuração" -#: fetch-pack.c:1293 +#: fetch-pack.c:1302 #, c-format msgid "error reading section header '%s'" msgstr "" -#: fetch-pack.c:1299 +#: fetch-pack.c:1308 #, fuzzy, c-format msgid "expected '%s', received '%s'" msgstr "blob para %s '%s' esperado" -#: fetch-pack.c:1360 +#: fetch-pack.c:1369 #, c-format msgid "unexpected acknowledgment line: '%s'" msgstr "" -#: fetch-pack.c:1365 +#: fetch-pack.c:1374 #, c-format msgid "error processing acks: %d" msgstr "" -#: fetch-pack.c:1375 +#: fetch-pack.c:1384 msgid "expected packfile to be sent after 'ready'" msgstr "" -#: fetch-pack.c:1377 +#: fetch-pack.c:1386 msgid "expected no other sections to be sent after no 'ready'" msgstr "" -#: fetch-pack.c:1419 +#: fetch-pack.c:1428 #, c-format msgid "error processing shallow info: %d" msgstr "" -#: fetch-pack.c:1466 +#: fetch-pack.c:1475 #, fuzzy, c-format msgid "expected wanted-ref, got '%s'" msgstr "esperava-se raso/aprofundar, obteve-se %s" -#: fetch-pack.c:1471 +#: fetch-pack.c:1480 #, fuzzy, c-format msgid "unexpected wanted-ref: '%s'" msgstr "fim de ficheiro inesperado" -#: fetch-pack.c:1476 +#: fetch-pack.c:1485 #, c-format msgid "error processing wanted refs: %d" msgstr "" -#: fetch-pack.c:1506 +#: fetch-pack.c:1515 #, fuzzy msgid "git fetch-pack: expected response end packet" msgstr "git fetch-pack: esperava-se lista rasa" -#: fetch-pack.c:1887 +#: fetch-pack.c:1897 msgid "no matching remote head" -msgstr "nenhuma cabeça remota correspondente" +msgstr "remote head nenhuma que corresponda" -#: fetch-pack.c:1910 builtin/clone.c:692 +#: fetch-pack.c:1920 builtin/clone.c:693 msgid "remote did not send all necessary objects" msgstr "o remoto não enviou todos os objetos necessários" -#: fetch-pack.c:1937 +#: fetch-pack.c:1947 #, c-format msgid "no such remote ref %s" msgstr "referência remota %s inexistente" -#: fetch-pack.c:1940 +#: fetch-pack.c:1950 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "O servidor não permite pedido do objeto não anunciado %s" @@ -4185,24 +4334,24 @@ msgstr "gpg não assinou os dados" msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "ignorar cor inválida '%.*s' em log.graphColors" -#: grep.c:668 +#: grep.c:640 msgid "" "given pattern contains NULL byte (via -f <file>). This is only supported " "with -P under PCRE v2" msgstr "" -#: grep.c:2128 +#: grep.c:2100 #, c-format msgid "'%s': unable to read %s" msgstr "'%s': não foi possível ler %s" -#: grep.c:2145 setup.c:176 builtin/clone.c:411 builtin/diff.c:89 +#: grep.c:2117 setup.c:176 builtin/clone.c:412 builtin/diff.c:89 #: builtin/rm.c:135 #, c-format msgid "failed to stat '%s'" msgstr "falha ao invocar stat de '%s'" -#: grep.c:2156 +#: grep.c:2128 #, c-format msgid "'%s': short read" msgstr "'%s': leitura truncada" @@ -4280,7 +4429,7 @@ msgstr "versão de índice %s não suportada" #: help.c:405 #, fuzzy msgid "The Git concept guides are:" -msgstr "Os guias comuns do Git:\n" +msgstr "Os guias comuns do Git:" #: help.c:429 msgid "See 'git help <command>' to read about a specific subcommand" @@ -4295,7 +4444,7 @@ msgstr "a executar $command" msgid "Command aliases" msgstr "" -#: help.c:513 +#: help.c:527 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" @@ -4304,33 +4453,31 @@ msgstr "" "'%s' parece ser um comando do git, mas não é possível\n" "executá-lo. Talvez git-%s esteja danificado?" -#: help.c:572 +#: help.c:543 help.c:631 +#, c-format +msgid "git: '%s' is not a git command. See 'git --help'." +msgstr "git: '%s' não é um comando do git. Consulte 'git --help'." + +#: help.c:591 msgid "Uh oh. Your system reports no Git commands at all." -msgstr "Oh não. Não há nenhum comando do Git disponível no sistema." +msgstr "Oh não. Teu sistema de reporta comando nenhum de Git." -#: help.c:594 +#: help.c:613 #, fuzzy, c-format msgid "WARNING: You called a Git command named '%s', which does not exist." -msgstr "" -"AVISO: Invocou um comando do Git designado '%s' que não existe.\n" -"Continuando, assumindo que queria dizer '%s'" +msgstr "AVISO: Invocou um comando do Git designado '%s', que não existe." -#: help.c:599 +#: help.c:618 #, c-format msgid "Continuing under the assumption that you meant '%s'." msgstr "" -#: help.c:604 +#: help.c:623 #, c-format msgid "Continuing in %0.1f seconds, assuming that you meant '%s'." msgstr "" -#: help.c:612 -#, c-format -msgid "git: '%s' is not a git command. See 'git --help'." -msgstr "git: '%s' não é um comando do git. Consulte 'git --help'." - -#: help.c:616 +#: help.c:635 msgid "" "\n" "The most similar command is" @@ -4340,17 +4487,17 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: help.c:656 +#: help.c:675 #, fuzzy msgid "git version [<options>]" msgstr "git column [<opções>]" -#: help.c:711 +#: help.c:730 #, c-format msgid "%s: %s - %s" msgstr "%s: %s - %s" -#: help.c:715 +#: help.c:734 msgid "" "\n" "Did you mean this?" @@ -4400,7 +4547,7 @@ msgstr "" #: ident.c:397 msgid "no email was given and auto-detection is disabled" -msgstr "nenhum e-mail indicado e a deteção automática está desativada" +msgstr "foi dado email nenhum e deteção automática está desativada" #: ident.c:402 #, c-format @@ -4410,7 +4557,7 @@ msgstr "" #: ident.c:419 msgid "no name was given and auto-detection is disabled" -msgstr "nenhum nome indicado e a deteção automática está desativada" +msgstr "foi dado nome nenhum e deteção automática está desativada" #: ident.c:425 #, c-format @@ -4515,6 +4662,21 @@ msgstr "Não é foi possível criar '%s.lock': %s" msgid "expected flush after ls-refs arguments" msgstr "" +#: merge-ort-wrappers.c:13 merge-recursive.c:3672 +#, fuzzy, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +" %s" +msgstr "" +"As suas alterações locais nos seguintes ficheiros seriam substituídas ao " +"integrar:\n" +"%%s" + +#: merge-ort-wrappers.c:33 merge-recursive.c:3436 +#, fuzzy, c-format +msgid "Already up to date!" +msgstr "Já está atualizado!" + #: merge-recursive.c:356 msgid "(bad commit)\n" msgstr "(commit incorreto)\n" @@ -4878,11 +5040,6 @@ msgstr "A adicionar %s" msgid "CONFLICT (add/add): Merge conflict in %s" msgstr "CONFLITO (%s): conflito de integração em %s" -#: merge-recursive.c:3436 -#, fuzzy -msgid "Already up to date!" -msgstr "Já está atualizado!" - #: merge-recursive.c:3445 #, c-format msgid "merging of trees %s and %s failed" @@ -4901,24 +5058,14 @@ msgstr[1] "%u antecessores comuns encontrados:" #: merge-recursive.c:3613 msgid "merge returned no commit" -msgstr "a integração não retornou nenhum commit" - -#: merge-recursive.c:3672 -#, fuzzy, c-format -msgid "" -"Your local changes to the following files would be overwritten by merge:\n" -" %s" -msgstr "" -"As suas alterações locais nos seguintes ficheiros seriam substituídas ao " -"integrar:\n" -"%%s" +msgstr "junção retornou commit nenhum" #: merge-recursive.c:3769 #, c-format msgid "Could not parse object '%s'" msgstr "Não foi possível analisar o objeto '%s'" -#: merge-recursive.c:3787 builtin/merge.c:702 builtin/merge.c:881 +#: merge-recursive.c:3787 builtin/merge.c:711 builtin/merge.c:895 msgid "Unable to write index." msgstr "Não é possível escrever no índice." @@ -4926,179 +5073,175 @@ msgstr "Não é possível escrever no índice." msgid "failed to read the cache" msgstr "falha ao ler a cache" -#: merge.c:109 rerere.c:720 builtin/am.c:1896 builtin/am.c:1930 -#: builtin/checkout.c:560 builtin/checkout.c:816 builtin/clone.c:816 +#: merge.c:109 rerere.c:720 builtin/am.c:1883 builtin/am.c:1917 +#: builtin/checkout.c:573 builtin/checkout.c:829 builtin/clone.c:817 #: builtin/stash.c:265 msgid "unable to write new index file" msgstr "não foi possível escrever novo ficheiro de índice" -#: midx.c:79 +#: midx.c:80 #, c-format msgid "multi-pack-index file %s is too small" msgstr "" -#: midx.c:95 +#: midx.c:96 #, c-format msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x" msgstr "" -#: midx.c:100 +#: midx.c:101 #, c-format msgid "multi-pack-index version %d not recognized" msgstr "" -#: midx.c:105 +#: midx.c:106 #, c-format msgid "multi-pack-index hash version %u does not match version %u" msgstr "" -#: midx.c:122 +#: midx.c:123 msgid "invalid chunk offset (too large)" msgstr "" -#: midx.c:146 +#: midx.c:147 msgid "terminating multi-pack-index chunk id appears earlier than expected" msgstr "" -#: midx.c:159 +#: midx.c:160 msgid "multi-pack-index missing required pack-name chunk" msgstr "" -#: midx.c:161 +#: midx.c:162 msgid "multi-pack-index missing required OID fanout chunk" msgstr "" -#: midx.c:163 +#: midx.c:164 msgid "multi-pack-index missing required OID lookup chunk" msgstr "" -#: midx.c:165 +#: midx.c:166 msgid "multi-pack-index missing required object offsets chunk" msgstr "" -#: midx.c:179 +#: midx.c:180 #, c-format msgid "multi-pack-index pack names out of order: '%s' before '%s'" msgstr "" -#: midx.c:222 +#: midx.c:223 #, c-format msgid "bad pack-int-id: %u (%u total packs)" msgstr "" -#: midx.c:272 +#: midx.c:273 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" msgstr "" -#: midx.c:300 -msgid "error preparing packfile from multi-pack-index" -msgstr "" - -#: midx.c:485 +#: midx.c:480 #, fuzzy, c-format msgid "failed to add packfile '%s'" msgstr "falha ao ler o ficheiro de comando '%s'" -#: midx.c:491 +#: midx.c:486 #, fuzzy, c-format msgid "failed to open pack-index '%s'" msgstr "falha ao abrir '%s'" -#: midx.c:551 +#: midx.c:546 #, fuzzy, c-format msgid "failed to locate object %d in packfile" msgstr "Falha ao criar os ficheiros de saída" -#: midx.c:853 +#: midx.c:846 msgid "Adding packfiles to multi-pack-index" msgstr "" -#: midx.c:886 +#: midx.c:879 #, c-format msgid "did not see pack-file %s to drop" msgstr "" -#: midx.c:938 +#: midx.c:931 #, fuzzy msgid "no pack files to index." msgstr "Não é possível escrever no índice." -#: midx.c:990 +#: midx.c:982 msgid "Writing chunks to multi-pack-index" msgstr "" -#: midx.c:1068 +#: midx.c:1060 #, fuzzy, c-format msgid "failed to clear multi-pack-index at %s" msgstr "falha ao limpar o índice" -#: midx.c:1124 +#: midx.c:1116 msgid "multi-pack-index file exists, but failed to parse" msgstr "" -#: midx.c:1132 +#: midx.c:1124 msgid "Looking for referenced packfiles" msgstr "" -#: midx.c:1147 +#: midx.c:1139 #, c-format msgid "" "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" msgstr "" -#: midx.c:1152 +#: midx.c:1144 msgid "the midx contains no oid" msgstr "" -#: midx.c:1161 +#: midx.c:1153 msgid "Verifying OID order in multi-pack-index" msgstr "" -#: midx.c:1170 +#: midx.c:1162 #, c-format msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" msgstr "" -#: midx.c:1190 +#: midx.c:1182 #, fuzzy msgid "Sorting objects by packfile" msgstr "A escrever objetos" -#: midx.c:1197 +#: midx.c:1189 #, fuzzy msgid "Verifying object offsets" msgstr "A escrever objetos" -#: midx.c:1213 +#: midx.c:1205 #, fuzzy, c-format msgid "failed to load pack entry for oid[%d] = %s" msgstr "não é possível adicionar %s à cache" -#: midx.c:1219 +#: midx.c:1211 #, fuzzy, c-format msgid "failed to load pack-index for packfile %s" msgstr "falha ao ler o ficheiro de comando '%s'" -#: midx.c:1228 +#: midx.c:1220 #, c-format msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>" msgstr "" -#: midx.c:1253 +#: midx.c:1245 #, fuzzy msgid "Counting referenced objects" msgstr "eliminar ficheiros não referenciados" -#: midx.c:1263 +#: midx.c:1255 msgid "Finding and deleting unreferenced packfiles" msgstr "" -#: midx.c:1454 +#: midx.c:1446 #, fuzzy msgid "could not start pack-objects" msgstr "Não foi possível lançar pack-objects" -#: midx.c:1474 +#: midx.c:1466 #, fuzzy msgid "could not finish pack-objects" msgstr "Não foi possível lançar pack-objects" @@ -5188,16 +5331,16 @@ msgstr "" msgid "unable to get size of %s" msgstr "não foi possível mover %s para %s" -#: packfile.c:630 +#: packfile.c:615 msgid "offset before end of packfile (broken .idx?)" msgstr "offset antes do fim do ficheiro de pacote (.idx danificado?)" -#: packfile.c:1922 +#: packfile.c:1907 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "offset antes do início do índice do pacote %s (índice corrompido?)" -#: packfile.c:1926 +#: packfile.c:1911 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "offset depois do fim do índice do pacote %s (índice truncado?)" @@ -5280,7 +5423,7 @@ msgstr "opção desconhecido %s" #: parse-options.c:866 #, fuzzy, c-format msgid "unknown non-ascii option in string: `%s'" -msgstr "Definidição --confirm desconhecida: '%s'\n" +msgstr "Definidição --confirm desconhecida: '%s'" #: parse-options.c:890 msgid "..." @@ -5454,7 +5597,7 @@ msgstr "erro de protocolo: cabeçalho de pacote incorreto" msgid "protocol error: bad line length %d" msgstr "erro de protocolo: cabeçalho de pacote incorreto" -#: pkt-line.c:373 sideband.c:150 +#: pkt-line.c:373 sideband.c:165 #, c-format msgid "remote error: %s" msgstr "erro remoto: %s" @@ -5504,10 +5647,10 @@ msgstr "não foi possível obter stat de %s" msgid "could not read `log` output" msgstr "não foi possível ler a saída do comando 'show'" -#: range-diff.c:98 sequencer.c:5283 +#: range-diff.c:98 sequencer.c:5310 #, fuzzy, c-format msgid "could not parse commit '%s'" -msgstr "não foi possível analisar o commit %s\n" +msgstr "não foi possível analisar o commit %s" #: range-diff.c:112 #, c-format @@ -5521,12 +5664,12 @@ msgstr "" msgid "could not parse git header '%.*s'" msgstr "não foi possível analisar o patch '%s'" -#: range-diff.c:301 +#: range-diff.c:299 #, fuzzy msgid "failed to generate diff" msgstr "falha ao criar o ficheiro %s" -#: range-diff.c:534 range-diff.c:536 +#: range-diff.c:532 range-diff.c:534 #, fuzzy, c-format msgid "could not parse log for '%s'" msgstr "não é possível ler o ficheiro de log '%s'" @@ -5645,8 +5788,8 @@ msgstr "não foi possível criar o diretórios para %s" #: read-cache.c:1971 read-cache.c:2262 rerere.c:565 rerere.c:599 rerere.c:1111 #: submodule.c:1628 builtin/add.c:538 builtin/check-ignore.c:181 -#: builtin/checkout.c:489 builtin/checkout.c:675 builtin/clean.c:991 -#: builtin/commit.c:364 builtin/diff-tree.c:121 builtin/grep.c:507 +#: builtin/checkout.c:502 builtin/checkout.c:688 builtin/clean.c:991 +#: builtin/commit.c:364 builtin/diff-tree.c:122 builtin/grep.c:507 #: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:290 #: builtin/submodule--helper.c:332 msgid "index file corrupt" @@ -5702,12 +5845,12 @@ msgstr "não foi possível ler o ficheiro '%s'" msgid "broken index, expect %s in %s, got %s" msgstr "" -#: read-cache.c:3017 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1126 +#: read-cache.c:3017 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1140 #, c-format msgid "could not close '%s'" msgstr "não foi possível fechar '%s'" -#: read-cache.c:3120 sequencer.c:2446 sequencer.c:4185 +#: read-cache.c:3120 sequencer.c:2479 sequencer.c:4231 #, fuzzy, c-format msgid "could not stat '%s'" msgstr "não foi possível obter stat de '%s'" @@ -5740,7 +5883,7 @@ msgid "" "Or you can abort the rebase with 'git rebase --abort'.\n" msgstr "" "Pode corrí-lo com 'git rebase --edit-todo' e depois executar 'git rebase --" -"continue'." +"continue'.\n" #: rebase-interactive.c:33 #, fuzzy, c-format @@ -5797,7 +5940,7 @@ msgid "" "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" msgstr "" "\n" -"Não remover nenhum linha. Use 'drop' explicitamente para remover um commit.\n" +"Remove linha nenhuma. Usa explicitamente 'drop' para remover um commit.\n" #: rebase-interactive.c:75 git-rebase--preserve-merges.sh:222 msgid "" @@ -5831,14 +5974,14 @@ msgstr "" "No entanto, se remover tudo, o rebase será abortado.\n" "\n" -#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3571 -#: sequencer.c:3597 sequencer.c:5389 builtin/fsck.c:347 builtin/rebase.c:264 +#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3607 +#: sequencer.c:3633 sequencer.c:5416 builtin/fsck.c:347 builtin/rebase.c:270 #, fuzzy, c-format msgid "could not write '%s'" msgstr "não foi possível escrever em '%s'" -#: rebase-interactive.c:116 builtin/rebase.c:196 builtin/rebase.c:222 -#: builtin/rebase.c:246 +#: rebase-interactive.c:116 builtin/rebase.c:202 builtin/rebase.c:228 +#: builtin/rebase.c:252 #, fuzzy, c-format msgid "could not write '%s'." msgstr "não foi possível escrever em '%s'" @@ -5850,7 +5993,7 @@ msgid "" "Dropped commits (newer to older):\n" msgstr "" "Aviso: alguns commits podem ter sido descartados acidentalmente.\n" -"Commits descartados (mais novo para o mais velho):" +"Commits descartados (mais novo para o mais velho):\n" #: rebase-interactive.c:200 #, fuzzy, c-format @@ -5866,11 +6009,12 @@ msgstr "" "explicitamente.\n" "\n" "Use 'git config rebase.missingCommitsCheck' para mudar o nível de avisos.\n" -"O comportamentos possíveis são: ignore, warn, error." +"O comportamentos possíveis são: ignore, warn, error.\n" +"\n" -#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2361 -#: builtin/rebase.c:182 builtin/rebase.c:207 builtin/rebase.c:233 -#: builtin/rebase.c:258 +#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2394 +#: builtin/rebase.c:188 builtin/rebase.c:213 builtin/rebase.c:239 +#: builtin/rebase.c:264 #, c-format msgid "could not read '%s'." msgstr "não foi possível ler '%s'." @@ -6065,62 +6209,62 @@ msgstr "formato: átomo %%(end) utilizado sem átomo correspondente" msgid "malformed format string %s" msgstr "cadeia malformada %s" -#: ref-filter.c:1541 +#: ref-filter.c:1549 #, fuzzy, c-format msgid "no branch, rebasing %s" -msgstr "(nenhum ramo, a efetuar rebase de %s)" +msgstr "(ramo nenhum, rebaseando %s)" -#: ref-filter.c:1544 +#: ref-filter.c:1552 #, fuzzy, c-format msgid "no branch, rebasing detached HEAD %s" -msgstr "(nenhum ramo, a efetuar rebase de %s)" +msgstr "(ramo nenhum, rebaseando HEAD solta %s)" -#: ref-filter.c:1547 +#: ref-filter.c:1555 #, fuzzy, c-format msgid "no branch, bisect started on %s" -msgstr "(nenhum ramo, bissecção iniciada em %s)" +msgstr "(ramo nenhum, bisseção iniciada em %s)" -#: ref-filter.c:1557 +#: ref-filter.c:1565 #, fuzzy msgid "no branch" -msgstr "(nenhum ramo)" +msgstr "(ramo nenhum)" -#: ref-filter.c:1591 ref-filter.c:1800 +#: ref-filter.c:1599 ref-filter.c:1808 #, c-format msgid "missing object %s for %s" msgstr "falta o objeto %s de %s" -#: ref-filter.c:1601 +#: ref-filter.c:1609 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "falha ao invocar parse_object_buffer sobre %s de %s" -#: ref-filter.c:2054 +#: ref-filter.c:2062 #, c-format msgid "malformed object at '%s'" msgstr "objeto malformado em '%s'" -#: ref-filter.c:2143 +#: ref-filter.c:2151 #, c-format msgid "ignoring ref with broken name %s" msgstr "a referência %s com nome danificado foi ignorada" -#: ref-filter.c:2148 refs.c:657 +#: ref-filter.c:2156 refs.c:660 #, c-format msgid "ignoring broken ref %s" msgstr "a referência %s danificada foi ignorada" -#: ref-filter.c:2464 +#: ref-filter.c:2472 #, c-format msgid "format: %%(end) atom missing" msgstr "formato: falta átomo %%(end)" -#: ref-filter.c:2563 +#: ref-filter.c:2571 #, c-format msgid "malformed object name %s" msgstr "nome de objeto malformado %s" -#: ref-filter.c:2568 +#: ref-filter.c:2576 #, fuzzy, c-format msgid "option `%s' must point to a commit" msgstr "'%s' não aponta para um commit" @@ -6130,65 +6274,65 @@ msgstr "'%s' não aponta para um commit" msgid "%s does not point to a valid object!" msgstr "'%s' não aponta para um commit" -#: refs.c:572 +#: refs.c:575 #, fuzzy, c-format msgid "could not retrieve `%s`" msgstr "não foi possível remover '%s'" -#: refs.c:579 +#: refs.c:582 #, fuzzy, c-format msgid "invalid branch name: %s = %s" msgstr "Nome de ramo inválido: '%s'" -#: refs.c:655 +#: refs.c:658 #, fuzzy, c-format msgid "ignoring dangling symref %s" msgstr "a referência %s danificada foi ignorada" -#: refs.c:892 +#: refs.c:895 #, c-format msgid "log for ref %s has gap after %s" msgstr "" -#: refs.c:898 +#: refs.c:901 #, c-format msgid "log for ref %s unexpectedly ended on %s" msgstr "" -#: refs.c:957 +#: refs.c:960 #, c-format msgid "log for %s is empty" msgstr "" -#: refs.c:1049 +#: refs.c:1052 #, fuzzy, c-format msgid "refusing to update ref with bad name '%s'" msgstr "a referência %s com nome danificado foi ignorada" -#: refs.c:1120 +#: refs.c:1123 #, fuzzy, c-format msgid "update_ref failed for ref '%s': %s" msgstr "falha ao abrir '%s': %s" -#: refs.c:1944 +#: refs.c:1947 #, fuzzy, c-format msgid "multiple updates for ref '%s' not allowed" msgstr "nome de identificação vazio (de <%s>) não é permitido" -#: refs.c:2024 +#: refs.c:2027 msgid "ref updates forbidden inside quarantine environment" msgstr "" -#: refs.c:2035 +#: refs.c:2038 msgid "ref updates aborted by hook" msgstr "" -#: refs.c:2135 refs.c:2165 +#: refs.c:2138 refs.c:2168 #, fuzzy, c-format msgid "'%s' exists; cannot create '%s'" msgstr "não é possível criar '%s'" -#: refs.c:2141 refs.c:2176 +#: refs.c:2144 refs.c:2179 #, fuzzy, c-format msgid "cannot process '%s' and '%s' at the same time" msgstr "" @@ -6210,7 +6354,7 @@ msgstr "não foi possível eliminar a referência %s: %s" msgid "could not delete references: %s" msgstr "não foi possível eliminar as referências: %s" -#: refspec.c:167 +#: refspec.c:170 #, fuzzy, c-format msgid "invalid refspec '%s'" msgstr "ficheiro inválido: '%s'" @@ -6333,99 +6477,97 @@ msgstr "" msgid "dst ref %s receives from more than one src" msgstr "" -#: remote.c:1703 remote.c:1804 +#: remote.c:1714 remote.c:1815 msgid "HEAD does not point to a branch" msgstr "HEAD não aponta para um ramo" -#: remote.c:1712 +#: remote.c:1723 #, c-format msgid "no such branch: '%s'" msgstr "ramo inexistente: '%s'" -#: remote.c:1715 +#: remote.c:1726 #, c-format msgid "no upstream configured for branch '%s'" -msgstr "nenhum ramo a montante configurado para o ramo '%s'" +msgstr "configurado upstream nenhum para ramo '%s'" -#: remote.c:1721 +#: remote.c:1732 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "" "o ramo a montante '%s' não está guardado como um ramo de monitorização remoto" -#: remote.c:1736 +#: remote.c:1747 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" -msgstr "" -"o destino de publicação '%s' no remoto '%s' não é seguido por nenhum ramo " -"local" +msgstr "destino de atirar '%s' em remoto '%s' tem ramo de tracking local nenhum" -#: remote.c:1748 +#: remote.c:1759 #, c-format msgid "branch '%s' has no remote for pushing" -msgstr "o ramo '%s' não tem nenhum remoto para publicar" +msgstr "ramo '%s' tem remoto para atirar nenhum" -#: remote.c:1758 +#: remote.c:1769 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "" "'%2$s' não faz parte dos especificadores de referência de '%1$s' para " "publicação" -#: remote.c:1771 +#: remote.c:1782 msgid "push has no destination (push.default is 'nothing')" msgstr "publicação sem destino (push.default é 'nothing')" -#: remote.c:1793 +#: remote.c:1804 msgid "cannot resolve 'simple' push to a single destination" msgstr "não é possível resolver a publicação 'simple' num único destino" -#: remote.c:1922 +#: remote.c:1933 #, fuzzy, c-format msgid "couldn't find remote ref %s" msgstr "Referência remota HEAD não encontrada" -#: remote.c:1935 +#: remote.c:1946 #, c-format msgid "* Ignoring funny ref '%s' locally" msgstr "" -#: remote.c:2098 +#: remote.c:2109 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "A base do seu ramo é '%s', mas o ramo a montante desapareceu.\n" -#: remote.c:2102 +#: remote.c:2113 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (use \"git branch --unset-upstream\" para corrigir)\n" -#: remote.c:2105 +#: remote.c:2116 #, fuzzy, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "O seu ramo está atualizado com '%s'.\n" -#: remote.c:2109 +#: remote.c:2120 #, fuzzy, c-format msgid "Your branch and '%s' refer to different commits.\n" msgstr "O seu ramo está à frente de '%s' por %d commit.\n" -#: remote.c:2112 +#: remote.c:2123 #, c-format msgid " (use \"%s\" for details)\n" msgstr "" -#: remote.c:2116 +#: remote.c:2127 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "O seu ramo está à frente de '%s' por %d commit.\n" msgstr[1] "O seu ramo está à frente de '%s' por %d commits.\n" -#: remote.c:2122 +#: remote.c:2133 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (use \"git push\" para publicar os commits locais)\n" -#: remote.c:2125 +#: remote.c:2136 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -6437,11 +6579,11 @@ msgstr[1] "" "O seu ramo está atrás de '%s' por %d commits, podendo ser atualizado com " "avanço rápido.\n" -#: remote.c:2133 +#: remote.c:2144 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (use \"git pull\" para atualizar o seu ramo local)\n" -#: remote.c:2136 +#: remote.c:2147 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -6456,11 +6598,11 @@ msgstr[1] "" "O seu ramo e '%s' divergiram,\n" "tendo cada um %d e %d commits diferentes, respetivamente.\n" -#: remote.c:2146 +#: remote.c:2157 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr " (use \"git pull\" para integrar o ramo remoto no seu ramo)\n" -#: remote.c:2337 +#: remote.c:2348 #, fuzzy, c-format msgid "cannot parse expected object name '%s'" msgstr "não é possível ler o objeto %s: '%s'" @@ -6539,7 +6681,7 @@ msgstr "não é possível criar a ligação simbólica '%s' '%s'" msgid "Recorded preimage for '%s'" msgstr "" -#: rerere.c:881 submodule.c:2082 builtin/log.c:1975 +#: rerere.c:881 submodule.c:2082 builtin/log.c:1992 #: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890 #, c-format msgid "could not create directory '%s'" @@ -6568,7 +6710,7 @@ msgstr "" #: rerere.c:1096 #, fuzzy, c-format msgid "Forgot resolution for '%s'\n" -msgstr "não foi possível resolver a referência %s" +msgstr "não foi possível resolver a referência '%s'\n" #: rerere.c:1199 #, fuzzy @@ -6580,78 +6722,78 @@ msgstr "não é possível de obter o diretório de trabalho atual" msgid "could not determine HEAD revision" msgstr "não foi possível destacar HEAD" -#: reset.c:70 reset.c:76 sequencer.c:3426 +#: reset.c:70 reset.c:76 sequencer.c:3460 #, fuzzy, c-format msgid "failed to find tree of %s" msgstr "Falha ao procurar árvore de %s." -#: revision.c:2344 +#: revision.c:2336 msgid "--unpacked=<packfile> no longer supported" msgstr "" -#: revision.c:2364 +#: revision.c:2356 #, fuzzy, c-format msgid "unknown value for --diff-merges: %s" msgstr "valor desconhecido '%s' da chave '%s'" -#: revision.c:2702 +#: revision.c:2694 msgid "your current branch appears to be broken" msgstr "o ramo atual parece estar danificado" -#: revision.c:2705 +#: revision.c:2697 #, c-format msgid "your current branch '%s' does not have any commits yet" -msgstr "o ramo atual '%s' ainda não contém nenhum commit" +msgstr "teu ramo atual '%s' ainda contém commits nenhuns" -#: revision.c:2915 +#: revision.c:2907 msgid "-L does not yet support diff formats besides -p and -s" msgstr "" -#: run-command.c:763 +#: run-command.c:764 msgid "open /dev/null failed" msgstr "falha ao abrir /dev/null" -#: run-command.c:1270 +#: run-command.c:1271 #, fuzzy, c-format msgid "cannot create async thread: %s" msgstr "não foi possível criar thread: %s" -#: run-command.c:1334 +#: run-command.c:1335 #, c-format msgid "" "The '%s' hook was ignored because it's not set as executable.\n" "You can disable this warning with `git config advice.ignoredHook false`." msgstr "" -#: send-pack.c:145 +#: send-pack.c:146 #, fuzzy msgid "unexpected flush packet while reading remote unpack status" msgstr "não é possível analisar status de descompactação remota: %s" -#: send-pack.c:147 +#: send-pack.c:148 #, c-format msgid "unable to parse remote unpack status: %s" msgstr "não é possível analisar status de descompactação remota: %s" -#: send-pack.c:149 +#: send-pack.c:150 #, c-format msgid "remote unpack failed: %s" msgstr "descompactação remota falhou: %s" -#: send-pack.c:372 +#: send-pack.c:374 msgid "failed to sign the push certificate" msgstr "falha ao assinar o certificado de publicação" -#: send-pack.c:460 +#: send-pack.c:467 #, fuzzy msgid "the receiving end does not support this repository's hash algorithm" msgstr "o recetor não suporta opções de publicação" -#: send-pack.c:469 +#: send-pack.c:476 msgid "the receiving end does not support --signed push" msgstr "o recetor não suporta publicação com --signed" -#: send-pack.c:471 +#: send-pack.c:478 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" @@ -6659,48 +6801,48 @@ msgstr "" "certificado de publicação não enviado uma vez que o recetor não suporta " "publicação com --signed" -#: send-pack.c:483 +#: send-pack.c:490 msgid "the receiving end does not support --atomic push" msgstr "o recetor não suporta publicação com --atomic" -#: send-pack.c:488 +#: send-pack.c:495 msgid "the receiving end does not support push options" msgstr "o recetor não suporta opções de publicação" -#: sequencer.c:194 +#: sequencer.c:195 #, fuzzy, c-format msgid "invalid commit message cleanup mode '%s'" msgstr "Modo de limpeza inválido %s" -#: sequencer.c:308 +#: sequencer.c:323 #, fuzzy, c-format msgid "could not delete '%s'" msgstr "Não foi possível eliminar %s" -#: sequencer.c:329 builtin/rebase.c:749 builtin/rebase.c:1590 builtin/rm.c:385 +#: sequencer.c:343 builtin/rebase.c:755 builtin/rebase.c:1596 builtin/rm.c:385 #, c-format msgid "could not remove '%s'" msgstr "não foi possível remover '%s'" -#: sequencer.c:339 +#: sequencer.c:353 msgid "revert" msgstr "reverter" -#: sequencer.c:341 +#: sequencer.c:355 msgid "cherry-pick" msgstr "cherry-pick" -#: sequencer.c:343 +#: sequencer.c:357 #, fuzzy msgid "rebase" msgstr "rebase -i" -#: sequencer.c:345 +#: sequencer.c:359 #, fuzzy, c-format msgid "unknown action: %d" msgstr "Ação desconhecida: %d" -#: sequencer.c:404 +#: sequencer.c:418 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -6708,7 +6850,7 @@ msgstr "" "depois de resolver os conflitos, marque os caminhos corrigidos\n" "com 'git add <caminhos>' ou 'git rm <caminhos>'" -#: sequencer.c:407 +#: sequencer.c:421 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -6718,43 +6860,43 @@ msgstr "" "com 'git add <caminhos>' ou 'git rm <caminhos>'\n" "e submeta o resultado com 'git commit'" -#: sequencer.c:420 sequencer.c:3028 +#: sequencer.c:434 sequencer.c:3062 #, c-format msgid "could not lock '%s'" msgstr "não foi possível bloquear '%s'" -#: sequencer.c:422 sequencer.c:2827 sequencer.c:3032 sequencer.c:3046 -#: sequencer.c:3303 sequencer.c:5299 strbuf.c:1168 wrapper.c:631 +#: sequencer.c:436 sequencer.c:2861 sequencer.c:3066 sequencer.c:3080 +#: sequencer.c:3337 sequencer.c:5326 strbuf.c:1168 wrapper.c:631 #, c-format msgid "could not write to '%s'" msgstr "não foi possível escrever em '%s'" -#: sequencer.c:427 +#: sequencer.c:441 #, c-format msgid "could not write eol to '%s'" msgstr "não foi possível escrever fim de linha em '%s'" -#: sequencer.c:432 sequencer.c:2832 sequencer.c:3034 sequencer.c:3048 -#: sequencer.c:3311 +#: sequencer.c:446 sequencer.c:2866 sequencer.c:3068 sequencer.c:3082 +#: sequencer.c:3345 #, fuzzy, c-format msgid "failed to finalize '%s'" msgstr "falha ao finalizar '%s'." -#: sequencer.c:471 +#: sequencer.c:485 #, c-format msgid "your local changes would be overwritten by %s." msgstr "as suas alterações locais serão substituídas ao %s." -#: sequencer.c:475 +#: sequencer.c:489 msgid "commit your changes or stash them to proceed." msgstr "submeta ou esconda as suas alterações para continuar." -#: sequencer.c:507 +#: sequencer.c:521 #, c-format msgid "%s: fast-forward" msgstr "%s: avanço rápido" -#: sequencer.c:546 builtin/tag.c:566 +#: sequencer.c:560 builtin/tag.c:566 #, c-format msgid "Invalid cleanup mode %s" msgstr "Modo de limpeza inválido %s" @@ -6762,67 +6904,67 @@ msgstr "Modo de limpeza inválido %s" #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase". #. -#: sequencer.c:640 +#: sequencer.c:670 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: Não foi possível escrever novo ficheiro de índice" -#: sequencer.c:657 +#: sequencer.c:687 #, fuzzy msgid "unable to update cache tree" -msgstr "não foi possível atualizar a árvore de cache\n" +msgstr "não foi possível atualizar a árvore de cache" -#: sequencer.c:671 +#: sequencer.c:701 #, fuzzy msgid "could not resolve HEAD commit" -msgstr "não foi possível resolver o commit HEAD\n" +msgstr "não foi possível resolver o commit HEAD" -#: sequencer.c:751 +#: sequencer.c:781 #, c-format msgid "no key present in '%.*s'" msgstr "" -#: sequencer.c:762 +#: sequencer.c:792 #, fuzzy, c-format msgid "unable to dequote value of '%s'" msgstr "não é possível detetar automaticamente o nome (obteve-se '%s')" -#: sequencer.c:799 wrapper.c:201 wrapper.c:371 builtin/am.c:724 -#: builtin/am.c:816 builtin/merge.c:1121 builtin/rebase.c:902 +#: sequencer.c:829 wrapper.c:201 wrapper.c:371 builtin/am.c:710 +#: builtin/am.c:802 builtin/merge.c:1135 builtin/rebase.c:908 #, c-format msgid "could not open '%s' for reading" msgstr "não foi possível abrir '%s' para leitura" -#: sequencer.c:809 +#: sequencer.c:839 msgid "'GIT_AUTHOR_NAME' already given" msgstr "" -#: sequencer.c:814 +#: sequencer.c:844 msgid "'GIT_AUTHOR_EMAIL' already given" msgstr "" -#: sequencer.c:819 +#: sequencer.c:849 msgid "'GIT_AUTHOR_DATE' already given" msgstr "" -#: sequencer.c:823 +#: sequencer.c:853 #, fuzzy, c-format msgid "unknown variable '%s'" msgstr "Formato de arquivo desconhecido '%s'" -#: sequencer.c:828 +#: sequencer.c:858 msgid "missing 'GIT_AUTHOR_NAME'" msgstr "" -#: sequencer.c:830 +#: sequencer.c:860 msgid "missing 'GIT_AUTHOR_EMAIL'" msgstr "" -#: sequencer.c:832 +#: sequencer.c:862 msgid "missing 'GIT_AUTHOR_DATE'" msgstr "" -#: sequencer.c:897 +#: sequencer.c:927 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -6851,11 +6993,11 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:1178 +#: sequencer.c:1208 msgid "'prepare-commit-msg' hook failed" msgstr "" -#: sequencer.c:1184 +#: sequencer.c:1214 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6881,7 +7023,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1197 +#: sequencer.c:1227 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6905,365 +7047,365 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1239 +#: sequencer.c:1269 msgid "couldn't look up newly created commit" msgstr "não foi possível consultar o commit recém-criado" -#: sequencer.c:1241 +#: sequencer.c:1271 msgid "could not parse newly created commit" msgstr "não foi possível analisar o commit recém-criado" -#: sequencer.c:1287 +#: sequencer.c:1317 #, fuzzy msgid "unable to resolve HEAD after creating commit" -msgstr "não foi possível resolver o commit HEAD\n" +msgstr "não foi possível resolver o commit HEAD" -#: sequencer.c:1289 +#: sequencer.c:1319 msgid "detached HEAD" msgstr "HEAD destacada" -#: sequencer.c:1293 +#: sequencer.c:1323 msgid " (root-commit)" msgstr " (commit-raiz)" -#: sequencer.c:1314 +#: sequencer.c:1344 #, fuzzy msgid "could not parse HEAD" msgstr "não foi possível ler HEAD" -#: sequencer.c:1316 +#: sequencer.c:1346 #, fuzzy, c-format msgid "HEAD %s is not a commit!" msgstr "%s %s não é um commit!" -#: sequencer.c:1320 sequencer.c:1395 builtin/commit.c:1577 +#: sequencer.c:1350 sequencer.c:1425 builtin/commit.c:1577 msgid "could not parse HEAD commit" msgstr "não foi possível analisar o commit HEAD" -#: sequencer.c:1373 sequencer.c:2067 +#: sequencer.c:1403 sequencer.c:2100 #, fuzzy msgid "unable to parse commit author" msgstr "não foi possível analisar o commit %s" -#: sequencer.c:1384 builtin/am.c:1580 builtin/merge.c:692 +#: sequencer.c:1414 builtin/am.c:1566 builtin/merge.c:701 msgid "git write-tree failed to write a tree" msgstr "git write-tree falhou ao escrever uma árvore" -#: sequencer.c:1417 sequencer.c:1535 +#: sequencer.c:1447 sequencer.c:1565 #, fuzzy, c-format msgid "unable to read commit message from '%s'" msgstr "não foi possível ler a mensagem de commit de %s" -#: sequencer.c:1446 sequencer.c:1478 +#: sequencer.c:1476 sequencer.c:1508 #, fuzzy, c-format msgid "invalid author identity '%s'" msgstr "caminho inválido '%s'" -#: sequencer.c:1452 +#: sequencer.c:1482 msgid "corrupt author: missing date information" msgstr "" -#: sequencer.c:1491 builtin/am.c:1606 builtin/commit.c:1678 builtin/merge.c:890 -#: builtin/merge.c:915 +#: sequencer.c:1521 builtin/am.c:1593 builtin/commit.c:1678 builtin/merge.c:904 +#: builtin/merge.c:929 t/helper/test-fast-rebase.c:78 msgid "failed to write commit object" msgstr "falha ao escrever objeto de commit" -#: sequencer.c:1518 sequencer.c:4237 +#: sequencer.c:1548 sequencer.c:4283 t/helper/test-fast-rebase.c:198 #, c-format msgid "could not update %s" msgstr "não foi possível atualizar %s" -#: sequencer.c:1567 +#: sequencer.c:1597 #, fuzzy, c-format msgid "could not parse commit %s" msgstr "não foi possível analisar o commit %s\n" -#: sequencer.c:1572 +#: sequencer.c:1602 #, fuzzy, c-format msgid "could not parse parent commit %s" msgstr "não foi possível analisar o commit pai %s\n" -#: sequencer.c:1655 sequencer.c:1766 +#: sequencer.c:1685 sequencer.c:1796 #, c-format msgid "unknown command: %d" msgstr "comando desconhecido: %d" -#: sequencer.c:1713 sequencer.c:1738 +#: sequencer.c:1743 sequencer.c:1768 #, c-format msgid "This is a combination of %d commits." msgstr "Isto é a combinação de %d commits." -#: sequencer.c:1723 +#: sequencer.c:1753 msgid "need a HEAD to fixup" msgstr "necessária uma HEAD para fixup" -#: sequencer.c:1725 sequencer.c:3338 +#: sequencer.c:1755 sequencer.c:3372 msgid "could not read HEAD" msgstr "não foi possível ler HEAD" -#: sequencer.c:1727 +#: sequencer.c:1757 msgid "could not read HEAD's commit message" msgstr "não foi possível ler a mensagem de commit de HEAD" -#: sequencer.c:1733 +#: sequencer.c:1763 #, c-format msgid "cannot write '%s'" msgstr "não é possível escrever '%s'" -#: sequencer.c:1740 git-rebase--preserve-merges.sh:486 +#: sequencer.c:1770 git-rebase--preserve-merges.sh:486 msgid "This is the 1st commit message:" msgstr "Esta é a 1ª mensagem de commit:" -#: sequencer.c:1748 +#: sequencer.c:1778 #, c-format msgid "could not read commit message of %s" msgstr "não foi possível ler a mensagem de commit de %s" -#: sequencer.c:1755 +#: sequencer.c:1785 #, c-format msgid "This is the commit message #%d:" msgstr "Esta é a mensagem de commit nº%d:" -#: sequencer.c:1761 +#: sequencer.c:1791 #, c-format msgid "The commit message #%d will be skipped:" msgstr "A mensagem de commit #%d será ignorada:" -#: sequencer.c:1849 +#: sequencer.c:1879 msgid "your index file is unmerged." msgstr "ficheiro de índice não integrado." -#: sequencer.c:1856 +#: sequencer.c:1886 #, fuzzy msgid "cannot fixup root commit" msgstr "não é possível encontrar o commit %s (%s)" -#: sequencer.c:1875 +#: sequencer.c:1905 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "o commit %s é uma integração mas não foi fornecida a opção -m." -#: sequencer.c:1883 sequencer.c:1891 +#: sequencer.c:1913 sequencer.c:1921 #, c-format msgid "commit %s does not have parent %d" msgstr "o commit %s não tem o pai %d" -#: sequencer.c:1897 +#: sequencer.c:1927 #, c-format msgid "cannot get commit message for %s" msgstr "não é possível obter a mensagem de commit de %s" #. TRANSLATORS: The first %s will be a "todo" command like #. "revert" or "pick", the second %s a SHA1. -#: sequencer.c:1916 +#: sequencer.c:1946 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: não foi possível analisar o commit pai %s" -#: sequencer.c:1981 +#: sequencer.c:2011 #, c-format msgid "could not rename '%s' to '%s'" msgstr "não foi possível mudar o nome de '%s' para '%s'" -#: sequencer.c:2038 +#: sequencer.c:2071 #, c-format msgid "could not revert %s... %s" msgstr "não foi possível reverter %s... %s" -#: sequencer.c:2039 +#: sequencer.c:2072 #, c-format msgid "could not apply %s... %s" msgstr "não foi possível aplicar %s... %s" -#: sequencer.c:2059 +#: sequencer.c:2092 #, c-format msgid "dropping %s %s -- patch contents already upstream\n" msgstr "" -#: sequencer.c:2117 +#: sequencer.c:2150 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: falha ao ler o índice" -#: sequencer.c:2124 +#: sequencer.c:2157 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: falha ao atualizar o índice" -#: sequencer.c:2201 +#: sequencer.c:2234 #, fuzzy, c-format msgid "%s does not accept arguments: '%s'" msgstr "%%(body) não leva argumentos" -#: sequencer.c:2210 +#: sequencer.c:2243 #, fuzzy, c-format msgid "missing arguments for %s" msgstr "falta o objeto %s de %s" -#: sequencer.c:2241 +#: sequencer.c:2274 #, fuzzy, c-format msgid "could not parse '%s'" msgstr "não foi possível analisar %s" -#: sequencer.c:2302 +#: sequencer.c:2335 #, c-format msgid "invalid line %d: %.*s" msgstr "linha %d inválida: %.*s" -#: sequencer.c:2313 +#: sequencer.c:2346 #, c-format msgid "cannot '%s' without a previous commit" msgstr "não é possível efetuar '%s' sem um commit anterior" -#: sequencer.c:2399 +#: sequencer.c:2432 #, fuzzy msgid "cancelling a cherry picking in progress" -msgstr "nenhum cherry-pick ou revert em curso" +msgstr "cancelando um cherry picking em curso" -#: sequencer.c:2408 +#: sequencer.c:2441 #, fuzzy msgid "cancelling a revert in progress" -msgstr "nenhum cherry-pick ou revert em curso" +msgstr "cancelando uma reversão em curso" -#: sequencer.c:2452 +#: sequencer.c:2485 msgid "please fix this using 'git rebase --edit-todo'." msgstr "corrija-o usando 'git rebase --edit-todo'." -#: sequencer.c:2454 +#: sequencer.c:2487 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "folha de instruções inutilizável: '%s'" -#: sequencer.c:2459 +#: sequencer.c:2492 msgid "no commits parsed." -msgstr "nenhum commit analisado." +msgstr "commits nenhuns analisados." -#: sequencer.c:2470 +#: sequencer.c:2503 msgid "cannot cherry-pick during a revert." msgstr "não é possível efetuar cherry-pick durante uma reversão." -#: sequencer.c:2472 +#: sequencer.c:2505 msgid "cannot revert during a cherry-pick." msgstr "não é possível reverter durante um cherry-pick." -#: sequencer.c:2550 +#: sequencer.c:2583 #, c-format msgid "invalid value for %s: %s" msgstr "valor inválido de %s: %s" -#: sequencer.c:2657 +#: sequencer.c:2690 msgid "unusable squash-onto" msgstr "" -#: sequencer.c:2677 +#: sequencer.c:2710 #, c-format msgid "malformed options sheet: '%s'" msgstr "folha de opções malformada: '%s'" -#: sequencer.c:2769 sequencer.c:4609 +#: sequencer.c:2803 sequencer.c:4636 msgid "empty commit set passed" msgstr "o conjunto de commits especificado está vazio" -#: sequencer.c:2786 +#: sequencer.c:2820 #, fuzzy msgid "revert is already in progress" msgstr "cherry-pick ou revert em curso" -#: sequencer.c:2788 +#: sequencer.c:2822 #, fuzzy, c-format msgid "try \"git revert (--continue | %s--abort | --quit)\"" msgstr "tente \"git cherry-pick (--continue | --quit |--abort)\"" -#: sequencer.c:2791 +#: sequencer.c:2825 #, fuzzy msgid "cherry-pick is already in progress" msgstr "cherry-pick ou revert em curso" -#: sequencer.c:2793 +#: sequencer.c:2827 #, fuzzy, c-format msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" msgstr "tente \"git cherry-pick (--continue | --quit |--abort)\"" -#: sequencer.c:2807 +#: sequencer.c:2841 #, c-format msgid "could not create sequencer directory '%s'" msgstr "não foi possível criar o diretório do sequenciador '%s'" -#: sequencer.c:2822 +#: sequencer.c:2856 msgid "could not lock HEAD" msgstr "não foi possível bloquear HEAD" -#: sequencer.c:2882 sequencer.c:4325 +#: sequencer.c:2916 sequencer.c:4371 msgid "no cherry-pick or revert in progress" -msgstr "nenhum cherry-pick ou revert em curso" +msgstr "sem cherry-pick ou revert em curso" -#: sequencer.c:2884 sequencer.c:2895 +#: sequencer.c:2918 sequencer.c:2929 msgid "cannot resolve HEAD" msgstr "não é possível resolver HEAD" -#: sequencer.c:2886 sequencer.c:2930 +#: sequencer.c:2920 sequencer.c:2964 msgid "cannot abort from a branch yet to be born" msgstr "não é possível abortar um ramo ainda não criado" -#: sequencer.c:2916 builtin/grep.c:745 +#: sequencer.c:2950 builtin/grep.c:756 #, c-format msgid "cannot open '%s'" msgstr "não é possível abrir '%s'" -#: sequencer.c:2918 +#: sequencer.c:2952 #, c-format msgid "cannot read '%s': %s" msgstr "não é possível ler '%s': %s" -#: sequencer.c:2919 +#: sequencer.c:2953 msgid "unexpected end of file" msgstr "fim de ficheiro inesperado" -#: sequencer.c:2925 +#: sequencer.c:2959 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "o ficheiro HEAD de pre-cherry-pick '%s' está corrompido" -#: sequencer.c:2936 +#: sequencer.c:2970 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "Parece que a HEAD se moveu. Não recuando, verifique a HEAD." -#: sequencer.c:2977 +#: sequencer.c:3011 #, fuzzy msgid "no revert in progress" msgstr "Rebase não está em curso?" -#: sequencer.c:2986 +#: sequencer.c:3020 #, fuzzy msgid "no cherry-pick in progress" -msgstr "nenhum cherry-pick ou revert em curso" +msgstr "cherry-pick nenhum em curso" -#: sequencer.c:2996 +#: sequencer.c:3030 #, fuzzy msgid "failed to skip the commit" msgstr "falha ao escrever objeto de commit" -#: sequencer.c:3003 +#: sequencer.c:3037 msgid "there is nothing to skip" msgstr "" -#: sequencer.c:3006 +#: sequencer.c:3040 #, c-format msgid "" "have you committed already?\n" "try \"git %s --continue\"" msgstr "" -#: sequencer.c:3168 sequencer.c:4217 +#: sequencer.c:3202 sequencer.c:4263 msgid "cannot read HEAD" msgstr "não é possível ler HEAD" -#: sequencer.c:3185 +#: sequencer.c:3219 #, fuzzy, c-format msgid "unable to copy '%s' to '%s'" msgstr "não foi possível copiar '%s' para '%s'" -#: sequencer.c:3193 +#: sequencer.c:3227 #, fuzzy, c-format msgid "" "You can amend the commit now, with\n" @@ -7276,33 +7418,33 @@ msgid "" msgstr "" "Pode emendar o commit agora, com\n" "\n" -"\tgit commit --amend $gpg_sign_opt_quoted\n" +" git commit --amend %s\n" "\n" "Assim que estiver satisfeito com as alterações, execute\n" "\n" -"\tgit rebase --continue" +" git rebase --continue\n" -#: sequencer.c:3203 +#: sequencer.c:3237 #, fuzzy, c-format msgid "Could not apply %s... %.*s" msgstr "não foi possível aplicar %s... %s" -#: sequencer.c:3210 +#: sequencer.c:3244 #, fuzzy, c-format msgid "Could not merge %.*s" msgstr "Não foi possível ler %s." -#: sequencer.c:3224 sequencer.c:3228 builtin/difftool.c:641 +#: sequencer.c:3258 sequencer.c:3262 builtin/difftool.c:640 #, c-format msgid "could not copy '%s' to '%s'" msgstr "não foi possível copiar '%s' para '%s'" -#: sequencer.c:3240 +#: sequencer.c:3274 #, fuzzy, c-format msgid "Executing: %s\n" -msgstr "A executar: $rest" +msgstr "A executar: %s\n" -#: sequencer.c:3255 +#: sequencer.c:3289 #, c-format msgid "" "execution failed: %s\n" @@ -7317,11 +7459,11 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3261 +#: sequencer.c:3295 msgid "and made changes to the index and/or the working tree\n" msgstr "e fez alterações ao índice e/ou à árvore de trabalho\n" -#: sequencer.c:3267 +#: sequencer.c:3301 #, c-format msgid "" "execution succeeded: %s\n" @@ -7338,136 +7480,128 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3328 +#: sequencer.c:3362 #, fuzzy, c-format msgid "illegal label name: '%.*s'" msgstr "nome de ficheiro malformado: %.*s" -#: sequencer.c:3382 +#: sequencer.c:3416 #, fuzzy msgid "writing fake root commit" -msgstr "não há nada para submeter\n" +msgstr "não há nada para submeter" -#: sequencer.c:3387 +#: sequencer.c:3421 msgid "writing squash-onto" msgstr "" -#: sequencer.c:3471 +#: sequencer.c:3505 #, fuzzy, c-format msgid "could not resolve '%s'" msgstr "não foi possível remover '%s'" -#: sequencer.c:3502 +#: sequencer.c:3538 #, fuzzy msgid "cannot merge without a current revision" msgstr "não é possível efetuar '%s' sem um commit anterior" -#: sequencer.c:3524 +#: sequencer.c:3560 #, fuzzy, c-format msgid "unable to parse '%.*s'" msgstr "não foi possível criar '%s'" -#: sequencer.c:3533 +#: sequencer.c:3569 #, fuzzy, c-format msgid "nothing to merge: '%.*s'" -msgstr "ignorado não integrado: %s\n" +msgstr "ignorado não integrado: '%.*s'" -#: sequencer.c:3545 +#: sequencer.c:3581 msgid "octopus merge cannot be executed on top of a [new root]" msgstr "" -#: sequencer.c:3561 +#: sequencer.c:3597 #, fuzzy, c-format msgid "could not get commit message of '%s'" msgstr "não foi possível ler a mensagem de commit de %s" -#: sequencer.c:3730 +#: sequencer.c:3780 #, fuzzy, c-format msgid "could not even attempt to merge '%.*s'" msgstr "não foi possível validar a tag '%s'" -#: sequencer.c:3746 +#: sequencer.c:3796 #, fuzzy msgid "merge: Unable to write new index file" msgstr "%s: Não foi possível escrever novo ficheiro de índice" -#: sequencer.c:3820 +#: sequencer.c:3870 msgid "Cannot autostash" msgstr "Não é possível empilhar automaticamente (autostash)" -#: sequencer.c:3823 +#: sequencer.c:3873 #, fuzzy, c-format msgid "Unexpected stash response: '%s'" -msgstr "" -"1ª linha inesperada da mensagem de squash:\n" -"\n" -"\t%.*s" +msgstr "Resposta de squash inexperada: '%s'" -#: sequencer.c:3829 +#: sequencer.c:3879 #, fuzzy, c-format msgid "Could not create directory for '%s'" msgstr "Não foi possível criar o diretório '%s'" -#: sequencer.c:3832 +#: sequencer.c:3882 #, fuzzy, c-format msgid "Created autostash: %s\n" -msgstr "Pilha automática (autostash) criada: $stash_abbrev" +msgstr "Criado autostash: %s\n" -#: sequencer.c:3836 +#: sequencer.c:3886 #, fuzzy msgid "could not reset --hard" msgstr "não foi possível ler orig-head" -#: sequencer.c:3861 +#: sequencer.c:3911 #, fuzzy, c-format msgid "Applied autostash.\n" -msgstr "Pilha automática (autostash) aplicada." +msgstr "Autostash aplicado.\n" -#: sequencer.c:3873 +#: sequencer.c:3923 #, c-format msgid "cannot store %s" msgstr "não é possível guardar %s" -#: sequencer.c:3876 +#: sequencer.c:3926 #, fuzzy, c-format msgid "" "%s\n" "Your changes are safe in the stash.\n" "You can run \"git stash pop\" or \"git stash drop\" at any time.\n" msgstr "" -"Surgiram conflitos ao aplicar a pilha automática (autostash).\n" +"%s\n" "As suas alterações estão guardadas na pilha.\n" "Pode executar \"git stash pop\" ou \"git stash drop\" oportunamente.\n" -#: sequencer.c:3881 +#: sequencer.c:3931 #, fuzzy msgid "Applying autostash resulted in conflicts." -msgstr "Patch aplicado a '%s' com conflitos.\n" +msgstr "Patch aplicado a '%s' com conflitos." -#: sequencer.c:3882 +#: sequencer.c:3932 msgid "Autostash exists; creating a new stash entry." msgstr "" -#: sequencer.c:3974 -#, fuzzy, c-format -msgid "%s: not a valid OID" -msgstr "'%s' não é uma referência válida." - -#: sequencer.c:3979 git-rebase--preserve-merges.sh:769 +#: sequencer.c:4025 git-rebase--preserve-merges.sh:769 msgid "could not detach HEAD" msgstr "não foi possível destacar HEAD" -#: sequencer.c:3994 +#: sequencer.c:4040 #, fuzzy, c-format msgid "Stopped at HEAD\n" -msgstr "Parou a %s... %.*s\n" +msgstr "Parou no HEAD\n" -#: sequencer.c:3996 +#: sequencer.c:4042 #, fuzzy, c-format msgid "Stopped at %s\n" msgstr "Parou a %s... %.*s\n" -#: sequencer.c:4004 +#: sequencer.c:4050 #, c-format msgid "" "Could not execute the todo command\n" @@ -7480,58 +7614,58 @@ msgid "" " git rebase --continue\n" msgstr "" -#: sequencer.c:4050 +#: sequencer.c:4096 #, c-format msgid "Rebasing (%d/%d)%s" msgstr "" -#: sequencer.c:4095 +#: sequencer.c:4141 #, c-format msgid "Stopped at %s... %.*s\n" -msgstr "Parou a %s... %.*s\n" +msgstr "Parou no %s... %.*s\n" -#: sequencer.c:4166 +#: sequencer.c:4212 #, c-format msgid "unknown command %d" msgstr "comando desconhecido %d" -#: sequencer.c:4225 +#: sequencer.c:4271 msgid "could not read orig-head" msgstr "não foi possível ler orig-head" -#: sequencer.c:4230 +#: sequencer.c:4276 msgid "could not read 'onto'" msgstr "não foi possível ler 'onto'" -#: sequencer.c:4244 +#: sequencer.c:4290 #, c-format msgid "could not update HEAD to %s" msgstr "não foi possível atualizar HEAD para %s" -#: sequencer.c:4304 +#: sequencer.c:4350 #, fuzzy, c-format msgid "Successfully rebased and updated %s.\n" -msgstr "$head_name rebaseado e atualizado com sucesso." +msgstr "O %s foi rebaseado e atualizado com sucesso.\n" -#: sequencer.c:4337 +#: sequencer.c:4383 msgid "cannot rebase: You have unstaged changes." msgstr "não é possível rebasear: tem alterações não preparadas." -#: sequencer.c:4346 +#: sequencer.c:4392 msgid "cannot amend non-existing commit" msgstr "não é possível emendar commit não-existente" -#: sequencer.c:4348 +#: sequencer.c:4394 #, c-format msgid "invalid file: '%s'" msgstr "ficheiro inválido: '%s'" -#: sequencer.c:4350 +#: sequencer.c:4396 #, c-format msgid "invalid contents: '%s'" msgstr "conteúdo inválido: '%s'" -#: sequencer.c:4353 +#: sequencer.c:4399 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -7541,57 +7675,52 @@ msgstr "" "Tem alterações por submeter na árvore de trabalho. Submeta-as primeiro\n" "e execute 'git rebase --continue' de novo." -#: sequencer.c:4389 sequencer.c:4428 +#: sequencer.c:4435 sequencer.c:4474 #, fuzzy, c-format msgid "could not write file: '%s'" msgstr "não foi possível criar o ficheiro '%s'" -#: sequencer.c:4444 +#: sequencer.c:4490 msgid "could not remove CHERRY_PICK_HEAD" msgstr "não foi possível remover CHERRY_PICK_HEAD" -#: sequencer.c:4451 +#: sequencer.c:4497 msgid "could not commit staged changes." msgstr "não foi possível submeter as alterações preparadas." -#: sequencer.c:4477 -#, fuzzy, c-format -msgid "invalid committer '%s'" -msgstr "commit inválido %s" - -#: sequencer.c:4586 +#: sequencer.c:4613 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: não é possível efetuar cherry-pick de %s" -#: sequencer.c:4590 +#: sequencer.c:4617 #, c-format msgid "%s: bad revision" msgstr "%s: revisão incorreta" -#: sequencer.c:4625 +#: sequencer.c:4652 msgid "can't revert as initial commit" msgstr "não é possível reverter como commit inicial" -#: sequencer.c:5102 +#: sequencer.c:5129 msgid "make_script: unhandled options" msgstr "" -#: sequencer.c:5105 +#: sequencer.c:5132 msgid "make_script: error preparing revisions" msgstr "" -#: sequencer.c:5347 sequencer.c:5364 +#: sequencer.c:5374 sequencer.c:5391 #, fuzzy msgid "nothing to do" -msgstr "não há nada para submeter\n" +msgstr "há nada a fazer" -#: sequencer.c:5383 +#: sequencer.c:5410 #, fuzzy msgid "could not skip unnecessary pick commands" msgstr "Não foi possível saltar comandos pick desnecessários" -#: sequencer.c:5480 +#: sequencer.c:5504 msgid "the script was already rearranged." msgstr "" @@ -7606,9 +7735,9 @@ msgid "" "%s: no such path in the working tree.\n" "Use 'git <command> -- <path>...' to specify paths that do not exist locally." msgstr "" -"%s: não há tal caminho na árvore de trabalho.\n" -"Use 'git <comando> -- <caminho>...' para especificar caminhos que não " -"existem localmente." +"%s: sem tal path na working tree.\n" +"Use 'git <comando> -- <path>...' para especificar caminhos inexistentes " +"localmente." #: setup.c:198 #, c-format @@ -7764,269 +7893,269 @@ msgstr "falha ao invocar fseek" msgid "setsid failed" msgstr "falha ao executar o comando stash" -#: sha1-file.c:470 +#: sha1-file.c:480 #, c-format msgid "object directory %s does not exist; check .git/objects/info/alternates" msgstr "" -#: sha1-file.c:521 +#: sha1-file.c:531 #, fuzzy, c-format msgid "unable to normalize alternate object path: %s" msgstr "não foi possível analisar o objeto: %s" -#: sha1-file.c:593 +#: sha1-file.c:603 #, c-format msgid "%s: ignoring alternate object stores, nesting too deep" msgstr "" -#: sha1-file.c:600 +#: sha1-file.c:610 #, fuzzy, c-format msgid "unable to normalize object directory: %s" msgstr "não foi possível analisar o objeto: %s" -#: sha1-file.c:643 +#: sha1-file.c:653 #, fuzzy msgid "unable to fdopen alternates lockfile" msgstr "não foi possível escrever os parâmetros no ficheiro de configuração" -#: sha1-file.c:661 +#: sha1-file.c:671 #, fuzzy msgid "unable to read alternates file" msgstr "não foi possível ler o ficheiro de índice" -#: sha1-file.c:668 +#: sha1-file.c:678 #, fuzzy msgid "unable to move new alternates file into place" msgstr "não foi possível escrever novo ficheiro de índice" -#: sha1-file.c:703 +#: sha1-file.c:713 #, c-format msgid "path '%s' does not exist" msgstr "o caminho '%s' não existe" -#: sha1-file.c:724 +#: sha1-file.c:734 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "" "ainda não é suportada a funcionalidade que permite ter o repositório de " "referência '%s' como uma extração ligada." -#: sha1-file.c:730 +#: sha1-file.c:740 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "o repositório de referência '%s' não é um repositório local." -#: sha1-file.c:736 +#: sha1-file.c:746 #, c-format msgid "reference repository '%s' is shallow" msgstr "o repositório de referência '%s' é raso" -#: sha1-file.c:744 +#: sha1-file.c:754 #, c-format msgid "reference repository '%s' is grafted" msgstr "o repositório de referência '%s' está enxertado" -#: sha1-file.c:804 +#: sha1-file.c:814 #, c-format msgid "invalid line while parsing alternate refs: %s" msgstr "" -#: sha1-file.c:954 +#: sha1-file.c:964 #, c-format msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" msgstr "" -#: sha1-file.c:975 +#: sha1-file.c:985 #, fuzzy msgid "mmap failed" msgstr "%s falhou" -#: sha1-file.c:1139 +#: sha1-file.c:1149 #, fuzzy, c-format msgid "object file %s is empty" msgstr "objeto local %s corrompido" -#: sha1-file.c:1274 sha1-file.c:2467 +#: sha1-file.c:1284 sha1-file.c:2477 #, fuzzy, c-format msgid "corrupt loose object '%s'" msgstr "não foi possível analisar o objeto '%s'" -#: sha1-file.c:1276 sha1-file.c:2471 +#: sha1-file.c:1286 sha1-file.c:2481 #, fuzzy, c-format msgid "garbage at end of loose object '%s'" msgstr "não foi possível analisar o objeto: %s" -#: sha1-file.c:1318 +#: sha1-file.c:1328 #, fuzzy msgid "invalid object type" msgstr "tipo de objeto incorreto." -#: sha1-file.c:1402 +#: sha1-file.c:1412 #, c-format msgid "unable to unpack %s header with --allow-unknown-type" msgstr "" -#: sha1-file.c:1405 +#: sha1-file.c:1415 #, fuzzy, c-format msgid "unable to unpack %s header" msgstr "não foi possível atualizar %s" -#: sha1-file.c:1411 +#: sha1-file.c:1421 #, c-format msgid "unable to parse %s header with --allow-unknown-type" msgstr "" -#: sha1-file.c:1414 +#: sha1-file.c:1424 #, fuzzy, c-format msgid "unable to parse %s header" msgstr "não foi possível atualizar %s" -#: sha1-file.c:1641 +#: sha1-file.c:1651 #, fuzzy, c-format msgid "failed to read object %s" msgstr "falha ao ler o objeto '%s'." -#: sha1-file.c:1645 +#: sha1-file.c:1655 #, fuzzy, c-format msgid "replacement %s not found for %s" msgstr "modelos não encontrados em %s" -#: sha1-file.c:1649 +#: sha1-file.c:1659 #, fuzzy, c-format msgid "loose object %s (stored in %s) is corrupt" msgstr "objeto local %s corrompido" -#: sha1-file.c:1653 +#: sha1-file.c:1663 #, fuzzy, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "objeto local %s corrompido" -#: sha1-file.c:1758 +#: sha1-file.c:1768 #, fuzzy, c-format msgid "unable to write file %s" msgstr "não foi possível escrever %s" -#: sha1-file.c:1765 +#: sha1-file.c:1775 #, fuzzy, c-format msgid "unable to set permission to '%s'" msgstr "não foi possível resolver revisão: %s" -#: sha1-file.c:1772 +#: sha1-file.c:1782 #, fuzzy msgid "file write error" msgstr "falha ao escrever para rev-list" -#: sha1-file.c:1792 +#: sha1-file.c:1802 #, fuzzy msgid "error when closing loose object file" msgstr "erro ao fechar ficheiro de pacote" -#: sha1-file.c:1857 +#: sha1-file.c:1867 #, c-format msgid "insufficient permission for adding an object to repository database %s" msgstr "" -#: sha1-file.c:1859 +#: sha1-file.c:1869 #, fuzzy msgid "unable to create temporary file" msgstr "não foi possível criar índice temporário" -#: sha1-file.c:1883 +#: sha1-file.c:1893 #, fuzzy msgid "unable to write loose object file" msgstr "não é possível escrever o objeto de nota" -#: sha1-file.c:1889 +#: sha1-file.c:1899 #, fuzzy, c-format msgid "unable to deflate new object %s (%d)" msgstr "não é possível compactar objeto acrescentado (%d)" -#: sha1-file.c:1893 +#: sha1-file.c:1903 #, fuzzy, c-format msgid "deflateEnd on object %s failed (%d)" msgstr "falha de fstat de %s" -#: sha1-file.c:1897 +#: sha1-file.c:1907 #, c-format msgid "confused by unstable object source data for %s" msgstr "" -#: sha1-file.c:1907 builtin/pack-objects.c:1086 +#: sha1-file.c:1917 builtin/pack-objects.c:1086 #, fuzzy, c-format msgid "failed utime() on %s" msgstr "falha ao abrir '%s'" -#: sha1-file.c:1984 +#: sha1-file.c:1994 #, fuzzy, c-format msgid "cannot read object for %s" msgstr "não foi possível ler o objeto %s" -#: sha1-file.c:2035 +#: sha1-file.c:2045 #, fuzzy msgid "corrupt commit" msgstr "substituir autor do commit" -#: sha1-file.c:2043 +#: sha1-file.c:2053 #, fuzzy msgid "corrupt tag" msgstr "mostrar tags" -#: sha1-file.c:2143 +#: sha1-file.c:2153 #, c-format msgid "read error while indexing %s" msgstr "" -#: sha1-file.c:2146 +#: sha1-file.c:2156 #, fuzzy, c-format msgid "short read while indexing %s" msgstr "não é possível ler o índice" -#: sha1-file.c:2219 sha1-file.c:2229 +#: sha1-file.c:2229 sha1-file.c:2239 #, fuzzy, c-format msgid "%s: failed to insert into database" msgstr "gpg não assinou os dados" -#: sha1-file.c:2235 +#: sha1-file.c:2245 #, fuzzy, c-format msgid "%s: unsupported file type" msgstr "versão de índice %s não suportada" -#: sha1-file.c:2259 +#: sha1-file.c:2269 #, fuzzy, c-format msgid "%s is not a valid object" msgstr "%s não é um objeto '%s' válido" -#: sha1-file.c:2261 +#: sha1-file.c:2271 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s não é um objeto '%s' válido" -#: sha1-file.c:2288 builtin/index-pack.c:192 +#: sha1-file.c:2298 builtin/index-pack.c:192 #, c-format msgid "unable to open %s" msgstr "não foi possível abrir %s" -#: sha1-file.c:2478 sha1-file.c:2531 +#: sha1-file.c:2488 sha1-file.c:2541 #, c-format msgid "hash mismatch for %s (expected %s)" msgstr "" -#: sha1-file.c:2502 +#: sha1-file.c:2512 #, fuzzy, c-format msgid "unable to mmap %s" msgstr "não foi possível abrir %s" -#: sha1-file.c:2507 +#: sha1-file.c:2517 #, fuzzy, c-format msgid "unable to unpack header of %s" msgstr "não foi possível atualizar %s" -#: sha1-file.c:2513 +#: sha1-file.c:2523 #, fuzzy, c-format msgid "unable to parse header of %s" msgstr "não foi possível ler %s" -#: sha1-file.c:2524 +#: sha1-file.c:2534 #, fuzzy, c-format msgid "unable to unpack contents of %s" msgstr "não é possível analisar o contacto: %s" @@ -8181,8 +8310,8 @@ msgid_plural "%u bytes/s" msgstr[0] "bytes" msgstr[1] "bytes" -#: strbuf.c:1166 wrapper.c:199 wrapper.c:369 builtin/am.c:733 -#: builtin/rebase.c:858 +#: strbuf.c:1166 wrapper.c:199 wrapper.c:369 builtin/am.c:719 +#: builtin/rebase.c:864 #, c-format msgid "could not open '%s' for writing" msgstr "não foi possível abrir '%s' para escrita" @@ -8283,29 +8412,31 @@ msgstr "Falha ao resolver HEAD numa referência válida." #: submodule.c:1167 #, fuzzy, c-format msgid "Pushing submodule '%s'\n" -msgstr "A ignorar submódulo '%s'" +msgstr "A ignorar submódulo '%s'\n" #: submodule.c:1170 #, fuzzy, c-format msgid "Unable to push submodule '%s'\n" -msgstr "Não foi possível extrair o submódulo '$sm_path'" +msgstr "Impossível enviar submódulo '%s'\n" #: submodule.c:1462 #, fuzzy, c-format msgid "Fetching submodule %s%s\n" -msgstr "A ignorar submódulo '%s'" +msgstr "Buscando submódulo %s%s\n" #: submodule.c:1492 #, fuzzy, c-format msgid "Could not access submodule '%s'\n" -msgstr "não foi possível percorrer recursivamente o submódulo '%s'" +msgstr "Submódulo '%s' inacessível\n" #: submodule.c:1646 #, fuzzy, c-format msgid "" "Errors during submodule fetch:\n" "%s" -msgstr "percorrer submódulos recursivamente" +msgstr "" +"Erros na busca do submódulo:\n" +"%s" #: submodule.c:1671 #, c-format @@ -8411,7 +8542,7 @@ msgstr "falha ao executar o comando trailer '%s'" msgid "unknown value '%s' for key '%s'" msgstr "valor desconhecido '%s' da chave '%s'" -#: trailer.c:537 trailer.c:542 builtin/remote.c:298 builtin/remote.c:323 +#: trailer.c:537 trailer.c:542 builtin/remote.c:299 builtin/remote.c:324 #, c-format msgid "more than one %s" msgstr "mais do que um %s" @@ -8499,7 +8630,7 @@ msgstr "não foi possível executar o comando stash." msgid "error while running fast-import" msgstr "erro ao fechar ficheiro de pacote" -#: transport-helper.c:549 transport-helper.c:1226 +#: transport-helper.c:549 transport-helper.c:1236 #, fuzzy, c-format msgid "could not read ref %s" msgstr "Não foi possível ler a referência %s" @@ -8518,7 +8649,7 @@ msgstr "" msgid "invalid remote service path" msgstr "referência inválida: %s" -#: transport-helper.c:661 transport.c:1428 +#: transport-helper.c:661 transport.c:1446 #, fuzzy msgid "operation not supported by protocol" msgstr "opção não suportada com --recurse-submodules." @@ -8537,108 +8668,113 @@ msgstr "" msgid "expected ok/error, helper said '%s'" msgstr "blob para %s '%s' esperado" -#: transport-helper.c:841 +#: transport-helper.c:845 #, fuzzy, c-format msgid "helper reported unexpected status of %s" msgstr "ls-tree retornou código de retorno inesperado %d" -#: transport-helper.c:924 +#: transport-helper.c:928 #, fuzzy, c-format msgid "helper %s does not support dry-run" msgstr "O servidor não suporta --deepen" -#: transport-helper.c:927 +#: transport-helper.c:931 #, fuzzy, c-format msgid "helper %s does not support --signed" msgstr "O servidor não suporta --shallow-since" -#: transport-helper.c:930 +#: transport-helper.c:934 #, fuzzy, c-format msgid "helper %s does not support --signed=if-asked" msgstr "o recetor não suporta publicação com --signed" -#: transport-helper.c:935 +#: transport-helper.c:939 #, fuzzy, c-format msgid "helper %s does not support --atomic" msgstr "O servidor não suporta --shallow-since" -#: transport-helper.c:941 +#: transport-helper.c:943 +#, fuzzy, c-format +msgid "helper %s does not support --%s" +msgstr "O servidor não suporta --shallow-since" + +#: transport-helper.c:950 #, fuzzy, c-format msgid "helper %s does not support 'push-option'" msgstr "o recetor não suporta opções de publicação" -#: transport-helper.c:1040 +#: transport-helper.c:1050 msgid "remote-helper doesn't support push; refspec needed" msgstr "" -#: transport-helper.c:1045 +#: transport-helper.c:1055 #, fuzzy, c-format msgid "helper %s does not support 'force'" msgstr "O servidor não suporta --deepen" -#: transport-helper.c:1092 +#: transport-helper.c:1102 #, fuzzy msgid "couldn't run fast-export" msgstr "não foi possível executar o comando stash." -#: transport-helper.c:1097 +#: transport-helper.c:1107 #, fuzzy msgid "error while running fast-export" msgstr "erro ao fechar ficheiro de pacote" -#: transport-helper.c:1122 +#: transport-helper.c:1132 #, c-format msgid "" "No refs in common and none specified; doing nothing.\n" "Perhaps you should specify a branch.\n" msgstr "" -#: transport-helper.c:1203 +#: transport-helper.c:1213 #, fuzzy, c-format msgid "unsupported object format '%s'" msgstr "objeto malformado em '%s'" -#: transport-helper.c:1212 +#: transport-helper.c:1222 #, fuzzy, c-format msgid "malformed response in ref list: %s" msgstr "folha de opções malformada: '%s'" -#: transport-helper.c:1364 +#: transport-helper.c:1374 #, fuzzy, c-format msgid "read(%s) failed" msgstr "%s falhou" -#: transport-helper.c:1391 +#: transport-helper.c:1401 #, fuzzy, c-format msgid "write(%s) failed" msgstr "%s falhou" -#: transport-helper.c:1440 +#: transport-helper.c:1450 #, fuzzy, c-format msgid "%s thread failed" msgstr "%s falhou" -#: transport-helper.c:1444 +#: transport-helper.c:1454 #, fuzzy, c-format msgid "%s thread failed to join: %s" msgstr "falha ao abrir '%s'" -#: transport-helper.c:1463 transport-helper.c:1467 +#: transport-helper.c:1473 transport-helper.c:1477 #, c-format msgid "can't start thread for copying data: %s" msgstr "" -#: transport-helper.c:1504 +#: transport-helper.c:1514 #, c-format msgid "%s process failed to wait" msgstr "" -#: transport-helper.c:1508 +#: transport-helper.c:1518 #, fuzzy, c-format msgid "%s process failed" msgstr "%s falhou" -#: transport-helper.c:1526 transport-helper.c:1535 +#: transport-helper.c:1536 transport-helper.c:1545 msgid "can't start thread for copying data" msgstr "" @@ -8665,39 +8801,39 @@ msgstr "" msgid "server options require protocol version 2 or later" msgstr "" -#: transport.c:712 +#: transport.c:727 #, fuzzy msgid "could not parse transport.color.* config" msgstr "não foi possível analisar o autor do script" -#: transport.c:785 +#: transport.c:802 msgid "support for protocol v2 not implemented yet" msgstr "" -#: transport.c:919 +#: transport.c:936 #, fuzzy, c-format msgid "unknown value for config '%s': %s" msgstr "valor desconhecido '%s' da chave '%s'" -#: transport.c:985 +#: transport.c:1002 #, fuzzy, c-format msgid "transport '%s' not allowed" msgstr "ramo '%s' não encontrado." -#: transport.c:1038 +#: transport.c:1055 msgid "git-over-rsync is no longer supported" msgstr "" -#: transport.c:1140 +#: transport.c:1157 #, c-format msgid "" "The following submodule paths contain changes that can\n" "not be found on any remote:\n" msgstr "" -"Os seguintes caminhos de submódulo contêm alterações que\n" -"não puderam ser encontradas a nenhum remoto:\n" +"Os seguintes paths de submódulo contêm alterações que\n" +"puderam ser encontradas em remoto nenhum:\n" -#: transport.c:1144 +#: transport.c:1161 #, c-format msgid "" "\n" @@ -8724,11 +8860,11 @@ msgstr "" "para publicá-las no remoto.\n" "\n" -#: transport.c:1152 +#: transport.c:1169 msgid "Aborting." msgstr "Abortado." -#: transport.c:1297 +#: transport.c:1315 #, fuzzy msgid "failed to push all needed submodules" msgstr "Falha ao adicionar o submódulo '$sm_path'" @@ -8847,7 +8983,7 @@ msgid "" msgstr "" "Os seguintes ficheiros não controlados na árvore de trabalho seriam " "removidos ao integrar:\n" -"%%sMova ou remova-os antes de integrar." +"%%sPor favor, mova ou remova-os antes de integrar." #: unpack-trees.c:141 #, c-format @@ -8968,7 +9104,10 @@ msgstr "" msgid "" "The following paths are unmerged and were left despite sparse patterns:\n" "%s" -msgstr "Os seguintes caminhos estão ignorados por algum ficheiro .gitignore:\n" +msgstr "" +"Os seguintes caminhos estão unmerged e foram abandonados, apesar de sparse " +"patterns:\n" +"%s" #: unpack-trees.c:182 #, c-format @@ -9007,7 +9146,7 @@ msgstr "" msgid "Updating index flags" msgstr "A atualizar %s" -#: upload-pack.c:1516 +#: upload-pack.c:1550 msgid "expected flush after fetch arguments" msgstr "" @@ -9045,7 +9184,7 @@ msgstr "segmento de caminho '..' inválido" msgid "Fetching objects" msgstr "A verificar objetos" -#: worktree.c:236 builtin/am.c:2116 +#: worktree.c:236 builtin/am.c:2103 #, c-format msgid "failed to read '%s'" msgstr "falha ao ler '%s'" @@ -9447,7 +9586,7 @@ msgstr "" #: wt-status.c:1415 #, fuzzy msgid "Cherry-pick currently in progress." -msgstr "nenhum cherry-pick ou revert em curso" +msgstr "Cherry-pick atualmente em curso" #: wt-status.c:1418 #, c-format @@ -9544,16 +9683,16 @@ msgstr "rebase em curso; sobre " #: wt-status.c:1750 msgid "Not currently on any branch." -msgstr "Não se encontra em nenhum ramo neste momento." +msgstr "Atualmente em ramo nenhum." #: wt-status.c:1767 msgid "Initial commit" -msgstr "Commit inicial" +msgstr "Memória inicial" #: wt-status.c:1768 #, fuzzy msgid "No commits yet" -msgstr "nenhum commit analisado." +msgstr "Ainda commits nenhuns" #: wt-status.c:1782 msgid "Untracked files" @@ -9591,14 +9730,13 @@ msgstr "Sem alterações" #: wt-status.c:1807 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" -msgstr "" -"nenhuma alteração adicionada para submeter (use \"git add\" e/ou \"git " +msgstr "alteração nenhuma adicionada a commit (usa \"git add\" e/ou \"git " "commit -a\")\n" #: wt-status.c:1811 #, c-format msgid "no changes added to commit\n" -msgstr "nenhuma alteração adicionada para submeter\n" +msgstr "alteração nenhuma adicionada a commit\n" #: wt-status.c:1815 #, c-format @@ -9612,28 +9750,22 @@ msgstr "" #: wt-status.c:1819 #, c-format msgid "nothing added to commit but untracked files present\n" -msgstr "" -"não foi adicionado nada para submeter, mas existem ficheiros não " -"controlados\n" +msgstr "nada adicionado para commit mas ficheiros untracked presentes\n" #: wt-status.c:1823 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" -msgstr "" -"não há nada para submeter (crie/copie ficheiros e use \"git add\" para " -"controlá-los)\n" +msgstr "nada a commit (cria/copia ficheiros e usa \"git add\" para track)\n" #: wt-status.c:1827 wt-status.c:1833 #, c-format msgid "nothing to commit\n" -msgstr "não há nada para submeter\n" +msgstr "nada a commit\n" #: wt-status.c:1830 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" -msgstr "" -"não há nada para submeter (use -u para mostrar os ficheiros não " -"controlados)\n" +msgstr "nada a commit (use -u para mostrar ficheiros untracked)\n" #: wt-status.c:1835 #, c-format @@ -9647,11 +9779,11 @@ msgstr "Nenhum comando concluído." #: wt-status.c:1944 msgid "HEAD (no branch)" -msgstr "HEAD (nenhum ramo)" +msgstr "HEAD (ramo nenhum)" #: wt-status.c:1975 msgid "different" -msgstr "" +msgstr "diferente" #: wt-status.c:1977 wt-status.c:1985 msgid "behind " @@ -9676,7 +9808,7 @@ msgstr "além disso, o índice contém alterações não submetidas." msgid "cannot %s: Your index contains uncommitted changes." msgstr "não é possível efetuar %s: o índice contém alterações não submetidas." -#: compat/precompose_utf8.c:58 builtin/clone.c:456 +#: compat/precompose_utf8.c:58 builtin/clone.c:457 #, c-format msgid "failed to unlink '%s'" msgstr "falha ao invocar unlink de '%s'" @@ -9697,13 +9829,13 @@ msgstr "falha ao atualizar os ficheiros" #: builtin/add.c:103 #, c-format msgid "remove '%s'\n" -msgstr "remover '%s'\n" +msgstr "remove '%s'\n" #: builtin/add.c:178 msgid "Unstaged changes after refreshing the index:" msgstr "Alterações não preparadas depois de atualizar o índice:" -#: builtin/add.c:272 builtin/rev-parse.c:904 +#: builtin/add.c:272 builtin/rev-parse.c:908 msgid "Could not read the index" msgstr "Não foi possível ler o índice" @@ -9739,8 +9871,8 @@ msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "Os seguintes caminhos estão ignorados por algum ficheiro .gitignore:\n" #: builtin/add.c:328 builtin/clean.c:904 builtin/fetch.c:166 builtin/mv.c:124 -#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:538 -#: builtin/remote.c:1422 builtin/rm.c:242 builtin/send-pack.c:184 +#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:559 +#: builtin/remote.c:1427 builtin/rm.c:242 builtin/send-pack.c:190 msgid "dry run" msgstr "simular ação" @@ -9748,7 +9880,7 @@ msgstr "simular ação" msgid "interactive picking" msgstr "seleção interativa" -#: builtin/add.c:332 builtin/checkout.c:1529 builtin/reset.c:308 +#: builtin/add.c:332 builtin/checkout.c:1547 builtin/reset.c:308 msgid "select hunks interactively" msgstr "selecionar blocos interativamente" @@ -9864,14 +9996,14 @@ msgstr "A opção --ignore-missing só pode ser usada em conjunto com --dry-run" msgid "--chmod param '%s' must be either -x or +x" msgstr "o parâmetro '%s' de --chmod tem de ser -x ou +x" -#: builtin/add.c:507 builtin/checkout.c:1697 builtin/commit.c:351 -#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1503 +#: builtin/add.c:507 builtin/checkout.c:1715 builtin/commit.c:351 +#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1502 #, fuzzy msgid "--pathspec-from-file is incompatible with pathspec arguments" msgstr "--patch é incompatível com --{hard,mixed,soft}" -#: builtin/add.c:514 builtin/checkout.c:1709 builtin/commit.c:357 -#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1509 +#: builtin/add.c:514 builtin/checkout.c:1727 builtin/commit.c:357 +#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1508 msgid "--pathspec-file-nul requires --pathspec-from-file" msgstr "" @@ -9887,115 +10019,110 @@ msgid "" "\"git config advice.addEmptyPathspec false\"" msgstr "" -#: builtin/am.c:160 -#, fuzzy, c-format -msgid "invalid committer: %s" -msgstr "commit inválido %s" - -#: builtin/am.c:366 +#: builtin/am.c:352 msgid "could not parse author script" msgstr "não foi possível analisar o autor do script" -#: builtin/am.c:450 +#: builtin/am.c:436 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "'%s' foi eliminado pelo hook applypatch-msg" -#: builtin/am.c:492 +#: builtin/am.c:478 #, c-format msgid "Malformed input line: '%s'." msgstr "Linha de entrada malformada: '%s'." -#: builtin/am.c:530 +#: builtin/am.c:516 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "Falha ao copiar notas de '%s' para '%s'" -#: builtin/am.c:556 +#: builtin/am.c:542 msgid "fseek failed" msgstr "falha ao invocar fseek" -#: builtin/am.c:744 +#: builtin/am.c:730 #, c-format msgid "could not parse patch '%s'" msgstr "não foi possível analisar o patch '%s'" -#: builtin/am.c:809 +#: builtin/am.c:795 msgid "Only one StGIT patch series can be applied at once" msgstr "Só pode ser aplicada uma série de patches StGIT duma só vez" -#: builtin/am.c:857 +#: builtin/am.c:843 msgid "invalid timestamp" msgstr "carimbo de data/hora inválido" -#: builtin/am.c:862 builtin/am.c:874 +#: builtin/am.c:848 builtin/am.c:860 msgid "invalid Date line" msgstr "linha de Data inválida" -#: builtin/am.c:869 +#: builtin/am.c:855 msgid "invalid timezone offset" msgstr "mudança de fuso horário inválida" -#: builtin/am.c:962 +#: builtin/am.c:948 msgid "Patch format detection failed." msgstr "Falha ao detetar o formato do patch." -#: builtin/am.c:967 builtin/clone.c:409 +#: builtin/am.c:953 builtin/clone.c:410 #, c-format msgid "failed to create directory '%s'" msgstr "falha ao criar o diretório '%s'" -#: builtin/am.c:972 +#: builtin/am.c:958 msgid "Failed to split patches." msgstr "Falha ao dividir patches." -#: builtin/am.c:1103 +#: builtin/am.c:1089 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "Após resolver este problema, execute \"%s --continue\"." -#: builtin/am.c:1104 +#: builtin/am.c:1090 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "Se preferir ignorar este patch, execute \"%s --skip\"." -#: builtin/am.c:1105 +#: builtin/am.c:1091 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "" "Para restaurar o ramo original e interromper a aplicação dos patches, " "execute \"%s --abort\"." -#: builtin/am.c:1188 +#: builtin/am.c:1174 msgid "Patch sent with format=flowed; space at the end of lines might be lost." msgstr "" -#: builtin/am.c:1216 +#: builtin/am.c:1202 #, fuzzy msgid "Patch is empty." msgstr "O patch atual está vazio." -#: builtin/am.c:1281 +#: builtin/am.c:1267 #, fuzzy, c-format msgid "missing author line in commit %s" msgstr "Autor em falta: %s" -#: builtin/am.c:1284 +#: builtin/am.c:1270 #, fuzzy, c-format msgid "invalid ident line: %.*s" msgstr "linha de identidade inválida: %s" -#: builtin/am.c:1503 +#: builtin/am.c:1489 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" "O repositório não tem os blobs necessários para recorrer a integração com 3 " "pontos." -#: builtin/am.c:1505 +#: builtin/am.c:1491 msgid "Using index info to reconstruct a base tree..." msgstr "A usar informação do índice para reconstruir uma árvore de base..." -#: builtin/am.c:1524 +#: builtin/am.c:1510 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -10003,26 +10130,26 @@ msgstr "" "Editou o patch manualmente?\n" "Não é possível aplicá-lo aos blobs registados no índice." -#: builtin/am.c:1530 +#: builtin/am.c:1516 msgid "Falling back to patching base and 3-way merge..." msgstr "" "A recorrer a uma de base para aplicação de patches e integração com 3 " "pontos..." -#: builtin/am.c:1556 +#: builtin/am.c:1542 msgid "Failed to merge in the changes." msgstr "Falha ao integrar as alterações." -#: builtin/am.c:1588 +#: builtin/am.c:1574 msgid "applying to an empty history" msgstr "a aplicar a um histórico vazio" -#: builtin/am.c:1639 builtin/am.c:1643 +#: builtin/am.c:1626 builtin/am.c:1630 #, c-format msgid "cannot resume: %s does not exist." msgstr "não é possível continuar: %s não existe." -#: builtin/am.c:1661 +#: builtin/am.c:1648 msgid "Commit Body is:" msgstr "Corpo do commit:" @@ -10030,39 +10157,39 @@ msgstr "Corpo do commit:" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1671 +#: builtin/am.c:1658 #, c-format msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "Aplicar? [y]sim/[n]ão/[e]ditar/[v]er patch/[a]ceitar todos: " -#: builtin/am.c:1717 builtin/commit.c:395 +#: builtin/am.c:1704 builtin/commit.c:395 msgid "unable to write index file" msgstr "não é possível escrever o ficheiro de índice" -#: builtin/am.c:1721 +#: builtin/am.c:1708 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Índice modificado: não é possível aplicar patches (modificado: %s)" -#: builtin/am.c:1761 builtin/am.c:1829 +#: builtin/am.c:1748 builtin/am.c:1816 #, c-format msgid "Applying: %.*s" msgstr "A aplicar: %.*s" -#: builtin/am.c:1778 +#: builtin/am.c:1765 msgid "No changes -- Patch already applied." msgstr "Nenhuma alteração -- Já foi aplicado o patch." -#: builtin/am.c:1784 +#: builtin/am.c:1771 #, c-format msgid "Patch failed at %s %.*s" msgstr "Falha ao aplicar o patch em %s %.*s" -#: builtin/am.c:1788 +#: builtin/am.c:1775 msgid "Use 'git am --show-current-patch=diff' to see the failed patch" msgstr "" -#: builtin/am.c:1832 +#: builtin/am.c:1819 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -10072,7 +10199,7 @@ msgstr "" "Se não há nada por preparar, provavelmente essas mesmas alterações\n" "já foram introduzidas; pode querer ignorar este patch." -#: builtin/am.c:1839 +#: builtin/am.c:1826 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -10080,17 +10207,17 @@ msgid "" "You might run `git rm` on a file to accept \"deleted by them\" for it." msgstr "" -#: builtin/am.c:1946 builtin/am.c:1950 builtin/am.c:1962 builtin/reset.c:347 +#: builtin/am.c:1933 builtin/am.c:1937 builtin/am.c:1949 builtin/reset.c:347 #: builtin/reset.c:355 #, c-format msgid "Could not parse object '%s'." msgstr "Não foi possível analisar o objeto '%s'." -#: builtin/am.c:1998 +#: builtin/am.c:1985 msgid "failed to clean index" msgstr "falha ao limpar o índice" -#: builtin/am.c:2042 +#: builtin/am.c:2029 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -10098,157 +10225,158 @@ msgstr "" "Parece que a HEAD foi movida desde a última vez que o 'am' falhou.\n" "Não recuando a ORIG_HEAD" -#: builtin/am.c:2149 +#: builtin/am.c:2136 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Valor inválido de --patch-format: %s" -#: builtin/am.c:2191 +#: builtin/am.c:2178 #, fuzzy, c-format msgid "Invalid value for --show-current-patch: %s" msgstr "Valor inválido de --patch-format: %s" -#: builtin/am.c:2195 +#: builtin/am.c:2182 #, fuzzy, c-format msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s" msgstr "--first-parent é incompatível com --bisect" -#: builtin/am.c:2226 +#: builtin/am.c:2213 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<opções>] [(<mbox> | <Maildir>)...]" -#: builtin/am.c:2227 +#: builtin/am.c:2214 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<opções>] (--continue | --skip | --abort)" -#: builtin/am.c:2233 +#: builtin/am.c:2220 msgid "run interactively" msgstr "executar interativamente" -#: builtin/am.c:2235 +#: builtin/am.c:2222 msgid "historical option -- no-op" msgstr "opção histórica -- sem-ação" -#: builtin/am.c:2237 +#: builtin/am.c:2224 msgid "allow fall back on 3way merging if needed" msgstr "permitir recorrer a integração com 3 pontos se necessário" -#: builtin/am.c:2238 builtin/init-db.c:558 builtin/prune-packed.c:16 -#: builtin/repack.c:309 builtin/stash.c:816 +#: builtin/am.c:2225 builtin/init-db.c:558 builtin/prune-packed.c:16 +#: builtin/repack.c:335 builtin/stash.c:815 msgid "be quiet" msgstr "silencioso" -#: builtin/am.c:2240 -msgid "add a Signed-off-by line to the commit message" +#: builtin/am.c:2227 +#, fuzzy +msgid "add a Signed-off-by trailer to the commit message" msgstr "adicionar uma linha com Signed-of-by no fim da mensagem de commit" -#: builtin/am.c:2243 +#: builtin/am.c:2230 msgid "recode into utf8 (default)" msgstr "recodificar em utf8 (predefinição)" -#: builtin/am.c:2245 +#: builtin/am.c:2232 msgid "pass -k flag to git-mailinfo" msgstr "passar a opção -k ao git-mailinfo" -#: builtin/am.c:2247 +#: builtin/am.c:2234 msgid "pass -b flag to git-mailinfo" msgstr "passar a opção -b ao git-mailinfo" -#: builtin/am.c:2249 +#: builtin/am.c:2236 msgid "pass -m flag to git-mailinfo" msgstr "passar a opção -m ao git-mailinfo" -#: builtin/am.c:2251 +#: builtin/am.c:2238 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "passar a opção --keep-cr ao gitmailsplit para formato de mbox" -#: builtin/am.c:2254 +#: builtin/am.c:2241 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "" "não passar a opção --keep-cr ao git-mailsplit independentemente de am.keepcr" -#: builtin/am.c:2257 +#: builtin/am.c:2244 msgid "strip everything before a scissors line" msgstr "retirar todo o conteúdo antes da linha de tesoura" -#: builtin/am.c:2259 builtin/am.c:2262 builtin/am.c:2265 builtin/am.c:2268 -#: builtin/am.c:2271 builtin/am.c:2274 builtin/am.c:2277 builtin/am.c:2280 -#: builtin/am.c:2286 +#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255 +#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267 +#: builtin/am.c:2273 msgid "pass it through git-apply" msgstr "transmitir ao git-apply" -#: builtin/am.c:2276 builtin/commit.c:1395 builtin/fmt-merge-msg.c:17 -#: builtin/fmt-merge-msg.c:20 builtin/grep.c:892 builtin/merge.c:251 +#: builtin/am.c:2263 builtin/commit.c:1395 builtin/fmt-merge-msg.c:17 +#: builtin/fmt-merge-msg.c:20 builtin/grep.c:903 builtin/merge.c:260 #: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217 -#: builtin/rebase.c:1335 builtin/repack.c:320 builtin/repack.c:324 -#: builtin/repack.c:326 builtin/show-branch.c:650 builtin/show-ref.c:172 +#: builtin/rebase.c:1341 builtin/repack.c:346 builtin/repack.c:350 +#: builtin/repack.c:352 builtin/show-branch.c:650 builtin/show-ref.c:172 #: builtin/tag.c:404 parse-options.h:154 parse-options.h:175 #: parse-options.h:316 msgid "n" msgstr "n" -#: builtin/am.c:2282 builtin/branch.c:659 builtin/bugreport.c:135 +#: builtin/am.c:2269 builtin/branch.c:659 builtin/bugreport.c:136 #: builtin/for-each-ref.c:38 builtin/replace.c:556 builtin/tag.c:438 #: builtin/verify-tag.c:38 msgid "format" msgstr "formato" -#: builtin/am.c:2283 +#: builtin/am.c:2270 msgid "format the patch(es) are in" msgstr "formato de apresentação de patches" -#: builtin/am.c:2289 +#: builtin/am.c:2276 msgid "override error message when patch failure occurs" msgstr "substituir a mensagem de erro quando a aplicação do patch falha" -#: builtin/am.c:2291 +#: builtin/am.c:2278 msgid "continue applying patches after resolving a conflict" msgstr "continuar a aplicar os patches depois de resolver os conflitos" -#: builtin/am.c:2294 +#: builtin/am.c:2281 msgid "synonyms for --continue" msgstr "sinónimo de --continue" -#: builtin/am.c:2297 +#: builtin/am.c:2284 msgid "skip the current patch" msgstr "ignorar o patch atual" -#: builtin/am.c:2300 +#: builtin/am.c:2287 msgid "restore the original branch and abort the patching operation." msgstr "restaurar o ramo original e abortar a operação de patch." -#: builtin/am.c:2303 +#: builtin/am.c:2290 msgid "abort the patching operation but keep HEAD where it is." msgstr "" -#: builtin/am.c:2307 +#: builtin/am.c:2294 #, fuzzy msgid "show the patch being applied" msgstr "mostrar linhas não correspondidas" -#: builtin/am.c:2312 +#: builtin/am.c:2299 msgid "lie about committer date" msgstr "mentir sobre a data de commit" -#: builtin/am.c:2314 +#: builtin/am.c:2301 msgid "use current timestamp for author date" msgstr "usar a data e hora atual como data de autor" -#: builtin/am.c:2316 builtin/commit-tree.c:120 builtin/commit.c:1515 -#: builtin/merge.c:288 builtin/pull.c:175 builtin/rebase.c:530 -#: builtin/rebase.c:1388 builtin/revert.c:117 builtin/tag.c:419 +#: builtin/am.c:2303 builtin/commit-tree.c:120 builtin/commit.c:1515 +#: builtin/merge.c:297 builtin/pull.c:175 builtin/rebase.c:536 +#: builtin/rebase.c:1394 builtin/revert.c:117 builtin/tag.c:419 msgid "key-id" msgstr "id-chave" -#: builtin/am.c:2317 builtin/rebase.c:531 builtin/rebase.c:1389 +#: builtin/am.c:2304 builtin/rebase.c:537 builtin/rebase.c:1395 msgid "GPG-sign commits" msgstr "assinar os commits com GPG" -#: builtin/am.c:2320 +#: builtin/am.c:2307 msgid "(internal use for git-rebase)" msgstr "(uso interno de git-rebase)" -#: builtin/am.c:2338 +#: builtin/am.c:2325 msgid "" "The -b/--binary option has been a no-op for long time, and\n" "it will be removed. Please do not use it anymore." @@ -10256,17 +10384,17 @@ msgstr "" "A opção -b/--binary há muito que é ignorada e será\n" "futuramente removida. Por favor não a use." -#: builtin/am.c:2345 +#: builtin/am.c:2332 msgid "failed to read the index" msgstr "falha ao ler o índice" -#: builtin/am.c:2360 +#: builtin/am.c:2347 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "" "o diretório de rebesa anterior %s ainda existe, mas foi fornecida uma mbox." -#: builtin/am.c:2384 +#: builtin/am.c:2371 #, c-format msgid "" "Stray %s directory found.\n" @@ -10275,11 +10403,11 @@ msgstr "" "Diretório abandonado %s encontrado.\n" "Use \"git am --abort\" para o remover." -#: builtin/am.c:2390 +#: builtin/am.c:2377 msgid "Resolve operation not in progress, we are not resuming." msgstr "A operação de resolução não está em curso, não retomando." -#: builtin/am.c:2400 +#: builtin/am.c:2387 msgid "interactive mode requires patches on the command line" msgstr "" @@ -10320,139 +10448,129 @@ msgstr "git archive: esvaziamento de cache (flush) esperado" #: builtin/bisect--helper.c:23 #, fuzzy -msgid "git bisect--helper --next-all" -msgstr "git bisect--helper --next-all [--no-checkout]" - -#: builtin/bisect--helper.c:24 -msgid "git bisect--helper --write-terms <bad_term> <good_term>" -msgstr "" - -#: builtin/bisect--helper.c:25 -#, fuzzy -msgid "git bisect--helper --bisect-clean-state" -msgstr "git bisect--helper --next-all [--no-checkout]" - -#: builtin/bisect--helper.c:26 -#, fuzzy msgid "git bisect--helper --bisect-reset [<commit>]" msgstr "git bisect--helper --next-all [--no-checkout]" -#: builtin/bisect--helper.c:27 +#: builtin/bisect--helper.c:24 msgid "" "git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> " "<bad_term>" msgstr "" -#: builtin/bisect--helper.c:28 +#: builtin/bisect--helper.c:25 msgid "" "git bisect--helper --bisect-check-and-set-terms <command> <good_term> " "<bad_term>" msgstr "" -#: builtin/bisect--helper.c:29 +#: builtin/bisect--helper.c:26 msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]" msgstr "" -#: builtin/bisect--helper.c:30 +#: builtin/bisect--helper.c:27 #, fuzzy msgid "" "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --" "term-new]" msgstr "" -"argumento inválido $arg de 'git bisect terms'.\n" -"Opções suportadas: --term-good|--term-old e --term-bad|--term-new." +"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --" +"term-new]" -#: builtin/bisect--helper.c:31 +#: builtin/bisect--helper.c:28 msgid "" "git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}" "=<term>] [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] " "[<paths>...]" msgstr "" -#: builtin/bisect--helper.c:33 +#: builtin/bisect--helper.c:30 #, fuzzy msgid "git bisect--helper --bisect-next" msgstr "git bisect--helper --next-all [--no-checkout]" -#: builtin/bisect--helper.c:34 +#: builtin/bisect--helper.c:31 #, fuzzy msgid "git bisect--helper --bisect-auto-next" msgstr "git bisect--helper --next-all [--no-checkout]" -#: builtin/bisect--helper.c:35 +#: builtin/bisect--helper.c:32 +#, fuzzy +msgid "git bisect--helper --bisect-state (bad|new) [<rev>]" +msgstr "git bisect--helper --next-all [--no-checkout]" + +#: builtin/bisect--helper.c:33 #, fuzzy -msgid "git bisect--helper --bisect-autostart" +msgid "git bisect--helper --bisect-state (good|old) [<rev>...]" msgstr "git bisect--helper --next-all [--no-checkout]" -#: builtin/bisect--helper.c:97 +#: builtin/bisect--helper.c:108 #, fuzzy, c-format msgid "cannot open file '%s' in mode '%s'" msgstr "não é possível abrir o ficheiro '%s'" -#: builtin/bisect--helper.c:104 +#: builtin/bisect--helper.c:115 #, fuzzy, c-format msgid "could not write to file '%s'" msgstr "não foi possível escrever em '%s'" -#: builtin/bisect--helper.c:143 +#: builtin/bisect--helper.c:154 #, fuzzy, c-format msgid "'%s' is not a valid term" msgstr "'%s' não é uma referência válida." -#: builtin/bisect--helper.c:147 +#: builtin/bisect--helper.c:158 #, fuzzy, c-format msgid "can't use the builtin command '%s' as a term" msgstr "não é possível usar o comando '$term' como um termo" -#: builtin/bisect--helper.c:157 +#: builtin/bisect--helper.c:168 #, fuzzy, c-format msgid "can't change the meaning of the term '%s'" msgstr "não é possível alterar o significado do termo '$term'" -#: builtin/bisect--helper.c:167 +#: builtin/bisect--helper.c:178 msgid "please use two different terms" -msgstr "use dois termos diferentes" +msgstr "por favor, usa dois termos diferentes" -#: builtin/bisect--helper.c:207 +#: builtin/bisect--helper.c:194 #, fuzzy, c-format msgid "We are not bisecting.\n" -msgstr "Não se está a bissetar." +msgstr "Estamos bissetando nada.\n" -#: builtin/bisect--helper.c:215 +#: builtin/bisect--helper.c:202 #, fuzzy, c-format msgid "'%s' is not a valid commit" msgstr "'%s' não é um commit" -#: builtin/bisect--helper.c:224 +#: builtin/bisect--helper.c:211 #, fuzzy, c-format msgid "" "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'." msgstr "" -"Não foi possível extrair a HEAD original de '$branch'.\n" -"Tente 'git bisect reset <commit>'." +"pude check out HEAD original '%s' nenhuma. Tenta 'git bisect reset <commit>'." -#: builtin/bisect--helper.c:268 +#: builtin/bisect--helper.c:255 #, fuzzy, c-format msgid "Bad bisect_write argument: %s" msgstr "Argumento de bisect_write incorreto: $state" -#: builtin/bisect--helper.c:273 +#: builtin/bisect--helper.c:260 #, fuzzy, c-format msgid "couldn't get the oid of the rev '%s'" msgstr "não foi possível criar o diretório de árvore de trabalho '%s'" -#: builtin/bisect--helper.c:285 +#: builtin/bisect--helper.c:272 #, fuzzy, c-format msgid "couldn't open the file '%s'" msgstr "Não foi possível abrir o ficheiro '%s'" -#: builtin/bisect--helper.c:311 +#: builtin/bisect--helper.c:298 #, fuzzy, c-format msgid "Invalid command: you're currently in a %s/%s bisect" msgstr "" "Comando inválido: está-se a bissetar usando os termos $TERM_BAD/$TERM_GOOD." -#: builtin/bisect--helper.c:338 +#: builtin/bisect--helper.c:325 #, fuzzy, c-format msgid "" "You need to give me at least one %s and %s revision.\n" @@ -10461,7 +10579,7 @@ msgstr "" "Deve indicar pelo menos uma revisão $bad_syn e uma revisão $good_syn.\n" "(Pode usar \"git bisect $bad_syn\" e \"git bisect $good_syn\" para esse fim.)" -#: builtin/bisect--helper.c:342 +#: builtin/bisect--helper.c:329 #, fuzzy, c-format msgid "" "You need to start by \"git bisect start\".\n" @@ -10472,7 +10590,7 @@ msgstr "" "Indique pelo menos uma revisão $good_syn e uma revisão $bad_syn.\n" "(Pode usar \"git bisect $bad_syn\" e \"git bisect $good_syn\" para esse fim.)" -#: builtin/bisect--helper.c:362 +#: builtin/bisect--helper.c:349 #, fuzzy, c-format msgid "bisecting only with a %s commit" msgstr "Aviso: a bissetar só com um commit $TERM_BAD." @@ -10481,199 +10599,183 @@ msgstr "Aviso: a bissetar só com um commit $TERM_BAD." #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect--helper.c:370 +#: builtin/bisect--helper.c:357 msgid "Are you sure [Y/n]? " msgstr "Tem a certeza [Y/n]? " -#: builtin/bisect--helper.c:431 +#: builtin/bisect--helper.c:418 msgid "no terms defined" -msgstr "nenhum termo definido" +msgstr "termo nenhum definido" -#: builtin/bisect--helper.c:434 +#: builtin/bisect--helper.c:421 #, c-format msgid "" "Your current terms are %s for the old state\n" "and %s for the new state.\n" msgstr "" -#: builtin/bisect--helper.c:444 +#: builtin/bisect--helper.c:431 #, fuzzy, c-format msgid "" "invalid argument %s for 'git bisect terms'.\n" "Supported options are: --term-good|--term-old and --term-bad|--term-new." msgstr "" -"argumento inválido $arg de 'git bisect terms'.\n" +"argumento inválido %s para 'git bisect terms'.\n" "Opções suportadas: --term-good|--term-old e --term-bad|--term-new." -#: builtin/bisect--helper.c:511 +#: builtin/bisect--helper.c:498 #, fuzzy msgid "revision walk setup failed\n" -msgstr "falha ao configurar percurso de revisões" +msgstr "falha ao configurar percurso de revisões\n" -#: builtin/bisect--helper.c:533 +#: builtin/bisect--helper.c:520 #, fuzzy, c-format msgid "could not open '%s' for appending" msgstr "não foi possível abrir '%s' para leitura" -#: builtin/bisect--helper.c:651 builtin/bisect--helper.c:664 +#: builtin/bisect--helper.c:639 builtin/bisect--helper.c:652 #, fuzzy msgid "'' is not a valid term" msgstr "'$term' não é um termo válido" -#: builtin/bisect--helper.c:674 +#: builtin/bisect--helper.c:662 #, fuzzy, c-format msgid "unrecognized option: '%s'" msgstr "posição não reconhecida:%s" -#: builtin/bisect--helper.c:678 +#: builtin/bisect--helper.c:666 #, fuzzy, c-format msgid "'%s' does not appear to be a valid revision" msgstr "'$arg' não parecer ser uma revisão válida" -#: builtin/bisect--helper.c:709 +#: builtin/bisect--helper.c:697 #, fuzzy msgid "bad HEAD - I need a HEAD" msgstr "HEAD incorreta - é necessário uma HEAD" -#: builtin/bisect--helper.c:724 +#: builtin/bisect--helper.c:712 #, fuzzy, c-format msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'." msgstr "" "Falha ao extrair '$start_head'. Tente 'git bisect reset <ramo-válido>'." -#: builtin/bisect--helper.c:745 +#: builtin/bisect--helper.c:733 msgid "won't bisect on cg-seek'ed tree" msgstr "não é possível bissetar numa árvore \"cg-seek'ed\"" -#: builtin/bisect--helper.c:748 +#: builtin/bisect--helper.c:736 #, fuzzy msgid "bad HEAD - strange symbolic ref" msgstr "HEAD incorreta - referência simbólica desconhecida" -#: builtin/bisect--helper.c:775 +#: builtin/bisect--helper.c:756 #, fuzzy, c-format msgid "invalid ref: '%s'" msgstr "ficheiro inválido: '%s'" -#: builtin/bisect--helper.c:827 +#: builtin/bisect--helper.c:814 #, fuzzy msgid "You need to start by \"git bisect start\"\n" -msgstr "Deve começar por executar \"git bisect start\"" +msgstr "Deve começar por executar \"git bisect start\"\n" #. TRANSLATORS: Make sure to include [Y] and [n] in your #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect--helper.c:838 +#: builtin/bisect--helper.c:825 msgid "Do you want me to do it for you [Y/n]? " msgstr "Quer que o Git o faça por si [Y/n]? " -#: builtin/bisect--helper.c:866 -msgid "perform 'git bisect next'" -msgstr "executar 'git bisect next'" - -#: builtin/bisect--helper.c:868 -msgid "write the terms to .git/BISECT_TERMS" -msgstr "" +#: builtin/bisect--helper.c:843 +#, fuzzy +msgid "Please call `--bisect-state` with at least one argument" +msgstr "Invoque 'bisect_state' com pelo menos um argumento." -#: builtin/bisect--helper.c:870 -msgid "cleanup the bisection state" -msgstr "" +#: builtin/bisect--helper.c:856 +#, fuzzy, c-format +msgid "'git bisect %s' can take only one argument." +msgstr "'git bisect $TERM_BAD' só leva um argumento." -#: builtin/bisect--helper.c:872 -msgid "check for expected revs" -msgstr "" +#: builtin/bisect--helper.c:868 builtin/bisect--helper.c:879 +#, fuzzy, c-format +msgid "Bad rev input: %s" +msgstr "Revisão incorreta na entrada: $arg" -#: builtin/bisect--helper.c:874 +#: builtin/bisect--helper.c:924 #, fuzzy msgid "reset the bisection state" msgstr "remover uma secção: nome" -#: builtin/bisect--helper.c:876 +#: builtin/bisect--helper.c:926 msgid "write out the bisection state in BISECT_LOG" msgstr "" -#: builtin/bisect--helper.c:878 +#: builtin/bisect--helper.c:928 msgid "check and set terms in a bisection state" msgstr "" -#: builtin/bisect--helper.c:880 +#: builtin/bisect--helper.c:930 msgid "check whether bad or good terms exist" msgstr "" -#: builtin/bisect--helper.c:882 +#: builtin/bisect--helper.c:932 #, fuzzy msgid "print out the bisect terms" msgstr "imprimir apenas as tags do objeto" -#: builtin/bisect--helper.c:884 +#: builtin/bisect--helper.c:934 msgid "start the bisect session" msgstr "" -#: builtin/bisect--helper.c:886 +#: builtin/bisect--helper.c:936 #, fuzzy msgid "find the next bisection commit" msgstr "não é possível emendar commit não-existente" -#: builtin/bisect--helper.c:888 +#: builtin/bisect--helper.c:938 msgid "verify the next bisection state then checkout the next bisection commit" msgstr "" -#: builtin/bisect--helper.c:890 -msgid "start the bisection if it has not yet been started" +#: builtin/bisect--helper.c:940 +msgid "mark the state of ref (or refs)" msgstr "" -#: builtin/bisect--helper.c:892 +#: builtin/bisect--helper.c:942 msgid "no log for BISECT_WRITE" msgstr "" -#: builtin/bisect--helper.c:910 -#, fuzzy -msgid "--write-terms requires two arguments" -msgstr "--abort não leva argumentos" - -#: builtin/bisect--helper.c:914 -#, fuzzy -msgid "--bisect-clean-state requires no arguments" -msgstr "--continue não leva argumentos" - -#: builtin/bisect--helper.c:921 +#: builtin/bisect--helper.c:957 msgid "--bisect-reset requires either no argument or a commit" msgstr "" -#: builtin/bisect--helper.c:925 +#: builtin/bisect--helper.c:961 #, fuzzy msgid "--bisect-write requires either 4 or 5 arguments" msgstr ":strip= requer um inteiro positivo como argumento" -#: builtin/bisect--helper.c:931 +#: builtin/bisect--helper.c:967 msgid "--check-and-set-terms requires 3 arguments" msgstr "" -#: builtin/bisect--helper.c:937 +#: builtin/bisect--helper.c:973 msgid "--bisect-next-check requires 2 or 3 arguments" msgstr "" -#: builtin/bisect--helper.c:943 +#: builtin/bisect--helper.c:979 #, fuzzy msgid "--bisect-terms requires 0 or 1 argument" msgstr ":strip= requer um inteiro positivo como argumento" -#: builtin/bisect--helper.c:952 +#: builtin/bisect--helper.c:988 #, fuzzy msgid "--bisect-next requires 0 arguments" msgstr "--continue não leva argumentos" -#: builtin/bisect--helper.c:958 +#: builtin/bisect--helper.c:994 #, fuzzy msgid "--bisect-auto-next requires 0 arguments" msgstr "--continue não leva argumentos" -#: builtin/bisect--helper.c:964 -#, fuzzy -msgid "--bisect-autostart does not accept arguments" -msgstr "%%(subject) não leva argumentos" - #: builtin/blame.c:32 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "git blame [<opções>] [<rev-opções>] [<rev>] [--] <ficheiro>" @@ -10701,134 +10803,136 @@ msgstr "ignorar cor inválida '%.*s' em log.graphColors" msgid "invalid value for blame.coloring" msgstr "valor inválido de %s" -#: builtin/blame.c:845 +#: builtin/blame.c:847 #, c-format msgid "cannot find revision %s to ignore" msgstr "" -#: builtin/blame.c:867 +#: builtin/blame.c:869 msgid "Show blame entries as we find them, incrementally" msgstr "" "Mostrar entradas de culpa à medida que forem encontradas, incrementalmente" -#: builtin/blame.c:868 +#: builtin/blame.c:870 #, fuzzy msgid "Do not show object names of boundary commits (Default: off)" msgstr "Mostar SHA-1 dos commits limite em branco (Predefinição: desativado)" -#: builtin/blame.c:869 +#: builtin/blame.c:871 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "Não tratar os commits raiz como limites (Predefinição: desativado)" -#: builtin/blame.c:870 +#: builtin/blame.c:872 msgid "Show work cost statistics" msgstr "Mostrar estatísticas de custo de atividade" -#: builtin/blame.c:871 +#: builtin/blame.c:873 msgid "Force progress reporting" msgstr "Forçar informação de progresso" -#: builtin/blame.c:872 +#: builtin/blame.c:874 msgid "Show output score for blame entries" msgstr "Mostrar a pontuação das entradas de culpa" -#: builtin/blame.c:873 +#: builtin/blame.c:875 msgid "Show original filename (Default: auto)" msgstr "Mostrar o nome do ficheiro original (Predefinição: auto)" -#: builtin/blame.c:874 +#: builtin/blame.c:876 msgid "Show original linenumber (Default: off)" msgstr "Mostrar números de linha originais (Predefinição: desativado)" -#: builtin/blame.c:875 +#: builtin/blame.c:877 msgid "Show in a format designed for machine consumption" msgstr "Mostrar em formato próprio para ser consumo por uma máquina" -#: builtin/blame.c:876 +#: builtin/blame.c:878 msgid "Show porcelain format with per-line commit information" msgstr "Mostrar em formato de porcelana com informações de commit por linha" -#: builtin/blame.c:877 +#: builtin/blame.c:879 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "Usar o mesmo modo de saída que git-annotate (Predefinição: desativado)" -#: builtin/blame.c:878 +#: builtin/blame.c:880 msgid "Show raw timestamp (Default: off)" msgstr "Mostrar carimbo de data/hora em bruto (Predefinição: desativado)" -#: builtin/blame.c:879 +#: builtin/blame.c:881 msgid "Show long commit SHA1 (Default: off)" msgstr "Mostrar SHA1 longo de commit (Predefinição: desativado)" -#: builtin/blame.c:880 +#: builtin/blame.c:882 msgid "Suppress author name and timestamp (Default: off)" msgstr "" "Suprimir nome de autor e carimbo de data/hora (Predefinição: desativado)" -#: builtin/blame.c:881 +#: builtin/blame.c:883 msgid "Show author email instead of name (Default: off)" msgstr "Mostrar o email do autor em vez do nome (Predefinição: desativado)" -#: builtin/blame.c:882 +#: builtin/blame.c:884 msgid "Ignore whitespace differences" msgstr "Ignorar as diferenças de espaço em branco" -#: builtin/blame.c:883 builtin/log.c:1808 +#: builtin/blame.c:885 builtin/log.c:1813 #, fuzzy msgid "rev" msgstr "reverter" -#: builtin/blame.c:883 +#: builtin/blame.c:885 #, fuzzy msgid "Ignore <rev> when blaming" msgstr "ignorar o índice ao verificar" -#: builtin/blame.c:884 +#: builtin/blame.c:886 #, fuzzy msgid "Ignore revisions from <file>" msgstr "ler mensagem de um ficheiro" -#: builtin/blame.c:885 +#: builtin/blame.c:887 msgid "color redundant metadata from previous line differently" msgstr "" -#: builtin/blame.c:886 +#: builtin/blame.c:888 msgid "color lines by age" msgstr "" -#: builtin/blame.c:887 +#: builtin/blame.c:889 msgid "Spend extra cycles to find better match" msgstr "Despender ciclos extra para encontrar uma melhor correspondência" -#: builtin/blame.c:888 +#: builtin/blame.c:890 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "Usar revisões do <ficheiro> em vez de invocar git-rev-list" -#: builtin/blame.c:889 +#: builtin/blame.c:891 msgid "Use <file>'s contents as the final image" msgstr "Usar o conteúdo do <ficheiro> como imagem final" -#: builtin/blame.c:890 builtin/blame.c:891 +#: builtin/blame.c:892 builtin/blame.c:893 msgid "score" msgstr "pontuação" -#: builtin/blame.c:890 +#: builtin/blame.c:892 msgid "Find line copies within and across files" msgstr "Localizar linhas copiadas dentro e entre ficheiros" -#: builtin/blame.c:891 +#: builtin/blame.c:893 msgid "Find line movements within and across files" msgstr "Localizar linhas movidas dentro e entre ficheiros" -#: builtin/blame.c:892 -msgid "n,m" -msgstr "n,m" +#: builtin/blame.c:894 +#, fuzzy +msgid "range" +msgstr "Não é um intervalo." -#: builtin/blame.c:892 -msgid "Process only line range n,m, counting from 1" +#: builtin/blame.c:895 +#, fuzzy +msgid "Process only line range <start>,<end> or function :<funcname>" msgstr "Processar apenas o intervalo de linhas n,m, a cantar de 1" -#: builtin/blame.c:944 +#: builtin/blame.c:947 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "" "--progress não pode ser usado com --incremental ou formatos de porcelana" @@ -10841,18 +10945,18 @@ msgstr "" #. your language may need more or fewer display #. columns. #. -#: builtin/blame.c:995 +#: builtin/blame.c:998 msgid "4 years, 11 months ago" msgstr "há 4 anos e 11 meses atrás" -#: builtin/blame.c:1110 +#: builtin/blame.c:1114 #, c-format msgid "file %s has only %lu line" msgid_plural "file %s has only %lu lines" msgstr[0] "o ficheiro %s só tem %lu linha" msgstr[1] "o ficheiro %s só tem %lu linhas" -#: builtin/blame.c:1156 +#: builtin/blame.c:1159 msgid "Blaming lines" msgstr "Linhas de culpa" @@ -10973,7 +11077,7 @@ msgstr "não foi possível analisar o formato" #: builtin/branch.c:460 #, fuzzy msgid "could not resolve HEAD" -msgstr "não foi possível resolver o commit HEAD\n" +msgstr "não foi possível resolver o commit HEAD" #: builtin/branch.c:466 #, fuzzy, c-format @@ -11073,7 +11177,7 @@ msgstr "configurar modo de seguimento (consulte git-pull(1))" msgid "do not use" msgstr "esquema a usar" -#: builtin/branch.c:626 builtin/rebase.c:526 +#: builtin/branch.c:626 builtin/rebase.c:532 msgid "upstream" msgstr "a montante" @@ -11188,7 +11292,7 @@ msgstr "ordenar e filtrar são insensíveis a maiúsculas" msgid "format to use for the output" msgstr "formato a usar na saída" -#: builtin/branch.c:682 builtin/clone.c:789 +#: builtin/branch.c:682 builtin/clone.c:790 msgid "HEAD not found below refs/heads!" msgstr "HEAD não encontrada em refs/heads!" @@ -11216,7 +11320,7 @@ msgstr "Ainda não há commits no ramo '%s'." #: builtin/branch.c:766 #, c-format msgid "No branch named '%s'." -msgstr "Não há nenhum ramo denominado '%s'." +msgstr "Ramo nenhum denominado '%s'." #: builtin/branch.c:781 #, fuzzy @@ -11272,8 +11376,8 @@ msgstr "O ramo '%s' não tem informação sobre o ramo a montante" msgid "" "The -a, and -r, options to 'git branch' do not take a branch name.\n" "Did you mean to use: -a|-r --list <pattern>?" -msgstr "" -"as opções -a e -r de 'git branch' não fazem sentido com um nome de ramo" +msgstr "As opções -a, e -r, em 'git branch' levam nome de branch nenhum.\n" +"Quiseste utilizar: -a|-r --list <pattern>? " #: builtin/branch.c:843 #, fuzzy @@ -11281,13 +11385,13 @@ msgid "" "the '--set-upstream' option is no longer supported. Please use '--track' or " "'--set-upstream-to' instead." msgstr "" -"A opção --set-upstream é obsoleta e será removida. Considere o uso de --" -"track ou --set-upstream-to\n" +"A opção --set-upstream está obsoleta. Por favor, usa '--track' ou '--set-" +"upstream-to' invés." #: builtin/bugreport.c:15 #, fuzzy msgid "git version:\n" -msgstr "versão" +msgstr "versão git:\n" #: builtin/bugreport.c:21 #, c-format @@ -11329,39 +11433,39 @@ msgid "" "You can delete any lines you don't wish to share.\n" msgstr "" -#: builtin/bugreport.c:134 +#: builtin/bugreport.c:135 msgid "specify a destination for the bugreport file" msgstr "" -#: builtin/bugreport.c:136 +#: builtin/bugreport.c:137 msgid "specify a strftime format suffix for the filename" msgstr "" -#: builtin/bugreport.c:158 +#: builtin/bugreport.c:159 #, fuzzy, c-format msgid "could not create leading directories for '%s'" msgstr "não foi possível criar os diretórios superiores de '%s'" -#: builtin/bugreport.c:165 +#: builtin/bugreport.c:166 msgid "System Info" msgstr "" -#: builtin/bugreport.c:168 +#: builtin/bugreport.c:169 #, fuzzy msgid "Enabled Hooks" msgstr "não foi possível abrir %s" -#: builtin/bugreport.c:175 +#: builtin/bugreport.c:176 #, fuzzy, c-format msgid "couldn't create a new file at '%s'" msgstr "não foi possível criar o ficheiro '%s'" -#: builtin/bugreport.c:178 +#: builtin/bugreport.c:179 #, fuzzy, c-format msgid "unable to write to %s" msgstr "não foi possível escrever %s" -#: builtin/bugreport.c:188 +#: builtin/bugreport.c:189 #, c-format msgid "Created new report at '%s'.\n" msgstr "" @@ -11416,17 +11520,17 @@ msgstr "não mostrar tags descascadas" #: builtin/bundle.c:122 #, c-format msgid "%s is okay\n" -msgstr "%s está correto\n" +msgstr "%s está ok\n" #: builtin/bundle.c:163 msgid "Need a repository to unbundle." msgstr "É preciso um repositório para desempacotar." -#: builtin/bundle.c:171 builtin/remote.c:1687 +#: builtin/bundle.c:171 builtin/remote.c:1700 msgid "be verbose; must be placed before a subcommand" msgstr "ser verboso; deve ser colocado antes de um subcomando" -#: builtin/bundle.c:193 builtin/remote.c:1718 +#: builtin/bundle.c:193 builtin/remote.c:1731 #, c-format msgid "Unknown subcommand: %s" msgstr "Subcomando desconhecido: %s" @@ -11543,7 +11647,7 @@ msgstr "ler os nomes dos ficheiros da entrada padrão" msgid "terminate input and output records by a NUL character" msgstr "terminar registos da entrada e da saída com um carácter NUL" -#: builtin/check-ignore.c:21 builtin/checkout.c:1482 builtin/gc.c:538 +#: builtin/check-ignore.c:21 builtin/checkout.c:1500 builtin/gc.c:541 #: builtin/worktree.c:561 msgid "suppress progress reporting" msgstr "suprimir informação de progresso" @@ -11566,7 +11670,7 @@ msgstr "-z só faz sentido com --stdin" #: builtin/check-ignore.c:168 msgid "no path specified" -msgstr "nenhum caminho especificado" +msgstr "path nenhum especificado" #: builtin/check-ignore.c:172 msgid "--quiet is only valid with a single pathname" @@ -11595,58 +11699,58 @@ msgstr "não é possível analisar o contacto: %s" #: builtin/check-mailmap.c:48 msgid "no contacts specified" -msgstr "nenhum contacto especificado" +msgstr "contato nenhum especificado" -#: builtin/checkout-index.c:131 +#: builtin/checkout-index.c:139 msgid "git checkout-index [<options>] [--] [<file>...]" msgstr "git checkout-index [<opções>] [--] [<ficheiro>...]" -#: builtin/checkout-index.c:148 +#: builtin/checkout-index.c:156 msgid "stage should be between 1 and 3 or all" msgstr "stage deve ser um número entre 1 e 3 ou o parâmetro all" -#: builtin/checkout-index.c:164 +#: builtin/checkout-index.c:173 msgid "check out all files in the index" msgstr "extrair todos os ficheiros presentes no índice" -#: builtin/checkout-index.c:165 +#: builtin/checkout-index.c:174 msgid "force overwrite of existing files" msgstr "forçar substituição dos ficheiros existentes" -#: builtin/checkout-index.c:167 +#: builtin/checkout-index.c:176 msgid "no warning for existing files and files not in index" msgstr "" "não mostrar aviso para ficheiros existentes e ficheiros não presentes no " "índice" -#: builtin/checkout-index.c:169 +#: builtin/checkout-index.c:178 msgid "don't checkout new files" msgstr "não extrair novos ficheiros" -#: builtin/checkout-index.c:171 +#: builtin/checkout-index.c:180 msgid "update stat information in the index file" msgstr "atualizar informação de stat no ficheiro de índice" -#: builtin/checkout-index.c:175 +#: builtin/checkout-index.c:184 msgid "read list of paths from the standard input" msgstr "ler lista de caminhos da entrada padrão" -#: builtin/checkout-index.c:177 +#: builtin/checkout-index.c:186 msgid "write the content to temporary files" msgstr "escrever o conteúdo em ficheiros temporários" -#: builtin/checkout-index.c:178 builtin/column.c:31 +#: builtin/checkout-index.c:187 builtin/column.c:31 #: builtin/submodule--helper.c:1824 builtin/submodule--helper.c:1827 #: builtin/submodule--helper.c:1835 builtin/submodule--helper.c:2333 -#: builtin/worktree.c:754 +#: builtin/worktree.c:757 msgid "string" msgstr "cadeia" -#: builtin/checkout-index.c:179 +#: builtin/checkout-index.c:188 msgid "when creating files, prepend <string>" msgstr "preceder <cadeia> ao criar ficheiros" -#: builtin/checkout-index.c:181 +#: builtin/checkout-index.c:190 msgid "copy out the files from named stage" msgstr "copiar os ficheiros do estágio indicado" @@ -11709,8 +11813,8 @@ msgstr[1] "" #, fuzzy, c-format msgid "Updated %d path from %s" msgid_plural "Updated %d paths from %s" -msgstr[0] "%d caminho atualizado\n" -msgstr[1] "%d caminhos atualizados\n" +msgstr[0] "%d caminho atualizado" +msgstr[1] "%d caminhos atualizados" #: builtin/checkout.c:408 #, fuzzy, c-format @@ -11751,66 +11855,66 @@ msgstr "'%s' não pode ser usado com '%s'" msgid "'%s' or '%s' cannot be used with %s" msgstr "%s: %s não pode ser usado com %s" -#: builtin/checkout.c:528 builtin/checkout.c:535 +#: builtin/checkout.c:541 builtin/checkout.c:548 #, c-format msgid "path '%s' is unmerged" msgstr "o caminho '%s' não foi integrado" -#: builtin/checkout.c:703 +#: builtin/checkout.c:716 msgid "you need to resolve your current index first" msgstr "primeiro deve resolver o índice atual" -#: builtin/checkout.c:757 +#: builtin/checkout.c:770 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" "%s" msgstr "" -#: builtin/checkout.c:853 +#: builtin/checkout.c:866 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "Não é possível efetuar reflog de '%s': %s\n" -#: builtin/checkout.c:895 +#: builtin/checkout.c:908 msgid "HEAD is now at" msgstr "HEAD está agora em" -#: builtin/checkout.c:899 builtin/clone.c:720 +#: builtin/checkout.c:912 builtin/clone.c:721 t/helper/test-fast-rebase.c:202 msgid "unable to update HEAD" msgstr "não foi possível atualizar HEAD" -#: builtin/checkout.c:903 +#: builtin/checkout.c:916 #, c-format msgid "Reset branch '%s'\n" msgstr "Repor ramo '%s'\n" -#: builtin/checkout.c:906 +#: builtin/checkout.c:919 #, c-format msgid "Already on '%s'\n" msgstr "Já em '%s'\n" -#: builtin/checkout.c:910 +#: builtin/checkout.c:923 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Mudou para e repôs o ramo '%s'\n" -#: builtin/checkout.c:912 builtin/checkout.c:1338 +#: builtin/checkout.c:925 builtin/checkout.c:1356 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Mudou para o novo ramo '%s'\n" -#: builtin/checkout.c:914 +#: builtin/checkout.c:927 #, c-format msgid "Switched to branch '%s'\n" msgstr "Mudou para o ramo '%s'\n" -#: builtin/checkout.c:965 +#: builtin/checkout.c:978 #, c-format msgid " ... and %d more.\n" msgstr " ... e mais %d.\n" -#: builtin/checkout.c:971 +#: builtin/checkout.c:984 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -11823,15 +11927,17 @@ msgid_plural "" "\n" "%s\n" msgstr[0] "" -"Aviso: deixa %d commit para trás, não ligado a nenhum ramo:\n" +"Aviso: estás deixando %d commit para trás, desconetado a qualquer dos " +"teus ramos:\n" "\n" "%s\n" msgstr[1] "" -"Aviso: deixa %d commits para trás, não ligados a nenhum ramo:\n" +"Aviso: estás deixando %d commits para trás, desconetado a qualquer " +"dos teus ramos:\n" "\n" "%s\n" -#: builtin/checkout.c:990 +#: builtin/checkout.c:1003 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -11858,26 +11964,26 @@ msgstr[1] "" " git branch <nome-do-novo-ramo> %s\n" "\n" -#: builtin/checkout.c:1025 +#: builtin/checkout.c:1038 msgid "internal error in revision walk" msgstr "erro interno durante o curso de revisões" -#: builtin/checkout.c:1029 +#: builtin/checkout.c:1042 msgid "Previous HEAD position was" msgstr "A posição anterior de HEAD era" -#: builtin/checkout.c:1069 builtin/checkout.c:1333 +#: builtin/checkout.c:1082 builtin/checkout.c:1351 msgid "You are on a branch yet to be born" msgstr "Está num ramo ainda não criado" -#: builtin/checkout.c:1146 +#: builtin/checkout.c:1164 #, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" "Please use -- (and optionally --no-guess) to disambiguate" msgstr "" -#: builtin/checkout.c:1153 +#: builtin/checkout.c:1171 msgid "" "If you meant to check out a remote tracking branch on, e.g. 'origin',\n" "you can do so by fully qualifying the name with the --track option:\n" @@ -11889,225 +11995,225 @@ msgid "" "checkout.defaultRemote=origin in your config." msgstr "" -#: builtin/checkout.c:1163 +#: builtin/checkout.c:1181 #, fuzzy, c-format msgid "'%s' matched multiple (%d) remote tracking branches" msgstr "atuar sobre ramos de monitorização remotos" -#: builtin/checkout.c:1229 +#: builtin/checkout.c:1247 #, fuzzy msgid "only one reference expected" msgstr "esperava-se apenas uma referência, %d fornecidas." -#: builtin/checkout.c:1246 +#: builtin/checkout.c:1264 #, c-format msgid "only one reference expected, %d given." msgstr "esperava-se apenas uma referência, %d fornecidas." -#: builtin/checkout.c:1292 builtin/worktree.c:342 builtin/worktree.c:510 +#: builtin/checkout.c:1310 builtin/worktree.c:342 builtin/worktree.c:510 #, c-format msgid "invalid reference: %s" msgstr "referência inválida: %s" -#: builtin/checkout.c:1305 builtin/checkout.c:1671 +#: builtin/checkout.c:1323 builtin/checkout.c:1689 #, c-format msgid "reference is not a tree: %s" msgstr "a referência não é uma árvore: %s" -#: builtin/checkout.c:1352 +#: builtin/checkout.c:1370 #, fuzzy, c-format msgid "a branch is expected, got tag '%s'" msgstr "Não é possível eliminar o ramo '%s' extraído em '%s'" -#: builtin/checkout.c:1354 +#: builtin/checkout.c:1372 #, fuzzy, c-format msgid "a branch is expected, got remote branch '%s'" msgstr "Ramo %s configurado para seguir o ramo remoto %s de %s." -#: builtin/checkout.c:1355 builtin/checkout.c:1363 +#: builtin/checkout.c:1373 builtin/checkout.c:1381 #, fuzzy, c-format msgid "a branch is expected, got '%s'" msgstr "O ramo %s está a ser bissetado em %s" -#: builtin/checkout.c:1358 +#: builtin/checkout.c:1376 #, fuzzy, c-format msgid "a branch is expected, got commit '%s'" -msgstr "O seu ramo está atualizado com '%s'.\n" +msgstr "é suposto um branch, recebi um commit '%s'" -#: builtin/checkout.c:1374 +#: builtin/checkout.c:1392 msgid "" "cannot switch branch while merging\n" "Consider \"git merge --quit\" or \"git worktree add\"." msgstr "" -#: builtin/checkout.c:1378 +#: builtin/checkout.c:1396 msgid "" "cannot switch branch in the middle of an am session\n" "Consider \"git am --quit\" or \"git worktree add\"." msgstr "" -#: builtin/checkout.c:1382 +#: builtin/checkout.c:1400 msgid "" "cannot switch branch while rebasing\n" "Consider \"git rebase --quit\" or \"git worktree add\"." msgstr "" -#: builtin/checkout.c:1386 +#: builtin/checkout.c:1404 msgid "" "cannot switch branch while cherry-picking\n" "Consider \"git cherry-pick --quit\" or \"git worktree add\"." msgstr "" -#: builtin/checkout.c:1390 +#: builtin/checkout.c:1408 msgid "" "cannot switch branch while reverting\n" "Consider \"git revert --quit\" or \"git worktree add\"." msgstr "" -#: builtin/checkout.c:1394 +#: builtin/checkout.c:1412 #, fuzzy msgid "you are switching branch while bisecting" msgstr "Está a bissetar neste momento." -#: builtin/checkout.c:1401 +#: builtin/checkout.c:1419 msgid "paths cannot be used with switching branches" msgstr "não podem ser usados caminhos ao mudar de ramo" -#: builtin/checkout.c:1404 builtin/checkout.c:1408 builtin/checkout.c:1412 +#: builtin/checkout.c:1422 builtin/checkout.c:1426 builtin/checkout.c:1430 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "'%s' não pode ser usado ao mudar de ramo" -#: builtin/checkout.c:1416 builtin/checkout.c:1419 builtin/checkout.c:1422 -#: builtin/checkout.c:1427 builtin/checkout.c:1432 +#: builtin/checkout.c:1434 builtin/checkout.c:1437 builtin/checkout.c:1440 +#: builtin/checkout.c:1445 builtin/checkout.c:1450 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' não pode ser usado com '%s'" -#: builtin/checkout.c:1429 +#: builtin/checkout.c:1447 #, fuzzy, c-format msgid "'%s' cannot take <start-point>" msgstr "'%s' não pode ser usado com caminhos em atualização" -#: builtin/checkout.c:1437 +#: builtin/checkout.c:1455 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "Não é possível mudar de ramo para '%s', visto que não é um commit" -#: builtin/checkout.c:1444 +#: builtin/checkout.c:1462 #, fuzzy msgid "missing branch or commit argument" msgstr "Falta um nome dum ramo; tente -b" -#: builtin/checkout.c:1486 builtin/clone.c:91 builtin/commit-graph.c:84 -#: builtin/commit-graph.c:222 builtin/fetch.c:172 builtin/merge.c:287 -#: builtin/multi-pack-index.c:27 builtin/pull.c:119 builtin/push.c:551 -#: builtin/send-pack.c:192 +#: builtin/checkout.c:1504 builtin/clone.c:92 builtin/commit-graph.c:84 +#: builtin/commit-graph.c:222 builtin/fetch.c:172 builtin/merge.c:296 +#: builtin/multi-pack-index.c:27 builtin/pull.c:119 builtin/push.c:575 +#: builtin/send-pack.c:198 msgid "force progress reporting" msgstr "forçar informação de progresso" -#: builtin/checkout.c:1487 +#: builtin/checkout.c:1505 msgid "perform a 3-way merge with the new branch" msgstr "realizar uma integração com 3 pontos com o novo ramo" -#: builtin/checkout.c:1488 builtin/log.c:1795 parse-options.h:322 +#: builtin/checkout.c:1506 builtin/log.c:1800 parse-options.h:322 msgid "style" msgstr "estilo" -#: builtin/checkout.c:1489 +#: builtin/checkout.c:1507 msgid "conflict style (merge or diff3)" msgstr "estilo de conflito (merge ou diff3)" -#: builtin/checkout.c:1501 builtin/worktree.c:558 +#: builtin/checkout.c:1519 builtin/worktree.c:558 msgid "detach HEAD at named commit" msgstr "destacar HEAD no commit indicado" -#: builtin/checkout.c:1502 +#: builtin/checkout.c:1520 msgid "set upstream info for new branch" msgstr "definir a informação do ramo a montante do novo ramo" -#: builtin/checkout.c:1504 +#: builtin/checkout.c:1522 msgid "force checkout (throw away local modifications)" msgstr "forçar extração (descartar modificações locais)" -#: builtin/checkout.c:1506 +#: builtin/checkout.c:1524 msgid "new-branch" msgstr "novo-ramo" -#: builtin/checkout.c:1506 +#: builtin/checkout.c:1524 msgid "new unparented branch" msgstr "novo ramo sem pai" -#: builtin/checkout.c:1508 builtin/merge.c:291 +#: builtin/checkout.c:1526 builtin/merge.c:300 msgid "update ignored files (default)" msgstr "atualizar ficheiros ignorados (predefinição)" -#: builtin/checkout.c:1511 +#: builtin/checkout.c:1529 msgid "do not check if another worktree is holding the given ref" msgstr "" "não verificar se outra árvore de trabalho contém a referência fornecida" -#: builtin/checkout.c:1524 +#: builtin/checkout.c:1542 msgid "checkout our version for unmerged files" msgstr "extrair a nossa versão dos ficheiros não integrados" -#: builtin/checkout.c:1527 +#: builtin/checkout.c:1545 msgid "checkout their version for unmerged files" msgstr "extrair a versão deles dos ficheiros não integrados" -#: builtin/checkout.c:1531 +#: builtin/checkout.c:1549 msgid "do not limit pathspecs to sparse entries only" msgstr "não restringir especificadores de caminho a entradas esparsas" -#: builtin/checkout.c:1586 +#: builtin/checkout.c:1604 #, fuzzy, c-format msgid "-%c, -%c and --orphan are mutually exclusive" msgstr "-b, -B e --orphan são mutuamente exclusivos" -#: builtin/checkout.c:1590 +#: builtin/checkout.c:1608 #, fuzzy msgid "-p and --overlay are mutually exclusive" msgstr "-b, -B e --orphan são mutuamente exclusivos" -#: builtin/checkout.c:1627 +#: builtin/checkout.c:1645 msgid "--track needs a branch name" msgstr "--track requer um nome dum ramo" -#: builtin/checkout.c:1632 +#: builtin/checkout.c:1650 #, fuzzy, c-format msgid "missing branch name; try -%c" msgstr "Falta um nome dum ramo; tente -b" -#: builtin/checkout.c:1664 +#: builtin/checkout.c:1682 #, fuzzy, c-format msgid "could not resolve %s" msgstr "não foi possível remover '%s'" -#: builtin/checkout.c:1680 +#: builtin/checkout.c:1698 msgid "invalid path specification" msgstr "especificação de caminho inválida" -#: builtin/checkout.c:1687 +#: builtin/checkout.c:1705 #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "" -#: builtin/checkout.c:1691 +#: builtin/checkout.c:1709 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: --detach não aceita um caminho como argumento '%s'" -#: builtin/checkout.c:1700 +#: builtin/checkout.c:1718 #, fuzzy msgid "--pathspec-from-file is incompatible with --detach" msgstr "--first-parent é incompatível com --bisect" -#: builtin/checkout.c:1703 builtin/reset.c:325 builtin/stash.c:1500 +#: builtin/checkout.c:1721 builtin/reset.c:325 builtin/stash.c:1499 #, fuzzy msgid "--pathspec-from-file is incompatible with --patch" msgstr "--first-parent é incompatível com --bisect" -#: builtin/checkout.c:1716 +#: builtin/checkout.c:1734 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -12115,80 +12221,80 @@ msgstr "" "git checkout: --ours/--theirs, --force e --merge são incompatíveis\n" "durante a extração do índice." -#: builtin/checkout.c:1721 +#: builtin/checkout.c:1739 #, fuzzy msgid "you must specify path(s) to restore" msgstr "Deve especificar um diretório." -#: builtin/checkout.c:1747 builtin/checkout.c:1749 builtin/checkout.c:1798 -#: builtin/checkout.c:1800 builtin/clone.c:121 builtin/remote.c:170 +#: builtin/checkout.c:1765 builtin/checkout.c:1767 builtin/checkout.c:1816 +#: builtin/checkout.c:1818 builtin/clone.c:122 builtin/remote.c:170 #: builtin/remote.c:172 builtin/submodule--helper.c:2719 builtin/worktree.c:554 #: builtin/worktree.c:556 msgid "branch" msgstr "ramo" -#: builtin/checkout.c:1748 +#: builtin/checkout.c:1766 msgid "create and checkout a new branch" msgstr "criar e extrair um novo ramo" -#: builtin/checkout.c:1750 +#: builtin/checkout.c:1768 msgid "create/reset and checkout a branch" msgstr "criar/repor e extrair um ramo" -#: builtin/checkout.c:1751 +#: builtin/checkout.c:1769 msgid "create reflog for new branch" msgstr "criar reflog do novo ramo" -#: builtin/checkout.c:1753 +#: builtin/checkout.c:1771 #, fuzzy msgid "second guess 'git checkout <no-such-branch>' (default)" msgstr "tentar adivinhar 'git checkout <ramo-inexistente>'" -#: builtin/checkout.c:1754 +#: builtin/checkout.c:1772 #, fuzzy msgid "use overlay mode (default)" msgstr "eliminar referências soltas (predefinição)" -#: builtin/checkout.c:1799 +#: builtin/checkout.c:1817 #, fuzzy msgid "create and switch to a new branch" msgstr "criar e extrair um novo ramo" -#: builtin/checkout.c:1801 +#: builtin/checkout.c:1819 #, fuzzy msgid "create/reset and switch to a branch" msgstr "criar/repor e extrair um ramo" -#: builtin/checkout.c:1803 +#: builtin/checkout.c:1821 #, fuzzy msgid "second guess 'git switch <no-such-branch>'" msgstr "tentar adivinhar 'git checkout <ramo-inexistente>'" -#: builtin/checkout.c:1805 +#: builtin/checkout.c:1823 #, fuzzy msgid "throw away local modifications" msgstr "forçar extração (descartar modificações locais)" -#: builtin/checkout.c:1839 +#: builtin/checkout.c:1857 msgid "which tree-ish to checkout from" msgstr "" -#: builtin/checkout.c:1841 +#: builtin/checkout.c:1859 #, fuzzy msgid "restore the index" msgstr "falha ao ler o índice" -#: builtin/checkout.c:1843 +#: builtin/checkout.c:1861 #, fuzzy msgid "restore the working tree (default)" msgstr "Mostrar o estado da árvores de trabalho" -#: builtin/checkout.c:1845 +#: builtin/checkout.c:1863 #, fuzzy msgid "ignore unmerged entries" -msgstr "ignorado não integrado: %s\n" +msgstr "ignora unmerged entries" -#: builtin/checkout.c:1846 +#: builtin/checkout.c:1864 msgid "use overlay mode" msgstr "" @@ -12226,9 +12332,9 @@ msgstr "falha ao remover %s" #: builtin/clean.c:38 #, fuzzy, c-format msgid "could not lstat %s\n" -msgstr "não foi possível obter stat de %s" +msgstr "não foi possível obter stat de %s\n" -#: builtin/clean.c:302 git-add--interactive.perl:595 +#: builtin/clean.c:302 git-add--interactive.perl:593 #, c-format msgid "" "Prompt help:\n" @@ -12239,9 +12345,9 @@ msgstr "" "Ajuda de linha de comandos:\n" "1 - selecionar um item numerado\n" "foo - selecionar item baseado no prefixo único\n" -" - (vazio) não seleciona nada\n" +" - (vazio) seleciona nada\n" -#: builtin/clean.c:306 git-add--interactive.perl:604 +#: builtin/clean.c:306 git-add--interactive.perl:602 #, c-format msgid "" "Prompt help:\n" @@ -12262,8 +12368,8 @@ msgstr "" "* - escolher todos os itens\n" " - (vazio) concluir seleção\n" -#: builtin/clean.c:521 git-add--interactive.perl:570 -#: git-add--interactive.perl:575 +#: builtin/clean.c:521 git-add--interactive.perl:568 +#: git-add--interactive.perl:573 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "O quê (%s)?\n" @@ -12333,7 +12439,7 @@ msgid "remove whole directories" msgstr "remover diretórios inteiros" #: builtin/clean.c:909 builtin/describe.c:565 builtin/describe.c:567 -#: builtin/grep.c:910 builtin/log.c:181 builtin/log.c:183 +#: builtin/grep.c:921 builtin/log.c:183 builtin/log.c:185 #: builtin/ls-files.c:558 builtin/name-rev.c:526 builtin/name-rev.c:528 #: builtin/show-ref.c:179 msgid "pattern" @@ -12357,7 +12463,7 @@ msgid "" "clean" msgstr "" "clean.requireForce definido como true e nenhum -i, -n, ou -f fornecido; " -"limpeza recusada" +"recusando limpar" #: builtin/clean.c:932 msgid "" @@ -12365,7 +12471,7 @@ msgid "" "refusing to clean" msgstr "" "clean.requireForce predefinido como true e nenhum -i, -n, ou -f fornecido; " -"limpeza recusada" +"recusando limpar" #: builtin/clean.c:944 msgid "-x and -X cannot be used together" @@ -12375,163 +12481,163 @@ msgstr "-x e -X não pode ser usados juntos" msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<opções>] [--] <repo> [<dir>]" -#: builtin/clone.c:93 +#: builtin/clone.c:94 msgid "don't create a checkout" msgstr "não criar uma extração" -#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:553 +#: builtin/clone.c:95 builtin/clone.c:97 builtin/init-db.c:553 msgid "create a bare repository" msgstr "criar um repositório nu" -#: builtin/clone.c:98 +#: builtin/clone.c:99 msgid "create a mirror repository (implies bare)" msgstr "criar um repositório espelhado (implica repositório nu)" -#: builtin/clone.c:100 +#: builtin/clone.c:101 msgid "to clone from a local repository" msgstr "para clonar de um repositório local" -#: builtin/clone.c:102 +#: builtin/clone.c:103 msgid "don't use local hardlinks, always copy" msgstr "não usar ligações fixas, copiar sempre" -#: builtin/clone.c:104 +#: builtin/clone.c:105 msgid "setup as shared repository" msgstr "configurar como repositório partilhado" -#: builtin/clone.c:106 +#: builtin/clone.c:107 msgid "pathspec" msgstr "pathspec" -#: builtin/clone.c:106 +#: builtin/clone.c:107 msgid "initialize submodules in the clone" msgstr "inicializar submódulos no clone" -#: builtin/clone.c:110 +#: builtin/clone.c:111 msgid "number of submodules cloned in parallel" msgstr "número de submódulos clonados em paralelo" -#: builtin/clone.c:111 builtin/init-db.c:550 +#: builtin/clone.c:112 builtin/init-db.c:550 msgid "template-directory" msgstr "diretório-modelo" -#: builtin/clone.c:112 builtin/init-db.c:551 +#: builtin/clone.c:113 builtin/init-db.c:551 msgid "directory from which templates will be used" msgstr "diretório que contém os modelos usados" -#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1831 +#: builtin/clone.c:115 builtin/clone.c:117 builtin/submodule--helper.c:1831 #: builtin/submodule--helper.c:2336 msgid "reference repository" msgstr "repositório de referência" -#: builtin/clone.c:118 builtin/submodule--helper.c:1833 +#: builtin/clone.c:119 builtin/submodule--helper.c:1833 #: builtin/submodule--helper.c:2338 msgid "use --reference only while cloning" msgstr "usar --reference apenas para clonar" -#: builtin/clone.c:119 builtin/column.c:27 builtin/init-db.c:561 -#: builtin/merge-file.c:46 builtin/pack-objects.c:3546 builtin/repack.c:332 +#: builtin/clone.c:120 builtin/column.c:27 builtin/init-db.c:561 +#: builtin/merge-file.c:46 builtin/pack-objects.c:3546 builtin/repack.c:358 msgid "name" msgstr "nome" -#: builtin/clone.c:120 +#: builtin/clone.c:121 msgid "use <name> instead of 'origin' to track upstream" msgstr "usar <nome> em vez de 'origin' para seguir o ramo a montante" -#: builtin/clone.c:122 +#: builtin/clone.c:123 msgid "checkout <branch> instead of the remote's HEAD" msgstr "extrair <ramo> em vez da HEAD do remoto" -#: builtin/clone.c:124 +#: builtin/clone.c:125 msgid "path to git-upload-pack on the remote" msgstr "caminho para git-upload-pack no remoto" -#: builtin/clone.c:125 builtin/fetch.c:173 builtin/grep.c:849 +#: builtin/clone.c:126 builtin/fetch.c:173 builtin/grep.c:860 #: builtin/pull.c:208 msgid "depth" msgstr "profundidade" -#: builtin/clone.c:126 +#: builtin/clone.c:127 msgid "create a shallow clone of that depth" msgstr "criar um clone raso com essa profundidade" -#: builtin/clone.c:127 builtin/fetch.c:175 builtin/pack-objects.c:3535 +#: builtin/clone.c:128 builtin/fetch.c:175 builtin/pack-objects.c:3535 #: builtin/pull.c:211 msgid "time" msgstr "hora" -#: builtin/clone.c:128 +#: builtin/clone.c:129 msgid "create a shallow clone since a specific time" msgstr "criar um clone raso desde uma data específica" -#: builtin/clone.c:129 builtin/fetch.c:177 builtin/fetch.c:200 -#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1311 +#: builtin/clone.c:130 builtin/fetch.c:177 builtin/fetch.c:200 +#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1317 msgid "revision" msgstr "revisão" -#: builtin/clone.c:130 builtin/fetch.c:178 builtin/pull.c:215 +#: builtin/clone.c:131 builtin/fetch.c:178 builtin/pull.c:215 msgid "deepen history of shallow clone, excluding rev" msgstr "aprofundar o histórico de um clone raso, excluindo a revisão" -#: builtin/clone.c:132 builtin/submodule--helper.c:1843 +#: builtin/clone.c:133 builtin/submodule--helper.c:1843 #: builtin/submodule--helper.c:2352 msgid "clone only one branch, HEAD or --branch" msgstr "clonar apenas um ramo, HEAD ou --branch" -#: builtin/clone.c:134 +#: builtin/clone.c:135 msgid "don't clone any tags, and make later fetches not to follow them" msgstr "" -#: builtin/clone.c:136 +#: builtin/clone.c:137 msgid "any cloned submodules will be shallow" msgstr "qualquer submódulo clonado será raso" -#: builtin/clone.c:137 builtin/init-db.c:559 +#: builtin/clone.c:138 builtin/init-db.c:559 msgid "gitdir" msgstr "gitdir" -#: builtin/clone.c:138 builtin/init-db.c:560 +#: builtin/clone.c:139 builtin/init-db.c:560 msgid "separate git dir from working tree" msgstr "separar o repositório git da árvore de trabalho" -#: builtin/clone.c:139 +#: builtin/clone.c:140 msgid "key=value" msgstr "chave=valor" -#: builtin/clone.c:140 +#: builtin/clone.c:141 msgid "set config inside the new repository" msgstr "definir configuração dentro do novo repositório" -#: builtin/clone.c:142 builtin/fetch.c:195 builtin/ls-remote.c:76 -#: builtin/pull.c:230 builtin/push.c:560 builtin/send-pack.c:190 +#: builtin/clone.c:143 builtin/fetch.c:195 builtin/ls-remote.c:76 +#: builtin/pull.c:230 builtin/push.c:584 builtin/send-pack.c:196 msgid "server-specific" msgstr "específico do servidor" -#: builtin/clone.c:142 builtin/fetch.c:195 builtin/ls-remote.c:76 -#: builtin/pull.c:231 builtin/push.c:560 builtin/send-pack.c:191 +#: builtin/clone.c:143 builtin/fetch.c:195 builtin/ls-remote.c:76 +#: builtin/pull.c:231 builtin/push.c:584 builtin/send-pack.c:197 msgid "option to transmit" msgstr "opção para transmitir" -#: builtin/clone.c:143 builtin/fetch.c:196 builtin/pull.c:234 -#: builtin/push.c:561 +#: builtin/clone.c:144 builtin/fetch.c:196 builtin/pull.c:234 +#: builtin/push.c:585 msgid "use IPv4 addresses only" msgstr "usar apenas endereços IPv4" -#: builtin/clone.c:145 builtin/fetch.c:198 builtin/pull.c:237 -#: builtin/push.c:563 +#: builtin/clone.c:146 builtin/fetch.c:198 builtin/pull.c:237 +#: builtin/push.c:587 msgid "use IPv6 addresses only" msgstr "usar apenas endereços IPv6" -#: builtin/clone.c:149 +#: builtin/clone.c:150 #, fuzzy msgid "any cloned submodules will use their remote-tracking branch" msgstr "qualquer submódulo clonado será raso" -#: builtin/clone.c:151 +#: builtin/clone.c:152 msgid "initialize sparse-checkout file to include only files at root" msgstr "" -#: builtin/clone.c:287 +#: builtin/clone.c:288 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -12539,42 +12645,42 @@ msgstr "" "Não foi possível adivinhar o nome do diretório.\n" "Especifique um diretório na linha de comandos" -#: builtin/clone.c:340 +#: builtin/clone.c:341 #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "info: Não foi possível adicionar sobressalente de '%s': %s\n" -#: builtin/clone.c:413 +#: builtin/clone.c:414 #, c-format msgid "%s exists and is not a directory" msgstr "%s existe e não é um diretório" -#: builtin/clone.c:431 +#: builtin/clone.c:432 #, fuzzy, c-format msgid "failed to start iterator over '%s'" msgstr "falha ao escrever para '%s'" -#: builtin/clone.c:462 +#: builtin/clone.c:463 #, c-format msgid "failed to create link '%s'" msgstr "falha ao criar a ligação '%s'" -#: builtin/clone.c:466 +#: builtin/clone.c:467 #, c-format msgid "failed to copy file to '%s'" msgstr "falha ao copiar o ficheiro para '%s'" -#: builtin/clone.c:471 +#: builtin/clone.c:472 #, fuzzy, c-format msgid "failed to iterate over '%s'" msgstr "falha ao remover '%s'" -#: builtin/clone.c:498 +#: builtin/clone.c:499 #, c-format msgid "done.\n" msgstr "concluído.\n" -#: builtin/clone.c:512 +#: builtin/clone.c:513 #, fuzzy msgid "" "Clone succeeded, but checkout failed.\n" @@ -12585,108 +12691,107 @@ msgstr "" "Pode inspecionar o que foi extraído com 'git status'\n" "e repetir a extração com 'git checkout -f HEAD'\n" -#: builtin/clone.c:589 +#: builtin/clone.c:590 #, c-format msgid "Could not find remote branch %s to clone." msgstr "Ramo remoto %s não encontrado para clonar." -#: builtin/clone.c:708 +#: builtin/clone.c:709 #, c-format msgid "unable to update %s" msgstr "não foi possível atualizar %s" -#: builtin/clone.c:756 +#: builtin/clone.c:757 #, fuzzy msgid "failed to initialize sparse-checkout" msgstr "falha ao finalizar integração de notas" -#: builtin/clone.c:779 +#: builtin/clone.c:780 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" -"a HEAD remota referencia uma referência inexistente, não é possível " -"extrair.\n" +"remote HEAD refere-se a referência inexistente, impossível fazer checkout.\n" -#: builtin/clone.c:811 +#: builtin/clone.c:812 msgid "unable to checkout working tree" msgstr "não foi possível extrair a árvore de trabalho" -#: builtin/clone.c:868 +#: builtin/clone.c:887 msgid "unable to write parameters to config file" msgstr "não foi possível escrever os parâmetros no ficheiro de configuração" -#: builtin/clone.c:931 +#: builtin/clone.c:950 msgid "cannot repack to clean up" msgstr "não é possível reempacotar para limpar" -#: builtin/clone.c:933 +#: builtin/clone.c:952 msgid "cannot unlink temporary alternates file" msgstr "" "não é possível invocar unlink sobre o ficheiro sobressalente temporário" -#: builtin/clone.c:970 builtin/receive-pack.c:2434 +#: builtin/clone.c:992 builtin/receive-pack.c:2493 msgid "Too many arguments." msgstr "Demasiados argumentos." -#: builtin/clone.c:974 +#: builtin/clone.c:996 msgid "You must specify a repository to clone." msgstr "Deve especificar um repositório para clonar." -#: builtin/clone.c:987 +#: builtin/clone.c:1009 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "as opções --bare e --origin %s são incompatíveis." -#: builtin/clone.c:990 +#: builtin/clone.c:1012 msgid "--bare and --separate-git-dir are incompatible." msgstr "--bare e --separate-git-dir são incompatíveis." -#: builtin/clone.c:1006 +#: builtin/clone.c:1025 #, c-format msgid "repository '%s' does not exist" msgstr "o repositório '%s' não existe" -#: builtin/clone.c:1010 builtin/fetch.c:1841 +#: builtin/clone.c:1029 builtin/fetch.c:1841 #, c-format msgid "depth %s is not a positive number" msgstr "profundidade %s não é um número positivo" -#: builtin/clone.c:1020 +#: builtin/clone.c:1039 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "o caminho de destino '%s' já existe e não é um diretório vazio." -#: builtin/clone.c:1026 +#: builtin/clone.c:1045 #, fuzzy, c-format msgid "repository path '%s' already exists and is not an empty directory." msgstr "o caminho de destino '%s' já existe e não é um diretório vazio." -#: builtin/clone.c:1040 +#: builtin/clone.c:1059 #, c-format msgid "working tree '%s' already exists." msgstr "a árvore de trabalho '%s' já existe." -#: builtin/clone.c:1055 builtin/clone.c:1076 builtin/difftool.c:271 -#: builtin/log.c:1970 builtin/worktree.c:354 builtin/worktree.c:386 +#: builtin/clone.c:1074 builtin/clone.c:1095 builtin/difftool.c:271 +#: builtin/log.c:1987 builtin/worktree.c:354 builtin/worktree.c:386 #, c-format msgid "could not create leading directories of '%s'" msgstr "não foi possível criar os diretórios superiores de '%s'" -#: builtin/clone.c:1060 +#: builtin/clone.c:1079 #, c-format msgid "could not create work tree dir '%s'" msgstr "não foi possível criar o diretório de árvore de trabalho '%s'" -#: builtin/clone.c:1080 +#: builtin/clone.c:1099 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "A clonar no repositório nu '%s'...\n" -#: builtin/clone.c:1082 +#: builtin/clone.c:1101 #, c-format msgid "Cloning into '%s'...\n" -msgstr "A clonar em '%s'...\n" +msgstr "Clonando em '%s'...\n" -#: builtin/clone.c:1106 +#: builtin/clone.c:1125 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" @@ -12694,37 +12799,42 @@ msgstr "" "clone --recursive não é compatível com ambos --reference e --reference-if-" "able" -#: builtin/clone.c:1170 +#: builtin/clone.c:1169 builtin/remote.c:200 builtin/remote.c:705 +#, c-format +msgid "'%s' is not a valid remote name" +msgstr "'%s' não é um nome de remoto válido" + +#: builtin/clone.c:1210 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth é ignorado em clones locais; use file:// ." -#: builtin/clone.c:1172 +#: builtin/clone.c:1212 msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "--shallow-since é ignorado em clones locais; use file:// ." -#: builtin/clone.c:1174 +#: builtin/clone.c:1214 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "--shallow-exclude é ignorado em clones locais; use file:// ." -#: builtin/clone.c:1176 +#: builtin/clone.c:1216 #, fuzzy msgid "--filter is ignored in local clones; use file:// instead." msgstr "--depth é ignorado em clones locais; use file:// ." -#: builtin/clone.c:1179 +#: builtin/clone.c:1219 msgid "source repository is shallow, ignoring --local" msgstr "o repositório de origem é raso, --local ignorado" -#: builtin/clone.c:1184 +#: builtin/clone.c:1224 msgid "--local is ignored" msgstr "--local ignorado" -#: builtin/clone.c:1268 builtin/clone.c:1276 +#: builtin/clone.c:1308 builtin/clone.c:1316 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "O ramo remoto %s não foi encontrado no repositório a montante %s" -#: builtin/clone.c:1279 +#: builtin/clone.c:1319 msgid "You appear to have cloned an empty repository." msgstr "Parece foi clonado um repositório vazio." @@ -12778,7 +12888,7 @@ msgid "could not find object directory matching %s" msgstr "não foi possível ler o objeto %s da ligação simbólica %s" #: builtin/commit-graph.c:80 builtin/commit-graph.c:210 -#: builtin/commit-graph.c:316 builtin/fetch.c:184 builtin/log.c:1764 +#: builtin/commit-graph.c:316 builtin/fetch.c:184 builtin/log.c:1769 msgid "dir" msgstr "dir" @@ -12871,7 +12981,7 @@ msgstr "" msgid "duplicate parent %s ignored" msgstr "" -#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:546 +#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:555 #, fuzzy, c-format msgid "not a valid object name %s" msgstr "%s não é um nome de objeto válido" @@ -12901,8 +13011,8 @@ msgstr "número-pai" msgid "id of a parent commit object" msgstr "falha ao escrever objeto de commit" -#: builtin/commit-tree.c:114 builtin/commit.c:1504 builtin/merge.c:272 -#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1471 +#: builtin/commit-tree.c:114 builtin/commit.c:1504 builtin/merge.c:281 +#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1470 #: builtin/tag.c:413 msgid "message" msgstr "mensagem" @@ -12916,7 +13026,7 @@ msgstr "mensagem de commit" msgid "read commit log message from file" msgstr "ler mensagem de um ficheiro" -#: builtin/commit-tree.c:121 builtin/commit.c:1516 builtin/merge.c:289 +#: builtin/commit-tree.c:121 builtin/commit.c:1516 builtin/merge.c:298 #: builtin/pull.c:176 builtin/revert.c:118 msgid "GPG sign commit" msgstr "assinar o commit com GPG" @@ -12958,8 +13068,8 @@ msgid "" "\n" msgstr "" "O cherry-pick anterior está vazio, possivelmente devido a resolução de " -"conflitos.\n" -"Se deseja submeter de qualquer forma, use:\n" +"conflito.\n" +"Se ainda desejas commit, usa:\n" "\n" " git commit --allow-empty\n" "\n" @@ -13068,7 +13178,7 @@ msgstr "" msgid "could not lookup commit %s" msgstr "não foi possível consultar o commit %s" -#: builtin/commit.c:729 builtin/shortlog.c:478 +#: builtin/commit.c:729 builtin/shortlog.c:425 #, c-format msgid "(reading log message from standard input)\n" msgstr "(a ler mensagem de log da entrada padrão)\n" @@ -13106,8 +13216,8 @@ msgstr "" "\n" "Parece que está a submeter uma integração.\n" "Se não for o caso, remova o ficheiro\n" -"\t%s\n" -"e tente de novo.\n" +"\tgit update-ref -d MERGE_HEAD\n" +"e tenta de novo.\n" #: builtin/commit.c:858 #, fuzzy @@ -13121,8 +13231,8 @@ msgstr "" "\n" "Parece que está a submeter um cherry-pick.\n" "Se não é o caso, remova o ficheiro\n" -"\t%s\n" -"e tente outra vez.\n" +"\tgit update-ref -d CHERRY_PICK_HEAD\n" +"e tenta de novo.\n" #: builtin/commit.c:868 #, c-format @@ -13171,7 +13281,7 @@ msgstr "Erro ao construir árvores" #: builtin/commit.c:1011 builtin/tag.c:276 #, c-format msgid "Please supply the message using either -m or -F option.\n" -msgstr "Indique a mensagem usando as opções -m ou -F.\n" +msgstr "Indique a mensagem usando apenas as opções -m ou -F.\n" #: builtin/commit.c:1055 #, c-format @@ -13263,8 +13373,8 @@ msgstr "" msgid "version" msgstr "versão" -#: builtin/commit.c:1374 builtin/commit.c:1533 builtin/push.c:539 -#: builtin/worktree.c:722 +#: builtin/commit.c:1374 builtin/commit.c:1533 builtin/push.c:560 +#: builtin/worktree.c:725 msgid "machine-readable output" msgstr "saída inteligível por máquina" @@ -13278,7 +13388,7 @@ msgstr "terminar entradas com NUL" #: builtin/commit.c:1382 builtin/commit.c:1386 builtin/commit.c:1541 #: builtin/fast-export.c:1199 builtin/fast-export.c:1202 -#: builtin/fast-export.c:1205 builtin/rebase.c:1400 parse-options.h:336 +#: builtin/fast-export.c:1205 builtin/rebase.c:1406 parse-options.h:336 msgid "mode" msgstr "modo" @@ -13338,7 +13448,7 @@ msgstr "mostrar diff no modelo da mensagem de commit" msgid "Commit message options" msgstr "Opções de mensagem de commit" -#: builtin/commit.c:1501 builtin/merge.c:276 builtin/tag.c:415 +#: builtin/commit.c:1501 builtin/merge.c:285 builtin/tag.c:415 msgid "read message from file" msgstr "ler mensagem de um ficheiro" @@ -13350,7 +13460,7 @@ msgstr "autor" msgid "override author for commit" msgstr "substituir autor do commit" -#: builtin/commit.c:1503 builtin/gc.c:539 +#: builtin/commit.c:1503 builtin/gc.c:542 msgid "date" msgstr "data" @@ -13385,9 +13495,10 @@ msgstr "" msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "agora sou eu o autor do commit (usado com C/-c/--amend)" -#: builtin/commit.c:1510 builtin/log.c:1741 builtin/merge.c:292 +#: builtin/commit.c:1510 builtin/log.c:1744 builtin/merge.c:301 #: builtin/pull.c:145 builtin/revert.c:110 -msgid "add Signed-off-by:" +#, fuzzy +msgid "add a Signed-off-by trailer" msgstr "adicionar Signed-off-by:" #: builtin/commit.c:1511 @@ -13489,223 +13600,233 @@ msgstr "" msgid "git config [<options>]" msgstr "git config [<opções>]" -#: builtin/config.c:107 builtin/env--helper.c:27 +#: builtin/config.c:109 builtin/env--helper.c:27 #, fuzzy, c-format msgid "unrecognized --type argument, %s" msgstr "argumento não reconhecido: %s" -#: builtin/config.c:119 +#: builtin/config.c:121 #, fuzzy msgid "only one type at a time" msgstr "imprimir apenas correspondências exatas" -#: builtin/config.c:128 +#: builtin/config.c:130 msgid "Config file location" msgstr "Localização do ficheiro de configuração" -#: builtin/config.c:129 +#: builtin/config.c:131 msgid "use global config file" msgstr "usar ficheiro de configuração global" -#: builtin/config.c:130 +#: builtin/config.c:132 msgid "use system config file" msgstr "usar ficheiro de configuração do sistema" -#: builtin/config.c:131 +#: builtin/config.c:133 msgid "use repository config file" msgstr "usar ficheiro de configuração do repositório" -#: builtin/config.c:132 +#: builtin/config.c:134 #, fuzzy msgid "use per-worktree config file" msgstr "usar ficheiro de configuração do repositório" -#: builtin/config.c:133 +#: builtin/config.c:135 msgid "use given config file" msgstr "usar ficheiro de configuração fornecido" -#: builtin/config.c:134 +#: builtin/config.c:136 msgid "blob-id" msgstr "id-blob" -#: builtin/config.c:134 +#: builtin/config.c:136 msgid "read config from given blob object" msgstr "ler configuração a partir do objeto blob fornecido" -#: builtin/config.c:135 +#: builtin/config.c:137 msgid "Action" msgstr "Ação" -#: builtin/config.c:136 -msgid "get value: name [value-regex]" +#: builtin/config.c:138 +#, fuzzy +msgid "get value: name [value-pattern]" msgstr "obter valor: nome [regex-do-valor]" -#: builtin/config.c:137 -msgid "get all values: key [value-regex]" +#: builtin/config.c:139 +#, fuzzy +msgid "get all values: key [value-pattern]" msgstr "obter todos os valores: chave [regex-do-valor]" -#: builtin/config.c:138 -msgid "get values for regexp: name-regex [value-regex]" +#: builtin/config.c:140 +#, fuzzy +msgid "get values for regexp: name-regex [value-pattern]" msgstr "obter valores para a regexp: regex-do-nome [regex-do-valor]" -#: builtin/config.c:139 +#: builtin/config.c:141 msgid "get value specific for the URL: section[.var] URL" msgstr "obter valor do URL especificado: section[.var] URL" -#: builtin/config.c:140 -msgid "replace all matching variables: name value [value_regex]" +#: builtin/config.c:142 +#, fuzzy +msgid "replace all matching variables: name value [value-pattern]" msgstr "" "substituir todos as variáveis correspondentes: nome valor [regex-do-valor]" -#: builtin/config.c:141 +#: builtin/config.c:143 msgid "add a new variable: name value" msgstr "adicionar uma nova variável: nome valor" -#: builtin/config.c:142 -msgid "remove a variable: name [value-regex]" +#: builtin/config.c:144 +#, fuzzy +msgid "remove a variable: name [value-pattern]" msgstr "remover uma variável: nome [regex-do-valor]" -#: builtin/config.c:143 -msgid "remove all matches: name [value-regex]" +#: builtin/config.c:145 +#, fuzzy +msgid "remove all matches: name [value-pattern]" msgstr "remover todas as correspondências: nome [regex-do-valor]" -#: builtin/config.c:144 +#: builtin/config.c:146 msgid "rename section: old-name new-name" msgstr "mudar o nome da secção: nome-antigo novo-nome" -#: builtin/config.c:145 +#: builtin/config.c:147 msgid "remove a section: name" msgstr "remover uma secção: nome" -#: builtin/config.c:146 +#: builtin/config.c:148 msgid "list all" msgstr "listar todos" -#: builtin/config.c:147 +#: builtin/config.c:149 +msgid "use string equality when comparing values to 'value-pattern'" +msgstr "" + +#: builtin/config.c:150 msgid "open an editor" msgstr "abrir um editor" -#: builtin/config.c:148 +#: builtin/config.c:151 msgid "find the color configured: slot [default]" msgstr "encontrar a cor configurada: slot [predefinição]" -#: builtin/config.c:149 +#: builtin/config.c:152 msgid "find the color setting: slot [stdout-is-tty]" msgstr "encontrar a definição de cor: slot [stdout-é-tty]" -#: builtin/config.c:150 +#: builtin/config.c:153 msgid "Type" msgstr "Tipo" -#: builtin/config.c:151 builtin/env--helper.c:43 +#: builtin/config.c:154 builtin/env--helper.c:43 msgid "value is given this type" msgstr "" -#: builtin/config.c:152 +#: builtin/config.c:155 msgid "value is \"true\" or \"false\"" msgstr "o valor é \"true\" (verdadeiro) ou \"false\" (falso)" -#: builtin/config.c:153 +#: builtin/config.c:156 msgid "value is decimal number" msgstr "o valor é um número decimal" -#: builtin/config.c:154 +#: builtin/config.c:157 msgid "value is --bool or --int" msgstr "o valor é --bool ou --int" -#: builtin/config.c:155 +#: builtin/config.c:158 #, fuzzy msgid "value is --bool or string" msgstr "o valor é --bool ou --int" -#: builtin/config.c:156 +#: builtin/config.c:159 msgid "value is a path (file or directory name)" msgstr "o valor é um caminho (nome dum ficheiro ou diretório)" -#: builtin/config.c:157 +#: builtin/config.c:160 msgid "value is an expiry date" msgstr "" -#: builtin/config.c:158 +#: builtin/config.c:161 msgid "Other" msgstr "Outro" -#: builtin/config.c:159 +#: builtin/config.c:162 msgid "terminate values with NUL byte" msgstr "terminar valores com o byte NUL" -#: builtin/config.c:160 +#: builtin/config.c:163 msgid "show variable names only" msgstr "mostrar apenas os nomes das variáveis" -#: builtin/config.c:161 +#: builtin/config.c:164 msgid "respect include directives on lookup" msgstr "respeitar diretivas de inclusão ao pesquisar" -#: builtin/config.c:162 +#: builtin/config.c:165 msgid "show origin of config (file, standard input, blob, command line)" msgstr "" "mostrar a origem da configuração (ficheiro, entrada padrão, blob, linha de " "comandos)" -#: builtin/config.c:163 +#: builtin/config.c:166 msgid "show scope of config (worktree, local, global, system, command)" msgstr "" -#: builtin/config.c:164 builtin/env--helper.c:45 +#: builtin/config.c:167 builtin/env--helper.c:45 #, fuzzy msgid "value" msgstr "chave=valor" -#: builtin/config.c:164 +#: builtin/config.c:167 msgid "with --get, use default value when missing entry" msgstr "" -#: builtin/config.c:178 +#: builtin/config.c:181 #, c-format msgid "wrong number of arguments, should be %d" msgstr "" -#: builtin/config.c:180 +#: builtin/config.c:183 #, c-format msgid "wrong number of arguments, should be from %d to %d" msgstr "" -#: builtin/config.c:334 +#: builtin/config.c:339 #, fuzzy, c-format msgid "invalid key pattern: %s" msgstr "chave inválida: %s" -#: builtin/config.c:370 +#: builtin/config.c:377 #, fuzzy, c-format msgid "failed to format default config value: %s" msgstr "falha ao criar o ficheiro %s" -#: builtin/config.c:434 +#: builtin/config.c:441 #, fuzzy, c-format msgid "cannot parse color '%s'" msgstr "não é possível abrir o ficheiro '%s'" -#: builtin/config.c:476 +#: builtin/config.c:483 msgid "unable to parse default color value" msgstr "não é possível analisar o valor de cor por omissão" -#: builtin/config.c:529 builtin/config.c:789 +#: builtin/config.c:536 builtin/config.c:833 #, fuzzy msgid "not in a git directory" msgstr "Não é um repositório git" -#: builtin/config.c:532 +#: builtin/config.c:539 #, fuzzy msgid "writing to stdin is not supported" msgstr "Não é suportada profundidade negativa em --deepen" -#: builtin/config.c:535 +#: builtin/config.c:542 #, fuzzy msgid "writing config blobs is not supported" -msgstr "aviso: sendmail alias com aspas não é suportado: %s\n" +msgstr "escrever config blobs tem suporte nenhum" -#: builtin/config.c:620 +#: builtin/config.c:627 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -13720,93 +13841,97 @@ msgstr "" "#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c:644 +#: builtin/config.c:652 msgid "only one config file at a time" msgstr "" -#: builtin/config.c:650 +#: builtin/config.c:658 #, fuzzy msgid "--local can only be used inside a git repository" msgstr "--cached fora de um repositório" -#: builtin/config.c:652 +#: builtin/config.c:660 #, fuzzy msgid "--blob can only be used inside a git repository" msgstr "--cached fora de um repositório" -#: builtin/config.c:654 +#: builtin/config.c:662 #, fuzzy msgid "--worktree can only be used inside a git repository" msgstr "'%s' não é reconhecido como um repositório git" -#: builtin/config.c:676 +#: builtin/config.c:684 msgid "$HOME not set" msgstr "" -#: builtin/config.c:700 +#: builtin/config.c:708 msgid "" "--worktree cannot be used with multiple working trees unless the config\n" "extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n" "section in \"git help worktree\" for details" msgstr "" -#: builtin/config.c:735 +#: builtin/config.c:743 msgid "--get-color and variable type are incoherent" msgstr "" -#: builtin/config.c:740 +#: builtin/config.c:748 msgid "only one action at a time" msgstr "" -#: builtin/config.c:753 +#: builtin/config.c:761 msgid "--name-only is only applicable to --list or --get-regexp" msgstr "" -#: builtin/config.c:759 +#: builtin/config.c:767 msgid "" "--show-origin is only applicable to --get, --get-all, --get-regexp, and --" "list" msgstr "" -#: builtin/config.c:765 +#: builtin/config.c:773 msgid "--default is only applicable to --get" msgstr "" -#: builtin/config.c:778 +#: builtin/config.c:806 +msgid "--fixed-value only applies with 'value-pattern'" +msgstr "" + +#: builtin/config.c:822 #, fuzzy, c-format msgid "unable to read config file '%s'" msgstr "não é possível ler o ficheiro de assinatura '%s'" -#: builtin/config.c:781 +#: builtin/config.c:825 #, fuzzy msgid "error processing config file(s)" msgstr "usar ficheiro de configuração do repositório" -#: builtin/config.c:791 +#: builtin/config.c:835 #, fuzzy msgid "editing stdin is not supported" msgstr "Não é suportada profundidade negativa em --deepen" -#: builtin/config.c:793 +#: builtin/config.c:837 #, fuzzy msgid "editing blobs is not supported" msgstr "Não é suportada profundidade negativa em --deepen" -#: builtin/config.c:807 +#: builtin/config.c:851 #, c-format msgid "cannot create configuration file %s" msgstr "não é possível criar o ficheiro de configuração %s" -#: builtin/config.c:820 +#: builtin/config.c:864 #, c-format msgid "" "cannot overwrite multiple values with a single value\n" " Use a regexp, --add or --replace-all to change %s." msgstr "" "não é possível substituir múltiplos valores por um único valor\n" -"\tUse uma regexp, --add ou --replace-all para alterar %s." +" Usa uma regexp, --add ou --replace-all para alterar %s." -#: builtin/config.c:894 builtin/config.c:905 +#: builtin/config.c:943 builtin/config.c:954 #, fuzzy, c-format msgid "no such section: %s" msgstr "referência inexistente %s" @@ -13845,6 +13970,11 @@ msgstr "" msgid "credential-cache unavailable; no unix socket support" msgstr "" +#: builtin/credential-store.c:66 +#, fuzzy, c-format +msgid "unable to get credential storage lock in %d ms" +msgstr "não é possível de obter o diretório de trabalho atual" + #: builtin/describe.c:26 msgid "git describe [<options>] [<commit-ish>...]" msgstr "git describe [<opções>] [<commit-etc>...]" @@ -13878,7 +14008,7 @@ msgstr "a tag '%s' está de facto em '%s'" #: builtin/describe.c:328 #, c-format msgid "no tag exactly matches '%s'" -msgstr "nenhuma tag corresponde exatamente a '%s'" +msgstr "tag nenhuma corresponde exatamente a '%s'" #: builtin/describe.c:330 #, c-format @@ -14013,41 +14143,50 @@ msgstr "--dirty é incompatível com commits ou semelhantes" msgid "--broken is incompatible with commit-ishes" msgstr "--broken é incompatível com commits ou semelhantes" +#: builtin/diff-tree.c:155 +#, fuzzy +msgid "--stdin and --merge-base are mutually exclusive" +msgstr "-b, -B e --orphan são mutuamente exclusivos" + +#: builtin/diff-tree.c:157 +msgid "--merge-base only works with two commits" +msgstr "" + #: builtin/diff.c:91 #, c-format msgid "'%s': not a regular file or symlink" msgstr "'%s': não é um ficheiro regular nem uma ligação simbólica" -#: builtin/diff.c:241 +#: builtin/diff.c:258 #, c-format msgid "invalid option: %s" msgstr "opção inválida: %s" -#: builtin/diff.c:358 +#: builtin/diff.c:375 #, c-format msgid "%s...%s: no merge base" msgstr "" -#: builtin/diff.c:468 +#: builtin/diff.c:485 msgid "Not a git repository" msgstr "Não é um repositório git" -#: builtin/diff.c:513 +#: builtin/diff.c:530 builtin/grep.c:681 #, c-format msgid "invalid object '%s' given." msgstr "objeto inválido '%s' fornecido." -#: builtin/diff.c:524 +#: builtin/diff.c:541 #, c-format msgid "more than two blobs given: '%s'" msgstr "mais do que dois blobs fornecidos: '%s'" -#: builtin/diff.c:529 +#: builtin/diff.c:546 #, c-format msgid "unhandled object '%s' given." msgstr "objeto sem tratamento '%s' fornecido." -#: builtin/diff.c:563 +#: builtin/diff.c:580 #, c-format msgid "%s...%s: multiple merge bases, using %s" msgstr "" @@ -14076,7 +14215,7 @@ msgstr "não foi possível ler o ficheiro de ligação simbólica %s" msgid "could not read object %s for symlink %s" msgstr "não foi possível ler o objeto %s da ligação simbólica %s" -#: builtin/difftool.c:413 +#: builtin/difftool.c:412 msgid "" "combined diff formats('-c' and '--cc') are not supported in\n" "directory diff mode('-d' and '--dir-diff')." @@ -14084,55 +14223,55 @@ msgstr "" "formatos diff combinado('-c' e '--cc') não são suportados em\n" "modo diff diretório ('-d' e '--dir-diff')." -#: builtin/difftool.c:634 +#: builtin/difftool.c:633 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "ambos os ficheiros modificados: '%s' e '%s'." -#: builtin/difftool.c:636 +#: builtin/difftool.c:635 msgid "working tree file has been left." msgstr "ficheiro de árvore de trabalho foi deixado." -#: builtin/difftool.c:647 +#: builtin/difftool.c:646 #, c-format msgid "temporary files exist in '%s'." msgstr "existem ficheiros temporários em '%s'." -#: builtin/difftool.c:648 +#: builtin/difftool.c:647 msgid "you may want to cleanup or recover these." msgstr "pode querer limpar ou recuperá-los." -#: builtin/difftool.c:697 +#: builtin/difftool.c:696 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "use 'diff.guitool' em vez de 'diff.tool'" -#: builtin/difftool.c:699 +#: builtin/difftool.c:698 msgid "perform a full-directory diff" msgstr "efetuar diff diretório completo" -#: builtin/difftool.c:701 +#: builtin/difftool.c:700 msgid "do not prompt before launching a diff tool" msgstr "não perguntar antes de lançar uma ferramenta diff" -#: builtin/difftool.c:706 +#: builtin/difftool.c:705 msgid "use symlinks in dir-diff mode" msgstr "usar symlinks no modi dir-diff" -#: builtin/difftool.c:707 +#: builtin/difftool.c:706 #, fuzzy msgid "tool" msgstr "<ferramenta>" -#: builtin/difftool.c:708 +#: builtin/difftool.c:707 msgid "use the specified diff tool" msgstr "usar a ferramenta diff especificada" -#: builtin/difftool.c:710 +#: builtin/difftool.c:709 msgid "print a list of diff tools that may be used with `--tool`" msgstr "" "imprimir uma lista de ferramentas diff que podem ser usadas com '--tool'" -#: builtin/difftool.c:713 +#: builtin/difftool.c:712 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " "code" @@ -14140,35 +14279,35 @@ msgstr "" "fazer com que 'git-difftool' termine quando uma ferramenta diff invocada " "retorna um código de saída não nulo" -#: builtin/difftool.c:716 +#: builtin/difftool.c:715 msgid "specify a custom command for viewing diffs" msgstr "especificar um comando personalizado para ver diffs" -#: builtin/difftool.c:717 +#: builtin/difftool.c:716 msgid "passed to `diff`" msgstr "" -#: builtin/difftool.c:732 +#: builtin/difftool.c:731 msgid "difftool requires worktree or --no-index" msgstr "" -#: builtin/difftool.c:739 +#: builtin/difftool.c:738 #, fuzzy msgid "--dir-diff is incompatible with --no-index" msgstr "--dirty é incompatível com commits ou semelhantes" -#: builtin/difftool.c:742 +#: builtin/difftool.c:741 #, fuzzy msgid "--gui, --tool and --extcmd are mutually exclusive" msgstr "-b, -B e --detach são mutuamente exclusivos" -#: builtin/difftool.c:750 +#: builtin/difftool.c:749 msgid "no <tool> given for --tool=<tool>" -msgstr "nenhuma <ferramenta> dada a --tool=<ferramenta>" +msgstr "<ferramenta> nenhuma dada a --tool=<ferramenta>" -#: builtin/difftool.c:757 +#: builtin/difftool.c:756 msgid "no <cmd> given for --extcmd=<cmd>" -msgstr "nenhum <cmd> dado a --extcmd=<cmd>" +msgstr "<cmd> nenhum dado a --extcmd=<cmd>" #: builtin/env--helper.c:6 msgid "git env--helper --type=[bool|ulong] <options> <env-var>" @@ -14256,7 +14395,7 @@ msgstr "Usar a funcionalidade done para terminar o fluxo" msgid "Skip output of blob data" msgstr "Ignorar a exibição de dados de blob" -#: builtin/fast-export.c:1223 builtin/log.c:1811 +#: builtin/fast-export.c:1223 builtin/log.c:1816 msgid "refspec" msgstr "especificador de referência" @@ -14297,31 +14436,31 @@ msgstr "--name-only não faz sentido" msgid "Cannot pass both --import-marks and --import-marks-if-exists" msgstr "" -#: builtin/fast-import.c:3086 +#: builtin/fast-import.c:3088 #, fuzzy, c-format msgid "Missing from marks for submodule '%s'" msgstr "A ignorar submódulo '%s'" -#: builtin/fast-import.c:3088 +#: builtin/fast-import.c:3090 #, fuzzy, c-format msgid "Missing to marks for submodule '%s'" msgstr "A ignorar submódulo '%s'" -#: builtin/fast-import.c:3223 +#: builtin/fast-import.c:3225 #, c-format msgid "Expected 'mark' command, got %s" msgstr "" -#: builtin/fast-import.c:3228 +#: builtin/fast-import.c:3230 #, c-format msgid "Expected 'to' command, got %s" msgstr "" -#: builtin/fast-import.c:3320 +#: builtin/fast-import.c:3322 msgid "Expected format name:filename for submodule rewrite option" msgstr "" -#: builtin/fast-import.c:3374 +#: builtin/fast-import.c:3377 #, c-format msgid "feature '%s' forbidden in input without --allow-unsafe-features" msgstr "" @@ -14591,7 +14730,7 @@ msgstr " (%s ficou suspenso)" msgid "[deleted]" msgstr "[eliminado]" -#: builtin/fetch.c:1195 builtin/remote.c:1113 +#: builtin/fetch.c:1195 builtin/remote.c:1118 msgid "(none)" msgstr "(nenhum)" @@ -14649,7 +14788,7 @@ msgstr "Não foi possível obter de %s" #: builtin/fetch.c:1620 #, fuzzy, c-format msgid "could not fetch '%s' (exit code: %d)\n" -msgstr "não foi possível definir '%s' como '%s'" +msgstr "fetch '%s' impossível (exit code: %d)\n" #: builtin/fetch.c:1724 msgid "" @@ -14799,6 +14938,22 @@ msgstr "imprimir apenas referências que contenham o commit" msgid "print only refs which don't contain the commit" msgstr "imprimir apenas referências que não contenham o commit" +#: builtin/for-each-repo.c:9 +msgid "git for-each-repo --config=<config> <command-args>" +msgstr "" + +#: builtin/for-each-repo.c:37 +msgid "config" +msgstr "" + +#: builtin/for-each-repo.c:38 +msgid "config key storing a list of repository paths" +msgstr "" + +#: builtin/for-each-repo.c:46 +msgid "missing --config=<config>" +msgstr "" + #: builtin/fsck.c:69 builtin/fsck.c:148 builtin/fsck.c:149 #, fuzzy msgid "unknown" @@ -14846,7 +15001,7 @@ msgstr "já se tem %s (%s)" #: builtin/fsck.c:330 #, fuzzy, c-format msgid "dangling %s %s" -msgstr "A atualizar %s..%s\n" +msgstr "balanceando %s %s" #: builtin/fsck.c:340 #, fuzzy @@ -14900,7 +15055,7 @@ msgstr "referência inválida: %s" #: builtin/fsck.c:515 #, fuzzy, c-format msgid "Checking reflog %s->%s" -msgstr "A verificar a mudança de nome de '%s' para '%s'\n" +msgstr "Verificando reflog %s->%s" #: builtin/fsck.c:549 #, fuzzy, c-format @@ -15046,31 +15201,31 @@ msgstr "mostrar tamanho do objeto" msgid "invalid parameter: expected sha1, got '%s'" msgstr "parâmetro inválido na mágica 'prefix' do especificador de caminho" -#: builtin/gc.c:36 +#: builtin/gc.c:39 msgid "git gc [<options>]" msgstr "git gc [<opções>]" -#: builtin/gc.c:91 +#: builtin/gc.c:94 #, c-format msgid "Failed to fstat %s: %s" msgstr "falha ao invocar fstat sobre %s: %s" -#: builtin/gc.c:127 +#: builtin/gc.c:130 #, fuzzy, c-format msgid "failed to parse '%s' value '%s'" msgstr "falha ao abrir '%s': %s" -#: builtin/gc.c:476 builtin/init-db.c:58 +#: builtin/gc.c:479 builtin/init-db.c:58 #, c-format msgid "cannot stat '%s'" msgstr "não é possível invocar stat sobre '%s'" -#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:530 +#: builtin/gc.c:488 builtin/notes.c:240 builtin/tag.c:530 #, c-format msgid "cannot read '%s'" msgstr "não é possível ler '%s'" -#: builtin/gc.c:492 +#: builtin/gc.c:495 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -15085,54 +15240,53 @@ msgstr "" "\n" "%s" -#: builtin/gc.c:540 +#: builtin/gc.c:543 msgid "prune unreferenced objects" msgstr "eliminar ficheiros não referenciados" -#: builtin/gc.c:542 +#: builtin/gc.c:545 msgid "be more thorough (increased runtime)" msgstr "ser mais minucioso (aumenta o tempo de execução)" -#: builtin/gc.c:543 +#: builtin/gc.c:546 msgid "enable auto-gc mode" msgstr "ativar modo auto-gc" -#: builtin/gc.c:546 +#: builtin/gc.c:549 msgid "force running gc even if there may be another gc running" msgstr "forçar a execução do gc mesmo que haja outro gc a executar" -#: builtin/gc.c:549 +#: builtin/gc.c:552 msgid "repack all other packs except the largest pack" msgstr "" -#: builtin/gc.c:566 +#: builtin/gc.c:569 #, fuzzy, c-format msgid "failed to parse gc.logexpiry value %s" msgstr "falha ao analisar o valor %s de gc.logexpiry" -#: builtin/gc.c:577 +#: builtin/gc.c:580 #, fuzzy, c-format msgid "failed to parse prune expiry value %s" msgstr "falha ao analisar o valor %s de gc.logexpiry" -#: builtin/gc.c:597 +#: builtin/gc.c:600 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "" -"A autocompactar o repositório em segundo plano para obter um melhor " -"desempenho.\n" +"Autocompactando o repositório para desempenho ótimizado, em segundo plano.\n" -#: builtin/gc.c:599 +#: builtin/gc.c:602 #, c-format msgid "Auto packing the repository for optimum performance.\n" -msgstr "A autocompactar o repositório para obter um melhor desempenho.\n" +msgstr "Autocompactando o repositório para desempenho ótimizado.\n" -#: builtin/gc.c:600 +#: builtin/gc.c:603 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" -msgstr "Consulte \"git help gc\" para ler sobre manutenção manual.\n" +msgstr "Vê \"git help gc\" para manual de manutenção.\n" -#: builtin/gc.c:640 +#: builtin/gc.c:643 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" @@ -15140,65 +15294,152 @@ msgstr "" "gc já a executar na máquina '%s' pid %<PRIuMAX> (use --force se não for o " "caso)" -#: builtin/gc.c:695 +#: builtin/gc.c:698 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" "Existem demasiados objeto soltos inalcançáveis; execute 'git prune' para os " "remover." -#: builtin/gc.c:705 -msgid "git maintenance run [--auto] [--[no-]quiet] [--task=<task>]" +#: builtin/gc.c:708 +msgid "" +"git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]" msgstr "" -#: builtin/gc.c:812 +#: builtin/gc.c:738 +msgid "--no-schedule is not allowed" +msgstr "" + +#: builtin/gc.c:743 +#, fuzzy, c-format +msgid "unrecognized --schedule argument '%s'" +msgstr "argumento não reconhecido: %s" + +#: builtin/gc.c:862 #, fuzzy msgid "failed to write commit-graph" msgstr "falha ao escrever objeto de commit" -#: builtin/gc.c:905 +#: builtin/gc.c:901 +#, fuzzy +msgid "failed to fill remotes" +msgstr "falha ao remover %s" + +#: builtin/gc.c:1024 +#, fuzzy +msgid "failed to start 'git pack-objects' process" +msgstr "Não foi possível lançar pack-objects" + +#: builtin/gc.c:1041 +#, fuzzy +msgid "failed to finish 'git pack-objects' process" +msgstr "Não foi possível lançar pack-objects" + +#: builtin/gc.c:1093 +#, fuzzy +msgid "failed to write multi-pack-index" +msgstr "falha ao limpar o índice" + +#: builtin/gc.c:1111 +msgid "'git multi-pack-index expire' failed" +msgstr "" + +#: builtin/gc.c:1172 +#, fuzzy +msgid "'git multi-pack-index repack' failed" +msgstr "falha ao ler o ficheiro de comando '%s'" + +#: builtin/gc.c:1181 +msgid "" +"skipping incremental-repack task because core.multiPackIndex is disabled" +msgstr "" + +#: builtin/gc.c:1279 #, c-format msgid "lock file '%s' exists, skipping maintenance" msgstr "" -#: builtin/gc.c:932 +#: builtin/gc.c:1309 #, fuzzy, c-format msgid "task '%s' failed" msgstr "falha ao mudar o nome de '%s'" -#: builtin/gc.c:979 +#: builtin/gc.c:1389 #, fuzzy, c-format msgid "'%s' is not a valid task" msgstr "'%s' não é uma referência válida." -#: builtin/gc.c:984 +#: builtin/gc.c:1394 #, fuzzy, c-format msgid "task '%s' cannot be selected multiple times" msgstr "'%s' não pode ser usado com %s" -#: builtin/gc.c:999 +#: builtin/gc.c:1409 msgid "run tasks based on the state of the repository" msgstr "" -#: builtin/gc.c:1001 +#: builtin/gc.c:1410 +msgid "frequency" +msgstr "" + +#: builtin/gc.c:1411 +msgid "run tasks based on frequency" +msgstr "" + +#: builtin/gc.c:1414 msgid "do not report progress or other information over stderr" msgstr "" -#: builtin/gc.c:1002 +#: builtin/gc.c:1415 msgid "task" msgstr "" -#: builtin/gc.c:1003 +#: builtin/gc.c:1416 #, fuzzy msgid "run a specific task" -msgstr "nenhum caminho especificado" +msgstr "corre uma tarefa específica" + +#: builtin/gc.c:1433 +msgid "use at most one of --auto and --schedule=<frequency>" +msgstr "" + +#: builtin/gc.c:1467 +#, fuzzy +msgid "failed to run 'git config'" +msgstr "falha ao escrever para '%s'" + +#: builtin/gc.c:1512 +msgid "another process is scheduling background maintenance" +msgstr "" + +#: builtin/gc.c:1525 +msgid "failed to run 'crontab -l'; your system might not support 'cron'" +msgstr "" -#: builtin/gc.c:1026 +#: builtin/gc.c:1544 +msgid "failed to run 'crontab'; your system might not support 'cron'" +msgstr "" + +#: builtin/gc.c:1550 #, fuzzy -msgid "git maintenance run [<options>]" +msgid "failed to open stdin of 'crontab'" +msgstr "falha ao abrir '%s'" + +#: builtin/gc.c:1592 +msgid "'crontab' died" +msgstr "" + +#: builtin/gc.c:1605 +#, fuzzy +msgid "failed to add repo to global config" +msgstr "falha ao ler o ficheiro de comando '%s'" + +#: builtin/gc.c:1615 +#, fuzzy +msgid "git maintenance <subcommand> [<options>]" msgstr "git notes prune [<opções>]" -#: builtin/gc.c:1037 +#: builtin/gc.c:1634 #, fuzzy, c-format msgid "invalid subcommand: %s" msgstr "commit inválido %s" @@ -15237,255 +15478,255 @@ msgstr "não foi possível ler a árvore (%s)" msgid "unable to grep from object of type %s" msgstr "não foi possível efetuar grep de objetos do tipo %s" -#: builtin/grep.c:725 +#: builtin/grep.c:736 #, c-format msgid "switch `%c' expects a numerical value" msgstr "a opção '%c' espera um valor numérico" -#: builtin/grep.c:824 +#: builtin/grep.c:835 msgid "search in index instead of in the work tree" msgstr "procurar no índice em vez de procurar na árvore de trabalho" -#: builtin/grep.c:826 +#: builtin/grep.c:837 msgid "find in contents not managed by git" msgstr "procurar em conteúdos não geridos pelo git" -#: builtin/grep.c:828 +#: builtin/grep.c:839 msgid "search in both tracked and untracked files" msgstr "procurar em ficheiros controlados e não controlados" -#: builtin/grep.c:830 +#: builtin/grep.c:841 msgid "ignore files specified via '.gitignore'" msgstr "ignorar ficheiros especificados via '.gitignore'" -#: builtin/grep.c:832 +#: builtin/grep.c:843 msgid "recursively search in each submodule" msgstr "procurar recursivamente em cada submódulo" -#: builtin/grep.c:835 +#: builtin/grep.c:846 msgid "show non-matching lines" msgstr "mostrar linhas não correspondidas" -#: builtin/grep.c:837 +#: builtin/grep.c:848 msgid "case insensitive matching" msgstr "não diferenciar maiúsculas de minúsculas" -#: builtin/grep.c:839 +#: builtin/grep.c:850 msgid "match patterns only at word boundaries" msgstr "corresponder padrões apenas a palavras" -#: builtin/grep.c:841 +#: builtin/grep.c:852 msgid "process binary files as text" msgstr "processar ficheiros binários como texto" -#: builtin/grep.c:843 +#: builtin/grep.c:854 msgid "don't match patterns in binary files" msgstr "ignorar ficheiros binários" -#: builtin/grep.c:846 +#: builtin/grep.c:857 msgid "process binary files with textconv filters" msgstr "processar ficheiros binários com filtros textconv" -#: builtin/grep.c:848 +#: builtin/grep.c:859 #, fuzzy msgid "search in subdirectories (default)" msgstr "eliminar referências soltas (predefinição)" -#: builtin/grep.c:850 +#: builtin/grep.c:861 msgid "descend at most <depth> levels" msgstr "descer no máximo até <profundidade>" -#: builtin/grep.c:854 +#: builtin/grep.c:865 msgid "use extended POSIX regular expressions" msgstr "usar expressões regulares estendidas do POSIX" -#: builtin/grep.c:857 +#: builtin/grep.c:868 msgid "use basic POSIX regular expressions (default)" msgstr "usar expressões regulares básicas do POSIX (predefinição)" -#: builtin/grep.c:860 +#: builtin/grep.c:871 msgid "interpret patterns as fixed strings" msgstr "interpretar padrões como cadeias de caracteres fixas" -#: builtin/grep.c:863 +#: builtin/grep.c:874 msgid "use Perl-compatible regular expressions" msgstr "usar expressões regulares compatíveis com Perl" -#: builtin/grep.c:866 +#: builtin/grep.c:877 msgid "show line numbers" msgstr "mostrar números de linha" -#: builtin/grep.c:867 +#: builtin/grep.c:878 #, fuzzy msgid "show column number of first match" msgstr "mostrar apenas nomes de ficheiro sem correspondência" -#: builtin/grep.c:868 +#: builtin/grep.c:879 msgid "don't show filenames" msgstr "não mostrar nomes de ficheiro" -#: builtin/grep.c:869 +#: builtin/grep.c:880 msgid "show filenames" msgstr "mostrar nomes de ficheiro" -#: builtin/grep.c:871 +#: builtin/grep.c:882 msgid "show filenames relative to top directory" msgstr "mostrar nomes de ficheiro relativamente ao diretório superior" -#: builtin/grep.c:873 +#: builtin/grep.c:884 msgid "show only filenames instead of matching lines" msgstr "mostrar apenas nomes de ficheiro em vez de linhas correspondidas" -#: builtin/grep.c:875 +#: builtin/grep.c:886 msgid "synonym for --files-with-matches" msgstr "sinónimo de --files-with-matches" -#: builtin/grep.c:878 +#: builtin/grep.c:889 msgid "show only the names of files without match" msgstr "mostrar apenas nomes de ficheiro sem correspondência" -#: builtin/grep.c:880 +#: builtin/grep.c:891 msgid "print NUL after filenames" msgstr "imprimir NUL depois dos nomes de ficheiro" -#: builtin/grep.c:883 +#: builtin/grep.c:894 #, fuzzy msgid "show only matching parts of a line" msgstr "mostrar linhas não correspondidas" -#: builtin/grep.c:885 +#: builtin/grep.c:896 msgid "show the number of matches instead of matching lines" msgstr "mostrar o número de correspondências em vez das linha correspondidas" -#: builtin/grep.c:886 +#: builtin/grep.c:897 msgid "highlight matches" msgstr "realçar correspondências" -#: builtin/grep.c:888 +#: builtin/grep.c:899 msgid "print empty line between matches from different files" msgstr "" "imprimir uma linha em branco entre correspondências de diferentes ficheiros" -#: builtin/grep.c:890 +#: builtin/grep.c:901 msgid "show filename only once above matches from same file" msgstr "" "mostrar só uma vez o nome do ficheiro acima das correspondências dentro do " "mesmo ficheiro" -#: builtin/grep.c:893 +#: builtin/grep.c:904 msgid "show <n> context lines before and after matches" msgstr "mostrar <n> linhas de contexto antes e depois das correspondências" -#: builtin/grep.c:896 +#: builtin/grep.c:907 msgid "show <n> context lines before matches" msgstr "mostrar <n> linhas de contexto antes das correspondências" -#: builtin/grep.c:898 +#: builtin/grep.c:909 msgid "show <n> context lines after matches" msgstr "mostrar <n> linhas de contexto depois das correspondências" -#: builtin/grep.c:900 +#: builtin/grep.c:911 msgid "use <n> worker threads" msgstr "usar <n> threads de trabalho" -#: builtin/grep.c:901 +#: builtin/grep.c:912 msgid "shortcut for -C NUM" msgstr "atalho para -C NUM" -#: builtin/grep.c:904 +#: builtin/grep.c:915 msgid "show a line with the function name before matches" msgstr "mostrar uma linha com o nome da função antes das correspondências" -#: builtin/grep.c:906 +#: builtin/grep.c:917 msgid "show the surrounding function" msgstr "mostrar a função circundante" -#: builtin/grep.c:909 +#: builtin/grep.c:920 msgid "read patterns from file" msgstr "ler padrões do ficheiro" -#: builtin/grep.c:911 +#: builtin/grep.c:922 msgid "match <pattern>" msgstr "procurar <padrão>" -#: builtin/grep.c:913 +#: builtin/grep.c:924 msgid "combine patterns specified with -e" msgstr "combinar padrões especificados com -e" -#: builtin/grep.c:925 +#: builtin/grep.c:936 msgid "indicate hit with exit status without output" msgstr "indicar padrão encontrado no valor de saída, mas não imprimir" -#: builtin/grep.c:927 +#: builtin/grep.c:938 msgid "show only matches from files that match all patterns" msgstr "" "mostrar apenas correspondências de ficheiro que tenham todos os padrões" -#: builtin/grep.c:929 +#: builtin/grep.c:940 msgid "show parse tree for grep expression" msgstr "mostrar árvore de analise da expressões grep" -#: builtin/grep.c:933 +#: builtin/grep.c:944 msgid "pager" msgstr "paginador" -#: builtin/grep.c:933 +#: builtin/grep.c:944 msgid "show matching files in the pager" msgstr "mostrar ficheiros com correspondências no paginador" -#: builtin/grep.c:937 +#: builtin/grep.c:948 msgid "allow calling of grep(1) (ignored by this build)" msgstr "permitir invocar grep(1) (ignorado nesta compilação)" -#: builtin/grep.c:1004 +#: builtin/grep.c:1014 #, fuzzy msgid "no pattern given" -msgstr "nenhum padrão fornecido." +msgstr "fornecido padrão nenhum" -#: builtin/grep.c:1040 +#: builtin/grep.c:1050 msgid "--no-index or --untracked cannot be used with revs" msgstr "--no-index ou --untracked não podem ser usados em revisões" -#: builtin/grep.c:1048 +#: builtin/grep.c:1058 #, c-format msgid "unable to resolve revision: %s" msgstr "não foi possível resolver revisão: %s" -#: builtin/grep.c:1078 +#: builtin/grep.c:1088 #, fuzzy msgid "--untracked not supported with --recurse-submodules" msgstr "opção não suportada com --recurse-submodules." -#: builtin/grep.c:1082 +#: builtin/grep.c:1092 msgid "invalid option combination, ignoring --threads" msgstr "" -#: builtin/grep.c:1085 builtin/pack-objects.c:3655 +#: builtin/grep.c:1095 builtin/pack-objects.c:3655 #, fuzzy msgid "no threads support, ignoring --threads" msgstr "sem suporte de threads, %s ignorado" -#: builtin/grep.c:1088 builtin/index-pack.c:1573 builtin/pack-objects.c:2933 +#: builtin/grep.c:1098 builtin/index-pack.c:1573 builtin/pack-objects.c:2933 #, c-format msgid "invalid number of threads specified (%d)" msgstr "número de threads especificado inválido (%d)" -#: builtin/grep.c:1122 +#: builtin/grep.c:1132 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager só funciona na árvore de trabalho" -#: builtin/grep.c:1148 +#: builtin/grep.c:1158 #, fuzzy msgid "--cached or --untracked cannot be used with --no-index" msgstr "--cached ou --untracked não podem ser usados com --no-index." -#: builtin/grep.c:1154 +#: builtin/grep.c:1164 #, fuzzy msgid "--[no-]exclude-standard cannot be used for tracked contents" msgstr "" "--[no-]exclude-standard não podem ser usados em conteúdos não controlados." -#: builtin/grep.c:1162 +#: builtin/grep.c:1172 #, fuzzy msgid "both --cached and trees are given" msgstr "--cached e árvores foram fornecidos simultaneamente." @@ -15605,8 +15846,8 @@ msgid "" "'%s': cmd for supported man viewer.\n" "Please consider using 'man.<tool>.path' instead." msgstr "" -"'%s': comando de visualizador de manual suportado.\n" -"Considere usar 'man.<ferramenta>.path'." +"'%s': comando para visualizador de man.\n" +"Considera usar 'man.<ferramenta>.path' invés." #: builtin/help.c:436 #, c-format @@ -15615,11 +15856,11 @@ msgstr "'%s': visualizador de manual desconhecido." #: builtin/help.c:453 msgid "no man viewer handled the request" -msgstr "nenhum visualizador de manual atendeu o pedido" +msgstr "atendeu ao pedido visualizador de manual nenhum" #: builtin/help.c:461 msgid "no info viewer handled the request" -msgstr "nenhum visualizador de info atendeu o pedido" +msgstr "atendeu ao pedido visualizador de info nenhum" #: builtin/help.c:520 builtin/help.c:531 git.c:337 #, fuzzy, c-format @@ -15682,7 +15923,7 @@ msgstr "pacote demasiado grande para a definição atual de off_t" msgid "pack exceeds maximum allowed size" msgstr "o pacote excede o tamanho máximo permitido" -#: builtin/index-pack.c:342 builtin/repack.c:254 +#: builtin/index-pack.c:342 builtin/repack.c:286 #, c-format msgid "unable to create '%s'" msgstr "não foi possível criar '%s'" @@ -16011,22 +16252,22 @@ msgstr "" #: builtin/init-db.c:474 #, c-format msgid "Reinitialized existing shared Git repository in %s%s\n" -msgstr "Repositório Git partilhado e existente reinicializado em %s%s\n" +msgstr "Reiniciei respositório partilhado existente de Git em %s%s\n" #: builtin/init-db.c:475 #, c-format msgid "Reinitialized existing Git repository in %s%s\n" -msgstr "Repositório Git existem reinicializado em %s%s\n" +msgstr "Reiniciei repositório existente de Git em %s%s\n" #: builtin/init-db.c:479 #, c-format msgid "Initialized empty shared Git repository in %s%s\n" -msgstr "Repositório Git vazio e partilhado inicializado em %s%s\n" +msgstr "Iniciei repositório vazio partilhado de Git em %s%s\n" #: builtin/init-db.c:480 #, c-format msgid "Initialized empty Git repository in %s%s\n" -msgstr "Repositório Git vazio inicializado em %s%s\n" +msgstr "Iniciei repositório vazio de Git em %s%s\n" #: builtin/init-db.c:529 msgid "" @@ -16159,136 +16400,139 @@ msgstr "--name-only não faz sentido" #: builtin/interpret-trailers.c:133 msgid "no input file given for in-place editing" -msgstr "nenhum ficheiro de entrada fornecido para edição no local" +msgstr "fornecido para edição no local ficheiro de entrada nenhum" -#: builtin/log.c:56 +#: builtin/log.c:58 msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "git log [<opções>] [<intervalo-de-revisões>] [[--] <caminho>...]" -#: builtin/log.c:57 +#: builtin/log.c:59 msgid "git show [<options>] <object>..." msgstr "git show [<opções>] <objeto>..." -#: builtin/log.c:110 +#: builtin/log.c:112 #, c-format msgid "invalid --decorate option: %s" msgstr "opção --decorate inválida: %s" -#: builtin/log.c:177 +#: builtin/log.c:179 msgid "show source" msgstr "mostrar origem" -#: builtin/log.c:178 +#: builtin/log.c:180 msgid "Use mail map file" msgstr "usar ficheiro de mapeamento de correio" -#: builtin/log.c:181 +#: builtin/log.c:183 #, fuzzy msgid "only decorate refs that match <pattern>" msgstr "usar apenas referência que correspondam ao <padrão>" -#: builtin/log.c:183 +#: builtin/log.c:185 #, fuzzy msgid "do not decorate refs that match <pattern>" msgstr "não considerar tags que correspondam ao <padrão>" -#: builtin/log.c:184 +#: builtin/log.c:186 msgid "decorate options" msgstr "opções de decoração" -#: builtin/log.c:187 -msgid "Process line range n,m in file, counting from 1" -msgstr "processar intervalo de linhas n,m, a contar a partir de 1" +#: builtin/log.c:189 +msgid "" +"Trace the evolution of line range <start>,<end> or function :<funcname> in " +"<file>" +msgstr "" + +#: builtin/log.c:212 +#, fuzzy +msgid "-L<range>:<file> cannot be used with pathspec" +msgstr "%s: %s não pode ser usado com %s" -#: builtin/log.c:297 +#: builtin/log.c:302 #, c-format msgid "Final output: %d %s\n" msgstr "Resultado final: %d %s\n" -#: builtin/log.c:555 +#: builtin/log.c:564 #, c-format msgid "git show %s: bad file" msgstr "git show %s: ficheiro incorreto" -#: builtin/log.c:570 builtin/log.c:665 +#: builtin/log.c:579 builtin/log.c:674 #, fuzzy, c-format msgid "could not read object %s" msgstr "Não foi possível ler o objeto %s" -#: builtin/log.c:690 +#: builtin/log.c:699 #, fuzzy, c-format msgid "unknown type: %d" msgstr "Tipo desconhecido: %d" -#: builtin/log.c:839 +#: builtin/log.c:848 #, c-format msgid "%s: invalid cover from description mode" msgstr "" -#: builtin/log.c:846 +#: builtin/log.c:855 msgid "format.headers without value" msgstr "format.headers sem valor" -#: builtin/log.c:965 -msgid "name of output directory is too long" -msgstr "o nome do diretório de saída é demasiado longo" - -#: builtin/log.c:981 +#: builtin/log.c:984 #, fuzzy, c-format msgid "cannot open patch file %s" msgstr "Não é possível abrir o ficheiro de patch %s" -#: builtin/log.c:998 +#: builtin/log.c:1001 #, fuzzy msgid "need exactly one range" msgstr "É necessário exatamente um intervalo." -#: builtin/log.c:1008 +#: builtin/log.c:1011 #, fuzzy msgid "not a range" msgstr "Não é um intervalo." -#: builtin/log.c:1172 +#: builtin/log.c:1175 #, fuzzy msgid "cover letter needs email format" msgstr "A carta de apresentação precisa de um formato de e-mail" -#: builtin/log.c:1178 +#: builtin/log.c:1181 #, fuzzy msgid "failed to create cover-letter file" msgstr "Falha ao criar os ficheiros de saída" -#: builtin/log.c:1259 +#: builtin/log.c:1262 #, c-format msgid "insane in-reply-to: %s" msgstr "in-reply-to incorreto: %s" -#: builtin/log.c:1286 +#: builtin/log.c:1289 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<opções>] [<desde> | <intervalo-de-revisões>]" -#: builtin/log.c:1344 +#: builtin/log.c:1347 #, fuzzy msgid "two output directories?" msgstr "Dois diretórios de saída?" -#: builtin/log.c:1495 builtin/log.c:2301 builtin/log.c:2303 builtin/log.c:2315 +#: builtin/log.c:1498 builtin/log.c:2318 builtin/log.c:2320 builtin/log.c:2332 #, fuzzy, c-format msgid "unknown commit %s" msgstr "Commit desconhecido %s" -#: builtin/log.c:1506 builtin/replace.c:58 builtin/replace.c:207 +#: builtin/log.c:1509 builtin/replace.c:58 builtin/replace.c:207 #: builtin/replace.c:210 #, fuzzy, c-format msgid "failed to resolve '%s' as a valid ref" msgstr "falha ao resolver '%s' como uma referência válida." -#: builtin/log.c:1515 +#: builtin/log.c:1518 #, fuzzy msgid "could not find exact merge base" msgstr "Não foi possível encontrar a base exata de integração." -#: builtin/log.c:1525 +#: builtin/log.c:1528 #, fuzzy msgid "" "failed to get upstream, if you want to record base commit automatically,\n" @@ -16300,291 +16544,297 @@ msgstr "" "use branch --set-upstream-to para seguir um ramo remoto.\n" "Ou pode especificar o commit base com --base=<base-commit-id> manualmente." -#: builtin/log.c:1548 +#: builtin/log.c:1551 #, fuzzy msgid "failed to find exact merge base" msgstr "Falha ao procurar base exata de integração" -#: builtin/log.c:1565 +#: builtin/log.c:1568 msgid "base commit should be the ancestor of revision list" msgstr "o commit base deve ser o antecessor da lista de revisões" -#: builtin/log.c:1575 +#: builtin/log.c:1578 msgid "base commit shouldn't be in revision list" msgstr "o commit base não deve fazer parte da lista de revisões" -#: builtin/log.c:1633 +#: builtin/log.c:1636 msgid "cannot get patch id" msgstr "não é possível obter o id do patch" -#: builtin/log.c:1690 +#: builtin/log.c:1693 #, fuzzy msgid "failed to infer range-diff origin of current series" msgstr "falha ao guardar ligação à referência de notas atual (%s)" -#: builtin/log.c:1692 +#: builtin/log.c:1695 #, c-format msgid "using '%s' as range-diff origin of current series" msgstr "" -#: builtin/log.c:1736 +#: builtin/log.c:1739 msgid "use [PATCH n/m] even with a single patch" msgstr "usar [PATCH n/m] mesmo com um único patch" -#: builtin/log.c:1739 +#: builtin/log.c:1742 msgid "use [PATCH] even with multiple patches" msgstr "usar [PATCH] mesmo com múltiplos patches" -#: builtin/log.c:1743 +#: builtin/log.c:1746 msgid "print patches to standard out" msgstr "imprimir patches para a saída padrão" -#: builtin/log.c:1745 +#: builtin/log.c:1748 msgid "generate a cover letter" msgstr "gerar uma carta de apresentação" -#: builtin/log.c:1747 +#: builtin/log.c:1750 msgid "use simple number sequence for output file names" msgstr "" "usar uma sequência de números simples para denominar os ficheiros gerados" -#: builtin/log.c:1748 +#: builtin/log.c:1751 msgid "sfx" msgstr "sfx" -#: builtin/log.c:1749 +#: builtin/log.c:1752 msgid "use <sfx> instead of '.patch'" msgstr "usar <sfx> em vez de '.patch'" -#: builtin/log.c:1751 +#: builtin/log.c:1754 msgid "start numbering patches at <n> instead of 1" msgstr "começar a numerar os patches em <n> em vez de 1" -#: builtin/log.c:1753 +#: builtin/log.c:1756 msgid "mark the series as Nth re-roll" msgstr "marcar a série como a n-ésima reiteração" -#: builtin/log.c:1755 +#: builtin/log.c:1758 +#, fuzzy +msgid "max length of output filename" +msgstr "tamanho máximo de cada ficheiro de pacote gerado" + +#: builtin/log.c:1760 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "Usar [RFC PATCH] em vez de [PATCH]" -#: builtin/log.c:1758 +#: builtin/log.c:1763 msgid "cover-from-description-mode" msgstr "" -#: builtin/log.c:1759 +#: builtin/log.c:1764 msgid "generate parts of a cover letter based on a branch's description" msgstr "" -#: builtin/log.c:1761 +#: builtin/log.c:1766 msgid "Use [<prefix>] instead of [PATCH]" msgstr "usar [<prefixo>] em vez de [PATCH]" -#: builtin/log.c:1764 +#: builtin/log.c:1769 msgid "store resulting files in <dir>" msgstr "guardar os ficheiros resultantes em <dir>" -#: builtin/log.c:1767 +#: builtin/log.c:1772 msgid "don't strip/add [PATCH]" msgstr "não tirar/inserir [PATCH]" -#: builtin/log.c:1770 +#: builtin/log.c:1775 msgid "don't output binary diffs" msgstr "não gerar diffs binários" -#: builtin/log.c:1772 +#: builtin/log.c:1777 msgid "output all-zero hash in From header" msgstr "preencher o cabeçalho From com hash de zeros" -#: builtin/log.c:1774 +#: builtin/log.c:1779 msgid "don't include a patch matching a commit upstream" msgstr "não incluir um patch que coincida com um commit a montante" -#: builtin/log.c:1776 +#: builtin/log.c:1781 msgid "show patch format instead of default (patch + stat)" msgstr "" "mostrar no formato de patch em vez de no formato por omissão (patch + stat)" -#: builtin/log.c:1778 +#: builtin/log.c:1783 msgid "Messaging" msgstr "Mensagem" -#: builtin/log.c:1779 +#: builtin/log.c:1784 msgid "header" msgstr "cabeçalho" -#: builtin/log.c:1780 +#: builtin/log.c:1785 msgid "add email header" msgstr "adicionar cabeçalho de e-mail" -#: builtin/log.c:1781 builtin/log.c:1782 +#: builtin/log.c:1786 builtin/log.c:1787 msgid "email" msgstr "e-mail" -#: builtin/log.c:1781 +#: builtin/log.c:1786 msgid "add To: header" msgstr "adicionar cabeçalho To:" -#: builtin/log.c:1782 +#: builtin/log.c:1787 msgid "add Cc: header" msgstr "adicionar cabeçalho Cc:" -#: builtin/log.c:1783 +#: builtin/log.c:1788 msgid "ident" msgstr "identidade" -#: builtin/log.c:1784 +#: builtin/log.c:1789 msgid "set From address to <ident> (or committer ident if absent)" msgstr "" "definir o endereço From como <identidade> (ou como identidade do committer " "se não indicado)" -#: builtin/log.c:1786 +#: builtin/log.c:1791 msgid "message-id" msgstr "id-mensagem" -#: builtin/log.c:1787 +#: builtin/log.c:1792 msgid "make first mail a reply to <message-id>" msgstr "usar o primeiro email para responder a <id-mensagem>" -#: builtin/log.c:1788 builtin/log.c:1791 +#: builtin/log.c:1793 builtin/log.c:1796 msgid "boundary" msgstr "limite" -#: builtin/log.c:1789 +#: builtin/log.c:1794 msgid "attach the patch" msgstr "anexar o patch" -#: builtin/log.c:1792 +#: builtin/log.c:1797 msgid "inline the patch" msgstr "incorporar o patch" -#: builtin/log.c:1796 +#: builtin/log.c:1801 msgid "enable message threading, styles: shallow, deep" msgstr "ativar mensagens por tópicos, estilos: shallow (raso), deep (profundo)" -#: builtin/log.c:1798 +#: builtin/log.c:1803 msgid "signature" msgstr "assinatura" -#: builtin/log.c:1799 +#: builtin/log.c:1804 msgid "add a signature" msgstr "adicionar uma assinatura" -#: builtin/log.c:1800 +#: builtin/log.c:1805 msgid "base-commit" msgstr "commit-base" -#: builtin/log.c:1801 +#: builtin/log.c:1806 msgid "add prerequisite tree info to the patch series" msgstr "adicionar informação pré-requisito da árvore à série de patches" -#: builtin/log.c:1804 +#: builtin/log.c:1809 msgid "add a signature from a file" msgstr "adicionar uma assinatura de um ficheiro" -#: builtin/log.c:1805 +#: builtin/log.c:1810 msgid "don't print the patch filenames" msgstr "não imprimir os nomes dos ficheiros de patch" -#: builtin/log.c:1807 +#: builtin/log.c:1812 #, fuzzy msgid "show progress while generating patches" msgstr "mostrar medidor de progresso durante a fase de escrita de objetos" -#: builtin/log.c:1809 +#: builtin/log.c:1814 msgid "show changes against <rev> in cover letter or single patch" msgstr "" -#: builtin/log.c:1812 +#: builtin/log.c:1817 msgid "show changes against <refspec> in cover letter or single patch" msgstr "" -#: builtin/log.c:1814 +#: builtin/log.c:1819 msgid "percentage by which creation is weighted" msgstr "" -#: builtin/log.c:1896 +#: builtin/log.c:1905 #, c-format msgid "invalid ident line: %s" msgstr "linha de identidade inválida: %s" -#: builtin/log.c:1911 +#: builtin/log.c:1920 #, fuzzy msgid "-n and -k are mutually exclusive" msgstr "-n e -k são mutuamente exclusivos." -#: builtin/log.c:1913 +#: builtin/log.c:1922 #, fuzzy msgid "--subject-prefix/--rfc and -k are mutually exclusive" msgstr "--subject-prefix/--rfc e -k são mutuamente exclusivos." -#: builtin/log.c:1921 +#: builtin/log.c:1930 msgid "--name-only does not make sense" msgstr "--name-only não faz sentido" -#: builtin/log.c:1923 +#: builtin/log.c:1932 msgid "--name-status does not make sense" msgstr "--name-status não faz sentido" -#: builtin/log.c:1925 +#: builtin/log.c:1934 msgid "--check does not make sense" msgstr "--check não faz sentido" -#: builtin/log.c:1958 -msgid "standard output, or directory, which one?" -msgstr "saída padrão, ou diretório, qual deles?" +#: builtin/log.c:1956 +#, fuzzy +msgid "--stdout, --output, and --output-directory are mutually exclusive" +msgstr "-b, -B e --detach são mutuamente exclusivos" -#: builtin/log.c:2062 +#: builtin/log.c:2079 msgid "--interdiff requires --cover-letter or single patch" msgstr "" -#: builtin/log.c:2066 +#: builtin/log.c:2083 msgid "Interdiff:" msgstr "" -#: builtin/log.c:2067 +#: builtin/log.c:2084 #, c-format msgid "Interdiff against v%d:" msgstr "" -#: builtin/log.c:2073 +#: builtin/log.c:2090 msgid "--creation-factor requires --range-diff" msgstr "" -#: builtin/log.c:2077 +#: builtin/log.c:2094 msgid "--range-diff requires --cover-letter or single patch" msgstr "" -#: builtin/log.c:2085 +#: builtin/log.c:2102 msgid "Range-diff:" msgstr "" -#: builtin/log.c:2086 +#: builtin/log.c:2103 #, c-format msgid "Range-diff against v%d:" msgstr "" -#: builtin/log.c:2097 +#: builtin/log.c:2114 #, c-format msgid "unable to read signature file '%s'" msgstr "não é possível ler o ficheiro de assinatura '%s'" -#: builtin/log.c:2133 +#: builtin/log.c:2150 #, fuzzy msgid "Generating patches" msgstr "falha ao editar patch" -#: builtin/log.c:2177 +#: builtin/log.c:2194 #, fuzzy msgid "failed to create output files" msgstr "Falha ao criar os ficheiros de saída" -#: builtin/log.c:2236 +#: builtin/log.c:2253 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<ramo-a-montante> [<head> [<limite>]]]" -#: builtin/log.c:2290 +#: builtin/log.c:2307 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -16717,7 +16967,7 @@ msgstr "" msgid "do not print remote URL" msgstr "não imprimir URL remoto" -#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1392 +#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1398 msgid "exec" msgstr "exec" @@ -16903,292 +17153,287 @@ msgstr "não foi possível resolver a referência %s" msgid "Merging %s with %s\n" msgstr "A integrar %s com %s\n" -#: builtin/merge.c:56 +#: builtin/merge.c:57 msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<opções>] [<commit>...]" -#: builtin/merge.c:57 +#: builtin/merge.c:58 msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:58 +#: builtin/merge.c:59 msgid "git merge --continue" msgstr "git merge --continue" -#: builtin/merge.c:120 +#: builtin/merge.c:122 msgid "switch `m' requires a value" msgstr "a opção 'm' requer um valor" -#: builtin/merge.c:143 +#: builtin/merge.c:145 #, fuzzy, c-format msgid "option `%s' requires a value" msgstr "a opção '%s' requer um valor" -#: builtin/merge.c:189 +#: builtin/merge.c:198 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "Estratégia de integração '%s' não encontrada.\n" -#: builtin/merge.c:190 +#: builtin/merge.c:199 #, c-format msgid "Available strategies are:" msgstr "Estratégias disponíveis:" -#: builtin/merge.c:195 +#: builtin/merge.c:204 #, c-format msgid "Available custom strategies are:" msgstr "Estratégias personalizadas disponíveis:" -#: builtin/merge.c:246 builtin/pull.c:133 +#: builtin/merge.c:255 builtin/pull.c:133 msgid "do not show a diffstat at the end of the merge" msgstr "não apresentar um diffstat ao fim da integração" -#: builtin/merge.c:249 builtin/pull.c:136 +#: builtin/merge.c:258 builtin/pull.c:136 msgid "show a diffstat at the end of the merge" msgstr "mostrar um diffstat ao fim da integração" -#: builtin/merge.c:250 builtin/pull.c:139 +#: builtin/merge.c:259 builtin/pull.c:139 msgid "(synonym to --stat)" msgstr "(sinónimo de --stat)" -#: builtin/merge.c:252 builtin/pull.c:142 +#: builtin/merge.c:261 builtin/pull.c:142 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" "adicionar (no máximo <n>) entradas do shortlog à mensagem de commit da " "integração" -#: builtin/merge.c:255 builtin/pull.c:148 +#: builtin/merge.c:264 builtin/pull.c:148 msgid "create a single commit instead of doing a merge" msgstr "criar um único commit em vez de realizar uma integração" -#: builtin/merge.c:257 builtin/pull.c:151 +#: builtin/merge.c:266 builtin/pull.c:151 msgid "perform a commit if the merge succeeds (default)" msgstr "realizar um commit se a integração for bem sucedida (predefinição)" -#: builtin/merge.c:259 builtin/pull.c:154 +#: builtin/merge.c:268 builtin/pull.c:154 msgid "edit message before committing" msgstr "editar a mensagem antes de submeter" -#: builtin/merge.c:261 +#: builtin/merge.c:270 msgid "allow fast-forward (default)" msgstr "permitir avanço rápido (predefinição)" -#: builtin/merge.c:263 builtin/pull.c:161 +#: builtin/merge.c:272 builtin/pull.c:161 msgid "abort if fast-forward is not possible" msgstr "abortar se não é possível efetuar avanço rápido" -#: builtin/merge.c:267 builtin/pull.c:164 +#: builtin/merge.c:276 builtin/pull.c:164 msgid "verify that the named commit has a valid GPG signature" msgstr "verificar se o commit tem uma assinatura GPG válida" -#: builtin/merge.c:268 builtin/notes.c:787 builtin/pull.c:168 -#: builtin/rebase.c:533 builtin/rebase.c:1406 builtin/revert.c:114 +#: builtin/merge.c:277 builtin/notes.c:787 builtin/pull.c:168 +#: builtin/rebase.c:539 builtin/rebase.c:1412 builtin/revert.c:114 msgid "strategy" msgstr "estratégia" -#: builtin/merge.c:269 builtin/pull.c:169 +#: builtin/merge.c:278 builtin/pull.c:169 msgid "merge strategy to use" msgstr "estratégia de integração a usar" -#: builtin/merge.c:270 builtin/pull.c:172 +#: builtin/merge.c:279 builtin/pull.c:172 msgid "option=value" msgstr "opção=valor" -#: builtin/merge.c:271 builtin/pull.c:173 +#: builtin/merge.c:280 builtin/pull.c:173 msgid "option for selected merge strategy" msgstr "opções da estratégia de integração selecionada" -#: builtin/merge.c:273 +#: builtin/merge.c:282 msgid "merge commit message (for a non-fast-forward merge)" msgstr "mensagem de commit (de integração não suscetível a avanço rápido)" -#: builtin/merge.c:280 +#: builtin/merge.c:289 msgid "abort the current in-progress merge" msgstr "abortar integração em curso" -#: builtin/merge.c:282 +#: builtin/merge.c:291 #, fuzzy msgid "--abort but leave index and working tree alone" msgstr "repor HEAD, índice e árvore de trabalho" -#: builtin/merge.c:284 +#: builtin/merge.c:293 msgid "continue the current in-progress merge" msgstr "continuar a integração em curso" -#: builtin/merge.c:286 builtin/pull.c:180 +#: builtin/merge.c:295 builtin/pull.c:180 msgid "allow merging unrelated histories" msgstr "permitir integração de históricos não relacionados" -#: builtin/merge.c:293 +#: builtin/merge.c:302 #, fuzzy msgid "bypass pre-merge-commit and commit-msg hooks" msgstr "ignorar pre-commit e commit-msg hooks" -#: builtin/merge.c:310 +#: builtin/merge.c:319 msgid "could not run stash." msgstr "não foi possível executar o comando stash." -#: builtin/merge.c:315 +#: builtin/merge.c:324 msgid "stash failed" msgstr "falha ao executar o comando stash" -#: builtin/merge.c:320 +#: builtin/merge.c:329 #, c-format msgid "not a valid object: %s" msgstr "nome de objeto inválido: %s" -#: builtin/merge.c:342 builtin/merge.c:359 +#: builtin/merge.c:351 builtin/merge.c:368 msgid "read-tree failed" msgstr "falha ao executar o comando read-tree" -#: builtin/merge.c:389 +#: builtin/merge.c:398 msgid " (nothing to squash)" msgstr " (não há nada para esmagar)" -#: builtin/merge.c:400 +#: builtin/merge.c:409 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Commit esmagado -- HEAD não atualizada\n" -#: builtin/merge.c:450 +#: builtin/merge.c:459 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "Nenhuma mensagem de integração -- HEAD não atualizada\n" -#: builtin/merge.c:501 +#: builtin/merge.c:510 #, c-format msgid "'%s' does not point to a commit" msgstr "'%s' não aponta para um commit" -#: builtin/merge.c:588 +#: builtin/merge.c:597 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Valor de branch.%s.mergeoptions incorreto: %s" -#: builtin/merge.c:713 +#: builtin/merge.c:723 msgid "Not handling anything other than two heads merge." msgstr "Não se processa outra coisa senão incorporação de duas cabeças." -#: builtin/merge.c:726 +#: builtin/merge.c:736 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Opção desconhecida de merge-recursive: -X%s" -#: builtin/merge.c:741 +#: builtin/merge.c:755 t/helper/test-fast-rebase.c:209 #, c-format msgid "unable to write %s" msgstr "não foi possível escrever %s" -#: builtin/merge.c:793 +#: builtin/merge.c:807 #, c-format msgid "Could not read from '%s'" msgstr "Não foi possível ler '%s'" -#: builtin/merge.c:802 +#: builtin/merge.c:816 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" -msgstr "" -"Commit de integração não realizado; use 'git commit' para concluir a " -"integração.\n" +msgstr "Usa 'git commit' para completar o merge. Committando merge nenhum.\n" -#: builtin/merge.c:808 +#: builtin/merge.c:822 #, fuzzy msgid "" "Please enter a commit message to explain why this merge is necessary,\n" "especially if it merges an updated upstream into a topic branch.\n" "\n" msgstr "" -"Introduza uma mensagem de commit, explicando por que esta integração é " -"necessário,\n" -"sobretudo se incorpora um ramo a montante atualizado, num ramo tópico.\n" +"Introduza uma mensagem de commit, explicando o porquê desta integração\n" +"ser necessária, especialmente se é merge de updated stream para topic " +"branch.\n" "\n" -"Linhas começadas com '%c' são ignoradas e uma mensagem vazia\n" -"aborta o commit.\n" -#: builtin/merge.c:813 +#: builtin/merge.c:827 #, fuzzy msgid "An empty message aborts the commit.\n" -msgstr "editar a mensagem antes de submeter" +msgstr "Uma mensagem vazia aborta o commit.\n" -#: builtin/merge.c:816 +#: builtin/merge.c:830 #, fuzzy, c-format msgid "" "Lines starting with '%c' will be ignored, and an empty message aborts\n" "the commit.\n" msgstr "" -"Introduza a mensagem de commit das suas alterações.\n" -"Linhas começadas com '%c' serão ignoradas, e uma mensagem vazia\n" -"aborta o commit.\n" +"Linhas começadas com '%c' são ignoradas, e uma messagem vazia aborta\n" +"o commit.\n" -#: builtin/merge.c:869 +#: builtin/merge.c:883 msgid "Empty commit message." -msgstr "Mensagem de commit vazia." +msgstr "Mensagem commit vazia." -#: builtin/merge.c:884 +#: builtin/merge.c:898 #, c-format msgid "Wonderful.\n" msgstr "Maravilhoso.\n" -#: builtin/merge.c:945 +#: builtin/merge.c:959 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" -"Falha ao realizar integração automática; corrija os conflitos e submeta o " +"Merge automático falhou; resolve os conflitos e depois podes commitar o " "resultado.\n" -#: builtin/merge.c:984 +#: builtin/merge.c:998 msgid "No current branch." msgstr "Nenhum ramo atual." -#: builtin/merge.c:986 +#: builtin/merge.c:1000 msgid "No remote for the current branch." msgstr "Não há um remoto para o ramo atual." -#: builtin/merge.c:988 +#: builtin/merge.c:1002 msgid "No default upstream defined for the current branch." -msgstr "Não está definido nenhum ramo a montante para o ramo atual." +msgstr "Ramo atual sem upstream default definido." -#: builtin/merge.c:993 +#: builtin/merge.c:1007 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "Nenhum ramo de monitorização remoto seguido por %s de %s" -#: builtin/merge.c:1050 +#: builtin/merge.c:1064 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Valor '%s' incorreto no ambiente '%s'" -#: builtin/merge.c:1153 +#: builtin/merge.c:1167 #, c-format msgid "not something we can merge in %s: %s" msgstr "não se pode integrar em %s: %s" -#: builtin/merge.c:1187 +#: builtin/merge.c:1201 msgid "not something we can merge" msgstr "não se pode integrar" -#: builtin/merge.c:1291 +#: builtin/merge.c:1311 msgid "--abort expects no arguments" msgstr "--abort não leva argumentos" -#: builtin/merge.c:1295 +#: builtin/merge.c:1315 msgid "There is no merge to abort (MERGE_HEAD missing)." -msgstr "Não há nenhuma integração para se abortar (MERGE_HEAD não presente)." +msgstr "Há junção nenhuma para abortar (MERGE_HEAD faltando)." -#: builtin/merge.c:1313 +#: builtin/merge.c:1333 #, fuzzy msgid "--quit expects no arguments" msgstr "--abort não leva argumentos" -#: builtin/merge.c:1326 +#: builtin/merge.c:1346 msgid "--continue expects no arguments" msgstr "--continue não leva argumentos" -#: builtin/merge.c:1330 +#: builtin/merge.c:1350 msgid "There is no merge in progress (MERGE_HEAD missing)." -msgstr "Não há nenhuma integração em curso (MERGE_HEAD não presente)." +msgstr "Há junção nenhuma em curso (MERGE_HEAD faltando)." -#: builtin/merge.c:1346 +#: builtin/merge.c:1366 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -17196,7 +17441,7 @@ msgstr "" "Não concluiu a integração (MERGE_HEAD presente).\n" "Submeta as suas alterações antes de integrar." -#: builtin/merge.c:1353 +#: builtin/merge.c:1373 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -17204,106 +17449,104 @@ msgstr "" "Cherry-pick não concluído (CHERRY_PICK_HEAD presente).\n" "Submeta as suas alterações antes de integrar." -#: builtin/merge.c:1356 +#: builtin/merge.c:1376 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "Cherry-pick não concluído (CHERRY_PICK_HEAD presente)." -#: builtin/merge.c:1370 +#: builtin/merge.c:1390 msgid "You cannot combine --squash with --no-ff." msgstr "Não é possível combinar --squash e --no-ff." -#: builtin/merge.c:1372 +#: builtin/merge.c:1392 #, fuzzy msgid "You cannot combine --squash with --commit." msgstr "Não é possível combinar --squash e --no-ff." -#: builtin/merge.c:1388 +#: builtin/merge.c:1408 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "Nenhum commit especificado e merge.defaultToUpstream não definido." -#: builtin/merge.c:1405 +#: builtin/merge.c:1425 msgid "Squash commit into empty head not supported yet" msgstr "Esmagar um commit numa cabeça vazia ainda não é suportado" -#: builtin/merge.c:1407 +#: builtin/merge.c:1427 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "" "Não faz sentido submeter de modo não suscetível a avanço rápido, numa cabeça " "vazia" -#: builtin/merge.c:1412 +#: builtin/merge.c:1432 #, c-format msgid "%s - not something we can merge" msgstr "%s - não é algo se possa integrar" -#: builtin/merge.c:1414 +#: builtin/merge.c:1434 msgid "Can merge only exactly one commit into empty head" msgstr "Só se pode integrar exatamente um commit numa cabeça vazia" -#: builtin/merge.c:1495 +#: builtin/merge.c:1515 msgid "refusing to merge unrelated histories" msgstr "integração de históricos não relacionados recusada" -#: builtin/merge.c:1504 +#: builtin/merge.c:1524 #, fuzzy msgid "Already up to date." msgstr "Já está atualizado." -#: builtin/merge.c:1514 +#: builtin/merge.c:1534 #, c-format msgid "Updating %s..%s\n" -msgstr "A atualizar %s..%s\n" +msgstr "Atualizando %s..%s\n" -#: builtin/merge.c:1560 +#: builtin/merge.c:1580 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "A tentar integração mesmo trivial no interior do índice...\n" -#: builtin/merge.c:1567 +#: builtin/merge.c:1587 #, c-format msgid "Nope.\n" msgstr "Não.\n" -#: builtin/merge.c:1592 +#: builtin/merge.c:1612 #, fuzzy msgid "Already up to date. Yeeah!" msgstr "Já está atualizado. Sim!" -#: builtin/merge.c:1598 +#: builtin/merge.c:1618 msgid "Not possible to fast-forward, aborting." msgstr "Não é possível avançar rapidamente, a abortar." -#: builtin/merge.c:1626 builtin/merge.c:1691 +#: builtin/merge.c:1646 builtin/merge.c:1711 #, c-format msgid "Rewinding the tree to pristine...\n" -msgstr "A recuar a árvore ao seu estado original...\n" +msgstr "Recuando a árvore para estado pristino...\n" -#: builtin/merge.c:1630 +#: builtin/merge.c:1650 #, c-format msgid "Trying merge strategy %s...\n" -msgstr "A tentar a estratégia de integração %s...\n" +msgstr "Tentando estratégia merge %s...\n" -#: builtin/merge.c:1682 +#: builtin/merge.c:1702 #, c-format msgid "No merge strategy handled the merge.\n" -msgstr "Nenhuma estratégia de integração conseguiu processar a integração.\n" +msgstr "A junção lidou com estratégia de junção nenhuma.\n" -#: builtin/merge.c:1684 +#: builtin/merge.c:1704 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Falha ao integrar com a estratégia %s.\n" -#: builtin/merge.c:1693 +#: builtin/merge.c:1713 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "A usar %s para preparar resolução manual.\n" -#: builtin/merge.c:1707 +#: builtin/merge.c:1727 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" -msgstr "" -"A integração automática foi bem sucedida; interrompida antes de submeter " -"como solicitado\n" +msgstr "Merge automática correu bem; parei antes de commitar como pedido\n" #: builtin/mktree.c:66 msgid "git mktree [-z] [--missing] [--batch]" @@ -17358,7 +17601,7 @@ msgstr "git mv [<opções>] <origem>... <destino>" #: builtin/mv.c:83 #, c-format msgid "Directory %s is in index and no submodule?" -msgstr "O diretório %s está no índice porém nenhum submódulo?" +msgstr "A pasta %s está no index porém nenhum submódulo?" #: builtin/mv.c:85 msgid "Please stage your changes to .gitmodules or stash them to proceed" @@ -17406,7 +17649,7 @@ msgstr "o diretório de origem está vazio" #: builtin/mv.c:225 msgid "not under version control" -msgstr "não está no controlo de versões" +msgstr "" #: builtin/mv.c:227 msgid "conflicted" @@ -17443,7 +17686,7 @@ msgstr "%s, origem=%s, destino=%s" msgid "Renaming %s to %s\n" msgstr "A mudar de nome de %s para %s\n" -#: builtin/mv.c:280 builtin/remote.c:782 builtin/repack.c:518 +#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:484 #, c-format msgid "renaming '%s' failed" msgstr "falha ao mudar o nome de '%s'" @@ -17684,7 +17927,7 @@ msgstr "demasiados parâmetros" #: builtin/notes.c:389 builtin/notes.c:678 #, c-format msgid "no note found for object %s." -msgstr "nenhuma nota encontrada para o objeto %s." +msgstr "Encontrada nota nenhuma para objeto %s." #: builtin/notes.c:410 builtin/notes.c:576 msgid "note contents as a string" @@ -17722,16 +17965,16 @@ msgstr "" #: builtin/notes.c:463 builtin/notes.c:544 #, c-format msgid "Overwriting existing notes for object %s\n" -msgstr "A substituir as notas existentes do objeto %s\n" +msgstr "Gravando por cima, notas existentes para objeto %s\n" #: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902 #, c-format msgid "Removing note for object %s\n" -msgstr "A remover a nota do objeto %s\n" +msgstr "Removendo nota para objeto %s\n" #: builtin/notes.c:497 msgid "read objects from stdin" -msgstr "ler objetos da entrada padrão" +msgstr "ler objetos de stdin" #: builtin/notes.c:499 msgid "load rewriting config for <command> (implies --stdin)" @@ -17875,7 +18118,7 @@ msgstr "Falha ao resolver '%s' numa referência válida." #: builtin/notes.c:900 #, c-format msgid "Object %s has no note\n" -msgstr "O objeto %s não tem nenhuma nota\n" +msgstr "O objeto %s tem nota nenhuma\n" #: builtin/notes.c:912 msgid "attempt to remove non-existent note is not an error" @@ -17901,7 +18144,7 @@ msgstr "notes-ref" msgid "use notes from <notes-ref>" msgstr "usar notas de <notes-ref>" -#: builtin/notes.c:1034 builtin/stash.c:1605 +#: builtin/notes.c:1034 builtin/stash.c:1604 #, c-format msgid "unknown subcommand: %s" msgstr "subcomando desconhecido: %s" @@ -18355,7 +18598,7 @@ msgstr "Opções relativas a integração" msgid "incorporate changes by rebasing rather than merging" msgstr "incorporar alterações por rebase em vez de integrar" -#: builtin/pull.c:158 builtin/rebase.c:484 builtin/revert.c:126 +#: builtin/pull.c:158 builtin/rebase.c:490 builtin/revert.c:126 msgid "allow fast-forward" msgstr "permitir avanço rápido" @@ -18374,7 +18617,7 @@ msgstr "forçar a substituição do ramo local" #: builtin/pull.c:201 msgid "number of submodules pulled in parallel" -msgstr "número de submódulos puxados em paralelo" +msgstr "número de submódulos com pull em paralelo" #: builtin/pull.c:317 #, c-format @@ -18403,23 +18646,21 @@ msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." msgstr "" -"Não há nenhum candidato com o qual realizar rebase de entre as referências " -"que se acabaram de obter." +"As refs que obteste tem candidato nenhum para onde rebasear." #: builtin/pull.c:460 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "" -"Não há nenhum candidato com o qual integrar de entre as referências que se " -"acabaram obter." +"As refs que obteste tem candidato nenhum para junção." #: builtin/pull.c:461 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." msgstr "" -"Geralmente, significa que forneceu um especificador de referência\n" -"com um carácter universal (wildcard) que não corresponde a nenhum remoto." +"Normalmente isto significa que forneceste um wildcard especificador de ref\n" +"que tem correspondência nenhuma no lado do remoto." #: builtin/pull.c:464 #, c-format @@ -18432,15 +18673,15 @@ msgstr "" "Uma vez que este não é o remoto configurado por predefinição\n" "do ramo atual, deve especificar um ramo na linha de comandos." -#: builtin/pull.c:469 builtin/rebase.c:1240 git-parse-remote.sh:73 +#: builtin/pull.c:469 builtin/rebase.c:1246 msgid "You are not currently on a branch." -msgstr "Não se encontra em nenhum ramo de momento." +msgstr "Atualmente estás em ramo nenhum." -#: builtin/pull.c:471 builtin/pull.c:486 git-parse-remote.sh:79 +#: builtin/pull.c:471 builtin/pull.c:486 msgid "Please specify which branch you want to rebase against." msgstr "Especifique o ramo sobre o qual pretende realizar rebase." -#: builtin/pull.c:473 builtin/pull.c:488 git-parse-remote.sh:82 +#: builtin/pull.c:473 builtin/pull.c:488 msgid "Please specify which branch you want to merge with." msgstr "Especifique o ramo com o qual pretende integrar." @@ -18449,20 +18690,19 @@ msgid "See git-pull(1) for details." msgstr "Consulte git-pull(1) para obter mais detalhes." #: builtin/pull.c:476 builtin/pull.c:482 builtin/pull.c:491 -#: builtin/rebase.c:1246 git-parse-remote.sh:64 +#: builtin/rebase.c:1252 msgid "<remote>" msgstr "<remoto>" #: builtin/pull.c:476 builtin/pull.c:491 builtin/pull.c:496 -#: git-parse-remote.sh:65 msgid "<branch>" msgstr "<ramo>" -#: builtin/pull.c:484 builtin/rebase.c:1238 git-parse-remote.sh:75 +#: builtin/pull.c:484 builtin/rebase.c:1244 msgid "There is no tracking information for the current branch." -msgstr "O ramo atual não segue nenhum ramo." +msgstr "O ramo atual tem informação de tracking nenhuma." -#: builtin/pull.c:493 git-parse-remote.sh:95 +#: builtin/pull.c:493 msgid "" "If you wish to set tracking information for this branch you can do so with:" msgstr "" @@ -18483,25 +18723,25 @@ msgstr "" msgid "unable to access commit %s" msgstr "não foi possível analisar o commit %s" -#: builtin/pull.c:894 +#: builtin/pull.c:915 msgid "ignoring --verify-signatures for rebase" msgstr "ignorado --verify-signatures para rebase" -#: builtin/pull.c:954 +#: builtin/pull.c:972 msgid "Updating an unborn branch with changes added to the index." msgstr "" "A atualizar um ramo que ainda não foi criado e com alterações adicionadas ao " "índice." -#: builtin/pull.c:958 +#: builtin/pull.c:976 msgid "pull with rebase" -msgstr "puxar com rebase" +msgstr "pull com rebase" -#: builtin/pull.c:959 +#: builtin/pull.c:977 msgid "please commit or stash them." msgstr "submeta ou esconda-as." -#: builtin/pull.c:984 +#: builtin/pull.c:1002 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -18512,7 +18752,7 @@ msgstr "" "a avançar a árvore de trabalho a partir do\n" "commit %s." -#: builtin/pull.c:990 +#: builtin/pull.c:1008 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -18529,15 +18769,15 @@ msgstr "" "$ git reset --hard\n" "para recuperar." -#: builtin/pull.c:1005 +#: builtin/pull.c:1023 msgid "Cannot merge multiple branches into empty head." msgstr "Não é possível integrar múltiplos ramos numa cabeça vazia." -#: builtin/pull.c:1009 +#: builtin/pull.c:1027 msgid "Cannot rebase onto multiple branches." msgstr "Não é possível efetuar rebase sobre múltiplos ramos." -#: builtin/pull.c:1017 +#: builtin/pull.c:1041 msgid "cannot rebase with locally recorded submodule modifications" msgstr "" @@ -18669,12 +18909,11 @@ msgid "" "(e.g., 'git pull ...') before pushing again.\n" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" -"As atualizações foram rejeitadas porque o remoto contém alterações que\n" -"não tem localmente. Habitualmente, acontece porque outro repositório " -"publicou\n" -"na mesma referência. Pode integrar primeiro as alterações remotas\n" -"(e.g., 'git pull ...') antes de publicar de novo.\n" -"Consulte 'Note about fast-forwards' em 'git push --help' para obter detalhes." +"Atualizações foram rejeitadas porque o remoto contém trabalho diferente\n" +"do teu trabalho local. A causa, normalmente, é um push para a mesma ref.\n" +"Podes tentar integrar as diferenças remotas (p.e., 'git pull ...') antes\n" +"de fazeres novo push.\n" +"Vê a 'Note about fast-forwards' do 'git push --help' para detalhes." #: builtin/push.c:286 msgid "Updates were rejected because the tag already exists in the remote." @@ -18690,100 +18929,117 @@ msgstr "" "objeto não commit, ou atualizar uma referência remota fazendo-a\n" "apontar para um objeto não commit, sem usar a opção '--force'.\n" -#: builtin/push.c:351 +#: builtin/push.c:294 +#, fuzzy +msgid "" +"Updates were rejected because the tip of the remote-tracking\n" +"branch has been updated since the last checkout. You may want\n" +"to integrate those changes locally (e.g., 'git pull ...')\n" +"before forcing an update.\n" +msgstr "" +"As atualizações foram rejeitadas porque a ponta do ramo atual está atrasada\n" +"em relação ao homólogo remoto. Integre as alterações remotas (e.g.\n" +"'git pull ...') antes de publicar de novo.\n" +"Consulte 'Note about fast-forwards' em 'git push --help' para obter detalhes." + +#: builtin/push.c:364 #, c-format msgid "Pushing to %s\n" -msgstr "A publicar em %s\n" +msgstr "Fazendo push para %s\n" -#: builtin/push.c:358 +#: builtin/push.c:371 #, c-format msgid "failed to push some refs to '%s'" msgstr "falha ao publicar algumas referências em '%s'" -#: builtin/push.c:532 +#: builtin/push.c:553 msgid "repository" msgstr "repositório" -#: builtin/push.c:533 builtin/send-pack.c:183 +#: builtin/push.c:554 builtin/send-pack.c:189 msgid "push all refs" msgstr "publicar todas as referências" -#: builtin/push.c:534 builtin/send-pack.c:185 +#: builtin/push.c:555 builtin/send-pack.c:191 msgid "mirror all refs" msgstr "replicar todas as referências" -#: builtin/push.c:536 +#: builtin/push.c:557 msgid "delete refs" msgstr "eliminar referências" -#: builtin/push.c:537 +#: builtin/push.c:558 msgid "push tags (can't be used with --all or --mirror)" msgstr "publicar tags (não pode ser usado com --all ou --mirror)" -#: builtin/push.c:540 builtin/send-pack.c:186 +#: builtin/push.c:561 builtin/send-pack.c:192 msgid "force updates" msgstr "forçar atualização" -#: builtin/push.c:541 builtin/send-pack.c:198 +#: builtin/push.c:562 builtin/send-pack.c:204 #, fuzzy msgid "<refname>:<expect>" msgstr "nome da referência>:<esperado" -#: builtin/push.c:542 builtin/send-pack.c:199 +#: builtin/push.c:563 builtin/send-pack.c:205 msgid "require old value of ref to be at this value" msgstr "exigir que o antigo valor da referência tenha este valor" -#: builtin/push.c:545 +#: builtin/push.c:566 builtin/send-pack.c:208 +msgid "require remote updates to be integrated locally" +msgstr "" + +#: builtin/push.c:569 msgid "control recursive pushing of submodules" msgstr "controlar a publicação recursiva de submódulos" -#: builtin/push.c:546 builtin/send-pack.c:193 +#: builtin/push.c:570 builtin/send-pack.c:199 msgid "use thin pack" msgstr "usar pacote fino" -#: builtin/push.c:547 builtin/push.c:548 builtin/send-pack.c:180 -#: builtin/send-pack.c:181 +#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:186 +#: builtin/send-pack.c:187 msgid "receive pack program" msgstr "programa receive pack" -#: builtin/push.c:549 +#: builtin/push.c:573 msgid "set upstream for git pull/status" msgstr "definir o ramo a montante usado com git pull/status" -#: builtin/push.c:552 +#: builtin/push.c:576 msgid "prune locally removed refs" msgstr "eliminar referências removidas localmente" -#: builtin/push.c:554 +#: builtin/push.c:578 msgid "bypass pre-push hook" msgstr "ignorar pre-push hook" -#: builtin/push.c:555 +#: builtin/push.c:579 msgid "push missing but relevant tags" msgstr "publicar tags perdidas mas relevantes" -#: builtin/push.c:557 builtin/send-pack.c:187 +#: builtin/push.c:581 builtin/send-pack.c:193 msgid "GPG sign the push" msgstr "assinar publicação com GPG" -#: builtin/push.c:559 builtin/send-pack.c:194 +#: builtin/push.c:583 builtin/send-pack.c:200 msgid "request atomic transaction on remote side" msgstr "solicitar transação atómica no servidor remoto" -#: builtin/push.c:577 +#: builtin/push.c:601 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete é incompatível com --all, --mirror e --tags" -#: builtin/push.c:579 +#: builtin/push.c:603 msgid "--delete doesn't make sense without any refs" msgstr "--delete não faz sentido sem uma referência" -#: builtin/push.c:599 +#: builtin/push.c:623 #, c-format msgid "bad repository '%s'" msgstr "repositório '%s' incorreto" -#: builtin/push.c:600 +#: builtin/push.c:624 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -18805,27 +19061,27 @@ msgstr "" "\n" " git push <nome>\n" -#: builtin/push.c:615 +#: builtin/push.c:639 msgid "--all and --tags are incompatible" msgstr "--all e --tags são incompatíveis" -#: builtin/push.c:617 +#: builtin/push.c:641 msgid "--all can't be combined with refspecs" msgstr "--all não pode ser combinado com especificadores de referências" -#: builtin/push.c:621 +#: builtin/push.c:645 msgid "--mirror and --tags are incompatible" msgstr "--mirror e --tags são incompatíveis" -#: builtin/push.c:623 +#: builtin/push.c:647 msgid "--mirror can't be combined with refspecs" msgstr "--mirror não pode ser combinado com especificadores de referências" -#: builtin/push.c:626 +#: builtin/push.c:650 msgid "--all and --mirror are incompatible" msgstr "--all e --mirror são incompatíveis" -#: builtin/push.c:630 +#: builtin/push.c:657 msgid "push options must not have new line characters" msgstr "as opções de publicação não podem ter carateres de nova linha" @@ -18978,213 +19234,213 @@ msgstr "" msgid "git rebase --continue | --abort | --skip | --edit-todo" msgstr "git am [<opções>] (--continue | --skip | --abort)" -#: builtin/rebase.c:187 builtin/rebase.c:211 builtin/rebase.c:238 +#: builtin/rebase.c:193 builtin/rebase.c:217 builtin/rebase.c:244 #, fuzzy, c-format msgid "unusable todo list: '%s'" msgstr "não é possível invocar unlink: %s" -#: builtin/rebase.c:304 +#: builtin/rebase.c:310 #, fuzzy, c-format msgid "could not create temporary %s" msgstr "não foi possível criar ficheiro temporário" -#: builtin/rebase.c:310 +#: builtin/rebase.c:316 #, fuzzy msgid "could not mark as interactive" msgstr "Não foi possível marcar como interativo" -#: builtin/rebase.c:364 +#: builtin/rebase.c:369 #, fuzzy msgid "could not generate todo list" msgstr "não foi possível escrever para %s" -#: builtin/rebase.c:405 +#: builtin/rebase.c:411 msgid "a base commit must be provided with --upstream or --onto" msgstr "" -#: builtin/rebase.c:474 +#: builtin/rebase.c:480 #, fuzzy msgid "git rebase--interactive [<options>]" msgstr "git rebase--helper [<opções>]" -#: builtin/rebase.c:487 builtin/rebase.c:1382 +#: builtin/rebase.c:493 builtin/rebase.c:1388 msgid "keep commits which start empty" msgstr "" -#: builtin/rebase.c:491 builtin/revert.c:128 +#: builtin/rebase.c:497 builtin/revert.c:128 msgid "allow commits with empty messages" msgstr "permitir commits com mensagens vazias" -#: builtin/rebase.c:493 +#: builtin/rebase.c:499 #, fuzzy msgid "rebase merge commits" msgstr "mergetag incorreta no commit '%s'" -#: builtin/rebase.c:495 +#: builtin/rebase.c:501 msgid "keep original branch points of cousins" msgstr "" -#: builtin/rebase.c:497 +#: builtin/rebase.c:503 msgid "move commits that begin with squash!/fixup!" msgstr "" -#: builtin/rebase.c:498 +#: builtin/rebase.c:504 #, fuzzy msgid "sign commits" msgstr "assinar os commits com GPG" -#: builtin/rebase.c:500 builtin/rebase.c:1321 +#: builtin/rebase.c:506 builtin/rebase.c:1327 msgid "display a diffstat of what changed upstream" msgstr "" -#: builtin/rebase.c:502 +#: builtin/rebase.c:508 msgid "continue rebase" msgstr "continuar rebase" -#: builtin/rebase.c:504 +#: builtin/rebase.c:510 #, fuzzy msgid "skip commit" msgstr "commit" -#: builtin/rebase.c:505 +#: builtin/rebase.c:511 #, fuzzy msgid "edit the todo list" msgstr "falha ao escrever para rev-list" -#: builtin/rebase.c:507 +#: builtin/rebase.c:513 #, fuzzy msgid "show the current patch" msgstr "ignorar o patch atual" -#: builtin/rebase.c:510 +#: builtin/rebase.c:516 msgid "shorten commit ids in the todo list" msgstr "" -#: builtin/rebase.c:512 +#: builtin/rebase.c:518 msgid "expand commit ids in the todo list" msgstr "" -#: builtin/rebase.c:514 +#: builtin/rebase.c:520 msgid "check the todo list" msgstr "" -#: builtin/rebase.c:516 +#: builtin/rebase.c:522 msgid "rearrange fixup/squash lines" msgstr "" -#: builtin/rebase.c:518 +#: builtin/rebase.c:524 msgid "insert exec commands in todo list" msgstr "" -#: builtin/rebase.c:519 +#: builtin/rebase.c:525 msgid "onto" msgstr "" -#: builtin/rebase.c:522 +#: builtin/rebase.c:528 #, fuzzy msgid "restrict-revision" msgstr "revisão" -#: builtin/rebase.c:522 +#: builtin/rebase.c:528 #, fuzzy msgid "restrict revision" msgstr "revisão" -#: builtin/rebase.c:524 +#: builtin/rebase.c:530 msgid "squash-onto" msgstr "" -#: builtin/rebase.c:525 +#: builtin/rebase.c:531 msgid "squash onto" msgstr "" -#: builtin/rebase.c:527 +#: builtin/rebase.c:533 #, fuzzy msgid "the upstream commit" msgstr "Remover a informação do ramo a montante" -#: builtin/rebase.c:529 +#: builtin/rebase.c:535 #, fuzzy msgid "head-name" msgstr "mudar nome" -#: builtin/rebase.c:529 +#: builtin/rebase.c:535 #, fuzzy msgid "head name" msgstr "à frente " -#: builtin/rebase.c:534 +#: builtin/rebase.c:540 #, fuzzy msgid "rebase strategy" msgstr "estratégia de integração" -#: builtin/rebase.c:535 +#: builtin/rebase.c:541 #, fuzzy msgid "strategy-opts" msgstr "estratégia" -#: builtin/rebase.c:536 +#: builtin/rebase.c:542 #, fuzzy msgid "strategy options" msgstr "opções de decoração" -#: builtin/rebase.c:537 +#: builtin/rebase.c:543 msgid "switch-to" msgstr "" -#: builtin/rebase.c:538 +#: builtin/rebase.c:544 msgid "the branch or commit to checkout" msgstr "" -#: builtin/rebase.c:539 +#: builtin/rebase.c:545 #, fuzzy msgid "onto-name" msgstr "nome" -#: builtin/rebase.c:539 +#: builtin/rebase.c:545 #, fuzzy msgid "onto name" msgstr "nome do remoto" -#: builtin/rebase.c:540 +#: builtin/rebase.c:546 #, fuzzy msgid "cmd" msgstr "comando" -#: builtin/rebase.c:540 +#: builtin/rebase.c:546 #, fuzzy msgid "the command to run" msgstr "Nenhum comando concluído." -#: builtin/rebase.c:543 builtin/rebase.c:1415 +#: builtin/rebase.c:549 builtin/rebase.c:1421 msgid "automatically re-schedule any `exec` that fails" msgstr "" -#: builtin/rebase.c:559 +#: builtin/rebase.c:565 msgid "--[no-]rebase-cousins has no effect without --rebase-merges" msgstr "" -#: builtin/rebase.c:575 +#: builtin/rebase.c:581 #, c-format msgid "%s requires the merge backend" msgstr "" -#: builtin/rebase.c:618 +#: builtin/rebase.c:624 #, fuzzy, c-format msgid "could not get 'onto': '%s'" msgstr "não foi possível definir '%s' como '%s'" -#: builtin/rebase.c:635 +#: builtin/rebase.c:641 #, fuzzy, c-format msgid "invalid orig-head: '%s'" msgstr "ficheiro inválido: '%s'" -#: builtin/rebase.c:660 +#: builtin/rebase.c:666 #, c-format msgid "ignoring invalid allow_rerere_autoupdate: '%s'" msgstr "" -#: builtin/rebase.c:805 git-rebase--preserve-merges.sh:81 +#: builtin/rebase.c:811 git-rebase--preserve-merges.sh:81 #, fuzzy msgid "" "Resolve all conflicts manually, mark them as resolved with\n" @@ -19198,7 +19454,7 @@ msgstr "" "Para extrair o ramo original e interromper o rebase, execute \"git rebase --" "abort\"." -#: builtin/rebase.c:888 +#: builtin/rebase.c:894 #, c-format msgid "" "\n" @@ -19210,14 +19466,14 @@ msgid "" "As a result, git cannot rebase them." msgstr "" -#: builtin/rebase.c:1214 +#: builtin/rebase.c:1220 #, c-format msgid "" "unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask" "\"." msgstr "" -#: builtin/rebase.c:1232 +#: builtin/rebase.c:1238 #, fuzzy, c-format msgid "" "%s\n" @@ -19226,9 +19482,15 @@ msgid "" "\n" " git rebase '<branch>'\n" "\n" -msgstr "Especifique o ramo sobre o qual pretende realizar rebase." +msgstr "" +"%s\n" +"Por favor, diz o branch sobre o qual queres rebasear.\n" +"Vê git-rebase(1) para detalhes.\n" +"\n" +" git rebase '<branch>'\n" +"\n" -#: builtin/rebase.c:1248 +#: builtin/rebase.c:1254 #, fuzzy, c-format msgid "" "If you wish to set tracking information for this branch you can do so with:\n" @@ -19236,210 +19498,214 @@ msgid "" " git branch --set-upstream-to=%s/<branch> %s\n" "\n" msgstr "" -"Se deseja definir o ramo que deve ser seguido por este ramo, pode fazê-lo " -"com:" +"Se desejas por tracking information neste branch, podes fazer com:\n" +"\n" +" git branch --set-upstream-to=%s/<branch> %s\n" +"\n" -#: builtin/rebase.c:1278 +#: builtin/rebase.c:1284 msgid "exec commands cannot contain newlines" msgstr "" -#: builtin/rebase.c:1282 +#: builtin/rebase.c:1288 msgid "empty exec command" msgstr "" -#: builtin/rebase.c:1312 +#: builtin/rebase.c:1318 #, fuzzy msgid "rebase onto given branch instead of upstream" msgstr "demasiados ramos para remover a definição de ramo a montante" -#: builtin/rebase.c:1314 +#: builtin/rebase.c:1320 #, fuzzy msgid "use the merge-base of upstream and branch as the current base" msgstr "o ramo a montante solicitado '%s' não existe" -#: builtin/rebase.c:1316 +#: builtin/rebase.c:1322 #, fuzzy msgid "allow pre-rebase hook to run" msgstr "Rebase recusado pelo hook pre-rebase." -#: builtin/rebase.c:1318 +#: builtin/rebase.c:1324 msgid "be quiet. implies --no-stat" msgstr "" -#: builtin/rebase.c:1324 +#: builtin/rebase.c:1330 #, fuzzy msgid "do not show diffstat of what changed upstream" msgstr "não apresentar um diffstat ao fim da integração" -#: builtin/rebase.c:1327 +#: builtin/rebase.c:1333 #, fuzzy -msgid "add a Signed-off-by: line to each commit" +msgid "add a Signed-off-by trailer to each commit" msgstr "adicionar uma linha com Signed-of-by no fim da mensagem de commit" -#: builtin/rebase.c:1330 +#: builtin/rebase.c:1336 #, fuzzy msgid "make committer date match author date" msgstr "agrupar por committer em vez de autor" -#: builtin/rebase.c:1332 +#: builtin/rebase.c:1338 msgid "ignore author date and use current date" msgstr "" -#: builtin/rebase.c:1334 +#: builtin/rebase.c:1340 #, fuzzy msgid "synonym of --reset-author-date" msgstr "sinónimo de --files-with-matches" -#: builtin/rebase.c:1336 builtin/rebase.c:1340 +#: builtin/rebase.c:1342 builtin/rebase.c:1346 #, fuzzy msgid "passed to 'git apply'" msgstr "transmitir ao git-apply" -#: builtin/rebase.c:1338 +#: builtin/rebase.c:1344 #, fuzzy msgid "ignore changes in whitespace" msgstr "ignorar alterações de espaço em branco ao procurar contexto" -#: builtin/rebase.c:1342 builtin/rebase.c:1345 +#: builtin/rebase.c:1348 builtin/rebase.c:1351 msgid "cherry-pick all commits, even if unchanged" msgstr "" -#: builtin/rebase.c:1347 +#: builtin/rebase.c:1353 #, fuzzy msgid "continue" msgstr "continuar rebase" -#: builtin/rebase.c:1350 +#: builtin/rebase.c:1356 #, fuzzy msgid "skip current patch and continue" msgstr "ignorar o patch atual" -#: builtin/rebase.c:1352 +#: builtin/rebase.c:1358 #, fuzzy msgid "abort and check out the original branch" msgstr " (use \"git rebase --abort\" para restaurar o ramo original)" -#: builtin/rebase.c:1355 +#: builtin/rebase.c:1361 msgid "abort but keep HEAD where it is" msgstr "" -#: builtin/rebase.c:1356 +#: builtin/rebase.c:1362 #, fuzzy msgid "edit the todo list during an interactive rebase" msgstr "A ação --edit-todo só pode ser usada durante um rebase interativo." -#: builtin/rebase.c:1359 +#: builtin/rebase.c:1365 msgid "show the patch file being applied or merged" msgstr "" -#: builtin/rebase.c:1362 +#: builtin/rebase.c:1368 msgid "use apply strategies to rebase" msgstr "" -#: builtin/rebase.c:1366 +#: builtin/rebase.c:1372 #, fuzzy msgid "use merging strategies to rebase" msgstr "estratégia de integração a usar" -#: builtin/rebase.c:1370 +#: builtin/rebase.c:1376 msgid "let the user edit the list of commits to rebase" msgstr "" -#: builtin/rebase.c:1374 +#: builtin/rebase.c:1380 msgid "(DEPRECATED) try to recreate merges instead of ignoring them" msgstr "" -#: builtin/rebase.c:1379 +#: builtin/rebase.c:1385 msgid "how to handle commits that become empty" msgstr "" -#: builtin/rebase.c:1386 +#: builtin/rebase.c:1392 msgid "move commits that begin with squash!/fixup! under -i" msgstr "" -#: builtin/rebase.c:1393 +#: builtin/rebase.c:1399 msgid "add exec lines after each commit of the editable list" msgstr "" -#: builtin/rebase.c:1397 +#: builtin/rebase.c:1403 #, fuzzy msgid "allow rebasing commits with empty messages" msgstr "permitir commits com mensagens vazias" -#: builtin/rebase.c:1401 +#: builtin/rebase.c:1407 msgid "try to rebase merges instead of skipping them" msgstr "" -#: builtin/rebase.c:1404 +#: builtin/rebase.c:1410 #, fuzzy msgid "use 'merge-base --fork-point' to refine upstream" msgstr "git merge-base --fork-point <referência> [<commit>]" -#: builtin/rebase.c:1406 +#: builtin/rebase.c:1412 #, fuzzy msgid "use the given merge strategy" msgstr "opção de estratégia de integração" -#: builtin/rebase.c:1408 builtin/revert.c:115 +#: builtin/rebase.c:1414 builtin/revert.c:115 msgid "option" msgstr "opção" -#: builtin/rebase.c:1409 +#: builtin/rebase.c:1415 msgid "pass the argument through to the merge strategy" msgstr "" -#: builtin/rebase.c:1412 +#: builtin/rebase.c:1418 msgid "rebase all reachable commits up to the root(s)" msgstr "" -#: builtin/rebase.c:1417 +#: builtin/rebase.c:1423 msgid "apply all changes, even those already present upstream" msgstr "" -#: builtin/rebase.c:1434 +#: builtin/rebase.c:1440 msgid "" "the rebase.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." msgstr "" +"o suporte a rebase.useBuiltin foi removido!\n" +"Vê essa entry em 'git help config' para detalhes." -#: builtin/rebase.c:1440 +#: builtin/rebase.c:1446 #, fuzzy msgid "It looks like 'git am' is in progress. Cannot rebase." msgstr "Parece que o git-am está em curso. Não é possível efetuar rebase." -#: builtin/rebase.c:1481 +#: builtin/rebase.c:1487 msgid "" "git rebase --preserve-merges is deprecated. Use --rebase-merges instead." msgstr "" -#: builtin/rebase.c:1486 +#: builtin/rebase.c:1492 #, fuzzy msgid "cannot combine '--keep-base' with '--onto'" msgstr "Não é possível combinar --squash e --no-ff." -#: builtin/rebase.c:1488 +#: builtin/rebase.c:1494 #, fuzzy msgid "cannot combine '--keep-base' with '--root'" msgstr "Não é possível combinar --squash e --no-ff." -#: builtin/rebase.c:1492 +#: builtin/rebase.c:1498 #, fuzzy msgid "cannot combine '--root' with '--fork-point'" msgstr "Não é possível combinar --squash e --no-ff." -#: builtin/rebase.c:1495 +#: builtin/rebase.c:1501 msgid "No rebase in progress?" msgstr "Rebase não está em curso?" -#: builtin/rebase.c:1499 +#: builtin/rebase.c:1505 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "A ação --edit-todo só pode ser usada durante um rebase interativo." -#: builtin/rebase.c:1522 +#: builtin/rebase.c:1528 t/helper/test-fast-rebase.c:123 msgid "Cannot read HEAD" msgstr "Não é possível ler HEAD" -#: builtin/rebase.c:1534 +#: builtin/rebase.c:1540 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -19447,17 +19713,17 @@ msgstr "" "Deve editar todos os conflitos da integração\n" "e marcá-los como resolvidos usando git add" -#: builtin/rebase.c:1553 +#: builtin/rebase.c:1559 #, fuzzy msgid "could not discard worktree changes" msgstr "Não é possível remover as alterações da árvore de trabalho" -#: builtin/rebase.c:1572 +#: builtin/rebase.c:1578 #, fuzzy, c-format msgid "could not move back to %s" msgstr "Não foi possível voltar para $head_name" -#: builtin/rebase.c:1618 +#: builtin/rebase.c:1624 #, fuzzy, c-format msgid "" "It seems that there is already a %s directory, and\n" @@ -19469,156 +19735,155 @@ msgid "" "and run me again. I am stopping in case you still have something\n" "valuable there.\n" msgstr "" -"Parece que já existe um diretório $state_dir_base e\n" +"Parece que já existe um diretório %s, e\n" "é possível que outro processo de rebase já esteja em curso.\n" "Se for o caso, tente\n" -"\t$cmd_live_rebase\n" +"\t%s\n" "Se não for o caso,\n" -"\t$cmd_clear_stale_rebase\n" +"\t%s\n" "e execute o comando de novo. A execução foi interrompida no caso de\n" -"ainda ter algo importante nesse sítio." +"ainda ter algo importante nesse sítio.\n" -#: builtin/rebase.c:1646 +#: builtin/rebase.c:1652 #, fuzzy msgid "switch `C' expects a numerical value" msgstr "a opção '%c' espera um valor numérico" -#: builtin/rebase.c:1688 +#: builtin/rebase.c:1694 #, fuzzy, c-format msgid "Unknown mode: %s" msgstr "Mode de --patch desconhecido: %s" -#: builtin/rebase.c:1727 +#: builtin/rebase.c:1733 msgid "--strategy requires --merge or --interactive" msgstr "" -#: builtin/rebase.c:1757 +#: builtin/rebase.c:1763 msgid "cannot combine apply options with merge options" msgstr "" -#: builtin/rebase.c:1770 +#: builtin/rebase.c:1776 #, fuzzy, c-format msgid "Unknown rebase backend: %s" msgstr "Subcomando desconhecido: %s" -#: builtin/rebase.c:1795 +#: builtin/rebase.c:1806 msgid "--reschedule-failed-exec requires --exec or --interactive" msgstr "" -#: builtin/rebase.c:1815 +#: builtin/rebase.c:1826 msgid "cannot combine '--preserve-merges' with '--rebase-merges'" msgstr "" -#: builtin/rebase.c:1819 +#: builtin/rebase.c:1830 msgid "" "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'" msgstr "" -#: builtin/rebase.c:1843 +#: builtin/rebase.c:1854 #, fuzzy, c-format msgid "invalid upstream '%s'" msgstr "caminho inválido '%s'" -#: builtin/rebase.c:1849 +#: builtin/rebase.c:1860 #, fuzzy msgid "Could not create new root commit" msgstr "não foi possível analisar o commit recém-criado" -#: builtin/rebase.c:1875 +#: builtin/rebase.c:1886 #, c-format msgid "'%s': need exactly one merge base with branch" msgstr "" -#: builtin/rebase.c:1878 +#: builtin/rebase.c:1889 #, fuzzy, c-format msgid "'%s': need exactly one merge base" msgstr "É necessário exatamente um intervalo." -#: builtin/rebase.c:1886 +#: builtin/rebase.c:1897 #, fuzzy, c-format msgid "Does not point to a valid commit '%s'" msgstr "Não aponta para um commit válido: $onto_name" -#: builtin/rebase.c:1912 +#: builtin/rebase.c:1923 #, fuzzy, c-format msgid "fatal: no such branch/commit '%s'" msgstr "o ramo '%s' não existe" -#: builtin/rebase.c:1920 builtin/submodule--helper.c:40 +#: builtin/rebase.c:1931 builtin/submodule--helper.c:40 #: builtin/submodule--helper.c:2414 #, c-format msgid "No such ref: %s" msgstr "Referência inexistente: %s" -#: builtin/rebase.c:1931 +#: builtin/rebase.c:1942 #, fuzzy msgid "Could not resolve HEAD to a revision" -msgstr "não foi possível resolver o commit HEAD\n" +msgstr "Foi impossível resolver HEAD para uma revisão" -#: builtin/rebase.c:1952 +#: builtin/rebase.c:1963 msgid "Please commit or stash them." msgstr "Submeta ou esconda-as." -#: builtin/rebase.c:1988 +#: builtin/rebase.c:1999 #, fuzzy, c-format msgid "could not switch to %s" msgstr "não foi possível escrever para %s" -#: builtin/rebase.c:1999 +#: builtin/rebase.c:2010 #, fuzzy msgid "HEAD is up to date." msgstr "HEAD está agora em" -#: builtin/rebase.c:2001 +#: builtin/rebase.c:2012 #, fuzzy, c-format msgid "Current branch %s is up to date.\n" -msgstr "O ramo atual $branch_name está atualizado." +msgstr "Branch atual %s está atualizado.\n" -#: builtin/rebase.c:2009 +#: builtin/rebase.c:2020 #, fuzzy msgid "HEAD is up to date, rebase forced." msgstr "O ramo atual $branch_name está atualizado, rebase forçado." -#: builtin/rebase.c:2011 +#: builtin/rebase.c:2022 #, fuzzy, c-format msgid "Current branch %s is up to date, rebase forced.\n" -msgstr "O ramo atual $branch_name está atualizado, rebase forçado." +msgstr "Branch actual %s está atualizado, rebase forçado.\n" -#: builtin/rebase.c:2019 +#: builtin/rebase.c:2030 msgid "The pre-rebase hook refused to rebase." msgstr "Rebase recusado pelo hook pre-rebase." -#: builtin/rebase.c:2026 +#: builtin/rebase.c:2037 #, fuzzy, c-format msgid "Changes to %s:\n" -msgstr "A publicar em %s\n" +msgstr "Modificações para %s:\n" -#: builtin/rebase.c:2029 +#: builtin/rebase.c:2040 #, fuzzy, c-format msgid "Changes from %s to %s:\n" -msgstr "Alterações de $mb para $onto:" +msgstr "Modificações de %s para %s:\n" -#: builtin/rebase.c:2054 +#: builtin/rebase.c:2065 #, fuzzy, c-format msgid "First, rewinding head to replay your work on top of it...\n" -msgstr "" -"Primeiro, a recuar a cabeça para replicar as suas alterações no topo dela..." +msgstr "Primeiro, recuando head para refazer o teu trabalho em cima dela...\n" -#: builtin/rebase.c:2063 +#: builtin/rebase.c:2074 #, fuzzy msgid "Could not detach HEAD" msgstr "não foi possível destacar HEAD" -#: builtin/rebase.c:2072 +#: builtin/rebase.c:2083 #, fuzzy, c-format msgid "Fast-forwarded %s to %s.\n" -msgstr "Avanço-rápido para $sha1" +msgstr "Avançei-rápido %s para %s.\n" #: builtin/receive-pack.c:34 msgid "git receive-pack <git-dir>" msgstr "git receive-pack <git-dir>" -#: builtin/receive-pack.c:1224 +#: builtin/receive-pack.c:1276 msgid "" "By default, updating the current branch in a non-bare repository\n" "is denied, because it will make the index and work tree inconsistent\n" @@ -19645,10 +19910,10 @@ msgstr "" "consiga de outra forma atualizar a árvore de trabalho dele para\n" "refletir o que publicou.\n" "\n" -"Para suprimir esta mensagem e manter o comportamento predefinido, defina a " -"variável de configuração 'receive.denyCurrentBranch' como 'refuse'." +"Para suprimir esta mensagem e manter o comportamento predefinido, defina\n" +"a variável de configuração 'receive.denyCurrentBranch' como 'refuse'." -#: builtin/receive-pack.c:1244 +#: builtin/receive-pack.c:1296 msgid "" "By default, deleting the current branch is denied, because the next\n" "'git clone' won't result in any file checked out, causing confusion.\n" @@ -19668,11 +19933,11 @@ msgstr "" "\n" "Para suprimir esta mensagem, pode definí-la como 'refuse'." -#: builtin/receive-pack.c:2422 +#: builtin/receive-pack.c:2481 msgid "quiet" msgstr "silencioso" -#: builtin/receive-pack.c:2436 +#: builtin/receive-pack.c:2495 msgid "You must specify a directory." msgstr "Deve especificar um diretório." @@ -19721,7 +19986,7 @@ msgstr "Referência inválida: %s" #: builtin/reflog.c:710 #, fuzzy, c-format msgid "no reflog for '%s'" -msgstr "Não é possível efetuar reflog de '%s': %s\n" +msgstr "Impossível efetuar reflog de '%s'" #: builtin/reflog.c:756 #, fuzzy, c-format @@ -19824,8 +20089,8 @@ msgid "" "--mirror is dangerous and deprecated; please\n" "\t use --mirror=fetch or --mirror=push instead" msgstr "" -"--mirror é perigoso e obsoleto;\n" -"\t use --mirror=fetch ou --mirror=push" +"--mirror é perigoso e obsoleto; por favor\n" +"\t usa --mirror=fetch ou --mirror=push invés" #: builtin/remote.c:148 #, c-format @@ -19864,41 +20129,36 @@ msgstr "especificar um ramo mestre não faz sentido com --mirror" msgid "specifying branches to track makes sense only with fetch mirrors" msgstr "especificar ramos para seguir só faz sentido com fetch mirrors" -#: builtin/remote.c:195 builtin/remote.c:697 +#: builtin/remote.c:195 builtin/remote.c:700 #, c-format msgid "remote %s already exists." msgstr "o remoto %s já existe." -#: builtin/remote.c:199 builtin/remote.c:701 -#, c-format -msgid "'%s' is not a valid remote name" -msgstr "'%s' não é um nome de remoto válido" - -#: builtin/remote.c:239 +#: builtin/remote.c:240 #, c-format msgid "Could not setup master '%s'" msgstr "Não foi possível configuração o ramo mestre '%s'" -#: builtin/remote.c:354 +#: builtin/remote.c:355 #, c-format msgid "Could not get fetch map for refspec %s" msgstr "" "Não foi possível obter o mapa de fetch do especificador de referência %s" -#: builtin/remote.c:453 builtin/remote.c:461 +#: builtin/remote.c:454 builtin/remote.c:462 msgid "(matching)" msgstr "(correspondente)" -#: builtin/remote.c:465 +#: builtin/remote.c:466 msgid "(delete)" msgstr "(eliminado)" -#: builtin/remote.c:654 +#: builtin/remote.c:655 #, fuzzy, c-format msgid "could not set '%s'" msgstr "não foi possível reiniciar '%s'" -#: builtin/remote.c:659 +#: builtin/remote.c:660 #, c-format msgid "" "The %s configuration remote.pushDefault in:\n" @@ -19906,18 +20166,18 @@ msgid "" "now names the non-existent remote '%s'" msgstr "" -#: builtin/remote.c:690 builtin/remote.c:833 builtin/remote.c:941 +#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:946 #, fuzzy, c-format msgid "No such remote: '%s'" msgstr "Remoto inexistente '%s'" -#: builtin/remote.c:707 +#: builtin/remote.c:710 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "" "Não foi possível mudar o nome da secção de configuração de '%s' para '%s'" -#: builtin/remote.c:727 +#: builtin/remote.c:730 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -19929,17 +20189,17 @@ msgstr "" "\t%s\n" "\tAtualize a configuração manualmente se necessário." -#: builtin/remote.c:767 +#: builtin/remote.c:770 #, c-format msgid "deleting '%s' failed" msgstr "falha ao eliminar '%s'" -#: builtin/remote.c:801 +#: builtin/remote.c:804 #, c-format msgid "creating '%s' failed" msgstr "falha ao criar '%s'" -#: builtin/remote.c:877 +#: builtin/remote.c:882 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -19953,119 +20213,119 @@ msgstr[1] "" "Nota: alguns ramos fora da hierarquia refs/remotes/ não foram removidos;\n" "para os remover, use:" -#: builtin/remote.c:891 +#: builtin/remote.c:896 #, c-format msgid "Could not remove config section '%s'" msgstr "Não foi possível remover a secção de configuração '%s'" -#: builtin/remote.c:994 +#: builtin/remote.c:999 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " novo (os próxima objetos obtidos serão guardados em remotes/%s)" -#: builtin/remote.c:997 +#: builtin/remote.c:1002 msgid " tracked" msgstr " seguido" -#: builtin/remote.c:999 +#: builtin/remote.c:1004 msgid " stale (use 'git remote prune' to remove)" msgstr " obsoleto (use 'git remote prune' para remover)" -#: builtin/remote.c:1001 +#: builtin/remote.c:1006 msgid " ???" msgstr " ???" -#: builtin/remote.c:1042 +#: builtin/remote.c:1047 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "" "branch.%s.merge inválido; não é possível rebasear sobre mais do que um ramo" -#: builtin/remote.c:1051 +#: builtin/remote.c:1056 #, c-format msgid "rebases interactively onto remote %s" msgstr "rebaseia interativamente sobre %s do remoto" -#: builtin/remote.c:1053 +#: builtin/remote.c:1058 #, fuzzy, c-format msgid "rebases interactively (with merges) onto remote %s" msgstr "rebaseia interativamente sobre %s do remoto" -#: builtin/remote.c:1056 +#: builtin/remote.c:1061 #, c-format msgid "rebases onto remote %s" msgstr "rebaseia sobre %s do remoto" -#: builtin/remote.c:1060 +#: builtin/remote.c:1065 #, c-format msgid " merges with remote %s" msgstr " integra com %s do remoto" -#: builtin/remote.c:1063 +#: builtin/remote.c:1068 #, c-format msgid "merges with remote %s" msgstr "integra com %s do remoto" -#: builtin/remote.c:1066 +#: builtin/remote.c:1071 #, c-format msgid "%-*s and with remote %s\n" -msgstr "%-*s e com o %s do remoto\n" +msgstr "%-*s e com o %s remote\n" -#: builtin/remote.c:1109 +#: builtin/remote.c:1114 msgid "create" msgstr "criado" -#: builtin/remote.c:1112 +#: builtin/remote.c:1117 msgid "delete" msgstr "eliminado" -#: builtin/remote.c:1116 +#: builtin/remote.c:1121 msgid "up to date" msgstr "atualizado" -#: builtin/remote.c:1119 +#: builtin/remote.c:1124 msgid "fast-forwardable" msgstr "pode ser avançado rapidamente" -#: builtin/remote.c:1122 +#: builtin/remote.c:1127 msgid "local out of date" msgstr "local desatualizado" -#: builtin/remote.c:1129 +#: builtin/remote.c:1134 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s força em %-*s (%s)" -#: builtin/remote.c:1132 +#: builtin/remote.c:1137 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s publica em %-*s (%s)" -#: builtin/remote.c:1136 +#: builtin/remote.c:1141 #, c-format msgid " %-*s forces to %s" msgstr " %-*s força em %s" -#: builtin/remote.c:1139 +#: builtin/remote.c:1144 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s publica em %s" -#: builtin/remote.c:1207 +#: builtin/remote.c:1212 msgid "do not query remotes" msgstr "não consultar remotos" -#: builtin/remote.c:1234 +#: builtin/remote.c:1239 #, c-format msgid "* remote %s" msgstr "* remoto %s" -#: builtin/remote.c:1235 +#: builtin/remote.c:1240 #, c-format msgid " Fetch URL: %s" msgstr " Obter do URL: %s" -#: builtin/remote.c:1236 builtin/remote.c:1252 builtin/remote.c:1391 +#: builtin/remote.c:1241 builtin/remote.c:1257 builtin/remote.c:1396 msgid "(no URL)" msgstr "(nenhum URL)" @@ -20073,176 +20333,176 @@ msgstr "(nenhum URL)" #. with the one in " Fetch URL: %s" #. translation. #. -#: builtin/remote.c:1250 builtin/remote.c:1252 +#: builtin/remote.c:1255 builtin/remote.c:1257 #, c-format msgid " Push URL: %s" msgstr " Publicar no URL: %s" -#: builtin/remote.c:1254 builtin/remote.c:1256 builtin/remote.c:1258 +#: builtin/remote.c:1259 builtin/remote.c:1261 builtin/remote.c:1263 #, c-format msgid " HEAD branch: %s" msgstr " Ramo HEAD: %s" -#: builtin/remote.c:1254 +#: builtin/remote.c:1259 msgid "(not queried)" msgstr "(não consultado)" -#: builtin/remote.c:1256 +#: builtin/remote.c:1261 msgid "(unknown)" msgstr "(desconhecido)" -#: builtin/remote.c:1260 +#: builtin/remote.c:1265 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" -msgstr " Ramo HEAD (o remoto HEAD é ambíguo, pode ser um dos seguintes):\n" +msgstr " HEAD branch (HEAD remote é ambíguo, pode ser um dos seguintes):\n" -#: builtin/remote.c:1272 +#: builtin/remote.c:1277 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " Ramo remoto:%s" msgstr[1] " Ramos remotos:%s" -#: builtin/remote.c:1275 builtin/remote.c:1301 +#: builtin/remote.c:1280 builtin/remote.c:1306 msgid " (status not queried)" msgstr " (estado não consultado)" -#: builtin/remote.c:1284 +#: builtin/remote.c:1289 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] " Ramo local configurado para 'git pull':" msgstr[1] " Ramos locais configurados para 'git pull':" -#: builtin/remote.c:1292 +#: builtin/remote.c:1297 msgid " Local refs will be mirrored by 'git push'" msgstr " Referências locais serão refletidas (mirror) por 'git push'" -#: builtin/remote.c:1298 +#: builtin/remote.c:1303 #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" msgstr[0] " Referência local configurada para 'git push'%s:" msgstr[1] " Referências locais configuradas para 'git push'%s:" -#: builtin/remote.c:1319 +#: builtin/remote.c:1324 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "definir refs/remotes/<nome>/HEAD de acordo com o remoto" -#: builtin/remote.c:1321 +#: builtin/remote.c:1326 msgid "delete refs/remotes/<name>/HEAD" msgstr "eliminar refs/remotes/<nome>/HEAD" -#: builtin/remote.c:1336 +#: builtin/remote.c:1341 msgid "Cannot determine remote HEAD" msgstr "Não é possível determinar o remoto HEAD" -#: builtin/remote.c:1338 +#: builtin/remote.c:1343 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "Múltiplos ramos HEAD remotos. Escolha um explicitamente com:" -#: builtin/remote.c:1348 +#: builtin/remote.c:1353 #, c-format msgid "Could not delete %s" msgstr "Não foi possível eliminar %s" -#: builtin/remote.c:1356 +#: builtin/remote.c:1361 #, c-format msgid "Not a valid ref: %s" msgstr "Referência inválida: %s" -#: builtin/remote.c:1358 +#: builtin/remote.c:1363 #, c-format msgid "Could not setup %s" msgstr "Não foi possível configurar %s" -#: builtin/remote.c:1376 +#: builtin/remote.c:1381 #, c-format msgid " %s will become dangling!" msgstr " %s ficará suspenso!" -#: builtin/remote.c:1377 +#: builtin/remote.c:1382 #, c-format msgid " %s has become dangling!" msgstr " %s ficou suspenso!" -#: builtin/remote.c:1387 +#: builtin/remote.c:1392 #, c-format msgid "Pruning %s" msgstr "A eliminar %s" -#: builtin/remote.c:1388 +#: builtin/remote.c:1393 #, c-format msgid "URL: %s" msgstr "URL: %s" -#: builtin/remote.c:1404 +#: builtin/remote.c:1409 #, c-format msgid " * [would prune] %s" msgstr " * [eliminaria] %s" -#: builtin/remote.c:1407 +#: builtin/remote.c:1412 #, c-format msgid " * [pruned] %s" msgstr " * [eliminado] %s" -#: builtin/remote.c:1452 +#: builtin/remote.c:1457 msgid "prune remotes after fetching" msgstr "eliminar remotos depois de obter" -#: builtin/remote.c:1515 builtin/remote.c:1569 builtin/remote.c:1637 +#: builtin/remote.c:1521 builtin/remote.c:1577 builtin/remote.c:1647 #, c-format msgid "No such remote '%s'" msgstr "Remoto inexistente '%s'" -#: builtin/remote.c:1531 +#: builtin/remote.c:1539 msgid "add branch" msgstr "adicionar ramo" -#: builtin/remote.c:1538 +#: builtin/remote.c:1546 msgid "no remote specified" msgstr "nenhum remoto especificado" -#: builtin/remote.c:1555 +#: builtin/remote.c:1563 msgid "query push URLs rather than fetch URLs" msgstr "consultar URLs de publicação em vez de URLs utilizados para obter" -#: builtin/remote.c:1557 +#: builtin/remote.c:1565 msgid "return all URLs" msgstr "retornar todos os URLs" -#: builtin/remote.c:1585 +#: builtin/remote.c:1595 #, c-format msgid "no URLs configured for remote '%s'" msgstr "o remoto '%s' não tem nenhum URL configurado" -#: builtin/remote.c:1611 +#: builtin/remote.c:1621 msgid "manipulate push URLs" msgstr "manipular URLs de publicação" -#: builtin/remote.c:1613 +#: builtin/remote.c:1623 msgid "add URL" msgstr "adicionar URL" -#: builtin/remote.c:1615 +#: builtin/remote.c:1625 msgid "delete URLs" msgstr "eliminar URLs" -#: builtin/remote.c:1622 +#: builtin/remote.c:1632 msgid "--add --delete doesn't make sense" msgstr "--add --delete não faz sentido" -#: builtin/remote.c:1661 +#: builtin/remote.c:1673 #, c-format msgid "Invalid old URL pattern: %s" msgstr "Padrão de URL antigo inválido: %s" -#: builtin/remote.c:1669 +#: builtin/remote.c:1681 #, c-format msgid "No such URL found: %s" msgstr "URL não encontrado: %s" -#: builtin/remote.c:1671 +#: builtin/remote.c:1683 msgid "Will not delete all non-push URLs" msgstr "Não é possível remover todos os URLs de não publicação" @@ -20255,134 +20515,127 @@ msgid "" "Incremental repacks are incompatible with bitmap indexes. Use\n" "--no-write-bitmap-index or disable the pack.writebitmaps configuration." msgstr "" -"Repacks incrementais são incompatíveis com índices bitmap. Use\n" +"Repacks incrementais são incompatíveis com bitmap indexes. Usa\n" "--no-write-bitmap-índex ou desative a configuração pack.writebitmaps." #: builtin/repack.c:197 msgid "could not start pack-objects to repack promisor objects" msgstr "" -#: builtin/repack.c:236 builtin/repack.c:421 +#: builtin/repack.c:268 builtin/repack.c:447 msgid "repack: Expecting full hex object ID lines only from pack-objects." msgstr "" -#: builtin/repack.c:260 +#: builtin/repack.c:295 msgid "could not finish pack-objects to repack promisor objects" msgstr "" -#: builtin/repack.c:297 +#: builtin/repack.c:323 msgid "pack everything in a single pack" msgstr "compactar tudo num único pacote" -#: builtin/repack.c:299 +#: builtin/repack.c:325 msgid "same as -a, and turn unreachable objects loose" msgstr "o mesmo que -a, e soltar objetos inalcançáveis" -#: builtin/repack.c:302 +#: builtin/repack.c:328 msgid "remove redundant packs, and run git-prune-packed" msgstr "remover pacotes redundantes e executar git-prune-packed" -#: builtin/repack.c:304 +#: builtin/repack.c:330 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "passar --no-reuse-delta ao git-pack-objects" -#: builtin/repack.c:306 +#: builtin/repack.c:332 msgid "pass --no-reuse-object to git-pack-objects" msgstr "passar --no-reuse-object ao git-pack-objects" -#: builtin/repack.c:308 +#: builtin/repack.c:334 msgid "do not run git-update-server-info" msgstr "não executar git-update-server-info" -#: builtin/repack.c:311 +#: builtin/repack.c:337 msgid "pass --local to git-pack-objects" msgstr "passar --local ao git-pack-objects" -#: builtin/repack.c:313 +#: builtin/repack.c:339 msgid "write bitmap index" msgstr "escrever índice de mapa de bits" -#: builtin/repack.c:315 +#: builtin/repack.c:341 #, fuzzy msgid "pass --delta-islands to git-pack-objects" msgstr "passar --local ao git-pack-objects" -#: builtin/repack.c:316 +#: builtin/repack.c:342 msgid "approxidate" msgstr "aproximar" -#: builtin/repack.c:317 +#: builtin/repack.c:343 msgid "with -A, do not loosen objects older than this" msgstr "com -A, não soltar mais objetos além destes" -#: builtin/repack.c:319 +#: builtin/repack.c:345 msgid "with -a, repack unreachable objects" msgstr "com -a, reempacotar objetos inalcançáveis" -#: builtin/repack.c:321 +#: builtin/repack.c:347 msgid "size of the window used for delta compression" msgstr "dimensão da janela usada em compressão de deltas" -#: builtin/repack.c:322 builtin/repack.c:328 +#: builtin/repack.c:348 builtin/repack.c:354 msgid "bytes" msgstr "bytes" -#: builtin/repack.c:323 +#: builtin/repack.c:349 msgid "same as the above, but limit memory size instead of entries count" msgstr "" "o mesmo que o anterior, mas limitar a memória usada em vez do número de " "entradas" -#: builtin/repack.c:325 +#: builtin/repack.c:351 msgid "limits the maximum delta depth" msgstr "limitar a profundidade máxima de delta" -#: builtin/repack.c:327 +#: builtin/repack.c:353 #, fuzzy msgid "limits the maximum number of threads" msgstr "limitar a profundidade máxima de delta" -#: builtin/repack.c:329 +#: builtin/repack.c:355 msgid "maximum size of each packfile" msgstr "tamanho máximo de cada ficheiro de pacote" -#: builtin/repack.c:331 +#: builtin/repack.c:357 msgid "repack objects in packs marked with .keep" msgstr "reempacotar objetos em pacotes marcados com .keep" -#: builtin/repack.c:333 +#: builtin/repack.c:359 #, fuzzy msgid "do not repack this pack" msgstr "criar pacotes finos" -#: builtin/repack.c:343 +#: builtin/repack.c:369 msgid "cannot delete packs in a precious-objects repo" msgstr "não é possível eliminar pacotes num repositório de objetos-preciosos" -#: builtin/repack.c:347 +#: builtin/repack.c:373 msgid "--keep-unreachable and -A are incompatible" msgstr "--keep-unreachable e -A são incompatíveis" -#: builtin/repack.c:430 +#: builtin/repack.c:456 msgid "Nothing new to pack." msgstr "" #: builtin/repack.c:486 -#, c-format -msgid "" -"WARNING: Some packs in use have been renamed by\n" -"WARNING: prefixing old- to their name, in order to\n" -"WARNING: replace them with the new version of the\n" -"WARNING: file. But the operation failed, and the\n" -"WARNING: attempt to rename them back to their\n" -"WARNING: original names also failed.\n" -"WARNING: Please rename them in %s manually:\n" -msgstr "" +#, fuzzy, c-format +msgid "missing required file: %s" +msgstr "falta o objeto %s de %s" -#: builtin/repack.c:534 -#, c-format -msgid "failed to remove '%s'" -msgstr "falha ao remover '%s'" +#: builtin/repack.c:488 +#, fuzzy, c-format +msgid "could not unlink: %s" +msgstr "não foi possível bloquear '%s'" #: builtin/replace.c:22 msgid "git replace [-f] <object> <replacement>" @@ -20562,7 +20815,9 @@ msgstr "" msgid "" "could not convert the following graft(s):\n" "%s" -msgstr "Removeria o seguinte item:" +msgstr "" +"Impossível converter os seguinte(s) graft(s):\n" +"%s" #: builtin/replace.c:548 msgid "list replace refs" @@ -20721,8 +20976,8 @@ msgstr "HEAD está agora em %s" msgid "Cannot do a %s reset in the middle of a merge." msgstr "Não é possível repor de modo %s durante uma integração." -#: builtin/reset.c:295 builtin/stash.c:520 builtin/stash.c:595 -#: builtin/stash.c:619 +#: builtin/reset.c:295 builtin/stash.c:520 builtin/stash.c:594 +#: builtin/stash.c:618 msgid "be quiet, only report errors" msgstr "silencioso, só reportar erros" @@ -20843,11 +21098,11 @@ msgid "" "Run \"git rev-parse --parseopt -h\" for more information on the first usage." msgstr "" "git rev-parse --parseopt [<opções>] -- [<argumentos>...]\n" -" or: git rev-parse --sq-quote [<argumentos>...]\n" -" or: git rev-parse [<opções>] [<argumentos>...]\n" +" ou: git rev-parse --sq-quote [<argumentos>...]\n" +" ou: git rev-parse [<opções>] [<argumentos>...]\n" "\n" -"Execute \"git rev-parse --parseopt -h\" para obter mais informação sobre a " -"primeira utilização." +"Execute \"git rev-parse --parseopt -h\" para mais informação com a primeira " +"utilização." #: builtin/revert.c:24 msgid "git revert [<options>] <commit-ish>..." @@ -20928,11 +21183,11 @@ msgstr "preservar commits inicialmente vazios" msgid "keep redundant, empty commits" msgstr "manter commits redundantes e vazios" -#: builtin/revert.c:232 +#: builtin/revert.c:239 msgid "revert failed" msgstr "falha ao reverter" -#: builtin/revert.c:245 +#: builtin/revert.c:252 msgid "cherry-pick failed" msgstr "falha ao efetuar cherry-pick" @@ -20948,11 +21203,11 @@ msgid_plural "" "the following files have staged content different from both the\n" "file and the HEAD:" msgstr[0] "" -"o seguinte ficheiro tem conteúdo preparado no índice diferente\n" -"do conteúdo no ficheiro e em HEAD:" +"o seguinte ficheiro tem staged content diferente quer no ficheiro\n" +"quer em HEAD:" msgstr[1] "" -"os seguintes ficheiros têm conteúdo preparado no índice diferente\n" -"do conteúdo no ficheiro e em HEAD:" +"os seguintes ficheiros têm staged content diferente quer no ficheiro\n" +"quer em HEAD:" #: builtin/rm.c:212 msgid "" @@ -20960,7 +21215,7 @@ msgid "" "(use -f to force removal)" msgstr "" "\n" -"(use -f para forçar remoção)" +"(usa -f para forçar remoção)" #: builtin/rm.c:216 msgid "the following file has changes staged in the index:" @@ -21031,83 +21286,82 @@ msgid "" msgstr "" "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-" "receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<diretório> " -"[<referência>...]\n" -" --all e especificação explicita duma <referência> são mutuamente " -"exclusivos." +"[<ref>...]\n" +" --all e <ref> explícito são mutuamente exclusivos." -#: builtin/send-pack.c:182 +#: builtin/send-pack.c:188 msgid "remote name" msgstr "nome do remoto" -#: builtin/send-pack.c:195 +#: builtin/send-pack.c:201 msgid "use stateless RPC protocol" msgstr "use protocolo RPC sem estado" -#: builtin/send-pack.c:196 +#: builtin/send-pack.c:202 msgid "read refs from stdin" msgstr "ler referências do stdin" -#: builtin/send-pack.c:197 +#: builtin/send-pack.c:203 msgid "print status from remote helper" msgstr "imprimir estado do programa auxiliar remoto" -#: builtin/shortlog.c:15 +#: builtin/shortlog.c:16 #, fuzzy msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]" msgstr "" "git shortlog [<opções>] [<intervalo-de-revisões>] [[--] [<caminho>...]]" -#: builtin/shortlog.c:16 +#: builtin/shortlog.c:17 #, fuzzy msgid "git log --pretty=short | git shortlog [<options>]" msgstr "git worktree list [<opções>]" -#: builtin/shortlog.c:134 +#: builtin/shortlog.c:135 msgid "using multiple --group options with stdin is not supported" msgstr "" -#: builtin/shortlog.c:144 +#: builtin/shortlog.c:145 msgid "using --group=trailer with stdin is not supported" msgstr "" -#: builtin/shortlog.c:388 +#: builtin/shortlog.c:335 #, fuzzy, c-format msgid "unknown group type: %s" msgstr "Tipo desconhecido: %d" -#: builtin/shortlog.c:416 +#: builtin/shortlog.c:363 msgid "Group by committer rather than author" msgstr "agrupar por committer em vez de autor" -#: builtin/shortlog.c:419 +#: builtin/shortlog.c:366 msgid "sort output according to the number of commits per author" msgstr "ordenar saída de acordo com o número de commits por autor" -#: builtin/shortlog.c:421 +#: builtin/shortlog.c:368 msgid "Suppress commit descriptions, only provides commit count" msgstr "suprimir a descrição dos commits, fornecer apenas o número de commits" -#: builtin/shortlog.c:423 +#: builtin/shortlog.c:370 msgid "Show the email address of each author" msgstr "Mostrar o endereço de e-mail de cada autor" -#: builtin/shortlog.c:424 +#: builtin/shortlog.c:371 msgid "<w>[,<i1>[,<i2>]]" msgstr "" -#: builtin/shortlog.c:425 +#: builtin/shortlog.c:372 msgid "Linewrap output" msgstr "ajustar linhas" -#: builtin/shortlog.c:427 +#: builtin/shortlog.c:374 msgid "field" msgstr "" -#: builtin/shortlog.c:428 +#: builtin/shortlog.c:375 msgid "Group by field" msgstr "" -#: builtin/shortlog.c:456 +#: builtin/shortlog.c:403 #, fuzzy msgid "too many arguments given outside repository" msgstr "%s: '%s' está fora do repositório" @@ -21474,7 +21728,7 @@ msgstr "não foi possível ler '%s'." #: builtin/stash.c:422 #, fuzzy -msgid "conflicts in index.Try without --index." +msgid "conflicts in index. Try without --index." msgstr "Conflitos no índice. Tente sem --index." #: builtin/stash.c:428 @@ -21490,134 +21744,134 @@ msgstr "Não foi possível restaurar os ficheiros não controlados da pilha" #: builtin/stash.c:451 #, fuzzy, c-format msgid "Merging %s with %s" -msgstr "A integrar %s com %s\n" +msgstr "A fazer merge %s com %s" #: builtin/stash.c:461 msgid "Index was not unstashed." msgstr "O índice não foi reposto." -#: builtin/stash.c:522 builtin/stash.c:621 +#: builtin/stash.c:522 builtin/stash.c:620 #, fuzzy msgid "attempt to recreate the index" msgstr "falha ao ler o índice" -#: builtin/stash.c:555 +#: builtin/stash.c:566 #, fuzzy, c-format msgid "Dropped %s (%s)" msgstr "A descartar ${REV} ($s)" -#: builtin/stash.c:558 +#: builtin/stash.c:569 #, fuzzy, c-format msgid "%s: Could not drop stash entry" msgstr "${REV}: Não foi possível descartar elemento da pilha" -#: builtin/stash.c:583 +#: builtin/stash.c:582 #, fuzzy, c-format msgid "'%s' is not a stash reference" msgstr "'$args' não é uma referência de pilha" -#: builtin/stash.c:633 +#: builtin/stash.c:632 #, fuzzy msgid "The stash entry is kept in case you need it again." msgstr "A pilha é guarda no caso de precisar dela de novo." -#: builtin/stash.c:656 +#: builtin/stash.c:655 msgid "No branch name specified" msgstr "Nenhum nome de ramo especificado" -#: builtin/stash.c:800 builtin/stash.c:837 +#: builtin/stash.c:799 builtin/stash.c:836 #, fuzzy, c-format msgid "Cannot update %s with %s" msgstr "Não é possível atualizar $ref_stash com $w_commit" -#: builtin/stash.c:818 builtin/stash.c:1472 builtin/stash.c:1537 +#: builtin/stash.c:817 builtin/stash.c:1471 builtin/stash.c:1536 #, fuzzy msgid "stash message" msgstr "mensagem da tag" -#: builtin/stash.c:828 +#: builtin/stash.c:827 msgid "\"git stash store\" requires one <commit> argument" msgstr "" -#: builtin/stash.c:1043 +#: builtin/stash.c:1042 msgid "No changes selected" msgstr "Nenhuma alteração selecionada" -#: builtin/stash.c:1143 +#: builtin/stash.c:1142 msgid "You do not have the initial commit yet" msgstr "O commit inicial ainda não existe" -#: builtin/stash.c:1170 +#: builtin/stash.c:1169 msgid "Cannot save the current index state" msgstr "Não é possível guardar o estado atual do índice" -#: builtin/stash.c:1179 +#: builtin/stash.c:1178 msgid "Cannot save the untracked files" msgstr "Não é possível guardar os ficheiros não controlados" -#: builtin/stash.c:1190 builtin/stash.c:1199 +#: builtin/stash.c:1189 builtin/stash.c:1198 msgid "Cannot save the current worktree state" msgstr "Não é possível guardar o estado atual da árvore de trabalho" -#: builtin/stash.c:1227 +#: builtin/stash.c:1226 msgid "Cannot record working tree state" msgstr "Não é possível gravar o estado da árvore de trabalho" -#: builtin/stash.c:1276 +#: builtin/stash.c:1275 msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "" "Não é possível usar --patch e --include-untracked ou --all ao mesmo tempo" -#: builtin/stash.c:1292 +#: builtin/stash.c:1291 #, fuzzy msgid "Did you forget to 'git add'?" -msgstr "Queria dizer 'git add .'?\n" +msgstr "Será que falta 'git add'?" -#: builtin/stash.c:1307 +#: builtin/stash.c:1306 msgid "No local changes to save" msgstr "Não há alterações locais para guardar" -#: builtin/stash.c:1314 +#: builtin/stash.c:1313 msgid "Cannot initialize stash" msgstr "Não é possível inicializar a pilha" -#: builtin/stash.c:1329 +#: builtin/stash.c:1328 msgid "Cannot save the current status" msgstr "Não é possível guardar o estado atual" -#: builtin/stash.c:1334 +#: builtin/stash.c:1333 #, fuzzy, c-format msgid "Saved working directory and index state %s" msgstr "Diretório de trabalho e estado do índice $stash_msg guardados" -#: builtin/stash.c:1424 +#: builtin/stash.c:1423 msgid "Cannot remove worktree changes" msgstr "Não é possível remover as alterações da árvore de trabalho" -#: builtin/stash.c:1463 builtin/stash.c:1528 +#: builtin/stash.c:1462 builtin/stash.c:1527 msgid "keep index" msgstr "" -#: builtin/stash.c:1465 builtin/stash.c:1530 +#: builtin/stash.c:1464 builtin/stash.c:1529 msgid "stash in patch mode" msgstr "" -#: builtin/stash.c:1466 builtin/stash.c:1531 +#: builtin/stash.c:1465 builtin/stash.c:1530 #, fuzzy msgid "quiet mode" msgstr "silencioso" -#: builtin/stash.c:1468 builtin/stash.c:1533 +#: builtin/stash.c:1467 builtin/stash.c:1532 #, fuzzy msgid "include untracked files in stash" msgstr "listar ficheiros não controlados em colunas" -#: builtin/stash.c:1470 builtin/stash.c:1535 +#: builtin/stash.c:1469 builtin/stash.c:1534 #, fuzzy msgid "include ignore files" msgstr "mostrar ficheiros ignorados" -#: builtin/stash.c:1570 +#: builtin/stash.c:1569 msgid "" "the stash.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." @@ -21671,7 +21925,7 @@ msgstr "Nenhum URL encontrado para o caminho de submódulo '%s' em .gitmodules" #: builtin/submodule--helper.c:524 #, fuzzy, c-format msgid "Entering '%s'\n" -msgstr "a substituir '%s'" +msgstr "Entrando em '%s'\n" #: builtin/submodule--helper.c:527 #, c-format @@ -21719,12 +21973,12 @@ msgstr "Falha ao registar o URL do caminho de submódulo '%s'" #: builtin/submodule--helper.c:670 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" -msgstr "Submódulo '%s' (%s) registado com caminho '%s'\n" +msgstr "Submódulo '%s' (%s) registado para path '%s'\n" #: builtin/submodule--helper.c:680 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" -msgstr "aviso: modo de atualização do comando sugerido para o submódulo '%s'\n" +msgstr "aviso: modo command update sugerido para submódulo '%s'\n" #: builtin/submodule--helper.c:687 #, c-format @@ -21804,7 +22058,7 @@ msgstr "não foi possível analisar o objeto '%s'" #: builtin/submodule--helper.c:1059 #, fuzzy, c-format msgid "unexpected mode %o\n" -msgstr "modo inesperado $mod_dst" +msgstr "estou à espera de um modo diferente de %o\n" #: builtin/submodule--helper.c:1300 #, fuzzy @@ -21842,7 +22096,7 @@ msgstr "--deepen e --depth são mutuamente exclusivos" #: builtin/submodule--helper.c:1407 #, fuzzy, c-format msgid "Synchronizing submodule url for '%s'\n" -msgstr "A sincronizar o URL do submódulo '$displaypath'" +msgstr "Sincronizando URL do submódule '%s'\n" #: builtin/submodule--helper.c:1413 #, fuzzy, c-format @@ -21875,8 +22129,8 @@ msgid "" "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " "really want to remove it including all of its history)" msgstr "" -"A árvore de trabalho do submódulo '$displaypath' contém um diretório .git\n" -"(use 'rm -rf' se pretende mesmo removê-lo, incluindo todo o seu histórico)" +"Submodule work tree '%s' tem uma pasta .git (usa 'rm -rf' se queres mesmo " +"removê-la e remover toda a história)" #: builtin/submodule--helper.c:1558 #, fuzzy, c-format @@ -21890,13 +22144,12 @@ msgstr "" #: builtin/submodule--helper.c:1566 #, fuzzy, c-format msgid "Cleared directory '%s'\n" -msgstr "Diretório '$displaypath' limpo" +msgstr "Pasta '%s' limpa\n" #: builtin/submodule--helper.c:1568 #, fuzzy, c-format msgid "Could not remove submodule work tree '%s'\n" -msgstr "" -"Não foi possível remover a árvore de trabalho do submódulo '$displaypath'" +msgstr "Impossível remover submodule work tree '%s'\n" #: builtin/submodule--helper.c:1579 #, fuzzy, c-format @@ -21906,7 +22159,7 @@ msgstr "Não foi possível criar o diretório vazio do submódulo '$displaypath' #: builtin/submodule--helper.c:1595 #, fuzzy, c-format msgid "Submodule '%s' (%s) unregistered for path '%s'\n" -msgstr "Submódulo '%s' (%s) registado com caminho '%s'\n" +msgstr "Submódulo '%s' (%s) unregistred para caminho '%s'\n" #: builtin/submodule--helper.c:1624 msgid "Remove submodule working trees even if they contain local changes" @@ -22130,7 +22383,7 @@ msgstr "git submodule--helper init [<caminho>]" msgid "git submodule--helper config --check-writeable" msgstr "git submodule--helper init [<caminho>]" -#: builtin/submodule--helper.c:2665 git-submodule.sh:151 +#: builtin/submodule--helper.c:2665 git-submodule.sh:150 #, fuzzy, sh-format msgid "please make sure that the .gitmodules file is in the working tree" msgstr "" @@ -22177,7 +22430,7 @@ msgstr "nome do ramo é obrigatório" msgid "--branch and --default are mutually exclusive" msgstr "--deepen e --depth são mutuamente exclusivos" -#: builtin/submodule--helper.c:2792 git.c:438 git.c:710 +#: builtin/submodule--helper.c:2792 git.c:438 git.c:711 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s não suporta --super-prefix" @@ -22208,11 +22461,11 @@ msgstr "eliminar referências simbólicas" msgid "shorten ref output" msgstr "encurtar a apresentação de referências" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:486 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:499 msgid "reason" msgstr "razão" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:486 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:499 msgid "reason of the update" msgstr "razão da atualização" @@ -22222,8 +22475,8 @@ msgid "" "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n" "\t\t<tagname> [<head>]" msgstr "" -"git tag [-a | -s | -u <id-chave>] [-f] [-m <msg> | -F <ficheiro>] <nome-da-" -"tag> [<head>]" +"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <ficheiro>]\n" +"\t\t<tagname> [<head>]" #: builtin/tag.c:27 msgid "git tag -d <tagname>..." @@ -22239,7 +22492,8 @@ msgid "" msgstr "" "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--" "points-at <objeto>]\n" -"\t\t[--format=<formato>] [--[no-]merged [<commit>]] [<padrão>...]" +"\t\t[--format=<formato>] [--merged [<commit>] [--no-merged <commit>] " +"[<pattern>...]" #: builtin/tag.c:30 msgid "git tag -v [--format=<format>] <tagname>..." @@ -22253,7 +22507,7 @@ msgstr "tag '%s' não encontrada." #: builtin/tag.c:105 #, c-format msgid "Deleted tag '%s' (was %s)\n" -msgstr "Tag '%s' eliminada (era %s)\n" +msgstr "Apaguei tag '%s' (era %s)\n" #: builtin/tag.c:135 #, c-format @@ -22264,7 +22518,7 @@ msgid "" "Lines starting with '%c' will be ignored.\n" msgstr "" "\n" -"Escreva a mensagem da tag:\n" +"Escreve mensagem para tag:\n" " %s\n" "Linha começadas com '%c' serão ignoradas.\n" @@ -22278,9 +22532,9 @@ msgid "" "want to.\n" msgstr "" "\n" -"Escreva a mensagem da tag:\n" +"Escreve mensagem para tag:\n" " %s\n" -"Linhas começadas com '%c' serão mantidas; pode removê-las se o desejar.\n" +"Linhas começadas com '%c' serão mantidas; se queres, podes apagá-las.\n" #: builtin/tag.c:198 msgid "unable to sign the tag" @@ -22310,7 +22564,7 @@ msgstr "sem mensagem de tag?" #: builtin/tag.c:292 #, c-format msgid "The tag message has been left in %s\n" -msgstr "A mensagem da tag foi guardada em %s\n" +msgstr "Deixei a mensagem da tag em %s\n" #: builtin/tag.c:403 msgid "list tag names" @@ -22357,7 +22611,7 @@ msgstr "usar outra chave para assinar a tag" msgid "replace the tag if exists" msgstr "substituir a tag se esta existir" -#: builtin/tag.c:422 builtin/update-ref.c:492 +#: builtin/tag.c:422 builtin/update-ref.c:505 msgid "create a reflog" msgstr "criar um reflog" @@ -22434,7 +22688,7 @@ msgstr "a tag '%s' já existe" #: builtin/tag.c:585 #, c-format msgid "Updated tag '%s' (was %s)\n" -msgstr "Tag '%s' atualizada (era %s)\n" +msgstr "Atualizei tag '%s' (era %s)\n" #: builtin/unpack-objects.c:502 msgid "Unpacking objects" @@ -22725,20 +22979,20 @@ msgstr "" msgid "git update-ref [<options>] --stdin [-z]" msgstr "git update-ref [<opções>] --stdin [-z]" -#: builtin/update-ref.c:487 +#: builtin/update-ref.c:500 msgid "delete the reference" msgstr "eliminar a referência" -#: builtin/update-ref.c:489 +#: builtin/update-ref.c:502 msgid "update <refname> not the one it points to" msgstr "" "atualizar a referência <nome-da-referência>, não a referência que esta aponta" -#: builtin/update-ref.c:490 +#: builtin/update-ref.c:503 msgid "stdin has NUL-terminated arguments" msgstr "os argumentos da entrada padrão terminam em NUL" -#: builtin/update-ref.c:491 +#: builtin/update-ref.c:504 msgid "read updates from stdin" msgstr "ler atualizações da entrada padrão" @@ -22833,7 +23087,7 @@ msgstr "git worktree lock [<opções>] <caminho>" msgid "git worktree unlock <path>" msgstr "git worktree unlock <caminho>" -#: builtin/worktree.c:60 builtin/worktree.c:970 +#: builtin/worktree.c:60 builtin/worktree.c:973 #, fuzzy, c-format msgid "failed to delete '%s'" msgstr "falha ao executar '%s'" @@ -22974,120 +23228,120 @@ msgstr "-b, -B e --detach são mutuamente exclusivos" msgid "--[no-]track can only be used if a new branch is created" msgstr "A ação --edit-todo só pode ser usada durante um rebase interativo." -#: builtin/worktree.c:755 +#: builtin/worktree.c:758 msgid "reason for locking" msgstr "razão de trancar" -#: builtin/worktree.c:767 builtin/worktree.c:800 builtin/worktree.c:874 -#: builtin/worktree.c:998 +#: builtin/worktree.c:770 builtin/worktree.c:803 builtin/worktree.c:877 +#: builtin/worktree.c:1001 #, c-format msgid "'%s' is not a working tree" msgstr "'%s' não é uma árvore de trabalho" -#: builtin/worktree.c:769 builtin/worktree.c:802 +#: builtin/worktree.c:772 builtin/worktree.c:805 msgid "The main working tree cannot be locked or unlocked" msgstr "A árvore de trabalho principal não pode ser trancada nem destrancada" -#: builtin/worktree.c:774 +#: builtin/worktree.c:777 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "'%s' já está trancada, razão: %s" -#: builtin/worktree.c:776 +#: builtin/worktree.c:779 #, c-format msgid "'%s' is already locked" msgstr "'%s' já está trancada" -#: builtin/worktree.c:804 +#: builtin/worktree.c:807 #, c-format msgid "'%s' is not locked" msgstr "'%s' não está trancada" -#: builtin/worktree.c:845 +#: builtin/worktree.c:848 msgid "working trees containing submodules cannot be moved or removed" msgstr "" -#: builtin/worktree.c:853 +#: builtin/worktree.c:856 #, fuzzy msgid "force move even if worktree is dirty or locked" msgstr "forçar mover/mudar o nome mesmo que o destino exista" -#: builtin/worktree.c:876 builtin/worktree.c:1000 +#: builtin/worktree.c:879 builtin/worktree.c:1003 #, fuzzy, c-format msgid "'%s' is a main working tree" msgstr "'%s' não é uma árvore de trabalho" -#: builtin/worktree.c:881 +#: builtin/worktree.c:884 #, fuzzy, c-format msgid "could not figure out destination name from '%s'" msgstr "não foi possível migrar o diretório git de '%s' para '%s'" -#: builtin/worktree.c:894 +#: builtin/worktree.c:897 #, c-format msgid "" "cannot move a locked working tree, lock reason: %s\n" "use 'move -f -f' to override or unlock first" msgstr "" -#: builtin/worktree.c:896 +#: builtin/worktree.c:899 msgid "" "cannot move a locked working tree;\n" "use 'move -f -f' to override or unlock first" msgstr "" -#: builtin/worktree.c:899 +#: builtin/worktree.c:902 #, c-format msgid "validation failed, cannot move working tree: %s" msgstr "" -#: builtin/worktree.c:904 +#: builtin/worktree.c:907 #, fuzzy, c-format msgid "failed to move '%s' to '%s'" msgstr "falha ao abrir '%s': %s" -#: builtin/worktree.c:950 +#: builtin/worktree.c:953 #, fuzzy, c-format msgid "failed to run 'git status' on '%s'" msgstr "falha ao escrever para '%s'" -#: builtin/worktree.c:954 +#: builtin/worktree.c:957 #, c-format msgid "'%s' contains modified or untracked files, use --force to delete it" msgstr "" -#: builtin/worktree.c:959 +#: builtin/worktree.c:962 #, fuzzy, c-format msgid "failed to run 'git status' on '%s', code %d" msgstr "não foi possível executar 'git status' no submódulo '%s'" -#: builtin/worktree.c:982 +#: builtin/worktree.c:985 msgid "force removal even if worktree is dirty or locked" msgstr "" -#: builtin/worktree.c:1005 +#: builtin/worktree.c:1008 #, c-format msgid "" "cannot remove a locked working tree, lock reason: %s\n" "use 'remove -f -f' to override or unlock first" msgstr "" -#: builtin/worktree.c:1007 +#: builtin/worktree.c:1010 msgid "" "cannot remove a locked working tree;\n" "use 'remove -f -f' to override or unlock first" msgstr "" -#: builtin/worktree.c:1010 +#: builtin/worktree.c:1013 #, c-format msgid "validation failed, cannot remove working tree: %s" msgstr "" -#: builtin/worktree.c:1034 +#: builtin/worktree.c:1037 #, fuzzy, c-format msgid "repair: %s: %s" msgstr "%s: %s" -#: builtin/worktree.c:1037 +#: builtin/worktree.c:1040 #, fuzzy, c-format msgid "error: %s: %s" msgstr "%s: %s" @@ -23118,6 +23372,16 @@ msgstr "" msgid "not a git repository" msgstr "Não é um repositório git" +#: t/helper/test-fast-rebase.c:141 +#, fuzzy +msgid "unhandled options" +msgstr "Opções gerais" + +#: t/helper/test-fast-rebase.c:146 +#, fuzzy +msgid "error preparing revisions" +msgstr "Erro ao rematar %s." + #: t/helper/test-reach.c:154 #, fuzzy, c-format msgid "commit %s is not marked reachable" @@ -23155,9 +23419,10 @@ msgid "" "to read about a specific subcommand or concept.\n" "See 'git help git' for an overview of the system." msgstr "" -"'git help -a' e 'git help -g' listam os subcomandos disponíveis e alguns\n" -"guias de conceitos. Consulte 'git help <comando>' ou 'git help <conceito>'\n" -"para ler sobre um subcomando ou conceito específico." +"'git help -a' e 'git help -g' listam subcomandos disponíveis e alguns\n" +"guias de conceitos. Consulta 'git help <comando>' ou 'git help <conceito>'\n" +"para ler sobre um subcomando específico ou conceito específico.\n" +"Vê 'git help git' para visão geral do sistema." #: git.c:187 #, c-format @@ -23177,7 +23442,7 @@ msgstr "" #: git.c:229 #, fuzzy, c-format msgid "no prefix given for --super-prefix\n" -msgstr "%s não suporta --super-prefix" +msgstr "--super-prefix recebeu prefixo nenhum\n" #: git.c:251 #, c-format @@ -23192,7 +23457,7 @@ msgstr "" #: git.c:315 #, fuzzy, c-format msgid "unknown option: %s\n" -msgstr "opção desconhecido %s" +msgstr "desconheço opção: %s\n" #: git.c:364 #, c-format @@ -23231,32 +23496,34 @@ msgstr "mostrar ações na saída padrão" msgid "close failed on standard output" msgstr "enviar resultados para a saída padrão" -#: git.c:819 +#: git.c:820 #, c-format msgid "alias loop detected: expansion of '%s' does not terminate:%s" msgstr "" -#: git.c:869 +#: git.c:870 #, fuzzy, c-format msgid "cannot handle %s as a builtin" msgstr "não é possível enviar mensagem como 7bit" -#: git.c:882 +#: git.c:883 #, fuzzy, c-format msgid "" "usage: %s\n" "\n" -msgstr "utilização: %s" +msgstr "" +"utilização: %s\n" +"\n" -#: git.c:902 +#: git.c:903 #, c-format msgid "expansion of alias '%s' failed; '%s' is not a git command\n" msgstr "" -#: git.c:914 +#: git.c:915 #, fuzzy, c-format msgid "failed to run command '%s': %s\n" -msgstr "falha ao abrir '%s': %s" +msgstr "incapaz de executar comando '%s': %s\n" #: http.c:399 #, c-format @@ -23303,142 +23570,142 @@ msgid "" " asked for: %s\n" " redirect: %s" msgstr "" -"não é possível atualizar base de url de redireção:\n" -" pedido para: %s\n" -" redireção: %s" +"incapaz de atualizar base url da redireção:\n" +" pedi: %s\n" +" redireção: %s" -#: remote-curl.c:174 +#: remote-curl.c:183 #, fuzzy, c-format msgid "invalid quoting in push-option value: '%s'" msgstr "opção inválida: %s" -#: remote-curl.c:298 +#: remote-curl.c:307 #, fuzzy, c-format msgid "%sinfo/refs not valid: is this a git repository?" msgstr "'%s' não é reconhecido como um repositório git" -#: remote-curl.c:399 +#: remote-curl.c:408 msgid "invalid server response; expected service, got flush packet" msgstr "" -#: remote-curl.c:430 +#: remote-curl.c:439 #, fuzzy, c-format msgid "invalid server response; got '%s'" msgstr "referência inválida: %s" -#: remote-curl.c:490 +#: remote-curl.c:499 #, fuzzy, c-format msgid "repository '%s' not found" msgstr "o repositório '%s' não existe" -#: remote-curl.c:494 +#: remote-curl.c:503 #, fuzzy, c-format msgid "Authentication failed for '%s'" msgstr "Falha ao executar: $rest" -#: remote-curl.c:498 +#: remote-curl.c:507 #, c-format msgid "unable to access '%s': %s" msgstr "não é possível aceder a '%s': %s" -#: remote-curl.c:504 +#: remote-curl.c:513 #, c-format msgid "redirecting to %s" msgstr "a redirecionar para %s " -#: remote-curl.c:633 +#: remote-curl.c:642 msgid "shouldn't have EOF when not gentle on EOF" msgstr "" -#: remote-curl.c:645 +#: remote-curl.c:654 msgid "remote server sent stateless separator" msgstr "" -#: remote-curl.c:715 +#: remote-curl.c:724 msgid "unable to rewind rpc post data - try increasing http.postBuffer" msgstr "" -#: remote-curl.c:745 +#: remote-curl.c:754 #, c-format msgid "remote-curl: bad line length character: %.4s" msgstr "" -#: remote-curl.c:747 +#: remote-curl.c:756 msgid "remote-curl: unexpected response end packet" msgstr "" -#: remote-curl.c:823 +#: remote-curl.c:832 #, fuzzy, c-format msgid "RPC failed; %s" msgstr "falha: %d" -#: remote-curl.c:863 +#: remote-curl.c:872 #, fuzzy msgid "cannot handle pushes this big" msgstr "não é possível processar mais do que %d revisão." -#: remote-curl.c:978 +#: remote-curl.c:987 #, c-format msgid "cannot deflate request; zlib deflate error %d" msgstr "" -#: remote-curl.c:982 +#: remote-curl.c:991 #, c-format msgid "cannot deflate request; zlib end error %d" msgstr "" -#: remote-curl.c:1032 +#: remote-curl.c:1041 #, c-format msgid "%d bytes of length header were received" msgstr "" -#: remote-curl.c:1034 +#: remote-curl.c:1043 #, c-format msgid "%d bytes of body are still expected" msgstr "" -#: remote-curl.c:1123 +#: remote-curl.c:1132 #, fuzzy msgid "dumb http transport does not support shallow capabilities" msgstr "O servidor não suporta clientes rasos" -#: remote-curl.c:1138 +#: remote-curl.c:1147 #, fuzzy msgid "fetch failed." msgstr "falha ao executar o comando stash" -#: remote-curl.c:1184 +#: remote-curl.c:1193 msgid "cannot fetch by sha1 over smart http" msgstr "" -#: remote-curl.c:1228 remote-curl.c:1234 +#: remote-curl.c:1237 remote-curl.c:1243 #, fuzzy, c-format msgid "protocol error: expected sha/ref, got '%s'" msgstr "erro de protocolo: cabeçalho de pacote incorreto" -#: remote-curl.c:1246 remote-curl.c:1361 +#: remote-curl.c:1255 remote-curl.c:1373 #, fuzzy, c-format msgid "http transport does not support %s" msgstr "O servidor não suporta STARTTLS! %s" -#: remote-curl.c:1282 +#: remote-curl.c:1291 #, fuzzy msgid "git-http-push failed" msgstr "falha ao executar o comando stash" -#: remote-curl.c:1467 +#: remote-curl.c:1479 msgid "remote-curl: usage: git remote-curl <remote> [<url>]" msgstr "" -#: remote-curl.c:1499 +#: remote-curl.c:1511 msgid "remote-curl: error reading command stream from git" msgstr "" -#: remote-curl.c:1506 +#: remote-curl.c:1518 msgid "remote-curl: fetch attempted without a local repo" msgstr "" -#: remote-curl.c:1547 +#: remote-curl.c:1559 #, c-format msgid "remote-curl: unknown command '%s' from git" msgstr "" @@ -23450,7 +23717,7 @@ msgstr "" #: compat/compiler.h:38 #, fuzzy msgid "no libc information available\n" -msgstr "mostrar informação do ramo" +msgstr "informação libc indisponível\n" #: list-objects-filter-options.h:91 msgid "args" @@ -23731,187 +23998,185 @@ msgid "Output information on each ref" msgstr "atualizar informação de stat no ficheiro de índice" #: command-list.h:99 -msgid "Prepare patches for e-mail submission" +msgid "Run a Git command on a list of repositories" msgstr "" #: command-list.h:100 +msgid "Prepare patches for e-mail submission" +msgstr "" + +#: command-list.h:101 #, fuzzy msgid "Verifies the connectivity and validity of the objects in the database" msgstr "escrever o objeto na base de dados de objetos" -#: command-list.h:101 +#: command-list.h:102 msgid "Cleanup unnecessary files and optimize the local repository" msgstr "" -#: command-list.h:102 +#: command-list.h:103 msgid "Extract commit ID from an archive created using git-archive" msgstr "" -#: command-list.h:103 +#: command-list.h:104 msgid "Print lines matching a pattern" msgstr "Imprimir linhas que correspondam a um padrão" -#: command-list.h:104 +#: command-list.h:105 msgid "A portable graphical interface to Git" msgstr "" -#: command-list.h:105 +#: command-list.h:106 msgid "Compute object ID and optionally creates a blob from a file" msgstr "" -#: command-list.h:106 +#: command-list.h:107 msgid "Display help information about Git" msgstr "" -#: command-list.h:107 +#: command-list.h:108 msgid "Server side implementation of Git over HTTP" msgstr "" -#: command-list.h:108 +#: command-list.h:109 #, fuzzy msgid "Download from a remote Git repository via HTTP" msgstr "Transferir objetos e referências doutro repositório" -#: command-list.h:109 +#: command-list.h:110 #, fuzzy msgid "Push objects over HTTP/DAV to another repository" msgstr "Transferir objetos e referências doutro repositório" -#: command-list.h:110 +#: command-list.h:111 msgid "Send a collection of patches from stdin to an IMAP folder" msgstr "" -#: command-list.h:111 +#: command-list.h:112 msgid "Build pack index file for an existing packed archive" msgstr "" -#: command-list.h:112 +#: command-list.h:113 msgid "Create an empty Git repository or reinitialize an existing one" msgstr "Criar um repositório Git vazio ou reinicializar um já existente" -#: command-list.h:113 +#: command-list.h:114 msgid "Instantly browse your working repository in gitweb" msgstr "" -#: command-list.h:114 +#: command-list.h:115 msgid "Add or parse structured information in commit messages" msgstr "" -#: command-list.h:115 +#: command-list.h:116 #, fuzzy msgid "The Git repository browser" msgstr "Não é um repositório git" -#: command-list.h:116 +#: command-list.h:117 msgid "Show commit logs" msgstr "Mostrar histórico de commits" -#: command-list.h:117 +#: command-list.h:118 #, fuzzy msgid "Show information about files in the index and the working tree" msgstr "e fez alterações ao índice e/ou à árvore de trabalho" -#: command-list.h:118 +#: command-list.h:119 #, fuzzy msgid "List references in a remote repository" msgstr "repositório de referência" -#: command-list.h:119 +#: command-list.h:120 #, fuzzy msgid "List the contents of a tree object" msgstr "imprimir apenas as tags do objeto" -#: command-list.h:120 +#: command-list.h:121 msgid "Extracts patch and authorship from a single e-mail message" msgstr "" -#: command-list.h:121 +#: command-list.h:122 msgid "Simple UNIX mbox splitter program" msgstr "" -#: command-list.h:122 +#: command-list.h:123 msgid "Run tasks to optimize Git repository data" msgstr "" -#: command-list.h:123 +#: command-list.h:124 msgid "Join two or more development histories together" msgstr "Juntar duas ou mais histórias de desenvolvimento numa só" -#: command-list.h:124 +#: command-list.h:125 #, fuzzy msgid "Find as good common ancestors as possible for a merge" msgstr "encontrar antecessores de uma única integração com n pontos" -#: command-list.h:125 +#: command-list.h:126 #, fuzzy msgid "Run a three-way file merge" -msgstr "A recorrer a integração com 3 pontos...\n" +msgstr "Faz uma junção por três de ficheiro" -#: command-list.h:126 +#: command-list.h:127 #, fuzzy msgid "Run a merge for files needing merging" -msgstr "" -"integrar com 3 pontos se a integração ao nível de ficheiros não for " -"necessária" +msgstr "Faz um merge de ficheiros precisando de merge" -#: command-list.h:127 +#: command-list.h:128 msgid "The standard helper program to use with git-merge-index" msgstr "" -#: command-list.h:128 +#: command-list.h:129 msgid "Run merge conflict resolution tools to resolve merge conflicts" msgstr "" -#: command-list.h:129 +#: command-list.h:130 msgid "Show three-way merge without touching index" msgstr "" -#: command-list.h:130 +#: command-list.h:131 msgid "Write and verify multi-pack-indexes" msgstr "" -#: command-list.h:131 +#: command-list.h:132 #, fuzzy msgid "Creates a tag object" msgstr "outro objeto tag" -#: command-list.h:132 +#: command-list.h:133 msgid "Build a tree-object from ls-tree formatted text" msgstr "" -#: command-list.h:133 +#: command-list.h:134 msgid "Move or rename a file, a directory, or a symlink" msgstr "Mover ou mudar o nome de um ficheiro, diretório ou ligação simbólica" -#: command-list.h:134 +#: command-list.h:135 msgid "Find symbolic names for given revs" msgstr "" -#: command-list.h:135 +#: command-list.h:136 #, fuzzy msgid "Add or inspect object notes" msgstr "o objeto esperado %s não foi recebido" -#: command-list.h:136 +#: command-list.h:137 msgid "Import from and submit to Perforce repositories" msgstr "" -#: command-list.h:137 +#: command-list.h:138 #, fuzzy msgid "Create a packed archive of objects" msgstr "ignorar objetos compactados" -#: command-list.h:138 +#: command-list.h:139 #, fuzzy msgid "Find redundant pack files" msgstr "não é possível invocar pread sobre o ficheiro de pacote" -#: command-list.h:139 -msgid "Pack heads and tags for efficient repository access" -msgstr "" - #: command-list.h:140 -msgid "Routines to help parsing remote repository access parameters" +msgid "Pack heads and tags for efficient repository access" msgstr "" #: command-list.h:141 @@ -24090,7 +24355,7 @@ msgstr "" #: command-list.h:180 #, fuzzy msgid "Switch branches" -msgstr "Mudou para o ramo '%s'\n" +msgstr "Troca branches" #: command-list.h:181 #, fuzzy @@ -24251,75 +24516,60 @@ msgstr "Uma introdução ao Git (versão 1.5.1 ou mais recente)" msgid "An overview of recommended workflows with Git" msgstr "Uma descrição geral dos fluxos de trabalho recomendados para o Git" -#: git-bisect.sh:79 +#: git-bisect.sh:48 #, sh-format msgid "Bad rev input: $arg" msgstr "Revisão incorreta na entrada: $arg" -#: git-bisect.sh:99 -#, sh-format -msgid "Bad rev input: $bisected_head" -msgstr "Revisão incorreta na entrada: $bisected_head" - -#: git-bisect.sh:108 -#, sh-format -msgid "Bad rev input: $rev" -msgstr "Revisão incorreta na entrada: $rev" - -#: git-bisect.sh:117 -#, sh-format -msgid "'git bisect $TERM_BAD' can take only one argument." -msgstr "'git bisect $TERM_BAD' só leva um argumento." - -#: git-bisect.sh:149 +#: git-bisect.sh:82 msgid "No logfile given" msgstr "Nenhum ficheiro de log fornecido" -#: git-bisect.sh:150 +#: git-bisect.sh:83 #, sh-format msgid "cannot read $file for replaying" msgstr "não é possível ler $file para reproduzir" -#: git-bisect.sh:173 +#: git-bisect.sh:105 msgid "?? what are you talking about?" msgstr "?? do que é que está a falar?" -#: git-bisect.sh:183 +#: git-bisect.sh:115 msgid "bisect run failed: no command provided." msgstr "" -#: git-bisect.sh:188 +#: git-bisect.sh:120 #, sh-format msgid "running $command" msgstr "a executar $command" -#: git-bisect.sh:195 +#: git-bisect.sh:127 #, sh-format msgid "" "bisect run failed:\n" "exit code $res from '$command' is < 0 or >= 128" msgstr "" -"falha ao bissetar:\n" -"código de saída $res de '$command' é < 0 ou >= 128" +"bissetar impossível:\n" +"exit code $res de '$command' é < 0 ou >= 128" -#: git-bisect.sh:221 +#: git-bisect.sh:152 msgid "bisect run cannot continue any more" msgstr "não é possível continuar a bissetar" -#: git-bisect.sh:227 -#, sh-format +#: git-bisect.sh:158 +#, fuzzy, sh-format msgid "" "bisect run failed:\n" -"'bisect_state $state' exited with error code $res" +"'bisect-state $state' exited with error code $res" msgstr "" -"falha ao bissetar:\n" -"'bisect_state $state' retornou com o código de erro $res" +"bisseção impossível:\n" +"'bisect_state $state' retornou código $res de erro" -#: git-bisect.sh:234 +#: git-bisect.sh:165 msgid "bisect run success" msgstr "bissecção concluída com sucesso" -#: git-bisect.sh:242 +#: git-bisect.sh:173 msgid "We are not bisecting." msgstr "Não se está a bissetar." @@ -24363,49 +24613,49 @@ msgstr "A tentar integração simples com $pretty_name" msgid "Simple merge did not work, trying automatic merge." msgstr "A integração simples não funcionou, a tentar integração automática." -#: git-submodule.sh:180 +#: git-submodule.sh:179 msgid "Relative path can only be used from the toplevel of the working tree" msgstr "" "Os caminhos relativos só podem ser usados a partir do topo da árvore de " "trabalho" -#: git-submodule.sh:190 +#: git-submodule.sh:189 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "URL do repositório: '$repo' deve ser absoluto ou começar com ./|../" -#: git-submodule.sh:209 +#: git-submodule.sh:208 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "'$sm_path' já existe no índice" -#: git-submodule.sh:212 +#: git-submodule.sh:211 #, sh-format msgid "'$sm_path' already exists in the index and is not a submodule" msgstr "'$sm_path' já existe no índicee não é um submódulo" -#: git-submodule.sh:219 +#: git-submodule.sh:218 #, fuzzy, sh-format msgid "'$sm_path' does not have a commit checked out" msgstr "o caminho '%s' não tem a versão deles" -#: git-submodule.sh:250 +#: git-submodule.sh:249 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "A adicionar repositório existente em '$sm_path' ao índice" -#: git-submodule.sh:252 +#: git-submodule.sh:251 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "'$sm_path' já existe e não é uma repositório git válido" -#: git-submodule.sh:260 +#: git-submodule.sh:259 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "" "Um diretório git de '$sm_name' foi encontrado localmente com os remotos:" -#: git-submodule.sh:262 +#: git-submodule.sh:261 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from\n" @@ -24415,45 +24665,45 @@ msgid "" "or you are unsure what this means choose another name with the '--name' " "option." msgstr "" -"Se quer reutilizar este diretório git local em vez de clonar de novo de\n" +"Se queres reutilizar esta past git local, em vez de voltares a clonar\n" " $realrepo\n" -"use a opção '--force'. Se o diretório git local não é o repo correto\n" -"ou não tem a certeza o que isto significa escolha outro nome com a opção '--" -"name'." +"usa a opção --force. Se a pasta git local é o repo incorreto ou\n" +"se tens pouca certeza sobre o que isto significa, podes mudar o nome com a " +"opção '--name'." -#: git-submodule.sh:268 +#: git-submodule.sh:267 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "A reativar o diretório git local do submódulo '$sm_name'." -#: git-submodule.sh:280 +#: git-submodule.sh:279 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "Não foi possível extrair o submódulo '$sm_path'" -#: git-submodule.sh:285 +#: git-submodule.sh:284 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "Falha ao adicionar o submódulo '$sm_path'" -#: git-submodule.sh:294 +#: git-submodule.sh:293 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "Falha ao registar o submódulo '$sm_path'" -#: git-submodule.sh:567 +#: git-submodule.sh:568 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "" "Não foi possível encontrar a revisão atual no caminho de submódulo " "'$displaypath'" -#: git-submodule.sh:577 +#: git-submodule.sh:578 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "Não foi possível obter no caminho de submódulo '$sm_path'" -#: git-submodule.sh:582 +#: git-submodule.sh:583 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " @@ -24462,14 +24712,14 @@ msgstr "" "Não foi possível encontrar a revisão atual ${remote_name}/${branch} no " "caminho de submódulo '$sm_path'" -#: git-submodule.sh:600 +#: git-submodule.sh:601 #, fuzzy, sh-format msgid "" "Unable to fetch in submodule path '$displaypath'; trying to directly fetch " "$sha1:" msgstr "Não é possível obter no caminho de submódulo '$displaypath'" -#: git-submodule.sh:606 +#: git-submodule.sh:607 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " @@ -24478,59 +24728,54 @@ msgstr "" "Obteve-se no caminho de submódulo '$displaypath', mas não continha $sha1. " "Falha ao obter aquele commit diretamente." -#: git-submodule.sh:613 +#: git-submodule.sh:614 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "Não é possível extrair '$sha1' no caminho de submódulo '$displaypath'" -#: git-submodule.sh:614 +#: git-submodule.sh:615 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "Caminho de submódulo '$displaypath': '$sha1' extraído" -#: git-submodule.sh:618 +#: git-submodule.sh:619 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "" "Não foi possível efetuar rebase de '$sha1' no caminho de submódulo " "'$displaypath'" -#: git-submodule.sh:619 +#: git-submodule.sh:620 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "Caminho de submódulo '$displaypath': rebase concluído em '$sha1'" -#: git-submodule.sh:624 +#: git-submodule.sh:625 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "Não é possível integrar '$sha1' no caminho de submódulo '$displaypath'" -#: git-submodule.sh:625 +#: git-submodule.sh:626 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "Caminho de submódulo '$displaypath': integrado em '$sha1'" -#: git-submodule.sh:630 +#: git-submodule.sh:631 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "" "Falha ao executar '$command $sha1' no caminho de submódulo '$displaypath'" -#: git-submodule.sh:631 +#: git-submodule.sh:632 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "Caminho de submódulo '$displaypath': '$command $sha1'" -#: git-submodule.sh:662 +#: git-submodule.sh:663 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "Falha ao percorrer o caminho de submódulo '$displaypath'" -#: git-parse-remote.sh:89 -#, sh-format -msgid "See git-${cmd}(1) for details." -msgstr "Consulte git-${cmd}(1) para obter mais detalhes." - #: git-rebase--preserve-merges.sh:109 msgid "Applied autostash." msgstr "Pilha automática (autostash) aplicada." @@ -24546,9 +24791,9 @@ msgid "" "Your changes are safe in the stash.\n" "You can run \"git stash pop\" or \"git stash drop\" at any time.\n" msgstr "" -"Surgiram conflitos ao aplicar a pilha automática (autostash).\n" -"As suas alterações estão guardadas na pilha.\n" -"Pode executar \"git stash pop\" ou \"git stash drop\" oportunamente.\n" +"Realizando autostash existem sobreposições.\n" +"As tuas mudanças estão salvas na stash.\n" +"Podes executar \"git stash pop\" ou \"git stash drop\" oportunamente.\n" #: git-rebase--preserve-merges.sh:191 #, sh-format @@ -24578,15 +24823,21 @@ msgid "" msgstr "" "\n" "Comandos:\n" -" p, pick = usar commit\n" -" r, reword = usar commit, mas editar a mensagem de commit\n" -" e, edit = usar commit, mas parar para emendar\n" -" s, squash = usar commit, mas fundir com o commit anterior\n" -" f, fixup = como \"squash\", mas descartar a mensagem deste commit\n" -" x, exec = executar o comando (o resto da linha) usando a shell\n" -" d, drop = remover commit\n" +"p, pick <commit> = usa commit\n" +"r, reword <commit> = usa commit, editando a mensagem commit\n" +"e, edit <commit> = usa commit, mas pára para emendar\n" +"s, squash <commit> = usa commit, fundindo no commit anterior\n" +"f, fixup <commit> = como \"squash\", mas descarta mensagem deste commit\n" +"x, exec <commit> = executa comando (do resto da linha) usando a shell\n" +"d, drop <commit> = larga commit\n" +"l, label <label> = dá um label a HEAD atual\n" +"t, reset <label> = reinicia a HEAD em label\n" +"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n" +". cria merge commit usando a commit message original (a única\n" +". linha também poderá ser utlilizada). Usa -c <commit> para \n" +". modificar a commit message.\n" "\n" -"Estas linhas pode ser reordenadas; são executadas de cima para baixo.\n" +"Estas linhas podem ser reordenadas; são executadas de cima para baixo.\n" #: git-rebase--preserve-merges.sh:260 #, sh-format @@ -24599,11 +24850,11 @@ msgid "" "\n" "\tgit rebase --continue" msgstr "" -"Pode emendar o commit agora, com\n" +"Podes emendar o commit agora, com\n" "\n" "\tgit commit --amend $gpg_sign_opt_quoted\n" "\n" -"Assim que estiver satisfeito com as alterações, execute\n" +"Quando modificações estão correctas, executa\n" "\n" "\tgit rebase --continue" @@ -24692,13 +24943,10 @@ msgid "" "before\n" "you are able to reword the commit." msgstr "" -"Não foi possível emendar o commit depois de apanhar com sucesso $sha1... " -"$rest\n" -"Deve-se provavelmente a uma mensagem de commit vazia ou o pre-commit hook " -"falhou.\n" -"Se o pre-commit hook falhou, pode precisar de resolver o problema ante de " -"poder\n" -"reformular a mensagem do commit." +"Impossível emendar commit pós um sucesso do picking $sha1... $rest\n" +" devido a um commit message vazio, ou o pre-commit hook falhou. Se o \n" +"pre-commit hook falhou, pode ser preciso resolver o issue antes de \n" +"tentares modificar a mensagem commit." #: git-rebase--preserve-merges.sh:616 #, sh-format @@ -24730,7 +24978,7 @@ msgid "" "\n" "\tgit rebase --continue" msgstr "" -"Pode corrigir o problema e executar\n" +"Podes resolver o problema, e executar\n" "\n" "\tgit rebase --continue" @@ -24745,8 +24993,8 @@ msgid "" "\tgit rebase --continue" msgstr "" "Executado com sucesso: $rest\n" -"mas deixou alterações no índice e/ou na árvore de trabalho\n" -"Submeta ou esconda as alterações e execute\n" +"e tens alterações em índice e/ou em working tree\n" +"Põe no commit ou stash, e corre\n" "\n" "\tgit rebase --continue" @@ -24785,17 +25033,17 @@ msgid "" "\n" " git rebase --continue\n" msgstr "" -"Tem alterações preparadas na árvore de trabalho.\n" -"Se tenciona esmagar estas alterações\n" -"no commit anterior, execute:\n" +"Tens modificações staged na working tree.\n" +"Se tenciona squash as modificações no último\n" +"commit, execute:\n" "\n" " git commit --amend $gpg_sign_opt_quoted\n" "\n" -"Se tenciona pô-las num novo commit, execute:\n" +"Se tenciona pô-las em novo commit, execute:\n" "\n" " git commit $gpg_sign_opt_quoted\n" "\n" -"Em ambos os casos, quando estiver pronto, continue com:\n" +"Em ambos os casos, quando feito, continue com:\n" "\n" " git rebase --continue\n" @@ -24919,62 +25167,62 @@ msgstr "Não é possível determinar o caminho absoluto do diretório git" msgid "%12s %12s %s" msgstr "%12s %12s %s" -#: git-add--interactive.perl:634 +#: git-add--interactive.perl:632 #, perl-format msgid "touched %d path\n" msgid_plural "touched %d paths\n" msgstr[0] "%d caminho afetado\n" msgstr[1] "%d caminhos afetados\n" -#: git-add--interactive.perl:1058 +#: git-add--interactive.perl:1056 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for staging." msgstr "" -"Se o patch se aplicar corretamente, o excerto editado será marcado\n" -"como preparado imediatamente." +"Se patch aplica-se correctamente, a edição do hunk será marcada\n" +"imediatamente como preparado." -#: git-add--interactive.perl:1061 +#: git-add--interactive.perl:1059 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for stashing." msgstr "" -"Se o patch se aplicar corretamente, o excerto editado será marcado\n" -"como escondido imediatamente." +"Se patch aplica-se corretamente, a edição do hunk será marcada\n" +"imediatamente como stashed." -#: git-add--interactive.perl:1064 +#: git-add--interactive.perl:1062 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for unstaging." msgstr "" -"Se o patch se aplicar corretamente, o excerto editado será marcado\n" -"como não preparado imediatamente." +"Se patch aplica-se corretamente, a edição do hunk será marcada\n" +"imediatamente como despreparada." -#: git-add--interactive.perl:1067 git-add--interactive.perl:1076 -#: git-add--interactive.perl:1082 +#: git-add--interactive.perl:1065 git-add--interactive.perl:1074 +#: git-add--interactive.perl:1080 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for applying." msgstr "" -"Se o patch se aplicar corretamente, o excerto editado será marcado\n" -"para ser aplicado imediatamente." +"Se patch aplica-se corretamente, a edição do hunk será marcada\n" +"imediatamente como aplicada." -#: git-add--interactive.perl:1070 git-add--interactive.perl:1073 -#: git-add--interactive.perl:1079 +#: git-add--interactive.perl:1068 git-add--interactive.perl:1071 +#: git-add--interactive.perl:1077 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for discarding." msgstr "" -"Se o patch se aplicar corretamente, o excerto editado será marcado\n" -"para ser descartado imediatamente." +"Se patch aplica-se corretamente, a edição do hunk será marcada\n" +"imediatamente como descartada." -#: git-add--interactive.perl:1116 +#: git-add--interactive.perl:1114 #, perl-format msgid "failed to open hunk edit file for writing: %s" msgstr "" "não foi possível abrir o ficheiro de edição do excerto para escrita: %s" -#: git-add--interactive.perl:1123 +#: git-add--interactive.perl:1121 #, perl-format msgid "" "---\n" @@ -24983,17 +25231,17 @@ msgid "" "Lines starting with %s will be removed.\n" msgstr "" "---\n" -"Para remover linhas '%s', torne-as linhas ' ' (contexto).\n" -"Para remover linhas '%s', elimine-as.\n" +"Removendo linhas '%s', torna-as linhas ' ' (contexto).\n" +"Removendo linhas '%s', elimina-as.\n" "Linhas começadas com %s serão removidas.\n" -#: git-add--interactive.perl:1145 +#: git-add--interactive.perl:1143 #, perl-format msgid "failed to open hunk edit file for reading: %s" msgstr "" "não foi possível abrir o ficheiro de edição do excerto para leitura: %s" -#: git-add--interactive.perl:1253 +#: git-add--interactive.perl:1251 msgid "" "y - stage this hunk\n" "n - do not stage this hunk\n" @@ -25007,7 +25255,7 @@ msgstr "" "a - preparar este excerto e todos os excertos seguintes no ficheiro\n" "d - não preparar este excerto nem os excertos seguintes no ficheiro" -#: git-add--interactive.perl:1259 +#: git-add--interactive.perl:1257 msgid "" "y - stash this hunk\n" "n - do not stash this hunk\n" @@ -25021,7 +25269,7 @@ msgstr "" "a - esconder este excerto e todos os seguintes no ficheiro\n" "d - não esconder este excerto nem os excertos seguintes no ficheiro" -#: git-add--interactive.perl:1265 +#: git-add--interactive.perl:1263 msgid "" "y - unstage this hunk\n" "n - do not unstage this hunk\n" @@ -25035,7 +25283,7 @@ msgstr "" "a - despreparar este excerto e todos os excertos seguintes no ficheiro\n" "d - não despreparar este excerto nem os excertos seguintes no ficheiro" -#: git-add--interactive.perl:1271 +#: git-add--interactive.perl:1269 msgid "" "y - apply this hunk to index\n" "n - do not apply this hunk to index\n" @@ -25049,7 +25297,7 @@ msgstr "" "a - aplicar este excerto e todos os excertos seguintes no ficheiro\n" "d - não aplicar este excerto nem os excertos seguintes no ficheiro" -#: git-add--interactive.perl:1277 git-add--interactive.perl:1295 +#: git-add--interactive.perl:1275 git-add--interactive.perl:1293 msgid "" "y - discard this hunk from worktree\n" "n - do not discard this hunk from worktree\n" @@ -25063,7 +25311,7 @@ msgstr "" "a - descartar este excerto e todos os excertos seguintes no ficheiro\n" "d - não descartar este excerto nem os excertos seguintes no ficheiro" -#: git-add--interactive.perl:1283 +#: git-add--interactive.perl:1281 msgid "" "y - discard this hunk from index and worktree\n" "n - do not discard this hunk from index and worktree\n" @@ -25077,7 +25325,7 @@ msgstr "" "a - descartar este excerto e todos os excertos seguintes no ficheiro\n" "d - não descartar este excerto nem os excertos seguintes no ficheiro" -#: git-add--interactive.perl:1289 +#: git-add--interactive.perl:1287 msgid "" "y - apply this hunk to index and worktree\n" "n - do not apply this hunk to index and worktree\n" @@ -25091,7 +25339,7 @@ msgstr "" "a - aplicar este excerto e todos os excertos seguintes no ficheiro\n" "d - não aplicar este excerto nem os excertos seguintes no ficheiro" -#: git-add--interactive.perl:1301 +#: git-add--interactive.perl:1299 #, fuzzy msgid "" "y - apply this hunk to worktree\n" @@ -25106,7 +25354,7 @@ msgstr "" "a - aplicar este excerto e todos os excertos seguintes no ficheiro\n" "d - não aplicar este excerto nem os excertos seguintes no ficheiro" -#: git-add--interactive.perl:1316 +#: git-add--interactive.perl:1314 msgid "" "g - select a hunk to go to\n" "/ - search for a hunk matching the given regex\n" @@ -25128,95 +25376,95 @@ msgstr "" "e - editar manualmente o excerto atual\n" "? - imprimir ajuda\n" -#: git-add--interactive.perl:1347 +#: git-add--interactive.perl:1345 msgid "The selected hunks do not apply to the index!\n" msgstr "Os excertos selecionados não aplicam ao índice!\n" -#: git-add--interactive.perl:1362 +#: git-add--interactive.perl:1360 #, perl-format msgid "ignoring unmerged: %s\n" msgstr "ignorado não integrado: %s\n" -#: git-add--interactive.perl:1481 +#: git-add--interactive.perl:1479 #, fuzzy, perl-format msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? " msgstr "" "Aplicar alteração de modo ao índice e à árvore de trabalho [y,n,q,a,d,/" "%s,?]? " -#: git-add--interactive.perl:1482 +#: git-add--interactive.perl:1480 #, fuzzy, perl-format msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " msgstr "" "Aplicar eliminação ao índice e à árvore de trabalho [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1483 +#: git-add--interactive.perl:1481 #, fuzzy, perl-format msgid "Apply addition to worktree [y,n,q,a,d%s,?]? " msgstr "" "Aplicar eliminação ao índice e à árvore de trabalho [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1484 +#: git-add--interactive.perl:1482 #, fuzzy, perl-format msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? " msgstr "" "Aplicar este excerto ao índice e à árvore de trabalho [y,n,q,a,d,/%s,?]? " -#: git-add--interactive.perl:1601 +#: git-add--interactive.perl:1599 msgid "No other hunks to goto\n" msgstr "" -#: git-add--interactive.perl:1619 +#: git-add--interactive.perl:1617 #, perl-format msgid "Invalid number: '%s'\n" msgstr "Número inválido: '%s'\n" -#: git-add--interactive.perl:1624 +#: git-add--interactive.perl:1622 #, perl-format msgid "Sorry, only %d hunk available.\n" msgid_plural "Sorry, only %d hunks available.\n" msgstr[0] "Lamento, apenas %d excerto disponível.\n" msgstr[1] "Lamento, apenas %d excertos disponíveis.\n" -#: git-add--interactive.perl:1659 +#: git-add--interactive.perl:1657 msgid "No other hunks to search\n" msgstr "" -#: git-add--interactive.perl:1676 +#: git-add--interactive.perl:1674 #, perl-format msgid "Malformed search regexp %s: %s\n" msgstr "Regexp de pesquisa malformada %s: %s\n" -#: git-add--interactive.perl:1686 +#: git-add--interactive.perl:1684 msgid "No hunk matches the given pattern\n" msgstr "Nenhum excerto corresponde ao padrão fornecido\n" -#: git-add--interactive.perl:1698 git-add--interactive.perl:1720 +#: git-add--interactive.perl:1696 git-add--interactive.perl:1718 msgid "No previous hunk\n" msgstr "Nenhum excerto anterior\n" -#: git-add--interactive.perl:1707 git-add--interactive.perl:1726 +#: git-add--interactive.perl:1705 git-add--interactive.perl:1724 msgid "No next hunk\n" msgstr "Nenhum excerto seguinte\n" -#: git-add--interactive.perl:1732 +#: git-add--interactive.perl:1730 msgid "Sorry, cannot split this hunk\n" msgstr "" -#: git-add--interactive.perl:1738 +#: git-add--interactive.perl:1736 #, perl-format msgid "Split into %d hunk.\n" msgid_plural "Split into %d hunks.\n" msgstr[0] "Dividir em %d excerto.\n" msgstr[1] "Dividir em %d excertos.\n" -#: git-add--interactive.perl:1748 +#: git-add--interactive.perl:1746 msgid "Sorry, cannot edit this hunk\n" msgstr "" #. TRANSLATORS: please do not translate the command names #. 'status', 'update', 'revert', etc. -#: git-add--interactive.perl:1813 +#: git-add--interactive.perl:1811 msgid "" "status - show paths with changes\n" "update - add working tree state to the staged set of changes\n" @@ -25236,19 +25484,19 @@ msgstr "" "add untracked - adicionar conteúdos de ficheiros não controlados ao conjunto " "de alterações preparadas\n" -#: git-add--interactive.perl:1830 git-add--interactive.perl:1835 -#: git-add--interactive.perl:1838 git-add--interactive.perl:1845 -#: git-add--interactive.perl:1848 git-add--interactive.perl:1855 -#: git-add--interactive.perl:1859 git-add--interactive.perl:1865 +#: git-add--interactive.perl:1828 git-add--interactive.perl:1840 +#: git-add--interactive.perl:1843 git-add--interactive.perl:1850 +#: git-add--interactive.perl:1853 git-add--interactive.perl:1860 +#: git-add--interactive.perl:1864 git-add--interactive.perl:1870 msgid "missing --" msgstr "falta --" -#: git-add--interactive.perl:1861 +#: git-add--interactive.perl:1866 #, perl-format msgid "unknown --patch mode: %s" msgstr "Mode de --patch desconhecido: %s" -#: git-add--interactive.perl:1867 git-add--interactive.perl:1873 +#: git-add--interactive.perl:1872 git-add--interactive.perl:1878 #, perl-format msgid "invalid argument %s, expecting --" msgstr "argumento inválido %s, esperava-se --" @@ -25623,6 +25871,86 @@ msgstr "Saltar %s com sufixo de backup '%s'.\n" msgid "Do you really want to send %s? [y|N]: " msgstr "Deseja mesmo enviar %s? [y|N]: " +#~ msgid "store only" +#~ msgstr "armazenar apenas" + +#~ msgid "compress faster" +#~ msgstr "compressão rápida" + +#~ msgid "compress better" +#~ msgstr "compressão ótima" + +#, fuzzy, c-format +#~ msgid "unexpected duplicate commit id %s" +#~ msgstr "não foi possível analisar o commit %s" + +#, fuzzy, c-format +#~ msgid "%s: not a valid OID" +#~ msgstr "'%s' não é uma referência válida." + +#, fuzzy, c-format +#~ msgid "invalid committer '%s'" +#~ msgstr "commit inválido %s" + +#, fuzzy, c-format +#~ msgid "invalid committer: %s" +#~ msgstr "commit inválido %s" + +#, fuzzy +#~ msgid "git bisect--helper --next-all" +#~ msgstr "git bisect--helper --next-all [--no-checkout]" + +#, fuzzy +#~ msgid "git bisect--helper --bisect-clean-state" +#~ msgstr "git bisect--helper --next-all [--no-checkout]" + +#, fuzzy +#~ msgid "git bisect--helper --bisect-autostart" +#~ msgstr "git bisect--helper --next-all [--no-checkout]" + +#~ msgid "perform 'git bisect next'" +#~ msgstr "executar 'git bisect next'" + +#, fuzzy +#~ msgid "--write-terms requires two arguments" +#~ msgstr "--abort não leva argumentos" + +#, fuzzy +#~ msgid "--bisect-clean-state requires no arguments" +#~ msgstr "--continue não leva argumentos" + +#, fuzzy +#~ msgid "--bisect-autostart does not accept arguments" +#~ msgstr "%%(subject) não leva argumentos" + +#~ msgid "n,m" +#~ msgstr "n,m" + +#~ msgid "Process line range n,m in file, counting from 1" +#~ msgstr "processar intervalo de linhas n,m, a contar a partir de 1" + +#~ msgid "name of output directory is too long" +#~ msgstr "o nome do diretório de saída é demasiado longo" + +#~ msgid "standard output, or directory, which one?" +#~ msgstr "saída padrão, ou diretório, qual deles?" + +#, c-format +#~ msgid "failed to remove '%s'" +#~ msgstr "falha ao remover '%s'" + +#, sh-format +#~ msgid "Bad rev input: $bisected_head" +#~ msgstr "Revisão incorreta na entrada: $bisected_head" + +#, sh-format +#~ msgid "Bad rev input: $rev" +#~ msgstr "Revisão incorreta na entrada: $rev" + +#, sh-format +#~ msgid "See git-${cmd}(1) for details." +#~ msgstr "Consulte git-${cmd}(1) para obter mais detalhes." + #, c-format #~ msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" #~ msgstr "" @@ -25715,8 +26043,8 @@ msgstr "Deseja mesmo enviar %s? [y|N]: " #~ "Cannot update sparse checkout: the following entries are not up-to-date:\n" #~ "%s" #~ msgstr "" -#~ "Não é possível extrair esparsamente: as seguintes entradas não estão " -#~ "atualizadas:\n" +#~ "Impossível actualizar sparse checkout: estas entradas estão " +#~ "desactualizadas:\n" #~ "%s" #, c-format @@ -25803,8 +26131,7 @@ msgstr "Deseja mesmo enviar %s? [y|N]: " #~ "Cannot update paths and switch to branch '%s' at the same time.\n" #~ "Did you intend to checkout '%s' which can not be resolved as commit?" #~ msgstr "" -#~ "Não é possível atualizar os caminho e mudar para o ramo '%s' ao mesmo " -#~ "tempo.\n" +#~ " possível atualizar os caminho e mudar para o ramo '%s' ao mesmo tempo.\n" #~ "Pretendia extrair '%s' o qual não pode ser resolvido como commit?" #, c-format @@ -25934,8 +26261,8 @@ msgstr "Deseja mesmo enviar %s? [y|N]: " #~ "error: unknown option for 'stash save': $option\n" #~ " To provide a message, use git stash save -- '$option'" #~ msgstr "" -#~ "erro: opção desconhecida de 'stash save': $option\n" -#~ " Para fornecer uma mensagem, use git stash save -- '$option'" +#~ "erro: desconheço opção de 'stash save': $option\n" +#~ " Fornecendo mensagem, usa git stash save -- '$option'" #, sh-format #~ msgid "unknown option: $opt" @@ -26302,9 +26629,6 @@ msgstr "Deseja mesmo enviar %s? [y|N]: " #~ msgid "removing '%s' failed" #~ msgstr "falha ao remover '%s'" -#~ msgid "Please call 'bisect_state' with at least one argument." -#~ msgstr "Invoque 'bisect_state' com pelo menos um argumento." - #~ msgid "" #~ "If you want to reuse this local git directory instead of cloning again " #~ "from" @@ -3,16 +3,19 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Dimitriy Ryazantcev <DJm00n@mail.ru>, 2014-2019 -# insolor, 2014 -# insolor, 2014 +# Alexander Golubev <fatzer2@gmail.com>, 2020 +# Dimitriy Ryazantcev <DJm00n@mail.ru>, 2014-2021 +# Mike Manturov, 2014 +# Mike Manturov, 2014 +# Sergey Alyoshin <alyoshin.s@gmail.com>, 2020 +# Sergey Kuznetsov <votkinsk@gmail.com>, 2021 # Чук Таблицоменделеев <aurum444an@gmail.com>, 2019 msgid "" msgstr "" "Project-Id-Version: Git Russian Localization Project\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2019-06-04 08:24+0800\n" -"PO-Revision-Date: 2019-06-21 17:28+0000\n" +"POT-Creation-Date: 2020-12-21 07:10+0800\n" +"PO-Revision-Date: 2021-01-29 19:33+0000\n" "Last-Translator: Dimitriy Ryazantcev <DJm00n@mail.ru>\n" "Language-Team: Russian (http://www.transifex.com/djm00n/git-po-ru/language/ru/)\n" "MIME-Version: 1.0\n" @@ -21,73 +24,736 @@ msgstr "" "Language: ru\n" "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n" -#: advice.c:103 +#: add-interactive.c:376 +#, c-format +msgid "Huh (%s)?" +msgstr "Хм (%s)?" + +#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3284 +#: sequencer.c:3735 sequencer.c:3890 builtin/rebase.c:1532 +#: builtin/rebase.c:1955 +msgid "could not read index" +msgstr "не удалось прочитать индекс" + +#: add-interactive.c:584 git-add--interactive.perl:269 +#: git-add--interactive.perl:294 +msgid "binary" +msgstr "двоичный" + +#: add-interactive.c:642 git-add--interactive.perl:278 +#: git-add--interactive.perl:332 +msgid "nothing" +msgstr "ничего" + +#: add-interactive.c:643 git-add--interactive.perl:314 +#: git-add--interactive.perl:329 +msgid "unchanged" +msgstr "нет изменений" + +#: add-interactive.c:680 git-add--interactive.perl:641 +msgid "Update" +msgstr "Обновить" + +#: add-interactive.c:697 add-interactive.c:885 +#, c-format +msgid "could not stage '%s'" +msgstr " не удалось проиндексировать «%s»" + +#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3478 +msgid "could not write index" +msgstr "не удалось записать индекс" + +#: add-interactive.c:706 git-add--interactive.perl:626 +#, c-format, perl-format +msgid "updated %d path\n" +msgid_plural "updated %d paths\n" +msgstr[0] "обновлён %d путь\n" +msgstr[1] "обновлено %d пути\n" +msgstr[2] "обновлено %d путей\n" +msgstr[3] "обновлено %d пути\n" + +#: add-interactive.c:724 git-add--interactive.perl:676 +#, c-format, perl-format +msgid "note: %s is untracked now.\n" +msgstr "примечание: %s теперь неотслеживаемый.\n" + +#: add-interactive.c:729 apply.c:4125 builtin/checkout.c:295 +#: builtin/reset.c:145 +#, c-format +msgid "make_cache_entry failed for path '%s'" +msgstr "сбой make_cache_entry для пути «%s»" + +#: add-interactive.c:759 git-add--interactive.perl:653 +msgid "Revert" +msgstr "Обратить изменения" + +#: add-interactive.c:775 +msgid "Could not parse HEAD^{tree}" +msgstr "Не удалось разобрать HEAD^{tree}" + +#: add-interactive.c:813 git-add--interactive.perl:629 +#, c-format, perl-format +msgid "reverted %d path\n" +msgid_plural "reverted %d paths\n" +msgstr[0] "обращены изменения %d пути\n" +msgstr[1] "обращены изменения %d путей\n" +msgstr[2] "обращены изменения %d путей\n" +msgstr[3] "обращены изменения %d путей\n" + +#: add-interactive.c:864 git-add--interactive.perl:693 +#, c-format +msgid "No untracked files.\n" +msgstr "Нет неотслеживаемых файлов.\n" + +#: add-interactive.c:868 git-add--interactive.perl:687 +msgid "Add untracked" +msgstr "Добавить неотслеживаемый" + +#: add-interactive.c:895 git-add--interactive.perl:623 +#, c-format, perl-format +msgid "added %d path\n" +msgid_plural "added %d paths\n" +msgstr[0] "добавлен %d путь\n" +msgstr[1] "добавлено %d пути\n" +msgstr[2] "добавлено %d путей\n" +msgstr[3] "добавлено %d пути\n" + +#: add-interactive.c:925 +#, c-format +msgid "ignoring unmerged: %s" +msgstr "игнорирую не слитое: %s" + +#: add-interactive.c:937 add-patch.c:1751 git-add--interactive.perl:1369 +#, c-format +msgid "Only binary files changed.\n" +msgstr "Только изменения двоичных файлов.\n" + +#: add-interactive.c:939 add-patch.c:1749 git-add--interactive.perl:1371 +#, c-format +msgid "No changes.\n" +msgstr "Нет изменений.\n" + +#: add-interactive.c:943 git-add--interactive.perl:1379 +msgid "Patch update" +msgstr "Обновление патча" + +#: add-interactive.c:982 git-add--interactive.perl:1792 +msgid "Review diff" +msgstr "Просмотреть список изменений" + +#: add-interactive.c:1010 +msgid "show paths with changes" +msgstr "показать пути с изменениями" + +#: add-interactive.c:1012 +msgid "add working tree state to the staged set of changes" +msgstr "добавить содержимое рабочего каталога к списку проиндексированных изменений" + +#: add-interactive.c:1014 +msgid "revert staged set of changes back to the HEAD version" +msgstr "вернуть проиндексированные изменения назад к HEAD-версии" + +#: add-interactive.c:1016 +msgid "pick hunks and update selectively" +msgstr "выбрать отдельные блоки изменений и обновить выборочно" + +#: add-interactive.c:1018 +msgid "view diff between HEAD and index" +msgstr "просмотреть список изменений между HEAD и индексом" + +#: add-interactive.c:1020 +msgid "add contents of untracked files to the staged set of changes" +msgstr "добавить содержимое неотслеживаемых файлов к списку проиндексированных изменений" + +#: add-interactive.c:1028 add-interactive.c:1077 +msgid "Prompt help:" +msgstr "Справка:" + +#: add-interactive.c:1030 +msgid "select a single item" +msgstr "выбрать один элемент" + +#: add-interactive.c:1032 +msgid "select a range of items" +msgstr "выбрать диапазон элементов" + +#: add-interactive.c:1034 +msgid "select multiple ranges" +msgstr "выбрать несколько диапазонов" + +#: add-interactive.c:1036 add-interactive.c:1081 +msgid "select item based on unique prefix" +msgstr "выбрать элемент на основе уникального префикса" + +#: add-interactive.c:1038 +msgid "unselect specified items" +msgstr "убрать выбор указанных элементов" + +#: add-interactive.c:1040 +msgid "choose all items" +msgstr "выбрать все элементы" + +#: add-interactive.c:1042 +msgid "(empty) finish selecting" +msgstr "(пусто) закончить выбор" + +#: add-interactive.c:1079 +msgid "select a numbered item" +msgstr "выбрать элемент по номеру" + +#: add-interactive.c:1083 +msgid "(empty) select nothing" +msgstr "(пусто) ничего не выбирать" + +#: add-interactive.c:1091 builtin/clean.c:816 git-add--interactive.perl:1896 +msgid "*** Commands ***" +msgstr "*** Команды ***" + +#: add-interactive.c:1092 builtin/clean.c:817 git-add--interactive.perl:1893 +msgid "What now" +msgstr "Что теперь" + +#: add-interactive.c:1144 git-add--interactive.perl:213 +msgid "staged" +msgstr "в индексе" + +#: add-interactive.c:1144 git-add--interactive.perl:213 +msgid "unstaged" +msgstr "не в индексе" + +#: add-interactive.c:1144 apply.c:4987 apply.c:4990 builtin/am.c:2257 +#: builtin/am.c:2260 builtin/bugreport.c:134 builtin/clone.c:124 +#: builtin/fetch.c:147 builtin/merge.c:284 builtin/pull.c:190 +#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1818 +#: builtin/submodule--helper.c:1821 builtin/submodule--helper.c:2326 +#: builtin/submodule--helper.c:2329 builtin/submodule--helper.c:2572 +#: git-add--interactive.perl:213 +msgid "path" +msgstr "путь" + +#: add-interactive.c:1151 +msgid "could not refresh index" +msgstr "не удалось обновить индекс" + +#: add-interactive.c:1165 builtin/clean.c:781 git-add--interactive.perl:1803 +#, c-format +msgid "Bye.\n" +msgstr "До свидания.\n" + +#: add-patch.c:34 git-add--interactive.perl:1431 +#, c-format, perl-format +msgid "Stage mode change [y,n,q,a,d%s,?]? " +msgstr "Проиндексировать изменение режима доступа [y,n,q,a,d%s,?]? " + +#: add-patch.c:35 git-add--interactive.perl:1432 +#, c-format, perl-format +msgid "Stage deletion [y,n,q,a,d%s,?]? " +msgstr "Проиндексировать удаление [y,n,q,a,d%s,?]? " + +#: add-patch.c:36 git-add--interactive.perl:1433 +#, c-format, perl-format +msgid "Stage addition [y,n,q,a,d%s,?]? " +msgstr "Добавить к индексу [y,n,q,a,d%s,?]?" + +#: add-patch.c:37 git-add--interactive.perl:1434 +#, c-format, perl-format +msgid "Stage this hunk [y,n,q,a,d%s,?]? " +msgstr "Проиндексировать этот блок изменений [y,n,q,a,d%s,?]? " + +#: add-patch.c:39 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be marked for" +" staging." +msgstr "При чистом наложении патча изменённая часть сразу будет отмечена для индексирования." + +#: add-patch.c:42 +msgid "" +"y - stage this hunk\n" +"n - do not stage this hunk\n" +"q - quit; do not stage this hunk or any of the remaining ones\n" +"a - stage this hunk and all later hunks in the file\n" +"d - do not stage this hunk or any of the later hunks in the file\n" +msgstr "" + +#: add-patch.c:56 git-add--interactive.perl:1437 +#, c-format, perl-format +msgid "Stash mode change [y,n,q,a,d%s,?]? " +msgstr "Спрятать изменение режима доступа [y,n,q,a,d%s,?]? " + +#: add-patch.c:57 git-add--interactive.perl:1438 +#, c-format, perl-format +msgid "Stash deletion [y,n,q,a,d%s,?]? " +msgstr "Спрятать удаление файла [y,n,q,a,d%s,?]? " + +#: add-patch.c:58 git-add--interactive.perl:1439 +#, c-format, perl-format +msgid "Stash addition [y,n,q,a,d%s,?]? " +msgstr "Добавить к спрятанному [y,n,q,a,d%s,?]?" + +#: add-patch.c:59 git-add--interactive.perl:1440 +#, c-format, perl-format +msgid "Stash this hunk [y,n,q,a,d%s,?]? " +msgstr "Спрятать этот блок изменений [y,n,q,a,d%s,?]? " + +#: add-patch.c:61 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be marked for" +" stashing." +msgstr "При чистом наложении патча изменённая часть сразу будет отмечена для скрытия." + +#: add-patch.c:64 +msgid "" +"y - stash this hunk\n" +"n - do not stash this hunk\n" +"q - quit; do not stash this hunk or any of the remaining ones\n" +"a - stash this hunk and all later hunks in the file\n" +"d - do not stash this hunk or any of the later hunks in the file\n" +msgstr "" + +#: add-patch.c:80 git-add--interactive.perl:1443 +#, c-format, perl-format +msgid "Unstage mode change [y,n,q,a,d%s,?]? " +msgstr "Убрать изменения режима доступа из индекса [y,n,q,a,d%s,?]? " + +#: add-patch.c:81 git-add--interactive.perl:1444 +#, c-format, perl-format +msgid "Unstage deletion [y,n,q,a,d%s,?]? " +msgstr "Убрать удаление из индекса [y,n,q,a,d%s,?]? " + +#: add-patch.c:82 git-add--interactive.perl:1445 +#, c-format, perl-format +msgid "Unstage addition [y,n,q,a,d%s,?]? " +msgstr "Убрать из индекса [y,n,q,a,d%s,?]?" + +#: add-patch.c:83 git-add--interactive.perl:1446 +#, c-format, perl-format +msgid "Unstage this hunk [y,n,q,a,d%s,?]? " +msgstr "Убрать из индекса этот блок измений [y,n,q,a,d%s,?]? " + +#: add-patch.c:85 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be marked for" +" unstaging." +msgstr "При чистом наложении патча изменённая часть сразу будет отмечена для удаления из индекса." + +#: add-patch.c:88 +msgid "" +"y - unstage this hunk\n" +"n - do not unstage this hunk\n" +"q - quit; do not unstage this hunk or any of the remaining ones\n" +"a - unstage this hunk and all later hunks in the file\n" +"d - do not unstage this hunk or any of the later hunks in the file\n" +msgstr "" + +#: add-patch.c:103 git-add--interactive.perl:1449 +#, c-format, perl-format +msgid "Apply mode change to index [y,n,q,a,d%s,?]? " +msgstr "Применить изменение режима доступа к индексу [y,n,q,a,d%s,?]? " + +#: add-patch.c:104 git-add--interactive.perl:1450 +#, c-format, perl-format +msgid "Apply deletion to index [y,n,q,a,d%s,?]? " +msgstr "Применить удаление к индексу [y,n,q,a,d%s,?]? " + +#: add-patch.c:105 git-add--interactive.perl:1451 +#, c-format, perl-format +msgid "Apply addition to index [y,n,q,a,d%s,?]? " +msgstr "Применить добавление к индексу [y,n,q,a,d%s,?]?" + +#: add-patch.c:106 git-add--interactive.perl:1452 +#, c-format, perl-format +msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " +msgstr "Применить этот блок к индексу [y,n,q,a,d%s,?]? " + +#: add-patch.c:108 add-patch.c:176 add-patch.c:221 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be marked for" +" applying." +msgstr "При чистом наложении патча изменённая часть сразу будет отмечена для применения." + +#: add-patch.c:111 +msgid "" +"y - apply this hunk to index\n" +"n - do not apply this hunk to index\n" +"q - quit; do not apply this hunk or any of the remaining ones\n" +"a - apply this hunk and all later hunks in the file\n" +"d - do not apply this hunk or any of the later hunks in the file\n" +msgstr "" + +#: add-patch.c:126 git-add--interactive.perl:1455 +#: git-add--interactive.perl:1473 +#, c-format, perl-format +msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " +msgstr "Отменить изменения режима доступа в рабочем каталоге [y,n,q,a,d%s,?]? " + +#: add-patch.c:127 git-add--interactive.perl:1456 +#: git-add--interactive.perl:1474 +#, c-format, perl-format +msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " +msgstr "Отменить удаление в рабочем каталоге [y,n,q,a,d%s,?]? " + +#: add-patch.c:128 git-add--interactive.perl:1457 +#: git-add--interactive.perl:1475 +#, c-format, perl-format +msgid "Discard addition from worktree [y,n,q,a,d%s,?]? " +msgstr "Отменить добавления из рабочего каталога [y,n,q,a,d%s,?]?" + +#: add-patch.c:129 git-add--interactive.perl:1458 +#: git-add--interactive.perl:1476 +#, c-format, perl-format +msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " +msgstr "Отменить изменения этого блока в рабочем каталоге [y,n,q,a,d%s,?]? " + +#: add-patch.c:131 add-patch.c:154 add-patch.c:199 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be marked for" +" discarding." +msgstr "При чистом наложении патча изменённая часть сразу будет отмечена для отмены." + +#: add-patch.c:134 add-patch.c:202 +msgid "" +"y - discard this hunk from worktree\n" +"n - do not discard this hunk from worktree\n" +"q - quit; do not discard this hunk or any of the remaining ones\n" +"a - discard this hunk and all later hunks in the file\n" +"d - do not discard this hunk or any of the later hunks in the file\n" +msgstr "" + +#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461 +#, c-format, perl-format +msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " +msgstr "Отменить изменения режима доступа в индексе и рабочем каталоге [y,n,q,a,d%s,?]? " + +#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1462 +#, c-format, perl-format +msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " +msgstr "Отменить удаление в индексе и рабочем каталоге [y,n,q,a,d%s,?]? " + +#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1463 +#, c-format, perl-format +msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? " +msgstr "" + +#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1464 +#, c-format, perl-format +msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " +msgstr "Отменить изменения этого блока в индексе и рабочем каталоге [y,n,q,a,d%s,?]? " + +#: add-patch.c:157 +msgid "" +"y - discard this hunk from index and worktree\n" +"n - do not discard this hunk from index and worktree\n" +"q - quit; do not discard this hunk or any of the remaining ones\n" +"a - discard this hunk and all later hunks in the file\n" +"d - do not discard this hunk or any of the later hunks in the file\n" +msgstr "" + +#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467 +#, c-format, perl-format +msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " +msgstr "Применить изменения режима доступа к индексу и рабочему каталогу [y,n,q,a,d%s,?]? " + +#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1468 +#, c-format, perl-format +msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " +msgstr "Применить удаление к индексу и рабочему каталогу [y,n,q,a,d%s,?]? " + +#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1469 +#, c-format, perl-format +msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? " +msgstr "" + +#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1470 +#, c-format, perl-format +msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " +msgstr "Применить изменения этого блока к индексу и рабочему каталогу [y,n,q,a,d%s,?]? " + +#: add-patch.c:179 +msgid "" +"y - apply this hunk to index and worktree\n" +"n - do not apply this hunk to index and worktree\n" +"q - quit; do not apply this hunk or any of the remaining ones\n" +"a - apply this hunk and all later hunks in the file\n" +"d - do not apply this hunk or any of the later hunks in the file\n" +msgstr "" + +#: add-patch.c:224 +msgid "" +"y - apply this hunk to worktree\n" +"n - do not apply this hunk to worktree\n" +"q - quit; do not apply this hunk or any of the remaining ones\n" +"a - apply this hunk and all later hunks in the file\n" +"d - do not apply this hunk or any of the later hunks in the file\n" +msgstr "" + +#: add-patch.c:342 +#, c-format +msgid "could not parse hunk header '%.*s'" +msgstr "не удалось разобрать заголовок блока изменений «%.*s»" + +#: add-patch.c:361 add-patch.c:365 +#, c-format +msgid "could not parse colored hunk header '%.*s'" +msgstr "не удалось разобрать цветной заголовок блока изменений «%.*s»" + +#: add-patch.c:419 +msgid "could not parse diff" +msgstr "не удалось разобрать список изменений (diff)" + +#: add-patch.c:438 +msgid "could not parse colored diff" +msgstr "не удалось разобрать цветной список изменений (diff)" + +#: add-patch.c:452 +#, c-format +msgid "failed to run '%s'" +msgstr "" + +#: add-patch.c:611 +msgid "mismatched output from interactive.diffFilter" +msgstr "" + +#: add-patch.c:612 +msgid "" +"Your filter must maintain a one-to-one correspondence\n" +"between its input and output lines." +msgstr "" + +#: add-patch.c:790 +#, c-format +msgid "" +"expected context line #%d in\n" +"%.*s" +msgstr "на %d строке ожидалась информация о контексте\n%.*s" + +#: add-patch.c:805 +#, c-format +msgid "" +"hunks do not overlap:\n" +"%.*s\n" +"\tdoes not end with:\n" +"%.*s" +msgstr "блоки изменений не пересекаются:\n%.*s\n\tне заканчивается на:\n%.*s" + +#: add-patch.c:1081 git-add--interactive.perl:1115 +msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" +msgstr "Ручной режим редактирования блока изменений — смотрите ниже для небольшого руководства.\n" + +#: add-patch.c:1085 +#, c-format +msgid "" +"---\n" +"To remove '%c' lines, make them ' ' lines (context).\n" +"To remove '%c' lines, delete them.\n" +"Lines starting with %c will be removed.\n" +msgstr "---\nЧтобы убрать «%c»-строки, сделайте их ' '-строками (контекстными).\nЧтобы убрать «%c»-строки, удалите их.\nСтроки, начинающиеся с %cбудут удалены.\n" + +#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. +#: add-patch.c:1099 git-add--interactive.perl:1129 +msgid "" +"If it does not apply cleanly, you will be given an opportunity to\n" +"edit again. If all lines of the hunk are removed, then the edit is\n" +"aborted and the hunk is left unchanged.\n" +msgstr "Если патч не применяется без ошибок, вам будет дана\nвозможность изменить его снова. Если все строки блока\nизменений удалены, то редактирование будет отменено\nи блок останется без изменений.\n" + +#: add-patch.c:1132 +msgid "could not parse hunk header" +msgstr "" + +#: add-patch.c:1177 +msgid "'git apply --cached' failed" +msgstr "" + +#. TRANSLATORS: do not translate [y/n] +#. The program will only accept that input at this point. +#. Consider translating (saying "no" discards!) as +#. (saying "n" for "no" discards!) if the translation +#. of the word "no" does not start with n. +#. TRANSLATORS: do not translate [y/n] +#. The program will only accept that input +#. at this point. +#. Consider translating (saying "no" discards!) as +#. (saying "n" for "no" discards!) if the translation +#. of the word "no" does not start with n. +#: add-patch.c:1246 git-add--interactive.perl:1242 +msgid "" +"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]?" +" " +msgstr "Изменённый вами блок не применяется. Редактировать снова (ответ «y» означает «нет»!) [y/n]? " + +#: add-patch.c:1289 +msgid "The selected hunks do not apply to the index!" +msgstr "" + +#: add-patch.c:1290 git-add--interactive.perl:1346 +msgid "Apply them to the worktree anyway? " +msgstr "Все равно применить их к рабочему каталогу? " + +#: add-patch.c:1297 git-add--interactive.perl:1349 +msgid "Nothing was applied.\n" +msgstr "Ничего не применено.\n" + +#: add-patch.c:1354 +msgid "" +"j - leave this hunk undecided, see next undecided hunk\n" +"J - leave this hunk undecided, see next hunk\n" +"k - leave this hunk undecided, see previous undecided hunk\n" +"K - leave this hunk undecided, see previous hunk\n" +"g - select a hunk to go to\n" +"/ - search for a hunk matching the given regex\n" +"s - split the current hunk into smaller hunks\n" +"e - manually edit the current hunk\n" +"? - print help\n" +msgstr "" + +#: add-patch.c:1516 add-patch.c:1526 +msgid "No previous hunk" +msgstr "" + +#: add-patch.c:1521 add-patch.c:1531 +msgid "No next hunk" +msgstr "" + +#: add-patch.c:1537 +msgid "No other hunks to goto" +msgstr "" + +#: add-patch.c:1548 git-add--interactive.perl:1606 +msgid "go to which hunk (<ret> to see more)? " +msgstr "на какой блок перейти (нажмите <ввод> чтобы увидеть еще)? " + +#: add-patch.c:1549 git-add--interactive.perl:1608 +msgid "go to which hunk? " +msgstr "на какой блок перейти? " + +#: add-patch.c:1560 +#, c-format +msgid "Invalid number: '%s'" +msgstr "" + +#: add-patch.c:1565 +#, c-format +msgid "Sorry, only %d hunk available." +msgid_plural "Sorry, only %d hunks available." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: add-patch.c:1574 +msgid "No other hunks to search" +msgstr "" + +#: add-patch.c:1580 git-add--interactive.perl:1661 +msgid "search for regex? " +msgstr "искать с помощью регулярного выражения? " + +#: add-patch.c:1595 +#, c-format +msgid "Malformed search regexp %s: %s" +msgstr "" + +#: add-patch.c:1612 +msgid "No hunk matches the given pattern" +msgstr "" + +#: add-patch.c:1619 +msgid "Sorry, cannot split this hunk" +msgstr "" + +#: add-patch.c:1623 +#, c-format +msgid "Split into %d hunks." +msgstr "" + +#: add-patch.c:1627 +msgid "Sorry, cannot edit this hunk" +msgstr "" + +#: add-patch.c:1679 +msgid "'git apply' failed" +msgstr "" + +#: advice.c:143 +#, c-format +msgid "" +"\n" +"Disable this message with \"git config advice.%s false\"" +msgstr "" + +#: advice.c:159 #, c-format msgid "%shint: %.*s%s\n" msgstr "%sподсказка: %.*s%s\n" -#: advice.c:156 +#: advice.c:250 msgid "Cherry-picking is not possible because you have unmerged files." msgstr "Невозможно выполнить копирование коммита в текущую ветку, так как у вас имеются не слитые файлы." -#: advice.c:158 +#: advice.c:252 msgid "Committing is not possible because you have unmerged files." msgstr "Невозможно закоммитить, так как у вас имеются не слитые файлы." -#: advice.c:160 +#: advice.c:254 msgid "Merging is not possible because you have unmerged files." msgstr "Невозможно выполнить слияние, так как у вас имеются не слитые файлы." -#: advice.c:162 +#: advice.c:256 msgid "Pulling is not possible because you have unmerged files." msgstr "Невозможно выполнить получение, так как у вас имеются не слитые файлы." -#: advice.c:164 +#: advice.c:258 msgid "Reverting is not possible because you have unmerged files." msgstr "Невозможно обратить изменения, так как у вас имеются не слитые файлы." -#: advice.c:166 +#: advice.c:260 #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "Невозможно выполнить %s, так как у вас имеются не слитые файлы." -#: advice.c:174 +#: advice.c:268 msgid "" "Fix them up in the work tree, and then use 'git add/rm <file>'\n" "as appropriate to mark resolution and make a commit." msgstr "Исправьте их в рабочем каталоге, затем запустите «git add/rm <файл>»,\nчтобы пометить исправление и сделайте коммит." -#: advice.c:182 +#: advice.c:276 msgid "Exiting because of an unresolved conflict." msgstr "Выход из-за неразрешенного конфликта." -#: advice.c:187 builtin/merge.c:1320 +#: advice.c:281 builtin/merge.c:1369 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Вы не завершили слияние (присутствует файл MERGE_HEAD)." -#: advice.c:189 +#: advice.c:283 msgid "Please, commit your changes before merging." msgstr "Перед слиянием, выполните коммит ваших изменений." -#: advice.c:190 +#: advice.c:284 msgid "Exiting because of unfinished merge." msgstr "Выход из-за незавершенного слияния." -#: advice.c:196 +#: advice.c:290 #, c-format msgid "" -"Note: checking out '%s'.\n" +"Note: switching to '%s'.\n" "\n" "You are in 'detached HEAD' state. You can look around, make experimental\n" "changes and commit them, and you can discard any commits you make in this\n" -"state without impacting any branches by performing another checkout.\n" +"state without impacting any branches by switching back to a branch.\n" "\n" "If you want to create a new branch to retain commits you create, you may\n" -"do so (now or later) by using -b with the checkout command again. Example:\n" +"do so (now or later) by using -c with the switch command. Example:\n" +"\n" +" git switch -c <new-branch-name>\n" +"\n" +"Or undo this operation with:\n" "\n" -" git checkout -b <new-branch-name>\n" +" git switch -\n" "\n" -msgstr "Примечание: переход на «%s».\n\nВы сейчас в состоянии «отделённого HEAD». Вы можете осмотреться, сделать\nэкспериментальные изменения и закоммитить их, также вы можете отменить\nизменения любых коммитов в этом состоянии не затрагивая любые ветки и\nне переходя на них.\n\nЕсли вы хотите создать новую ветку и сохранить свои коммиты, то вы\nможете сделать это (сейчас или позже) вызвав команду checkout снова,\nно с параметром -b. Например:\n\n git checkout -b <имя-новой-ветки>\n\n" +"Turn off this advice by setting config variable advice.detachedHead to false\n" +"\n" +msgstr "" #: alias.c:50 msgid "cmdline ends with \\" @@ -97,92 +763,82 @@ msgstr "командная строка заканчивается символ msgid "unclosed quote" msgstr "пропущена закрывающая кавычка" -#: apply.c:63 +#: apply.c:69 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "неопознанная опция для пробелов «%s»" -#: apply.c:79 +#: apply.c:85 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "неопознанная опция для игнорирования пробелов «%s»" -#: apply.c:129 +#: apply.c:135 msgid "--reject and --3way cannot be used together." msgstr "--reject и --3way нельзя использовать одновременно." -#: apply.c:131 +#: apply.c:137 msgid "--cached and --3way cannot be used together." msgstr "--cached и --3way нельзя использовать одновременно." -#: apply.c:134 +#: apply.c:140 msgid "--3way outside a repository" msgstr "--3way вне репозитория" -#: apply.c:145 +#: apply.c:151 msgid "--index outside a repository" msgstr "--index вне репозитория" -#: apply.c:148 +#: apply.c:154 msgid "--cached outside a repository" msgstr "--cached вне репозитория" -#: apply.c:829 +#: apply.c:801 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "Не удалось подготовить регулярное выражение для метки времени %s" -#: apply.c:838 +#: apply.c:810 #, c-format msgid "regexec returned %d for input: %s" msgstr "regexec возвратил %d для ввода: %s" -#: apply.c:912 +#: apply.c:884 #, c-format msgid "unable to find filename in patch at line %d" msgstr "не удалось найти имя файла в строке патча %d" -#: apply.c:950 +#: apply.c:922 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "git apply: плохой git-diff — ожидалось /dev/null, получено %s на строке %d" -#: apply.c:956 +#: apply.c:928 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "git apply: плохой git-diff — не согласующееся новое имя файла на строке %d" -#: apply.c:957 +#: apply.c:929 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "git apply: плохой git-diff — не согласующееся старое имя файла на строке %d" -#: apply.c:962 +#: apply.c:934 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "git apply: плохой git-diff — ожидалось /dev/null на строке %d" -#: apply.c:991 +#: apply.c:963 #, c-format msgid "invalid mode on line %d: %s" msgstr "недопустимый режим %d: %s" -#: apply.c:1310 +#: apply.c:1282 #, c-format msgid "inconsistent header lines %d and %d" msgstr "противоречивые строки заголовка %d и %d" -#: apply.c:1482 -#, c-format -msgid "recount: unexpected line: %.*s" -msgstr "recount: не ожидаемая строка: %.*s" - -#: apply.c:1551 -#, c-format -msgid "patch fragment without header at line %d: %.*s" -msgstr "фрагмент изменений без заголовка на строке %d: %.*s" - -#: apply.c:1571 +#: apply.c:1372 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname" @@ -195,70 +851,80 @@ msgstr[1] "заголовок git diff не нашел информацию об msgstr[2] "заголовок git diff не нашел информацию об имени файла при удалении %d ведущих компонент пути к файлу (строка %d)" msgstr[3] "заголовок git diff не нашел информацию об имени файла при удалении %d ведущих компонент пути к файлу (строка %d)" -#: apply.c:1584 +#: apply.c:1385 #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "заголовок git diff не содержит информации об имени файла (строка %d)" -#: apply.c:1772 +#: apply.c:1481 +#, c-format +msgid "recount: unexpected line: %.*s" +msgstr "recount: не ожидаемая строка: %.*s" + +#: apply.c:1550 +#, c-format +msgid "patch fragment without header at line %d: %.*s" +msgstr "фрагмент изменений без заголовка на строке %d: %.*s" + +#: apply.c:1753 msgid "new file depends on old contents" msgstr "новый файл зависит от старого содержимого" -#: apply.c:1774 +#: apply.c:1755 msgid "deleted file still has contents" msgstr "удаленный файл все еще имеет содержимое" -#: apply.c:1808 +#: apply.c:1789 #, c-format msgid "corrupt patch at line %d" msgstr "патч поврежден на строке %d" -#: apply.c:1845 +#: apply.c:1826 #, c-format msgid "new file %s depends on old contents" msgstr "новый файл %s зависит от старого содержимого" -#: apply.c:1847 +#: apply.c:1828 #, c-format msgid "deleted file %s still has contents" msgstr "удаленный файл %s все еще имеет содержимое" -#: apply.c:1850 +#: apply.c:1831 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** предупреждение: файл %s становится пустым, но не удаляется" -#: apply.c:1997 +#: apply.c:1978 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "поврежденный двоичный патч на строке %d: %.*s" -#: apply.c:2034 +#: apply.c:2015 #, c-format msgid "unrecognized binary patch at line %d" msgstr "неопознанный двоичный патч на строке %d" -#: apply.c:2196 +#: apply.c:2177 #, c-format msgid "patch with only garbage at line %d" msgstr "патч с мусором на строке %d" -#: apply.c:2282 +#: apply.c:2263 #, c-format msgid "unable to read symlink %s" msgstr "не удалось прочитать символьную ссылку %s" -#: apply.c:2286 +#: apply.c:2267 #, c-format msgid "unable to open or read %s" msgstr "не удалось открыть или прочесть %s" -#: apply.c:2945 +#: apply.c:2936 #, c-format msgid "invalid start of line: '%c'" msgstr "неправильное начало строки: «%c»" -#: apply.c:3066 +#: apply.c:3057 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." @@ -267,258 +933,253 @@ msgstr[1] "Часть #%d успешно применена на %d (со сдв msgstr[2] "Часть #%d успешно применена на %d (со сдвигом в %d строк)." msgstr[3] "Часть #%d успешно применена на %d (со сдвигом в %d строк)." -#: apply.c:3078 +#: apply.c:3069 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "Контекст сужен до (%ld/%ld), чтобы применить фрагмент на %d строке" -#: apply.c:3084 +#: apply.c:3075 #, c-format msgid "" "while searching for:\n" "%.*s" msgstr "при поиске:\n%.*s" -#: apply.c:3106 +#: apply.c:3097 #, c-format msgid "missing binary patch data for '%s'" msgstr "пропущены данные двоичного патча для «%s»" -#: apply.c:3114 +#: apply.c:3105 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "невозможно выполнить reverse-apply для двоичного патча, без обращения изменений блока «%s»" -#: apply.c:3161 +#: apply.c:3152 #, c-format msgid "cannot apply binary patch to '%s' without full index line" msgstr "невозможно применить двоичный патч «%s» без строки с указанной полной версией индекса" -#: apply.c:3171 +#: apply.c:3163 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." msgstr "патч применятся к файлу «%s» (%s), но его текущее содержимое не соотвествует ожидаемому." -#: apply.c:3179 +#: apply.c:3171 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "патч применяется к пустому файлу «%s», но файл не пустой" -#: apply.c:3197 +#: apply.c:3189 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "не удалось прочитать необходимую посылку %s для «%s»" -#: apply.c:3210 +#: apply.c:3202 #, c-format msgid "binary patch does not apply to '%s'" msgstr "не удалось применить двоичный патч к «%s»" -#: apply.c:3216 +#: apply.c:3209 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "после применения двоичного патча для «%s» был получен неправильный результат (ожидалось %s, получено %s)" -#: apply.c:3237 +#: apply.c:3230 #, c-format msgid "patch failed: %s:%ld" msgstr "ошибка применения изменений: %s:%ld" -#: apply.c:3360 +#: apply.c:3353 #, c-format msgid "cannot checkout %s" msgstr "не удалось переключить состояние на %s" -#: apply.c:3412 apply.c:3423 apply.c:3469 midx.c:59 setup.c:279 +#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:73 setup.c:308 #, c-format msgid "failed to read %s" msgstr "не удалось прочитать %s" -#: apply.c:3420 +#: apply.c:3413 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "чтение из «%s» за символической ссылкой" -#: apply.c:3449 apply.c:3692 +#: apply.c:3442 apply.c:3685 #, c-format msgid "path %s has been renamed/deleted" msgstr "путь %s был переименован/удален" -#: apply.c:3535 apply.c:3707 +#: apply.c:3528 apply.c:3700 #, c-format msgid "%s: does not exist in index" msgstr "%s: нет в индексе" -#: apply.c:3544 apply.c:3715 +#: apply.c:3537 apply.c:3708 apply.c:3952 #, c-format msgid "%s: does not match index" msgstr "%s: не совпадает с индексом" -#: apply.c:3579 +#: apply.c:3572 msgid "repository lacks the necessary blob to fall back on 3-way merge." msgstr "в репозитории отсутствует необходимый двоичный объект для отката к трёхходовому слиянию." -#: apply.c:3582 +#: apply.c:3575 #, c-format msgid "Falling back to three-way merge...\n" msgstr "Откат к трёхходовому слиянию…\n" -#: apply.c:3598 apply.c:3602 +#: apply.c:3591 apply.c:3595 #, c-format msgid "cannot read the current contents of '%s'" msgstr "не удалось прочитать текущее содержимое «%s»" -#: apply.c:3614 +#: apply.c:3607 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "Не удалось откатиться к трёхходовому слиянию…\n" -#: apply.c:3628 +#: apply.c:3621 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "Патч применен к «%s» с конфликтами.\n" -#: apply.c:3633 +#: apply.c:3626 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "Патч применен к «%s» без ошибок.\n" -#: apply.c:3659 +#: apply.c:3652 msgid "removal patch leaves file contents" msgstr "патч удаления не удалил содержимое файла" -#: apply.c:3732 +#: apply.c:3725 #, c-format msgid "%s: wrong type" msgstr "%s: неправильный тип" -#: apply.c:3734 +#: apply.c:3727 #, c-format msgid "%s has type %o, expected %o" msgstr "%s имеет тип %o, а ожидался %o" -#: apply.c:3885 apply.c:3887 read-cache.c:830 read-cache.c:856 -#: read-cache.c:1309 +#: apply.c:3892 apply.c:3894 read-cache.c:832 read-cache.c:858 +#: read-cache.c:1313 #, c-format msgid "invalid path '%s'" msgstr "неправильный путь «%s»" -#: apply.c:3943 +#: apply.c:3950 #, c-format msgid "%s: already exists in index" msgstr "%s: уже содержится в индексе" -#: apply.c:3946 +#: apply.c:3954 #, c-format msgid "%s: already exists in working directory" msgstr "%s: уже содержится в рабочем каталоге" -#: apply.c:3966 +#: apply.c:3974 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "новый режим доступа (%o) для %s не соответствует старому режиму доступа (%o)" -#: apply.c:3971 +#: apply.c:3979 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "новый режим доступа (%o) для %s не соответствует старому режиму доступа (%o) для %s" -#: apply.c:3991 +#: apply.c:3999 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "затронутый файл «%s» находится за символической ссылкой" -#: apply.c:3995 +#: apply.c:4003 #, c-format msgid "%s: patch does not apply" msgstr "%s: не удалось применить патч" -#: apply.c:4010 +#: apply.c:4018 #, c-format msgid "Checking patch %s..." msgstr "Проверка патча %s…" -#: apply.c:4102 +#: apply.c:4110 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "информация об sha1 отсутствует или бесполезна для подмодуля %s" -#: apply.c:4109 +#: apply.c:4117 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "изменен режим для %s, который не находится в текущем HEAD" -#: apply.c:4112 +#: apply.c:4120 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "информация об sha1 отсутствует или бесполезна (%s)." -#: apply.c:4117 builtin/checkout.c:257 builtin/reset.c:143 -#, c-format -msgid "make_cache_entry failed for path '%s'" -msgstr "сбой make_cache_entry для пути «%s»" - -#: apply.c:4121 +#: apply.c:4129 #, c-format msgid "could not add %s to temporary index" msgstr "не удалось добавить %s во временный индекс" -#: apply.c:4131 +#: apply.c:4139 #, c-format msgid "could not write temporary index to %s" msgstr "не удалось записать временный индкекс в %s" -#: apply.c:4269 +#: apply.c:4277 #, c-format msgid "unable to remove %s from index" msgstr "не удалось удалить %s из индекса" -#: apply.c:4303 +#: apply.c:4311 #, c-format msgid "corrupt patch for submodule %s" msgstr "поврежденный патч для подмодуля %s" -#: apply.c:4309 +#: apply.c:4317 #, c-format msgid "unable to stat newly created file '%s'" msgstr "не удалось выполнить stat для созданного файла «%s»" -#: apply.c:4317 +#: apply.c:4325 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "не удалось создать вспомогательный файл для созданного файла %s" -#: apply.c:4323 apply.c:4468 +#: apply.c:4331 apply.c:4476 #, c-format msgid "unable to add cache entry for %s" msgstr "не удалось создать запись в кэше для %s" -#: apply.c:4366 +#: apply.c:4374 builtin/bisect--helper.c:524 #, c-format msgid "failed to write to '%s'" msgstr "не удалось записать в «%s»" -#: apply.c:4370 +#: apply.c:4378 #, c-format msgid "closing file '%s'" msgstr "закрытие файла «%s»" -#: apply.c:4440 +#: apply.c:4448 #, c-format msgid "unable to write file '%s' mode %o" msgstr "не удалось записать файл «%s» с режимом доступа %o" -#: apply.c:4538 +#: apply.c:4546 #, c-format msgid "Applied patch %s cleanly." msgstr "Патч %s применен без ошибок." -#: apply.c:4546 +#: apply.c:4554 msgid "internal error" msgstr "внутренняя ошибка" -#: apply.c:4549 +#: apply.c:4557 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." @@ -527,45 +1188,45 @@ msgstr[1] "Применение патча %%s с %d отказами…" msgstr[2] "Применение патча %%s с %d отказами…" msgstr[3] "Применение патча %%s с %d отказами…" -#: apply.c:4560 +#: apply.c:4568 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "усечение имени .rej файла до %.*s.rej" -#: apply.c:4568 builtin/fetch.c:837 builtin/fetch.c:1118 +#: apply.c:4576 builtin/fetch.c:927 builtin/fetch.c:1228 #, c-format msgid "cannot open %s" msgstr "не удалось открыть %s" -#: apply.c:4582 +#: apply.c:4590 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Блок №%d применен без ошибок." -#: apply.c:4586 +#: apply.c:4594 #, c-format msgid "Rejected hunk #%d." msgstr "Блок №%d отклонен." -#: apply.c:4696 +#: apply.c:4718 #, c-format msgid "Skipped patch '%s'." msgstr "Патч «%s» пропущен." -#: apply.c:4704 +#: apply.c:4726 msgid "unrecognized input" msgstr "не распознанный ввод" -#: apply.c:4724 +#: apply.c:4746 msgid "unable to read index file" msgstr "не удалось прочитать файл индекса" -#: apply.c:4879 +#: apply.c:4903 #, c-format msgid "can't open patch '%s': %s" msgstr "не удалось открыть патч «%s»: %s" -#: apply.c:4906 +#: apply.c:4930 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" @@ -574,7 +1235,7 @@ msgstr[1] "пропущено %d ошибки в пробельных симво msgstr[2] "пропущено %d ошибок в пробельных символах" msgstr[3] "пропущено %d ошибок в пробельных символах" -#: apply.c:4912 apply.c:4927 +#: apply.c:4936 apply.c:4951 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -583,7 +1244,7 @@ msgstr[1] "%d строки добавили ошибки в пробельных msgstr[2] "%d строк добавили ошибки в пробельных символах." msgstr[3] "%d строк добавили ошибки в пробельных символах." -#: apply.c:4920 +#: apply.c:4944 #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." @@ -592,143 +1253,178 @@ msgstr[1] "%d строки добавлено после исправления msgstr[2] "%d строк добавлено после исправления ошибок в пробелах." msgstr[3] "%d строки добавлено после исправления ошибок в пробелах." -#: apply.c:4936 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390 +#: apply.c:4960 builtin/add.c:618 builtin/mv.c:304 builtin/rm.c:406 msgid "Unable to write new index file" msgstr "Не удалось записать новый файл индекса" -#: apply.c:4963 apply.c:4966 builtin/am.c:2210 builtin/am.c:2213 -#: builtin/clone.c:120 builtin/fetch.c:118 builtin/merge.c:271 -#: builtin/pull.c:207 builtin/submodule--helper.c:407 -#: builtin/submodule--helper.c:1366 builtin/submodule--helper.c:1369 -#: builtin/submodule--helper.c:1849 builtin/submodule--helper.c:1852 -#: builtin/submodule--helper.c:2091 git-add--interactive.perl:197 -msgid "path" -msgstr "путь" - -#: apply.c:4964 +#: apply.c:4988 msgid "don't apply changes matching the given path" msgstr "не применять изменения по указанному пути" -#: apply.c:4967 +#: apply.c:4991 msgid "apply changes matching the given path" msgstr "применять изменения по указанному пути" -#: apply.c:4969 builtin/am.c:2219 +#: apply.c:4993 builtin/am.c:2266 msgid "num" msgstr "количество" -#: apply.c:4970 +#: apply.c:4994 msgid "remove <num> leading slashes from traditional diff paths" msgstr "удалить <количество> ведущих косых черт из традиционных путей списка изменений" -#: apply.c:4973 +#: apply.c:4997 msgid "ignore additions made by the patch" msgstr "игнорировать добавления, сделанные этим патчем" -#: apply.c:4975 +#: apply.c:4999 msgid "instead of applying the patch, output diffstat for the input" msgstr "вместо применения патча вывести статистику добавлений и удалений для ввода" -#: apply.c:4979 +#: apply.c:5003 msgid "show number of added and deleted lines in decimal notation" msgstr "показать количество добавленных и удаленных строк в десятичном представлении" -#: apply.c:4981 +#: apply.c:5005 msgid "instead of applying the patch, output a summary for the input" msgstr "вместо применения патча вывести сводку изменений для ввода" -#: apply.c:4983 +#: apply.c:5007 msgid "instead of applying the patch, see if the patch is applicable" msgstr "вместо применения патча проверить подходит ли он" -#: apply.c:4985 +#: apply.c:5009 msgid "make sure the patch is applicable to the current index" msgstr "проверить, что патч применяется к текущему индексу" -#: apply.c:4987 +#: apply.c:5011 msgid "mark new files with `git add --intent-to-add`" msgstr "помечать новые файлы с «git add --intent-to-add»" -#: apply.c:4989 +#: apply.c:5013 msgid "apply a patch without touching the working tree" msgstr "применить патч, не изменяя рабочий каталог" -#: apply.c:4991 +#: apply.c:5015 msgid "accept a patch that touches outside the working area" msgstr "принять патч, который затрагивает файлы за рабочим каталогом" -#: apply.c:4994 +#: apply.c:5018 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "а также применить патч (используйте с --stat/--summary/--check)" -#: apply.c:4996 +#: apply.c:5020 msgid "attempt three-way merge if a patch does not apply" msgstr "попытаться сделать трехходовое слияние, если патч не применяется" -#: apply.c:4998 +#: apply.c:5022 msgid "build a temporary index based on embedded index information" msgstr "построить временный индекс, основанный на встроенной информации об индексе" -#: apply.c:5001 builtin/checkout-index.c:173 builtin/ls-files.c:524 +#: apply.c:5025 builtin/checkout-index.c:182 builtin/ls-files.c:525 msgid "paths are separated with NUL character" msgstr "пути, отделённые НУЛЕВЫМ символом" -#: apply.c:5003 +#: apply.c:5027 msgid "ensure at least <n> lines of context match" msgstr "удостовериться, что по крайней мере <n> строк контекста совпадают" -#: apply.c:5004 builtin/am.c:2198 builtin/interpret-trailers.c:97 -#: builtin/interpret-trailers.c:99 builtin/interpret-trailers.c:101 -#: builtin/pack-objects.c:3317 builtin/rebase.c:1415 +#: apply.c:5028 builtin/am.c:2245 builtin/interpret-trailers.c:98 +#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 +#: builtin/pack-objects.c:3562 builtin/rebase.c:1346 msgid "action" msgstr "действие" -#: apply.c:5005 +#: apply.c:5029 msgid "detect new or modified lines that have whitespace errors" msgstr "определять новые или модифицированные строки, у которых есть ошибки в пробельных символах" -#: apply.c:5008 apply.c:5011 +#: apply.c:5032 apply.c:5035 msgid "ignore changes in whitespace when finding context" msgstr "игнорировать изменения в пробельных символах при поиске контекста" -#: apply.c:5014 +#: apply.c:5038 msgid "apply the patch in reverse" msgstr "применить патч с обращением изменений" -#: apply.c:5016 +#: apply.c:5040 msgid "don't expect at least one line of context" msgstr "не ожидать как минимум одной строки контекста" -#: apply.c:5018 +#: apply.c:5042 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "оставить отклоненные блоки изменений в соответствующих *.rej файлах" -#: apply.c:5020 +#: apply.c:5044 msgid "allow overlapping hunks" msgstr "разрешить перекрывающиеся блоки изменений" -#: apply.c:5021 builtin/add.c:291 builtin/check-ignore.c:22 -#: builtin/commit.c:1317 builtin/count-objects.c:98 builtin/fsck.c:786 -#: builtin/log.c:2045 builtin/mv.c:123 builtin/read-tree.c:128 +#: apply.c:5045 builtin/add.c:329 builtin/check-ignore.c:22 +#: builtin/commit.c:1364 builtin/count-objects.c:98 builtin/fsck.c:775 +#: builtin/log.c:2287 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "быть многословнее" -#: apply.c:5023 +#: apply.c:5047 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "разрешить некорректно определенные пропущенные пустые строки в конце файла" -#: apply.c:5026 +#: apply.c:5050 msgid "do not trust the line counts in the hunk headers" msgstr "не доверять количеству строк из заголовка блока изменений" -#: apply.c:5028 builtin/am.c:2207 +#: apply.c:5052 builtin/am.c:2254 msgid "root" msgstr "корень" -#: apply.c:5029 +#: apply.c:5053 msgid "prepend <root> to all filenames" msgstr "добавить <корень> спереди ко всем именам файлов" +#: archive-tar.c:125 archive-zip.c:345 +#, c-format +msgid "cannot stream blob %s" +msgstr "не удалось создать поток двоичного объекта %s" + +#: archive-tar.c:265 archive-zip.c:358 +#, c-format +msgid "unsupported file mode: 0%o (SHA1: %s)" +msgstr "неподдерживаемый режим доступа к файлу: 0%o (SHA1: %s)" + +#: archive-tar.c:450 +#, c-format +msgid "unable to start '%s' filter" +msgstr "не удалось запустить фильтр «%s»" + +#: archive-tar.c:453 +msgid "unable to redirect descriptor" +msgstr "не удалось перенаправить дескриптор" + +#: archive-tar.c:460 +#, c-format +msgid "'%s' filter reported error" +msgstr "фильтр «%s» сообщил об ошибке" + +#: archive-zip.c:318 +#, c-format +msgid "path is not valid UTF-8: %s" +msgstr "путь не является действительным UTF-8: %s" + +#: archive-zip.c:322 +#, c-format +msgid "path too long (%d chars, SHA1: %s): %s" +msgstr "путь слишком длинный (%d символов, SHA1: %s): %s" + +#: archive-zip.c:469 builtin/pack-objects.c:244 builtin/pack-objects.c:247 +#, c-format +msgid "deflate error (%d)" +msgstr "ошибка сжатия (%d)" + +#: archive-zip.c:603 +#, c-format +msgid "timestamp too large for this system: %<PRIuMAX>" +msgstr "отметка времени слишком большая для этой системы: %<PRIuMAX>" + #: archive.c:14 msgid "git archive [<options>] <tree-ish> [<path>...]" msgstr "git archive [<опции>] <указатель-дерева> [<путь>…]" @@ -747,224 +1443,198 @@ msgstr "git archive --remote <репозиторий> [--exec <команда>] msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <репозиторий> [--exec <команда>] --list" -#: archive.c:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299 +#: archive.c:192 +#, c-format +msgid "cannot read %s" +msgstr "не удалось прочитать %s" + +#: archive.c:345 sequencer.c:459 sequencer.c:1736 sequencer.c:2886 +#: sequencer.c:3327 sequencer.c:3436 builtin/am.c:249 builtin/commit.c:786 +#: builtin/merge.c:1138 +#, c-format +msgid "could not read '%s'" +msgstr "не удалось прочитать «%s»" + +#: archive.c:430 builtin/add.c:181 builtin/add.c:594 builtin/rm.c:315 #, c-format msgid "pathspec '%s' did not match any files" msgstr "спецификатор пути «%s» не соответствует ни одному файлу" -#: archive.c:396 +#: archive.c:454 #, c-format msgid "no such ref: %.*s" msgstr "нет такой ссылки: %.*s" -#: archive.c:401 +#: archive.c:460 #, c-format msgid "not a valid object name: %s" msgstr "недопустимое имя объекта: %s" -#: archive.c:414 +#: archive.c:473 #, c-format msgid "not a tree object: %s" msgstr "недействительный объект дерева: %s" -#: archive.c:424 +#: archive.c:485 msgid "current working directory is untracked" msgstr "текущий рабочий каталог не отслеживается" -#: archive.c:455 +#: archive.c:526 +#, c-format +msgid "File not found: %s" +msgstr "" + +#: archive.c:528 +#, c-format +msgid "Not a regular file: %s" +msgstr "" + +#: archive.c:555 msgid "fmt" msgstr "формат" -#: archive.c:455 +#: archive.c:555 msgid "archive format" msgstr "формат архива" -#: archive.c:456 builtin/log.c:1557 +#: archive.c:556 builtin/log.c:1765 msgid "prefix" msgstr "префикс" -#: archive.c:457 +#: archive.c:557 msgid "prepend prefix to each pathname in the archive" msgstr "добавлять префикс перед каждым путем файла в архиве" -#: archive.c:458 builtin/blame.c:821 builtin/blame.c:822 -#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1091 -#: builtin/fast-export.c:1093 builtin/grep.c:895 builtin/hash-object.c:105 -#: builtin/ls-files.c:560 builtin/ls-files.c:563 builtin/notes.c:412 -#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:177 +#: archive.c:558 archive.c:561 builtin/blame.c:886 builtin/blame.c:890 +#: builtin/blame.c:891 builtin/commit-tree.c:117 builtin/config.c:135 +#: builtin/fast-export.c:1207 builtin/fast-export.c:1209 +#: builtin/fast-export.c:1213 builtin/grep.c:919 builtin/hash-object.c:105 +#: builtin/ls-files.c:561 builtin/ls-files.c:564 builtin/notes.c:412 +#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:190 msgid "file" msgstr "файл" -#: archive.c:459 builtin/archive.c:90 +#: archive.c:559 +msgid "add untracked file to archive" +msgstr "" + +#: archive.c:562 builtin/archive.c:90 msgid "write the archive to this file" msgstr "запись архива в этот файл" -#: archive.c:461 +#: archive.c:564 msgid "read .gitattributes in working directory" msgstr "читать .gitattributes в рабочем каталоге" -#: archive.c:462 +#: archive.c:565 msgid "report archived files on stderr" msgstr "отчет об архивированных файлах в stderr" -#: archive.c:463 -msgid "store only" -msgstr "только хранение" - -#: archive.c:464 -msgid "compress faster" -msgstr "сжимать быстрее" - -#: archive.c:472 -msgid "compress better" -msgstr "сжимать лучше" +#: archive.c:567 +msgid "set compression level" +msgstr "" -#: archive.c:475 +#: archive.c:570 msgid "list supported archive formats" msgstr "перечислить поддерживаемые форматы архивов" -#: archive.c:477 builtin/archive.c:91 builtin/clone.c:110 builtin/clone.c:113 -#: builtin/submodule--helper.c:1378 builtin/submodule--helper.c:1858 +#: archive.c:572 builtin/archive.c:91 builtin/clone.c:114 builtin/clone.c:117 +#: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335 msgid "repo" msgstr "репозиторий" -#: archive.c:478 builtin/archive.c:92 +#: archive.c:573 builtin/archive.c:92 msgid "retrieve the archive from remote repository <repo>" msgstr "получить архив из внешнего <репозитория>" -#: archive.c:479 builtin/archive.c:93 builtin/difftool.c:707 +#: archive.c:574 builtin/archive.c:93 builtin/difftool.c:714 #: builtin/notes.c:498 msgid "command" msgstr "команда" -#: archive.c:480 builtin/archive.c:94 +#: archive.c:575 builtin/archive.c:94 msgid "path to the remote git-upload-archive command" msgstr "путь к команде git-upload-archive на машине с внешним репозиторием" -#: archive.c:487 +#: archive.c:582 msgid "Unexpected option --remote" msgstr "Неожиданная опция --remote" -#: archive.c:489 +#: archive.c:584 msgid "Option --exec can only be used together with --remote" msgstr "Опция --exec может использоваться только вместе с --remote" -#: archive.c:491 +#: archive.c:586 msgid "Unexpected option --output" msgstr "Неожиданная опция --output" -#: archive.c:513 +#: archive.c:588 +msgid "Options --add-file and --remote cannot be used together" +msgstr "" + +#: archive.c:610 #, c-format msgid "Unknown archive format '%s'" msgstr "Неизвестный формат архива «%s»" -#: archive.c:520 +#: archive.c:619 #, c-format msgid "Argument not supported for format '%s': -%d" msgstr "Аргумент не поддерживается для формата «%s»: -%d" -#: archive-tar.c:125 archive-zip.c:345 -#, c-format -msgid "cannot stream blob %s" -msgstr "не удалось создать поток двоичного объекта %s" - -#: archive-tar.c:260 archive-zip.c:363 -#, c-format -msgid "unsupported file mode: 0%o (SHA1: %s)" -msgstr "неподдерживаемый режим доступа к файлу: 0%o (SHA1: %s)" - -#: archive-tar.c:287 archive-zip.c:353 -#, c-format -msgid "cannot read %s" -msgstr "не удалось прочитать %s" - -#: archive-tar.c:459 -#, c-format -msgid "unable to start '%s' filter" -msgstr "не удалось запустить фильтр «%s»" - -#: archive-tar.c:462 -msgid "unable to redirect descriptor" -msgstr "не удалось перенаправить дескриптор" - -#: archive-tar.c:469 -#, c-format -msgid "'%s' filter reported error" -msgstr "фильтр «%s» сообщил об ошибке" - -#: archive-zip.c:314 -#, c-format -msgid "path is not valid UTF-8: %s" -msgstr "путь не является действительным UTF-8: %s" - -#: archive-zip.c:318 -#, c-format -msgid "path too long (%d chars, SHA1: %s): %s" -msgstr "путь слишком длинный (%d символов, SHA1: %s): %s" - -#: archive-zip.c:474 builtin/pack-objects.c:226 builtin/pack-objects.c:229 -#, c-format -msgid "deflate error (%d)" -msgstr "ошибка сжатия (%d)" - -#: archive-zip.c:609 -#, c-format -msgid "timestamp too large for this system: %<PRIuMAX>" -msgstr "отметка времени слишком большая для этой системы: %<PRIuMAX>" - -#: attr.c:211 +#: attr.c:202 #, c-format msgid "%.*s is not a valid attribute name" msgstr "%.*s не является допустимым именем атрибута" -#: attr.c:368 +#: attr.c:359 #, c-format msgid "%s not allowed: %s:%d" msgstr "%s не разрешено: %s:%d" -#: attr.c:408 +#: attr.c:399 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." msgstr "Отрицающие шаблоны в атрибутах git игнорируются.\nИспользуйте «\\!» для буквального использования символа в значении «восклицательный знак»." -#: bisect.c:468 +#: bisect.c:489 #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "Плохое содержимое файла «%s»: %s" -#: bisect.c:678 +#: bisect.c:699 #, c-format msgid "We cannot bisect more!\n" msgstr "Невозможно продолжить бинарный поиск!\n" -#: bisect.c:733 +#: bisect.c:766 #, c-format msgid "Not a valid commit name %s" msgstr "Недопустимое имя коммита %s" -#: bisect.c:758 +#: bisect.c:791 #, c-format msgid "" "The merge base %s is bad.\n" "This means the bug has been fixed between %s and [%s].\n" msgstr "База слияния %s является плохим коммитом.\nЭто значит, что ошибка была исправлена где-то между %s и [%s].\n" -#: bisect.c:763 +#: bisect.c:796 #, c-format msgid "" "The merge base %s is new.\n" "The property has changed between %s and [%s].\n" msgstr "База слияния %s является новой.\nСвойство было изменено где-то между %s и [%s].\n" -#: bisect.c:768 +#: bisect.c:801 #, c-format msgid "" "The merge base %s is %s.\n" "This means the first '%s' commit is between %s and [%s].\n" msgstr "База слияния %s является %s.\nЭто значит, что «%s» коммит находится где-то между %s и [%s].\n" -#: bisect.c:776 +#: bisect.c:809 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -972,7 +1642,7 @@ msgid "" "Maybe you mistook %s and %s revs?\n" msgstr "Несколько %s коммитов не являются предками %s коммита.\nВ этом случае git bisect не может работать правильно.\nВозможно, вы перепутали редакции %s и %s местами?\n" -#: bisect.c:789 +#: bisect.c:822 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -980,43 +1650,43 @@ msgid "" "We continue anyway." msgstr "База слияния между %s и [%s] должно быть пропущена.\nПоэтому мы не можем быть уверены, что первый %s коммит находится между %s и %s.\nНо все же продолжаем поиск." -#: bisect.c:822 +#: bisect.c:861 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "Бинарный поиск: база слияния должна быть проверена\n" -#: bisect.c:865 +#: bisect.c:911 #, c-format msgid "a %s revision is needed" msgstr "нужно указать %s редакцию" -#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:248 +#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:255 #, c-format msgid "could not create file '%s'" msgstr "не удалось создать файл «%s»" -#: bisect.c:928 builtin/merge.c:146 +#: bisect.c:987 builtin/merge.c:152 #, c-format msgid "could not read file '%s'" msgstr "не удалось прочитать файл «%s»" -#: bisect.c:958 +#: bisect.c:1027 msgid "reading bisect refs failed" msgstr "сбой при чтении ссылок двоичного поиска" -#: bisect.c:977 +#: bisect.c:1057 #, c-format msgid "%s was both %s and %s\n" msgstr "%s была одновременно и %s и %s\n" -#: bisect.c:985 +#: bisect.c:1066 #, c-format msgid "" "No testable commit found.\n" "Maybe you started with bad path parameters?\n" msgstr "Тестируемый коммит не найден.\nВозможно, вы начали поиск с указанием неправильного параметра пути?\n" -#: bisect.c:1004 +#: bisect.c:1095 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -1027,7 +1697,7 @@ msgstr[3] "(примерно %d шагов)" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. -#: bisect.c:1010 +#: bisect.c:1101 #, c-format msgid "Bisecting: %d revision left to test after this %s\n" msgid_plural "Bisecting: %d revisions left to test after this %s\n" @@ -1036,37 +1706,37 @@ msgstr[1] "Бинарный поиск: %d редакции осталось п msgstr[2] "Бинарный поиск: %d редакций осталось проверить после этой %s\n" msgstr[3] "Бинарный поиск: %d редакций осталось проверить после этой %s\n" -#: blame.c:1794 +#: blame.c:2777 msgid "--contents and --reverse do not blend well." msgstr "--contents и --reverse не очень сочетаются." -#: blame.c:1808 +#: blame.c:2791 msgid "cannot use --contents with final commit object name" msgstr "нельзя использовать --contents с указанием финального имени объекта" -#: blame.c:1829 +#: blame.c:2812 msgid "--reverse and --first-parent together require specified latest commit" msgstr "при --reverse и --first-parent вместе нужно указывать конкретный последний коммит" -#: blame.c:1838 bundle.c:164 ref-filter.c:2077 remote.c:1938 sequencer.c:2030 -#: sequencer.c:4224 builtin/commit.c:1017 builtin/log.c:382 builtin/log.c:940 -#: builtin/log.c:1428 builtin/log.c:1804 builtin/log.c:2094 -#: builtin/merge.c:415 builtin/pack-objects.c:3140 builtin/pack-objects.c:3155 -#: builtin/shortlog.c:192 +#: blame.c:2821 bundle.c:213 ref-filter.c:2272 remote.c:2031 sequencer.c:2138 +#: sequencer.c:4633 submodule.c:855 builtin/commit.c:1045 builtin/log.c:409 +#: builtin/log.c:1023 builtin/log.c:1625 builtin/log.c:2046 builtin/log.c:2336 +#: builtin/merge.c:423 builtin/pack-objects.c:3380 builtin/pack-objects.c:3395 +#: builtin/shortlog.c:267 msgid "revision walk setup failed" msgstr "сбой инициализации прохода по редакциям" -#: blame.c:1856 +#: blame.c:2839 msgid "" "--reverse --first-parent together require range along first-parent chain" msgstr "при указании --reverse и --first-parent вместе, требуется также указать диапазон по цепочке первого родителя" -#: blame.c:1867 +#: blame.c:2850 #, c-format msgid "no such path %s in %s" msgstr "нет такого пути %s в %s" -#: blame.c:1878 +#: blame.c:2861 #, c-format msgid "cannot read blob %s for path %s" msgstr "невозможно прочитать объект %s для пути %s" @@ -1186,37 +1856,51 @@ msgstr "Неоднозначное имя объекта: «%s»." msgid "Not a valid branch point: '%s'." msgstr "Недопустимая точка ветки: «%s»." -#: branch.c:359 +#: branch.c:365 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "«%s» уже находится на «%s»" -#: branch.c:382 +#: branch.c:388 #, c-format msgid "HEAD of working tree %s is not updated" msgstr "HEAD рабочего каталога %s не обновлён" -#: bundle.c:36 +#: bundle.c:41 +#, c-format +msgid "unrecognized bundle hash algorithm: %s" +msgstr "" + +#: bundle.c:45 +#, c-format +msgid "unknown capability '%s'" +msgstr "" + +#: bundle.c:71 #, c-format -msgid "'%s' does not look like a v2 bundle file" -msgstr "«%s» не похож на файл пакета версии 2" +msgid "'%s' does not look like a v2 or v3 bundle file" +msgstr "" -#: bundle.c:64 +#: bundle.c:110 #, c-format msgid "unrecognized header: %s%s (%d)" msgstr "неопознанный заголовок: %s%s (%d)" -#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2281 sequencer.c:2916 -#: builtin/commit.c:788 +#: bundle.c:136 rerere.c:480 rerere.c:690 sequencer.c:2390 sequencer.c:3176 +#: builtin/commit.c:814 #, c-format msgid "could not open '%s'" msgstr "не удалось открыть «%s»" -#: bundle.c:143 +#: bundle.c:189 msgid "Repository lacks these prerequisite commits:" msgstr "В репозитории отсутствуют необходимые коммиты:" -#: bundle.c:194 +#: bundle.c:192 +msgid "need a repository to verify a bundle" +msgstr "" + +#: bundle.c:243 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" @@ -1225,11 +1909,11 @@ msgstr[1] "Пакет содержит эти %d ссылки:" msgstr[2] "Пакет содержит эти %d ссылок:" msgstr[3] "Пакет содержит эти %d ссылок:" -#: bundle.c:201 +#: bundle.c:250 msgid "The bundle records a complete history." msgstr "Пакет содержит полную историю." -#: bundle.c:203 +#: bundle.c:252 #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" @@ -1238,160 +1922,159 @@ msgstr[1] "Пакет требует эти %d ссылки:" msgstr[2] "Пакет требует эти %d ссылок:" msgstr[3] "Пакет требует эти %d ссылок:" -#: bundle.c:269 +#: bundle.c:319 msgid "unable to dup bundle descriptor" msgstr "не удалось дублировать дескриптор пакета" -#: bundle.c:276 +#: bundle.c:326 msgid "Could not spawn pack-objects" msgstr "Не удалось создать объекты пакета" -#: bundle.c:287 +#: bundle.c:337 msgid "pack-objects died" msgstr "критическая ошибка pack-objects" -#: bundle.c:329 +#: bundle.c:379 msgid "rev-list died" msgstr "критическая ошибка rev-list" -#: bundle.c:378 +#: bundle.c:428 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "ссылка «%s» исключена в соответствии с опциями rev-list" -#: bundle.c:457 builtin/log.c:197 builtin/log.c:1709 builtin/shortlog.c:306 +#: bundle.c:498 +#, c-format +msgid "unsupported bundle version %d" +msgstr "" + +#: bundle.c:500 +#, c-format +msgid "cannot write bundle version %d with algorithm %s" +msgstr "" + +#: bundle.c:522 builtin/log.c:209 builtin/log.c:1927 builtin/shortlog.c:408 #, c-format msgid "unrecognized argument: %s" msgstr "неопознанный аргумент: %s" -#: bundle.c:465 +#: bundle.c:530 msgid "Refusing to create empty bundle." msgstr "Отклонение создания пустого пакета." -#: bundle.c:475 +#: bundle.c:540 #, c-format msgid "cannot create '%s'" msgstr "не удалось создать «%s»" -#: bundle.c:500 +#: bundle.c:565 msgid "index-pack died" msgstr "критическая ошибка index-pack" -#: color.c:296 +#: color.c:329 #, c-format msgid "invalid color value: %.*s" msgstr "недопустимое значение цвета: %.*s" -#: commit.c:50 sequencer.c:2697 builtin/am.c:355 builtin/am.c:399 -#: builtin/am.c:1377 builtin/am.c:2022 builtin/replace.c:455 -#, c-format -msgid "could not parse %s" -msgstr "не удалось разобрать %s" - -#: commit.c:52 -#, c-format -msgid "%s %s is not a commit!" -msgstr "%s %s не является коммитом!" - -#: commit.c:193 -msgid "" -"Support for <GIT_DIR>/info/grafts is deprecated\n" -"and will be removed in a future Git version.\n" -"\n" -"Please use \"git replace --convert-graft-file\"\n" -"to convert the grafts into replace refs.\n" -"\n" -"Turn this message off by running\n" -"\"git config advice.graftFileDeprecated false\"" -msgstr "Поддержка <GIT_DIR>/info/grafts устарела и будет удалена в следующих версиях Git.\n\nИспользуйте «git replace --convert-graft-file» для конвертации сращений (grafts) на ссылки замены.\n\nЧтобы скрыть это сообщение запустите «git config advice.graftFileDeprecated false»" - -#: commit.c:1128 -#, c-format -msgid "Commit %s has an untrusted GPG signature, allegedly by %s." -msgstr "Коммит %s содержит не доверенную GPG подпись, предположительно от %s." - -#: commit.c:1131 -#, c-format -msgid "Commit %s has a bad GPG signature allegedly by %s." -msgstr "Коммит %s содержит плохую GPG подпись, предположительно от %s." - -#: commit.c:1134 -#, c-format -msgid "Commit %s does not have a GPG signature." -msgstr "Коммит %s не содержит GPG подпись." - -#: commit.c:1137 -#, c-format -msgid "Commit %s has a good GPG signature by %s\n" -msgstr "Коммит %s содержит действительную GPG подпись, от %s.\n" - -#: commit.c:1391 -msgid "" -"Warning: commit message did not conform to UTF-8.\n" -"You may want to amend it after fixing the message, or set the config\n" -"variable i18n.commitencoding to the encoding your project uses.\n" -msgstr "Предупреждение: сообщение коммита не соответствует UTF-8.\nВозможно, вы захотите исправить его после исправления сообщения\nили настроить опцию i18n.commitencoding и указать кодировку\nсообщений, которую использует ваш проект.\n" +#: commit-graph.c:188 midx.c:47 +msgid "invalid hash version" +msgstr "" -#: commit-graph.c:105 +#: commit-graph.c:246 msgid "commit-graph file is too small" msgstr "файл commit-graph слишком маленький" -#: commit-graph.c:170 +#: commit-graph.c:311 #, c-format msgid "commit-graph signature %X does not match signature %X" msgstr "подпись commit-graph файла %X не соотвествует подписи %X" -#: commit-graph.c:177 +#: commit-graph.c:318 #, c-format msgid "commit-graph version %X does not match version %X" msgstr "версия commit-graph файла %X не соотвествует версии %X" -#: commit-graph.c:184 +#: commit-graph.c:325 #, c-format msgid "commit-graph hash version %X does not match version %X" -msgstr "версия хеш-суммы commit-graph файла %X не соответствует версии %X" +msgstr "версия хэш-функции commit-graph файла %X не соответствует версии %X" -#: commit-graph.c:207 -msgid "commit-graph chunk lookup table entry missing; file may be incomplete" -msgstr "не найдена таблица расположения частей в файле commit-graph; возможно файл повреждён" +#: commit-graph.c:342 +#, c-format +msgid "commit-graph file is too small to hold %u chunks" +msgstr "" -#: commit-graph.c:218 +#: commit-graph.c:361 #, c-format msgid "commit-graph improper chunk offset %08x%08x" msgstr "некорректное смещение части в commit-graph файле %08x%08x" -#: commit-graph.c:255 +#: commit-graph.c:433 #, c-format msgid "commit-graph chunk id %08x appears multiple times" msgstr "часть файла commit-graph с идентификатором %08x появляется несколько раз" -#: commit-graph.c:390 +#: commit-graph.c:499 +msgid "commit-graph has no base graphs chunk" +msgstr "" + +#: commit-graph.c:509 +msgid "commit-graph chain does not match" +msgstr "" + +#: commit-graph.c:557 +#, c-format +msgid "invalid commit-graph chain: line '%s' not a hash" +msgstr "" + +#: commit-graph.c:581 +msgid "unable to find all commit-graph files" +msgstr "" + +#: commit-graph.c:721 commit-graph.c:785 +msgid "invalid commit position. commit-graph is likely corrupt" +msgstr "" + +#: commit-graph.c:742 #, c-format msgid "could not find commit %s" msgstr "не удалось найти коммит %s" -#: commit-graph.c:732 builtin/pack-objects.c:2649 +#: commit-graph.c:1036 builtin/am.c:1292 +#, c-format +msgid "unable to parse commit %s" +msgstr "не удалось разобрать коммит %s" + +#: commit-graph.c:1252 builtin/pack-objects.c:2864 #, c-format msgid "unable to get type of object %s" msgstr "не удалось получить тип объекта %s" -#: commit-graph.c:765 +#: commit-graph.c:1283 msgid "Loading known commits in commit graph" msgstr "Загрузка известных коммитов на граф коммитов" -#: commit-graph.c:781 +#: commit-graph.c:1300 msgid "Expanding reachable commits in commit graph" msgstr "Расширение достижимых коммитов на граф коммитов" -#: commit-graph.c:793 +#: commit-graph.c:1320 msgid "Clearing commit marks in commit graph" msgstr "Очистка пометок коммитов на графе коммитов" -#: commit-graph.c:813 +#: commit-graph.c:1339 msgid "Computing commit graph generation numbers" msgstr "Вычисление номеров поколений на графе коммитов" -#: commit-graph.c:930 +#: commit-graph.c:1406 +msgid "Computing commit changed paths Bloom filters" +msgstr "" + +#: commit-graph.c:1483 +msgid "Collecting referenced commits" +msgstr "" + +#: commit-graph.c:1508 #, c-format msgid "Finding commits for commit graph in %d pack" msgid_plural "Finding commits for commit graph in %d packs" @@ -1400,52 +2083,43 @@ msgstr[1] "Поиск коммитов для графа коммитов в %d msgstr[2] "Поиск коммитов для графа коммитов в %d пакетах" msgstr[3] "Поиск коммитов для графа коммитов в %d пакетах" -#: commit-graph.c:943 +#: commit-graph.c:1521 #, c-format msgid "error adding pack %s" msgstr "ошибка добавления пакета %s" -#: commit-graph.c:945 +#: commit-graph.c:1525 #, c-format msgid "error opening index for %s" msgstr "ошибка открытия индекса для %s" -#: commit-graph.c:959 -#, c-format -msgid "Finding commits for commit graph from %d ref" -msgid_plural "Finding commits for commit graph from %d refs" -msgstr[0] "Поиск коммитов для графа коммитов по %d ссылке" -msgstr[1] "Поиск коммитов для графа коммитов по %d ссылкам" -msgstr[2] "Поиск коммитов для графа коммитов по %d ссылкам" -msgstr[3] "Поиск коммитов для графа коммитов по %d ссылкам" - -#: commit-graph.c:991 +#: commit-graph.c:1562 msgid "Finding commits for commit graph among packed objects" msgstr "Поиск коммитов для графа коммитов среди упакованных объектов" -#: commit-graph.c:1004 -msgid "Counting distinct commits in commit graph" -msgstr "Вычисление количества отдельных коммитов на графе коммитов" - -#: commit-graph.c:1017 -#, c-format -msgid "the commit graph format cannot write %d commits" -msgstr "программе форматирования графа коммитов не удалось записать %d коммитов" - -#: commit-graph.c:1026 +#: commit-graph.c:1580 msgid "Finding extra edges in commit graph" msgstr "Поиск дополнительных ребер на графе коммитов" -#: commit-graph.c:1050 -msgid "too many commits to write graph" -msgstr "слишком много коммитов для записи графа" +#: commit-graph.c:1628 +msgid "failed to write correct number of base graph ids" +msgstr "" -#: commit-graph.c:1057 midx.c:819 +#: commit-graph.c:1670 midx.c:819 #, c-format msgid "unable to create leading directories of %s" msgstr "не удалось создать родительские каталоги для %s" -#: commit-graph.c:1097 +#: commit-graph.c:1683 +msgid "unable to create temporary graph layer" +msgstr "" + +#: commit-graph.c:1688 +#, c-format +msgid "unable to adjust shared permissions for '%s'" +msgstr "" + +#: commit-graph.c:1758 #, c-format msgid "Writing out commit graph in %d pass" msgid_plural "Writing out commit graph in %d passes" @@ -1454,83 +2128,161 @@ msgstr[1] "Запись графа коммитов в %d прохода" msgstr[2] "Запись графа коммитов в %d проходов" msgstr[3] "Запись графа коммитов в %d прохода" -#: commit-graph.c:1162 +#: commit-graph.c:1803 +msgid "unable to open commit-graph chain file" +msgstr "" + +#: commit-graph.c:1819 +msgid "failed to rename base commit-graph file" +msgstr "" + +#: commit-graph.c:1839 +msgid "failed to rename temporary commit-graph file" +msgstr "" + +#: commit-graph.c:1965 +msgid "Scanning merged commits" +msgstr "" + +#: commit-graph.c:2009 +msgid "Merging commit-graph" +msgstr "" + +#: commit-graph.c:2115 +msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled" +msgstr "" + +#: commit-graph.c:2214 +msgid "too many commits to write graph" +msgstr "слишком много коммитов для записи графа" + +#: commit-graph.c:2307 msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "файл commit-graph содержит неправильную контрольную сумму и скорее всего поврежден" -#: commit-graph.c:1172 +#: commit-graph.c:2317 #, c-format msgid "commit-graph has incorrect OID order: %s then %s" msgstr "файл commit-graph содержит неправильный порядок OID: %s, а затем %s" -#: commit-graph.c:1182 commit-graph.c:1197 +#: commit-graph.c:2327 commit-graph.c:2342 #, c-format msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" msgstr "файл commit-graph содержит неправильное значение fanout: fanout[%d] = %u != %u" -#: commit-graph.c:1189 +#: commit-graph.c:2334 #, c-format msgid "failed to parse commit %s from commit-graph" msgstr "не удалось разобрать коммит %s из файла commit-graph" -#: commit-graph.c:1206 +#: commit-graph.c:2352 msgid "Verifying commits in commit graph" msgstr "Проверка коммитов на графе коммитов" -#: commit-graph.c:1219 +#: commit-graph.c:2367 #, c-format msgid "failed to parse commit %s from object database for commit-graph" msgstr "не удалось разобрать коммит %s из базы объектов файла commit-graph" -#: commit-graph.c:1226 +#: commit-graph.c:2374 #, c-format msgid "root tree OID for commit %s in commit-graph is %s != %s" -msgstr " в файле commit-graph OID корня дерева для коммита %s является %s != %s" +msgstr "в файле commit-graph OID корня дерева для коммита %s является %s != %s" -#: commit-graph.c:1236 +#: commit-graph.c:2384 #, c-format msgid "commit-graph parent list for commit %s is too long" msgstr "слишком большой список родителей файле commit-graph для коммита %s" -#: commit-graph.c:1242 +#: commit-graph.c:2393 #, c-format msgid "commit-graph parent for %s is %s != %s" msgstr "в файле commit-graph родитель для %s является %s != %s" -#: commit-graph.c:1255 +#: commit-graph.c:2407 #, c-format msgid "commit-graph parent list for commit %s terminates early" msgstr "в файле commit-graph список родителей для коммита %s закончился слишком рано" -#: commit-graph.c:1260 +#: commit-graph.c:2412 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero " "elsewhere" msgstr "в файле commit-graph содержится нулевой номер поколения для коммита %s, но ненулевой в остальных случаях" -#: commit-graph.c:1264 +#: commit-graph.c:2416 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero " "elsewhere" msgstr "в файле commit-graph содержится ненулевой номер поколения для коммита %s, но нулевой в остальных случаях" -#: commit-graph.c:1279 +#: commit-graph.c:2432 #, c-format msgid "commit-graph generation for commit %s is %u != %u" msgstr "в файле commit-graph номер поколения для коммита %s является %u != %u" -#: commit-graph.c:1285 +#: commit-graph.c:2438 #, c-format msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" msgstr "в файле commit-graph дата коммита %s является %<PRIuMAX> != %<PRIuMAX>" +#: commit.c:52 sequencer.c:2879 builtin/am.c:359 builtin/am.c:403 +#: builtin/am.c:1371 builtin/am.c:2018 builtin/replace.c:457 +#, c-format +msgid "could not parse %s" +msgstr "не удалось разобрать %s" + +#: commit.c:54 +#, c-format +msgid "%s %s is not a commit!" +msgstr "%s %s не является коммитом!" + +#: commit.c:194 +msgid "" +"Support for <GIT_DIR>/info/grafts is deprecated\n" +"and will be removed in a future Git version.\n" +"\n" +"Please use \"git replace --convert-graft-file\"\n" +"to convert the grafts into replace refs.\n" +"\n" +"Turn this message off by running\n" +"\"git config advice.graftFileDeprecated false\"" +msgstr "Поддержка <GIT_DIR>/info/grafts устарела и будет удалена в следующих версиях Git.\n\nИспользуйте «git replace --convert-graft-file» для конвертации сращений (grafts) на ссылки замены.\n\nЧтобы скрыть это сообщение запустите «git config advice.graftFileDeprecated false»" + +#: commit.c:1172 +#, c-format +msgid "Commit %s has an untrusted GPG signature, allegedly by %s." +msgstr "Коммит %s содержит не доверенную GPG подпись, предположительно от %s." + +#: commit.c:1176 +#, c-format +msgid "Commit %s has a bad GPG signature allegedly by %s." +msgstr "Коммит %s содержит плохую GPG подпись, предположительно от %s." + +#: commit.c:1179 +#, c-format +msgid "Commit %s does not have a GPG signature." +msgstr "Коммит %s не содержит GPG подпись." + +#: commit.c:1182 +#, c-format +msgid "Commit %s has a good GPG signature by %s\n" +msgstr "Коммит %s содержит действительную GPG подпись, от %s.\n" + +#: commit.c:1436 +msgid "" +"Warning: commit message did not conform to UTF-8.\n" +"You may want to amend it after fixing the message, or set the config\n" +"variable i18n.commitencoding to the encoding your project uses.\n" +msgstr "Предупреждение: сообщение коммита не соответствует UTF-8.\nВозможно, вы захотите исправить его после исправления сообщения\nили настроить опцию i18n.commitencoding и указать кодировку\nсообщений, которую использует ваш проект.\n" + #: compat/obstack.c:406 compat/obstack.c:408 msgid "memory exhausted" msgstr "память исчерпана" -#: config.c:123 +#: config.c:125 #, c-format msgid "" "exceeded maximum include depth (%d) while including\n" @@ -1540,294 +2292,290 @@ msgid "" "This might be due to circular includes." msgstr "" -#: config.c:139 +#: config.c:141 #, c-format msgid "could not expand include path '%s'" msgstr "не удалось раскрыть путь включения «%s»" -#: config.c:150 +#: config.c:152 msgid "relative config includes must come from files" msgstr "относительные включения конфигурации должны исходить из файлов" -#: config.c:190 +#: config.c:198 msgid "relative config include conditionals must come from files" msgstr "относительные условные включения конфигурации должны исходить из файлов" -#: config.c:348 +#: config.c:378 #, c-format msgid "key does not contain a section: %s" msgstr "" -#: config.c:354 +#: config.c:384 #, c-format msgid "key does not contain variable name: %s" msgstr "" -#: config.c:378 sequencer.c:2459 +#: config.c:408 sequencer.c:2580 #, c-format msgid "invalid key: %s" msgstr "недействительный ключ: %s" -#: config.c:384 +#: config.c:414 #, c-format msgid "invalid key (newline): %s" msgstr "" -#: config.c:420 config.c:432 +#: config.c:450 config.c:462 #, c-format msgid "bogus config parameter: %s" msgstr "" -#: config.c:467 +#: config.c:497 #, c-format msgid "bogus format in %s" msgstr "" -#: config.c:793 +#: config.c:836 #, c-format msgid "bad config line %d in blob %s" msgstr "ошибка в %d строке двоичного объекта %s" -#: config.c:797 +#: config.c:840 #, c-format msgid "bad config line %d in file %s" msgstr "ошибка в %d строке файла %s" -#: config.c:801 +#: config.c:844 #, c-format msgid "bad config line %d in standard input" msgstr "ошибка в %d строке стандартного ввода" -#: config.c:805 +#: config.c:848 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "ошибка в %d строке двоичного объекта подмодуля %s" -#: config.c:809 +#: config.c:852 #, c-format msgid "bad config line %d in command line %s" msgstr "ошибка в %d строке коммандной строки %s" -#: config.c:813 +#: config.c:856 #, c-format msgid "bad config line %d in %s" msgstr "ошибка в %d строке в %s" -#: config.c:952 +#: config.c:993 msgid "out of range" msgstr "вне диапазона" -#: config.c:952 +#: config.c:993 msgid "invalid unit" msgstr "неправильное число" -#: config.c:958 +#: config.c:994 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "неправильное числовое значение «%s» для «%s»: %s" -#: config.c:963 +#: config.c:1013 #, c-format msgid "bad numeric config value '%s' for '%s' in blob %s: %s" msgstr "неправильное числовое значение «%s» для «%s» в двоичном объекте %s: %s" -#: config.c:966 +#: config.c:1016 #, c-format msgid "bad numeric config value '%s' for '%s' in file %s: %s" msgstr "неправильное числовое значение «%s» для «%s» в файле %s: %s" -#: config.c:969 +#: config.c:1019 #, c-format msgid "bad numeric config value '%s' for '%s' in standard input: %s" msgstr "неправильное числовое значение «%s» для «%s» на стандартном вводе: %s" -#: config.c:972 +#: config.c:1022 #, c-format msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" msgstr "неправильное числовое значение «%s» для «%s» в двоичном объекте подмодуля %s: %s" -#: config.c:975 +#: config.c:1025 #, c-format msgid "bad numeric config value '%s' for '%s' in command line %s: %s" msgstr "неправильное числовое значение «%s» для «%s» на коммандной строке %s: %s" -#: config.c:978 +#: config.c:1028 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "неправильное числовое значение «%s» для «%s» в %s: %s" -#: config.c:1073 +#: config.c:1123 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "сбой разворачивания пути каталога пользователя: «%s»" -#: config.c:1082 +#: config.c:1132 #, c-format msgid "'%s' for '%s' is not a valid timestamp" msgstr "«%s» для «%s» не является допустимой меткой даты/времени" -#: config.c:1173 +#: config.c:1223 #, c-format msgid "abbrev length out of range: %d" msgstr "" -#: config.c:1187 config.c:1198 +#: config.c:1237 config.c:1248 #, c-format msgid "bad zlib compression level %d" msgstr "неправильный уровень сжатия zlib %d" -#: config.c:1290 +#: config.c:1340 msgid "core.commentChar should only be one character" msgstr "" -#: config.c:1323 +#: config.c:1373 #, c-format msgid "invalid mode for object creation: %s" msgstr "недопустимый режим создания объекта: %s" -#: config.c:1395 +#: config.c:1445 #, c-format msgid "malformed value for %s" msgstr "" -#: config.c:1421 +#: config.c:1471 #, c-format msgid "malformed value for %s: %s" msgstr "" -#: config.c:1422 +#: config.c:1472 msgid "must be one of nothing, matching, simple, upstream or current" msgstr "" -#: config.c:1483 builtin/pack-objects.c:3397 +#: config.c:1533 builtin/pack-objects.c:3649 #, c-format msgid "bad pack compression level %d" msgstr "неправильный уровень сжатия пакета %d" -#: config.c:1604 +#: config.c:1655 #, c-format msgid "unable to load config blob object '%s'" msgstr "" -#: config.c:1607 +#: config.c:1658 #, c-format msgid "reference '%s' does not point to a blob" msgstr "" -#: config.c:1624 +#: config.c:1675 #, c-format msgid "unable to resolve config blob '%s'" msgstr "" -#: config.c:1654 +#: config.c:1705 #, c-format msgid "failed to parse %s" msgstr "" -#: config.c:1710 +#: config.c:1759 msgid "unable to parse command-line config" msgstr "не удалось разобрать конфигурацию из командной строки" -#: config.c:2059 +#: config.c:2122 msgid "unknown error occurred while reading the configuration files" msgstr "произошла неизвестная ошибка при чтении файлов конфигурации" -#: config.c:2229 +#: config.c:2296 #, c-format msgid "Invalid %s: '%s'" msgstr "Недействительный %s: «%s»" -#: config.c:2272 -#, c-format -msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" -msgstr "неизвестное значение «%s» для core.untrackedCache; использую стандартное значение «keep»" - -#: config.c:2298 +#: config.c:2341 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "значение «%d» для splitIndex.maxPercentChange должно быть от 0 до 100" -#: config.c:2344 +#: config.c:2387 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "не удалось разобрать «%s» в конфигурации из командной строки" -#: config.c:2346 +#: config.c:2389 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "неправильная переменная конфигурации «%s» в файле «%s» на строке %d" -#: config.c:2427 +#: config.c:2473 #, c-format msgid "invalid section name '%s'" msgstr "" -#: config.c:2459 +#: config.c:2505 #, c-format msgid "%s has multiple values" msgstr "%s имеет несколько значений" -#: config.c:2488 +#: config.c:2534 #, c-format msgid "failed to write new configuration file %s" msgstr "" -#: config.c:2740 config.c:3064 +#: config.c:2786 config.c:3112 #, c-format msgid "could not lock config file %s" msgstr "" -#: config.c:2751 +#: config.c:2797 #, c-format msgid "opening %s" msgstr "" -#: config.c:2786 builtin/config.c:328 +#: config.c:2834 builtin/config.c:361 #, c-format msgid "invalid pattern: %s" msgstr "" -#: config.c:2811 +#: config.c:2859 #, c-format msgid "invalid config file %s" msgstr "" -#: config.c:2824 config.c:3077 +#: config.c:2872 config.c:3125 #, c-format msgid "fstat on %s failed" msgstr "сбой при выполнении fstat на файле %s" -#: config.c:2835 +#: config.c:2883 #, c-format msgid "unable to mmap '%s'" msgstr "" -#: config.c:2844 config.c:3082 +#: config.c:2892 config.c:3130 #, c-format msgid "chmod on %s failed" msgstr "" -#: config.c:2929 config.c:3179 +#: config.c:2977 config.c:3227 #, c-format msgid "could not write config file %s" msgstr "" -#: config.c:2963 +#: config.c:3011 #, c-format msgid "could not set '%s' to '%s'" msgstr "не удалось установить «%s» в «%s»" -#: config.c:2965 builtin/remote.c:782 +#: config.c:3013 builtin/remote.c:657 builtin/remote.c:855 +#: builtin/remote.c:863 #, c-format msgid "could not unset '%s'" msgstr "не удалось сбросить значение для «%s»" -#: config.c:3055 +#: config.c:3103 #, c-format msgid "invalid section name: %s" msgstr "" -#: config.c:3222 +#: config.c:3270 #, c-format msgid "missing value for '%s'" msgstr "" @@ -1849,79 +2597,88 @@ msgstr "Не удалось прочитать из внешнего репоз msgid "server doesn't support '%s'" msgstr "" -#: connect.c:103 +#: connect.c:118 #, c-format msgid "server doesn't support feature '%s'" msgstr "" -#: connect.c:114 +#: connect.c:129 msgid "expected flush after capabilities" msgstr "" -#: connect.c:233 +#: connect.c:263 #, c-format msgid "ignoring capabilities after first line '%s'" msgstr "" -#: connect.c:252 +#: connect.c:284 msgid "protocol error: unexpected capabilities^{}" msgstr "" -#: connect.c:273 +#: connect.c:306 #, c-format msgid "protocol error: expected shallow sha-1, got '%s'" msgstr "" -#: connect.c:275 +#: connect.c:308 msgid "repository on the other end cannot be shallow" msgstr "" -#: connect.c:313 +#: connect.c:347 msgid "invalid packet" msgstr "" -#: connect.c:333 +#: connect.c:367 #, c-format msgid "protocol error: unexpected '%s'" msgstr "" -#: connect.c:441 +#: connect.c:473 +#, c-format +msgid "unknown object format '%s' specified by server" +msgstr "" + +#: connect.c:500 #, c-format msgid "invalid ls-refs response: %s" msgstr "" -#: connect.c:445 +#: connect.c:504 msgid "expected flush after ref listing" msgstr "" -#: connect.c:544 +#: connect.c:507 +msgid "expected response end packet after ref listing" +msgstr "" + +#: connect.c:640 #, c-format msgid "protocol '%s' is not supported" msgstr "" -#: connect.c:595 +#: connect.c:691 msgid "unable to set SO_KEEPALIVE on socket" msgstr "" -#: connect.c:635 connect.c:698 +#: connect.c:731 connect.c:794 #, c-format msgid "Looking up %s ... " msgstr "" -#: connect.c:639 +#: connect.c:735 #, c-format msgid "unable to look up %s (port %s) (%s)" msgstr "" #. TRANSLATORS: this is the end of "Looking up %s ... " -#: connect.c:643 connect.c:714 +#: connect.c:739 connect.c:810 #, c-format msgid "" "done.\n" "Connecting to %s (port %s) ... " msgstr "" -#: connect.c:665 connect.c:742 +#: connect.c:761 connect.c:838 #, c-format msgid "" "unable to connect to %s:\n" @@ -1929,116 +2686,116 @@ msgid "" msgstr "" #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... " -#: connect.c:671 connect.c:748 +#: connect.c:767 connect.c:844 msgid "done." msgstr "" -#: connect.c:702 +#: connect.c:798 #, c-format msgid "unable to look up %s (%s)" msgstr "" -#: connect.c:708 +#: connect.c:804 #, c-format msgid "unknown port %s" msgstr "" -#: connect.c:845 connect.c:1171 +#: connect.c:941 connect.c:1271 #, c-format msgid "strange hostname '%s' blocked" msgstr "" -#: connect.c:847 +#: connect.c:943 #, c-format msgid "strange port '%s' blocked" msgstr "" -#: connect.c:857 +#: connect.c:953 #, c-format msgid "cannot start proxy %s" msgstr "" -#: connect.c:924 +#: connect.c:1024 msgid "no path specified; see 'git help pull' for valid url syntax" msgstr "" -#: connect.c:1119 +#: connect.c:1219 msgid "ssh variant 'simple' does not support -4" msgstr "" -#: connect.c:1131 +#: connect.c:1231 msgid "ssh variant 'simple' does not support -6" msgstr "" -#: connect.c:1148 +#: connect.c:1248 msgid "ssh variant 'simple' does not support setting port" msgstr "" -#: connect.c:1260 +#: connect.c:1360 #, c-format msgid "strange pathname '%s' blocked" msgstr "" -#: connect.c:1307 +#: connect.c:1408 msgid "unable to fork" msgstr "" -#: connected.c:85 builtin/fsck.c:221 builtin/prune.c:43 +#: connected.c:108 builtin/fsck.c:209 builtin/prune.c:45 msgid "Checking connectivity" msgstr "Проверка соединения" -#: connected.c:97 +#: connected.c:120 msgid "Could not run 'git rev-list'" msgstr "Не удалось запустить «git rev-list»" -#: connected.c:117 +#: connected.c:144 msgid "failed write to rev-list" msgstr "сбой записи в rev-list" -#: connected.c:124 +#: connected.c:149 msgid "failed to close rev-list's stdin" msgstr "сбой закрытия стандартного ввода у rev-list" -#: convert.c:193 +#: convert.c:194 #, c-format msgid "illegal crlf_action %d" msgstr "" -#: convert.c:206 +#: convert.c:207 #, c-format msgid "CRLF would be replaced by LF in %s" msgstr "" -#: convert.c:208 +#: convert.c:209 #, c-format msgid "" "CRLF will be replaced by LF in %s.\n" "The file will have its original line endings in your working directory" msgstr "" -#: convert.c:216 +#: convert.c:217 #, c-format msgid "LF would be replaced by CRLF in %s" msgstr "LF будет заменен на CRLF в %s" -#: convert.c:218 +#: convert.c:219 #, c-format msgid "" "LF will be replaced by CRLF in %s.\n" "The file will have its original line endings in your working directory" msgstr "" -#: convert.c:279 +#: convert.c:284 #, c-format msgid "BOM is prohibited in '%s' if encoded as %s" msgstr "BOM запрещен в «%s», если кодируется как %s" -#: convert.c:286 +#: convert.c:291 #, c-format msgid "" -"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as " +"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as " "working-tree-encoding." -msgstr "Файл «%s» содержит маркер последовательности байтов (BOM). Используйте UTF-%s как кодировку рабочего каталога." +msgstr "" #: convert.c:304 #, c-format @@ -2052,75 +2809,103 @@ msgid "" "UTF-%sLE (depending on the byte order) as working-tree-encoding." msgstr "Файл «%s» не содержит маркер последовательности байтов (BOM). Используйте UTF-%sBE или UTF-%sLE (в зависимости от порядка байтов) как кодировку рабочего каталога." -#: convert.c:424 convert.c:495 +#: convert.c:419 convert.c:490 #, c-format msgid "failed to encode '%s' from %s to %s" msgstr "не удалось перекодировать «%s» из %s в %s" -#: convert.c:467 +#: convert.c:462 #, c-format msgid "encoding '%s' from %s to %s and back is not the same" msgstr "перекодирование «%s» из %s в %s и обратно не одно и то же" -#: convert.c:673 +#: convert.c:665 #, c-format msgid "cannot fork to run external filter '%s'" msgstr "" -#: convert.c:693 +#: convert.c:685 #, c-format msgid "cannot feed the input to external filter '%s'" msgstr "" -#: convert.c:700 +#: convert.c:692 #, c-format msgid "external filter '%s' failed %d" msgstr "" -#: convert.c:735 convert.c:738 +#: convert.c:727 convert.c:730 #, c-format msgid "read from external filter '%s' failed" msgstr "" -#: convert.c:741 convert.c:796 +#: convert.c:733 convert.c:788 #, c-format msgid "external filter '%s' failed" msgstr "" -#: convert.c:844 +#: convert.c:837 msgid "unexpected filter type" msgstr "" -#: convert.c:855 +#: convert.c:848 msgid "path name too long for external filter" msgstr "" -#: convert.c:929 +#: convert.c:940 #, c-format msgid "" "external filter '%s' is not available anymore although not all paths have " "been filtered" msgstr "" -#: convert.c:1228 +#: convert.c:1240 msgid "true/false are no valid working-tree-encodings" msgstr "true/false не является допустимым значением для working-tree-encoding" -#: convert.c:1398 convert.c:1432 +#: convert.c:1428 convert.c:1462 #, c-format msgid "%s: clean filter '%s' failed" msgstr "" -#: convert.c:1476 +#: convert.c:1508 #, c-format msgid "%s: smudge filter %s failed" msgstr "" -#: date.c:137 +#: credential.c:96 +#, c-format +msgid "skipping credential lookup for key: credential.%s" +msgstr "" + +#: credential.c:112 +msgid "refusing to work with credential missing host field" +msgstr "" + +#: credential.c:114 +msgid "refusing to work with credential missing protocol field" +msgstr "" + +#: credential.c:394 +#, c-format +msgid "url contains a newline in its %s component: %s" +msgstr "" + +#: credential.c:438 +#, c-format +msgid "url has no scheme: %s" +msgstr "" + +#: credential.c:511 +#, c-format +msgid "credential url cannot be parsed: %s" +msgstr "" + +#: date.c:138 msgid "in the future" msgstr "в будущем" -#: date.c:143 +#: date.c:144 #, c-format msgid "%<PRIuMAX> second ago" msgid_plural "%<PRIuMAX> seconds ago" @@ -2129,7 +2914,7 @@ msgstr[1] "%<PRIuMAX> секунды назад" msgstr[2] "%<PRIuMAX> секунд назад" msgstr[3] "%<PRIuMAX> секунды назад" -#: date.c:150 +#: date.c:151 #, c-format msgid "%<PRIuMAX> minute ago" msgid_plural "%<PRIuMAX> minutes ago" @@ -2138,7 +2923,7 @@ msgstr[1] "%<PRIuMAX> минуты назад" msgstr[2] "%<PRIuMAX> минут назад" msgstr[3] "%<PRIuMAX> минуты назад" -#: date.c:157 +#: date.c:158 #, c-format msgid "%<PRIuMAX> hour ago" msgid_plural "%<PRIuMAX> hours ago" @@ -2147,7 +2932,7 @@ msgstr[1] "%<PRIuMAX> часа назад" msgstr[2] "%<PRIuMAX> часов назад" msgstr[3] "%<PRIuMAX> часа назад" -#: date.c:164 +#: date.c:165 #, c-format msgid "%<PRIuMAX> day ago" msgid_plural "%<PRIuMAX> days ago" @@ -2156,7 +2941,7 @@ msgstr[1] "%<PRIuMAX> дня назад" msgstr[2] "%<PRIuMAX> дней назад" msgstr[3] "%<PRIuMAX> дня назад" -#: date.c:170 +#: date.c:171 #, c-format msgid "%<PRIuMAX> week ago" msgid_plural "%<PRIuMAX> weeks ago" @@ -2165,7 +2950,7 @@ msgstr[1] "%<PRIuMAX> недели назад" msgstr[2] "%<PRIuMAX> недель назад" msgstr[3] "%<PRIuMAX> недели назад" -#: date.c:177 +#: date.c:178 #, c-format msgid "%<PRIuMAX> month ago" msgid_plural "%<PRIuMAX> months ago" @@ -2174,7 +2959,7 @@ msgstr[1] "%<PRIuMAX> месяца назад" msgstr[2] "%<PRIuMAX> месяцев назад" msgstr[3] "%<PRIuMAX> месяца назад" -#: date.c:188 +#: date.c:189 #, c-format msgid "%<PRIuMAX> year" msgid_plural "%<PRIuMAX> years" @@ -2184,7 +2969,7 @@ msgstr[2] "%<PRIuMAX> лет" msgstr[3] "%<PRIuMAX> года" #. TRANSLATORS: "%s" is "<n> years" -#: date.c:191 +#: date.c:192 #, c-format msgid "%s, %<PRIuMAX> month ago" msgid_plural "%s, %<PRIuMAX> months ago" @@ -2193,7 +2978,7 @@ msgstr[1] "%s, %<PRIuMAX> месяца назад" msgstr[2] "%s, %<PRIuMAX> месяцев назад" msgstr[3] "%s, %<PRIuMAX> месяца назад" -#: date.c:196 date.c:201 +#: date.c:197 date.c:202 #, c-format msgid "%<PRIuMAX> year ago" msgid_plural "%<PRIuMAX> years ago" @@ -2221,19 +3006,30 @@ msgstr "" msgid "island regex from config has too many capture groups (max=%d)" msgstr "" -#: delta-islands.c:466 +#: delta-islands.c:467 #, c-format msgid "Marked %d islands, done.\n" msgstr "" -#: diffcore-order.c:24 -#, c-format -msgid "failed to read orderfile '%s'" -msgstr "сбой чтения orderfile «%s»" +#: diff-lib.c:534 +msgid "--merge-base does not work with ranges" +msgstr "" -#: diffcore-rename.c:544 -msgid "Performing inexact rename detection" -msgstr "Выполняется неточное определение переименования" +#: diff-lib.c:536 +msgid "--merge-base only works with commits" +msgstr "" + +#: diff-lib.c:553 +msgid "unable to get HEAD" +msgstr "" + +#: diff-lib.c:560 +msgid "no merge base found" +msgstr "" + +#: diff-lib.c:562 +msgid "multiple merge bases found" +msgstr "" #: diff-no-index.c:238 msgid "git diff --no-index [<options>] <path> <path>" @@ -2245,615 +3041,652 @@ msgid "" "tree" msgstr "" -#: diff.c:155 +#: diff.c:156 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr " Сбой разбора величины среза (cut-off) у dirstat «%s»\n" -#: diff.c:160 +#: diff.c:161 #, c-format msgid " Unknown dirstat parameter '%s'\n" -msgstr "Неизвестный параметр dirstat: «%s»\n" +msgstr " Неизвестный параметр dirstat: «%s»\n" -#: diff.c:296 +#: diff.c:297 msgid "" "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', " "'dimmed-zebra', 'plain'" msgstr "" -#: diff.c:324 +#: diff.c:325 #, c-format msgid "" "unknown color-moved-ws mode '%s', possible values are 'ignore-space-change'," " 'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'" msgstr "" -#: diff.c:332 +#: diff.c:333 msgid "" "color-moved-ws: allow-indentation-change cannot be combined with other " "whitespace modes" msgstr "" -#: diff.c:405 +#: diff.c:410 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "Неизвестное значения для переменной «diff.submodule»: «%s»" -#: diff.c:465 +#: diff.c:470 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" "%s" msgstr "Найдены ошибки в переменной «diff.dirstat»:\n%s" -#: diff.c:4210 +#: diff.c:4276 #, c-format msgid "external diff died, stopping at %s" msgstr "критическая ошибка при внешнем сравнении, останов на %s" -#: diff.c:4555 +#: diff.c:4625 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-only, --name-status, --check и -s нельзя использовать одновременно" -#: diff.c:4558 +#: diff.c:4628 msgid "-G, -S and --find-object are mutually exclusive" msgstr "-G, -S и --find-object нельзя использовать одновременно" -#: diff.c:4636 +#: diff.c:4707 msgid "--follow requires exactly one pathspec" msgstr "--follow требует ровно одного спецификатора пути" -#: diff.c:4684 +#: diff.c:4755 #, c-format msgid "invalid --stat value: %s" msgstr "" -#: diff.c:4689 diff.c:4694 diff.c:4699 diff.c:4704 diff.c:5217 -#: parse-options.c:199 parse-options.c:203 +#: diff.c:4760 diff.c:4765 diff.c:4770 diff.c:4775 diff.c:5303 +#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180 #, c-format msgid "%s expects a numerical value" msgstr "" -#: diff.c:4721 +#: diff.c:4792 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" "%s" msgstr "Сбой разбора параметра опции --dirstat/-X :\n%s" -#: diff.c:4806 +#: diff.c:4877 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "" -#: diff.c:4830 +#: diff.c:4901 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "" -#: diff.c:4844 +#: diff.c:4915 #, c-format msgid "unable to resolve '%s'" msgstr "" -#: diff.c:4894 diff.c:4900 +#: diff.c:4965 diff.c:4971 #, c-format msgid "%s expects <n>/<m> form" msgstr "" -#: diff.c:4912 +#: diff.c:4983 #, c-format msgid "%s expects a character, got '%s'" msgstr "" -#: diff.c:4933 +#: diff.c:5004 #, c-format msgid "bad --color-moved argument: %s" msgstr "" -#: diff.c:4952 +#: diff.c:5023 #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "" -#: diff.c:4992 +#: diff.c:5063 msgid "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and \"histogram\"" msgstr "" -#: diff.c:5028 diff.c:5048 +#: diff.c:5099 diff.c:5119 #, c-format msgid "invalid argument to %s" msgstr "" -#: diff.c:5186 +#: diff.c:5223 +#, c-format +msgid "invalid regex given to -I: '%s'" +msgstr "" + +#: diff.c:5272 #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "" -#: diff.c:5242 +#: diff.c:5328 #, c-format msgid "bad --word-diff argument: %s" msgstr "" -#: diff.c:5265 +#: diff.c:5351 msgid "Diff output format options" msgstr "" -#: diff.c:5267 diff.c:5273 +#: diff.c:5353 diff.c:5359 msgid "generate patch" msgstr "" -#: diff.c:5270 builtin/log.c:167 +#: diff.c:5356 builtin/log.c:178 msgid "suppress diff output" msgstr "не выводить список изменений" -#: diff.c:5275 diff.c:5389 diff.c:5396 +#: diff.c:5361 diff.c:5475 diff.c:5482 msgid "<n>" msgstr "" -#: diff.c:5276 diff.c:5279 +#: diff.c:5362 diff.c:5365 msgid "generate diffs with <n> lines context" msgstr "" -#: diff.c:5281 +#: diff.c:5367 msgid "generate the diff in raw format" msgstr "" -#: diff.c:5284 +#: diff.c:5370 msgid "synonym for '-p --raw'" msgstr "" -#: diff.c:5288 +#: diff.c:5374 msgid "synonym for '-p --stat'" msgstr "" -#: diff.c:5292 +#: diff.c:5378 msgid "machine friendly --stat" msgstr "" -#: diff.c:5295 +#: diff.c:5381 msgid "output only the last line of --stat" msgstr "" -#: diff.c:5297 diff.c:5305 +#: diff.c:5383 diff.c:5391 msgid "<param1,param2>..." msgstr "" -#: diff.c:5298 +#: diff.c:5384 msgid "" "output the distribution of relative amount of changes for each sub-directory" msgstr "" -#: diff.c:5302 +#: diff.c:5388 msgid "synonym for --dirstat=cumulative" msgstr "" -#: diff.c:5306 +#: diff.c:5392 msgid "synonym for --dirstat=files,param1,param2..." msgstr "" -#: diff.c:5310 +#: diff.c:5396 msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "" -#: diff.c:5313 +#: diff.c:5399 msgid "condensed summary such as creations, renames and mode changes" msgstr "краткая сводка изменений, вроде созданий, переименований или изменений режима доступа" -#: diff.c:5316 +#: diff.c:5402 msgid "show only names of changed files" msgstr "" -#: diff.c:5319 +#: diff.c:5405 msgid "show only names and status of changed files" msgstr "" -#: diff.c:5321 +#: diff.c:5407 msgid "<width>[,<name-width>[,<count>]]" msgstr "" -#: diff.c:5322 +#: diff.c:5408 msgid "generate diffstat" msgstr "" -#: diff.c:5324 diff.c:5327 diff.c:5330 +#: diff.c:5410 diff.c:5413 diff.c:5416 msgid "<width>" msgstr "" -#: diff.c:5325 +#: diff.c:5411 msgid "generate diffstat with a given width" msgstr "" -#: diff.c:5328 +#: diff.c:5414 msgid "generate diffstat with a given name width" msgstr "" -#: diff.c:5331 +#: diff.c:5417 msgid "generate diffstat with a given graph width" msgstr "" -#: diff.c:5333 +#: diff.c:5419 msgid "<count>" msgstr "" -#: diff.c:5334 +#: diff.c:5420 msgid "generate diffstat with limited lines" msgstr "" -#: diff.c:5337 +#: diff.c:5423 msgid "generate compact summary in diffstat" -msgstr "генерация компактной сводки изменений в diffstat" +msgstr "генерация компактной сводки в diffstat" -#: diff.c:5340 +#: diff.c:5426 msgid "output a binary diff that can be applied" msgstr "" -#: diff.c:5343 +#: diff.c:5429 msgid "show full pre- and post-image object names on the \"index\" lines" msgstr "" -#: diff.c:5345 +#: diff.c:5431 msgid "show colored diff" msgstr "" -#: diff.c:5346 +#: diff.c:5432 msgid "<kind>" msgstr "" -#: diff.c:5347 +#: diff.c:5433 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" msgstr "" -#: diff.c:5350 +#: diff.c:5436 msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or " "--numstat" msgstr "" -#: diff.c:5353 diff.c:5356 diff.c:5359 diff.c:5465 +#: diff.c:5439 diff.c:5442 diff.c:5445 diff.c:5554 msgid "<prefix>" msgstr "" -#: diff.c:5354 +#: diff.c:5440 msgid "show the given source prefix instead of \"a/\"" msgstr "" -#: diff.c:5357 +#: diff.c:5443 msgid "show the given destination prefix instead of \"b/\"" msgstr "" -#: diff.c:5360 +#: diff.c:5446 msgid "prepend an additional prefix to every line of output" msgstr "" -#: diff.c:5363 +#: diff.c:5449 msgid "do not show any source or destination prefix" msgstr "" -#: diff.c:5366 +#: diff.c:5452 msgid "show context between diff hunks up to the specified number of lines" msgstr "" -#: diff.c:5370 diff.c:5375 diff.c:5380 +#: diff.c:5456 diff.c:5461 diff.c:5466 msgid "<char>" msgstr "" -#: diff.c:5371 +#: diff.c:5457 msgid "specify the character to indicate a new line instead of '+'" msgstr "" -#: diff.c:5376 +#: diff.c:5462 msgid "specify the character to indicate an old line instead of '-'" msgstr "" -#: diff.c:5381 +#: diff.c:5467 msgid "specify the character to indicate a context instead of ' '" msgstr "" -#: diff.c:5384 +#: diff.c:5470 msgid "Diff rename options" msgstr "" -#: diff.c:5385 +#: diff.c:5471 msgid "<n>[/<m>]" msgstr "" -#: diff.c:5386 +#: diff.c:5472 msgid "break complete rewrite changes into pairs of delete and create" msgstr "" -#: diff.c:5390 +#: diff.c:5476 msgid "detect renames" msgstr "" -#: diff.c:5394 +#: diff.c:5480 msgid "omit the preimage for deletes" msgstr "" -#: diff.c:5397 +#: diff.c:5483 msgid "detect copies" msgstr "" -#: diff.c:5401 +#: diff.c:5487 msgid "use unmodified files as source to find copies" msgstr "" -#: diff.c:5403 +#: diff.c:5489 msgid "disable rename detection" msgstr "" -#: diff.c:5406 +#: diff.c:5492 msgid "use empty blobs as rename source" msgstr "" -#: diff.c:5408 +#: diff.c:5494 msgid "continue listing the history of a file beyond renames" msgstr "" -#: diff.c:5411 +#: diff.c:5497 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" msgstr "" -#: diff.c:5413 +#: diff.c:5499 msgid "Diff algorithm options" msgstr "" -#: diff.c:5415 +#: diff.c:5501 msgid "produce the smallest possible diff" msgstr "" -#: diff.c:5418 +#: diff.c:5504 msgid "ignore whitespace when comparing lines" msgstr "" -#: diff.c:5421 +#: diff.c:5507 msgid "ignore changes in amount of whitespace" msgstr "" -#: diff.c:5424 +#: diff.c:5510 msgid "ignore changes in whitespace at EOL" msgstr "" -#: diff.c:5427 +#: diff.c:5513 msgid "ignore carrier-return at the end of line" msgstr "" -#: diff.c:5430 +#: diff.c:5516 msgid "ignore changes whose lines are all blank" msgstr "" -#: diff.c:5433 +#: diff.c:5518 diff.c:5540 diff.c:5543 diff.c:5588 +msgid "<regex>" +msgstr "" + +#: diff.c:5519 +msgid "ignore changes whose all lines match <regex>" +msgstr "" + +#: diff.c:5522 msgid "heuristic to shift diff hunk boundaries for easy reading" msgstr "" -#: diff.c:5436 +#: diff.c:5525 msgid "generate diff using the \"patience diff\" algorithm" msgstr "" -#: diff.c:5440 +#: diff.c:5529 msgid "generate diff using the \"histogram diff\" algorithm" msgstr "" -#: diff.c:5442 +#: diff.c:5531 msgid "<algorithm>" msgstr "" -#: diff.c:5443 +#: diff.c:5532 msgid "choose a diff algorithm" msgstr "" -#: diff.c:5445 +#: diff.c:5534 msgid "<text>" msgstr "" -#: diff.c:5446 +#: diff.c:5535 msgid "generate diff using the \"anchored diff\" algorithm" msgstr "" -#: diff.c:5448 diff.c:5457 diff.c:5460 +#: diff.c:5537 diff.c:5546 diff.c:5549 msgid "<mode>" msgstr "" -#: diff.c:5449 +#: diff.c:5538 msgid "show word diff, using <mode> to delimit changed words" msgstr "" -#: diff.c:5451 diff.c:5454 diff.c:5499 -msgid "<regex>" -msgstr "" - -#: diff.c:5452 +#: diff.c:5541 msgid "use <regex> to decide what a word is" msgstr "" -#: diff.c:5455 +#: diff.c:5544 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" msgstr "" -#: diff.c:5458 +#: diff.c:5547 msgid "moved lines of code are colored differently" msgstr "" -#: diff.c:5461 +#: diff.c:5550 msgid "how white spaces are ignored in --color-moved" msgstr "" -#: diff.c:5464 +#: diff.c:5553 msgid "Other diff options" msgstr "" -#: diff.c:5466 +#: diff.c:5555 msgid "when run from subdir, exclude changes outside and show relative paths" msgstr "" -#: diff.c:5470 +#: diff.c:5559 msgid "treat all files as text" msgstr "" -#: diff.c:5472 +#: diff.c:5561 msgid "swap two inputs, reverse the diff" msgstr "" -#: diff.c:5474 +#: diff.c:5563 msgid "exit with 1 if there were differences, 0 otherwise" msgstr "" -#: diff.c:5476 +#: diff.c:5565 msgid "disable all output of the program" msgstr "" -#: diff.c:5478 +#: diff.c:5567 msgid "allow an external diff helper to be executed" msgstr "" -#: diff.c:5480 +#: diff.c:5569 msgid "run external text conversion filters when comparing binary files" msgstr "" -#: diff.c:5482 +#: diff.c:5571 msgid "<when>" msgstr "" -#: diff.c:5483 +#: diff.c:5572 msgid "ignore changes to submodules in the diff generation" msgstr "" -#: diff.c:5486 +#: diff.c:5575 msgid "<format>" msgstr "" -#: diff.c:5487 +#: diff.c:5576 msgid "specify how differences in submodules are shown" msgstr "" -#: diff.c:5491 +#: diff.c:5580 msgid "hide 'git add -N' entries from the index" msgstr "" -#: diff.c:5494 +#: diff.c:5583 msgid "treat 'git add -N' entries as real in the index" msgstr "" -#: diff.c:5496 +#: diff.c:5585 msgid "<string>" msgstr "" -#: diff.c:5497 +#: diff.c:5586 msgid "" "look for differences that change the number of occurrences of the specified " "string" msgstr "" -#: diff.c:5500 +#: diff.c:5589 msgid "" "look for differences that change the number of occurrences of the specified " "regex" msgstr "" -#: diff.c:5503 +#: diff.c:5592 msgid "show all changes in the changeset with -S or -G" msgstr "" -#: diff.c:5506 +#: diff.c:5595 msgid "treat <string> in -S as extended POSIX regular expression" msgstr "" -#: diff.c:5509 +#: diff.c:5598 msgid "control the order in which files appear in the output" msgstr "" -#: diff.c:5510 +#: diff.c:5599 msgid "<object-id>" msgstr "" -#: diff.c:5511 +#: diff.c:5600 msgid "" "look for differences that change the number of occurrences of the specified " "object" msgstr "" -#: diff.c:5513 +#: diff.c:5602 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "" -#: diff.c:5514 +#: diff.c:5603 msgid "select files by diff type" msgstr "" -#: diff.c:5516 +#: diff.c:5605 msgid "<file>" msgstr "" -#: diff.c:5517 +#: diff.c:5606 msgid "Output to a specific file" msgstr "" -#: diff.c:6150 +#: diff.c:6263 msgid "inexact rename detection was skipped due to too many files." msgstr "неточное определение переименования было пропущено из-за слишком большого количества файлов." -#: diff.c:6153 +#: diff.c:6266 msgid "only found copies from modified paths due to too many files." msgstr "найдены только копии из измененных путей из-за слишком большого количества файлов." -#: diff.c:6156 +#: diff.c:6269 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." msgstr "возможно вы захотите установить переменную %s в как минимум значение %d и повторить вызов команды." -#: dir.c:537 +#: diffcore-order.c:24 +#, c-format +msgid "failed to read orderfile '%s'" +msgstr "сбой чтения orderfile «%s»" + +#: diffcore-rename.c:592 +msgid "Performing inexact rename detection" +msgstr "Выполняется неточное определение переименования" + +#: dir.c:578 #, c-format msgid "pathspec '%s' did not match any file(s) known to git" msgstr "" -#: dir.c:926 +#: dir.c:718 dir.c:747 dir.c:760 +#, c-format +msgid "unrecognized pattern: '%s'" +msgstr "" + +#: dir.c:777 dir.c:791 +#, c-format +msgid "unrecognized negative pattern: '%s'" +msgstr "" + +#: dir.c:809 +#, c-format +msgid "your sparse-checkout file may have issues: pattern '%s' is repeated" +msgstr "" + +#: dir.c:819 +msgid "disabling cone pattern matching" +msgstr "" + +#: dir.c:1198 #, c-format msgid "cannot use %s as an exclude file" msgstr "" -#: dir.c:1843 +#: dir.c:2305 #, c-format msgid "could not open directory '%s'" msgstr "не удалось открыть каталог «%s»" -#: dir.c:2085 +#: dir.c:2605 msgid "failed to get kernel name and information" msgstr "не удалось получить имя ядра и информацию" -#: dir.c:2209 +#: dir.c:2729 msgid "untracked cache is disabled on this system or location" msgstr "" -#: dir.c:3013 +#: dir.c:3520 #, c-format msgid "index file corrupt in repo %s" msgstr "" -#: dir.c:3058 dir.c:3063 +#: dir.c:3565 dir.c:3570 #, c-format msgid "could not create directories for %s" msgstr "не удалось создать каталоги для %s" -#: dir.c:3092 +#: dir.c:3599 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "не удалось переместить каталог git с «%s» в «%s»" -#: editor.c:73 +#: editor.c:74 #, c-format msgid "hint: Waiting for your editor to close the file...%c" msgstr "подсказка: Ожидание, пока вы закроете редактор с файлом…%c" -#: entry.c:178 +#: entry.c:177 msgid "Filtering content" msgstr "Фильтруется содержимое" -#: entry.c:476 +#: entry.c:478 #, c-format msgid "could not stat file '%s'" msgstr "не удалось выполнить stat для файла «%s»" @@ -2863,7 +3696,7 @@ msgstr "не удалось выполнить stat для файла «%s»" msgid "bad git namespace path \"%s\"" msgstr "" -#: environment.c:332 +#: environment.c:337 #, c-format msgid "could not set GIT_DIR to '%s'" msgstr "" @@ -2873,289 +3706,285 @@ msgstr "" msgid "too many args to run %s" msgstr "" -#: fetch-object.c:17 -msgid "Remote with no URL" -msgstr "Внешний репозиторий без URL" - -#: fetch-pack.c:151 +#: fetch-pack.c:177 msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack: ожидается передача списка для получение части" -#: fetch-pack.c:154 +#: fetch-pack.c:180 msgid "git fetch-pack: expected a flush packet after shallow list" msgstr "" -#: fetch-pack.c:165 +#: fetch-pack.c:191 msgid "git fetch-pack: expected ACK/NAK, got a flush packet" msgstr "git fetch-pack: ожидается ACK/NAK, а получен пустой пакет" -#: fetch-pack.c:185 +#: fetch-pack.c:211 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "git fetch-pack: ожидается ACK/NAK, а получено «%s»" -#: fetch-pack.c:196 +#: fetch-pack.c:222 msgid "unable to write to remote" msgstr "" -#: fetch-pack.c:258 +#: fetch-pack.c:283 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc требует multi_ack_detailed" -#: fetch-pack.c:360 fetch-pack.c:1271 +#: fetch-pack.c:378 fetch-pack.c:1406 #, c-format msgid "invalid shallow line: %s" msgstr "неправильная строка частичного получения: %s" -#: fetch-pack.c:366 fetch-pack.c:1277 +#: fetch-pack.c:384 fetch-pack.c:1412 #, c-format msgid "invalid unshallow line: %s" msgstr "неправильная строка полного получения: %s" -#: fetch-pack.c:368 fetch-pack.c:1279 +#: fetch-pack.c:386 fetch-pack.c:1414 #, c-format msgid "object not found: %s" msgstr "объект не найден: %s" -#: fetch-pack.c:371 fetch-pack.c:1282 +#: fetch-pack.c:389 fetch-pack.c:1417 #, c-format msgid "error in object: %s" msgstr "ошибка в объекте: %s" -#: fetch-pack.c:373 fetch-pack.c:1284 +#: fetch-pack.c:391 fetch-pack.c:1419 #, c-format msgid "no shallow found: %s" msgstr "частичный клон не найден: %s" -#: fetch-pack.c:376 fetch-pack.c:1288 +#: fetch-pack.c:394 fetch-pack.c:1423 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "ожидалось shallow/unshallow, а получено %s" -#: fetch-pack.c:417 +#: fetch-pack.c:434 #, c-format msgid "got %s %d %s" msgstr "получено %s %d %s" -#: fetch-pack.c:434 +#: fetch-pack.c:451 #, c-format msgid "invalid commit %s" msgstr "недопустимый коммит %s" -#: fetch-pack.c:465 +#: fetch-pack.c:482 msgid "giving up" msgstr "останавливаю дальнейшие попытки" -#: fetch-pack.c:477 progress.c:284 +#: fetch-pack.c:495 progress.c:339 msgid "done" msgstr "готово" -#: fetch-pack.c:489 +#: fetch-pack.c:507 #, c-format msgid "got %s (%d) %s" msgstr "получено %s (%d) %s" -#: fetch-pack.c:535 +#: fetch-pack.c:543 #, c-format msgid "Marking %s as complete" msgstr "Помечаю %s как завершенный" -#: fetch-pack.c:744 +#: fetch-pack.c:758 #, c-format msgid "already have %s (%s)" msgstr "уже есть %s (%s)" -#: fetch-pack.c:783 +#: fetch-pack.c:827 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-pack: не удалось запустить программу разбора данных" -#: fetch-pack.c:791 +#: fetch-pack.c:835 msgid "protocol error: bad pack header" msgstr "ошибка протокола: неправильный заголовок потока" -#: fetch-pack.c:859 +#: fetch-pack.c:919 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-pack: не удалось запустить программу %s" -#: fetch-pack.c:875 +#: fetch-pack.c:937 #, c-format msgid "%s failed" msgstr "%s завершен с ошибкой" -#: fetch-pack.c:877 +#: fetch-pack.c:939 msgid "error in sideband demultiplexer" msgstr "произошла ошибка в программе разбора данных" -#: fetch-pack.c:906 -msgid "Server does not support shallow clients" -msgstr "Сервер не поддерживает клиентов с частичным клонированием" - -#: fetch-pack.c:910 -msgid "Server supports multi_ack_detailed" -msgstr "Сервер поддерживает multi_ack_detailed" - -#: fetch-pack.c:913 -msgid "Server supports no-done" -msgstr "Сервер поддерживает no-done" - -#: fetch-pack.c:919 -msgid "Server supports multi_ack" -msgstr "Сервер поддерживает multi_ack" - -#: fetch-pack.c:923 -msgid "Server supports side-band-64k" -msgstr "Сервер поддерживает side-band-64k" - -#: fetch-pack.c:927 -msgid "Server supports side-band" -msgstr "Сервер поддерживает side-band" - -#: fetch-pack.c:931 -msgid "Server supports allow-tip-sha1-in-want" -msgstr "Сервер поддерживает allow-tip-sha1-in-want" - -#: fetch-pack.c:935 -msgid "Server supports allow-reachable-sha1-in-want" -msgstr "Сервер поддерживает allow-reachable-sha1-in-want" - -#: fetch-pack.c:945 -msgid "Server supports ofs-delta" -msgstr "Сервер поддерживает ofs-delta" - -#: fetch-pack.c:951 fetch-pack.c:1144 -msgid "Server supports filter" -msgstr "Сервер поддерживает фильтрацию" - -#: fetch-pack.c:959 +#: fetch-pack.c:982 #, c-format msgid "Server version is %.*s" msgstr "Версия сервера %.*s" -#: fetch-pack.c:965 +#: fetch-pack.c:990 fetch-pack.c:996 fetch-pack.c:999 fetch-pack.c:1005 +#: fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017 fetch-pack.c:1021 +#: fetch-pack.c:1025 fetch-pack.c:1029 fetch-pack.c:1033 fetch-pack.c:1037 +#: fetch-pack.c:1043 fetch-pack.c:1049 fetch-pack.c:1054 fetch-pack.c:1059 +#, c-format +msgid "Server supports %s" +msgstr "" + +#: fetch-pack.c:992 +msgid "Server does not support shallow clients" +msgstr "Сервер не поддерживает клиентов с частичным клонированием" + +#: fetch-pack.c:1052 msgid "Server does not support --shallow-since" msgstr "Сервер не поддерживает --shallow-since" -#: fetch-pack.c:969 +#: fetch-pack.c:1057 msgid "Server does not support --shallow-exclude" msgstr "Сервер не поддерживает --shallow-exclude" -#: fetch-pack.c:971 +#: fetch-pack.c:1061 msgid "Server does not support --deepen" msgstr "Сервер не поддерживает --deepen" -#: fetch-pack.c:988 +#: fetch-pack.c:1063 +msgid "Server does not support this repository's object format" +msgstr "" + +#: fetch-pack.c:1076 msgid "no common commits" msgstr "не общих коммитов" -#: fetch-pack.c:1000 fetch-pack.c:1449 +#: fetch-pack.c:1088 fetch-pack.c:1628 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack: ошибка при получении данных." -#: fetch-pack.c:1138 +#: fetch-pack.c:1214 +#, c-format +msgid "mismatched algorithms: client %s; server %s" +msgstr "" + +#: fetch-pack.c:1218 +#, c-format +msgid "the server does not support algorithm '%s'" +msgstr "" + +#: fetch-pack.c:1238 msgid "Server does not support shallow requests" msgstr "Сервер не поддерживает частичные запросы" -#: fetch-pack.c:1171 +#: fetch-pack.c:1245 +msgid "Server supports filter" +msgstr "Сервер поддерживает фильтрацию" + +#: fetch-pack.c:1284 msgid "unable to write request to remote" msgstr "" -#: fetch-pack.c:1189 +#: fetch-pack.c:1302 #, c-format msgid "error reading section header '%s'" msgstr "" -#: fetch-pack.c:1195 +#: fetch-pack.c:1308 #, c-format msgid "expected '%s', received '%s'" msgstr "" -#: fetch-pack.c:1234 +#: fetch-pack.c:1369 #, c-format msgid "unexpected acknowledgment line: '%s'" msgstr "" -#: fetch-pack.c:1239 +#: fetch-pack.c:1374 #, c-format msgid "error processing acks: %d" msgstr "" -#: fetch-pack.c:1249 +#: fetch-pack.c:1384 msgid "expected packfile to be sent after 'ready'" msgstr "" -#: fetch-pack.c:1251 +#: fetch-pack.c:1386 msgid "expected no other sections to be sent after no 'ready'" msgstr "" -#: fetch-pack.c:1293 +#: fetch-pack.c:1428 #, c-format msgid "error processing shallow info: %d" msgstr "" -#: fetch-pack.c:1340 +#: fetch-pack.c:1475 #, c-format msgid "expected wanted-ref, got '%s'" msgstr "" -#: fetch-pack.c:1345 +#: fetch-pack.c:1480 #, c-format msgid "unexpected wanted-ref: '%s'" msgstr "" -#: fetch-pack.c:1350 +#: fetch-pack.c:1485 #, c-format msgid "error processing wanted refs: %d" msgstr "" -#: fetch-pack.c:1676 +#: fetch-pack.c:1515 +msgid "git fetch-pack: expected response end packet" +msgstr "" + +#: fetch-pack.c:1897 msgid "no matching remote head" msgstr "нет соотвествующего внешнего указателя на ветку" -#: fetch-pack.c:1699 builtin/clone.c:673 +#: fetch-pack.c:1920 builtin/clone.c:693 msgid "remote did not send all necessary objects" msgstr "внешний репозиторий прислал не все необходимые объекты" -#: fetch-pack.c:1726 +#: fetch-pack.c:1947 #, c-format msgid "no such remote ref %s" msgstr "нет такой внешней ссылки %s" -#: fetch-pack.c:1729 +#: fetch-pack.c:1950 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "Сервер не поддерживает запрос необъявленного объекта %s" -#: gpg-interface.c:318 -msgid "gpg failed to sign the data" -msgstr "gpg не удалось подписать данные" - -#: gpg-interface.c:344 +#: gpg-interface.c:272 msgid "could not create temporary file" msgstr "не удалось создать временный файл" -#: gpg-interface.c:347 +#: gpg-interface.c:275 #, c-format msgid "failed writing detached signature to '%s'" msgstr "сбой записи отсоединенной подписи в «%s»" -#: graph.c:97 +#: gpg-interface.c:457 +msgid "gpg failed to sign the data" +msgstr "gpg не удалось подписать данные" + +#: graph.c:98 #, c-format msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "игнорирую недопустимый цвет «%.*s» в log.graphColors" -#: grep.c:2113 +#: grep.c:640 +msgid "" +"given pattern contains NULL byte (via -f <file>). This is only supported " +"with -P under PCRE v2" +msgstr "" + +#: grep.c:2100 #, c-format msgid "'%s': unable to read %s" msgstr "«%s»: не удалось прочесть %s" -#: grep.c:2130 setup.c:164 builtin/clone.c:411 builtin/diff.c:82 +#: grep.c:2117 setup.c:176 builtin/clone.c:412 builtin/diff.c:89 #: builtin/rm.c:135 #, c-format msgid "failed to stat '%s'" msgstr "не удалось выполнить stat «%s»" -#: grep.c:2141 +#: grep.c:2128 #, c-format msgid "'%s': short read" msgstr "«%s»: слишком мало данных прочитано" @@ -3205,79 +4034,79 @@ msgid "Low-level Commands / Interrogators" msgstr "Низкоуровневые команды / Запросчики" #: help.c:37 -msgid "Low-level Commands / Synching Repositories" -msgstr "Низкоуровневые команды / Синхронизация репозиториев" +msgid "Low-level Commands / Syncing Repositories" +msgstr "" #: help.c:38 msgid "Low-level Commands / Internal Helpers" msgstr "Низкоуровневые команды / Внутренние вспомогательные" -#: help.c:298 +#: help.c:300 #, c-format msgid "available git commands in '%s'" msgstr "доступные команды git в «%s»" -#: help.c:305 +#: help.c:307 msgid "git commands available from elsewhere on your $PATH" msgstr "команды git, доступные в других местах вашего $PATH" -#: help.c:314 +#: help.c:316 msgid "These are common Git commands used in various situations:" msgstr "Стандартные команды Git используемые в различных ситуациях:" -#: help.c:363 git.c:97 +#: help.c:365 git.c:99 #, c-format msgid "unsupported command listing type '%s'" msgstr "неподдерживаемый тип списка команд «%s»" -#: help.c:403 -msgid "The common Git guides are:" -msgstr "Основные руководства Git:" +#: help.c:405 +msgid "The Git concept guides are:" +msgstr "" -#: help.c:512 +#: help.c:429 msgid "See 'git help <command>' to read about a specific subcommand" msgstr "Запустите «git help <команда>», чтобы прочесть о конкретной подкоманде" -#: help.c:517 +#: help.c:434 msgid "External commands" msgstr "" -#: help.c:532 +#: help.c:449 msgid "Command aliases" msgstr "" -#: help.c:596 +#: help.c:527 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" "able to execute it. Maybe git-%s is broken?" msgstr "«%s» похоже на команду git, но нам не удалось ее запустить. Возможно, git-%s не работает?" -#: help.c:655 +#: help.c:543 help.c:631 +#, c-format +msgid "git: '%s' is not a git command. See 'git --help'." +msgstr "git: «%s» не является командой git. Смотрите «git --help»." + +#: help.c:591 msgid "Uh oh. Your system reports no Git commands at all." msgstr "Ой-ёй! Ваша система не сообщает ни о каких командах Git вообще." -#: help.c:677 +#: help.c:613 #, c-format msgid "WARNING: You called a Git command named '%s', which does not exist." msgstr "Внимание: Вы запустили не существующую команду Git «%s»." -#: help.c:682 +#: help.c:618 #, c-format msgid "Continuing under the assumption that you meant '%s'." msgstr "Продолжаю, предполагая, что вы имели в виду «%s»." -#: help.c:687 +#: help.c:623 #, c-format msgid "Continuing in %0.1f seconds, assuming that you meant '%s'." msgstr "Продолжу через %0.1f секунд, предполагая, что вы имели в виду «%s»." -#: help.c:695 -#, c-format -msgid "git: '%s' is not a git command. See 'git --help'." -msgstr "git: «%s» не является командой git. Смотрите «git --help»." - -#: help.c:699 +#: help.c:635 msgid "" "\n" "The most similar command is" @@ -3289,16 +4118,16 @@ msgstr[1] "\nСамые похожие команды:" msgstr[2] "\nСамые похожие команды:" msgstr[3] "\nСамые похожие команды:" -#: help.c:714 +#: help.c:675 msgid "git version [<options>]" msgstr "git version [<options>]" -#: help.c:782 +#: help.c:730 #, c-format msgid "%s: %s - %s" msgstr "%s: %s — %s" -#: help.c:786 +#: help.c:734 msgid "" "\n" "Did you mean this?" @@ -3310,7 +4139,15 @@ msgstr[1] "\nВозможно, вы имели в виду что-то из эт msgstr[2] "\nВозможно, вы имели в виду что-то из этого?" msgstr[3] "\nВозможно, вы имели в виду что-то из этого?" -#: ident.c:349 +#: ident.c:353 +msgid "Author identity unknown\n" +msgstr "" + +#: ident.c:356 +msgid "Committer identity unknown\n" +msgstr "" + +#: ident.c:362 msgid "" "\n" "*** Please tell me who you are.\n" @@ -3325,71 +4162,95 @@ msgid "" "\n" msgstr "\n*** Пожалуйста, скажите мне кто вы есть.\n\nЗапустите\n\n git config --global user.email \"you@example.com\"\n git config --global user.name \"Ваше Имя\"\n\nдля указания идентификационных данных аккаунта по умолчанию.\nПропустите параметр --global для указания данных только для этого репозитория.\n\n" -#: ident.c:379 +#: ident.c:397 msgid "no email was given and auto-detection is disabled" msgstr "адрес электронной почты не указан и автоопределение отключено" -#: ident.c:384 +#: ident.c:402 #, c-format msgid "unable to auto-detect email address (got '%s')" msgstr "не удалось выполнить автоопределение адреса электронной почты (получено «%s»)" -#: ident.c:401 +#: ident.c:419 msgid "no name was given and auto-detection is disabled" msgstr "имя не указано и автоопределение отключено" -#: ident.c:407 +#: ident.c:425 #, c-format msgid "unable to auto-detect name (got '%s')" msgstr "не удалось выполнить автоопределение имени (получено «%s»)" -#: ident.c:415 +#: ident.c:433 #, c-format msgid "empty ident name (for <%s>) not allowed" msgstr "пустое имя идентификатора (для <%s>) не разрешено" -#: ident.c:421 +#: ident.c:439 #, c-format msgid "name consists only of disallowed characters: %s" msgstr "имя состоит только из неразрешенных симоволов: %s" -#: ident.c:436 builtin/commit.c:608 +#: ident.c:454 builtin/commit.c:634 #, c-format msgid "invalid date format: %s" msgstr "неправильный формат даты: %s" -#: list-objects.c:129 -#, c-format -msgid "entry '%s' in tree %s has tree mode, but is not a tree" +#: list-objects-filter-options.c:81 +msgid "expected 'tree:<depth>'" +msgstr "" + +#: list-objects-filter-options.c:96 +msgid "sparse:path filters support has been dropped" msgstr "" -#: list-objects.c:142 +#: list-objects-filter-options.c:109 #, c-format -msgid "entry '%s' in tree %s has blob mode, but is not a blob" +msgid "invalid filter-spec '%s'" msgstr "" -#: list-objects.c:378 +#: list-objects-filter-options.c:125 #, c-format -msgid "unable to load root tree for commit %s" +msgid "must escape char in sub-filter-spec: '%c'" +msgstr "" + +#: list-objects-filter-options.c:167 +msgid "expected something after combine:" msgstr "" -#: list-objects-filter-options.c:36 +#: list-objects-filter-options.c:249 msgid "multiple filter-specs cannot be combined" msgstr "невозможно объединять фильтрацию с помощью нескольких спецификаций" -#: list-objects-filter-options.c:58 -msgid "expected 'tree:<depth>'" +#: list-objects-filter-options.c:361 +msgid "unable to upgrade repository format to support partial clone" msgstr "" -#: list-objects-filter-options.c:84 -msgid "sparse:path filters support has been dropped" +#: list-objects-filter.c:492 +#, c-format +msgid "unable to access sparse blob in '%s'" +msgstr "" + +#: list-objects-filter.c:495 +#, c-format +msgid "unable to parse sparse filter data in %s" msgstr "" -#: list-objects-filter-options.c:158 -msgid "cannot change partial clone promisor remote" -msgstr "нельзя изменить внешний репозиторий при частичном клонировании" +#: list-objects.c:127 +#, c-format +msgid "entry '%s' in tree %s has tree mode, but is not a tree" +msgstr "" + +#: list-objects.c:140 +#, c-format +msgid "entry '%s' in tree %s has blob mode, but is not a blob" +msgstr "" -#: lockfile.c:151 +#: list-objects.c:375 +#, c-format +msgid "unable to load root tree for commit %s" +msgstr "" + +#: lockfile.c:152 #, c-format msgid "" "Unable to create '%s.lock': %s.\n" @@ -3401,123 +4262,125 @@ msgid "" "remove the file manually to continue." msgstr "Не удалось создать «%s.lock»: %s.\n\nПохоже, что другой процесс git запущен в этом репозитории,\nнапример редактор открыт из «git commit». Пожалуйста, убедитесь,\nчто все процессы были завершены и потом попробуйте снова.\nЕсли это не поможет, то возможно процесс git был ранее завершен\nс ошибкой в этом репозитории: \nудалите файл вручную для продолжения." -#: lockfile.c:159 +#: lockfile.c:160 #, c-format msgid "Unable to create '%s.lock': %s" msgstr "Не удалось создать «%s.lock»: %s" -#: merge.c:41 -msgid "failed to read the cache" -msgstr "сбой чтения кэша" +#: ls-refs.c:109 +msgid "expected flush after ls-refs arguments" +msgstr "" -#: merge.c:107 rerere.c:720 builtin/am.c:1887 builtin/am.c:1921 -#: builtin/checkout.c:461 builtin/checkout.c:811 builtin/clone.c:773 -#: builtin/stash.c:264 -msgid "unable to write new index file" -msgstr "не удалось записать новый файл индекса" +#: merge-ort-wrappers.c:13 merge-recursive.c:3672 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +" %s" +msgstr "" -#: merge-recursive.c:322 +#: merge-ort-wrappers.c:33 merge-recursive.c:3436 +#, c-format +msgid "Already up to date!" +msgstr "Уже обновлено!" + +#: merge-recursive.c:356 msgid "(bad commit)\n" msgstr "(плохой коммит)\n" -#: merge-recursive.c:345 +#: merge-recursive.c:379 #, c-format msgid "add_cacheinfo failed for path '%s'; merge aborting." msgstr "сбой add_cacheinfo для пути «%s»; отмена слияния." -#: merge-recursive.c:354 +#: merge-recursive.c:388 #, c-format msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." msgstr "сбой обновления add_cacheinfo для пути «%s»; отмена слияния." -#: merge-recursive.c:437 -msgid "error building trees" -msgstr "ошибка при построении деревьев" - -#: merge-recursive.c:861 +#: merge-recursive.c:874 #, c-format msgid "failed to create path '%s'%s" msgstr "не удалось создать путь «%s»%s" -#: merge-recursive.c:872 +#: merge-recursive.c:885 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "Удаление %s, чтобы освободить место для подкаталогов\n" -#: merge-recursive.c:886 merge-recursive.c:905 +#: merge-recursive.c:899 merge-recursive.c:918 msgid ": perhaps a D/F conflict?" msgstr ": возможно, конфликт каталогов/файлов?" -#: merge-recursive.c:895 +#: merge-recursive.c:908 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "отказ потери неотслеживаемого файла в «%s»" -#: merge-recursive.c:936 builtin/cat-file.c:40 +#: merge-recursive.c:949 builtin/cat-file.c:41 #, c-format msgid "cannot read object %s '%s'" msgstr "невозможно прочитать объект %s «%s»" -#: merge-recursive.c:939 +#: merge-recursive.c:954 #, c-format msgid "blob expected for %s '%s'" msgstr "ожидается двоичный объект для %s «%s»" -#: merge-recursive.c:963 +#: merge-recursive.c:979 #, c-format msgid "failed to open '%s': %s" msgstr "не удалось открыть «%s»: %s" -#: merge-recursive.c:974 +#: merge-recursive.c:990 #, c-format msgid "failed to symlink '%s': %s" msgstr "не удалось создать символьную ссылку «%s»: %s" -#: merge-recursive.c:979 +#: merge-recursive.c:995 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "не понятно, что делать с %06o %s «%s»" -#: merge-recursive.c:1175 +#: merge-recursive.c:1191 #, c-format msgid "Failed to merge submodule %s (not checked out)" msgstr "Не удалось слить подмодуль %s (состояние не забрано)" -#: merge-recursive.c:1182 +#: merge-recursive.c:1198 #, c-format msgid "Failed to merge submodule %s (commits not present)" msgstr "Не удалось слить подмодуль %s (нет коммитов)" -#: merge-recursive.c:1189 +#: merge-recursive.c:1205 #, c-format msgid "Failed to merge submodule %s (commits don't follow merge-base)" msgstr "Не удалось слить подмодуль %s (у коммитов другая база слияния)" -#: merge-recursive.c:1197 merge-recursive.c:1209 +#: merge-recursive.c:1213 merge-recursive.c:1225 #, c-format msgid "Fast-forwarding submodule %s to the following commit:" msgstr "Перемотка вперед подмодуля %s до указанного коммита:" -#: merge-recursive.c:1200 merge-recursive.c:1212 +#: merge-recursive.c:1216 merge-recursive.c:1228 #, c-format msgid "Fast-forwarding submodule %s" msgstr "Перемотка вперед подмодуля %s" -#: merge-recursive.c:1235 +#: merge-recursive.c:1251 #, c-format msgid "Failed to merge submodule %s (merge following commits not found)" msgstr "Не удалось слить подмодуль %s (нет указанных коммитов для слияния)" -#: merge-recursive.c:1239 +#: merge-recursive.c:1255 #, c-format msgid "Failed to merge submodule %s (not fast-forward)" msgstr "Не удалось слить подмодуль %s (нельзя сделать перемотку вперед)" -#: merge-recursive.c:1240 +#: merge-recursive.c:1256 msgid "Found a possible merge resolution for the submodule:\n" msgstr "Найдено возможное разрешение слиятия для подмодуля:\n" -#: merge-recursive.c:1243 +#: merge-recursive.c:1259 #, c-format msgid "" "If this is correct simply add it to the index for example\n" @@ -3528,108 +4391,108 @@ msgid "" "which will accept this suggestion.\n" msgstr "Если оно верное, то просто добавьте его в индекс, например так:\n\n git update-index --cacheinfo 160000 %s \"%s\"\n\nтем самым принимая это предположение.\n" -#: merge-recursive.c:1252 +#: merge-recursive.c:1268 #, c-format msgid "Failed to merge submodule %s (multiple merges found)" msgstr "Не удалось слить подмодуль %s (найдено несколько слияний)" -#: merge-recursive.c:1325 +#: merge-recursive.c:1341 msgid "Failed to execute internal merge" msgstr "Не удалось запустить внутреннее слияние" -#: merge-recursive.c:1330 +#: merge-recursive.c:1346 #, c-format msgid "Unable to add %s to database" msgstr "Не удалось добавить %s в базу данных" -#: merge-recursive.c:1362 +#: merge-recursive.c:1378 #, c-format msgid "Auto-merging %s" msgstr "Автослияние %s" -#: merge-recursive.c:1385 +#: merge-recursive.c:1402 #, c-format msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." msgstr "Ошибка: Отказ потери неотслеживаемого файла %s; запись в %s взамен." -#: merge-recursive.c:1457 +#: merge-recursive.c:1474 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " "in tree." msgstr "КОНФЛИКТ (%s/удаление): %s удалено в %s и %s в %s. Версия %s из %s оставлена в дереве." -#: merge-recursive.c:1462 +#: merge-recursive.c:1479 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " "left in tree." msgstr "КОНФЛИКТ (%s/удаление): %s удалено в %s и от %s до %s в %s. Версия %s из %s оставлена в дереве." -#: merge-recursive.c:1469 +#: merge-recursive.c:1486 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " "in tree at %s." msgstr "КОНФЛИКТ (%s/удаление): %s удалено в %s и %s в %s. Версия %s из %s оставлена в дереве на %s." -#: merge-recursive.c:1474 +#: merge-recursive.c:1491 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " "left in tree at %s." msgstr "КОНФЛИКТ (%s/удаление): %s удалено в %s и от %s до %s в %s. Версия %s из %s оставлена в дереве на %s." -#: merge-recursive.c:1509 +#: merge-recursive.c:1526 msgid "rename" msgstr "переименование" -#: merge-recursive.c:1509 +#: merge-recursive.c:1526 msgid "renamed" msgstr "переименовано" -#: merge-recursive.c:1589 merge-recursive.c:2445 merge-recursive.c:3085 +#: merge-recursive.c:1577 merge-recursive.c:2484 merge-recursive.c:3129 #, c-format msgid "Refusing to lose dirty file at %s" msgstr "Отказ потери изменённого файла %s" -#: merge-recursive.c:1599 +#: merge-recursive.c:1587 #, c-format msgid "Refusing to lose untracked file at %s, even though it's in the way." msgstr "Отказ потери неотслеживаемого файла %s, даже с учетом его наличия." -#: merge-recursive.c:1657 +#: merge-recursive.c:1645 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s" msgstr "" -#: merge-recursive.c:1687 +#: merge-recursive.c:1676 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s — это каталог в %s, добавляем как %s вместо этого" -#: merge-recursive.c:1692 +#: merge-recursive.c:1681 #, c-format msgid "Refusing to lose untracked file at %s; adding as %s instead" msgstr "Отказ потери неотслеживаемого файла %s; добавление как %s взамен." -#: merge-recursive.c:1711 +#: merge-recursive.c:1708 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename " "\"%s\"->\"%s\" in \"%s\"%s" msgstr "КОНФЛИКТ (переименование/переименование): Переименование «%s»→«%s» в ветке «%s» и переименование «%s»→«%s» в ветке «%s»%s" -#: merge-recursive.c:1716 +#: merge-recursive.c:1713 msgid " (left unresolved)" msgstr " (оставлено неразрешенным)" -#: merge-recursive.c:1825 +#: merge-recursive.c:1805 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "КОНФЛИКТ (переименование/переименование): Переименование «%s»→«%s» в ветке «%s» и переименование «%s»→«%s» в ветке «%s»" -#: merge-recursive.c:2030 +#: merge-recursive.c:2068 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to place %s because " @@ -3637,157 +4500,146 @@ msgid "" "getting a majority of the files." msgstr "" -#: merge-recursive.c:2062 +#: merge-recursive.c:2100 #, c-format msgid "" "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " "implicit directory rename(s) putting the following path(s) there: %s." msgstr "" -#: merge-recursive.c:2072 +#: merge-recursive.c:2110 #, c-format msgid "" "CONFLICT (implicit dir rename): Cannot map more than one path to %s; " "implicit directory renames tried to put these paths there: %s" msgstr "" -#: merge-recursive.c:2164 +#: merge-recursive.c:2202 #, c-format msgid "" "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory " "%s->%s in %s" msgstr "" -#: merge-recursive.c:2408 +#: merge-recursive.c:2447 #, c-format msgid "" "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " "renamed." msgstr "" -#: merge-recursive.c:2929 +#: merge-recursive.c:2973 #, c-format msgid "cannot read object %s" msgstr "невозможно прочитать объект «%s»" -#: merge-recursive.c:2932 +#: merge-recursive.c:2976 #, c-format msgid "object %s is not a blob" msgstr "объект %s не является двоичным объектом" -#: merge-recursive.c:2996 +#: merge-recursive.c:3040 msgid "modify" msgstr "изменение" -#: merge-recursive.c:2996 +#: merge-recursive.c:3040 msgid "modified" msgstr "изменено" -#: merge-recursive.c:3008 +#: merge-recursive.c:3052 msgid "content" msgstr "содержимое" -#: merge-recursive.c:3012 +#: merge-recursive.c:3056 msgid "add/add" msgstr "добавление/добавление" -#: merge-recursive.c:3035 +#: merge-recursive.c:3079 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "Пропуск %s (слиты одинаковые изменения как существующие)" -#: merge-recursive.c:3057 git-submodule.sh:937 +#: merge-recursive.c:3101 msgid "submodule" msgstr "подмодуль" -#: merge-recursive.c:3058 +#: merge-recursive.c:3102 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "КОНФЛИКТ (%s): Конфликт слияния в %s" -#: merge-recursive.c:3088 +#: merge-recursive.c:3132 #, c-format msgid "Adding as %s instead" msgstr "Добавление вместо этого как %s" -#: merge-recursive.c:3170 +#: merge-recursive.c:3215 #, c-format msgid "" "Path updated: %s added in %s inside a directory that was renamed in %s; " "moving it to %s." msgstr "" -#: merge-recursive.c:3173 +#: merge-recursive.c:3218 #, c-format msgid "" "CONFLICT (file location): %s added in %s inside a directory that was renamed" " in %s, suggesting it should perhaps be moved to %s." msgstr "" -#: merge-recursive.c:3177 +#: merge-recursive.c:3222 #, c-format msgid "" "Path updated: %s renamed to %s in %s, inside a directory that was renamed in" " %s; moving it to %s." msgstr "" -#: merge-recursive.c:3180 +#: merge-recursive.c:3225 #, c-format msgid "" "CONFLICT (file location): %s renamed to %s in %s, inside a directory that " "was renamed in %s, suggesting it should perhaps be moved to %s." msgstr "" -#: merge-recursive.c:3294 +#: merge-recursive.c:3339 #, c-format msgid "Removing %s" msgstr "Удаление %s" -#: merge-recursive.c:3317 +#: merge-recursive.c:3362 msgid "file/directory" msgstr "файл/каталог" -#: merge-recursive.c:3322 +#: merge-recursive.c:3367 msgid "directory/file" msgstr "каталог/файл" -#: merge-recursive.c:3329 +#: merge-recursive.c:3374 #, c-format msgid "" "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "КОНФЛИКТ (%s): Уже существует каталог с именем «%s» в «%s». Добавление «%s» как «%s»" -#: merge-recursive.c:3338 +#: merge-recursive.c:3383 #, c-format msgid "Adding %s" msgstr "Добавление %s" -#: merge-recursive.c:3347 +#: merge-recursive.c:3392 #, c-format msgid "CONFLICT (add/add): Merge conflict in %s" msgstr "" -#: merge-recursive.c:3385 -#, c-format -msgid "" -"Your local changes to the following files would be overwritten by merge:\n" -" %s" -msgstr "" - -#: merge-recursive.c:3396 -msgid "Already up to date!" -msgstr "Уже обновлено!" - -#: merge-recursive.c:3405 +#: merge-recursive.c:3445 #, c-format msgid "merging of trees %s and %s failed" msgstr "сбой слияния деревьев «%s» и «%s»" -#: merge-recursive.c:3504 +#: merge-recursive.c:3550 msgid "Merging:" msgstr "Слияние:" -#: merge-recursive.c:3517 +#: merge-recursive.c:3563 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" @@ -3796,154 +4648,201 @@ msgstr[1] "найдено %u общих предка:" msgstr[2] "найдено %u общих предков:" msgstr[3] "найдено %u общих предков:" -#: merge-recursive.c:3556 +#: merge-recursive.c:3613 msgid "merge returned no commit" msgstr "слияние не вернуло коммит" -#: merge-recursive.c:3622 +#: merge-recursive.c:3769 #, c-format msgid "Could not parse object '%s'" msgstr "Не удалось разобрать объект «%s»" -#: merge-recursive.c:3638 builtin/merge.c:702 builtin/merge.c:873 +#: merge-recursive.c:3787 builtin/merge.c:711 builtin/merge.c:895 msgid "Unable to write index." msgstr "Не удается записать индекс." -#: midx.c:66 +#: merge.c:41 +msgid "failed to read the cache" +msgstr "сбой чтения кэша" + +#: merge.c:109 rerere.c:720 builtin/am.c:1883 builtin/am.c:1917 +#: builtin/checkout.c:573 builtin/checkout.c:829 builtin/clone.c:817 +#: builtin/stash.c:265 +msgid "unable to write new index file" +msgstr "не удалось записать новый файл индекса" + +#: midx.c:80 #, c-format msgid "multi-pack-index file %s is too small" msgstr "" -#: midx.c:82 +#: midx.c:96 #, c-format msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x" msgstr "" -#: midx.c:87 +#: midx.c:101 #, c-format msgid "multi-pack-index version %d not recognized" msgstr "" -#: midx.c:92 +#: midx.c:106 #, c-format -msgid "hash version %u does not match" -msgstr "версия хеш-суммы %u не соответсвует" +msgid "multi-pack-index hash version %u does not match version %u" +msgstr "" -#: midx.c:106 +#: midx.c:123 msgid "invalid chunk offset (too large)" msgstr "" -#: midx.c:130 +#: midx.c:147 msgid "terminating multi-pack-index chunk id appears earlier than expected" msgstr "" -#: midx.c:143 +#: midx.c:160 msgid "multi-pack-index missing required pack-name chunk" msgstr "" -#: midx.c:145 +#: midx.c:162 msgid "multi-pack-index missing required OID fanout chunk" msgstr "" -#: midx.c:147 +#: midx.c:164 msgid "multi-pack-index missing required OID lookup chunk" msgstr "" -#: midx.c:149 +#: midx.c:166 msgid "multi-pack-index missing required object offsets chunk" msgstr "" -#: midx.c:163 +#: midx.c:180 #, c-format msgid "multi-pack-index pack names out of order: '%s' before '%s'" msgstr "" -#: midx.c:208 +#: midx.c:223 #, c-format msgid "bad pack-int-id: %u (%u total packs)" msgstr "" -#: midx.c:258 +#: midx.c:273 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" msgstr "" -#: midx.c:286 -msgid "error preparing packfile from multi-pack-index" -msgstr "" - -#: midx.c:457 +#: midx.c:480 #, c-format msgid "failed to add packfile '%s'" msgstr "" -#: midx.c:463 +#: midx.c:486 #, c-format msgid "failed to open pack-index '%s'" msgstr "" -#: midx.c:557 +#: midx.c:546 #, c-format msgid "failed to locate object %d in packfile" msgstr "" -#: midx.c:993 +#: midx.c:846 +msgid "Adding packfiles to multi-pack-index" +msgstr "" + +#: midx.c:879 +#, c-format +msgid "did not see pack-file %s to drop" +msgstr "" + +#: midx.c:931 +msgid "no pack files to index." +msgstr "" + +#: midx.c:982 +msgid "Writing chunks to multi-pack-index" +msgstr "" + +#: midx.c:1060 #, c-format msgid "failed to clear multi-pack-index at %s" msgstr "" -#: midx.c:1048 +#: midx.c:1116 +msgid "multi-pack-index file exists, but failed to parse" +msgstr "" + +#: midx.c:1124 msgid "Looking for referenced packfiles" msgstr "" -#: midx.c:1063 +#: midx.c:1139 #, c-format msgid "" "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" msgstr "" -#: midx.c:1067 -msgid "Verifying OID order in MIDX" +#: midx.c:1144 +msgid "the midx contains no oid" msgstr "" -#: midx.c:1076 +#: midx.c:1153 +msgid "Verifying OID order in multi-pack-index" +msgstr "" + +#: midx.c:1162 #, c-format msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" msgstr "" -#: midx.c:1095 +#: midx.c:1182 msgid "Sorting objects by packfile" msgstr "" -#: midx.c:1101 +#: midx.c:1189 msgid "Verifying object offsets" msgstr "" -#: midx.c:1117 +#: midx.c:1205 #, c-format msgid "failed to load pack entry for oid[%d] = %s" msgstr "" -#: midx.c:1123 +#: midx.c:1211 #, c-format msgid "failed to load pack-index for packfile %s" msgstr "" -#: midx.c:1132 +#: midx.c:1220 #, c-format msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>" msgstr "" -#: name-hash.c:531 +#: midx.c:1245 +msgid "Counting referenced objects" +msgstr "" + +#: midx.c:1255 +msgid "Finding and deleting unreferenced packfiles" +msgstr "" + +#: midx.c:1446 +msgid "could not start pack-objects" +msgstr "" + +#: midx.c:1466 +msgid "could not finish pack-objects" +msgstr "" + +#: name-hash.c:537 #, c-format msgid "unable to create lazy_dir thread: %s" msgstr "" -#: name-hash.c:553 +#: name-hash.c:559 #, c-format msgid "unable to create lazy_name thread: %s" msgstr "" -#: name-hash.c:559 +#: name-hash.c:565 #, c-format msgid "unable to join lazy_name thread: %s" msgstr "" @@ -3982,45 +4881,70 @@ msgstr "Отказ в перезаписи заметок в %s (за преде msgid "Bad %s value: '%s'" msgstr "Неправильное значение переменной %s: «%s»" -#: object.c:54 +#: object.c:53 #, c-format msgid "invalid object type \"%s\"" msgstr "" -#: object.c:174 +#: object.c:173 #, c-format msgid "object %s is a %s, not a %s" msgstr "" -#: object.c:234 +#: object.c:233 #, c-format msgid "object %s has unknown type id %d" msgstr "" -#: object.c:247 +#: object.c:246 #, c-format msgid "unable to parse object: %s" msgstr "не удалось разобрать объект: %s" -#: object.c:267 object.c:278 +#: object.c:266 object.c:278 #, c-format msgid "hash mismatch %s" -msgstr "несоответствие хеш-суммы %s" +msgstr "несоответствие хэш-кода %s" + +#: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2216 +#, c-format +msgid "unable to get size of %s" +msgstr "не удалось получить размер %s" -#: packfile.c:617 +#: packfile.c:615 msgid "offset before end of packfile (broken .idx?)" msgstr "сдвиг до конца файла пакета (возможно, повреждён файл .idx?)" -#: packfile.c:1868 +#: packfile.c:1907 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "сдвиг до начала индекса пакета для %s (повреждён индекс?)" -#: packfile.c:1872 +#: packfile.c:1911 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "сдвиг за пределами индекса пакета для %s (обрезан индекс?)" +#: parse-options-cb.c:20 parse-options-cb.c:24 +#, c-format +msgid "option `%s' expects a numerical value" +msgstr "" + +#: parse-options-cb.c:41 +#, c-format +msgid "malformed expiration date '%s'" +msgstr "" + +#: parse-options-cb.c:54 +#, c-format +msgid "option `%s' expects \"always\", \"auto\", or \"never\"" +msgstr "" + +#: parse-options-cb.c:132 parse-options-cb.c:149 +#, c-format +msgid "malformed object name '%s'" +msgstr "Неправильное имя объекта «%s»" + #: parse-options.c:38 #, c-format msgid "%s requires a value" @@ -4036,7 +4960,7 @@ msgstr "" msgid "%s : incompatible with something else" msgstr "" -#: parse-options.c:92 parse-options.c:96 parse-options.c:319 +#: parse-options.c:92 parse-options.c:96 parse-options.c:317 #, c-format msgid "%s takes no value" msgstr "" @@ -4046,162 +4970,147 @@ msgstr "" msgid "%s isn't available" msgstr "" -#: parse-options.c:219 +#: parse-options.c:217 #, c-format msgid "%s expects a non-negative integer value with an optional k/m/g suffix" msgstr "" -#: parse-options.c:389 +#: parse-options.c:386 #, c-format msgid "ambiguous option: %s (could be --%s%s or --%s%s)" msgstr "" -#: parse-options.c:423 parse-options.c:431 +#: parse-options.c:420 parse-options.c:428 +#, c-format +msgid "did you mean `--%s` (with two dashes)?" +msgstr "" + +#: parse-options.c:666 parse-options.c:971 #, c-format -msgid "did you mean `--%s` (with two dashes ?)" +msgid "alias of --%s" msgstr "" -#: parse-options.c:859 +#: parse-options.c:862 #, c-format msgid "unknown option `%s'" msgstr "" -#: parse-options.c:861 +#: parse-options.c:864 #, c-format msgid "unknown switch `%c'" msgstr "" -#: parse-options.c:863 +#: parse-options.c:866 #, c-format msgid "unknown non-ascii option in string: `%s'" msgstr "" -#: parse-options.c:887 +#: parse-options.c:890 msgid "..." msgstr "…" -#: parse-options.c:906 +#: parse-options.c:909 #, c-format msgid "usage: %s" msgstr "использование: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. -#: parse-options.c:912 +#: parse-options.c:915 #, c-format msgid " or: %s" msgstr " или: %s" -#: parse-options.c:915 +#: parse-options.c:918 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:954 +#: parse-options.c:957 msgid "-NUM" msgstr "-КОЛИЧЕСТВО" -#: parse-options.c:968 -#, c-format -msgid "alias of --%s" -msgstr "" - -#: parse-options-cb.c:20 parse-options-cb.c:24 -#, c-format -msgid "option `%s' expects a numerical value" -msgstr "" - -#: parse-options-cb.c:41 -#, c-format -msgid "malformed expiration date '%s'" -msgstr "" - -#: parse-options-cb.c:54 -#, c-format -msgid "option `%s' expects \"always\", \"auto\", or \"never\"" -msgstr "" - -#: parse-options-cb.c:130 parse-options-cb.c:147 -#, c-format -msgid "malformed object name '%s'" -msgstr "Неправильное имя объекта «%s»" - -#: path.c:897 +#: path.c:915 #, c-format msgid "Could not make %s writable by group" msgstr "Не удалось предоставить доступ к %s на запись" -#: pathspec.c:128 +#: pathspec.c:130 msgid "Escape character '\\' not allowed as last character in attr value" msgstr "Управляющий символ «\\» не разрешен как последний символ в значении attr" -#: pathspec.c:146 +#: pathspec.c:148 msgid "Only one 'attr:' specification is allowed." msgstr "Разрешен только один спецификатор «attr:»." -#: pathspec.c:149 +#: pathspec.c:151 msgid "attr spec must not be empty" msgstr "спецификатор attr не должен быть пустой" -#: pathspec.c:192 +#: pathspec.c:194 #, c-format msgid "invalid attribute name %s" msgstr "недопустимое имя атрибута %s" -#: pathspec.c:257 +#: pathspec.c:259 msgid "global 'glob' and 'noglob' pathspec settings are incompatible" msgstr "глобальные опции спецификаторов пути «glob» и «noglob» нельзя использовать одновременно" -#: pathspec.c:264 +#: pathspec.c:266 msgid "" "global 'literal' pathspec setting is incompatible with all other global " "pathspec settings" msgstr "глобальная опция спецификатора пути «literal» не совместима с другими глобальными спецификаторами доступа" -#: pathspec.c:304 +#: pathspec.c:306 msgid "invalid parameter for pathspec magic 'prefix'" -msgstr "неправильный параметр для магического слова «prefix» в спецификаторе пути " +msgstr "неправильный параметр для магического слова «prefix» в спецификаторе пути" -#: pathspec.c:325 +#: pathspec.c:327 #, c-format msgid "Invalid pathspec magic '%.*s' in '%s'" msgstr "неправильное магическое слово «%.*s» в спецификаторе пути «%s»" -#: pathspec.c:330 +#: pathspec.c:332 #, c-format msgid "Missing ')' at the end of pathspec magic in '%s'" msgstr "Пропущено «)» в конце магического слова спецификатора пути «%s»" -#: pathspec.c:368 +#: pathspec.c:370 #, c-format msgid "Unimplemented pathspec magic '%c' in '%s'" msgstr "Нереализованное магическое слово «%c» спецификатора пути «%s»" -#: pathspec.c:427 +#: pathspec.c:429 #, c-format msgid "%s: 'literal' and 'glob' are incompatible" msgstr "%s: «literal» и «glob» не совместимы" -#: pathspec.c:440 +#: pathspec.c:445 #, c-format -msgid "%s: '%s' is outside repository" -msgstr "%s: «%s» вне репозитория" +msgid "%s: '%s' is outside repository at '%s'" +msgstr "" -#: pathspec.c:514 +#: pathspec.c:521 #, c-format msgid "'%s' (mnemonic: '%c')" msgstr "«%s» (мнемоника: «%c»)" -#: pathspec.c:524 +#: pathspec.c:531 #, c-format msgid "%s: pathspec magic not supported by this command: %s" msgstr "%s: магические слова в спецификаторе пути не поддерживаются командой: %s" -#: pathspec.c:591 +#: pathspec.c:598 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "спецификатор пути «%s» находится за символической ссылкой" +#: pathspec.c:643 +#, c-format +msgid "line is badly quoted: %s" +msgstr "" + #: pkt-line.c:92 msgid "unable to write flush packet" msgstr "" @@ -4211,44 +5120,48 @@ msgid "unable to write delim packet" msgstr "" #: pkt-line.c:106 +msgid "unable to write stateless separator packet" +msgstr "" + +#: pkt-line.c:113 msgid "flush packet write failed" msgstr "" -#: pkt-line.c:146 pkt-line.c:232 +#: pkt-line.c:153 pkt-line.c:239 msgid "protocol error: impossibly long line" msgstr "" -#: pkt-line.c:162 pkt-line.c:164 +#: pkt-line.c:169 pkt-line.c:171 msgid "packet write with format failed" msgstr "" -#: pkt-line.c:196 +#: pkt-line.c:203 msgid "packet write failed - data exceeds max packet size" msgstr "" -#: pkt-line.c:203 pkt-line.c:210 +#: pkt-line.c:210 pkt-line.c:217 msgid "packet write failed" msgstr "" -#: pkt-line.c:295 +#: pkt-line.c:302 msgid "read error" msgstr "" -#: pkt-line.c:303 +#: pkt-line.c:310 msgid "the remote end hung up unexpectedly" msgstr "" -#: pkt-line.c:331 +#: pkt-line.c:338 #, c-format msgid "protocol error: bad line length character: %.4s" msgstr "" -#: pkt-line.c:341 pkt-line.c:346 +#: pkt-line.c:352 pkt-line.c:357 #, c-format msgid "protocol error: bad line length %d" msgstr "" -#: pkt-line.c:362 +#: pkt-line.c:373 sideband.c:165 #, c-format msgid "remote error: %s" msgstr "ошибка внешнего репозитория: %s" @@ -4262,233 +5175,272 @@ msgstr "" msgid "unable to create threaded lstat: %s" msgstr "" -#: pretty.c:966 +#: pretty.c:983 msgid "unable to parse --pretty format" msgstr "не удалось разобрать формат для --pretty" -#: range-diff.c:56 +#: promisor-remote.c:30 +msgid "promisor-remote: unable to fork off fetch subprocess" +msgstr "" + +#: promisor-remote.c:35 promisor-remote.c:37 +msgid "promisor-remote: could not write to fetch subprocess" +msgstr "" + +#: promisor-remote.c:41 +msgid "promisor-remote: could not close stdin to fetch subprocess" +msgstr "" + +#: promisor-remote.c:53 +#, c-format +msgid "promisor remote name cannot begin with '/': %s" +msgstr "" + +#: prune-packed.c:35 +msgid "Removing duplicate objects" +msgstr "Удаление дублирующихся объектов" + +#: range-diff.c:77 msgid "could not start `log`" msgstr "" -#: range-diff.c:59 +#: range-diff.c:79 msgid "could not read `log` output" msgstr "" -#: range-diff.c:74 sequencer.c:4897 +#: range-diff.c:98 sequencer.c:5310 #, c-format msgid "could not parse commit '%s'" msgstr "не удалось разобрать коммит «%s»" -#: range-diff.c:224 +#: range-diff.c:112 +#, c-format +msgid "" +"could not parse first line of `log` output: did not start with 'commit ': " +"'%s'" +msgstr "" + +#: range-diff.c:137 +#, c-format +msgid "could not parse git header '%.*s'" +msgstr "" + +#: range-diff.c:299 msgid "failed to generate diff" msgstr "" -#: range-diff.c:455 range-diff.c:457 +#: range-diff.c:532 range-diff.c:534 #, c-format msgid "could not parse log for '%s'" msgstr "" -#: read-cache.c:680 +#: read-cache.c:682 #, c-format msgid "will not add file alias '%s' ('%s' already exists in index)" msgstr "" -#: read-cache.c:696 +#: read-cache.c:698 msgid "cannot create an empty blob in the object database" msgstr "" -#: read-cache.c:718 +#: read-cache.c:720 #, c-format msgid "%s: can only add regular files, symbolic links or git-directories" msgstr "" -#: read-cache.c:723 +#: read-cache.c:725 #, c-format msgid "'%s' does not have a commit checked out" msgstr "" -#: read-cache.c:775 +#: read-cache.c:777 #, c-format msgid "unable to index file '%s'" msgstr "" -#: read-cache.c:794 +#: read-cache.c:796 #, c-format msgid "unable to add '%s' to index" msgstr "" -#: read-cache.c:805 +#: read-cache.c:807 #, c-format msgid "unable to stat '%s'" msgstr "" -#: read-cache.c:1314 +#: read-cache.c:1318 #, c-format msgid "'%s' appears as both a file and as a directory" msgstr "" -#: read-cache.c:1499 +#: read-cache.c:1524 msgid "Refresh index" msgstr "" -#: read-cache.c:1613 +#: read-cache.c:1639 #, c-format msgid "" "index.version set, but the value is invalid.\n" "Using version %i" msgstr "index.version указан, но значение недействительное.\nИспользую версию %i" -#: read-cache.c:1623 +#: read-cache.c:1649 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" "Using version %i" msgstr "GIT_INDEX_VERSION указан, но значение недействительное.\nИспользую версию %i" -#: read-cache.c:1679 +#: read-cache.c:1705 #, c-format msgid "bad signature 0x%08x" msgstr "" -#: read-cache.c:1682 +#: read-cache.c:1708 #, c-format msgid "bad index version %d" msgstr "" -#: read-cache.c:1691 +#: read-cache.c:1717 msgid "bad index file sha1 signature" msgstr "" -#: read-cache.c:1721 +#: read-cache.c:1747 #, c-format msgid "index uses %.4s extension, which we do not understand" msgstr "" -#: read-cache.c:1723 +#: read-cache.c:1749 #, c-format msgid "ignoring %.4s extension" msgstr "" -#: read-cache.c:1760 +#: read-cache.c:1786 #, c-format msgid "unknown index entry format 0x%08x" msgstr "" -#: read-cache.c:1776 +#: read-cache.c:1802 #, c-format msgid "malformed name field in the index, near path '%s'" msgstr "" -#: read-cache.c:1833 +#: read-cache.c:1859 msgid "unordered stage entries in index" msgstr "" -#: read-cache.c:1836 +#: read-cache.c:1862 #, c-format msgid "multiple stage entries for merged file '%s'" msgstr "" -#: read-cache.c:1839 +#: read-cache.c:1865 #, c-format msgid "unordered stage entries for '%s'" msgstr "" -#: read-cache.c:1946 read-cache.c:2234 rerere.c:565 rerere.c:599 rerere.c:1111 -#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:358 -#: builtin/checkout.c:672 builtin/checkout.c:1060 builtin/clean.c:955 -#: builtin/commit.c:344 builtin/diff-tree.c:120 builtin/grep.c:498 -#: builtin/mv.c:145 builtin/reset.c:245 builtin/rm.c:271 -#: builtin/submodule--helper.c:330 +#: read-cache.c:1971 read-cache.c:2262 rerere.c:565 rerere.c:599 rerere.c:1111 +#: submodule.c:1628 builtin/add.c:538 builtin/check-ignore.c:181 +#: builtin/checkout.c:502 builtin/checkout.c:688 builtin/clean.c:991 +#: builtin/commit.c:364 builtin/diff-tree.c:122 builtin/grep.c:507 +#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:290 +#: builtin/submodule--helper.c:332 msgid "index file corrupt" msgstr "файл индекса поврежден" -#: read-cache.c:2087 +#: read-cache.c:2115 #, c-format msgid "unable to create load_cache_entries thread: %s" msgstr "" -#: read-cache.c:2100 +#: read-cache.c:2128 #, c-format msgid "unable to join load_cache_entries thread: %s" msgstr "" -#: read-cache.c:2133 +#: read-cache.c:2161 #, c-format msgid "%s: index file open failed" msgstr "" -#: read-cache.c:2137 +#: read-cache.c:2165 #, c-format msgid "%s: cannot stat the open index" msgstr "" -#: read-cache.c:2141 +#: read-cache.c:2169 #, c-format msgid "%s: index file smaller than expected" msgstr "" -#: read-cache.c:2145 +#: read-cache.c:2173 #, c-format msgid "%s: unable to map index file" msgstr "" -#: read-cache.c:2187 +#: read-cache.c:2215 #, c-format msgid "unable to create load_index_extensions thread: %s" msgstr "" -#: read-cache.c:2214 +#: read-cache.c:2242 #, c-format msgid "unable to join load_index_extensions thread: %s" msgstr "" -#: read-cache.c:2246 +#: read-cache.c:2274 #, c-format msgid "could not freshen shared index '%s'" msgstr "" -#: read-cache.c:2293 +#: read-cache.c:2321 #, c-format msgid "broken index, expect %s in %s, got %s" msgstr "" -#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1117 +#: read-cache.c:3017 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1140 #, c-format msgid "could not close '%s'" msgstr "не удалось закрыть «%s»" -#: read-cache.c:3092 sequencer.c:2354 sequencer.c:3807 +#: read-cache.c:3120 sequencer.c:2479 sequencer.c:4231 #, c-format msgid "could not stat '%s'" msgstr "не удалось выполнить stat для «%s»" -#: read-cache.c:3105 +#: read-cache.c:3133 #, c-format msgid "unable to open git dir: %s" msgstr "не удалось открыть каталог git: %s" -#: read-cache.c:3117 +#: read-cache.c:3145 #, c-format msgid "unable to unlink: %s" msgstr "не удалось отсоединить: %s" -#: read-cache.c:3142 +#: read-cache.c:3170 #, c-format msgid "cannot fix permission bits on '%s'" msgstr "" -#: read-cache.c:3291 +#: read-cache.c:3319 #, c-format msgid "%s: cannot drop to stage #0" msgstr "" -#: rebase-interactive.c:26 +#: rebase-interactive.c:11 +msgid "" +"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'.\n" +"Or you can abort the rebase with 'git rebase --abort'.\n" +msgstr "Вы можете исправить это с помощью «git rebase --edit-todo», а потом запустив «git rebase --continue».\nИли вы можете прервать процесс перемещения, выполнив «git rebase --abort»\n" + +#: rebase-interactive.c:33 #, c-format msgid "" "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." msgstr "нераспознанная настройка %s для опции rebase.missingCommitsCheck. Игнорирую." -#: rebase-interactive.c:35 +#: rebase-interactive.c:42 msgid "" "\n" "Commands:\n" @@ -4510,7 +5462,7 @@ msgid "" "These lines can be re-ordered; they are executed from top to bottom.\n" msgstr "\nКоманды:\np, pick <коммит> = использовать коммит\nr, reword <коммит> = использовать коммит, но изменить сообщение коммита\ne, edit <коммит> = использовать коммит, но остановиться для исправления\ns, squash <коммит> = использовать коммит, но объединить с предыдущим коммитом\nf, fixup <коммит> = как «squash», но пропустить сообщение коммита\nx, exec <команда> = выполнить команду (остаток строки) с помощью командной оболочки\nb, break = остановиться здесь (продолжить с помощью «git rebase --continue»)\nd, drop <коммит> = удалить коммит\nl, label <метка> = дать имя текущему HEAD\nt, reset <метка> = сбросить HEAD к указанной метке\nm, merge [-C <коммит> | -c <коммит>] <метка> [# <строка>]\n. создать слияние используя сообщение коммита оригинального\n. слияния (или использовать указанную строку, если оригинальное\n. слияние не указано). Используйте -c <коммит> чтобы изменить\n. сообщение коммита.\n\nЭти строки можно перемещать; они будут выполнены сверху вниз.\n" -#: rebase-interactive.c:56 +#: rebase-interactive.c:63 #, c-format msgid "Rebase %s onto %s (%d command)" msgid_plural "Rebase %s onto %s (%d commands)" @@ -4519,19 +5471,19 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:173 +#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:218 msgid "" "\n" "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" msgstr "\nНе удаляйте строки. Используйте «drop», чтобы явно удалить коммит.\n" -#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:177 +#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:222 msgid "" "\n" "If you remove a line here THAT COMMIT WILL BE LOST.\n" msgstr "\nЕсли вы удалите строку здесь, то УКАЗАННЫЙ КОММИТ БУДЕТ УТЕРЯН.\n" -#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:816 +#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:861 msgid "" "\n" "You are editing the todo file of an ongoing interactive rebase.\n" @@ -4540,36 +5492,33 @@ msgid "" "\n" msgstr "\nВы сейчас редактируете файл со списком дел для интерактивного перемещения.\nДля продолжения перемещения, после редактирования файла запустите:\n git rebase --continue\n\n" -#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:893 +#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:938 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" "\n" msgstr "\nНо если вы удалите все, то процесс перемещения будет будет прерван.\n\n" -#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:900 -msgid "Note that empty commits are commented out" -msgstr "Заметьте, что пустые коммиты закомментированны" - -#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3339 -#: sequencer.c:3365 sequencer.c:4996 builtin/fsck.c:356 builtin/rebase.c:235 +#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3607 +#: sequencer.c:3633 sequencer.c:5416 builtin/fsck.c:347 builtin/rebase.c:270 #, c-format msgid "could not write '%s'" msgstr "не удалось записать «%s»" -#: rebase-interactive.c:108 +#: rebase-interactive.c:116 builtin/rebase.c:202 builtin/rebase.c:228 +#: builtin/rebase.c:252 #, c-format -msgid "could not copy '%s' to '%s'." -msgstr "" +msgid "could not write '%s'." +msgstr "не удалось записать «%s»." -#: rebase-interactive.c:173 +#: rebase-interactive.c:193 #, c-format msgid "" "Warning: some commits may have been dropped accidentally.\n" "Dropped commits (newer to older):\n" msgstr "Внимание: некоторые коммиты могли быть отброшены по ошибке.\nОтброшенные коммиты (от новых к старым):\n" -#: rebase-interactive.c:180 +#: rebase-interactive.c:200 #, c-format msgid "" "To avoid this message, use \"drop\" to explicitly remove a commit.\n" @@ -4579,430 +5528,410 @@ msgid "" "\n" msgstr "Чтобы избежать этого сообщения, используйте «drop» чтобы явно удалить коммит.\n\nИспользуйте опцию «git config rebase.missingCommitsCheck» для изменения количества предупреждений.\nВозможные значения: ignore, warn, error.\n\n" -#: refs.c:192 +#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2394 +#: builtin/rebase.c:188 builtin/rebase.c:213 builtin/rebase.c:239 +#: builtin/rebase.c:264 #, c-format -msgid "%s does not point to a valid object!" -msgstr "" - -#: refs.c:597 -#, c-format -msgid "ignoring dangling symref %s" -msgstr "" - -#: refs.c:599 ref-filter.c:1982 -#, c-format -msgid "ignoring broken ref %s" -msgstr "игнорирую неправильную ссылку %s" - -#: refs.c:734 -#, c-format -msgid "could not open '%s' for writing: %s" -msgstr "не удалось открыть «%s» для записи: %s" - -#: refs.c:744 refs.c:795 -#, c-format -msgid "could not read ref '%s'" -msgstr "" - -#: refs.c:750 -#, c-format -msgid "ref '%s' already exists" -msgstr "" - -#: refs.c:755 -#, c-format -msgid "unexpected object ID when writing '%s'" -msgstr "" - -#: refs.c:763 sequencer.c:400 sequencer.c:2679 sequencer.c:2805 -#: sequencer.c:2819 sequencer.c:3076 sequencer.c:4913 wrapper.c:656 -#, c-format -msgid "could not write to '%s'" -msgstr "не удалось записать в «%s»" - -#: refs.c:790 wrapper.c:225 wrapper.c:395 builtin/am.c:715 -#: builtin/rebase.c:993 -#, c-format -msgid "could not open '%s' for writing" -msgstr "не удалось открыть «%s» для записи" - -#: refs.c:797 -#, c-format -msgid "unexpected object ID when deleting '%s'" -msgstr "" - -#: refs.c:928 -#, c-format -msgid "log for ref %s has gap after %s" -msgstr "" - -#: refs.c:934 -#, c-format -msgid "log for ref %s unexpectedly ended on %s" -msgstr "" - -#: refs.c:993 -#, c-format -msgid "log for %s is empty" -msgstr "" - -#: refs.c:1085 -#, c-format -msgid "refusing to update ref with bad name '%s'" -msgstr "" - -#: refs.c:1161 -#, c-format -msgid "update_ref failed for ref '%s': %s" -msgstr "" - -#: refs.c:1942 -#, c-format -msgid "multiple updates for ref '%s' not allowed" -msgstr "" - -#: refs.c:1974 -msgid "ref updates forbidden inside quarantine environment" -msgstr "обновление ссылок запрещено в изолированном окружении" - -#: refs.c:2070 refs.c:2100 -#, c-format -msgid "'%s' exists; cannot create '%s'" -msgstr "" - -#: refs.c:2076 refs.c:2111 -#, c-format -msgid "cannot process '%s' and '%s' at the same time" -msgstr "" - -#: refs/files-backend.c:1234 -#, c-format -msgid "could not remove reference %s" -msgstr "не удалось удалить ссылки %s" - -#: refs/files-backend.c:1248 refs/packed-backend.c:1532 -#: refs/packed-backend.c:1542 -#, c-format -msgid "could not delete reference %s: %s" -msgstr "не удалось удалить ссылку %s: %s" - -#: refs/files-backend.c:1251 refs/packed-backend.c:1545 -#, c-format -msgid "could not delete references: %s" -msgstr "не удалось удалить ссылки: %s" - -#: refspec.c:137 -#, c-format -msgid "invalid refspec '%s'" -msgstr "" +msgid "could not read '%s'." +msgstr "не удалось прочитать «%s»." -#: ref-filter.c:39 wt-status.c:1909 +#: ref-filter.c:42 wt-status.c:1973 msgid "gone" msgstr "исчез" -#: ref-filter.c:40 +#: ref-filter.c:43 #, c-format msgid "ahead %d" msgstr "впереди %d" -#: ref-filter.c:41 +#: ref-filter.c:44 #, c-format msgid "behind %d" msgstr "позади %d" -#: ref-filter.c:42 +#: ref-filter.c:45 #, c-format msgid "ahead %d, behind %d" msgstr "впереди %d, позади %d" -#: ref-filter.c:138 +#: ref-filter.c:169 #, c-format msgid "expected format: %%(color:<color>)" msgstr "ожидаемый формат: %%(color:<color>)" -#: ref-filter.c:140 +#: ref-filter.c:171 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "неопознанный цвет: %%(color:%s)" -#: ref-filter.c:162 +#: ref-filter.c:193 #, c-format msgid "Integer value expected refname:lstrip=%s" msgstr "Ожидается целочисленное значение refname:lstrip=%s" -#: ref-filter.c:166 +#: ref-filter.c:197 #, c-format msgid "Integer value expected refname:rstrip=%s" msgstr "Ожидается целочисленное значение refname:rstrip=%s" -#: ref-filter.c:168 +#: ref-filter.c:199 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "неопознанный аргумент %%(%s): %s" -#: ref-filter.c:223 +#: ref-filter.c:254 #, c-format msgid "%%(objecttype) does not take arguments" msgstr "" -#: ref-filter.c:245 +#: ref-filter.c:276 #, c-format msgid "unrecognized %%(objectsize) argument: %s" msgstr "" -#: ref-filter.c:253 +#: ref-filter.c:284 #, c-format msgid "%%(deltabase) does not take arguments" msgstr "" -#: ref-filter.c:265 +#: ref-filter.c:296 #, c-format msgid "%%(body) does not take arguments" msgstr "параметр %%(body) не принимает аргументы" -#: ref-filter.c:274 +#: ref-filter.c:309 #, c-format -msgid "%%(subject) does not take arguments" -msgstr "параметр %%(subject) не принимает аргументы" +msgid "unrecognized %%(subject) argument: %s" +msgstr "" -#: ref-filter.c:296 +#: ref-filter.c:330 #, c-format msgid "unknown %%(trailers) argument: %s" msgstr "неизвестный аргумент для %%(trailers): %s" -#: ref-filter.c:325 +#: ref-filter.c:363 #, c-format msgid "positive value expected contents:lines=%s" msgstr "положительное значение ожидает contents:lines=%s" -#: ref-filter.c:327 +#: ref-filter.c:365 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "неопознанный аргумент %%(contents): %s" -#: ref-filter.c:342 +#: ref-filter.c:380 #, c-format -msgid "positive value expected objectname:short=%s" -msgstr "ожидается положительное значение objectname:short=%s" +msgid "positive value expected '%s' in %%(%s)" +msgstr "" -#: ref-filter.c:346 +#: ref-filter.c:384 #, c-format -msgid "unrecognized %%(objectname) argument: %s" -msgstr "неопознанный аргумент %%(objectname): %s" +msgid "unrecognized argument '%s' in %%(%s)" +msgstr "" -#: ref-filter.c:376 +#: ref-filter.c:398 +#, c-format +msgid "unrecognized email option: %s" +msgstr "" + +#: ref-filter.c:428 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "ожидаемый формат: %%(align:<width>,<position>)" -#: ref-filter.c:388 +#: ref-filter.c:440 #, c-format msgid "unrecognized position:%s" msgstr "неопознанная позиция:%s" -#: ref-filter.c:395 +#: ref-filter.c:447 #, c-format msgid "unrecognized width:%s" msgstr "неопознанная ширина:%s" -#: ref-filter.c:404 +#: ref-filter.c:456 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "неопознанный аргумент %%(align): %s" -#: ref-filter.c:412 +#: ref-filter.c:464 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "ожидается положительная ширина с указанием частицы %%(align)" -#: ref-filter.c:430 +#: ref-filter.c:482 #, c-format msgid "unrecognized %%(if) argument: %s" msgstr "неопознанный аргумент %%(if): %s" -#: ref-filter.c:531 +#: ref-filter.c:584 #, c-format msgid "malformed field name: %.*s" msgstr "неправильное имя поля: %.*s" -#: ref-filter.c:558 +#: ref-filter.c:611 #, c-format msgid "unknown field name: %.*s" msgstr "неизвестное имя поля: %.*s" -#: ref-filter.c:562 +#: ref-filter.c:615 #, c-format msgid "" "not a git repository, but the field '%.*s' requires access to object data" msgstr "" -#: ref-filter.c:686 +#: ref-filter.c:739 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "формат: частица %%(if) использована без частицы %%(then)" -#: ref-filter.c:749 +#: ref-filter.c:802 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "формат: частица %%(then) использована без частицы %%(if)" -#: ref-filter.c:751 +#: ref-filter.c:804 #, c-format msgid "format: %%(then) atom used more than once" msgstr "формат: частица %%(then) использована более одного раза" -#: ref-filter.c:753 +#: ref-filter.c:806 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "формат: частица %%(then) использована после %%(else)" -#: ref-filter.c:781 +#: ref-filter.c:834 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "формат: частица %%(else) использована без частицы %%(if)" -#: ref-filter.c:783 +#: ref-filter.c:836 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "формат: частица %%(else) использована без частицы %%(then)" -#: ref-filter.c:785 +#: ref-filter.c:838 #, c-format msgid "format: %%(else) atom used more than once" msgstr "формат: частица %%(else) использована более одного раза" -#: ref-filter.c:800 +#: ref-filter.c:853 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "формат: частица %%(end) использована без соответствующей частицы" -#: ref-filter.c:857 +#: ref-filter.c:910 #, c-format msgid "malformed format string %s" msgstr "неправильная строка формата %s" -#: ref-filter.c:1453 -#, c-format -msgid "(no branch, rebasing %s)" -msgstr "(нет ветки, перемещение %s)" - -#: ref-filter.c:1456 -#, c-format -msgid "(no branch, rebasing detached HEAD %s)" -msgstr "(нет ветки перемещение отделённого HEAD %s)" - -#: ref-filter.c:1459 +#: ref-filter.c:1549 #, c-format -msgid "(no branch, bisect started on %s)" -msgstr "(нет ветки, двоичный поиск начат на %s)" +msgid "no branch, rebasing %s" +msgstr "" -#. TRANSLATORS: make sure this matches "HEAD -#. detached at " in wt-status.c -#: ref-filter.c:1467 +#: ref-filter.c:1552 #, c-format -msgid "(HEAD detached at %s)" -msgstr "(HEAD отделён на %s)" +msgid "no branch, rebasing detached HEAD %s" +msgstr "" -#. TRANSLATORS: make sure this matches "HEAD -#. detached from " in wt-status.c -#: ref-filter.c:1474 +#: ref-filter.c:1555 #, c-format -msgid "(HEAD detached from %s)" -msgstr "(HEAD отделён начиная с %s)" +msgid "no branch, bisect started on %s" +msgstr "" -#: ref-filter.c:1478 -msgid "(no branch)" -msgstr "(нет ветки)" +#: ref-filter.c:1565 +msgid "no branch" +msgstr "" -#: ref-filter.c:1512 ref-filter.c:1669 +#: ref-filter.c:1599 ref-filter.c:1808 #, c-format msgid "missing object %s for %s" msgstr "не найден объект %s для %s" -#: ref-filter.c:1522 +#: ref-filter.c:1609 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "сбой при выполнении parse_object_buffer на %s для %s" -#: ref-filter.c:1888 +#: ref-filter.c:2062 #, c-format msgid "malformed object at '%s'" msgstr "Повреждённый объект «%s»" -#: ref-filter.c:1977 +#: ref-filter.c:2151 #, c-format msgid "ignoring ref with broken name %s" msgstr "игнорирую ссылку с неправильным именем %s" -#: ref-filter.c:2263 +#: ref-filter.c:2156 refs.c:676 +#, c-format +msgid "ignoring broken ref %s" +msgstr "игнорирую неправильную ссылку %s" + +#: ref-filter.c:2472 #, c-format msgid "format: %%(end) atom missing" msgstr "format: пропущена частица %%(end)" -#: ref-filter.c:2363 +#: ref-filter.c:2571 +#, c-format +msgid "malformed object name %s" +msgstr "неправильное имя объекта %s" + +#: ref-filter.c:2576 #, c-format -msgid "option `%s' is incompatible with --merged" +msgid "option `%s' must point to a commit" msgstr "" -#: ref-filter.c:2366 +#: refs.c:264 #, c-format -msgid "option `%s' is incompatible with --no-merged" +msgid "%s does not point to a valid object!" msgstr "" -#: ref-filter.c:2376 +#: refs.c:566 #, c-format -msgid "malformed object name %s" -msgstr "неправильное имя объекта %s" +msgid "" +"Using '%s' as the name for the initial branch. This default branch name\n" +"is subject to change. To configure the initial branch name to use in all\n" +"of your new repositories, which will suppress this warning, call:\n" +"\n" +"\tgit config --global init.defaultBranch <name>\n" +"\n" +"Names commonly chosen instead of 'master' are 'main', 'trunk' and\n" +"'development'. The just-created branch can be renamed via this command:\n" +"\n" +"\tgit branch -m <name>\n" +msgstr "" -#: ref-filter.c:2381 +#: refs.c:588 #, c-format -msgid "option `%s' must point to a commit" +msgid "could not retrieve `%s`" +msgstr "" + +#: refs.c:598 +#, c-format +msgid "invalid branch name: %s = %s" +msgstr "" + +#: refs.c:674 +#, c-format +msgid "ignoring dangling symref %s" +msgstr "" + +#: refs.c:911 +#, c-format +msgid "log for ref %s has gap after %s" +msgstr "" + +#: refs.c:917 +#, c-format +msgid "log for ref %s unexpectedly ended on %s" +msgstr "" + +#: refs.c:976 +#, c-format +msgid "log for %s is empty" +msgstr "" + +#: refs.c:1068 +#, c-format +msgid "refusing to update ref with bad name '%s'" +msgstr "" + +#: refs.c:1139 +#, c-format +msgid "update_ref failed for ref '%s': %s" +msgstr "" + +#: refs.c:1963 +#, c-format +msgid "multiple updates for ref '%s' not allowed" msgstr "" -#: remote.c:363 +#: refs.c:2043 +msgid "ref updates forbidden inside quarantine environment" +msgstr "обновление ссылок запрещено в изолированном окружении" + +#: refs.c:2054 +msgid "ref updates aborted by hook" +msgstr "" + +#: refs.c:2154 refs.c:2184 +#, c-format +msgid "'%s' exists; cannot create '%s'" +msgstr "" + +#: refs.c:2160 refs.c:2195 +#, c-format +msgid "cannot process '%s' and '%s' at the same time" +msgstr "" + +#: refs/files-backend.c:1228 +#, c-format +msgid "could not remove reference %s" +msgstr "не удалось удалить ссылки %s" + +#: refs/files-backend.c:1242 refs/packed-backend.c:1542 +#: refs/packed-backend.c:1552 +#, c-format +msgid "could not delete reference %s: %s" +msgstr "не удалось удалить ссылку %s: %s" + +#: refs/files-backend.c:1245 refs/packed-backend.c:1555 +#, c-format +msgid "could not delete references: %s" +msgstr "не удалось удалить ссылки: %s" + +#: refspec.c:170 +#, c-format +msgid "invalid refspec '%s'" +msgstr "" + +#: remote.c:351 #, c-format msgid "config remote shorthand cannot begin with '/': %s" msgstr "" -#: remote.c:410 +#: remote.c:399 msgid "more than one receivepack given, using the first" msgstr "" -#: remote.c:418 +#: remote.c:407 msgid "more than one uploadpack given, using the first" msgstr "" -#: remote.c:608 +#: remote.c:590 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "Нельзя извлечь одновременно %s и %s в %s" -#: remote.c:612 +#: remote.c:594 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s обычно отслеживает %s, а не %s" -#: remote.c:616 +#: remote.c:598 #, c-format msgid "%s tracks both %s and %s" msgstr "%s отслеживает и %s и %s" -#: remote.c:684 +#: remote.c:666 #, c-format msgid "key '%s' of pattern had no '*'" msgstr "" -#: remote.c:694 +#: remote.c:676 #, c-format msgid "value '%s' of pattern has no '*'" msgstr "" -#: remote.c:1000 +#: remote.c:1073 #, c-format msgid "src refspec %s does not match any" msgstr "" -#: remote.c:1005 +#: remote.c:1078 #, c-format msgid "src refspec %s matches more than one" msgstr "" @@ -5010,7 +5939,7 @@ msgstr "" #. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is #. the <src>. -#: remote.c:1020 +#: remote.c:1093 #, c-format msgid "" "The destination you provided is not a full refname (i.e.,\n" @@ -5024,7 +5953,7 @@ msgid "" "Neither worked, so we gave up. You must fully qualify the ref." msgstr "" -#: remote.c:1040 +#: remote.c:1113 #, c-format msgid "" "The <src> part of the refspec is a commit object.\n" @@ -5032,7 +5961,7 @@ msgid "" "'%s:refs/heads/%s'?" msgstr "" -#: remote.c:1045 +#: remote.c:1118 #, c-format msgid "" "The <src> part of the refspec is a tag object.\n" @@ -5040,7 +5969,7 @@ msgid "" "'%s:refs/tags/%s'?" msgstr "" -#: remote.c:1050 +#: remote.c:1123 #, c-format msgid "" "The <src> part of the refspec is a tree object.\n" @@ -5048,7 +5977,7 @@ msgid "" "'%s:refs/tags/%s'?" msgstr "" -#: remote.c:1055 +#: remote.c:1128 #, c-format msgid "" "The <src> part of the refspec is a blob object.\n" @@ -5056,103 +5985,103 @@ msgid "" "'%s:refs/tags/%s'?" msgstr "" -#: remote.c:1091 +#: remote.c:1164 #, c-format msgid "%s cannot be resolved to branch" msgstr "" -#: remote.c:1102 +#: remote.c:1175 #, c-format msgid "unable to delete '%s': remote ref does not exist" msgstr "" -#: remote.c:1114 +#: remote.c:1187 #, c-format msgid "dst refspec %s matches more than one" msgstr "" -#: remote.c:1121 +#: remote.c:1194 #, c-format msgid "dst ref %s receives from more than one src" msgstr "" -#: remote.c:1624 remote.c:1725 +#: remote.c:1714 remote.c:1815 msgid "HEAD does not point to a branch" msgstr "HEAD не указывает на ветку" -#: remote.c:1633 +#: remote.c:1723 #, c-format msgid "no such branch: '%s'" msgstr "нет такой ветки: «%s»" -#: remote.c:1636 +#: remote.c:1726 #, c-format msgid "no upstream configured for branch '%s'" msgstr "вышестоящая ветка не настроена для ветки «%s»" -#: remote.c:1642 +#: remote.c:1732 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "вышестоящая ветка «%s» не сохранена как отслеживаемая ветка" -#: remote.c:1657 +#: remote.c:1747 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "назначение для отправки «%s» на внешнем сервере «%s» не имеет локальной отслеживаемой ветки" -#: remote.c:1669 +#: remote.c:1759 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "ветка «%s» не имеет внешнего сервера для отправки" -#: remote.c:1679 +#: remote.c:1769 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "спецификаторы пути для отправки «%s» не включают в себя «%s»" -#: remote.c:1692 +#: remote.c:1782 msgid "push has no destination (push.default is 'nothing')" msgstr "отправка не имеет точки назначения (push.default выставлен в «nothing»)" -#: remote.c:1714 +#: remote.c:1804 msgid "cannot resolve 'simple' push to a single destination" msgstr "не удалось выполнить «simple» отправку в единственную точку назначения" -#: remote.c:1840 +#: remote.c:1933 #, c-format msgid "couldn't find remote ref %s" msgstr "" -#: remote.c:1853 +#: remote.c:1946 #, c-format msgid "* Ignoring funny ref '%s' locally" msgstr "" -#: remote.c:2016 +#: remote.c:2109 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "Ваша ветка базируется на «%s», но вышестоящий репозиторий исчез.\n" -#: remote.c:2020 +#: remote.c:2113 msgid " (use \"git branch --unset-upstream\" to fixup)\n" -msgstr "(для исправления запустите «git branch --unset-upstream»)\n" +msgstr " (для исправления запустите «git branch --unset-upstream»)\n" -#: remote.c:2023 +#: remote.c:2116 #, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "Ваша ветка обновлена в соответствии с «%s».\n" -#: remote.c:2027 +#: remote.c:2120 #, c-format msgid "Your branch and '%s' refer to different commits.\n" msgstr "Ваша ветка и «%s» указывают на разные коммиты.\n" -#: remote.c:2030 +#: remote.c:2123 #, c-format msgid " (use \"%s\" for details)\n" msgstr " (используйте «%s» для просмотра описания)\n" -#: remote.c:2034 +#: remote.c:2127 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" @@ -5161,11 +6090,11 @@ msgstr[1] "Ваша ветка опережает «%s» на %d коммита. msgstr[2] "Ваша ветка опережает «%s» на %d коммитов.\n" msgstr[3] "Ваша ветка опережает «%s» на %d коммитов.\n" -#: remote.c:2040 +#: remote.c:2133 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (используйте «git push», чтобы опубликовать ваши локальные коммиты)\n" -#: remote.c:2043 +#: remote.c:2136 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -5175,11 +6104,11 @@ msgstr[1] "Ваша ветка отстает от «%s» на %d коммита msgstr[2] "Ваша ветка отстает от «%s» на %d коммитов и может быть перемотана вперед.\n" msgstr[3] "Ваша ветка отстает от «%s» на %d коммитов и может быть перемотана вперед.\n" -#: remote.c:2051 +#: remote.c:2144 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (используйте «git pull», чтобы обновить вашу локальную ветку)\n" -#: remote.c:2054 +#: remote.c:2147 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -5192,11 +6121,11 @@ msgstr[1] "Ваша ветка и «%s» разделились\nи теперь msgstr[2] "Ваша ветка и «%s» разделились\nи теперь имеют %d и %d разных коммитов в каждой соответственно.\n" msgstr[3] "Ваша ветка и «%s» разделились\nи теперь имеют %d и %d разных коммитов в каждой соответственно.\n" -#: remote.c:2064 +#: remote.c:2157 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr " (используйте «git pull», чтобы слить внешнюю ветку в вашу)\n" -#: remote.c:2247 +#: remote.c:2349 #, c-format msgid "cannot parse expected object name '%s'" msgstr "" @@ -5211,7 +6140,7 @@ msgstr "" msgid "duplicate replace ref: %s" msgstr "" -#: replace-object.c:73 +#: replace-object.c:82 #, c-format msgid "replace depth too high for object %s" msgstr "" @@ -5274,8 +6203,8 @@ msgstr "" msgid "Recorded preimage for '%s'" msgstr "" -#: rerere.c:881 submodule.c:2024 builtin/log.c:1750 -#: builtin/submodule--helper.c:1417 builtin/submodule--helper.c:1427 +#: rerere.c:881 submodule.c:2082 builtin/log.c:1992 +#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890 #, c-format msgid "could not create directory '%s'" msgstr "не удалось создать каталог «%s»" @@ -5309,223 +6238,240 @@ msgstr "" msgid "unable to open rr-cache directory" msgstr "" -#: revision.c:2476 +#: reset.c:42 +msgid "could not determine HEAD revision" +msgstr "" + +#: reset.c:70 reset.c:76 sequencer.c:3460 +#, c-format +msgid "failed to find tree of %s" +msgstr "не удалось найти дерево для %s" + +#: revision.c:2336 +msgid "--unpacked=<packfile> no longer supported" +msgstr "" + +#: revision.c:2356 +#, c-format +msgid "unknown value for --diff-merges: %s" +msgstr "" + +#: revision.c:2694 msgid "your current branch appears to be broken" msgstr "похоже, ваша текущая ветка повреждена" -#: revision.c:2479 +#: revision.c:2697 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "ваша текущая ветка «%s» еще не содержит ни одного коммита" -#: revision.c:2679 -msgid "--first-parent is incompatible with --bisect" -msgstr "опцию --first-parent нельзя использовать одновременно с --bisect" - -#: revision.c:2683 +#: revision.c:2907 msgid "-L does not yet support diff formats besides -p and -s" msgstr "" -#: run-command.c:763 +#: run-command.c:764 msgid "open /dev/null failed" msgstr "сбой открытия /dev/null" -#: run-command.c:1269 +#: run-command.c:1271 #, c-format msgid "cannot create async thread: %s" msgstr "" -#: run-command.c:1333 +#: run-command.c:1335 #, c-format msgid "" "The '%s' hook was ignored because it's not set as executable.\n" "You can disable this warning with `git config advice.ignoredHook false`." msgstr "Перехватчик «%s» был проигнорирован, так как он не установлен как исполняемый.\nВы можете отключить это предупреждение с помощью команды «git config advice.ignoredHook false»." -#: send-pack.c:141 +#: send-pack.c:146 msgid "unexpected flush packet while reading remote unpack status" msgstr "неожиданный пустой пакет при чтении статуса внешней распаковки" -#: send-pack.c:143 +#: send-pack.c:148 #, c-format msgid "unable to parse remote unpack status: %s" msgstr "не удалось разобрать статус внешней распаковки: %s" -#: send-pack.c:145 +#: send-pack.c:150 #, c-format msgid "remote unpack failed: %s" msgstr "сбой при внешней распаковке %s" -#: send-pack.c:306 +#: send-pack.c:374 msgid "failed to sign the push certificate" msgstr "сбой подписания сертификата отправки" -#: send-pack.c:420 +#: send-pack.c:467 +msgid "the receiving end does not support this repository's hash algorithm" +msgstr "" + +#: send-pack.c:476 msgid "the receiving end does not support --signed push" msgstr "принимающая сторона не поддерживает отправку с опцией --signed" -#: send-pack.c:422 +#: send-pack.c:478 msgid "" "not sending a push certificate since the receiving end does not support " "--signed push" msgstr "не отправляем сертификат для отправки, так как принимающая сторона не поддерживает отправку с опцией --signed" -#: send-pack.c:434 +#: send-pack.c:490 msgid "the receiving end does not support --atomic push" msgstr "принимающая сторона не поддерживает отправку с опцией --atomic" -#: send-pack.c:439 +#: send-pack.c:495 msgid "the receiving end does not support push options" msgstr "принимающая сторона не поддерживает отправку с опциями" -#: sequencer.c:187 +#: sequencer.c:195 #, c-format msgid "invalid commit message cleanup mode '%s'" msgstr "неправильный режим очистки сообщения коммита «%s»" -#: sequencer.c:292 +#: sequencer.c:323 #, c-format msgid "could not delete '%s'" msgstr "не удалось удалить «%s»" -#: sequencer.c:318 +#: sequencer.c:343 builtin/rebase.c:755 builtin/rebase.c:1596 builtin/rm.c:385 +#, c-format +msgid "could not remove '%s'" +msgstr "не удалось удалить «%s»" + +#: sequencer.c:353 msgid "revert" msgstr "обратить изменения" -#: sequencer.c:320 +#: sequencer.c:355 msgid "cherry-pick" msgstr "копировать коммит" -#: sequencer.c:322 -msgid "rebase -i" -msgstr "rebase -i" +#: sequencer.c:357 +msgid "rebase" +msgstr "" -#: sequencer.c:324 +#: sequencer.c:359 #, c-format msgid "unknown action: %d" msgstr "" -#: sequencer.c:382 +#: sequencer.c:418 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" msgstr "после разрешения конфликтов, пометьте исправленные пути\nс помощью «git add <пути>» или «git rm <пути>»" -#: sequencer.c:385 +#: sequencer.c:421 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" "and commit the result with 'git commit'" msgstr "после разрешения конфликтов, пометьте исправленные пути\nс помощью «git add <пути>» или «git rm <пути>»\nи сделайте коммит с помощью «git commit»" -#: sequencer.c:398 sequencer.c:2801 +#: sequencer.c:434 sequencer.c:3062 #, c-format msgid "could not lock '%s'" msgstr "не удалось заблокировать «%s»" -#: sequencer.c:405 +#: sequencer.c:436 sequencer.c:2861 sequencer.c:3066 sequencer.c:3080 +#: sequencer.c:3337 sequencer.c:5326 strbuf.c:1168 wrapper.c:631 +#, c-format +msgid "could not write to '%s'" +msgstr "не удалось записать в «%s»" + +#: sequencer.c:441 #, c-format msgid "could not write eol to '%s'" msgstr "не удалось записать eol в «%s»" -#: sequencer.c:410 sequencer.c:2684 sequencer.c:2807 sequencer.c:2821 -#: sequencer.c:3084 +#: sequencer.c:446 sequencer.c:2866 sequencer.c:3068 sequencer.c:3082 +#: sequencer.c:3345 #, c-format msgid "failed to finalize '%s'" msgstr "не удалось завершить «%s»" -#: sequencer.c:433 sequencer.c:978 sequencer.c:1652 sequencer.c:2704 -#: sequencer.c:3066 sequencer.c:3175 builtin/am.c:245 builtin/commit.c:760 -#: builtin/merge.c:1115 builtin/rebase.c:567 -#, c-format -msgid "could not read '%s'" -msgstr "не удалось прочитать «%s»" - -#: sequencer.c:459 +#: sequencer.c:485 #, c-format msgid "your local changes would be overwritten by %s." msgstr "ваши локальные изменения будут перезаписаны %s." -#: sequencer.c:463 +#: sequencer.c:489 msgid "commit your changes or stash them to proceed." msgstr "для продолжения закоммитьте ваши изменения или спрячьте их." -#: sequencer.c:495 +#: sequencer.c:521 #, c-format msgid "%s: fast-forward" msgstr "%s: перемотка вперед" -#: sequencer.c:534 builtin/tag.c:555 +#: sequencer.c:560 builtin/tag.c:566 #, c-format msgid "Invalid cleanup mode %s" msgstr "Неправильное значение режима очистки %s" #. TRANSLATORS: %s will be "revert", "cherry-pick" or -#. "rebase -i". -#: sequencer.c:629 +#. "rebase". +#: sequencer.c:670 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: Не удалось записать файл индекса" -#: sequencer.c:646 +#: sequencer.c:687 msgid "unable to update cache tree" msgstr "не удалось обновить дерево кэша" -#: sequencer.c:660 +#: sequencer.c:701 msgid "could not resolve HEAD commit" msgstr "не удалось распознать HEAD коммит" -#: sequencer.c:740 +#: sequencer.c:781 #, c-format msgid "no key present in '%.*s'" msgstr "" -#: sequencer.c:751 +#: sequencer.c:792 #, c-format msgid "unable to dequote value of '%s'" msgstr "" -#: sequencer.c:788 wrapper.c:227 wrapper.c:397 builtin/am.c:706 -#: builtin/am.c:798 builtin/merge.c:1112 builtin/rebase.c:1035 +#: sequencer.c:829 wrapper.c:201 wrapper.c:371 builtin/am.c:710 +#: builtin/am.c:802 builtin/merge.c:1135 builtin/rebase.c:908 #, c-format msgid "could not open '%s' for reading" msgstr "не удалось открыть «%s» для чтения" -#: sequencer.c:798 +#: sequencer.c:839 msgid "'GIT_AUTHOR_NAME' already given" msgstr "" -#: sequencer.c:803 +#: sequencer.c:844 msgid "'GIT_AUTHOR_EMAIL' already given" msgstr "" -#: sequencer.c:808 +#: sequencer.c:849 msgid "'GIT_AUTHOR_DATE' already given" msgstr "" -#: sequencer.c:812 +#: sequencer.c:853 #, c-format msgid "unknown variable '%s'" msgstr "" -#: sequencer.c:817 +#: sequencer.c:858 msgid "missing 'GIT_AUTHOR_NAME'" msgstr "" -#: sequencer.c:819 +#: sequencer.c:860 msgid "missing 'GIT_AUTHOR_EMAIL'" msgstr "" -#: sequencer.c:821 +#: sequencer.c:862 msgid "missing 'GIT_AUTHOR_DATE'" msgstr "" -#: sequencer.c:881 -#, c-format -msgid "invalid date format '%s' in '%s'" -msgstr "" - -#: sequencer.c:898 +#: sequencer.c:927 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -5542,15 +6488,11 @@ msgid "" " git rebase --continue\n" msgstr "у вас имеются проиндексированные изменения в рабочем каталоге. Если эти изменения должны быть объеденены с предыдущим коммитом, то запустите:\n\n git commit --amend %s\n\nЕсли же они должны быть помещены в новый коммит, то запустите:\n\n git commit %s\n\nВ любом случае, после того как вы закончите, продолжить перемещение можно выполнив:\n\n git rebase --continue\n" -#: sequencer.c:992 -msgid "writing root commit" -msgstr "запись коневого коммита" - -#: sequencer.c:1213 +#: sequencer.c:1208 msgid "'prepare-commit-msg' hook failed" msgstr "ошибка при вызове перехватчика «prepare-commit-msg»" -#: sequencer.c:1220 +#: sequencer.c:1214 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -5565,7 +6507,7 @@ msgid "" " git commit --amend --reset-author\n" msgstr "Ваше имя или электронная почта настроены автоматически на основании вашего\nимени пользователя и имени машины. Пожалуйста, проверьте, что они \nопределены правильно.\nВы можете отключить это уведомление установив их напрямую. Запустите следующую\nкоманду и следуйте инструкциям вашего текстового редактора, для\nредактирования вашего файла конфигурации:\n\n git config --global --edit\n\nПосле этого, изменить авторство этой коммита можно будет с помощью команды:\n\n git commit --amend --reset-author\n" -#: sequencer.c:1233 +#: sequencer.c:1227 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -5579,305 +6521,354 @@ msgid "" " git commit --amend --reset-author\n" msgstr "Ваше имя или электронная почта настроены автоматически на основании вашего\nимени пользователя и имени машины. Пожалуйста, проверьте, что они \nопределены правильно.\nВы можете отключить это уведомление установив их напрямую:\n\n git config --global user.name \"Ваше Имя\"\n git config --global user.email you@example.com\n\nПосле этого, изменить авторство этой коммита можно будет с помощью команды:\n\n git commit --amend --reset-author\n" -#: sequencer.c:1275 +#: sequencer.c:1269 msgid "couldn't look up newly created commit" msgstr "нельзя запросить новосозданный коммит" -#: sequencer.c:1277 +#: sequencer.c:1271 msgid "could not parse newly created commit" msgstr "нельзя разобрать новосозданный коммит" -#: sequencer.c:1323 +#: sequencer.c:1317 msgid "unable to resolve HEAD after creating commit" msgstr "не удалось найти HEAD после создания коммита" -#: sequencer.c:1325 +#: sequencer.c:1319 msgid "detached HEAD" msgstr "отделённый HEAD" -#: sequencer.c:1329 +#: sequencer.c:1323 msgid " (root-commit)" msgstr " (корневой коммит)" -#: sequencer.c:1350 +#: sequencer.c:1344 msgid "could not parse HEAD" msgstr "не удалось разобрать HEAD" -#: sequencer.c:1352 +#: sequencer.c:1346 #, c-format msgid "HEAD %s is not a commit!" msgstr "HEAD %s не является коммитом!" -#: sequencer.c:1356 builtin/commit.c:1551 +#: sequencer.c:1350 sequencer.c:1425 builtin/commit.c:1577 msgid "could not parse HEAD commit" msgstr "не удалось разобрать HEAD коммит" -#: sequencer.c:1408 sequencer.c:2001 +#: sequencer.c:1403 sequencer.c:2100 msgid "unable to parse commit author" msgstr "не удалось разобрать автора коммита" -#: sequencer.c:1418 builtin/am.c:1572 builtin/merge.c:688 +#: sequencer.c:1414 builtin/am.c:1566 builtin/merge.c:701 msgid "git write-tree failed to write a tree" msgstr "git write-tree не удалось записать дерево" -#: sequencer.c:1435 sequencer.c:1496 +#: sequencer.c:1447 sequencer.c:1565 #, c-format msgid "unable to read commit message from '%s'" msgstr "не удалось прочитать сообщение коммита из «%s»" -#: sequencer.c:1462 builtin/am.c:1594 builtin/commit.c:1650 -#: builtin/merge.c:882 builtin/merge.c:906 +#: sequencer.c:1476 sequencer.c:1508 +#, c-format +msgid "invalid author identity '%s'" +msgstr "" + +#: sequencer.c:1482 +msgid "corrupt author: missing date information" +msgstr "" + +#: sequencer.c:1521 builtin/am.c:1593 builtin/commit.c:1678 +#: builtin/merge.c:904 builtin/merge.c:929 t/helper/test-fast-rebase.c:78 msgid "failed to write commit object" msgstr "сбой записи объекта коммита" -#: sequencer.c:1523 +#: sequencer.c:1548 sequencer.c:4283 t/helper/test-fast-rebase.c:198 +#, c-format +msgid "could not update %s" +msgstr "не удалось обновить %s" + +#: sequencer.c:1597 #, c-format msgid "could not parse commit %s" msgstr "не удалось разобрать коммит %s" -#: sequencer.c:1528 +#: sequencer.c:1602 #, c-format msgid "could not parse parent commit %s" msgstr "не удалось разобрать родительский коммит %s" -#: sequencer.c:1602 sequencer.c:1712 +#: sequencer.c:1685 sequencer.c:1796 #, c-format msgid "unknown command: %d" msgstr "неизвестная команда: %d" -#: sequencer.c:1659 sequencer.c:1684 +#: sequencer.c:1743 sequencer.c:1768 #, c-format msgid "This is a combination of %d commits." msgstr "Это объединение %d коммитов." -#: sequencer.c:1669 +#: sequencer.c:1753 msgid "need a HEAD to fixup" msgstr "нужен HEAD для исправления" -#: sequencer.c:1671 sequencer.c:3111 +#: sequencer.c:1755 sequencer.c:3372 msgid "could not read HEAD" msgstr "не удалось прочитать HEAD" -#: sequencer.c:1673 +#: sequencer.c:1757 msgid "could not read HEAD's commit message" msgstr "не удалось прочитать сообщение коммита текущего HEAD" -#: sequencer.c:1679 +#: sequencer.c:1763 #, c-format msgid "cannot write '%s'" msgstr "не удалось записать «%s»" -#: sequencer.c:1686 git-rebase--preserve-merges.sh:441 +#: sequencer.c:1770 git-rebase--preserve-merges.sh:486 msgid "This is the 1st commit message:" msgstr "Это 1-е сообщение коммита:" -#: sequencer.c:1694 +#: sequencer.c:1778 #, c-format msgid "could not read commit message of %s" msgstr "не удалось прочитать сообщение коммита для %s" -#: sequencer.c:1701 +#: sequencer.c:1785 #, c-format msgid "This is the commit message #%d:" msgstr "Это сообщение коммита номер #%d:" -#: sequencer.c:1707 +#: sequencer.c:1791 #, c-format msgid "The commit message #%d will be skipped:" msgstr "Сообщение коммита номер #%d будет пропущено:" -#: sequencer.c:1795 +#: sequencer.c:1879 msgid "your index file is unmerged." msgstr "ваш индекс не слит." -#: sequencer.c:1802 +#: sequencer.c:1886 msgid "cannot fixup root commit" msgstr "нельзя исправить корневой коммит" -#: sequencer.c:1821 +#: sequencer.c:1905 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "коммит %s — это коммит-слияние, но опция -m не указана." -#: sequencer.c:1829 sequencer.c:1837 +#: sequencer.c:1913 sequencer.c:1921 #, c-format msgid "commit %s does not have parent %d" msgstr "у коммита %s нет предка %d" -#: sequencer.c:1843 +#: sequencer.c:1927 #, c-format msgid "cannot get commit message for %s" msgstr "не удалось получить сообщение коммита для %s" #. TRANSLATORS: The first %s will be a "todo" command like #. "revert" or "pick", the second %s a SHA1. -#: sequencer.c:1862 +#: sequencer.c:1946 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: не удалось разобрать родительский коммит для %s" -#: sequencer.c:1927 +#: sequencer.c:2011 #, c-format msgid "could not rename '%s' to '%s'" msgstr "не удалось переименовать «%s» в «%s»" -#: sequencer.c:1982 +#: sequencer.c:2071 #, c-format msgid "could not revert %s... %s" msgstr "не удалось обратить изменения коммита %s… %s" -#: sequencer.c:1983 +#: sequencer.c:2072 #, c-format msgid "could not apply %s... %s" msgstr "не удалось применить коммит %s… %s" -#: sequencer.c:2042 +#: sequencer.c:2092 +#, c-format +msgid "dropping %s %s -- patch contents already upstream\n" +msgstr "" + +#: sequencer.c:2150 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: сбой чтения индекса" -#: sequencer.c:2049 +#: sequencer.c:2157 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: сбой обновления индекса" -#: sequencer.c:2118 +#: sequencer.c:2234 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "параметр %s не принимает аргументы: «%s»" -#: sequencer.c:2127 +#: sequencer.c:2243 #, c-format msgid "missing arguments for %s" msgstr "пропущены аргументы для %s" -#: sequencer.c:2164 +#: sequencer.c:2274 #, c-format -msgid "could not parse '%.*s'" +msgid "could not parse '%s'" msgstr "" -#: sequencer.c:2226 +#: sequencer.c:2335 #, c-format msgid "invalid line %d: %.*s" msgstr "неправильная строка %d: %.*s" -#: sequencer.c:2237 +#: sequencer.c:2346 #, c-format msgid "cannot '%s' without a previous commit" msgstr "нельзя выполнить «%s» без указания предыдущего коммита" -#: sequencer.c:2285 builtin/rebase.c:153 builtin/rebase.c:178 -#: builtin/rebase.c:204 builtin/rebase.c:229 -#, c-format -msgid "could not read '%s'." -msgstr "не удалось прочитать «%s»." +#: sequencer.c:2432 +msgid "cancelling a cherry picking in progress" +msgstr "" + +#: sequencer.c:2441 +msgid "cancelling a revert in progress" +msgstr "" -#: sequencer.c:2360 +#: sequencer.c:2485 msgid "please fix this using 'git rebase --edit-todo'." msgstr "пожалуйста исправьте это с помощью «git rebase --edit-todo»." -#: sequencer.c:2362 +#: sequencer.c:2487 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "непригодная для использования карта с инструкциями: «%s»" -#: sequencer.c:2367 +#: sequencer.c:2492 msgid "no commits parsed." msgstr "коммиты не разобраны." -#: sequencer.c:2378 +#: sequencer.c:2503 msgid "cannot cherry-pick during a revert." msgstr "нельзя скопировать коммит во время процесса обращения коммита." -#: sequencer.c:2380 +#: sequencer.c:2505 msgid "cannot revert during a cherry-pick." msgstr "нельзя обратить изменения коммита во время копирования коммита." -#: sequencer.c:2462 +#: sequencer.c:2583 #, c-format msgid "invalid value for %s: %s" msgstr "неправильное значение %s: %s" -#: sequencer.c:2549 +#: sequencer.c:2690 msgid "unusable squash-onto" msgstr "непригодный для использования уплотнить-над" -#: sequencer.c:2565 +#: sequencer.c:2710 #, c-format msgid "malformed options sheet: '%s'" msgstr "испорченная карта с опциями: «%s»" -#: sequencer.c:2648 sequencer.c:4227 +#: sequencer.c:2803 sequencer.c:4636 msgid "empty commit set passed" msgstr "передан пустой набор коммитов" -#: sequencer.c:2656 -msgid "a cherry-pick or revert is already in progress" -msgstr "копирование или обращение изменений коммита уже выполняются" +#: sequencer.c:2820 +msgid "revert is already in progress" +msgstr "" + +#: sequencer.c:2822 +#, c-format +msgid "try \"git revert (--continue | %s--abort | --quit)\"" +msgstr "" -#: sequencer.c:2657 -msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" -msgstr "попробуйте «git cherry-pick (--continue | --quit | --abort)»" +#: sequencer.c:2825 +msgid "cherry-pick is already in progress" +msgstr "" + +#: sequencer.c:2827 +#, c-format +msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" +msgstr "" -#: sequencer.c:2660 +#: sequencer.c:2841 #, c-format msgid "could not create sequencer directory '%s'" msgstr "не удалось создать каталог для указателя следования коммитов «%s»" -#: sequencer.c:2674 +#: sequencer.c:2856 msgid "could not lock HEAD" msgstr "не удалось заблокировать HEAD" -#: sequencer.c:2729 sequencer.c:3979 +#: sequencer.c:2916 sequencer.c:4371 msgid "no cherry-pick or revert in progress" msgstr "копирование или обращение изменений коммита уже выполняются" -#: sequencer.c:2731 +#: sequencer.c:2918 sequencer.c:2929 msgid "cannot resolve HEAD" msgstr "не удалось определить HEAD" -#: sequencer.c:2733 sequencer.c:2768 +#: sequencer.c:2920 sequencer.c:2964 msgid "cannot abort from a branch yet to be born" msgstr "нельзя отменить изменения с ветки, которая еще не создана" -#: sequencer.c:2754 builtin/grep.c:732 +#: sequencer.c:2950 builtin/grep.c:756 #, c-format msgid "cannot open '%s'" msgstr "не удалось открыть «%s»" -#: sequencer.c:2756 +#: sequencer.c:2952 #, c-format msgid "cannot read '%s': %s" msgstr "не удалось прочитать «%s»: %s" -#: sequencer.c:2757 +#: sequencer.c:2953 msgid "unexpected end of file" msgstr "неожиданный конец файла" -#: sequencer.c:2763 +#: sequencer.c:2959 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "сохраненный файл с HEAD перед копированием коммита «%s» поврежден" -#: sequencer.c:2774 +#: sequencer.c:2970 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "Похоже, что вы переместили HEAD. Перемотка не выполняется, проверьте свой указатель HEAD!" -#: sequencer.c:2903 sequencer.c:3894 +#: sequencer.c:3011 +msgid "no revert in progress" +msgstr "" + +#: sequencer.c:3020 +msgid "no cherry-pick in progress" +msgstr "" + +#: sequencer.c:3030 +msgid "failed to skip the commit" +msgstr "" + +#: sequencer.c:3037 +msgid "there is nothing to skip" +msgstr "" + +#: sequencer.c:3040 #, c-format -msgid "could not update %s" -msgstr "не удалось обновить %s" +msgid "" +"have you committed already?\n" +"try \"git %s --continue\"" +msgstr "" -#: sequencer.c:2941 sequencer.c:3874 +#: sequencer.c:3202 sequencer.c:4263 msgid "cannot read HEAD" msgstr "не удалось прочитать HEAD" -#: sequencer.c:2958 +#: sequencer.c:3219 #, c-format msgid "unable to copy '%s' to '%s'" msgstr "" -#: sequencer.c:2966 +#: sequencer.c:3227 #, c-format msgid "" "You can amend the commit now, with\n" @@ -5889,27 +6880,27 @@ msgid "" " git rebase --continue\n" msgstr "" -#: sequencer.c:2976 +#: sequencer.c:3237 #, c-format msgid "Could not apply %s... %.*s" msgstr "" -#: sequencer.c:2983 +#: sequencer.c:3244 #, c-format msgid "Could not merge %.*s" msgstr "" -#: sequencer.c:2997 sequencer.c:3001 builtin/difftool.c:633 +#: sequencer.c:3258 sequencer.c:3262 builtin/difftool.c:640 #, c-format msgid "could not copy '%s' to '%s'" msgstr "не удалось скопировать «%s» в «%s»" -#: sequencer.c:3023 sequencer.c:3446 builtin/rebase.c:839 -#: builtin/rebase.c:1580 builtin/rebase.c:1940 builtin/rebase.c:1995 -msgid "could not read index" -msgstr "не удалось прочитать индекс" +#: sequencer.c:3274 +#, c-format +msgid "Executing: %s\n" +msgstr "" -#: sequencer.c:3028 +#: sequencer.c:3289 #, c-format msgid "" "execution failed: %s\n" @@ -5919,11 +6910,11 @@ msgid "" "\n" msgstr "ошибка выполнения: %s\n%sВы можете исправить ошибку, а затем запустить\n\n git rebase --continue\n\n" -#: sequencer.c:3034 +#: sequencer.c:3295 msgid "and made changes to the index and/or the working tree\n" msgstr "и были сделаны изменения в индексе и/или в рабочем каталоге\n" -#: sequencer.c:3040 +#: sequencer.c:3301 #, c-format msgid "" "execution succeeded: %s\n" @@ -5934,108 +6925,120 @@ msgid "" "\n" msgstr "успешное выполнение: %s\nно остались изменения в индексе и/или в рабочем каталоге\nСделайте коммит или спрячьте ваши изменения, а затем выполните\n\n git rebase --continue\n\n" -#: sequencer.c:3101 +#: sequencer.c:3362 #, c-format msgid "illegal label name: '%.*s'" msgstr "" -#: sequencer.c:3155 +#: sequencer.c:3416 msgid "writing fake root commit" msgstr "запись поддельного корневого коммита" -#: sequencer.c:3160 +#: sequencer.c:3421 msgid "writing squash-onto" msgstr "запить уплотнить-над" -#: sequencer.c:3198 builtin/rebase.c:844 builtin/rebase.c:850 -#, c-format -msgid "failed to find tree of %s" -msgstr "не удалось найти дерево для %s" - -#: sequencer.c:3216 builtin/rebase.c:863 -msgid "could not write index" -msgstr "не удалось записать индекс" - -#: sequencer.c:3243 +#: sequencer.c:3505 #, c-format msgid "could not resolve '%s'" msgstr "не удалось распознать «%s»" -#: sequencer.c:3271 +#: sequencer.c:3538 msgid "cannot merge without a current revision" msgstr "нельзя слить без текущей редакции" -#: sequencer.c:3293 +#: sequencer.c:3560 #, c-format msgid "unable to parse '%.*s'" msgstr "" -#: sequencer.c:3302 +#: sequencer.c:3569 #, c-format msgid "nothing to merge: '%.*s'" msgstr "" -#: sequencer.c:3314 +#: sequencer.c:3581 msgid "octopus merge cannot be executed on top of a [new root]" msgstr "" -#: sequencer.c:3329 +#: sequencer.c:3597 #, c-format msgid "could not get commit message of '%s'" msgstr "не удалось получить сообщение коммита для «%s»" -#: sequencer.c:3478 +#: sequencer.c:3780 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "не удалось даже попытаться слить «%.*s»" -#: sequencer.c:3494 +#: sequencer.c:3796 msgid "merge: Unable to write new index file" msgstr "слияние: Не удалось записать файл индекса" -#: sequencer.c:3562 builtin/rebase.c:711 +#: sequencer.c:3870 +msgid "Cannot autostash" +msgstr "Не удалось автоматически спрятать изменения" + +#: sequencer.c:3873 +#, c-format +msgid "Unexpected stash response: '%s'" +msgstr "" + +#: sequencer.c:3879 +#, c-format +msgid "Could not create directory for '%s'" +msgstr "" + +#: sequencer.c:3882 +#, c-format +msgid "Created autostash: %s\n" +msgstr "" + +#: sequencer.c:3886 +msgid "could not reset --hard" +msgstr "" + +#: sequencer.c:3911 #, c-format msgid "Applied autostash.\n" msgstr "Применены автоматически спрятанные изменения.\n" -#: sequencer.c:3574 +#: sequencer.c:3923 #, c-format msgid "cannot store %s" msgstr "не удалось сохранить %s" -#: sequencer.c:3577 builtin/rebase.c:727 +#: sequencer.c:3926 #, c-format msgid "" -"Applying autostash resulted in conflicts.\n" +"%s\n" "Your changes are safe in the stash.\n" "You can run \"git stash pop\" or \"git stash drop\" at any time.\n" -msgstr "Применение автоматически спрятанных изменений вызвало конфликты.\nВаши изменения спрятаны и в безопасности.\nВы можете выполнить «git stash pop» или «git stash drop» в любой момент.\n" +msgstr "" -#: sequencer.c:3638 -#, c-format -msgid "could not checkout %s" +#: sequencer.c:3931 +msgid "Applying autostash resulted in conflicts." msgstr "" -#: sequencer.c:3652 -#, c-format -msgid "%s: not a valid OID" +#: sequencer.c:3932 +msgid "Autostash exists; creating a new stash entry." msgstr "" -#: sequencer.c:3657 git-rebase--preserve-merges.sh:724 +#: sequencer.c:4025 git-rebase--preserve-merges.sh:769 msgid "could not detach HEAD" msgstr "не удалось отделить HEAD" -#: sequencer.c:3672 +#: sequencer.c:4040 #, c-format msgid "Stopped at HEAD\n" msgstr "" -#: sequencer.c:3674 +#: sequencer.c:4042 #, c-format msgid "Stopped at %s\n" msgstr "" -#: sequencer.c:3682 +#: sequencer.c:4050 #, c-format msgid "" "Could not execute the todo command\n" @@ -6048,120 +7051,124 @@ msgid "" " git rebase --continue\n" msgstr "" -#: sequencer.c:3759 +#: sequencer.c:4096 +#, c-format +msgid "Rebasing (%d/%d)%s" +msgstr "" + +#: sequencer.c:4141 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "Остановлено на %s … %.*s\n" -#: sequencer.c:3837 +#: sequencer.c:4212 #, c-format msgid "unknown command %d" msgstr "неизвестная команда %d" -#: sequencer.c:3882 +#: sequencer.c:4271 msgid "could not read orig-head" msgstr "не удалось прочитать orig-head" -#: sequencer.c:3887 +#: sequencer.c:4276 msgid "could not read 'onto'" msgstr "не удалось прочитать «onto»" -#: sequencer.c:3901 +#: sequencer.c:4290 #, c-format msgid "could not update HEAD to %s" msgstr "не удалось обновить HEAD на %s" -#: sequencer.c:3991 +#: sequencer.c:4350 +#, c-format +msgid "Successfully rebased and updated %s.\n" +msgstr "" + +#: sequencer.c:4383 msgid "cannot rebase: You have unstaged changes." msgstr "не удалось выполнить перемещение коммитов: У вас есть непроиндексированные изменения." -#: sequencer.c:4000 +#: sequencer.c:4392 msgid "cannot amend non-existing commit" msgstr "не удалось исправить несуществующий коммит" -#: sequencer.c:4002 +#: sequencer.c:4394 #, c-format msgid "invalid file: '%s'" msgstr "недопустимый файл: «%s»" -#: sequencer.c:4004 +#: sequencer.c:4396 #, c-format msgid "invalid contents: '%s'" msgstr "недопустимое содержимое: «%s»" -#: sequencer.c:4007 +#: sequencer.c:4399 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" "first and then run 'git rebase --continue' again." msgstr "\nУ вас имеются незакоммиченные изменения в рабочем каталоге. Сделайте коммит, а затем запустите «git rebase --continue» снова." -#: sequencer.c:4043 sequencer.c:4081 +#: sequencer.c:4435 sequencer.c:4474 #, c-format msgid "could not write file: '%s'" msgstr "" -#: sequencer.c:4096 +#: sequencer.c:4490 msgid "could not remove CHERRY_PICK_HEAD" msgstr "не удалось удалить CHERRY_PICK_HEAD" -#: sequencer.c:4103 +#: sequencer.c:4497 msgid "could not commit staged changes." msgstr "не удалось закоммитить проиндексированные изменения." -#: sequencer.c:4204 +#: sequencer.c:4613 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: не удалось скопировать коммит %s" -#: sequencer.c:4208 +#: sequencer.c:4617 #, c-format msgid "%s: bad revision" msgstr "%s: плохая редакция" -#: sequencer.c:4243 +#: sequencer.c:4652 msgid "can't revert as initial commit" msgstr "нельзя возвратить изначальный коммит" -#: sequencer.c:4686 +#: sequencer.c:5129 msgid "make_script: unhandled options" msgstr "make_script: не обработанные опции" -#: sequencer.c:4689 +#: sequencer.c:5132 msgid "make_script: error preparing revisions" msgstr "make_script: ошибка при обновлении редакций" -#: sequencer.c:4847 -msgid "" -"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'.\n" -"Or you can abort the rebase with 'git rebase --abort'.\n" -msgstr "Вы можете исправить это с помощью «git rebase --edit-todo», а потом запустив «git rebase --continue».\nИли вы можете прервать процесс перемещения, выполнив «git rebase --abort»\n" - -#: sequencer.c:4959 sequencer.c:4976 +#: sequencer.c:5374 sequencer.c:5391 msgid "nothing to do" msgstr "" -#: sequencer.c:4990 +#: sequencer.c:5410 msgid "could not skip unnecessary pick commands" msgstr "" -#: sequencer.c:5073 +#: sequencer.c:5504 msgid "the script was already rearranged." msgstr "сценарий уже был перестроен." -#: setup.c:123 +#: setup.c:133 #, c-format -msgid "'%s' is outside repository" -msgstr "«%s» вне репозитория" +msgid "'%s' is outside repository at '%s'" +msgstr "" -#: setup.c:173 +#: setup.c:185 #, c-format msgid "" "%s: no such path in the working tree.\n" "Use 'git <command> -- <path>...' to specify paths that do not exist locally." msgstr "%s: нет такого пути в рабочем каталоге.\nИспользуйте «git <команда> -- <путь>…» для указания путей, которые не существуют локально." -#: setup.c:186 +#: setup.c:198 #, c-format msgid "" "ambiguous argument '%s': unknown revision or path not in the working tree.\n" @@ -6169,12 +7176,12 @@ msgid "" "'git <command> [<revision>...] -- [<file>...]'" msgstr "неоднозначный аргумент «%s»: неизвестная редакция или не путь в рабочем каталоге.\nИспользуйте «--» для отделения путей от редакций, вот так:\n«git <команда> [<редакция>…] -- [<файл>…]»" -#: setup.c:235 +#: setup.c:264 #, c-format msgid "option '%s' must come before non-option arguments" msgstr "" -#: setup.c:254 +#: setup.c:283 #, c-format msgid "" "ambiguous argument '%s': both revision and filename\n" @@ -6182,387 +7189,547 @@ msgid "" "'git <command> [<revision>...] -- [<file>...]'" msgstr "неоднозначный аргумент «%s»: является одновременно и редакцией и именем файла.\nИспользуйте «--» для отделения путей от редакций, вот так:\n«git <команда> [<редакция>…] -- [<файл>…]»" -#: setup.c:390 +#: setup.c:419 msgid "unable to set up work tree using invalid config" msgstr "" -#: setup.c:394 +#: setup.c:423 msgid "this operation must be run in a work tree" msgstr "" -#: setup.c:540 +#: setup.c:661 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "Ожидаемая версия git репозитория <= %d, а обнаружена %d" -#: setup.c:548 +#: setup.c:669 msgid "unknown repository extensions found:" msgstr "обнаружены неизвестные расширения репозитория:" -#: setup.c:567 +#: setup.c:681 +msgid "repo version is 0, but v1-only extensions found:" +msgstr "" + +#: setup.c:700 #, c-format msgid "error opening '%s'" msgstr "ошибка открытия «%s»" -#: setup.c:569 +#: setup.c:702 #, c-format msgid "too large to be a .git file: '%s'" msgstr "файл слишком большой как для .git файла: «%s»" -#: setup.c:571 +#: setup.c:704 #, c-format msgid "error reading %s" msgstr "ошибка чтения %s" -#: setup.c:573 +#: setup.c:706 #, c-format msgid "invalid gitfile format: %s" msgstr "неправильный формат файла gitfile: %s" -#: setup.c:575 +#: setup.c:708 #, c-format msgid "no path in gitfile: %s" msgstr "нет пути в gitfile: %s" -#: setup.c:577 +#: setup.c:710 #, c-format msgid "not a git repository: %s" msgstr "не является репозиторием git: %s" -#: setup.c:676 +#: setup.c:812 #, c-format msgid "'$%s' too big" msgstr "«$%s» слишком большой" -#: setup.c:690 +#: setup.c:826 #, c-format msgid "not a git repository: '%s'" msgstr "не является репозиторием git: «%s»" -#: setup.c:719 setup.c:721 setup.c:752 +#: setup.c:855 setup.c:857 setup.c:888 #, c-format msgid "cannot chdir to '%s'" msgstr "не удалось выполнить chdir в «%s»" -#: setup.c:724 setup.c:780 setup.c:790 setup.c:829 setup.c:837 +#: setup.c:860 setup.c:916 setup.c:926 setup.c:965 setup.c:973 msgid "cannot come back to cwd" msgstr "не удалось вернуться в cwd" -#: setup.c:851 +#: setup.c:987 #, c-format msgid "failed to stat '%*s%s%s'" msgstr "не удалось выполнить stat для «%*s%s%s»" -#: setup.c:1083 +#: setup.c:1225 msgid "Unable to read current working directory" msgstr "Не удалось прочитать текущий рабочий каталог" -#: setup.c:1092 setup.c:1098 +#: setup.c:1234 setup.c:1240 #, c-format msgid "cannot change to '%s'" msgstr "не удалось изменить на «%s»" -#: setup.c:1103 +#: setup.c:1245 #, c-format msgid "not a git repository (or any of the parent directories): %s" msgstr "не найден git репозиторий (или один из родительских каталогов): %s" -#: setup.c:1109 +#: setup.c:1251 #, c-format msgid "" "not a git repository (or any parent up to mount point %s)\n" "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)." msgstr "не найден git репозиторий (или один из его каталогов вплоть до точки монтирования %s)\nОстанавливаю поиск на границе файловой системы (так как GIT_DISCOVERY_ACROSS_FILESYSTEM не установлен)." -#: setup.c:1220 +#: setup.c:1362 #, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" "The owner of files must always have read and write permissions." msgstr "" -#: setup.c:1264 +#: setup.c:1409 msgid "open /dev/null or dup failed" msgstr "сбой открытия /dev/null или дублирования дескриптора" -#: setup.c:1279 +#: setup.c:1424 msgid "fork failed" msgstr "сбой при выполнении fork" -#: setup.c:1284 +#: setup.c:1429 msgid "setsid failed" msgstr "сбой при выполнении setsid" -#: sha1-file.c:453 +#: sha1-file.c:480 #, c-format msgid "object directory %s does not exist; check .git/objects/info/alternates" msgstr "" -#: sha1-file.c:504 +#: sha1-file.c:531 #, c-format msgid "unable to normalize alternate object path: %s" msgstr "" -#: sha1-file.c:576 +#: sha1-file.c:603 #, c-format msgid "%s: ignoring alternate object stores, nesting too deep" msgstr "" -#: sha1-file.c:583 +#: sha1-file.c:610 #, c-format msgid "unable to normalize object directory: %s" msgstr "" -#: sha1-file.c:626 +#: sha1-file.c:653 msgid "unable to fdopen alternates lockfile" msgstr "" -#: sha1-file.c:644 +#: sha1-file.c:671 msgid "unable to read alternates file" msgstr "" -#: sha1-file.c:651 +#: sha1-file.c:678 msgid "unable to move new alternates file into place" msgstr "" -#: sha1-file.c:686 +#: sha1-file.c:713 #, c-format msgid "path '%s' does not exist" msgstr "путь «%s» не существует" -#: sha1-file.c:712 +#: sha1-file.c:734 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "ссылаемый репозиторий «%s» как связанное состояние, пока не поддерживается." -#: sha1-file.c:718 +#: sha1-file.c:740 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "ссылаемый репозиторий «%s» не является локальным." -#: sha1-file.c:724 +#: sha1-file.c:746 #, c-format msgid "reference repository '%s' is shallow" msgstr "ссылаемый репозиторий «%s» является частичным" -#: sha1-file.c:732 +#: sha1-file.c:754 #, c-format msgid "reference repository '%s' is grafted" msgstr "ссылаемый репозиторий «%s» является сращенным" -#: sha1-file.c:846 +#: sha1-file.c:814 +#, c-format +msgid "invalid line while parsing alternate refs: %s" +msgstr "" + +#: sha1-file.c:964 #, c-format msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" msgstr "" -#: sha1-file.c:871 +#: sha1-file.c:985 msgid "mmap failed" msgstr "" -#: sha1-file.c:1035 +#: sha1-file.c:1149 #, c-format msgid "object file %s is empty" msgstr "" -#: sha1-file.c:1159 sha1-file.c:2297 +#: sha1-file.c:1284 sha1-file.c:2477 #, c-format msgid "corrupt loose object '%s'" msgstr "" -#: sha1-file.c:1161 sha1-file.c:2301 +#: sha1-file.c:1286 sha1-file.c:2481 #, c-format msgid "garbage at end of loose object '%s'" msgstr "" -#: sha1-file.c:1203 +#: sha1-file.c:1328 msgid "invalid object type" msgstr "" -#: sha1-file.c:1287 +#: sha1-file.c:1412 #, c-format msgid "unable to unpack %s header with --allow-unknown-type" msgstr "" -#: sha1-file.c:1290 +#: sha1-file.c:1415 #, c-format msgid "unable to unpack %s header" msgstr "" -#: sha1-file.c:1296 +#: sha1-file.c:1421 #, c-format msgid "unable to parse %s header with --allow-unknown-type" msgstr "" -#: sha1-file.c:1299 +#: sha1-file.c:1424 #, c-format msgid "unable to parse %s header" msgstr "" -#: sha1-file.c:1490 +#: sha1-file.c:1651 #, c-format msgid "failed to read object %s" msgstr "" -#: sha1-file.c:1494 +#: sha1-file.c:1655 #, c-format msgid "replacement %s not found for %s" msgstr "" -#: sha1-file.c:1498 +#: sha1-file.c:1659 #, c-format msgid "loose object %s (stored in %s) is corrupt" msgstr "" -#: sha1-file.c:1502 +#: sha1-file.c:1663 #, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "" -#: sha1-file.c:1604 +#: sha1-file.c:1768 #, c-format msgid "unable to write file %s" msgstr "" -#: sha1-file.c:1611 +#: sha1-file.c:1775 #, c-format msgid "unable to set permission to '%s'" msgstr "" -#: sha1-file.c:1618 +#: sha1-file.c:1782 msgid "file write error" msgstr "" -#: sha1-file.c:1637 +#: sha1-file.c:1802 msgid "error when closing loose object file" msgstr "" -#: sha1-file.c:1702 +#: sha1-file.c:1867 #, c-format msgid "insufficient permission for adding an object to repository database %s" msgstr "" -#: sha1-file.c:1704 +#: sha1-file.c:1869 msgid "unable to create temporary file" msgstr "" -#: sha1-file.c:1728 +#: sha1-file.c:1893 msgid "unable to write loose object file" msgstr "" -#: sha1-file.c:1734 +#: sha1-file.c:1899 #, c-format msgid "unable to deflate new object %s (%d)" msgstr "" -#: sha1-file.c:1738 +#: sha1-file.c:1903 #, c-format msgid "deflateEnd on object %s failed (%d)" msgstr "" -#: sha1-file.c:1742 +#: sha1-file.c:1907 #, c-format msgid "confused by unstable object source data for %s" msgstr "" -#: sha1-file.c:1752 builtin/pack-objects.c:920 +#: sha1-file.c:1917 builtin/pack-objects.c:1086 #, c-format msgid "failed utime() on %s" msgstr "" -#: sha1-file.c:1827 +#: sha1-file.c:1994 #, c-format msgid "cannot read object for %s" msgstr "" -#: sha1-file.c:1867 +#: sha1-file.c:2045 msgid "corrupt commit" msgstr "" -#: sha1-file.c:1875 +#: sha1-file.c:2053 msgid "corrupt tag" msgstr "" -#: sha1-file.c:1974 +#: sha1-file.c:2153 #, c-format msgid "read error while indexing %s" msgstr "" -#: sha1-file.c:1977 +#: sha1-file.c:2156 #, c-format msgid "short read while indexing %s" msgstr "" -#: sha1-file.c:2050 sha1-file.c:2059 +#: sha1-file.c:2229 sha1-file.c:2239 #, c-format msgid "%s: failed to insert into database" msgstr "" -#: sha1-file.c:2065 +#: sha1-file.c:2245 #, c-format msgid "%s: unsupported file type" msgstr "" -#: sha1-file.c:2089 +#: sha1-file.c:2269 #, c-format msgid "%s is not a valid object" msgstr "" -#: sha1-file.c:2091 +#: sha1-file.c:2271 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s не является действительным объектом «%s»" -#: sha1-file.c:2118 builtin/index-pack.c:154 +#: sha1-file.c:2298 builtin/index-pack.c:192 #, c-format msgid "unable to open %s" msgstr "не удалось открыть %s" -#: sha1-file.c:2308 sha1-file.c:2360 +#: sha1-file.c:2488 sha1-file.c:2541 #, c-format msgid "hash mismatch for %s (expected %s)" -msgstr "несоответствие хеш-суммы %s (ожидается %s)" +msgstr "несоответствие хэш-кода %s (ожидается %s)" -#: sha1-file.c:2332 +#: sha1-file.c:2512 #, c-format msgid "unable to mmap %s" msgstr "" -#: sha1-file.c:2337 +#: sha1-file.c:2517 #, c-format msgid "unable to unpack header of %s" msgstr "" -#: sha1-file.c:2343 +#: sha1-file.c:2523 #, c-format msgid "unable to parse header of %s" msgstr "" -#: sha1-file.c:2354 +#: sha1-file.c:2534 #, c-format msgid "unable to unpack contents of %s" msgstr "" -#: sha1-name.c:490 +#: sha1-name.c:486 #, c-format msgid "short SHA1 %s is ambiguous" msgstr "сокращённый SHA1 идентификатор %s неоднозначен" -#: sha1-name.c:501 +#: sha1-name.c:497 msgid "The candidates are:" msgstr "Возможно, вы имели в виду:" -#: sha1-name.c:800 +#: sha1-name.c:796 msgid "" "Git normally never creates a ref that ends with 40 hex characters\n" "because it will be ignored when you just specify 40-hex. These refs\n" "may be created by mistake. For example,\n" "\n" -" git checkout -b $br $(git rev-parse ...)\n" +" git switch -c $br $(git rev-parse ...)\n" "\n" "where \"$br\" is somehow empty and a 40-hex ref is created. Please\n" "examine these refs and maybe delete them. Turn this message off by\n" "running \"git config advice.objectNameWarning false\"" -msgstr "Обычно Git не создает ссылки, оканчивающиеся на 40 шестнадцатеричных\nсимволов, потому, что они будут игнорироваться, когда вы просто\nукажете это 40-символьное шестнадцатеричное число. Такие ссылки\nмогли быть созданы по ошибке. Например, с помощью:\n\n git checkout -b $br $(git rev-parse …)\n\n, если «$br» оказался пустым, то ссылка с 40-символьным\nшестнадцатеричным числом будет создана. Пожалуйста, просмотрите эти\nссылки и, возможно, удалите их. Вы можете отключить это сообщение\nзапустив «git config advice.objectNameWarning false»" +msgstr "" + +#: sha1-name.c:916 +#, c-format +msgid "log for '%.*s' only goes back to %s" +msgstr "" + +#: sha1-name.c:924 +#, c-format +msgid "log for '%.*s' only has %d entries" +msgstr "" + +#: sha1-name.c:1702 +#, c-format +msgid "path '%s' exists on disk, but not in '%.*s'" +msgstr "" + +#: sha1-name.c:1708 +#, c-format +msgid "" +"path '%s' exists, but not '%s'\n" +"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?" +msgstr "" + +#: sha1-name.c:1717 +#, c-format +msgid "path '%s' does not exist in '%.*s'" +msgstr "" + +#: sha1-name.c:1745 +#, c-format +msgid "" +"path '%s' is in the index, but not at stage %d\n" +"hint: Did you mean ':%d:%s'?" +msgstr "" + +#: sha1-name.c:1761 +#, c-format +msgid "" +"path '%s' is in the index, but not '%s'\n" +"hint: Did you mean ':%d:%s' aka ':%d:./%s'?" +msgstr "" + +#: sha1-name.c:1769 +#, c-format +msgid "path '%s' exists on disk, but not in the index" +msgstr "" + +#: sha1-name.c:1771 +#, c-format +msgid "path '%s' does not exist (neither on disk nor in the index)" +msgstr "" + +#: sha1-name.c:1784 +msgid "relative path syntax can't be used outside working tree" +msgstr "" + +#: sha1-name.c:1922 +#, c-format +msgid "invalid object name '%.*s'." +msgstr "" + +#. TRANSLATORS: IEC 80000-13:2008 gibibyte +#: strbuf.c:848 +#, c-format +msgid "%u.%2.2u GiB" +msgstr "%u.%2.2u ГиБ" + +#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second +#: strbuf.c:850 +#, c-format +msgid "%u.%2.2u GiB/s" +msgstr "%u.%2.2u ГиБ/с" + +#. TRANSLATORS: IEC 80000-13:2008 mebibyte +#: strbuf.c:858 +#, c-format +msgid "%u.%2.2u MiB" +msgstr "%u.%2.2u МиБ" + +#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second +#: strbuf.c:860 +#, c-format +msgid "%u.%2.2u MiB/s" +msgstr "%u.%2.2u МиБ/с" + +#. TRANSLATORS: IEC 80000-13:2008 kibibyte +#: strbuf.c:867 +#, c-format +msgid "%u.%2.2u KiB" +msgstr "%u.%2.2u КиБ" + +#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second +#: strbuf.c:869 +#, c-format +msgid "%u.%2.2u KiB/s" +msgstr "%u.%2.2u КиБ/с" + +#. TRANSLATORS: IEC 80000-13:2008 byte +#: strbuf.c:875 +#, c-format +msgid "%u byte" +msgid_plural "%u bytes" +msgstr[0] "%u байт" +msgstr[1] "%u байта" +msgstr[2] "%u байтов" +msgstr[3] "%u байта" + +#. TRANSLATORS: IEC 80000-13:2008 byte/second +#: strbuf.c:877 +#, c-format +msgid "%u byte/s" +msgid_plural "%u bytes/s" +msgstr[0] "%u байт/с" +msgstr[1] "%u байта/с" +msgstr[2] "%u байтов/с" +msgstr[3] "%u байта/с" + +#: strbuf.c:1166 wrapper.c:199 wrapper.c:369 builtin/am.c:719 +#: builtin/rebase.c:864 +#, c-format +msgid "could not open '%s' for writing" +msgstr "не удалось открыть «%s» для записи" + +#: strbuf.c:1175 +#, c-format +msgid "could not edit '%s'" +msgstr "" + +#: submodule-config.c:237 +#, c-format +msgid "ignoring suspicious submodule name: %s" +msgstr "игнорирую подозрительный подмодуль с именем: %s" + +#: submodule-config.c:304 +msgid "negative values not allowed for submodule.fetchjobs" +msgstr "нельзя использовать отрицательные значения для submodule.fetchjobs" + +#: submodule-config.c:402 +#, c-format +msgid "ignoring '%s' which may be interpreted as a command-line option: %s" +msgstr "" + +#: submodule-config.c:499 +#, c-format +msgid "invalid value for %s" +msgstr "неправильное значение %s" + +#: submodule-config.c:766 +#, c-format +msgid "Could not update .gitmodules entry %s" +msgstr "Не удалось обновить .gitmodules запись %s" #: submodule.c:114 submodule.c:143 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" @@ -6592,62 +7759,137 @@ msgstr "в пустом подмодуле «%s»" msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "Спецификатор пути «%s» в подмодуле «%.*s»" -#: submodule.c:910 +#: submodule.c:434 +#, c-format +msgid "bad --ignore-submodules argument: %s" +msgstr "" + +#: submodule.c:816 +#, c-format +msgid "" +"Submodule in commit %s at path: '%s' collides with a submodule named the " +"same. Skipping it." +msgstr "" + +#: submodule.c:919 #, c-format msgid "submodule entry '%s' (%s) is a %s, not a commit" msgstr "запись подмодуля «%s» (%s) является %s, а не является коммитом" -#: submodule.c:1147 builtin/branch.c:672 builtin/submodule--helper.c:1988 +#: submodule.c:1004 +#, c-format +msgid "" +"Could not run 'git rev-list <commits> --not --remotes -n 1' command in " +"submodule %s" +msgstr "" + +#: submodule.c:1127 +#, c-format +msgid "process for submodule '%s' failed" +msgstr "" + +#: submodule.c:1156 builtin/branch.c:680 builtin/submodule--helper.c:2469 msgid "Failed to resolve HEAD as a valid ref." msgstr "Не удалось определить HEAD как действительную ссылку." -#: submodule.c:1481 +#: submodule.c:1167 +#, c-format +msgid "Pushing submodule '%s'\n" +msgstr "" + +#: submodule.c:1170 #, c-format -msgid "Could not access submodule '%s'" +msgid "Unable to push submodule '%s'\n" msgstr "" -#: submodule.c:1651 +#: submodule.c:1462 +#, c-format +msgid "Fetching submodule %s%s\n" +msgstr "" + +#: submodule.c:1492 +#, c-format +msgid "Could not access submodule '%s'\n" +msgstr "" + +#: submodule.c:1646 +#, c-format +msgid "" +"Errors during submodule fetch:\n" +"%s" +msgstr "" + +#: submodule.c:1671 #, c-format msgid "'%s' not recognized as a git repository" msgstr "«%s» не распознан как репозиторий git" -#: submodule.c:1789 +#: submodule.c:1688 +#, c-format +msgid "Could not run 'git status --porcelain=2' in submodule %s" +msgstr "" + +#: submodule.c:1729 +#, c-format +msgid "'git status --porcelain=2' failed in submodule %s" +msgstr "" + +#: submodule.c:1804 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "не удалось запустить «git status» в подмодуле «%s»" -#: submodule.c:1802 +#: submodule.c:1817 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "не удалось запустить «git status» в подмодуле «%s»" -#: submodule.c:1817 +#: submodule.c:1832 #, c-format msgid "Could not unset core.worktree setting in submodule '%s'" msgstr "" -#: submodule.c:1907 +#: submodule.c:1859 submodule.c:2169 +#, c-format +msgid "could not recurse into submodule '%s'" +msgstr "не удалось рекурсивно зайти в подмодуль «%s»" + +#: submodule.c:1880 +msgid "could not reset submodule index" +msgstr "" + +#: submodule.c:1922 #, c-format msgid "submodule '%s' has dirty index" msgstr "подмодуль «%s» имеет изменённый индекс" -#: submodule.c:1959 +#: submodule.c:1974 #, c-format msgid "Submodule '%s' could not be updated." msgstr "" -#: submodule.c:2008 +#: submodule.c:2042 +#, c-format +msgid "submodule git dir '%s' is inside git dir '%.*s'" +msgstr "" + +#: submodule.c:2063 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" msgstr "relocate_gitdir для подмодуля «%s» с указанием более одного рабочего дерева не поддерживается" -#: submodule.c:2020 submodule.c:2076 +#: submodule.c:2075 submodule.c:2134 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "не удалось запросить имя подмодуля «%s»" -#: submodule.c:2027 +#: submodule.c:2079 +#, c-format +msgid "refusing to move '%s' into an existing git dir" +msgstr "" + +#: submodule.c:2086 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -6655,544 +7897,544 @@ msgid "" "'%s'\n" msgstr "Перемещение каталога git для «%s%s» из\n«%s» в\n«%s»\n" -#: submodule.c:2111 -#, c-format -msgid "could not recurse into submodule '%s'" -msgstr "не удалось рекурсивно зайти в подмодуль «%s»" - -#: submodule.c:2155 +#: submodule.c:2214 msgid "could not start ls-files in .." msgstr "не удалось выполнить stat ls-files в .." -#: submodule.c:2194 +#: submodule.c:2254 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree вернул неожиданный код %d" -#: submodule-config.c:232 -#, c-format -msgid "ignoring suspicious submodule name: %s" -msgstr "игнорирую подозрительный подмодуль с именем: %s" - -#: submodule-config.c:299 -msgid "negative values not allowed for submodule.fetchjobs" -msgstr "нельзя использовать отрицательные значения для submodule.fetchjobs" - -#: submodule-config.c:397 -#, c-format -msgid "ignoring '%s' which may be interpreted as a command-line option: %s" -msgstr "" - -#: submodule-config.c:486 -#, c-format -msgid "invalid value for %s" -msgstr "неправильное значение %s" - -#: submodule-config.c:755 -#, c-format -msgid "Could not update .gitmodules entry %s" -msgstr " Не удалось обновить .gitmodules запись %s" - -#: trailer.c:238 +#: trailer.c:236 #, c-format msgid "running trailer command '%s' failed" msgstr "сбой при запуске команды завершителя «%s»" -#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553 -#: trailer.c:557 +#: trailer.c:483 trailer.c:488 trailer.c:493 trailer.c:547 trailer.c:551 +#: trailer.c:555 #, c-format msgid "unknown value '%s' for key '%s'" msgstr "неизвестное значение «%s» для ключа «%s»" -#: trailer.c:539 trailer.c:544 builtin/remote.c:295 +#: trailer.c:537 trailer.c:542 builtin/remote.c:299 builtin/remote.c:324 #, c-format msgid "more than one %s" msgstr "больше одного %s" -#: trailer.c:730 +#: trailer.c:728 #, c-format msgid "empty trailer token in trailer '%.*s'" msgstr "пустая последняя лексема в завершителе «%.*s»" -#: trailer.c:750 +#: trailer.c:748 #, c-format msgid "could not read input file '%s'" msgstr "не удалось прочитать входной файл «%s»" -#: trailer.c:753 +#: trailer.c:751 msgid "could not read from stdin" msgstr "не удалось прочитать из стандартного ввода" -#: trailer.c:1011 wrapper.c:701 +#: trailer.c:1009 wrapper.c:676 #, c-format msgid "could not stat %s" msgstr "не удалось выполнить stat для %s" -#: trailer.c:1013 +#: trailer.c:1011 #, c-format msgid "file %s is not a regular file" msgstr "файл %s не является обычным файлом" -#: trailer.c:1015 +#: trailer.c:1013 #, c-format msgid "file %s is not writable by user" msgstr "файл %s не доступен на запись пользователю" -#: trailer.c:1027 +#: trailer.c:1025 msgid "could not open temporary file" msgstr "не удалось создать временный файл" -#: trailer.c:1067 +#: trailer.c:1065 #, c-format msgid "could not rename temporary file to %s" msgstr "не удалось переименовать временный файл в %s" -#: transport.c:116 -#, c-format -msgid "Would set upstream of '%s' to '%s' of '%s'\n" -msgstr "Будет установлен вышестоящий репозиторий для «%s» на «%s» с «%s»\n" - -#: transport.c:142 -#, c-format -msgid "could not read bundle '%s'" -msgstr "" - -#: transport.c:208 -#, c-format -msgid "transport: invalid depth option '%s'" -msgstr "транспорт: неправильный параметр глубины «%s»" - -#: transport.c:259 -msgid "see protocol.version in 'git help config' for more details" -msgstr "" - -#: transport.c:260 -msgid "server options require protocol version 2 or later" -msgstr "" - -#: transport.c:625 -msgid "could not parse transport.color.* config" -msgstr "не удалось разобрать опцию transport.color.*" - -#: transport.c:698 -msgid "support for protocol v2 not implemented yet" -msgstr "" - -#: transport.c:825 -#, c-format -msgid "unknown value for config '%s': %s" -msgstr "" - -#: transport.c:891 -#, c-format -msgid "transport '%s' not allowed" -msgstr "" - -#: transport.c:945 -msgid "git-over-rsync is no longer supported" -msgstr "" - -#: transport.c:1040 -#, c-format -msgid "" -"The following submodule paths contain changes that can\n" -"not be found on any remote:\n" -msgstr "Подмодули по указанным путям содержат изменения, которые не найдены ни на одном из внешних репозиториев:\n" - -#: transport.c:1044 -#, c-format -msgid "" -"\n" -"Please try\n" -"\n" -"\tgit push --recurse-submodules=on-demand\n" -"\n" -"or cd to the path and use\n" -"\n" -"\tgit push\n" -"\n" -"to push them to a remote.\n" -"\n" -msgstr "\nПопробуйте выполнить\n\n\tgit push --recurse-submodules=on-demand\n\nили перейти в каталог с помощью команды cd и выполнить\n\n\tgit push\n\nдля их отправки на внешний репозиторий.\n" - -#: transport.c:1052 -msgid "Aborting." -msgstr "Прерываю." - -#: transport.c:1193 -msgid "failed to push all needed submodules" -msgstr "" - -#: transport.c:1326 transport-helper.c:645 -msgid "operation not supported by protocol" -msgstr "" - -#: transport.c:1430 -#, c-format -msgid "invalid line while parsing alternate refs: %s" -msgstr "" - -#: transport-helper.c:51 transport-helper.c:80 +#: transport-helper.c:62 transport-helper.c:91 msgid "full write to remote helper failed" msgstr "" -#: transport-helper.c:134 +#: transport-helper.c:145 #, c-format msgid "unable to find remote helper for '%s'" msgstr "" -#: transport-helper.c:150 transport-helper.c:559 +#: transport-helper.c:161 transport-helper.c:575 msgid "can't dup helper output fd" msgstr "" -#: transport-helper.c:201 +#: transport-helper.c:214 #, c-format msgid "" "unknown mandatory capability %s; this remote helper probably needs newer " "version of Git" msgstr "" -#: transport-helper.c:207 +#: transport-helper.c:220 msgid "this remote helper should implement refspec capability" msgstr "" -#: transport-helper.c:274 transport-helper.c:414 +#: transport-helper.c:287 transport-helper.c:429 #, c-format msgid "%s unexpectedly said: '%s'" msgstr "" -#: transport-helper.c:403 +#: transport-helper.c:417 #, c-format msgid "%s also locked %s" msgstr "" -#: transport-helper.c:481 +#: transport-helper.c:497 msgid "couldn't run fast-import" msgstr "" -#: transport-helper.c:504 +#: transport-helper.c:520 msgid "error while running fast-import" msgstr "" -#: transport-helper.c:533 transport-helper.c:1099 +#: transport-helper.c:549 transport-helper.c:1236 #, c-format msgid "could not read ref %s" msgstr "" -#: transport-helper.c:578 +#: transport-helper.c:594 #, c-format msgid "unknown response to connect: %s" msgstr "" -#: transport-helper.c:600 +#: transport-helper.c:616 msgid "setting remote service path not supported by protocol" msgstr "" -#: transport-helper.c:602 +#: transport-helper.c:618 msgid "invalid remote service path" msgstr "" -#: transport-helper.c:648 +#: transport-helper.c:661 transport.c:1446 +msgid "operation not supported by protocol" +msgstr "" + +#: transport-helper.c:664 #, c-format msgid "can't connect to subservice %s" msgstr "" -#: transport-helper.c:720 +#: transport-helper.c:745 +msgid "'option' without a matching 'ok/error' directive" +msgstr "" + +#: transport-helper.c:788 #, c-format msgid "expected ok/error, helper said '%s'" msgstr "" -#: transport-helper.c:773 +#: transport-helper.c:845 #, c-format msgid "helper reported unexpected status of %s" msgstr "" -#: transport-helper.c:834 +#: transport-helper.c:928 #, c-format msgid "helper %s does not support dry-run" msgstr "" -#: transport-helper.c:837 +#: transport-helper.c:931 #, c-format msgid "helper %s does not support --signed" msgstr "" -#: transport-helper.c:840 +#: transport-helper.c:934 #, c-format msgid "helper %s does not support --signed=if-asked" msgstr "" -#: transport-helper.c:847 +#: transport-helper.c:939 +#, c-format +msgid "helper %s does not support --atomic" +msgstr "" + +#: transport-helper.c:943 +#, c-format +msgid "helper %s does not support --%s" +msgstr "" + +#: transport-helper.c:950 #, c-format msgid "helper %s does not support 'push-option'" msgstr "" -#: transport-helper.c:939 +#: transport-helper.c:1050 msgid "remote-helper doesn't support push; refspec needed" msgstr "" -#: transport-helper.c:944 +#: transport-helper.c:1055 #, c-format msgid "helper %s does not support 'force'" msgstr "" -#: transport-helper.c:991 +#: transport-helper.c:1102 msgid "couldn't run fast-export" msgstr "" -#: transport-helper.c:996 +#: transport-helper.c:1107 msgid "error while running fast-export" msgstr "" -#: transport-helper.c:1021 +#: transport-helper.c:1132 #, c-format msgid "" "No refs in common and none specified; doing nothing.\n" -"Perhaps you should specify a branch such as 'master'.\n" +"Perhaps you should specify a branch.\n" +msgstr "" + +#: transport-helper.c:1213 +#, c-format +msgid "unsupported object format '%s'" msgstr "" -#: transport-helper.c:1085 +#: transport-helper.c:1222 #, c-format msgid "malformed response in ref list: %s" msgstr "" -#: transport-helper.c:1238 +#: transport-helper.c:1374 #, c-format msgid "read(%s) failed" msgstr "" -#: transport-helper.c:1265 +#: transport-helper.c:1401 #, c-format msgid "write(%s) failed" msgstr "" -#: transport-helper.c:1314 +#: transport-helper.c:1450 #, c-format msgid "%s thread failed" msgstr "" -#: transport-helper.c:1318 +#: transport-helper.c:1454 #, c-format msgid "%s thread failed to join: %s" msgstr "" -#: transport-helper.c:1337 transport-helper.c:1341 +#: transport-helper.c:1473 transport-helper.c:1477 #, c-format msgid "can't start thread for copying data: %s" msgstr "" -#: transport-helper.c:1378 +#: transport-helper.c:1514 #, c-format msgid "%s process failed to wait" msgstr "" -#: transport-helper.c:1382 +#: transport-helper.c:1518 #, c-format msgid "%s process failed" msgstr "" -#: transport-helper.c:1400 transport-helper.c:1409 +#: transport-helper.c:1536 transport-helper.c:1545 msgid "can't start thread for copying data" msgstr "" -#: tree-walk.c:33 +#: transport.c:116 +#, c-format +msgid "Would set upstream of '%s' to '%s' of '%s'\n" +msgstr "Будет установлен вышестоящий репозиторий для «%s» на «%s» с «%s»\n" + +#: transport.c:145 +#, c-format +msgid "could not read bundle '%s'" +msgstr "" + +#: transport.c:220 +#, c-format +msgid "transport: invalid depth option '%s'" +msgstr "транспорт: неправильный параметр глубины «%s»" + +#: transport.c:269 +msgid "see protocol.version in 'git help config' for more details" +msgstr "" + +#: transport.c:270 +msgid "server options require protocol version 2 or later" +msgstr "" + +#: transport.c:727 +msgid "could not parse transport.color.* config" +msgstr "не удалось разобрать опцию transport.color.*" + +#: transport.c:802 +msgid "support for protocol v2 not implemented yet" +msgstr "" + +#: transport.c:936 +#, c-format +msgid "unknown value for config '%s': %s" +msgstr "" + +#: transport.c:1002 +#, c-format +msgid "transport '%s' not allowed" +msgstr "" + +#: transport.c:1055 +msgid "git-over-rsync is no longer supported" +msgstr "" + +#: transport.c:1157 +#, c-format +msgid "" +"The following submodule paths contain changes that can\n" +"not be found on any remote:\n" +msgstr "Подмодули по указанным путям содержат изменения, которые не найдены ни на одном из внешних репозиториев:\n" + +#: transport.c:1161 +#, c-format +msgid "" +"\n" +"Please try\n" +"\n" +"\tgit push --recurse-submodules=on-demand\n" +"\n" +"or cd to the path and use\n" +"\n" +"\tgit push\n" +"\n" +"to push them to a remote.\n" +"\n" +msgstr "\nПопробуйте выполнить\n\n\tgit push --recurse-submodules=on-demand\n\nили перейти в каталог с помощью команды cd и выполнить\n\n\tgit push\n\nдля их отправки на внешний репозиторий.\n" + +#: transport.c:1169 +msgid "Aborting." +msgstr "Прерываю." + +#: transport.c:1315 +msgid "failed to push all needed submodules" +msgstr "" + +#: tree-walk.c:32 msgid "too-short tree object" msgstr "слишком короткий объект дерева" -#: tree-walk.c:39 +#: tree-walk.c:38 msgid "malformed mode in tree entry" msgstr "неправильный режим в записи дерева" -#: tree-walk.c:43 +#: tree-walk.c:42 msgid "empty filename in tree entry" msgstr "пустое имя файла в записи дерева" -#: tree-walk.c:116 +#: tree-walk.c:117 msgid "too-short tree file" msgstr "слишком короткий файл дерева" -#: unpack-trees.c:111 +#: unpack-trees.c:113 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" "%%sPlease commit your changes or stash them before you switch branches." msgstr "Ваши локальные изменения в указанных файлах будут перезаписаны при переключении на состояние:\n%%sСделайте коммит или спрячьте ваши изменения перед переключением веток." -#: unpack-trees.c:113 +#: unpack-trees.c:115 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" "%%s" msgstr "Ваши локальные изменения в указанных файлах будут перезаписаны при переключении на состояние:\n%%s" -#: unpack-trees.c:116 +#: unpack-trees.c:118 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" "%%sPlease commit your changes or stash them before you merge." msgstr "Ваши локальные изменения в указанных файлах будут перезаписаны при слиянии:\n%%sСделайте коммит или спрячьте ваши изменения перед слиянием веток." -#: unpack-trees.c:118 +#: unpack-trees.c:120 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" "%%s" msgstr "Ваши локальные изменения в указанных файлах будут перезаписаны при слиянии:\n%%s" -#: unpack-trees.c:121 +#: unpack-trees.c:123 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" "%%sPlease commit your changes or stash them before you %s." msgstr "Ваши локальные изменения в указанных файлах будут перезаписаны при %s:\n%%sСделайте коммит или спрячьте ваши изменения перед %s." -#: unpack-trees.c:123 +#: unpack-trees.c:125 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" "%%s" msgstr "Ваши локальные изменения в указанных файлах будут перезаписаны при %s:\n%%s" -#: unpack-trees.c:128 +#: unpack-trees.c:130 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" "%s" msgstr "Обновление указанных каталогов приведет к потере неотслеживаемых файлов в них:\n%s" -#: unpack-trees.c:132 +#: unpack-trees.c:134 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" "%%sPlease move or remove them before you switch branches." msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут удалены при переключении на состояние:\n%%sПереместите эти файлы или удалите их перед переключением веток." -#: unpack-trees.c:134 +#: unpack-trees.c:136 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" "%%s" msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут удалены при переключении на состояние:\n%%s" -#: unpack-trees.c:137 +#: unpack-trees.c:139 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" "%%sPlease move or remove them before you merge." msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут удалены при слиянии:\n%%sПереместите эти файлы или удалите их перед переключением веток." -#: unpack-trees.c:139 +#: unpack-trees.c:141 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" "%%s" msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут удалены при слиянии:\n%%s" -#: unpack-trees.c:142 +#: unpack-trees.c:144 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" "%%sPlease move or remove them before you %s." msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут удалены при %s:\n%%sПереместите эти файлы или удалите их перед %s." -#: unpack-trees.c:144 +#: unpack-trees.c:146 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" "%%s" msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут удалены при %s:\n%%s" -#: unpack-trees.c:150 +#: unpack-trees.c:152 #, c-format msgid "" "The following untracked working tree files would be overwritten by checkout:\n" "%%sPlease move or remove them before you switch branches." msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут перезаписаны при переключении на состояние:\n%%sПереместите эти файлы или удалите их перед переключением веток." -#: unpack-trees.c:152 +#: unpack-trees.c:154 #, c-format msgid "" "The following untracked working tree files would be overwritten by checkout:\n" "%%s" msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут перезаписаны при переключении на состояние:\n%%s" -#: unpack-trees.c:155 +#: unpack-trees.c:157 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" "%%sPlease move or remove them before you merge." msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут перезаписаны при слиянии:\n%%sПереместите эти файлы или удалите их перед переключением веток." -#: unpack-trees.c:157 +#: unpack-trees.c:159 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" "%%s" msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут перезаписаны при слиянии:\n%%s" -#: unpack-trees.c:160 +#: unpack-trees.c:162 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" "%%sPlease move or remove them before you %s." msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут перезаписаны при %s:\n%%sПереместите эти файлы или удалите их перед %s." -#: unpack-trees.c:162 +#: unpack-trees.c:164 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" "%%s" msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут перезаписаны при %s:\n%%s" -#: unpack-trees.c:170 +#: unpack-trees.c:172 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "Запись «%s» частично совпадает с «%s». Не удалось назначить соответствие." -#: unpack-trees.c:173 +#: unpack-trees.c:175 #, c-format msgid "" -"Cannot update sparse checkout: the following entries are not up to date:\n" +"Cannot update submodule:\n" "%s" -msgstr "Не удалось обновить частичное состояние: следующие элементы не последней версии:\n%s" +msgstr "Не удолось обновить подмодуль:\n%s" -#: unpack-trees.c:175 +#: unpack-trees.c:178 #, c-format msgid "" -"The following working tree files would be overwritten by sparse checkout update:\n" +"The following paths are not up to date and were left despite sparse patterns:\n" "%s" -msgstr "Указанные файлы из рабочего каталога будут перезаписаны при обновлении частичного состояния:\n%s" +msgstr "" -#: unpack-trees.c:177 +#: unpack-trees.c:180 #, c-format msgid "" -"The following working tree files would be removed by sparse checkout update:\n" +"The following paths are unmerged and were left despite sparse patterns:\n" "%s" -msgstr "Указанные файлы из рабочего каталога будут удалены при обновлении частичного состояния:\n%s" +msgstr "" -#: unpack-trees.c:179 +#: unpack-trees.c:182 #, c-format msgid "" -"Cannot update submodule:\n" +"The following paths were already present and thus not updated despite sparse patterns:\n" "%s" -msgstr "Не удолось обновить подмодуль:\n%s" +msgstr "" -#: unpack-trees.c:256 +#: unpack-trees.c:262 #, c-format msgid "Aborting\n" msgstr "Прерываю\n" -#: unpack-trees.c:318 -msgid "Checking out files" -msgstr "Распаковка файлов" +#: unpack-trees.c:289 +#, c-format +msgid "" +"After fixing the above paths, you may want to run `git sparse-checkout " +"reapply`.\n" +msgstr "После исправления указанных путей вы можете запустить «git sparse-checkout reapply».\n" #: unpack-trees.c:350 +msgid "Updating files" +msgstr "" + +#: unpack-trees.c:382 msgid "" "the following paths have collided (e.g. case-sensitive paths\n" "on a case-insensitive filesystem) and only one from the same\n" "colliding group is in the working tree:\n" msgstr "" +#: unpack-trees.c:1498 +msgid "Updating index flags" +msgstr "" + +#: upload-pack.c:1550 +msgid "expected flush after fetch arguments" +msgstr "" + #: urlmatch.c:163 msgid "invalid URL scheme name or missing '://' suffix" msgstr "Неправильная имя URL схемы или пропущен суффикс «://»" @@ -7222,179 +8464,221 @@ msgstr "неправильный номер порта" msgid "invalid '..' path segment" msgstr "неправильная часть пути «..»" -#: worktree.c:255 builtin/am.c:2097 +#: walker.c:170 +msgid "Fetching objects" +msgstr "" + +#: worktree.c:236 builtin/am.c:2103 #, c-format msgid "failed to read '%s'" msgstr "не удалось прочитать «%s»" -#: worktree.c:301 +#: worktree.c:283 #, c-format msgid "'%s' at main working tree is not the repository directory" msgstr "" -#: worktree.c:312 +#: worktree.c:294 #, c-format msgid "'%s' file does not contain absolute path to the working tree location" msgstr "" -#: worktree.c:324 +#: worktree.c:306 #, c-format msgid "'%s' does not exist" msgstr "«%s» не существует" -#: worktree.c:330 +#: worktree.c:312 #, c-format msgid "'%s' is not a .git file, error code %d" msgstr "" -#: worktree.c:338 +#: worktree.c:321 #, c-format msgid "'%s' does not point back to '%s'" msgstr "" -#: wrapper.c:223 wrapper.c:393 +#: worktree.c:587 +msgid "not a directory" +msgstr "" + +#: worktree.c:596 +msgid ".git is not a file" +msgstr "" + +#: worktree.c:598 +msgid ".git file broken" +msgstr "" + +#: worktree.c:600 +msgid ".git file incorrect" +msgstr "" + +#: worktree.c:670 +msgid "not a valid path" +msgstr "" + +#: worktree.c:676 +msgid "unable to locate repository; .git is not a file" +msgstr "" + +#: worktree.c:679 +msgid "unable to locate repository; .git file broken" +msgstr "" + +#: worktree.c:685 +msgid "gitdir unreadable" +msgstr "" + +#: worktree.c:689 +msgid "gitdir incorrect" +msgstr "" + +#: wrapper.c:197 wrapper.c:367 #, c-format msgid "could not open '%s' for reading and writing" msgstr "не удалось открыть «%s» для чтения и записи" -#: wrapper.c:424 wrapper.c:624 +#: wrapper.c:398 wrapper.c:599 #, c-format msgid "unable to access '%s'" msgstr "«%s» недоступно" -#: wrapper.c:632 +#: wrapper.c:607 msgid "unable to get current working directory" msgstr "не удалось получить текущий рабочий каталог" -#: wt-status.c:156 +#: wt-status.c:158 msgid "Unmerged paths:" msgstr "Не слитые пути:" -#: wt-status.c:183 wt-status.c:210 +#: wt-status.c:187 wt-status.c:219 +msgid " (use \"git restore --staged <file>...\" to unstage)" +msgstr " (используйте «git restore --staged <файл>…», чтобы убрать из индекса)" + +#: wt-status.c:190 wt-status.c:222 #, c-format -msgid " (use \"git reset %s <file>...\" to unstage)" -msgstr " (используйте «git reset %s <файл>…», чтобы убрать из индекса)" +msgid " (use \"git restore --source=%s --staged <file>...\" to unstage)" +msgstr " (используйте «git restore --source=%s --staged <файл>…», чтобы убрать из индекса)" -#: wt-status.c:185 wt-status.c:212 +#: wt-status.c:193 wt-status.c:225 msgid " (use \"git rm --cached <file>...\" to unstage)" msgstr " (используйте «git rm --cached <файл>…», чтобы убрать из индекса)" -#: wt-status.c:189 +#: wt-status.c:197 msgid " (use \"git add <file>...\" to mark resolution)" msgstr " (используйте «git add <файл>…», чтобы пометить разрешение конфликта)" -#: wt-status.c:191 wt-status.c:195 +#: wt-status.c:199 wt-status.c:203 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr " (используйте «git add/rm <файл>…», чтобы пометить выбранное разрешение конфликта)" -#: wt-status.c:193 +#: wt-status.c:201 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (используйте «git rm <файл>…», чтобы пометить разрешение конфликта)" -#: wt-status.c:204 wt-status.c:1064 +#: wt-status.c:211 wt-status.c:1070 msgid "Changes to be committed:" msgstr "Изменения, которые будут включены в коммит:" -#: wt-status.c:222 wt-status.c:1073 +#: wt-status.c:234 wt-status.c:1079 msgid "Changes not staged for commit:" msgstr "Изменения, которые не в индексе для коммита:" -#: wt-status.c:226 +#: wt-status.c:238 msgid " (use \"git add <file>...\" to update what will be committed)" msgstr " (используйте «git add <файл>…», чтобы добавить файл в индекс)" -#: wt-status.c:228 +#: wt-status.c:240 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr " (используйте «git add/rm <файл>…», чтобы добавить или удалить файл из индекса)" -#: wt-status.c:229 -msgid "" -" (use \"git checkout -- <file>...\" to discard changes in working " -"directory)" -msgstr " (используйте «git checkout -- <файл>…», чтобы отменить изменения\n в рабочем каталоге)" +#: wt-status.c:241 +msgid " (use \"git restore <file>...\" to discard changes in working directory)" +msgstr " (используйте «git restore <файл>…», чтобы отменить изменения в рабочем каталоге)" -#: wt-status.c:231 +#: wt-status.c:243 msgid " (commit or discard the untracked or modified content in submodules)" msgstr " (сделайте коммит или отмените изменения в неотслеживаемом или измененном содержимом в подмодулях)" -#: wt-status.c:243 +#: wt-status.c:254 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr " (используйте «git %s <файл>…», чтобы добавить в то, что будет включено в коммит)" -#: wt-status.c:258 +#: wt-status.c:266 msgid "both deleted:" msgstr "оба удалены:" -#: wt-status.c:260 +#: wt-status.c:268 msgid "added by us:" msgstr "добавлено нами:" -#: wt-status.c:262 +#: wt-status.c:270 msgid "deleted by them:" msgstr "удалено ими:" -#: wt-status.c:264 +#: wt-status.c:272 msgid "added by them:" msgstr "добавлено ими:" -#: wt-status.c:266 +#: wt-status.c:274 msgid "deleted by us:" msgstr "удалено нами:" -#: wt-status.c:268 +#: wt-status.c:276 msgid "both added:" msgstr "оба добавлены:" -#: wt-status.c:270 +#: wt-status.c:278 msgid "both modified:" msgstr "оба изменены:" -#: wt-status.c:280 +#: wt-status.c:288 msgid "new file:" msgstr "новый файл:" -#: wt-status.c:282 +#: wt-status.c:290 msgid "copied:" msgstr "скопировано:" -#: wt-status.c:284 +#: wt-status.c:292 msgid "deleted:" msgstr "удалено:" -#: wt-status.c:286 +#: wt-status.c:294 msgid "modified:" msgstr "изменено:" -#: wt-status.c:288 +#: wt-status.c:296 msgid "renamed:" msgstr "переименовано:" -#: wt-status.c:290 +#: wt-status.c:298 msgid "typechange:" msgstr "изменен тип:" -#: wt-status.c:292 +#: wt-status.c:300 msgid "unknown:" msgstr "неизвестно:" -#: wt-status.c:294 +#: wt-status.c:302 msgid "unmerged:" msgstr "не слитые:" -#: wt-status.c:374 +#: wt-status.c:382 msgid "new commits, " msgstr "новые коммиты, " -#: wt-status.c:376 +#: wt-status.c:384 msgid "modified content, " msgstr "изменено содержимое, " -#: wt-status.c:378 +#: wt-status.c:386 msgid "untracked content, " msgstr "неотслеживаемое содержимое, " -#: wt-status.c:896 +#: wt-status.c:903 #, c-format msgid "Your stash currently has %d entry" msgid_plural "Your stash currently has %d entries" @@ -7403,69 +8687,77 @@ msgstr[1] "У вас сейчас спрятаны %d записи" msgstr[2] "У вас сейчас спрятано %d записей" msgstr[3] "У вас сейчас спрятаны %d записи" -#: wt-status.c:928 +#: wt-status.c:934 msgid "Submodules changed but not updated:" msgstr "Измененные, но не обновленные подмодули:" -#: wt-status.c:930 +#: wt-status.c:936 msgid "Submodule changes to be committed:" msgstr "Изменения в подмодулях, которые будут закоммичены:" -#: wt-status.c:1012 +#: wt-status.c:1018 msgid "" "Do not modify or remove the line above.\n" "Everything below it will be ignored." msgstr "Не изменяйте или удаляйте строку выше этой.\nВсё, что ниже — будет проигнорировано." -#: wt-status.c:1119 +#: wt-status.c:1110 +#, c-format +msgid "" +"\n" +"It took %.2f seconds to compute the branch ahead/behind values.\n" +"You can use '--no-ahead-behind' to avoid this.\n" +msgstr "" + +#: wt-status.c:1140 msgid "You have unmerged paths." msgstr "У вас есть не слитые пути." -#: wt-status.c:1122 +#: wt-status.c:1143 msgid " (fix conflicts and run \"git commit\")" msgstr " (разрешите конфликты, затем запустите «git commit»)" -#: wt-status.c:1124 +#: wt-status.c:1145 msgid " (use \"git merge --abort\" to abort the merge)" msgstr " (используйте «git merge --abort», чтобы остановить операцию слияния)" -#: wt-status.c:1128 +#: wt-status.c:1149 msgid "All conflicts fixed but you are still merging." msgstr "Все конфликты исправлены, но вы все еще в процессе слияния." -#: wt-status.c:1131 +#: wt-status.c:1152 msgid " (use \"git commit\" to conclude merge)" msgstr " (используйте «git commit», чтобы завершить слияние)" -#: wt-status.c:1140 +#: wt-status.c:1161 msgid "You are in the middle of an am session." msgstr "Вы в процессе сессии am." -#: wt-status.c:1143 +#: wt-status.c:1164 msgid "The current patch is empty." msgstr "Текущий патч пустой." -#: wt-status.c:1147 +#: wt-status.c:1168 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (разрешите конфликты, затем запустите «git am --continue»)" -#: wt-status.c:1149 +#: wt-status.c:1170 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (используйте «git am --skip», чтобы пропустить этот патч)" -#: wt-status.c:1151 +#: wt-status.c:1172 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (используйте «git am --abort», чтобы восстановить оригинальную ветку)" -#: wt-status.c:1284 +#: wt-status.c:1305 msgid "git-rebase-todo is missing." msgstr "git-rebase-todo отсутствует." -#: wt-status.c:1286 +#: wt-status.c:1307 msgid "No commands done." msgstr "Команды не выполнены." -#: wt-status.c:1289 +#: wt-status.c:1310 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" @@ -7474,16 +8766,16 @@ msgstr[1] "Последняя команда выполнена (%d команд msgstr[2] "Последняя команда выполнена (%d команд выполнено):" msgstr[3] "Последняя команда выполнена (%d команд выполнено):" -#: wt-status.c:1300 +#: wt-status.c:1321 #, c-format msgid " (see more in file %s)" msgstr " (смотрите дополнительно в файле %s)" -#: wt-status.c:1305 +#: wt-status.c:1326 msgid "No commands remaining." msgstr "Команд больше не осталось." -#: wt-status.c:1308 +#: wt-status.c:1329 #, c-format msgid "Next command to do (%d remaining command):" msgid_plural "Next commands to do (%d remaining commands):" @@ -7492,170 +8784,175 @@ msgstr[1] "Следующая команда для выполнения (%d к msgstr[2] "Следующая команда для выполнения (%d команд осталось):" msgstr[3] "Следующая команда для выполнения (%d команд осталось):" -#: wt-status.c:1316 +#: wt-status.c:1337 msgid " (use \"git rebase --edit-todo\" to view and edit)" -msgstr " (используйте «git rebase --edit-todo», чтобы просмотреть и изменить)" +msgstr " (используйте «git rebase --edit-todo», чтобы просмотреть или изменить их)" -#: wt-status.c:1328 +#: wt-status.c:1349 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "Вы сейчас перемещаете ветку «%s» над «%s»." -#: wt-status.c:1333 +#: wt-status.c:1354 msgid "You are currently rebasing." msgstr "Вы сейчас перемещаете ветку." -#: wt-status.c:1346 +#: wt-status.c:1367 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (разрешите конфликты, затем запустите «git rebase --continue»)" -#: wt-status.c:1348 +#: wt-status.c:1369 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (используйте «git rebase --skip», чтобы пропустить этот патч)" -#: wt-status.c:1350 +#: wt-status.c:1371 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " (используйте «git rebase --abort», чтобы перейти на оригинальную ветку)" -#: wt-status.c:1357 +#: wt-status.c:1378 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (все конфликты разрешены: запустите «git rebase --continue»)" -#: wt-status.c:1361 +#: wt-status.c:1382 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "Вы сейчас разделяете коммит при перемещении ветки «%s» над «%s»." -#: wt-status.c:1366 +#: wt-status.c:1387 msgid "You are currently splitting a commit during a rebase." msgstr "Вы сейчас разделяете коммит при перемещении ветки." -#: wt-status.c:1369 +#: wt-status.c:1390 msgid " (Once your working directory is clean, run \"git rebase --continue\")" -msgstr "(Как только ваш рабочий каталог будет чистый, запустите «git rebase --continue»)" +msgstr " (Как только ваш рабочий каталог будет чистый, запустите «git rebase --continue»)" -#: wt-status.c:1373 +#: wt-status.c:1394 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "Вы сейчас редактируете коммит при перемещении ветки «%s» над «%s»." -#: wt-status.c:1378 +#: wt-status.c:1399 msgid "You are currently editing a commit during a rebase." msgstr "Вы сейчас редактируете коммит при перемещении ветки." -#: wt-status.c:1381 +#: wt-status.c:1402 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " (используйте «git commit --amend», чтобы исправить текущий коммит)" -#: wt-status.c:1383 +#: wt-status.c:1404 msgid " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr " (используйте «git rebase --continue», когда будете довольны изменениями)" -#: wt-status.c:1394 +#: wt-status.c:1415 msgid "Cherry-pick currently in progress." msgstr "" -#: wt-status.c:1397 +#: wt-status.c:1418 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "Вы копируете коммит %s." -#: wt-status.c:1404 +#: wt-status.c:1425 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (разрешите конфликты, затем запустите «git cherry-pick --continue»)" -#: wt-status.c:1407 +#: wt-status.c:1428 msgid " (run \"git cherry-pick --continue\" to continue)" msgstr "" -#: wt-status.c:1410 +#: wt-status.c:1431 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr " (все конфликты разрешены: запустите «git cherry-pick --continue»)" -#: wt-status.c:1412 +#: wt-status.c:1433 +msgid " (use \"git cherry-pick --skip\" to skip this patch)" +msgstr "" + +#: wt-status.c:1435 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr " (используйте «git cherry-pick --abort», чтобы отменить копирования коммита)" -#: wt-status.c:1422 +#: wt-status.c:1445 msgid "Revert currently in progress." msgstr "" -#: wt-status.c:1425 +#: wt-status.c:1448 #, c-format msgid "You are currently reverting commit %s." msgstr "Вы сейчас обращаете изменения коммита %s." -#: wt-status.c:1431 +#: wt-status.c:1454 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (разрешите конфликты, затем запустите «git revert --continue»)" -#: wt-status.c:1434 +#: wt-status.c:1457 msgid " (run \"git revert --continue\" to continue)" msgstr "" -#: wt-status.c:1437 +#: wt-status.c:1460 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (все конфликты разрешены: запустите «git revert --continue»)" -#: wt-status.c:1439 +#: wt-status.c:1462 +msgid " (use \"git revert --skip\" to skip this patch)" +msgstr "" + +#: wt-status.c:1464 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " (используйте «git revert --abort», чтобы отменить операцию обращения изменений коммита)" -#: wt-status.c:1449 +#: wt-status.c:1474 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "Вы сейчас в процессе двоичного поиска, начатого с ветки «%s»." -#: wt-status.c:1453 +#: wt-status.c:1478 msgid "You are currently bisecting." msgstr "Вы сейчас в процессе двоичного поиска." -#: wt-status.c:1456 +#: wt-status.c:1481 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " (используйте «git bisect reset», чтобы вернуться на исходную ветку)" -#: wt-status.c:1665 +#: wt-status.c:1492 +#, c-format +msgid "You are in a sparse checkout with %d%% of tracked files present." +msgstr "" + +#: wt-status.c:1731 msgid "On branch " msgstr "На ветке " -#: wt-status.c:1672 +#: wt-status.c:1738 msgid "interactive rebase in progress; onto " msgstr "интерактивное перемещение в процессе; над " -#: wt-status.c:1674 +#: wt-status.c:1740 msgid "rebase in progress; onto " msgstr "перемещение в процессе; над " -#: wt-status.c:1679 -msgid "HEAD detached at " -msgstr "HEAD отделён на " - -#: wt-status.c:1681 -msgid "HEAD detached from " -msgstr "HEAD отделён начиная с " - -#: wt-status.c:1684 +#: wt-status.c:1750 msgid "Not currently on any branch." msgstr "Сейчас ни на одной из веток" -#: wt-status.c:1701 +#: wt-status.c:1767 msgid "Initial commit" msgstr "Начальный коммит" -#: wt-status.c:1702 +#: wt-status.c:1768 msgid "No commits yet" msgstr "Еще нет коммитов" -#: wt-status.c:1716 +#: wt-status.c:1782 msgid "Untracked files" msgstr "Неотслеживаемые файлы" -#: wt-status.c:1718 +#: wt-status.c:1784 msgid "Ignored files" msgstr "Игнорируемые файлы" -#: wt-status.c:1722 +#: wt-status.c:1788 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -7663,216 +8960,225 @@ msgid "" "new files yourself (see 'git help status')." msgstr "%.2f секунды занял вывод списка неотслеживаемых файлов. «status -uno» возможно может ускорить это, но будьте внимательны, и не забудьте добавить новые файлы вручную (смотрите «git help status» для подробностей)." -#: wt-status.c:1728 +#: wt-status.c:1794 #, c-format msgid "Untracked files not listed%s" msgstr "Неотслеживаемые файлы не показаны%s" -#: wt-status.c:1730 +#: wt-status.c:1796 msgid " (use -u option to show untracked files)" -msgstr "(используйте опцию «-u», чтобы показать неотслеживаемые файлы)" +msgstr " (используйте опцию «-u», чтобы показать неотслеживаемые файлы)" -#: wt-status.c:1736 +#: wt-status.c:1802 msgid "No changes" msgstr "Нет изменений" -#: wt-status.c:1741 +#: wt-status.c:1807 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "нет изменений добавленных для коммита\n(используйте «git add» и/или «git commit -a»)\n" -#: wt-status.c:1744 +#: wt-status.c:1811 #, c-format msgid "no changes added to commit\n" msgstr "нет изменений добавленных для коммита\n" -#: wt-status.c:1747 +#: wt-status.c:1815 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " "track)\n" msgstr "ничего не добавлено в коммит, но есть неотслеживаемые файлы (используйте «git add», чтобы отслеживать их)\n" -#: wt-status.c:1750 +#: wt-status.c:1819 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "ничего не добавлено в коммит, но есть неотслеживаемые файлы\n" -#: wt-status.c:1753 +#: wt-status.c:1823 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "нечего коммитить (создайте/скопируйте файлы, затем запустите «git add», чтобы отслеживать их)\n" -#: wt-status.c:1756 wt-status.c:1761 +#: wt-status.c:1827 wt-status.c:1833 #, c-format msgid "nothing to commit\n" msgstr "нечего коммитить\n" -#: wt-status.c:1759 +#: wt-status.c:1830 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "нечего коммитить (используйте опцию «-u», чтобы показать неотслеживаемые файлы)\n" -#: wt-status.c:1763 +#: wt-status.c:1835 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "нечего коммитить, нет изменений в рабочем каталоге\n" -#: wt-status.c:1876 +#: wt-status.c:1940 msgid "No commits yet on " -msgstr "Еще нет коммитов в" +msgstr "Еще нет коммитов в " -#: wt-status.c:1880 +#: wt-status.c:1944 msgid "HEAD (no branch)" msgstr "HEAD (нет ветки)" -#: wt-status.c:1911 +#: wt-status.c:1975 msgid "different" msgstr "отличается" -#: wt-status.c:1913 wt-status.c:1921 +#: wt-status.c:1977 wt-status.c:1985 msgid "behind " -msgstr "позади" +msgstr "позади " -#: wt-status.c:1916 wt-status.c:1919 +#: wt-status.c:1980 wt-status.c:1983 msgid "ahead " msgstr "впереди " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2443 +#: wt-status.c:2505 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "не удалось выполнить %s: У вас есть непроиндексированные изменения." -#: wt-status.c:2449 +#: wt-status.c:2511 msgid "additionally, your index contains uncommitted changes." msgstr "к тому же, в вашем индексе есть незакоммиченные изменения." -#: wt-status.c:2451 +#: wt-status.c:2513 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "не удалось выполнить %s: В вашем индексе есть незакоммиченные изменения." -#: builtin/add.c:25 +#: compat/precompose_utf8.c:58 builtin/clone.c:457 +#, c-format +msgid "failed to unlink '%s'" +msgstr "сбой отсоединения «%s»" + +#: builtin/add.c:26 msgid "git add [<options>] [--] <pathspec>..." msgstr "git add [<опции>] [--] <спецификатор-пути>…" -#: builtin/add.c:84 +#: builtin/add.c:88 #, c-format msgid "unexpected diff status %c" msgstr "неожиданный статус утилиты сравнения %c" -#: builtin/add.c:89 builtin/commit.c:285 +#: builtin/add.c:93 builtin/commit.c:285 msgid "updating files failed" msgstr "сбой при обновлении файлов" -#: builtin/add.c:99 +#: builtin/add.c:103 #, c-format msgid "remove '%s'\n" msgstr "удалить «%s»\n" -#: builtin/add.c:174 +#: builtin/add.c:178 msgid "Unstaged changes after refreshing the index:" msgstr "Непроиндексированные изменения после обновления индекса:" -#: builtin/add.c:234 builtin/rev-parse.c:896 +#: builtin/add.c:272 builtin/rev-parse.c:908 msgid "Could not read the index" msgstr "Не удалось прочитать индекс" -#: builtin/add.c:245 +#: builtin/add.c:283 #, c-format msgid "Could not open '%s' for writing." msgstr "Не удалось открыть «%s» для записи." -#: builtin/add.c:249 +#: builtin/add.c:287 msgid "Could not write patch" msgstr "Не удалось записать патч" -#: builtin/add.c:252 +#: builtin/add.c:290 msgid "editing patch failed" msgstr "сбой при редактировании патча" -#: builtin/add.c:255 +#: builtin/add.c:293 #, c-format msgid "Could not stat '%s'" msgstr "Не удалось выполнить stat для «%s»" -#: builtin/add.c:257 +#: builtin/add.c:295 msgid "Empty patch. Aborted." msgstr "Пустой патч. Операция прервана." -#: builtin/add.c:262 +#: builtin/add.c:300 #, c-format msgid "Could not apply '%s'" msgstr "Не удалось применить «%s»" -#: builtin/add.c:270 +#: builtin/add.c:308 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "Следующие пути игнорируются одним из ваших файлов .gitignore:\n" -#: builtin/add.c:290 builtin/clean.c:908 builtin/fetch.c:137 builtin/mv.c:124 -#: builtin/prune-packed.c:56 builtin/pull.c:221 builtin/push.c:560 -#: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165 +#: builtin/add.c:328 builtin/clean.c:904 builtin/fetch.c:166 builtin/mv.c:124 +#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:559 +#: builtin/remote.c:1427 builtin/rm.c:242 builtin/send-pack.c:190 msgid "dry run" msgstr "пробный запуск" -#: builtin/add.c:293 +#: builtin/add.c:331 msgid "interactive picking" msgstr "интерактивный выбор" -#: builtin/add.c:294 builtin/checkout.c:1379 builtin/reset.c:306 +#: builtin/add.c:332 builtin/checkout.c:1547 builtin/reset.c:308 msgid "select hunks interactively" msgstr "интерактивный выбор блоков" -#: builtin/add.c:295 +#: builtin/add.c:333 msgid "edit current diff and apply" msgstr "отредактировать текущий файл списка изменений и применить его" -#: builtin/add.c:296 +#: builtin/add.c:334 msgid "allow adding otherwise ignored files" msgstr "разрешить добавление игнорируемых иначе файлов" -#: builtin/add.c:297 +#: builtin/add.c:335 msgid "update tracked files" msgstr "обновить отслеживаемые файлы" -#: builtin/add.c:298 +#: builtin/add.c:336 msgid "renormalize EOL of tracked files (implies -u)" msgstr "перенормализировать концы строк (EOL) отслеживаемых файлов (подразумевает -u)" -#: builtin/add.c:299 +#: builtin/add.c:337 msgid "record only the fact that the path will be added later" msgstr "записать только факт, что путь будет добавлен позже" -#: builtin/add.c:300 +#: builtin/add.c:338 msgid "add changes from all tracked and untracked files" msgstr "добавить изменения из всех отслеживаемых и неотслеживаемых файлов" -#: builtin/add.c:303 +#: builtin/add.c:341 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "игнорировать пути удаленные из рабочего каталога (тоже, что и --no-all)" -#: builtin/add.c:305 +#: builtin/add.c:343 msgid "don't add, only refresh the index" msgstr "не добавлять, только обновить индекс" -#: builtin/add.c:306 +#: builtin/add.c:344 msgid "just skip files which cannot be added because of errors" msgstr "пропускать файлы, которые не могут быть добавлены из-за ошибок" -#: builtin/add.c:307 +#: builtin/add.c:345 msgid "check if - even missing - files are ignored in dry run" msgstr "удостовериться, что даже недостающие файлы будут проигнорированы при пробном запуске" -#: builtin/add.c:309 builtin/update-index.c:1001 +#: builtin/add.c:347 builtin/update-index.c:1004 msgid "override the executable bit of the listed files" msgstr "переопределить бит выполнения на указанных файлах" -#: builtin/add.c:311 +#: builtin/add.c:349 msgid "warn when adding an embedded repository" msgstr "предупреждать при добавлении встроенного git репозитория" -#: builtin/add.c:326 +#: builtin/add.c:351 +msgid "backend for `git stash -p`" +msgstr "" + +#: builtin/add.c:369 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -7890,399 +9196,434 @@ msgid "" "See \"git help submodule\" for more information." msgstr "Вы добавили другой репозиторий git внутри текущего репозитория\nКлоны внешнего репозитория не будут содержать внутренний\nрепозиторий и не будут знать как его получить.\nЕсли вы хотели добавить подмодуль, то запустите:\n\n\tgit submodule add <url> %s\n\nЕсли бы добавили этот путь по ошибке, то вы можете удалить его\nиз индекса с помощью:\n\n\tgit rm --cached %s\n\nДля дополнительной информации смотрите «git help submodule»." -#: builtin/add.c:354 +#: builtin/add.c:397 #, c-format msgid "adding embedded git repository: %s" msgstr "добавление встроенного git репозитория: %s" -#: builtin/add.c:372 -#, c-format -msgid "Use -f if you really want to add them.\n" -msgstr "Используйте -f, если вы действительно хотите добавить их.\n" +#: builtin/add.c:416 +msgid "" +"Use -f if you really want to add them.\n" +"Turn this message off by running\n" +"\"git config advice.addIgnoredFile false\"" +msgstr "" -#: builtin/add.c:379 +#: builtin/add.c:425 msgid "adding files failed" msgstr "ошибка при добавлении файлов" -#: builtin/add.c:419 +#: builtin/add.c:453 builtin/commit.c:345 +msgid "--pathspec-from-file is incompatible with --interactive/--patch" +msgstr "" + +#: builtin/add.c:470 +msgid "--pathspec-from-file is incompatible with --edit" +msgstr "" + +#: builtin/add.c:482 msgid "-A and -u are mutually incompatible" msgstr "-A и -u нельзя использовать одновременно" -#: builtin/add.c:426 +#: builtin/add.c:485 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "Опция --ignore-missing может использоваться только вместе с --dry-run" -#: builtin/add.c:430 +#: builtin/add.c:489 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "параметр --chmod «%s» должен быть -x или +x" -#: builtin/add.c:445 +#: builtin/add.c:507 builtin/checkout.c:1715 builtin/commit.c:351 +#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1502 +msgid "--pathspec-from-file is incompatible with pathspec arguments" +msgstr "" + +#: builtin/add.c:514 builtin/checkout.c:1727 builtin/commit.c:357 +#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1508 +msgid "--pathspec-file-nul requires --pathspec-from-file" +msgstr "" + +#: builtin/add.c:518 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "Ничего не указано, ничего не добавлено.\n" -#: builtin/add.c:446 -#, c-format -msgid "Maybe you wanted to say 'git add .'?\n" -msgstr "Возможно, вы имели в виду «git add .»?\n" +#: builtin/add.c:520 +msgid "" +"Maybe you wanted to say 'git add .'?\n" +"Turn this message off by running\n" +"\"git config advice.addEmptyPathspec false\"" +msgstr "" -#: builtin/am.c:348 +#: builtin/am.c:352 msgid "could not parse author script" msgstr "не удалось разобрать сценарий авторства" -#: builtin/am.c:432 +#: builtin/am.c:436 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "«%s» был удален перехватчиком applypatch-msg" -#: builtin/am.c:474 +#: builtin/am.c:478 #, c-format msgid "Malformed input line: '%s'." msgstr "Неправильная строка ввода: «%s»." -#: builtin/am.c:512 +#: builtin/am.c:516 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "Не удалось скопировать заметку из «%s» в «%s»" -#: builtin/am.c:538 +#: builtin/am.c:542 msgid "fseek failed" msgstr "сбой при выполнении fseek" -#: builtin/am.c:726 +#: builtin/am.c:730 #, c-format msgid "could not parse patch '%s'" msgstr "не удалось разобрать патч «%s»" -#: builtin/am.c:791 +#: builtin/am.c:795 msgid "Only one StGIT patch series can be applied at once" msgstr "Только серия патчей StGIT может быть применена за раз" -#: builtin/am.c:839 +#: builtin/am.c:843 msgid "invalid timestamp" msgstr "недопустимая метка даты/времени" -#: builtin/am.c:844 builtin/am.c:856 +#: builtin/am.c:848 builtin/am.c:860 msgid "invalid Date line" msgstr "недопустимая строка даты" -#: builtin/am.c:851 +#: builtin/am.c:855 msgid "invalid timezone offset" msgstr "недопустимое смещение часового пояса" -#: builtin/am.c:944 +#: builtin/am.c:948 msgid "Patch format detection failed." msgstr "Сбой определения формата патча." -#: builtin/am.c:949 builtin/clone.c:409 +#: builtin/am.c:953 builtin/clone.c:410 #, c-format msgid "failed to create directory '%s'" msgstr "не удалось создать каталог «%s»" -#: builtin/am.c:954 +#: builtin/am.c:958 msgid "Failed to split patches." msgstr "Не удалось разделить патчи на части." -#: builtin/am.c:1084 builtin/commit.c:371 -msgid "unable to write index file" -msgstr "не удалось записать индекс" - -#: builtin/am.c:1098 +#: builtin/am.c:1089 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "Когда вы устраните эту проблему, запустите «%s --continue»." -#: builtin/am.c:1099 +#: builtin/am.c:1090 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "Если вы хотите пропустить этот патч, то запустите «%s --skip»." -#: builtin/am.c:1100 +#: builtin/am.c:1091 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "Чтобы вернуться на предыдущую ветку и остановить применение изменений, запустите «%s --abort»." -#: builtin/am.c:1183 +#: builtin/am.c:1174 msgid "" "Patch sent with format=flowed; space at the end of lines might be lost." msgstr "" -#: builtin/am.c:1211 +#: builtin/am.c:1202 msgid "Patch is empty." msgstr "Патч пустой." -#: builtin/am.c:1277 +#: builtin/am.c:1267 #, c-format -msgid "invalid ident line: %.*s" -msgstr "неправильная строка идентификации: %.*s" +msgid "missing author line in commit %s" +msgstr "" -#: builtin/am.c:1299 +#: builtin/am.c:1270 #, c-format -msgid "unable to parse commit %s" -msgstr "не удалось разобрать коммит %s" +msgid "invalid ident line: %.*s" +msgstr "неправильная строка идентификации: %.*s" -#: builtin/am.c:1495 +#: builtin/am.c:1489 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "В репозитории отсутствуют двоичные объекты, необходимые для отката к трехходовому слиянию." -#: builtin/am.c:1497 +#: builtin/am.c:1491 msgid "Using index info to reconstruct a base tree..." msgstr "Использую индекс для реконструкции базового дерева…" -#: builtin/am.c:1516 +#: builtin/am.c:1510 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." msgstr "Вы вручную изменяли патч?\nОн не накладывается без ошибок на двоичные объекты, записанные в его заголовке." -#: builtin/am.c:1522 +#: builtin/am.c:1516 msgid "Falling back to patching base and 3-way merge..." msgstr "Откат к применению изменений к базовому коммиту с помощью трехходового слияния…" -#: builtin/am.c:1548 +#: builtin/am.c:1542 msgid "Failed to merge in the changes." msgstr "Не удалось слить изменения." -#: builtin/am.c:1580 +#: builtin/am.c:1574 msgid "applying to an empty history" msgstr "применение к пустой истории" -#: builtin/am.c:1627 builtin/am.c:1631 +#: builtin/am.c:1626 builtin/am.c:1630 #, c-format msgid "cannot resume: %s does not exist." -msgstr "нельзя продолжнить: %s не существует " +msgstr "нельзя продолжнить: %s не существует." -#: builtin/am.c:1647 -msgid "cannot be interactive without stdin connected to a terminal." -msgstr "не удалось использовать интерактивное поведение, без stdin подключенного к терминалу." - -#: builtin/am.c:1652 +#: builtin/am.c:1648 msgid "Commit Body is:" msgstr "Тело коммита:" #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] #. in your translation. The program will only accept English #. input at this point. -#: builtin/am.c:1662 +#: builtin/am.c:1658 +#, c-format msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "Применить? [y] - да/[n] - нет/[e] - редактировать/[v] - просмотреть патч/[a] - применить всё: " -#: builtin/am.c:1712 +#: builtin/am.c:1704 builtin/commit.c:395 +msgid "unable to write index file" +msgstr "не удалось записать индекс" + +#: builtin/am.c:1708 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Индекс изменён: нельзя применять патчи (изменено: %s)" -#: builtin/am.c:1752 builtin/am.c:1820 +#: builtin/am.c:1748 builtin/am.c:1816 #, c-format msgid "Applying: %.*s" msgstr "Применение: %.*s" -#: builtin/am.c:1769 +#: builtin/am.c:1765 msgid "No changes -- Patch already applied." msgstr "Нет изменений — Патч уже применен." -#: builtin/am.c:1775 +#: builtin/am.c:1771 #, c-format msgid "Patch failed at %s %.*s" msgstr "Ошибка применения изменений на %s %.*s" -#: builtin/am.c:1779 -msgid "Use 'git am --show-current-patch' to see the failed patch" +#: builtin/am.c:1775 +msgid "Use 'git am --show-current-patch=diff' to see the failed patch" msgstr "" -#: builtin/am.c:1823 +#: builtin/am.c:1819 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" "already introduced the same changes; you might want to skip this patch." msgstr "Нет изменений — возможно, вы забыли вызвать «git add»?\nЕсли ничего не осталось для индексации, то, скорее всего, что-то другое уже сделало те же изменения; возможно, вам следует пропустить этот патч." -#: builtin/am.c:1830 +#: builtin/am.c:1826 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as such.\n" "You might run `git rm` on a file to accept \"deleted by them\" for it." msgstr "У вас есть не слитые пути в индексе.\nВы должны выполнить «git add» для каждого файла с разрешенными конфликтами, чтобы пометить их таковыми.\nВы можете запустить «git rm» с именем файла, чтобы пометить его как «удалено ими»." -#: builtin/am.c:1937 builtin/am.c:1941 builtin/am.c:1953 builtin/reset.c:329 -#: builtin/reset.c:337 +#: builtin/am.c:1933 builtin/am.c:1937 builtin/am.c:1949 builtin/reset.c:347 +#: builtin/reset.c:355 #, c-format msgid "Could not parse object '%s'." msgstr "Не удалось разобрать объект «%s»." -#: builtin/am.c:1989 +#: builtin/am.c:1985 msgid "failed to clean index" msgstr "не удалось очистить индекс" -#: builtin/am.c:2033 +#: builtin/am.c:2029 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" msgstr "Похоже, что вы переместили HEAD с момента последней ошибки выполнения «am».\nПеремотка на ORIG_HEAD не выполняется" -#: builtin/am.c:2130 +#: builtin/am.c:2136 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Неправильное значение для --patch-format: %s" -#: builtin/am.c:2166 +#: builtin/am.c:2178 +#, c-format +msgid "Invalid value for --show-current-patch: %s" +msgstr "" + +#: builtin/am.c:2182 +#, c-format +msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s" +msgstr "" + +#: builtin/am.c:2213 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<опции>] [(<mbox> | <Maildir>)…]" -#: builtin/am.c:2167 +#: builtin/am.c:2214 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<опции>] (--continue | --skip | --abort)" -#: builtin/am.c:2173 +#: builtin/am.c:2220 msgid "run interactively" msgstr "запустить в интерактивном режиме" -#: builtin/am.c:2175 +#: builtin/am.c:2222 msgid "historical option -- no-op" msgstr "историческая опция — ничего не делает" -#: builtin/am.c:2177 +#: builtin/am.c:2224 msgid "allow fall back on 3way merging if needed" msgstr "разрешить откатиться к трехходовому слиянию, если нужно" -#: builtin/am.c:2178 builtin/init-db.c:494 builtin/prune-packed.c:58 -#: builtin/repack.c:306 builtin/stash.c:805 +#: builtin/am.c:2225 builtin/init-db.c:560 builtin/prune-packed.c:16 +#: builtin/repack.c:335 builtin/stash.c:815 msgid "be quiet" msgstr "тихий режим" -#: builtin/am.c:2180 -msgid "add a Signed-off-by line to the commit message" -msgstr "добавить строку Signed-off-by к сообщению коммита" +#: builtin/am.c:2227 +msgid "add a Signed-off-by trailer to the commit message" +msgstr "" -#: builtin/am.c:2183 +#: builtin/am.c:2230 msgid "recode into utf8 (default)" msgstr "перекодировать в utf8 (по умолчанию)" -#: builtin/am.c:2185 +#: builtin/am.c:2232 msgid "pass -k flag to git-mailinfo" msgstr "передать флаг -k в git-mailinfo" -#: builtin/am.c:2187 +#: builtin/am.c:2234 msgid "pass -b flag to git-mailinfo" msgstr "передать флаг -b в git-mailinfo" -#: builtin/am.c:2189 +#: builtin/am.c:2236 msgid "pass -m flag to git-mailinfo" msgstr "передать флаг -m в git-mailinfo" -#: builtin/am.c:2191 +#: builtin/am.c:2238 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "передать флаг --keep-cr в git-mailsplit для формата mbox" -#: builtin/am.c:2194 +#: builtin/am.c:2241 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "не передавать --keep-cr флаг в git-mailsplit вне зависимости от am.keepcr" -#: builtin/am.c:2197 +#: builtin/am.c:2244 msgid "strip everything before a scissors line" msgstr "обрезать все до строки обрезки" -#: builtin/am.c:2199 builtin/am.c:2202 builtin/am.c:2205 builtin/am.c:2208 -#: builtin/am.c:2211 builtin/am.c:2214 builtin/am.c:2217 builtin/am.c:2220 -#: builtin/am.c:2226 +#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255 +#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267 +#: builtin/am.c:2273 msgid "pass it through git-apply" msgstr "передать его в git-apply" -#: builtin/am.c:2216 builtin/commit.c:1348 builtin/fmt-merge-msg.c:671 -#: builtin/fmt-merge-msg.c:674 builtin/grep.c:879 builtin/merge.c:247 -#: builtin/pull.c:158 builtin/pull.c:217 builtin/rebase.c:1412 -#: builtin/repack.c:317 builtin/repack.c:321 builtin/repack.c:323 -#: builtin/show-branch.c:651 builtin/show-ref.c:172 builtin/tag.c:397 -#: parse-options.h:141 parse-options.h:162 parse-options.h:311 +#: builtin/am.c:2263 builtin/commit.c:1395 builtin/fmt-merge-msg.c:17 +#: builtin/fmt-merge-msg.c:20 builtin/grep.c:903 builtin/merge.c:260 +#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217 +#: builtin/rebase.c:1341 builtin/repack.c:346 builtin/repack.c:350 +#: builtin/repack.c:352 builtin/show-branch.c:650 builtin/show-ref.c:172 +#: builtin/tag.c:404 parse-options.h:154 parse-options.h:175 +#: parse-options.h:316 msgid "n" msgstr "n" -#: builtin/am.c:2222 builtin/branch.c:653 builtin/for-each-ref.c:38 -#: builtin/replace.c:554 builtin/tag.c:431 builtin/verify-tag.c:39 +#: builtin/am.c:2269 builtin/branch.c:661 builtin/bugreport.c:136 +#: builtin/for-each-ref.c:38 builtin/replace.c:556 builtin/tag.c:438 +#: builtin/verify-tag.c:38 msgid "format" msgstr "формат" -#: builtin/am.c:2223 +#: builtin/am.c:2270 msgid "format the patch(es) are in" msgstr "формат, в котором находятся патчи" -#: builtin/am.c:2229 +#: builtin/am.c:2276 msgid "override error message when patch failure occurs" msgstr "переопределить сообщение об ошибке, если не удалось наложить изменения" -#: builtin/am.c:2231 +#: builtin/am.c:2278 msgid "continue applying patches after resolving a conflict" msgstr "продолжить применение изменений после разрешения конфиликта" -#: builtin/am.c:2234 +#: builtin/am.c:2281 msgid "synonyms for --continue" msgstr "синоним для --continue" -#: builtin/am.c:2237 +#: builtin/am.c:2284 msgid "skip the current patch" msgstr "пропустить текущий патч" -#: builtin/am.c:2240 +#: builtin/am.c:2287 msgid "restore the original branch and abort the patching operation." msgstr "восстановить оригинальную ветку и отменить операцию применения изменений." -#: builtin/am.c:2243 +#: builtin/am.c:2290 msgid "abort the patching operation but keep HEAD where it is." msgstr "" -#: builtin/am.c:2246 -msgid "show the patch being applied." +#: builtin/am.c:2294 +msgid "show the patch being applied" msgstr "" -#: builtin/am.c:2250 +#: builtin/am.c:2299 msgid "lie about committer date" msgstr "соврать о дате коммитера" -#: builtin/am.c:2252 +#: builtin/am.c:2301 msgid "use current timestamp for author date" msgstr "использовать текущее время как время авторства" -#: builtin/am.c:2254 builtin/commit-tree.c:120 builtin/commit.c:1491 -#: builtin/merge.c:282 builtin/pull.c:192 builtin/rebase.c:489 -#: builtin/rebase.c:1453 builtin/revert.c:116 builtin/tag.c:412 +#: builtin/am.c:2303 builtin/commit-tree.c:120 builtin/commit.c:1515 +#: builtin/merge.c:297 builtin/pull.c:175 builtin/rebase.c:536 +#: builtin/rebase.c:1394 builtin/revert.c:117 builtin/tag.c:419 msgid "key-id" msgstr "key-id" -#: builtin/am.c:2255 builtin/rebase.c:490 builtin/rebase.c:1454 +#: builtin/am.c:2304 builtin/rebase.c:537 builtin/rebase.c:1395 msgid "GPG-sign commits" msgstr "подписать коммиты с помощью GPG" -#: builtin/am.c:2258 +#: builtin/am.c:2307 msgid "(internal use for git-rebase)" msgstr "(внутреннее использование для git-rebase)" -#: builtin/am.c:2276 +#: builtin/am.c:2325 msgid "" "The -b/--binary option has been a no-op for long time, and\n" "it will be removed. Please do not use it anymore." msgstr "Опция -b/--binary уже долгое время ничего не делает и будет удалена с следующих версиях Git. Пожалуйста, не используйте ее." -#: builtin/am.c:2283 +#: builtin/am.c:2332 msgid "failed to read the index" msgstr "сбой чтения индекса" -#: builtin/am.c:2298 +#: builtin/am.c:2347 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "предыдущий каталог перемещения %s еще существует, но передан mbox." -#: builtin/am.c:2322 +#: builtin/am.c:2371 #, c-format msgid "" "Stray %s directory found.\n" "Use \"git am --abort\" to remove it." msgstr "Найден забытый каталог %s.\nИспользуйте «git am --abort», чтобы удалить его." -#: builtin/am.c:2328 +#: builtin/am.c:2377 msgid "Resolve operation not in progress, we are not resuming." msgstr "Операция разрешения конфликтов не в процессе выполнения, не продолжаем." +#: builtin/am.c:2387 +msgid "interactive mode requires patches on the command line" +msgstr "" + #: builtin/apply.c:8 msgid "git apply [<options>] [<patch>...]" msgstr "git apply [<опции>] [<патч>…]" @@ -8317,118 +9658,128 @@ msgstr "git archive: ошибка протокола" msgid "git archive: expected a flush" msgstr "git archive: ожидался сброс буфера" -#: builtin/bisect--helper.c:22 -msgid "git bisect--helper --next-all [--no-checkout]" -msgstr "git bisect--helper --next-all [--no-checkout]" - #: builtin/bisect--helper.c:23 -msgid "git bisect--helper --write-terms <bad_term> <good_term>" -msgstr "git bisect--helper --write-terms <плохое-определение> <хорошее-определение>" - -#: builtin/bisect--helper.c:24 -msgid "git bisect--helper --bisect-clean-state" -msgstr "git bisect--helper --bisect-clean-state" - -#: builtin/bisect--helper.c:25 msgid "git bisect--helper --bisect-reset [<commit>]" msgstr "" -#: builtin/bisect--helper.c:26 +#: builtin/bisect--helper.c:24 msgid "" "git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> " "<bad_term>" msgstr "" -#: builtin/bisect--helper.c:27 +#: builtin/bisect--helper.c:25 msgid "" "git bisect--helper --bisect-check-and-set-terms <command> <good_term> " "<bad_term>" msgstr "" -#: builtin/bisect--helper.c:28 +#: builtin/bisect--helper.c:26 msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]" msgstr "" -#: builtin/bisect--helper.c:29 +#: builtin/bisect--helper.c:27 msgid "" "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | " "--term-new]" msgstr "" -#: builtin/bisect--helper.c:30 +#: builtin/bisect--helper.c:28 msgid "" -"git bisect--helper --bisect-start [--term-{old,good}=<term> " -"--term-{new,bad}=<term>][--no-checkout] [<bad> [<good>...]] [--] " -"[<paths>...]" +"git bisect--helper --bisect-start [--term-{new,bad}=<term> " +"--term-{old,good}=<term>] [--no-checkout] [--first-parent] [<bad> " +"[<good>...]] [--] [<paths>...]" +msgstr "git bisect--helper --bisect-start [--term-{new,bad}=<термин> --term-{old,good}=<термин>] [--no-checkout] [--first-parent] [<плохая-редация> [<хорошая-редация>…]] [--] [<пути>…]" + +#: builtin/bisect--helper.c:30 +msgid "git bisect--helper --bisect-next" +msgstr "" + +#: builtin/bisect--helper.c:31 +msgid "git bisect--helper --bisect-auto-next" +msgstr "" + +#: builtin/bisect--helper.c:32 +msgid "git bisect--helper --bisect-state (bad|new) [<rev>]" +msgstr "" + +#: builtin/bisect--helper.c:33 +msgid "git bisect--helper --bisect-state (good|old) [<rev>...]" +msgstr "" + +#: builtin/bisect--helper.c:108 +#, c-format +msgid "cannot open file '%s' in mode '%s'" +msgstr "" + +#: builtin/bisect--helper.c:115 +#, c-format +msgid "could not write to file '%s'" msgstr "" -#: builtin/bisect--helper.c:86 +#: builtin/bisect--helper.c:154 #, c-format msgid "'%s' is not a valid term" msgstr "«%s» не является допустимым определением" -#: builtin/bisect--helper.c:90 +#: builtin/bisect--helper.c:158 #, c-format msgid "can't use the builtin command '%s' as a term" msgstr "нельзя использовать встроенную команду «%s» как определение" -#: builtin/bisect--helper.c:100 +#: builtin/bisect--helper.c:168 #, c-format msgid "can't change the meaning of the term '%s'" msgstr "нельзя изменить значение определения «%s»" -#: builtin/bisect--helper.c:111 +#: builtin/bisect--helper.c:178 msgid "please use two different terms" msgstr "используйте два разных определения" -#: builtin/bisect--helper.c:118 -msgid "could not open the file BISECT_TERMS" -msgstr "не удалось открыть файл BISECT_TERMS" - -#: builtin/bisect--helper.c:155 +#: builtin/bisect--helper.c:194 #, c-format msgid "We are not bisecting.\n" msgstr "" -#: builtin/bisect--helper.c:163 +#: builtin/bisect--helper.c:202 #, c-format msgid "'%s' is not a valid commit" msgstr "" -#: builtin/bisect--helper.c:174 +#: builtin/bisect--helper.c:211 #, c-format msgid "" "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'." msgstr "" -#: builtin/bisect--helper.c:215 +#: builtin/bisect--helper.c:255 #, c-format msgid "Bad bisect_write argument: %s" msgstr "" -#: builtin/bisect--helper.c:220 +#: builtin/bisect--helper.c:260 #, c-format msgid "couldn't get the oid of the rev '%s'" msgstr "" -#: builtin/bisect--helper.c:232 +#: builtin/bisect--helper.c:272 #, c-format msgid "couldn't open the file '%s'" msgstr "" -#: builtin/bisect--helper.c:258 +#: builtin/bisect--helper.c:298 #, c-format msgid "Invalid command: you're currently in a %s/%s bisect" msgstr "" -#: builtin/bisect--helper.c:285 +#: builtin/bisect--helper.c:325 #, c-format msgid "" "You need to give me at least one %s and %s revision.\n" "You can use \"git bisect %s\" and \"git bisect %s\" for that." msgstr "" -#: builtin/bisect--helper.c:289 +#: builtin/bisect--helper.c:329 #, c-format msgid "" "You need to start by \"git bisect start\".\n" @@ -8436,7 +9787,7 @@ msgid "" "You can use \"git bisect %s\" and \"git bisect %s\" for that." msgstr "" -#: builtin/bisect--helper.c:321 +#: builtin/bisect--helper.c:349 #, c-format msgid "bisecting only with a %s commit" msgstr "" @@ -8444,131 +9795,167 @@ msgstr "" #. TRANSLATORS: Make sure to include [Y] and [n] in your #. translation. The program will only accept English input #. at this point. -#: builtin/bisect--helper.c:329 +#: builtin/bisect--helper.c:357 msgid "Are you sure [Y/n]? " msgstr "Вы уверены [Y - да/n - нет]? " -#: builtin/bisect--helper.c:376 +#: builtin/bisect--helper.c:418 msgid "no terms defined" msgstr "определения не заданы" -#: builtin/bisect--helper.c:379 +#: builtin/bisect--helper.c:421 #, c-format msgid "" "Your current terms are %s for the old state\n" "and %s for the new state.\n" msgstr "" -#: builtin/bisect--helper.c:389 +#: builtin/bisect--helper.c:431 #, c-format msgid "" "invalid argument %s for 'git bisect terms'.\n" "Supported options are: --term-good|--term-old and --term-bad|--term-new." msgstr "" -#: builtin/bisect--helper.c:475 +#: builtin/bisect--helper.c:498 +msgid "revision walk setup failed\n" +msgstr "" + +#: builtin/bisect--helper.c:520 +#, c-format +msgid "could not open '%s' for appending" +msgstr "" + +#: builtin/bisect--helper.c:639 builtin/bisect--helper.c:652 +msgid "'' is not a valid term" +msgstr "" + +#: builtin/bisect--helper.c:662 #, c-format msgid "unrecognized option: '%s'" msgstr "" -#: builtin/bisect--helper.c:479 +#: builtin/bisect--helper.c:666 #, c-format msgid "'%s' does not appear to be a valid revision" msgstr "" -#: builtin/bisect--helper.c:511 +#: builtin/bisect--helper.c:697 msgid "bad HEAD - I need a HEAD" msgstr "" -#: builtin/bisect--helper.c:526 +#: builtin/bisect--helper.c:712 #, c-format msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'." msgstr "" -#: builtin/bisect--helper.c:547 +#: builtin/bisect--helper.c:733 msgid "won't bisect on cg-seek'ed tree" msgstr "нельзя выполнить двоичный поиск на дереве после cg-seek" -#: builtin/bisect--helper.c:550 +#: builtin/bisect--helper.c:736 msgid "bad HEAD - strange symbolic ref" msgstr "" -#: builtin/bisect--helper.c:627 -msgid "perform 'git bisect next'" -msgstr "выполнить «git bisect next»" +#: builtin/bisect--helper.c:756 +#, c-format +msgid "invalid ref: '%s'" +msgstr "" + +#: builtin/bisect--helper.c:814 +msgid "You need to start by \"git bisect start\"\n" +msgstr "" + +#. TRANSLATORS: Make sure to include [Y] and [n] in your +#. translation. The program will only accept English input +#. at this point. +#: builtin/bisect--helper.c:825 +msgid "Do you want me to do it for you [Y/n]? " +msgstr "Вы уверены, что хотите, чтобы я сделал это [Y] - да/[n] - нет? " -#: builtin/bisect--helper.c:629 -msgid "write the terms to .git/BISECT_TERMS" -msgstr "записать определения в .git/BISECT_TERMS" +#: builtin/bisect--helper.c:843 +msgid "Please call `--bisect-state` with at least one argument" +msgstr "" -#: builtin/bisect--helper.c:631 -msgid "cleanup the bisection state" -msgstr "очистить состояние двоичного поиска" +#: builtin/bisect--helper.c:856 +#, c-format +msgid "'git bisect %s' can take only one argument." +msgstr "" -#: builtin/bisect--helper.c:633 -msgid "check for expected revs" -msgstr "проверить ожидаемые редакции" +#: builtin/bisect--helper.c:868 builtin/bisect--helper.c:879 +#, c-format +msgid "Bad rev input: %s" +msgstr "" -#: builtin/bisect--helper.c:635 +#: builtin/bisect--helper.c:924 msgid "reset the bisection state" msgstr "" -#: builtin/bisect--helper.c:637 +#: builtin/bisect--helper.c:926 msgid "write out the bisection state in BISECT_LOG" msgstr "" -#: builtin/bisect--helper.c:639 +#: builtin/bisect--helper.c:928 msgid "check and set terms in a bisection state" msgstr "" -#: builtin/bisect--helper.c:641 +#: builtin/bisect--helper.c:930 msgid "check whether bad or good terms exist" msgstr "" -#: builtin/bisect--helper.c:643 +#: builtin/bisect--helper.c:932 msgid "print out the bisect terms" msgstr "" -#: builtin/bisect--helper.c:645 +#: builtin/bisect--helper.c:934 msgid "start the bisect session" msgstr "" -#: builtin/bisect--helper.c:647 -msgid "update BISECT_HEAD instead of checking out the current commit" -msgstr "обновить BISECT_HEAD вместо перехода на текущий коммит" +#: builtin/bisect--helper.c:936 +msgid "find the next bisection commit" +msgstr "" -#: builtin/bisect--helper.c:649 -msgid "no log for BISECT_WRITE" +#: builtin/bisect--helper.c:938 +msgid "" +"verify the next bisection state then checkout the next bisection commit" msgstr "" -#: builtin/bisect--helper.c:666 -msgid "--write-terms requires two arguments" -msgstr "--write-terms требует указания двух параметров" +#: builtin/bisect--helper.c:940 +msgid "mark the state of ref (or refs)" +msgstr "" -#: builtin/bisect--helper.c:670 -msgid "--bisect-clean-state requires no arguments" -msgstr "--bisect-clean-state не требует указания параметров" +#: builtin/bisect--helper.c:942 +msgid "no log for BISECT_WRITE" +msgstr "" -#: builtin/bisect--helper.c:677 +#: builtin/bisect--helper.c:957 msgid "--bisect-reset requires either no argument or a commit" msgstr "" -#: builtin/bisect--helper.c:681 +#: builtin/bisect--helper.c:961 msgid "--bisect-write requires either 4 or 5 arguments" msgstr "" -#: builtin/bisect--helper.c:687 +#: builtin/bisect--helper.c:967 msgid "--check-and-set-terms requires 3 arguments" msgstr "" -#: builtin/bisect--helper.c:693 +#: builtin/bisect--helper.c:973 msgid "--bisect-next-check requires 2 or 3 arguments" msgstr "" -#: builtin/bisect--helper.c:699 +#: builtin/bisect--helper.c:979 msgid "--bisect-terms requires 0 or 1 argument" msgstr "" +#: builtin/bisect--helper.c:988 +msgid "--bisect-next requires 0 arguments" +msgstr "" + +#: builtin/bisect--helper.c:994 +msgid "--bisect-auto-next requires 0 arguments" +msgstr "" + #: builtin/blame.c:32 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "git blame [<опции>] [<опции-редакции>] [<редакция>] [--] <файл>" @@ -8577,133 +9964,146 @@ msgstr "git blame [<опции>] [<опции-редакции>] [<редакц msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "<опции-rev-list> документированы в git-rev-list(1)" -#: builtin/blame.c:407 +#: builtin/blame.c:410 #, c-format msgid "expecting a color: %s" msgstr "ожидается цвет: %s" -#: builtin/blame.c:414 +#: builtin/blame.c:417 msgid "must end with a color" msgstr "должно заканчиваться на цвет" -#: builtin/blame.c:701 +#: builtin/blame.c:730 #, c-format msgid "invalid color '%s' in color.blame.repeatedLines" msgstr "" -#: builtin/blame.c:719 +#: builtin/blame.c:748 msgid "invalid value for blame.coloring" msgstr "" -#: builtin/blame.c:794 +#: builtin/blame.c:847 +#, c-format +msgid "cannot find revision %s to ignore" +msgstr "" + +#: builtin/blame.c:869 msgid "Show blame entries as we find them, incrementally" msgstr "Показать записи авторства постепенно, в процессе нахождения" -#: builtin/blame.c:795 -msgid "Show blank SHA-1 for boundary commits (Default: off)" -msgstr "Не показывать SHA-1 для коммитов, не входящих в границы запроса (По умолчанию: отключено)" +#: builtin/blame.c:870 +msgid "Do not show object names of boundary commits (Default: off)" +msgstr "" -#: builtin/blame.c:796 +#: builtin/blame.c:871 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "Не воспринимать корневые коммиты как граничные (По умолчанию: отключено)" -#: builtin/blame.c:797 +#: builtin/blame.c:872 msgid "Show work cost statistics" msgstr "Показать статистику расходов на выполнение запроса" -#: builtin/blame.c:798 +#: builtin/blame.c:873 msgid "Force progress reporting" msgstr "Принудительно выводить прогресс выполнения" -#: builtin/blame.c:799 +#: builtin/blame.c:874 msgid "Show output score for blame entries" msgstr "Показать оценку для записей авторства" -#: builtin/blame.c:800 +#: builtin/blame.c:875 msgid "Show original filename (Default: auto)" msgstr "Показать оригинальное имя файла (По умолчанию: автоматически)" -#: builtin/blame.c:801 +#: builtin/blame.c:876 msgid "Show original linenumber (Default: off)" msgstr "Показать оригинальные номера строк (По умолчанию: отключено)" -#: builtin/blame.c:802 +#: builtin/blame.c:877 msgid "Show in a format designed for machine consumption" msgstr "Показать в формате для программного разбора" -#: builtin/blame.c:803 +#: builtin/blame.c:878 msgid "Show porcelain format with per-line commit information" msgstr "Показать в машиночитаемом формате, с построчной информацией о коммите" -#: builtin/blame.c:804 +#: builtin/blame.c:879 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "Использовать такой же формат вывода, как и git-annotate (По умолчанию: отключено)" -#: builtin/blame.c:805 +#: builtin/blame.c:880 msgid "Show raw timestamp (Default: off)" msgstr "Показать необработанные временные метки (По умолчанию: отключено)" -#: builtin/blame.c:806 +#: builtin/blame.c:881 msgid "Show long commit SHA1 (Default: off)" msgstr "Показать длинный SHA1 идентификатор коммита (По умолчанию: отключено)" -#: builtin/blame.c:807 +#: builtin/blame.c:882 msgid "Suppress author name and timestamp (Default: off)" msgstr "Не показывать имя автора и временные метки (По умолчанию: отключено)" -#: builtin/blame.c:808 +#: builtin/blame.c:883 msgid "Show author email instead of name (Default: off)" msgstr "Показать почту автора вместо имени (По умолчанию: отключено)" -#: builtin/blame.c:809 +#: builtin/blame.c:884 msgid "Ignore whitespace differences" msgstr "Игнорировать различия в пробелах" -#: builtin/blame.c:810 +#: builtin/blame.c:885 builtin/log.c:1813 +msgid "rev" +msgstr "" + +#: builtin/blame.c:885 +msgid "Ignore <rev> when blaming" +msgstr "" + +#: builtin/blame.c:886 +msgid "Ignore revisions from <file>" +msgstr "" + +#: builtin/blame.c:887 msgid "color redundant metadata from previous line differently" msgstr "" -#: builtin/blame.c:811 +#: builtin/blame.c:888 msgid "color lines by age" msgstr "" -#: builtin/blame.c:818 -msgid "Use an experimental heuristic to improve diffs" -msgstr "Использовать эксперементальную эвристику, чтобы улучшить файлы списка изменений" - -#: builtin/blame.c:820 +#: builtin/blame.c:889 msgid "Spend extra cycles to find better match" msgstr "Потратить больше времени, для нахождения лучших совпадений" -#: builtin/blame.c:821 +#: builtin/blame.c:890 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "Использовать редакции из <файла> вместо вызова git-rev-list" -#: builtin/blame.c:822 +#: builtin/blame.c:891 msgid "Use <file>'s contents as the final image" msgstr "Использовать содержимое <файла> как финальный снимок" -#: builtin/blame.c:823 builtin/blame.c:824 +#: builtin/blame.c:892 builtin/blame.c:893 msgid "score" msgstr "мин-длина" -#: builtin/blame.c:823 +#: builtin/blame.c:892 msgid "Find line copies within and across files" msgstr "Найти копирование строк в пределах и между файлами" -#: builtin/blame.c:824 +#: builtin/blame.c:893 msgid "Find line movements within and across files" msgstr "Найти перемещения строк в пределах и между файлами" -#: builtin/blame.c:825 -msgid "n,m" -msgstr "начало,конец" +#: builtin/blame.c:894 +msgid "range" +msgstr "" -#: builtin/blame.c:825 -msgid "Process only line range n,m, counting from 1" -msgstr "Обработать только строки в диапазоне начало,конец, начиная с 1" +#: builtin/blame.c:895 +msgid "Process only line range <start>,<end> or function :<funcname>" +msgstr "" -#: builtin/blame.c:876 +#: builtin/blame.c:947 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "--progress нельзя использовать одновременно с --incremental или машиночитаемым (porcelain) форматом" @@ -8714,11 +10114,11 @@ msgstr "--progress нельзя использовать одновременн #. among various forms of relative timestamps, but #. your language may need more or fewer display #. columns. -#: builtin/blame.c:927 +#: builtin/blame.c:998 msgid "4 years, 11 months ago" msgstr "4 года и 11 месяцев назад" -#: builtin/blame.c:1031 +#: builtin/blame.c:1114 #, c-format msgid "file %s has only %lu line" msgid_plural "file %s has only %lu lines" @@ -8727,13 +10127,13 @@ msgstr[1] "файл %s содержит только %lu строки" msgstr[2] "файл %s содержит только %lu строк" msgstr[3] "файл %s содержит только %lu строки" -#: builtin/blame.c:1077 +#: builtin/blame.c:1159 msgid "Blaming lines" msgstr "Просмотр авторов строк" #: builtin/branch.c:29 -msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" -msgstr "git branch [<опции>] [-r | -a] [--merged | --no-merged]" +msgid "git branch [<options>] [-r | -a] [--merged] [--no-merged]" +msgstr "" #: builtin/branch.c:30 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" @@ -8759,147 +10159,147 @@ msgstr "git branch [<опции>] [-r | -a] [--points-at]" msgid "git branch [<options>] [-r | -a] [--format]" msgstr "git branch [<опции>] [-r | -a] [--format]" -#: builtin/branch.c:151 +#: builtin/branch.c:154 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" " '%s', but not yet merged to HEAD." msgstr "удаление ветки «%s», которая была слита с\n «%s», но не слита с HEAD." -#: builtin/branch.c:155 +#: builtin/branch.c:158 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" " '%s', even though it is merged to HEAD." msgstr "не удаление ветки «%s», которая еще не слита с\n «%s», хотя уже слита с HEAD." -#: builtin/branch.c:169 +#: builtin/branch.c:172 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "Не удалось найти объект коммита для «%s»" -#: builtin/branch.c:173 +#: builtin/branch.c:176 #, c-format msgid "" "The branch '%s' is not fully merged.\n" "If you are sure you want to delete it, run 'git branch -D %s'." msgstr "Ветка «%s» не слита полностью.\nЕсли вы уверены, что хотите ее удалить, запустите «git branch -D %s»." -#: builtin/branch.c:186 +#: builtin/branch.c:189 msgid "Update of config-file failed" msgstr "Не удалось обновить файл конфигурации" -#: builtin/branch.c:217 +#: builtin/branch.c:220 msgid "cannot use -a with -d" msgstr "нельзя использовать одновременно ключи -a и -d" -#: builtin/branch.c:223 +#: builtin/branch.c:226 msgid "Couldn't look up commit object for HEAD" msgstr "Не удалось найти объект коммита для HEAD" -#: builtin/branch.c:237 +#: builtin/branch.c:240 #, c-format msgid "Cannot delete branch '%s' checked out at '%s'" msgstr "Нельзя удалить ветку «%s» т.к. она активна на «%s»" -#: builtin/branch.c:252 +#: builtin/branch.c:255 #, c-format msgid "remote-tracking branch '%s' not found." msgstr "внешняя отслеживаемая ветка «%s» не найдена." -#: builtin/branch.c:253 +#: builtin/branch.c:256 #, c-format msgid "branch '%s' not found." msgstr "ветка «%s» не найдена." -#: builtin/branch.c:268 +#: builtin/branch.c:271 #, c-format msgid "Error deleting remote-tracking branch '%s'" msgstr "Ошибка удаления внешней отслеживаемой ветки «%s»" -#: builtin/branch.c:269 +#: builtin/branch.c:272 #, c-format msgid "Error deleting branch '%s'" msgstr "Ошибка удаления ветки «%s»" -#: builtin/branch.c:276 +#: builtin/branch.c:279 #, c-format msgid "Deleted remote-tracking branch %s (was %s).\n" msgstr "Внешняя отслеживаемая ветка %s удалена (была %s).\n" -#: builtin/branch.c:277 +#: builtin/branch.c:280 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "Ветка %s удалена (была %s).\n" -#: builtin/branch.c:421 builtin/tag.c:60 +#: builtin/branch.c:429 builtin/tag.c:61 msgid "unable to parse format string" msgstr "не удалось разобрать строку формата" -#: builtin/branch.c:452 +#: builtin/branch.c:460 msgid "could not resolve HEAD" -msgstr "" +msgstr "не удалось получить HEAD" -#: builtin/branch.c:458 +#: builtin/branch.c:466 #, c-format msgid "HEAD (%s) points outside of refs/heads/" -msgstr "" +msgstr "HEAD (%s) указывает за пределы refs/heads/" -#: builtin/branch.c:473 +#: builtin/branch.c:481 #, c-format msgid "Branch %s is being rebased at %s" msgstr "Производится перемещение ветки %s на %s" -#: builtin/branch.c:477 +#: builtin/branch.c:485 #, c-format msgid "Branch %s is being bisected at %s" msgstr "Производится двоичный поиск в ветке %s на %s" -#: builtin/branch.c:494 +#: builtin/branch.c:502 msgid "cannot copy the current branch while not on any." msgstr "невозможно скопировать текущую ветку, если вы не находитесь ни на одной из веток." -#: builtin/branch.c:496 +#: builtin/branch.c:504 msgid "cannot rename the current branch while not on any." msgstr "невозможно переименовать текущую ветку, если вы не находитесь ни на одной из них." -#: builtin/branch.c:507 +#: builtin/branch.c:515 #, c-format msgid "Invalid branch name: '%s'" msgstr "Недействительное имя ветки: «%s»" -#: builtin/branch.c:534 +#: builtin/branch.c:544 msgid "Branch rename failed" msgstr "Сбой переименования ветки" -#: builtin/branch.c:536 +#: builtin/branch.c:546 msgid "Branch copy failed" msgstr "Сбой копирования ветки" -#: builtin/branch.c:540 +#: builtin/branch.c:550 #, c-format msgid "Created a copy of a misnamed branch '%s'" msgstr "Создана копия неправильно названной ветки «%s»" -#: builtin/branch.c:543 +#: builtin/branch.c:553 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "Переименована неправильно названная ветка «%s»" -#: builtin/branch.c:549 +#: builtin/branch.c:559 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "Ветка переименована в %s, но HEAD не обновлен!" -#: builtin/branch.c:558 +#: builtin/branch.c:568 msgid "Branch is renamed, but update of config-file failed" msgstr "Ветка переименована, но произошел сбой обновления файла конфигурации" -#: builtin/branch.c:560 +#: builtin/branch.c:570 msgid "Branch is copied, but update of config-file failed" msgstr "Ветка скопирована, но произошел сбой обновления файла конфигурации" -#: builtin/branch.c:576 +#: builtin/branch.c:586 #, c-format msgid "" "Please edit the description for the branch\n" @@ -8907,308 +10307,439 @@ msgid "" "Lines starting with '%c' will be stripped.\n" msgstr "Измените описание для ветки:\n %s\nСтроки, начинающиеся с «%c» будут вырезаны.\n" -#: builtin/branch.c:610 +#: builtin/branch.c:620 msgid "Generic options" msgstr "Общие параметры" -#: builtin/branch.c:612 +#: builtin/branch.c:622 msgid "show hash and subject, give twice for upstream branch" -msgstr "показывать хеш-сумму и тему, укажите дважды для вышестоящей ветки" +msgstr "показывать хэш-код и тему, укажите дважды для вышестоящей ветки" -#: builtin/branch.c:613 +#: builtin/branch.c:623 msgid "suppress informational messages" msgstr "не выводить информационные сообщения" -#: builtin/branch.c:614 +#: builtin/branch.c:624 msgid "set up tracking mode (see git-pull(1))" msgstr "установить режим отслеживания вышестоящей ветки (см. git-pull(1))" -#: builtin/branch.c:616 +#: builtin/branch.c:626 msgid "do not use" msgstr "не используйте" -#: builtin/branch.c:618 builtin/rebase.c:485 +#: builtin/branch.c:628 builtin/rebase.c:532 msgid "upstream" msgstr "вышестоящая" -#: builtin/branch.c:618 +#: builtin/branch.c:628 msgid "change the upstream info" msgstr "изменить информацию о вышестоящей ветке" -#: builtin/branch.c:619 -msgid "Unset the upstream info" -msgstr "Убрать информацию о вышестоящей ветке" +#: builtin/branch.c:629 +msgid "unset the upstream info" +msgstr "" -#: builtin/branch.c:620 +#: builtin/branch.c:630 msgid "use colored output" msgstr "использовать цветной вывод" -#: builtin/branch.c:621 +#: builtin/branch.c:631 msgid "act on remote-tracking branches" msgstr "выполнить действия на отслеживаемых внешних ветках" -#: builtin/branch.c:623 builtin/branch.c:625 +#: builtin/branch.c:633 builtin/branch.c:635 msgid "print only branches that contain the commit" -msgstr "вывод только веток, которые содержат коммит" +msgstr "вывести только ветки, которые содержат коммит" -#: builtin/branch.c:624 builtin/branch.c:626 +#: builtin/branch.c:634 builtin/branch.c:636 msgid "print only branches that don't contain the commit" -msgstr "вывод только веток, которые не содержат коммит" +msgstr "вывести только ветки, которые не содержат коммит" -#: builtin/branch.c:629 +#: builtin/branch.c:639 msgid "Specific git-branch actions:" msgstr "Специфичные для git-branch действия:" -#: builtin/branch.c:630 +#: builtin/branch.c:640 msgid "list both remote-tracking and local branches" -msgstr "показать список и отслеживаемых и локальных веток" +msgstr "вывести списки отслеживаемых и локальных веток" -#: builtin/branch.c:632 +#: builtin/branch.c:642 msgid "delete fully merged branch" msgstr "удалить полностью слитую ветку" -#: builtin/branch.c:633 +#: builtin/branch.c:643 msgid "delete branch (even if not merged)" msgstr "удалить ветку (даже никуда не слитую)" -#: builtin/branch.c:634 +#: builtin/branch.c:644 msgid "move/rename a branch and its reflog" msgstr "переместить/переименовать ветки и ее журнал ссылок" -#: builtin/branch.c:635 +#: builtin/branch.c:645 msgid "move/rename a branch, even if target exists" msgstr "переместить/переименовать ветку, даже если целевое имя уже существует" -#: builtin/branch.c:636 +#: builtin/branch.c:646 msgid "copy a branch and its reflog" msgstr "скопировать ветку и её журнал ссылок" -#: builtin/branch.c:637 +#: builtin/branch.c:647 msgid "copy a branch, even if target exists" msgstr "скопировать ветку, даже если целевое имя уже существует" -#: builtin/branch.c:638 +#: builtin/branch.c:648 msgid "list branch names" -msgstr "показать список имен веток" +msgstr "показать список имён веток" -#: builtin/branch.c:639 +#: builtin/branch.c:649 msgid "show current branch name" -msgstr "" +msgstr "вывести имя текущей ветки" -#: builtin/branch.c:640 +#: builtin/branch.c:650 msgid "create the branch's reflog" msgstr "создать журнал ссылок ветки" -#: builtin/branch.c:642 +#: builtin/branch.c:652 msgid "edit the description for the branch" msgstr "изменить описание ветки" -#: builtin/branch.c:643 +#: builtin/branch.c:653 msgid "force creation, move/rename, deletion" msgstr "принудительное создание, перемещение или удаление ветки" -#: builtin/branch.c:644 +#: builtin/branch.c:654 msgid "print only branches that are merged" msgstr "вывод только слитых веток" -#: builtin/branch.c:645 +#: builtin/branch.c:655 msgid "print only branches that are not merged" msgstr "вывод только не слитых веток" -#: builtin/branch.c:646 +#: builtin/branch.c:656 msgid "list branches in columns" msgstr "показать список веток по столбцам" -#: builtin/branch.c:649 builtin/for-each-ref.c:42 builtin/notes.c:415 +#: builtin/branch.c:658 builtin/for-each-ref.c:42 builtin/notes.c:415 #: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584 -#: builtin/tag.c:427 +#: builtin/tag.c:434 msgid "object" msgstr "объект" -#: builtin/branch.c:650 +#: builtin/branch.c:659 msgid "print only branches of the object" msgstr "вывод только веток, определенного объекта" -#: builtin/branch.c:652 builtin/for-each-ref.c:48 builtin/tag.c:434 +#: builtin/branch.c:660 builtin/for-each-ref.c:48 builtin/tag.c:441 msgid "sorting and filtering are case insensitive" msgstr "сортировка и фильтрация не зависят от регистра" -#: builtin/branch.c:653 builtin/for-each-ref.c:38 builtin/tag.c:432 -#: builtin/verify-tag.c:39 +#: builtin/branch.c:661 builtin/for-each-ref.c:38 builtin/tag.c:439 +#: builtin/verify-tag.c:38 msgid "format to use for the output" msgstr "использовать формат для вывода" -#: builtin/branch.c:676 builtin/clone.c:748 +#: builtin/branch.c:684 builtin/clone.c:790 msgid "HEAD not found below refs/heads!" msgstr "HEAD не найден в refs/heads!" -#: builtin/branch.c:700 +#: builtin/branch.c:708 msgid "--column and --verbose are incompatible" msgstr "--column и --verbose нельзя использовать одновременно" -#: builtin/branch.c:715 builtin/branch.c:769 builtin/branch.c:778 +#: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786 msgid "branch name required" msgstr "требуется имя ветки" -#: builtin/branch.c:745 +#: builtin/branch.c:753 msgid "Cannot give description to detached HEAD" msgstr "Нельзя дать описание отделённому HEAD" -#: builtin/branch.c:750 +#: builtin/branch.c:758 msgid "cannot edit description of more than one branch" msgstr "нельзя изменить описание более одной ветки за раз" -#: builtin/branch.c:757 +#: builtin/branch.c:765 #, c-format msgid "No commit on branch '%s' yet." msgstr "Еще нет коммита на ветке «%s»." -#: builtin/branch.c:760 +#: builtin/branch.c:768 #, c-format msgid "No branch named '%s'." msgstr "Нет ветки с именем «%s»." -#: builtin/branch.c:775 +#: builtin/branch.c:783 msgid "too many branches for a copy operation" msgstr "слишком много веток для операции копирования" -#: builtin/branch.c:784 +#: builtin/branch.c:792 msgid "too many arguments for a rename operation" msgstr "слишком много аргументов для операции переименования" -#: builtin/branch.c:789 +#: builtin/branch.c:797 msgid "too many arguments to set new upstream" msgstr "слишком много аргументов для указания новой вышестоящей ветки" -#: builtin/branch.c:793 +#: builtin/branch.c:801 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." msgstr "невозможно установить вышестоящий репозиторий для HEAD на %s, так как он не указывает ни на одну ветку." -#: builtin/branch.c:796 builtin/branch.c:819 +#: builtin/branch.c:804 builtin/branch.c:827 #, c-format msgid "no such branch '%s'" msgstr "нет такой ветки «%s»" -#: builtin/branch.c:800 +#: builtin/branch.c:808 #, c-format msgid "branch '%s' does not exist" msgstr "ветка «%s» не существует" -#: builtin/branch.c:813 +#: builtin/branch.c:821 msgid "too many arguments to unset upstream" msgstr "слишком много аргументов для сброса указания вышестоящей ветки" -#: builtin/branch.c:817 +#: builtin/branch.c:825 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "невозможно убрать вышестоящий репозиторий для HEAD, так как он не указывает ни на одну ветку." -#: builtin/branch.c:823 +#: builtin/branch.c:831 #, c-format msgid "Branch '%s' has no upstream information" msgstr "Ветка «%s» не имеет информации о вышестоящей ветке" -#: builtin/branch.c:833 -msgid "-a and -r options to 'git branch' do not make sense with a branch name" -msgstr "параметры -a и -r для «git branch» не имеют смысла с указанием имени ветки" +#: builtin/branch.c:841 +msgid "" +"The -a, and -r, options to 'git branch' do not take a branch name.\n" +"Did you mean to use: -a|-r --list <pattern>?" +msgstr "" -#: builtin/branch.c:836 +#: builtin/branch.c:845 msgid "" "the '--set-upstream' option is no longer supported. Please use '--track' or " "'--set-upstream-to' instead." msgstr "опция --set-upstream больше не поддерживается. Вместо неё используйте «--track» или «--set-upstream-to»" -#: builtin/bundle.c:45 +#: builtin/bugreport.c:15 +msgid "git version:\n" +msgstr "" + +#: builtin/bugreport.c:21 #, c-format -msgid "%s is okay\n" -msgstr "%s в порядке\n" +msgid "uname() failed with error '%s' (%d)\n" +msgstr "" + +#: builtin/bugreport.c:31 +msgid "compiler info: " +msgstr "" + +#: builtin/bugreport.c:34 +msgid "libc info: " +msgstr "" + +#: builtin/bugreport.c:80 +msgid "not run from a git repository - no hooks to show\n" +msgstr "" + +#: builtin/bugreport.c:90 +msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]" +msgstr "" + +#: builtin/bugreport.c:97 +msgid "" +"Thank you for filling out a Git bug report!\n" +"Please answer the following questions to help us understand your issue.\n" +"\n" +"What did you do before the bug happened? (Steps to reproduce your issue)\n" +"\n" +"What did you expect to happen? (Expected behavior)\n" +"\n" +"What happened instead? (Actual behavior)\n" +"\n" +"What's different between what you expected and what actually happened?\n" +"\n" +"Anything else you want to add:\n" +"\n" +"Please review the rest of the bug report below.\n" +"You can delete any lines you don't wish to share.\n" +msgstr "" + +#: builtin/bugreport.c:135 +msgid "specify a destination for the bugreport file" +msgstr "" + +#: builtin/bugreport.c:137 +msgid "specify a strftime format suffix for the filename" +msgstr "" + +#: builtin/bugreport.c:159 +#, c-format +msgid "could not create leading directories for '%s'" +msgstr "" + +#: builtin/bugreport.c:166 +msgid "System Info" +msgstr "" + +#: builtin/bugreport.c:169 +msgid "Enabled Hooks" +msgstr "" + +#: builtin/bugreport.c:176 +#, c-format +msgid "couldn't create a new file at '%s'" +msgstr "" + +#: builtin/bugreport.c:179 +#, c-format +msgid "unable to write to %s" +msgstr "" + +#: builtin/bugreport.c:189 +#, c-format +msgid "Created new report at '%s'.\n" +msgstr "" + +#: builtin/bundle.c:15 builtin/bundle.c:23 +msgid "git bundle create [<options>] <file> <git-rev-list args>" +msgstr "" + +#: builtin/bundle.c:16 builtin/bundle.c:28 +msgid "git bundle verify [<options>] <file>" +msgstr "" + +#: builtin/bundle.c:17 builtin/bundle.c:33 +msgid "git bundle list-heads <file> [<refname>...]" +msgstr "" + +#: builtin/bundle.c:18 builtin/bundle.c:38 +msgid "git bundle unbundle <file> [<refname>...]" +msgstr "" + +#: builtin/bundle.c:67 builtin/pack-objects.c:3480 +msgid "do not show progress meter" +msgstr "не выводить прогресс выполнения" -#: builtin/bundle.c:58 +#: builtin/bundle.c:69 builtin/pack-objects.c:3482 +msgid "show progress meter" +msgstr "показать прогресс выполнения" + +#: builtin/bundle.c:71 builtin/pack-objects.c:3484 +msgid "show progress meter during object writing phase" +msgstr "показать прогресс выполнения во время записи объектов" + +#: builtin/bundle.c:74 builtin/pack-objects.c:3487 +msgid "similar to --all-progress when progress meter is shown" +msgstr "похоже на --all-progress при включенном прогрессе выполнения" + +#: builtin/bundle.c:76 +msgid "specify bundle format version" +msgstr "" + +#: builtin/bundle.c:96 msgid "Need a repository to create a bundle." msgstr "Требуется репозиторий для создания пакета." -#: builtin/bundle.c:62 +#: builtin/bundle.c:107 +msgid "do not show bundle details" +msgstr "" + +#: builtin/bundle.c:122 +#, c-format +msgid "%s is okay\n" +msgstr "%s в порядке\n" + +#: builtin/bundle.c:163 msgid "Need a repository to unbundle." msgstr "Требуется репозиторий для распаковки." -#: builtin/cat-file.c:593 +#: builtin/bundle.c:171 builtin/remote.c:1700 +msgid "be verbose; must be placed before a subcommand" +msgstr "быть многословнее; должно стоять перед подкомандой" + +#: builtin/bundle.c:193 builtin/remote.c:1731 +#, c-format +msgid "Unknown subcommand: %s" +msgstr "Неизвестная подкоманда: %s" + +#: builtin/cat-file.c:598 msgid "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | " "-p | <type> | --textconv | --filters) [--path=<path>] <object>" msgstr "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -p | <тип> | --textconv | --filters) [--path=<путь>] <объект>" -#: builtin/cat-file.c:594 +#: builtin/cat-file.c:599 msgid "" -"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | " -"--filters]" -msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --filters]" +"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-" +"symlinks] [--textconv | --filters]" +msgstr "" -#: builtin/cat-file.c:615 +#: builtin/cat-file.c:620 msgid "only one batch option may be specified" msgstr "" -#: builtin/cat-file.c:633 +#: builtin/cat-file.c:638 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<тип> может быть одним из: blob, tree, commit, tag" -#: builtin/cat-file.c:634 +#: builtin/cat-file.c:639 msgid "show object type" msgstr "показать тип объекта" -#: builtin/cat-file.c:635 +#: builtin/cat-file.c:640 msgid "show object size" msgstr "показать размер объекта" -#: builtin/cat-file.c:637 +#: builtin/cat-file.c:642 msgid "exit with zero when there's no error" msgstr "выйти с нулевым кодом возврата, если нет ошибки" -#: builtin/cat-file.c:638 +#: builtin/cat-file.c:643 msgid "pretty-print object's content" msgstr "структурированный вывод содержимого объекта" -#: builtin/cat-file.c:640 +#: builtin/cat-file.c:645 msgid "for blob objects, run textconv on object's content" -msgstr "запустить texconv на содержимом двоичных объектов " +msgstr "запустить texconv на содержимом двоичных объектов" -#: builtin/cat-file.c:642 +#: builtin/cat-file.c:647 msgid "for blob objects, run filters on object's content" -msgstr "запуск фильтров на содержимом двоичных объектов " +msgstr "запуск фильтров на содержимом двоичных объектов" -#: builtin/cat-file.c:643 git-submodule.sh:936 +#: builtin/cat-file.c:648 msgid "blob" msgstr "двоичный объект" -#: builtin/cat-file.c:644 +#: builtin/cat-file.c:649 msgid "use a specific path for --textconv/--filters" msgstr "использовать определенный путь для --textconv/--filters" -#: builtin/cat-file.c:646 +#: builtin/cat-file.c:651 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "разрешить -s и -t работать с повреждёнными объектами" -#: builtin/cat-file.c:647 +#: builtin/cat-file.c:652 msgid "buffer --batch output" msgstr "буфферировать вывод --batch" -#: builtin/cat-file.c:649 +#: builtin/cat-file.c:654 msgid "show info and content of objects fed from the standard input" msgstr "показать информацию и содержимое объектов, переданных из стандартного ввода" -#: builtin/cat-file.c:653 +#: builtin/cat-file.c:658 msgid "show info about objects fed from the standard input" msgstr "показать информацию об объектах, переданных из стандартного ввода" -#: builtin/cat-file.c:657 +#: builtin/cat-file.c:662 msgid "follow in-tree symlinks (used with --batch or --batch-check)" msgstr "переходить по символьным ссылкам внутри дерева (используется с опциями --batch и --batch-check)" -#: builtin/cat-file.c:659 +#: builtin/cat-file.c:664 msgid "show all objects with --batch or --batch-check" msgstr "показать все объекты с опциями --batch или --batch-check" -#: builtin/cat-file.c:661 +#: builtin/cat-file.c:666 msgid "do not order --batch-all-objects output" msgstr "" @@ -9236,8 +10767,8 @@ msgstr "прочитать имена файлов из стандартного msgid "terminate input and output records by a NUL character" msgstr "окончание ввода и вывода записей по НУЛЕВОМУ символу" -#: builtin/check-ignore.c:21 builtin/checkout.c:1355 builtin/gc.c:538 -#: builtin/worktree.c:499 +#: builtin/check-ignore.c:21 builtin/checkout.c:1500 builtin/gc.c:541 +#: builtin/worktree.c:561 msgid "suppress progress reporting" msgstr "не выводить прогресс выполнения" @@ -9249,27 +10780,27 @@ msgstr "показать не совпадающие введенные пути msgid "ignore index when checking" msgstr "игнорировать индекс при проверке" -#: builtin/check-ignore.c:160 +#: builtin/check-ignore.c:163 msgid "cannot specify pathnames with --stdin" msgstr "нельзя указывать пути вместе с параметром --stdin" -#: builtin/check-ignore.c:163 +#: builtin/check-ignore.c:166 msgid "-z only makes sense with --stdin" msgstr "-z имеет смысл только вместе с параметром --stdin" -#: builtin/check-ignore.c:165 +#: builtin/check-ignore.c:168 msgid "no path specified" msgstr "не указан путь" -#: builtin/check-ignore.c:169 +#: builtin/check-ignore.c:172 msgid "--quiet is only valid with a single pathname" msgstr "--quiet можно использовать только при указании одного пути" -#: builtin/check-ignore.c:171 +#: builtin/check-ignore.c:174 msgid "cannot have both --quiet and --verbose" msgstr "нельзя использовать одновременно --quiet и --verbose" -#: builtin/check-ignore.c:174 +#: builtin/check-ignore.c:177 msgid "--non-matching is only valid with --verbose" msgstr "--non-matching можно использовать только вместе с --verbose" @@ -9290,117 +10821,104 @@ msgstr "не удалось разобрать контакт: %s" msgid "no contacts specified" msgstr "не указаны контакты" -#: builtin/checkout-index.c:131 +#: builtin/checkout-index.c:139 msgid "git checkout-index [<options>] [--] [<file>...]" msgstr "git checkout-index [<опции>] [--] [<файл>…]" -#: builtin/checkout-index.c:148 +#: builtin/checkout-index.c:156 msgid "stage should be between 1 and 3 or all" msgstr "индекс должен быть между 1 и 3 или all" -#: builtin/checkout-index.c:164 +#: builtin/checkout-index.c:173 msgid "check out all files in the index" msgstr "переключиться на состояние всех файлов из индекса" -#: builtin/checkout-index.c:165 +#: builtin/checkout-index.c:174 msgid "force overwrite of existing files" msgstr "принудительная перезапись существующих файлов" -#: builtin/checkout-index.c:167 +#: builtin/checkout-index.c:176 msgid "no warning for existing files and files not in index" msgstr "не выводить предупреждения для существующих и непроиндексированных файлов" -#: builtin/checkout-index.c:169 +#: builtin/checkout-index.c:178 msgid "don't checkout new files" msgstr "не создавать новые файлы" -#: builtin/checkout-index.c:171 +#: builtin/checkout-index.c:180 msgid "update stat information in the index file" msgstr "обновить статистику доступа в файле индекса" -#: builtin/checkout-index.c:175 +#: builtin/checkout-index.c:184 msgid "read list of paths from the standard input" msgstr "прочитать список путей из стандартного ввода" -#: builtin/checkout-index.c:177 +#: builtin/checkout-index.c:186 msgid "write the content to temporary files" msgstr "записать содержимое во временные файлы" -#: builtin/checkout-index.c:178 builtin/column.c:31 -#: builtin/submodule--helper.c:1372 builtin/submodule--helper.c:1375 -#: builtin/submodule--helper.c:1383 builtin/submodule--helper.c:1856 -#: builtin/worktree.c:672 +#: builtin/checkout-index.c:187 builtin/column.c:31 +#: builtin/submodule--helper.c:1824 builtin/submodule--helper.c:1827 +#: builtin/submodule--helper.c:1835 builtin/submodule--helper.c:2333 +#: builtin/worktree.c:757 msgid "string" msgstr "строка" -#: builtin/checkout-index.c:179 +#: builtin/checkout-index.c:188 msgid "when creating files, prepend <string>" msgstr "добавить спереди <строку> при создании файлов" -#: builtin/checkout-index.c:181 +#: builtin/checkout-index.c:190 msgid "copy out the files from named stage" msgstr "копировать файлы из указанного индекса" -#: builtin/checkout.c:32 +#: builtin/checkout.c:31 msgid "git checkout [<options>] <branch>" msgstr "git checkout [<опции>] <ветка>" -#: builtin/checkout.c:33 +#: builtin/checkout.c:32 msgid "git checkout [<options>] [<branch>] -- <file>..." msgstr "git checkout [<опции>] [<ветка>] -- <файл>…" -#: builtin/checkout.c:151 builtin/checkout.c:190 +#: builtin/checkout.c:37 +msgid "git switch [<options>] [<branch>]" +msgstr "" + +#: builtin/checkout.c:42 +msgid "git restore [<options>] [--source=<branch>] <file>..." +msgstr "git restore [<опции>] [--source=<ветка>] <файл>…" + +#: builtin/checkout.c:188 builtin/checkout.c:227 #, c-format msgid "path '%s' does not have our version" msgstr "путь «%s» не имеет нашей версии" -#: builtin/checkout.c:153 builtin/checkout.c:192 +#: builtin/checkout.c:190 builtin/checkout.c:229 #, c-format msgid "path '%s' does not have their version" msgstr "путь «%s» не имеет их версии" -#: builtin/checkout.c:169 +#: builtin/checkout.c:206 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "путь «%s» не имеет всех необходимых версий" -#: builtin/checkout.c:219 +#: builtin/checkout.c:258 #, c-format msgid "path '%s' does not have necessary versions" msgstr "путь «%s» не имеет необходимых версий" -#: builtin/checkout.c:237 +#: builtin/checkout.c:275 #, c-format msgid "path '%s': cannot merge" msgstr "путь «%s»: не удалось слить" -#: builtin/checkout.c:253 +#: builtin/checkout.c:291 #, c-format msgid "Unable to add merge result for '%s'" msgstr "Не удалось добавить результат слияния «%s»" -#: builtin/checkout.c:331 builtin/checkout.c:334 builtin/checkout.c:337 -#: builtin/checkout.c:340 -#, c-format -msgid "'%s' cannot be used with updating paths" -msgstr "«%s» нельзя использовать при обновлении путей" - -#: builtin/checkout.c:343 builtin/checkout.c:346 -#, c-format -msgid "'%s' cannot be used with %s" -msgstr "«%s» нельзя использовать одновременно с %s" - -#: builtin/checkout.c:349 -#, c-format -msgid "Cannot update paths and switch to branch '%s' at the same time." -msgstr "Нельзя обновлять пути и переключаться на ветку «%s» одновременно." - -#: builtin/checkout.c:396 builtin/checkout.c:403 -#, c-format -msgid "path '%s' is unmerged" -msgstr "путь «%s» не слит" - -#: builtin/checkout.c:442 +#: builtin/checkout.c:396 #, c-format msgid "Recreated %d merge conflict" msgid_plural "Recreated %d merge conflicts" @@ -9409,7 +10927,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: builtin/checkout.c:447 +#: builtin/checkout.c:401 #, c-format msgid "Updated %d path from %s" msgid_plural "Updated %d paths from %s" @@ -9418,7 +10936,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: builtin/checkout.c:454 +#: builtin/checkout.c:408 #, c-format msgid "Updated %d path from the index" msgid_plural "Updated %d paths from the index" @@ -9427,66 +10945,97 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: builtin/checkout.c:695 +#: builtin/checkout.c:431 builtin/checkout.c:434 builtin/checkout.c:437 +#: builtin/checkout.c:441 +#, c-format +msgid "'%s' cannot be used with updating paths" +msgstr "«%s» нельзя использовать при обновлении путей" + +#: builtin/checkout.c:444 builtin/checkout.c:447 +#, c-format +msgid "'%s' cannot be used with %s" +msgstr "«%s» нельзя использовать одновременно с %s" + +#: builtin/checkout.c:451 +#, c-format +msgid "Cannot update paths and switch to branch '%s' at the same time." +msgstr "Нельзя обновлять пути и переключаться на ветку «%s» одновременно." + +#: builtin/checkout.c:455 +#, c-format +msgid "neither '%s' or '%s' is specified" +msgstr "" + +#: builtin/checkout.c:459 +#, c-format +msgid "'%s' must be used when '%s' is not specified" +msgstr "" + +#: builtin/checkout.c:464 builtin/checkout.c:469 +#, c-format +msgid "'%s' or '%s' cannot be used with %s" +msgstr "" + +#: builtin/checkout.c:541 builtin/checkout.c:548 +#, c-format +msgid "path '%s' is unmerged" +msgstr "путь «%s» не слит" + +#: builtin/checkout.c:716 msgid "you need to resolve your current index first" msgstr "сначала нужно разрешить конфликты в вашем текущем индексе" -#: builtin/checkout.c:744 +#: builtin/checkout.c:770 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" "%s" msgstr "" -#: builtin/checkout.c:751 -#, c-format -msgid "staged changes in the following files may be lost: %s" -msgstr "" - -#: builtin/checkout.c:848 +#: builtin/checkout.c:866 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "Не удалось создать журнал ссылок для «%s»: %s\n" -#: builtin/checkout.c:890 +#: builtin/checkout.c:908 msgid "HEAD is now at" msgstr "HEAD сейчас на" -#: builtin/checkout.c:894 builtin/clone.c:701 +#: builtin/checkout.c:912 builtin/clone.c:721 t/helper/test-fast-rebase.c:202 msgid "unable to update HEAD" msgstr "не удалось обновить HEAD" -#: builtin/checkout.c:898 +#: builtin/checkout.c:916 #, c-format msgid "Reset branch '%s'\n" msgstr "Сброс ветки «%s»\n" -#: builtin/checkout.c:901 +#: builtin/checkout.c:919 #, c-format msgid "Already on '%s'\n" msgstr "Уже на «%s»\n" -#: builtin/checkout.c:905 +#: builtin/checkout.c:923 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Переключение и сброс ветки «%s»\n" -#: builtin/checkout.c:907 builtin/checkout.c:1283 +#: builtin/checkout.c:925 builtin/checkout.c:1356 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Переключено на новую ветку «%s»\n" -#: builtin/checkout.c:909 +#: builtin/checkout.c:927 #, c-format msgid "Switched to branch '%s'\n" msgstr "Переключено на ветку «%s»\n" -#: builtin/checkout.c:960 +#: builtin/checkout.c:978 #, c-format msgid " ... and %d more.\n" msgstr " … и еще %d.\n" -#: builtin/checkout.c:966 +#: builtin/checkout.c:984 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -9503,7 +11052,7 @@ msgstr[1] "Предупреждение: вы оставляете позади msgstr[2] "Предупреждение: вы оставляете позади %d коммитов не соединенные ни с одной из ваших веток:\n\n%s\n" msgstr[3] "Предупреждение: вы оставляете позади %d коммитов не соединенные ни с одной из ваших веток:\n\n%s\n" -#: builtin/checkout.c:985 +#: builtin/checkout.c:1003 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -9522,228 +11071,357 @@ msgstr[1] "Если вы хотите сохранить их с помощью msgstr[2] "Если вы хотите сохранить их с помощью создания новой ветки, то сейчас самое время\nсделать это с помощью:\n\n git branch <имя-новой-ветки> %s\n" msgstr[3] "Если вы хотите сохранить их с помощью создания новой ветки, то сейчас самое время\nсделать это с помощью:\n\n git branch <имя-новой-ветки> %s\n" -#: builtin/checkout.c:1017 +#: builtin/checkout.c:1038 msgid "internal error in revision walk" msgstr "внутренняя ошибка при хождении по редакциям" -#: builtin/checkout.c:1021 +#: builtin/checkout.c:1042 msgid "Previous HEAD position was" msgstr "Предыдущая позиция HEAD была" -#: builtin/checkout.c:1052 builtin/checkout.c:1278 +#: builtin/checkout.c:1082 builtin/checkout.c:1351 msgid "You are on a branch yet to be born" msgstr "Вы находитесь на еще не созданной ветке" -#: builtin/checkout.c:1173 -#, c-format -msgid "only one reference expected, %d given." -msgstr "ожидается только одна ссылка, а передано %d." - -#: builtin/checkout.c:1209 +#: builtin/checkout.c:1164 #, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" "Please use -- (and optionally --no-guess) to disambiguate" msgstr "" -#: builtin/checkout.c:1222 builtin/worktree.c:290 builtin/worktree.c:448 +#: builtin/checkout.c:1171 +msgid "" +"If you meant to check out a remote tracking branch on, e.g. 'origin',\n" +"you can do so by fully qualifying the name with the --track option:\n" +"\n" +" git checkout --track origin/<name>\n" +"\n" +"If you'd like to always have checkouts of an ambiguous <name> prefer\n" +"one remote, e.g. the 'origin' remote, consider setting\n" +"checkout.defaultRemote=origin in your config." +msgstr "" + +#: builtin/checkout.c:1181 +#, c-format +msgid "'%s' matched multiple (%d) remote tracking branches" +msgstr "" + +#: builtin/checkout.c:1247 +msgid "only one reference expected" +msgstr "" + +#: builtin/checkout.c:1264 +#, c-format +msgid "only one reference expected, %d given." +msgstr "ожидается только одна ссылка, а передано %d." + +#: builtin/checkout.c:1310 builtin/worktree.c:342 builtin/worktree.c:510 #, c-format msgid "invalid reference: %s" msgstr "неправильная ссылка: %s" -#: builtin/checkout.c:1251 +#: builtin/checkout.c:1323 builtin/checkout.c:1689 #, c-format msgid "reference is not a tree: %s" msgstr "в дереве нет такой ссылки: %s" -#: builtin/checkout.c:1292 +#: builtin/checkout.c:1370 +#, c-format +msgid "a branch is expected, got tag '%s'" +msgstr "" + +#: builtin/checkout.c:1372 +#, c-format +msgid "a branch is expected, got remote branch '%s'" +msgstr "" + +#: builtin/checkout.c:1373 builtin/checkout.c:1381 +#, c-format +msgid "a branch is expected, got '%s'" +msgstr "" + +#: builtin/checkout.c:1376 +#, c-format +msgid "a branch is expected, got commit '%s'" +msgstr "" + +#: builtin/checkout.c:1392 +msgid "" +"cannot switch branch while merging\n" +"Consider \"git merge --quit\" or \"git worktree add\"." +msgstr "" + +#: builtin/checkout.c:1396 +msgid "" +"cannot switch branch in the middle of an am session\n" +"Consider \"git am --quit\" or \"git worktree add\"." +msgstr "" + +#: builtin/checkout.c:1400 +msgid "" +"cannot switch branch while rebasing\n" +"Consider \"git rebase --quit\" or \"git worktree add\"." +msgstr "" + +#: builtin/checkout.c:1404 +msgid "" +"cannot switch branch while cherry-picking\n" +"Consider \"git cherry-pick --quit\" or \"git worktree add\"." +msgstr "" + +#: builtin/checkout.c:1408 +msgid "" +"cannot switch branch while reverting\n" +"Consider \"git revert --quit\" or \"git worktree add\"." +msgstr "" + +#: builtin/checkout.c:1412 +msgid "you are switching branch while bisecting" +msgstr "" + +#: builtin/checkout.c:1419 msgid "paths cannot be used with switching branches" msgstr "нельзя использовать пути при переключении веток" -#: builtin/checkout.c:1295 builtin/checkout.c:1299 builtin/checkout.c:1303 +#: builtin/checkout.c:1422 builtin/checkout.c:1426 builtin/checkout.c:1430 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "нельзя использовать «%s» при переключении веток" -#: builtin/checkout.c:1307 builtin/checkout.c:1310 builtin/checkout.c:1315 -#: builtin/checkout.c:1318 +#: builtin/checkout.c:1434 builtin/checkout.c:1437 builtin/checkout.c:1440 +#: builtin/checkout.c:1445 builtin/checkout.c:1450 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "«%s» нельзя использовать одновременно с «%s»" -#: builtin/checkout.c:1323 +#: builtin/checkout.c:1447 +#, c-format +msgid "'%s' cannot take <start-point>" +msgstr "" + +#: builtin/checkout.c:1455 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "Нельзя переключить ветку на не коммит «%s»" -#: builtin/checkout.c:1356 builtin/checkout.c:1358 builtin/clone.c:118 -#: builtin/remote.c:169 builtin/remote.c:171 builtin/worktree.c:492 -#: builtin/worktree.c:494 -msgid "branch" -msgstr "ветка" +#: builtin/checkout.c:1462 +msgid "missing branch or commit argument" +msgstr "" -#: builtin/checkout.c:1357 -msgid "create and checkout a new branch" -msgstr "создать и переключиться на новую ветку" +#: builtin/checkout.c:1504 builtin/clone.c:92 builtin/commit-graph.c:84 +#: builtin/commit-graph.c:222 builtin/fetch.c:172 builtin/merge.c:296 +#: builtin/multi-pack-index.c:27 builtin/pull.c:119 builtin/push.c:575 +#: builtin/send-pack.c:198 +msgid "force progress reporting" +msgstr "принудительно выводить прогресс" -#: builtin/checkout.c:1359 -msgid "create/reset and checkout a branch" -msgstr "создать/сбросить и перключиться на новую ветку" +#: builtin/checkout.c:1505 +msgid "perform a 3-way merge with the new branch" +msgstr "выполнить трехходовое слияние с новой веткой" -#: builtin/checkout.c:1360 -msgid "create reflog for new branch" -msgstr "создать журнал ссылок для новой ветки" +#: builtin/checkout.c:1506 builtin/log.c:1800 parse-options.h:322 +msgid "style" +msgstr "стиль" + +#: builtin/checkout.c:1507 +msgid "conflict style (merge or diff3)" +msgstr "стиль конфликтов слияния (merge или diff3)" -#: builtin/checkout.c:1361 builtin/worktree.c:496 +#: builtin/checkout.c:1519 builtin/worktree.c:558 msgid "detach HEAD at named commit" msgstr "отсоединить HEAD на указанном коммите" -#: builtin/checkout.c:1362 +#: builtin/checkout.c:1520 msgid "set upstream info for new branch" msgstr "установить информацию о вышестоящей ветке для новой ветки" -#: builtin/checkout.c:1364 +#: builtin/checkout.c:1522 +msgid "force checkout (throw away local modifications)" +msgstr "принудительное переключение на состояние (отбрасывает все локальные изменения)" + +#: builtin/checkout.c:1524 msgid "new-branch" msgstr "новая-ветка" -#: builtin/checkout.c:1364 +#: builtin/checkout.c:1524 msgid "new unparented branch" msgstr "новая ветка без родителей" -#: builtin/checkout.c:1366 +#: builtin/checkout.c:1526 builtin/merge.c:300 +msgid "update ignored files (default)" +msgstr "обновить игнорируемые файлы (по умолчанию)" + +#: builtin/checkout.c:1529 +msgid "do not check if another worktree is holding the given ref" +msgstr "не проверять, что другое дерево уже содержит указанную ссылку" + +#: builtin/checkout.c:1542 msgid "checkout our version for unmerged files" msgstr "переключиться на нашу версию для не слитых файлов" -#: builtin/checkout.c:1369 +#: builtin/checkout.c:1545 msgid "checkout their version for unmerged files" msgstr "переключиться на их версию для не слитых файлов" -#: builtin/checkout.c:1371 -msgid "force checkout (throw away local modifications)" -msgstr "принудительное переключение на состояние (отбрасывает все локальные изменения)" - -#: builtin/checkout.c:1373 -msgid "perform a 3-way merge with the new branch" -msgstr "выполнить трехходовое слияние с новой веткой" - -#: builtin/checkout.c:1375 builtin/merge.c:284 -msgid "update ignored files (default)" -msgstr "обновить игнорируемые файлы (по умолчанию)" - -#: builtin/checkout.c:1377 builtin/log.c:1594 parse-options.h:317 -msgid "style" -msgstr "стиль" - -#: builtin/checkout.c:1378 -msgid "conflict style (merge or diff3)" -msgstr "стиль конфликтов слияния (merge или diff3)" - -#: builtin/checkout.c:1381 +#: builtin/checkout.c:1549 msgid "do not limit pathspecs to sparse entries only" msgstr "не ограничивать спецификаторы пути только частичными записями" -#: builtin/checkout.c:1383 -msgid "do not second guess 'git checkout <no-such-branch>'" -msgstr "" - -#: builtin/checkout.c:1385 -msgid "do not check if another worktree is holding the given ref" -msgstr "не проверять, что другое дерево уже содержит указанную ссылку" - -#: builtin/checkout.c:1389 builtin/clone.c:88 builtin/fetch.c:141 -#: builtin/merge.c:281 builtin/pull.c:136 builtin/push.c:575 -#: builtin/send-pack.c:174 -msgid "force progress reporting" -msgstr "принудительно выводить прогресс" - -#: builtin/checkout.c:1390 -msgid "use overlay mode (default)" +#: builtin/checkout.c:1604 +#, c-format +msgid "-%c, -%c and --orphan are mutually exclusive" msgstr "" -#: builtin/checkout.c:1422 -msgid "-b, -B and --orphan are mutually exclusive" -msgstr "-b, -B и --orphan нельзя использовать одновременно" - -#: builtin/checkout.c:1425 +#: builtin/checkout.c:1608 msgid "-p and --overlay are mutually exclusive" msgstr "" -#: builtin/checkout.c:1442 +#: builtin/checkout.c:1645 msgid "--track needs a branch name" msgstr "--track требует имя ветки" -#: builtin/checkout.c:1447 -msgid "missing branch name; try -b" -msgstr "пропущено имя ветки; попробуйте -b" +#: builtin/checkout.c:1650 +#, c-format +msgid "missing branch name; try -%c" +msgstr "" -#: builtin/checkout.c:1484 +#: builtin/checkout.c:1682 +#, c-format +msgid "could not resolve %s" +msgstr "" + +#: builtin/checkout.c:1698 msgid "invalid path specification" msgstr "недопустимый спецификатор пути" -#: builtin/checkout.c:1491 +#: builtin/checkout.c:1705 #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "«%s» не является коммитом, поэтому невозможно создать из него ветку «%s»" -#: builtin/checkout.c:1495 +#: builtin/checkout.c:1709 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: --detach не принимает путь «%s» как аргумент" -#: builtin/checkout.c:1499 +#: builtin/checkout.c:1718 +msgid "--pathspec-from-file is incompatible with --detach" +msgstr "" + +#: builtin/checkout.c:1721 builtin/reset.c:325 builtin/stash.c:1499 +msgid "--pathspec-from-file is incompatible with --patch" +msgstr "" + +#: builtin/checkout.c:1734 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." msgstr "git checkout: --ours/--theirs, --force and --merge нельзя использовать одновременно при применении состояния индекса." -#: builtin/checkout.c:1519 -#, c-format -msgid "" -"'%s' matched more than one remote tracking branch.\n" -"We found %d remotes with a reference that matched. So we fell back\n" -"on trying to resolve the argument as a path, but failed there too!\n" -"\n" -"If you meant to check out a remote tracking branch on, e.g. 'origin',\n" -"you can do so by fully qualifying the name with the --track option:\n" -"\n" -" git checkout --track origin/<name>\n" -"\n" -"If you'd like to always have checkouts of an ambiguous <name> prefer\n" -"one remote, e.g. the 'origin' remote, consider setting\n" -"checkout.defaultRemote=origin in your config." +#: builtin/checkout.c:1739 +msgid "you must specify path(s) to restore" msgstr "" -#: builtin/clean.c:28 +#: builtin/checkout.c:1765 builtin/checkout.c:1767 builtin/checkout.c:1816 +#: builtin/checkout.c:1818 builtin/clone.c:122 builtin/remote.c:170 +#: builtin/remote.c:172 builtin/submodule--helper.c:2719 +#: builtin/worktree.c:554 builtin/worktree.c:556 +msgid "branch" +msgstr "ветка" + +#: builtin/checkout.c:1766 +msgid "create and checkout a new branch" +msgstr "создать и переключиться на новую ветку" + +#: builtin/checkout.c:1768 +msgid "create/reset and checkout a branch" +msgstr "создать/сбросить и перключиться на новую ветку" + +#: builtin/checkout.c:1769 +msgid "create reflog for new branch" +msgstr "создать журнал ссылок для новой ветки" + +#: builtin/checkout.c:1771 +msgid "second guess 'git checkout <no-such-branch>' (default)" +msgstr "" + +#: builtin/checkout.c:1772 +msgid "use overlay mode (default)" +msgstr "" + +#: builtin/checkout.c:1817 +msgid "create and switch to a new branch" +msgstr "" + +#: builtin/checkout.c:1819 +msgid "create/reset and switch to a branch" +msgstr "" + +#: builtin/checkout.c:1821 +msgid "second guess 'git switch <no-such-branch>'" +msgstr "" + +#: builtin/checkout.c:1823 +msgid "throw away local modifications" +msgstr "" + +#: builtin/checkout.c:1857 +msgid "which tree-ish to checkout from" +msgstr "" + +#: builtin/checkout.c:1859 +msgid "restore the index" +msgstr "" + +#: builtin/checkout.c:1861 +msgid "restore the working tree (default)" +msgstr "" + +#: builtin/checkout.c:1863 +msgid "ignore unmerged entries" +msgstr "" + +#: builtin/checkout.c:1864 +msgid "use overlay mode" +msgstr "" + +#: builtin/clean.c:29 msgid "" "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." msgstr "git clean [-d] [-f] [-i] [-n] [-q] [-e <шаблон>] [-x | -X] [--] <пути>…" -#: builtin/clean.c:32 +#: builtin/clean.c:33 #, c-format msgid "Removing %s\n" msgstr "Удаление %s\n" -#: builtin/clean.c:33 +#: builtin/clean.c:34 #, c-format msgid "Would remove %s\n" msgstr "Будет удалено %s\n" -#: builtin/clean.c:34 +#: builtin/clean.c:35 #, c-format msgid "Skipping repository %s\n" msgstr "Пропуск репозитория %s\n" -#: builtin/clean.c:35 +#: builtin/clean.c:36 #, c-format msgid "Would skip repository %s\n" msgstr "Будет пропущен репозиторий %s\n" -#: builtin/clean.c:36 +#: builtin/clean.c:37 #, c-format msgid "failed to remove %s" msgstr "сбой удаления %s" -#: builtin/clean.c:299 git-add--interactive.perl:579 +#: builtin/clean.c:38 +#, c-format +msgid "could not lstat %s\n" +msgstr "" + +#: builtin/clean.c:302 git-add--interactive.perl:593 #, c-format msgid "" "Prompt help:\n" @@ -9752,7 +11430,7 @@ msgid "" " - (empty) select nothing\n" msgstr "Справка по выделению:\n1 - выбрать указанный элемент\nfoo - выбрать элемент с указанным префиксом\n - (пусто) не выбирать ничего\n" -#: builtin/clean.c:303 git-add--interactive.perl:588 +#: builtin/clean.c:306 git-add--interactive.perl:602 #, c-format msgid "" "Prompt help:\n" @@ -9765,8 +11443,8 @@ msgid "" " - (empty) finish selecting\n" msgstr "Справка по выделению:\n1 - выбрать один элемент\n3-5 - выбрать диапазон элементов\n2-3,6-9 - выбрать несколько диапазонов\nfoo - выбрать элемент с указанным префиксом\n-… - убрать выделение с указанных элементов\n* - выбрать все элементы\n - (пусто) завершить выделение\n" -#: builtin/clean.c:519 git-add--interactive.perl:554 -#: git-add--interactive.perl:559 +#: builtin/clean.c:521 git-add--interactive.perl:568 +#: git-add--interactive.perl:573 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "Хм (%s)?\n" @@ -9776,27 +11454,22 @@ msgstr "Хм (%s)?\n" msgid "Input ignore patterns>> " msgstr "Шаблоны игнорирования ввода>> " -#: builtin/clean.c:698 +#: builtin/clean.c:696 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "ПРЕДУПРЕЖДЕНИЕ: Не удалось найти элементы соответствующие: %s" -#: builtin/clean.c:719 +#: builtin/clean.c:717 msgid "Select items to delete" msgstr "Укажите элементы для удаления" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:760 +#: builtin/clean.c:758 #, c-format msgid "Remove %s [y/N]? " msgstr "Удалить %s [y - да/N - нет]? " -#: builtin/clean.c:785 git-add--interactive.perl:1717 -#, c-format -msgid "Bye.\n" -msgstr "До свидания.\n" - -#: builtin/clean.c:793 +#: builtin/clean.c:789 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -9807,15 +11480,7 @@ msgid "" "? - help for prompt selection" msgstr "clean - начать очистку\nfilter by pattern - исключить удаление элементов\nselect by numbers - исключить удаление элементов по номерам\nask each - запрашивать подтверждение на удаление каждого элемента (как «rm -i»)\nquit - прекратить очистку\nhelp - этот экран\n? - справка по выделению" -#: builtin/clean.c:820 git-add--interactive.perl:1793 -msgid "*** Commands ***" -msgstr "*** Команды ***" - -#: builtin/clean.c:821 git-add--interactive.perl:1790 -msgid "What now" -msgstr "Что теперь" - -#: builtin/clean.c:829 +#: builtin/clean.c:825 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "Удалить следующие элементы:" @@ -9823,387 +11488,406 @@ msgstr[1] "Удалить следующие элементы:" msgstr[2] "Удалить следующие элементы:" msgstr[3] "Удалить следующие элементы:" -#: builtin/clean.c:845 +#: builtin/clean.c:841 msgid "No more files to clean, exiting." msgstr "Больше нет файлов для очистки, выходим." -#: builtin/clean.c:907 +#: builtin/clean.c:903 msgid "do not print names of files removed" msgstr "не выводить имена удаляемых файлов" -#: builtin/clean.c:909 +#: builtin/clean.c:905 msgid "force" msgstr "принудительно" -#: builtin/clean.c:910 +#: builtin/clean.c:906 msgid "interactive cleaning" msgstr "интерактивная очистка" -#: builtin/clean.c:912 +#: builtin/clean.c:908 msgid "remove whole directories" msgstr "удалить каталоги полностью" -#: builtin/clean.c:913 builtin/describe.c:546 builtin/describe.c:548 -#: builtin/grep.c:897 builtin/log.c:171 builtin/log.c:173 -#: builtin/ls-files.c:557 builtin/name-rev.c:417 builtin/name-rev.c:419 +#: builtin/clean.c:909 builtin/describe.c:565 builtin/describe.c:567 +#: builtin/grep.c:921 builtin/log.c:183 builtin/log.c:185 +#: builtin/ls-files.c:558 builtin/name-rev.c:526 builtin/name-rev.c:528 #: builtin/show-ref.c:179 msgid "pattern" msgstr "шаблон" -#: builtin/clean.c:914 +#: builtin/clean.c:910 msgid "add <pattern> to ignore rules" msgstr "добавить <шаблон> в правила игнорирования" -#: builtin/clean.c:915 +#: builtin/clean.c:911 msgid "remove ignored files, too" msgstr "также удалить игнорируемые файлы" -#: builtin/clean.c:917 +#: builtin/clean.c:913 msgid "remove only ignored files" msgstr "удалить только игнорируемые файлы" -#: builtin/clean.c:935 -msgid "-x and -X cannot be used together" -msgstr "нельзя использовать одновременно -x и -X" - -#: builtin/clean.c:939 +#: builtin/clean.c:929 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to" " clean" msgstr "clean.requireForce установлен как true и ни одна из опций -i, -n или -f не указана; отказ очистки" -#: builtin/clean.c:942 +#: builtin/clean.c:932 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" msgstr "clean.requireForce установлен по умолчанию как true и ни одна из опций -i, -n или -f не указана; отказ очистки" -#: builtin/clone.c:44 +#: builtin/clean.c:944 +msgid "-x and -X cannot be used together" +msgstr "нельзя использовать одновременно -x и -X" + +#: builtin/clone.c:45 msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<опции>] [--] <репозиторий> [<каталог>]" -#: builtin/clone.c:90 +#: builtin/clone.c:94 msgid "don't create a checkout" msgstr "не переключать рабочую копию на HEAD" -#: builtin/clone.c:91 builtin/clone.c:93 builtin/init-db.c:489 +#: builtin/clone.c:95 builtin/clone.c:97 builtin/init-db.c:555 msgid "create a bare repository" msgstr "создать голый репозиторий" -#: builtin/clone.c:95 +#: builtin/clone.c:99 msgid "create a mirror repository (implies bare)" msgstr "создать зеркало репозитория (включает в себя и параметр bare)" -#: builtin/clone.c:97 +#: builtin/clone.c:101 msgid "to clone from a local repository" msgstr "для клонирования из локального репозитория" -#: builtin/clone.c:99 +#: builtin/clone.c:103 msgid "don't use local hardlinks, always copy" msgstr "не использовать жесткие ссылки, всегда копировать файлы" -#: builtin/clone.c:101 +#: builtin/clone.c:105 msgid "setup as shared repository" msgstr "настроить как общедоступный репозиторий" -#: builtin/clone.c:104 +#: builtin/clone.c:107 msgid "pathspec" msgstr "спецификатор-пути" -#: builtin/clone.c:104 +#: builtin/clone.c:107 msgid "initialize submodules in the clone" msgstr "инициализировать подмодули в клоне" -#: builtin/clone.c:107 +#: builtin/clone.c:111 msgid "number of submodules cloned in parallel" msgstr "количество подмодулей, которые будут клонированы парралельно" -#: builtin/clone.c:108 builtin/init-db.c:486 +#: builtin/clone.c:112 builtin/init-db.c:552 msgid "template-directory" msgstr "каталог-шаблонов" -#: builtin/clone.c:109 builtin/init-db.c:487 +#: builtin/clone.c:113 builtin/init-db.c:553 msgid "directory from which templates will be used" msgstr "каталог, шаблоны из которого будут использованы" -#: builtin/clone.c:111 builtin/clone.c:113 builtin/submodule--helper.c:1379 -#: builtin/submodule--helper.c:1859 +#: builtin/clone.c:115 builtin/clone.c:117 builtin/submodule--helper.c:1831 +#: builtin/submodule--helper.c:2336 msgid "reference repository" msgstr "ссылаемый репозиторий" -#: builtin/clone.c:115 builtin/submodule--helper.c:1381 -#: builtin/submodule--helper.c:1861 +#: builtin/clone.c:119 builtin/submodule--helper.c:1833 +#: builtin/submodule--helper.c:2338 msgid "use --reference only while cloning" msgstr "используйте --reference только при клонировании" -#: builtin/clone.c:116 builtin/column.c:27 builtin/merge-file.c:46 -#: builtin/pack-objects.c:3306 builtin/repack.c:329 +#: builtin/clone.c:120 builtin/column.c:27 builtin/init-db.c:563 +#: builtin/merge-file.c:46 builtin/pack-objects.c:3546 builtin/repack.c:358 msgid "name" msgstr "имя" -#: builtin/clone.c:117 +#: builtin/clone.c:121 msgid "use <name> instead of 'origin' to track upstream" msgstr "использовать <имя> вместо «origin» для отслеживания вышестоящего репозитория" -#: builtin/clone.c:119 +#: builtin/clone.c:123 msgid "checkout <branch> instead of the remote's HEAD" msgstr "переключиться на <ветку>, вместо HEAD внешнего репозитория" -#: builtin/clone.c:121 +#: builtin/clone.c:125 msgid "path to git-upload-pack on the remote" msgstr "путь к git-upload-pack на внешнем репозитории" -#: builtin/clone.c:122 builtin/fetch.c:142 builtin/grep.c:836 -#: builtin/pull.c:225 +#: builtin/clone.c:126 builtin/fetch.c:173 builtin/grep.c:860 +#: builtin/pull.c:208 msgid "depth" msgstr "глубина" -#: builtin/clone.c:123 +#: builtin/clone.c:127 msgid "create a shallow clone of that depth" msgstr "сделать частичный клон указанной глубины" -#: builtin/clone.c:124 builtin/fetch.c:144 builtin/pack-objects.c:3295 +#: builtin/clone.c:128 builtin/fetch.c:175 builtin/pack-objects.c:3535 +#: builtin/pull.c:211 msgid "time" msgstr "время" -#: builtin/clone.c:125 +#: builtin/clone.c:129 msgid "create a shallow clone since a specific time" msgstr "сделать частичный клон до определенного времени" -#: builtin/clone.c:126 builtin/fetch.c:146 builtin/fetch.c:169 -#: builtin/rebase.c:1389 +#: builtin/clone.c:130 builtin/fetch.c:177 builtin/fetch.c:200 +#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1317 msgid "revision" msgstr "редакция" -#: builtin/clone.c:127 builtin/fetch.c:147 +#: builtin/clone.c:131 builtin/fetch.c:178 builtin/pull.c:215 msgid "deepen history of shallow clone, excluding rev" msgstr "углубить историю частичного клона исключая редакцию" -#: builtin/clone.c:129 +#: builtin/clone.c:133 builtin/submodule--helper.c:1843 +#: builtin/submodule--helper.c:2352 msgid "clone only one branch, HEAD or --branch" msgstr "клонировать только одну ветку, HEAD или --branch" -#: builtin/clone.c:131 +#: builtin/clone.c:135 msgid "don't clone any tags, and make later fetches not to follow them" msgstr "не клонировать метки, а также настроить, чтобы не клонировались и в дальнейшем" -#: builtin/clone.c:133 +#: builtin/clone.c:137 msgid "any cloned submodules will be shallow" msgstr "все склонированные подмодули будут частичными клонами" -#: builtin/clone.c:134 builtin/init-db.c:495 +#: builtin/clone.c:138 builtin/init-db.c:561 msgid "gitdir" msgstr "каталог-git" -#: builtin/clone.c:135 builtin/init-db.c:496 +#: builtin/clone.c:139 builtin/init-db.c:562 msgid "separate git dir from working tree" msgstr "разместить каталог git отдельно от рабочей копии" -#: builtin/clone.c:136 +#: builtin/clone.c:140 msgid "key=value" msgstr "ключ=значение" -#: builtin/clone.c:137 +#: builtin/clone.c:141 msgid "set config inside the new repository" msgstr "установить параметры внутри нового репозитория" -#: builtin/clone.c:139 builtin/fetch.c:164 builtin/ls-remote.c:76 -#: builtin/push.c:585 builtin/send-pack.c:172 +#: builtin/clone.c:143 builtin/fetch.c:195 builtin/ls-remote.c:76 +#: builtin/pull.c:230 builtin/push.c:584 builtin/send-pack.c:196 msgid "server-specific" msgstr "зависит-от-сервера" -#: builtin/clone.c:139 builtin/fetch.c:164 builtin/ls-remote.c:76 -#: builtin/push.c:585 builtin/send-pack.c:173 +#: builtin/clone.c:143 builtin/fetch.c:195 builtin/ls-remote.c:76 +#: builtin/pull.c:231 builtin/push.c:584 builtin/send-pack.c:197 msgid "option to transmit" msgstr "передаваемые опции" -#: builtin/clone.c:140 builtin/fetch.c:165 builtin/pull.c:238 -#: builtin/push.c:586 +#: builtin/clone.c:144 builtin/fetch.c:196 builtin/pull.c:234 +#: builtin/push.c:585 msgid "use IPv4 addresses only" msgstr "использовать только IPv4 адреса" -#: builtin/clone.c:142 builtin/fetch.c:167 builtin/pull.c:241 -#: builtin/push.c:588 +#: builtin/clone.c:146 builtin/fetch.c:198 builtin/pull.c:237 +#: builtin/push.c:587 msgid "use IPv6 addresses only" msgstr "использовать только IPv6 адреса" -#: builtin/clone.c:280 +#: builtin/clone.c:150 +msgid "any cloned submodules will use their remote-tracking branch" +msgstr "" + +#: builtin/clone.c:152 +msgid "initialize sparse-checkout file to include only files at root" +msgstr "" + +#: builtin/clone.c:288 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" msgstr "Имя каталога не может быть угадано.\nУкажите имя каталога с помощью параметра командной строки" -#: builtin/clone.c:333 +#: builtin/clone.c:341 #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "информация: Не удалось добавить альтернативу для «%s»: %s\n" -#: builtin/clone.c:405 -#, c-format -msgid "failed to open '%s'" -msgstr "не удалось открыть «%s»" - -#: builtin/clone.c:413 +#: builtin/clone.c:414 #, c-format msgid "%s exists and is not a directory" msgstr "%s уже существует и не является каталогом" -#: builtin/clone.c:427 -#, c-format -msgid "failed to stat %s\n" -msgstr "не удалось выполнить stat %s\n" - -#: builtin/clone.c:444 +#: builtin/clone.c:432 #, c-format -msgid "failed to unlink '%s'" -msgstr "сбой отсоединения «%s»" +msgid "failed to start iterator over '%s'" +msgstr "" -#: builtin/clone.c:449 +#: builtin/clone.c:463 #, c-format msgid "failed to create link '%s'" msgstr "не удалось создать ссылку «%s»" -#: builtin/clone.c:453 +#: builtin/clone.c:467 #, c-format msgid "failed to copy file to '%s'" msgstr "не удалось копировать файл в «%s»" -#: builtin/clone.c:479 +#: builtin/clone.c:472 +#, c-format +msgid "failed to iterate over '%s'" +msgstr "" + +#: builtin/clone.c:499 #, c-format msgid "done.\n" msgstr "готово.\n" -#: builtin/clone.c:493 +#: builtin/clone.c:513 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" -"and retry the checkout with 'git checkout -f HEAD'\n" -msgstr "Клонирование прошло успешно, но во время переключения состояния произошла ошибка.\nС помощь команды «git status» вы можете просмотреть, какие файлы были обновлены,\nа с помощью «git checkout -f HEAD» можно повторить попытку переключения на ветку \n" +"and retry with 'git restore --source=HEAD :/'\n" +msgstr "Клонирование прошло успешно, но во время переключения на состояние произошла ошибка.\nС помощь команды «git status» вы можете просмотреть какие файлы были обновлены,\nа повторить попытку перехода на версию можно с помощью «git restore --source=HEAD :/»\n" -#: builtin/clone.c:570 +#: builtin/clone.c:590 #, c-format msgid "Could not find remote branch %s to clone." msgstr "Не удалось найти внешнюю ветку %s для клонирования." -#: builtin/clone.c:689 +#: builtin/clone.c:709 #, c-format msgid "unable to update %s" msgstr "не удалось обновить %s" -#: builtin/clone.c:739 +#: builtin/clone.c:757 +msgid "failed to initialize sparse-checkout" +msgstr "" + +#: builtin/clone.c:780 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" -msgstr "внешний HEAD ссылается на несуществующую ссылку, нельзя переключиться на такую версию.\n" +msgstr "внешний HEAD ссылается на несуществующую ссылку, нельзя переключиться на такое состояние.\n" -#: builtin/clone.c:770 +#: builtin/clone.c:812 msgid "unable to checkout working tree" msgstr "не удалось переключиться на версию в рабочем каталоге" -#: builtin/clone.c:815 +#: builtin/clone.c:887 msgid "unable to write parameters to config file" msgstr "не удалось записать параметры в файл конфигурации" -#: builtin/clone.c:878 +#: builtin/clone.c:950 msgid "cannot repack to clean up" msgstr "не удалось выполнить перепаковку для очистки" -#: builtin/clone.c:880 +#: builtin/clone.c:952 msgid "cannot unlink temporary alternates file" msgstr "не удалось отсоединить временные альтернативные файлы" -#: builtin/clone.c:920 builtin/receive-pack.c:1952 +#: builtin/clone.c:992 builtin/receive-pack.c:2493 msgid "Too many arguments." msgstr "Слишком много аргументов." -#: builtin/clone.c:924 +#: builtin/clone.c:996 msgid "You must specify a repository to clone." msgstr "Вы должны указать репозиторий для клонирования." -#: builtin/clone.c:937 +#: builtin/clone.c:1009 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "--bare и --origin %s нельзя использовать одновременно." -#: builtin/clone.c:940 +#: builtin/clone.c:1012 msgid "--bare and --separate-git-dir are incompatible." msgstr "--bare и --separate-git-dir нельзя использовать одновременно." -#: builtin/clone.c:953 +#: builtin/clone.c:1025 #, c-format msgid "repository '%s' does not exist" msgstr "репозиторий «%s» не существует" -#: builtin/clone.c:959 builtin/fetch.c:1610 +#: builtin/clone.c:1029 builtin/fetch.c:1841 #, c-format msgid "depth %s is not a positive number" msgstr "глубина %s не является положительным числом" -#: builtin/clone.c:969 +#: builtin/clone.c:1039 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "целевой путь «%s» уже существует и не является пустым каталогом." -#: builtin/clone.c:979 +#: builtin/clone.c:1045 +#, c-format +msgid "repository path '%s' already exists and is not an empty directory." +msgstr "" + +#: builtin/clone.c:1059 #, c-format msgid "working tree '%s' already exists." msgstr "рабочий каталог «%s» уже существует." -#: builtin/clone.c:994 builtin/clone.c:1015 builtin/difftool.c:264 -#: builtin/worktree.c:296 builtin/worktree.c:328 +#: builtin/clone.c:1074 builtin/clone.c:1095 builtin/difftool.c:271 +#: builtin/log.c:1987 builtin/worktree.c:354 builtin/worktree.c:386 #, c-format msgid "could not create leading directories of '%s'" msgstr "не удалось создать родительские каталоги для «%s»" -#: builtin/clone.c:999 +#: builtin/clone.c:1079 #, c-format msgid "could not create work tree dir '%s'" msgstr "не удалось создать рабочий каталог «%s»" -#: builtin/clone.c:1019 +#: builtin/clone.c:1099 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Клонирование в голый репозиторий «%s»…\n" -#: builtin/clone.c:1021 +#: builtin/clone.c:1101 #, c-format msgid "Cloning into '%s'...\n" msgstr "Клонирование в «%s»…\n" -#: builtin/clone.c:1045 +#: builtin/clone.c:1125 msgid "" "clone --recursive is not compatible with both --reference and --reference-" "if-able" msgstr "клонирование с параметром --recursive нельзя использовать одновременно ни с --reference, ни с --reference-if-able" -#: builtin/clone.c:1106 +#: builtin/clone.c:1169 builtin/remote.c:200 builtin/remote.c:705 +#, c-format +msgid "'%s' is not a valid remote name" +msgstr "«%s» не является допустимым именем внешнего репозитория." + +#: builtin/clone.c:1210 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth игнорируется на локальных клонах; вместо этого используйте file://." -#: builtin/clone.c:1108 +#: builtin/clone.c:1212 msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "--shallow-since игнорируется на локальных клонах; используйте file:// вместо этого." -#: builtin/clone.c:1110 +#: builtin/clone.c:1214 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "--shallow-exclude игнорируется на локальных клонах; используйте file:// вместо этого." -#: builtin/clone.c:1112 +#: builtin/clone.c:1216 msgid "--filter is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:1115 +#: builtin/clone.c:1219 msgid "source repository is shallow, ignoring --local" msgstr "исходный репозиторий является частичным, --local игнорируется" -#: builtin/clone.c:1120 +#: builtin/clone.c:1224 msgid "--local is ignored" msgstr "--local игнорируется" -#: builtin/clone.c:1197 builtin/clone.c:1205 +#: builtin/clone.c:1311 builtin/clone.c:1319 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Внешняя ветка %s не найдена в вышестоящем репозитории %s" -#: builtin/clone.c:1208 +#: builtin/clone.c:1322 msgid "You appear to have cloned an empty repository." msgstr "Похоже, что вы клонировали пустой репозиторий." @@ -10239,6 +11923,107 @@ msgstr "Расстояние отступа между колонками" msgid "--command must be the first argument" msgstr "параметр --command должен быть первым" +#: builtin/commit-graph.c:13 builtin/commit-graph.c:22 +msgid "" +"git commit-graph verify [--object-dir <objdir>] [--shallow] " +"[--[no-]progress]" +msgstr "" + +#: builtin/commit-graph.c:14 builtin/commit-graph.c:27 +msgid "" +"git commit-graph write [--object-dir <objdir>] [--append] " +"[--split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] " +"[--changed-paths] [--[no-]max-new-filters <n>] [--[no-]progress] <split " +"options>" +msgstr "" + +#: builtin/commit-graph.c:64 +#, c-format +msgid "could not find object directory matching %s" +msgstr "" + +#: builtin/commit-graph.c:80 builtin/commit-graph.c:210 +#: builtin/commit-graph.c:316 builtin/fetch.c:184 builtin/log.c:1769 +msgid "dir" +msgstr "каталог" + +#: builtin/commit-graph.c:81 builtin/commit-graph.c:211 +#: builtin/commit-graph.c:317 +msgid "The object directory to store the graph" +msgstr "Каталог объектов для сохранения графа" + +#: builtin/commit-graph.c:83 +msgid "if the commit-graph is split, only verify the tip file" +msgstr "" + +#: builtin/commit-graph.c:106 +#, c-format +msgid "Could not open commit-graph '%s'" +msgstr "Не удалось открыть файл commit-graph «%s»" + +#: builtin/commit-graph.c:142 +#, c-format +msgid "unrecognized --split argument, %s" +msgstr "" + +#: builtin/commit-graph.c:155 +#, c-format +msgid "unexpected non-hex object ID: %s" +msgstr "" + +#: builtin/commit-graph.c:160 +#, c-format +msgid "invalid object: %s" +msgstr "" + +#: builtin/commit-graph.c:213 +msgid "start walk at all refs" +msgstr "начать со всех ссылок" + +#: builtin/commit-graph.c:215 +msgid "scan pack-indexes listed by stdin for commits" +msgstr "искать коммиты в pack-indexes, перечисленных на стандартном вводе" + +#: builtin/commit-graph.c:217 +msgid "start walk at commits listed by stdin" +msgstr "начать с коммитов, перечисленных на стандартном вводе" + +#: builtin/commit-graph.c:219 +msgid "include all commits already in the commit-graph file" +msgstr "включить все коммиты, которые уже есть в файле commit-graph" + +#: builtin/commit-graph.c:221 +msgid "enable computation for changed paths" +msgstr "" + +#: builtin/commit-graph.c:224 +msgid "allow writing an incremental commit-graph file" +msgstr "" + +#: builtin/commit-graph.c:228 +msgid "maximum number of commits in a non-base split commit-graph" +msgstr "" + +#: builtin/commit-graph.c:230 +msgid "maximum ratio between two levels of a split commit-graph" +msgstr "" + +#: builtin/commit-graph.c:232 +msgid "only expire files older than a given date-time" +msgstr "" + +#: builtin/commit-graph.c:234 +msgid "maximum number of changed-path Bloom filters to compute" +msgstr "" + +#: builtin/commit-graph.c:255 +msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" +msgstr "используйте что-то одно из --reachable, --stdin-commits и --stdin-packs" + +#: builtin/commit-graph.c:287 +msgid "Collecting commits from input" +msgstr "" + #: builtin/commit-tree.c:18 msgid "" "git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F " @@ -10250,7 +12035,7 @@ msgstr "" msgid "duplicate parent %s ignored" msgstr "" -#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:520 +#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:555 #, c-format msgid "not a valid object name %s" msgstr "" @@ -10258,17 +12043,17 @@ msgstr "" #: builtin/commit-tree.c:93 #, c-format msgid "git commit-tree: failed to open '%s'" -msgstr "" +msgstr "git commit-tree: сбой при открытии «%s»" #: builtin/commit-tree.c:96 #, c-format msgid "git commit-tree: failed to read '%s'" -msgstr "" +msgstr "git commit-tree: сбой при чтении «%s»" #: builtin/commit-tree.c:98 #, c-format msgid "git commit-tree: failed to close '%s'" -msgstr "" +msgstr "git commit-tree: сбой при закрытии «%s»" #: builtin/commit-tree.c:111 msgid "parent" @@ -10278,32 +12063,32 @@ msgstr "" msgid "id of a parent commit object" msgstr "" -#: builtin/commit-tree.c:114 builtin/commit.c:1480 builtin/merge.c:268 -#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1473 -#: builtin/tag.c:406 +#: builtin/commit-tree.c:114 builtin/commit.c:1504 builtin/merge.c:281 +#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1470 +#: builtin/tag.c:413 msgid "message" msgstr "сообщение" -#: builtin/commit-tree.c:115 builtin/commit.c:1480 +#: builtin/commit-tree.c:115 builtin/commit.c:1504 msgid "commit message" msgstr "сообщение коммита" #: builtin/commit-tree.c:118 msgid "read commit log message from file" -msgstr "" +msgstr "прочитать сообщение коммита из файла" -#: builtin/commit-tree.c:121 builtin/commit.c:1492 builtin/merge.c:283 -#: builtin/pull.c:193 builtin/revert.c:117 +#: builtin/commit-tree.c:121 builtin/commit.c:1516 builtin/merge.c:298 +#: builtin/pull.c:176 builtin/revert.c:118 msgid "GPG sign commit" msgstr "подписать коммит с помощью GPG" #: builtin/commit-tree.c:133 msgid "must give exactly one tree" -msgstr "" +msgstr "необходимо указать одно дерево" #: builtin/commit-tree.c:140 msgid "git commit-tree: failed to read" -msgstr "" +msgstr "git commit-tree: сбой при чтении" #: builtin/commit.c:41 msgid "git commit [<options>] [--] <pathspec>..." @@ -10330,138 +12115,155 @@ msgid "" msgstr "Копируемый коммит теперь пуст, возможно после разрешения конфликтов.\nЕсли вы все равно хотите сделать пустой коммит, используйте:\n\n git commit --allow-empty\n\n" #: builtin/commit.c:63 -msgid "Otherwise, please use 'git reset'\n" -msgstr "В противном случае, используйте «git reset»\n" +msgid "Otherwise, please use 'git rebase --skip'\n" +msgstr "В противном случае, используйте «git rebase --skip»\n" #: builtin/commit.c:66 +msgid "Otherwise, please use 'git cherry-pick --skip'\n" +msgstr "" + +#: builtin/commit.c:69 msgid "" +"and then use:\n" +"\n" +" git cherry-pick --continue\n" +"\n" +"to resume cherry-picking the remaining commits.\n" "If you wish to skip this commit, use:\n" "\n" -" git reset\n" +" git cherry-pick --skip\n" "\n" -"Then \"git cherry-pick --continue\" will resume cherry-picking\n" -"the remaining commits.\n" -msgstr "Если вы хотите пропустит этот коммит, используйте команду:\n\n git reset\n\nПосле этого «git cherry-pick --continue» продолжит копирование оставшихся коммитов.\n" +msgstr "" #: builtin/commit.c:312 msgid "failed to unpack HEAD tree object" msgstr "сбой распаковки объекта дерева HEAD" -#: builtin/commit.c:353 +#: builtin/commit.c:348 +msgid "--pathspec-from-file with -a does not make sense" +msgstr "" + +#: builtin/commit.c:361 +msgid "No paths with --include/--only does not make sense." +msgstr "Указание путей каталогов с опциями --include/--only не имеет смысла." + +#: builtin/commit.c:373 msgid "unable to create temporary index" msgstr "не удалось создать временный индекс" -#: builtin/commit.c:359 +#: builtin/commit.c:382 msgid "interactive add failed" msgstr "сбой интерактивного добавления" -#: builtin/commit.c:373 +#: builtin/commit.c:397 msgid "unable to update temporary index" msgstr "не удалось обновить временный индекс" -#: builtin/commit.c:375 +#: builtin/commit.c:399 msgid "Failed to update main cache tree" msgstr "Сбой при обновлении основного кэша дерева" -#: builtin/commit.c:400 builtin/commit.c:423 builtin/commit.c:469 +#: builtin/commit.c:424 builtin/commit.c:447 builtin/commit.c:495 msgid "unable to write new_index file" msgstr "не удалось записать файл new_index" -#: builtin/commit.c:452 +#: builtin/commit.c:476 msgid "cannot do a partial commit during a merge." msgstr "нельзя создать частичный коммит во время слияния." -#: builtin/commit.c:454 +#: builtin/commit.c:478 msgid "cannot do a partial commit during a cherry-pick." msgstr "нельзя создать частичный коммит во время копирования коммита." -#: builtin/commit.c:462 +#: builtin/commit.c:480 +msgid "cannot do a partial commit during a rebase." +msgstr "" + +#: builtin/commit.c:488 msgid "cannot read the index" msgstr "не удалось прочитать индекс" -#: builtin/commit.c:481 +#: builtin/commit.c:507 msgid "unable to write temporary index file" msgstr "не удалось записать временный файл индекса" -#: builtin/commit.c:579 +#: builtin/commit.c:605 #, c-format msgid "commit '%s' lacks author header" msgstr "у коммита «%s» отсутствует автор в заголовке" -#: builtin/commit.c:581 +#: builtin/commit.c:607 #, c-format msgid "commit '%s' has malformed author line" msgstr "у коммита «%s» строка автора в неправильном формате" -#: builtin/commit.c:600 +#: builtin/commit.c:626 msgid "malformed --author parameter" msgstr "параметр --author в неправильном формате" -#: builtin/commit.c:653 +#: builtin/commit.c:679 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" msgstr "нельзя выбрать символ комментария, который\nне используется в текущем сообщении коммита" -#: builtin/commit.c:691 builtin/commit.c:724 builtin/commit.c:1069 +#: builtin/commit.c:717 builtin/commit.c:750 builtin/commit.c:1097 #, c-format msgid "could not lookup commit %s" msgstr "не удалось запросить коммит %s" -#: builtin/commit.c:703 builtin/shortlog.c:319 +#: builtin/commit.c:729 builtin/shortlog.c:425 #, c-format msgid "(reading log message from standard input)\n" msgstr "(чтение файла журнала из стандартного ввода)\n" -#: builtin/commit.c:705 +#: builtin/commit.c:731 msgid "could not read log from standard input" msgstr "не удалось прочитать файл журнала из стандартного ввода" -#: builtin/commit.c:709 +#: builtin/commit.c:735 #, c-format msgid "could not read log file '%s'" msgstr "не удалось прочитать файл журнала «%s»" -#: builtin/commit.c:740 builtin/commit.c:756 +#: builtin/commit.c:766 builtin/commit.c:782 msgid "could not read SQUASH_MSG" msgstr "не удалось прочитать SQUASH_MSG" -#: builtin/commit.c:747 +#: builtin/commit.c:773 msgid "could not read MERGE_MSG" msgstr "не удалось прочитать MERGE_MSG" -#: builtin/commit.c:807 +#: builtin/commit.c:833 msgid "could not write commit template" msgstr "не удалось записать шаблон описания коммита" -#: builtin/commit.c:826 -#, c-format +#: builtin/commit.c:853 msgid "" "\n" "It looks like you may be committing a merge.\n" -"If this is not correct, please remove the file\n" -"\t%s\n" +"If this is not correct, please run\n" +"\tgit update-ref -d MERGE_HEAD\n" "and try again.\n" -msgstr "\nПохоже, что вы пытаетесь закоммитить слияние.\nЕсли это ошибка, пожалуйста удалите файл\n\t%s\nи попробуйте снова.\n" +msgstr "" -#: builtin/commit.c:831 -#, c-format +#: builtin/commit.c:858 msgid "" "\n" "It looks like you may be committing a cherry-pick.\n" -"If this is not correct, please remove the file\n" -"\t%s\n" +"If this is not correct, please run\n" +"\tgit update-ref -d CHERRY_PICK_HEAD\n" "and try again.\n" -msgstr "\nПохоже, что вы пытаетесь закоммитить при копировании коммита.\nЕсли это не так, то удалите файл\n\t%s\nи попробуйте снова.\n" +msgstr "" -#: builtin/commit.c:844 +#: builtin/commit.c:868 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" "with '%c' will be ignored, and an empty message aborts the commit.\n" msgstr "Пожалуйста, введите сообщение коммита для ваших изменений. Строки,\nначинающиеся с «%c» будут проигнорированы, а пустое сообщение\nотменяет процесс коммита.\n" -#: builtin/commit.c:852 +#: builtin/commit.c:876 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -10469,583 +12271,541 @@ msgid "" "An empty message aborts the commit.\n" msgstr "Пожалуйста, введите сообщение коммита для ваших изменений. Строки,\nначинающиеся с «%c» будут оставлены; вы можете удалить их вручную,\nесли хотите. Пустое сообщение отменяет процесс коммита.\n" -#: builtin/commit.c:869 +#: builtin/commit.c:893 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sАвтор: %.*s <%.*s>" -#: builtin/commit.c:877 +#: builtin/commit.c:901 #, c-format msgid "%sDate: %s" msgstr "%sДата: %s" -#: builtin/commit.c:884 +#: builtin/commit.c:908 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sКоммитер: %.*s <%.*s>" -#: builtin/commit.c:902 +#: builtin/commit.c:926 msgid "Cannot read index" msgstr "Не удалось прочитать индекс" -#: builtin/commit.c:969 +#: builtin/commit.c:997 msgid "Error building trees" msgstr "Ошибка при построении деревьев" -#: builtin/commit.c:983 builtin/tag.c:269 +#: builtin/commit.c:1011 builtin/tag.c:276 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Пожалуйста, укажите сообщение, при указании опций -m или -F.\n" -#: builtin/commit.c:1027 +#: builtin/commit.c:1055 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "--author «%s» не в формате «Имя <почта>» и не совпадает с существующим автором" -#: builtin/commit.c:1041 +#: builtin/commit.c:1069 #, c-format msgid "Invalid ignored mode '%s'" msgstr "Недопустимый режим показа игнорируемых файлов «%s»" -#: builtin/commit.c:1059 builtin/commit.c:1284 +#: builtin/commit.c:1087 builtin/commit.c:1331 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Неправильный режим неотслеживаемых файлов «%s»" -#: builtin/commit.c:1097 +#: builtin/commit.c:1127 msgid "--long and -z are incompatible" msgstr "--long и -z нельзя использовать одновременно" -#: builtin/commit.c:1130 +#: builtin/commit.c:1171 msgid "Using both --reset-author and --author does not make sense" msgstr "Указание одновременно опций --reset-author и --author не имеет смысла" -#: builtin/commit.c:1139 +#: builtin/commit.c:1180 msgid "You have nothing to amend." msgstr "Нечего исправлять." -#: builtin/commit.c:1142 +#: builtin/commit.c:1183 msgid "You are in the middle of a merge -- cannot amend." msgstr "Вы в процессе слияния — сейчас нельзя исправлять." -#: builtin/commit.c:1144 +#: builtin/commit.c:1185 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "Вы в процессе копирования коммита — сейчас нельзя исправлять." -#: builtin/commit.c:1147 +#: builtin/commit.c:1187 +msgid "You are in the middle of a rebase -- cannot amend." +msgstr "" + +#: builtin/commit.c:1190 msgid "Options --squash and --fixup cannot be used together" msgstr "Опции --squash и --fixup не могут использоваться одновременно" -#: builtin/commit.c:1157 +#: builtin/commit.c:1200 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "Может использоваться только одна из опций -c/-C/-F/--fixup." -#: builtin/commit.c:1159 +#: builtin/commit.c:1202 msgid "Option -m cannot be combined with -c/-C/-F." msgstr "" -#: builtin/commit.c:1167 +#: builtin/commit.c:1211 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author может использоваться только одновременно с опциями -C, -c или --amend." -#: builtin/commit.c:1184 +#: builtin/commit.c:1229 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "Может использоваться только одна из опций --include/--only/--all/--interactive/--patch." -#: builtin/commit.c:1186 -msgid "No paths with --include/--only does not make sense." -msgstr "Указание путей каталогов с опциями --include/--only не имеет смысла." - -#: builtin/commit.c:1192 +#: builtin/commit.c:1235 #, c-format msgid "paths '%s ...' with -a does not make sense" msgstr "" -#: builtin/commit.c:1319 builtin/commit.c:1503 +#: builtin/commit.c:1366 builtin/commit.c:1527 msgid "show status concisely" msgstr "кратко показать статус" -#: builtin/commit.c:1321 builtin/commit.c:1505 +#: builtin/commit.c:1368 builtin/commit.c:1529 msgid "show branch information" msgstr "показать информацию о версии" -#: builtin/commit.c:1323 +#: builtin/commit.c:1370 msgid "show stash information" msgstr "показать информацию о спрятанном" -#: builtin/commit.c:1325 builtin/commit.c:1507 +#: builtin/commit.c:1372 builtin/commit.c:1531 msgid "compute full ahead/behind values" msgstr "" -#: builtin/commit.c:1327 +#: builtin/commit.c:1374 msgid "version" msgstr "версия" -#: builtin/commit.c:1327 builtin/commit.c:1509 builtin/push.c:561 -#: builtin/worktree.c:643 +#: builtin/commit.c:1374 builtin/commit.c:1533 builtin/push.c:560 +#: builtin/worktree.c:725 msgid "machine-readable output" msgstr "машиночитаемый вывод" -#: builtin/commit.c:1330 builtin/commit.c:1511 +#: builtin/commit.c:1377 builtin/commit.c:1535 msgid "show status in long format (default)" msgstr "показать статус в длинном формате (по умолчанию)" -#: builtin/commit.c:1333 builtin/commit.c:1514 +#: builtin/commit.c:1380 builtin/commit.c:1538 msgid "terminate entries with NUL" msgstr "завершать записи НУЛЕВЫМ байтом" -#: builtin/commit.c:1335 builtin/commit.c:1339 builtin/commit.c:1517 -#: builtin/fast-export.c:1085 builtin/fast-export.c:1088 builtin/rebase.c:1465 -#: parse-options.h:331 +#: builtin/commit.c:1382 builtin/commit.c:1386 builtin/commit.c:1541 +#: builtin/fast-export.c:1198 builtin/fast-export.c:1201 +#: builtin/fast-export.c:1204 builtin/rebase.c:1406 parse-options.h:336 msgid "mode" msgstr "режим" -#: builtin/commit.c:1336 builtin/commit.c:1517 +#: builtin/commit.c:1383 builtin/commit.c:1541 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "показать неотслеживаемые файлы, опциональные режимы: all (все), normal (как обычно), no (нет). (По умолчанию: all)" -#: builtin/commit.c:1340 +#: builtin/commit.c:1387 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" msgstr "показывать игнорируемые файлы, с опциональным режимом: traditional (традиционный), matching (только совпадающие), no (не показывать). (По умолчанию: traditional)" -#: builtin/commit.c:1342 parse-options.h:179 +#: builtin/commit.c:1389 parse-options.h:192 msgid "when" msgstr "когда" -#: builtin/commit.c:1343 +#: builtin/commit.c:1390 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "игнорировать изменения в подмодулях, опционально когда: all (всегда), dirty (изменённые), untracked (неотслеживаемые). (По умолчанию: all)" -#: builtin/commit.c:1345 +#: builtin/commit.c:1392 msgid "list untracked files in columns" msgstr "показать неотслеживаемые файлы по столбцам" -#: builtin/commit.c:1346 +#: builtin/commit.c:1393 msgid "do not detect renames" msgstr "не определять переименования" -#: builtin/commit.c:1348 +#: builtin/commit.c:1395 msgid "detect renames, optionally set similarity index" msgstr "определять переименования, опционально устанавливать рейтинг сходства" -#: builtin/commit.c:1368 +#: builtin/commit.c:1415 msgid "Unsupported combination of ignored and untracked-files arguments" msgstr "Неподдерживаемая комбинация аргументов отображения игнорируемых и неотслеживаемых файлов" -#: builtin/commit.c:1473 +#: builtin/commit.c:1497 msgid "suppress summary after successful commit" msgstr "не выводить сводку изменений после успешного коммита" -#: builtin/commit.c:1474 +#: builtin/commit.c:1498 msgid "show diff in commit message template" msgstr "добавить список изменений в шаблон сообщения коммита" -#: builtin/commit.c:1476 +#: builtin/commit.c:1500 msgid "Commit message options" msgstr "Опции сообщения коммита" -#: builtin/commit.c:1477 builtin/merge.c:272 builtin/tag.c:408 +#: builtin/commit.c:1501 builtin/merge.c:285 builtin/tag.c:415 msgid "read message from file" msgstr "прочитать сообщение из файла" -#: builtin/commit.c:1478 +#: builtin/commit.c:1502 msgid "author" msgstr "автор" -#: builtin/commit.c:1478 +#: builtin/commit.c:1502 msgid "override author for commit" msgstr "подменить автора коммита" -#: builtin/commit.c:1479 builtin/gc.c:539 +#: builtin/commit.c:1503 builtin/gc.c:542 msgid "date" msgstr "дата" -#: builtin/commit.c:1479 +#: builtin/commit.c:1503 msgid "override date for commit" msgstr "подменить дату коммита" -#: builtin/commit.c:1481 builtin/commit.c:1482 builtin/commit.c:1483 -#: builtin/commit.c:1484 parse-options.h:323 ref-filter.h:92 +#: builtin/commit.c:1505 builtin/commit.c:1506 builtin/commit.c:1507 +#: builtin/commit.c:1508 parse-options.h:328 ref-filter.h:87 msgid "commit" msgstr "коммит" -#: builtin/commit.c:1481 +#: builtin/commit.c:1505 msgid "reuse and edit message from specified commit" msgstr "использовать и отредактировать сообщение от указанного коммита" -#: builtin/commit.c:1482 +#: builtin/commit.c:1506 msgid "reuse message from specified commit" msgstr "использовать сообщение указанного коммита" -#: builtin/commit.c:1483 +#: builtin/commit.c:1507 msgid "use autosquash formatted message to fixup specified commit" msgstr "использовать форматированное сообщение автоуплотнения для исправления указанного коммита" -#: builtin/commit.c:1484 +#: builtin/commit.c:1508 msgid "use autosquash formatted message to squash specified commit" msgstr "использовать форматированное сообщение автоуплотнения для уплотнения указанного коммита" -#: builtin/commit.c:1485 +#: builtin/commit.c:1509 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "коммит теперь за моим авторством (используется с -C/-c/--amend)" -#: builtin/commit.c:1486 builtin/log.c:1541 builtin/merge.c:285 -#: builtin/pull.c:162 builtin/revert.c:109 -msgid "add Signed-off-by:" -msgstr "добавить Signed-off-by:" +#: builtin/commit.c:1510 builtin/log.c:1744 builtin/merge.c:301 +#: builtin/pull.c:145 builtin/revert.c:110 +msgid "add a Signed-off-by trailer" +msgstr "" -#: builtin/commit.c:1487 +#: builtin/commit.c:1511 msgid "use specified template file" msgstr "использовать указанный файл шаблона" -#: builtin/commit.c:1488 +#: builtin/commit.c:1512 msgid "force edit of commit" msgstr "принудительно редактировать коммит" -#: builtin/commit.c:1490 +#: builtin/commit.c:1514 msgid "include status in commit message template" msgstr "включить статус файлов в шаблон сообщения коммита" -#: builtin/commit.c:1495 +#: builtin/commit.c:1519 msgid "Commit contents options" msgstr "Опции содержимого коммита" -#: builtin/commit.c:1496 +#: builtin/commit.c:1520 msgid "commit all changed files" msgstr "закоммитить все измененные файлы" -#: builtin/commit.c:1497 +#: builtin/commit.c:1521 msgid "add specified files to index for commit" msgstr "добавить указанные файлы в индекс для коммита" -#: builtin/commit.c:1498 +#: builtin/commit.c:1522 msgid "interactively add files" msgstr "интерактивное добавление файлов" -#: builtin/commit.c:1499 +#: builtin/commit.c:1523 msgid "interactively add changes" msgstr "интерактивное добавление изменений" -#: builtin/commit.c:1500 +#: builtin/commit.c:1524 msgid "commit only specified files" msgstr "закоммитить только указанные файлы" -#: builtin/commit.c:1501 +#: builtin/commit.c:1525 msgid "bypass pre-commit and commit-msg hooks" msgstr "пропустить перехватчик pre-commit и commit-msg" -#: builtin/commit.c:1502 +#: builtin/commit.c:1526 msgid "show what would be committed" msgstr "показать, что будет закоммичено" -#: builtin/commit.c:1515 +#: builtin/commit.c:1539 msgid "amend previous commit" msgstr "исправить предыдущий коммит" -#: builtin/commit.c:1516 +#: builtin/commit.c:1540 msgid "bypass post-rewrite hook" msgstr "пропустить перехватчик post-rewrite" -#: builtin/commit.c:1521 +#: builtin/commit.c:1547 msgid "ok to record an empty change" msgstr "разрешить запись пустого коммита" -#: builtin/commit.c:1523 +#: builtin/commit.c:1549 msgid "ok to record a change with an empty message" msgstr "разрешить запись изменений с пустым сообщением" -#: builtin/commit.c:1596 +#: builtin/commit.c:1622 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Файл MERGE_HEAD поврежден (%s)" -#: builtin/commit.c:1603 +#: builtin/commit.c:1629 msgid "could not read MERGE_MODE" msgstr "не удалось прочитать MERGE_MODE" -#: builtin/commit.c:1622 +#: builtin/commit.c:1650 #, c-format msgid "could not read commit message: %s" msgstr "не удалось открыть сообщение коммита: %s" -#: builtin/commit.c:1629 +#: builtin/commit.c:1657 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Отмена коммита из-за пустого сообщения коммита.\n" -#: builtin/commit.c:1634 +#: builtin/commit.c:1662 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "Отмена коммита; вы не изменили сообщение.\n" -#: builtin/commit.c:1668 +#: builtin/commit.c:1696 msgid "" "repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" -"not exceeded, and then \"git reset HEAD\" to recover." -msgstr "репозиторий был обновлен, но не удалось записать файл new_index. Удостоверьтесь, что на диске есть свободное место и квота не исчерпана, а после этого запустите «git reset HEAD» для восстановления." - -#: builtin/commit-graph.c:10 -msgid "git commit-graph [--object-dir <objdir>]" -msgstr "git commit-graph [--object-dir <каталог-объектов>]" - -#: builtin/commit-graph.c:11 builtin/commit-graph.c:23 -msgid "git commit-graph read [--object-dir <objdir>]" -msgstr "git commit-graph read [--object-dir <каталог-объектов>]" - -#: builtin/commit-graph.c:12 builtin/commit-graph.c:18 -msgid "git commit-graph verify [--object-dir <objdir>]" -msgstr "git commit-graph verify [--object-dir <каталог-объектов>]" - -#: builtin/commit-graph.c:13 builtin/commit-graph.c:28 -msgid "" -"git commit-graph write [--object-dir <objdir>] [--append] [--reachable" -"|--stdin-packs|--stdin-commits]" -msgstr "git commit-graph write [--object-dir <каталог-объектов>] [--append] [--reachable|--stdin-packs|--stdin-commits]" - -#: builtin/commit-graph.c:51 builtin/commit-graph.c:89 -#: builtin/commit-graph.c:147 builtin/commit-graph.c:205 builtin/fetch.c:153 -#: builtin/log.c:1561 -msgid "dir" -msgstr "каталог" - -#: builtin/commit-graph.c:52 builtin/commit-graph.c:90 -#: builtin/commit-graph.c:148 builtin/commit-graph.c:206 -msgid "The object directory to store the graph" -msgstr "Каталог объектов для сохранения графа" - -#: builtin/commit-graph.c:68 builtin/commit-graph.c:105 -#, c-format -msgid "Could not open commit-graph '%s'" -msgstr "Не удалось открыть файл commit-graph «%s»" - -#: builtin/commit-graph.c:150 -msgid "start walk at all refs" -msgstr "начать со всех ссылок" - -#: builtin/commit-graph.c:152 -msgid "scan pack-indexes listed by stdin for commits" -msgstr "искать коммиты в pack-indexes, перечисленных на стандартном вводе" - -#: builtin/commit-graph.c:154 -msgid "start walk at commits listed by stdin" -msgstr "начать с коммитов, перечисленных на стандартном вводе" - -#: builtin/commit-graph.c:156 -msgid "include all commits already in the commit-graph file" -msgstr "включить все коммиты, которые уже есть в файле commit-graph" - -#: builtin/commit-graph.c:165 -msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" -msgstr "используйте что-то одно из --reachable, --stdin-commits и --stdin-packs" +"not exceeded, and then \"git restore --staged :/\" to recover." +msgstr "репозиторий был обновлен, но не удалось записать файл new_index. Удостоверьтесь, что на диске есть свободное место и квота не исчерпана, а после этого запустите «git restore --staged :/» для восстановления." #: builtin/config.c:11 msgid "git config [<options>]" msgstr "git config [<опции>]" -#: builtin/config.c:103 +#: builtin/config.c:109 builtin/env--helper.c:27 #, c-format msgid "unrecognized --type argument, %s" msgstr "" -#: builtin/config.c:115 +#: builtin/config.c:121 msgid "only one type at a time" msgstr "" -#: builtin/config.c:124 +#: builtin/config.c:130 msgid "Config file location" msgstr "Размещение файла конфигурации" -#: builtin/config.c:125 +#: builtin/config.c:131 msgid "use global config file" msgstr "использовать глобальный файл конфигурации" -#: builtin/config.c:126 +#: builtin/config.c:132 msgid "use system config file" msgstr "использовать системный файл конфигурации" -#: builtin/config.c:127 +#: builtin/config.c:133 msgid "use repository config file" msgstr "использовать файл конфигурации репозитория" -#: builtin/config.c:128 +#: builtin/config.c:134 msgid "use per-worktree config file" msgstr "" -#: builtin/config.c:129 +#: builtin/config.c:135 msgid "use given config file" msgstr "использовать указанный файл конфигурации" -#: builtin/config.c:130 +#: builtin/config.c:136 msgid "blob-id" msgstr "идент-двоичн-объекта" -#: builtin/config.c:130 +#: builtin/config.c:136 msgid "read config from given blob object" msgstr "прочитать настройки из указанного двоичного объекта" -#: builtin/config.c:131 +#: builtin/config.c:137 msgid "Action" msgstr "Действие" -#: builtin/config.c:132 -msgid "get value: name [value-regex]" -msgstr "получить значение: имя [шаблон-значений]" +#: builtin/config.c:138 +msgid "get value: name [value-pattern]" +msgstr "" -#: builtin/config.c:133 -msgid "get all values: key [value-regex]" -msgstr "получить все значения: ключ [шаблон-значений]" +#: builtin/config.c:139 +msgid "get all values: key [value-pattern]" +msgstr "" -#: builtin/config.c:134 -msgid "get values for regexp: name-regex [value-regex]" -msgstr "получить значения по шаблону: шаблон-имен [шаблон-значений]" +#: builtin/config.c:140 +msgid "get values for regexp: name-regex [value-pattern]" +msgstr "" -#: builtin/config.c:135 +#: builtin/config.c:141 msgid "get value specific for the URL: section[.var] URL" msgstr "получить значение, специфичное для URL: раздел[.переменная] URL" -#: builtin/config.c:136 -msgid "replace all matching variables: name value [value_regex]" -msgstr "заменить все соответствующие переменные: имя значение [шаблон-значений]" +#: builtin/config.c:142 +msgid "replace all matching variables: name value [value-pattern]" +msgstr "" -#: builtin/config.c:137 +#: builtin/config.c:143 msgid "add a new variable: name value" msgstr "добавить новую переменную: имя значение" -#: builtin/config.c:138 -msgid "remove a variable: name [value-regex]" -msgstr "удалить переменную: имя [шаблон-значений]" +#: builtin/config.c:144 +msgid "remove a variable: name [value-pattern]" +msgstr "" -#: builtin/config.c:139 -msgid "remove all matches: name [value-regex]" -msgstr "удалить все совпадающие: имя [шаблон-значений]" +#: builtin/config.c:145 +msgid "remove all matches: name [value-pattern]" +msgstr "" -#: builtin/config.c:140 +#: builtin/config.c:146 msgid "rename section: old-name new-name" msgstr "переименовать раздел: старое-имя новое-имя" -#: builtin/config.c:141 +#: builtin/config.c:147 msgid "remove a section: name" msgstr "удалить раздел: имя" -#: builtin/config.c:142 +#: builtin/config.c:148 msgid "list all" msgstr "показать весь список" -#: builtin/config.c:143 +#: builtin/config.c:149 +msgid "use string equality when comparing values to 'value-pattern'" +msgstr "" + +#: builtin/config.c:150 msgid "open an editor" msgstr "открыть в редакторе" -#: builtin/config.c:144 +#: builtin/config.c:151 msgid "find the color configured: slot [default]" msgstr "найти настроенный цвет: раздел [по-умолчанию]" -#: builtin/config.c:145 +#: builtin/config.c:152 msgid "find the color setting: slot [stdout-is-tty]" msgstr "проверить, существует ли настроенный цвет: раздел [stdout-есть-tty]" -#: builtin/config.c:146 +#: builtin/config.c:153 msgid "Type" msgstr "Тип" -#: builtin/config.c:147 +#: builtin/config.c:154 builtin/env--helper.c:43 msgid "value is given this type" msgstr "" -#: builtin/config.c:148 +#: builtin/config.c:155 msgid "value is \"true\" or \"false\"" msgstr "значение — это «true» (правда) или «false» (ложь)" -#: builtin/config.c:149 +#: builtin/config.c:156 msgid "value is decimal number" msgstr "значение — это десятичное число" -#: builtin/config.c:150 +#: builtin/config.c:157 msgid "value is --bool or --int" msgstr "значение — это --bool или --int" -#: builtin/config.c:151 +#: builtin/config.c:158 +msgid "value is --bool or string" +msgstr "" + +#: builtin/config.c:159 msgid "value is a path (file or directory name)" msgstr "значение — это путь (к файлу или каталогу)" -#: builtin/config.c:152 +#: builtin/config.c:160 msgid "value is an expiry date" msgstr "значение - это дата окончания срока действия" -#: builtin/config.c:153 +#: builtin/config.c:161 msgid "Other" msgstr "Другое" -#: builtin/config.c:154 +#: builtin/config.c:162 msgid "terminate values with NUL byte" msgstr "завершать значения НУЛЕВЫМ байтом" -#: builtin/config.c:155 +#: builtin/config.c:163 msgid "show variable names only" msgstr "показывать только имена переменных" -#: builtin/config.c:156 +#: builtin/config.c:164 msgid "respect include directives on lookup" msgstr "учитывать директивы include (включения файлов) при запросе" -#: builtin/config.c:157 +#: builtin/config.c:165 msgid "show origin of config (file, standard input, blob, command line)" msgstr "показать источник настройки (файл, стандартный ввод, двоичный объект, командная строка)" -#: builtin/config.c:158 +#: builtin/config.c:166 +msgid "show scope of config (worktree, local, global, system, command)" +msgstr "" + +#: builtin/config.c:167 builtin/env--helper.c:45 msgid "value" msgstr "" -#: builtin/config.c:158 +#: builtin/config.c:167 msgid "with --get, use default value when missing entry" msgstr "" -#: builtin/config.c:172 +#: builtin/config.c:181 #, c-format msgid "wrong number of arguments, should be %d" msgstr "" -#: builtin/config.c:174 +#: builtin/config.c:183 #, c-format msgid "wrong number of arguments, should be from %d to %d" msgstr "" -#: builtin/config.c:308 +#: builtin/config.c:339 #, c-format msgid "invalid key pattern: %s" msgstr "" -#: builtin/config.c:344 +#: builtin/config.c:377 #, c-format msgid "failed to format default config value: %s" msgstr "" -#: builtin/config.c:401 +#: builtin/config.c:441 #, c-format msgid "cannot parse color '%s'" msgstr "" -#: builtin/config.c:443 +#: builtin/config.c:483 msgid "unable to parse default color value" msgstr "не удалось разобрать значение цвета по умолчанию" -#: builtin/config.c:496 builtin/config.c:742 +#: builtin/config.c:536 builtin/config.c:833 msgid "not in a git directory" msgstr "" -#: builtin/config.c:499 +#: builtin/config.c:539 msgid "writing to stdin is not supported" msgstr "" -#: builtin/config.c:502 +#: builtin/config.c:542 msgid "writing config blobs is not supported" msgstr "" -#: builtin/config.c:587 +#: builtin/config.c:627 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -11055,81 +12815,89 @@ msgid "" "#\temail = %s\n" msgstr "# Это файл конфигурации пользователя Git.\n[user]\n# Пожалуйста, адаптируйте и раскомментируйте следующие строки:\n#\tuser = %s\n#\temail = %s\n" -#: builtin/config.c:611 +#: builtin/config.c:652 msgid "only one config file at a time" msgstr "" -#: builtin/config.c:616 +#: builtin/config.c:658 msgid "--local can only be used inside a git repository" msgstr "--local можно использовать только внутри git репозитория" -#: builtin/config.c:619 +#: builtin/config.c:660 msgid "--blob can only be used inside a git repository" msgstr "" -#: builtin/config.c:638 +#: builtin/config.c:662 +msgid "--worktree can only be used inside a git repository" +msgstr "" + +#: builtin/config.c:684 msgid "$HOME not set" msgstr "" -#: builtin/config.c:658 +#: builtin/config.c:708 msgid "" "--worktree cannot be used with multiple working trees unless the config\n" "extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n" "section in \"git help worktree\" for details" msgstr "" -#: builtin/config.c:688 +#: builtin/config.c:743 msgid "--get-color and variable type are incoherent" msgstr "" -#: builtin/config.c:693 +#: builtin/config.c:748 msgid "only one action at a time" msgstr "" -#: builtin/config.c:706 +#: builtin/config.c:761 msgid "--name-only is only applicable to --list or --get-regexp" msgstr "" -#: builtin/config.c:712 +#: builtin/config.c:767 msgid "" "--show-origin is only applicable to --get, --get-all, --get-regexp, and " "--list" msgstr "" -#: builtin/config.c:718 +#: builtin/config.c:773 msgid "--default is only applicable to --get" msgstr "" -#: builtin/config.c:731 +#: builtin/config.c:806 +msgid "--fixed-value only applies with 'value-pattern'" +msgstr "" + +#: builtin/config.c:822 #, c-format msgid "unable to read config file '%s'" msgstr "" -#: builtin/config.c:734 +#: builtin/config.c:825 msgid "error processing config file(s)" msgstr "" -#: builtin/config.c:744 +#: builtin/config.c:835 msgid "editing stdin is not supported" msgstr "" -#: builtin/config.c:746 +#: builtin/config.c:837 msgid "editing blobs is not supported" msgstr "" -#: builtin/config.c:760 +#: builtin/config.c:851 #, c-format msgid "cannot create configuration file %s" msgstr "не удалось создать файл конфигурации %s" -#: builtin/config.c:773 +#: builtin/config.c:864 #, c-format msgid "" "cannot overwrite multiple values with a single value\n" " Use a regexp, --add or --replace-all to change %s." msgstr "нельзя перезаписать несколько значений одним\n Используйте регулярные выражения, параметры --add или --replace-all, чтобы изменить %s." -#: builtin/config.c:847 builtin/config.c:858 +#: builtin/config.c:943 builtin/config.c:954 #, c-format msgid "no such section: %s" msgstr "" @@ -11142,11 +12910,37 @@ msgstr "git count-objects [-v] [-H | --human-readable]" msgid "print sizes in human readable format" msgstr "вывод размеров в удобочитаемом для человека виде" -#: builtin/describe.c:27 +#: builtin/credential-cache--daemon.c:226 +#, c-format +msgid "" +"The permissions on your socket directory are too loose; other\n" +"users may be able to read your cached credentials. Consider running:\n" +"\n" +"\tchmod 0700 %s" +msgstr "Права доступа к вашему каталогу сокетов слишком свободны; друге пользователи могуи читать ваши закэшированные пароли доступа. Обдумайте запуск команды:\n\n\tchmod 0700 %s" + +#: builtin/credential-cache--daemon.c:275 +msgid "print debugging messages to stderr" +msgstr "вывод отладочных сообщений на stderr" + +#: builtin/credential-cache--daemon.c:315 +msgid "credential-cache--daemon unavailable; no unix socket support" +msgstr "" + +#: builtin/credential-cache.c:154 +msgid "credential-cache unavailable; no unix socket support" +msgstr "" + +#: builtin/credential-store.c:66 +#, c-format +msgid "unable to get credential storage lock in %d ms" +msgstr "" + +#: builtin/describe.c:26 msgid "git describe [<options>] [<commit-ish>...]" msgstr "git describe [<опции>] [<указатель-коммита>…]" -#: builtin/describe.c:28 +#: builtin/describe.c:27 msgid "git describe [<options>] --dirty" msgstr "git describe [<опции>] --dirty" @@ -11162,659 +12956,840 @@ msgstr "легковесный" msgid "annotated" msgstr "аннотированный" -#: builtin/describe.c:273 +#: builtin/describe.c:277 #, c-format msgid "annotated tag %s not available" msgstr "аннотированная метка %s не доступна" -#: builtin/describe.c:277 -#, c-format -msgid "annotated tag %s has no embedded name" -msgstr "аннотированная метка %s не содержит встроенного названия" - -#: builtin/describe.c:279 +#: builtin/describe.c:281 #, c-format -msgid "tag '%s' is really '%s' here" -msgstr "метка «%s» уже здесь «%s»" +msgid "tag '%s' is externally known as '%s'" +msgstr "" -#: builtin/describe.c:323 +#: builtin/describe.c:328 #, c-format msgid "no tag exactly matches '%s'" msgstr "нет меток, точно соответствующих «%s»" -#: builtin/describe.c:325 +#: builtin/describe.c:330 #, c-format msgid "No exact match on refs or tags, searching to describe\n" msgstr "Нет точных совпадений по ссылкам или тегам, ищу описания\n" -#: builtin/describe.c:379 +#: builtin/describe.c:397 #, c-format msgid "finished search at %s\n" msgstr "поиск окончен на %s\n" -#: builtin/describe.c:405 +#: builtin/describe.c:424 #, c-format msgid "" "No annotated tags can describe '%s'.\n" "However, there were unannotated tags: try --tags." msgstr "Нет аннотированных меток, которые могут описать «%s».\nНо имеются неаннотированные метки: попробуйте добавить параметр --tags." -#: builtin/describe.c:409 +#: builtin/describe.c:428 #, c-format msgid "" "No tags can describe '%s'.\n" "Try --always, or create some tags." msgstr "Нет меток, которые могут описать «%s….\nПопробуйте добавить параметр --always или создать какие-нибудь метки." -#: builtin/describe.c:439 +#: builtin/describe.c:458 #, c-format msgid "traversed %lu commits\n" msgstr "посещено %lu коммитов\n" -#: builtin/describe.c:442 +#: builtin/describe.c:461 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" "gave up search at %s\n" msgstr "более %i меток найдено; показано последние %i\nостановлен поиск после %s\n" -#: builtin/describe.c:510 +#: builtin/describe.c:529 #, c-format msgid "describe %s\n" msgstr "описать %s\n" -#: builtin/describe.c:513 +#: builtin/describe.c:532 #, c-format msgid "Not a valid object name %s" msgstr "Недопустимое имя объекта %s" -#: builtin/describe.c:521 +#: builtin/describe.c:540 #, c-format msgid "%s is neither a commit nor blob" msgstr "%s не является коммитом или двоичным объектом" -#: builtin/describe.c:535 +#: builtin/describe.c:554 msgid "find the tag that comes after the commit" msgstr "поиск метки, которая идет после коммита" -#: builtin/describe.c:536 +#: builtin/describe.c:555 msgid "debug search strategy on stderr" msgstr "вывод отладочной информации стратегии поиска на стандартный вывод" -#: builtin/describe.c:537 +#: builtin/describe.c:556 msgid "use any ref" msgstr "использовать любую ссылку" -#: builtin/describe.c:538 +#: builtin/describe.c:557 msgid "use any tag, even unannotated" msgstr "использовать любую метку, даже неаннотированную" -#: builtin/describe.c:539 +#: builtin/describe.c:558 msgid "always use long format" msgstr "всегда использовать длинный формат вывода" -#: builtin/describe.c:540 +#: builtin/describe.c:559 msgid "only follow first parent" msgstr "следовать только за первым родителем" -#: builtin/describe.c:543 +#: builtin/describe.c:562 msgid "only output exact matches" msgstr "выводить только точные совпадения" -#: builtin/describe.c:545 +#: builtin/describe.c:564 msgid "consider <n> most recent tags (default: 10)" msgstr "рассматривать последние <n> меток (по умолчанию: 10)" -#: builtin/describe.c:547 +#: builtin/describe.c:566 msgid "only consider tags matching <pattern>" msgstr "рассматривать только метки по <шаблону>" -#: builtin/describe.c:549 +#: builtin/describe.c:568 msgid "do not consider tags matching <pattern>" msgstr "не учитывать метки, которые соответствуют <шаблону>" -#: builtin/describe.c:551 builtin/name-rev.c:426 +#: builtin/describe.c:570 builtin/name-rev.c:535 msgid "show abbreviated commit object as fallback" msgstr "если не найдено, показать сокращенный номер редакции коммита" -#: builtin/describe.c:552 builtin/describe.c:555 +#: builtin/describe.c:571 builtin/describe.c:574 msgid "mark" msgstr "пометка" -#: builtin/describe.c:553 +#: builtin/describe.c:572 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "добавить <пометку> при изменённом рабочем каталоге (по умолчанию: «-dirty»)" -#: builtin/describe.c:556 +#: builtin/describe.c:575 msgid "append <mark> on broken working tree (default: \"-broken\")" msgstr "добавить <пометку> на повреждённое рабочее дерево (по умолчанию: «-broken»)" -#: builtin/describe.c:574 +#: builtin/describe.c:593 msgid "--long is incompatible with --abbrev=0" msgstr "--long несовместимо с --abbrev=0" -#: builtin/describe.c:603 +#: builtin/describe.c:622 msgid "No names found, cannot describe anything." msgstr "Имена не найдены, не могу ничего описать." -#: builtin/describe.c:654 +#: builtin/describe.c:673 msgid "--dirty is incompatible with commit-ishes" msgstr "--dirty несовместимо с указанием указателей коммитов" -#: builtin/describe.c:656 +#: builtin/describe.c:675 msgid "--broken is incompatible with commit-ishes" msgstr "--broken несовместимо с указанием указателей коммитов" -#: builtin/diff.c:84 +#: builtin/diff-tree.c:155 +msgid "--stdin and --merge-base are mutually exclusive" +msgstr "" + +#: builtin/diff-tree.c:157 +msgid "--merge-base only works with two commits" +msgstr "" + +#: builtin/diff.c:91 #, c-format msgid "'%s': not a regular file or symlink" msgstr "«%s»: не является обычным файлом или символьной ссылкой" -#: builtin/diff.c:235 +#: builtin/diff.c:258 #, c-format msgid "invalid option: %s" msgstr "неправильный параметр: %s" -#: builtin/diff.c:350 +#: builtin/diff.c:375 +#, c-format +msgid "%s...%s: no merge base" +msgstr "" + +#: builtin/diff.c:485 msgid "Not a git repository" msgstr "Не найден git репозиторий" -#: builtin/diff.c:394 +#: builtin/diff.c:530 builtin/grep.c:681 #, c-format msgid "invalid object '%s' given." msgstr "передан неправильный объект «%s»." -#: builtin/diff.c:403 +#: builtin/diff.c:541 #, c-format msgid "more than two blobs given: '%s'" msgstr "передано больше двух двоичных объектов: «%s»" -#: builtin/diff.c:408 +#: builtin/diff.c:546 #, c-format msgid "unhandled object '%s' given." msgstr "передан необработанный объект «%s»." +#: builtin/diff.c:580 +#, c-format +msgid "%s...%s: multiple merge bases, using %s" +msgstr "" + #: builtin/difftool.c:30 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" msgstr "git difftool [<опции>] [<коммит> [<коммит>]] [--] [<путь>…]" -#: builtin/difftool.c:253 +#: builtin/difftool.c:260 #, c-format msgid "failed: %d" msgstr "сбой: %d" -#: builtin/difftool.c:295 +#: builtin/difftool.c:302 #, c-format msgid "could not read symlink %s" msgstr "не удалось прочитать символьную ссылку %s" -#: builtin/difftool.c:297 +#: builtin/difftool.c:304 #, c-format msgid "could not read symlink file %s" msgstr "не удалось прочитать файл символьной ссылки %s" -#: builtin/difftool.c:305 +#: builtin/difftool.c:312 #, c-format msgid "could not read object %s for symlink %s" msgstr "не удалось прочитать объект %s для символьной ссылки %s" -#: builtin/difftool.c:406 +#: builtin/difftool.c:412 msgid "" "combined diff formats('-c' and '--cc') are not supported in\n" "directory diff mode('-d' and '--dir-diff')." msgstr "комбинированные форматы файлов списка изменений(«-c» и «--cc») не поддерживаются в режиме сравнения каталогов(«-d» и «--dir-diff»)." -#: builtin/difftool.c:626 +#: builtin/difftool.c:633 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "оба файла изменены: «%s» и «%s»." -#: builtin/difftool.c:628 +#: builtin/difftool.c:635 msgid "working tree file has been left." msgstr "рабочий каталог был покинут." -#: builtin/difftool.c:639 +#: builtin/difftool.c:646 #, c-format msgid "temporary files exist in '%s'." msgstr "временные файлы уже находятся в «%s»." -#: builtin/difftool.c:640 +#: builtin/difftool.c:647 msgid "you may want to cleanup or recover these." msgstr "возможно вы хотите их удалить или восстановить." -#: builtin/difftool.c:689 +#: builtin/difftool.c:696 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "использовать «diff.guitool» вместо «diff.tool»" -#: builtin/difftool.c:691 +#: builtin/difftool.c:698 msgid "perform a full-directory diff" msgstr "выполнить пофайловое сравнение всего каталога" -#: builtin/difftool.c:693 +#: builtin/difftool.c:700 msgid "do not prompt before launching a diff tool" msgstr "не спрашивать перед запуском утилиты сравнения" -#: builtin/difftool.c:698 +#: builtin/difftool.c:705 msgid "use symlinks in dir-diff mode" msgstr "использовать символьные ссылки в режиме сравнения каталога" -#: builtin/difftool.c:699 +#: builtin/difftool.c:706 msgid "tool" msgstr "" -#: builtin/difftool.c:700 +#: builtin/difftool.c:707 msgid "use the specified diff tool" msgstr "использовать указанную утилиту сравнения" -#: builtin/difftool.c:702 +#: builtin/difftool.c:709 msgid "print a list of diff tools that may be used with `--tool`" msgstr "вывести список утилит, которые можно использовать с параметром «--tool»" -#: builtin/difftool.c:705 +#: builtin/difftool.c:712 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit" " code" msgstr "выходить из «git-difftool», если вызванная утилита сравнения вернула не нулевой код возврата" -#: builtin/difftool.c:708 +#: builtin/difftool.c:715 msgid "specify a custom command for viewing diffs" msgstr "использовать особую команду для просмотра изменений" -#: builtin/difftool.c:709 +#: builtin/difftool.c:716 msgid "passed to `diff`" msgstr "" -#: builtin/difftool.c:724 +#: builtin/difftool.c:731 msgid "difftool requires worktree or --no-index" msgstr "" -#: builtin/difftool.c:731 +#: builtin/difftool.c:738 msgid "--dir-diff is incompatible with --no-index" msgstr "" -#: builtin/difftool.c:734 +#: builtin/difftool.c:741 msgid "--gui, --tool and --extcmd are mutually exclusive" msgstr "" -#: builtin/difftool.c:742 +#: builtin/difftool.c:749 msgid "no <tool> given for --tool=<tool>" msgstr "не передана <утилита> для --tool=<утилита>" -#: builtin/difftool.c:749 +#: builtin/difftool.c:756 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "не передана <команда> для --extcmd=<команда>" +#: builtin/env--helper.c:6 +msgid "git env--helper --type=[bool|ulong] <options> <env-var>" +msgstr "" + +#: builtin/env--helper.c:42 builtin/hash-object.c:98 +msgid "type" +msgstr "тип" + +#: builtin/env--helper.c:46 +msgid "default for git_env_*(...) to fall back on" +msgstr "" + +#: builtin/env--helper.c:48 +msgid "be quiet only use git_env_*() value as exit code" +msgstr "" + +#: builtin/env--helper.c:67 +#, c-format +msgid "" +"option `--default' expects a boolean value with `--type=bool`, not `%s`" +msgstr "" + +#: builtin/env--helper.c:82 +#, c-format +msgid "" +"option `--default' expects an unsigned long value with `--type=ulong`, not " +"`%s`" +msgstr "" + #: builtin/fast-export.c:29 msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [опции-rev-list]" -#: builtin/fast-export.c:1084 +#: builtin/fast-export.c:868 +msgid "Error: Cannot export nested tags unless --mark-tags is specified." +msgstr "" + +#: builtin/fast-export.c:1177 +msgid "--anonymize-map token cannot be empty" +msgstr "" + +#: builtin/fast-export.c:1197 msgid "show progress after <n> objects" msgstr "показать прогресс после <n> объектов" -#: builtin/fast-export.c:1086 +#: builtin/fast-export.c:1199 msgid "select handling of signed tags" msgstr "выбор обработки подписанных меток" -#: builtin/fast-export.c:1089 +#: builtin/fast-export.c:1202 msgid "select handling of tags that tag filtered objects" msgstr "выбор обработки меток, которыми помечены отфильтрованные объекты" -#: builtin/fast-export.c:1092 +#: builtin/fast-export.c:1205 +msgid "select handling of commit messages in an alternate encoding" +msgstr "" + +#: builtin/fast-export.c:1208 msgid "Dump marks to this file" msgstr "Записать пометки в этот файл" -#: builtin/fast-export.c:1094 +#: builtin/fast-export.c:1210 msgid "Import marks from this file" msgstr "Импортировать пометки из этого файла" -#: builtin/fast-export.c:1096 +#: builtin/fast-export.c:1214 +msgid "Import marks from this file if it exists" +msgstr "" + +#: builtin/fast-export.c:1216 msgid "Fake a tagger when tags lack one" msgstr "Подделать автора метки, если у метки он отсутствует" -#: builtin/fast-export.c:1098 +#: builtin/fast-export.c:1218 msgid "Output full tree for each commit" msgstr "Вывести полное дерево для каждого коммита" -#: builtin/fast-export.c:1100 +#: builtin/fast-export.c:1220 msgid "Use the done feature to terminate the stream" msgstr "Использовать пометку завершения в конце потока" -#: builtin/fast-export.c:1101 +#: builtin/fast-export.c:1221 msgid "Skip output of blob data" msgstr "Пропустить вывод данных двоичных объектов" -#: builtin/fast-export.c:1102 builtin/log.c:1609 +#: builtin/fast-export.c:1222 builtin/log.c:1816 msgid "refspec" msgstr "спецификатор ссылки" -#: builtin/fast-export.c:1103 +#: builtin/fast-export.c:1223 msgid "Apply refspec to exported refs" msgstr "Применить спецификатор ссылки к экспортируемым ссылкам" -#: builtin/fast-export.c:1104 +#: builtin/fast-export.c:1224 msgid "anonymize output" msgstr "сделать вывод анонимным" -#: builtin/fast-export.c:1106 +#: builtin/fast-export.c:1225 +msgid "from:to" +msgstr "" + +#: builtin/fast-export.c:1226 +msgid "convert <from> to <to> in anonymized output" +msgstr "" + +#: builtin/fast-export.c:1229 msgid "Reference parents which are not in fast-export stream by object id" msgstr "" -#: builtin/fast-export.c:1108 +#: builtin/fast-export.c:1231 msgid "Show original object ids of blobs/commits" msgstr "" -#: builtin/fetch.c:28 +#: builtin/fast-export.c:1233 +msgid "Label tags with mark ids" +msgstr "" + +#: builtin/fast-export.c:1256 +msgid "--anonymize-map without --anonymize does not make sense" +msgstr "" + +#: builtin/fast-export.c:1271 +msgid "Cannot pass both --import-marks and --import-marks-if-exists" +msgstr "" + +#: builtin/fast-import.c:3088 +#, c-format +msgid "Missing from marks for submodule '%s'" +msgstr "" + +#: builtin/fast-import.c:3090 +#, c-format +msgid "Missing to marks for submodule '%s'" +msgstr "" + +#: builtin/fast-import.c:3225 +#, c-format +msgid "Expected 'mark' command, got %s" +msgstr "" + +#: builtin/fast-import.c:3230 +#, c-format +msgid "Expected 'to' command, got %s" +msgstr "" + +#: builtin/fast-import.c:3322 +msgid "Expected format name:filename for submodule rewrite option" +msgstr "" + +#: builtin/fast-import.c:3377 +#, c-format +msgid "feature '%s' forbidden in input without --allow-unsafe-features" +msgstr "" + +#: builtin/fetch-pack.c:241 +#, c-format +msgid "Lockfile created but not reported: %s" +msgstr "" + +#: builtin/fetch.c:35 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [<опции>] [<репозиторий> [<спецификатор-ссылки>…]]" -#: builtin/fetch.c:29 +#: builtin/fetch.c:36 msgid "git fetch [<options>] <group>" msgstr "git fetch [<опции>] <группа>" -#: builtin/fetch.c:30 +#: builtin/fetch.c:37 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [<опции>] [(<репозиторий> | <группа>)…]" -#: builtin/fetch.c:31 +#: builtin/fetch.c:38 msgid "git fetch --all [<options>]" msgstr "git fetch --all [<опции>]" -#: builtin/fetch.c:115 builtin/pull.c:202 +#: builtin/fetch.c:119 +msgid "fetch.parallel cannot be negative" +msgstr "" + +#: builtin/fetch.c:142 builtin/pull.c:185 msgid "fetch from all remotes" msgstr "извлечь со всех внешних репозиториев" -#: builtin/fetch.c:117 builtin/pull.c:205 +#: builtin/fetch.c:144 builtin/pull.c:245 +msgid "set upstream for git pull/fetch" +msgstr "" + +#: builtin/fetch.c:146 builtin/pull.c:188 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "дописать к .git/FETCH_HEAD вместо перезаписи" -#: builtin/fetch.c:119 builtin/pull.c:208 +#: builtin/fetch.c:148 builtin/pull.c:191 msgid "path to upload pack on remote end" msgstr "путь к программе упаковки пакета на машине с внешним репозиторием" -#: builtin/fetch.c:120 +#: builtin/fetch.c:149 msgid "force overwrite of local reference" msgstr "" -#: builtin/fetch.c:122 +#: builtin/fetch.c:151 msgid "fetch from multiple remotes" msgstr "извлечь с нескольких внешних репозиториев" -#: builtin/fetch.c:124 builtin/pull.c:212 +#: builtin/fetch.c:153 builtin/pull.c:195 msgid "fetch all tags and associated objects" msgstr "извлечь все метки и связанные объекты" -#: builtin/fetch.c:126 +#: builtin/fetch.c:155 msgid "do not fetch all tags (--no-tags)" msgstr "не извлекать все метки (--no-tags)" -#: builtin/fetch.c:128 +#: builtin/fetch.c:157 msgid "number of submodules fetched in parallel" msgstr "количество подмодулей, которые будут скачаны парралельно" -#: builtin/fetch.c:130 builtin/pull.c:215 +#: builtin/fetch.c:159 builtin/pull.c:198 msgid "prune remote-tracking branches no longer on remote" msgstr "почистить отслеживаемые внешние ветки, которых уже нет на внешнем репозитории" -#: builtin/fetch.c:132 +#: builtin/fetch.c:161 msgid "prune local tags no longer on remote and clobber changed tags" msgstr "" -#: builtin/fetch.c:133 builtin/fetch.c:156 builtin/pull.c:139 +#: builtin/fetch.c:162 builtin/fetch.c:187 builtin/pull.c:122 msgid "on-demand" msgstr "по требованию" -#: builtin/fetch.c:134 +#: builtin/fetch.c:163 msgid "control recursive fetching of submodules" msgstr "управление рекурсивным извлечением подмодулей" -#: builtin/fetch.c:138 builtin/pull.c:223 +#: builtin/fetch.c:168 +msgid "write fetched references to the FETCH_HEAD file" +msgstr "" + +#: builtin/fetch.c:169 builtin/pull.c:206 msgid "keep downloaded pack" msgstr "оставить загруженный пакет данных" -#: builtin/fetch.c:140 +#: builtin/fetch.c:171 msgid "allow updating of HEAD ref" msgstr "разрешить обновление ссылки HEAD" -#: builtin/fetch.c:143 builtin/fetch.c:149 builtin/pull.c:226 +#: builtin/fetch.c:174 builtin/fetch.c:180 builtin/pull.c:209 +#: builtin/pull.c:218 msgid "deepen history of shallow clone" msgstr "улугубить историю частичного клона" -#: builtin/fetch.c:145 +#: builtin/fetch.c:176 builtin/pull.c:212 msgid "deepen history of shallow repository based on time" msgstr "углубить историю частичного клона основываясь на времени" -#: builtin/fetch.c:151 builtin/pull.c:229 +#: builtin/fetch.c:182 builtin/pull.c:221 msgid "convert to a complete repository" msgstr "преобразовать в полный репозиторий" -#: builtin/fetch.c:154 +#: builtin/fetch.c:185 msgid "prepend this to submodule path output" msgstr "присоединять это спереди к выводу путей подмодуля" -#: builtin/fetch.c:157 +#: builtin/fetch.c:188 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" msgstr "настроить по умолчанию рекурсивное извлечение подмодулей (более низкий приоритет, чем файлы конфигурации)" -#: builtin/fetch.c:161 builtin/pull.c:232 +#: builtin/fetch.c:192 builtin/pull.c:224 msgid "accept refs that update .git/shallow" msgstr "принимать ссылки, которые обновляют .git/shallow" -#: builtin/fetch.c:162 builtin/pull.c:234 +#: builtin/fetch.c:193 builtin/pull.c:226 msgid "refmap" msgstr "соответствие-ссылок" -#: builtin/fetch.c:163 builtin/pull.c:235 +#: builtin/fetch.c:194 builtin/pull.c:227 msgid "specify fetch refmap" msgstr "указать соответствие ссылок при извлечении" -#: builtin/fetch.c:170 +#: builtin/fetch.c:201 builtin/pull.c:240 msgid "report that we have only objects reachable from this object" msgstr "" -#: builtin/fetch.c:469 +#: builtin/fetch.c:204 builtin/fetch.c:206 +msgid "run 'maintenance --auto' after fetching" +msgstr "" + +#: builtin/fetch.c:208 builtin/pull.c:243 +msgid "check for forced-updates on all updated branches" +msgstr "" + +#: builtin/fetch.c:210 +msgid "write the commit-graph after fetching" +msgstr "" + +#: builtin/fetch.c:212 +msgid "accept refspecs from stdin" +msgstr "" + +#: builtin/fetch.c:523 msgid "Couldn't find remote ref HEAD" msgstr "Не удалось найти ссылку HEAD на внешнем репозитории" -#: builtin/fetch.c:608 +#: builtin/fetch.c:677 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "опция fetch.output содержит неправильное значение для %s" -#: builtin/fetch.c:705 +#: builtin/fetch.c:775 #, c-format msgid "object %s not found" msgstr "объект %s не найден" -#: builtin/fetch.c:709 +#: builtin/fetch.c:779 msgid "[up to date]" msgstr "[актуально]" -#: builtin/fetch.c:722 builtin/fetch.c:738 builtin/fetch.c:801 +#: builtin/fetch.c:792 builtin/fetch.c:808 builtin/fetch.c:880 msgid "[rejected]" msgstr "[отклонено]" -#: builtin/fetch.c:723 +#: builtin/fetch.c:793 msgid "can't fetch in current branch" msgstr "нельзя извлечь текущую ветку" -#: builtin/fetch.c:733 +#: builtin/fetch.c:803 msgid "[tag update]" msgstr "[обновление метки]" -#: builtin/fetch.c:734 builtin/fetch.c:771 builtin/fetch.c:784 -#: builtin/fetch.c:796 +#: builtin/fetch.c:804 builtin/fetch.c:841 builtin/fetch.c:863 +#: builtin/fetch.c:875 msgid "unable to update local ref" msgstr "не удалось обновить локальную ссылку" -#: builtin/fetch.c:738 +#: builtin/fetch.c:808 msgid "would clobber existing tag" msgstr "" -#: builtin/fetch.c:760 +#: builtin/fetch.c:830 msgid "[new tag]" msgstr "[новая метка]" -#: builtin/fetch.c:763 +#: builtin/fetch.c:833 msgid "[new branch]" msgstr "[новая ветка]" -#: builtin/fetch.c:766 +#: builtin/fetch.c:836 msgid "[new ref]" msgstr "[новая ссылка]" -#: builtin/fetch.c:796 +#: builtin/fetch.c:875 msgid "forced update" msgstr "принудительное обновление" -#: builtin/fetch.c:801 +#: builtin/fetch.c:880 msgid "non-fast-forward" msgstr "без перемотки вперед" -#: builtin/fetch.c:847 +#: builtin/fetch.c:901 +msgid "" +"Fetch normally indicates which branches had a forced update,\n" +"but that check has been disabled. To re-enable, use '--show-forced-updates'\n" +"flag or run 'git config fetch.showForcedUpdates true'." +msgstr "" + +#: builtin/fetch.c:905 +#, c-format +msgid "" +"It took %.2f seconds to check forced updates. You can use\n" +"'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates false'\n" +" to avoid this check.\n" +msgstr "" + +#: builtin/fetch.c:939 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s не отправил все необходимые объекты\n" -#: builtin/fetch.c:868 +#: builtin/fetch.c:960 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "%s отклонено из-за того, что частичные корни не разрешено обновлять" -#: builtin/fetch.c:959 builtin/fetch.c:1081 +#: builtin/fetch.c:1053 builtin/fetch.c:1191 #, c-format msgid "From %.*s\n" msgstr "Из %.*s\n" -#: builtin/fetch.c:970 +#: builtin/fetch.c:1064 #, c-format msgid "" "some local refs could not be updated; try running\n" " 'git remote prune %s' to remove any old, conflicting branches" msgstr "не удалось обновить некоторые локальные ссылки; попробуйте запустить «git remote prune %s», чтобы почистить старые, конфликтующие ветки" -#: builtin/fetch.c:1051 +#: builtin/fetch.c:1161 #, c-format msgid " (%s will become dangling)" msgstr " (%s будет висящей веткой)" -#: builtin/fetch.c:1052 +#: builtin/fetch.c:1162 #, c-format msgid " (%s has become dangling)" msgstr " (%s стала висящей веткой)" -#: builtin/fetch.c:1084 +#: builtin/fetch.c:1194 msgid "[deleted]" msgstr "[удалено]" -#: builtin/fetch.c:1085 builtin/remote.c:1036 +#: builtin/fetch.c:1195 builtin/remote.c:1118 msgid "(none)" msgstr "(нет)" -#: builtin/fetch.c:1108 +#: builtin/fetch.c:1218 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "Отказ получения в текущую ветку %s не голого репозитория" -#: builtin/fetch.c:1127 +#: builtin/fetch.c:1237 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "Неправильное значение «%2$s» для параметра «%1$s» для %3$s" -#: builtin/fetch.c:1130 +#: builtin/fetch.c:1240 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "Параметр «%s» игнорируется для %s\n" -#: builtin/fetch.c:1434 +#: builtin/fetch.c:1448 +msgid "multiple branches detected, incompatible with --set-upstream" +msgstr "" + +#: builtin/fetch.c:1463 +msgid "not setting upstream for a remote remote-tracking branch" +msgstr "" + +#: builtin/fetch.c:1465 +msgid "not setting upstream for a remote tag" +msgstr "" + +#: builtin/fetch.c:1467 +msgid "unknown branch type" +msgstr "" + +#: builtin/fetch.c:1469 +msgid "" +"no source branch found.\n" +"you need to specify exactly one branch with the --set-upstream option." +msgstr "" + +#: builtin/fetch.c:1598 builtin/fetch.c:1661 #, c-format msgid "Fetching %s\n" msgstr "Извлечение из %s\n" -#: builtin/fetch.c:1436 builtin/remote.c:100 +#: builtin/fetch.c:1608 builtin/fetch.c:1663 builtin/remote.c:101 #, c-format msgid "Could not fetch %s" msgstr "Не удалось извлечь %s" -#: builtin/fetch.c:1482 -msgid "" -"--filter can only be used with the remote configured in " -"extensions.partialClone" +#: builtin/fetch.c:1620 +#, c-format +msgid "could not fetch '%s' (exit code: %d)\n" msgstr "" -#: builtin/fetch.c:1506 +#: builtin/fetch.c:1724 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." msgstr "Не указан внешний репозиторий. Укажите URL или имя внешнего репозитория из которого должны извлекаться новые редакции." -#: builtin/fetch.c:1543 +#: builtin/fetch.c:1760 msgid "You need to specify a tag name." msgstr "Вам нужно указать имя метки." -#: builtin/fetch.c:1594 +#: builtin/fetch.c:1825 msgid "Negative depth in --deepen is not supported" msgstr "Отрицательная грубина для --deepen не поддерживается" -#: builtin/fetch.c:1596 +#: builtin/fetch.c:1827 msgid "--deepen and --depth are mutually exclusive" msgstr "--deepen и --depth нельзя использовать одновременно" -#: builtin/fetch.c:1601 +#: builtin/fetch.c:1832 msgid "--depth and --unshallow cannot be used together" msgstr "нельзя использовать одновременно --depth и --unshallow" -#: builtin/fetch.c:1603 +#: builtin/fetch.c:1834 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow не имеет смысла на полном репозитории" -#: builtin/fetch.c:1619 +#: builtin/fetch.c:1851 msgid "fetch --all does not take a repository argument" msgstr "fetch --all не принимает имя репозитория как аргумент" -#: builtin/fetch.c:1621 +#: builtin/fetch.c:1853 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all не имеет смысла при указании спецификаторов ссылок" -#: builtin/fetch.c:1630 +#: builtin/fetch.c:1862 #, c-format msgid "No such remote or remote group: %s" msgstr "Нет такого внешнего репозитория или группы: %s" -#: builtin/fetch.c:1637 +#: builtin/fetch.c:1869 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Получение группы и указание спецификаций ссылок не имеет смысла" -#: builtin/fetch.c:1653 +#: builtin/fetch.c:1887 msgid "" "--filter can only be used with the remote configured in " "extensions.partialclone" msgstr "" -#: builtin/fmt-merge-msg.c:18 +#: builtin/fetch.c:1891 +msgid "--stdin can only be used when fetching from one remote" +msgstr "" + +#: builtin/fmt-merge-msg.c:7 msgid "" "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" msgstr "git fmt-merge-msg [-m <сообщение>] [--log[=<n>] | --no-log] [--file <файл>]" -#: builtin/fmt-merge-msg.c:672 +#: builtin/fmt-merge-msg.c:18 msgid "populate log with at most <n> entries from shortlog" msgstr "отправить в журнал <n> записей из короткого журнала" -#: builtin/fmt-merge-msg.c:675 +#: builtin/fmt-merge-msg.c:21 msgid "alias for --log (deprecated)" msgstr "сокращение для --log (устаревшее)" -#: builtin/fmt-merge-msg.c:678 +#: builtin/fmt-merge-msg.c:24 msgid "text" msgstr "текст" -#: builtin/fmt-merge-msg.c:679 +#: builtin/fmt-merge-msg.c:25 msgid "use <text> as start of message" msgstr "использовать <текст> как начальное сообщение" -#: builtin/fmt-merge-msg.c:680 +#: builtin/fmt-merge-msg.c:26 msgid "file to read from" msgstr "файл для чтения" @@ -11827,8 +13802,8 @@ msgid "git for-each-ref [--points-at <object>]" msgstr "git for-each-ref [--points-at <объект>]" #: builtin/for-each-ref.c:12 -msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]" -msgstr "git for-each-ref [(--merged | --no-merged) [<коммит>]]" +msgid "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]" +msgstr "" #: builtin/for-each-ref.c:13 msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]" @@ -11854,7 +13829,7 @@ msgstr "выводить указатели места заполнения в msgid "show only <n> matched refs" msgstr "показать только <n> совпадающих ссылок" -#: builtin/for-each-ref.c:39 builtin/tag.c:433 +#: builtin/for-each-ref.c:39 builtin/tag.c:440 msgid "respect format colors" msgstr "использовать цвета из формата" @@ -11878,272 +13853,288 @@ msgstr "вывод только ссылок, которые содержат к msgid "print only refs which don't contain the commit" msgstr "вывод только ссылок, которые не содержат коммит" -#: builtin/fsck.c:88 builtin/fsck.c:160 builtin/fsck.c:161 +#: builtin/for-each-repo.c:9 +msgid "git for-each-repo --config=<config> <command-args>" +msgstr "" + +#: builtin/for-each-repo.c:37 +msgid "config" +msgstr "" + +#: builtin/for-each-repo.c:38 +msgid "config key storing a list of repository paths" +msgstr "" + +#: builtin/for-each-repo.c:46 +msgid "missing --config=<config>" +msgstr "" + +#: builtin/fsck.c:69 builtin/fsck.c:148 builtin/fsck.c:149 msgid "unknown" msgstr "" #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation> -#: builtin/fsck.c:120 builtin/fsck.c:136 +#: builtin/fsck.c:101 builtin/fsck.c:121 #, c-format msgid "error in %s %s: %s" msgstr "" #. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation> -#: builtin/fsck.c:131 +#: builtin/fsck.c:115 #, c-format msgid "warning in %s %s: %s" msgstr "" -#: builtin/fsck.c:157 builtin/fsck.c:159 +#: builtin/fsck.c:144 builtin/fsck.c:147 #, c-format msgid "broken link from %7s %s" msgstr "" -#: builtin/fsck.c:168 +#: builtin/fsck.c:156 msgid "wrong object type in link" msgstr "" -#: builtin/fsck.c:184 +#: builtin/fsck.c:172 #, c-format msgid "" "broken link from %7s %s\n" " to %7s %s" msgstr "" -#: builtin/fsck.c:295 +#: builtin/fsck.c:283 #, c-format msgid "missing %s %s" msgstr "" -#: builtin/fsck.c:321 +#: builtin/fsck.c:310 #, c-format msgid "unreachable %s %s" msgstr "" -#: builtin/fsck.c:340 +#: builtin/fsck.c:330 #, c-format msgid "dangling %s %s" msgstr "" -#: builtin/fsck.c:349 +#: builtin/fsck.c:340 msgid "could not create lost-found" msgstr "" -#: builtin/fsck.c:360 +#: builtin/fsck.c:351 #, c-format msgid "could not finish '%s'" msgstr "не удалось закончить '%s'" -#: builtin/fsck.c:377 +#: builtin/fsck.c:368 #, c-format msgid "Checking %s" msgstr "" -#: builtin/fsck.c:415 +#: builtin/fsck.c:406 #, c-format msgid "Checking connectivity (%d objects)" msgstr "" -#: builtin/fsck.c:434 +#: builtin/fsck.c:425 #, c-format msgid "Checking %s %s" msgstr "" -#: builtin/fsck.c:438 +#: builtin/fsck.c:430 msgid "broken links" msgstr "" -#: builtin/fsck.c:447 +#: builtin/fsck.c:439 #, c-format msgid "root %s" msgstr "" -#: builtin/fsck.c:455 +#: builtin/fsck.c:447 #, c-format msgid "tagged %s %s (%s) in %s" msgstr "" -#: builtin/fsck.c:484 +#: builtin/fsck.c:476 #, c-format msgid "%s: object corrupt or missing" msgstr "" -#: builtin/fsck.c:509 +#: builtin/fsck.c:501 #, c-format msgid "%s: invalid reflog entry %s" msgstr "" -#: builtin/fsck.c:523 +#: builtin/fsck.c:515 #, c-format msgid "Checking reflog %s->%s" msgstr "" -#: builtin/fsck.c:557 +#: builtin/fsck.c:549 #, c-format msgid "%s: invalid sha1 pointer %s" msgstr "" -#: builtin/fsck.c:564 +#: builtin/fsck.c:556 #, c-format msgid "%s: not a commit" msgstr "" -#: builtin/fsck.c:619 +#: builtin/fsck.c:610 msgid "notice: No default references" msgstr "" -#: builtin/fsck.c:634 +#: builtin/fsck.c:625 #, c-format msgid "%s: object corrupt or missing: %s" msgstr "" -#: builtin/fsck.c:647 +#: builtin/fsck.c:638 #, c-format msgid "%s: object could not be parsed: %s" msgstr "" -#: builtin/fsck.c:667 +#: builtin/fsck.c:658 #, c-format msgid "bad sha1 file: %s" msgstr "" -#: builtin/fsck.c:682 +#: builtin/fsck.c:673 msgid "Checking object directory" msgstr "" -#: builtin/fsck.c:685 +#: builtin/fsck.c:676 msgid "Checking object directories" msgstr "Проверка каталогов объектов" -#: builtin/fsck.c:700 +#: builtin/fsck.c:691 #, c-format msgid "Checking %s link" msgstr "" -#: builtin/fsck.c:705 builtin/index-pack.c:841 +#: builtin/fsck.c:696 builtin/index-pack.c:865 #, c-format msgid "invalid %s" msgstr "неправильный %s" -#: builtin/fsck.c:712 +#: builtin/fsck.c:703 #, c-format msgid "%s points to something strange (%s)" msgstr "" -#: builtin/fsck.c:718 +#: builtin/fsck.c:709 #, c-format msgid "%s: detached HEAD points at nothing" msgstr "" -#: builtin/fsck.c:722 +#: builtin/fsck.c:713 #, c-format msgid "notice: %s points to an unborn branch (%s)" msgstr "" -#: builtin/fsck.c:734 +#: builtin/fsck.c:725 msgid "Checking cache tree" msgstr "" -#: builtin/fsck.c:739 +#: builtin/fsck.c:730 #, c-format msgid "%s: invalid sha1 pointer in cache-tree" msgstr "" -#: builtin/fsck.c:750 +#: builtin/fsck.c:739 msgid "non-tree in cache-tree" msgstr "" -#: builtin/fsck.c:781 +#: builtin/fsck.c:770 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<опции>] [<объект>…]" -#: builtin/fsck.c:787 +#: builtin/fsck.c:776 msgid "show unreachable objects" msgstr "показать недоступные объекты" -#: builtin/fsck.c:788 +#: builtin/fsck.c:777 msgid "show dangling objects" msgstr "показать объекты, на которые нет ссылок" -#: builtin/fsck.c:789 +#: builtin/fsck.c:778 msgid "report tags" msgstr "вывести отчет по меткам" -#: builtin/fsck.c:790 +#: builtin/fsck.c:779 msgid "report root nodes" msgstr "вывести отчет по корневым узлам" -#: builtin/fsck.c:791 +#: builtin/fsck.c:780 msgid "make index objects head nodes" msgstr "воспринимать объекты в индексе как корневые узлы" -#: builtin/fsck.c:792 +#: builtin/fsck.c:781 msgid "make reflogs head nodes (default)" msgstr "создать корневые узлы журналов ссылок (по умолчанию)" -#: builtin/fsck.c:793 +#: builtin/fsck.c:782 msgid "also consider packs and alternate objects" msgstr "также проверять пакеты и альтернативные объекты" -#: builtin/fsck.c:794 +#: builtin/fsck.c:783 msgid "check only connectivity" msgstr "только проверить соединение" -#: builtin/fsck.c:795 +#: builtin/fsck.c:784 msgid "enable more strict checking" msgstr "использовать более строгую проверку" -#: builtin/fsck.c:797 +#: builtin/fsck.c:786 msgid "write dangling objects in .git/lost-found" msgstr "записать объекты на которые нет ссылок в .git/lost-found" -#: builtin/fsck.c:798 builtin/prune.c:132 +#: builtin/fsck.c:787 builtin/prune.c:134 msgid "show progress" msgstr "показать прогресс выполнения" -#: builtin/fsck.c:799 +#: builtin/fsck.c:788 msgid "show verbose names for reachable objects" msgstr "показать подробные имена для недоступных объектов" -#: builtin/fsck.c:859 builtin/index-pack.c:224 +#: builtin/fsck.c:847 builtin/index-pack.c:261 msgid "Checking objects" msgstr "Проверка объектов" -#: builtin/fsck.c:887 +#: builtin/fsck.c:875 #, c-format msgid "%s: object missing" msgstr "" -#: builtin/fsck.c:899 +#: builtin/fsck.c:886 #, c-format msgid "invalid parameter: expected sha1, got '%s'" msgstr "" -#: builtin/gc.c:34 +#: builtin/gc.c:39 msgid "git gc [<options>]" msgstr "git gc [<опции>]" -#: builtin/gc.c:90 +#: builtin/gc.c:94 #, c-format msgid "Failed to fstat %s: %s" msgstr "Не удалось выполнить fstat %s: %s" -#: builtin/gc.c:126 +#: builtin/gc.c:130 #, c-format msgid "failed to parse '%s' value '%s'" msgstr "" -#: builtin/gc.c:476 builtin/init-db.c:55 +#: builtin/gc.c:479 builtin/init-db.c:58 #, c-format msgid "cannot stat '%s'" msgstr "не удалось выполнить stat для «%s»" -#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:519 +#: builtin/gc.c:488 builtin/notes.c:240 builtin/tag.c:530 #, c-format msgid "cannot read '%s'" msgstr "не удалось прочитать «%s»" -#: builtin/gc.c:492 +#: builtin/gc.c:495 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -12153,64 +14144,196 @@ msgid "" "%s" msgstr "Последний запуск gc сообщил следующее. Пожалуйста, исправьте ошибку и удалите %s.\nАвтоматическая очистка репозитория не будет производиться, пока этот файл не удалён.\n\n%s" -#: builtin/gc.c:540 +#: builtin/gc.c:543 msgid "prune unreferenced objects" msgstr "почистить объекты, на которые нет ссылок" -#: builtin/gc.c:542 +#: builtin/gc.c:545 msgid "be more thorough (increased runtime)" msgstr "проверять более внимательно (занимает больше времени)" -#: builtin/gc.c:543 +#: builtin/gc.c:546 msgid "enable auto-gc mode" msgstr "включить режим auto-gc" -#: builtin/gc.c:546 +#: builtin/gc.c:549 msgid "force running gc even if there may be another gc running" msgstr "принудительно запустить gc, даже есть другая копия gc уже запущена" -#: builtin/gc.c:549 +#: builtin/gc.c:552 msgid "repack all other packs except the largest pack" msgstr "" -#: builtin/gc.c:566 +#: builtin/gc.c:569 #, c-format msgid "failed to parse gc.logexpiry value %s" msgstr "" -#: builtin/gc.c:577 +#: builtin/gc.c:580 #, c-format msgid "failed to parse prune expiry value %s" msgstr "" -#: builtin/gc.c:597 +#: builtin/gc.c:600 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "Автоматическая упаковка репозитория в фоне, для оптимальной производительности.\n" -#: builtin/gc.c:599 +#: builtin/gc.c:602 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "Автоматическая упаковка репозитория, для оптимальной производительности.\n" -#: builtin/gc.c:600 +#: builtin/gc.c:603 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "Смотрите «git help gc» руководства по ручной очистке.\n" -#: builtin/gc.c:640 +#: builtin/gc.c:643 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" msgstr "gc уже запущен на этом компьютере «%s» pid %<PRIuMAX> (если нет, используйте --force)" -#: builtin/gc.c:693 +#: builtin/gc.c:698 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove " "them." msgstr "Имеется слишком много объектов, на которые нет ссылок; запустите «git prune» для их удаления." -#: builtin/grep.c:29 +#: builtin/gc.c:708 +msgid "" +"git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]" +msgstr "" + +#: builtin/gc.c:738 +msgid "--no-schedule is not allowed" +msgstr "" + +#: builtin/gc.c:743 +#, c-format +msgid "unrecognized --schedule argument '%s'" +msgstr "" + +#: builtin/gc.c:862 +msgid "failed to write commit-graph" +msgstr "" + +#: builtin/gc.c:901 +msgid "failed to fill remotes" +msgstr "" + +#: builtin/gc.c:1024 +msgid "failed to start 'git pack-objects' process" +msgstr "" + +#: builtin/gc.c:1041 +msgid "failed to finish 'git pack-objects' process" +msgstr "" + +#: builtin/gc.c:1093 +msgid "failed to write multi-pack-index" +msgstr "" + +#: builtin/gc.c:1111 +msgid "'git multi-pack-index expire' failed" +msgstr "" + +#: builtin/gc.c:1172 +msgid "'git multi-pack-index repack' failed" +msgstr "" + +#: builtin/gc.c:1181 +msgid "" +"skipping incremental-repack task because core.multiPackIndex is disabled" +msgstr "" + +#: builtin/gc.c:1279 +#, c-format +msgid "lock file '%s' exists, skipping maintenance" +msgstr "" + +#: builtin/gc.c:1309 +#, c-format +msgid "task '%s' failed" +msgstr "" + +#: builtin/gc.c:1389 +#, c-format +msgid "'%s' is not a valid task" +msgstr "" + +#: builtin/gc.c:1394 +#, c-format +msgid "task '%s' cannot be selected multiple times" +msgstr "" + +#: builtin/gc.c:1409 +msgid "run tasks based on the state of the repository" +msgstr "" + +#: builtin/gc.c:1410 +msgid "frequency" +msgstr "" + +#: builtin/gc.c:1411 +msgid "run tasks based on frequency" +msgstr "" + +#: builtin/gc.c:1414 +msgid "do not report progress or other information over stderr" +msgstr "" + +#: builtin/gc.c:1415 +msgid "task" +msgstr "" + +#: builtin/gc.c:1416 +msgid "run a specific task" +msgstr "" + +#: builtin/gc.c:1433 +msgid "use at most one of --auto and --schedule=<frequency>" +msgstr "" + +#: builtin/gc.c:1467 +msgid "failed to run 'git config'" +msgstr "" + +#: builtin/gc.c:1512 +msgid "another process is scheduling background maintenance" +msgstr "" + +#: builtin/gc.c:1525 +msgid "failed to run 'crontab -l'; your system might not support 'cron'" +msgstr "" + +#: builtin/gc.c:1544 +msgid "failed to run 'crontab'; your system might not support 'cron'" +msgstr "" + +#: builtin/gc.c:1550 +msgid "failed to open stdin of 'crontab'" +msgstr "" + +#: builtin/gc.c:1592 +msgid "'crontab' died" +msgstr "" + +#: builtin/gc.c:1605 +msgid "failed to add repo to global config" +msgstr "" + +#: builtin/gc.c:1615 +msgid "git maintenance <subcommand> [<options>]" +msgstr "" + +#: builtin/gc.c:1634 +#, c-format +msgid "invalid subcommand: %s" +msgstr "" + +#: builtin/grep.c:30 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "git grep [<опции>] [-e] <шаблон> [<редакция>…] [[--] <путь>…]" @@ -12227,258 +14350,258 @@ msgstr "указано недопустимое количество поток #. TRANSLATORS: %s is the configuration #. variable for tweaking threads, currently #. grep.threads -#: builtin/grep.c:287 builtin/index-pack.c:1514 builtin/index-pack.c:1705 -#: builtin/pack-objects.c:2720 +#: builtin/grep.c:287 builtin/index-pack.c:1576 builtin/index-pack.c:1766 +#: builtin/pack-objects.c:2936 #, c-format msgid "no threads support, ignoring %s" msgstr "нет поддержки потоков, игнорирование %s" -#: builtin/grep.c:466 builtin/grep.c:590 builtin/grep.c:631 +#: builtin/grep.c:475 builtin/grep.c:600 builtin/grep.c:640 #, c-format msgid "unable to read tree (%s)" msgstr "не удалось прочитать дерево (%s)" -#: builtin/grep.c:646 +#: builtin/grep.c:655 #, c-format msgid "unable to grep from object of type %s" msgstr "не удалось выполнить grep из объекта типа %s" -#: builtin/grep.c:712 +#: builtin/grep.c:736 #, c-format msgid "switch `%c' expects a numerical value" msgstr "параметр «%c» ожидает числовое значение" -#: builtin/grep.c:811 +#: builtin/grep.c:835 msgid "search in index instead of in the work tree" msgstr "искать в индексе, а не в рабочем каталоге" -#: builtin/grep.c:813 +#: builtin/grep.c:837 msgid "find in contents not managed by git" msgstr "искать в содержимом не управляемым git" -#: builtin/grep.c:815 +#: builtin/grep.c:839 msgid "search in both tracked and untracked files" msgstr "искать и в отслеживаемых, и в неотслеживаемых файлах" -#: builtin/grep.c:817 +#: builtin/grep.c:841 msgid "ignore files specified via '.gitignore'" msgstr "игнорировать файлы указанные в «.gitignore»" -#: builtin/grep.c:819 +#: builtin/grep.c:843 msgid "recursively search in each submodule" msgstr "рекурсивный поиск по всем подмодулям" -#: builtin/grep.c:822 +#: builtin/grep.c:846 msgid "show non-matching lines" msgstr "искать в несовпадающих строках" -#: builtin/grep.c:824 +#: builtin/grep.c:848 msgid "case insensitive matching" msgstr "без учета регистра" -#: builtin/grep.c:826 +#: builtin/grep.c:850 msgid "match patterns only at word boundaries" msgstr "искать совпадения шаблона только на границах слов" -#: builtin/grep.c:828 +#: builtin/grep.c:852 msgid "process binary files as text" msgstr "обработка двоичных файлов как текста" -#: builtin/grep.c:830 +#: builtin/grep.c:854 msgid "don't match patterns in binary files" msgstr "не искать совпадения шаблона в двоичных файлах" -#: builtin/grep.c:833 +#: builtin/grep.c:857 msgid "process binary files with textconv filters" msgstr "обрабатываться двоичные файлы с помощью фильтров textconv" -#: builtin/grep.c:835 +#: builtin/grep.c:859 msgid "search in subdirectories (default)" msgstr "" -#: builtin/grep.c:837 +#: builtin/grep.c:861 msgid "descend at most <depth> levels" msgstr "на глубине максиму <глубина> уровней" -#: builtin/grep.c:841 +#: builtin/grep.c:865 msgid "use extended POSIX regular expressions" msgstr "использовать расширенные регулярные выражения POSIX" -#: builtin/grep.c:844 +#: builtin/grep.c:868 msgid "use basic POSIX regular expressions (default)" msgstr "использовать базовые регулярные выражения POSIX (по умолчанию)" -#: builtin/grep.c:847 +#: builtin/grep.c:871 msgid "interpret patterns as fixed strings" msgstr "интерпретировать шаблоны как фиксированные строки" -#: builtin/grep.c:850 +#: builtin/grep.c:874 msgid "use Perl-compatible regular expressions" msgstr "использовать Perl-совместимые регулярные выражения" -#: builtin/grep.c:853 +#: builtin/grep.c:877 msgid "show line numbers" msgstr "вывести номера строк" -#: builtin/grep.c:854 +#: builtin/grep.c:878 msgid "show column number of first match" msgstr "" -#: builtin/grep.c:855 +#: builtin/grep.c:879 msgid "don't show filenames" msgstr "не выводить имена файлов" -#: builtin/grep.c:856 +#: builtin/grep.c:880 msgid "show filenames" msgstr "выводить имена файлов" -#: builtin/grep.c:858 +#: builtin/grep.c:882 msgid "show filenames relative to top directory" msgstr "выводить имена файлов относительно каталога репозитория" -#: builtin/grep.c:860 +#: builtin/grep.c:884 msgid "show only filenames instead of matching lines" msgstr "выводить только имена файлов, а не совпадающие строки" -#: builtin/grep.c:862 +#: builtin/grep.c:886 msgid "synonym for --files-with-matches" msgstr "синоним для --files-with-matches" -#: builtin/grep.c:865 +#: builtin/grep.c:889 msgid "show only the names of files without match" msgstr "выводить только несовпадающие имена файлов" -#: builtin/grep.c:867 +#: builtin/grep.c:891 msgid "print NUL after filenames" msgstr "выводить двоичный НОЛЬ после списка имен файлов" -#: builtin/grep.c:870 +#: builtin/grep.c:894 msgid "show only matching parts of a line" msgstr "" -#: builtin/grep.c:872 +#: builtin/grep.c:896 msgid "show the number of matches instead of matching lines" msgstr "выводить количество совпадений, а не совпадающие строки" -#: builtin/grep.c:873 +#: builtin/grep.c:897 msgid "highlight matches" msgstr "подсвечивать совпадения" -#: builtin/grep.c:875 +#: builtin/grep.c:899 msgid "print empty line between matches from different files" msgstr "выводить пустую строку после совпадений из разных файлов" -#: builtin/grep.c:877 +#: builtin/grep.c:901 msgid "show filename only once above matches from same file" msgstr "выводить имя файла только раз на несколько совпадений в одном файле" -#: builtin/grep.c:880 +#: builtin/grep.c:904 msgid "show <n> context lines before and after matches" msgstr "показать <n> строк контекста перед и после совпадения" -#: builtin/grep.c:883 +#: builtin/grep.c:907 msgid "show <n> context lines before matches" msgstr "показать <n> строк контекста перед совпадением" -#: builtin/grep.c:885 +#: builtin/grep.c:909 msgid "show <n> context lines after matches" msgstr "показать <n> строк контекста после совпадения" -#: builtin/grep.c:887 +#: builtin/grep.c:911 msgid "use <n> worker threads" msgstr "использовать <кол> рабочих потоков" -#: builtin/grep.c:888 +#: builtin/grep.c:912 msgid "shortcut for -C NUM" msgstr "тоже, что и -C КОЛИЧЕСТВО" -#: builtin/grep.c:891 +#: builtin/grep.c:915 msgid "show a line with the function name before matches" msgstr "показать строку с именем функции перед совпадением" -#: builtin/grep.c:893 +#: builtin/grep.c:917 msgid "show the surrounding function" msgstr "показать окружающую функцию" -#: builtin/grep.c:896 +#: builtin/grep.c:920 msgid "read patterns from file" msgstr "прочитать шаблоны из файла" -#: builtin/grep.c:898 +#: builtin/grep.c:922 msgid "match <pattern>" msgstr "поиск соответствий с <шаблоном>" -#: builtin/grep.c:900 +#: builtin/grep.c:924 msgid "combine patterns specified with -e" msgstr "объединить шаблоны указанные с помощью -e" -#: builtin/grep.c:912 +#: builtin/grep.c:936 msgid "indicate hit with exit status without output" msgstr "ничего не выводить, указать на совпадение с помощью кода выхода" -#: builtin/grep.c:914 +#: builtin/grep.c:938 msgid "show only matches from files that match all patterns" msgstr "показать только совпадения из файлов в которых совпадают все шаблоны" -#: builtin/grep.c:916 +#: builtin/grep.c:940 msgid "show parse tree for grep expression" msgstr "показать дерево разбора для выражения поиска" -#: builtin/grep.c:920 +#: builtin/grep.c:944 msgid "pager" msgstr "пейджер" -#: builtin/grep.c:920 +#: builtin/grep.c:944 msgid "show matching files in the pager" msgstr "показать совпадающие файлы с помощью программы-пейджера" -#: builtin/grep.c:924 +#: builtin/grep.c:948 msgid "allow calling of grep(1) (ignored by this build)" msgstr "разрешить вызов grep(1) (игнорируется в этой сборке)" -#: builtin/grep.c:988 +#: builtin/grep.c:1014 msgid "no pattern given" msgstr "" -#: builtin/grep.c:1024 +#: builtin/grep.c:1050 msgid "--no-index or --untracked cannot be used with revs" msgstr "--no-index или --untracked нельзя использовать одновременно с указанием ревизии" -#: builtin/grep.c:1032 +#: builtin/grep.c:1058 #, c-format msgid "unable to resolve revision: %s" msgstr "не удалось определить редакцию: %s" -#: builtin/grep.c:1063 +#: builtin/grep.c:1088 +msgid "--untracked not supported with --recurse-submodules" +msgstr "" + +#: builtin/grep.c:1092 msgid "invalid option combination, ignoring --threads" msgstr "" -#: builtin/grep.c:1066 builtin/pack-objects.c:3403 +#: builtin/grep.c:1095 builtin/pack-objects.c:3655 msgid "no threads support, ignoring --threads" msgstr "нет поддержки потоков, игнорирование --threads" -#: builtin/grep.c:1069 builtin/index-pack.c:1511 builtin/pack-objects.c:2717 +#: builtin/grep.c:1098 builtin/index-pack.c:1573 builtin/pack-objects.c:2933 #, c-format msgid "invalid number of threads specified (%d)" msgstr "указано неправильное количество потоков (%d)" -#: builtin/grep.c:1092 +#: builtin/grep.c:1132 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager работает только в рабочем каталоге" -#: builtin/grep.c:1115 -msgid "option not supported with --recurse-submodules" -msgstr "" - -#: builtin/grep.c:1121 +#: builtin/grep.c:1158 msgid "--cached or --untracked cannot be used with --no-index" msgstr "" -#: builtin/grep.c:1127 +#: builtin/grep.c:1164 msgid "--[no-]exclude-standard cannot be used for tracked contents" msgstr "" -#: builtin/grep.c:1135 +#: builtin/grep.c:1172 msgid "both --cached and trees are given" msgstr "" @@ -12493,10 +14616,6 @@ msgid "git hash-object --stdin-paths" msgstr "git hash-object --stdin-paths" #: builtin/hash-object.c:98 -msgid "type" -msgstr "тип" - -#: builtin/hash-object.c:98 msgid "object type" msgstr "тип объекта" @@ -12515,133 +14634,133 @@ msgstr "сохранить файл без использования фильт #: builtin/hash-object.c:104 msgid "" "just hash any random garbage to create corrupt objects for debugging Git" -msgstr "хешировать любой мусор и создавать поврежденные объекты для отладки Git" +msgstr "хэшировать любой мусор и создавать поврежденные объекты для отладки Git" #: builtin/hash-object.c:105 msgid "process file as it were from this path" msgstr "обработать файл так, будто он находится по указанному пути" -#: builtin/help.c:46 +#: builtin/help.c:47 msgid "print all available commands" msgstr "вывести список всех доступных команд" -#: builtin/help.c:47 +#: builtin/help.c:48 msgid "exclude guides" msgstr "исключить руководства" -#: builtin/help.c:48 +#: builtin/help.c:49 msgid "print list of useful guides" msgstr "вывести список полезных руководств" -#: builtin/help.c:49 +#: builtin/help.c:50 msgid "print all configuration variable names" msgstr "" -#: builtin/help.c:51 +#: builtin/help.c:52 msgid "show man page" msgstr "открыть руководство в формате man" -#: builtin/help.c:52 +#: builtin/help.c:53 msgid "show manual in web browser" msgstr "открыть руководство в веб-браузере" -#: builtin/help.c:54 +#: builtin/help.c:55 msgid "show info page" msgstr "открыть руководство в формате info" -#: builtin/help.c:56 +#: builtin/help.c:57 msgid "print command description" msgstr "" -#: builtin/help.c:61 +#: builtin/help.c:62 msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" msgstr "git help [--all] [--guides] [--man | --web | --info] [<команда>]" -#: builtin/help.c:77 +#: builtin/help.c:163 #, c-format msgid "unrecognized help format '%s'" msgstr "неопознанный формат руководства «%s»" -#: builtin/help.c:104 +#: builtin/help.c:190 msgid "Failed to start emacsclient." msgstr "Сбой при запуске emacsclient." -#: builtin/help.c:117 +#: builtin/help.c:203 msgid "Failed to parse emacsclient version." msgstr "Сбой при определении версии emacsclient." -#: builtin/help.c:125 +#: builtin/help.c:211 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "версия emacsclient «%d» слишком старая (< 22)." -#: builtin/help.c:143 builtin/help.c:165 builtin/help.c:175 builtin/help.c:183 +#: builtin/help.c:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269 #, c-format msgid "failed to exec '%s'" msgstr "сбой при запуске «%s»" -#: builtin/help.c:221 +#: builtin/help.c:307 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" "Please consider using 'man.<tool>.cmd' instead." msgstr "«%s»: путь для неподдерживаемой программы просмотра man.\nВместо этого используйте «man.<программа>.cmd»." -#: builtin/help.c:233 +#: builtin/help.c:319 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" "Please consider using 'man.<tool>.path' instead." msgstr "«%s»: команда для неподдерживаемой программы просмотра man.\nВместо этого используйте «man.<программа>.path»." -#: builtin/help.c:350 +#: builtin/help.c:436 #, c-format msgid "'%s': unknown man viewer." msgstr "«%s»: неизвестная программа просмотра man." -#: builtin/help.c:367 +#: builtin/help.c:453 msgid "no man viewer handled the request" msgstr "программа просмотра man не обработала запрос" -#: builtin/help.c:375 +#: builtin/help.c:461 msgid "no info viewer handled the request" msgstr "программа просмотра info не обработала запрос" -#: builtin/help.c:434 builtin/help.c:445 git.c:335 +#: builtin/help.c:520 builtin/help.c:531 git.c:337 #, c-format msgid "'%s' is aliased to '%s'" msgstr "«%s» — это сокращение для «%s»" -#: builtin/help.c:448 git.c:364 +#: builtin/help.c:534 git.c:369 #, c-format msgid "bad alias.%s string: %s" msgstr "" -#: builtin/help.c:477 builtin/help.c:507 +#: builtin/help.c:563 builtin/help.c:593 #, c-format msgid "usage: %s%s" msgstr "использование: %s%s" -#: builtin/help.c:491 +#: builtin/help.c:577 msgid "'git help config' for more information" msgstr "" -#: builtin/index-pack.c:184 +#: builtin/index-pack.c:221 #, c-format msgid "object type mismatch at %s" msgstr "несоответствие типа объекта на %s" -#: builtin/index-pack.c:204 +#: builtin/index-pack.c:241 #, c-format msgid "did not receive expected object %s" msgstr "ожидаемый объект не получен на %s" -#: builtin/index-pack.c:207 +#: builtin/index-pack.c:244 #, c-format msgid "object %s: expected type %s, found %s" msgstr "объект %s: ожидаемый тип %s, получен %s" -#: builtin/index-pack.c:257 +#: builtin/index-pack.c:294 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" @@ -12650,73 +14769,73 @@ msgstr[1] "не удалось заполнить %d байта" msgstr[2] "не удалось заполнить %d байтов" msgstr[3] "не удалось заполнить %d байтов" -#: builtin/index-pack.c:267 +#: builtin/index-pack.c:304 msgid "early EOF" msgstr "неожиданный конец файла" -#: builtin/index-pack.c:268 +#: builtin/index-pack.c:305 msgid "read error on input" msgstr "ошибка чтения ввода" -#: builtin/index-pack.c:280 +#: builtin/index-pack.c:317 msgid "used more bytes than were available" msgstr "использовано больше байт, чем было доступно" -#: builtin/index-pack.c:287 builtin/pack-objects.c:600 +#: builtin/index-pack.c:324 builtin/pack-objects.c:619 msgid "pack too large for current definition of off_t" msgstr "пакет слишком большой для текущего определения off_t" -#: builtin/index-pack.c:290 builtin/unpack-objects.c:94 +#: builtin/index-pack.c:327 builtin/unpack-objects.c:95 msgid "pack exceeds maximum allowed size" msgstr "размер пакета превышает максимальный допустимый" -#: builtin/index-pack.c:305 builtin/repack.c:250 +#: builtin/index-pack.c:342 builtin/repack.c:286 #, c-format msgid "unable to create '%s'" msgstr "не удалось создать «%s»" -#: builtin/index-pack.c:311 +#: builtin/index-pack.c:348 #, c-format msgid "cannot open packfile '%s'" msgstr "не удалось открыть файл пакета «%s»" -#: builtin/index-pack.c:325 +#: builtin/index-pack.c:362 msgid "pack signature mismatch" msgstr "несоответствие подписи пакета" -#: builtin/index-pack.c:327 +#: builtin/index-pack.c:364 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "версия пакета %<PRIu32> не поддерживается" -#: builtin/index-pack.c:345 +#: builtin/index-pack.c:382 #, c-format msgid "pack has bad object at offset %<PRIuMAX>: %s" msgstr "пакет содержит плохой объект по смещению %<PRIuMAX>: %s" -#: builtin/index-pack.c:465 +#: builtin/index-pack.c:488 #, c-format msgid "inflate returned %d" msgstr "программа сжатия вернула %d" -#: builtin/index-pack.c:514 +#: builtin/index-pack.c:537 msgid "offset value overflow for delta base object" msgstr "переполнение значения смещения у базового объекта дельты" -#: builtin/index-pack.c:522 +#: builtin/index-pack.c:545 msgid "delta base offset is out of bound" msgstr "смещение базовой дельты вышло за допустимые пределы" -#: builtin/index-pack.c:530 +#: builtin/index-pack.c:553 #, c-format msgid "unknown object type %d" msgstr "неизвестный тип объекта %d" -#: builtin/index-pack.c:561 +#: builtin/index-pack.c:584 msgid "cannot pread pack file" msgstr "не удалось выполнить pread для файла пакета" -#: builtin/index-pack.c:563 +#: builtin/index-pack.c:586 #, c-format msgid "premature end of pack file, %<PRIuMAX> byte missing" msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing" @@ -12725,88 +14844,88 @@ msgstr[1] "преждевременное окончание файла паке msgstr[2] "преждевременное окончание файла пакета, %<PRIuMAX> байтов отсутствует" msgstr[3] "преждевременное окончание файла пакета, %<PRIuMAX> байтов отсутствует" -#: builtin/index-pack.c:589 +#: builtin/index-pack.c:612 msgid "serious inflate inconsistency" msgstr "серьезное несоответствие при распаковке" -#: builtin/index-pack.c:734 builtin/index-pack.c:740 builtin/index-pack.c:763 -#: builtin/index-pack.c:802 builtin/index-pack.c:811 +#: builtin/index-pack.c:757 builtin/index-pack.c:763 builtin/index-pack.c:787 +#: builtin/index-pack.c:826 builtin/index-pack.c:835 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "НАЙДЕНА КОЛЛИЗИЯ SHA1 С %s !" -#: builtin/index-pack.c:737 builtin/pack-objects.c:153 -#: builtin/pack-objects.c:213 builtin/pack-objects.c:307 +#: builtin/index-pack.c:760 builtin/pack-objects.c:171 +#: builtin/pack-objects.c:231 builtin/pack-objects.c:326 #, c-format msgid "unable to read %s" msgstr "не удалось прочитать %s" -#: builtin/index-pack.c:800 +#: builtin/index-pack.c:824 #, c-format msgid "cannot read existing object info %s" msgstr "не удалось прочитать информацию существующего объекта %s" -#: builtin/index-pack.c:808 +#: builtin/index-pack.c:832 #, c-format msgid "cannot read existing object %s" msgstr "не удалось прочитать существующий объект %s" -#: builtin/index-pack.c:822 +#: builtin/index-pack.c:846 #, c-format msgid "invalid blob object %s" msgstr "неправильный файл двоичного объекта %s" -#: builtin/index-pack.c:825 builtin/index-pack.c:844 +#: builtin/index-pack.c:849 builtin/index-pack.c:868 msgid "fsck error in packed object" msgstr "" -#: builtin/index-pack.c:846 +#: builtin/index-pack.c:870 #, c-format msgid "Not all child objects of %s are reachable" msgstr "Не все дочерние объекты %s достижимы" -#: builtin/index-pack.c:918 builtin/index-pack.c:949 +#: builtin/index-pack.c:931 builtin/index-pack.c:978 msgid "failed to apply delta" msgstr "сбой при применении дельты" -#: builtin/index-pack.c:1117 +#: builtin/index-pack.c:1161 msgid "Receiving objects" msgstr "Получение объектов" -#: builtin/index-pack.c:1117 +#: builtin/index-pack.c:1161 msgid "Indexing objects" msgstr "Индексирование объектов" -#: builtin/index-pack.c:1151 +#: builtin/index-pack.c:1195 msgid "pack is corrupted (SHA1 mismatch)" msgstr "пакет поврежден (несоответствие SHA1)" -#: builtin/index-pack.c:1156 +#: builtin/index-pack.c:1200 msgid "cannot fstat packfile" msgstr "не удалось выполнить fstat для файла пакета" -#: builtin/index-pack.c:1159 +#: builtin/index-pack.c:1203 msgid "pack has junk at the end" msgstr "файл пакета содержит мусор в конце" -#: builtin/index-pack.c:1171 +#: builtin/index-pack.c:1215 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "безумная путаница в parse_pack_objects()" -#: builtin/index-pack.c:1194 +#: builtin/index-pack.c:1238 msgid "Resolving deltas" msgstr "Определение изменений" -#: builtin/index-pack.c:1204 builtin/pack-objects.c:2489 +#: builtin/index-pack.c:1249 builtin/pack-objects.c:2697 #, c-format msgid "unable to create thread: %s" msgstr "не удалось создать поток: %s" -#: builtin/index-pack.c:1245 +#: builtin/index-pack.c:1282 msgid "confusion beyond insanity" msgstr "безумная путаница" -#: builtin/index-pack.c:1251 +#: builtin/index-pack.c:1288 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" @@ -12815,12 +14934,12 @@ msgstr[1] "завершено с %d локальными объектами" msgstr[2] "завершено с %d локальными объектами" msgstr[3] "завершено с %d локальными объектами" -#: builtin/index-pack.c:1263 +#: builtin/index-pack.c:1300 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "Неожиданная контрольная сумма в конце %s (диск поврежден?)" -#: builtin/index-pack.c:1267 +#: builtin/index-pack.c:1304 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" @@ -12829,59 +14948,59 @@ msgstr[1] "пакет содержит %d неразрешенные дельт msgstr[2] "пакет содержит %d неразрешенных дельт" msgstr[3] "пакет содержит %d неразрешенных дельт" -#: builtin/index-pack.c:1291 +#: builtin/index-pack.c:1328 #, c-format msgid "unable to deflate appended object (%d)" msgstr "нельзя сжать присоединенный объект (%d)" -#: builtin/index-pack.c:1368 +#: builtin/index-pack.c:1424 #, c-format msgid "local object %s is corrupt" msgstr "локальный объект %s поврежден" -#: builtin/index-pack.c:1382 +#: builtin/index-pack.c:1444 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "имя пакета «%s» не оканчивается на «.pack»" -#: builtin/index-pack.c:1407 +#: builtin/index-pack.c:1469 #, c-format msgid "cannot write %s file '%s'" msgstr "" -#: builtin/index-pack.c:1415 +#: builtin/index-pack.c:1477 #, c-format msgid "cannot close written %s file '%s'" msgstr "" -#: builtin/index-pack.c:1439 +#: builtin/index-pack.c:1501 msgid "error while closing pack file" msgstr "ошибка при закрытии файла пакета" -#: builtin/index-pack.c:1453 +#: builtin/index-pack.c:1515 msgid "cannot store pack file" msgstr "не удалось сохранить файл пакета" -#: builtin/index-pack.c:1461 +#: builtin/index-pack.c:1523 msgid "cannot store index file" msgstr "не удалось сохранить файл индекса" -#: builtin/index-pack.c:1505 builtin/pack-objects.c:2728 +#: builtin/index-pack.c:1567 builtin/pack-objects.c:2944 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "плохой pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1573 +#: builtin/index-pack.c:1631 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Не удалось открыть существующий файл пакета «%s»" -#: builtin/index-pack.c:1575 +#: builtin/index-pack.c:1633 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "Не удалось открыть существующий файл индекса для «%s»" -#: builtin/index-pack.c:1623 +#: builtin/index-pack.c:1681 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" @@ -12890,7 +15009,7 @@ msgstr[1] "не дельты: %d объекта" msgstr[2] "не дельты: %d объектов" msgstr[3] "не дельты: %d объектов" -#: builtin/index-pack.c:1630 +#: builtin/index-pack.c:1688 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" @@ -12899,698 +15018,761 @@ msgstr[1] "длина цепочки = %d: %lu объекта" msgstr[2] "длина цепочки = %d: %lu объектов" msgstr[3] "длина цепочки = %d: %lu объектов" -#: builtin/index-pack.c:1667 +#: builtin/index-pack.c:1728 msgid "Cannot come back to cwd" msgstr "Не удалось вернуться в текущий рабочий каталог" -#: builtin/index-pack.c:1716 builtin/index-pack.c:1719 -#: builtin/index-pack.c:1735 builtin/index-pack.c:1739 +#: builtin/index-pack.c:1777 builtin/index-pack.c:1780 +#: builtin/index-pack.c:1796 builtin/index-pack.c:1800 #, c-format msgid "bad %s" msgstr "плохой %s" -#: builtin/index-pack.c:1755 +#: builtin/index-pack.c:1806 builtin/init-db.c:392 builtin/init-db.c:625 +#, c-format +msgid "unknown hash algorithm '%s'" +msgstr "" + +#: builtin/index-pack.c:1821 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin нельзя использовать без --stdin" -#: builtin/index-pack.c:1757 +#: builtin/index-pack.c:1823 msgid "--stdin requires a git repository" msgstr "опция --stdin требует наличия репозитория git" -#: builtin/index-pack.c:1763 +#: builtin/index-pack.c:1825 +msgid "--object-format cannot be used with --stdin" +msgstr "" + +#: builtin/index-pack.c:1831 msgid "--verify with no packfile name given" msgstr "--verify без указания имени файла пакета" -#: builtin/index-pack.c:1811 builtin/unpack-objects.c:580 +#: builtin/index-pack.c:1892 builtin/unpack-objects.c:582 msgid "fsck error in pack objects" -msgstr "" +msgstr "ошибка fsck в упакованных объектах" -#: builtin/init-db.c:61 +#: builtin/init-db.c:64 #, c-format msgid "cannot stat template '%s'" msgstr "не удалось выполнить stat для шаблона «%s»" -#: builtin/init-db.c:66 +#: builtin/init-db.c:69 #, c-format msgid "cannot opendir '%s'" msgstr "не удалось выполнить opendir для «%s»" -#: builtin/init-db.c:78 +#: builtin/init-db.c:81 #, c-format msgid "cannot readlink '%s'" msgstr "не удалось выполнить readlink для «%s»" -#: builtin/init-db.c:80 +#: builtin/init-db.c:83 #, c-format msgid "cannot symlink '%s' '%s'" msgstr "не удалось создать символьную ссылку «%s» на «%s»" -#: builtin/init-db.c:86 +#: builtin/init-db.c:89 #, c-format msgid "cannot copy '%s' to '%s'" msgstr "не удалось скопировать файл «%s» в «%s»" -#: builtin/init-db.c:90 +#: builtin/init-db.c:93 #, c-format msgid "ignoring template %s" msgstr "игнорирование шаблона %s" -#: builtin/init-db.c:121 +#: builtin/init-db.c:124 #, c-format msgid "templates not found in %s" msgstr "" -#: builtin/init-db.c:136 +#: builtin/init-db.c:139 #, c-format msgid "not copying templates from '%s': %s" msgstr "не копирую шаблоны из «%s»: %s" -#: builtin/init-db.c:334 +#: builtin/init-db.c:275 +#, c-format +msgid "invalid initial branch name: '%s'" +msgstr "" + +#: builtin/init-db.c:367 #, c-format msgid "unable to handle file type %d" msgstr "не удается обработать файл типа %d" -#: builtin/init-db.c:337 +#: builtin/init-db.c:370 #, c-format msgid "unable to move %s to %s" msgstr "не удается переместить файл %s в %s" -#: builtin/init-db.c:354 builtin/init-db.c:357 +#: builtin/init-db.c:386 +msgid "attempt to reinitialize repository with different hash" +msgstr "" + +#: builtin/init-db.c:410 builtin/init-db.c:413 #, c-format msgid "%s already exists" msgstr "%s уже существует" -#: builtin/init-db.c:413 +#: builtin/init-db.c:445 +#, c-format +msgid "re-init: ignored --initial-branch=%s" +msgstr "" + +#: builtin/init-db.c:476 #, c-format msgid "Reinitialized existing shared Git repository in %s%s\n" msgstr "Переинициализирован существующий общий репозиторий Git в %s%s\n" -#: builtin/init-db.c:414 +#: builtin/init-db.c:477 #, c-format msgid "Reinitialized existing Git repository in %s%s\n" msgstr "Переинициализирован существующий репозиторий Git в %s%s\n" -#: builtin/init-db.c:418 +#: builtin/init-db.c:481 #, c-format msgid "Initialized empty shared Git repository in %s%s\n" msgstr "Инициализирован пустой общий репозиторий Git в %s%s\n" -#: builtin/init-db.c:419 +#: builtin/init-db.c:482 #, c-format msgid "Initialized empty Git repository in %s%s\n" msgstr "Инициализирован пустой репозиторий Git в %s%s\n" -#: builtin/init-db.c:468 +#: builtin/init-db.c:531 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] " "[--shared[=<permissions>]] [<directory>]" msgstr "git init [-q | --quiet] [--bare] [--template=<каталог-шаблонов>] [--shared[=<права-доступа>]] [<каталог>]" -#: builtin/init-db.c:491 +#: builtin/init-db.c:557 msgid "permissions" msgstr "права-доступа" -#: builtin/init-db.c:492 +#: builtin/init-db.c:558 msgid "specify that the git repository is to be shared amongst several users" msgstr "укажите, если репозиторий git будет использоваться несколькими пользователями" -#: builtin/init-db.c:526 builtin/init-db.c:531 +#: builtin/init-db.c:564 +msgid "override the name of the initial branch" +msgstr "" + +#: builtin/init-db.c:565 builtin/verify-pack.c:74 +msgid "hash" +msgstr "хэш-код" + +#: builtin/init-db.c:566 builtin/show-index.c:22 builtin/verify-pack.c:75 +msgid "specify the hash algorithm to use" +msgstr "указание какой алгоритм хэширования использовать" + +#: builtin/init-db.c:573 +msgid "--separate-git-dir and --bare are mutually exclusive" +msgstr "" + +#: builtin/init-db.c:602 builtin/init-db.c:607 #, c-format msgid "cannot mkdir %s" msgstr "не удалось выполнить mkdir %s" -#: builtin/init-db.c:535 +#: builtin/init-db.c:611 builtin/init-db.c:666 #, c-format msgid "cannot chdir to %s" msgstr "не удалось выполнить chdir в %s" -#: builtin/init-db.c:556 +#: builtin/init-db.c:638 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" "dir=<directory>)" msgstr "%s (или --work-tree=<каталог>) нельзя использовать без указания %s (или --git-dir=<каталог>)" -#: builtin/init-db.c:584 +#: builtin/init-db.c:690 #, c-format msgid "Cannot access work tree '%s'" msgstr "Не удалось получить доступ к рабочему каталогу «%s»" -#: builtin/interpret-trailers.c:15 +#: builtin/init-db.c:695 +msgid "--separate-git-dir incompatible with bare repository" +msgstr "" + +#: builtin/interpret-trailers.c:16 msgid "" "git interpret-trailers [--in-place] [--trim-empty] [(--trailer " "<token>[(=|:)<value>])...] [<file>...]" msgstr "git interpret-trailers [--in-place] [--trim-empty] [(--trailer <ключ>[(=|:)<значение>])…] [<файл>…]" -#: builtin/interpret-trailers.c:94 +#: builtin/interpret-trailers.c:95 msgid "edit files in place" msgstr "редактировать файлы на месте" -#: builtin/interpret-trailers.c:95 +#: builtin/interpret-trailers.c:96 msgid "trim empty trailers" msgstr "удалять пустые завершители" -#: builtin/interpret-trailers.c:98 +#: builtin/interpret-trailers.c:99 msgid "where to place the new trailer" msgstr "где поместить новый завершитель" -#: builtin/interpret-trailers.c:100 +#: builtin/interpret-trailers.c:101 msgid "action if trailer already exists" msgstr "действие, если завершитель уже существует" -#: builtin/interpret-trailers.c:102 +#: builtin/interpret-trailers.c:103 msgid "action if trailer is missing" msgstr "действие, если завершитель не существует" -#: builtin/interpret-trailers.c:104 +#: builtin/interpret-trailers.c:105 msgid "output only the trailers" msgstr "вывести только завершители" -#: builtin/interpret-trailers.c:105 +#: builtin/interpret-trailers.c:106 msgid "do not apply config rules" msgstr "не применять правила из файла конфигурации" -#: builtin/interpret-trailers.c:106 +#: builtin/interpret-trailers.c:107 msgid "join whitespace-continued values" msgstr "объединить значения разделенные пробелом" -#: builtin/interpret-trailers.c:107 +#: builtin/interpret-trailers.c:108 msgid "set parsing options" msgstr "указание опций разбора" -#: builtin/interpret-trailers.c:109 +#: builtin/interpret-trailers.c:110 msgid "do not treat --- specially" -msgstr "" +msgstr "не воспринимать --- по-особенному" -#: builtin/interpret-trailers.c:110 +#: builtin/interpret-trailers.c:111 msgid "trailer" msgstr "завершитель" -#: builtin/interpret-trailers.c:111 +#: builtin/interpret-trailers.c:112 msgid "trailer(s) to add" msgstr "завершители для добавления" -#: builtin/interpret-trailers.c:120 +#: builtin/interpret-trailers.c:123 msgid "--trailer with --only-input does not make sense" msgstr "--trailer одновременно с --only-input не имеет смысла" -#: builtin/interpret-trailers.c:130 +#: builtin/interpret-trailers.c:133 msgid "no input file given for in-place editing" msgstr "ничего не передано, для редактирования файлов на месте" -#: builtin/log.c:55 +#: builtin/log.c:58 msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "git log [<опции>] [<диапазон-редакций>] [[--] <путь>…]" -#: builtin/log.c:56 +#: builtin/log.c:59 msgid "git show [<options>] <object>..." msgstr "git show [<опции>] <объект>…" -#: builtin/log.c:104 +#: builtin/log.c:112 #, c-format msgid "invalid --decorate option: %s" msgstr "неправильный параметр для --decorate: %s" -#: builtin/log.c:168 +#: builtin/log.c:179 msgid "show source" msgstr "показать источник" -#: builtin/log.c:169 +#: builtin/log.c:180 msgid "Use mail map file" msgstr "Использовать файл соответствия почтовых адресов" -#: builtin/log.c:171 +#: builtin/log.c:183 msgid "only decorate refs that match <pattern>" msgstr "декорировать только ссылки соответствующие <шаблону>" -#: builtin/log.c:173 +#: builtin/log.c:185 msgid "do not decorate refs that match <pattern>" msgstr "не декорировать ссылки соответствующие <шаблону>" -#: builtin/log.c:174 +#: builtin/log.c:186 msgid "decorate options" msgstr "опции формата вывода ссылок" -#: builtin/log.c:177 -msgid "Process line range n,m in file, counting from 1" -msgstr "Обработать диапазон строк n,m из файла, начиная с 1" +#: builtin/log.c:189 +msgid "" +"Trace the evolution of line range <start>,<end> or function :<funcname> in " +"<file>" +msgstr "" -#: builtin/log.c:275 +#: builtin/log.c:212 +msgid "-L<range>:<file> cannot be used with pathspec" +msgstr "" + +#: builtin/log.c:302 #, c-format msgid "Final output: %d %s\n" msgstr "Финальный вывод: %d %s\n" -#: builtin/log.c:529 +#: builtin/log.c:564 #, c-format msgid "git show %s: bad file" msgstr "git show %s: плохой файл" -#: builtin/log.c:544 builtin/log.c:638 +#: builtin/log.c:579 builtin/log.c:674 #, c-format msgid "could not read object %s" msgstr "" -#: builtin/log.c:663 +#: builtin/log.c:699 #, c-format msgid "unknown type: %d" msgstr "" -#: builtin/log.c:784 +#: builtin/log.c:848 +#, c-format +msgid "%s: invalid cover from description mode" +msgstr "" + +#: builtin/log.c:855 msgid "format.headers without value" msgstr "в format.headers не указано значение" -#: builtin/log.c:885 -msgid "name of output directory is too long" -msgstr "слишком длинное имя выходного каталога" - -#: builtin/log.c:901 +#: builtin/log.c:984 #, c-format msgid "cannot open patch file %s" msgstr "" -#: builtin/log.c:918 +#: builtin/log.c:1001 msgid "need exactly one range" msgstr "" -#: builtin/log.c:928 +#: builtin/log.c:1011 msgid "not a range" msgstr "" -#: builtin/log.c:1051 +#: builtin/log.c:1175 msgid "cover letter needs email format" msgstr "" -#: builtin/log.c:1057 +#: builtin/log.c:1181 msgid "failed to create cover-letter file" msgstr "" -#: builtin/log.c:1136 +#: builtin/log.c:1262 #, c-format msgid "insane in-reply-to: %s" msgstr "ошибка в поле in-reply-to: %s" -#: builtin/log.c:1163 +#: builtin/log.c:1289 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<опции>] [<начиная-с> | <диапазон-редакций>]" -#: builtin/log.c:1221 +#: builtin/log.c:1347 msgid "two output directories?" msgstr "" -#: builtin/log.c:1332 builtin/log.c:2076 builtin/log.c:2078 builtin/log.c:2090 +#: builtin/log.c:1498 builtin/log.c:2318 builtin/log.c:2320 builtin/log.c:2332 #, c-format msgid "unknown commit %s" msgstr "" -#: builtin/log.c:1342 builtin/replace.c:58 builtin/replace.c:207 +#: builtin/log.c:1509 builtin/replace.c:58 builtin/replace.c:207 #: builtin/replace.c:210 #, c-format msgid "failed to resolve '%s' as a valid ref" msgstr "" -#: builtin/log.c:1347 +#: builtin/log.c:1518 msgid "could not find exact merge base" msgstr "" -#: builtin/log.c:1351 +#: builtin/log.c:1528 msgid "" "failed to get upstream, if you want to record base commit automatically,\n" "please use git branch --set-upstream-to to track a remote branch.\n" "Or you could specify base commit by --base=<base-commit-id> manually" msgstr "" -#: builtin/log.c:1371 +#: builtin/log.c:1551 msgid "failed to find exact merge base" msgstr "" -#: builtin/log.c:1382 +#: builtin/log.c:1568 msgid "base commit should be the ancestor of revision list" msgstr "базовый коммит должен быть предком списка редакций" -#: builtin/log.c:1386 +#: builtin/log.c:1578 msgid "base commit shouldn't be in revision list" msgstr "базовый коммит не должен быть в списке редакций" -#: builtin/log.c:1439 +#: builtin/log.c:1636 msgid "cannot get patch id" msgstr "не удалось получить идентификатор патча" -#: builtin/log.c:1491 -msgid "failed to infer range-diff ranges" +#: builtin/log.c:1693 +msgid "failed to infer range-diff origin of current series" +msgstr "" + +#: builtin/log.c:1695 +#, c-format +msgid "using '%s' as range-diff origin of current series" msgstr "" -#: builtin/log.c:1536 +#: builtin/log.c:1739 msgid "use [PATCH n/m] even with a single patch" msgstr "выводить [PATCH n/m] даже когда один патч" -#: builtin/log.c:1539 +#: builtin/log.c:1742 msgid "use [PATCH] even with multiple patches" msgstr "выводить [PATCH] даже когда несколько патчей" -#: builtin/log.c:1543 +#: builtin/log.c:1746 msgid "print patches to standard out" msgstr "выводить патчи на стандартный вывод" -#: builtin/log.c:1545 +#: builtin/log.c:1748 msgid "generate a cover letter" msgstr "создать сопроводительное письмо" -#: builtin/log.c:1547 +#: builtin/log.c:1750 msgid "use simple number sequence for output file names" msgstr "использовать простую последовательность чисел для имен выходных файлов" -#: builtin/log.c:1548 +#: builtin/log.c:1751 msgid "sfx" msgstr "суффикс" -#: builtin/log.c:1549 +#: builtin/log.c:1752 msgid "use <sfx> instead of '.patch'" msgstr "использовать суффикс <суффикс> вместо «.patch»" -#: builtin/log.c:1551 +#: builtin/log.c:1754 msgid "start numbering patches at <n> instead of 1" msgstr "начать нумерацию патчей с <n>, а не с 1" -#: builtin/log.c:1553 +#: builtin/log.c:1756 msgid "mark the series as Nth re-roll" msgstr "пометить серию как энную попытку" -#: builtin/log.c:1555 +#: builtin/log.c:1758 +msgid "max length of output filename" +msgstr "" + +#: builtin/log.c:1760 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "Использовать [RFC PATCH] вместо [PATCH]" -#: builtin/log.c:1558 +#: builtin/log.c:1763 +msgid "cover-from-description-mode" +msgstr "" + +#: builtin/log.c:1764 +msgid "generate parts of a cover letter based on a branch's description" +msgstr "" + +#: builtin/log.c:1766 msgid "Use [<prefix>] instead of [PATCH]" msgstr "Использовать [<префикс>] вместо [PATCH]" -#: builtin/log.c:1561 +#: builtin/log.c:1769 msgid "store resulting files in <dir>" msgstr "сохранить результирующие файлы в <каталог>" -#: builtin/log.c:1564 +#: builtin/log.c:1772 msgid "don't strip/add [PATCH]" msgstr "не обрезать/добавлять [PATCH]" -#: builtin/log.c:1567 +#: builtin/log.c:1775 msgid "don't output binary diffs" msgstr "не выводить двоичные изменения" -#: builtin/log.c:1569 +#: builtin/log.c:1777 msgid "output all-zero hash in From header" -msgstr "выводить нулевую хеш-сумму в заголовке From" +msgstr "выводить нулевой хэш-код в заголовке From" -#: builtin/log.c:1571 +#: builtin/log.c:1779 msgid "don't include a patch matching a commit upstream" msgstr "не включать патч, если коммит уже есть в вышестоящей ветке" -#: builtin/log.c:1573 +#: builtin/log.c:1781 msgid "show patch format instead of default (patch + stat)" msgstr "выводить в формате патча, а не в стандартном (патч + статистика)" -#: builtin/log.c:1575 +#: builtin/log.c:1783 msgid "Messaging" msgstr "Передача сообщений" -#: builtin/log.c:1576 +#: builtin/log.c:1784 msgid "header" msgstr "заголовок" -#: builtin/log.c:1577 +#: builtin/log.c:1785 msgid "add email header" msgstr "добавить заголовок сообщения" -#: builtin/log.c:1578 builtin/log.c:1580 +#: builtin/log.c:1786 builtin/log.c:1787 msgid "email" msgstr "почта" -#: builtin/log.c:1578 +#: builtin/log.c:1786 msgid "add To: header" msgstr "добавить заголовок To:" -#: builtin/log.c:1580 +#: builtin/log.c:1787 msgid "add Cc: header" msgstr "добавить заголовок Cc:" -#: builtin/log.c:1582 +#: builtin/log.c:1788 msgid "ident" msgstr "идентификатор" -#: builtin/log.c:1583 +#: builtin/log.c:1789 msgid "set From address to <ident> (or committer ident if absent)" msgstr "установить адрес отправителя на <идентификатор> (или на идентификатор коммитера, если отсутствует)" -#: builtin/log.c:1585 +#: builtin/log.c:1791 msgid "message-id" msgstr "идентификатор-сообщения" -#: builtin/log.c:1586 +#: builtin/log.c:1792 msgid "make first mail a reply to <message-id>" msgstr "сделать первое письмо ответом на <идентификатор-сообщения>" -#: builtin/log.c:1587 builtin/log.c:1590 +#: builtin/log.c:1793 builtin/log.c:1796 msgid "boundary" msgstr "вложение" -#: builtin/log.c:1588 +#: builtin/log.c:1794 msgid "attach the patch" msgstr "приложить патч" -#: builtin/log.c:1591 +#: builtin/log.c:1797 msgid "inline the patch" msgstr "включить патч в текст письма" -#: builtin/log.c:1595 +#: builtin/log.c:1801 msgid "enable message threading, styles: shallow, deep" msgstr "включить в письмах иерархичность, стили: shallow (частичную), deep (глубокую)" -#: builtin/log.c:1597 +#: builtin/log.c:1803 msgid "signature" msgstr "подпись" -#: builtin/log.c:1598 +#: builtin/log.c:1804 msgid "add a signature" msgstr "добавить подпись" -#: builtin/log.c:1599 +#: builtin/log.c:1805 msgid "base-commit" msgstr "базовый коммит" -#: builtin/log.c:1600 +#: builtin/log.c:1806 msgid "add prerequisite tree info to the patch series" msgstr "добавить информацию о требовании дерева к серии патчей" -#: builtin/log.c:1602 +#: builtin/log.c:1809 msgid "add a signature from a file" msgstr "добавить подпись из файла" -#: builtin/log.c:1603 +#: builtin/log.c:1810 msgid "don't print the patch filenames" msgstr "не выводить имена файлов патчей" -#: builtin/log.c:1605 +#: builtin/log.c:1812 msgid "show progress while generating patches" msgstr "показать прогресс выполнения во создания патчей" -#: builtin/log.c:1606 -msgid "rev" -msgstr "" - -#: builtin/log.c:1607 +#: builtin/log.c:1814 msgid "show changes against <rev> in cover letter or single patch" msgstr "" -#: builtin/log.c:1610 +#: builtin/log.c:1817 msgid "show changes against <refspec> in cover letter or single patch" msgstr "" -#: builtin/log.c:1612 +#: builtin/log.c:1819 msgid "percentage by which creation is weighted" msgstr "" -#: builtin/log.c:1687 +#: builtin/log.c:1905 #, c-format msgid "invalid ident line: %s" msgstr "неправильная строка идентификации: %s" -#: builtin/log.c:1702 +#: builtin/log.c:1920 msgid "-n and -k are mutually exclusive" msgstr "" -#: builtin/log.c:1704 +#: builtin/log.c:1922 msgid "--subject-prefix/--rfc and -k are mutually exclusive" msgstr "" -#: builtin/log.c:1712 +#: builtin/log.c:1930 msgid "--name-only does not make sense" msgstr "--name-only не имеет смысла" -#: builtin/log.c:1714 +#: builtin/log.c:1932 msgid "--name-status does not make sense" msgstr "--name-status не имеет смысла" -#: builtin/log.c:1716 +#: builtin/log.c:1934 msgid "--check does not make sense" msgstr "--check не имеет смысла" -#: builtin/log.c:1748 -msgid "standard output, or directory, which one?" -msgstr "стандартный вывод или каталог?" +#: builtin/log.c:1956 +msgid "--stdout, --output, and --output-directory are mutually exclusive" +msgstr "" -#: builtin/log.c:1837 +#: builtin/log.c:2079 msgid "--interdiff requires --cover-letter or single patch" msgstr "" -#: builtin/log.c:1841 +#: builtin/log.c:2083 msgid "Interdiff:" msgstr "" -#: builtin/log.c:1842 +#: builtin/log.c:2084 #, c-format msgid "Interdiff against v%d:" msgstr "" -#: builtin/log.c:1848 +#: builtin/log.c:2090 msgid "--creation-factor requires --range-diff" msgstr "" -#: builtin/log.c:1852 +#: builtin/log.c:2094 msgid "--range-diff requires --cover-letter or single patch" msgstr "" -#: builtin/log.c:1860 +#: builtin/log.c:2102 msgid "Range-diff:" msgstr "" -#: builtin/log.c:1861 +#: builtin/log.c:2103 #, c-format msgid "Range-diff against v%d:" msgstr "" -#: builtin/log.c:1872 +#: builtin/log.c:2114 #, c-format msgid "unable to read signature file '%s'" msgstr "не удалось прочитать файл подписи «%s»" -#: builtin/log.c:1908 +#: builtin/log.c:2150 msgid "Generating patches" msgstr "Создание патчей" -#: builtin/log.c:1952 +#: builtin/log.c:2194 msgid "failed to create output files" msgstr "" -#: builtin/log.c:2011 +#: builtin/log.c:2253 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<вышестоящая-ветка> [<редакция> [<ограничение>]]]" -#: builtin/log.c:2065 +#: builtin/log.c:2307 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> " "manually.\n" msgstr "Не удалось найти отслеживаемую внешнюю ветку, укажите <вышестоящую-ветку> вручную.\n" -#: builtin/ls-files.c:470 +#: builtin/ls-files.c:471 msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<опции>] [<файл>…]" -#: builtin/ls-files.c:526 +#: builtin/ls-files.c:527 msgid "identify the file status with tags" msgstr "выводить имена файлов с метками" -#: builtin/ls-files.c:528 +#: builtin/ls-files.c:529 msgid "use lowercase letters for 'assume unchanged' files" msgstr "использовать символы в нижнем регистре для «предположительно без изменений» файлов" -#: builtin/ls-files.c:530 +#: builtin/ls-files.c:531 msgid "use lowercase letters for 'fsmonitor clean' files" msgstr "использовать символы нижнего регистра для файлов «fsmonitor clean»" -#: builtin/ls-files.c:532 +#: builtin/ls-files.c:533 msgid "show cached files in the output (default)" msgstr "показывать кэшированные файлы при выводе (по умолчанию)" -#: builtin/ls-files.c:534 +#: builtin/ls-files.c:535 msgid "show deleted files in the output" msgstr "показывать удаленные файлы при выводе" -#: builtin/ls-files.c:536 +#: builtin/ls-files.c:537 msgid "show modified files in the output" msgstr "показывать измененные файлы при выводе" -#: builtin/ls-files.c:538 +#: builtin/ls-files.c:539 msgid "show other files in the output" msgstr "показывать другие файлы при выводе" -#: builtin/ls-files.c:540 +#: builtin/ls-files.c:541 msgid "show ignored files in the output" msgstr "показывать игнорируемые файлы при выводе" -#: builtin/ls-files.c:543 +#: builtin/ls-files.c:544 msgid "show staged contents' object name in the output" msgstr "показывать имя индексированного объекта на выводе" -#: builtin/ls-files.c:545 +#: builtin/ls-files.c:546 msgid "show files on the filesystem that need to be removed" msgstr "показывать файлы в файловой системе, которые должны быть удалены" -#: builtin/ls-files.c:547 +#: builtin/ls-files.c:548 msgid "show 'other' directories' names only" msgstr "показывать только имена у «других» каталогов" -#: builtin/ls-files.c:549 +#: builtin/ls-files.c:550 msgid "show line endings of files" msgstr "показать концы строк файлов" -#: builtin/ls-files.c:551 +#: builtin/ls-files.c:552 msgid "don't show empty directories" msgstr "не показывать пустые каталоги" -#: builtin/ls-files.c:554 +#: builtin/ls-files.c:555 msgid "show unmerged files in the output" msgstr "показывать не слитые файлы на выводе" -#: builtin/ls-files.c:556 +#: builtin/ls-files.c:557 msgid "show resolve-undo information" msgstr "показывать информации о разрешении конфликтов и отмене" -#: builtin/ls-files.c:558 +#: builtin/ls-files.c:559 msgid "skip files matching pattern" msgstr "пропустить файлы, соответствующие шаблону" -#: builtin/ls-files.c:561 +#: builtin/ls-files.c:562 msgid "exclude patterns are read from <file>" msgstr "прочитать шаблоны исключения из <файл>" -#: builtin/ls-files.c:564 +#: builtin/ls-files.c:565 msgid "read additional per-directory exclude patterns in <file>" msgstr "прочитать дополнительные покаталожные шаблоны исключения из <файл>" -#: builtin/ls-files.c:566 +#: builtin/ls-files.c:567 msgid "add the standard git exclusions" msgstr "добавить стандартные исключения git" -#: builtin/ls-files.c:570 +#: builtin/ls-files.c:571 msgid "make the output relative to the project top directory" msgstr "выводить пути относительно корневого каталога проекта" -#: builtin/ls-files.c:573 +#: builtin/ls-files.c:574 msgid "recurse through submodules" msgstr "рекурсивно по подмодулям" -#: builtin/ls-files.c:575 +#: builtin/ls-files.c:576 msgid "if any <file> is not in the index, treat this as an error" msgstr "если какой-либо <файл> не в индексе, считать это ошибкой" -#: builtin/ls-files.c:576 +#: builtin/ls-files.c:577 msgid "tree-ish" msgstr "указатель-дерева" -#: builtin/ls-files.c:577 +#: builtin/ls-files.c:578 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "притвориться, что пути удалены, т.к. <указатель-дерева> еще существует" -#: builtin/ls-files.c:579 +#: builtin/ls-files.c:580 msgid "show debugging data" msgstr "показать отладочную информацию" @@ -13605,7 +15787,7 @@ msgstr "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<запуск>] msgid "do not print remote URL" msgstr "не выводить URL внешних репозиториев" -#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1458 +#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1398 msgid "exec" msgstr "запуск" @@ -13678,476 +15860,488 @@ msgstr "вывести полное дерево; не только текущи msgid "empty mbox: '%s'" msgstr "пустой mbox: «%s»" -#: builtin/merge.c:54 +#: builtin/merge-base.c:32 +msgid "git merge-base [-a | --all] <commit> <commit>..." +msgstr "git merge-base [-a | --all] <коммит> <коммит>…" + +#: builtin/merge-base.c:33 +msgid "git merge-base [-a | --all] --octopus <commit>..." +msgstr "git merge-base [-a | --all] --octopus <коммит>…" + +#: builtin/merge-base.c:34 +msgid "git merge-base --independent <commit>..." +msgstr "git merge-base --independent <коммит>…" + +#: builtin/merge-base.c:35 +msgid "git merge-base --is-ancestor <commit> <commit>" +msgstr "git merge-base --is-ancestor <коммит> <коммит>" + +#: builtin/merge-base.c:36 +msgid "git merge-base --fork-point <ref> [<commit>]" +msgstr "git merge-base --fork-point <ссылка> [<коммит>]" + +#: builtin/merge-base.c:143 +msgid "output all common ancestors" +msgstr "вывести всех общих предков" + +#: builtin/merge-base.c:145 +msgid "find ancestors for a single n-way merge" +msgstr "вывести предков для одного многоходового слияния" + +#: builtin/merge-base.c:147 +msgid "list revs not reachable from others" +msgstr "вывести список редаций, которые не достижимы из друг друга" + +#: builtin/merge-base.c:149 +msgid "is the first one ancestor of the other?" +msgstr "является первым предком второго указанного коммита?" + +#: builtin/merge-base.c:151 +msgid "find where <commit> forked from reflog of <ref>" +msgstr "найти журнале ссылок <ссылка> где именно <коммит> разветвился" + +#: builtin/merge-file.c:9 +msgid "" +"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> " +"<orig-file> <file2>" +msgstr "git merge-file [<опции>] [-L имя1 [-L orig [-L имя2]]] <файл1> <ориг-файл> <файл2>" + +#: builtin/merge-file.c:35 +msgid "send results to standard output" +msgstr "вывести результат на стандартный вывод" + +#: builtin/merge-file.c:36 +msgid "use a diff3 based merge" +msgstr "использовать diff3 слияние" + +#: builtin/merge-file.c:37 +msgid "for conflicts, use our version" +msgstr "при возникновении конфликтов, использовать нашу версию" + +#: builtin/merge-file.c:39 +msgid "for conflicts, use their version" +msgstr "при возникновении конфликтов, использовать их версию" + +#: builtin/merge-file.c:41 +msgid "for conflicts, use a union version" +msgstr "при возникновении конфликтов, использовать обе версии" + +#: builtin/merge-file.c:44 +msgid "for conflicts, use this marker size" +msgstr "при возникновении конфликтов, использовать этот размер маркера" + +#: builtin/merge-file.c:45 +msgid "do not warn about conflicts" +msgstr "не предупреждать о конфликтах" + +#: builtin/merge-file.c:47 +msgid "set labels for file1/orig-file/file2" +msgstr "установить метки для файл1/ориг-файл/файл2" + +#: builtin/merge-recursive.c:47 +#, c-format +msgid "unknown option %s" +msgstr "неизвестная опция %s" + +#: builtin/merge-recursive.c:53 +#, c-format +msgid "could not parse object '%s'" +msgstr "не удалось разобрать объект «%s»" + +#: builtin/merge-recursive.c:57 +#, c-format +msgid "cannot handle more than %d base. Ignoring %s." +msgid_plural "cannot handle more than %d bases. Ignoring %s." +msgstr[0] "невозможно обработать больше %d базы. Игнорирую %s." +msgstr[1] "невозможно обработать больше %d баз. Игнорирую %s." +msgstr[2] "невозможно обработать больше %d баз. Игнорирую %s." +msgstr[3] "невозможно обработать больше %d базы. Игнорирую %s." + +#: builtin/merge-recursive.c:65 +msgid "not handling anything other than two heads merge." +msgstr "не обрабатываю ничего, кроме слияния двух указателей на ветки." + +#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76 +#, c-format +msgid "could not resolve ref '%s'" +msgstr "не удалось распознать ссылку «%s»" + +#: builtin/merge-recursive.c:82 +#, c-format +msgid "Merging %s with %s\n" +msgstr "Слияние %s и %s\n" + +#: builtin/merge.c:57 msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<опции>] [<коммит>…]" -#: builtin/merge.c:55 +#: builtin/merge.c:58 msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:56 +#: builtin/merge.c:59 msgid "git merge --continue" msgstr "git merge --continue" -#: builtin/merge.c:116 +#: builtin/merge.c:122 msgid "switch `m' requires a value" msgstr "при указании параметра «m» требуется указать значение" -#: builtin/merge.c:139 +#: builtin/merge.c:145 #, c-format msgid "option `%s' requires a value" msgstr "" -#: builtin/merge.c:185 +#: builtin/merge.c:198 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "Не удалось найти стратегию слияния «%s».\n" -#: builtin/merge.c:186 +#: builtin/merge.c:199 #, c-format msgid "Available strategies are:" msgstr "Доступные стратегии:" -#: builtin/merge.c:191 +#: builtin/merge.c:204 #, c-format msgid "Available custom strategies are:" msgstr "Доступные пользовательские стратегии:" -#: builtin/merge.c:242 builtin/pull.c:150 +#: builtin/merge.c:255 builtin/pull.c:133 msgid "do not show a diffstat at the end of the merge" msgstr "не выводить статистику изменений после окончания слияния" -#: builtin/merge.c:245 builtin/pull.c:153 +#: builtin/merge.c:258 builtin/pull.c:136 msgid "show a diffstat at the end of the merge" msgstr "вывести статистику изменений после окончания слияния" -#: builtin/merge.c:246 builtin/pull.c:156 +#: builtin/merge.c:259 builtin/pull.c:139 msgid "(synonym to --stat)" msgstr "(синоним для --stat)" -#: builtin/merge.c:248 builtin/pull.c:159 +#: builtin/merge.c:261 builtin/pull.c:142 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "добавить (максимум <n>) записей из короткого журнала в сообщение коммита у слияния" -#: builtin/merge.c:251 builtin/pull.c:165 +#: builtin/merge.c:264 builtin/pull.c:148 msgid "create a single commit instead of doing a merge" msgstr "создать один коммит, вместо выполнения слияния" -#: builtin/merge.c:253 builtin/pull.c:168 +#: builtin/merge.c:266 builtin/pull.c:151 msgid "perform a commit if the merge succeeds (default)" msgstr "сделать коммит, если слияние прошло успешно (по умолчанию)" -#: builtin/merge.c:255 builtin/pull.c:171 +#: builtin/merge.c:268 builtin/pull.c:154 msgid "edit message before committing" msgstr "отредактировать сообщение перед выполнением коммита" -#: builtin/merge.c:257 +#: builtin/merge.c:270 msgid "allow fast-forward (default)" msgstr "разрешить перемотку вперед (по умолчанию)" -#: builtin/merge.c:259 builtin/pull.c:178 +#: builtin/merge.c:272 builtin/pull.c:161 msgid "abort if fast-forward is not possible" msgstr "отменить выполнение слияния, если перемотка вперед невозможна" -#: builtin/merge.c:263 builtin/pull.c:181 +#: builtin/merge.c:276 builtin/pull.c:164 msgid "verify that the named commit has a valid GPG signature" msgstr "проверить, что указанный коммит имеет верную электронную подпись GPG" -#: builtin/merge.c:264 builtin/notes.c:787 builtin/pull.c:185 -#: builtin/rebase.c:492 builtin/rebase.c:1471 builtin/revert.c:113 +#: builtin/merge.c:277 builtin/notes.c:787 builtin/pull.c:168 +#: builtin/rebase.c:539 builtin/rebase.c:1412 builtin/revert.c:114 msgid "strategy" msgstr "стратегия" -#: builtin/merge.c:265 builtin/pull.c:186 +#: builtin/merge.c:278 builtin/pull.c:169 msgid "merge strategy to use" msgstr "используемая стратегия слияния" -#: builtin/merge.c:266 builtin/pull.c:189 +#: builtin/merge.c:279 builtin/pull.c:172 msgid "option=value" msgstr "опция=значение" -#: builtin/merge.c:267 builtin/pull.c:190 +#: builtin/merge.c:280 builtin/pull.c:173 msgid "option for selected merge strategy" msgstr "опции для выбранной стратегии слияния" -#: builtin/merge.c:269 +#: builtin/merge.c:282 msgid "merge commit message (for a non-fast-forward merge)" msgstr "сообщение коммита для слияния (для слияния без перемотки вперед)" -#: builtin/merge.c:276 +#: builtin/merge.c:289 msgid "abort the current in-progress merge" msgstr "отменить выполнение происходящего слияния" -#: builtin/merge.c:278 +#: builtin/merge.c:291 +msgid "--abort but leave index and working tree alone" +msgstr "" + +#: builtin/merge.c:293 msgid "continue the current in-progress merge" msgstr "продолжить выполнение происходящего слияния" -#: builtin/merge.c:280 builtin/pull.c:197 +#: builtin/merge.c:295 builtin/pull.c:180 msgid "allow merging unrelated histories" msgstr "разрешить слияние несвязанных историй изменений" -#: builtin/merge.c:286 -msgid "verify commit-msg hook" -msgstr "проверить перехватчик commit-msg" +#: builtin/merge.c:302 +msgid "bypass pre-merge-commit and commit-msg hooks" +msgstr "" -#: builtin/merge.c:311 +#: builtin/merge.c:319 msgid "could not run stash." msgstr "не удалось выполнить stash." -#: builtin/merge.c:316 +#: builtin/merge.c:324 msgid "stash failed" msgstr "сбой при выполнении stash" -#: builtin/merge.c:321 +#: builtin/merge.c:329 #, c-format msgid "not a valid object: %s" msgstr "неправильный объект: %s" -#: builtin/merge.c:343 builtin/merge.c:360 +#: builtin/merge.c:351 builtin/merge.c:368 msgid "read-tree failed" msgstr "сбой при выполнении read-tree" -#: builtin/merge.c:390 +#: builtin/merge.c:398 msgid " (nothing to squash)" msgstr " (нечего уплотнять)" -#: builtin/merge.c:401 +#: builtin/merge.c:409 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Уплотнение коммита — не обновляя HEAD\n" -#: builtin/merge.c:451 +#: builtin/merge.c:459 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "Нет сообщения слияния — не обновляем HEAD\n" -#: builtin/merge.c:502 +#: builtin/merge.c:510 #, c-format msgid "'%s' does not point to a commit" msgstr "«%s» не указывает на коммит" -#: builtin/merge.c:589 +#: builtin/merge.c:597 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Неправильная строка branch.%s.mergeoptions: %s" -#: builtin/merge.c:712 +#: builtin/merge.c:723 msgid "Not handling anything other than two heads merge." msgstr "Не обрабатываю ничего, кроме слияния двух указателей на ветки." -#: builtin/merge.c:726 +#: builtin/merge.c:736 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Неизвестный параметр merge-recursive: -X%s" -#: builtin/merge.c:741 +#: builtin/merge.c:755 t/helper/test-fast-rebase.c:209 #, c-format msgid "unable to write %s" msgstr "не удалось записать %s" -#: builtin/merge.c:793 +#: builtin/merge.c:807 #, c-format msgid "Could not read from '%s'" msgstr "Не удалось прочесть из «%s»" -#: builtin/merge.c:802 +#: builtin/merge.c:816 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "Не выполняю коммит слияния; используйте «git commit» для завершения слияния.\n" -#: builtin/merge.c:808 +#: builtin/merge.c:822 msgid "" "Please enter a commit message to explain why this merge is necessary,\n" "especially if it merges an updated upstream into a topic branch.\n" "\n" msgstr "" -#: builtin/merge.c:813 +#: builtin/merge.c:827 msgid "An empty message aborts the commit.\n" msgstr "" -#: builtin/merge.c:816 +#: builtin/merge.c:830 #, c-format msgid "" "Lines starting with '%c' will be ignored, and an empty message aborts\n" "the commit.\n" msgstr "" -#: builtin/merge.c:857 +#: builtin/merge.c:883 msgid "Empty commit message." msgstr "Пустое сообщение коммита." -#: builtin/merge.c:876 +#: builtin/merge.c:898 #, c-format msgid "Wonderful.\n" msgstr "Прекрасно.\n" -#: builtin/merge.c:936 +#: builtin/merge.c:959 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "Не удалось провести автоматическое слияние; исправьте конфликты и сделайте коммит результата.\n" -#: builtin/merge.c:975 +#: builtin/merge.c:998 msgid "No current branch." msgstr "Нет текущей ветки." -#: builtin/merge.c:977 +#: builtin/merge.c:1000 msgid "No remote for the current branch." msgstr "У текущей ветки нет внешнего репозитория." -#: builtin/merge.c:979 +#: builtin/merge.c:1002 msgid "No default upstream defined for the current branch." msgstr "Для текущей ветки не указана вышестоящая ветка по умолчанию." -#: builtin/merge.c:984 +#: builtin/merge.c:1007 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "Не указана внешняя отслеживаемая ветка для %s на %s" -#: builtin/merge.c:1041 +#: builtin/merge.c:1064 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Плохое значение «%s» в переменной окружения «%s»" -#: builtin/merge.c:1144 +#: builtin/merge.c:1167 #, c-format msgid "not something we can merge in %s: %s" msgstr "не является тем, что можно слить в %s: %s" -#: builtin/merge.c:1178 +#: builtin/merge.c:1201 msgid "not something we can merge" msgstr "не является тем, что можно слить" -#: builtin/merge.c:1281 +#: builtin/merge.c:1311 msgid "--abort expects no arguments" msgstr "опция --abort не принимает аргументы" -#: builtin/merge.c:1285 +#: builtin/merge.c:1315 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "Нет слияния, которое можно отменить (отсутствует файл MERGE_HEAD)." -#: builtin/merge.c:1297 +#: builtin/merge.c:1333 +msgid "--quit expects no arguments" +msgstr "" + +#: builtin/merge.c:1346 msgid "--continue expects no arguments" msgstr "опция --continue не принимает аргументы" -#: builtin/merge.c:1301 +#: builtin/merge.c:1350 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "Сейчас не происходит слияние (отсутствует файл MERGE_HEAD)." -#: builtin/merge.c:1317 +#: builtin/merge.c:1366 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." msgstr "Вы не завершили слияние (присутствует файл MERGE_HEAD).\nВыполните коммит ваших изменений, перед слиянием." -#: builtin/merge.c:1324 +#: builtin/merge.c:1373 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." msgstr "Вы не завершили копирование коммита (присутствует файл CHERRY_PICK_HEAD).\nПожалуйста, закоммитьте ваши изменения, перед слиянием." -#: builtin/merge.c:1327 +#: builtin/merge.c:1376 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "Вы не завершили копирование коммита (присутствует файл CHERRY_PICK_HEAD)." -#: builtin/merge.c:1341 +#: builtin/merge.c:1390 msgid "You cannot combine --squash with --no-ff." msgstr "Нельзя использовать одновременно --squash и --no-ff." -#: builtin/merge.c:1349 +#: builtin/merge.c:1392 +msgid "You cannot combine --squash with --commit." +msgstr "" + +#: builtin/merge.c:1408 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "Коммит не указан и параметр merge.defaultToUpstream не установлен." -#: builtin/merge.c:1366 +#: builtin/merge.c:1425 msgid "Squash commit into empty head not supported yet" msgstr "Уплотнение коммита в пустую ветку еще не поддерживается" -#: builtin/merge.c:1368 +#: builtin/merge.c:1427 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "Коммит, не являющийся перемоткой вперед, нет смысла делать в пустую ветку." -#: builtin/merge.c:1373 +#: builtin/merge.c:1432 #, c-format msgid "%s - not something we can merge" msgstr "%s не является тем, что можно слить" -#: builtin/merge.c:1375 +#: builtin/merge.c:1434 msgid "Can merge only exactly one commit into empty head" msgstr "Можно только один коммит в пустую ветку." -#: builtin/merge.c:1454 +#: builtin/merge.c:1515 msgid "refusing to merge unrelated histories" msgstr "отказ слияния несвязанных историй изменений" -#: builtin/merge.c:1463 +#: builtin/merge.c:1524 msgid "Already up to date." msgstr "Уже обновлено." -#: builtin/merge.c:1473 +#: builtin/merge.c:1534 #, c-format msgid "Updating %s..%s\n" msgstr "Обновление %s..%s\n" -#: builtin/merge.c:1515 +#: builtin/merge.c:1580 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Попытка тривиального слияния в индексе…\n" -#: builtin/merge.c:1522 +#: builtin/merge.c:1587 #, c-format msgid "Nope.\n" msgstr "Не вышло.\n" -#: builtin/merge.c:1547 +#: builtin/merge.c:1612 msgid "Already up to date. Yeeah!" msgstr "Уже обновлено. Круто!" -#: builtin/merge.c:1553 +#: builtin/merge.c:1618 msgid "Not possible to fast-forward, aborting." msgstr "Перемотка вперед невозможна, отмена." -#: builtin/merge.c:1576 builtin/merge.c:1655 +#: builtin/merge.c:1646 builtin/merge.c:1711 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Перемотка дерева к исходному состоянию…\n" -#: builtin/merge.c:1580 +#: builtin/merge.c:1650 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Попытка слияния с помощью стратегии %s…\n" -#: builtin/merge.c:1646 +#: builtin/merge.c:1702 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Ни одна стратегия слияния не обработала слияние.\n" -#: builtin/merge.c:1648 +#: builtin/merge.c:1704 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Сбой при слиянии с помощью стратегии %s.\n" -#: builtin/merge.c:1657 +#: builtin/merge.c:1713 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "Использую %s для подготовки ручного разрешения конфликтов.\n" -#: builtin/merge.c:1669 +#: builtin/merge.c:1727 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "Автоматическое слияние прошло успешно; как и запрашивали, остановлено перед выполнением коммита\n" -#: builtin/merge-base.c:32 -msgid "git merge-base [-a | --all] <commit> <commit>..." -msgstr "git merge-base [-a | --all] <коммит> <коммит>…" - -#: builtin/merge-base.c:33 -msgid "git merge-base [-a | --all] --octopus <commit>..." -msgstr "git merge-base [-a | --all] --octopus <коммит>…" - -#: builtin/merge-base.c:34 -msgid "git merge-base --independent <commit>..." -msgstr "git merge-base --independent <коммит>…" - -#: builtin/merge-base.c:35 -msgid "git merge-base --is-ancestor <commit> <commit>" -msgstr "git merge-base --is-ancestor <коммит> <коммит>" - -#: builtin/merge-base.c:36 -msgid "git merge-base --fork-point <ref> [<commit>]" -msgstr "git merge-base --fork-point <ссылка> [<коммит>]" - -#: builtin/merge-base.c:153 -msgid "output all common ancestors" -msgstr "вывести всех общих предков" - -#: builtin/merge-base.c:155 -msgid "find ancestors for a single n-way merge" -msgstr "вывести предков для одного многоходового слияния" - -#: builtin/merge-base.c:157 -msgid "list revs not reachable from others" -msgstr "вывести список редаций, которые не достижимы из друг друга" - -#: builtin/merge-base.c:159 -msgid "is the first one ancestor of the other?" -msgstr "является первым предком второго указанного коммита?" - -#: builtin/merge-base.c:161 -msgid "find where <commit> forked from reflog of <ref>" -msgstr "найти журнале ссылок <ссылка> где именно <коммит> разветвился" - -#: builtin/merge-file.c:9 -msgid "" -"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> " -"<orig-file> <file2>" -msgstr "git merge-file [<опции>] [-L имя1 [-L orig [-L имя2]]] <файл1> <ориг-файл> <файл2>" - -#: builtin/merge-file.c:35 -msgid "send results to standard output" -msgstr "вывести результат на стандартный вывод" - -#: builtin/merge-file.c:36 -msgid "use a diff3 based merge" -msgstr "использовать diff3 слияние" - -#: builtin/merge-file.c:37 -msgid "for conflicts, use our version" -msgstr "при возникновении конфликтов, использовать нашу версию" - -#: builtin/merge-file.c:39 -msgid "for conflicts, use their version" -msgstr "при возникновении конфликтов, использовать их версию" - -#: builtin/merge-file.c:41 -msgid "for conflicts, use a union version" -msgstr "при возникновении конфликтов, использовать обе версии" - -#: builtin/merge-file.c:44 -msgid "for conflicts, use this marker size" -msgstr "при возникновении конфликтов, использовать этот размер маркера" - -#: builtin/merge-file.c:45 -msgid "do not warn about conflicts" -msgstr "не предупреждать о конфликтах" - -#: builtin/merge-file.c:47 -msgid "set labels for file1/orig-file/file2" -msgstr "установить метки для файл1/ориг-файл/файл2" - -#: builtin/merge-recursive.c:46 -#, c-format -msgid "unknown option %s" -msgstr "неизвестная опция %s" - -#: builtin/merge-recursive.c:52 -#, c-format -msgid "could not parse object '%s'" -msgstr "не удалось разобрать объект «%s»" - -#: builtin/merge-recursive.c:56 -#, c-format -msgid "cannot handle more than %d base. Ignoring %s." -msgid_plural "cannot handle more than %d bases. Ignoring %s." -msgstr[0] "невозможно обработать больше %d базы. Игнорирую %s." -msgstr[1] "невозможно обработать больше %d баз. Игнорирую %s." -msgstr[2] "невозможно обработать больше %d баз. Игнорирую %s." -msgstr[3] "невозможно обработать больше %d базы. Игнорирую %s." - -#: builtin/merge-recursive.c:64 -msgid "not handling anything other than two heads merge." -msgstr "не обрабатываю ничего, кроме слияния двух указателей на ветки." - -#: builtin/merge-recursive.c:70 builtin/merge-recursive.c:72 -#, c-format -msgid "could not resolve ref '%s'" -msgstr "не удалось распознать ссылку «%s»" - -#: builtin/merge-recursive.c:78 -#, c-format -msgid "Merging %s with %s\n" -msgstr "Слияние %s и %s\n" - #: builtin/mktree.c:66 msgid "git mktree [-z] [--missing] [--batch]" msgstr "git mktree [-z] [--missing] [--batch]" @@ -14165,20 +16359,32 @@ msgid "allow creation of more than one tree" msgstr "допустить создание более одного дерева" #: builtin/multi-pack-index.c:9 -msgid "git multi-pack-index [--object-dir=<dir>] (write|verify)" +msgid "" +"git multi-pack-index [<options>] (write|verify|expire|repack --batch-" +"size=<size>)" msgstr "" -#: builtin/multi-pack-index.c:22 +#: builtin/multi-pack-index.c:26 msgid "object directory containing set of packfile and pack-index pairs" msgstr "" -#: builtin/multi-pack-index.c:40 builtin/prune-packed.c:67 +#: builtin/multi-pack-index.c:29 +msgid "" +"during repack, collect pack-files of smaller size into a batch that is " +"larger than this size" +msgstr "" + +#: builtin/multi-pack-index.c:50 builtin/prune-packed.c:25 msgid "too many arguments" msgstr "" -#: builtin/multi-pack-index.c:51 +#: builtin/multi-pack-index.c:60 +msgid "--batch-size option is only for 'repack' subcommand" +msgstr "" + +#: builtin/multi-pack-index.c:69 #, c-format -msgid "unrecognized verb: %s" +msgid "unrecognized subcommand: %s" msgstr "" #: builtin/mv.c:18 @@ -14207,113 +16413,117 @@ msgstr "принудительно перемещать/переименоват msgid "skip move/rename errors" msgstr "пропускать ошибки при перемещении/переименовании" -#: builtin/mv.c:169 +#: builtin/mv.c:170 #, c-format msgid "destination '%s' is not a directory" msgstr "целевой путь «%s» не является каталогом" -#: builtin/mv.c:180 +#: builtin/mv.c:181 #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "Проверка переименования из «%s» в «%s»\n" -#: builtin/mv.c:184 +#: builtin/mv.c:185 msgid "bad source" msgstr "плохой источник" -#: builtin/mv.c:187 +#: builtin/mv.c:188 msgid "can not move directory into itself" msgstr "нельзя переместить каталог в самого себя" -#: builtin/mv.c:190 +#: builtin/mv.c:191 msgid "cannot move directory over file" msgstr "нельзя переместить каталог в файл" -#: builtin/mv.c:199 +#: builtin/mv.c:200 msgid "source directory is empty" msgstr "исходный каталог пуст" -#: builtin/mv.c:224 +#: builtin/mv.c:225 msgid "not under version control" msgstr "не под версионным контролем" #: builtin/mv.c:227 +msgid "conflicted" +msgstr "" + +#: builtin/mv.c:230 msgid "destination exists" msgstr "целевой путь уже существует" -#: builtin/mv.c:235 +#: builtin/mv.c:238 #, c-format msgid "overwriting '%s'" msgstr "перезапись «%s»" -#: builtin/mv.c:238 +#: builtin/mv.c:241 msgid "Cannot overwrite" msgstr "Не удалось перезаписать" -#: builtin/mv.c:241 +#: builtin/mv.c:244 msgid "multiple sources for the same target" msgstr "несколько источников для одного целевого пути" -#: builtin/mv.c:243 +#: builtin/mv.c:246 msgid "destination directory does not exist" msgstr "целевой каталог не существует" -#: builtin/mv.c:250 +#: builtin/mv.c:253 #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s, откуда=%s, куда=%s" -#: builtin/mv.c:271 +#: builtin/mv.c:274 #, c-format msgid "Renaming %s to %s\n" msgstr "Переименование %s в %s\n" -#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:516 +#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:484 #, c-format msgid "renaming '%s' failed" msgstr "сбой при переименовании «%s»" -#: builtin/name-rev.c:355 +#: builtin/name-rev.c:465 msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [<опции>] <коммит>…" -#: builtin/name-rev.c:356 +#: builtin/name-rev.c:466 msgid "git name-rev [<options>] --all" msgstr "git name-rev [<опции>] --all" -#: builtin/name-rev.c:357 +#: builtin/name-rev.c:467 msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [<опции>] --stdin" -#: builtin/name-rev.c:415 -msgid "print only names (no SHA-1)" -msgstr "выводить только имена (без SHA-1)" +#: builtin/name-rev.c:524 +msgid "print only ref-based names (no object names)" +msgstr "" -#: builtin/name-rev.c:416 +#: builtin/name-rev.c:525 msgid "only use tags to name the commits" msgstr "использовать только метки для именования коммитов" -#: builtin/name-rev.c:418 +#: builtin/name-rev.c:527 msgid "only use refs matching <pattern>" -msgstr "использовать только ссылки, соответствующие <шаблону> " +msgstr "использовать только ссылки, соответствующие <шаблону>" -#: builtin/name-rev.c:420 +#: builtin/name-rev.c:529 msgid "ignore refs matching <pattern>" msgstr "игнорировать ссылки, соответствующие <шаблону>" -#: builtin/name-rev.c:422 +#: builtin/name-rev.c:531 msgid "list all commits reachable from all refs" msgstr "вывести список всех коммитов, достижимых со всех ссылок" -#: builtin/name-rev.c:423 +#: builtin/name-rev.c:532 msgid "read from stdin" msgstr "прочитать из стандартного ввода" -#: builtin/name-rev.c:424 +#: builtin/name-rev.c:533 msgid "allow to print `undefined` names (default)" msgstr "разрешить вывод «undefined», если не найдено (по умолчанию)" -#: builtin/name-rev.c:430 +#: builtin/name-rev.c:539 msgid "dereference tags in the input (internal use)" msgstr "разыменовывать введенные метки (для внутреннего использования)" @@ -14453,7 +16663,7 @@ msgstr "не удалось записать объект заметки" msgid "the note contents have been left in %s" msgstr "содержимое заметки осталось в %s" -#: builtin/notes.c:242 builtin/tag.c:522 +#: builtin/notes.c:242 builtin/tag.c:533 #, c-format msgid "could not open or read '%s'" msgstr "не удалось открыть или прочитать «%s»" @@ -14673,7 +16883,7 @@ msgid "" "--abort'.\n" msgstr "Не удалось автоматически слить заметки. Исправьте конфликты в %s и закоммитьте результат с помощью «git notes merge --commit», или прервите процесс слияния с помощью «git notes merge --abort».\n" -#: builtin/notes.c:897 builtin/tag.c:535 +#: builtin/notes.c:897 builtin/tag.c:546 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "Не удалось разрешить «%s» как ссылку." @@ -14691,7 +16901,7 @@ msgstr "попытка удаления несуществующей замет msgid "read object names from the standard input" msgstr "прочитать имена объектов из стандартного ввода" -#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:165 +#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:220 msgid "do not remove, show only" msgstr "не удалять, только показать список" @@ -14707,387 +16917,375 @@ msgstr "ссылка-на-заметку" msgid "use notes from <notes-ref>" msgstr "использовать заметку из <ссылка-на-заметку>" -#: builtin/notes.c:1034 builtin/stash.c:1611 +#: builtin/notes.c:1034 builtin/stash.c:1604 #, c-format msgid "unknown subcommand: %s" msgstr "неизвестная подкоманда: %s" -#: builtin/pack-objects.c:52 +#: builtin/pack-objects.c:54 msgid "" "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" msgstr "git pack-objects --stdout [<опции>…] [< <список-ссылок> | < <список-объектов>]" -#: builtin/pack-objects.c:53 +#: builtin/pack-objects.c:55 msgid "" "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" msgstr "git pack-objects [<опции>…] <имя-базы> [< <список-ссылок> | < <список-объектов>]" -#: builtin/pack-objects.c:424 +#: builtin/pack-objects.c:443 #, c-format msgid "bad packed object CRC for %s" msgstr "" -#: builtin/pack-objects.c:435 +#: builtin/pack-objects.c:454 #, c-format msgid "corrupt packed object for %s" msgstr "" -#: builtin/pack-objects.c:566 +#: builtin/pack-objects.c:585 #, c-format msgid "recursive delta detected for object %s" msgstr "" -#: builtin/pack-objects.c:777 +#: builtin/pack-objects.c:796 #, c-format msgid "ordered %u objects, expected %<PRIu32>" msgstr "" -#: builtin/pack-objects.c:790 -#, c-format -msgid "packfile is invalid: %s" -msgstr "" - -#: builtin/pack-objects.c:794 -#, c-format -msgid "unable to open packfile for reuse: %s" -msgstr "" - -#: builtin/pack-objects.c:798 -msgid "unable to seek in reused packfile" -msgstr "" - -#: builtin/pack-objects.c:809 -msgid "unable to read from reused packfile" -msgstr "" - -#: builtin/pack-objects.c:837 +#: builtin/pack-objects.c:1004 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "отключение записи битовых карт, так как карты были разбиты на части из-за pack.packSizeLimit" -#: builtin/pack-objects.c:850 +#: builtin/pack-objects.c:1017 msgid "Writing objects" msgstr "Запись объектов" -#: builtin/pack-objects.c:912 builtin/update-index.c:89 +#: builtin/pack-objects.c:1078 builtin/update-index.c:90 #, c-format msgid "failed to stat %s" msgstr "не удалось выполнить stat %s" -#: builtin/pack-objects.c:965 +#: builtin/pack-objects.c:1131 #, c-format msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" msgstr "" -#: builtin/pack-objects.c:1161 +#: builtin/pack-objects.c:1348 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "отключение записи битовых карт, так как некоторые объекты не были упакованы" -#: builtin/pack-objects.c:1589 +#: builtin/pack-objects.c:1796 #, c-format msgid "delta base offset overflow in pack for %s" msgstr "" -#: builtin/pack-objects.c:1598 +#: builtin/pack-objects.c:1805 #, c-format msgid "delta base offset out of bound for %s" msgstr "" -#: builtin/pack-objects.c:1867 +#: builtin/pack-objects.c:2086 msgid "Counting objects" msgstr "Подсчет объектов" -#: builtin/pack-objects.c:1997 -#, c-format -msgid "unable to get size of %s" -msgstr "не удалось получить размер %s" - -#: builtin/pack-objects.c:2012 +#: builtin/pack-objects.c:2231 #, c-format msgid "unable to parse object header of %s" msgstr "не удалось разобрать заголовок объекта %s" -#: builtin/pack-objects.c:2082 builtin/pack-objects.c:2098 -#: builtin/pack-objects.c:2108 +#: builtin/pack-objects.c:2301 builtin/pack-objects.c:2317 +#: builtin/pack-objects.c:2327 #, c-format msgid "object %s cannot be read" msgstr "" -#: builtin/pack-objects.c:2085 builtin/pack-objects.c:2112 +#: builtin/pack-objects.c:2304 builtin/pack-objects.c:2331 #, c-format msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)" msgstr "" -#: builtin/pack-objects.c:2122 +#: builtin/pack-objects.c:2341 msgid "suboptimal pack - out of memory" msgstr "" -#: builtin/pack-objects.c:2448 +#: builtin/pack-objects.c:2656 #, c-format msgid "Delta compression using up to %d threads" msgstr "При сжатии изменений используется до %d потоков" -#: builtin/pack-objects.c:2580 +#: builtin/pack-objects.c:2795 #, c-format msgid "unable to pack objects reachable from tag %s" msgstr "" -#: builtin/pack-objects.c:2667 +#: builtin/pack-objects.c:2883 msgid "Compressing objects" msgstr "Сжатие объектов" -#: builtin/pack-objects.c:2673 +#: builtin/pack-objects.c:2889 msgid "inconsistency with delta count" msgstr "" -#: builtin/pack-objects.c:2754 +#: builtin/pack-objects.c:2961 +#, c-format +msgid "" +"value of uploadpack.blobpackfileuri must be of the form '<object-hash> " +"<pack-hash> <uri>' (got '%s')" +msgstr "" + +#: builtin/pack-objects.c:2964 +#, c-format +msgid "" +"object already configured in another uploadpack.blobpackfileuri (got '%s')" +msgstr "" + +#: builtin/pack-objects.c:2993 #, c-format msgid "" "expected edge object ID, got garbage:\n" " %s" msgstr "" -#: builtin/pack-objects.c:2760 +#: builtin/pack-objects.c:2999 #, c-format msgid "" "expected object ID, got garbage:\n" " %s" msgstr "" -#: builtin/pack-objects.c:2858 +#: builtin/pack-objects.c:3097 msgid "invalid value for --missing" msgstr "недопустимое значение для --missing" -#: builtin/pack-objects.c:2917 builtin/pack-objects.c:3025 +#: builtin/pack-objects.c:3156 builtin/pack-objects.c:3264 msgid "cannot open pack index" msgstr "" -#: builtin/pack-objects.c:2948 +#: builtin/pack-objects.c:3187 #, c-format msgid "loose object at %s could not be examined" msgstr "" -#: builtin/pack-objects.c:3033 +#: builtin/pack-objects.c:3272 msgid "unable to force loose object" msgstr "" -#: builtin/pack-objects.c:3125 +#: builtin/pack-objects.c:3365 #, c-format msgid "not a rev '%s'" msgstr "" -#: builtin/pack-objects.c:3128 +#: builtin/pack-objects.c:3368 #, c-format msgid "bad revision '%s'" msgstr "" -#: builtin/pack-objects.c:3153 +#: builtin/pack-objects.c:3393 msgid "unable to add recent objects" msgstr "" -#: builtin/pack-objects.c:3206 +#: builtin/pack-objects.c:3446 #, c-format msgid "unsupported index version %s" msgstr "неподдерживаемая версия индекса %s" -#: builtin/pack-objects.c:3210 +#: builtin/pack-objects.c:3450 #, c-format msgid "bad index version '%s'" msgstr "плохая версия индекса «%s»" -#: builtin/pack-objects.c:3240 -msgid "do not show progress meter" -msgstr "не выводить прогресс выполнения" - -#: builtin/pack-objects.c:3242 -msgid "show progress meter" -msgstr "показать прогресс выполнения" - -#: builtin/pack-objects.c:3244 -msgid "show progress meter during object writing phase" -msgstr "показать прогресс выполнения во время записи объектов" - -#: builtin/pack-objects.c:3247 -msgid "similar to --all-progress when progress meter is shown" -msgstr "похоже на --all-progress при включенном прогрессе выполнения" - -#: builtin/pack-objects.c:3248 +#: builtin/pack-objects.c:3488 msgid "<version>[,<offset>]" msgstr "" -#: builtin/pack-objects.c:3249 +#: builtin/pack-objects.c:3489 msgid "write the pack index file in the specified idx format version" msgstr "записать файл индекса пакета в указанной версии формата" -#: builtin/pack-objects.c:3252 +#: builtin/pack-objects.c:3492 msgid "maximum size of each output pack file" msgstr "максимальный размер каждого выходного файла пакета" -#: builtin/pack-objects.c:3254 +#: builtin/pack-objects.c:3494 msgid "ignore borrowed objects from alternate object store" msgstr "игнорировать чужие объекты, взятые из альтернативного хранилища объектов" -#: builtin/pack-objects.c:3256 +#: builtin/pack-objects.c:3496 msgid "ignore packed objects" msgstr "игнорировать упакованные объекты" -#: builtin/pack-objects.c:3258 +#: builtin/pack-objects.c:3498 msgid "limit pack window by objects" msgstr "ограничить окно пакета по количеству объектов" -#: builtin/pack-objects.c:3260 +#: builtin/pack-objects.c:3500 msgid "limit pack window by memory in addition to object limit" msgstr "дополнительно к количеству объектов ограничить окно пакета по памяти" -#: builtin/pack-objects.c:3262 +#: builtin/pack-objects.c:3502 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "максимальная разрешенная длина цепочки дельт в результирующем пакете" -#: builtin/pack-objects.c:3264 +#: builtin/pack-objects.c:3504 msgid "reuse existing deltas" msgstr "использовать повторно существующие дельты" -#: builtin/pack-objects.c:3266 +#: builtin/pack-objects.c:3506 msgid "reuse existing objects" msgstr "использовать повторно существующие объекты" -#: builtin/pack-objects.c:3268 +#: builtin/pack-objects.c:3508 msgid "use OFS_DELTA objects" msgstr "использовать объекты OFS_DELTA" -#: builtin/pack-objects.c:3270 +#: builtin/pack-objects.c:3510 msgid "use threads when searching for best delta matches" msgstr "использовать многопоточность при поиске лучших совпадений дельт" -#: builtin/pack-objects.c:3272 +#: builtin/pack-objects.c:3512 msgid "do not create an empty pack output" msgstr "не создавать пустые выходные пакеты" -#: builtin/pack-objects.c:3274 +#: builtin/pack-objects.c:3514 msgid "read revision arguments from standard input" msgstr "прочитать аргументы редакций из стандартного ввода" -#: builtin/pack-objects.c:3276 +#: builtin/pack-objects.c:3516 msgid "limit the objects to those that are not yet packed" msgstr "ограничиться объектами, которые еще не упакованы" -#: builtin/pack-objects.c:3279 +#: builtin/pack-objects.c:3519 msgid "include objects reachable from any reference" msgstr "включить объекты, которые достижимы по любой из ссылок" -#: builtin/pack-objects.c:3282 +#: builtin/pack-objects.c:3522 msgid "include objects referred by reflog entries" msgstr "включить объекты, на которые ссылаются записи журнала ссылок" -#: builtin/pack-objects.c:3285 +#: builtin/pack-objects.c:3525 msgid "include objects referred to by the index" msgstr "включить объекты, на которые ссылается индекс" -#: builtin/pack-objects.c:3288 +#: builtin/pack-objects.c:3528 msgid "output pack to stdout" msgstr "вывести пакет на стандартный вывод" -#: builtin/pack-objects.c:3290 +#: builtin/pack-objects.c:3530 msgid "include tag objects that refer to objects to be packed" msgstr "включить объекты меток, которые ссылаются на упаковываемые объекты" -#: builtin/pack-objects.c:3292 +#: builtin/pack-objects.c:3532 msgid "keep unreachable objects" msgstr "сохранять ссылки на недоступные объекты" -#: builtin/pack-objects.c:3294 +#: builtin/pack-objects.c:3534 msgid "pack loose unreachable objects" msgstr "паковать недостижимые объекты" -#: builtin/pack-objects.c:3296 +#: builtin/pack-objects.c:3536 msgid "unpack unreachable objects newer than <time>" msgstr "распаковать недоступные объекты, которые новее, чем <время>" -#: builtin/pack-objects.c:3299 +#: builtin/pack-objects.c:3539 msgid "use the sparse reachability algorithm" msgstr "" -#: builtin/pack-objects.c:3301 +#: builtin/pack-objects.c:3541 msgid "create thin packs" msgstr "создавать тонкие пакеты" -#: builtin/pack-objects.c:3303 +#: builtin/pack-objects.c:3543 msgid "create packs suitable for shallow fetches" msgstr "создавать пакеты, подходящие для частичных извлечений" -#: builtin/pack-objects.c:3305 +#: builtin/pack-objects.c:3545 msgid "ignore packs that have companion .keep file" msgstr "игнорировать пакеты, рядом с которыми лежит .keep файл" -#: builtin/pack-objects.c:3307 +#: builtin/pack-objects.c:3547 msgid "ignore this pack" msgstr "игнорировать этот пакет" -#: builtin/pack-objects.c:3309 +#: builtin/pack-objects.c:3549 msgid "pack compression level" msgstr "уровень сжатия пакета" -#: builtin/pack-objects.c:3311 +#: builtin/pack-objects.c:3551 msgid "do not hide commits by grafts" msgstr "не скрывать коммиты сращениями" -#: builtin/pack-objects.c:3313 +#: builtin/pack-objects.c:3553 msgid "use a bitmap index if available to speed up counting objects" msgstr "по возможности использовать индекс в битовых картах, для ускорения подсчета объектов" -#: builtin/pack-objects.c:3315 +#: builtin/pack-objects.c:3555 msgid "write a bitmap index together with the pack index" msgstr "запись индекса в битовых картах вместе с индексом пакета" -#: builtin/pack-objects.c:3318 +#: builtin/pack-objects.c:3559 +msgid "write a bitmap index if possible" +msgstr "" + +#: builtin/pack-objects.c:3563 msgid "handling for missing objects" msgstr "обработка отсутствующих объектов" -#: builtin/pack-objects.c:3321 +#: builtin/pack-objects.c:3566 msgid "do not pack objects in promisor packfiles" msgstr "не упаковывать объекты в promisor файлы пакетов" -#: builtin/pack-objects.c:3323 +#: builtin/pack-objects.c:3568 msgid "respect islands during delta compression" msgstr "" -#: builtin/pack-objects.c:3348 +#: builtin/pack-objects.c:3570 +msgid "protocol" +msgstr "" + +#: builtin/pack-objects.c:3571 +msgid "exclude any configured uploadpack.blobpackfileuri with this protocol" +msgstr "" + +#: builtin/pack-objects.c:3600 #, c-format msgid "delta chain depth %d is too deep, forcing %d" msgstr "глубина цепочки изменений %d слишком большая, использую принудительно %d" -#: builtin/pack-objects.c:3353 +#: builtin/pack-objects.c:3605 #, c-format msgid "pack.deltaCacheLimit is too high, forcing %d" msgstr "лисит pack.deltaCacheLimit слишком высокий, использую принудительно %d" -#: builtin/pack-objects.c:3407 +#: builtin/pack-objects.c:3659 msgid "--max-pack-size cannot be used to build a pack for transfer" msgstr "" -#: builtin/pack-objects.c:3409 +#: builtin/pack-objects.c:3661 msgid "minimum pack size limit is 1 MiB" msgstr "" -#: builtin/pack-objects.c:3414 +#: builtin/pack-objects.c:3666 msgid "--thin cannot be used to build an indexable pack" msgstr "" -#: builtin/pack-objects.c:3417 +#: builtin/pack-objects.c:3669 msgid "--keep-unreachable and --unpack-unreachable are incompatible" msgstr "" -#: builtin/pack-objects.c:3423 +#: builtin/pack-objects.c:3675 msgid "cannot use --filter without --stdout" msgstr "" -#: builtin/pack-objects.c:3484 +#: builtin/pack-objects.c:3735 msgid "Enumerating objects" msgstr "Перечисление объектов" -#: builtin/pack-objects.c:3514 +#: builtin/pack-objects.c:3766 #, c-format -msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)" -msgstr "Всего %<PRIu32> (изменения %<PRIu32>), повторно использовано %<PRIu32> (изменения %<PRIu32>)" +msgid "" +"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-" +"reused %<PRIu32>" +msgstr "Всего %<PRIu32> (изменений %<PRIu32>), повторно использовано %<PRIu32> (изменений %<PRIu32>), повторно использовано пакетов %<PRIu32>" #: builtin/pack-refs.c:8 msgid "git pack-refs [<options>]" @@ -15101,98 +17299,110 @@ msgstr "паковать всё" msgid "prune loose refs (default)" msgstr "почистить слабые ссылки (по умолчанию)" -#: builtin/prune-packed.c:9 +#: builtin/prune-packed.c:6 msgid "git prune-packed [-n | --dry-run] [-q | --quiet]" msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]" -#: builtin/prune-packed.c:42 -msgid "Removing duplicate objects" -msgstr "Удаление дублирующихся объектов" - -#: builtin/prune.c:12 +#: builtin/prune.c:14 msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--progress] [--expire <время>] [--] [<редакция>…]" -#: builtin/prune.c:131 +#: builtin/prune.c:133 msgid "report pruned objects" msgstr "вывести список удаленных объектов" -#: builtin/prune.c:134 +#: builtin/prune.c:136 msgid "expire objects older than <time>" msgstr "удалить объекты старее чем <дата-окончания>" -#: builtin/prune.c:136 +#: builtin/prune.c:138 msgid "limit traversal to objects outside promisor packfiles" msgstr "ограничить обход объектами вне promisor файлов пакетов" -#: builtin/prune.c:150 +#: builtin/prune.c:152 msgid "cannot prune in a precious-objects repo" msgstr "нельзя почистить неиспользуемые объекты в precious-objects репозитории" -#: builtin/pull.c:66 builtin/pull.c:68 +#: builtin/pull.c:45 builtin/pull.c:47 #, c-format msgid "Invalid value for %s: %s" msgstr "Неправильное значение %s: %s" -#: builtin/pull.c:88 +#: builtin/pull.c:67 msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "git pull [<опции>] [<репозиторий> [<спецификатор-ссылки>…]]" -#: builtin/pull.c:140 +#: builtin/pull.c:123 msgid "control for recursive fetching of submodules" msgstr "управление рекурсивным извлечением подмодулей" -#: builtin/pull.c:144 +#: builtin/pull.c:127 msgid "Options related to merging" msgstr "Опции, связанные со слиянием" -#: builtin/pull.c:147 +#: builtin/pull.c:130 msgid "incorporate changes by rebasing rather than merging" msgstr "забрать изменения с помощью перемещения, а не слияния" -#: builtin/pull.c:175 builtin/rebase.c:447 builtin/revert.c:125 +#: builtin/pull.c:158 builtin/rebase.c:490 builtin/revert.c:126 msgid "allow fast-forward" msgstr "разрешить перемотку вперед" -#: builtin/pull.c:184 -msgid "automatically stash/stash pop before and after rebase" -msgstr "автоматически выполнять stash/stash pop до и после перемещения" +#: builtin/pull.c:167 parse-options.h:339 +msgid "automatically stash/stash pop before and after" +msgstr "" -#: builtin/pull.c:200 +#: builtin/pull.c:183 msgid "Options related to fetching" msgstr "Опции, связанные с извлечением изменений" -#: builtin/pull.c:210 +#: builtin/pull.c:193 msgid "force overwrite of local branch" msgstr "принудительная перезапись локальной ветки" -#: builtin/pull.c:218 +#: builtin/pull.c:201 msgid "number of submodules pulled in parallel" msgstr "количество подмодулей, которые будут получены парралельно" -#: builtin/pull.c:313 +#: builtin/pull.c:317 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "Неправильное значение для pull.ff: %s" -#: builtin/pull.c:430 +#: builtin/pull.c:348 +msgid "" +"Pulling without specifying how to reconcile divergent branches is\n" +"discouraged. You can squelch this message by running one of the following\n" +"commands sometime before your next pull:\n" +"\n" +" git config pull.rebase false # merge (the default strategy)\n" +" git config pull.rebase true # rebase\n" +" git config pull.ff only # fast-forward only\n" +"\n" +"You can replace \"git config\" with \"git config --global\" to set a default\n" +"preference for all repositories. You can also pass --rebase, --no-rebase,\n" +"or --ff-only on the command line to override the configured default per\n" +"invocation.\n" +msgstr "" + +#: builtin/pull.c:458 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." msgstr "Нет претендентов для перемещения среди ссылок, которые вы только что получили." -#: builtin/pull.c:432 +#: builtin/pull.c:460 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "Нет претендентов для слияния среди ссылок, которые вы только что получили." -#: builtin/pull.c:433 +#: builtin/pull.c:461 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." msgstr "Обычно это означает, что вы передали спецификацию ссылки с помощью шаблона и этот шаблон ни с чем не совпал на внешнем репозитории." -#: builtin/pull.c:436 +#: builtin/pull.c:464 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -15200,74 +17410,69 @@ msgid "" "for your current branch, you must specify a branch on the command line." msgstr "Вы попросили получить изменения со внешнего репозитория «%s», но не указали ветку. Так как это не репозиторий по умолчанию для вашей текущей ветки, вы должны указать ветку в командной строке." -#: builtin/pull.c:441 builtin/rebase.c:1321 git-parse-remote.sh:73 +#: builtin/pull.c:469 builtin/rebase.c:1246 msgid "You are not currently on a branch." msgstr "Вы сейчас ни на одной из веток." -#: builtin/pull.c:443 builtin/pull.c:458 git-parse-remote.sh:79 +#: builtin/pull.c:471 builtin/pull.c:486 msgid "Please specify which branch you want to rebase against." msgstr "Пожалуйста, укажите на какую ветку вы хотите переместить изменения." -#: builtin/pull.c:445 builtin/pull.c:460 git-parse-remote.sh:82 +#: builtin/pull.c:473 builtin/pull.c:488 msgid "Please specify which branch you want to merge with." msgstr "Пожалуйста, укажите с какой веткой вы хотите слить изменения." -#: builtin/pull.c:446 builtin/pull.c:461 +#: builtin/pull.c:474 builtin/pull.c:489 msgid "See git-pull(1) for details." msgstr "Для дополнительной информации, смотрите git-pull(1)." -#: builtin/pull.c:448 builtin/pull.c:454 builtin/pull.c:463 -#: builtin/rebase.c:1327 git-parse-remote.sh:64 +#: builtin/pull.c:476 builtin/pull.c:482 builtin/pull.c:491 +#: builtin/rebase.c:1252 msgid "<remote>" msgstr "<внешний-репозиторий>" -#: builtin/pull.c:448 builtin/pull.c:463 builtin/pull.c:468 -#: git-parse-remote.sh:65 +#: builtin/pull.c:476 builtin/pull.c:491 builtin/pull.c:496 msgid "<branch>" msgstr "<ветка>" -#: builtin/pull.c:456 builtin/rebase.c:1319 git-parse-remote.sh:75 +#: builtin/pull.c:484 builtin/rebase.c:1244 msgid "There is no tracking information for the current branch." msgstr "У текущей ветки нет информации об отслеживании." -#: builtin/pull.c:465 git-parse-remote.sh:95 +#: builtin/pull.c:493 msgid "" "If you wish to set tracking information for this branch you can do so with:" msgstr "Если вы хотите указать информацию о отслеживаемой ветке, выполните:" -#: builtin/pull.c:470 +#: builtin/pull.c:498 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" "from the remote, but no such ref was fetched." msgstr "Ваша конфигурация указывает, что нужно слить изменения со ссылкой\n«%s» из внешнего репозитория, но такая ссылка не была получена." -#: builtin/pull.c:574 +#: builtin/pull.c:609 #, c-format msgid "unable to access commit %s" msgstr "" -#: builtin/pull.c:854 +#: builtin/pull.c:915 msgid "ignoring --verify-signatures for rebase" msgstr "игнорирование --verify-signatures при перемещении" -#: builtin/pull.c:909 -msgid "--[no-]autostash option is only valid with --rebase." -msgstr "--[no-]autostash можно использовать только вместе с --rebase." - -#: builtin/pull.c:917 +#: builtin/pull.c:972 msgid "Updating an unborn branch with changes added to the index." msgstr "Обновление еще не начавшейся ветки с изменениями, добавленными в индекс." -#: builtin/pull.c:921 +#: builtin/pull.c:976 msgid "pull with rebase" msgstr "получение с перемещением" -#: builtin/pull.c:922 +#: builtin/pull.c:977 msgid "please commit or stash them." msgstr "сделайте коммит или спрячьте их." -#: builtin/pull.c:947 +#: builtin/pull.c:1002 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -15275,7 +17480,7 @@ msgid "" "commit %s." msgstr "извлечение обновило указатель на вашу текущую ветку.\nперемотка вашего рабочего каталога\nс коммита %s." -#: builtin/pull.c:953 +#: builtin/pull.c:1008 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -15286,15 +17491,15 @@ msgid "" "to recover." msgstr "Не удалось перемотать вперёд изменения в вашем рабочем каталоге.\nПосле того, как вы убедитесь, что вы сохранили всё необходимое из вывода\n$ git diff %s\n, запустите\n$ git reset --hard\nдля восстановления исходного состояния." -#: builtin/pull.c:968 +#: builtin/pull.c:1023 msgid "Cannot merge multiple branches into empty head." msgstr "Нельзя слить несколько веток в пустой указатель на ветку." -#: builtin/pull.c:972 +#: builtin/pull.c:1027 msgid "Cannot rebase onto multiple branches." msgstr "Невозможно переместить над несколькими ветками." -#: builtin/pull.c:979 +#: builtin/pull.c:1041 msgid "cannot rebase with locally recorded submodule modifications" msgstr "невозможно выполнить перемещение с записанными локальными изменениями в подмодулях" @@ -15306,17 +17511,17 @@ msgstr "git push [<опции>] [<репозиторий> [<спецификат msgid "tag shorthand without <tag>" msgstr "указано сокращение tag, но не указана сама <метка>" -#: builtin/push.c:121 +#: builtin/push.c:119 msgid "--delete only accepts plain target ref names" msgstr "опция --delete принимает только простые целевые имена ссылок" -#: builtin/push.c:167 +#: builtin/push.c:164 msgid "" "\n" "To choose either option permanently, see push.default in 'git help config'." msgstr "\nЧтобы выбрать любую из опций на постоянной основе, смотрите push.default в «git help config»." -#: builtin/push.c:170 +#: builtin/push.c:167 #, c-format msgid "" "The upstream branch of your current branch does not match\n" @@ -15331,7 +17536,7 @@ msgid "" "%s" msgstr "" -#: builtin/push.c:185 +#: builtin/push.c:182 #, c-format msgid "" "You are not currently on a branch.\n" @@ -15341,7 +17546,7 @@ msgid "" " git push %s HEAD:<name-of-remote-branch>\n" msgstr "Вы сейчас не находитесь ни на одной из веток.\nЧтобы отправить историю, ведущую к текущему (отделённый HEAD) состоянию, используйте\n\n git push %s HEAD:<имя-внешней-ветки>\n" -#: builtin/push.c:199 +#: builtin/push.c:194 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -15350,13 +17555,13 @@ msgid "" " git push --set-upstream %s %s\n" msgstr "Текущая ветка %s не имеет вышестоящей ветки.\nЧтобы отправить текущую ветку и установить внешнюю ветку как вышестоящую для этой ветки, используйте\n\n git push --set-upstream %s %s\n" -#: builtin/push.c:207 +#: builtin/push.c:202 #, c-format msgid "" "The current branch %s has multiple upstream branches, refusing to push." msgstr "Ваша текущая ветка %s имеет несколько вышестоящих веток, отказ в отправке изменений." -#: builtin/push.c:210 +#: builtin/push.c:205 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -15364,11 +17569,11 @@ msgid "" "to update which remote branch." msgstr "Вы сейчас отправляете изменения на внешний репозиторий «%s», который не является вышестоящим для вашей текущей ветки «%s», без указания того, что отправлять и в какую внешнюю ветку." -#: builtin/push.c:269 +#: builtin/push.c:260 msgid "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "Вы не указали спецификацию ссылки для отправки, а push.default указан как «nothing»." -#: builtin/push.c:276 +#: builtin/push.c:267 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -15376,7 +17581,7 @@ msgid "" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "Обновления были отклонены, так как верхушка вашей текущей ветки\nпозади ее внешней части. Заберите и слейте внешние изменения \n(например, с помощью «git pull …») перед повторной попыткой отправки\nизменений.\nДля дополнительной информации, смотрите «Note about fast-forwards»\nв «git push --help»." -#: builtin/push.c:282 +#: builtin/push.c:273 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. Check out this branch and integrate the remote changes\n" @@ -15384,7 +17589,7 @@ msgid "" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "Обновления были отклонены, так как верхушка отправляемой ветки\nпозади ее внешней части. Переключитесь на ветку и заберите внешние\nизменения (например, с помощью «git pull …») перед повторной\nпопыткой отправки изменений.\nДля дополнительной информации, смотрите «Note about fast-forwards»\nв «git push --help»." -#: builtin/push.c:288 +#: builtin/push.c:279 msgid "" "Updates were rejected because the remote contains work that you do\n" "not have locally. This is usually caused by another repository pushing\n" @@ -15393,86 +17598,81 @@ msgid "" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "Обновления были отклонены, так как внешний репозиторий содержит\nизменения, которых у вас нет в вашем локальном репозитории.\nОбычно, это связанно с тем, что кто-то уже отправил изменения в \nто же место. Перед повторной отправкой ваших изменений, вам нужно\nзабрать и слить изменения из внешнего репозитория себе\n(например, с помощью «git pull …»).\nДля дополнительной информации, смотрите «Note about fast-forwards»\nв «git push --help»." -#: builtin/push.c:295 +#: builtin/push.c:286 msgid "Updates were rejected because the tag already exists in the remote." msgstr "Обновления были отклонены, так как метка уже существует во внешнем репозитории." -#: builtin/push.c:298 +#: builtin/push.c:289 msgid "" "You cannot update a remote ref that points at a non-commit object,\n" "or update a remote ref to make it point at a non-commit object,\n" "without using the '--force' option.\n" msgstr "Вы не можете обновить внешнюю ссылку, которая указывает на объект, не являющийся коммитом или обновить внешнюю ссылку так, чтобы она указывала на объект, не являющийся коммитом, без указания опции «--force».\n" -#: builtin/push.c:359 +#: builtin/push.c:294 +msgid "" +"Updates were rejected because the tip of the remote-tracking\n" +"branch has been updated since the last checkout. You may want\n" +"to integrate those changes locally (e.g., 'git pull ...')\n" +"before forcing an update.\n" +msgstr "" + +#: builtin/push.c:364 #, c-format msgid "Pushing to %s\n" msgstr "Отправка в %s\n" -#: builtin/push.c:364 +#: builtin/push.c:371 #, c-format msgid "failed to push some refs to '%s'" msgstr "не удалось отправить некоторые ссылки в «%s»" -#: builtin/push.c:398 -#, c-format -msgid "bad repository '%s'" -msgstr "плохой репозитория «%s»" - -#: builtin/push.c:399 -msgid "" -"No configured push destination.\n" -"Either specify the URL from the command-line or configure a remote repository using\n" -"\n" -" git remote add <name> <url>\n" -"\n" -"and then push using the remote name\n" -"\n" -" git push <name>\n" -msgstr "Не настроена точка назначения для отправки.\nЛибо укажите URL с помощью командной строки, либо настройте внешний репозиторий с помощью\n\n git remote add <имя> <адрес>\n\nа затем отправьте изменения с помощью имени внешнего репозитория\n\n git push <имя>\n" - -#: builtin/push.c:554 +#: builtin/push.c:553 msgid "repository" msgstr "репозиторий" -#: builtin/push.c:555 builtin/send-pack.c:164 +#: builtin/push.c:554 builtin/send-pack.c:189 msgid "push all refs" msgstr "отправить все ссылки" -#: builtin/push.c:556 builtin/send-pack.c:166 +#: builtin/push.c:555 builtin/send-pack.c:191 msgid "mirror all refs" msgstr "сделать зеркало всех ссылок" -#: builtin/push.c:558 +#: builtin/push.c:557 msgid "delete refs" msgstr "удалить ссылки" -#: builtin/push.c:559 +#: builtin/push.c:558 msgid "push tags (can't be used with --all or --mirror)" msgstr "отправить метки (нельзя использовать вместе с --all или --mirror)" -#: builtin/push.c:562 builtin/send-pack.c:167 +#: builtin/push.c:561 builtin/send-pack.c:192 msgid "force updates" msgstr "принудительное обновление" -#: builtin/push.c:564 builtin/send-pack.c:181 +#: builtin/push.c:562 builtin/send-pack.c:204 msgid "<refname>:<expect>" msgstr "" -#: builtin/push.c:565 builtin/send-pack.c:182 +#: builtin/push.c:563 builtin/send-pack.c:205 msgid "require old value of ref to be at this value" msgstr "требовать, чтобы старое значение ссылки было ожидаемым" -#: builtin/push.c:568 +#: builtin/push.c:566 builtin/send-pack.c:208 +msgid "require remote updates to be integrated locally" +msgstr "" + +#: builtin/push.c:569 msgid "control recursive pushing of submodules" msgstr "управление рекурсивной отправкой подмодулей" -#: builtin/push.c:570 builtin/send-pack.c:175 +#: builtin/push.c:570 builtin/send-pack.c:199 msgid "use thin pack" msgstr "использовать тонкие пакеты" -#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:161 -#: builtin/send-pack.c:162 +#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:186 +#: builtin/send-pack.c:187 msgid "receive pack program" msgstr "путь к программе упаковки на сервере" @@ -15492,43 +17692,60 @@ msgstr "пропустить перехватчик pre-push" msgid "push missing but relevant tags" msgstr "отправить пропущенные, но нужные метки" -#: builtin/push.c:582 builtin/send-pack.c:169 +#: builtin/push.c:581 builtin/send-pack.c:193 msgid "GPG sign the push" msgstr "подписать отправку с помощью GPG" -#: builtin/push.c:584 builtin/send-pack.c:176 +#: builtin/push.c:583 builtin/send-pack.c:200 msgid "request atomic transaction on remote side" msgstr "запросить выполнение атомарной транзакции на внешней стороне" -#: builtin/push.c:602 +#: builtin/push.c:601 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete несовместимо с --all, --mirror и --tags" -#: builtin/push.c:604 +#: builtin/push.c:603 msgid "--delete doesn't make sense without any refs" msgstr "--delete не имеет смысла без указания ссылок" -#: builtin/push.c:607 +#: builtin/push.c:623 +#, c-format +msgid "bad repository '%s'" +msgstr "плохой репозитория «%s»" + +#: builtin/push.c:624 +msgid "" +"No configured push destination.\n" +"Either specify the URL from the command-line or configure a remote repository using\n" +"\n" +" git remote add <name> <url>\n" +"\n" +"and then push using the remote name\n" +"\n" +" git push <name>\n" +msgstr "Не настроена точка назначения для отправки.\nЛибо укажите URL с помощью командной строки, либо настройте внешний репозиторий с помощью\n\n git remote add <имя> <адрес>\n\nа затем отправьте изменения с помощью имени внешнего репозитория\n\n git push <имя>\n" + +#: builtin/push.c:639 msgid "--all and --tags are incompatible" msgstr "--all и --tags нельзя использовать одновременно" -#: builtin/push.c:609 +#: builtin/push.c:641 msgid "--all can't be combined with refspecs" msgstr "--all нельзя использовать вместе со спецификаторами ссылок" -#: builtin/push.c:613 +#: builtin/push.c:645 msgid "--mirror and --tags are incompatible" msgstr "--mirror и --tags нельзя использовать одновременно" -#: builtin/push.c:615 +#: builtin/push.c:647 msgid "--mirror can't be combined with refspecs" msgstr "--mirror нельзя использовать вместе со спецификаторами ссылок" -#: builtin/push.c:618 +#: builtin/push.c:650 msgid "--all and --mirror are incompatible" msgstr "--all и --mirror нельзя использовать одновременно" -#: builtin/push.c:637 +#: builtin/push.c:657 msgid "push options must not have new line characters" msgstr "опции для отправки не должны содержать символы перевода строк" @@ -15544,24 +17761,32 @@ msgstr "" msgid "git range-diff [<options>] <base> <old-tip> <new-tip>" msgstr "" -#: builtin/range-diff.c:21 +#: builtin/range-diff.c:22 msgid "Percentage by which creation is weighted" msgstr "" -#: builtin/range-diff.c:23 +#: builtin/range-diff.c:24 msgid "use simple diff colors" msgstr "" -#: builtin/range-diff.c:46 builtin/range-diff.c:50 +#: builtin/range-diff.c:26 +msgid "notes" +msgstr "" + +#: builtin/range-diff.c:26 +msgid "passed to 'git log'" +msgstr "" + +#: builtin/range-diff.c:50 builtin/range-diff.c:54 #, c-format msgid "no .. in range: '%s'" msgstr "" -#: builtin/range-diff.c:60 +#: builtin/range-diff.c:64 msgid "single arg format must be symmetric range" msgstr "" -#: builtin/range-diff.c:75 +#: builtin/range-diff.c:79 msgid "need two commit ranges" msgstr "" @@ -15640,232 +17865,213 @@ msgstr "отладка unpack-trees" msgid "suppress feedback messages" msgstr "" -#: builtin/rebase.c:32 +#: builtin/read-tree.c:188 +msgid "You need to resolve your current index first" +msgstr "" + +#: builtin/rebase.c:35 msgid "" -"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] " -"[<branch>]" +"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] " +"[<upstream> [<branch>]]" msgstr "" -#: builtin/rebase.c:34 +#: builtin/rebase.c:37 msgid "" "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root " "[<branch>]" msgstr "" -#: builtin/rebase.c:36 +#: builtin/rebase.c:39 msgid "git rebase --continue | --abort | --skip | --edit-todo" msgstr "" -#: builtin/rebase.c:158 builtin/rebase.c:182 builtin/rebase.c:209 +#: builtin/rebase.c:193 builtin/rebase.c:217 builtin/rebase.c:244 #, c-format msgid "unusable todo list: '%s'" msgstr "непригодный для использования список дел: «%s»" -#: builtin/rebase.c:167 builtin/rebase.c:193 builtin/rebase.c:217 -#, c-format -msgid "could not write '%s'." -msgstr "" - -#: builtin/rebase.c:252 -msgid "no HEAD?" -msgstr "" - -#: builtin/rebase.c:279 +#: builtin/rebase.c:310 #, c-format msgid "could not create temporary %s" msgstr "" -#: builtin/rebase.c:285 +#: builtin/rebase.c:316 msgid "could not mark as interactive" msgstr "" -#: builtin/rebase.c:343 +#: builtin/rebase.c:369 msgid "could not generate todo list" msgstr "" -#: builtin/rebase.c:382 +#: builtin/rebase.c:411 msgid "a base commit must be provided with --upstream or --onto" msgstr "" -#: builtin/rebase.c:437 +#: builtin/rebase.c:480 msgid "git rebase--interactive [<options>]" msgstr "" -#: builtin/rebase.c:449 -msgid "keep empty commits" -msgstr "оставить пустые коммиты" +#: builtin/rebase.c:493 builtin/rebase.c:1388 +msgid "keep commits which start empty" +msgstr "" -#: builtin/rebase.c:451 builtin/revert.c:127 +#: builtin/rebase.c:497 builtin/revert.c:128 msgid "allow commits with empty messages" msgstr "разрешить коммиты с пустыми сообщениями" -#: builtin/rebase.c:452 +#: builtin/rebase.c:499 msgid "rebase merge commits" msgstr "" -#: builtin/rebase.c:454 +#: builtin/rebase.c:501 msgid "keep original branch points of cousins" msgstr "" -#: builtin/rebase.c:456 +#: builtin/rebase.c:503 msgid "move commits that begin with squash!/fixup!" msgstr "" -#: builtin/rebase.c:457 +#: builtin/rebase.c:504 msgid "sign commits" msgstr "" -#: builtin/rebase.c:459 builtin/rebase.c:1397 +#: builtin/rebase.c:506 builtin/rebase.c:1327 msgid "display a diffstat of what changed upstream" msgstr "" -#: builtin/rebase.c:461 +#: builtin/rebase.c:508 msgid "continue rebase" msgstr "продолжить перемещение" -#: builtin/rebase.c:463 +#: builtin/rebase.c:510 msgid "skip commit" msgstr "" -#: builtin/rebase.c:464 +#: builtin/rebase.c:511 msgid "edit the todo list" msgstr "" -#: builtin/rebase.c:466 +#: builtin/rebase.c:513 msgid "show the current patch" msgstr "" -#: builtin/rebase.c:469 +#: builtin/rebase.c:516 msgid "shorten commit ids in the todo list" msgstr "вывести короткие идентификаторы коммитов в списке действий" -#: builtin/rebase.c:471 +#: builtin/rebase.c:518 msgid "expand commit ids in the todo list" msgstr "вывести полные идентификаторы коммитов в списке действий" -#: builtin/rebase.c:473 +#: builtin/rebase.c:520 msgid "check the todo list" msgstr "проверить список дел" -#: builtin/rebase.c:475 +#: builtin/rebase.c:522 msgid "rearrange fixup/squash lines" msgstr "переставить строки fixup/squash" -#: builtin/rebase.c:477 +#: builtin/rebase.c:524 msgid "insert exec commands in todo list" msgstr "вставить команды исполнения коммитов в списке действий" -#: builtin/rebase.c:478 +#: builtin/rebase.c:525 msgid "onto" msgstr "" -#: builtin/rebase.c:481 +#: builtin/rebase.c:528 msgid "restrict-revision" msgstr "" -#: builtin/rebase.c:481 +#: builtin/rebase.c:528 msgid "restrict revision" msgstr "" -#: builtin/rebase.c:483 +#: builtin/rebase.c:530 msgid "squash-onto" msgstr "" -#: builtin/rebase.c:484 +#: builtin/rebase.c:531 msgid "squash onto" msgstr "" -#: builtin/rebase.c:486 +#: builtin/rebase.c:533 msgid "the upstream commit" msgstr "" -#: builtin/rebase.c:488 +#: builtin/rebase.c:535 msgid "head-name" msgstr "" -#: builtin/rebase.c:488 +#: builtin/rebase.c:535 msgid "head name" msgstr "" -#: builtin/rebase.c:493 +#: builtin/rebase.c:540 msgid "rebase strategy" msgstr "" -#: builtin/rebase.c:494 +#: builtin/rebase.c:541 msgid "strategy-opts" msgstr "" -#: builtin/rebase.c:495 +#: builtin/rebase.c:542 msgid "strategy options" msgstr "" -#: builtin/rebase.c:496 +#: builtin/rebase.c:543 msgid "switch-to" msgstr "" -#: builtin/rebase.c:497 +#: builtin/rebase.c:544 msgid "the branch or commit to checkout" msgstr "" -#: builtin/rebase.c:498 +#: builtin/rebase.c:545 msgid "onto-name" msgstr "" -#: builtin/rebase.c:498 +#: builtin/rebase.c:545 msgid "onto name" msgstr "" -#: builtin/rebase.c:499 +#: builtin/rebase.c:546 msgid "cmd" msgstr "" -#: builtin/rebase.c:499 +#: builtin/rebase.c:546 msgid "the command to run" msgstr "" -#: builtin/rebase.c:502 builtin/rebase.c:1480 +#: builtin/rebase.c:549 builtin/rebase.c:1421 msgid "automatically re-schedule any `exec` that fails" msgstr "" -#: builtin/rebase.c:518 +#: builtin/rebase.c:565 msgid "--[no-]rebase-cousins has no effect without --rebase-merges" msgstr "--[no-]rebase-cousins не имеет смысла без указания --rebase-merges" -#: builtin/rebase.c:534 builtin/rebase.c:1787 +#: builtin/rebase.c:581 #, c-format -msgid "%s requires an interactive rebase" +msgid "%s requires the merge backend" msgstr "" -#: builtin/rebase.c:586 +#: builtin/rebase.c:624 #, c-format msgid "could not get 'onto': '%s'" msgstr "" -#: builtin/rebase.c:601 +#: builtin/rebase.c:641 #, c-format msgid "invalid orig-head: '%s'" msgstr "" -#: builtin/rebase.c:626 +#: builtin/rebase.c:666 #, c-format msgid "ignoring invalid allow_rerere_autoupdate: '%s'" msgstr "" -#: builtin/rebase.c:702 -#, c-format -msgid "Could not read '%s'" -msgstr "" - -#: builtin/rebase.c:720 -#, c-format -msgid "Cannot store %s" -msgstr "" - -#: builtin/rebase.c:817 -msgid "could not determine HEAD revision" -msgstr "" - -#: builtin/rebase.c:940 +#: builtin/rebase.c:811 git-rebase--preserve-merges.sh:81 msgid "" "Resolve all conflicts manually, mark them as resolved with\n" "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n" @@ -15873,7 +18079,7 @@ msgid "" "To abort and get back to the state before \"git rebase\", run \"git rebase --abort\"." msgstr "Разрешите все конфликты вручную, пометьте их разрешёнными с помощью «git add/rm <конфликтующие-файлы>», а затем запустите «git rebase --continue».\nЕсли вы хотите пропустить этот коммит, то запустите «git rebase --skip».\nЧтобы вернуться на состояние до «git rebase», запустите «git rebase --abort»." -#: builtin/rebase.c:1021 +#: builtin/rebase.c:894 #, c-format msgid "" "\n" @@ -15885,7 +18091,12 @@ msgid "" "As a result, git cannot rebase them." msgstr "" -#: builtin/rebase.c:1313 +#: builtin/rebase.c:1220 +#, c-format +msgid "unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask\"." +msgstr "" + +#: builtin/rebase.c:1238 #, c-format msgid "" "%s\n" @@ -15896,7 +18107,7 @@ msgid "" "\n" msgstr "" -#: builtin/rebase.c:1329 +#: builtin/rebase.c:1254 #, c-format msgid "" "If you wish to set tracking information for this branch you can do so with:\n" @@ -15905,174 +18116,201 @@ msgid "" "\n" msgstr "" -#: builtin/rebase.c:1359 +#: builtin/rebase.c:1284 msgid "exec commands cannot contain newlines" msgstr "" -#: builtin/rebase.c:1363 +#: builtin/rebase.c:1288 msgid "empty exec command" msgstr "" -#: builtin/rebase.c:1390 +#: builtin/rebase.c:1318 msgid "rebase onto given branch instead of upstream" msgstr "" -#: builtin/rebase.c:1392 +#: builtin/rebase.c:1320 +msgid "use the merge-base of upstream and branch as the current base" +msgstr "" + +#: builtin/rebase.c:1322 msgid "allow pre-rebase hook to run" msgstr "" -#: builtin/rebase.c:1394 +#: builtin/rebase.c:1324 msgid "be quiet. implies --no-stat" msgstr "" -#: builtin/rebase.c:1400 +#: builtin/rebase.c:1330 msgid "do not show diffstat of what changed upstream" msgstr "" -#: builtin/rebase.c:1403 -msgid "add a Signed-off-by: line to each commit" +#: builtin/rebase.c:1333 +msgid "add a Signed-off-by trailer to each commit" +msgstr "" + +#: builtin/rebase.c:1336 +msgid "make committer date match author date" msgstr "" -#: builtin/rebase.c:1405 builtin/rebase.c:1409 builtin/rebase.c:1411 -msgid "passed to 'git am'" +#: builtin/rebase.c:1338 +msgid "ignore author date and use current date" msgstr "" -#: builtin/rebase.c:1413 builtin/rebase.c:1415 +#: builtin/rebase.c:1340 +msgid "synonym of --reset-author-date" +msgstr "" + +#: builtin/rebase.c:1342 builtin/rebase.c:1346 msgid "passed to 'git apply'" msgstr "" -#: builtin/rebase.c:1417 builtin/rebase.c:1420 +#: builtin/rebase.c:1344 +msgid "ignore changes in whitespace" +msgstr "" + +#: builtin/rebase.c:1348 builtin/rebase.c:1351 msgid "cherry-pick all commits, even if unchanged" msgstr "" -#: builtin/rebase.c:1422 +#: builtin/rebase.c:1353 msgid "continue" msgstr "" -#: builtin/rebase.c:1425 +#: builtin/rebase.c:1356 msgid "skip current patch and continue" msgstr "" -#: builtin/rebase.c:1427 +#: builtin/rebase.c:1358 msgid "abort and check out the original branch" msgstr "" -#: builtin/rebase.c:1430 +#: builtin/rebase.c:1361 msgid "abort but keep HEAD where it is" msgstr "" -#: builtin/rebase.c:1431 +#: builtin/rebase.c:1362 msgid "edit the todo list during an interactive rebase" msgstr "" -#: builtin/rebase.c:1434 +#: builtin/rebase.c:1365 msgid "show the patch file being applied or merged" msgstr "" -#: builtin/rebase.c:1437 +#: builtin/rebase.c:1368 +msgid "use apply strategies to rebase" +msgstr "" + +#: builtin/rebase.c:1372 msgid "use merging strategies to rebase" msgstr "" -#: builtin/rebase.c:1441 +#: builtin/rebase.c:1376 msgid "let the user edit the list of commits to rebase" msgstr "" -#: builtin/rebase.c:1445 +#: builtin/rebase.c:1380 msgid "(DEPRECATED) try to recreate merges instead of ignoring them" msgstr "" -#: builtin/rebase.c:1449 -msgid "preserve empty commits during rebase" +#: builtin/rebase.c:1385 +msgid "how to handle commits that become empty" msgstr "" -#: builtin/rebase.c:1451 +#: builtin/rebase.c:1392 msgid "move commits that begin with squash!/fixup! under -i" msgstr "" -#: builtin/rebase.c:1457 -msgid "automatically stash/stash pop before and after" -msgstr "" - -#: builtin/rebase.c:1459 +#: builtin/rebase.c:1399 msgid "add exec lines after each commit of the editable list" msgstr "" -#: builtin/rebase.c:1463 +#: builtin/rebase.c:1403 msgid "allow rebasing commits with empty messages" msgstr "" -#: builtin/rebase.c:1466 +#: builtin/rebase.c:1407 msgid "try to rebase merges instead of skipping them" msgstr "" -#: builtin/rebase.c:1469 +#: builtin/rebase.c:1410 msgid "use 'merge-base --fork-point' to refine upstream" msgstr "" -#: builtin/rebase.c:1471 +#: builtin/rebase.c:1412 msgid "use the given merge strategy" msgstr "" -#: builtin/rebase.c:1473 builtin/revert.c:114 +#: builtin/rebase.c:1414 builtin/revert.c:115 msgid "option" msgstr "опция" -#: builtin/rebase.c:1474 +#: builtin/rebase.c:1415 msgid "pass the argument through to the merge strategy" msgstr "" -#: builtin/rebase.c:1477 +#: builtin/rebase.c:1418 msgid "rebase all reachable commits up to the root(s)" msgstr "" -#: builtin/rebase.c:1498 +#: builtin/rebase.c:1423 +msgid "apply all changes, even those already present upstream" +msgstr "" + +#: builtin/rebase.c:1440 msgid "" "the rebase.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." msgstr "" -#: builtin/rebase.c:1504 +#: builtin/rebase.c:1446 msgid "It looks like 'git am' is in progress. Cannot rebase." msgstr "Похоже, что выполняется «git am». Невозможно выполнить перемещение." -#: builtin/rebase.c:1545 +#: builtin/rebase.c:1487 msgid "" "git rebase --preserve-merges is deprecated. Use --rebase-merges instead." msgstr "" -#: builtin/rebase.c:1549 +#: builtin/rebase.c:1492 +msgid "cannot combine '--keep-base' with '--onto'" +msgstr "" + +#: builtin/rebase.c:1494 +msgid "cannot combine '--keep-base' with '--root'" +msgstr "" + +#: builtin/rebase.c:1498 +msgid "cannot combine '--root' with '--fork-point'" +msgstr "" + +#: builtin/rebase.c:1501 msgid "No rebase in progress?" msgstr "Нет перемещения в процессе?" -#: builtin/rebase.c:1553 +#: builtin/rebase.c:1505 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "Действие --edit-todo может использоваться только при интерактивном перемещении." -#: builtin/rebase.c:1576 +#: builtin/rebase.c:1528 t/helper/test-fast-rebase.c:123 msgid "Cannot read HEAD" msgstr "Не удалось прочитать HEAD" -#: builtin/rebase.c:1588 +#: builtin/rebase.c:1540 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" msgstr "Вы должны отредактировать все\nконфликты слияния, а потом пометить\nих как разрешенные с помощью git add" -#: builtin/rebase.c:1607 +#: builtin/rebase.c:1559 msgid "could not discard worktree changes" msgstr "" -#: builtin/rebase.c:1626 +#: builtin/rebase.c:1578 #, c-format msgid "could not move back to %s" msgstr "" -#: builtin/rebase.c:1637 builtin/rm.c:369 -#, c-format -msgid "could not remove '%s'" -msgstr "не удалось удалить «%s»" - -#: builtin/rebase.c:1663 +#: builtin/rebase.c:1624 #, c-format msgid "" "It seems that there is already a %s directory, and\n" @@ -16085,167 +18323,140 @@ msgid "" "valuable there.\n" msgstr "" -#: builtin/rebase.c:1684 +#: builtin/rebase.c:1652 msgid "switch `C' expects a numerical value" msgstr "" -#: builtin/rebase.c:1725 +#: builtin/rebase.c:1694 #, c-format msgid "Unknown mode: %s" msgstr "" -#: builtin/rebase.c:1747 +#: builtin/rebase.c:1733 msgid "--strategy requires --merge or --interactive" msgstr "" -#: builtin/rebase.c:1796 -msgid "cannot combine am options with either interactive or merge options" +#: builtin/rebase.c:1763 +msgid "cannot combine apply options with merge options" msgstr "" -#: builtin/rebase.c:1815 -msgid "cannot combine '--preserve-merges' with '--rebase-merges'" +#: builtin/rebase.c:1776 +#, c-format +msgid "Unknown rebase backend: %s" msgstr "" -#: builtin/rebase.c:1819 -msgid "" -"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'" +#: builtin/rebase.c:1806 +msgid "--reschedule-failed-exec requires --exec or --interactive" msgstr "" -#: builtin/rebase.c:1825 -msgid "cannot combine '--rebase-merges' with '--strategy-option'" +#: builtin/rebase.c:1826 +msgid "cannot combine '--preserve-merges' with '--rebase-merges'" msgstr "" -#: builtin/rebase.c:1828 -msgid "cannot combine '--rebase-merges' with '--strategy'" +#: builtin/rebase.c:1830 +msgid "" +"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'" msgstr "" -#: builtin/rebase.c:1852 +#: builtin/rebase.c:1854 #, c-format msgid "invalid upstream '%s'" msgstr "" -#: builtin/rebase.c:1858 +#: builtin/rebase.c:1860 msgid "Could not create new root commit" msgstr "" -#: builtin/rebase.c:1876 +#: builtin/rebase.c:1886 +#, c-format +msgid "'%s': need exactly one merge base with branch" +msgstr "" + +#: builtin/rebase.c:1889 #, c-format msgid "'%s': need exactly one merge base" msgstr "" -#: builtin/rebase.c:1883 +#: builtin/rebase.c:1897 #, c-format msgid "Does not point to a valid commit '%s'" msgstr "" -#: builtin/rebase.c:1908 +#: builtin/rebase.c:1923 #, c-format msgid "fatal: no such branch/commit '%s'" msgstr "" -#: builtin/rebase.c:1916 builtin/submodule--helper.c:38 -#: builtin/submodule--helper.c:1933 +#: builtin/rebase.c:1931 builtin/submodule--helper.c:40 +#: builtin/submodule--helper.c:2414 #, c-format msgid "No such ref: %s" msgstr "Нет такой ссылки: %s" -#: builtin/rebase.c:1927 +#: builtin/rebase.c:1942 msgid "Could not resolve HEAD to a revision" msgstr "" -#: builtin/rebase.c:1968 -msgid "Cannot autostash" -msgstr "Не удалось автоматически спрятать изменения" - -#: builtin/rebase.c:1971 -#, c-format -msgid "Unexpected stash response: '%s'" -msgstr "" - -#: builtin/rebase.c:1977 -#, c-format -msgid "Could not create directory for '%s'" -msgstr "" - -#: builtin/rebase.c:1980 -#, c-format -msgid "Created autostash: %s\n" -msgstr "" - -#: builtin/rebase.c:1983 -msgid "could not reset --hard" -msgstr "" - -#: builtin/rebase.c:1984 builtin/reset.c:114 -#, c-format -msgid "HEAD is now at %s" -msgstr "HEAD сейчас на %s" - -#: builtin/rebase.c:2000 +#: builtin/rebase.c:1963 msgid "Please commit or stash them." msgstr "Сделайте коммит или спрячьте их." -#: builtin/rebase.c:2027 -#, c-format -msgid "could not parse '%s'" -msgstr "" - -#: builtin/rebase.c:2040 +#: builtin/rebase.c:1999 #, c-format msgid "could not switch to %s" msgstr "" -#: builtin/rebase.c:2051 +#: builtin/rebase.c:2010 msgid "HEAD is up to date." msgstr "HEAD уже в актуальном состоянии." -#: builtin/rebase.c:2053 +#: builtin/rebase.c:2012 #, c-format msgid "Current branch %s is up to date.\n" msgstr "" -#: builtin/rebase.c:2061 +#: builtin/rebase.c:2020 msgid "HEAD is up to date, rebase forced." msgstr "HEAD уже в актуальном состоянии, принудительное перемещение." -#: builtin/rebase.c:2063 +#: builtin/rebase.c:2022 #, c-format msgid "Current branch %s is up to date, rebase forced.\n" msgstr "" -#: builtin/rebase.c:2071 +#: builtin/rebase.c:2030 msgid "The pre-rebase hook refused to rebase." msgstr "Перехватчик pre-rebase отказал в перемещении." -#: builtin/rebase.c:2078 +#: builtin/rebase.c:2037 #, c-format msgid "Changes to %s:\n" msgstr "" -#: builtin/rebase.c:2081 +#: builtin/rebase.c:2040 #, c-format msgid "Changes from %s to %s:\n" msgstr "" -#: builtin/rebase.c:2106 +#: builtin/rebase.c:2065 #, c-format msgid "First, rewinding head to replay your work on top of it...\n" msgstr "" -#: builtin/rebase.c:2115 +#: builtin/rebase.c:2074 msgid "Could not detach HEAD" msgstr "" -#: builtin/rebase.c:2124 +#: builtin/rebase.c:2083 #, c-format msgid "Fast-forwarded %s to %s.\n" msgstr "" -#: builtin/receive-pack.c:33 +#: builtin/receive-pack.c:34 msgid "git receive-pack <git-dir>" msgstr "git receive-pack <каталог-git>" -#: builtin/receive-pack.c:833 +#: builtin/receive-pack.c:1276 msgid "" "By default, updating the current branch in a non-bare repository\n" "is denied, because it will make the index and work tree inconsistent\n" @@ -16262,7 +18473,7 @@ msgid "" "'receive.denyCurrentBranch' configuration variable to 'refuse'." msgstr "По умолчанию, обновлять текущую ветку в репозитории с рабочей\nкопией (не голом) запрещено, так как это сделает состояние индекса\nи рабочего каталога противоречивым, и вам прийдется выполнить\n«git reset --hard», чтобы состояние рабочего каталога снова\nсоответствовало HEAD.\n\nВы можете установить значение опции «receive.denyCurrentBranch»\nв «ignore» или «warn» во внешнем репозитории, чтобы разрешить\nотправку в его текущую ветку; но это не рекомендуется, если только\nвы не намерены обновить его рабочий каталог способом подобным\nвышеописанному.\n\nЧтобы пропустить это сообщение и все равно оставить поведение\nпо умолчанию, установите значение опции «receive.denyCurrentBranch»\nв «refuse»." -#: builtin/receive-pack.c:853 +#: builtin/receive-pack.c:1296 msgid "" "By default, deleting the current branch is denied, because the next\n" "'git clone' won't result in any file checked out, causing confusion.\n" @@ -16274,11 +18485,11 @@ msgid "" "To squelch this message, you can set it to 'refuse'." msgstr "По умолчанию, удаление текущей ветки запрещено, так как последующий\n«git clone» не сможет получить никаких файлов, что приведет к путанице.\n\nВы можете установить значение опции «receive.denyDeleteCurrent»\nв «warn» или «ignore», во внешнем репозитории, чтобы разрешить\nудаление текущей ветки с или без предупреждающего сообщения.\n\nЧтобы пропустить это сообщение, вы можете установить значение опции\nв «refuse»." -#: builtin/receive-pack.c:1940 +#: builtin/receive-pack.c:2481 msgid "quiet" msgstr "тихий режим" -#: builtin/receive-pack.c:1954 +#: builtin/receive-pack.c:2495 msgid "You must specify a directory." msgstr "Вы должны указать каталог." @@ -16299,210 +18510,218 @@ msgstr "" msgid "git reflog exists <ref>" msgstr "" -#: builtin/reflog.c:567 builtin/reflog.c:572 +#: builtin/reflog.c:568 builtin/reflog.c:573 #, c-format msgid "'%s' is not a valid timestamp" msgstr "«%s» не является допустимой меткой даты/времени" -#: builtin/reflog.c:605 +#: builtin/reflog.c:606 #, c-format msgid "Marking reachable objects..." msgstr "" -#: builtin/reflog.c:643 +#: builtin/reflog.c:644 #, c-format msgid "%s points nowhere!" msgstr "" -#: builtin/reflog.c:695 +#: builtin/reflog.c:696 msgid "no reflog specified to delete" msgstr "" -#: builtin/reflog.c:704 +#: builtin/reflog.c:705 #, c-format msgid "not a reflog: %s" msgstr "" -#: builtin/reflog.c:709 +#: builtin/reflog.c:710 #, c-format msgid "no reflog for '%s'" msgstr "" -#: builtin/reflog.c:755 +#: builtin/reflog.c:756 #, c-format msgid "invalid ref format: %s" msgstr "" -#: builtin/reflog.c:764 +#: builtin/reflog.c:765 msgid "git reflog [ show | expire | delete | exists ]" msgstr "" -#: builtin/remote.c:16 +#: builtin/remote.c:17 msgid "git remote [-v | --verbose]" msgstr "git remote [-v | --verbose]" -#: builtin/remote.c:17 +#: builtin/remote.c:18 msgid "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] " "[--mirror=<fetch|push>] <name> <url>" msgstr "git remote add [-t <ветка>] [-m <мастер-ветка>] [-f] [--tags | --no-tags] [--mirror=<fetch|push>] <имя> <адрес>" -#: builtin/remote.c:18 builtin/remote.c:38 +#: builtin/remote.c:19 builtin/remote.c:39 msgid "git remote rename <old> <new>" msgstr "git remote rename <старое-название> <новое-название>" -#: builtin/remote.c:19 builtin/remote.c:43 +#: builtin/remote.c:20 builtin/remote.c:44 msgid "git remote remove <name>" msgstr "git remote remove <имя>" -#: builtin/remote.c:20 builtin/remote.c:48 +#: builtin/remote.c:21 builtin/remote.c:49 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" msgstr "git remote set-head <имя> (-a | --auto | -d | --delete | <ветка>)" -#: builtin/remote.c:21 +#: builtin/remote.c:22 msgid "git remote [-v | --verbose] show [-n] <name>" msgstr "git remote [-v | --verbose] show [-n] <имя>" -#: builtin/remote.c:22 +#: builtin/remote.c:23 msgid "git remote prune [-n | --dry-run] <name>" msgstr "git remote prune [-n | --dry-run] <имя>" -#: builtin/remote.c:23 +#: builtin/remote.c:24 msgid "" "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" msgstr "git remote [-v | --verbose] update [-p | --prune] [(<группа> | <имя-внешнего-репозитория>)…]" -#: builtin/remote.c:24 +#: builtin/remote.c:25 msgid "git remote set-branches [--add] <name> <branch>..." msgstr "git remote set-branches [--add] <имя> <ветка>…" -#: builtin/remote.c:25 builtin/remote.c:74 +#: builtin/remote.c:26 builtin/remote.c:75 msgid "git remote get-url [--push] [--all] <name>" msgstr "git remote get-url [--push] [--all] <имя>" -#: builtin/remote.c:26 builtin/remote.c:79 +#: builtin/remote.c:27 builtin/remote.c:80 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" msgstr "git remote set-url [--push] <имя> <новый-url> [<старый-url>]" -#: builtin/remote.c:27 builtin/remote.c:80 +#: builtin/remote.c:28 builtin/remote.c:81 msgid "git remote set-url --add <name> <newurl>" msgstr "git remote set-url --add <имя> <новый-url>" -#: builtin/remote.c:28 builtin/remote.c:81 +#: builtin/remote.c:29 builtin/remote.c:82 msgid "git remote set-url --delete <name> <url>" msgstr "git remote set-url --delete <имя> <url>" -#: builtin/remote.c:33 +#: builtin/remote.c:34 msgid "git remote add [<options>] <name> <url>" msgstr "git remote add [<опции>] <имя> <url>" -#: builtin/remote.c:53 +#: builtin/remote.c:54 msgid "git remote set-branches <name> <branch>..." msgstr "git remote set-branches <имя> <ветка>…" -#: builtin/remote.c:54 +#: builtin/remote.c:55 msgid "git remote set-branches --add <name> <branch>..." msgstr "git remote set-branches --add <имя> <ветка>…" -#: builtin/remote.c:59 +#: builtin/remote.c:60 msgid "git remote show [<options>] <name>" msgstr "git remote show [<опции>] <имя>" -#: builtin/remote.c:64 +#: builtin/remote.c:65 msgid "git remote prune [<options>] <name>" msgstr "git remote prune [<опции>] <имя>" -#: builtin/remote.c:69 +#: builtin/remote.c:70 msgid "git remote update [<options>] [<group> | <remote>]..." msgstr "git remote update [<опции>] [<группа> | <имя-внешнего-репозитория>]…" -#: builtin/remote.c:98 +#: builtin/remote.c:99 #, c-format msgid "Updating %s" msgstr "Обновление %s" -#: builtin/remote.c:130 +#: builtin/remote.c:131 msgid "" "--mirror is dangerous and deprecated; please\n" "\t use --mirror=fetch or --mirror=push instead" msgstr "ключ --mirror небезопасен и не рекомендуется к использованию;\nиспользуйте вместо него --mirror=fetch или --mirror=push" -#: builtin/remote.c:147 +#: builtin/remote.c:148 #, c-format msgid "unknown mirror argument: %s" msgstr "неизвестный аргумент для mirror: %s" -#: builtin/remote.c:163 +#: builtin/remote.c:164 msgid "fetch the remote branches" msgstr "извлечь внешние ветки" -#: builtin/remote.c:165 +#: builtin/remote.c:166 msgid "import all tags and associated objects when fetching" msgstr "импортировать все метки и ассоциированные объекты при извлечении" -#: builtin/remote.c:168 +#: builtin/remote.c:169 msgid "or do not fetch any tag at all (--no-tags)" msgstr "или не извлекать метки вообще (--no-tags)" -#: builtin/remote.c:170 +#: builtin/remote.c:171 msgid "branch(es) to track" msgstr "отслеживаемые ветки" -#: builtin/remote.c:171 +#: builtin/remote.c:172 msgid "master branch" msgstr "мастер ветка" -#: builtin/remote.c:173 +#: builtin/remote.c:174 msgid "set up remote as a mirror to push to or fetch from" msgstr "настроить внешний репозиторий как зеркало для отправки или извлечения изменений" -#: builtin/remote.c:185 +#: builtin/remote.c:186 msgid "specifying a master branch makes no sense with --mirror" msgstr "указание мастер ветки не имеет смысла с параметром --mirror" -#: builtin/remote.c:187 +#: builtin/remote.c:188 msgid "specifying branches to track makes sense only with fetch mirrors" msgstr "указание отслеживаемых веток имеет смысл только при зеркальном извлечении" -#: builtin/remote.c:194 builtin/remote.c:636 +#: builtin/remote.c:195 builtin/remote.c:700 #, c-format msgid "remote %s already exists." msgstr "внешний репозиторий %s уже существует" -#: builtin/remote.c:198 builtin/remote.c:640 -#, c-format -msgid "'%s' is not a valid remote name" -msgstr "«%s» не является допустимым именем внешнего репозитория." - -#: builtin/remote.c:238 +#: builtin/remote.c:240 #, c-format msgid "Could not setup master '%s'" msgstr "Не удалось настроить мастер ветку «%s»" -#: builtin/remote.c:344 +#: builtin/remote.c:355 #, c-format msgid "Could not get fetch map for refspec %s" msgstr "Не удалось извлечь карту для спецификатора ссылки %s" -#: builtin/remote.c:443 builtin/remote.c:451 +#: builtin/remote.c:454 builtin/remote.c:462 msgid "(matching)" msgstr "(соответствующая)" -#: builtin/remote.c:455 +#: builtin/remote.c:466 msgid "(delete)" msgstr "(удаленная)" -#: builtin/remote.c:629 builtin/remote.c:765 builtin/remote.c:864 +#: builtin/remote.c:655 +#, c-format +msgid "could not set '%s'" +msgstr "" + +#: builtin/remote.c:660 +#, c-format +msgid "" +"The %s configuration remote.pushDefault in:\n" +"\t%s:%d\n" +"now names the non-existent remote '%s'" +msgstr "" + +#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:946 #, c-format msgid "No such remote: '%s'" msgstr "" -#: builtin/remote.c:646 +#: builtin/remote.c:710 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "Не удалось переименовать секцию конфигурации с «%s» на «%s»" -#: builtin/remote.c:666 +#: builtin/remote.c:730 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -16510,17 +18729,17 @@ msgid "" "\tPlease update the configuration manually if necessary." msgstr "Не обновляю нестандартную спецификатор ссылки для извлечения\n\t%s\n\tПожалуйста, если требуется, обновите конфигурацию вручную." -#: builtin/remote.c:702 +#: builtin/remote.c:770 #, c-format msgid "deleting '%s' failed" msgstr "не удалось удалить «%s»" -#: builtin/remote.c:736 +#: builtin/remote.c:804 #, c-format msgid "creating '%s' failed" msgstr "не удалось создать «%s»" -#: builtin/remote.c:802 +#: builtin/remote.c:882 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -16532,148 +18751,148 @@ msgstr[1] "Примечание: Некоторые ветки вне иерар msgstr[2] "Примечание: Некоторые ветки вне иерархии refs/remotes/ не будут удалены;\nчтобы удалить их, используйте:" msgstr[3] "Примечание: Некоторые ветки вне иерархии refs/remotes/ не будут удалены;\nчтобы удалить их, используйте:" -#: builtin/remote.c:816 +#: builtin/remote.c:896 #, c-format msgid "Could not remove config section '%s'" msgstr "Не удалось удалить секцию файла конфигурации «%s»" -#: builtin/remote.c:917 +#: builtin/remote.c:999 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " новая (следующее извлечение сохранит ее в remotes/%s)" -#: builtin/remote.c:920 +#: builtin/remote.c:1002 msgid " tracked" msgstr " отслеживается" -#: builtin/remote.c:922 +#: builtin/remote.c:1004 msgid " stale (use 'git remote prune' to remove)" msgstr " недействительна (используйте «git remote prune», чтобы удалить)" -#: builtin/remote.c:924 +#: builtin/remote.c:1006 msgid " ???" msgstr " ???" -#: builtin/remote.c:965 +#: builtin/remote.c:1047 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "неправильный параметр конфигурации branch.%s.merge; невозможно переместить более чем над 1 веткой" -#: builtin/remote.c:974 +#: builtin/remote.c:1056 #, c-format msgid "rebases interactively onto remote %s" msgstr "перемещается интерактивно над внешней веткой %s" -#: builtin/remote.c:976 +#: builtin/remote.c:1058 #, c-format msgid "rebases interactively (with merges) onto remote %s" msgstr "" -#: builtin/remote.c:979 +#: builtin/remote.c:1061 #, c-format msgid "rebases onto remote %s" msgstr "перемещается над внешней веткой %s" -#: builtin/remote.c:983 +#: builtin/remote.c:1065 #, c-format msgid " merges with remote %s" msgstr " будет слита с внешней веткой %s" -#: builtin/remote.c:986 +#: builtin/remote.c:1068 #, c-format msgid "merges with remote %s" msgstr "будет слита с внешней веткой %s" -#: builtin/remote.c:989 +#: builtin/remote.c:1071 #, c-format msgid "%-*s and with remote %s\n" msgstr "%-*s и с внешней веткой %s\n" -#: builtin/remote.c:1032 +#: builtin/remote.c:1114 msgid "create" msgstr "создана" -#: builtin/remote.c:1035 +#: builtin/remote.c:1117 msgid "delete" msgstr "удалена" -#: builtin/remote.c:1039 +#: builtin/remote.c:1121 msgid "up to date" msgstr "уже актуальна" -#: builtin/remote.c:1042 +#: builtin/remote.c:1124 msgid "fast-forwardable" msgstr "возможна перемотка вперед" -#: builtin/remote.c:1045 +#: builtin/remote.c:1127 msgid "local out of date" msgstr "локальная ветка устарела" -#: builtin/remote.c:1052 +#: builtin/remote.c:1134 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s будет принудительно отправлена в %-*s (%s)" -#: builtin/remote.c:1055 +#: builtin/remote.c:1137 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s будет отправлена в %-*s (%s)" -#: builtin/remote.c:1059 +#: builtin/remote.c:1141 #, c-format msgid " %-*s forces to %s" msgstr " %-*s будет принудительно отправлена в %s" -#: builtin/remote.c:1062 +#: builtin/remote.c:1144 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s будет отправлена в %s" -#: builtin/remote.c:1130 +#: builtin/remote.c:1212 msgid "do not query remotes" msgstr "не опрашивать внешние репозитории" -#: builtin/remote.c:1157 +#: builtin/remote.c:1239 #, c-format msgid "* remote %s" msgstr "* внешний репозиторий %s" -#: builtin/remote.c:1158 +#: builtin/remote.c:1240 #, c-format msgid " Fetch URL: %s" msgstr " URL для извлечения: %s" -#: builtin/remote.c:1159 builtin/remote.c:1175 builtin/remote.c:1314 +#: builtin/remote.c:1241 builtin/remote.c:1257 builtin/remote.c:1396 msgid "(no URL)" msgstr "(нет URL)" #. TRANSLATORS: the colon ':' should align #. with the one in " Fetch URL: %s" #. translation. -#: builtin/remote.c:1173 builtin/remote.c:1175 +#: builtin/remote.c:1255 builtin/remote.c:1257 #, c-format msgid " Push URL: %s" msgstr " URL для отправки: %s" -#: builtin/remote.c:1177 builtin/remote.c:1179 builtin/remote.c:1181 +#: builtin/remote.c:1259 builtin/remote.c:1261 builtin/remote.c:1263 #, c-format msgid " HEAD branch: %s" msgstr " HEAD ветка: %s" -#: builtin/remote.c:1177 +#: builtin/remote.c:1259 msgid "(not queried)" msgstr "(не запрашивался)" -#: builtin/remote.c:1179 +#: builtin/remote.c:1261 msgid "(unknown)" msgstr "(неизвестно)" -#: builtin/remote.c:1183 +#: builtin/remote.c:1265 #, c-format msgid " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" msgstr " HEAD ветка (HEAD внешнего репозитория неоднозначный, может быть одним из):\n" -#: builtin/remote.c:1195 +#: builtin/remote.c:1277 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" @@ -16682,11 +18901,11 @@ msgstr[1] " Внешние ветки:%s" msgstr[2] " Внешние ветки:%s" msgstr[3] " Внешние ветки:%s" -#: builtin/remote.c:1198 builtin/remote.c:1224 +#: builtin/remote.c:1280 builtin/remote.c:1306 msgid " (status not queried)" msgstr " (статус не запрашивался)" -#: builtin/remote.c:1207 +#: builtin/remote.c:1289 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] " Локальная ветка, настроенная для «git pull»:" @@ -16694,11 +18913,11 @@ msgstr[1] " Локальные ветки, настроенные для «git msgstr[2] " Локальные ветки, настроенные для «git pull»:" msgstr[3] " Локальные ветки, настроенные для «git pull»:" -#: builtin/remote.c:1215 +#: builtin/remote.c:1297 msgid " Local refs will be mirrored by 'git push'" msgstr " Локальные ссылки, зеркалируемые с помощью «git push»" -#: builtin/remote.c:1221 +#: builtin/remote.c:1303 #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" @@ -16707,266 +18926,250 @@ msgstr[1] " Локальные ссылки, настроенные для «gi msgstr[2] " Локальные ссылки, настроенные для «git push»%s:" msgstr[3] " Локальные ссылки, настроенные для «git push»%s:" -#: builtin/remote.c:1242 +#: builtin/remote.c:1324 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "установить refs/remotes/<имя>/HEAD в зависимости от внешнего репозитория" -#: builtin/remote.c:1244 +#: builtin/remote.c:1326 msgid "delete refs/remotes/<name>/HEAD" msgstr "удалить refs/remotes/<имя>/HEAD" -#: builtin/remote.c:1259 +#: builtin/remote.c:1341 msgid "Cannot determine remote HEAD" msgstr "Не удалось определить внешний HEAD" -#: builtin/remote.c:1261 +#: builtin/remote.c:1343 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "Несколько внешних HEAD веток. Укажите явно одну из них:" -#: builtin/remote.c:1271 +#: builtin/remote.c:1353 #, c-format msgid "Could not delete %s" msgstr "Не удалось удалить %s" -#: builtin/remote.c:1279 +#: builtin/remote.c:1361 #, c-format msgid "Not a valid ref: %s" msgstr "Недопустимая ссылка: %s" -#: builtin/remote.c:1281 +#: builtin/remote.c:1363 #, c-format msgid "Could not setup %s" msgstr "Не удалось настроить %s" -#: builtin/remote.c:1299 +#: builtin/remote.c:1381 #, c-format msgid " %s will become dangling!" msgstr " %s будет висящей веткой!" -#: builtin/remote.c:1300 +#: builtin/remote.c:1382 #, c-format msgid " %s has become dangling!" msgstr " %s стала висящей веткой!" -#: builtin/remote.c:1310 +#: builtin/remote.c:1392 #, c-format msgid "Pruning %s" msgstr "Очистка %s" -#: builtin/remote.c:1311 +#: builtin/remote.c:1393 #, c-format msgid "URL: %s" msgstr "URL: %s" -#: builtin/remote.c:1327 +#: builtin/remote.c:1409 #, c-format msgid " * [would prune] %s" msgstr " * [будет удалена] %s" -#: builtin/remote.c:1330 +#: builtin/remote.c:1412 #, c-format msgid " * [pruned] %s" msgstr " * [удалена] %s" -#: builtin/remote.c:1375 +#: builtin/remote.c:1457 msgid "prune remotes after fetching" msgstr "почистить внешние репозитории после извлечения" -#: builtin/remote.c:1438 builtin/remote.c:1492 builtin/remote.c:1560 +#: builtin/remote.c:1521 builtin/remote.c:1577 builtin/remote.c:1647 #, c-format msgid "No such remote '%s'" msgstr "Нет такого внешнего репозитория «%s»" -#: builtin/remote.c:1454 +#: builtin/remote.c:1539 msgid "add branch" msgstr "добавить ветку" -#: builtin/remote.c:1461 +#: builtin/remote.c:1546 msgid "no remote specified" msgstr "не указан внешний репозиторий" -#: builtin/remote.c:1478 +#: builtin/remote.c:1563 msgid "query push URLs rather than fetch URLs" msgstr "запросить URL отправки, вместо URL извлечения" -#: builtin/remote.c:1480 +#: builtin/remote.c:1565 msgid "return all URLs" msgstr "вернуть все URL" -#: builtin/remote.c:1508 +#: builtin/remote.c:1595 #, c-format msgid "no URLs configured for remote '%s'" msgstr "URL не настроены для внешнего репозитория «%s»" -#: builtin/remote.c:1534 +#: builtin/remote.c:1621 msgid "manipulate push URLs" msgstr "управление URL отправки" -#: builtin/remote.c:1536 +#: builtin/remote.c:1623 msgid "add URL" msgstr "добавить URL" -#: builtin/remote.c:1538 +#: builtin/remote.c:1625 msgid "delete URLs" msgstr "удалить URL" -#: builtin/remote.c:1545 +#: builtin/remote.c:1632 msgid "--add --delete doesn't make sense" msgstr "--add нельзя использовать одновременно с --delete" -#: builtin/remote.c:1584 +#: builtin/remote.c:1673 #, c-format msgid "Invalid old URL pattern: %s" msgstr "Неправильный шаблон старого URL: %s" -#: builtin/remote.c:1592 +#: builtin/remote.c:1681 #, c-format msgid "No such URL found: %s" msgstr "Не найдены совпадения URL: %s" -#: builtin/remote.c:1594 +#: builtin/remote.c:1683 msgid "Will not delete all non-push URLs" msgstr "Нельзя удалить все URL не-отправки" -#: builtin/remote.c:1610 -msgid "be verbose; must be placed before a subcommand" -msgstr "быть многословнее; должно стоять перед подкомандой" - -#: builtin/remote.c:1641 -#, c-format -msgid "Unknown subcommand: %s" -msgstr "Неизвестная подкоманда: %s" - -#: builtin/repack.c:22 +#: builtin/repack.c:25 msgid "git repack [<options>]" msgstr "git repack [<опции>]" -#: builtin/repack.c:27 +#: builtin/repack.c:30 msgid "" "Incremental repacks are incompatible with bitmap indexes. Use\n" "--no-write-bitmap-index or disable the pack.writebitmaps configuration." msgstr "Инкрементальные перепаковки не совместимы с индексами в битовых картах. Используйте опцию --no-write-bitmap-index или отключите параметр конфигурации pack.writebitmaps." -#: builtin/repack.c:200 +#: builtin/repack.c:197 msgid "could not start pack-objects to repack promisor objects" msgstr "" -#: builtin/repack.c:239 builtin/repack.c:414 +#: builtin/repack.c:268 builtin/repack.c:447 msgid "repack: Expecting full hex object ID lines only from pack-objects." msgstr "" -#: builtin/repack.c:256 +#: builtin/repack.c:295 msgid "could not finish pack-objects to repack promisor objects" msgstr "" -#: builtin/repack.c:294 +#: builtin/repack.c:323 msgid "pack everything in a single pack" msgstr "упаковать всё в один пакет" -#: builtin/repack.c:296 +#: builtin/repack.c:325 msgid "same as -a, and turn unreachable objects loose" msgstr "тоже, что и -a, но дополнительно отбросить недостижимые объекты" -#: builtin/repack.c:299 +#: builtin/repack.c:328 msgid "remove redundant packs, and run git-prune-packed" msgstr "удалите лишние пакеты и запустите git-prune-packed" -#: builtin/repack.c:301 +#: builtin/repack.c:330 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "передать опцию --no-reuse-delta в git-pack-objects" -#: builtin/repack.c:303 +#: builtin/repack.c:332 msgid "pass --no-reuse-object to git-pack-objects" msgstr "передать опцию --no-reuse-object в git-pack-objects" -#: builtin/repack.c:305 +#: builtin/repack.c:334 msgid "do not run git-update-server-info" msgstr "не запускать git-update-server-info" -#: builtin/repack.c:308 +#: builtin/repack.c:337 msgid "pass --local to git-pack-objects" msgstr "передать опцию --local в git-pack-objects" -#: builtin/repack.c:310 +#: builtin/repack.c:339 msgid "write bitmap index" msgstr "запись индекса в битовых картах" -#: builtin/repack.c:312 +#: builtin/repack.c:341 msgid "pass --delta-islands to git-pack-objects" msgstr "" -#: builtin/repack.c:313 +#: builtin/repack.c:342 msgid "approxidate" msgstr "примерная-дата" -#: builtin/repack.c:314 +#: builtin/repack.c:343 msgid "with -A, do not loosen objects older than this" msgstr "с опцией -A, не отбрасывать объекты старее, чем указано" -#: builtin/repack.c:316 +#: builtin/repack.c:345 msgid "with -a, repack unreachable objects" msgstr "с параметром -a, перепаковать недоступные объекты" -#: builtin/repack.c:318 +#: builtin/repack.c:347 msgid "size of the window used for delta compression" msgstr "размер окна, используемый для компрессии дельт" -#: builtin/repack.c:319 builtin/repack.c:325 +#: builtin/repack.c:348 builtin/repack.c:354 msgid "bytes" msgstr "количество-байт" -#: builtin/repack.c:320 +#: builtin/repack.c:349 msgid "same as the above, but limit memory size instead of entries count" msgstr "тоже, что и выше, но ограничить размер памяти, а не количество записей" -#: builtin/repack.c:322 +#: builtin/repack.c:351 msgid "limits the maximum delta depth" msgstr "ограничение на максимальную глубину дельт" -#: builtin/repack.c:324 +#: builtin/repack.c:353 msgid "limits the maximum number of threads" msgstr "ограничение на максимальное количество потоков" -#: builtin/repack.c:326 +#: builtin/repack.c:355 msgid "maximum size of each packfile" msgstr "максимальный размер каждого из файлов пакета" -#: builtin/repack.c:328 +#: builtin/repack.c:357 msgid "repack objects in packs marked with .keep" msgstr "переупаковать объекты в пакеты, помеченные файлом .keep" -#: builtin/repack.c:330 +#: builtin/repack.c:359 msgid "do not repack this pack" msgstr "" -#: builtin/repack.c:340 +#: builtin/repack.c:369 msgid "cannot delete packs in a precious-objects repo" msgstr "нельзя удалять пакеты в precious-objects репозитории" -#: builtin/repack.c:344 +#: builtin/repack.c:373 msgid "--keep-unreachable and -A are incompatible" msgstr "--keep-unreachable и -A нельзя использовать одновременно" -#: builtin/repack.c:423 +#: builtin/repack.c:456 msgid "Nothing new to pack." msgstr "" -#: builtin/repack.c:484 +#: builtin/repack.c:486 #, c-format -msgid "" -"WARNING: Some packs in use have been renamed by\n" -"WARNING: prefixing old- to their name, in order to\n" -"WARNING: replace them with the new version of the\n" -"WARNING: file. But the operation failed, and the\n" -"WARNING: attempt to rename them back to their\n" -"WARNING: original names also failed.\n" -"WARNING: Please rename them in %s manually:\n" +msgid "missing required file: %s" msgstr "" -#: builtin/repack.c:532 +#: builtin/repack.c:488 #, c-format -msgid "failed to remove '%s'" -msgstr "сбой удаления «%s»" +msgid "could not unlink: %s" +msgstr "" #: builtin/replace.c:22 msgid "git replace [-f] <object> <replacement>" @@ -17066,8 +19269,8 @@ msgstr "" msgid "unable to write object to database" msgstr "" -#: builtin/replace.c:322 builtin/replace.c:377 builtin/replace.c:422 -#: builtin/replace.c:452 +#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:424 +#: builtin/replace.c:454 #, c-format msgid "not a valid object name: '%s'" msgstr "" @@ -17086,124 +19289,124 @@ msgstr "" msgid "new object is the same as the old one: '%s'" msgstr "" -#: builtin/replace.c:383 +#: builtin/replace.c:384 #, c-format msgid "could not parse %s as a commit" msgstr "" -#: builtin/replace.c:414 +#: builtin/replace.c:416 #, c-format msgid "bad mergetag in commit '%s'" msgstr "плохая метка слияния в коммите «%s»" -#: builtin/replace.c:416 +#: builtin/replace.c:418 #, c-format msgid "malformed mergetag in commit '%s'" msgstr "повреждённая метка слияния в коммите «%s»" -#: builtin/replace.c:428 +#: builtin/replace.c:430 #, c-format msgid "" "original commit '%s' contains mergetag '%s' that is discarded; use --edit " "instead of --graft" msgstr "оригинальный коммит «%s» содержит метку слияния «%s», которая была отброшена; используйте --edit вместо --graft" -#: builtin/replace.c:467 +#: builtin/replace.c:469 #, c-format msgid "the original commit '%s' has a gpg signature" msgstr "" -#: builtin/replace.c:468 +#: builtin/replace.c:470 msgid "the signature will be removed in the replacement commit!" msgstr "подпись будет удалена в замененном коммите!" -#: builtin/replace.c:478 +#: builtin/replace.c:480 #, c-format msgid "could not write replacement commit for: '%s'" msgstr "не удалось записать замену для коммита: «%s»" -#: builtin/replace.c:486 +#: builtin/replace.c:488 #, c-format msgid "graft for '%s' unnecessary" msgstr "" -#: builtin/replace.c:490 +#: builtin/replace.c:492 #, c-format msgid "new commit is the same as the old one: '%s'" msgstr "" -#: builtin/replace.c:525 +#: builtin/replace.c:527 #, c-format msgid "" "could not convert the following graft(s):\n" "%s" msgstr "" -#: builtin/replace.c:546 +#: builtin/replace.c:548 msgid "list replace refs" msgstr "вывести список заменяемых ссылок" -#: builtin/replace.c:547 +#: builtin/replace.c:549 msgid "delete replace refs" msgstr "удаление заменяемых ссылок" -#: builtin/replace.c:548 +#: builtin/replace.c:550 msgid "edit existing object" msgstr "изменение существующего объекта" -#: builtin/replace.c:549 +#: builtin/replace.c:551 msgid "change a commit's parents" msgstr "изменение родителя коммита" -#: builtin/replace.c:550 +#: builtin/replace.c:552 msgid "convert existing graft file" msgstr "" -#: builtin/replace.c:551 +#: builtin/replace.c:553 msgid "replace the ref if it exists" msgstr "замена ссылки, если она существует" -#: builtin/replace.c:553 +#: builtin/replace.c:555 msgid "do not pretty-print contents for --edit" msgstr "не делать структурированный вывод содержимого для --edit" -#: builtin/replace.c:554 +#: builtin/replace.c:556 msgid "use this format" msgstr "использовать этот формат" -#: builtin/replace.c:567 +#: builtin/replace.c:569 msgid "--format cannot be used when not listing" msgstr "" -#: builtin/replace.c:575 +#: builtin/replace.c:577 msgid "-f only makes sense when writing a replacement" msgstr "" -#: builtin/replace.c:579 +#: builtin/replace.c:581 msgid "--raw only makes sense with --edit" msgstr "" -#: builtin/replace.c:585 +#: builtin/replace.c:587 msgid "-d needs at least one argument" msgstr "" -#: builtin/replace.c:591 +#: builtin/replace.c:593 msgid "bad number of arguments" msgstr "" -#: builtin/replace.c:597 +#: builtin/replace.c:599 msgid "-e needs exactly one argument" msgstr "" -#: builtin/replace.c:603 +#: builtin/replace.c:605 msgid "-g needs at least one argument" msgstr "" -#: builtin/replace.c:609 +#: builtin/replace.c:611 msgid "--convert-graft-file takes no argument" msgstr "" -#: builtin/replace.c:615 +#: builtin/replace.c:617 msgid "only one pattern can be given with -l" msgstr "" @@ -17230,113 +19433,123 @@ msgid "" msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<коммит>]" #: builtin/reset.c:33 -msgid "git reset [-q] [<tree-ish>] [--] <paths>..." -msgstr "git reset [-q] [<указатель-дерева>] [--] <пути>…" +msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..." +msgstr "" #: builtin/reset.c:34 -msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" -msgstr "git reset --patch [<указатель-дерева>] [--] [<пути>…]" +msgid "" +"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]" +msgstr "" + +#: builtin/reset.c:35 +msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]" +msgstr "" -#: builtin/reset.c:40 +#: builtin/reset.c:41 msgid "mixed" msgstr "смешанный" -#: builtin/reset.c:40 +#: builtin/reset.c:41 msgid "soft" msgstr "мягкий" -#: builtin/reset.c:40 +#: builtin/reset.c:41 msgid "hard" msgstr "жесткий" -#: builtin/reset.c:40 +#: builtin/reset.c:41 msgid "merge" msgstr "слиянием" -#: builtin/reset.c:40 +#: builtin/reset.c:41 msgid "keep" msgstr "оставлением" -#: builtin/reset.c:81 +#: builtin/reset.c:83 msgid "You do not have a valid HEAD." msgstr "У вас нет верного HEAD." -#: builtin/reset.c:83 +#: builtin/reset.c:85 msgid "Failed to find tree of HEAD." msgstr "Не удалось найти дерево у HEAD." -#: builtin/reset.c:89 +#: builtin/reset.c:91 #, c-format msgid "Failed to find tree of %s." msgstr "Не удалось найти дерево у %s." -#: builtin/reset.c:193 +#: builtin/reset.c:116 +#, c-format +msgid "HEAD is now at %s" +msgstr "HEAD сейчас на %s" + +#: builtin/reset.c:195 #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "Нельзя выполнить сброс в режиме «%s» во время слияния." -#: builtin/reset.c:293 builtin/stash.c:514 builtin/stash.c:589 -#: builtin/stash.c:613 +#: builtin/reset.c:295 builtin/stash.c:520 builtin/stash.c:594 +#: builtin/stash.c:618 msgid "be quiet, only report errors" msgstr "тихий режим, выводить только ошибки" -#: builtin/reset.c:295 +#: builtin/reset.c:297 msgid "reset HEAD and index" msgstr "сбросить HEAD и индекс" -#: builtin/reset.c:296 +#: builtin/reset.c:298 msgid "reset only HEAD" msgstr "сбросить только HEAD" -#: builtin/reset.c:298 builtin/reset.c:300 +#: builtin/reset.c:300 builtin/reset.c:302 msgid "reset HEAD, index and working tree" msgstr "сбросить HEAD, индекс и рабочий каталог" -#: builtin/reset.c:302 +#: builtin/reset.c:304 msgid "reset HEAD but keep local changes" msgstr "сбросить HEAD, но оставить локальные изменения" -#: builtin/reset.c:308 +#: builtin/reset.c:310 msgid "record only the fact that removed paths will be added later" msgstr "записать только факт того, что удаленные пути будут добавлены позже" -#: builtin/reset.c:326 +#: builtin/reset.c:344 #, c-format msgid "Failed to resolve '%s' as a valid revision." msgstr "Не удалось распознать «%s» как действительную редакцию." -#: builtin/reset.c:334 +#: builtin/reset.c:352 #, c-format msgid "Failed to resolve '%s' as a valid tree." msgstr "Не удалось распознать «%s» как действительное дерево." -#: builtin/reset.c:343 +#: builtin/reset.c:361 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "--patch нельзя использовать одновременно с --{hard,mixed,soft}" -#: builtin/reset.c:353 +#: builtin/reset.c:371 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "использование опции --mixed с путями устарело; используйте «git reset -- <пути>» instead." -#: builtin/reset.c:355 +#: builtin/reset.c:373 #, c-format msgid "Cannot do %s reset with paths." msgstr "Нельзя выполнить сброс в режиме «%s» вместе с указанием пути." -#: builtin/reset.c:370 +#: builtin/reset.c:388 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "сброс «%s» разрешен только с голым репозиторием" -#: builtin/reset.c:374 +#: builtin/reset.c:392 msgid "-N can only be used with --mixed" msgstr "-N можно использовать вместе с --mixed" -#: builtin/reset.c:395 +#: builtin/reset.c:413 msgid "Unstaged changes after reset:" msgstr "Непроиндексированные изменения после сброса:" -#: builtin/reset.c:398 +#: builtin/reset.c:416 #, c-format msgid "" "\n" @@ -17345,53 +19558,48 @@ msgid "" "to make this the default.\n" msgstr "" -#: builtin/reset.c:408 +#: builtin/reset.c:434 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "Не удалось сбросить файл индекса на редакцию «%s»." -#: builtin/reset.c:412 +#: builtin/reset.c:439 msgid "Could not write new index file." msgstr "Не удалось записать новый файл индекса." -#: builtin/rev-list.c:405 +#: builtin/rev-list.c:499 msgid "cannot combine --exclude-promisor-objects and --missing" msgstr "" -#: builtin/rev-list.c:466 +#: builtin/rev-list.c:560 msgid "object filtering requires --objects" msgstr "фильтрация объектов требует указания параметра --objects" -#: builtin/rev-list.c:469 -#, c-format -msgid "invalid sparse value '%s'" -msgstr "недопустимое частичное значение «%s»" - -#: builtin/rev-list.c:510 +#: builtin/rev-list.c:610 msgid "rev-list does not support display of notes" msgstr "rev-list не поддерживает отображение заметок" -#: builtin/rev-list.c:513 -msgid "cannot combine --use-bitmap-index with object filtering" -msgstr "нельзя использовать --use-bitmap-index одновременно с фильтрацией объектов" +#: builtin/rev-list.c:615 +msgid "marked counting is incompatible with --objects" +msgstr "" -#: builtin/rev-parse.c:408 +#: builtin/rev-parse.c:409 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" msgstr "git rev-parse --parseopt [<опции>] -- [<аргументы>…]" -#: builtin/rev-parse.c:413 +#: builtin/rev-parse.c:414 msgid "keep the `--` passed as an arg" msgstr "передавать далее «--» как аргумент" -#: builtin/rev-parse.c:415 +#: builtin/rev-parse.c:416 msgid "stop parsing after the first non-option argument" msgstr "остановить разбор после первого аргумента не являющегося опцией" -#: builtin/rev-parse.c:418 +#: builtin/rev-parse.c:419 msgid "output in stuck long form" msgstr "выводить аргументы в длинном формате" -#: builtin/rev-parse.c:551 +#: builtin/rev-parse.c:552 msgid "" "git rev-parse --parseopt [<options>] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" @@ -17438,47 +19646,51 @@ msgstr "продолжить последовательность копиров msgid "cancel revert or cherry-pick sequence" msgstr "отмена последовательности копирования или обращения изменений коммитов" -#: builtin/revert.c:106 +#: builtin/revert.c:105 +msgid "skip current commit and continue" +msgstr "" + +#: builtin/revert.c:107 msgid "don't automatically commit" msgstr "не коммитить автоматически" -#: builtin/revert.c:107 +#: builtin/revert.c:108 msgid "edit the commit message" msgstr "изменить сообщение коммита" -#: builtin/revert.c:110 +#: builtin/revert.c:111 msgid "parent-number" msgstr "номер-родителя" -#: builtin/revert.c:111 +#: builtin/revert.c:112 msgid "select mainline parent" msgstr "выбор основного родителя" -#: builtin/revert.c:113 +#: builtin/revert.c:114 msgid "merge strategy" msgstr "стратегия слияния" -#: builtin/revert.c:115 +#: builtin/revert.c:116 msgid "option for merge strategy" msgstr "опция для стратегии слияния" -#: builtin/revert.c:124 +#: builtin/revert.c:125 msgid "append commit name" msgstr "добавить имя коммита" -#: builtin/revert.c:126 +#: builtin/revert.c:127 msgid "preserve initially empty commits" msgstr "сохранить изначально пустые коммиты" -#: builtin/revert.c:128 +#: builtin/revert.c:129 msgid "keep redundant, empty commits" msgstr "оставить избыточные, пустые коммиты" -#: builtin/revert.c:227 +#: builtin/revert.c:239 msgid "revert failed" msgstr "сбой обращения изменений коммита" -#: builtin/revert.c:240 +#: builtin/revert.c:252 msgid "cherry-pick failed" msgstr "сбой при копировании коммита" @@ -17526,36 +19738,40 @@ msgstr[1] "следующие файлы содержат локальные и msgstr[2] "следующие файлы содержат локальные изменения:" msgstr[3] "следующие файлы содержат локальные изменения:" -#: builtin/rm.c:242 +#: builtin/rm.c:243 msgid "do not list removed files" msgstr "не выводить список удаленных файлов" -#: builtin/rm.c:243 +#: builtin/rm.c:244 msgid "only remove from the index" msgstr "удалить только из индекса" -#: builtin/rm.c:244 +#: builtin/rm.c:245 msgid "override the up-to-date check" msgstr "пропустить проверку актуальности" -#: builtin/rm.c:245 +#: builtin/rm.c:246 msgid "allow recursive removal" msgstr "разрешить рекурсивное удаление" -#: builtin/rm.c:247 +#: builtin/rm.c:248 msgid "exit with a zero status even if nothing matched" msgstr "выход с нулевым кодом возврата, даже если ничего не найдено" -#: builtin/rm.c:289 +#: builtin/rm.c:282 +msgid "No pathspec was given. Which files should I remove?" +msgstr "" + +#: builtin/rm.c:305 msgid "please stage your changes to .gitmodules or stash them to proceed" msgstr "" -#: builtin/rm.c:307 +#: builtin/rm.c:323 #, c-format msgid "not removing '%s' recursively without -r" msgstr "не удаляю рекурсивно «%s» без указания опции -r" -#: builtin/rm.c:346 +#: builtin/rm.c:362 #, c-format msgid "git rm: unable to remove %s" msgstr "git rm: не удалось удалить %s" @@ -17566,55 +19782,76 @@ msgid "" " --all and explicit <ref> specification are mutually exclusive." msgstr "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-receive-pack>] [--verbose] [--thin] [--atomic] [<сервер>:]<каталог> [<ссылка>…]\n --all и явный спецификатор <ссылки> взаимно исключающие." -#: builtin/send-pack.c:163 +#: builtin/send-pack.c:188 msgid "remote name" msgstr "имя внешнего репозитория" -#: builtin/send-pack.c:177 +#: builtin/send-pack.c:201 msgid "use stateless RPC protocol" msgstr "протокол без сохранения состояния для RPC" -#: builtin/send-pack.c:178 +#: builtin/send-pack.c:202 msgid "read refs from stdin" msgstr "прочитать ссылки из стандартного ввода" -#: builtin/send-pack.c:179 +#: builtin/send-pack.c:203 msgid "print status from remote helper" msgstr "вывести статус от скрипта внешнего сервера" -#: builtin/shortlog.c:14 +#: builtin/shortlog.c:16 msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]" msgstr "git shortlog [<опции>] [<диапазон-редакций>] [[--] <путь>…]" -#: builtin/shortlog.c:15 +#: builtin/shortlog.c:17 msgid "git log --pretty=short | git shortlog [<options>]" msgstr "git log --pretty=short | git shortlog [<опции>]" -#: builtin/shortlog.c:264 +#: builtin/shortlog.c:135 +msgid "using multiple --group options with stdin is not supported" +msgstr "" + +#: builtin/shortlog.c:145 +msgid "using --group=trailer with stdin is not supported" +msgstr "" + +#: builtin/shortlog.c:335 +#, c-format +msgid "unknown group type: %s" +msgstr "" + +#: builtin/shortlog.c:363 msgid "Group by committer rather than author" msgstr "Группировать по коммитеру, а не по автору" -#: builtin/shortlog.c:266 +#: builtin/shortlog.c:366 msgid "sort output according to the number of commits per author" msgstr "отсортировать вывод по количеству коммитов у автора" -#: builtin/shortlog.c:268 +#: builtin/shortlog.c:368 msgid "Suppress commit descriptions, only provides commit count" msgstr "Не выводить описания коммитов, а только их количество" -#: builtin/shortlog.c:270 +#: builtin/shortlog.c:370 msgid "Show the email address of each author" msgstr "Показать почту каждого из авторов" -#: builtin/shortlog.c:271 +#: builtin/shortlog.c:371 msgid "<w>[,<i1>[,<i2>]]" msgstr "<w>[,<i1>[,<i2>]]" -#: builtin/shortlog.c:272 +#: builtin/shortlog.c:372 msgid "Linewrap output" msgstr "Перенос строк на выводе" -#: builtin/shortlog.c:301 +#: builtin/shortlog.c:374 +msgid "field" +msgstr "" + +#: builtin/shortlog.c:375 +msgid "Group by field" +msgstr "" + +#: builtin/shortlog.c:403 msgid "too many arguments given outside repository" msgstr "" @@ -17639,90 +19876,90 @@ msgstr[1] "игнорирование %s; невозможно обработа msgstr[2] "игнорирование %s; невозможно обработать больше %d ссылок" msgstr[3] "игнорирование %s; невозможно обработать больше %d ссылки" -#: builtin/show-branch.c:549 +#: builtin/show-branch.c:548 #, c-format msgid "no matching refs with %s" msgstr "нет совпадающих записей с %s" -#: builtin/show-branch.c:646 +#: builtin/show-branch.c:645 msgid "show remote-tracking and local branches" msgstr "показать список и отслеживаемых внешних и локальных веток" -#: builtin/show-branch.c:648 +#: builtin/show-branch.c:647 msgid "show remote-tracking branches" msgstr "показать список отслеживаемых внешних веток" -#: builtin/show-branch.c:650 +#: builtin/show-branch.c:649 msgid "color '*!+-' corresponding to the branch" msgstr "окрашивать «*!+-» в соответствии с веткой" -#: builtin/show-branch.c:652 +#: builtin/show-branch.c:651 msgid "show <n> more commits after the common ancestor" msgstr "показать <n> коммитов после общего предка" -#: builtin/show-branch.c:654 +#: builtin/show-branch.c:653 msgid "synonym to more=-1" msgstr "синоним для more=-1" -#: builtin/show-branch.c:655 +#: builtin/show-branch.c:654 msgid "suppress naming strings" msgstr "не выводить именованные строки" -#: builtin/show-branch.c:657 +#: builtin/show-branch.c:656 msgid "include the current branch" msgstr "включить в вывод текущую ветку" -#: builtin/show-branch.c:659 +#: builtin/show-branch.c:658 msgid "name commits with their object names" msgstr "именовать коммиты их именами объектов" -#: builtin/show-branch.c:661 +#: builtin/show-branch.c:660 msgid "show possible merge bases" msgstr "вывести возможные базы слияния" -#: builtin/show-branch.c:663 +#: builtin/show-branch.c:662 msgid "show refs unreachable from any other ref" msgstr "вывести ссылки, недоступные из любых других ссылок" -#: builtin/show-branch.c:665 +#: builtin/show-branch.c:664 msgid "show commits in topological order" msgstr "вывести коммиты в топологическом порядке" -#: builtin/show-branch.c:668 +#: builtin/show-branch.c:667 msgid "show only commits not on the first branch" msgstr "вывести только коммиты, отсутствующие в первой ветке" -#: builtin/show-branch.c:670 +#: builtin/show-branch.c:669 msgid "show merges reachable from only one tip" msgstr "вывести слияния, достижимые только из одной из верхушек" -#: builtin/show-branch.c:672 +#: builtin/show-branch.c:671 msgid "topologically sort, maintaining date order where possible" msgstr "топологическая сортировка, с сохранением порядка дат, если возможно" -#: builtin/show-branch.c:675 +#: builtin/show-branch.c:674 msgid "<n>[,<base>]" msgstr "<n>[,<база>]" -#: builtin/show-branch.c:676 +#: builtin/show-branch.c:675 msgid "show <n> most recent ref-log entries starting at base" msgstr "показать <n> последних записей в журнале ссылок, начиная с базы" -#: builtin/show-branch.c:712 +#: builtin/show-branch.c:711 msgid "" "--reflog is incompatible with --all, --remotes, --independent or --merge-" "base" msgstr "--reflog несовместимо с --all, --remotes, --independent и --merge-base" -#: builtin/show-branch.c:736 +#: builtin/show-branch.c:735 msgid "no branches given, and HEAD is not valid" msgstr "не указаны ветки и HEAD не действительный" -#: builtin/show-branch.c:739 +#: builtin/show-branch.c:738 msgid "--reflog option needs one branch name" msgstr "параметр --reflog требует указания имени одной ветки" -#: builtin/show-branch.c:742 +#: builtin/show-branch.c:741 #, c-format msgid "only %d entry can be shown at one time." msgid_plural "only %d entries can be shown at one time." @@ -17731,12 +19968,12 @@ msgstr[1] "только %d записи могут быть показаны о msgstr[2] "только %d записей могут быть показаны одновременно." msgstr[3] "только %d записи могут быть показаны одновременно." -#: builtin/show-branch.c:746 +#: builtin/show-branch.c:745 #, c-format msgid "no such ref %s" msgstr "нет такой ссылки %s" -#: builtin/show-branch.c:832 +#: builtin/show-branch.c:831 #, c-format msgid "cannot handle more than %d rev." msgid_plural "cannot handle more than %d revs." @@ -17745,16 +19982,24 @@ msgstr[1] "невозможно обработать больше %d редак msgstr[2] "невозможно обработать больше %d редакций." msgstr[3] "невозможно обработать больше %d редакции." -#: builtin/show-branch.c:836 +#: builtin/show-branch.c:835 #, c-format msgid "'%s' is not a valid ref." msgstr "«%s» не является допустимой ссылкой на коммит." -#: builtin/show-branch.c:839 +#: builtin/show-branch.c:838 #, c-format msgid "cannot find commit %s (%s)" msgstr "не удалось найти коммит %s (%s)" +#: builtin/show-index.c:21 +msgid "hash-algorithm" +msgstr "" + +#: builtin/show-index.c:31 +msgid "Unknown hash algorithm" +msgstr "" + #: builtin/show-ref.c:12 msgid "" "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | " @@ -17787,7 +20032,7 @@ msgstr "разыменовать метки в идентификаторы об #: builtin/show-ref.c:173 msgid "only show SHA1 hash using <n> digits" -msgstr "использовать <n> символов для вывода SHA-1 хеш-суммы" +msgstr "использовать <n> символов для вывода хэш-кода SHA-1" #: builtin/show-ref.c:177 msgid "do not print results to stdout (useful with --verify)" @@ -17797,15 +20042,86 @@ msgstr "не печатать результат на стандартный в msgid "show refs from stdin that aren't in local repository" msgstr "вывести ссылки со стандартного ввода, которых нет в локальном репозитории" -#: builtin/stash.c:22 builtin/stash.c:37 +#: builtin/sparse-checkout.c:21 +msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>" +msgstr "" + +#: builtin/sparse-checkout.c:50 +msgid "git sparse-checkout list" +msgstr "" + +#: builtin/sparse-checkout.c:76 +msgid "this worktree is not sparse (sparse-checkout file may not exist)" +msgstr "" + +#: builtin/sparse-checkout.c:228 +msgid "failed to create directory for sparse-checkout file" +msgstr "" + +#: builtin/sparse-checkout.c:269 +msgid "unable to upgrade repository format to enable worktreeConfig" +msgstr "" + +#: builtin/sparse-checkout.c:271 +msgid "failed to set extensions.worktreeConfig setting" +msgstr "" + +#: builtin/sparse-checkout.c:288 +msgid "git sparse-checkout init [--cone]" +msgstr "" + +#: builtin/sparse-checkout.c:307 +msgid "initialize the sparse-checkout in cone mode" +msgstr "" + +#: builtin/sparse-checkout.c:344 +#, c-format +msgid "failed to open '%s'" +msgstr "не удалось открыть «%s»" + +#: builtin/sparse-checkout.c:401 +#, c-format +msgid "could not normalize path %s" +msgstr "" + +#: builtin/sparse-checkout.c:413 +msgid "git sparse-checkout (set|add) (--stdin | <patterns>)" +msgstr "" + +#: builtin/sparse-checkout.c:438 +#, c-format +msgid "unable to unquote C-style string '%s'" +msgstr "" + +#: builtin/sparse-checkout.c:492 builtin/sparse-checkout.c:516 +msgid "unable to load existing sparse-checkout patterns" +msgstr "" + +#: builtin/sparse-checkout.c:561 +msgid "read patterns from standard in" +msgstr "" + +#: builtin/sparse-checkout.c:576 +msgid "git sparse-checkout reapply" +msgstr "" + +#: builtin/sparse-checkout.c:595 +msgid "git sparse-checkout disable" +msgstr "" + +#: builtin/sparse-checkout.c:623 +msgid "error while refreshing working directory" +msgstr "" + +#: builtin/stash.c:22 builtin/stash.c:38 msgid "git stash list [<options>]" msgstr "git stash list [<опции>]" -#: builtin/stash.c:23 builtin/stash.c:42 +#: builtin/stash.c:23 builtin/stash.c:43 msgid "git stash show [<options>] [<stash>]" msgstr "git stash show [<опциии>] [<спрятанные-изменения>]" -#: builtin/stash.c:24 builtin/stash.c:47 +#: builtin/stash.c:24 builtin/stash.c:48 msgid "git stash drop [-q|--quiet] [<stash>]" msgstr "git stash drop [-q|--quiet] [<спрятанные-изменения>]" @@ -17813,209 +20129,217 @@ msgstr "git stash drop [-q|--quiet] [<спрятанные-изменения>]" msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<спрятанные-изменения>]" -#: builtin/stash.c:26 builtin/stash.c:62 +#: builtin/stash.c:26 builtin/stash.c:63 msgid "git stash branch <branchname> [<stash>]" msgstr "git stash branch <имя-ветки> [<спрятанные-изменения>]" -#: builtin/stash.c:27 builtin/stash.c:67 +#: builtin/stash.c:27 builtin/stash.c:68 msgid "git stash clear" msgstr "git stash clear" -#: builtin/stash.c:28 builtin/stash.c:77 +#: builtin/stash.c:28 msgid "" "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" +" [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" " [--] [<pathspec>...]]" -msgstr "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n [-u|--include-untracked] [-a|--all] [-m|--message <сообщение>]\n [--] [<спецификатор-пути>…]]" +msgstr "" -#: builtin/stash.c:31 builtin/stash.c:84 +#: builtin/stash.c:32 builtin/stash.c:85 msgid "" "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [<message>]" msgstr "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n [-u|--include-untracked] [-a|--all] [<сообщение>]" -#: builtin/stash.c:52 +#: builtin/stash.c:53 msgid "git stash pop [--index] [-q|--quiet] [<stash>]" msgstr "git stash pop [--index] [-q|--quiet] [<спрятанные-изменения>]" -#: builtin/stash.c:57 +#: builtin/stash.c:58 msgid "git stash apply [--index] [-q|--quiet] [<stash>]" msgstr "git stash apply [--index] [-q|--quiet] [<спрятанные-изменения>]" -#: builtin/stash.c:72 +#: builtin/stash.c:73 msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>" msgstr "git stash store [-m|--message <сообщение>] [-q|--quiet] <коммит>" -#: builtin/stash.c:127 +#: builtin/stash.c:78 +msgid "" +"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" +" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" +" [--] [<pathspec>...]]" +msgstr "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n [-u|--include-untracked] [-a|--all] [-m|--message <сообщение>]\n [--] [<спецификатор-пути>…]]" + +#: builtin/stash.c:128 #, c-format msgid "'%s' is not a stash-like commit" msgstr "«%s» не является коммитом со спрятанными изменениями" -#: builtin/stash.c:147 +#: builtin/stash.c:148 #, c-format msgid "Too many revisions specified:%s" msgstr "Передано слишком много редакций:%s" -#: builtin/stash.c:161 git-legacy-stash.sh:548 +#: builtin/stash.c:162 msgid "No stash entries found." msgstr "Не найдены спрятанные изменения." -#: builtin/stash.c:175 +#: builtin/stash.c:176 #, c-format msgid "%s is not a valid reference" msgstr "%s не является допустимой ссылкой на коммит" -#: builtin/stash.c:224 git-legacy-stash.sh:75 +#: builtin/stash.c:225 msgid "git stash clear with parameters is unimplemented" msgstr "git stash очистка с параметрами не реализована" -#: builtin/stash.c:403 +#: builtin/stash.c:404 msgid "cannot apply a stash in the middle of a merge" msgstr "нельзя применить спрятанные изменения во время выполнения слияния" -#: builtin/stash.c:414 +#: builtin/stash.c:415 #, c-format msgid "could not generate diff %s^!." msgstr "не удалось сгенерировать список изменений %s^!." -#: builtin/stash.c:421 -msgid "conflicts in index.Try without --index." -msgstr "конфликты в индексе. Попробуйте без --index." +#: builtin/stash.c:422 +msgid "conflicts in index. Try without --index." +msgstr "" -#: builtin/stash.c:427 +#: builtin/stash.c:428 msgid "could not save index tree" msgstr "не удалось сохранить дерево индекса" -#: builtin/stash.c:434 +#: builtin/stash.c:437 msgid "could not restore untracked files from stash" msgstr "невозможно восстановить неотслеживаемые файлы из спрятанных файлов" -#: builtin/stash.c:448 +#: builtin/stash.c:451 #, c-format msgid "Merging %s with %s" msgstr "Слияние %s и %s" -#: builtin/stash.c:458 git-legacy-stash.sh:680 +#: builtin/stash.c:461 msgid "Index was not unstashed." msgstr "Индекс не был извлечён из спрятанных изменений." -#: builtin/stash.c:516 builtin/stash.c:615 +#: builtin/stash.c:522 builtin/stash.c:620 msgid "attempt to recreate the index" msgstr "попытка пересоздания индекса" -#: builtin/stash.c:549 +#: builtin/stash.c:566 #, c-format msgid "Dropped %s (%s)" msgstr "Отброшено %s (%s)" -#: builtin/stash.c:552 +#: builtin/stash.c:569 #, c-format msgid "%s: Could not drop stash entry" msgstr "%s: Не удалось отбросить запись из спрятанных изменений" -#: builtin/stash.c:577 +#: builtin/stash.c:582 #, c-format msgid "'%s' is not a stash reference" msgstr "«%s» не является ссылкой на спрятанные изменения" -#: builtin/stash.c:627 git-legacy-stash.sh:694 +#: builtin/stash.c:632 msgid "The stash entry is kept in case you need it again." msgstr "Спрятанные изменения сохранены, на случай если они снова вам понадобятся." -#: builtin/stash.c:650 git-legacy-stash.sh:712 +#: builtin/stash.c:655 msgid "No branch name specified" msgstr "Не указано имя ветки" -#: builtin/stash.c:789 builtin/stash.c:826 +#: builtin/stash.c:799 builtin/stash.c:836 #, c-format msgid "Cannot update %s with %s" msgstr "Не удолось обновить %s с %s" -#: builtin/stash.c:807 builtin/stash.c:1474 builtin/stash.c:1510 +#: builtin/stash.c:817 builtin/stash.c:1471 builtin/stash.c:1536 msgid "stash message" msgstr "описание спрятанных изменений" -#: builtin/stash.c:817 +#: builtin/stash.c:827 msgid "\"git stash store\" requires one <commit> argument" msgstr "«git stash store» требует указания одного аргумента <коммит>" -#: builtin/stash.c:1039 git-legacy-stash.sh:217 +#: builtin/stash.c:1042 msgid "No changes selected" msgstr "Изменения не выбраны" -#: builtin/stash.c:1135 git-legacy-stash.sh:150 +#: builtin/stash.c:1142 msgid "You do not have the initial commit yet" msgstr "У вас еще нет начального коммита" -#: builtin/stash.c:1162 git-legacy-stash.sh:165 +#: builtin/stash.c:1169 msgid "Cannot save the current index state" msgstr "Не удалось сохранить текущее состояние индекса" -#: builtin/stash.c:1171 git-legacy-stash.sh:180 +#: builtin/stash.c:1178 msgid "Cannot save the untracked files" msgstr "Невозможно сохранить неотслеживаемые файлы" -#: builtin/stash.c:1182 builtin/stash.c:1191 git-legacy-stash.sh:200 -#: git-legacy-stash.sh:213 +#: builtin/stash.c:1189 builtin/stash.c:1198 msgid "Cannot save the current worktree state" msgstr "Не удалось сохранить текущее состояние рабочего каталога" -#: builtin/stash.c:1219 git-legacy-stash.sh:233 +#: builtin/stash.c:1226 msgid "Cannot record working tree state" msgstr "Не удалось записать состояние рабочего каталога" -#: builtin/stash.c:1268 git-legacy-stash.sh:337 +#: builtin/stash.c:1275 msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "Нельзя использовать --patch и --include-untracked или --all одновременно" -#: builtin/stash.c:1284 +#: builtin/stash.c:1291 msgid "Did you forget to 'git add'?" msgstr "Возможно, вы забыли выполнить «git add»?" -#: builtin/stash.c:1299 git-legacy-stash.sh:345 +#: builtin/stash.c:1306 msgid "No local changes to save" msgstr "Нет локальных изменений для сохранения" -#: builtin/stash.c:1306 git-legacy-stash.sh:350 +#: builtin/stash.c:1313 msgid "Cannot initialize stash" msgstr "Не удалось инициализировать спрятанные изменения" -#: builtin/stash.c:1321 git-legacy-stash.sh:354 +#: builtin/stash.c:1328 msgid "Cannot save the current status" msgstr "Не удалось сохранить текущий статус" -#: builtin/stash.c:1326 +#: builtin/stash.c:1333 #, c-format msgid "Saved working directory and index state %s" msgstr "Рабочий каталог и состояние индекса сохранены %s" -#: builtin/stash.c:1430 git-legacy-stash.sh:384 +#: builtin/stash.c:1423 msgid "Cannot remove worktree changes" msgstr "Не удалось удалить изменения рабочего каталога" -#: builtin/stash.c:1465 builtin/stash.c:1501 +#: builtin/stash.c:1462 builtin/stash.c:1527 msgid "keep index" msgstr "" -#: builtin/stash.c:1467 builtin/stash.c:1503 +#: builtin/stash.c:1464 builtin/stash.c:1529 msgid "stash in patch mode" msgstr "" -#: builtin/stash.c:1468 builtin/stash.c:1504 +#: builtin/stash.c:1465 builtin/stash.c:1530 msgid "quiet mode" msgstr "" -#: builtin/stash.c:1470 builtin/stash.c:1506 +#: builtin/stash.c:1467 builtin/stash.c:1532 msgid "include untracked files in stash" msgstr "" -#: builtin/stash.c:1472 builtin/stash.c:1508 +#: builtin/stash.c:1469 builtin/stash.c:1534 msgid "include ignore files" msgstr "" -#: builtin/stash.c:1568 -#, c-format -msgid "could not exec %s" +#: builtin/stash.c:1569 +msgid "" +"the stash.useBuiltin support has been removed!\n" +"See its entry in 'git help config' for details." msgstr "" #: builtin/stripspace.c:18 @@ -18034,393 +20358,502 @@ msgstr "пропустить и удалить все строки, начина msgid "prepend comment character and space to each line" msgstr "добавить перед каждой строкой символ комметария и пробел" -#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1942 +#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:2423 #, c-format msgid "Expecting a full ref name, got %s" msgstr "Ожидалось полное имя ссылки, а получено %s" -#: builtin/submodule--helper.c:62 +#: builtin/submodule--helper.c:64 msgid "submodule--helper print-default-remote takes no arguments" msgstr "" -#: builtin/submodule--helper.c:100 +#: builtin/submodule--helper.c:102 #, c-format msgid "cannot strip one component off url '%s'" msgstr "не удалось обрезать один компонент url «%s»" -#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1367 +#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1819 msgid "alternative anchor for relative paths" msgstr "альтернативный символ для относительных путей" -#: builtin/submodule--helper.c:413 +#: builtin/submodule--helper.c:415 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<путь>] [<путь>…]" -#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:627 -#: builtin/submodule--helper.c:650 +#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:629 +#: builtin/submodule--helper.c:652 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "URL для подмодуля по пути «%s» не найден в .gitmodules" -#: builtin/submodule--helper.c:522 +#: builtin/submodule--helper.c:524 #, c-format msgid "Entering '%s'\n" msgstr "" -#: builtin/submodule--helper.c:525 +#: builtin/submodule--helper.c:527 #, c-format msgid "" "run_command returned non-zero status for %s\n" "." msgstr "" -#: builtin/submodule--helper.c:546 +#: builtin/submodule--helper.c:549 #, c-format msgid "" "run_command returned non-zero status while recursing in the nested submodules of %s\n" "." msgstr "" -#: builtin/submodule--helper.c:562 +#: builtin/submodule--helper.c:565 msgid "Suppress output of entering each submodule command" msgstr "" -#: builtin/submodule--helper.c:564 builtin/submodule--helper.c:1049 +#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1487 msgid "Recurse into nested submodules" msgstr "" -#: builtin/submodule--helper.c:569 +#: builtin/submodule--helper.c:572 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>" msgstr "" -#: builtin/submodule--helper.c:596 +#: builtin/submodule--helper.c:599 #, c-format msgid "" "could not look up configuration '%s'. Assuming this repository is its own " "authoritative upstream." msgstr "" -#: builtin/submodule--helper.c:664 +#: builtin/submodule--helper.c:666 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "Сбой регистрации адреса для пути подмодуля «%s»" -#: builtin/submodule--helper.c:668 +#: builtin/submodule--helper.c:670 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "Подмодуль «%s» (%s) зарегистрирован по пути «%s»\n" -#: builtin/submodule--helper.c:678 +#: builtin/submodule--helper.c:680 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" msgstr "внимание: предполагаемый режим обновления для подмодуля «%s»\n" -#: builtin/submodule--helper.c:685 +#: builtin/submodule--helper.c:687 #, c-format msgid "Failed to register update mode for submodule path '%s'" msgstr "Сбой регистрации режима обновления для пути подмодуля «%s»" -#: builtin/submodule--helper.c:707 +#: builtin/submodule--helper.c:709 msgid "Suppress output for initializing a submodule" msgstr "Не выводить информацию о инициализации подмодуля" -#: builtin/submodule--helper.c:712 +#: builtin/submodule--helper.c:714 msgid "git submodule--helper init [<options>] [<path>]" msgstr "" -#: builtin/submodule--helper.c:784 builtin/submodule--helper.c:910 +#: builtin/submodule--helper.c:787 builtin/submodule--helper.c:922 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "не найдено соответствие подмодулей в .gitmodules для пути «%s»" -#: builtin/submodule--helper.c:823 +#: builtin/submodule--helper.c:835 #, c-format msgid "could not resolve HEAD ref inside the submodule '%s'" msgstr "не удалось найти HEAD ссылку внутри подмодуля «%s»" -#: builtin/submodule--helper.c:850 builtin/submodule--helper.c:1019 +#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1457 #, c-format msgid "failed to recurse into submodule '%s'" msgstr "не удалось перейти вглубь подмодуля «%s»" -#: builtin/submodule--helper.c:874 builtin/submodule--helper.c:1185 +#: builtin/submodule--helper.c:886 builtin/submodule--helper.c:1623 msgid "Suppress submodule status output" msgstr "Не выводить статус подмодуля" -#: builtin/submodule--helper.c:875 +#: builtin/submodule--helper.c:887 msgid "" "Use commit stored in the index instead of the one stored in the submodule " "HEAD" msgstr "Использовать коммит хранящийся в индексе вместо коммита хранящегося в HEAD подмодуля" -#: builtin/submodule--helper.c:876 +#: builtin/submodule--helper.c:888 msgid "recurse into nested submodules" msgstr "проходить вглубь вложенных подмодулей" -#: builtin/submodule--helper.c:881 +#: builtin/submodule--helper.c:893 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" msgstr "git submodule status [--quiet] [--cached] [--recursive] [<путь>…]" -#: builtin/submodule--helper.c:905 +#: builtin/submodule--helper.c:917 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name <путь>" -#: builtin/submodule--helper.c:969 +#: builtin/submodule--helper.c:989 +#, c-format +msgid "* %s %s(blob)->%s(submodule)" +msgstr "" + +#: builtin/submodule--helper.c:992 +#, c-format +msgid "* %s %s(submodule)->%s(blob)" +msgstr "" + +#: builtin/submodule--helper.c:1005 +#, c-format +msgid "%s" +msgstr "" + +#: builtin/submodule--helper.c:1055 +#, c-format +msgid "couldn't hash object from '%s'" +msgstr "" + +#: builtin/submodule--helper.c:1059 +#, c-format +msgid "unexpected mode %o\n" +msgstr "" + +#: builtin/submodule--helper.c:1300 +msgid "use the commit stored in the index instead of the submodule HEAD" +msgstr "" + +#: builtin/submodule--helper.c:1302 +msgid "to compare the commit in the index with that in the submodule HEAD" +msgstr "" + +#: builtin/submodule--helper.c:1304 +msgid "skip submodules with 'ignore_config' value set to 'all'" +msgstr "" + +#: builtin/submodule--helper.c:1306 +msgid "limit the summary size" +msgstr "" + +#: builtin/submodule--helper.c:1311 +msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]" +msgstr "" + +#: builtin/submodule--helper.c:1335 +msgid "could not fetch a revision for HEAD" +msgstr "" + +#: builtin/submodule--helper.c:1340 +msgid "--cached and --files are mutually exclusive" +msgstr "" + +#: builtin/submodule--helper.c:1407 #, c-format msgid "Synchronizing submodule url for '%s'\n" msgstr "" -#: builtin/submodule--helper.c:975 +#: builtin/submodule--helper.c:1413 #, c-format msgid "failed to register url for submodule path '%s'" msgstr "" -#: builtin/submodule--helper.c:989 +#: builtin/submodule--helper.c:1427 #, c-format msgid "failed to get the default remote for submodule '%s'" msgstr "" -#: builtin/submodule--helper.c:1000 +#: builtin/submodule--helper.c:1438 #, c-format msgid "failed to update remote for submodule '%s'" msgstr "" -#: builtin/submodule--helper.c:1047 +#: builtin/submodule--helper.c:1485 msgid "Suppress output of synchronizing submodule url" msgstr "" -#: builtin/submodule--helper.c:1054 +#: builtin/submodule--helper.c:1492 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" msgstr "git submodule--helper sync [--quiet] [--recursive] [<путь>]" -#: builtin/submodule--helper.c:1108 +#: builtin/submodule--helper.c:1546 #, c-format msgid "" "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " "really want to remove it including all of its history)" msgstr "" -#: builtin/submodule--helper.c:1120 +#: builtin/submodule--helper.c:1558 #, c-format msgid "" "Submodule work tree '%s' contains local modifications; use '-f' to discard " "them" msgstr "" -#: builtin/submodule--helper.c:1128 +#: builtin/submodule--helper.c:1566 #, c-format msgid "Cleared directory '%s'\n" msgstr "" -#: builtin/submodule--helper.c:1130 +#: builtin/submodule--helper.c:1568 #, c-format msgid "Could not remove submodule work tree '%s'\n" msgstr "" -#: builtin/submodule--helper.c:1141 +#: builtin/submodule--helper.c:1579 #, c-format msgid "could not create empty submodule directory %s" msgstr "" -#: builtin/submodule--helper.c:1157 +#: builtin/submodule--helper.c:1595 #, c-format msgid "Submodule '%s' (%s) unregistered for path '%s'\n" msgstr "" -#: builtin/submodule--helper.c:1186 +#: builtin/submodule--helper.c:1624 msgid "Remove submodule working trees even if they contain local changes" msgstr "" -#: builtin/submodule--helper.c:1187 +#: builtin/submodule--helper.c:1625 msgid "Unregister all submodules" msgstr "" -#: builtin/submodule--helper.c:1192 +#: builtin/submodule--helper.c:1630 msgid "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" msgstr "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<путь>…]]" -#: builtin/submodule--helper.c:1206 +#: builtin/submodule--helper.c:1644 msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "Используйте «--all», если вы действительно хотите деинициализировать все подмодули" -#: builtin/submodule--helper.c:1301 builtin/submodule--helper.c:1304 +#: builtin/submodule--helper.c:1713 +msgid "" +"An alternate computed from a superproject's alternate is invalid.\n" +"To allow Git to clone without an alternate in such a case, set\n" +"submodule.alternateErrorStrategy to 'info' or, equivalently, clone with\n" +"'--reference-if-able' instead of '--reference'." +msgstr "" + +#: builtin/submodule--helper.c:1752 builtin/submodule--helper.c:1755 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "подмодулю «%s» не удалось добавить альтернативу: %s" -#: builtin/submodule--helper.c:1340 +#: builtin/submodule--helper.c:1791 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "Значение «%s» для параметра submodule.alternateErrorStrategy не рапознано" -#: builtin/submodule--helper.c:1347 +#: builtin/submodule--helper.c:1798 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "Значение «%s» для параметра submodule.alternateLocation не рапознано" -#: builtin/submodule--helper.c:1370 +#: builtin/submodule--helper.c:1822 msgid "where the new submodule will be cloned to" msgstr "куда должен быть склонирован новый подмодуль" -#: builtin/submodule--helper.c:1373 +#: builtin/submodule--helper.c:1825 msgid "name of the new submodule" msgstr "имя нового подмодуля" -#: builtin/submodule--helper.c:1376 +#: builtin/submodule--helper.c:1828 msgid "url where to clone the submodule from" msgstr "url откуда должен был склонирован новый подмодуль" -#: builtin/submodule--helper.c:1384 +#: builtin/submodule--helper.c:1836 msgid "depth for shallow clones" msgstr "глубина для частичного клона" -#: builtin/submodule--helper.c:1387 builtin/submodule--helper.c:1871 +#: builtin/submodule--helper.c:1839 builtin/submodule--helper.c:2348 msgid "force cloning progress" msgstr "принудительно выводить прогресс клонирования" -#: builtin/submodule--helper.c:1392 +#: builtin/submodule--helper.c:1841 builtin/submodule--helper.c:2350 +msgid "disallow cloning into non-empty directory" +msgstr "" + +#: builtin/submodule--helper.c:1848 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " -"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" -msgstr "git submodule--helper clone [--prefix=<путь>] [--quiet] [--reference <репозиторий>] [--name <имя>] [--depth <глубина>] --url <url> --path <путь>" +"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url " +"<url> --path <path>" +msgstr "" + +#: builtin/submodule--helper.c:1873 +#, c-format +msgid "refusing to create/use '%s' in another submodule's git dir" +msgstr "" -#: builtin/submodule--helper.c:1423 +#: builtin/submodule--helper.c:1884 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "не удалось клонировать «%s» в подмодуль по пути «%s»" -#: builtin/submodule--helper.c:1437 +#: builtin/submodule--helper.c:1888 +#, c-format +msgid "directory not empty: '%s'" +msgstr "" + +#: builtin/submodule--helper.c:1900 #, c-format msgid "could not get submodule directory for '%s'" msgstr "не удалось получить каталог для подмодуля «%s»" -#: builtin/submodule--helper.c:1473 +#: builtin/submodule--helper.c:1936 #, c-format msgid "Invalid update mode '%s' for submodule path '%s'" msgstr "" -#: builtin/submodule--helper.c:1477 +#: builtin/submodule--helper.c:1940 #, c-format msgid "Invalid update mode '%s' configured for submodule path '%s'" msgstr "" -#: builtin/submodule--helper.c:1570 +#: builtin/submodule--helper.c:2041 #, c-format msgid "Submodule path '%s' not initialized" msgstr "Подмодуль по пути «%s» не инициализирован" -#: builtin/submodule--helper.c:1574 +#: builtin/submodule--helper.c:2045 msgid "Maybe you want to use 'update --init'?" msgstr "Возможно, вы хотели использовать «update --init»?" -#: builtin/submodule--helper.c:1604 +#: builtin/submodule--helper.c:2075 #, c-format msgid "Skipping unmerged submodule %s" msgstr "Пропуск не слитого подмодуля %s" -#: builtin/submodule--helper.c:1633 +#: builtin/submodule--helper.c:2104 #, c-format msgid "Skipping submodule '%s'" msgstr "Пропуск подмодуля «%s»" -#: builtin/submodule--helper.c:1777 +#: builtin/submodule--helper.c:2254 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "Не удалось клонировать «%s». Запланирована повторная попытка" -#: builtin/submodule--helper.c:1788 +#: builtin/submodule--helper.c:2265 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "Не удалось клонировать «%s» со второй попытки, отмена" -#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:2092 +#: builtin/submodule--helper.c:2327 builtin/submodule--helper.c:2573 msgid "path into the working tree" msgstr "путь в рабочем каталоге" -#: builtin/submodule--helper.c:1853 +#: builtin/submodule--helper.c:2330 msgid "path into the working tree, across nested submodule boundaries" msgstr "путь в рабочем каталоге, в пределах границ подмодуля" -#: builtin/submodule--helper.c:1857 +#: builtin/submodule--helper.c:2334 msgid "rebase, merge, checkout or none" msgstr "rebase, merge, checkout или none" -#: builtin/submodule--helper.c:1863 +#: builtin/submodule--helper.c:2340 msgid "Create a shallow clone truncated to the specified number of revisions" msgstr "Создать частичный клон, ограниченный указанным количеством редакций" -#: builtin/submodule--helper.c:1866 +#: builtin/submodule--helper.c:2343 msgid "parallel jobs" msgstr "параллельные задачи" -#: builtin/submodule--helper.c:1868 +#: builtin/submodule--helper.c:2345 msgid "whether the initial clone should follow the shallow recommendation" msgstr "должен ли изначальный процесс клонирования следовать рекомендации о частичности" -#: builtin/submodule--helper.c:1869 +#: builtin/submodule--helper.c:2346 msgid "don't print cloning progress" msgstr "вы выводить прогресс клонирования" -#: builtin/submodule--helper.c:1876 -msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" -msgstr "git submodule--helper update_clone [--prefix=<путь>] [<путь>…]" +#: builtin/submodule--helper.c:2357 +msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]" +msgstr "" -#: builtin/submodule--helper.c:1889 +#: builtin/submodule--helper.c:2370 msgid "bad value for update parameter" msgstr "плохое значение для параметра update" -#: builtin/submodule--helper.c:1937 +#: builtin/submodule--helper.c:2418 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " "the superproject is not on any branch" msgstr "Ветка подмодуля (%s) настроена на наследование ветки из родительского проекта, но он не находится ни на одной ветке" -#: builtin/submodule--helper.c:2060 +#: builtin/submodule--helper.c:2541 #, c-format msgid "could not get a repository handle for submodule '%s'" msgstr "" -#: builtin/submodule--helper.c:2093 +#: builtin/submodule--helper.c:2574 msgid "recurse into submodules" msgstr "рекурсивно по подмодулям" -#: builtin/submodule--helper.c:2099 +#: builtin/submodule--helper.c:2580 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" msgstr "git submodule--helper absorb-git-dirs [<опции>] [<путь>…]" -#: builtin/submodule--helper.c:2156 +#: builtin/submodule--helper.c:2636 msgid "check if it is safe to write to the .gitmodules file" msgstr "" -#: builtin/submodule--helper.c:2159 +#: builtin/submodule--helper.c:2639 msgid "unset the config in the .gitmodules file" msgstr "" -#: builtin/submodule--helper.c:2164 +#: builtin/submodule--helper.c:2644 msgid "git submodule--helper config <name> [<value>]" msgstr "git submodule--helper config <имя> [<значение>]" -#: builtin/submodule--helper.c:2165 +#: builtin/submodule--helper.c:2645 msgid "git submodule--helper config --unset <name>" msgstr "git submodule--helper config --unset <имя>" -#: builtin/submodule--helper.c:2166 +#: builtin/submodule--helper.c:2646 msgid "git submodule--helper config --check-writeable" msgstr "git submodule--helper config --check-writeable" -#: builtin/submodule--helper.c:2185 git-submodule.sh:171 +#: builtin/submodule--helper.c:2665 git-submodule.sh:150 #, sh-format msgid "please make sure that the .gitmodules file is in the working tree" msgstr "" -#: builtin/submodule--helper.c:2235 git.c:433 git.c:685 +#: builtin/submodule--helper.c:2681 +msgid "Suppress output for setting url of a submodule" +msgstr "" + +#: builtin/submodule--helper.c:2685 +msgid "git submodule--helper set-url [--quiet] <path> <newurl>" +msgstr "" + +#: builtin/submodule--helper.c:2718 +msgid "set the default tracking branch to master" +msgstr "" + +#: builtin/submodule--helper.c:2720 +msgid "set the default tracking branch" +msgstr "" + +#: builtin/submodule--helper.c:2724 +msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>" +msgstr "" + +#: builtin/submodule--helper.c:2725 +msgid "" +"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>" +msgstr "" + +#: builtin/submodule--helper.c:2732 +msgid "--branch or --default required" +msgstr "" + +#: builtin/submodule--helper.c:2735 +msgid "--branch and --default are mutually exclusive" +msgstr "" + +#: builtin/submodule--helper.c:2792 git.c:438 git.c:711 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s не поддерживает параметр --super-prefix" -#: builtin/submodule--helper.c:2241 +#: builtin/submodule--helper.c:2798 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "«%s» не является подкомандой submodule--helper" @@ -18445,11 +20878,11 @@ msgstr "удалить символьные ссылки" msgid "shorten ref output" msgstr "укороченный вывод ссылок" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:499 msgid "reason" msgstr "причина" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:499 msgid "reason of the update" msgstr "причина обновления" @@ -18466,24 +20899,24 @@ msgstr "git tag -d <имя-метки>…" #: builtin/tag.c:28 msgid "" "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--points-at <object>]\n" -"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]" -msgstr "git tag -l [-n[<количество>]] [--contains <коммит>] [--no-contains <коммит>] [--points-at <объект>]\n\t\t[--format=<формат>] [--[no-]merged [<коммит>]] [<шаблон>…]" +"\t\t[--format=<format>] [--merged <commit>] [--no-merged <commit>] [<pattern>...]" +msgstr "" #: builtin/tag.c:30 msgid "git tag -v [--format=<format>] <tagname>..." msgstr "git tag -v [--format=<формат>] <имя-метки>…" -#: builtin/tag.c:88 +#: builtin/tag.c:89 #, c-format msgid "tag '%s' not found." msgstr "метка «%s» не найдена." -#: builtin/tag.c:104 +#: builtin/tag.c:105 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "Метка «%s» удалена (была %s)\n" -#: builtin/tag.c:134 +#: builtin/tag.c:135 #, c-format msgid "" "\n" @@ -18492,7 +20925,7 @@ msgid "" "Lines starting with '%c' will be ignored.\n" msgstr "\nВведите сообщение для метки:\n %s\nСтроки, начинающиеся с «%c» будут проигнорированы.\n" -#: builtin/tag.c:138 +#: builtin/tag.c:139 #, c-format msgid "" "\n" @@ -18501,15 +20934,15 @@ msgid "" "Lines starting with '%c' will be kept; you may remove them yourself if you want to.\n" msgstr "\nВведите сообщение для метки:\n %s\nСтроки, начинающиеся с «%c» будут оставлены; вы можете удалить их вручную, если хотите.\n" -#: builtin/tag.c:192 +#: builtin/tag.c:198 msgid "unable to sign the tag" msgstr "не удалось подписать метку" -#: builtin/tag.c:194 +#: builtin/tag.c:200 msgid "unable to write tag file" msgstr "не удалось записать файл метки" -#: builtin/tag.c:210 +#: builtin/tag.c:216 #, c-format msgid "" "You have created a nested tag. The object referred to by your new tag is\n" @@ -18518,382 +20951,386 @@ msgid "" "\tgit tag -f %s %s^{}" msgstr "" -#: builtin/tag.c:226 +#: builtin/tag.c:232 msgid "bad object type." msgstr "неправильный тип объекта" -#: builtin/tag.c:278 +#: builtin/tag.c:285 msgid "no tag message?" msgstr "нет описания метки?" -#: builtin/tag.c:285 +#: builtin/tag.c:292 #, c-format msgid "The tag message has been left in %s\n" msgstr "Сообщение метки было оставлено в %s\n" -#: builtin/tag.c:396 +#: builtin/tag.c:403 msgid "list tag names" msgstr "список названий меток" -#: builtin/tag.c:398 +#: builtin/tag.c:405 msgid "print <n> lines of each tag message" msgstr "печатать <n> строк описания от каждой метки" -#: builtin/tag.c:400 +#: builtin/tag.c:407 msgid "delete tags" msgstr "удалить метки" -#: builtin/tag.c:401 +#: builtin/tag.c:408 msgid "verify tags" msgstr "проверить метки" -#: builtin/tag.c:403 +#: builtin/tag.c:410 msgid "Tag creation options" msgstr "Настройки создания метки" -#: builtin/tag.c:405 +#: builtin/tag.c:412 msgid "annotated tag, needs a message" msgstr "для аннотированной метки нужно сообщение" -#: builtin/tag.c:407 +#: builtin/tag.c:414 msgid "tag message" msgstr "описание метки" -#: builtin/tag.c:409 +#: builtin/tag.c:416 msgid "force edit of tag message" msgstr "" -#: builtin/tag.c:410 +#: builtin/tag.c:417 msgid "annotated and GPG-signed tag" msgstr "аннотированная и подписанная с помощью GPG метка" -#: builtin/tag.c:413 +#: builtin/tag.c:420 msgid "use another key to sign the tag" msgstr "использовать другой ключ для подписания метки" -#: builtin/tag.c:414 +#: builtin/tag.c:421 msgid "replace the tag if exists" msgstr "замена метки, если она существует" -#: builtin/tag.c:415 builtin/update-ref.c:369 +#: builtin/tag.c:422 builtin/update-ref.c:505 msgid "create a reflog" msgstr "создать журнал ссылок" -#: builtin/tag.c:417 +#: builtin/tag.c:424 msgid "Tag listing options" msgstr "Настройки вывода списка меток" -#: builtin/tag.c:418 +#: builtin/tag.c:425 msgid "show tag list in columns" msgstr "показать список меток по столбцам" -#: builtin/tag.c:419 builtin/tag.c:421 +#: builtin/tag.c:426 builtin/tag.c:428 msgid "print only tags that contain the commit" msgstr "вывод только меток, которые содержат коммит" -#: builtin/tag.c:420 builtin/tag.c:422 +#: builtin/tag.c:427 builtin/tag.c:429 msgid "print only tags that don't contain the commit" msgstr "вывод только меток, которые не содержат коммит" -#: builtin/tag.c:423 +#: builtin/tag.c:430 msgid "print only tags that are merged" msgstr "вывод только слитых меток" -#: builtin/tag.c:424 +#: builtin/tag.c:431 msgid "print only tags that are not merged" msgstr "вывод только не слитых меток" -#: builtin/tag.c:428 +#: builtin/tag.c:435 msgid "print only tags of the object" msgstr "вывод только меток, определенного объекта" -#: builtin/tag.c:472 +#: builtin/tag.c:483 msgid "--column and -n are incompatible" msgstr "--column и -n нельзя использовать одновременно" -#: builtin/tag.c:494 +#: builtin/tag.c:505 msgid "-n option is only allowed in list mode" msgstr "опцию -n можно использовать только в режиме списка" -#: builtin/tag.c:496 +#: builtin/tag.c:507 msgid "--contains option is only allowed in list mode" msgstr "опцию --contains можно использовать только в режиме списка" -#: builtin/tag.c:498 +#: builtin/tag.c:509 msgid "--no-contains option is only allowed in list mode" msgstr "опцию --no-contains можно использовать только в режиме списка" -#: builtin/tag.c:500 +#: builtin/tag.c:511 msgid "--points-at option is only allowed in list mode" msgstr "опцию --points-at можно использовать только в режиме списка" -#: builtin/tag.c:502 +#: builtin/tag.c:513 msgid "--merged and --no-merged options are only allowed in list mode" msgstr "опции --merged и --no-merged можно использовать только в режиме списка" -#: builtin/tag.c:513 +#: builtin/tag.c:524 msgid "only one -F or -m option is allowed." msgstr "-F и -m нельзя использовать одновременно." -#: builtin/tag.c:532 +#: builtin/tag.c:543 msgid "too many params" msgstr "передано слишком много параметров" -#: builtin/tag.c:538 +#: builtin/tag.c:549 #, c-format msgid "'%s' is not a valid tag name." msgstr "«%s» не является допустимым именем метки." -#: builtin/tag.c:543 +#: builtin/tag.c:554 #, c-format msgid "tag '%s' already exists" msgstr "метка «%s» уже существует" -#: builtin/tag.c:574 +#: builtin/tag.c:585 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "Метка «%s» обновлена (была %s)\n" -#: builtin/unpack-objects.c:500 +#: builtin/unpack-objects.c:502 msgid "Unpacking objects" msgstr "Распаковка объектов" -#: builtin/update-index.c:83 +#: builtin/update-index.c:84 #, c-format msgid "failed to create directory %s" msgstr "не удалось создать каталог %s" -#: builtin/update-index.c:99 +#: builtin/update-index.c:100 #, c-format msgid "failed to create file %s" msgstr "не удалось создать файл %s" -#: builtin/update-index.c:107 +#: builtin/update-index.c:108 #, c-format msgid "failed to delete file %s" msgstr "не удалось удалить файл %s" -#: builtin/update-index.c:114 builtin/update-index.c:220 +#: builtin/update-index.c:115 builtin/update-index.c:221 #, c-format msgid "failed to delete directory %s" msgstr "не удалось удалить каталог %s" -#: builtin/update-index.c:139 +#: builtin/update-index.c:140 #, c-format msgid "Testing mtime in '%s' " msgstr "Проверка mtime в «%s» " -#: builtin/update-index.c:153 +#: builtin/update-index.c:154 msgid "directory stat info does not change after adding a new file" msgstr "информация статистики каталога не изменяется после добавления нового файла" -#: builtin/update-index.c:166 +#: builtin/update-index.c:167 msgid "directory stat info does not change after adding a new directory" msgstr "информация статистики каталога не изменяется после добавления нового каталога" -#: builtin/update-index.c:179 +#: builtin/update-index.c:180 msgid "directory stat info changes after updating a file" msgstr "информация статистики каталога изменяется после добавления нового файла" -#: builtin/update-index.c:190 +#: builtin/update-index.c:191 msgid "directory stat info changes after adding a file inside subdirectory" msgstr "информация статистики каталога изменяется после добавления нового файла внутри подкаталога" -#: builtin/update-index.c:201 +#: builtin/update-index.c:202 msgid "directory stat info does not change after deleting a file" msgstr "информация статистики каталога не изменяется после удаления файла" -#: builtin/update-index.c:214 +#: builtin/update-index.c:215 msgid "directory stat info does not change after deleting a directory" msgstr "информация статистики каталога не изменяется после удаления каталога" -#: builtin/update-index.c:221 +#: builtin/update-index.c:222 msgid " OK" msgstr " OK" -#: builtin/update-index.c:589 +#: builtin/update-index.c:591 msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [<опции>] [--] [<файл>…]" -#: builtin/update-index.c:971 +#: builtin/update-index.c:974 msgid "continue refresh even when index needs update" msgstr "продолжить обновление, даже если индекс требует обновления" -#: builtin/update-index.c:974 +#: builtin/update-index.c:977 msgid "refresh: ignore submodules" msgstr "обновление: игнорировать подмодули" -#: builtin/update-index.c:977 +#: builtin/update-index.c:980 msgid "do not ignore new files" msgstr "не игнорировать новые файлы" -#: builtin/update-index.c:979 +#: builtin/update-index.c:982 msgid "let files replace directories and vice-versa" msgstr "разрешить файлам заменять каталоги и наоборот" -#: builtin/update-index.c:981 +#: builtin/update-index.c:984 msgid "notice files missing from worktree" msgstr "замечать файлы отсутствующие в рабочем каталоге" -#: builtin/update-index.c:983 +#: builtin/update-index.c:986 msgid "refresh even if index contains unmerged entries" msgstr "обновить, даже если в индексе имеются не слитые записи" -#: builtin/update-index.c:986 +#: builtin/update-index.c:989 msgid "refresh stat information" msgstr "обновить информацию о статусе файлов" -#: builtin/update-index.c:990 +#: builtin/update-index.c:993 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "как --refresh, но игнорировать настройку assume-unchanged" -#: builtin/update-index.c:994 +#: builtin/update-index.c:997 msgid "<mode>,<object>,<path>" msgstr "<режим доступа>,<объект>,<путь>" -#: builtin/update-index.c:995 +#: builtin/update-index.c:998 msgid "add the specified entry to the index" msgstr "добавить указанную запись в индекс" -#: builtin/update-index.c:1005 +#: builtin/update-index.c:1008 msgid "mark files as \"not changing\"" msgstr "пометить файлы как «не измененные»" -#: builtin/update-index.c:1008 +#: builtin/update-index.c:1011 msgid "clear assumed-unchanged bit" msgstr "убрать пометку assumed-unchanged" -#: builtin/update-index.c:1011 +#: builtin/update-index.c:1014 msgid "mark files as \"index-only\"" msgstr "пометить файлы как «только в индексе»" -#: builtin/update-index.c:1014 +#: builtin/update-index.c:1017 msgid "clear skip-worktree bit" msgstr "убрать пометку skip-worktree" -#: builtin/update-index.c:1017 +#: builtin/update-index.c:1020 +msgid "do not touch index-only entries" +msgstr "" + +#: builtin/update-index.c:1022 msgid "add to index only; do not add content to object database" msgstr "только добавить в индекс; не добавлять содержимое в базу данных объектов" -#: builtin/update-index.c:1019 +#: builtin/update-index.c:1024 msgid "remove named paths even if present in worktree" msgstr "удалить указанные пути, даже если они существуют в рабочем каталоге" -#: builtin/update-index.c:1021 +#: builtin/update-index.c:1026 msgid "with --stdin: input lines are terminated by null bytes" msgstr "с опцией --stdin: строки на вводе отделяются НУЛЕВЫМ байтом" -#: builtin/update-index.c:1023 +#: builtin/update-index.c:1028 msgid "read list of paths to be updated from standard input" msgstr "прочитать список обновляемых путей из стандартного ввода" -#: builtin/update-index.c:1027 +#: builtin/update-index.c:1032 msgid "add entries from standard input to the index" msgstr "добавить записи из стандартного ввода в индекс" -#: builtin/update-index.c:1031 +#: builtin/update-index.c:1036 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "заново заполнить индекс #2 и #3 для указанных путей" -#: builtin/update-index.c:1035 +#: builtin/update-index.c:1040 msgid "only update entries that differ from HEAD" msgstr "обновить только записи, которые отличаются от HEAD" -#: builtin/update-index.c:1039 +#: builtin/update-index.c:1044 msgid "ignore files missing from worktree" msgstr "игнорировать файлы, отсутствующие в рабочем каталоге" -#: builtin/update-index.c:1042 +#: builtin/update-index.c:1047 msgid "report actions to standard output" msgstr "вывести выполняемые действия на стандартный вывод" -#: builtin/update-index.c:1044 +#: builtin/update-index.c:1049 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(для машинной обработки) забыть сохраненные неразрешенные конфликты" -#: builtin/update-index.c:1048 +#: builtin/update-index.c:1053 msgid "write index in this format" msgstr "записать индекс в указанном формате" -#: builtin/update-index.c:1050 +#: builtin/update-index.c:1055 msgid "enable or disable split index" msgstr "разрешить или запретить раздельный индекс" -#: builtin/update-index.c:1052 +#: builtin/update-index.c:1057 msgid "enable/disable untracked cache" msgstr "включить/отключить кэш неотслеживаемых файлов" -#: builtin/update-index.c:1054 +#: builtin/update-index.c:1059 msgid "test if the filesystem supports untracked cache" msgstr "проверить, что файловая система поддерживает кэш неотслеживаемых файлов" -#: builtin/update-index.c:1056 +#: builtin/update-index.c:1061 msgid "enable untracked cache without testing the filesystem" msgstr "включить кэш неотслеживаемых файлов без проверки файловой системы" -#: builtin/update-index.c:1058 +#: builtin/update-index.c:1063 msgid "write out the index even if is not flagged as changed" msgstr "записать индекс, даже если он не помечен как измененный" -#: builtin/update-index.c:1060 +#: builtin/update-index.c:1065 msgid "enable or disable file system monitor" msgstr "включить или выключить мониторинг файловой системы" -#: builtin/update-index.c:1062 +#: builtin/update-index.c:1067 msgid "mark files as fsmonitor valid" msgstr "пометить файл как действительный в мониторе файловой системы" -#: builtin/update-index.c:1065 +#: builtin/update-index.c:1070 msgid "clear fsmonitor valid bit" msgstr "снять пометку действительности мониторе файловой системы" -#: builtin/update-index.c:1168 +#: builtin/update-index.c:1173 msgid "" "core.splitIndex is set to false; remove or change it, if you really want to " "enable split index" msgstr "параметр core.splitIndex установлен в false; удалите или измените его, если вы действительно хотите включить разделенный индекс" -#: builtin/update-index.c:1177 +#: builtin/update-index.c:1182 msgid "" "core.splitIndex is set to true; remove or change it, if you really want to " "disable split index" msgstr "параметр core.splitIndex установлен в true; удалите или измените его, если вы действительно хотите отключить разделенный индекс" -#: builtin/update-index.c:1188 +#: builtin/update-index.c:1194 msgid "" "core.untrackedCache is set to true; remove or change it, if you really want " "to disable the untracked cache" msgstr "параметр core.untrackedCache установлен true; удалите или измените его, если вы действительно хотите удалить кэш неотслеживаемых файлов" -#: builtin/update-index.c:1192 +#: builtin/update-index.c:1198 msgid "Untracked cache disabled" msgstr "Кэш неотслеживаемых файлов отключен" -#: builtin/update-index.c:1200 +#: builtin/update-index.c:1206 msgid "" "core.untrackedCache is set to false; remove or change it, if you really want" " to enable the untracked cache" msgstr "параметр core.untrackedCache установлен false; удалите или измените его, если вы действительно хотите включить кэш неотслеживаемых файлов" -#: builtin/update-index.c:1204 +#: builtin/update-index.c:1210 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "Кэш неотслеживаемых файлов включен для «%s»" -#: builtin/update-index.c:1212 +#: builtin/update-index.c:1218 msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor" msgstr "параметр core.fsmonitor не установлен; установите его если вы действительно хотите включить мониторинг файловой системы" -#: builtin/update-index.c:1216 +#: builtin/update-index.c:1222 msgid "fsmonitor enabled" msgstr "мониторинг файловой системы включён" -#: builtin/update-index.c:1219 +#: builtin/update-index.c:1225 msgid "" "core.fsmonitor is set; remove it if you really want to disable fsmonitor" msgstr "параметр core.fsmonitor установлен; удалите его если вы действительно хотите выключить мониторинг файловой системы" -#: builtin/update-index.c:1223 +#: builtin/update-index.c:1229 msgid "fsmonitor disabled" msgstr "мониторинг файловой системы выключён" @@ -18909,19 +21346,19 @@ msgstr "git update-ref [<опции>] <имя-ссылки> <новое-зн msgid "git update-ref [<options>] --stdin [-z]" msgstr "git update-ref [<опции>] --stdin [-z]" -#: builtin/update-ref.c:364 +#: builtin/update-ref.c:500 msgid "delete the reference" msgstr "удалить ссылку" -#: builtin/update-ref.c:366 +#: builtin/update-ref.c:502 msgid "update <refname> not the one it points to" msgstr "обновить <имя-ссылки> а не то, на что она указывает" -#: builtin/update-ref.c:367 +#: builtin/update-ref.c:503 msgid "stdin has NUL-terminated arguments" msgstr "ввод отделённый НУЛЕВЫМИ символами" -#: builtin/update-ref.c:368 +#: builtin/update-ref.c:504 msgid "read updates from stdin" msgstr "прочитать обновления из стандартного ввода" @@ -18953,308 +21390,312 @@ msgstr "не проверять <каталог>/.git/ если <каталог> msgid "interrupt transfer after <n> seconds of inactivity" msgstr "прервать передачу после <кол> секунд простоя" -#: builtin/verify-commit.c:20 +#: builtin/verify-commit.c:19 msgid "git verify-commit [-v | --verbose] <commit>..." msgstr "git verify-commit [-v | --verbose] <коммит>…" -#: builtin/verify-commit.c:76 +#: builtin/verify-commit.c:68 msgid "print commit contents" msgstr "вывести содержимое коммита" -#: builtin/verify-commit.c:77 builtin/verify-tag.c:38 +#: builtin/verify-commit.c:69 builtin/verify-tag.c:37 msgid "print raw gpg status output" msgstr "выводить сырой вывод статуса от gpg" -#: builtin/verify-pack.c:55 +#: builtin/verify-pack.c:59 msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <пакет>…" -#: builtin/verify-pack.c:65 +#: builtin/verify-pack.c:70 msgid "verbose" msgstr "быть многословнее" -#: builtin/verify-pack.c:67 +#: builtin/verify-pack.c:72 msgid "show statistics only" msgstr "вывести только статистику" -#: builtin/verify-tag.c:19 +#: builtin/verify-tag.c:18 msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..." msgstr "git verify-tag [-v | --verbose] [--format=<формат>] <метка>…" -#: builtin/verify-tag.c:37 +#: builtin/verify-tag.c:36 msgid "print tag contents" msgstr "вывести содержимое метки" -#: builtin/worktree.c:18 +#: builtin/worktree.c:17 msgid "git worktree add [<options>] <path> [<commit-ish>]" msgstr "git worktree add [<опции>] <путь> [<указатель-коммита>]" -#: builtin/worktree.c:19 +#: builtin/worktree.c:18 msgid "git worktree list [<options>]" msgstr "git worktree list [<опции>]" -#: builtin/worktree.c:20 +#: builtin/worktree.c:19 msgid "git worktree lock [<options>] <path>" msgstr "git worktree lock [<опции>] <путь>" -#: builtin/worktree.c:21 +#: builtin/worktree.c:20 msgid "git worktree move <worktree> <new-path>" msgstr "git worktree move <рабочий-каталог> <новый-путь>" -#: builtin/worktree.c:22 +#: builtin/worktree.c:21 msgid "git worktree prune [<options>]" msgstr "git worktree prune [<опции>]" -#: builtin/worktree.c:23 +#: builtin/worktree.c:22 msgid "git worktree remove [<options>] <worktree>" msgstr "git worktree remove [<опции>] <рабочий-каталог>" -#: builtin/worktree.c:24 +#: builtin/worktree.c:23 msgid "git worktree unlock <path>" msgstr "git worktree unlock <путь>" -#: builtin/worktree.c:61 builtin/worktree.c:891 +#: builtin/worktree.c:60 builtin/worktree.c:973 #, c-format msgid "failed to delete '%s'" msgstr "не удалось удалить «%s»" -#: builtin/worktree.c:80 -#, c-format -msgid "Removing worktrees/%s: not a valid directory" -msgstr "Удаление рабочих каталогов/%s: не является каталогом" +#: builtin/worktree.c:85 +msgid "not a valid directory" +msgstr "" -#: builtin/worktree.c:86 -#, c-format -msgid "Removing worktrees/%s: gitdir file does not exist" -msgstr "Удаление рабочих каталогов/%s: файл gitdir не существует" +#: builtin/worktree.c:91 +msgid "gitdir file does not exist" +msgstr "" -#: builtin/worktree.c:91 builtin/worktree.c:100 +#: builtin/worktree.c:96 builtin/worktree.c:105 #, c-format -msgid "Removing worktrees/%s: unable to read gitdir file (%s)" -msgstr "Удаление рабочих каталогов/%s: не удалось прочитать файл gitdir (%s)" +msgid "unable to read gitdir file (%s)" +msgstr "" -#: builtin/worktree.c:110 +#: builtin/worktree.c:115 #, c-format -msgid "" -"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read " -"%<PRIuMAX>)" -msgstr "Удаление рабочего каталога/%s: прочитано мало данных (ожидалось %<PRIuMAX> байт, прочитано %<PRIuMAX>)" +msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)" +msgstr "" -#: builtin/worktree.c:118 -#, c-format -msgid "Removing worktrees/%s: invalid gitdir file" -msgstr "Удаление рабочих каталогов/%s: недействительный файл gitdir" +#: builtin/worktree.c:123 +msgid "invalid gitdir file" +msgstr "" -#: builtin/worktree.c:127 +#: builtin/worktree.c:131 +msgid "gitdir file points to non-existent location" +msgstr "" + +#: builtin/worktree.c:146 #, c-format -msgid "Removing worktrees/%s: gitdir file points to non-existent location" -msgstr "Удаление рабочих каталогов/%s: gitdir указывает на несуществующее расположение" +msgid "Removing %s/%s: %s" +msgstr "" -#: builtin/worktree.c:166 +#: builtin/worktree.c:221 msgid "report pruned working trees" msgstr "вывести список удаленных рабочих каталогов" -#: builtin/worktree.c:168 +#: builtin/worktree.c:223 msgid "expire working trees older than <time>" msgstr "удалить рабочие каталоги старее чем <дата-окончания>" -#: builtin/worktree.c:235 +#: builtin/worktree.c:293 #, c-format msgid "'%s' already exists" msgstr "«%s» уже существует" -#: builtin/worktree.c:252 +#: builtin/worktree.c:302 #, c-format -msgid "unable to re-add worktree '%s'" +msgid "unusable worktree destination '%s'" msgstr "" -#: builtin/worktree.c:257 +#: builtin/worktree.c:307 #, c-format msgid "" "'%s' is a missing but locked worktree;\n" -"use 'add -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear" +"use '%s -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear" msgstr "" -#: builtin/worktree.c:259 +#: builtin/worktree.c:309 #, c-format msgid "" "'%s' is a missing but already registered worktree;\n" -"use 'add -f' to override, or 'prune' or 'remove' to clear" +"use '%s -f' to override, or 'prune' or 'remove' to clear" msgstr "" -#: builtin/worktree.c:302 +#: builtin/worktree.c:360 #, c-format msgid "could not create directory of '%s'" msgstr "не удалось создать каталог «%s»" -#: builtin/worktree.c:432 builtin/worktree.c:438 +#: builtin/worktree.c:494 builtin/worktree.c:500 #, c-format msgid "Preparing worktree (new branch '%s')" msgstr "" -#: builtin/worktree.c:434 +#: builtin/worktree.c:496 #, c-format msgid "Preparing worktree (resetting branch '%s'; was at %s)" msgstr "" -#: builtin/worktree.c:443 +#: builtin/worktree.c:505 #, c-format msgid "Preparing worktree (checking out '%s')" msgstr "" -#: builtin/worktree.c:449 +#: builtin/worktree.c:511 #, c-format msgid "Preparing worktree (detached HEAD %s)" msgstr "" -#: builtin/worktree.c:490 +#: builtin/worktree.c:552 msgid "checkout <branch> even if already checked out in other worktree" msgstr "переключиться на <ветка> даже если она уже активна в другом рабочесм каталоге" -#: builtin/worktree.c:493 +#: builtin/worktree.c:555 msgid "create a new branch" msgstr "создать новую ветку" -#: builtin/worktree.c:495 +#: builtin/worktree.c:557 msgid "create or reset a branch" msgstr "создать или перейти на ветку" -#: builtin/worktree.c:497 +#: builtin/worktree.c:559 msgid "populate the new working tree" msgstr "наполнить новый рабочий каталог" -#: builtin/worktree.c:498 +#: builtin/worktree.c:560 msgid "keep the new working tree locked" msgstr "держать рабочий каталог заблокированным" -#: builtin/worktree.c:501 +#: builtin/worktree.c:563 msgid "set up tracking mode (see git-branch(1))" msgstr "настроить режим отслеживания ветки (смотрите git-branch(1))" -#: builtin/worktree.c:504 +#: builtin/worktree.c:566 msgid "try to match the new branch name with a remote-tracking branch" msgstr "пытаться найти соответствие имени новой ветки с именем внешней ветки" -#: builtin/worktree.c:512 +#: builtin/worktree.c:574 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b, -B и --detach нельзя использовать одновременно" -#: builtin/worktree.c:573 +#: builtin/worktree.c:635 msgid "--[no-]track can only be used if a new branch is created" msgstr "--[no-]track можно использовать только когда вы создаёте новую ветку" -#: builtin/worktree.c:673 +#: builtin/worktree.c:758 msgid "reason for locking" msgstr "причина блокировки" -#: builtin/worktree.c:685 builtin/worktree.c:718 builtin/worktree.c:792 -#: builtin/worktree.c:919 +#: builtin/worktree.c:770 builtin/worktree.c:803 builtin/worktree.c:877 +#: builtin/worktree.c:1001 #, c-format msgid "'%s' is not a working tree" msgstr "«%s» не является рабочим каталогом" -#: builtin/worktree.c:687 builtin/worktree.c:720 +#: builtin/worktree.c:772 builtin/worktree.c:805 msgid "The main working tree cannot be locked or unlocked" msgstr "Главный рабочий каталог не может быть заблокирован или разблокирован" -#: builtin/worktree.c:692 +#: builtin/worktree.c:777 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "«%s» уже заблокирован, причина: %s" -#: builtin/worktree.c:694 +#: builtin/worktree.c:779 #, c-format msgid "'%s' is already locked" msgstr "«%s» уже заблокирован" -#: builtin/worktree.c:722 +#: builtin/worktree.c:807 #, c-format msgid "'%s' is not locked" msgstr "«%s» не заблокирован" -#: builtin/worktree.c:763 +#: builtin/worktree.c:848 msgid "working trees containing submodules cannot be moved or removed" msgstr "" -#: builtin/worktree.c:771 +#: builtin/worktree.c:856 msgid "force move even if worktree is dirty or locked" msgstr "" -#: builtin/worktree.c:794 builtin/worktree.c:921 +#: builtin/worktree.c:879 builtin/worktree.c:1003 #, c-format msgid "'%s' is a main working tree" msgstr "" -#: builtin/worktree.c:799 +#: builtin/worktree.c:884 #, c-format msgid "could not figure out destination name from '%s'" msgstr "" -#: builtin/worktree.c:805 -#, c-format -msgid "target '%s' already exists" -msgstr "" - -#: builtin/worktree.c:813 +#: builtin/worktree.c:897 #, c-format msgid "" "cannot move a locked working tree, lock reason: %s\n" "use 'move -f -f' to override or unlock first" msgstr "" -#: builtin/worktree.c:815 +#: builtin/worktree.c:899 msgid "" "cannot move a locked working tree;\n" "use 'move -f -f' to override or unlock first" msgstr "" -#: builtin/worktree.c:818 +#: builtin/worktree.c:902 #, c-format msgid "validation failed, cannot move working tree: %s" msgstr "" -#: builtin/worktree.c:823 +#: builtin/worktree.c:907 #, c-format msgid "failed to move '%s' to '%s'" msgstr "" -#: builtin/worktree.c:871 +#: builtin/worktree.c:953 #, c-format msgid "failed to run 'git status' on '%s'" msgstr "" -#: builtin/worktree.c:875 +#: builtin/worktree.c:957 #, c-format -msgid "'%s' is dirty, use --force to delete it" +msgid "'%s' contains modified or untracked files, use --force to delete it" msgstr "" -#: builtin/worktree.c:880 +#: builtin/worktree.c:962 #, c-format msgid "failed to run 'git status' on '%s', code %d" msgstr "" -#: builtin/worktree.c:903 +#: builtin/worktree.c:985 msgid "force removal even if worktree is dirty or locked" msgstr "" -#: builtin/worktree.c:926 +#: builtin/worktree.c:1008 #, c-format msgid "" "cannot remove a locked working tree, lock reason: %s\n" "use 'remove -f -f' to override or unlock first" msgstr "" -#: builtin/worktree.c:928 +#: builtin/worktree.c:1010 msgid "" "cannot remove a locked working tree;\n" "use 'remove -f -f' to override or unlock first" msgstr "" -#: builtin/worktree.c:931 +#: builtin/worktree.c:1013 #, c-format msgid "validation failed, cannot remove working tree: %s" msgstr "" +#: builtin/worktree.c:1037 +#, c-format +msgid "repair: %s: %s" +msgstr "" + +#: builtin/worktree.c:1040 +#, c-format +msgid "error: %s: %s" +msgstr "" + #: builtin/write-tree.c:15 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" msgstr "git write-tree [--missing-ok] [--prefix=<префикс>/]" @@ -19271,25 +21712,29 @@ msgstr "вывести объект дерева для подкаталога msgid "only useful for debugging" msgstr "используется только при отладке" -#: credential-cache--daemon.c:223 +#: http-fetch.c:114 #, c-format -msgid "" -"The permissions on your socket directory are too loose; other\n" -"users may be able to read your cached credentials. Consider running:\n" -"\n" -"\tchmod 0700 %s" -msgstr "Права доступа к вашему каталогу сокетов слишком свободны; друге пользователи могуи читать ваши закэшированные пароли доступа. Обдумайте запуск команды:\n\n\tchmod 0700 %s" +msgid "argument to --packfile must be a valid hash (got '%s')" +msgstr "" -#: credential-cache--daemon.c:272 -msgid "print debugging messages to stderr" -msgstr "вывод отладочных сообщений на stderr" +#: http-fetch.c:122 +msgid "not a git repository" +msgstr "" + +#: t/helper/test-fast-rebase.c:141 +msgid "unhandled options" +msgstr "" -#: t/helper/test-reach.c:152 +#: t/helper/test-fast-rebase.c:146 +msgid "error preparing revisions" +msgstr "" + +#: t/helper/test-reach.c:154 #, c-format msgid "commit %s is not marked reachable" msgstr "" -#: t/helper/test-reach.c:162 +#: t/helper/test-reach.c:164 msgid "too many commits marked reachable" msgstr "" @@ -19301,7 +21746,7 @@ msgstr "" msgid "exit immediately after advertising capabilities" msgstr "" -#: git.c:27 +#: git.c:28 msgid "" "git [--version] [--help] [-C <path>] [-c <name>=<value>]\n" " [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n" @@ -19310,146 +21755,147 @@ msgid "" " <command> [<args>]" msgstr "git [--version] [--help] [-C <путь>] [-c <имя>=<значение>]\n [--exec-path[=<путь>]] [--html-path] [--man-path] [--info-path]\n [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--bare]\n [--git-dir=<путь>] [--work-tree=<путь>] [--namespace=<имя>]\n <команда> [<аргументы>]" -#: git.c:34 +#: git.c:35 msgid "" "'git help -a' and 'git help -g' list available subcommands and some\n" "concept guides. See 'git help <command>' or 'git help <concept>'\n" -"to read about a specific subcommand or concept." -msgstr "«git help -а» и «git help -g» выводит список доступных подкоманд и\nнекоторые руководства по темам. Запустите «git help <команда>» или\n«git help <термин>», чтобы прочесть о конкретных подкоманде или теме." +"to read about a specific subcommand or concept.\n" +"See 'git help git' for an overview of the system." +msgstr "" -#: git.c:185 +#: git.c:187 #, c-format msgid "no directory given for --git-dir\n" msgstr "" -#: git.c:199 +#: git.c:201 #, c-format msgid "no namespace given for --namespace\n" msgstr "" -#: git.c:213 +#: git.c:215 #, c-format msgid "no directory given for --work-tree\n" msgstr "" -#: git.c:227 +#: git.c:229 #, c-format msgid "no prefix given for --super-prefix\n" msgstr "" -#: git.c:249 +#: git.c:251 #, c-format msgid "-c expects a configuration string\n" msgstr "" -#: git.c:287 +#: git.c:289 #, c-format msgid "no directory given for -C\n" msgstr "" -#: git.c:313 +#: git.c:315 #, c-format msgid "unknown option: %s\n" msgstr "" -#: git.c:359 +#: git.c:364 #, c-format msgid "while expanding alias '%s': '%s'" msgstr "" -#: git.c:368 +#: git.c:373 #, c-format msgid "" "alias '%s' changes environment variables.\n" "You can use '!git' in the alias to do this" msgstr "" -#: git.c:376 +#: git.c:380 #, c-format msgid "empty alias for %s" msgstr "" -#: git.c:379 +#: git.c:383 #, c-format msgid "recursive alias: %s" msgstr "" -#: git.c:459 +#: git.c:465 msgid "write failure on standard output" msgstr "" -#: git.c:461 +#: git.c:467 msgid "unknown write failure on standard output" msgstr "" -#: git.c:463 +#: git.c:469 msgid "close failed on standard output" msgstr "" -#: git.c:797 +#: git.c:820 #, c-format msgid "alias loop detected: expansion of '%s' does not terminate:%s" msgstr "" -#: git.c:847 +#: git.c:870 #, c-format msgid "cannot handle %s as a builtin" msgstr "" -#: git.c:860 +#: git.c:883 #, c-format msgid "" "usage: %s\n" "\n" msgstr "" -#: git.c:880 +#: git.c:903 #, c-format msgid "expansion of alias '%s' failed; '%s' is not a git command\n" msgstr "" -#: git.c:892 +#: git.c:915 #, c-format msgid "failed to run command '%s': %s\n" msgstr "" -#: http.c:378 +#: http.c:399 #, c-format msgid "negative value for http.postbuffer; defaulting to %d" msgstr "отрицательное значение http.postbuffer; использую стандартное значение %d" -#: http.c:399 +#: http.c:420 msgid "Delegation control is not supported with cURL < 7.22.0" msgstr "Делегация проверки полномочий не поддерживается с cURL < 7.22.0" -#: http.c:408 +#: http.c:429 msgid "Public key pinning not supported with cURL < 7.44.0" msgstr "Public key pinning не поддерживается с cURL < 7.44.0" -#: http.c:876 +#: http.c:910 msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0" msgstr "" -#: http.c:949 +#: http.c:989 msgid "Protocol restrictions not supported with cURL < 7.19.4" msgstr "" -#: http.c:1085 +#: http.c:1132 #, c-format msgid "Unsupported SSL backend '%s'. Supported SSL backends:" msgstr "" -#: http.c:1092 +#: http.c:1139 #, c-format msgid "Could not set SSL backend to '%s': cURL was built without SSL backends" msgstr "" -#: http.c:1096 +#: http.c:1143 #, c-format msgid "Could not set SSL backend to '%s': already set" msgstr "" -#: http.c:1965 +#: http.c:2025 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -19457,152 +21903,193 @@ msgid "" " redirect: %s" msgstr "не удалось обновить базовый url из переадресации:\n запрошено: %s\n переадресовано: %s" -#: remote-curl.c:157 +#: remote-curl.c:183 #, c-format msgid "invalid quoting in push-option value: '%s'" msgstr "" -#: remote-curl.c:254 +#: remote-curl.c:307 #, c-format msgid "%sinfo/refs not valid: is this a git repository?" msgstr "" -#: remote-curl.c:355 +#: remote-curl.c:408 msgid "invalid server response; expected service, got flush packet" msgstr "" -#: remote-curl.c:386 +#: remote-curl.c:439 #, c-format msgid "invalid server response; got '%s'" msgstr "" -#: remote-curl.c:446 +#: remote-curl.c:499 #, c-format msgid "repository '%s' not found" msgstr "" -#: remote-curl.c:450 +#: remote-curl.c:503 #, c-format msgid "Authentication failed for '%s'" msgstr "" -#: remote-curl.c:454 +#: remote-curl.c:507 #, c-format msgid "unable to access '%s': %s" msgstr "«%s» недоступно: %s" -#: remote-curl.c:460 +#: remote-curl.c:513 #, c-format msgid "redirecting to %s" msgstr "переадресация на %s" -#: remote-curl.c:584 +#: remote-curl.c:642 msgid "shouldn't have EOF when not gentle on EOF" msgstr "" -#: remote-curl.c:664 -msgid "unable to rewind rpc post data - try increasing http.postBuffer" +#: remote-curl.c:654 +msgid "remote server sent stateless separator" msgstr "" #: remote-curl.c:724 +msgid "unable to rewind rpc post data - try increasing http.postBuffer" +msgstr "" + +#: remote-curl.c:754 +#, c-format +msgid "remote-curl: bad line length character: %.4s" +msgstr "" + +#: remote-curl.c:756 +msgid "remote-curl: unexpected response end packet" +msgstr "" + +#: remote-curl.c:832 #, c-format msgid "RPC failed; %s" msgstr "" -#: remote-curl.c:764 +#: remote-curl.c:872 msgid "cannot handle pushes this big" msgstr "" -#: remote-curl.c:879 +#: remote-curl.c:987 #, c-format msgid "cannot deflate request; zlib deflate error %d" msgstr "" -#: remote-curl.c:883 +#: remote-curl.c:991 #, c-format msgid "cannot deflate request; zlib end error %d" msgstr "" -#: remote-curl.c:1014 +#: remote-curl.c:1041 +#, c-format +msgid "%d bytes of length header were received" +msgstr "" + +#: remote-curl.c:1043 +#, c-format +msgid "%d bytes of body are still expected" +msgstr "" + +#: remote-curl.c:1132 msgid "dumb http transport does not support shallow capabilities" msgstr "" -#: remote-curl.c:1028 +#: remote-curl.c:1147 msgid "fetch failed." msgstr "" -#: remote-curl.c:1076 +#: remote-curl.c:1193 msgid "cannot fetch by sha1 over smart http" msgstr "" -#: remote-curl.c:1120 remote-curl.c:1126 +#: remote-curl.c:1237 remote-curl.c:1243 #, c-format msgid "protocol error: expected sha/ref, got '%s'" msgstr "" -#: remote-curl.c:1138 remote-curl.c:1252 +#: remote-curl.c:1255 remote-curl.c:1373 #, c-format msgid "http transport does not support %s" msgstr "" -#: remote-curl.c:1174 +#: remote-curl.c:1291 msgid "git-http-push failed" msgstr "" -#: remote-curl.c:1360 +#: remote-curl.c:1479 msgid "remote-curl: usage: git remote-curl <remote> [<url>]" msgstr "" -#: remote-curl.c:1392 +#: remote-curl.c:1511 msgid "remote-curl: error reading command stream from git" msgstr "" -#: remote-curl.c:1399 +#: remote-curl.c:1518 msgid "remote-curl: fetch attempted without a local repo" msgstr "" -#: remote-curl.c:1439 +#: remote-curl.c:1559 #, c-format msgid "remote-curl: unknown command '%s' from git" msgstr "" -#: list-objects-filter-options.h:61 +#: compat/compiler.h:26 +msgid "no compiler information available\n" +msgstr "" + +#: compat/compiler.h:38 +msgid "no libc information available\n" +msgstr "" + +#: list-objects-filter-options.h:91 msgid "args" msgstr "аргументы" -#: list-objects-filter-options.h:62 +#: list-objects-filter-options.h:92 msgid "object filtering" msgstr "фильтрация объектов" -#: parse-options.h:170 +#: parse-options.h:183 msgid "expiry-date" msgstr "дата-окончания" -#: parse-options.h:184 +#: parse-options.h:197 msgid "no-op (backward compatibility)" msgstr "ничего не делает (оставлено для обратной совместимости)" -#: parse-options.h:304 +#: parse-options.h:309 msgid "be more verbose" msgstr "быть многословнее" -#: parse-options.h:306 +#: parse-options.h:311 msgid "be more quiet" msgstr "тихий режим" -#: parse-options.h:312 -msgid "use <n> digits to display SHA-1s" -msgstr "использовать <n> цифр для вывода SHA-1" +#: parse-options.h:317 +msgid "use <n> digits to display object names" +msgstr "" -#: parse-options.h:331 +#: parse-options.h:336 msgid "how to strip spaces and #comments from message" msgstr "как удалять пробелы и #комментарии из сообщения коммита" -#: ref-filter.h:101 +#: parse-options.h:337 +msgid "read pathspec from file" +msgstr "" + +#: parse-options.h:338 +msgid "" +"with --pathspec-from-file, pathspec elements are separated with NUL " +"character" +msgstr "" + +#: ref-filter.h:96 msgid "key" msgstr "ключ" -#: ref-filter.h:101 +#: ref-filter.h:96 msgid "field name to sort on" msgstr "имя поля, по которому выполнить сортировку" @@ -19610,6 +22097,14 @@ msgstr "имя поля, по которому выполнить сортиро msgid "update the index with reused conflict resolution if possible" msgstr "обновить индекс с помощью переиспользования разрешения конфликта, если возможно" +#: wt-status.h:80 +msgid "HEAD detached at " +msgstr "HEAD отделён на " + +#: wt-status.h:81 +msgid "HEAD detached from " +msgstr "HEAD отделён начиная с " + #: command-list.h:50 msgid "Add file contents to the index" msgstr "Добавление содержимого файла в индекс" @@ -19647,681 +22142,691 @@ msgid "List, create, or delete branches" msgstr "Вывод списка, создание или удаление веток" #: command-list.h:59 +msgid "Collect information for user to file a bug report" +msgstr "" + +#: command-list.h:60 msgid "Move objects and refs by archive" msgstr "Перемещение объектов и ссылок по архиву" -#: command-list.h:60 +#: command-list.h:61 msgid "Provide content or type and size information for repository objects" msgstr "Вывод содержимого или типа и информации о размере для объектов репозитория" -#: command-list.h:61 +#: command-list.h:62 msgid "Display gitattributes information" msgstr "Вывод информации из gitattributes" -#: command-list.h:62 +#: command-list.h:63 msgid "Debug gitignore / exclude files" msgstr "Отладка файлов gitignore / exclude" -#: command-list.h:63 +#: command-list.h:64 msgid "Show canonical names and email addresses of contacts" msgstr "Вывод каноничных имён и адресов электронной почты контактов" -#: command-list.h:64 +#: command-list.h:65 msgid "Switch branches or restore working tree files" msgstr "Переключение веток или восстановление файлов в рабочем каталоге" -#: command-list.h:65 +#: command-list.h:66 msgid "Copy files from the index to the working tree" msgstr "Копирование файлов из индекса в рабочий каталог" -#: command-list.h:66 +#: command-list.h:67 msgid "Ensures that a reference name is well formed" msgstr "Удостовериться, что имя ссылки правильно сформировано" -#: command-list.h:67 +#: command-list.h:68 msgid "Find commits yet to be applied to upstream" msgstr "Поиск коммитов которые еще не применены вышестоящим репозиторием" -#: command-list.h:68 +#: command-list.h:69 msgid "Apply the changes introduced by some existing commits" msgstr "Применение изменений, сделанных в каком-то существующем коммите" -#: command-list.h:69 +#: command-list.h:70 msgid "Graphical alternative to git-commit" msgstr "Графическая альтернатива для git-commit" -#: command-list.h:70 +#: command-list.h:71 msgid "Remove untracked files from the working tree" msgstr "Удаление неотслеживаемых файлов из рабочего каталога" -#: command-list.h:71 +#: command-list.h:72 msgid "Clone a repository into a new directory" msgstr "Клонирование репозитория в новый каталог" -#: command-list.h:72 +#: command-list.h:73 msgid "Display data in columns" msgstr "Вывод данных по колонкам" -#: command-list.h:73 +#: command-list.h:74 msgid "Record changes to the repository" msgstr "Запись изменений в репозиторий" -#: command-list.h:74 +#: command-list.h:75 msgid "Write and verify Git commit-graph files" msgstr "Запись и проверка commit-graph файлов Git" -#: command-list.h:75 +#: command-list.h:76 msgid "Create a new commit object" msgstr "Создание нового объекта коммита" -#: command-list.h:76 +#: command-list.h:77 msgid "Get and set repository or global options" msgstr "Получение и установка глобальных опций или опций репозитория" -#: command-list.h:77 +#: command-list.h:78 msgid "Count unpacked number of objects and their disk consumption" msgstr "Подсчет количества неупакованных объектов и их потребления диска" -#: command-list.h:78 +#: command-list.h:79 msgid "Retrieve and store user credentials" msgstr "Получение и сохранение учетных записей пользователя" -#: command-list.h:79 +#: command-list.h:80 msgid "Helper to temporarily store passwords in memory" msgstr "Помощник для временного хранения паролей в памяти" -#: command-list.h:80 +#: command-list.h:81 msgid "Helper to store credentials on disk" msgstr "Помощник для хранения учетных записей на диске" -#: command-list.h:81 +#: command-list.h:82 msgid "Export a single commit to a CVS checkout" msgstr "Экспорт единственного коммита в виде рабочей копии CVS" -#: command-list.h:82 +#: command-list.h:83 msgid "Salvage your data out of another SCM people love to hate" msgstr "Спасение ваших данных из другой СКВ которую люди любят ненавидеть" -#: command-list.h:83 +#: command-list.h:84 msgid "A CVS server emulator for Git" msgstr "Эмулятор сервера CVS для Git" -#: command-list.h:84 +#: command-list.h:85 msgid "A really simple server for Git repositories" msgstr "Очень простой сервер для Git репозиториев" -#: command-list.h:85 +#: command-list.h:86 msgid "Give an object a human readable name based on an available ref" msgstr "Присвоение объекту удобочитаемое имя на основе доступной ссылки" -#: command-list.h:86 +#: command-list.h:87 msgid "Show changes between commits, commit and working tree, etc" msgstr "Вывод разницы между коммитами, коммитом и рабочим каталогом и т.д." -#: command-list.h:87 +#: command-list.h:88 msgid "Compares files in the working tree and the index" msgstr "Сравнение седержимого файлов в рабочем каталоге с файлами в индексе" -#: command-list.h:88 +#: command-list.h:89 msgid "Compare a tree to the working tree or index" msgstr "Сравнение дерева файлов с рабочим каталогом или индексом" -#: command-list.h:89 +#: command-list.h:90 msgid "Compares the content and mode of blobs found via two tree objects" msgstr "Сравнение содержимого и режима двоичных объектов, найденных по двум объектам дерева" -#: command-list.h:90 +#: command-list.h:91 msgid "Show changes using common diff tools" msgstr "Показ изменений с помощью распространенных утилит сравнения" -#: command-list.h:91 +#: command-list.h:92 msgid "Git data exporter" msgstr "Экспорт данных Git" -#: command-list.h:92 +#: command-list.h:93 msgid "Backend for fast Git data importers" msgstr "Внутренний интерфейс для быстрого импорта данных Git" -#: command-list.h:93 +#: command-list.h:94 msgid "Download objects and refs from another repository" msgstr "Загрузка объектов и ссылок из другого репозитория" -#: command-list.h:94 +#: command-list.h:95 msgid "Receive missing objects from another repository" msgstr "Получение недостающих объектов из другого репозитория" -#: command-list.h:95 +#: command-list.h:96 msgid "Rewrite branches" msgstr "Перезапись веток" -#: command-list.h:96 +#: command-list.h:97 msgid "Produce a merge commit message" msgstr "Создание сообщения коммита для слияния" -#: command-list.h:97 +#: command-list.h:98 msgid "Output information on each ref" msgstr "Вывод информации о каждой ссылке" -#: command-list.h:98 +#: command-list.h:99 +msgid "Run a Git command on a list of repositories" +msgstr "" + +#: command-list.h:100 msgid "Prepare patches for e-mail submission" msgstr "Подготовка патчей для отправки по электронной почте" -#: command-list.h:99 +#: command-list.h:101 msgid "Verifies the connectivity and validity of the objects in the database" msgstr "Проверка связности и валидности объектов в базе данных" -#: command-list.h:100 +#: command-list.h:102 msgid "Cleanup unnecessary files and optimize the local repository" msgstr "Очистка ненужных файлов и оптимизация локального репозитория" -#: command-list.h:101 +#: command-list.h:103 msgid "Extract commit ID from an archive created using git-archive" msgstr "Извлечение идентификатора коммита из архива, созданного с помощью git-archive" -#: command-list.h:102 +#: command-list.h:104 msgid "Print lines matching a pattern" msgstr "Вывод строк, соответствующих шаблону" -#: command-list.h:103 +#: command-list.h:105 msgid "A portable graphical interface to Git" msgstr "Портативный графический интерфейс для Git" -#: command-list.h:104 +#: command-list.h:106 msgid "Compute object ID and optionally creates a blob from a file" msgstr "Вычисление идентификатора объекта и возможное создание двоичного объекта из файла" -#: command-list.h:105 +#: command-list.h:107 msgid "Display help information about Git" msgstr "Отображение справочной информации о Git" -#: command-list.h:106 +#: command-list.h:108 msgid "Server side implementation of Git over HTTP" msgstr "Серверная реализация протокола Git над HTTP" -#: command-list.h:107 +#: command-list.h:109 msgid "Download from a remote Git repository via HTTP" msgstr "Загрузка из внешнего репозитория Git с помощью HTTP" -#: command-list.h:108 +#: command-list.h:110 msgid "Push objects over HTTP/DAV to another repository" msgstr "Отправка объектов в другой репозиторий с помощью HTTP/DAV" -#: command-list.h:109 +#: command-list.h:111 msgid "Send a collection of patches from stdin to an IMAP folder" msgstr "Отправка коллекции патчей из стандартного ввода в папку IMAP" -#: command-list.h:110 +#: command-list.h:112 msgid "Build pack index file for an existing packed archive" msgstr "Построение файла индекса для существующего упакованного архива" -#: command-list.h:111 +#: command-list.h:113 msgid "Create an empty Git repository or reinitialize an existing one" msgstr "Создание пустого репозитория Git или переинициализация существующего" -#: command-list.h:112 +#: command-list.h:114 msgid "Instantly browse your working repository in gitweb" msgstr "Мгновенный просмотр вашего рабочего репозитория в gitweb" -#: command-list.h:113 +#: command-list.h:115 msgid "Add or parse structured information in commit messages" msgstr "Добавление или разбор структурированной информации в сообщениях коммита" -#: command-list.h:114 +#: command-list.h:116 msgid "The Git repository browser" msgstr "Браузер репозитория Git" -#: command-list.h:115 +#: command-list.h:117 msgid "Show commit logs" msgstr "Вывод истории коммитов" -#: command-list.h:116 +#: command-list.h:118 msgid "Show information about files in the index and the working tree" msgstr "Вывод информации о файлах в индексе и в рабочем каталоге" -#: command-list.h:117 +#: command-list.h:119 msgid "List references in a remote repository" msgstr "Вывод списка ссылок во внешнем репозитории" -#: command-list.h:118 +#: command-list.h:120 msgid "List the contents of a tree object" msgstr "Вывод содержимого объекта дерева" -#: command-list.h:119 +#: command-list.h:121 msgid "Extracts patch and authorship from a single e-mail message" msgstr "Извлекает патч и авторство из одного сообщения электронной почты" -#: command-list.h:120 +#: command-list.h:122 msgid "Simple UNIX mbox splitter program" msgstr "Простая программа UNIX для разбора файла mbox" -#: command-list.h:121 +#: command-list.h:123 +msgid "Run tasks to optimize Git repository data" +msgstr "" + +#: command-list.h:124 msgid "Join two or more development histories together" msgstr "Объединение одной или нескольких историй разработки вместе" -#: command-list.h:122 +#: command-list.h:125 msgid "Find as good common ancestors as possible for a merge" msgstr "Поиск подходящих общих предков для возможного слияния" -#: command-list.h:123 +#: command-list.h:126 msgid "Run a three-way file merge" msgstr "Запуск трёхходового слияния файлов" -#: command-list.h:124 +#: command-list.h:127 msgid "Run a merge for files needing merging" msgstr "Запуск слияния для файлов, которые требуют слияния" -#: command-list.h:125 +#: command-list.h:128 msgid "The standard helper program to use with git-merge-index" msgstr "Стандартная программа-помощник для использования совместно с git-merge-index" -#: command-list.h:126 +#: command-list.h:129 msgid "Run merge conflict resolution tools to resolve merge conflicts" msgstr "Запуск инструментов разрешения конфликтов слияния" -#: command-list.h:127 +#: command-list.h:130 msgid "Show three-way merge without touching index" msgstr "Вывод трёхходового слияние без затрагивания индекса" -#: command-list.h:128 +#: command-list.h:131 msgid "Write and verify multi-pack-indexes" msgstr "Запись и проверка файлов multi-pack-index" -#: command-list.h:129 +#: command-list.h:132 msgid "Creates a tag object" msgstr "Создание объектов меток" -#: command-list.h:130 +#: command-list.h:133 msgid "Build a tree-object from ls-tree formatted text" msgstr "Построение объекта дерева из текста формата ls-tree" -#: command-list.h:131 +#: command-list.h:134 msgid "Move or rename a file, a directory, or a symlink" msgstr "Перемещение или переименование файла, каталога или символьной ссылки" -#: command-list.h:132 +#: command-list.h:135 msgid "Find symbolic names for given revs" msgstr "Поиск символьных имён для указанных редакций" -#: command-list.h:133 +#: command-list.h:136 msgid "Add or inspect object notes" msgstr "Добавление или просмотр заметок объекта" -#: command-list.h:134 +#: command-list.h:137 msgid "Import from and submit to Perforce repositories" msgstr "Импорт и отправка в репозитории Perforce" -#: command-list.h:135 +#: command-list.h:138 msgid "Create a packed archive of objects" msgstr "Создание упакованного архива объектов" -#: command-list.h:136 +#: command-list.h:139 msgid "Find redundant pack files" msgstr "Поиск избыточных файлов пакетов" -#: command-list.h:137 +#: command-list.h:140 msgid "Pack heads and tags for efficient repository access" msgstr "Упаковка указателей на ветки и меток для эффективного доступа к репозиторию" -#: command-list.h:138 -msgid "Routines to help parsing remote repository access parameters" -msgstr "Подпрограммы для помощи разбора параметров доступа внешнего репозитория" - -#: command-list.h:139 +#: command-list.h:141 msgid "Compute unique ID for a patch" msgstr "Вычисление уникального идентификатора для патча" -#: command-list.h:140 +#: command-list.h:142 msgid "Prune all unreachable objects from the object database" msgstr "Очистка всех недостижимых объектов из базы данных объектов" -#: command-list.h:141 +#: command-list.h:143 msgid "Remove extra objects that are already in pack files" msgstr "Удаление дополнительных объектов, которые уже содержатся в файлах пакетов" -#: command-list.h:142 +#: command-list.h:144 msgid "Fetch from and integrate with another repository or a local branch" msgstr "Извлечение изменений и объединение с другим репозиторием или локальной веткой" -#: command-list.h:143 +#: command-list.h:145 msgid "Update remote refs along with associated objects" msgstr "Обновление внешних ссылок и связанных объектов" -#: command-list.h:144 +#: command-list.h:146 msgid "Applies a quilt patchset onto the current branch" msgstr "Применение упорядоченного списка патчей над текущей веткой" -#: command-list.h:145 +#: command-list.h:147 msgid "Compare two commit ranges (e.g. two versions of a branch)" msgstr "Сравнение двух диапазонов коммитов (например двух версий ветки)" -#: command-list.h:146 +#: command-list.h:148 msgid "Reads tree information into the index" msgstr "Чтение информации о дереве в индекс" -#: command-list.h:147 +#: command-list.h:149 msgid "Reapply commits on top of another base tip" msgstr "Повторное применение коммитов над верхушкой другой ветки" -#: command-list.h:148 +#: command-list.h:150 msgid "Receive what is pushed into the repository" msgstr "Получение того, что было отправлено в репозиторий" -#: command-list.h:149 +#: command-list.h:151 msgid "Manage reflog information" msgstr "Управление информацией журнала ссылок" -#: command-list.h:150 +#: command-list.h:152 msgid "Manage set of tracked repositories" msgstr "Управление набором отслеживаемых репозиториев" -#: command-list.h:151 +#: command-list.h:153 msgid "Pack unpacked objects in a repository" msgstr "Упаковка неупакованных объектов в репозитории" -#: command-list.h:152 +#: command-list.h:154 msgid "Create, list, delete refs to replace objects" msgstr "Создание, вывод списка, удаление ссылок для замены объектов" -#: command-list.h:153 +#: command-list.h:155 msgid "Generates a summary of pending changes" msgstr "Генерация сводки предстоящих изменений" -#: command-list.h:154 +#: command-list.h:156 msgid "Reuse recorded resolution of conflicted merges" msgstr "Повторное использование записанных разрешений конфликтов при слияниях" -#: command-list.h:155 +#: command-list.h:157 msgid "Reset current HEAD to the specified state" msgstr "Сброс текущего состояния HEAD на указанное состояние" -#: command-list.h:156 +#: command-list.h:158 +msgid "Restore working tree files" +msgstr "" + +#: command-list.h:159 msgid "Revert some existing commits" msgstr "Обращение изменений существующих коммитов" -#: command-list.h:157 +#: command-list.h:160 msgid "Lists commit objects in reverse chronological order" msgstr "Вывод списка объектов коммита в обратном хронологическом порядке" -#: command-list.h:158 +#: command-list.h:161 msgid "Pick out and massage parameters" msgstr "Разбор и обработка параметров" -#: command-list.h:159 +#: command-list.h:162 msgid "Remove files from the working tree and from the index" msgstr "Удаление файлов из рабочего каталога и индекса" -#: command-list.h:160 +#: command-list.h:163 msgid "Send a collection of patches as emails" msgstr "Отправка коллекции патчей на электронную почту" -#: command-list.h:161 +#: command-list.h:164 msgid "Push objects over Git protocol to another repository" msgstr "Отправка объектов в другой репозиторий с помощью протокола Git" -#: command-list.h:162 +#: command-list.h:165 msgid "Restricted login shell for Git-only SSH access" msgstr "Ограниченная оболочка входа в систему для доступа Git через SSH" -#: command-list.h:163 +#: command-list.h:166 msgid "Summarize 'git log' output" msgstr "Обобщение вывода «git log»" -#: command-list.h:164 +#: command-list.h:167 msgid "Show various types of objects" msgstr "Вывод различных типов объектов" -#: command-list.h:165 +#: command-list.h:168 msgid "Show branches and their commits" msgstr "Вывод веток и их коммитов" -#: command-list.h:166 +#: command-list.h:169 msgid "Show packed archive index" msgstr "Вывод индекса упакованного архива" -#: command-list.h:167 +#: command-list.h:170 msgid "List references in a local repository" msgstr "Вывод ссылок в локальном репозитории" -#: command-list.h:168 +#: command-list.h:171 msgid "Git's i18n setup code for shell scripts" msgstr "Код настройки интернационализации для сценариев оболочки Git" -#: command-list.h:169 +#: command-list.h:172 msgid "Common Git shell script setup code" msgstr "Общий код настройки для сценариев оболочки Git" -#: command-list.h:170 +#: command-list.h:173 +msgid "Initialize and modify the sparse-checkout" +msgstr "" + +#: command-list.h:174 msgid "Stash the changes in a dirty working directory away" msgstr "Спрятать изменения в изменённом рабочем каталоге" -#: command-list.h:171 +#: command-list.h:175 msgid "Add file contents to the staging area" msgstr "Добавление содержимого файлов в индекс" -#: command-list.h:172 +#: command-list.h:176 msgid "Show the working tree status" msgstr "Вывод состояния рабочего каталога" -#: command-list.h:173 +#: command-list.h:177 msgid "Remove unnecessary whitespace" msgstr "Удаление ненужных пробелов" -#: command-list.h:174 +#: command-list.h:178 msgid "Initialize, update or inspect submodules" msgstr "Инициализация, обновление или просмотр подмодулей" -#: command-list.h:175 +#: command-list.h:179 msgid "Bidirectional operation between a Subversion repository and Git" msgstr "Двухсторонние операции между репозиториями Subversion и Git" -#: command-list.h:176 +#: command-list.h:180 +msgid "Switch branches" +msgstr "" + +#: command-list.h:181 msgid "Read, modify and delete symbolic refs" msgstr "Чтение, изменение и удаление символических ссылок" -#: command-list.h:177 +#: command-list.h:182 msgid "Create, list, delete or verify a tag object signed with GPG" msgstr "Создание, вывод списка, удаление или проверка метки, подписанной с помощью GPG" -#: command-list.h:178 +#: command-list.h:183 msgid "Creates a temporary file with a blob's contents" msgstr "Создание временного файла с содержимым двоичного объекта" -#: command-list.h:179 +#: command-list.h:184 msgid "Unpack objects from a packed archive" msgstr "Распаковка объектов из упакованного архива" -#: command-list.h:180 +#: command-list.h:185 msgid "Register file contents in the working tree to the index" msgstr "Регистрация содержимого файла из рабочего каталога в индекс" -#: command-list.h:181 +#: command-list.h:186 msgid "Update the object name stored in a ref safely" msgstr "Безопасное обновление имени объекта хранящегося в ссылке" -#: command-list.h:182 +#: command-list.h:187 msgid "Update auxiliary info file to help dumb servers" msgstr "Обновление файла со вспомогательной информацией для глупых серверов" -#: command-list.h:183 +#: command-list.h:188 msgid "Send archive back to git-archive" msgstr "Отправка архива обратно в git-archive" -#: command-list.h:184 +#: command-list.h:189 msgid "Send objects packed back to git-fetch-pack" msgstr "Отправка упакованных объектов обратно в git-fetch-pack" -#: command-list.h:185 +#: command-list.h:190 msgid "Show a Git logical variable" msgstr "Вывод логической переменной Git" -#: command-list.h:186 +#: command-list.h:191 msgid "Check the GPG signature of commits" msgstr "Проверка подписи GPG коммитов" -#: command-list.h:187 +#: command-list.h:192 msgid "Validate packed Git archive files" msgstr "Проверка файлов упакованных архивов Git" -#: command-list.h:188 +#: command-list.h:193 msgid "Check the GPG signature of tags" msgstr "Проверка подписи GPG меток" -#: command-list.h:189 +#: command-list.h:194 msgid "Git web interface (web frontend to Git repositories)" msgstr "Веб интерфейс Git (веб-интерфейс для Git репозиториев)" -#: command-list.h:190 +#: command-list.h:195 msgid "Show logs with difference each commit introduces" msgstr "Вывод журнала с изменениями, которые вводил каждый из коммитов" -#: command-list.h:191 +#: command-list.h:196 msgid "Manage multiple working trees" msgstr "Управление несколькими рабочими каталогами" -#: command-list.h:192 +#: command-list.h:197 msgid "Create a tree object from the current index" msgstr "Создание объекта дерева из текущего индекса" -#: command-list.h:193 +#: command-list.h:198 msgid "Defining attributes per path" msgstr "Определение атрибутов для путей файлов или каталогов" -#: command-list.h:194 +#: command-list.h:199 msgid "Git command-line interface and conventions" msgstr "Интерфейс коммандной строки Git и соглашения" -#: command-list.h:195 +#: command-list.h:200 msgid "A Git core tutorial for developers" msgstr "Учебник по ядру Git для разработчиков" -#: command-list.h:196 +#: command-list.h:201 +msgid "Providing usernames and passwords to Git" +msgstr "" + +#: command-list.h:202 msgid "Git for CVS users" msgstr "Git для пользователей CVS" -#: command-list.h:197 +#: command-list.h:203 msgid "Tweaking diff output" msgstr "Подстройка вывода списка изменений" -#: command-list.h:198 +#: command-list.h:204 msgid "A useful minimum set of commands for Everyday Git" msgstr "Полезный минимум команд для каждодневного использования Git" -#: command-list.h:199 +#: command-list.h:205 +msgid "Frequently asked questions about using Git" +msgstr "" + +#: command-list.h:206 msgid "A Git Glossary" msgstr "Глоссарий Git" -#: command-list.h:200 +#: command-list.h:207 msgid "Hooks used by Git" msgstr "Перехватчики используемые Git" -#: command-list.h:201 +#: command-list.h:208 msgid "Specifies intentionally untracked files to ignore" msgstr "Указание специально игнорируемых файлов" -#: command-list.h:202 +#: command-list.h:209 msgid "Defining submodule properties" msgstr "Определение свойств подмодулей" -#: command-list.h:203 +#: command-list.h:210 msgid "Git namespaces" msgstr "Пространства имён Git" -#: command-list.h:204 +#: command-list.h:211 +msgid "Helper programs to interact with remote repositories" +msgstr "" + +#: command-list.h:212 msgid "Git Repository Layout" msgstr "Содержимое репозитория Git" -#: command-list.h:205 +#: command-list.h:213 msgid "Specifying revisions and ranges for Git" msgstr "Указание редакций и диапазонов для Git" -#: command-list.h:206 +#: command-list.h:214 +msgid "Mounting one repository inside another" +msgstr "" + +#: command-list.h:215 msgid "A tutorial introduction to Git: part two" msgstr "Обучающее введение в Git: часть вторая" -#: command-list.h:207 +#: command-list.h:216 msgid "A tutorial introduction to Git" msgstr "Обучающее введение в Git" -#: command-list.h:208 +#: command-list.h:217 msgid "An overview of recommended workflows with Git" msgstr "Обзор рекомендуемых последовательностей выполняемых действий с Git" -#: git-bisect.sh:54 -msgid "You need to start by \"git bisect start\"" -msgstr "Вам нужно начать с помощью «git bisect start»" - -#. TRANSLATORS: Make sure to include [Y] and [n] in your -#. translation. The program will only accept English input -#. at this point. -#: git-bisect.sh:60 -msgid "Do you want me to do it for you [Y/n]? " -msgstr "Вы уверены, что хотите, чтобы я сделал это [Y - да/n - нет]? " - -#: git-bisect.sh:101 +#: git-bisect.sh:48 #, sh-format msgid "Bad rev input: $arg" msgstr "Плохой ввод номера редакции: $arg" -#: git-bisect.sh:121 -#, sh-format -msgid "Bad rev input: $bisected_head" -msgstr "Плохой ввод номера редакции: $bisected_head" - -#: git-bisect.sh:130 -#, sh-format -msgid "Bad rev input: $rev" -msgstr "Плохой ввод номера редакции: $rev" - -#: git-bisect.sh:139 -#, sh-format -msgid "'git bisect $TERM_BAD' can take only one argument." -msgstr "«git bisect $TERM_BAD» может принимать только один аргумент." - -#: git-bisect.sh:209 +#: git-bisect.sh:82 msgid "No logfile given" msgstr "Не передан файл журнала" -#: git-bisect.sh:210 +#: git-bisect.sh:83 #, sh-format msgid "cannot read $file for replaying" msgstr "не удалось прочитать $file для повтора изменений" -#: git-bisect.sh:232 +#: git-bisect.sh:105 msgid "?? what are you talking about?" msgstr "?? вы о чем?" -#: git-bisect.sh:241 +#: git-bisect.sh:115 msgid "bisect run failed: no command provided." msgstr "сбой при выполнении двоичного поиска: не передана команда." -#: git-bisect.sh:246 +#: git-bisect.sh:120 #, sh-format msgid "running $command" msgstr "запускаю $command" -#: git-bisect.sh:253 +#: git-bisect.sh:127 #, sh-format msgid "" "bisect run failed:\n" "exit code $res from '$command' is < 0 or >= 128" msgstr "не удалось выполнить двоичный поиск:\nкод завершения $res от «$command» оказался < 0 или >= 128" -#: git-bisect.sh:279 +#: git-bisect.sh:152 msgid "bisect run cannot continue any more" msgstr "bisect run больше не может продолжать" -#: git-bisect.sh:285 +#: git-bisect.sh:158 #, sh-format msgid "" "bisect run failed:\n" -"'bisect_state $state' exited with error code $res" -msgstr "не удалось выполнить двоичный поиск:\n«bisect_state $state» завершился с кодом ошибки $res" +"'bisect-state $state' exited with error code $res" +msgstr "" -#: git-bisect.sh:292 +#: git-bisect.sh:165 msgid "bisect run success" msgstr "bisect run выполнен успешно" -#: git-bisect.sh:300 +#: git-bisect.sh:173 msgid "We are not bisecting." msgstr "Вы сейчас не в процессе бинарного поиска." @@ -20363,136 +22868,46 @@ msgstr "Попытка простого слияния с $pretty_name" msgid "Simple merge did not work, trying automatic merge." msgstr "Простое слияние не удалось, попытка автоматического слияния." -#: git-legacy-stash.sh:220 -msgid "Cannot remove temporary index (can't happen)" -msgstr "Не удалось удалить временный индекс (не должно случаться)" - -#: git-legacy-stash.sh:271 -#, sh-format -msgid "Cannot update $ref_stash with $w_commit" -msgstr "Не удалось обновить $ref_stash с помощью $w_commit" - -#: git-legacy-stash.sh:323 -#, sh-format -msgid "error: unknown option for 'stash push': $option" -msgstr "ошибка: неизвестный параметр для «stash push»: $option" - -#: git-legacy-stash.sh:355 -#, sh-format -msgid "Saved working directory and index state $stash_msg" -msgstr "Рабочий каталог и состояние индекса сохранены $stash_msg" - -#: git-legacy-stash.sh:535 -#, sh-format -msgid "unknown option: $opt" -msgstr "неизвестная опция: $opt" - -#: git-legacy-stash.sh:555 -#, sh-format -msgid "Too many revisions specified: $REV" -msgstr "Передано слишком много редакций: $REV" - -#: git-legacy-stash.sh:570 -#, sh-format -msgid "$reference is not a valid reference" -msgstr "$reference не является действительной ссылкой" - -#: git-legacy-stash.sh:598 -#, sh-format -msgid "'$args' is not a stash-like commit" -msgstr "«$args» не похоже на коммит со спрятанными изменениями" - -#: git-legacy-stash.sh:609 -#, sh-format -msgid "'$args' is not a stash reference" -msgstr "«$args» не является ссылкой на спрятанные изменения" - -#: git-legacy-stash.sh:617 -msgid "unable to refresh index" -msgstr "не удалось обновить индекс" - -#: git-legacy-stash.sh:621 -msgid "Cannot apply a stash in the middle of a merge" -msgstr "Нельзя применить спрятанные изменения во время выполнения слияния" - -#: git-legacy-stash.sh:629 -msgid "Conflicts in index. Try without --index." -msgstr "Конфликты в индексе. Попробуйте без --index." - -#: git-legacy-stash.sh:631 -msgid "Could not save index tree" -msgstr "Не удалось сохранить дерево индекса" - -#: git-legacy-stash.sh:640 -msgid "Could not restore untracked files from stash entry" -msgstr "Невозможно восстановить неотслеживаемые файлы из спрятанных изменений" - -#: git-legacy-stash.sh:665 -msgid "Cannot unstage modified files" -msgstr "Невозможно убрать из индекса измененные файлы" - -#: git-legacy-stash.sh:703 -#, sh-format -msgid "Dropped ${REV} ($s)" -msgstr "Отброшено ${REV} ($s)" - -#: git-legacy-stash.sh:704 -#, sh-format -msgid "${REV}: Could not drop stash entry" -msgstr "${REV}: Не удалось отбросить запись из спрятанных изменений" - -#: git-legacy-stash.sh:791 -msgid "(To restore them type \"git stash apply\")" -msgstr "(Чтобы восстановить их, наберите «git stash apply»)" - -#: git-submodule.sh:200 +#: git-submodule.sh:179 msgid "Relative path can only be used from the toplevel of the working tree" msgstr "Относительный путь можно использовать только находясь на вершине рабочего каталога" -#: git-submodule.sh:210 +#: git-submodule.sh:189 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "URL репозитория: «$repo» должен быть абсолютным или начинаться с ./|../" -#: git-submodule.sh:229 +#: git-submodule.sh:208 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "«$sm_path» уже содержится в индексе" -#: git-submodule.sh:232 +#: git-submodule.sh:211 #, sh-format msgid "'$sm_path' already exists in the index and is not a submodule" msgstr "«$sm_path» уже содержится в индексе и не является подмодулем" -#: git-submodule.sh:239 +#: git-submodule.sh:218 #, sh-format msgid "'$sm_path' does not have a commit checked out" msgstr "" -#: git-submodule.sh:245 -#, sh-format -msgid "" -"The following path is ignored by one of your .gitignore files:\n" -"$sm_path\n" -"Use -f if you really want to add it." -msgstr "Следующие пути игнорируются одним из ваших файлов .gitignore:\n$sm_path\nИспользуйте опцию -f, если вы действительно хотите его добавить." - -#: git-submodule.sh:268 +#: git-submodule.sh:249 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "Добавляю существующий репозиторий из «$sm_path» в индекс" -#: git-submodule.sh:270 +#: git-submodule.sh:251 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "«$sm_path» уже существует и не является действительным репозиторием git" -#: git-submodule.sh:278 +#: git-submodule.sh:259 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "Каталог git для «$sm_name» найден локально на внешних репозиториях:" -#: git-submodule.sh:280 +#: git-submodule.sh:261 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from\n" @@ -20501,137 +22916,124 @@ msgid "" "or you are unsure what this means choose another name with the '--name' option." msgstr "Если вы хотите повторно использовать локальный каталог git вместо повторного клонирования из\n $realrepo\nто используйте параметр «--force». Если же локальный каталог git не является нужным репозиторием или если вы не уверены, что это значит, то укажите другое имя для подмодуля с помощью параметра «--name»." -#: git-submodule.sh:286 +#: git-submodule.sh:267 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "Восстановление локального каталога git для подмодуля «$sm_name»." -#: git-submodule.sh:298 +#: git-submodule.sh:279 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "Не удалось переключиться на состояние у подмодуля «$sm_path»" -#: git-submodule.sh:303 +#: git-submodule.sh:284 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "Сбой добавления подмодуля «$sm_path»" -#: git-submodule.sh:312 +#: git-submodule.sh:293 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "Не удалось зарегистрировать подмодуль «$sm_path»" -#: git-submodule.sh:573 +#: git-submodule.sh:568 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "Не удалось найти текущую редакцию для подмодуля по пути «$displaypath»" -#: git-submodule.sh:583 +#: git-submodule.sh:578 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "Не удалось выполнить извлечение для подмодуля по пути «$sm_path»" -#: git-submodule.sh:588 +#: git-submodule.sh:583 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " "'$sm_path'" msgstr "Не удалось найти текущую редакцию ${remote_name}/${branch} для подмодуля по пути «$sm_path»" -#: git-submodule.sh:606 +#: git-submodule.sh:601 #, sh-format msgid "" "Unable to fetch in submodule path '$displaypath'; trying to directly fetch " "$sha1:" msgstr "" -#: git-submodule.sh:612 +#: git-submodule.sh:607 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " "Direct fetching of that commit failed." msgstr "Получен по пути подмодуля «$displaypath», но не содержит $sha1. Сбой при прямом получении коммита." -#: git-submodule.sh:619 +#: git-submodule.sh:614 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "Не удалось переключиться на состояние «$sha1» для подмодуля по пути «$displaypath»" -#: git-submodule.sh:620 +#: git-submodule.sh:615 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "Подмодуль по пути «$displaypath»: забрано состояние «$sha1»" -#: git-submodule.sh:624 +#: git-submodule.sh:619 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "Не удалось переместить «$sha1» для подмодуля по пути «$displaypath»" -#: git-submodule.sh:625 +#: git-submodule.sh:620 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "Подмодуль по пути «$displaypath»: перемещен над «$sha1»" -#: git-submodule.sh:630 +#: git-submodule.sh:625 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "Не удалось выполнить слияние с «$sha1» для подмодуля по пути «$displaypath»" -#: git-submodule.sh:631 +#: git-submodule.sh:626 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "Подмодуль по пути «$displaypath»: слито с «$sha1»" -#: git-submodule.sh:636 +#: git-submodule.sh:631 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "Сбой выполнения «$command $sha1» для подмодуля по пути «$displaypath»" -#: git-submodule.sh:637 +#: git-submodule.sh:632 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "Подмодуль по пути «$displaypath»: «$command $sha1»" -#: git-submodule.sh:668 +#: git-submodule.sh:663 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "Не удалось выполнить рекурсивно для подмодуля по пути «$displaypath»" -#: git-submodule.sh:830 -msgid "The --cached option cannot be used with the --files option" -msgstr "Опцию --cached нельзя использовать одновременно с опцией --files" - -#: git-submodule.sh:882 -#, sh-format -msgid "unexpected mode $mod_dst" -msgstr "неизвестный режим $mod_dst" +#: git-rebase--preserve-merges.sh:109 +msgid "Applied autostash." +msgstr "Применены автоматически спрятанные изменения." -#: git-submodule.sh:902 +#: git-rebase--preserve-merges.sh:112 #, sh-format -msgid " Warn: $display_name doesn't contain commit $sha1_src" -msgstr " Предупреждение: $display_name не содержит коммит $sha1_src" +msgid "Cannot store $stash_sha1" +msgstr "Не удалось сохранить $stash_sha1" -#: git-submodule.sh:905 -#, sh-format -msgid " Warn: $display_name doesn't contain commit $sha1_dst" -msgstr " Предупреждение: $display_name не содержит коммит $sha1_dst" - -#: git-submodule.sh:908 -#, sh-format -msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" -msgstr " Предупреждение: $display_name не содержит коммиты $sha1_src и $sha1_dst" - -#: git-parse-remote.sh:89 -#, sh-format -msgid "See git-${cmd}(1) for details." -msgstr "Для дополнительной информации, смотрите git-${cmd}(1)." +#: git-rebase--preserve-merges.sh:113 +msgid "" +"Applying autostash resulted in conflicts.\n" +"Your changes are safe in the stash.\n" +"You can run \"git stash pop\" or \"git stash drop\" at any time.\n" +msgstr "Применение автоматически спрятанных изменений вызвало конфликты.\nВаши изменения спрятаны и в безопасности.\nВы можете выполнить «git stash pop» или «git stash drop» в любой момент.\n" -#: git-rebase--preserve-merges.sh:136 +#: git-rebase--preserve-merges.sh:191 #, sh-format msgid "Rebasing ($new_count/$total)" msgstr "Перемещение ($new_count/$total)" -#: git-rebase--preserve-merges.sh:152 +#: git-rebase--preserve-merges.sh:197 msgid "" "\n" "Commands:\n" @@ -20652,7 +23054,7 @@ msgid "" "These lines can be re-ordered; they are executed from top to bottom.\n" msgstr "\nКоманды:\np, pick <коммит> = использовать коммит\nr, reword <коммит> = использовать коммит, но изменить сообщение коммита\ne, edit <коммит> = использовать коммит, но остановиться для исправления\ns, squash <коммит> = использовать коммит, но объединить с предыдущим коммитом\nf, fixup <коммит> = как «squash», но пропустить сообщение коммита\nx, exec <команда> = выполнить команду (остаток строки) с помощью командной оболочки\nd, drop <коммит> = удалить коммит\nl, label <метка> = дать имя текущему HEAD\nt, reset <метка> = сбросить HEAD к указанной метке\nm, merge [-C <коммит> | -c <коммит>] <метка> [# <строка>]\n. создать слияние используя сообщение коммита оригинального\n. слияния (или использовать указанную строку, если оригинальное\n. слияние не указано). Используйте -c <коммит> чтобы изменить\n. сообщение коммита.\n\nЭти строки можно перемещать; они будут выполнены сверху вниз.\n" -#: git-rebase--preserve-merges.sh:215 +#: git-rebase--preserve-merges.sh:260 #, sh-format msgid "" "You can amend the commit now, with\n" @@ -20664,61 +23066,61 @@ msgid "" "\tgit rebase --continue" msgstr "Теперь вы можете исправить коммит с помощью\n\n\tgit commit --amend $gpg_sign_opt_quoted\n\nКак только вы будете довольны результатом, запустите\n\n\tgit rebase --continue" -#: git-rebase--preserve-merges.sh:240 +#: git-rebase--preserve-merges.sh:285 #, sh-format msgid "$sha1: not a commit that can be picked" msgstr "$sha1: не является коммитом, который можно взять" -#: git-rebase--preserve-merges.sh:279 +#: git-rebase--preserve-merges.sh:324 #, sh-format msgid "Invalid commit name: $sha1" msgstr "Недопустимое имя коммита: $sha1" -#: git-rebase--preserve-merges.sh:309 +#: git-rebase--preserve-merges.sh:354 msgid "Cannot write current commit's replacement sha1" msgstr "Не удалось записать замену sha1 текущего коммита" -#: git-rebase--preserve-merges.sh:360 +#: git-rebase--preserve-merges.sh:405 #, sh-format msgid "Fast-forward to $sha1" msgstr "Перемотка вперед до $sha1" -#: git-rebase--preserve-merges.sh:362 +#: git-rebase--preserve-merges.sh:407 #, sh-format msgid "Cannot fast-forward to $sha1" msgstr "Не удалось перемотать вперед до $sha1" -#: git-rebase--preserve-merges.sh:371 +#: git-rebase--preserve-merges.sh:416 #, sh-format msgid "Cannot move HEAD to $first_parent" msgstr "Не удалось переместить HEAD на $first_parent" -#: git-rebase--preserve-merges.sh:376 +#: git-rebase--preserve-merges.sh:421 #, sh-format msgid "Refusing to squash a merge: $sha1" msgstr "Нельзя уплотнить слияние: $sha1" -#: git-rebase--preserve-merges.sh:394 +#: git-rebase--preserve-merges.sh:439 #, sh-format msgid "Error redoing merge $sha1" msgstr "Ошибка при повторении слияния $sha1" -#: git-rebase--preserve-merges.sh:403 +#: git-rebase--preserve-merges.sh:448 #, sh-format msgid "Could not pick $sha1" msgstr "Не удалось взять $sha1" -#: git-rebase--preserve-merges.sh:412 +#: git-rebase--preserve-merges.sh:457 #, sh-format msgid "This is the commit message #${n}:" msgstr "Это сообщение коммита номер #${n}:" -#: git-rebase--preserve-merges.sh:417 +#: git-rebase--preserve-merges.sh:462 #, sh-format msgid "The commit message #${n} will be skipped:" msgstr "Сообщение коммита номер #${n} будет пропущено:" -#: git-rebase--preserve-merges.sh:428 +#: git-rebase--preserve-merges.sh:473 #, sh-format msgid "This is a combination of $count commit." msgid_plural "This is a combination of $count commits." @@ -20727,22 +23129,22 @@ msgstr[1] "Это объединение $count коммитов" msgstr[2] "Это объединение $count коммитов" msgstr[3] "Это объединение $count коммитов" -#: git-rebase--preserve-merges.sh:437 +#: git-rebase--preserve-merges.sh:482 #, sh-format msgid "Cannot write $fixup_msg" msgstr "Не удалось записать $fixup_msg" -#: git-rebase--preserve-merges.sh:440 +#: git-rebase--preserve-merges.sh:485 msgid "This is a combination of 2 commits." msgstr "Это объединение 2 коммитов" -#: git-rebase--preserve-merges.sh:481 git-rebase--preserve-merges.sh:524 -#: git-rebase--preserve-merges.sh:527 +#: git-rebase--preserve-merges.sh:526 git-rebase--preserve-merges.sh:569 +#: git-rebase--preserve-merges.sh:572 #, sh-format msgid "Could not apply $sha1... $rest" msgstr "Не удалось применить $sha1… $rest" -#: git-rebase--preserve-merges.sh:556 +#: git-rebase--preserve-merges.sh:601 #, sh-format msgid "" "Could not amend commit after successfully picking $sha1... $rest\n" @@ -20751,31 +23153,31 @@ msgid "" "you are able to reword the commit." msgstr "Не удалось исправить коммит после успешного перехода на $sha1… $rest\nЭто произошло, скорее всего, из-за пустого сообщения коммита или из-за перехватчика перед коммитом. Если же это произошло из-за перехватчика перед коммитом, то вам нужно решить с ним проблему и повторить попытку снова." -#: git-rebase--preserve-merges.sh:571 +#: git-rebase--preserve-merges.sh:616 #, sh-format msgid "Stopped at $sha1_abbrev... $rest" msgstr "Остановлено на $sha1_abbrev… $rest" -#: git-rebase--preserve-merges.sh:586 +#: git-rebase--preserve-merges.sh:631 #, sh-format msgid "Cannot '$squash_style' without a previous commit" msgstr "Нельзя сделать «$squash_style» без указания предыдущего коммита" -#: git-rebase--preserve-merges.sh:628 +#: git-rebase--preserve-merges.sh:673 #, sh-format msgid "Executing: $rest" msgstr "Выполнение: $rest" -#: git-rebase--preserve-merges.sh:636 +#: git-rebase--preserve-merges.sh:681 #, sh-format msgid "Execution failed: $rest" msgstr "Не удалось выполнить: $rest" -#: git-rebase--preserve-merges.sh:638 +#: git-rebase--preserve-merges.sh:683 msgid "and made changes to the index and/or the working tree" msgstr "и были сделаны изменения в индексе и/или в рабочем каталоге" -#: git-rebase--preserve-merges.sh:640 +#: git-rebase--preserve-merges.sh:685 msgid "" "You can fix the problem, and then run\n" "\n" @@ -20783,7 +23185,7 @@ msgid "" msgstr "Вы можете исправить ошибку, а затем запустить\n\n\tgit rebase --continue" #. TRANSLATORS: after these lines is a command to be issued by the user -#: git-rebase--preserve-merges.sh:653 +#: git-rebase--preserve-merges.sh:698 #, sh-format msgid "" "Execution succeeded: $rest\n" @@ -20793,25 +23195,25 @@ msgid "" "\tgit rebase --continue" msgstr "Успешное выполнение: $rest\nно остались изменения в индексе и/или в рабочем каталоге\nСделайте коммит или спрячьте ваши изменения, а затем выполните\n\n\tgit rebase --continue" -#: git-rebase--preserve-merges.sh:664 +#: git-rebase--preserve-merges.sh:709 #, sh-format msgid "Unknown command: $command $sha1 $rest" msgstr "Неопознанная команда: $command $sha1 $rest" -#: git-rebase--preserve-merges.sh:665 +#: git-rebase--preserve-merges.sh:710 msgid "Please fix this using 'git rebase --edit-todo'." msgstr "Пожалуйста исправьте это с помощью «git rebase --edit-todo»." -#: git-rebase--preserve-merges.sh:700 +#: git-rebase--preserve-merges.sh:745 #, sh-format msgid "Successfully rebased and updated $head_name." msgstr "Успешно перемещён и обновлён $head_name." -#: git-rebase--preserve-merges.sh:757 +#: git-rebase--preserve-merges.sh:802 msgid "Could not remove CHERRY_PICK_HEAD" msgstr "Не удалось удалить CHERRY_PICK_HEAD" -#: git-rebase--preserve-merges.sh:762 +#: git-rebase--preserve-merges.sh:807 #, sh-format msgid "" "You have staged changes in your working tree.\n" @@ -20829,43 +23231,43 @@ msgid "" " git rebase --continue\n" msgstr "У вас имеются проиндексированные изменения в рабочем каталоге.\nЕсли эти изменения должны быть объеденены с предыдущим коммитом, то запустите:\n\n git commit --amend $gpg_sign_opt_quoted\n\nЕсли же они должны быть помещены в новый коммит, то запустите:\n\n git commit $gpg_sign_opt_quoted\n\nВ любом случае, после того как вы закончите, продолжить перемещение можно выполнив:\n\n git rebase --continue\n" -#: git-rebase--preserve-merges.sh:779 +#: git-rebase--preserve-merges.sh:824 msgid "Error trying to find the author identity to amend commit" msgstr "Произошла ошибка при поиске автора для исправления коммита" -#: git-rebase--preserve-merges.sh:784 +#: git-rebase--preserve-merges.sh:829 msgid "" "You have uncommitted changes in your working tree. Please commit them\n" "first and then run 'git rebase --continue' again." msgstr "У вас имеются незакоммиченные изменения в рабочем каталоге. Сделайте коммит, а затем запустите «git rebase --continue» снова." -#: git-rebase--preserve-merges.sh:789 git-rebase--preserve-merges.sh:793 +#: git-rebase--preserve-merges.sh:834 git-rebase--preserve-merges.sh:838 msgid "Could not commit staged changes." msgstr "Не удалось закоммитить проиндексированные изменения." -#: git-rebase--preserve-merges.sh:824 git-rebase--preserve-merges.sh:910 +#: git-rebase--preserve-merges.sh:869 git-rebase--preserve-merges.sh:955 msgid "Could not execute editor" msgstr "Не удалось запустить редактор" -#: git-rebase--preserve-merges.sh:845 +#: git-rebase--preserve-merges.sh:890 #, sh-format msgid "Could not checkout $switch_to" msgstr "Не удалось перейти на версию $switch_to" -#: git-rebase--preserve-merges.sh:852 +#: git-rebase--preserve-merges.sh:897 msgid "No HEAD?" msgstr "Нет указателя HEAD?" -#: git-rebase--preserve-merges.sh:853 +#: git-rebase--preserve-merges.sh:898 #, sh-format msgid "Could not create temporary $state_dir" msgstr "Не удалось создать временный каталог $state_dir" -#: git-rebase--preserve-merges.sh:856 +#: git-rebase--preserve-merges.sh:901 msgid "Could not mark as interactive" msgstr "Не удалось пометить как интерактивный" -#: git-rebase--preserve-merges.sh:888 +#: git-rebase--preserve-merges.sh:933 #, sh-format msgid "Rebase $shortrevisions onto $shortonto ($todocount command)" msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" @@ -20874,7 +23276,11 @@ msgstr[1] "Перемещение $shortrevisions над $shortonto ($todocount msgstr[2] "Перемещение $shortrevisions над $shortonto ($todocount команд)" msgstr[3] "Перемещение $shortrevisions над $shortonto ($todocount команд)" -#: git-rebase--preserve-merges.sh:942 git-rebase--preserve-merges.sh:947 +#: git-rebase--preserve-merges.sh:945 +msgid "Note that empty commits are commented out" +msgstr "Заметьте, что пустые коммиты закомментированны" + +#: git-rebase--preserve-merges.sh:987 git-rebase--preserve-merges.sh:992 msgid "Could not init rewritten commits" msgstr "Не удалось инициализировать перезаписанные коммиты" @@ -20936,59 +23342,12 @@ msgid "Unable to determine absolute path of git directory" msgstr "Не удалось определить абсолютный путь к каталогу git" #. TRANSLATORS: you can adjust this to align "git add -i" status menu -#: git-add--interactive.perl:196 +#: git-add--interactive.perl:212 #, perl-format msgid "%12s %12s %s" msgstr "%12s %12s %s" -#: git-add--interactive.perl:197 -msgid "staged" -msgstr "в индексе" - -#: git-add--interactive.perl:197 -msgid "unstaged" -msgstr "не в индексе" - -#: git-add--interactive.perl:253 git-add--interactive.perl:278 -msgid "binary" -msgstr "двоичный" - -#: git-add--interactive.perl:262 git-add--interactive.perl:316 -msgid "nothing" -msgstr "ничего" - -#: git-add--interactive.perl:298 git-add--interactive.perl:313 -msgid "unchanged" -msgstr "нет изменений" - -#: git-add--interactive.perl:609 -#, perl-format -msgid "added %d path\n" -msgid_plural "added %d paths\n" -msgstr[0] "добавлен %d путь\n" -msgstr[1] "добавлено %d пути\n" -msgstr[2] "добавлено %d путей\n" -msgstr[3] "добавлено %d пути\n" - -#: git-add--interactive.perl:612 -#, perl-format -msgid "updated %d path\n" -msgid_plural "updated %d paths\n" -msgstr[0] "обновлён %d путь\n" -msgstr[1] "обновлено %d пути\n" -msgstr[2] "обновлено %d путей\n" -msgstr[3] "обновлено %d пути\n" - -#: git-add--interactive.perl:615 -#, perl-format -msgid "reverted %d path\n" -msgid_plural "reverted %d paths\n" -msgstr[0] "обращены изменения %d пути\n" -msgstr[1] "обращены изменения %d путей\n" -msgstr[2] "обращены изменения %d путей\n" -msgstr[3] "обращены изменения %d путей\n" - -#: git-add--interactive.perl:618 +#: git-add--interactive.perl:632 #, perl-format msgid "touched %d path\n" msgid_plural "touched %d paths\n" @@ -20997,67 +23356,44 @@ msgstr[1] "тронуты %d пути\n" msgstr[2] "тронуты %d путей\n" msgstr[3] "тронуты %d пути\n" -#: git-add--interactive.perl:627 -msgid "Update" -msgstr "Обновить" - -#: git-add--interactive.perl:639 -msgid "Revert" -msgstr "Обратить изменения" - -#: git-add--interactive.perl:662 -#, perl-format -msgid "note: %s is untracked now.\n" -msgstr "примечание: %s теперь неотслеживаемый.\n" - -#: git-add--interactive.perl:673 -msgid "Add untracked" -msgstr "Добавить неотслеживаемый" - -#: git-add--interactive.perl:679 -msgid "No untracked files.\n" -msgstr "Нет неотслеживаемых файлов.\n" - -#: git-add--interactive.perl:1033 +#: git-add--interactive.perl:1056 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for staging." msgstr "Если патч применяется без ошибок, то изменённый блок будет сразу помечен для индексирования." -#: git-add--interactive.perl:1036 +#: git-add--interactive.perl:1059 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for stashing." msgstr "Если патч применяется без ошибок, то изменённый блок будет сразу помечен для прятанья." -#: git-add--interactive.perl:1039 +#: git-add--interactive.perl:1062 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for unstaging." msgstr "Если патч применяется без ошибок, то изменённый блок будет сразу помечен для убирания из индекса." -#: git-add--interactive.perl:1042 git-add--interactive.perl:1051 +#: git-add--interactive.perl:1065 git-add--interactive.perl:1074 +#: git-add--interactive.perl:1080 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for applying." msgstr "Если патч применяется без ошибок, то изменённый блок будет сразу помечен для применения." -#: git-add--interactive.perl:1045 git-add--interactive.perl:1048 +#: git-add--interactive.perl:1068 git-add--interactive.perl:1071 +#: git-add--interactive.perl:1077 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for discarding." msgstr "Если патч применяется без ошибок, то изменённый блок будет сразу помечен для отмены изменений." -#: git-add--interactive.perl:1085 +#: git-add--interactive.perl:1114 #, perl-format msgid "failed to open hunk edit file for writing: %s" msgstr "не удалось открыть файл редактирования блока изменений для записи: %s" -#: git-add--interactive.perl:1086 -msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" -msgstr "Ручной режим редактирования блока изменений — смотрите ниже для небольшого руководства.\n" - -#: git-add--interactive.perl:1092 +#: git-add--interactive.perl:1121 #, perl-format msgid "" "---\n" @@ -21066,32 +23402,12 @@ msgid "" "Lines starting with %s will be removed.\n" msgstr "---\nЧтобы удалить «%s» строки, сделайте их ' ' строками (контекст).\nЧтобы удалить «%s» строки, удалите их.\nСтроки, начинающиеся с %s будут удалены.\n" -#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. -#: git-add--interactive.perl:1100 -msgid "" -"If it does not apply cleanly, you will be given an opportunity to\n" -"edit again. If all lines of the hunk are removed, then the edit is\n" -"aborted and the hunk is left unchanged.\n" -msgstr "Если патч не применяется без ошибок, вам будет дана\nвозможность изменить его снова. Если все строки блока\nизменений удалены, то редактирование будет отменено\nи блок останется без изменений.\n" - -#: git-add--interactive.perl:1114 +#: git-add--interactive.perl:1143 #, perl-format msgid "failed to open hunk edit file for reading: %s" msgstr "не удалось открыть файл редактирования блока изменений для чтения: %s" -#. TRANSLATORS: do not translate [y/n] -#. The program will only accept that input -#. at this point. -#. Consider translating (saying "no" discards!) as -#. (saying "n" for "no" discards!) if the translation -#. of the word "no" does not start with n. -#: git-add--interactive.perl:1213 -msgid "" -"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]?" -" " -msgstr "Изменённый вами блок не применяется. Редактировать снова (ответ «y» означает «нет»!) [y/n]? " - -#: git-add--interactive.perl:1222 +#: git-add--interactive.perl:1251 msgid "" "y - stage this hunk\n" "n - do not stage this hunk\n" @@ -21100,7 +23416,7 @@ msgid "" "d - do not stage this hunk or any of the later hunks in the file" msgstr "y - проиндексировать блок изменений\nn - не индексировать этот блок изменений\nq - выход; не индексировать этот и последующие блоки\na - проиндексировать этот и все последующие блоки файла\nd - не индексировать этот и последующие блоки файла" -#: git-add--interactive.perl:1228 +#: git-add--interactive.perl:1257 msgid "" "y - stash this hunk\n" "n - do not stash this hunk\n" @@ -21109,7 +23425,7 @@ msgid "" "d - do not stash this hunk or any of the later hunks in the file" msgstr "y - спрятать изменения блока\nq - выход; не прятать изменения этого и последующих блоков\na - спрятать этот и все последующие блоки файла\nd - не прятать этот и последующие блоки файла" -#: git-add--interactive.perl:1234 +#: git-add--interactive.perl:1263 msgid "" "y - unstage this hunk\n" "n - do not unstage this hunk\n" @@ -21118,7 +23434,7 @@ msgid "" "d - do not unstage this hunk or any of the later hunks in the file" msgstr "y - убрать из индекса этот блок изменений\nn - не убирать из индекса этот блок изменений\nq - выход; не убирать из индекса этот и последующие блоки\na - убрать из индекса этот и все последующие блоки файла\nd - не убирать из индекса этот и последующие блоки файла" -#: git-add--interactive.perl:1240 +#: git-add--interactive.perl:1269 msgid "" "y - apply this hunk to index\n" "n - do not apply this hunk to index\n" @@ -21127,7 +23443,7 @@ msgid "" "d - do not apply this hunk or any of the later hunks in the file" msgstr "y - применить блок изменений к индексу\nn - не применять этот блок изменений к индексу\nq - выход; не применять этот и последующие блоки\na - применить этот блок и все последующие блоки файла\nd - не применять этот и последующие блоки файла" -#: git-add--interactive.perl:1246 +#: git-add--interactive.perl:1275 git-add--interactive.perl:1293 msgid "" "y - discard this hunk from worktree\n" "n - do not discard this hunk from worktree\n" @@ -21136,7 +23452,7 @@ msgid "" "d - do not discard this hunk or any of the later hunks in the file" msgstr "y - отменить изменения этого блока в рабочем каталоге\nn - не отменять изменения этого блока в рабочем каталоге\nq - выход; не отменять изменения этого блока и всех последующих\na - отменить изменения этого и всех последующих блоков файла\nd - не отменять изменения этого и всех последующих блоков файла" -#: git-add--interactive.perl:1252 +#: git-add--interactive.perl:1281 msgid "" "y - discard this hunk from index and worktree\n" "n - do not discard this hunk from index and worktree\n" @@ -21145,7 +23461,7 @@ msgid "" "d - do not discard this hunk or any of the later hunks in the file" msgstr "y - отменить изменения этого блока в индексе и рабочем каталоге\nn - не отменять изменения этого блока в индексе и рабочем каталоге\nq - выход; не отменять изменения этого блока и всех последующих\na - отменить изменения этого и всех последующих блоков файла\nd - не отменять изменения этого и всех последующих блоков файла" -#: git-add--interactive.perl:1258 +#: git-add--interactive.perl:1287 msgid "" "y - apply this hunk to index and worktree\n" "n - do not apply this hunk to index and worktree\n" @@ -21154,7 +23470,16 @@ msgid "" "d - do not apply this hunk or any of the later hunks in the file" msgstr "y - применить блок изменений к индексу и рабочему каталогу\nn - не применять этот блок изменений к индексу и рабочему каталогу\nq - выход; не применять этот и последующие блоки\na - применить этот блок и все последующие блоки файла\nd - не применять этот и последующие блоки файла" -#: git-add--interactive.perl:1273 +#: git-add--interactive.perl:1299 +msgid "" +"y - apply this hunk to worktree\n" +"n - do not apply this hunk to worktree\n" +"q - quit; do not apply this hunk or any of the remaining ones\n" +"a - apply this hunk and all later hunks in the file\n" +"d - do not apply this hunk or any of the later hunks in the file" +msgstr "" + +#: git-add--interactive.perl:1314 msgid "" "g - select a hunk to go to\n" "/ - search for a hunk matching the given regex\n" @@ -21167,158 +23492,45 @@ msgid "" "? - print help\n" msgstr "g - выбрать блок изменений на который нужно перейти\n/ - поиск блока изменений с помощью регулярного выражения\nj - не принимать решение по этому блоку, перейти на следующий без решения\nJ - не принимать решение по этому блоку, перейти на следующий\nk - не принимать решение по этому блоку, перейти на предыдущий без решения\nK - не принимать решение по этому блоку, перейти на предыдущий\ns - разделить текущий блок на блоки меньшего размера\ne - вручную отредактировать текущий блок\n? - вывести справку\n" -#: git-add--interactive.perl:1304 +#: git-add--interactive.perl:1345 msgid "The selected hunks do not apply to the index!\n" msgstr "Выбранные блоки не применяются без ошибок к индексу!\n" -#: git-add--interactive.perl:1305 -msgid "Apply them to the worktree anyway? " -msgstr "Все равно применить их к рабочему каталогу?" - -#: git-add--interactive.perl:1308 -msgid "Nothing was applied.\n" -msgstr "Ничего не применено.\n" - -#: git-add--interactive.perl:1319 +#: git-add--interactive.perl:1360 #, perl-format msgid "ignoring unmerged: %s\n" msgstr "игнорирую не слитое: %s\n" -#: git-add--interactive.perl:1328 -msgid "Only binary files changed.\n" -msgstr "Только изменения двоичных файлов.\n" - -#: git-add--interactive.perl:1330 -msgid "No changes.\n" -msgstr "Нет изменений.\n" - -#: git-add--interactive.perl:1338 -msgid "Patch update" -msgstr "Обновление патча" - -#: git-add--interactive.perl:1390 -#, perl-format -msgid "Stage mode change [y,n,q,a,d%s,?]? " -msgstr "Проиндексировать изменение режима доступа [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1391 +#: git-add--interactive.perl:1479 #, perl-format -msgid "Stage deletion [y,n,q,a,d%s,?]? " -msgstr "Проиндексировать удаление [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1392 -#, perl-format -msgid "Stage this hunk [y,n,q,a,d%s,?]? " -msgstr "Проиндексировать этот блок изменений [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1395 -#, perl-format -msgid "Stash mode change [y,n,q,a,d%s,?]? " -msgstr "Спрятать изменение режима доступа [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1396 -#, perl-format -msgid "Stash deletion [y,n,q,a,d%s,?]? " -msgstr "Спрятать удаление файла [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1397 -#, perl-format -msgid "Stash this hunk [y,n,q,a,d%s,?]? " -msgstr "Спрятать этот блок изменений [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1400 -#, perl-format -msgid "Unstage mode change [y,n,q,a,d%s,?]? " -msgstr "Убрать изменения режима доступа из индекса [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1401 -#, perl-format -msgid "Unstage deletion [y,n,q,a,d%s,?]? " -msgstr "Убрать удаление из индекса [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1402 -#, perl-format -msgid "Unstage this hunk [y,n,q,a,d%s,?]? " -msgstr "Убрать из индекса этот блок измений [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1405 -#, perl-format -msgid "Apply mode change to index [y,n,q,a,d%s,?]? " -msgstr "Применить изменение режима доступа к индексу [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1406 -#, perl-format -msgid "Apply deletion to index [y,n,q,a,d%s,?]? " -msgstr "Применить удаление к индексу [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1407 -#, perl-format -msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " -msgstr "Применить этот блок к индексу [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1410 -#, perl-format -msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " -msgstr "Отменить изменения режима доступа в рабочем каталоге [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1411 -#, perl-format -msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " -msgstr "Отменить удаление в рабочем каталоге [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1412 -#, perl-format -msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " -msgstr "Отменить изменения этого блока в рабочем каталоге [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1415 -#, perl-format -msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " -msgstr "Отменить изменения режима доступа в индексе и рабочем каталоге [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1416 -#, perl-format -msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " -msgstr "Отменить удаление в индексе и рабочем каталоге [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1417 -#, perl-format -msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " -msgstr "Отменить изменения этого блока в индексе и рабочем каталоге [y,n,q,a,d%s,?]? " +msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? " +msgstr "" -#: git-add--interactive.perl:1420 +#: git-add--interactive.perl:1480 #, perl-format -msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " -msgstr "Применить изменения режима доступа к индексу и рабочему каталогу [y,n,q,a,d%s,?]? " +msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " +msgstr "" -#: git-add--interactive.perl:1421 +#: git-add--interactive.perl:1481 #, perl-format -msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " -msgstr "Применить удаление к индексу и рабочему каталогу [y,n,q,a,d%s,?]? " +msgid "Apply addition to worktree [y,n,q,a,d%s,?]? " +msgstr "" -#: git-add--interactive.perl:1422 +#: git-add--interactive.perl:1482 #, perl-format -msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " -msgstr "Применить изменения этого блока к индексу и рабочему каталогу [y,n,q,a,d%s,?]? " +msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? " +msgstr "" -#: git-add--interactive.perl:1522 +#: git-add--interactive.perl:1599 msgid "No other hunks to goto\n" msgstr "" -#: git-add--interactive.perl:1529 -msgid "go to which hunk (<ret> to see more)? " -msgstr "на какой блок перейти (нажмите <ввод> чтобы увидеть еще)? " - -#: git-add--interactive.perl:1531 -msgid "go to which hunk? " -msgstr "на какой блок перейти? " - -#: git-add--interactive.perl:1540 +#: git-add--interactive.perl:1617 #, perl-format msgid "Invalid number: '%s'\n" msgstr "Неверный номер: «%s»\n" -#: git-add--interactive.perl:1545 +#: git-add--interactive.perl:1622 #, perl-format msgid "Sorry, only %d hunk available.\n" msgid_plural "Sorry, only %d hunks available.\n" @@ -21327,36 +23539,32 @@ msgstr[1] "Простите, но только %d блока изменений msgstr[2] "Простите, но только %d блоков изменений доступно.\n" msgstr[3] "Простите, но только %d блока изменений доступно.\n" -#: git-add--interactive.perl:1571 +#: git-add--interactive.perl:1657 msgid "No other hunks to search\n" msgstr "" -#: git-add--interactive.perl:1575 -msgid "search for regex? " -msgstr "искать с помощью регулярного выражения? " - -#: git-add--interactive.perl:1588 +#: git-add--interactive.perl:1674 #, perl-format msgid "Malformed search regexp %s: %s\n" msgstr "Регулярное выражение для поиска в неверном формате %s: %s\n" -#: git-add--interactive.perl:1598 +#: git-add--interactive.perl:1684 msgid "No hunk matches the given pattern\n" msgstr "Не найдены блоки, которые соответствуют указанному шаблону\n" -#: git-add--interactive.perl:1610 git-add--interactive.perl:1632 +#: git-add--interactive.perl:1696 git-add--interactive.perl:1718 msgid "No previous hunk\n" msgstr "Нет предыдущего блока\n" -#: git-add--interactive.perl:1619 git-add--interactive.perl:1638 +#: git-add--interactive.perl:1705 git-add--interactive.perl:1724 msgid "No next hunk\n" msgstr "Не следующего блока\n" -#: git-add--interactive.perl:1644 +#: git-add--interactive.perl:1730 msgid "Sorry, cannot split this hunk\n" msgstr "" -#: git-add--interactive.perl:1650 +#: git-add--interactive.perl:1736 #, perl-format msgid "Split into %d hunk.\n" msgid_plural "Split into %d hunks.\n" @@ -21365,17 +23573,13 @@ msgstr[1] "Разбито на %d блока изменений.\n" msgstr[2] "Разбито на %d блоков изменений.\n" msgstr[3] "Разбито на %d блока изменений.\n" -#: git-add--interactive.perl:1660 +#: git-add--interactive.perl:1746 msgid "Sorry, cannot edit this hunk\n" msgstr "" -#: git-add--interactive.perl:1706 -msgid "Review diff" -msgstr "Просмотреть изменения" - #. TRANSLATORS: please do not translate the command names #. 'status', 'update', 'revert', etc. -#: git-add--interactive.perl:1725 +#: git-add--interactive.perl:1811 msgid "" "status - show paths with changes\n" "update - add working tree state to the staged set of changes\n" @@ -21385,18 +23589,19 @@ msgid "" "add untracked - add contents of untracked files to the staged set of changes\n" msgstr "status - показать пути с изменениями\nupdate - добавить состояние рабочего каталога индекс\nrevert - вернуть проиндексированный набор изменений к HEAD версии\npatch - выбрать и выборочно обновить блоки\ndiff - просмотреть изменения между HEAD и индексом\nadd untracked - добавить содержимое неотслеживаемых файлов в индекс\n" -#: git-add--interactive.perl:1742 git-add--interactive.perl:1747 -#: git-add--interactive.perl:1750 git-add--interactive.perl:1757 -#: git-add--interactive.perl:1761 git-add--interactive.perl:1767 +#: git-add--interactive.perl:1828 git-add--interactive.perl:1840 +#: git-add--interactive.perl:1843 git-add--interactive.perl:1850 +#: git-add--interactive.perl:1853 git-add--interactive.perl:1860 +#: git-add--interactive.perl:1864 git-add--interactive.perl:1870 msgid "missing --" msgstr "отсутствует --" -#: git-add--interactive.perl:1763 +#: git-add--interactive.perl:1866 #, perl-format msgid "unknown --patch mode: %s" msgstr "неизвестный режим для --patch: %s" -#: git-add--interactive.perl:1769 git-add--interactive.perl:1775 +#: git-add--interactive.perl:1872 git-add--interactive.perl:1878 #, perl-format msgid "invalid argument %s, expecting --" msgstr "недопустимый аргумент %s, ожидается --" @@ -21409,65 +23614,72 @@ msgstr "локальный часовой пояс отличается от GMT msgid "local time offset greater than or equal to 24 hours\n" msgstr "локальный сдвиг времени больше или равен 24 часа\n" -#: git-send-email.perl:219 git-send-email.perl:225 +#: git-send-email.perl:223 git-send-email.perl:229 msgid "the editor exited uncleanly, aborting everything" msgstr "редактор был завершен с ошибкой, отменяю всё" -#: git-send-email.perl:302 +#: git-send-email.perl:312 #, perl-format msgid "'%s' contains an intermediate version of the email you were composing.\n" msgstr "«%s» содержит промежуточную версию письма, которое вы готовите.\n" -#: git-send-email.perl:307 +#: git-send-email.perl:317 #, perl-format msgid "'%s.final' contains the composed email.\n" msgstr "«%s.final» содержит подготовленное письмо.\n" -#: git-send-email.perl:326 +#: git-send-email.perl:410 msgid "--dump-aliases incompatible with other options\n" msgstr "--dump-aliases не совместимо с другими опциями\n" -#: git-send-email.perl:395 git-send-email.perl:656 +#: git-send-email.perl:484 +msgid "" +"fatal: found configuration options for 'sendmail'\n" +"git-send-email is configured with the sendemail.* options - note the 'e'.\n" +"Set sendemail.forbidSendmailVariables to false to disable this check.\n" +msgstr "" + +#: git-send-email.perl:489 git-send-email.perl:691 msgid "Cannot run git format-patch from outside a repository\n" msgstr "Нельзя запускать git format-patch вне репозитория\n" -#: git-send-email.perl:398 +#: git-send-email.perl:492 msgid "" "`batch-size` and `relogin` must be specified together (via command-line or " "configuration option)\n" msgstr "" -#: git-send-email.perl:470 +#: git-send-email.perl:505 #, perl-format msgid "Unknown --suppress-cc field: '%s'\n" msgstr "Неизвестное поле --suppress-cc: «%s»\n" -#: git-send-email.perl:501 +#: git-send-email.perl:536 #, perl-format msgid "Unknown --confirm setting: '%s'\n" msgstr "Неизвестный параметр --confirm: «%s»\n" -#: git-send-email.perl:529 +#: git-send-email.perl:564 #, perl-format msgid "warning: sendmail alias with quotes is not supported: %s\n" msgstr "предупреждение: сокращение для sendmail с кавычками не поддерживается: %s\n" -#: git-send-email.perl:531 +#: git-send-email.perl:566 #, perl-format msgid "warning: `:include:` not supported: %s\n" msgstr "предупреждение: «:include:» не поддерживается: %s\n" -#: git-send-email.perl:533 +#: git-send-email.perl:568 #, perl-format msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" msgstr "предупреждение: перенаправление «/file» или «|pipe» не поддерживается: %s\n" -#: git-send-email.perl:538 +#: git-send-email.perl:573 #, perl-format msgid "warning: sendmail line is not recognized: %s\n" msgstr "предупреждение: строка sendmail не распознана: %s\n" -#: git-send-email.perl:622 +#: git-send-email.perl:657 #, perl-format msgid "" "File '%s' exists but it could also be the range of commits\n" @@ -21477,36 +23689,36 @@ msgid "" " * Giving --format-patch option if you mean a range.\n" msgstr "Файл «%s» существует, но это также может быть и\nдиапазоном коммитов для которых нужно сделать патчи. \nУстраните неоднозначность…\n\n * Указав \"./%s\" если вы имеете в виду имя файла; или\n * Передав опцию --format-patch если вы имеете в виду диапазон коммитов.\n" -#: git-send-email.perl:643 +#: git-send-email.perl:678 #, perl-format msgid "Failed to opendir %s: %s" msgstr "Не удалось выполнить opendir %s: %s" -#: git-send-email.perl:667 +#: git-send-email.perl:702 #, perl-format msgid "" "fatal: %s: %s\n" "warning: no patches were sent\n" msgstr "критическая ошибка: %s: %s\nпредупреждение: патчи не были отправлены\n" -#: git-send-email.perl:678 +#: git-send-email.perl:713 msgid "" "\n" "No patch files specified!\n" "\n" msgstr "\nФайл с патчем не указан!\n\n" -#: git-send-email.perl:691 +#: git-send-email.perl:726 #, perl-format msgid "No subject line in %s?" msgstr "Нет строки с темой в %s?" -#: git-send-email.perl:701 +#: git-send-email.perl:736 #, perl-format msgid "Failed to open for writing %s: %s" msgstr "Не удалось открыть для записи %s: %s" -#: git-send-email.perl:712 +#: git-send-email.perl:747 msgid "" "Lines beginning in \"GIT:\" will be removed.\n" "Consider including an overall diffstat or table of contents\n" @@ -21515,37 +23727,37 @@ msgid "" "Clear the body content if you don't wish to send a summary.\n" msgstr "Строки, начинающиеся с «GIT:» будут удалены.\nВозможно будет полезно включить статистику добавлений\nи удалений или таблицу содержимого к создаваемому патчу.\n\nОчистите содержимое, если вы не хотите отправлять письмо со сводкой изменений.\n" -#: git-send-email.perl:736 +#: git-send-email.perl:771 #, perl-format msgid "Failed to open %s: %s" msgstr "Не удалось открыть %s: %s" -#: git-send-email.perl:753 +#: git-send-email.perl:788 #, perl-format msgid "Failed to open %s.final: %s" msgstr "Не удалось открыть %s.final: %s" -#: git-send-email.perl:796 +#: git-send-email.perl:831 msgid "Summary email is empty, skipping it\n" msgstr "Письмо со сводкой изменений пустое, попускаю его\n" #. TRANSLATORS: please keep [y/N] as is. -#: git-send-email.perl:831 +#: git-send-email.perl:866 #, perl-format msgid "Are you sure you want to use <%s> [y/N]? " msgstr "Вы уверены, что хотите использовать <%s> [y/N]? " -#: git-send-email.perl:886 +#: git-send-email.perl:921 msgid "" "The following files are 8bit, but do not declare a Content-Transfer-" "Encoding.\n" msgstr "Следующие файлы 8 битные, но не содержат Content-Transfer-Encoding.\n" -#: git-send-email.perl:891 +#: git-send-email.perl:926 msgid "Which 8bit encoding should I declare [UTF-8]? " msgstr "Какую 8 битную кодировку нужно указать [UTF-8]? " -#: git-send-email.perl:899 +#: git-send-email.perl:934 #, perl-format msgid "" "Refusing to send because the patch\n" @@ -21553,20 +23765,20 @@ msgid "" "has the template subject '*** SUBJECT HERE ***'. Pass --force if you really want to send.\n" msgstr "Отказываюсь отправить, т.к. патч\n\t%s\nсодержит шаблонный заголовок «*** SUBJECT HERE ***». Укажите параметр --force, если вы действительно хотите отправить его.\n" -#: git-send-email.perl:918 +#: git-send-email.perl:953 msgid "To whom should the emails be sent (if anyone)?" msgstr "Кому должны быть отправлены письма (если нужно)?" -#: git-send-email.perl:936 +#: git-send-email.perl:971 #, perl-format msgid "fatal: alias '%s' expands to itself\n" msgstr "критическая ошибка: сокращение «%s» раскрывается само в себя\n" -#: git-send-email.perl:948 +#: git-send-email.perl:983 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? " msgstr "Message-ID который нужно использовать в поле In-Reply-To для первого письма (если нужно)? " -#: git-send-email.perl:1006 git-send-email.perl:1014 +#: git-send-email.perl:1041 git-send-email.perl:1049 #, perl-format msgid "error: unable to extract a valid address from: %s\n" msgstr "ошибка: не удалось выделить действительный адрес из: %s\n" @@ -21574,16 +23786,16 @@ msgstr "ошибка: не удалось выделить действител #. TRANSLATORS: Make sure to include [q] [d] [e] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:1018 +#: git-send-email.perl:1053 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " msgstr "Что нужно сделать с этим адресом? ([q] - выход|[d] - отбросить|[e] - редактировать): " -#: git-send-email.perl:1335 +#: git-send-email.perl:1370 #, perl-format msgid "CA path \"%s\" does not exist" msgstr "путь CA «%s» не существует" -#: git-send-email.perl:1418 +#: git-send-email.perl:1453 msgid "" " The Cc list above has been expanded by additional\n" " addresses found in the patch commit message. By default\n" @@ -21600,128 +23812,128 @@ msgstr " Список Cc (получателей копии письма) б #. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:1433 +#: git-send-email.perl:1468 msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): " msgstr "Отправить это письмо? ([y] - да|[n] - нет|[e] - изменить|[q] - выход|[a] - все): " -#: git-send-email.perl:1436 +#: git-send-email.perl:1471 msgid "Send this email reply required" msgstr "Отправка этого ответа на письмо обязательна" -#: git-send-email.perl:1464 +#: git-send-email.perl:1499 msgid "The required SMTP server is not properly defined." msgstr "Требуемый SMTP сервер не был правильно объявлен." -#: git-send-email.perl:1511 +#: git-send-email.perl:1546 #, perl-format msgid "Server does not support STARTTLS! %s" msgstr "Сервер не поддерживает STARTTLS! %s" -#: git-send-email.perl:1516 git-send-email.perl:1520 +#: git-send-email.perl:1551 git-send-email.perl:1555 #, perl-format msgid "STARTTLS failed! %s" msgstr "Ошибка STARTTLS! %s" -#: git-send-email.perl:1529 +#: git-send-email.perl:1564 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." msgstr "Не удалось инициализировать SMTP. Проверьте ваши настройки и попробуйте запустить в параметром --smtp-debug." -#: git-send-email.perl:1547 +#: git-send-email.perl:1582 #, perl-format msgid "Failed to send %s\n" msgstr "Не удалось отправить %s\n" -#: git-send-email.perl:1550 +#: git-send-email.perl:1585 #, perl-format msgid "Dry-Sent %s\n" msgstr "Имитация отправки %s\n" -#: git-send-email.perl:1550 +#: git-send-email.perl:1585 #, perl-format msgid "Sent %s\n" msgstr "Отправлено %s\n" -#: git-send-email.perl:1552 +#: git-send-email.perl:1587 msgid "Dry-OK. Log says:\n" msgstr "Имитация OK. Журнал содержит:\n" -#: git-send-email.perl:1552 +#: git-send-email.perl:1587 msgid "OK. Log says:\n" msgstr "OK. Журнал содержит:\n" -#: git-send-email.perl:1564 +#: git-send-email.perl:1599 msgid "Result: " msgstr "Результат: " -#: git-send-email.perl:1567 +#: git-send-email.perl:1602 msgid "Result: OK\n" msgstr "Результат: OK\n" -#: git-send-email.perl:1585 +#: git-send-email.perl:1620 #, perl-format msgid "can't open file %s" msgstr "не удалось открыть файл %s" -#: git-send-email.perl:1632 git-send-email.perl:1652 +#: git-send-email.perl:1667 git-send-email.perl:1687 #, perl-format msgid "(mbox) Adding cc: %s from line '%s'\n" msgstr "(mbox) Добавление cc: %s со строки «%s»\n" -#: git-send-email.perl:1638 +#: git-send-email.perl:1673 #, perl-format msgid "(mbox) Adding to: %s from line '%s'\n" msgstr "(mbox) Добавление to: %s со строки «%s»\n" -#: git-send-email.perl:1691 +#: git-send-email.perl:1730 #, perl-format msgid "(non-mbox) Adding cc: %s from line '%s'\n" msgstr "(non-mbox) Добавление cc: %s со строки «%s»\n" -#: git-send-email.perl:1726 +#: git-send-email.perl:1765 #, perl-format msgid "(body) Adding cc: %s from line '%s'\n" msgstr "(body) Добавление cc: %s со строки «%s»\n" -#: git-send-email.perl:1837 +#: git-send-email.perl:1876 #, perl-format msgid "(%s) Could not execute '%s'" msgstr "(%s) Не удалось выполнить «%s»" -#: git-send-email.perl:1844 +#: git-send-email.perl:1883 #, perl-format msgid "(%s) Adding %s: %s from: '%s'\n" msgstr "(%s) Добавление %s: %s из: «%s»\n" -#: git-send-email.perl:1848 +#: git-send-email.perl:1887 #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "(%s) не удалось закрыть поток к «%s»" -#: git-send-email.perl:1878 +#: git-send-email.perl:1917 msgid "cannot send message as 7bit" msgstr "не удалось отправить сообщение в 7 битной кодировке" -#: git-send-email.perl:1886 +#: git-send-email.perl:1925 msgid "invalid transfer encoding" msgstr "недопустимая кодировка передачи" -#: git-send-email.perl:1927 git-send-email.perl:1979 git-send-email.perl:1989 +#: git-send-email.perl:1966 git-send-email.perl:2018 git-send-email.perl:2028 #, perl-format msgid "unable to open %s: %s\n" msgstr "не удалось открыть %s: %s\n" -#: git-send-email.perl:1930 +#: git-send-email.perl:1969 #, perl-format msgid "%s: patch contains a line longer than 998 characters" msgstr "%s: патч содержит строку длиннее чем 998 символов" -#: git-send-email.perl:1947 +#: git-send-email.perl:1986 #, perl-format msgid "Skipping %s with backup suffix '%s'.\n" msgstr "Пропускаю %s с окончанием резервной копии «%s».\n" #. TRANSLATORS: please keep "[y|N]" as is. -#: git-send-email.perl:1951 +#: git-send-email.perl:1990 #, perl-format msgid "Do you really want to send %s? [y|N]: " -msgstr "Вы действительно хотите отправить %s? [y - да|N - нет]: " +msgstr "Вы действительно хотите отправить %s? [y] - да, [N] - нет: " |