diff options
-rw-r--r-- | po/TEAMS | 8 | ||||
-rw-r--r-- | po/de.po | 7215 | ||||
-rw-r--r-- | po/es.po | 20 | ||||
-rw-r--r-- | po/fr.po | 26 | ||||
-rw-r--r-- | po/it.po | 10760 | ||||
-rw-r--r-- | po/zh_CN.po | 7123 |
6 files changed, 14236 insertions, 10916 deletions
@@ -11,9 +11,9 @@ Leader: Jordi Mas <jmas@softcatala.org> Members: Alex Henrie <alexhenrie24@gmail.com> Language: de (German) -Repository: https://github.com/ralfth/git-po-de -Leader: Ralf Thielow <ralf.thielow@gmail.com> -Members: Matthias Rüster <matthias.ruester@gmail.com> +Repository: https://github.com/ruester/git-po-de +Leader: Matthias Rüster <matthias.ruester@gmail.com> +Members: Ralf Thielow <ralf.thielow@gmail.com> Phillip Szelat <phillip.szelat@gmail.com> Language: el (Greek) @@ -66,4 +66,4 @@ Repository: https://github.com/jiangxin/git/ Leader: Jiang Xin <worldhello.net AT gmail.com> Members: Ray Chen <oldsharp AT gmail.com> 依云 <lilydjwg AT gmail.com> - Fangyi Zhou <fangyi.zhou AT yuriko.moe> + Fangyi Zhou <me AT fangyi.io> @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2019-02-15 10:09+0800\n" +"POT-Creation-Date: 2019-06-04 08:24+0800\n" "PO-Revision-Date: 2016-11-28 18:10+0100\n" "Last-Translator: Ralf Thielow <ralf.thielow@gmail.com>\n" "Language-Team: German <>\n" @@ -17,43 +17,43 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n!=1);\n" -#: advice.c:101 +#: advice.c:103 #, c-format msgid "%shint: %.*s%s\n" msgstr "%sHinweis: %.*s%s\n" -#: advice.c:154 +#: advice.c:156 msgid "Cherry-picking is not possible because you have unmerged files." msgstr "" "Cherry-Picken ist nicht möglich, weil Sie nicht zusammengeführte Dateien " "haben." -#: advice.c:156 +#: advice.c:158 msgid "Committing is not possible because you have unmerged files." msgstr "" "Committen ist nicht möglich, weil Sie nicht zusammengeführte Dateien haben." -#: advice.c:158 +#: advice.c:160 msgid "Merging is not possible because you have unmerged files." msgstr "" "Mergen ist nicht möglich, weil Sie nicht zusammengeführte Dateien haben." -#: advice.c:160 +#: advice.c:162 msgid "Pulling is not possible because you have unmerged files." msgstr "" "Pullen ist nicht möglich, weil Sie nicht zusammengeführte Dateien haben." -#: advice.c:162 +#: advice.c:164 msgid "Reverting is not possible because you have unmerged files." msgstr "" "Reverten ist nicht möglich, weil Sie nicht zusammengeführte Dateien haben." -#: advice.c:164 +#: advice.c:166 #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "%s ist nicht möglich, weil Sie nicht zusammengeführte Dateien haben." -#: advice.c:172 +#: advice.c:174 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." @@ -62,23 +62,23 @@ msgstr "" "dann 'git add/rm <Datei>', um die Auflösung entsprechend zu markieren\n" "und zu committen." -#: advice.c:180 +#: advice.c:182 msgid "Exiting because of an unresolved conflict." msgstr "Beende wegen unaufgelöstem Konflikt." -#: advice.c:185 builtin/merge.c:1290 +#: advice.c:187 builtin/merge.c:1320 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Sie haben Ihren Merge nicht abgeschlossen (MERGE_HEAD existiert)." -#: advice.c:187 +#: advice.c:189 msgid "Please, commit your changes before merging." msgstr "Bitte committen Sie Ihre Änderungen, bevor Sie mergen." -#: advice.c:188 +#: advice.c:190 msgid "Exiting because of unfinished merge." msgstr "Beende wegen nicht abgeschlossenem Merge." -#: advice.c:194 +#: advice.c:196 #, c-format msgid "" "Note: checking out '%s'.\n" @@ -117,99 +117,99 @@ msgstr "Befehlszeile endet mit \\" msgid "unclosed quote" msgstr "Nicht geschlossene Anführungszeichen." -#: apply.c:59 +#: apply.c:63 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "Nicht erkannte Whitespace-Option: '%s'" -#: apply.c:75 +#: apply.c:79 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "nicht erkannte Option zum Ignorieren von Whitespace: '%s'" -#: apply.c:125 +#: apply.c:129 msgid "--reject and --3way cannot be used together." msgstr "--reject und --3way können nicht gemeinsam verwendet werden." -#: apply.c:127 +#: apply.c:131 msgid "--cached and --3way cannot be used together." msgstr "--cached und --3way können nicht gemeinsam verwendet werden." -#: apply.c:130 +#: apply.c:134 msgid "--3way outside a repository" msgstr "" "Die Option --3way kann nicht außerhalb eines Repositories verwendet werden." -#: apply.c:141 +#: apply.c:145 msgid "--index outside a repository" msgstr "" "Die Option --index kann nicht außerhalb eines Repositories verwendet werden." -#: apply.c:144 +#: apply.c:148 msgid "--cached outside a repository" msgstr "" "Die Option --cached kann nicht außerhalb eines Repositories verwendet werden." -#: apply.c:825 +#: apply.c:829 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "Kann regulären Ausdruck für Zeitstempel %s nicht verarbeiten" -#: apply.c:834 +#: apply.c:838 #, c-format msgid "regexec returned %d for input: %s" msgstr "Ausführung des regulären Ausdrucks gab %d zurück. Eingabe: %s" -#: apply.c:908 +#: apply.c:912 #, c-format msgid "unable to find filename in patch at line %d" msgstr "Konnte keinen Dateinamen in Zeile %d des Patches finden." -#: apply.c:946 +#: apply.c:950 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "" "git apply: ungültiges 'git-diff' - erwartete /dev/null, erhielt %s in Zeile " "%d" -#: apply.c:952 +#: apply.c:956 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "" "git apply: ungültiges 'git-diff' - Inkonsistenter neuer Dateiname in Zeile %d" -#: apply.c:953 +#: apply.c:957 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "" "git apply: ungültiges 'git-diff' - Inkonsistenter alter Dateiname in Zeile %d" -#: apply.c:958 +#: apply.c:962 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "git apply: ungültiges 'git-diff' - erwartete /dev/null in Zeile %d" -#: apply.c:987 +#: apply.c:991 #, c-format msgid "invalid mode on line %d: %s" msgstr "Ungültiger Modus in Zeile %d: %s" -#: apply.c:1306 +#: apply.c:1310 #, c-format msgid "inconsistent header lines %d and %d" msgstr "Inkonsistente Kopfzeilen %d und %d." -#: apply.c:1478 +#: apply.c:1482 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recount: unerwartete Zeile: %.*s" -#: apply.c:1547 +#: apply.c:1551 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "Patch-Fragment ohne Kopfbereich bei Zeile %d: %.*s" -#: apply.c:1567 +#: apply.c:1571 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -224,72 +224,72 @@ msgstr[1] "" "Dem Kopfbereich von \"git diff\" fehlen Informationen zum Dateinamen, wenn " "%d vorangestellte Teile des Pfades entfernt werden (Zeile %d)" -#: apply.c:1580 +#: apply.c:1584 #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "" "Dem Kopfbereich von \"git diff\" fehlen Informationen zum Dateinamen (Zeile " "%d)" -#: apply.c:1768 +#: apply.c:1772 msgid "new file depends on old contents" msgstr "neue Datei hängt von alten Inhalten ab" -#: apply.c:1770 +#: apply.c:1774 msgid "deleted file still has contents" msgstr "entfernte Datei hat noch Inhalte" -#: apply.c:1804 +#: apply.c:1808 #, c-format msgid "corrupt patch at line %d" msgstr "fehlerhafter Patch bei Zeile %d" -#: apply.c:1841 +#: apply.c:1845 #, c-format msgid "new file %s depends on old contents" msgstr "neue Datei %s hängt von alten Inhalten ab" -#: apply.c:1843 +#: apply.c:1847 #, c-format msgid "deleted file %s still has contents" msgstr "entfernte Datei %s hat noch Inhalte" -#: apply.c:1846 +#: apply.c:1850 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** Warnung: Datei %s wird leer, aber nicht entfernt." -#: apply.c:1993 +#: apply.c:1997 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "fehlerhafter Binär-Patch bei Zeile %d: %.*s" -#: apply.c:2030 +#: apply.c:2034 #, c-format msgid "unrecognized binary patch at line %d" msgstr "nicht erkannter Binär-Patch bei Zeile %d" -#: apply.c:2192 +#: apply.c:2196 #, c-format msgid "patch with only garbage at line %d" msgstr "Patch mit nutzlosen Informationen bei Zeile %d" -#: apply.c:2278 +#: apply.c:2282 #, c-format msgid "unable to read symlink %s" msgstr "konnte symbolische Verknüpfung %s nicht lesen" -#: apply.c:2282 +#: apply.c:2286 #, c-format msgid "unable to open or read %s" msgstr "konnte %s nicht öffnen oder lesen" -#: apply.c:2941 +#: apply.c:2945 #, c-format msgid "invalid start of line: '%c'" msgstr "Ungültiger Zeilenanfang: '%c'" -#: apply.c:3062 +#: apply.c:3066 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." @@ -297,12 +297,12 @@ msgstr[0] "Patch-Bereich #%d erfolgreich angewendet bei %d (%d Zeile versetzt)" msgstr[1] "" "Patch-Bereich #%d erfolgreich angewendet bei %d (%d Zeilen versetzt)" -#: apply.c:3074 +#: apply.c:3078 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "Kontext reduziert zu (%ld/%ld), um Patch-Bereich bei %d anzuwenden" -#: apply.c:3080 +#: apply.c:3084 #, c-format msgid "" "while searching for:\n" @@ -311,25 +311,25 @@ msgstr "" "bei der Suche nach:\n" "%.*s" -#: apply.c:3102 +#: apply.c:3106 #, c-format msgid "missing binary patch data for '%s'" msgstr "keine Daten in Binär-Patch für '%s'" -#: apply.c:3110 +#: apply.c:3114 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "" "kann binären Patch nicht in umgekehrter Reihenfolge anwenden ohne einen\n" "umgekehrten Patch-Block auf '%s'" -#: apply.c:3157 +#: apply.c:3161 #, c-format msgid "cannot apply binary patch to '%s' without full index line" msgstr "" "kann binären Patch auf '%s' nicht ohne eine vollständige Index-Zeile anwenden" -#: apply.c:3167 +#: apply.c:3171 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." @@ -337,442 +337,441 @@ msgstr "" "der Patch wird angewendet auf '%s' (%s), was nicht den aktuellen Inhalten\n" "entspricht" -#: apply.c:3175 +#: apply.c:3179 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "der Patch wird auf ein leeres '%s' angewendet, was aber nicht leer ist" -#: apply.c:3193 +#: apply.c:3197 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "das erforderliche Postimage %s für '%s' kann nicht gelesen werden" -#: apply.c:3206 +#: apply.c:3210 #, c-format msgid "binary patch does not apply to '%s'" msgstr "Konnte Binär-Patch nicht auf '%s' anwenden" -#: apply.c:3212 +#: apply.c:3216 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" "Binär-Patch für '%s' erzeugt falsches Ergebnis (erwartete %s, bekam %s)" -#: apply.c:3233 +#: apply.c:3237 #, c-format msgid "patch failed: %s:%ld" msgstr "Anwendung des Patches fehlgeschlagen: %s:%ld" -#: apply.c:3356 +#: apply.c:3360 #, c-format msgid "cannot checkout %s" msgstr "kann %s nicht auschecken" -#: apply.c:3408 apply.c:3419 apply.c:3465 midx.c:58 setup.c:278 +#: apply.c:3412 apply.c:3423 apply.c:3469 midx.c:59 setup.c:279 #, c-format msgid "failed to read %s" msgstr "Fehler beim Lesen von %s" -#: apply.c:3416 +#: apply.c:3420 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "'%s' ist hinter einer symbolischen Verknüpfung" -#: apply.c:3445 apply.c:3688 +#: apply.c:3449 apply.c:3692 #, c-format msgid "path %s has been renamed/deleted" msgstr "Pfad %s wurde umbenannt/gelöscht" -#: apply.c:3531 apply.c:3703 +#: apply.c:3535 apply.c:3707 #, c-format msgid "%s: does not exist in index" msgstr "%s ist nicht im Index" -#: apply.c:3540 apply.c:3711 +#: apply.c:3544 apply.c:3715 #, c-format msgid "%s: does not match index" msgstr "%s entspricht nicht der Version im Index" -#: apply.c:3575 +#: apply.c:3579 msgid "repository lacks the necessary blob to fall back on 3-way merge." msgstr "" "Dem Repository fehlt der notwendige Blob, um auf einen 3-Wege-Merge\n" "zurückzufallen." -#: apply.c:3578 +#: apply.c:3582 #, c-format msgid "Falling back to three-way merge...\n" msgstr "Falle zurück auf 3-Wege-Merge ...\n" -#: apply.c:3594 apply.c:3598 +#: apply.c:3598 apply.c:3602 #, c-format msgid "cannot read the current contents of '%s'" msgstr "kann aktuelle Inhalte von '%s' nicht lesen" -#: apply.c:3610 +#: apply.c:3614 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "Fehler beim Zurückfallen auf 3-Wege-Merge...\n" -#: apply.c:3624 +#: apply.c:3628 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "Patch auf '%s' mit Konflikten angewendet.\n" -#: apply.c:3629 +#: apply.c:3633 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "Patch auf '%s' sauber angewendet.\n" -#: apply.c:3655 +#: apply.c:3659 msgid "removal patch leaves file contents" msgstr "Lösch-Patch hinterlässt Dateiinhalte" -#: apply.c:3728 +#: apply.c:3732 #, c-format msgid "%s: wrong type" msgstr "%s: falscher Typ" -#: apply.c:3730 +#: apply.c:3734 #, c-format msgid "%s has type %o, expected %o" msgstr "%s ist vom Typ %o, erwartete %o" -#: apply.c:3881 apply.c:3883 read-cache.c:820 read-cache.c:846 -#: read-cache.c:1299 +#: apply.c:3885 apply.c:3887 read-cache.c:830 read-cache.c:856 +#: read-cache.c:1309 #, c-format msgid "invalid path '%s'" msgstr "Ungültiger Pfad '%s'" -#: apply.c:3939 +#: apply.c:3943 #, c-format msgid "%s: already exists in index" msgstr "%s ist bereits bereitgestellt" -#: apply.c:3942 +#: apply.c:3946 #, c-format msgid "%s: already exists in working directory" msgstr "%s existiert bereits im Arbeitsverzeichnis" -#: apply.c:3962 +#: apply.c:3966 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "neuer Modus (%o) von %s entspricht nicht dem alten Modus (%o)" -#: apply.c:3967 +#: apply.c:3971 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "neuer Modus (%o) von %s entspricht nicht dem alten Modus (%o) von %s" -#: apply.c:3987 +#: apply.c:3991 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "betroffene Datei '%s' ist hinter einer symbolischen Verknüpfung" -#: apply.c:3991 +#: apply.c:3995 #, c-format msgid "%s: patch does not apply" msgstr "%s: Patch konnte nicht angewendet werden" -#: apply.c:4006 +#: apply.c:4010 #, c-format msgid "Checking patch %s..." msgstr "Prüfe Patch %s ..." -#: apply.c:4098 +#: apply.c:4102 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "SHA-1 Information fehlt oder ist unbrauchbar für Submodul %s" -#: apply.c:4105 +#: apply.c:4109 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "Modusänderung für %s, was sich nicht im aktuellen HEAD befindet" -#: apply.c:4108 +#: apply.c:4112 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "SHA-1 Information fehlt oder ist unbrauchbar (%s)." -#: apply.c:4113 builtin/checkout.c:248 builtin/reset.c:143 +#: 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 für Pfad '%s' fehlgeschlagen" -#: apply.c:4117 +#: apply.c:4121 #, c-format msgid "could not add %s to temporary index" msgstr "konnte %s nicht zum temporären Index hinzufügen" -#: apply.c:4127 +#: apply.c:4131 #, c-format msgid "could not write temporary index to %s" msgstr "konnte temporären Index nicht nach %s schreiben" -#: apply.c:4265 +#: apply.c:4269 #, c-format msgid "unable to remove %s from index" msgstr "konnte %s nicht aus dem Index entfernen" -#: apply.c:4299 +#: apply.c:4303 #, c-format msgid "corrupt patch for submodule %s" msgstr "fehlerhafter Patch für Submodul %s" -#: apply.c:4305 +#: apply.c:4309 #, c-format msgid "unable to stat newly created file '%s'" msgstr "konnte neu erstellte Datei '%s' nicht lesen" -#: apply.c:4313 +#: apply.c:4317 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "kann internen Speicher für eben erstellte Datei %s nicht erzeugen" -#: apply.c:4319 apply.c:4464 +#: apply.c:4323 apply.c:4468 #, c-format msgid "unable to add cache entry for %s" msgstr "kann für %s keinen Eintrag in den Zwischenspeicher hinzufügen" -#: apply.c:4362 +#: apply.c:4366 #, c-format msgid "failed to write to '%s'" msgstr "Fehler beim Schreiben nach '%s'" -#: apply.c:4366 +#: apply.c:4370 #, c-format msgid "closing file '%s'" msgstr "schließe Datei '%s'" -#: apply.c:4436 +#: apply.c:4440 #, c-format msgid "unable to write file '%s' mode %o" msgstr "konnte Datei '%s' mit Modus %o nicht schreiben" -#: apply.c:4534 +#: apply.c:4538 #, c-format msgid "Applied patch %s cleanly." msgstr "Patch %s sauber angewendet" -#: apply.c:4542 +#: apply.c:4546 msgid "internal error" msgstr "interner Fehler" -#: apply.c:4545 +#: apply.c:4549 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "Wende Patch %%s mit %d Zurückweisung an..." msgstr[1] "Wende Patch %%s mit %d Zurückweisungen an..." -#: apply.c:4556 +#: apply.c:4560 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "Verkürze Name von .rej Datei zu %.*s.rej" -#: apply.c:4564 builtin/fetch.c:837 builtin/fetch.c:1118 +#: apply.c:4568 builtin/fetch.c:837 builtin/fetch.c:1118 #, c-format msgid "cannot open %s" msgstr "kann '%s' nicht öffnen" -#: apply.c:4578 +#: apply.c:4582 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Patch-Bereich #%d sauber angewendet." -#: apply.c:4582 +#: apply.c:4586 #, c-format msgid "Rejected hunk #%d." msgstr "Patch-Block #%d zurückgewiesen." -#: apply.c:4692 +#: apply.c:4696 #, c-format msgid "Skipped patch '%s'." msgstr "Patch '%s' ausgelassen." -#: apply.c:4700 +#: apply.c:4704 msgid "unrecognized input" msgstr "nicht erkannte Eingabe" -#: apply.c:4720 +#: apply.c:4724 msgid "unable to read index file" msgstr "Konnte Index-Datei nicht lesen" -#: apply.c:4875 +#: apply.c:4879 #, c-format msgid "can't open patch '%s': %s" msgstr "kann Patch '%s' nicht öffnen: %s" -#: apply.c:4902 +#: apply.c:4906 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "unterdrückte %d Whitespace-Fehler" msgstr[1] "unterdrückte %d Whitespace-Fehler" -#: apply.c:4908 apply.c:4923 +#: apply.c:4912 apply.c:4927 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "%d Zeile fügt Whitespace-Fehler hinzu." msgstr[1] "%d Zeilen fügen Whitespace-Fehler hinzu." -#: apply.c:4916 +#: apply.c:4920 #, c-format msgid "%d line applied after fixing whitespace errors." 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:4932 builtin/add.c:539 builtin/mv.c:301 builtin/rm.c:390 +#: apply.c:4936 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390 msgid "Unable to write new index file" msgstr "Konnte neue Index-Datei nicht schreiben." -#: apply.c:4959 apply.c:4962 builtin/am.c:2203 builtin/am.c:2206 -#: builtin/clone.c:122 builtin/fetch.c:118 builtin/merge.c:263 -#: builtin/pull.c:200 builtin/submodule--helper.c:407 +#: 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:1850 builtin/submodule--helper.c:1853 -#: builtin/submodule--helper.c:2092 git-add--interactive.perl:197 +#: builtin/submodule--helper.c:1849 builtin/submodule--helper.c:1852 +#: builtin/submodule--helper.c:2091 git-add--interactive.perl:197 msgid "path" msgstr "Pfad" -#: apply.c:4960 +#: apply.c:4964 msgid "don't apply changes matching the given path" msgstr "keine Änderungen im angegebenen Pfad anwenden" -#: apply.c:4963 +#: apply.c:4967 msgid "apply changes matching the given path" msgstr "Änderungen nur im angegebenen Pfad anwenden" -#: apply.c:4965 builtin/am.c:2212 +#: apply.c:4969 builtin/am.c:2219 msgid "num" msgstr "Anzahl" -#: apply.c:4966 +#: apply.c:4970 msgid "remove <num> leading slashes from traditional diff paths" msgstr "" "<Anzahl> vorangestellte Schrägstriche von herkömmlichen Differenzpfaden " "entfernen" -#: apply.c:4969 +#: apply.c:4973 msgid "ignore additions made by the patch" msgstr "hinzugefügte Zeilen des Patches ignorieren" -#: apply.c:4971 +#: apply.c:4975 msgid "instead of applying the patch, output diffstat for the input" msgstr "" "anstatt der Anwendung des Patches, den \"diffstat\" für die Eingabe " "ausgegeben" -#: apply.c:4975 +#: apply.c:4979 msgid "show number of added and deleted lines in decimal notation" msgstr "" "die Anzahl von hinzugefügten/entfernten Zeilen in Dezimalnotation anzeigen" -#: apply.c:4977 +#: apply.c:4981 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" -#: apply.c:4979 +#: apply.c:4983 msgid "instead of applying the patch, see if the patch is applicable" msgstr "" "anstatt der Anwendung des Patches, zeige ob Patch angewendet werden kann" -#: apply.c:4981 +#: apply.c:4985 msgid "make sure the patch is applicable to the current index" msgstr "" "sicherstellen, dass der Patch mit dem aktuellen Index angewendet werden kann" -#: apply.c:4983 +#: apply.c:4987 msgid "mark new files with `git add --intent-to-add`" msgstr "neue Dateien mit `git add --intent-to-add` markieren" -#: apply.c:4985 +#: apply.c:4989 msgid "apply a patch without touching the working tree" msgstr "Patch anwenden, ohne Änderungen im Arbeitsverzeichnis vorzunehmen" -#: apply.c:4987 +#: apply.c:4991 msgid "accept a patch that touches outside the working area" msgstr "" "Patch anwenden, der Änderungen außerhalb des Arbeitsverzeichnisses vornimmt" -#: apply.c:4990 +#: apply.c:4994 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "Patch anwenden (Benutzung mit --stat/--summary/--check)" -#: apply.c:4992 +#: apply.c:4996 msgid "attempt three-way merge if a patch does not apply" msgstr "versuche 3-Wege-Merge, wenn der Patch nicht angewendet werden konnte" -#: apply.c:4994 +#: apply.c:4998 msgid "build a temporary index based on embedded index information" msgstr "" "einen temporären Index, basierend auf den integrierten Index-Informationen, " "erstellen" -#: apply.c:4997 builtin/checkout-index.c:173 builtin/ls-files.c:524 +#: apply.c:5001 builtin/checkout-index.c:173 builtin/ls-files.c:524 msgid "paths are separated with NUL character" msgstr "Pfade sind getrennt durch NUL Zeichen" -#: apply.c:4999 +#: apply.c:5003 msgid "ensure at least <n> lines of context match" msgstr "" "sicher stellen, dass mindestens <n> Zeilen des Kontextes übereinstimmen" -#: apply.c:5000 builtin/am.c:2191 builtin/interpret-trailers.c:97 +#: 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:3314 builtin/rebase.c:1065 +#: builtin/pack-objects.c:3317 builtin/rebase.c:1415 msgid "action" msgstr "Aktion" -#: apply.c:5001 +#: apply.c:5005 msgid "detect new or modified lines that have whitespace errors" msgstr "neue oder geänderte Zeilen, die Whitespace-Fehler haben, ermitteln" -#: apply.c:5004 apply.c:5007 +#: apply.c:5008 apply.c:5011 msgid "ignore changes in whitespace when finding context" msgstr "Änderungen im Whitespace bei der Suche des Kontextes ignorieren" -#: apply.c:5010 +#: apply.c:5014 msgid "apply the patch in reverse" msgstr "den Patch in umgekehrter Reihenfolge anwenden" -#: apply.c:5012 +#: apply.c:5016 msgid "don't expect at least one line of context" msgstr "keinen Kontext erwarten" -#: apply.c:5014 +#: apply.c:5018 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "" "zurückgewiesene Patch-Blöcke in entsprechenden *.rej Dateien hinterlassen" -#: apply.c:5016 +#: apply.c:5020 msgid "allow overlapping hunks" msgstr "sich überlappende Patch-Blöcke erlauben" -#: apply.c:5017 builtin/add.c:291 builtin/check-ignore.c:22 -#: builtin/commit.c:1312 builtin/count-objects.c:98 builtin/fsck.c:724 -#: builtin/log.c:2037 builtin/mv.c:123 builtin/read-tree.c:128 -#: builtin/rebase--interactive.c:159 +#: 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 msgid "be verbose" msgstr "erweiterte Ausgaben" -#: apply.c:5019 +#: apply.c:5023 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "fehlerhaft erkannten fehlenden Zeilenumbruch am Dateiende tolerieren" -#: apply.c:5022 +#: apply.c:5026 msgid "do not trust the line counts in the hunk headers" msgstr "den Zeilennummern im Kopf des Patch-Blocks nicht vertrauen" -#: apply.c:5024 builtin/am.c:2200 +#: apply.c:5028 builtin/am.c:2207 msgid "root" msgstr "Wurzelverzeichnis" -#: apply.c:5025 +#: apply.c:5029 msgid "prepend <root> to all filenames" msgstr "<Wurzelverzeichnis> vor alle Dateinamen stellen" @@ -795,7 +794,7 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <Repository> [--exec <Programm>] --list" -#: archive.c:372 builtin/add.c:177 builtin/add.c:515 builtin/rm.c:299 +#: archive.c:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299 #, c-format msgid "pathspec '%s' did not match any files" msgstr "Pfadspezifikation '%s' stimmt mit keinen Dateien überein" @@ -827,7 +826,7 @@ msgstr "Format" msgid "archive format" msgstr "Archivformat" -#: archive.c:456 builtin/log.c:1549 +#: archive.c:456 builtin/log.c:1557 msgid "prefix" msgstr "Präfix" @@ -835,11 +834,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:458 builtin/blame.c:820 builtin/blame.c:821 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:162 +#: 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 msgid "file" msgstr "Datei" @@ -871,8 +870,8 @@ msgstr "besser komprimieren" msgid "list supported archive formats" msgstr "unterstützte Archivformate auflisten" -#: archive.c:477 builtin/archive.c:91 builtin/clone.c:112 builtin/clone.c:115 -#: builtin/submodule--helper.c:1378 builtin/submodule--helper.c:1859 +#: 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 msgid "repo" msgstr "Repository" @@ -880,7 +879,7 @@ msgstr "Repository" msgid "retrieve the archive from remote repository <repo>" msgstr "Archiv vom Remote-Repository <Repository> abrufen" -#: archive.c:479 builtin/archive.c:93 builtin/difftool.c:715 +#: archive.c:479 builtin/archive.c:93 builtin/difftool.c:707 #: builtin/notes.c:498 msgid "command" msgstr "Programm" @@ -926,16 +925,16 @@ msgstr "Nicht unterstützter Dateimodus: 0%o (SHA1: %s)" msgid "cannot read %s" msgstr "Kann %s nicht lesen." -#: archive-tar.c:458 +#: archive-tar.c:459 #, c-format msgid "unable to start '%s' filter" msgstr "Konnte '%s' Filter nicht starten." -#: archive-tar.c:461 +#: archive-tar.c:462 msgid "unable to redirect descriptor" msgstr "Konnte Descriptor nicht umleiten." -#: archive-tar.c:468 +#: archive-tar.c:469 #, c-format msgid "'%s' filter reported error" msgstr "'%s' Filter meldete Fehler." @@ -950,7 +949,7 @@ msgstr "Pfad ist kein gültiges UTF-8: %s" msgid "path too long (%d chars, SHA1: %s): %s" msgstr "Pfad zu lang (%d Zeichen, SHA1: %s): %s" -#: archive-zip.c:474 builtin/pack-objects.c:225 builtin/pack-objects.c:228 +#: archive-zip.c:474 builtin/pack-objects.c:226 builtin/pack-objects.c:229 #, c-format msgid "deflate error (%d)" msgstr "Fehler beim Komprimieren (%d)" @@ -1053,26 +1052,26 @@ 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:884 builtin/notes.c:177 builtin/tag.c:237 +#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:248 #, c-format msgid "could not create file '%s'" msgstr "konnte Datei '%s' nicht erstellen" -#: bisect.c:937 builtin/merge.c:139 +#: bisect.c:928 builtin/merge.c:146 #, c-format msgid "could not read file '%s'" msgstr "Konnte Datei '%s' nicht lesen" -#: bisect.c:967 +#: bisect.c:958 msgid "reading bisect refs failed" msgstr "Lesen von Referenzen für binäre Suche fehlgeschlagen" -#: bisect.c:986 +#: bisect.c:977 #, c-format msgid "%s was both %s and %s\n" msgstr "%s war sowohl %s als auch %s\n" -#: bisect.c:994 +#: bisect.c:985 #, c-format msgid "" "No testable commit found.\n" @@ -1081,7 +1080,7 @@ msgstr "" "Kein testbarer Commit gefunden.\n" "Vielleicht starteten Sie mit falschen Pfad-Parametern?\n" -#: bisect.c:1013 +#: bisect.c:1004 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -1091,55 +1090,55 @@ msgstr[1] "(ungefähr %d Schritte)" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. -#: bisect.c:1019 +#: bisect.c:1010 #, 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] "binäre Suche: danach noch %d Commit zum Testen übrig %s\n" msgstr[1] "binäre Suche: danach noch %d Commits zum Testen übrig %s\n" -#: blame.c:1792 +#: blame.c:1794 msgid "--contents and --reverse do not blend well." msgstr "--contents und --reverse funktionieren gemeinsam nicht." -#: blame.c:1806 +#: blame.c:1808 msgid "cannot use --contents with final commit object name" msgstr "" "kann --contents nicht mit endgültigem Namen des Commit-Objektes benutzen" -#: blame.c:1827 +#: blame.c:1829 msgid "--reverse and --first-parent together require specified latest commit" msgstr "" "--reverse und --first-parent zusammen erfordern die Angabe eines " "endgültigen\n" "Commits" -#: blame.c:1836 bundle.c:164 ref-filter.c:2071 remote.c:1948 sequencer.c:1993 -#: sequencer.c:4064 builtin/commit.c:1004 builtin/log.c:378 builtin/log.c:936 -#: builtin/log.c:1420 builtin/log.c:1796 builtin/log.c:2086 builtin/merge.c:407 -#: builtin/pack-objects.c:3137 builtin/pack-objects.c:3152 +#: 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 msgid "revision walk setup failed" msgstr "Einrichtung des Revisionsgangs fehlgeschlagen" -#: blame.c:1854 +#: blame.c:1856 msgid "" "--reverse --first-parent together require range along first-parent chain" msgstr "" "--reverse und --first-parent zusammen erfordern einen Bereich entlang der\n" "\"first-parent\"-Kette" -#: blame.c:1865 +#: blame.c:1867 #, c-format msgid "no such path %s in %s" msgstr "Pfad %s nicht in %s" -#: blame.c:1876 +#: blame.c:1878 #, c-format msgid "cannot read blob %s for path %s" msgstr "kann Blob %s für Pfad '%s' nicht lesen" -#: branch.c:52 +#: branch.c:53 #, c-format msgid "" "\n" @@ -1153,89 +1152,89 @@ msgstr "" "\"git branch --set-upstream-to=%s%s%s\"\n" "erneut setzen." -#: branch.c:66 +#: branch.c:67 #, c-format msgid "Not setting branch %s as its own upstream." msgstr "Branch %s kann nicht sein eigener Upstream-Branch sein." -#: branch.c:92 +#: branch.c:93 #, c-format msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing." msgstr "Branch '%s' folgt nun Remote-Branch '%s' von '%s' durch Rebase." -#: branch.c:93 +#: branch.c:94 #, c-format msgid "Branch '%s' set up to track remote branch '%s' from '%s'." msgstr "Branch '%s' folgt nun Remote-Branch '%s' von '%s'." -#: branch.c:97 +#: branch.c:98 #, c-format msgid "Branch '%s' set up to track local branch '%s' by rebasing." msgstr "Branch '%s' folgt nun lokalem Branch '%s' durch Rebase." -#: branch.c:98 +#: branch.c:99 #, c-format msgid "Branch '%s' set up to track local branch '%s'." msgstr "Branch '%s' folgt nun lokalem Branch '%s'." -#: branch.c:103 +#: branch.c:104 #, c-format msgid "Branch '%s' set up to track remote ref '%s' by rebasing." msgstr "Branch '%s' folgt nun Remote-Referenz '%s' durch Rebase." -#: branch.c:104 +#: branch.c:105 #, c-format msgid "Branch '%s' set up to track remote ref '%s'." msgstr "Branch '%s' folgt nun Remote-Referenz '%s'." -#: branch.c:108 +#: branch.c:109 #, c-format msgid "Branch '%s' set up to track local ref '%s' by rebasing." msgstr "Branch '%s' folgt nun lokaler Referenz '%s' durch Rebase." -#: branch.c:109 +#: branch.c:110 #, c-format msgid "Branch '%s' set up to track local ref '%s'." msgstr "Branch '%s' folgt nun lokaler Referenz '%s'." -#: branch.c:118 +#: branch.c:119 msgid "Unable to write upstream branch configuration" msgstr "Konnte Konfiguration zu Upstream-Branch nicht schreiben." -#: branch.c:155 +#: branch.c:156 #, c-format msgid "Not tracking: ambiguous information for ref %s" msgstr "" "Konfiguration zum Folgen von Branch nicht eingerichtet. Referenz %s ist " "mehrdeutig." -#: branch.c:188 +#: branch.c:189 #, c-format msgid "'%s' is not a valid branch name." msgstr "'%s' ist kein gültiger Branchname." -#: branch.c:207 +#: branch.c:208 #, c-format msgid "A branch named '%s' already exists." msgstr "Branch '%s' existiert bereits." -#: branch.c:212 +#: branch.c:213 msgid "Cannot force update the current branch." msgstr "Kann Aktualisierung des aktuellen Branches nicht erzwingen." -#: branch.c:232 +#: branch.c:233 #, c-format msgid "Cannot setup tracking information; starting point '%s' is not a branch." msgstr "" "Kann Tracking-Informationen nicht einrichten; Startpunkt '%s' ist kein " "Branch." -#: branch.c:234 +#: branch.c:235 #, c-format msgid "the requested upstream branch '%s' does not exist" msgstr "der angeforderte Upstream-Branch '%s' existiert nicht" -#: branch.c:236 +#: branch.c:237 msgid "" "\n" "If you are planning on basing your work on an upstream\n" @@ -1256,17 +1255,17 @@ msgstr "" "\"git push -u\" verwenden, um den Upstream-Branch beim \"push\"\n" "zu konfigurieren." -#: branch.c:280 +#: branch.c:281 #, c-format msgid "Not a valid object name: '%s'." msgstr "Ungültiger Objekt-Name: '%s'" -#: branch.c:300 +#: branch.c:301 #, c-format msgid "Ambiguous object name: '%s'." msgstr "mehrdeutiger Objekt-Name: '%s'" -#: branch.c:305 +#: branch.c:306 #, c-format msgid "Not a valid branch point: '%s'." msgstr "Ungültiger Branchpunkt: '%s'" @@ -1291,8 +1290,8 @@ msgstr "'%s' sieht nicht wie eine v2 Paketdatei aus" msgid "unrecognized header: %s%s (%d)" msgstr "nicht erkannter Kopfbereich: %s%s (%d)" -#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2215 sequencer.c:2763 -#: builtin/commit.c:776 +#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2281 sequencer.c:2916 +#: builtin/commit.c:788 #, c-format msgid "could not open '%s'" msgstr "Konnte '%s' nicht öffnen" @@ -1340,7 +1339,7 @@ msgstr "\"rev-list\" abgebrochen" msgid "ref '%s' is excluded by the rev-list options" msgstr "Referenz '%s' wird durch \"rev-list\" Optionen ausgeschlossen" -#: bundle.c:457 builtin/log.c:193 builtin/log.c:1701 builtin/shortlog.c:306 +#: bundle.c:457 builtin/log.c:197 builtin/log.c:1709 builtin/shortlog.c:306 #, c-format msgid "unrecognized argument: %s" msgstr "nicht erkanntes Argument: %s" @@ -1363,9 +1362,8 @@ msgstr "Erstellung der Paketindexdatei abgebrochen" msgid "invalid color value: %.*s" msgstr "Ungültiger Farbwert: %.*s" -#: commit.c:50 sequencer.c:2567 builtin/am.c:355 builtin/am.c:399 -#: builtin/am.c:1375 builtin/am.c:2019 builtin/replace.c:376 -#: builtin/replace.c:448 +#: 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 "konnte %s nicht parsen" @@ -1396,28 +1394,28 @@ msgstr "" "Sie können diese Meldung unterdrücken, indem Sie\n" "\"git config advice.graftFileDeprecated false\" ausführen." -#: commit.c:1122 +#: commit.c:1128 #, 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:1125 +#: commit.c:1131 #, 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:1128 +#: commit.c:1134 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "Commit %s hat keine GPG-Signatur." -#: commit.c:1131 +#: commit.c:1137 #, 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:1385 +#: 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" @@ -1429,133 +1427,203 @@ msgstr "" "Encoding,\n" "welches von ihrem Projekt verwendet wird.\n" -#: commit-graph.c:101 -#, c-format -msgid "graph file %s is too small" -msgstr "Graph-Datei %s ist zu klein." +#: commit-graph.c:105 +msgid "commit-graph file is too small" +msgstr "Commit-Graph-Datei ist zu klein." -#: commit-graph.c:136 +#: commit-graph.c:170 #, c-format -msgid "graph signature %X does not match signature %X" -msgstr "Graph-Signatur %X stimmt nicht mit Signatur %X überein." +msgid "commit-graph signature %X does not match signature %X" +msgstr "Commit-Graph-Signatur %X stimmt nicht mit Signatur %X überein." -#: commit-graph.c:143 +#: commit-graph.c:177 #, c-format -msgid "graph version %X does not match version %X" -msgstr "Graph-Version %X stimmt nicht mit Version %X überein." +msgid "commit-graph version %X does not match version %X" +msgstr "Commit-Graph-Version %X stimmt nicht mit Version %X überein." -#: commit-graph.c:150 +#: commit-graph.c:184 #, c-format -msgid "hash version %X does not match version %X" -msgstr "Hash-Version %X stimmt nicht mit Version %X überein." +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:173 -msgid "chunk lookup table entry missing; graph file may be incomplete" -msgstr "fehlender Tabelleneintrag für Chunk-Lookup; Graph-Datei möglicherweise unvollständig" +#: commit-graph.c:207 +msgid "commit-graph chunk lookup table entry missing; file may be incomplete" +msgstr "" +"fehlender Tabelleneintrag für Commit-Graph Chunk-Lookup; Datei " +"möglicherweise unvollständig" -#: commit-graph.c:184 +#: commit-graph.c:218 #, c-format -msgid "improper chunk offset %08x%08x" -msgstr "Unzulässiger Chunk-Offset %08x%08x" +msgid "commit-graph improper chunk offset %08x%08x" +msgstr "Unzulässiger Commit-Graph Chunk-Offset %08x%08x" -#: commit-graph.c:221 +#: commit-graph.c:255 #, c-format -msgid "chunk id %08x appears multiple times" -msgstr "Chunk-Id %08x kommt mehrfach vor." +msgid "commit-graph chunk id %08x appears multiple times" +msgstr "Commit-Graph Chunk-Id %08x kommt mehrfach vor." -#: commit-graph.c:334 +#: commit-graph.c:390 #, c-format msgid "could not find commit %s" msgstr "Konnte Commit %s nicht finden." -#: commit-graph.c:671 builtin/pack-objects.c:2646 +#: commit-graph.c:732 builtin/pack-objects.c:2649 #, c-format msgid "unable to get type of object %s" msgstr "Konnte Art von Objekt '%s' nicht bestimmen." -#: commit-graph.c:704 +#: commit-graph.c:765 msgid "Loading known commits in commit graph" msgstr "Lade bekannte Commits in Commit-Graph" -#: commit-graph.c:720 +#: commit-graph.c:781 msgid "Expanding reachable commits in commit graph" msgstr "Erweitere erreichbare Commits in Commit-Graph" -#: commit-graph.c:732 +#: commit-graph.c:793 msgid "Clearing commit marks in commit graph" msgstr "Lösche Commit-Markierungen in Commit-Graph" -#: commit-graph.c:752 +#: commit-graph.c:813 msgid "Computing commit graph generation numbers" msgstr "Commit-Graph Generierungsnummern berechnen" -#: commit-graph.c:869 +#: commit-graph.c:930 #, 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:882 +#: commit-graph.c:943 #, c-format msgid "error adding pack %s" msgstr "Fehler beim Hinzufügen von Paket %s." -#: commit-graph.c:884 +#: commit-graph.c:945 #, c-format msgid "error opening index for %s" msgstr "Fehler beim Öffnen des Index für %s." -#: commit-graph.c:898 +#: 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] "Suche Commits für Commit-Graph in %d Referenz" msgstr[1] "Suche Commits für Commit-Graph in %d Referenzen" -#: commit-graph.c:930 +#: commit-graph.c:991 msgid "Finding commits for commit graph among packed objects" msgstr "Suche Commits für Commit-Graph in gepackten Objekten" -#: commit-graph.c:943 +#: commit-graph.c:1004 msgid "Counting distinct commits in commit graph" msgstr "Zähle Commits in Commit-Graph" -#: commit-graph.c:956 +#: commit-graph.c:1017 #, c-format msgid "the commit graph format cannot write %d commits" msgstr "Das Commit-Graph Format kann nicht %d Commits schreiben." -#: commit-graph.c:965 +#: commit-graph.c:1026 msgid "Finding extra edges in commit graph" msgstr "Suche zusätzliche Ränder in Commit-Graph" -#: commit-graph.c:989 +#: commit-graph.c:1050 msgid "too many commits to write graph" msgstr "Zu viele Commits zum Schreiben des Graphen." -#: commit-graph.c:996 midx.c:769 +#: commit-graph.c:1057 midx.c:819 #, c-format msgid "unable to create leading directories of %s" msgstr "Konnte führende Verzeichnisse von '%s' nicht erstellen." -#: commit-graph.c:1036 +#: commit-graph.c:1097 #, 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:1109 +#: commit-graph.c:1162 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:1153 +#: commit-graph.c:1172 +#, 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:1182 commit-graph.c:1197 +#, 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:1189 +#, c-format +msgid "failed to parse commit %s from commit-graph" +msgstr "Konnte Commit %s von Commit-Graph nicht parsen." + +#: commit-graph.c:1206 msgid "Verifying commits in commit graph" msgstr "Commit in Commit-Graph überprüfen" +#: commit-graph.c:1219 +#, 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:1226 +#, 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:1236 +#, 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:1242 +#, 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:1255 +#, 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:1260 +#, c-format +msgid "" +"commit-graph has generation number zero for commit %s, but non-zero elsewhere" +msgstr "" +"Commit-Graph hat Generationsnummer null für Commit %s, aber sonst ungleich " +"null" + +#: commit-graph.c:1264 +#, c-format +msgid "" +"commit-graph has non-zero generation number for commit %s, but zero elsewhere" +msgstr "" +"Commit-Graph hat Generationsnummer ungleich null für Commit %s, aber sonst " +"null" + +#: commit-graph.c:1279 +#, c-format +msgid "commit-graph generation for commit %s is %u != %u" +msgstr "Commit-Graph Erstellung für Commit %s ist %u != %u" + +#: commit-graph.c:1285 +#, 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>" + #: compat/obstack.c:406 compat/obstack.c:408 msgid "memory exhausted" msgstr "Speicher verbraucht" @@ -1602,7 +1670,7 @@ msgstr "Schlüssel enthält keine Sektion: %s" msgid "key does not contain variable name: %s" msgstr "Schlüssel enthält keinen Variablennamen: %s" -#: config.c:378 sequencer.c:2330 +#: config.c:378 sequencer.c:2459 #, c-format msgid "invalid key: %s" msgstr "Ungültiger Schlüssel: %s" @@ -1746,142 +1814,142 @@ msgid "must be one of nothing, matching, simple, upstream or current" msgstr "" "Muss einer von diesen sein: nothing, matching, simple, upstream, current" -#: config.c:1481 builtin/pack-objects.c:3394 +#: config.c:1483 builtin/pack-objects.c:3397 #, c-format msgid "bad pack compression level %d" msgstr "ungültiger Komprimierungsgrad (%d) für Paketierung" -#: config.c:1602 +#: config.c:1604 #, c-format msgid "unable to load config blob object '%s'" msgstr "Konnte Blob-Objekt '%s' für Konfiguration nicht laden." -#: config.c:1605 +#: config.c:1607 #, c-format msgid "reference '%s' does not point to a blob" msgstr "Referenz '%s' zeigt auf keinen Blob." -#: config.c:1622 +#: config.c:1624 #, c-format msgid "unable to resolve config blob '%s'" msgstr "Konnte Blob '%s' für Konfiguration nicht auflösen." -#: config.c:1652 +#: config.c:1654 #, c-format msgid "failed to parse %s" msgstr "Fehler beim Parsen von %s." -#: config.c:1705 +#: config.c:1710 msgid "unable to parse command-line config" msgstr "" "Konnte die über die Befehlszeile angegebene Konfiguration nicht parsen." -#: config.c:2037 +#: config.c:2059 msgid "unknown error occurred while reading the configuration files" msgstr "" "Es trat ein unbekannter Fehler beim Lesen der Konfigurationsdateien auf." -#: config.c:2207 +#: config.c:2229 #, c-format msgid "Invalid %s: '%s'" msgstr "Ungültiger %s: '%s'" -#: config.c:2250 +#: config.c:2272 #, c-format msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" msgstr "" "Unbekannter Wert '%s' in core.untrackedCache; benutze Standardwert 'keep'" -#: config.c:2276 +#: config.c:2298 #, 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:2322 +#: config.c:2344 #, 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:2324 +#: config.c:2346 #, 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:2405 +#: config.c:2427 #, c-format msgid "invalid section name '%s'" msgstr "Ungültiger Sektionsname '%s'" -#: config.c:2437 +#: config.c:2459 #, c-format msgid "%s has multiple values" msgstr "%s hat mehrere Werte" -#: config.c:2466 +#: config.c:2488 #, c-format msgid "failed to write new configuration file %s" msgstr "Konnte neue Konfigurationsdatei '%s' nicht schreiben." -#: config.c:2716 config.c:3040 +#: config.c:2740 config.c:3064 #, c-format msgid "could not lock config file %s" msgstr "Konnte Konfigurationsdatei '%s' nicht sperren." -#: config.c:2727 +#: config.c:2751 #, c-format msgid "opening %s" msgstr "Öffne %s" -#: config.c:2762 builtin/config.c:328 +#: config.c:2786 builtin/config.c:328 #, c-format msgid "invalid pattern: %s" msgstr "Ungültiges Muster: %s" -#: config.c:2787 +#: config.c:2811 #, c-format msgid "invalid config file %s" msgstr "Ungültige Konfigurationsdatei %s" -#: config.c:2800 config.c:3053 +#: config.c:2824 config.c:3077 #, c-format msgid "fstat on %s failed" msgstr "fstat auf %s fehlgeschlagen" -#: config.c:2811 +#: config.c:2835 #, c-format msgid "unable to mmap '%s'" msgstr "mmap für '%s' fehlgeschlagen" -#: config.c:2820 config.c:3058 +#: config.c:2844 config.c:3082 #, c-format msgid "chmod on %s failed" msgstr "chmod auf %s fehlgeschlagen" -#: config.c:2905 config.c:3155 +#: config.c:2929 config.c:3179 #, c-format msgid "could not write config file %s" msgstr "Konnte Konfigurationsdatei %s nicht schreiben." -#: config.c:2939 +#: config.c:2963 #, c-format msgid "could not set '%s' to '%s'" msgstr "Konnte '%s' nicht zu '%s' setzen." -#: config.c:2941 builtin/remote.c:782 +#: config.c:2965 builtin/remote.c:782 #, c-format msgid "could not unset '%s'" msgstr "Konnte '%s' nicht aufheben." -#: config.c:3031 +#: config.c:3055 #, c-format msgid "invalid section name: %s" msgstr "Ungültiger Sektionsname: %s" -#: config.c:3198 +#: config.c:3222 #, c-format msgid "missing value for '%s'" msgstr "Fehlender Wert für '%s'" @@ -2040,28 +2108,28 @@ msgstr "SSH-Variante 'simple' unterstützt kein -6." msgid "ssh variant 'simple' does not support setting port" msgstr "SSH-Variante 'simple' unterstützt nicht das Setzen eines Ports." -#: connect.c:1259 +#: connect.c:1260 #, c-format msgid "strange pathname '%s' blocked" msgstr "Merkwürdigen Pfadnamen '%s' blockiert." -#: connect.c:1304 +#: connect.c:1307 msgid "unable to fork" msgstr "Kann Prozess nicht starten." -#: connected.c:68 builtin/fsck.c:221 builtin/prune.c:146 +#: connected.c:85 builtin/fsck.c:221 builtin/prune.c:43 msgid "Checking connectivity" msgstr "Prüfe Konnektivität" -#: connected.c:80 +#: connected.c:97 msgid "Could not run 'git rev-list'" msgstr "Konnte 'git rev-list' nicht ausführen" -#: connected.c:100 +#: connected.c:117 msgid "failed write to rev-list" msgstr "Fehler beim Schreiben nach rev-list" -#: connected.c:107 +#: connected.c:124 msgid "failed to close rev-list's stdin" msgstr "Fehler beim Schließen von rev-list's Standard-Eingabe" @@ -2298,23 +2366,30 @@ msgstr "Fehler beim Lesen der Reihenfolgedatei '%s'." msgid "Performing inexact rename detection" msgstr "Führe Erkennung für ungenaue Umbenennung aus" -#: diff.c:108 -#, c-format -msgid "option '%s' requires a value" -msgstr "Option '%s' erfordert einen Wert." +#: diff-no-index.c:238 +msgid "git diff --no-index [<options>] <path> <path>" +msgstr "git diff --no-index [<Optionen>] <Pfad> <Pfad>" + +#: diff-no-index.c:263 +msgid "" +"Not a git repository. Use --no-index to compare two paths outside a working " +"tree" +msgstr "" +"Kein Git-Repository. Nutzen Sie --no-index, um zwei Pfade außerhalb des " +"Arbeitsverzeichnisses zu vergleichen." -#: diff.c:158 +#: diff.c:155 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr "" " Fehler beim Parsen des abgeschnittenen \"dirstat\" Prozentsatzes '%s'\n" -#: diff.c:163 +#: diff.c:160 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr " Unbekannter \"dirstat\" Parameter '%s'\n" -#: diff.c:291 +#: diff.c:296 msgid "" "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', " "'dimmed-zebra', 'plain'" @@ -2322,14 +2397,16 @@ msgstr "" "\"color moved\"-Einstellung muss eines von diesen sein: 'no', 'default', " "'blocks', 'zebra', 'dimmed_zebra', 'plain'" -#: diff.c:319 +#: diff.c:324 #, 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 "Unbekannter color-moved-ws Modus '%s', mögliche Werte sind 'ignore-space-change', 'ignore-space-at-eol', 'ignore-all-space', 'allow-identation-change'" +msgstr "" +"Unbekannter color-moved-ws Modus '%s', mögliche Werte sind 'ignore-space-" +"change', 'ignore-space-at-eol', 'ignore-all-space', 'allow-identation-change'" -#: diff.c:327 +#: diff.c:332 msgid "" "color-moved-ws: allow-indentation-change cannot be combined with other " "whitespace modes" @@ -2337,12 +2414,12 @@ msgstr "" "color-moved-ws: allow-indentation-change kann nicht mit anderen\n" "Whitespace-Modi kombiniert werden." -#: diff.c:400 +#: diff.c:405 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "Unbekannter Wert in Konfigurationsvariable 'diff.dirstat': '%s'" -#: diff.c:460 +#: diff.c:465 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -2351,25 +2428,36 @@ msgstr "" "Fehler in 'diff.dirstat' Konfigurationsvariable gefunden:\n" "%s" -#: diff.c:4211 +#: diff.c:4210 #, c-format msgid "external diff died, stopping at %s" msgstr "externes Diff-Programm unerwartet beendet, angehalten bei %s" -#: diff.c:4553 +#: diff.c:4555 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:4556 +#: diff.c:4558 msgid "-G, -S and --find-object are mutually exclusive" msgstr "-G, -S und --find-object schließen sich gegenseitig aus" -#: diff.c:4634 +#: diff.c:4636 msgid "--follow requires exactly one pathspec" msgstr "--follow erfordert genau eine Pfadspezifikation" -#: diff.c:4800 +#: diff.c:4684 +#, c-format +msgid "invalid --stat value: %s" +msgstr "Ungültiger --stat Wert: %s" + +#: diff.c:4689 diff.c:4694 diff.c:4699 diff.c:4704 diff.c:5217 +#: parse-options.c:199 parse-options.c:203 +#, c-format +msgid "%s expects a numerical value" +msgstr "%s erwartet einen numerischen Wert." + +#: diff.c:4721 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -2378,22 +2466,523 @@ msgstr "" "Fehler beim Parsen des --dirstat/-X Optionsparameters:\n" "%s" -#: diff.c:4814 +#: diff.c:4806 #, c-format -msgid "Failed to parse --submodule option parameter: '%s'" +msgid "unknown change class '%c' in --diff-filter=%s" +msgstr "Unbekannte Änderungsklasse '%c' in --diff-filter=%s" + +#: diff.c:4830 +#, c-format +msgid "unknown value after ws-error-highlight=%.*s" +msgstr "Unbekannter Wert nach ws-error-highlight=%.*s" + +#: diff.c:4844 +#, c-format +msgid "unable to resolve '%s'" +msgstr "konnte '%s' nicht auflösen" + +#: diff.c:4894 diff.c:4900 +#, c-format +msgid "%s expects <n>/<m> form" +msgstr "%s erwartet die Form <n>/<m>" + +#: diff.c:4912 +#, c-format +msgid "%s expects a character, got '%s'" +msgstr "%s erwartet ein Zeichen, '%s' bekommen" + +#: diff.c:4933 +#, c-format +msgid "bad --color-moved argument: %s" +msgstr "Ungültiges --color-moved Argument: %s" + +#: diff.c:4952 +#, c-format +msgid "invalid mode '%s' in --color-moved-ws" +msgstr "Ungültiger Modus '%s' in --color-moved-ws" + +#: diff.c:4992 +msgid "" +"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " +"\"histogram\"" +msgstr "" +"Option diff-algorithm akzeptiert: \"myers\", \"minimal\", \"patience\" and " +"\"histogram\"" + +#: diff.c:5028 diff.c:5048 +#, c-format +msgid "invalid argument to %s" +msgstr "Ungültiges Argument für %s" + +#: diff.c:5186 +#, c-format +msgid "failed to parse --submodule option parameter: '%s'" msgstr "Fehler beim Parsen des --submodule Optionsparameters: '%s'" -#: diff.c:5900 +#: diff.c:5242 +#, c-format +msgid "bad --word-diff argument: %s" +msgstr "Ungültiges --word-diff Argument: %s" + +#: diff.c:5265 +msgid "Diff output format options" +msgstr "Diff-Optionen zu Ausgabeformaten" + +#: diff.c:5267 diff.c:5273 +msgid "generate patch" +msgstr "Erzeuge Patch" + +#: diff.c:5270 builtin/log.c:167 +msgid "suppress diff output" +msgstr "Ausgabe der Unterschiede unterdrücken" + +#: diff.c:5275 diff.c:5389 diff.c:5396 +msgid "<n>" +msgstr "<n>" + +#: diff.c:5276 diff.c:5279 +msgid "generate diffs with <n> lines context" +msgstr "Erstelle Unterschiede mit <n> Zeilen des Kontextes" + +#: diff.c:5281 +msgid "generate the diff in raw format" +msgstr "Erstelle Unterschiede im Rohformat" + +#: diff.c:5284 +msgid "synonym for '-p --raw'" +msgstr "Synonym für '-p --raw'" + +#: diff.c:5288 +msgid "synonym for '-p --stat'" +msgstr "Synonym für '-p --stat'" + +#: diff.c:5292 +msgid "machine friendly --stat" +msgstr "maschinenlesbare Ausgabe von --stat" + +#: diff.c:5295 +msgid "output only the last line of --stat" +msgstr "nur die letzte Zeile von --stat ausgeben" + +#: diff.c:5297 diff.c:5305 +msgid "<param1,param2>..." +msgstr "<Parameter1,Parameter2>..." + +#: diff.c:5298 +msgid "" +"output the distribution of relative amount of changes for each sub-directory" +msgstr "" +"Gebe die Verteilung des relativen Umfangs der Änderungen für jedes " +"Unterverzeichnis aus" + +#: diff.c:5302 +msgid "synonym for --dirstat=cumulative" +msgstr "Synonym für --dirstat=cumulative" + +#: diff.c:5306 +msgid "synonym for --dirstat=files,param1,param2..." +msgstr "Synonym für --dirstat=files,Parameter1,Parameter2..." + +#: diff.c:5310 +msgid "warn if changes introduce conflict markers or whitespace errors" +msgstr "" +"Warnen, wenn Änderungen Konfliktmarker oder Whitespace-Fehler einbringen" + +#: diff.c:5313 +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:5316 +msgid "show only names of changed files" +msgstr "nur Dateinamen der geänderten Dateien anzeigen" + +#: diff.c:5319 +msgid "show only names and status of changed files" +msgstr "nur Dateinamen und Status der geänderten Dateien anzeigen" + +#: diff.c:5321 +msgid "<width>[,<name-width>[,<count>]]" +msgstr "<Breite>[,<Namens-Breite>[,<Anzahl>]]" + +#: diff.c:5322 +msgid "generate diffstat" +msgstr "Generiere Zusammenfassung der Unterschiede" + +#: diff.c:5324 diff.c:5327 diff.c:5330 +msgid "<width>" +msgstr "<Breite>" + +#: diff.c:5325 +msgid "generate diffstat with a given width" +msgstr "Erzeuge Zusammenfassung der Unterschiede mit gegebener Breite" + +#: diff.c:5328 +msgid "generate diffstat with a given name width" +msgstr "Erzeuge Zusammenfassung der Unterschiede mit gegebener Namens-Breite" + +#: diff.c:5331 +msgid "generate diffstat with a given graph width" +msgstr "Erzeuge Zusammenfassung der Unterschiede mit gegebener Graph-Breite" + +#: diff.c:5333 +msgid "<count>" +msgstr "<Anzahl>" + +#: diff.c:5334 +msgid "generate diffstat with limited lines" +msgstr "Erzeuge Zusammenfassung der Unterschiede mit begrenzten Zeilen" + +#: diff.c:5337 +msgid "generate compact summary in diffstat" +msgstr "Erzeuge kompakte Zusammenstellung in Zusammenfassung der Unterschiede" + +#: diff.c:5340 +msgid "output a binary diff that can be applied" +msgstr "Gebe eine binäre Differenz aus, dass angewendet werden kann" + +#: diff.c:5343 +msgid "show full pre- and post-image object names on the \"index\" lines" +msgstr "Zeige vollständige Objekt-Namen in den \"index\"-Zeilen" + +#: diff.c:5345 +msgid "show colored diff" +msgstr "Zeige farbige Unterschiede" + +#: diff.c:5346 +msgid "<kind>" +msgstr "<Art>" + +#: diff.c:5347 +msgid "" +"highlight whitespace errors in the 'context', 'old' or 'new' lines in the " +"diff" +msgstr "" +"Hebe Whitespace-Fehler in den Zeilen 'context', 'old' oder 'new' bei den " +"Unterschieden hervor" + +#: diff.c:5350 +msgid "" +"do not munge pathnames and use NULs as output field terminators in --raw or " +"--numstat" +msgstr "" +"Verschleiere nicht die Pfadnamen und nutze NUL-Zeichen als Schlusszeichen in " +"Ausgabefeldern bei --raw oder --numstat" + +#: diff.c:5353 diff.c:5356 diff.c:5359 diff.c:5465 +msgid "<prefix>" +msgstr "<Präfix>" + +#: diff.c:5354 +msgid "show the given source prefix instead of \"a/\"" +msgstr "Zeige den gegebenen Quell-Präfix statt \"a/\"" + +#: diff.c:5357 +msgid "show the given destination prefix instead of \"b/\"" +msgstr "Zeige den gegebenen Ziel-Präfix statt \"b/\"" + +#: diff.c:5360 +msgid "prepend an additional prefix to every line of output" +msgstr "Stelle einen zusätzlichen Präfix bei jeder Ausgabezeile voran" + +#: diff.c:5363 +msgid "do not show any source or destination prefix" +msgstr "Zeige keine Quell- oder Ziel-Präfixe an" + +#: diff.c:5366 +msgid "show context between diff hunks up to the specified number of lines" +msgstr "" +"Zeige Kontext zwischen Unterschied-Blöcken bis zur angegebenen Anzahl von " +"Zeilen." + +#: diff.c:5370 diff.c:5375 diff.c:5380 +msgid "<char>" +msgstr "<Zeichen>" + +#: diff.c:5371 +msgid "specify the character to indicate a new line instead of '+'" +msgstr "Das Zeichen festlegen, das eine neue Zeile kennzeichnet (statt '+')" + +#: diff.c:5376 +msgid "specify the character to indicate an old line instead of '-'" +msgstr "Das Zeichen festlegen, das eine alte Zeile kennzeichnet (statt '-')" + +#: diff.c:5381 +msgid "specify the character to indicate a context instead of ' '" +msgstr "Das Zeichen festlegen, das den Kontext kennzeichnet (statt ' ')" + +#: diff.c:5384 +msgid "Diff rename options" +msgstr "Diff-Optionen zur Umbenennung" + +#: diff.c:5385 +msgid "<n>[/<m>]" +msgstr "<n>[/<m>]" + +#: diff.c:5386 +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:5390 +msgid "detect renames" +msgstr "Umbenennungen erkennen" + +#: diff.c:5394 +msgid "omit the preimage for deletes" +msgstr "Preimage für Löschungen weglassen." + +#: diff.c:5397 +msgid "detect copies" +msgstr "Kopien erkennen" + +#: diff.c:5401 +msgid "use unmodified files as source to find copies" +msgstr "Nutze ungeänderte Dateien als Quelle zum Finden von Kopien" + +#: diff.c:5403 +msgid "disable rename detection" +msgstr "Erkennung von Umbenennungen deaktivieren" + +#: diff.c:5406 +msgid "use empty blobs as rename source" +msgstr "Nutze leere Blobs als Quelle von Umbennungen" + +#: diff.c:5408 +msgid "continue listing the history of a file beyond renames" +msgstr "Fortführen der Auflistung der Historie einer Datei nach Umbennung" + +#: diff.c:5411 +msgid "" +"prevent rename/copy detection if the number of rename/copy targets exceeds " +"given limit" +msgstr "" +"Verhindere die Erkennung von Umbennungen und Kopien, wenn die Anzahl der " +"Ziele für Umbennungen und Kopien das gegebene Limit überschreitet" + +#: diff.c:5413 +msgid "Diff algorithm options" +msgstr "Diff Algorithmus-Optionen" + +#: diff.c:5415 +msgid "produce the smallest possible diff" +msgstr "Erzeuge die kleinstmöglichen Änderungen" + +#: diff.c:5418 +msgid "ignore whitespace when comparing lines" +msgstr "Whitespace-Änderungen beim Vergleich von Zeilen ignorieren" + +#: diff.c:5421 +msgid "ignore changes in amount of whitespace" +msgstr "Änderungen bei der Anzahl von Whitespace ignorieren" + +#: diff.c:5424 +msgid "ignore changes in whitespace at EOL" +msgstr "Whitespace-Änderungen am Zeilenende ignorieren" + +#: diff.c:5427 +msgid "ignore carrier-return at the end of line" +msgstr "Ignoriere den Zeilenumbruch am Ende der Zeile" + +#: diff.c:5430 +msgid "ignore changes whose lines are all blank" +msgstr "Ignoriere Änderungen in leeren Zeilen" + +#: diff.c:5433 +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:5436 +msgid "generate diff using the \"patience diff\" algorithm" +msgstr "Erzeuge Änderungen durch Nutzung des Algorithmus \"Patience Diff\"" + +#: diff.c:5440 +msgid "generate diff using the \"histogram diff\" algorithm" +msgstr "Erzeuge Änderungen durch Nutzung des Algorithmus \"Histogram Diff\"" + +#: diff.c:5442 +msgid "<algorithm>" +msgstr "<Algorithmus>" + +#: diff.c:5443 +msgid "choose a diff algorithm" +msgstr "Ein Algorithmus für Änderungen wählen" + +#: diff.c:5445 +msgid "<text>" +msgstr "<Text>" + +#: diff.c:5446 +msgid "generate diff using the \"anchored diff\" algorithm" +msgstr "Erzeuge Änderungen durch Nutzung des Algorithmus \"Anchored Diff\"" + +#: diff.c:5448 diff.c:5457 diff.c:5460 +msgid "<mode>" +msgstr "<Modus>" + +#: diff.c:5449 +msgid "show word diff, using <mode> to delimit changed words" +msgstr "Zeige Wort-Änderungen, nutze <Modus>, um Wörter abzugrenzen" + +#: diff.c:5451 diff.c:5454 diff.c:5499 +msgid "<regex>" +msgstr "<Regex>" + +#: diff.c:5452 +msgid "use <regex> to decide what a word is" +msgstr "Nutze <Regex>, um zu entscheiden, was ein Wort ist" + +#: diff.c:5455 +msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" +msgstr "Entsprechend wie --word-diff=color --word-diff-regex=<Regex>" + +#: diff.c:5458 +msgid "moved lines of code are colored differently" +msgstr "Verschobene Codezeilen sind andersfarbig" + +#: diff.c:5461 +msgid "how white spaces are ignored in --color-moved" +msgstr "Wie Whitespaces in --color-moved ignoriert werden" + +#: diff.c:5464 +msgid "Other diff options" +msgstr "Andere Diff-Optionen" + +#: diff.c:5466 +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:5470 +msgid "treat all files as text" +msgstr "alle Dateien als Text behandeln" + +#: diff.c:5472 +msgid "swap two inputs, reverse the diff" +msgstr "Vertausche die beiden Eingaben und drehe die Änderungen um" + +#: diff.c:5474 +msgid "exit with 1 if there were differences, 0 otherwise" +msgstr "" +"Beende mit Exit-Status 1, wenn Änderungen vorhanden sind, andernfalls mit 0" + +#: diff.c:5476 +msgid "disable all output of the program" +msgstr "Keine Ausgaben vom Programm" + +#: diff.c:5478 +msgid "allow an external diff helper to be executed" +msgstr "Erlaube die Ausführung eines externes Programms für Änderungen" + +#: diff.c:5480 +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:5482 +msgid "<when>" +msgstr "<wann>" + +#: diff.c:5483 +msgid "ignore changes to submodules in the diff generation" +msgstr "" +"Änderungen in Submodulen während der Erstellung der Unterschiede ignorieren" + +#: diff.c:5486 +msgid "<format>" +msgstr "<Format>" + +#: diff.c:5487 +msgid "specify how differences in submodules are shown" +msgstr "Angeben, wie Unterschiede in Submodulen gezeigt werden" + +#: diff.c:5491 +msgid "hide 'git add -N' entries from the index" +msgstr "verstecke 'git add -N' Einträge vom Index" + +#: diff.c:5494 +msgid "treat 'git add -N' entries as real in the index" +msgstr "Behandle 'git add -N' Einträge im Index als echt" + +#: diff.c:5496 +msgid "<string>" +msgstr "<Zeichenkette>" + +#: diff.c:5497 +msgid "" +"look for differences that change the number of occurrences of the specified " +"string" +msgstr "" +"Suche nach Unterschieden, welche die Anzahl des Vorkommens der angegebenen " +"Zeichenkette verändern" + +#: diff.c:5500 +msgid "" +"look for differences that change the number of occurrences of the specified " +"regex" +msgstr "" +"Suche nach Unterschieden, welche die Anzahl des Vorkommens des angegebenen " +"regulären Ausdrucks verändern" + +#: diff.c:5503 +msgid "show all changes in the changeset with -S or -G" +msgstr "zeige alle Änderungen im Changeset mit -S oder -G" + +#: diff.c:5506 +msgid "treat <string> in -S as extended POSIX regular expression" +msgstr "" +"behandle <Zeichenkette> bei -S als erweiterten POSIX regulären Ausdruck" + +#: diff.c:5509 +msgid "control the order in which files appear in the output" +msgstr "" +"kontrolliere die Reihenfolge, in der die Dateien in der Ausgabe erscheinen" + +#: diff.c:5510 +msgid "<object-id>" +msgstr "<Objekt-ID>" + +#: diff.c:5511 +msgid "" +"look for differences that change the number of occurrences of the specified " +"object" +msgstr "" +"Suche nach Unterschieden, welche die Anzahl des Vorkommens des angegebenen " +"Objektes verändern" + +#: diff.c:5513 +msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" +msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]" + +#: diff.c:5514 +msgid "select files by diff type" +msgstr "Wähle Dateien anhand der Art der Änderung" + +#: diff.c:5516 +msgid "<file>" +msgstr "<Datei>" + +#: diff.c:5517 +msgid "Output to a specific file" +msgstr "Ausgabe zu einer bestimmten Datei" + +#: diff.c:6150 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:5903 +#: diff.c:6153 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:5906 +#: diff.c:6156 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." @@ -2401,43 +2990,43 @@ msgstr "" "Sie könnten die Variable %s auf mindestens %d setzen und den Befehl\n" "erneut versuchen." -#: dir.c:538 +#: dir.c:537 #, c-format msgid "pathspec '%s' did not match any file(s) known to git" msgstr "" "Pfadspezifikation '%s' stimmt mit keinen git-bekannten Dateien überein." -#: dir.c:927 +#: dir.c:926 #, c-format msgid "cannot use %s as an exclude file" msgstr "Kann %s nicht als exclude-Filter benutzen." -#: dir.c:1842 +#: dir.c:1843 #, c-format msgid "could not open directory '%s'" msgstr "Konnte Verzeichnis '%s' nicht öffnen." -#: dir.c:2084 +#: dir.c:2085 msgid "failed to get kernel name and information" msgstr "Fehler beim Sammeln von Namen und Informationen zum Kernel" -#: dir.c:2208 +#: dir.c:2209 msgid "untracked cache is disabled on this system or location" msgstr "" "Cache für unversionierte Dateien ist auf diesem System oder\n" "für dieses Verzeichnis deaktiviert." -#: dir.c:3009 +#: dir.c:3013 #, c-format msgid "index file corrupt in repo %s" msgstr "Index-Datei in Repository %s beschädigt." -#: dir.c:3054 dir.c:3059 +#: dir.c:3058 dir.c:3063 #, c-format msgid "could not create directories for %s" msgstr "Konnte Verzeichnisse für '%s' nicht erstellen." -#: dir.c:3088 +#: dir.c:3092 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "Konnte Git-Verzeichnis nicht von '%s' nach '%s' migrieren." @@ -2451,7 +3040,7 @@ msgstr "Hinweis: Warte auf das Schließen der Datei durch Ihren Editor...%c" msgid "Filtering content" msgstr "Filtere Inhalt" -#: entry.c:465 +#: entry.c:476 #, c-format msgid "could not stat file '%s'" msgstr "Konnte Datei '%s' nicht lesen." @@ -2466,7 +3055,7 @@ msgstr "Ungültiger Git-Namespace-Pfad \"%s\"" msgid "could not set GIT_DIR to '%s'" msgstr "Konnte GIT_DIR nicht zu '%s' setzen." -#: exec-cmd.c:361 +#: exec-cmd.c:363 #, c-format msgid "too many args to run %s" msgstr "Zu viele Argumente angegeben, um %s auszuführen." @@ -2492,226 +3081,234 @@ msgstr "git fetch-pack: ACK/NAK erwartet, Flush-Paket bekommen" msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "git fetch-pack: ACK/NAK erwartet, '%s' bekommen" -#: fetch-pack.c:256 +#: fetch-pack.c:196 +msgid "unable to write to remote" +msgstr "konnte nicht zum Remote schreiben" + +#: fetch-pack.c:258 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc benötigt multi_ack_detailed" -#: fetch-pack.c:358 fetch-pack.c:1264 +#: fetch-pack.c:360 fetch-pack.c:1271 #, c-format msgid "invalid shallow line: %s" msgstr "Ungültige shallow-Zeile: %s" -#: fetch-pack.c:364 fetch-pack.c:1271 +#: fetch-pack.c:366 fetch-pack.c:1277 #, c-format msgid "invalid unshallow line: %s" msgstr "Ungültige unshallow-Zeile: %s" -#: fetch-pack.c:366 fetch-pack.c:1273 +#: fetch-pack.c:368 fetch-pack.c:1279 #, c-format msgid "object not found: %s" msgstr "Objekt nicht gefunden: %s" -#: fetch-pack.c:369 fetch-pack.c:1276 +#: fetch-pack.c:371 fetch-pack.c:1282 #, c-format msgid "error in object: %s" msgstr "Fehler in Objekt: %s" -#: fetch-pack.c:371 fetch-pack.c:1278 +#: fetch-pack.c:373 fetch-pack.c:1284 #, c-format msgid "no shallow found: %s" msgstr "Kein shallow-Objekt gefunden: %s" -#: fetch-pack.c:374 fetch-pack.c:1282 +#: fetch-pack.c:376 fetch-pack.c:1288 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "shallow/unshallow erwartet, %s bekommen" -#: fetch-pack.c:415 +#: fetch-pack.c:417 #, c-format msgid "got %s %d %s" msgstr "%s %d %s bekommen" -#: fetch-pack.c:432 +#: fetch-pack.c:434 #, c-format msgid "invalid commit %s" msgstr "Ungültiger Commit %s" -#: fetch-pack.c:463 +#: fetch-pack.c:465 msgid "giving up" msgstr "Gebe auf" -#: fetch-pack.c:475 progress.c:229 +#: fetch-pack.c:477 progress.c:284 msgid "done" msgstr "Fertig" -#: fetch-pack.c:487 +#: fetch-pack.c:489 #, c-format msgid "got %s (%d) %s" msgstr "%s (%d) %s bekommen" -#: fetch-pack.c:533 +#: fetch-pack.c:535 #, c-format msgid "Marking %s as complete" msgstr "Markiere %s als vollständig" -#: fetch-pack.c:740 +#: fetch-pack.c:744 #, c-format msgid "already have %s (%s)" msgstr "habe %s (%s) bereits" -#: fetch-pack.c:779 +#: fetch-pack.c:783 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-pack: Fehler beim Starten des sideband demultiplexer" -#: fetch-pack.c:787 +#: fetch-pack.c:791 msgid "protocol error: bad pack header" msgstr "Protokollfehler: ungültiger Pack-Header" -#: fetch-pack.c:855 +#: fetch-pack.c:859 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-pack: konnte %s nicht starten" -#: fetch-pack.c:871 +#: fetch-pack.c:875 #, c-format msgid "%s failed" msgstr "%s fehlgeschlagen" -#: fetch-pack.c:873 +#: fetch-pack.c:877 msgid "error in sideband demultiplexer" msgstr "Fehler in sideband demultiplexer" -#: fetch-pack.c:902 +#: fetch-pack.c:906 msgid "Server does not support shallow clients" msgstr "Server unterstützt keine shallow-Clients" -#: fetch-pack.c:906 +#: fetch-pack.c:910 msgid "Server supports multi_ack_detailed" msgstr "Server unterstützt multi_ack_detailed" -#: fetch-pack.c:909 +#: fetch-pack.c:913 msgid "Server supports no-done" msgstr "Server unterstützt no-done" -#: fetch-pack.c:915 +#: fetch-pack.c:919 msgid "Server supports multi_ack" msgstr "Server unterstützt multi_ack" -#: fetch-pack.c:919 +#: fetch-pack.c:923 msgid "Server supports side-band-64k" msgstr "Server unterstützt side-band-64k" -#: fetch-pack.c:923 +#: fetch-pack.c:927 msgid "Server supports side-band" msgstr "Server unterstützt side-band" -#: fetch-pack.c:927 +#: fetch-pack.c:931 msgid "Server supports allow-tip-sha1-in-want" msgstr "Server unterstützt allow-tip-sha1-in-want" -#: fetch-pack.c:931 +#: fetch-pack.c:935 msgid "Server supports allow-reachable-sha1-in-want" msgstr "Server unterstützt allow-reachable-sha1-in-want" -#: fetch-pack.c:941 +#: fetch-pack.c:945 msgid "Server supports ofs-delta" msgstr "Server unterstützt ofs-delta" -#: fetch-pack.c:947 fetch-pack.c:1140 +#: fetch-pack.c:951 fetch-pack.c:1144 msgid "Server supports filter" msgstr "Server unterstützt Filter" -#: fetch-pack.c:955 +#: fetch-pack.c:959 #, c-format msgid "Server version is %.*s" msgstr "Server-Version ist %.*s" -#: fetch-pack.c:961 +#: fetch-pack.c:965 msgid "Server does not support --shallow-since" msgstr "Server unterstützt kein --shallow-since" -#: fetch-pack.c:965 +#: fetch-pack.c:969 msgid "Server does not support --shallow-exclude" msgstr "Server unterstützt kein --shallow-exclude" -#: fetch-pack.c:967 +#: fetch-pack.c:971 msgid "Server does not support --deepen" msgstr "Server unterstützt kein --deepen" -#: fetch-pack.c:984 +#: fetch-pack.c:988 msgid "no common commits" msgstr "keine gemeinsamen Commits" -#: fetch-pack.c:996 fetch-pack.c:1419 +#: fetch-pack.c:1000 fetch-pack.c:1449 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack: Abholen fehlgeschlagen." -#: fetch-pack.c:1134 +#: fetch-pack.c:1138 msgid "Server does not support shallow requests" msgstr "Server unterstützt keine shallow-Anfragen." -#: fetch-pack.c:1184 +#: fetch-pack.c:1171 +msgid "unable to write request to remote" +msgstr "konnte Anfrage nicht zum Remote schreiben" + +#: fetch-pack.c:1189 #, c-format msgid "error reading section header '%s'" msgstr "Fehler beim Lesen von Sektionskopf '%s'." -#: fetch-pack.c:1190 +#: fetch-pack.c:1195 #, c-format msgid "expected '%s', received '%s'" msgstr "'%s' erwartet, '%s' empfangen" -#: fetch-pack.c:1229 +#: fetch-pack.c:1234 #, c-format msgid "unexpected acknowledgment line: '%s'" msgstr "Unerwartete Acknowledgment-Zeile: '%s'" -#: fetch-pack.c:1234 +#: fetch-pack.c:1239 #, c-format msgid "error processing acks: %d" msgstr "Fehler beim Verarbeiten von ACKS: %d" -#: fetch-pack.c:1244 +#: fetch-pack.c:1249 msgid "expected packfile to be sent after 'ready'" msgstr "Erwartete Versand einer Packdatei nach 'ready'." -#: fetch-pack.c:1246 +#: fetch-pack.c:1251 msgid "expected no other sections to be sent after no 'ready'" msgstr "Erwartete keinen Versand einer anderen Sektion ohne 'ready'." -#: fetch-pack.c:1287 +#: fetch-pack.c:1293 #, c-format msgid "error processing shallow info: %d" msgstr "Fehler beim Verarbeiten von Shallow-Informationen: %d" -#: fetch-pack.c:1308 +#: fetch-pack.c:1340 #, c-format msgid "expected wanted-ref, got '%s'" msgstr "wanted-ref erwartet, '%s' bekommen" -#: fetch-pack.c:1318 +#: fetch-pack.c:1345 #, c-format msgid "unexpected wanted-ref: '%s'" msgstr "Unerwartetes wanted-ref: '%s'" -#: fetch-pack.c:1322 +#: fetch-pack.c:1350 #, c-format msgid "error processing wanted refs: %d" msgstr "Fehler beim Verarbeiten von wanted-refs: %d" -#: fetch-pack.c:1646 +#: fetch-pack.c:1676 msgid "no matching remote head" msgstr "kein übereinstimmender Remote-Branch" -#: fetch-pack.c:1664 builtin/clone.c:671 +#: fetch-pack.c:1699 builtin/clone.c:673 msgid "remote did not send all necessary objects" msgstr "Remote-Repository hat nicht alle erforderlichen Objekte gesendet." -#: fetch-pack.c:1690 +#: fetch-pack.c:1726 #, c-format msgid "no such remote ref %s" msgstr "keine solche Remote-Referenz %s" -#: fetch-pack.c:1693 +#: fetch-pack.c:1729 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "Der Server lehnt Anfrage nach nicht angebotenem Objekt %s ab." @@ -2815,30 +3412,30 @@ 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:363 git.c:90 +#: help.c:363 git.c:97 #, c-format msgid "unsupported command listing type '%s'" msgstr "Nicht unterstützte Art zur Befehlsauflistung '%s'." -#: help.c:410 +#: help.c:403 msgid "The common Git guides are:" msgstr "Die allgemeinen Git-Anleitungen sind:" -#: help.c:519 +#: help.c:512 msgid "See 'git help <command>' to read about a specific subcommand" msgstr "" "Siehe 'git help <Befehl>', um mehr über einen spezifischen Unterbefehl zu " "lesen." -#: help.c:524 +#: help.c:517 msgid "External commands" msgstr "Externe Befehle" -#: help.c:539 +#: help.c:532 msgid "Command aliases" msgstr "Alias-Befehle" -#: help.c:603 +#: help.c:596 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" @@ -2847,32 +3444,32 @@ msgstr "" "'%s' scheint ein git-Befehl zu sein, konnte aber\n" "nicht ausgeführt werden. Vielleicht ist git-%s fehlerhaft?" -#: help.c:662 +#: help.c:655 msgid "Uh oh. Your system reports no Git commands at all." msgstr "Uh oh. Keine Git-Befehle auf Ihrem System vorhanden." -#: help.c:684 +#: help.c:677 #, c-format msgid "WARNING: You called a Git command named '%s', which does not exist." msgstr "" "WARNUNG: Sie haben Git-Befehl '%s' ausgeführt, welcher nicht existiert." -#: help.c:689 +#: help.c:682 #, c-format msgid "Continuing under the assumption that you meant '%s'." msgstr "Setze fort unter der Annahme, dass Sie '%s' meinten." -#: help.c:694 +#: help.c:687 #, c-format msgid "Continuing in %0.1f seconds, assuming that you meant '%s'." msgstr "Setze in %0.1f Sekunden fort unter der Annahme, dass Sie '%s' meinten." -#: help.c:702 +#: help.c:695 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "git: '%s' ist kein Git-Befehl. Siehe 'git --help'." -#: help.c:706 +#: help.c:699 msgid "" "\n" "The most similar command is" @@ -2886,16 +3483,16 @@ msgstr[1] "" "\n" "Die ähnlichsten Befehle sind" -#: help.c:721 +#: help.c:714 msgid "git version [<options>]" msgstr "git version [<Optionen>]" -#: help.c:789 +#: help.c:782 #, c-format msgid "%s: %s - %s" msgstr "%s: %s - %s" -#: help.c:793 +#: help.c:786 msgid "" "\n" "Did you mean this?" @@ -2909,7 +3506,7 @@ msgstr[1] "" "\n" "Haben Sie eines von diesen gemeint?" -#: ident.c:345 +#: ident.c:349 msgid "" "\n" "*** Please tell me who you are.\n" @@ -2935,39 +3532,55 @@ msgstr "" "Lassen Sie die Option \"--global\" weg, um die Identität nur\n" "für dieses Repository zu setzen.\n" -#: ident.c:369 +#: ident.c:379 msgid "no email was given and auto-detection is disabled" msgstr "keine E-Mail angegeben und automatische Erkennung ist deaktiviert" -#: ident.c:374 +#: ident.c:384 #, c-format msgid "unable to auto-detect email address (got '%s')" msgstr "Konnte die E-Mail-Adresse nicht automatisch erkennen ('%s' erhalten)" -#: ident.c:384 +#: ident.c:401 msgid "no name was given and auto-detection is disabled" msgstr "kein Name angegeben und automatische Erkennung ist deaktiviert" -#: ident.c:390 +#: ident.c:407 #, c-format msgid "unable to auto-detect name (got '%s')" msgstr "konnte Namen nicht automatisch erkennen ('%s' erhalten)" -#: ident.c:398 +#: ident.c:415 #, c-format msgid "empty ident name (for <%s>) not allowed" msgstr "Leerer Name in Identifikation (für <%s>) nicht erlaubt." -#: ident.c:404 +#: ident.c:421 #, c-format msgid "name consists only of disallowed characters: %s" msgstr "Name besteht nur aus nicht erlaubten Zeichen: %s" -#: ident.c:419 builtin/commit.c:608 +#: ident.c:436 builtin/commit.c:608 #, c-format msgid "invalid date format: %s" msgstr "Ungültiges Datumsformat: %s" +#: list-objects.c:129 +#, c-format +msgid "entry '%s' in tree %s has tree mode, but is not a tree" +msgstr "" +"Eintrag '%s' im Tree-Objekt %s hat Tree-Modus, aber ist kein Tree-Objekt" + +#: list-objects.c:142 +#, c-format +msgid "entry '%s' in tree %s has blob mode, but is not a blob" +msgstr "Eintrag '%s' im Tree-Objekt %s hat Blob-Modus, aber ist kein Blob" + +#: list-objects.c:378 +#, c-format +msgid "unable to load root tree for commit %s" +msgstr "Konnte Root-Tree-Objekt für Commit %s nicht laden." + #: list-objects-filter-options.c:36 msgid "multiple filter-specs cannot be combined" msgstr "Mehrere filter-specs können nicht kombiniert werden." @@ -2976,7 +3589,11 @@ msgstr "Mehrere filter-specs können nicht kombiniert werden." msgid "expected 'tree:<depth>'" msgstr "'tree:<Tiefe>' erwartet" -#: list-objects-filter-options.c:152 +#: list-objects-filter-options.c:84 +msgid "sparse:path filters support has been dropped" +msgstr "Keine Unterstützung für sparse:path Filter mehr" + +#: list-objects-filter-options.c:158 msgid "cannot change partial clone promisor remote" msgstr "Kann Remote-Repository für partielles Klonen nicht ändern." @@ -3009,117 +3626,118 @@ msgstr "Konnte '%s.lock' nicht erstellen: %s" msgid "failed to read the cache" msgstr "Lesen des Zwischenspeichers fehlgeschlagen" -#: merge.c:107 rerere.c:720 builtin/am.c:1884 builtin/am.c:1918 -#: builtin/checkout.c:416 builtin/checkout.c:745 builtin/clone.c:771 +#: 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 "Konnte neue Index-Datei nicht schreiben." -#: merge-recursive.c:332 +#: merge-recursive.c:322 msgid "(bad commit)\n" msgstr "(ungültiger Commit)\n" -#: merge-recursive.c:355 +#: merge-recursive.c:345 #, c-format msgid "add_cacheinfo failed for path '%s'; merge aborting." msgstr "add_cacheinfo für Pfad '%s' fehlgeschlagen; Merge wird abgebrochen." -#: merge-recursive.c:364 +#: merge-recursive.c:354 #, c-format msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." msgstr "" "add_cacheinfo zur Aktualisierung für Pfad '%s' fehlgeschlagen;\n" "Merge wird abgebrochen." -#: merge-recursive.c:447 +#: merge-recursive.c:437 msgid "error building trees" msgstr "Fehler beim Erstellen der \"Tree\"-Objekte" -#: merge-recursive.c:902 +#: merge-recursive.c:861 #, c-format msgid "failed to create path '%s'%s" msgstr "Fehler beim Erstellen des Pfades '%s'%s" -#: merge-recursive.c:913 +#: merge-recursive.c:872 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "Entferne %s, um Platz für Unterverzeichnis zu schaffen\n" -#: merge-recursive.c:927 merge-recursive.c:946 +#: merge-recursive.c:886 merge-recursive.c:905 msgid ": perhaps a D/F conflict?" msgstr ": vielleicht ein Verzeichnis/Datei-Konflikt?" -#: merge-recursive.c:936 +#: merge-recursive.c:895 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "verweigere, da unversionierte Dateien in '%s' verloren gehen würden" -#: merge-recursive.c:978 builtin/cat-file.c:40 +#: merge-recursive.c:936 builtin/cat-file.c:40 #, c-format msgid "cannot read object %s '%s'" msgstr "kann Objekt %s '%s' nicht lesen" -#: merge-recursive.c:980 +#: merge-recursive.c:939 #, c-format msgid "blob expected for %s '%s'" msgstr "Blob erwartet für %s '%s'" -#: merge-recursive.c:1004 +#: merge-recursive.c:963 #, c-format msgid "failed to open '%s': %s" msgstr "Fehler beim Öffnen von '%s': %s" -#: merge-recursive.c:1015 +#: merge-recursive.c:974 #, c-format msgid "failed to symlink '%s': %s" msgstr "Fehler beim Erstellen einer symbolischen Verknüpfung für '%s': %s" -#: merge-recursive.c:1020 +#: merge-recursive.c:979 #, c-format 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:1211 +#: merge-recursive.c:1175 #, c-format msgid "Failed to merge submodule %s (not checked out)" msgstr "Fehler beim Merge von Submodul %s (nicht ausgecheckt)." -#: merge-recursive.c:1218 +#: merge-recursive.c:1182 #, c-format msgid "Failed to merge submodule %s (commits not present)" msgstr "Fehler beim Merge von Submodul %s (Commits nicht vorhanden)." -#: merge-recursive.c:1225 +#: merge-recursive.c:1189 #, 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:1233 merge-recursive.c:1245 +#: merge-recursive.c:1197 merge-recursive.c:1209 #, c-format msgid "Fast-forwarding submodule %s to the following commit:" msgstr "Spule Submodul %s zu dem folgenden Commit vor:" -#: merge-recursive.c:1236 merge-recursive.c:1248 +#: merge-recursive.c:1200 merge-recursive.c:1212 #, c-format msgid "Fast-forwarding submodule %s" msgstr "Spule Submodul %s vor" -#: merge-recursive.c:1271 +#: merge-recursive.c:1235 #, c-format msgid "Failed to merge submodule %s (merge following commits not found)" msgstr "" "Fehler beim Merge von Submodule %s (dem Merge nachfolgende Commits nicht " "gefunden)" -#: merge-recursive.c:1275 +#: merge-recursive.c:1239 #, c-format msgid "Failed to merge submodule %s (not fast-forward)" msgstr "Fehler beim Merge von Submodul %s (kein Vorspulen)" -#: merge-recursive.c:1276 +#: merge-recursive.c:1240 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:1279 +#: merge-recursive.c:1243 #, c-format msgid "" "If this is correct simply add it to the index for example\n" @@ -3136,33 +3754,33 @@ msgstr "" "\n" "hinzu, um diesen Vorschlag zu akzeptieren.\n" -#: merge-recursive.c:1288 +#: merge-recursive.c:1252 #, c-format msgid "Failed to merge submodule %s (multiple merges found)" msgstr "Fehler beim Merge von Submodul %s (mehrere Merges gefunden)" -#: merge-recursive.c:1361 +#: merge-recursive.c:1325 msgid "Failed to execute internal merge" msgstr "Fehler bei Ausführung des internen Merges" -#: merge-recursive.c:1366 +#: merge-recursive.c:1330 #, c-format msgid "Unable to add %s to database" msgstr "Konnte %s nicht zur Datenbank hinzufügen" -#: merge-recursive.c:1398 +#: merge-recursive.c:1362 #, c-format msgid "Auto-merging %s" msgstr "automatischer Merge von %s" -#: merge-recursive.c:1419 +#: merge-recursive.c:1385 #, c-format msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." msgstr "" "Fehler: Verweigere unversionierte Datei bei %s zu verlieren;\n" "schreibe stattdessen nach %s." -#: merge-recursive.c:1486 +#: merge-recursive.c:1457 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -3171,7 +3789,7 @@ msgstr "" "KONFLIKT (%s/löschen): %s gelöscht in %s und %s in %s. Stand %s von %s wurde " "im Arbeitsbereich gelassen." -#: merge-recursive.c:1491 +#: merge-recursive.c:1462 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -3180,7 +3798,7 @@ msgstr "" "KONFLIKT (%s/löschen): %s gelöscht in %s und %s nach %s in %s. Stand %s von " "%s wurde im Arbeitsbereich gelassen." -#: merge-recursive.c:1498 +#: merge-recursive.c:1469 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -3189,7 +3807,7 @@ msgstr "" "KONFLIKT (%s/löschen): %s gelöscht in %s und %s in %s. Stand %s von %s wurde " "im Arbeitsbereich bei %s gelassen." -#: merge-recursive.c:1503 +#: merge-recursive.c:1474 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -3198,46 +3816,46 @@ msgstr "" "KONFLIKT (%s/löschen): %s gelöscht in %s und %s nach %s in %s. Stand %s von " "%s wurde im Arbeitsbereich bei %s gelassen." -#: merge-recursive.c:1537 +#: merge-recursive.c:1509 msgid "rename" msgstr "umbenennen" -#: merge-recursive.c:1537 +#: merge-recursive.c:1509 msgid "renamed" msgstr "umbenannt" -#: merge-recursive.c:1633 merge-recursive.c:2481 merge-recursive.c:3213 +#: merge-recursive.c:1589 merge-recursive.c:2445 merge-recursive.c:3085 #, c-format msgid "Refusing to lose dirty file at %s" msgstr "Verweigere geänderte Datei bei %s zu verlieren." -#: merge-recursive.c:1643 +#: merge-recursive.c:1599 #, c-format msgid "Refusing to lose untracked file at %s, even though it's in the way." msgstr "" "Verweigere unversionierte Datei bei %s zu verlieren, auch wenn diese im Weg " "ist." -#: merge-recursive.c:1706 +#: merge-recursive.c:1657 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s" msgstr "" "KONFLIKT (umbenennen/hinzufügen): Benenne um %s->%s in %s. %s hinzugefügt in " "%s" -#: merge-recursive.c:1734 +#: merge-recursive.c:1687 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s ist ein Verzeichnis in %s, füge es stattdessen als %s hinzu" -#: merge-recursive.c:1739 +#: merge-recursive.c:1692 #, c-format msgid "Refusing to lose untracked file at %s; adding as %s instead" msgstr "" "Verweigere unversionierte Datei bei %s zu verlieren; füge stattdessen %s " "hinzu" -#: merge-recursive.c:1759 +#: merge-recursive.c:1711 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -3246,18 +3864,18 @@ msgstr "" "KONFLIKT (umbenennen/umbenennen): Benenne um \"%s\"->\"%s\" in Branch \"%s\" " "und \"%s\"->\"%s\" in Branch \"%s\"%s" -#: merge-recursive.c:1764 +#: merge-recursive.c:1716 msgid " (left unresolved)" msgstr " (bleibt unaufgelöst)" -#: merge-recursive.c:1868 +#: merge-recursive.c:1825 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" "KONFLIKT (umbenennen/umbenennen): Benenne um %s->%s in %s. Benenne um %s->%s " "in %s" -#: merge-recursive.c:2064 +#: merge-recursive.c:2030 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to place %s because " @@ -3270,7 +3888,7 @@ msgstr "" "wobei\n" "keines dieser Ziele die Mehrheit der Dateien erhielt." -#: merge-recursive.c:2096 +#: merge-recursive.c:2062 #, c-format msgid "" "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " @@ -3281,7 +3899,7 @@ msgstr "" "Weg von impliziter Verzeichnisumbenennung, die versucht, einen oder mehrere\n" "Pfade dahin zu setzen: %s." -#: merge-recursive.c:2106 +#: merge-recursive.c:2072 #, c-format msgid "" "CONFLICT (implicit dir rename): Cannot map more than one path to %s; " @@ -3292,7 +3910,7 @@ msgstr "" "%s mappen; implizite Verzeichnisumbenennungen versuchten diese Pfade dahin\n" "zu setzen: %s" -#: merge-recursive.c:2198 +#: merge-recursive.c:2164 #, c-format msgid "" "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" @@ -3301,7 +3919,7 @@ msgstr "" "KONFLIKT (umbenennen/umbenennen): Benenne Verzeichnis um %s->%s in %s.\n" "Benenne Verzeichnis um %s->%s in %s" -#: merge-recursive.c:2443 +#: merge-recursive.c:2408 #, c-format msgid "" "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " @@ -3310,82 +3928,119 @@ msgstr "" "WARNUNG: Vermeide Umbenennung %s -> %s von %s, weil %s selbst umbenannt " "wurde." -#: merge-recursive.c:3022 +#: merge-recursive.c:2929 #, c-format msgid "cannot read object %s" msgstr "kann Objekt %s nicht lesen" -#: merge-recursive.c:3025 +#: merge-recursive.c:2932 #, c-format msgid "object %s is not a blob" msgstr "Objekt %s ist kein Blob" -#: merge-recursive.c:3094 +#: merge-recursive.c:2996 msgid "modify" msgstr "ändern" -#: merge-recursive.c:3094 +#: merge-recursive.c:2996 msgid "modified" msgstr "geändert" -#: merge-recursive.c:3105 +#: merge-recursive.c:3008 msgid "content" msgstr "Inhalt" -#: merge-recursive.c:3112 +#: merge-recursive.c:3012 msgid "add/add" msgstr "hinzufügen/hinzufügen" -#: merge-recursive.c:3160 +#: merge-recursive.c:3035 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "%s ausgelassen (Ergebnis des Merges existiert bereits)" -#: merge-recursive.c:3182 git-submodule.sh:861 +#: merge-recursive.c:3057 git-submodule.sh:937 msgid "submodule" msgstr "Submodul" -#: merge-recursive.c:3183 +#: merge-recursive.c:3058 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "KONFLIKT (%s): Merge-Konflikt in %s" -#: merge-recursive.c:3216 +#: merge-recursive.c:3088 #, c-format msgid "Adding as %s instead" msgstr "Füge stattdessen als %s hinzu" -#: merge-recursive.c:3319 +#: merge-recursive.c:3170 +#, 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:3173 +#, 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:3177 +#, 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:3180 +#, 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:3294 #, c-format msgid "Removing %s" msgstr "Entferne %s" -#: merge-recursive.c:3345 +#: merge-recursive.c:3317 msgid "file/directory" msgstr "Datei/Verzeichnis" -#: merge-recursive.c:3351 +#: merge-recursive.c:3322 msgid "directory/file" msgstr "Verzeichnis/Datei" -#: merge-recursive.c:3358 +#: merge-recursive.c:3329 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" "KONFLIKT (%s): Es existiert bereits ein Verzeichnis %s in %s. Füge %s als %s " "hinzu." -#: merge-recursive.c:3367 +#: merge-recursive.c:3338 #, c-format msgid "Adding %s" msgstr "Füge %s hinzu" -#: merge-recursive.c:3376 +#: merge-recursive.c:3347 #, c-format msgid "CONFLICT (add/add): Merge conflict in %s" msgstr "KONFLIKT (hinzufügen/hinzufügen): Merge-Konflikt in %s" -#: merge-recursive.c:3417 +#: merge-recursive.c:3385 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -3395,124 +4050,128 @@ msgstr "" "überschrieben werden:\n" " %s" -#: merge-recursive.c:3428 +#: merge-recursive.c:3396 msgid "Already up to date!" msgstr "Bereits aktuell!" -#: merge-recursive.c:3437 +#: merge-recursive.c:3405 #, c-format msgid "merging of trees %s and %s failed" msgstr "Zusammenführen der \"Tree\"-Objekte %s und %s fehlgeschlagen" -#: merge-recursive.c:3536 +#: merge-recursive.c:3504 msgid "Merging:" msgstr "Merge:" -#: merge-recursive.c:3549 +#: merge-recursive.c:3517 #, 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:3588 +#: merge-recursive.c:3556 msgid "merge returned no commit" msgstr "Merge hat keinen Commit zurückgegeben" -#: merge-recursive.c:3654 +#: merge-recursive.c:3622 #, c-format msgid "Could not parse object '%s'" msgstr "Konnte Objekt '%s' nicht parsen." -#: merge-recursive.c:3670 builtin/merge.c:692 builtin/merge.c:850 +#: merge-recursive.c:3638 builtin/merge.c:702 builtin/merge.c:873 msgid "Unable to write index." msgstr "Konnte Index nicht schreiben." -#: midx.c:65 +#: midx.c:66 #, c-format msgid "multi-pack-index file %s is too small" msgstr "multi-pack-index-Datei %s ist zu klein." -#: midx.c:81 +#: midx.c:82 #, 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:86 +#: midx.c:87 #, c-format msgid "multi-pack-index version %d not recognized" msgstr "multi-pack-index-Version %d nicht erkannt." -#: midx.c:91 +#: midx.c:92 #, c-format msgid "hash version %u does not match" msgstr "Hash-Version %u stimmt nicht überein." -#: midx.c:105 +#: midx.c:106 msgid "invalid chunk offset (too large)" msgstr "Ungültiger Chunk-Offset (zu groß)" -#: midx.c:129 +#: midx.c:130 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:142 +#: midx.c:143 msgid "multi-pack-index missing required pack-name chunk" msgstr "multi-pack-index fehlt erforderlicher pack-name Chunk." -#: midx.c:144 +#: midx.c:145 msgid "multi-pack-index missing required OID fanout chunk" msgstr "multi-pack-index fehlt erforderlicher OID fanout Chunk." -#: midx.c:146 +#: midx.c:147 msgid "multi-pack-index missing required OID lookup chunk" msgstr "multi-pack-index fehlt erforderlicher OID lookup Chunk." -#: midx.c:148 +#: midx.c:149 msgid "multi-pack-index missing required object offsets chunk" msgstr "multi-pack-index fehlt erforderlicher object offset Chunk." -#: midx.c:162 +#: midx.c:163 #, 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:205 +#: midx.c:208 #, c-format msgid "bad pack-int-id: %u (%u total packs)" msgstr "Ungültige pack-int-id: %u (%u Pakete insgesamt)" -#: midx.c:246 +#: midx.c:258 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." -#: midx.c:271 +#: midx.c:286 msgid "error preparing packfile from multi-pack-index" msgstr "Fehler bei Vorbereitung der Packdatei aus multi-pack-index." -#: midx.c:407 +#: midx.c:457 #, c-format msgid "failed to add packfile '%s'" msgstr "Fehler beim Hinzufügen von Packdatei '%s'." -#: midx.c:413 +#: midx.c:463 #, c-format msgid "failed to open pack-index '%s'" msgstr "Fehler beim Öffnen von pack-index '%s'" -#: midx.c:507 +#: midx.c:557 #, c-format msgid "failed to locate object %d in packfile" msgstr "Fehler beim Lokalisieren von Objekt %d in Packdatei." -#: midx.c:943 +#: midx.c:993 #, c-format msgid "failed to clear multi-pack-index at %s" msgstr "Fehler beim Löschen des multi-pack-index bei %s" -#: midx.c:981 +#: midx.c:1048 +msgid "Looking for referenced packfiles" +msgstr "Suche nach referenzierten Pack-Dateien" + +#: midx.c:1063 #, c-format msgid "" "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" @@ -3520,26 +4179,34 @@ msgstr "" "Ungültige oid fanout Reihenfolge: fanout[%d] = %<PRIx32> > %<PRIx32> = " "fanout[%d]" -#: midx.c:992 +#: midx.c:1067 +msgid "Verifying OID order in MIDX" +msgstr "Verifiziere OID-Reihenfolge in MIDX" + +#: midx.c:1076 #, 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:996 +#: midx.c:1095 +msgid "Sorting objects by packfile" +msgstr "Sortiere Objekte nach Pack-Datei" + +#: midx.c:1101 msgid "Verifying object offsets" msgstr "Überprüfe Objekt-Offsets" -#: midx.c:1004 +#: midx.c:1117 #, 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:1010 +#: midx.c:1123 #, c-format msgid "failed to load pack-index for packfile %s" msgstr "Fehler beim Laden des Pack-Index für Packdatei %s" -#: midx.c:1019 +#: midx.c:1132 #, c-format msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>" msgstr "Falscher Objekt-Offset für oid[%d] = %s: %<PRIx64> != %<PRIx64>" @@ -3629,85 +4296,82 @@ msgstr "Konnte Objekt '%s' nicht parsen." msgid "hash mismatch %s" msgstr "Hash stimmt nicht mit %s überein." -#: packfile.c:607 +#: packfile.c:617 msgid "offset before end of packfile (broken .idx?)" msgstr "Offset vor Ende der Packdatei (fehlerhafte Indexdatei?)" -#: packfile.c:1870 +#: packfile.c:1868 #, 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:1874 +#: packfile.c:1872 #, 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?)" -#: parse-options.c:35 +#: parse-options.c:38 #, c-format msgid "%s requires a value" msgstr "%s erfordert einen Wert." -#: parse-options.c:69 +#: parse-options.c:73 #, c-format msgid "%s is incompatible with %s" msgstr "%s ist inkompatibel mit %s." -#: parse-options.c:74 +#: parse-options.c:78 #, c-format msgid "%s : incompatible with something else" msgstr "%s: inkompatibel mit etwas anderem" -#: parse-options.c:88 parse-options.c:92 parse-options.c:260 +#: parse-options.c:92 parse-options.c:96 parse-options.c:319 #, c-format msgid "%s takes no value" msgstr "%s erwartet keinen Wert" -#: parse-options.c:90 +#: parse-options.c:94 #, c-format msgid "%s isn't available" msgstr "%s ist nicht verfügbar." -#: parse-options.c:178 -#, c-format -msgid "%s expects a numerical value" -msgstr "%s erwartet einen numerischen Wert." - -#: parse-options.c:194 +#: parse-options.c:219 #, c-format msgid "%s expects a non-negative integer value with an optional k/m/g suffix" -msgstr "%s erwartet einen nicht-negativen Integer-Wert mit einem optionalen k/m/g Suffix" +msgstr "" +"%s erwartet einen nicht-negativen Integer-Wert mit einem optionalen k/m/g " +"Suffix" -#: parse-options.c:322 +#: parse-options.c:389 #, c-format msgid "ambiguous option: %s (could be --%s%s or --%s%s)" msgstr "Mehrdeutige Option: %s (kann --%s%s oder --%s%s sein)" -#: parse-options.c:356 parse-options.c:364 +#: parse-options.c:423 parse-options.c:431 #, c-format msgid "did you mean `--%s` (with two dashes ?)" msgstr "Meinten Sie `--%s` (mit zwei Strichen?)" -#: parse-options.c:649 +#: parse-options.c:859 #, c-format msgid "unknown option `%s'" msgstr "Unbekannte Option: `%s'" -#: parse-options.c:651 +#: parse-options.c:861 #, c-format msgid "unknown switch `%c'" msgstr "Unbekannter Schalter `%c'" -#: parse-options.c:653 +#: parse-options.c:863 #, c-format msgid "unknown non-ascii option in string: `%s'" msgstr "Unbekannte nicht-Ascii Option in String: `%s'" -#: parse-options.c:675 +#: parse-options.c:887 msgid "..." msgstr "..." -#: parse-options.c:694 +#: parse-options.c:906 #, c-format msgid "usage: %s" msgstr "Verwendung: %s" @@ -3715,41 +4379,46 @@ msgstr "Verwendung: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c:700 +#: parse-options.c:912 #, c-format msgid " or: %s" msgstr " oder: %s" -#: parse-options.c:703 +#: parse-options.c:915 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:742 +#: parse-options.c:954 msgid "-NUM" msgstr "-NUM" -#: parse-options-cb.c:21 +#: parse-options.c:968 +#, c-format +msgid "alias of --%s" +msgstr "Alias für --%s" + +#: parse-options-cb.c:20 parse-options-cb.c:24 #, c-format msgid "option `%s' expects a numerical value" msgstr "Option `%s' erwartet einen numerischen Wert." -#: parse-options-cb.c:38 +#: parse-options-cb.c:41 #, c-format msgid "malformed expiration date '%s'" msgstr "Fehlerhaftes Ablaufdatum '%s'" -#: parse-options-cb.c:51 +#: parse-options-cb.c:54 #, c-format msgid "option `%s' expects \"always\", \"auto\", or \"never\"" msgstr "Option `%s' erwartet \"always\", \"auto\" oder \"never\"." -#: parse-options-cb.c:110 +#: parse-options-cb.c:130 parse-options-cb.c:147 #, c-format msgid "malformed object name '%s'" msgstr "fehlerhafter Objekt-Name '%s'" -#: path.c:894 +#: path.c:897 #, c-format msgid "Could not make %s writable by group" msgstr "Konnte Gruppenschreibrecht für %s nicht setzen." @@ -3830,46 +4499,54 @@ msgstr "" msgid "pathspec '%s' is beyond a symbolic link" msgstr "Pfadspezifikation '%s' ist hinter einer symbolischen Verknüpfung" -#: pkt-line.c:104 +#: pkt-line.c:92 +msgid "unable to write flush packet" +msgstr "Konnte Flush-Paket nicht schreiben." + +#: pkt-line.c:99 +msgid "unable to write delim packet" +msgstr "Konnte Delim-Paket nicht schreiben." + +#: pkt-line.c:106 msgid "flush packet write failed" msgstr "Flush beim Schreiben des Pakets fehlgeschlagen." -#: pkt-line.c:144 pkt-line.c:230 +#: pkt-line.c:146 pkt-line.c:232 msgid "protocol error: impossibly long line" msgstr "Protokollfehler: unmöglich lange Zeile" -#: pkt-line.c:160 pkt-line.c:162 +#: pkt-line.c:162 pkt-line.c:164 msgid "packet write with format failed" msgstr "Schreiben des Pakets mit Format fehlgeschlagen." -#: pkt-line.c:194 +#: pkt-line.c:196 msgid "packet write failed - data exceeds max packet size" msgstr "" "Schreiben des Pakets fehlgeschlagen - Daten überschreiten maximale Paketgröße" -#: pkt-line.c:201 pkt-line.c:208 +#: pkt-line.c:203 pkt-line.c:210 msgid "packet write failed" msgstr "Schreiben des Pakets fehlgeschlagen." -#: pkt-line.c:293 +#: pkt-line.c:295 msgid "read error" msgstr "Lesefehler" -#: pkt-line.c:301 +#: pkt-line.c:303 msgid "the remote end hung up unexpectedly" msgstr "Die Gegenseite hat unerwartet abgebrochen." -#: pkt-line.c:329 +#: pkt-line.c:331 #, c-format msgid "protocol error: bad line length character: %.4s" msgstr "Protokollfehler: ungültiges Zeichen für Zeilenlänge: %.4s" -#: pkt-line.c:339 pkt-line.c:344 +#: pkt-line.c:341 pkt-line.c:346 #, c-format msgid "protocol error: bad line length %d" msgstr "Protokollfehler: ungültige Zeilenlänge %d" -#: pkt-line.c:353 +#: pkt-line.c:362 #, c-format msgid "remote error: %s" msgstr "Fehler am anderen Ende: %s" @@ -3883,7 +4560,7 @@ msgstr "Aktualisiere Index" msgid "unable to create threaded lstat: %s" msgstr "Kann Thread für lstat nicht erzeugen: %s" -#: pretty.c:963 +#: pretty.c:966 msgid "unable to parse --pretty format" msgstr "Konnte --pretty Format nicht parsen." @@ -3895,7 +4572,7 @@ msgstr "Konnte `log` nicht starten." msgid "could not read `log` output" msgstr "Konnte Ausgabe von `log` nicht lesen." -#: range-diff.c:74 sequencer.c:4828 +#: range-diff.c:74 sequencer.c:4897 #, c-format msgid "could not parse commit '%s'" msgstr "Konnte Commit '%s' nicht parsen." @@ -3909,45 +4586,53 @@ msgstr "Fehler beim Generieren des Diffs." msgid "could not parse log for '%s'" msgstr "Konnte Log für '%s' nicht parsen." -#: read-cache.c:673 +#: read-cache.c:680 #, c-format msgid "will not add file alias '%s' ('%s' already exists in index)" -msgstr "Dateialias '%s' wird nicht hinzugefügt ('%s' existiert bereits im Index)." +msgstr "" +"Dateialias '%s' wird nicht hinzugefügt ('%s' existiert bereits im Index)." -#: read-cache.c:689 +#: read-cache.c:696 msgid "cannot create an empty blob in the object database" msgstr "Kann keinen leeren Blob in die Objektdatenbank schreiben." -#: read-cache.c:710 +#: read-cache.c:718 #, c-format msgid "%s: can only add regular files, symbolic links or git-directories" -msgstr "%s: Kann nur reguläre Dateien, symbolische Links oder Git-Verzeichnisse hinzufügen." +msgstr "" +"%s: Kann nur reguläre Dateien, symbolische Links oder Git-Verzeichnisse " +"hinzufügen." -#: read-cache.c:765 +#: read-cache.c:723 +#, c-format +msgid "'%s' does not have a commit checked out" +msgstr "'%s' hat keinen Commit ausgecheckt" + +#: read-cache.c:775 #, c-format msgid "unable to index file '%s'" msgstr "Konnte Datei '%s' nicht indizieren." -#: read-cache.c:784 +#: read-cache.c:794 #, c-format msgid "unable to add '%s' to index" msgstr "Konnte '%s' nicht dem Index hinzufügen." -#: read-cache.c:795 +#: read-cache.c:805 #, c-format msgid "unable to stat '%s'" msgstr "Konnte '%s' nicht lesen." -#: read-cache.c:1304 +#: read-cache.c:1314 #, c-format msgid "'%s' appears as both a file and as a directory" msgstr "'%s' scheint eine Datei und ein Verzeichnis zu sein." -#: read-cache.c:1489 +#: read-cache.c:1499 msgid "Refresh index" msgstr "Aktualisiere Index" -#: read-cache.c:1603 +#: read-cache.c:1613 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -3956,7 +4641,7 @@ msgstr "" "index.version gesetzt, aber Wert ungültig.\n" "Verwende Version %i" -#: read-cache.c:1613 +#: read-cache.c:1623 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -3965,144 +4650,152 @@ msgstr "" "GIT_INDEX_VERSION gesetzt, aber Wert ungültig.\n" "Verwende Version %i" -#: read-cache.c:1684 +#: read-cache.c:1679 #, c-format msgid "bad signature 0x%08x" msgstr "Ungültige Signatur 0x%08x" -#: read-cache.c:1687 +#: read-cache.c:1682 #, c-format msgid "bad index version %d" msgstr "Ungültige Index-Version %d" -#: read-cache.c:1696 +#: read-cache.c:1691 msgid "bad index file sha1 signature" msgstr "Ungültige SHA1-Signatur der Index-Datei." -#: read-cache.c:1726 +#: read-cache.c:1721 #, 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:1728 +#: read-cache.c:1723 #, c-format msgid "ignoring %.4s extension" msgstr "Ignoriere Erweiterung %.4s" -#: read-cache.c:1765 +#: read-cache.c:1760 #, c-format msgid "unknown index entry format 0x%08x" msgstr "Unbekanntes Format für Index-Eintrag 0x%08x" -#: read-cache.c:1781 +#: read-cache.c:1776 #, 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:1836 +#: read-cache.c:1833 msgid "unordered stage entries in index" msgstr "Ungeordnete Stage-Einträge im Index." -#: read-cache.c:1839 +#: read-cache.c:1836 #, c-format msgid "multiple stage entries for merged file '%s'" msgstr "Mehrere Stage-Einträge für zusammengeführte Datei '%s'." -#: read-cache.c:1842 +#: read-cache.c:1839 #, c-format msgid "unordered stage entries for '%s'" msgstr "Ungeordnete Stage-Einträge für '%s'." -#: read-cache.c:1949 read-cache.c:2227 rerere.c:565 rerere.c:599 rerere.c:1111 -#: builtin/add.c:459 builtin/check-ignore.c:178 builtin/checkout.c:294 -#: builtin/checkout.c:622 builtin/checkout.c:991 builtin/clean.c:955 -#: builtin/commit.c:344 builtin/diff-tree.c:116 builtin/grep.c:498 +#: 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 msgid "index file corrupt" msgstr "Index-Datei beschädigt" -#: read-cache.c:2090 +#: read-cache.c:2087 #, 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:2103 +#: read-cache.c:2100 #, 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:2136 +#: read-cache.c:2133 #, c-format msgid "%s: index file open failed" msgstr "%s: Öffnen der Index-Datei fehlgeschlagen." -#: read-cache.c:2140 +#: read-cache.c:2137 #, c-format msgid "%s: cannot stat the open index" msgstr "%s: Kann geöffneten Index nicht lesen." -#: read-cache.c:2144 +#: read-cache.c:2141 #, c-format msgid "%s: index file smaller than expected" msgstr "%s: Index-Datei ist kleiner als erwartet." -#: read-cache.c:2148 +#: read-cache.c:2145 #, c-format msgid "%s: unable to map index file" msgstr "%s: Konnte Index-Datei nicht einlesen." -#: read-cache.c:2190 +#: read-cache.c:2187 #, 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:2217 +#: read-cache.c:2214 #, 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:2239 +#: read-cache.c:2246 #, c-format msgid "could not freshen shared index '%s'" msgstr "Konnte geteilten Index '%s' nicht aktualisieren." -#: read-cache.c:2274 +#: read-cache.c:2293 #, c-format msgid "broken index, expect %s in %s, got %s" msgstr "Fehlerhafter Index. Erwartete %s in %s, erhielt %s." -#: read-cache.c:2971 sequencer.c:4791 wrapper.c:658 builtin/merge.c:1087 +#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1117 #, c-format msgid "could not close '%s'" msgstr "Konnte '%s' nicht schließen." -#: read-cache.c:3044 sequencer.c:2237 sequencer.c:3647 +#: read-cache.c:3092 sequencer.c:2354 sequencer.c:3807 #, c-format msgid "could not stat '%s'" msgstr "Konnte '%s' nicht lesen." -#: read-cache.c:3057 +#: read-cache.c:3105 #, c-format msgid "unable to open git dir: %s" msgstr "konnte Git-Verzeichnis nicht öffnen: %s" -#: read-cache.c:3069 +#: read-cache.c:3117 #, c-format msgid "unable to unlink: %s" msgstr "Konnte '%s' nicht entfernen." -#: read-cache.c:3088 +#: read-cache.c:3142 #, c-format msgid "cannot fix permission bits on '%s'" msgstr "Konnte Zugriffsberechtigung auf '%s' nicht setzen." -#: read-cache.c:3237 +#: read-cache.c:3291 #, c-format msgid "%s: cannot drop to stage #0" msgstr "%s: Kann nicht auf Stufe #0 wechseln." -#: rebase-interactive.c:10 +#: rebase-interactive.c:26 +#, c-format +msgid "" +"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." +msgstr "" +"Nicht erkannte Einstellung %s für Option rebase.missingCommitsCheck. " +"Ignoriere." + +#: rebase-interactive.c:35 msgid "" "\n" "Commands:\n" @@ -4147,7 +4840,14 @@ msgstr "" "Diese Zeilen können umsortiert werden; Sie werden von oben nach unten\n" "ausgeführt.\n" -#: rebase-interactive.c:31 git-rebase--preserve-merges.sh:173 +#: rebase-interactive.c:56 +#, c-format +msgid "Rebase %s onto %s (%d command)" +msgid_plural "Rebase %s onto %s (%d commands)" +msgstr[0] "Rebase von %s auf %s (%d Kommando)" +msgstr[1] "Rebase von %s auf %s (%d Kommandos)" + +#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:173 msgid "" "\n" "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" @@ -4156,7 +4856,7 @@ msgstr "" "Keine Zeile entfernen. Benutzen Sie 'drop', um explizit einen Commit zu\n" "entfernen.\n" -#: rebase-interactive.c:34 git-rebase--preserve-merges.sh:177 +#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:177 msgid "" "\n" "If you remove a line here THAT COMMIT WILL BE LOST.\n" @@ -4164,7 +4864,7 @@ msgstr "" "\n" "Wenn Sie hier eine Zeile entfernen, wird DIESER COMMIT VERLOREN GEHEN.\n" -#: rebase-interactive.c:40 git-rebase--preserve-merges.sh:816 +#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:816 msgid "" "\n" "You are editing the todo file of an ongoing interactive rebase.\n" @@ -4178,7 +4878,7 @@ msgstr "" " git rebase --continue\n" "\n" -#: rebase-interactive.c:45 git-rebase--preserve-merges.sh:893 +#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:893 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" @@ -4188,127 +4888,156 @@ msgstr "" "Wenn Sie jedoch alles löschen, wird der Rebase abgebrochen.\n" "\n" -#: rebase-interactive.c:51 git-rebase--preserve-merges.sh:900 +#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:900 msgid "Note that empty commits are commented out" msgstr "Leere Commits sind auskommentiert." -#: rebase-interactive.c:62 rebase-interactive.c:75 sequencer.c:2219 -#: sequencer.c:4569 sequencer.c:4625 sequencer.c:4900 +#: 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 #, c-format -msgid "could not read '%s'." -msgstr "Konnte '%s' nicht lesen." +msgid "could not write '%s'" +msgstr "Konnte '%s' nicht schreiben." + +#: rebase-interactive.c:108 +#, c-format +msgid "could not copy '%s' to '%s'." +msgstr "Konnte '%s' nicht nach '%s' kopieren." + +#: rebase-interactive.c:173 +#, c-format +msgid "" +"Warning: some commits may have been dropped accidentally.\n" +"Dropped commits (newer to older):\n" +msgstr "" +"Warnung: Einige Commits könnten aus Versehen entfernt worden sein.\n" +"Entfernte Commits (neu zu alt):\n" + +#: rebase-interactive.c:180 +#, c-format +msgid "" +"To avoid this message, use \"drop\" to explicitly remove a commit.\n" +"\n" +"Use 'git config rebase.missingCommitsCheck' to change the level of " +"warnings.\n" +"The possible behaviours are: ignore, warn, error.\n" +"\n" +msgstr "" +"Um diese Meldung zu vermeiden, benutzen Sie \"drop\", um exlizit Commits zu\n" +"entfernen.\n" +"\n" +"Benutzen Sie 'git config rebase.missingCommitsCheck', um die Stufe der\n" +"Warnungen zu ändern.\n" +"Die möglichen Verhaltensweisen sind: ignore, warn, error.\n" #: refs.c:192 #, c-format msgid "%s does not point to a valid object!" msgstr "%s zeigt auf kein gültiges Objekt!" -#: refs.c:583 +#: refs.c:597 #, c-format msgid "ignoring dangling symref %s" msgstr "Ignoriere unreferenzierte symbolische Referenz %s" -#: refs.c:585 ref-filter.c:1976 +#: refs.c:599 ref-filter.c:1982 #, c-format msgid "ignoring broken ref %s" msgstr "Ignoriere fehlerhafte Referenz %s" -#: refs.c:711 +#: refs.c:734 #, c-format msgid "could not open '%s' for writing: %s" msgstr "Konnte '%s' nicht zum Schreiben öffnen: %s" -#: refs.c:721 refs.c:772 +#: refs.c:744 refs.c:795 #, c-format msgid "could not read ref '%s'" msgstr "Konnte Referenz '%s' nicht lesen." -#: refs.c:727 +#: refs.c:750 #, c-format msgid "ref '%s' already exists" msgstr "Referenz '%s' existiert bereits." -#: refs.c:732 +#: refs.c:755 #, c-format msgid "unexpected object ID when writing '%s'" msgstr "Unerwartete Objekt-ID beim Schreiben von '%s'." -#: refs.c:740 sequencer.c:396 sequencer.c:2549 sequencer.c:2675 -#: sequencer.c:2689 sequencer.c:2923 sequencer.c:4789 sequencer.c:4852 -#: wrapper.c:656 +#: 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 "Konnte nicht nach '%s' schreiben." -#: refs.c:767 sequencer.c:4787 sequencer.c:4846 wrapper.c:225 wrapper.c:395 -#: builtin/am.c:713 builtin/rebase.c:575 +#: 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 "Konnte '%s' nicht zum Schreiben öffnen." -#: refs.c:774 +#: refs.c:797 #, c-format msgid "unexpected object ID when deleting '%s'" msgstr "Unerwartete Objekt-ID beim Löschen von '%s'." -#: refs.c:905 +#: refs.c:928 #, 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:911 +#: refs.c:934 #, c-format msgid "log for ref %s unexpectedly ended on %s" msgstr "Log für Referenz %s unerwartet bei %s beendet." -#: refs.c:969 +#: refs.c:993 #, c-format msgid "log for %s is empty" msgstr "Log für %s ist leer." -#: refs.c:1061 +#: refs.c:1085 #, c-format msgid "refusing to update ref with bad name '%s'" msgstr "Verweigere Aktualisierung einer Referenz mit fehlerhaftem Namen '%s'." -#: refs.c:1137 +#: refs.c:1161 #, c-format msgid "update_ref failed for ref '%s': %s" msgstr "update_ref für Referenz '%s' fehlgeschlagen: %s" -#: refs.c:1911 +#: refs.c:1942 #, c-format msgid "multiple updates for ref '%s' not allowed" msgstr "Mehrere Aktualisierungen für Referenz '%s' nicht erlaubt." -#: refs.c:1943 +#: refs.c:1974 msgid "ref updates forbidden inside quarantine environment" msgstr "" "Aktualisierungen von Referenzen ist innerhalb der Quarantäne-Umgebung " "verboten." -#: refs.c:2039 refs.c:2069 +#: refs.c:2070 refs.c:2100 #, c-format msgid "'%s' exists; cannot create '%s'" msgstr "'%s' existiert; kann '%s' nicht erstellen" -#: refs.c:2045 refs.c:2080 +#: refs.c:2076 refs.c:2111 #, c-format msgid "cannot process '%s' and '%s' at the same time" msgstr "Kann '%s' und '%s' nicht zur selben Zeit verarbeiten." -#: refs/files-backend.c:1228 +#: refs/files-backend.c:1234 #, c-format msgid "could not remove reference %s" msgstr "Konnte Referenz %s nicht löschen" -#: refs/files-backend.c:1242 refs/packed-backend.c:1532 +#: 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 "Konnte Referenz %s nicht entfernen: %s" -#: refs/files-backend.c:1245 refs/packed-backend.c:1545 +#: refs/files-backend.c:1251 refs/packed-backend.c:1545 #, c-format msgid "could not delete references: %s" msgstr "Konnte Referenzen nicht entfernen: %s" @@ -4318,7 +5047,7 @@ msgstr "Konnte Referenzen nicht entfernen: %s" msgid "invalid refspec '%s'" msgstr "Ungültige Refspec '%s'" -#: ref-filter.c:39 wt-status.c:1861 +#: ref-filter.c:39 wt-status.c:1909 msgid "gone" msgstr "entfernt" @@ -4442,79 +5171,79 @@ msgstr "Positive Breitenangabe für %%(align) erwartet" msgid "unrecognized %%(if) argument: %s" msgstr "nicht erkanntes %%(if) Argument: %s" -#: ref-filter.c:527 +#: ref-filter.c:531 #, c-format msgid "malformed field name: %.*s" msgstr "Fehlerhafter Feldname: %.*s" -#: ref-filter.c:554 +#: ref-filter.c:558 #, c-format msgid "unknown field name: %.*s" msgstr "Unbekannter Feldname: %.*s" -#: ref-filter.c:558 +#: ref-filter.c:562 #, 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:682 +#: ref-filter.c:686 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "format: %%(if) Atom ohne ein %%(then) Atom verwendet" -#: ref-filter.c:745 +#: ref-filter.c:749 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "format: %%(then) Atom ohne ein %%(if) Atom verwendet" -#: ref-filter.c:747 +#: ref-filter.c:751 #, c-format msgid "format: %%(then) atom used more than once" msgstr "format: %%(then) Atom mehr als einmal verwendet" -#: ref-filter.c:749 +#: ref-filter.c:753 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "format: %%(then) Atom nach %%(else) verwendet" -#: ref-filter.c:777 +#: ref-filter.c:781 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "format: %%(else) Atom ohne ein %%(if) Atom verwendet" -#: ref-filter.c:779 +#: ref-filter.c:783 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "Format: %%(else) Atom ohne ein %%(then) Atom verwendet" -#: ref-filter.c:781 +#: ref-filter.c:785 #, c-format msgid "format: %%(else) atom used more than once" msgstr "Format: %%(end) Atom mehr als einmal verwendet" -#: ref-filter.c:796 +#: ref-filter.c:800 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "Format: %%(end) Atom ohne zugehöriges Atom verwendet" -#: ref-filter.c:853 +#: ref-filter.c:857 #, c-format msgid "malformed format string %s" msgstr "Fehlerhafter Formatierungsstring %s" -#: ref-filter.c:1447 +#: ref-filter.c:1453 #, c-format msgid "(no branch, rebasing %s)" msgstr "(kein Branch, Rebase von Branch %s im Gange)" -#: ref-filter.c:1450 +#: ref-filter.c:1456 #, c-format msgid "(no branch, rebasing detached HEAD %s)" msgstr "(kein Branch, Rebase von losgelöstem HEAD %s)" -#: ref-filter.c:1453 +#: ref-filter.c:1459 #, c-format msgid "(no branch, bisect started on %s)" msgstr "(kein Branch, binäre Suche begonnen bei %s)" @@ -4522,7 +5251,7 @@ msgstr "(kein Branch, binäre Suche begonnen bei %s)" #. TRANSLATORS: make sure this matches "HEAD #. detached at " in wt-status.c #. -#: ref-filter.c:1461 +#: ref-filter.c:1467 #, c-format msgid "(HEAD detached at %s)" msgstr "(HEAD losgelöst bei %s)" @@ -4530,56 +5259,56 @@ msgstr "(HEAD losgelöst bei %s)" #. TRANSLATORS: make sure this matches "HEAD #. detached from " in wt-status.c #. -#: ref-filter.c:1468 +#: ref-filter.c:1474 #, c-format msgid "(HEAD detached from %s)" msgstr "(HEAD losgelöst von %s)" -#: ref-filter.c:1472 +#: ref-filter.c:1478 msgid "(no branch)" msgstr "(kein Branch)" -#: ref-filter.c:1506 ref-filter.c:1663 +#: ref-filter.c:1512 ref-filter.c:1669 #, c-format msgid "missing object %s for %s" msgstr "Objekt %s fehlt für %s" -#: ref-filter.c:1516 +#: ref-filter.c:1522 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "parse_object_buffer bei %s für %s fehlgeschlagen" -#: ref-filter.c:1882 +#: ref-filter.c:1888 #, c-format msgid "malformed object at '%s'" msgstr "fehlerhaftes Objekt bei '%s'" -#: ref-filter.c:1971 +#: ref-filter.c:1977 #, c-format msgid "ignoring ref with broken name %s" msgstr "Ignoriere Referenz mit fehlerhaftem Namen %s" -#: ref-filter.c:2257 +#: ref-filter.c:2263 #, c-format msgid "format: %%(end) atom missing" msgstr "Format: %%(end) Atom fehlt" -#: ref-filter.c:2352 +#: ref-filter.c:2363 #, c-format msgid "option `%s' is incompatible with --merged" msgstr "Die Option `%s' ist inkompatibel mit --merged." -#: ref-filter.c:2355 +#: ref-filter.c:2366 #, c-format msgid "option `%s' is incompatible with --no-merged" msgstr "Die Option `%s' ist inkompatibel mit --no-merged." -#: ref-filter.c:2365 +#: ref-filter.c:2376 #, c-format msgid "malformed object name %s" msgstr "Missgebildeter Objektname %s" -#: ref-filter.c:2370 +#: ref-filter.c:2381 #, c-format msgid "option `%s' must point to a commit" msgstr "Die Option `%s' muss auf einen Commit zeigen." @@ -4587,7 +5316,9 @@ msgstr "Die Option `%s' muss auf einen Commit zeigen." #: remote.c:363 #, c-format msgid "config remote shorthand cannot begin with '/': %s" -msgstr "Kürzel für Remote-Repository in der Konfiguration kann nicht mit '/' beginnen: %s" +msgstr "" +"Kürzel für Remote-Repository in der Konfiguration kann nicht mit '/' " +"beginnen: %s" #: remote.c:410 msgid "more than one receivepack given, using the first" @@ -4649,12 +5380,15 @@ msgid "" "\n" "Neither worked, so we gave up. You must fully qualify the ref." msgstr "" -"Das angegebene Ziel ist kein vollständiger Referenzname (startet mit \"refs/\").\n" +"Das angegebene Ziel ist kein vollständiger Referenzname (startet mit \"refs/" +"\").\n" "Wir versuchten zu erraten, was Sie meinten, mit:\n" "\n" "- Suche einer Referenz, die mit '%s' übereinstimmt, auf der Remote-Seite\n" -"- Prüfung, ob die versendete <Quelle> ('%s') eine Referenz in \"refs/{heads,tags}\"\n" -" ist, in dessen Falle wir einen entsprechenden refs/{heads,tags} Präfix auf\n" +"- Prüfung, ob die versendete <Quelle> ('%s') eine Referenz in \"refs/{heads," +"tags}\"\n" +" ist, in dessen Falle wir einen entsprechenden refs/{heads,tags} Präfix " +"auf\n" " der Remote-Seite hinzufügen würden.\n" "\n" "Keines hat funktioniert, sodass wir aufgegeben haben. Sie müssen die\n" @@ -4778,43 +5512,43 @@ msgstr "Konnte Remote-Referenz %s nicht finden." msgid "* Ignoring funny ref '%s' locally" msgstr "* Ignoriere sonderbare Referenz '%s' lokal" -#: remote.c:1990 +#: remote.c:2016 #, 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:1994 +#: remote.c:2020 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (benutzen Sie \"git branch --unset-upstream\" zum Beheben)\n" -#: remote.c:1997 +#: remote.c:2023 #, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "Ihr Branch ist auf demselben Stand wie '%s'.\n" -#: remote.c:2001 +#: remote.c:2027 #, c-format msgid "Your branch and '%s' refer to different commits.\n" msgstr "Ihr Branch und '%s' zeigen auf unterschiedliche Commits.\n" -#: remote.c:2004 +#: remote.c:2030 #, c-format msgid " (use \"%s\" for details)\n" msgstr " (benutzen Sie \"%s\" für Details)\n" -#: remote.c:2008 +#: remote.c:2034 #, 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:2014 +#: remote.c:2040 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (benutzen Sie \"git push\", um lokale Commits zu publizieren)\n" -#: remote.c:2017 +#: remote.c:2043 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -4824,12 +5558,12 @@ msgstr[0] "" msgstr[1] "" "Ihr Branch ist %2$d Commits hinter '%1$s', und kann vorgespult werden.\n" -#: remote.c:2025 +#: remote.c:2051 msgid " (use \"git pull\" to update your local branch)\n" msgstr "" " (benutzen Sie \"git pull\", um Ihren lokalen Branch zu aktualisieren)\n" -#: remote.c:2028 +#: remote.c:2054 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -4844,13 +5578,13 @@ msgstr[1] "" "Ihr Branch und '%s' sind divergiert,\n" "und haben jeweils %d und %d unterschiedliche Commits.\n" -#: remote.c:2038 +#: remote.c:2064 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:2221 +#: remote.c:2247 #, c-format msgid "cannot parse expected object name '%s'" msgstr "Kann erwarteten Objektnamen '%s' nicht parsen." @@ -4878,12 +5612,6 @@ msgstr "Fehlerhaftes MERGE_RR" msgid "unable to write rerere record" msgstr "Konnte Rerere-Eintrag nicht schreiben." -#: rerere.c:485 rerere.c:692 sequencer.c:3186 sequencer.c:3212 -#: builtin/fsck.c:314 -#, c-format -msgid "could not write '%s'" -msgstr "Konnte '%s' nicht schreiben." - #: rerere.c:495 #, c-format msgid "there were errors while writing '%s' (%s)" @@ -4934,8 +5662,8 @@ msgstr "Kann '%s' nicht löschen." msgid "Recorded preimage for '%s'" msgstr "Preimage für '%s' aufgezeichnet." -#: rerere.c:881 submodule.c:2012 builtin/submodule--helper.c:1417 -#: builtin/submodule--helper.c:1427 +#: rerere.c:881 submodule.c:2024 builtin/log.c:1750 +#: builtin/submodule--helper.c:1417 builtin/submodule--helper.c:1427 #, c-format msgid "could not create directory '%s'" msgstr "Konnte Verzeichnis '%s' nicht erstellen." @@ -4969,29 +5697,33 @@ msgstr "Aufgezeichnete Konfliktauflösung für '%s' gelöscht.\n" msgid "unable to open rr-cache directory" msgstr "Konnte rr-cache Verzeichnis nicht öffnen." -#: revision.c:2484 +#: revision.c:2476 msgid "your current branch appears to be broken" msgstr "Ihr aktueller Branch scheint fehlerhaft zu sein." -#: revision.c:2487 +#: revision.c:2479 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "Ihr aktueller Branch '%s' hat noch keine Commits." -#: revision.c:2684 +#: revision.c:2679 msgid "--first-parent is incompatible with --bisect" msgstr "Die Optionen --first-parent und --bisect sind inkompatibel." -#: run-command.c:742 +#: revision.c:2683 +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:763 msgid "open /dev/null failed" msgstr "Öffnen von /dev/null fehlgeschlagen" -#: run-command.c:1231 +#: run-command.c:1269 #, c-format msgid "cannot create async thread: %s" msgstr "Konnte Thread für async nicht erzeugen: %s" -#: run-command.c:1295 +#: run-command.c:1333 #, c-format msgid "" "The '%s' hook was ignored because it's not set as executable.\n" @@ -5040,34 +5772,34 @@ msgstr "die Gegenseite unterstützt keinen atomaren Versand (\"--atomic push\")" msgid "the receiving end does not support push options" msgstr "die Gegenseite unterstützt keine Push-Optionen" -#: sequencer.c:184 +#: sequencer.c:187 #, c-format msgid "invalid commit message cleanup mode '%s'" msgstr "Ungültiger \"cleanup\"-Modus '%s' für Commit-Beschreibungen." -#: sequencer.c:288 +#: sequencer.c:292 #, c-format msgid "could not delete '%s'" msgstr "Konnte '%s' nicht löschen." -#: sequencer.c:314 +#: sequencer.c:318 msgid "revert" msgstr "Revert" -#: sequencer.c:316 +#: sequencer.c:320 msgid "cherry-pick" msgstr "Cherry-Pick" -#: sequencer.c:318 +#: sequencer.c:322 msgid "rebase -i" msgstr "interaktives Rebase" -#: sequencer.c:320 +#: sequencer.c:324 #, c-format msgid "unknown action: %d" msgstr "Unbekannte Aktion: %d" -#: sequencer.c:378 +#: sequencer.c:382 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -5075,7 +5807,7 @@ msgstr "" "nach Auflösung der Konflikte markieren Sie die korrigierten Pfade\n" "mit 'git add <Pfade>' oder 'git rm <Pfade>'" -#: sequencer.c:381 +#: sequencer.c:385 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -5085,111 +5817,116 @@ msgstr "" "mit 'git add <Pfade>' oder 'git rm <Pfade>' und tragen Sie das Ergebnis mit\n" "'git commit' ein" -#: sequencer.c:394 sequencer.c:2671 +#: sequencer.c:398 sequencer.c:2801 #, c-format msgid "could not lock '%s'" msgstr "Konnte '%s' nicht sperren" -#: sequencer.c:401 +#: sequencer.c:405 #, c-format msgid "could not write eol to '%s'" msgstr "Konnte EOL nicht nach '%s' schreiben." -#: sequencer.c:406 sequencer.c:2554 sequencer.c:2677 sequencer.c:2691 -#: sequencer.c:2931 +#: sequencer.c:410 sequencer.c:2684 sequencer.c:2807 sequencer.c:2821 +#: sequencer.c:3084 #, c-format msgid "failed to finalize '%s'" msgstr "Fehler beim Fertigstellen von '%s'." -#: sequencer.c:429 sequencer.c:931 sequencer.c:1615 sequencer.c:2574 -#: sequencer.c:2913 sequencer.c:3022 builtin/am.c:245 builtin/commit.c:748 -#: builtin/merge.c:1085 builtin/rebase.c:154 +#: 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 "Konnte '%s' nicht lesen" -#: sequencer.c:455 +#: sequencer.c:459 #, c-format msgid "your local changes would be overwritten by %s." msgstr "Ihre lokalen Änderungen würden durch den %s überschrieben werden." -#: sequencer.c:459 +#: sequencer.c:463 msgid "commit your changes or stash them to proceed." msgstr "" "Committen Sie Ihre Änderungen oder benutzen Sie \"stash\", um fortzufahren." -#: sequencer.c:491 +#: sequencer.c:495 #, c-format msgid "%s: fast-forward" msgstr "%s: Vorspulen" +#: sequencer.c:534 builtin/tag.c:555 +#, c-format +msgid "Invalid cleanup mode %s" +msgstr "Ungültiger \"cleanup\" Modus %s" + #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase -i". #. -#: sequencer.c:582 +#: sequencer.c:629 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: Konnte neue Index-Datei nicht schreiben" -#: sequencer.c:598 +#: sequencer.c:646 msgid "unable to update cache tree" msgstr "Konnte Cache-Verzeichnis nicht aktualisieren." -#: sequencer.c:612 +#: sequencer.c:660 msgid "could not resolve HEAD commit" msgstr "Konnte HEAD-Commit nicht auflösen." -#: sequencer.c:692 +#: sequencer.c:740 #, c-format msgid "no key present in '%.*s'" msgstr "Kein Schlüssel in '%.*s' vorhanden." -#: sequencer.c:703 +#: sequencer.c:751 #, c-format msgid "unable to dequote value of '%s'" msgstr "Konnte Anführungszeichen von '%s' nicht entfernen." -#: sequencer.c:740 wrapper.c:227 wrapper.c:397 builtin/am.c:704 -#: builtin/am.c:796 builtin/merge.c:1082 builtin/rebase.c:617 +#: 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 #, c-format msgid "could not open '%s' for reading" msgstr "Konnte '%s' nicht zum Lesen öffnen." -#: sequencer.c:750 +#: sequencer.c:798 msgid "'GIT_AUTHOR_NAME' already given" msgstr "'GIT_AUTHOR_NAME' bereits angegeben." -#: sequencer.c:755 +#: sequencer.c:803 msgid "'GIT_AUTHOR_EMAIL' already given" msgstr "'GIT_AUTHOR_EMAIL' bereits angegeben." -#: sequencer.c:760 +#: sequencer.c:808 msgid "'GIT_AUTHOR_DATE' already given" msgstr "'GIT_AUTHOR_DATE' bereits angegeben." -#: sequencer.c:764 +#: sequencer.c:812 #, c-format msgid "unknown variable '%s'" msgstr "Unbekannte Variable '%s'" -#: sequencer.c:769 +#: sequencer.c:817 msgid "missing 'GIT_AUTHOR_NAME'" msgstr "'GIT_AUTHOR_NAME' fehlt." -#: sequencer.c:771 +#: sequencer.c:819 msgid "missing 'GIT_AUTHOR_EMAIL'" msgstr "'GIT_AUTHOR_EMAIL' fehlt." -#: sequencer.c:773 +#: sequencer.c:821 msgid "missing 'GIT_AUTHOR_DATE'" msgstr "'GIT_AUTHOR_DATE' fehlt." -#: sequencer.c:833 +#: sequencer.c:881 #, c-format msgid "invalid date format '%s' in '%s'" msgstr "Ungültiges Datumsformat '%s' in '%s'" -#: sequencer.c:850 +#: sequencer.c:898 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -5220,15 +5957,15 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:945 +#: sequencer.c:992 msgid "writing root commit" msgstr "Root-Commit schreiben" -#: sequencer.c:1155 +#: sequencer.c:1213 msgid "'prepare-commit-msg' hook failed" msgstr "'prepare-commit-msg' Hook fehlgeschlagen." -#: sequencer.c:1162 +#: sequencer.c:1220 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -5256,7 +5993,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1175 +#: sequencer.c:1233 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -5282,296 +6019,307 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1217 +#: sequencer.c:1275 msgid "couldn't look up newly created commit" msgstr "Konnte neu erstellten Commit nicht nachschlagen." -#: sequencer.c:1219 +#: sequencer.c:1277 msgid "could not parse newly created commit" msgstr "Konnte neu erstellten Commit nicht analysieren." -#: sequencer.c:1265 +#: sequencer.c:1323 msgid "unable to resolve HEAD after creating commit" msgstr "Konnte HEAD nicht auflösen, nachdem der Commit erstellt wurde." -#: sequencer.c:1267 +#: sequencer.c:1325 msgid "detached HEAD" msgstr "losgelöster HEAD" -#: sequencer.c:1271 +#: sequencer.c:1329 msgid " (root-commit)" msgstr " (Root-Commit)" -#: sequencer.c:1292 +#: sequencer.c:1350 msgid "could not parse HEAD" msgstr "Konnte HEAD nicht parsen." -#: sequencer.c:1294 +#: sequencer.c:1352 #, c-format msgid "HEAD %s is not a commit!" msgstr "HEAD %s ist kein Commit!" -#: sequencer.c:1298 builtin/commit.c:1546 +#: sequencer.c:1356 builtin/commit.c:1551 msgid "could not parse HEAD commit" msgstr "Konnte Commit von HEAD nicht analysieren." -#: sequencer.c:1350 sequencer.c:1964 +#: sequencer.c:1408 sequencer.c:2001 msgid "unable to parse commit author" msgstr "Konnte Commit-Autor nicht parsen." -#: sequencer.c:1360 builtin/am.c:1570 builtin/merge.c:678 +#: sequencer.c:1418 builtin/am.c:1572 builtin/merge.c:688 msgid "git write-tree failed to write a tree" msgstr "\"git write-tree\" schlug beim Schreiben eines \"Tree\"-Objektes fehl" -#: sequencer.c:1377 sequencer.c:1433 +#: sequencer.c:1435 sequencer.c:1496 #, c-format msgid "unable to read commit message from '%s'" msgstr "Konnte Commit-Beschreibung von '%s' nicht lesen." -#: sequencer.c:1399 builtin/am.c:1591 builtin/commit.c:1649 builtin/merge.c:859 -#: builtin/merge.c:884 +#: sequencer.c:1462 builtin/am.c:1594 builtin/commit.c:1650 builtin/merge.c:882 +#: builtin/merge.c:906 msgid "failed to write commit object" msgstr "Fehler beim Schreiben des Commit-Objektes." -#: sequencer.c:1460 +#: sequencer.c:1523 #, c-format msgid "could not parse commit %s" msgstr "Konnte Commit %s nicht parsen." -#: sequencer.c:1465 +#: sequencer.c:1528 #, c-format msgid "could not parse parent commit %s" msgstr "Konnte Eltern-Commit %s nicht parsen." -#: sequencer.c:1565 sequencer.c:1675 +#: sequencer.c:1602 sequencer.c:1712 #, c-format msgid "unknown command: %d" msgstr "Unbekannter Befehl: %d" -#: sequencer.c:1622 sequencer.c:1647 +#: sequencer.c:1659 sequencer.c:1684 #, c-format msgid "This is a combination of %d commits." msgstr "Das ist eine Kombination aus %d Commits." -#: sequencer.c:1632 sequencer.c:4808 +#: sequencer.c:1669 msgid "need a HEAD to fixup" msgstr "benötige HEAD für fixup" -#: sequencer.c:1634 sequencer.c:2958 +#: sequencer.c:1671 sequencer.c:3111 msgid "could not read HEAD" msgstr "Konnte HEAD nicht lesen" -#: sequencer.c:1636 +#: sequencer.c:1673 msgid "could not read HEAD's commit message" msgstr "Konnte Commit-Beschreibung von HEAD nicht lesen" -#: sequencer.c:1642 +#: sequencer.c:1679 #, c-format msgid "cannot write '%s'" msgstr "kann '%s' nicht schreiben" -#: sequencer.c:1649 git-rebase--preserve-merges.sh:441 +#: sequencer.c:1686 git-rebase--preserve-merges.sh:441 msgid "This is the 1st commit message:" msgstr "Das ist die erste Commit-Beschreibung:" -#: sequencer.c:1657 +#: sequencer.c:1694 #, c-format msgid "could not read commit message of %s" msgstr "Konnte Commit-Beschreibung von %s nicht lesen." -#: sequencer.c:1664 +#: sequencer.c:1701 #, c-format msgid "This is the commit message #%d:" msgstr "Das ist Commit-Beschreibung #%d:" -#: sequencer.c:1670 +#: sequencer.c:1707 #, c-format msgid "The commit message #%d will be skipped:" msgstr "Die Commit-Beschreibung #%d wird ausgelassen:" -#: sequencer.c:1758 +#: sequencer.c:1795 msgid "your index file is unmerged." msgstr "Ihre Index-Datei ist nicht zusammengeführt." -#: sequencer.c:1765 +#: sequencer.c:1802 msgid "cannot fixup root commit" msgstr "kann fixup nicht auf Root-Commit anwenden" -#: sequencer.c:1784 +#: sequencer.c:1821 #, 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:1792 sequencer.c:1800 +#: sequencer.c:1829 sequencer.c:1837 #, c-format msgid "commit %s does not have parent %d" msgstr "Commit %s hat keinen Eltern-Commit %d" -#: sequencer.c:1806 +#: sequencer.c:1843 #, 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:1825 +#: sequencer.c:1862 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: kann Eltern-Commit %s nicht parsen" -#: sequencer.c:1890 +#: sequencer.c:1927 #, c-format msgid "could not rename '%s' to '%s'" msgstr "Konnte '%s' nicht zu '%s' umbenennen." -#: sequencer.c:1945 +#: sequencer.c:1982 #, c-format msgid "could not revert %s... %s" msgstr "Konnte \"revert\" nicht auf %s... (%s) ausführen" -#: sequencer.c:1946 +#: sequencer.c:1983 #, c-format msgid "could not apply %s... %s" msgstr "Konnte %s... (%s) nicht anwenden" -#: sequencer.c:2005 +#: sequencer.c:2042 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: Fehler beim Lesen des Index" -#: sequencer.c:2012 +#: sequencer.c:2049 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: Fehler beim Aktualisieren des Index" -#: sequencer.c:2094 +#: sequencer.c:2118 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "%s akzeptiert keine Argumente: '%s'" -#: sequencer.c:2103 +#: sequencer.c:2127 #, c-format msgid "missing arguments for %s" msgstr "Fehlende Argumente für %s." -#: sequencer.c:2163 +#: sequencer.c:2164 +#, c-format +msgid "could not parse '%.*s'" +msgstr "Konnte '%.*s' nicht parsen." + +#: sequencer.c:2226 #, c-format msgid "invalid line %d: %.*s" msgstr "Ungültige Zeile %d: %.*s" -#: sequencer.c:2171 +#: sequencer.c:2237 #, c-format msgid "cannot '%s' without a previous commit" msgstr "Kann '%s' nicht ohne vorherigen Commit ausführen" -#: sequencer.c:2243 +#: 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 "Konnte '%s' nicht lesen." + +#: sequencer.c:2360 msgid "please fix this using 'git rebase --edit-todo'." msgstr "" "Bitte beheben Sie dieses, indem Sie 'git rebase --edit-todo' ausführen." -#: sequencer.c:2245 +#: sequencer.c:2362 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "Unbenutzbares Instruktionsblatt: '%s'" -#: sequencer.c:2250 +#: sequencer.c:2367 msgid "no commits parsed." msgstr "Keine Commits geparst." -#: sequencer.c:2261 +#: sequencer.c:2378 msgid "cannot cherry-pick during a revert." msgstr "Kann Cherry-Pick nicht während eines Reverts ausführen." -#: sequencer.c:2263 +#: sequencer.c:2380 msgid "cannot revert during a cherry-pick." msgstr "Kann Revert nicht während eines Cherry-Picks ausführen." -#: sequencer.c:2333 +#: sequencer.c:2462 #, c-format msgid "invalid value for %s: %s" msgstr "Ungültiger Wert für %s: %s" -#: sequencer.c:2420 +#: sequencer.c:2549 msgid "unusable squash-onto" msgstr "Unbenutzbares squash-onto." -#: sequencer.c:2436 +#: sequencer.c:2565 #, c-format msgid "malformed options sheet: '%s'" msgstr "Fehlerhaftes Optionsblatt: '%s'" -#: sequencer.c:2518 sequencer.c:4067 +#: sequencer.c:2648 sequencer.c:4227 msgid "empty commit set passed" msgstr "leere Menge von Commits übergeben" -#: sequencer.c:2526 +#: sequencer.c:2656 msgid "a cherry-pick or revert is already in progress" msgstr "\"cherry-pick\" oder \"revert\" ist bereits im Gang" -#: sequencer.c:2527 +#: sequencer.c:2657 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "versuchen Sie \"git cherry-pick (--continue | --quit | --abort)\"" -#: sequencer.c:2530 +#: sequencer.c:2660 #, c-format msgid "could not create sequencer directory '%s'" msgstr "Konnte \"sequencer\"-Verzeichnis '%s' nicht erstellen." -#: sequencer.c:2544 +#: sequencer.c:2674 msgid "could not lock HEAD" msgstr "Konnte HEAD nicht sperren" -#: sequencer.c:2599 sequencer.c:3819 +#: sequencer.c:2729 sequencer.c:3979 msgid "no cherry-pick or revert in progress" msgstr "kein \"cherry-pick\" oder \"revert\" im Gang" -#: sequencer.c:2601 +#: sequencer.c:2731 msgid "cannot resolve HEAD" msgstr "kann HEAD nicht auflösen" -#: sequencer.c:2603 sequencer.c:2638 +#: sequencer.c:2733 sequencer.c:2768 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:2624 builtin/grep.c:732 +#: sequencer.c:2754 builtin/grep.c:732 #, c-format msgid "cannot open '%s'" msgstr "kann '%s' nicht öffnen" -#: sequencer.c:2626 +#: sequencer.c:2756 #, c-format msgid "cannot read '%s': %s" msgstr "Kann '%s' nicht lesen: %s" -#: sequencer.c:2627 +#: sequencer.c:2757 msgid "unexpected end of file" msgstr "Unerwartetes Dateiende" -#: sequencer.c:2633 +#: sequencer.c:2763 #, 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:2644 +#: sequencer.c:2774 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:2750 sequencer.c:3735 +#: sequencer.c:2903 sequencer.c:3894 #, c-format msgid "could not update %s" msgstr "Konnte %s nicht aktualisieren." -#: sequencer.c:2788 sequencer.c:3715 +#: sequencer.c:2941 sequencer.c:3874 msgid "cannot read HEAD" msgstr "Kann HEAD nicht lesen" -#: sequencer.c:2805 +#: sequencer.c:2958 #, c-format msgid "unable to copy '%s' to '%s'" msgstr "Konnte '%s' nicht nach '%s' kopieren." -#: sequencer.c:2813 +#: sequencer.c:2966 #, c-format msgid "" "You can amend the commit now, with\n" @@ -5590,27 +6338,27 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:2823 +#: sequencer.c:2976 #, c-format msgid "Could not apply %s... %.*s" msgstr "Konnte %s... (%.*s) nicht anwenden" -#: sequencer.c:2830 +#: sequencer.c:2983 #, c-format msgid "Could not merge %.*s" msgstr "Konnte \"%.*s\" nicht zusammenführen." -#: sequencer.c:2844 sequencer.c:2848 builtin/difftool.c:641 +#: sequencer.c:2997 sequencer.c:3001 builtin/difftool.c:633 #, c-format msgid "could not copy '%s' to '%s'" msgstr "Konnte '%s' nicht nach '%s' kopieren." -#: sequencer.c:2870 sequencer.c:3293 builtin/rebase.c:424 builtin/rebase.c:1230 -#: builtin/rebase.c:1591 builtin/rebase.c:1646 +#: 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 "Konnte den Index nicht lesen." -#: sequencer.c:2875 +#: sequencer.c:3028 #, c-format msgid "" "execution failed: %s\n" @@ -5626,11 +6374,11 @@ msgstr "" "\n" "ausführen.\n" -#: sequencer.c:2881 +#: sequencer.c:3034 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:2887 +#: sequencer.c:3040 #, c-format msgid "" "execution succeeded: %s\n" @@ -5648,77 +6396,77 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:2948 +#: sequencer.c:3101 #, c-format msgid "illegal label name: '%.*s'" msgstr "Unerlaubter Beschriftungsname: '%.*s'" -#: sequencer.c:3002 +#: sequencer.c:3155 msgid "writing fake root commit" msgstr "unechten Root-Commit schreiben" -#: sequencer.c:3007 +#: sequencer.c:3160 msgid "writing squash-onto" msgstr "squash-onto schreiben" -#: sequencer.c:3045 builtin/rebase.c:429 builtin/rebase.c:435 +#: sequencer.c:3198 builtin/rebase.c:844 builtin/rebase.c:850 #, c-format msgid "failed to find tree of %s" msgstr "Fehler beim Finden des \"Tree\"-Objektes von %s." -#: sequencer.c:3063 builtin/rebase.c:448 +#: sequencer.c:3216 builtin/rebase.c:863 msgid "could not write index" msgstr "Konnte Index nicht schreiben." -#: sequencer.c:3090 +#: sequencer.c:3243 #, c-format msgid "could not resolve '%s'" msgstr "Konnte '%s' nicht auflösen." -#: sequencer.c:3118 +#: sequencer.c:3271 msgid "cannot merge without a current revision" msgstr "Kann nicht ohne einen aktuellen Commit mergen." -#: sequencer.c:3140 +#: sequencer.c:3293 #, c-format msgid "unable to parse '%.*s'" msgstr "Konnte '%.*s' nicht parsen." -#: sequencer.c:3149 +#: sequencer.c:3302 #, c-format msgid "nothing to merge: '%.*s'" msgstr "Nichts zum Zusammenführen: '%.*s'" -#: sequencer.c:3161 +#: sequencer.c:3314 msgid "octopus merge cannot be executed on top of a [new root]" msgstr "" "Octupus-Merge kann nicht auf Basis von [neuem Root-Commit] ausgeführt werden." -#: sequencer.c:3176 +#: sequencer.c:3329 #, c-format msgid "could not get commit message of '%s'" msgstr "Konnte keine Commit-Beschreibung von '%s' bekommen." -#: sequencer.c:3325 +#: sequencer.c:3478 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "Konnte nicht einmal versuchen '%.*s' zu mergen." -#: sequencer.c:3341 +#: sequencer.c:3494 msgid "merge: Unable to write new index file" msgstr "merge: Konnte neue Index-Datei nicht schreiben." -#: sequencer.c:3409 builtin/rebase.c:298 +#: sequencer.c:3562 builtin/rebase.c:711 #, c-format msgid "Applied autostash.\n" msgstr "Automatischen Stash angewendet.\n" -#: sequencer.c:3421 +#: sequencer.c:3574 #, c-format msgid "cannot store %s" msgstr "kann %s nicht speichern" -#: sequencer.c:3424 builtin/rebase.c:314 +#: sequencer.c:3577 builtin/rebase.c:727 #, c-format msgid "" "Applying autostash resulted in conflicts.\n" @@ -5729,31 +6477,31 @@ msgstr "" "Ihre Änderungen sind im Stash sicher.\n" "Sie können jederzeit \"git stash pop\" oder \"git stash drop\" ausführen.\n" -#: sequencer.c:3478 +#: sequencer.c:3638 #, c-format msgid "could not checkout %s" msgstr "Konnte %s nicht auschecken." -#: sequencer.c:3492 +#: sequencer.c:3652 #, c-format msgid "%s: not a valid OID" msgstr "%s: keine gültige OID" -#: sequencer.c:3497 git-rebase--preserve-merges.sh:724 +#: sequencer.c:3657 git-rebase--preserve-merges.sh:724 msgid "could not detach HEAD" msgstr "Konnte HEAD nicht loslösen" -#: sequencer.c:3512 +#: sequencer.c:3672 #, c-format msgid "Stopped at HEAD\n" msgstr "Angehalten bei HEAD\n" -#: sequencer.c:3514 +#: sequencer.c:3674 #, c-format msgid "Stopped at %s\n" msgstr "Angehalten bei %s\n" -#: sequencer.c:3522 +#: sequencer.c:3682 #, c-format msgid "" "Could not execute the todo command\n" @@ -5775,50 +6523,50 @@ msgstr "" " git rebase --edit-todo\n" " git rebase --continue\n" -#: sequencer.c:3597 +#: sequencer.c:3759 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "Angehalten bei %s... %.*s\n" -#: sequencer.c:3677 +#: sequencer.c:3837 #, c-format msgid "unknown command %d" msgstr "Unbekannter Befehl %d" -#: sequencer.c:3723 +#: sequencer.c:3882 msgid "could not read orig-head" msgstr "Konnte orig-head nicht lesen." -#: sequencer.c:3728 sequencer.c:4805 +#: sequencer.c:3887 msgid "could not read 'onto'" msgstr "Konnte 'onto' nicht lesen." -#: sequencer.c:3742 +#: sequencer.c:3901 #, c-format msgid "could not update HEAD to %s" msgstr "Konnte HEAD nicht auf %s aktualisieren." -#: sequencer.c:3831 +#: sequencer.c:3991 msgid "cannot rebase: You have unstaged changes." msgstr "" "Rebase nicht möglich: Sie haben Änderungen, die nicht zum Commit\n" "vorgemerkt sind." -#: sequencer.c:3840 +#: sequencer.c:4000 msgid "cannot amend non-existing commit" msgstr "Kann nicht existierenden Commit nicht nachbessern." -#: sequencer.c:3842 +#: sequencer.c:4002 #, c-format msgid "invalid file: '%s'" msgstr "Ungültige Datei: '%s'" -#: sequencer.c:3844 +#: sequencer.c:4004 #, c-format msgid "invalid contents: '%s'" msgstr "Ungültige Inhalte: '%s'" -#: sequencer.c:3847 +#: sequencer.c:4007 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -5829,82 +6577,42 @@ msgstr "" "committen Sie diese zuerst und führen Sie dann 'git rebase --continue'\n" "erneut aus." -#: sequencer.c:3883 sequencer.c:3921 +#: sequencer.c:4043 sequencer.c:4081 #, c-format msgid "could not write file: '%s'" msgstr "Konnte Datei nicht schreiben: '%s'" -#: sequencer.c:3936 +#: sequencer.c:4096 msgid "could not remove CHERRY_PICK_HEAD" msgstr "Konnte CHERRY_PICK_HEAD nicht löschen." -#: sequencer.c:3943 +#: sequencer.c:4103 msgid "could not commit staged changes." msgstr "Konnte Änderungen aus der Staging-Area nicht committen." -#: sequencer.c:4044 +#: sequencer.c:4204 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: %s kann nicht in \"cherry-pick\" benutzt werden" -#: sequencer.c:4048 +#: sequencer.c:4208 #, c-format msgid "%s: bad revision" msgstr "%s: ungültiger Commit" -#: sequencer.c:4083 +#: sequencer.c:4243 msgid "can't revert as initial commit" msgstr "Kann nicht als allerersten Commit einen Revert ausführen." -#: sequencer.c:4529 +#: sequencer.c:4686 msgid "make_script: unhandled options" msgstr "make_script: unbehandelte Optionen" -#: sequencer.c:4532 +#: sequencer.c:4689 msgid "make_script: error preparing revisions" msgstr "make_script: Fehler beim Vorbereiten der Commits" -#: sequencer.c:4573 sequencer.c:4629 sequencer.c:4904 -#, c-format -msgid "unusable todo list: '%s'" -msgstr "Unbenutzbare TODO-Liste: '%s'" - -#: sequencer.c:4684 -#, c-format -msgid "" -"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." -msgstr "" -"Nicht erkannte Einstellung %s für Option rebase.missingCommitsCheck. " -"Ignoriere." - -#: sequencer.c:4754 -#, c-format -msgid "" -"Warning: some commits may have been dropped accidentally.\n" -"Dropped commits (newer to older):\n" -msgstr "" -"Warnung: Einige Commits könnten aus Versehen entfernt worden sein.\n" -"Entfernte Commits (neu zu alt):\n" - -#: sequencer.c:4761 -#, c-format -msgid "" -"To avoid this message, use \"drop\" to explicitly remove a commit.\n" -"\n" -"Use 'git config rebase.missingCommitsCheck' to change the level of " -"warnings.\n" -"The possible behaviours are: ignore, warn, error.\n" -"\n" -msgstr "" -"Um diese Meldung zu vermeiden, benutzen Sie \"drop\", um exlizit Commits zu\n" -"entfernen.\n" -"\n" -"Benutzen Sie 'git config rebase.missingCommitsCheck', um die Stufe der\n" -"Warnungen zu ändern.\n" -"Die möglichen Verhaltensweisen sind: ignore, warn, error.\n" - -#: sequencer.c:4774 -#, c-format +#: sequencer.c:4847 msgid "" "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" "continue'.\n" @@ -5914,31 +6622,15 @@ msgstr "" "'git rebase --continue' aus.\n" "Oder Sie können den Rebase mit 'git rebase --abort' abbrechen.\n" -#: sequencer.c:4912 sequencer.c:4950 +#: sequencer.c:4959 sequencer.c:4976 msgid "nothing to do" msgstr "Nichts zu tun." -#: sequencer.c:4916 -#, c-format -msgid "Rebase %s onto %s (%d command)" -msgid_plural "Rebase %s onto %s (%d commands)" -msgstr[0] "Rebase von %s auf %s (%d Kommando)" -msgstr[1] "Rebase von %s auf %s (%d Kommandos)" - -#: sequencer.c:4928 -#, c-format -msgid "could not copy '%s' to '%s'." -msgstr "Konnte '%s' nicht nach '%s' kopieren." - -#: sequencer.c:4932 sequencer.c:4961 -msgid "could not transform the todo list" -msgstr "Konnte die TODO-Liste nicht umwandeln." - -#: sequencer.c:4964 +#: sequencer.c:4990 msgid "could not skip unnecessary pick commands" msgstr "Konnte unnötige \"pick\"-Befehle nicht auslassen." -#: sequencer.c:5047 +#: sequencer.c:5073 msgid "the script was already rearranged." msgstr "Das Script wurde bereits umgeordnet." @@ -5947,7 +6639,7 @@ msgstr "Das Script wurde bereits umgeordnet." msgid "'%s' is outside repository" msgstr "'%s' liegt außerhalb des Repositories." -#: setup.c:172 +#: setup.c:173 #, c-format msgid "" "%s: no such path in the working tree.\n" @@ -5957,7 +6649,7 @@ msgstr "" "Benutzen Sie 'git <Befehl> -- <Pfad>...' zur Angabe von Pfaden, die lokal\n" "nicht existieren." -#: setup.c:185 +#: setup.c:186 #, c-format msgid "" "ambiguous argument '%s': unknown revision or path not in the working tree.\n" @@ -5969,13 +6661,13 @@ msgstr "" "Benutzen Sie '--', um Pfade und Commits zu trennen, ähnlich wie:\n" "'git <Befehl> [<Commit>...] -- [<Datei>...]'" -#: setup.c:234 +#: setup.c:235 #, c-format msgid "option '%s' must come before non-option arguments" msgstr "" "Die Option '%s' muss vor den Argumenten kommen, die keine Optionen sind." -#: setup.c:253 +#: setup.c:254 #, c-format msgid "" "ambiguous argument '%s': both revision and filename\n" @@ -5986,93 +6678,93 @@ msgstr "" "Benutzen Sie '--', um Pfade und Commits zu trennen, ähnlich wie:\n" "'git <Befehl> [<Commit>...] -- [<Datei>...]'" -#: setup.c:389 +#: setup.c:390 msgid "unable to set up work tree using invalid config" msgstr "" "Konnte Arbeitsverzeichnis mit ungültiger Konfiguration nicht einrichten." -#: setup.c:393 +#: setup.c:394 msgid "this operation must be run in a work tree" msgstr "Diese Operation muss in einem Arbeitsverzeichnis ausgeführt werden." -#: setup.c:527 +#: setup.c:540 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "Erwartete Git-Repository-Version <= %d, %d gefunden" -#: setup.c:535 +#: setup.c:548 msgid "unknown repository extensions found:" msgstr "Unbekannte Repository-Erweiterungen gefunden:" -#: setup.c:554 +#: setup.c:567 #, c-format msgid "error opening '%s'" msgstr "Fehler beim Öffnen von '%s'." -#: setup.c:556 +#: setup.c:569 #, c-format msgid "too large to be a .git file: '%s'" msgstr "Zu groß, um eine .git-Datei zu sein: '%s'" -#: setup.c:558 +#: setup.c:571 #, c-format msgid "error reading %s" msgstr "Fehler beim Lesen von '%s'." -#: setup.c:560 +#: setup.c:573 #, c-format msgid "invalid gitfile format: %s" msgstr "Ungültiges gitfile-Format: %s" -#: setup.c:562 +#: setup.c:575 #, c-format msgid "no path in gitfile: %s" msgstr "Kein Pfad in gitfile: %s" -#: setup.c:564 +#: setup.c:577 #, c-format msgid "not a git repository: %s" msgstr "Kein Git-Repository: %s" -#: setup.c:663 +#: setup.c:676 #, c-format msgid "'$%s' too big" msgstr "'$%s' zu groß" -#: setup.c:677 +#: setup.c:690 #, c-format msgid "not a git repository: '%s'" msgstr "Kein Git-Repository: '%s'" -#: setup.c:706 setup.c:708 setup.c:739 +#: setup.c:719 setup.c:721 setup.c:752 #, c-format msgid "cannot chdir to '%s'" msgstr "Kann nicht in Verzeichnis '%s' wechseln." -#: setup.c:711 setup.c:767 setup.c:777 setup.c:816 setup.c:824 +#: setup.c:724 setup.c:780 setup.c:790 setup.c:829 setup.c:837 msgid "cannot come back to cwd" msgstr "Kann nicht zum aktuellen Arbeitsverzeichnis zurückwechseln." -#: setup.c:838 +#: setup.c:851 #, c-format msgid "failed to stat '%*s%s%s'" msgstr "Konnte '%*s%s%s' nicht lesen." -#: setup.c:1068 +#: setup.c:1083 msgid "Unable to read current working directory" msgstr "Konnte aktuelles Arbeitsverzeichnis nicht lesen." -#: setup.c:1077 setup.c:1083 +#: setup.c:1092 setup.c:1098 #, c-format msgid "cannot change to '%s'" msgstr "Kann nicht nach '%s' wechseln." -#: setup.c:1088 +#: setup.c:1103 #, c-format msgid "not a git repository (or any of the parent directories): %s" msgstr "Kein Git-Repository (oder irgendeines der Elternverzeichnisse): %s" -#: setup.c:1094 +#: setup.c:1109 #, c-format msgid "" "not a git repository (or any parent up to mount point %s)\n" @@ -6082,7 +6774,7 @@ msgstr "" "%s)\n" "Stoppe bei Dateisystemgrenze (GIT_DISCOVERY_ACROSS_FILESYSTEM nicht gesetzt)." -#: setup.c:1204 +#: setup.c:1220 #, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" @@ -6091,285 +6783,285 @@ msgstr "" "Problem mit Wert für Dateimodus (0%.3o) von core.sharedRepository.\n" "Der Besitzer der Dateien muss immer Lese- und Schreibrechte haben." -#: setup.c:1247 +#: setup.c:1264 msgid "open /dev/null or dup failed" msgstr "Öffnen von /dev/null oder dup fehlgeschlagen." -#: setup.c:1262 +#: setup.c:1279 msgid "fork failed" msgstr "fork fehlgeschlagen" -#: setup.c:1267 +#: setup.c:1284 msgid "setsid failed" msgstr "setsid fehlgeschlagen" -#: sha1-file.c:445 +#: sha1-file.c:453 #, 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:496 +#: sha1-file.c:504 #, c-format msgid "unable to normalize alternate object path: %s" msgstr "Konnte alternativen Objektpfad '%s' nicht normalisieren." -#: sha1-file.c:568 +#: sha1-file.c:576 #, c-format msgid "%s: ignoring alternate object stores, nesting too deep" msgstr "%s: ignoriere alternative Objektspeicher - Verschachtelung zu tief" -#: sha1-file.c:575 +#: sha1-file.c:583 #, c-format msgid "unable to normalize object directory: %s" msgstr "Konnte Objektverzeichnis '%s' nicht normalisieren." -#: sha1-file.c:618 +#: sha1-file.c:626 msgid "unable to fdopen alternates lockfile" msgstr "Konnte fdopen nicht auf Lock-Datei für \"alternates\" aufrufen." -#: sha1-file.c:636 +#: sha1-file.c:644 msgid "unable to read alternates file" msgstr "Konnte \"alternates\"-Datei nicht lesen." -#: sha1-file.c:643 +#: sha1-file.c:651 msgid "unable to move new alternates file into place" msgstr "Konnte neue \"alternates\"-Datei nicht übernehmen." -#: sha1-file.c:678 +#: sha1-file.c:686 #, c-format msgid "path '%s' does not exist" msgstr "Pfad '%s' existiert nicht" -#: sha1-file.c:704 +#: sha1-file.c:712 #, 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:710 +#: sha1-file.c:718 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "Referenziertes Repository '%s' ist kein lokales Repository." -#: sha1-file.c:716 +#: sha1-file.c:724 #, c-format msgid "reference repository '%s' is shallow" msgstr "" "Referenziertes Repository '%s' hat eine unvollständige Historie (shallow)." -#: sha1-file.c:724 +#: sha1-file.c:732 #, c-format msgid "reference repository '%s' is grafted" msgstr "" "Referenziertes Repository '%s' ist mit künstlichen Vorgängern (\"grafts\") " "eingehängt." -#: sha1-file.c:838 +#: sha1-file.c:846 #, c-format msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" msgstr "Versuche mmap %<PRIuMAX> über Limit %<PRIuMAX>." -#: sha1-file.c:863 +#: sha1-file.c:871 msgid "mmap failed" msgstr "mmap fehlgeschlagen" -#: sha1-file.c:1027 +#: sha1-file.c:1035 #, c-format msgid "object file %s is empty" msgstr "Objektdatei %s ist leer." -#: sha1-file.c:1151 sha1-file.c:2288 +#: sha1-file.c:1159 sha1-file.c:2297 #, c-format msgid "corrupt loose object '%s'" msgstr "Fehlerhaftes loses Objekt '%s'." -#: sha1-file.c:1153 sha1-file.c:2292 +#: sha1-file.c:1161 sha1-file.c:2301 #, c-format msgid "garbage at end of loose object '%s'" msgstr "Nutzlose Daten am Ende von losem Objekt '%s'." -#: sha1-file.c:1195 +#: sha1-file.c:1203 msgid "invalid object type" msgstr "ungültiger Objekt-Typ" -#: sha1-file.c:1279 +#: sha1-file.c:1287 #, 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:1282 +#: sha1-file.c:1290 #, c-format msgid "unable to unpack %s header" msgstr "Konnte %s Kopfbereich nicht entpacken." -#: sha1-file.c:1288 +#: sha1-file.c:1296 #, 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:1291 +#: sha1-file.c:1299 #, c-format msgid "unable to parse %s header" msgstr "Konnte %s Kopfbereich nicht parsen." -#: sha1-file.c:1481 +#: sha1-file.c:1490 #, c-format msgid "failed to read object %s" msgstr "Konnte Objekt %s nicht lesen." -#: sha1-file.c:1485 +#: sha1-file.c:1494 #, c-format msgid "replacement %s not found for %s" msgstr "Ersetzung %s für %s nicht gefunden." -#: sha1-file.c:1489 +#: sha1-file.c:1498 #, c-format msgid "loose object %s (stored in %s) is corrupt" msgstr "Loses Objekt %s (gespeichert in %s) ist beschädigt." -#: sha1-file.c:1493 +#: sha1-file.c:1502 #, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "Gepacktes Objekt %s (gespeichert in %s) ist beschädigt." -#: sha1-file.c:1595 +#: sha1-file.c:1604 #, c-format msgid "unable to write file %s" msgstr "Konnte Datei %s nicht schreiben." -#: sha1-file.c:1602 +#: sha1-file.c:1611 #, c-format msgid "unable to set permission to '%s'" msgstr "Konnte Zugriffsberechtigung auf '%s' nicht setzen." -#: sha1-file.c:1609 +#: sha1-file.c:1618 msgid "file write error" msgstr "Fehler beim Schreiben einer Datei." -#: sha1-file.c:1628 +#: sha1-file.c:1637 msgid "error when closing loose object file" msgstr "Fehler beim Schließen der Datei für lose Objekte." -#: sha1-file.c:1693 +#: sha1-file.c:1702 #, 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:1695 +#: sha1-file.c:1704 msgid "unable to create temporary file" msgstr "Konnte temporäre Datei nicht erstellen." -#: sha1-file.c:1719 +#: sha1-file.c:1728 msgid "unable to write loose object file" msgstr "Fehler beim Schreiben der Datei für lose Objekte." -#: sha1-file.c:1725 +#: sha1-file.c:1734 #, c-format msgid "unable to deflate new object %s (%d)" msgstr "Konnte neues Objekt %s (%d) nicht komprimieren." -#: sha1-file.c:1729 +#: sha1-file.c:1738 #, c-format msgid "deflateEnd on object %s failed (%d)" msgstr "deflateEnd auf Objekt %s fehlgeschlagen (%d)" -#: sha1-file.c:1733 +#: sha1-file.c:1742 #, c-format msgid "confused by unstable object source data for %s" msgstr "Fehler wegen instabilen Objektquelldaten für %s" -#: sha1-file.c:1743 builtin/pack-objects.c:919 +#: sha1-file.c:1752 builtin/pack-objects.c:920 #, c-format msgid "failed utime() on %s" msgstr "Fehler beim Aufruf von utime() auf '%s'." -#: sha1-file.c:1818 +#: sha1-file.c:1827 #, c-format msgid "cannot read object for %s" msgstr "Kann Objekt für %s nicht lesen." -#: sha1-file.c:1858 +#: sha1-file.c:1867 msgid "corrupt commit" msgstr "fehlerhafter Commit" -#: sha1-file.c:1866 +#: sha1-file.c:1875 msgid "corrupt tag" msgstr "fehlerhaftes Tag" -#: sha1-file.c:1965 +#: sha1-file.c:1974 #, c-format msgid "read error while indexing %s" msgstr "Lesefehler beim Indizieren von '%s'." -#: sha1-file.c:1968 +#: sha1-file.c:1977 #, c-format msgid "short read while indexing %s" msgstr "read() zu kurz beim Indizieren von '%s'." -#: sha1-file.c:2041 sha1-file.c:2050 +#: sha1-file.c:2050 sha1-file.c:2059 #, c-format msgid "%s: failed to insert into database" msgstr "%s: Fehler beim Einfügen in die Datenbank" -#: sha1-file.c:2056 +#: sha1-file.c:2065 #, c-format msgid "%s: unsupported file type" msgstr "%s: nicht unterstützte Dateiart" -#: sha1-file.c:2080 +#: sha1-file.c:2089 #, c-format msgid "%s is not a valid object" msgstr "%s ist kein gültiges Objekt" -#: sha1-file.c:2082 +#: sha1-file.c:2091 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s ist kein gültiges '%s' Objekt" -#: sha1-file.c:2109 builtin/index-pack.c:154 +#: sha1-file.c:2118 builtin/index-pack.c:154 #, c-format msgid "unable to open %s" msgstr "kann %s nicht öffnen" -#: sha1-file.c:2299 sha1-file.c:2351 +#: sha1-file.c:2308 sha1-file.c:2360 #, c-format msgid "hash mismatch for %s (expected %s)" msgstr "Hash für %s stimmt nicht überein (%s erwartet)." -#: sha1-file.c:2323 +#: sha1-file.c:2332 #, c-format msgid "unable to mmap %s" msgstr "Konnte mmap nicht auf %s ausführen." -#: sha1-file.c:2328 +#: sha1-file.c:2337 #, c-format msgid "unable to unpack header of %s" msgstr "Konnte Kopfbereich von %s nicht entpacken." -#: sha1-file.c:2334 +#: sha1-file.c:2343 #, c-format msgid "unable to parse header of %s" msgstr "Konnte Kopfbereich von %s nicht parsen." -#: sha1-file.c:2345 +#: sha1-file.c:2354 #, c-format msgid "unable to unpack contents of %s" msgstr "Konnte Inhalt von %s nicht entpacken." -#: sha1-name.c:448 +#: sha1-name.c:490 #, c-format msgid "short SHA1 %s is ambiguous" msgstr "Kurzer SHA-1 %s ist mehrdeutig." -#: sha1-name.c:459 +#: sha1-name.c:501 msgid "The candidates are:" msgstr "Die Kandidaten sind:" -#: sha1-name.c:742 +#: sha1-name.c:800 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" @@ -6424,51 +7116,51 @@ msgstr "In nicht ausgechecktem Submodul '%s'." msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "Pfadspezifikation '%s' befindet sich in Submodul '%.*s'" -#: submodule.c:906 +#: submodule.c:910 #, 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:1143 builtin/branch.c:656 builtin/submodule--helper.c:1989 +#: submodule.c:1147 builtin/branch.c:672 builtin/submodule--helper.c:1988 msgid "Failed to resolve HEAD as a valid ref." msgstr "Konnte HEAD nicht als gültige Referenz auflösen." -#: submodule.c:1477 +#: submodule.c:1481 #, c-format msgid "Could not access submodule '%s'" msgstr "Konnte nicht auf Submodul '%s' zugreifen." -#: submodule.c:1639 +#: submodule.c:1651 #, c-format msgid "'%s' not recognized as a git repository" msgstr "'%s' nicht als Git-Repository erkannt" -#: submodule.c:1777 +#: submodule.c:1789 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "Konnte 'git status' in Submodul '%s' nicht starten." -#: submodule.c:1790 +#: submodule.c:1802 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "Konnte 'git status' in Submodul '%s' nicht ausführen." -#: submodule.c:1805 +#: submodule.c:1817 #, c-format msgid "Could not unset core.worktree setting in submodule '%s'" msgstr "Konnte core.worktree Einstellung in Submodul '%s' nicht aufheben." -#: submodule.c:1895 +#: submodule.c:1907 #, c-format msgid "submodule '%s' has dirty index" msgstr "Submodul '%s' hat einen geänderten Index." -#: submodule.c:1947 +#: submodule.c:1959 #, c-format msgid "Submodule '%s' could not be updated." msgstr "Submodule '%s' konnte nicht aktualisiert werden." -#: submodule.c:1996 +#: submodule.c:2008 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" @@ -6476,12 +7168,12 @@ msgstr "" "relocate_gitdir für Submodul '%s' mit mehr als einem Arbeitsverzeichnis\n" "wird nicht unterstützt" -#: submodule.c:2008 submodule.c:2064 +#: submodule.c:2020 submodule.c:2076 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "konnte Name für Submodul '%s' nicht nachschlagen" -#: submodule.c:2015 +#: submodule.c:2027 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -6492,16 +7184,16 @@ msgstr "" "'%s' nach\n" "'%s'\n" -#: submodule.c:2099 +#: submodule.c:2111 #, c-format msgid "could not recurse into submodule '%s'" msgstr "Fehler bei Rekursion in Submodul-Pfad '%s'" -#: submodule.c:2143 +#: submodule.c:2155 msgid "could not start ls-files in .." msgstr "Konnte 'ls-files' nicht in .. starten" -#: submodule.c:2182 +#: submodule.c:2194 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree mit unerwartetem Rückgabewert %d beendet" @@ -6511,23 +7203,23 @@ msgstr "ls-tree mit unerwartetem Rückgabewert %d beendet" msgid "ignoring suspicious submodule name: %s" msgstr "Ignoriere verdächtigen Submodulnamen: %s" -#: submodule-config.c:296 +#: submodule-config.c:299 msgid "negative values not allowed for submodule.fetchjobs" msgstr "Negative Werte für submodule.fetchjobs nicht erlaubt." -#: submodule-config.c:390 +#: submodule-config.c:397 #, c-format msgid "ignoring '%s' which may be interpreted as a command-line option: %s" msgstr "" "Ignoriere '%s', was als eine Befehlszeilenoption '%s' interpretiert werden " "würde." -#: submodule-config.c:479 +#: submodule-config.c:486 #, c-format msgid "invalid value for %s" msgstr "Ungültiger Wert für %s" -#: submodule-config.c:754 +#: submodule-config.c:755 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "Konnte Eintrag '%s' in .gitmodules nicht aktualisieren" @@ -6601,29 +7293,37 @@ msgstr "Konnte Paket '%s' nicht lesen." msgid "transport: invalid depth option '%s'" msgstr "transport: ungültige --depth Option '%s'" -#: transport.c:617 +#: transport.c:259 +msgid "see protocol.version in 'git help config' for more details" +msgstr "Siehe protocol.version in 'git help config' für weitere Informationen" + +#: transport.c:260 +msgid "server options require protocol version 2 or later" +msgstr "Server-Optionen benötigen Protokoll-Version 2 oder höher" + +#: transport.c:625 msgid "could not parse transport.color.* config" msgstr "Konnte transport.color.* Konfiguration nicht parsen." -#: transport.c:690 +#: transport.c:698 msgid "support for protocol v2 not implemented yet" msgstr "Unterstützung für Protokoll v2 noch nicht implementiert." -#: transport.c:817 +#: transport.c:825 #, c-format msgid "unknown value for config '%s': %s" msgstr "Unbekannter Wert für Konfiguration '%s': %s" -#: transport.c:883 +#: transport.c:891 #, c-format msgid "transport '%s' not allowed" msgstr "Übertragungsart '%s' nicht erlaubt." -#: transport.c:937 +#: transport.c:945 msgid "git-over-rsync is no longer supported" msgstr "git-over-rsync wird nicht länger unterstützt." -#: transport.c:1032 +#: transport.c:1040 #, c-format msgid "" "The following submodule paths contain changes that can\n" @@ -6632,7 +7332,7 @@ msgstr "" "Die folgenden Submodul-Pfade enthalten Änderungen, die in keinem\n" "Remote-Repository gefunden wurden:\n" -#: transport.c:1036 +#: transport.c:1044 #, c-format msgid "" "\n" @@ -6659,19 +7359,19 @@ msgstr "" "zum Versenden zu einem Remote-Repository.\n" "\n" -#: transport.c:1044 +#: transport.c:1052 msgid "Aborting." msgstr "Abbruch." -#: transport.c:1184 +#: transport.c:1193 msgid "failed to push all needed submodules" msgstr "Fehler beim Versand aller erforderlichen Submodule." -#: transport.c:1317 transport-helper.c:643 +#: transport.c:1326 transport-helper.c:645 msgid "operation not supported by protocol" msgstr "Die Operation wird von dem Protokoll nicht unterstützt." -#: transport.c:1421 +#: transport.c:1430 #, c-format msgid "invalid line while parsing alternate refs: %s" msgstr "Ungültige Zeile beim Parsen alternativer Referenzen: %s" @@ -6680,18 +7380,18 @@ msgstr "Ungültige Zeile beim Parsen alternativer Referenzen: %s" msgid "full write to remote helper failed" msgstr "Vollständiges Schreiben zu Remote-Helper fehlgeschlagen." -#: transport-helper.c:132 +#: transport-helper.c:134 #, c-format msgid "unable to find remote helper for '%s'" msgstr "Konnte Remote-Helper für '%s' nicht finden." -#: transport-helper.c:148 transport-helper.c:557 +#: transport-helper.c:150 transport-helper.c:559 msgid "can't dup helper output fd" msgstr "" "Konnte dup() auf Dateideskriptor für Ausgaben des Remote-Helpers nicht " "ausführen." -#: transport-helper.c:199 +#: transport-helper.c:201 #, c-format msgid "" "unknown mandatory capability %s; this remote helper probably needs newer " @@ -6700,100 +7400,100 @@ msgstr "" "Unbekannte erforderliche Fähigkeit %s; dieser Remote-Helper benötigt\n" "wahrscheinlich eine neuere Version von Git." -#: transport-helper.c:205 +#: transport-helper.c:207 msgid "this remote helper should implement refspec capability" msgstr "Dieser Remote-Helper sollte die \"refspec\"-Fähigkeit implementieren." -#: transport-helper.c:272 transport-helper.c:412 +#: transport-helper.c:274 transport-helper.c:414 #, c-format msgid "%s unexpectedly said: '%s'" msgstr "unerwartete Ausgabe von %s: '%s'" -#: transport-helper.c:401 +#: transport-helper.c:403 #, c-format msgid "%s also locked %s" msgstr "%s sperrte auch %s" -#: transport-helper.c:479 +#: transport-helper.c:481 msgid "couldn't run fast-import" msgstr "Konnte \"fast-import\" nicht ausführen." -#: transport-helper.c:502 +#: transport-helper.c:504 msgid "error while running fast-import" msgstr "Fehler beim Ausführen von 'fast-import'." -#: transport-helper.c:531 transport-helper.c:1097 +#: transport-helper.c:533 transport-helper.c:1099 #, c-format msgid "could not read ref %s" msgstr "Konnte Referenz %s nicht lesen." -#: transport-helper.c:576 +#: transport-helper.c:578 #, c-format msgid "unknown response to connect: %s" msgstr "Unbekannte Antwort auf 'connect': %s" -#: transport-helper.c:598 +#: transport-helper.c:600 msgid "setting remote service path not supported by protocol" msgstr "" "Setzen des Remote-Service Pfads wird von dem Protokoll nicht unterstützt." -#: transport-helper.c:600 +#: transport-helper.c:602 msgid "invalid remote service path" msgstr "Ungültiger Remote-Service Pfad." -#: transport-helper.c:646 +#: transport-helper.c:648 #, c-format msgid "can't connect to subservice %s" msgstr "Kann keine Verbindung zu Subservice %s herstellen." -#: transport-helper.c:718 +#: transport-helper.c:720 #, c-format msgid "expected ok/error, helper said '%s'" msgstr "Erwartete ok/error, Remote-Helper gab '%s' aus." -#: transport-helper.c:771 +#: transport-helper.c:773 #, c-format msgid "helper reported unexpected status of %s" msgstr "Remote-Helper meldete unerwarteten Status von %s." -#: transport-helper.c:832 +#: transport-helper.c:834 #, c-format msgid "helper %s does not support dry-run" msgstr "Remote-Helper %s unterstützt kein Trockenlauf." -#: transport-helper.c:835 +#: transport-helper.c:837 #, c-format msgid "helper %s does not support --signed" msgstr "Remote-Helper %s unterstützt kein --signed." -#: transport-helper.c:838 +#: transport-helper.c:840 #, c-format msgid "helper %s does not support --signed=if-asked" msgstr "Remote-Helper %s unterstützt kein --signed=if-asked." -#: transport-helper.c:845 +#: transport-helper.c:847 #, c-format msgid "helper %s does not support 'push-option'" msgstr "Remote-Helper %s unterstützt nicht 'push-option'." -#: transport-helper.c:937 +#: transport-helper.c:939 msgid "remote-helper doesn't support push; refspec needed" msgstr "Remote-Helper unterstützt kein Push; Refspec benötigt" -#: transport-helper.c:942 +#: transport-helper.c:944 #, c-format msgid "helper %s does not support 'force'" msgstr "Remote-Helper %s unterstützt kein 'force'." -#: transport-helper.c:989 +#: transport-helper.c:991 msgid "couldn't run fast-export" msgstr "Konnte \"fast-export\" nicht ausführen." -#: transport-helper.c:994 +#: transport-helper.c:996 msgid "error while running fast-export" msgstr "Fehler beim Ausführen von \"fast-export\"." -#: transport-helper.c:1019 +#: transport-helper.c:1021 #, c-format msgid "" "No refs in common and none specified; doing nothing.\n" @@ -6802,47 +7502,47 @@ msgstr "" "Keine gemeinsamen Referenzen und nichts spezifiziert; keine Ausführung.\n" "Vielleicht sollten Sie einen Branch wie 'master' angeben.\n" -#: transport-helper.c:1083 +#: transport-helper.c:1085 #, c-format msgid "malformed response in ref list: %s" msgstr "Ungültige Antwort in Referenzliste: %s" -#: transport-helper.c:1236 +#: transport-helper.c:1238 #, c-format msgid "read(%s) failed" msgstr "Lesen von %s fehlgeschlagen." -#: transport-helper.c:1263 +#: transport-helper.c:1265 #, c-format msgid "write(%s) failed" msgstr "Schreiben von %s fehlgeschlagen." -#: transport-helper.c:1312 +#: transport-helper.c:1314 #, c-format msgid "%s thread failed" msgstr "Thread %s fehlgeschlagen." -#: transport-helper.c:1316 +#: transport-helper.c:1318 #, c-format msgid "%s thread failed to join: %s" msgstr "Fehler beim Beitreten zu Thread %s: %s" -#: transport-helper.c:1335 transport-helper.c:1339 +#: transport-helper.c:1337 transport-helper.c:1341 #, c-format msgid "can't start thread for copying data: %s" msgstr "Kann Thread zum Kopieren von Daten nicht starten: %s" -#: transport-helper.c:1376 +#: transport-helper.c:1378 #, c-format msgid "%s process failed to wait" msgstr "Fehler beim Warten von Prozess %s." -#: transport-helper.c:1380 +#: transport-helper.c:1382 #, c-format msgid "%s process failed" msgstr "Prozess %s fehlgeschlagen" -#: transport-helper.c:1398 transport-helper.c:1407 +#: transport-helper.c:1400 transport-helper.c:1409 msgid "can't start thread for copying data" msgstr "Kann Thread zum Kopieren von Daten nicht starten." @@ -7104,16 +7804,16 @@ msgstr "" "Kann Submodul nicht aktualisieren:\n" "%s" -#: unpack-trees.c:253 +#: unpack-trees.c:256 #, c-format msgid "Aborting\n" msgstr "Abbruch\n" -#: unpack-trees.c:335 +#: unpack-trees.c:318 msgid "Checking out files" msgstr "Checke Dateien aus" -#: unpack-trees.c:367 +#: unpack-trees.c:350 msgid "" "the following paths have collided (e.g. case-sensitive paths\n" "on a case-insensitive filesystem) and only one from the same\n" @@ -7152,32 +7852,32 @@ msgstr "ungültige Portnummer" msgid "invalid '..' path segment" msgstr "ungültiges '..' Pfadsegment" -#: worktree.c:249 builtin/am.c:2094 +#: worktree.c:255 builtin/am.c:2097 #, c-format msgid "failed to read '%s'" msgstr "Fehler beim Lesen von '%s'" -#: worktree.c:295 +#: worktree.c:301 #, c-format msgid "'%s' at main working tree is not the repository directory" msgstr "'%s' im Hauptarbeitsverzeichnis ist nicht das Repository-Verzeichnis." -#: worktree.c:306 +#: worktree.c:312 #, 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:318 +#: worktree.c:324 #, c-format msgid "'%s' does not exist" msgstr "'%s' existiert nicht." -#: worktree.c:324 +#: worktree.c:330 #, c-format msgid "'%s' is not a .git file, error code %d" msgstr "'%s' ist keine .git-Datei, Fehlercode %d" -#: worktree.c:332 +#: worktree.c:338 #, c-format msgid "'%s' does not point back to '%s'" msgstr "'%s' zeigt nicht zurück auf '%s'" @@ -7196,167 +7896,167 @@ msgstr "konnte nicht auf '%s' zugreifen" msgid "unable to get current working directory" msgstr "Konnte aktuelles Arbeitsverzeichnis nicht bekommen." -#: wt-status.c:155 +#: wt-status.c:156 msgid "Unmerged paths:" msgstr "Nicht zusammengeführte Pfade:" -#: wt-status.c:182 wt-status.c:209 +#: wt-status.c:183 wt-status.c:210 #, c-format msgid " (use \"git reset %s <file>...\" to unstage)" msgstr "" " (benutzen Sie \"git reset %s <Datei>...\" zum Entfernen aus der Staging-" "Area)" -#: wt-status.c:184 wt-status.c:211 +#: wt-status.c:185 wt-status.c:212 msgid " (use \"git rm --cached <file>...\" to unstage)" msgstr "" " (benutzen Sie \"git rm --cached <Datei>...\" zum Entfernen aus der Staging-" "Area)" -#: wt-status.c:188 +#: wt-status.c:189 msgid " (use \"git add <file>...\" to mark resolution)" msgstr "" " (benutzen Sie \"git add/rm <Datei>...\", um die Auflösung zu markieren)" -#: wt-status.c:190 wt-status.c:194 +#: wt-status.c:191 wt-status.c:195 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr "" " (benutzen Sie \"git add/rm <Datei>...\", um die Auflösung entsprechend zu " "markieren)" -#: wt-status.c:192 +#: wt-status.c:193 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr "" " (benutzen Sie \"git add/rm <Datei>...\", um die Auflösung zu markieren)" -#: wt-status.c:203 wt-status.c:1046 +#: wt-status.c:204 wt-status.c:1064 msgid "Changes to be committed:" msgstr "Zum Commit vorgemerkte Änderungen:" -#: wt-status.c:221 wt-status.c:1055 +#: wt-status.c:222 wt-status.c:1073 msgid "Changes not staged for commit:" msgstr "Änderungen, die nicht zum Commit vorgemerkt sind:" -#: wt-status.c:225 +#: wt-status.c:226 msgid " (use \"git add <file>...\" to update what will be committed)" msgstr "" " (benutzen Sie \"git add <Datei>...\", um die Änderungen zum Commit " "vorzumerken)" -#: wt-status.c:227 +#: wt-status.c:228 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr "" " (benutzen Sie \"git add/rm <Datei>...\", um die Änderungen zum Commit " "vorzumerken)" -#: wt-status.c:228 +#: wt-status.c:229 msgid "" " (use \"git checkout -- <file>...\" to discard changes in working directory)" msgstr "" " (benutzen Sie \"git checkout -- <Datei>...\", um die Änderungen im " "Arbeitsverzeichnis zu verwerfen)" -#: wt-status.c:230 +#: wt-status.c:231 msgid " (commit or discard the untracked or modified content in submodules)" msgstr "" " (committen oder verwerfen Sie den unversionierten oder geänderten Inhalt " "in den Submodulen)" -#: wt-status.c:242 +#: wt-status.c:243 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr "" " (benutzen Sie \"git %s <Datei>...\", um die Änderungen zum Commit " "vorzumerken)" -#: wt-status.c:257 +#: wt-status.c:258 msgid "both deleted:" msgstr "beide gelöscht:" -#: wt-status.c:259 +#: wt-status.c:260 msgid "added by us:" msgstr "von uns hinzugefügt:" -#: wt-status.c:261 +#: wt-status.c:262 msgid "deleted by them:" msgstr "von denen gelöscht:" -#: wt-status.c:263 +#: wt-status.c:264 msgid "added by them:" msgstr "von denen hinzugefügt:" -#: wt-status.c:265 +#: wt-status.c:266 msgid "deleted by us:" msgstr "von uns gelöscht:" -#: wt-status.c:267 +#: wt-status.c:268 msgid "both added:" msgstr "von beiden hinzugefügt:" -#: wt-status.c:269 +#: wt-status.c:270 msgid "both modified:" msgstr "von beiden geändert:" -#: wt-status.c:279 +#: wt-status.c:280 msgid "new file:" msgstr "neue Datei:" -#: wt-status.c:281 +#: wt-status.c:282 msgid "copied:" msgstr "kopiert:" -#: wt-status.c:283 +#: wt-status.c:284 msgid "deleted:" msgstr "gelöscht:" -#: wt-status.c:285 +#: wt-status.c:286 msgid "modified:" msgstr "geändert:" -#: wt-status.c:287 +#: wt-status.c:288 msgid "renamed:" msgstr "umbenannt:" -#: wt-status.c:289 +#: wt-status.c:290 msgid "typechange:" msgstr "Typänderung:" -#: wt-status.c:291 +#: wt-status.c:292 msgid "unknown:" msgstr "unbekannt:" -#: wt-status.c:293 +#: wt-status.c:294 msgid "unmerged:" msgstr "nicht gemerged:" -#: wt-status.c:373 +#: wt-status.c:374 msgid "new commits, " msgstr "neue Commits, " -#: wt-status.c:375 +#: wt-status.c:376 msgid "modified content, " msgstr "geänderter Inhalt, " -#: wt-status.c:377 +#: wt-status.c:378 msgid "untracked content, " msgstr "unversionierter Inhalt, " -#: wt-status.c:884 +#: wt-status.c:896 #, 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:916 +#: wt-status.c:928 msgid "Submodules changed but not updated:" msgstr "Submodule geändert, aber nicht aktualisiert:" -#: wt-status.c:918 +#: wt-status.c:930 msgid "Submodule changes to be committed:" msgstr "Änderungen in Submodul zum Committen:" -#: wt-status.c:1000 +#: wt-status.c:1012 msgid "" "Do not modify or remove the line above.\n" "Everything below it will be ignored." @@ -7364,114 +8064,114 @@ msgstr "" "Ändern oder entfernen Sie nicht die obige Zeile.\n" "Alles unterhalb von ihr wird ignoriert." -#: wt-status.c:1101 +#: wt-status.c:1119 msgid "You have unmerged paths." msgstr "Sie haben nicht zusammengeführte Pfade." -#: wt-status.c:1104 +#: wt-status.c:1122 msgid " (fix conflicts and run \"git commit\")" msgstr " (beheben Sie die Konflikte und führen Sie \"git commit\" aus)" -#: wt-status.c:1106 +#: wt-status.c:1124 msgid " (use \"git merge --abort\" to abort the merge)" msgstr " (benutzen Sie \"git merge --abort\", um den Merge abzubrechen)" -#: wt-status.c:1110 +#: wt-status.c:1128 msgid "All conflicts fixed but you are still merging." msgstr "Alle Konflikte sind behoben, aber Sie sind immer noch beim Merge." -#: wt-status.c:1113 +#: wt-status.c:1131 msgid " (use \"git commit\" to conclude merge)" msgstr " (benutzen Sie \"git commit\", um den Merge abzuschließen)" -#: wt-status.c:1122 +#: wt-status.c:1140 msgid "You are in the middle of an am session." msgstr "Eine \"am\"-Sitzung ist im Gange." -#: wt-status.c:1125 +#: wt-status.c:1143 msgid "The current patch is empty." msgstr "Der aktuelle Patch ist leer." -#: wt-status.c:1129 +#: wt-status.c:1147 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:1131 +#: wt-status.c:1149 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (benutzen Sie \"git am --skip\", um diesen Patch auszulassen)" -#: wt-status.c:1133 +#: wt-status.c:1151 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:1264 +#: wt-status.c:1284 msgid "git-rebase-todo is missing." msgstr "git-rebase-todo fehlt." -#: wt-status.c:1266 +#: wt-status.c:1286 msgid "No commands done." msgstr "Keine Befehle ausgeführt." -#: wt-status.c:1269 +#: wt-status.c:1289 #, 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:1280 +#: wt-status.c:1300 #, c-format msgid " (see more in file %s)" msgstr " (mehr Informationen in Datei %s)" -#: wt-status.c:1285 +#: wt-status.c:1305 msgid "No commands remaining." msgstr "Keine Befehle verbleibend." -#: wt-status.c:1288 +#: wt-status.c:1308 #, 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:1296 +#: wt-status.c:1316 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr " (benutzen Sie \"git rebase --edit-todo\" zum Ansehen und Bearbeiten)" -#: wt-status.c:1308 +#: wt-status.c:1328 #, 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:1313 +#: wt-status.c:1333 msgid "You are currently rebasing." msgstr "Sie sind gerade beim Rebase." -#: wt-status.c:1326 +#: wt-status.c:1346 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:1328 +#: wt-status.c:1348 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (benutzen Sie \"git rebase --skip\", um diesen Patch auszulassen)" -#: wt-status.c:1330 +#: wt-status.c:1350 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:1337 +#: wt-status.c:1357 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (alle Konflikte behoben: führen Sie \"git rebase --continue\" aus)" -#: wt-status.c:1341 +#: wt-status.c:1361 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." @@ -7479,138 +8179,154 @@ msgstr "" "Sie teilen gerade einen Commit auf, während ein Rebase von Branch '%s' auf " "'%s' im Gange ist." -#: wt-status.c:1346 +#: wt-status.c:1366 msgid "You are currently splitting a commit during a rebase." msgstr "Sie teilen gerade einen Commit während eines Rebase auf." -#: wt-status.c:1349 +#: wt-status.c:1369 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:1353 +#: wt-status.c:1373 #, 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:1358 +#: wt-status.c:1378 msgid "You are currently editing a commit during a rebase." msgstr "Sie editieren gerade einen Commit während eines Rebase." -#: wt-status.c:1361 +#: wt-status.c:1381 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr "" " (benutzen Sie \"git commit --amend\", um den aktuellen Commit " "nachzubessern)" -#: wt-status.c:1363 +#: wt-status.c:1383 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:1372 +#: wt-status.c:1394 +msgid "Cherry-pick currently in progress." +msgstr "Cherry-pick zurzeit im Gange." + +#: wt-status.c:1397 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "Sie führen gerade \"cherry-pick\" von Commit %s aus." -#: wt-status.c:1377 +#: wt-status.c:1404 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:1380 +#: wt-status.c:1407 +msgid " (run \"git cherry-pick --continue\" to continue)" +msgstr " (Führen Sie \"git cherry-pick --continue\" aus, um weiterzumachen)" + +#: wt-status.c:1410 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" " (alle Konflikte behoben: führen Sie \"git cherry-pick --continue\" aus)" -#: wt-status.c:1382 +#: wt-status.c:1412 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:1390 +#: wt-status.c:1422 +msgid "Revert currently in progress." +msgstr "Revert zurzeit im Gange." + +#: wt-status.c:1425 #, c-format msgid "You are currently reverting commit %s." msgstr "Sie sind gerade beim Revert von Commit '%s'." -#: wt-status.c:1395 +#: wt-status.c:1431 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:1398 +#: wt-status.c:1434 +msgid " (run \"git revert --continue\" to continue)" +msgstr " (Führen Sie \"git revert --continue\", um weiterzumachen)" + +#: wt-status.c:1437 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (alle Konflikte behoben: führen Sie \"git revert --continue\" aus)" -#: wt-status.c:1400 +#: wt-status.c:1439 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr "" " (benutzen Sie \"git revert --abort\", um die Revert-Operation abzubrechen)" -#: wt-status.c:1410 +#: wt-status.c:1449 #, 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:1414 +#: wt-status.c:1453 msgid "You are currently bisecting." msgstr "Sie sind gerade bei einer binären Suche." -#: wt-status.c:1417 +#: wt-status.c:1456 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:1617 +#: wt-status.c:1665 msgid "On branch " msgstr "Auf Branch " -#: wt-status.c:1624 +#: wt-status.c:1672 msgid "interactive rebase in progress; onto " msgstr "interaktives Rebase im Gange; auf " -#: wt-status.c:1626 +#: wt-status.c:1674 msgid "rebase in progress; onto " msgstr "Rebase im Gange; auf " -#: wt-status.c:1631 +#: wt-status.c:1679 msgid "HEAD detached at " msgstr "HEAD losgelöst bei " -#: wt-status.c:1633 +#: wt-status.c:1681 msgid "HEAD detached from " msgstr "HEAD losgelöst von " -#: wt-status.c:1636 +#: wt-status.c:1684 msgid "Not currently on any branch." msgstr "Im Moment auf keinem Branch." -#: wt-status.c:1653 +#: wt-status.c:1701 msgid "Initial commit" msgstr "Initialer Commit" -#: wt-status.c:1654 +#: wt-status.c:1702 msgid "No commits yet" msgstr "Noch keine Commits" -#: wt-status.c:1668 +#: wt-status.c:1716 msgid "Untracked files" msgstr "Unversionierte Dateien" -#: wt-status.c:1670 +#: wt-status.c:1718 msgid "Ignored files" msgstr "Ignorierte Dateien" -#: wt-status.c:1674 +#: wt-status.c:1722 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -7621,32 +8337,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:1680 +#: wt-status.c:1728 #, c-format msgid "Untracked files not listed%s" msgstr "Unversionierte Dateien nicht aufgelistet%s" -#: wt-status.c:1682 +#: wt-status.c:1730 msgid " (use -u option to show untracked files)" msgstr " (benutzen Sie die Option -u, um unversionierte Dateien anzuzeigen)" -#: wt-status.c:1688 +#: wt-status.c:1736 msgid "No changes" msgstr "Keine Änderungen" -#: wt-status.c:1693 +#: wt-status.c:1741 #, 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:1696 +#: wt-status.c:1744 #, c-format msgid "no changes added to commit\n" msgstr "keine Änderungen zum Commit vorgemerkt\n" -#: wt-status.c:1699 +#: wt-status.c:1747 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -7655,67 +8371,67 @@ msgstr "" "nichts zum Commit vorgemerkt, aber es gibt unversionierte Dateien\n" "(benutzen Sie \"git add\" zum Versionieren)\n" -#: wt-status.c:1702 +#: wt-status.c:1750 #, 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:1705 +#: wt-status.c:1753 #, 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:1708 wt-status.c:1713 +#: wt-status.c:1756 wt-status.c:1761 #, c-format msgid "nothing to commit\n" msgstr "nichts zu committen\n" -#: wt-status.c:1711 +#: wt-status.c:1759 #, 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:1715 +#: wt-status.c:1763 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "nichts zu committen, Arbeitsverzeichnis unverändert\n" -#: wt-status.c:1828 +#: wt-status.c:1876 msgid "No commits yet on " msgstr "Noch keine Commits in " -#: wt-status.c:1832 +#: wt-status.c:1880 msgid "HEAD (no branch)" msgstr "HEAD (kein Branch)" -#: wt-status.c:1863 +#: wt-status.c:1911 msgid "different" msgstr "unterschiedlich" -#: wt-status.c:1865 wt-status.c:1873 +#: wt-status.c:1913 wt-status.c:1921 msgid "behind " msgstr "hinterher " -#: wt-status.c:1868 wt-status.c:1871 +#: wt-status.c:1916 wt-status.c:1919 msgid "ahead " msgstr "voraus " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2386 +#: wt-status.c:2443 #, 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:2392 +#: wt-status.c:2449 msgid "additionally, your index contains uncommitted changes." msgstr "Zusätzlich enthält die Staging-Area nicht committete Änderungen." -#: wt-status.c:2394 +#: wt-status.c:2451 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "" @@ -7782,7 +8498,7 @@ msgstr "" "ignoriert:\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:214 builtin/push.c:560 +#: 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 msgid "dry run" msgstr "Probelauf" @@ -7791,7 +8507,7 @@ msgstr "Probelauf" msgid "interactive picking" msgstr "interaktives Auswählen" -#: builtin/add.c:294 builtin/checkout.c:1304 builtin/reset.c:306 +#: builtin/add.c:294 builtin/checkout.c:1379 builtin/reset.c:306 msgid "select hunks interactively" msgstr "Blöcke interaktiv auswählen" @@ -7840,7 +8556,7 @@ msgstr "" 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:309 builtin/update-index.c:991 +#: builtin/add.c:309 builtin/update-index.c:1001 msgid "override the executable bit of the listed files" msgstr "das \"ausführbar\"-Bit der aufgelisteten Dateien überschreiben" @@ -7892,30 +8608,30 @@ msgstr "Füge eingebettetes Repository hinzu: %s" msgid "Use -f if you really want to add them.\n" msgstr "Verwenden Sie -f wenn Sie diese wirklich hinzufügen möchten.\n" -#: builtin/add.c:380 +#: builtin/add.c:379 msgid "adding files failed" msgstr "Hinzufügen von Dateien fehlgeschlagen" -#: builtin/add.c:418 +#: builtin/add.c:419 msgid "-A and -u are mutually incompatible" msgstr "Die Optionen -A und -u sind zueinander inkompatibel." -#: builtin/add.c:425 +#: builtin/add.c:426 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." -#: builtin/add.c:429 +#: builtin/add.c:430 #, 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:444 +#: builtin/add.c:445 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "Nichts spezifiziert, nichts hinzugefügt.\n" -#: builtin/add.c:445 +#: builtin/add.c:446 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Meinten Sie vielleicht 'git add .'?\n" @@ -7929,111 +8645,111 @@ msgstr "konnte Autor-Skript nicht parsen" msgid "'%s' was deleted by the applypatch-msg hook" msgstr "'%s' wurde durch den applypatch-msg Hook entfernt" -#: builtin/am.c:473 +#: builtin/am.c:474 #, c-format msgid "Malformed input line: '%s'." msgstr "Fehlerhafte Eingabezeile: '%s'." -#: builtin/am.c:510 +#: builtin/am.c:512 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "Fehler beim Kopieren der Notizen von '%s' nach '%s'" -#: builtin/am.c:536 +#: builtin/am.c:538 msgid "fseek failed" msgstr "\"fseek\" fehlgeschlagen" -#: builtin/am.c:724 +#: builtin/am.c:726 #, c-format msgid "could not parse patch '%s'" msgstr "konnte Patch '%s' nicht parsen" -#: builtin/am.c:789 +#: builtin/am.c:791 msgid "Only one StGIT patch series can be applied at once" msgstr "Es kann nur eine StGIT Patch-Serie auf einmal angewendet werden." -#: builtin/am.c:837 +#: builtin/am.c:839 msgid "invalid timestamp" msgstr "ungültiger Zeitstempel" -#: builtin/am.c:842 builtin/am.c:854 +#: builtin/am.c:844 builtin/am.c:856 msgid "invalid Date line" msgstr "Ungültige \"Date\"-Zeile" -#: builtin/am.c:849 +#: builtin/am.c:851 msgid "invalid timezone offset" msgstr "Ungültiger Offset in der Zeitzone" -#: builtin/am.c:942 +#: builtin/am.c:944 msgid "Patch format detection failed." msgstr "Patch-Formaterkennung fehlgeschlagen." -#: builtin/am.c:947 builtin/clone.c:409 +#: builtin/am.c:949 builtin/clone.c:409 #, c-format msgid "failed to create directory '%s'" msgstr "Fehler beim Erstellen von Verzeichnis '%s'" -#: builtin/am.c:952 +#: builtin/am.c:954 msgid "Failed to split patches." msgstr "Fehler beim Aufteilen der Patches." -#: builtin/am.c:1082 builtin/commit.c:371 +#: builtin/am.c:1084 builtin/commit.c:371 msgid "unable to write index file" msgstr "Konnte Index-Datei nicht schreiben." -#: builtin/am.c:1096 +#: builtin/am.c:1098 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "" "Wenn Sie das Problem aufgelöst haben, führen Sie \"%s --continue\" aus." -#: builtin/am.c:1097 +#: builtin/am.c:1099 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "" "Falls Sie diesen Patch auslassen möchten, führen Sie stattdessen \"%s --skip" "\" aus." -#: builtin/am.c:1098 +#: builtin/am.c:1100 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "" "Um den ursprünglichen Branch wiederherzustellen und die Anwendung der " "Patches abzubrechen, führen Sie \"%s --abort\" aus." -#: builtin/am.c:1181 +#: builtin/am.c:1183 msgid "Patch sent with format=flowed; space at the end of lines might be lost." msgstr "" "Patch mit format=flowed versendet; Leerzeichen am Ende von Zeilen könnte " "verloren gehen." -#: builtin/am.c:1209 +#: builtin/am.c:1211 msgid "Patch is empty." msgstr "Patch ist leer." -#: builtin/am.c:1275 +#: builtin/am.c:1277 #, c-format msgid "invalid ident line: %.*s" msgstr "Ungültige Identifikationszeile: %.*s" -#: builtin/am.c:1297 +#: builtin/am.c:1299 #, c-format msgid "unable to parse commit %s" msgstr "Konnte Commit '%s' nicht parsen." -#: builtin/am.c:1493 +#: builtin/am.c:1495 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" "Dem Repository fehlen notwendige Blobs um auf einen 3-Wege-Merge " "zurückzufallen." -#: builtin/am.c:1495 +#: builtin/am.c:1497 msgid "Using index info to reconstruct a base tree..." msgstr "" "Verwende Informationen aus der Staging-Area, um ein Basisverzeichnis " "nachzustellen ..." -#: builtin/am.c:1514 +#: builtin/am.c:1516 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -8041,30 +8757,30 @@ msgstr "" "Haben Sie den Patch per Hand editiert?\n" "Er kann nicht auf die Blobs in seiner 'index' Zeile angewendet werden." -#: builtin/am.c:1520 +#: builtin/am.c:1522 msgid "Falling back to patching base and 3-way merge..." msgstr "Falle zurück zum Patchen der Basis und zum 3-Wege-Merge ..." -#: builtin/am.c:1546 +#: builtin/am.c:1548 msgid "Failed to merge in the changes." msgstr "Merge der Änderungen fehlgeschlagen." -#: builtin/am.c:1578 +#: builtin/am.c:1580 msgid "applying to an empty history" msgstr "auf leere Historie anwenden" -#: builtin/am.c:1624 builtin/am.c:1628 +#: builtin/am.c:1627 builtin/am.c:1631 #, c-format msgid "cannot resume: %s does not exist." msgstr "Kann nicht fortsetzen: %s existiert nicht" -#: builtin/am.c:1644 +#: builtin/am.c:1647 msgid "cannot be interactive without stdin connected to a terminal." msgstr "" "Kann nicht interaktiv sein, ohne dass die Standard-Eingabe mit einem " "Terminal verbunden ist." -#: builtin/am.c:1649 +#: builtin/am.c:1652 msgid "Commit Body is:" msgstr "Commit-Beschreibung ist:" @@ -8072,36 +8788,36 @@ msgstr "Commit-Beschreibung ist:" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1659 +#: builtin/am.c:1662 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "Anwenden? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " -#: builtin/am.c:1709 +#: builtin/am.c:1712 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Geänderter Index: kann Patches nicht anwenden (geändert: %s)" -#: builtin/am.c:1749 builtin/am.c:1817 +#: builtin/am.c:1752 builtin/am.c:1820 #, c-format msgid "Applying: %.*s" msgstr "Wende an: %.*s" -#: builtin/am.c:1766 +#: builtin/am.c:1769 msgid "No changes -- Patch already applied." msgstr "Keine Änderungen -- Patches bereits angewendet." -#: builtin/am.c:1772 +#: builtin/am.c:1775 #, c-format msgid "Patch failed at %s %.*s" msgstr "Anwendung des Patches fehlgeschlagen bei %s %.*s" -#: builtin/am.c:1776 +#: builtin/am.c:1779 msgid "Use 'git am --show-current-patch' to see the failed patch" msgstr "" "Benutzen Sie 'git am --show-current-patch', um den\n" "fehlgeschlagenen Patch zu sehen." -#: builtin/am.c:1820 +#: builtin/am.c:1823 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -8112,7 +8828,7 @@ msgstr "" "diese bereits anderweitig eingefügt worden sein; Sie könnten diesen Patch\n" "auslassen." -#: builtin/am.c:1827 +#: builtin/am.c:1830 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -8125,17 +8841,17 @@ msgstr "" "Sie können 'git rm' auf Dateien ausführen, um \"von denen gelöscht\" für\n" "diese zu akzeptieren." -#: builtin/am.c:1934 builtin/am.c:1938 builtin/am.c:1950 builtin/reset.c:329 +#: builtin/am.c:1937 builtin/am.c:1941 builtin/am.c:1953 builtin/reset.c:329 #: builtin/reset.c:337 #, c-format msgid "Could not parse object '%s'." msgstr "Konnte Objekt '%s' nicht parsen." -#: builtin/am.c:1986 +#: builtin/am.c:1989 msgid "failed to clean index" msgstr "Fehler beim Bereinigen des Index" -#: builtin/am.c:2030 +#: builtin/am.c:2033 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -8143,144 +8859,144 @@ msgstr "" "Sie scheinen seit dem letzten gescheiterten 'am' HEAD geändert zu haben.\n" "Keine Zurücksetzung zu ORIG_HEAD." -#: builtin/am.c:2123 +#: builtin/am.c:2130 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Ungültiger Wert für --patch-format: %s" -#: builtin/am.c:2159 +#: builtin/am.c:2166 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<Optionen>] [(<mbox> | <E-Mail-Verzeichnis>)...]" -#: builtin/am.c:2160 +#: builtin/am.c:2167 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<Optionen>] (--continue | --skip | --abort)" -#: builtin/am.c:2166 +#: builtin/am.c:2173 msgid "run interactively" msgstr "interaktiv ausführen" -#: builtin/am.c:2168 +#: builtin/am.c:2175 msgid "historical option -- no-op" msgstr "historische Option -- kein Effekt" -#: builtin/am.c:2170 +#: builtin/am.c:2177 msgid "allow fall back on 3way merging if needed" msgstr "erlaube, falls notwendig, das Zurückfallen auf einen 3-Wege-Merge" -#: builtin/am.c:2171 builtin/init-db.c:486 builtin/prune-packed.c:58 -#: builtin/repack.c:306 +#: builtin/am.c:2178 builtin/init-db.c:494 builtin/prune-packed.c:58 +#: builtin/repack.c:306 builtin/stash.c:805 msgid "be quiet" msgstr "weniger Ausgaben" -#: builtin/am.c:2173 +#: builtin/am.c:2180 msgid "add a Signed-off-by line to the commit message" msgstr "der Commit-Beschreibung eine Signed-off-by Zeile hinzufügen" -#: builtin/am.c:2176 +#: builtin/am.c:2183 msgid "recode into utf8 (default)" msgstr "nach UTF-8 umkodieren (Standard)" -#: builtin/am.c:2178 +#: builtin/am.c:2185 msgid "pass -k flag to git-mailinfo" msgstr "-k an git-mailinfo übergeben" -#: builtin/am.c:2180 +#: builtin/am.c:2187 msgid "pass -b flag to git-mailinfo" msgstr "-b an git-mailinfo übergeben" -#: builtin/am.c:2182 +#: builtin/am.c:2189 msgid "pass -m flag to git-mailinfo" msgstr "-m an git-mailinfo übergeben" -#: builtin/am.c:2184 +#: builtin/am.c:2191 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "--keep-cr an git-mailsplit für mbox-Format übergeben" -#: builtin/am.c:2187 +#: builtin/am.c:2194 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "kein --keep-cr an git-mailsplit übergeben, unabhängig von am.keepcr" -#: builtin/am.c:2190 +#: builtin/am.c:2197 msgid "strip everything before a scissors line" msgstr "alles vor einer Scheren-Zeile entfernen" -#: builtin/am.c:2192 builtin/am.c:2195 builtin/am.c:2198 builtin/am.c:2201 -#: builtin/am.c:2204 builtin/am.c:2207 builtin/am.c:2210 builtin/am.c:2213 -#: builtin/am.c:2219 +#: 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 msgid "pass it through git-apply" msgstr "an git-apply übergeben" -#: builtin/am.c:2209 builtin/commit.c:1343 builtin/fmt-merge-msg.c:671 -#: builtin/fmt-merge-msg.c:674 builtin/grep.c:879 builtin/merge.c:240 -#: builtin/pull.c:152 builtin/pull.c:210 builtin/rebase.c:1062 +#: 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:171 builtin/tag.c:386 -#: parse-options.h:144 parse-options.h:146 parse-options.h:266 +#: 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 msgid "n" msgstr "Anzahl" -#: builtin/am.c:2215 builtin/branch.c:637 builtin/for-each-ref.c:38 -#: builtin/replace.c:544 builtin/tag.c:422 builtin/verify-tag.c:39 +#: 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 msgid "format" msgstr "Format" -#: builtin/am.c:2216 +#: builtin/am.c:2223 msgid "format the patch(es) are in" msgstr "Patch-Format" -#: builtin/am.c:2222 +#: builtin/am.c:2229 msgid "override error message when patch failure occurs" msgstr "Meldung bei fehlerhafter Patch-Anwendung überschreiben" -#: builtin/am.c:2224 +#: builtin/am.c:2231 msgid "continue applying patches after resolving a conflict" msgstr "Anwendung der Patches nach Auflösung eines Konfliktes fortsetzen" -#: builtin/am.c:2227 +#: builtin/am.c:2234 msgid "synonyms for --continue" msgstr "Synonyme für --continue" -#: builtin/am.c:2230 +#: builtin/am.c:2237 msgid "skip the current patch" msgstr "den aktuellen Patch auslassen" -#: builtin/am.c:2233 +#: builtin/am.c:2240 msgid "restore the original branch and abort the patching operation." msgstr "" "ursprünglichen Branch wiederherstellen und Anwendung der Patches abbrechen" -#: builtin/am.c:2236 +#: builtin/am.c:2243 msgid "abort the patching operation but keep HEAD where it is." msgstr "Patch-Operation abbrechen, aber HEAD an aktueller Stelle belassen" -#: builtin/am.c:2239 +#: builtin/am.c:2246 msgid "show the patch being applied." msgstr "den Patch, der gerade angewendet wird, anzeigen" -#: builtin/am.c:2243 +#: builtin/am.c:2250 msgid "lie about committer date" msgstr "Autor-Datum als Commit-Datum verwenden" -#: builtin/am.c:2245 +#: builtin/am.c:2252 msgid "use current timestamp for author date" msgstr "aktuellen Zeitstempel als Autor-Datum verwenden" -#: builtin/am.c:2247 builtin/commit.c:1486 builtin/merge.c:274 -#: builtin/pull.c:185 builtin/rebase.c:1106 builtin/rebase--interactive.c:185 -#: builtin/revert.c:114 builtin/tag.c:402 +#: 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 msgid "key-id" msgstr "GPG-Schlüsselkennung" -#: builtin/am.c:2248 builtin/rebase.c:1107 builtin/rebase--interactive.c:186 +#: builtin/am.c:2255 builtin/rebase.c:490 builtin/rebase.c:1454 msgid "GPG-sign commits" msgstr "Commits mit GPG signieren" -#: builtin/am.c:2251 +#: builtin/am.c:2258 msgid "(internal use for git-rebase)" msgstr "(intern für git-rebase verwendet)" -#: builtin/am.c:2269 +#: builtin/am.c:2276 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." @@ -8288,16 +9004,16 @@ msgstr "" "Die -b/--binary Option hat seit Langem keinen Effekt und wird\n" "entfernt. Bitte verwenden Sie diese nicht mehr." -#: builtin/am.c:2276 +#: builtin/am.c:2283 msgid "failed to read the index" msgstr "Fehler beim Lesen des Index" -#: builtin/am.c:2291 +#: builtin/am.c:2298 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "Vorheriges Rebase-Verzeichnis %s existiert noch, aber mbox gegeben." -#: builtin/am.c:2315 +#: builtin/am.c:2322 #, c-format msgid "" "Stray %s directory found.\n" @@ -8306,7 +9022,7 @@ msgstr "" "Stray %s Verzeichnis gefunden.\n" "Benutzen Sie \"git am --abort\", um es zu entfernen." -#: builtin/am.c:2321 +#: builtin/am.c:2328 msgid "Resolve operation not in progress, we are not resuming." msgstr "Es ist keine Auflösung im Gange, es wird nicht fortgesetzt." @@ -8364,29 +9080,39 @@ msgstr "git bisect--helper --bisect-reset [<Commit>]" 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>" +msgstr "" +"git bisect--helper --bisect-write [--no-log] <Zustand> <Revision> " +"<Begriff_gut> <Begriff_schlecht>" #: 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 <Befehl> <Begriff_gut> <Begriff_schlecht>" +msgstr "" +"git bisect--helper --bisect-check-and-set-terms <Befehl> <Begriff_gut> " +"<Begriff_schlecht>" #: builtin/bisect--helper.c:28 msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]" -msgstr "git bisect--helper --bisect-next-check <Begriff_gut> <Begriff_schlecht> [<Begriff>]" +msgstr "" +"git bisect--helper --bisect-next-check <Begriff_gut> <Begriff_schlecht> " +"[<Begriff>]" #: builtin/bisect--helper.c:29 msgid "" "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --" "term-new]" -msgstr "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --term-new]" +msgstr "" +"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --" +"term-new]" #: builtin/bisect--helper.c:30 msgid "" "git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}" "=<term>][--no-checkout] [<bad> [<good>...]] [--] [<paths>...]" -msgstr "git bisect--helper --bisect-start [--term-{old,good}=<Begriff> --term-{new,bad}=<Begriff>][--no-checkout] [<schlecht> [<gut>...]] [--] [<Pfade>...]" +msgstr "" +"git bisect--helper --bisect-start [--term-{old,good}=<Begriff> --term-{new," +"bad}=<Begriff>][--no-checkout] [<schlecht> [<gut>...]] [--] [<Pfade>...]" #: builtin/bisect--helper.c:86 #, c-format @@ -8521,7 +9247,9 @@ msgstr "Ungültiger HEAD - HEAD wird benötigt." #: builtin/bisect--helper.c:526 #, 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>'." +msgstr "" +"Auschecken von '%s' fehlgeschlagen. Versuchen Sie 'git bisect start " +"<gültiger-Branch>'." #: builtin/bisect--helper.c:547 msgid "won't bisect on cg-seek'ed tree" @@ -8608,146 +9336,146 @@ msgstr "--bisect-next-check benötigt 2 oder 3 Argumente." msgid "--bisect-terms requires 0 or 1 argument" msgstr "--bisect-terms benötigt 0 oder 1 Argument." -#: builtin/blame.c:31 +#: builtin/blame.c:32 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "git blame [<Optionen>] [<rev-opts>] [<Commit>] [--] <Datei>" -#: builtin/blame.c:36 +#: builtin/blame.c:37 msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "<rev-opts> sind dokumentiert in git-rev-list(1)" -#: builtin/blame.c:406 +#: builtin/blame.c:407 #, c-format msgid "expecting a color: %s" msgstr "Erwarte eine Farbe: %s" -#: builtin/blame.c:413 +#: builtin/blame.c:414 msgid "must end with a color" msgstr "Muss mit einer Farbe enden." -#: builtin/blame.c:700 +#: builtin/blame.c:701 #, c-format msgid "invalid color '%s' in color.blame.repeatedLines" msgstr "Ungültige Farbe '%s' in color.blame.repeatedLines." -#: builtin/blame.c:718 +#: builtin/blame.c:719 msgid "invalid value for blame.coloring" msgstr "Ungültiger Wert für blame.coloring." -#: builtin/blame.c:793 +#: builtin/blame.c:794 msgid "Show blame entries as we find them, incrementally" msgstr "\"blame\"-Einträge schrittweise anzeigen, während wir sie generieren" -#: builtin/blame.c:794 +#: builtin/blame.c:795 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "leere SHA-1 für Grenz-Commits anzeigen (Standard: aus)" -#: builtin/blame.c:795 +#: builtin/blame.c:796 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "Root-Commits nicht als Grenzen behandeln (Standard: aus)" -#: builtin/blame.c:796 +#: builtin/blame.c:797 msgid "Show work cost statistics" msgstr "Statistiken zum Arbeitsaufwand anzeigen" -#: builtin/blame.c:797 +#: builtin/blame.c:798 msgid "Force progress reporting" msgstr "Fortschrittsanzeige erzwingen" -#: builtin/blame.c:798 +#: builtin/blame.c:799 msgid "Show output score for blame entries" msgstr "Ausgabebewertung für \"blame\"-Einträge anzeigen" -#: builtin/blame.c:799 +#: builtin/blame.c:800 msgid "Show original filename (Default: auto)" msgstr "ursprünglichen Dateinamen anzeigen (Standard: auto)" -#: builtin/blame.c:800 +#: builtin/blame.c:801 msgid "Show original linenumber (Default: off)" msgstr "ursprüngliche Zeilennummer anzeigen (Standard: aus)" -#: builtin/blame.c:801 +#: builtin/blame.c:802 msgid "Show in a format designed for machine consumption" msgstr "Anzeige in einem Format für maschinelle Auswertung" -#: builtin/blame.c:802 +#: builtin/blame.c:803 msgid "Show porcelain format with per-line commit information" msgstr "" "Anzeige in Format für Fremdprogramme mit Commit-Informationen pro Zeile" -#: builtin/blame.c:803 +#: builtin/blame.c:804 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "" "Den gleichen Ausgabemodus benutzen wie \"git-annotate\" (Standard: aus)" -#: builtin/blame.c:804 +#: builtin/blame.c:805 msgid "Show raw timestamp (Default: off)" msgstr "Unbearbeiteten Zeitstempel anzeigen (Standard: aus)" -#: builtin/blame.c:805 +#: builtin/blame.c:806 msgid "Show long commit SHA1 (Default: off)" msgstr "Langen Commit-SHA1 anzeigen (Standard: aus)" -#: builtin/blame.c:806 +#: builtin/blame.c:807 msgid "Suppress author name and timestamp (Default: off)" msgstr "Den Namen des Autors und den Zeitstempel unterdrücken (Standard: aus)" -#: builtin/blame.c:807 +#: builtin/blame.c:808 msgid "Show author email instead of name (Default: off)" msgstr "" "Anstatt des Namens die E-Mail-Adresse des Autors anzeigen (Standard: aus)" -#: builtin/blame.c:808 +#: builtin/blame.c:809 msgid "Ignore whitespace differences" msgstr "Unterschiede im Whitespace ignorieren" -#: builtin/blame.c:809 +#: builtin/blame.c:810 msgid "color redundant metadata from previous line differently" msgstr "redundante Metadaten der vorherigen Zeile unterschiedlich einfärben" -#: builtin/blame.c:810 +#: builtin/blame.c:811 msgid "color lines by age" msgstr "Zeilen nach Alter einfärben" -#: builtin/blame.c:817 +#: builtin/blame.c:818 msgid "Use an experimental heuristic to improve diffs" msgstr "" "eine experimentelle Heuristik zur Verbesserung der Darstellung\n" "von Unterschieden verwenden" -#: builtin/blame.c:819 +#: builtin/blame.c:820 msgid "Spend extra cycles to find better match" msgstr "Länger arbeiten, um bessere Übereinstimmungen zu finden" -#: builtin/blame.c:820 +#: builtin/blame.c:821 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "Commits von <Datei> benutzen, anstatt \"git-rev-list\" aufzurufen" -#: builtin/blame.c:821 +#: builtin/blame.c:822 msgid "Use <file>'s contents as the final image" msgstr "Inhalte der <Datei>en als endgültiges Abbild benutzen" -#: builtin/blame.c:822 builtin/blame.c:823 +#: builtin/blame.c:823 builtin/blame.c:824 msgid "score" msgstr "Bewertung" -#: builtin/blame.c:822 +#: builtin/blame.c:823 msgid "Find line copies within and across files" msgstr "kopierte Zeilen innerhalb oder zwischen Dateien finden" -#: builtin/blame.c:823 +#: builtin/blame.c:824 msgid "Find line movements within and across files" msgstr "verschobene Zeilen innerhalb oder zwischen Dateien finden" -#: builtin/blame.c:824 +#: builtin/blame.c:825 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:824 +#: builtin/blame.c:825 msgid "Process only line range n,m, counting from 1" msgstr "nur Zeilen im Bereich n,m verarbeiten, gezählt von 1" -#: builtin/blame.c:875 +#: builtin/blame.c:876 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "" "--progress kann nicht mit --incremental oder Formaten für Fremdprogramme\n" @@ -8761,18 +9489,18 @@ msgstr "" #. your language may need more or fewer display #. columns. #. -#: builtin/blame.c:926 +#: builtin/blame.c:927 msgid "4 years, 11 months ago" msgstr "vor 4 Jahren und 11 Monaten" -#: builtin/blame.c:1018 +#: builtin/blame.c:1031 #, 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:1064 +#: builtin/blame.c:1077 msgid "Blaming lines" msgstr "Verarbeite Zeilen" @@ -8884,72 +9612,81 @@ msgstr "Remote-Tracking-Branch %s entfernt (war %s).\n" msgid "Deleted branch %s (was %s).\n" msgstr "Branch %s entfernt (war %s).\n" -#: builtin/branch.c:421 builtin/tag.c:59 +#: builtin/branch.c:421 builtin/tag.c:60 msgid "unable to parse format string" msgstr "Konnte Formatierungsstring nicht parsen." +#: builtin/branch.c:452 +msgid "could not resolve HEAD" +msgstr "Konnte HEAD-Commit nicht auflösen." + #: builtin/branch.c:458 #, c-format +msgid "HEAD (%s) points outside of refs/heads/" +msgstr "HEAD (%s) wurde nicht unter \"refs/heads/\" gefunden!" + +#: builtin/branch.c:473 +#, c-format msgid "Branch %s is being rebased at %s" msgstr "Branch %s wird auf %s umgesetzt" -#: builtin/branch.c:462 +#: builtin/branch.c:477 #, c-format msgid "Branch %s is being bisected at %s" msgstr "Binäre Suche von Branch %s zu %s im Gange" -#: builtin/branch.c:479 +#: builtin/branch.c:494 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:481 +#: builtin/branch.c:496 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:492 +#: builtin/branch.c:507 #, c-format msgid "Invalid branch name: '%s'" msgstr "Ungültiger Branchname: '%s'" -#: builtin/branch.c:519 +#: builtin/branch.c:534 msgid "Branch rename failed" msgstr "Umbenennung des Branches fehlgeschlagen" -#: builtin/branch.c:521 +#: builtin/branch.c:536 msgid "Branch copy failed" msgstr "Kopie des Branches fehlgeschlagen" -#: builtin/branch.c:525 +#: builtin/branch.c:540 #, c-format msgid "Created a copy of a misnamed branch '%s'" msgstr "Kopie eines falsch benannten Branches '%s' erstellt." -#: builtin/branch.c:528 +#: builtin/branch.c:543 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "falsch benannten Branch '%s' umbenannt" -#: builtin/branch.c:534 +#: builtin/branch.c:549 #, 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:543 +#: builtin/branch.c:558 msgid "Branch is renamed, but update of config-file failed" msgstr "" "Branch ist umbenannt, aber die Aktualisierung der Konfigurationsdatei ist " "fehlgeschlagen." -#: builtin/branch.c:545 +#: builtin/branch.c:560 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:561 +#: builtin/branch.c:576 #, c-format msgid "" "Please edit the description for the branch\n" @@ -8960,187 +9697,181 @@ msgstr "" " %s\n" "Zeilen, die mit '%c' beginnen, werden entfernt.\n" -#: builtin/branch.c:594 +#: builtin/branch.c:610 msgid "Generic options" msgstr "Allgemeine Optionen" -#: builtin/branch.c:596 +#: builtin/branch.c:612 msgid "show hash and subject, give twice for upstream branch" msgstr "Hash und Betreff anzeigen; -vv: zusätzlich Upstream-Branch" -#: builtin/branch.c:597 +#: builtin/branch.c:613 msgid "suppress informational messages" msgstr "Informationsmeldungen unterdrücken" -#: builtin/branch.c:598 +#: builtin/branch.c:614 msgid "set up tracking mode (see git-pull(1))" msgstr "Modus zum Folgen von Branches einstellen (siehe git-pull(1))" -#: builtin/branch.c:600 +#: builtin/branch.c:616 msgid "do not use" msgstr "nicht verwenden" -#: builtin/branch.c:602 builtin/rebase--interactive.c:182 +#: builtin/branch.c:618 builtin/rebase.c:485 msgid "upstream" msgstr "Upstream" -#: builtin/branch.c:602 +#: builtin/branch.c:618 msgid "change the upstream info" msgstr "Informationen zum Upstream-Branch ändern" -#: builtin/branch.c:603 +#: builtin/branch.c:619 msgid "Unset the upstream info" msgstr "Informationen zum Upstream-Branch entfernen" -#: builtin/branch.c:604 +#: builtin/branch.c:620 msgid "use colored output" msgstr "farbige Ausgaben verwenden" -#: builtin/branch.c:605 +#: builtin/branch.c:621 msgid "act on remote-tracking branches" msgstr "auf Remote-Tracking-Branches wirken" -#: builtin/branch.c:607 builtin/branch.c:609 +#: builtin/branch.c:623 builtin/branch.c:625 msgid "print only branches that contain the commit" msgstr "nur Branches ausgeben, die diesen Commit enthalten" -#: builtin/branch.c:608 builtin/branch.c:610 +#: builtin/branch.c:624 builtin/branch.c:626 msgid "print only branches that don't contain the commit" msgstr "nur Branches ausgeben, die diesen Commit nicht enthalten" -#: builtin/branch.c:613 +#: builtin/branch.c:629 msgid "Specific git-branch actions:" msgstr "spezifische Aktionen für \"git-branch\":" -#: builtin/branch.c:614 +#: builtin/branch.c:630 msgid "list both remote-tracking and local branches" msgstr "Remote-Tracking und lokale Branches auflisten" -#: builtin/branch.c:616 +#: builtin/branch.c:632 msgid "delete fully merged branch" msgstr "vollständig zusammengeführten Branch entfernen" -#: builtin/branch.c:617 +#: builtin/branch.c:633 msgid "delete branch (even if not merged)" msgstr "Branch löschen (auch wenn nicht zusammengeführt)" -#: builtin/branch.c:618 +#: builtin/branch.c:634 msgid "move/rename a branch and its reflog" msgstr "einen Branch und dessen Reflog verschieben/umbenennen" -#: builtin/branch.c:619 +#: builtin/branch.c:635 msgid "move/rename a branch, even if target exists" msgstr "" "einen Branch verschieben/umbenennen, auch wenn das Ziel bereits existiert" -#: builtin/branch.c:620 +#: builtin/branch.c:636 msgid "copy a branch and its reflog" msgstr "einen Branch und dessen Reflog kopieren" -#: builtin/branch.c:621 +#: builtin/branch.c:637 msgid "copy a branch, even if target exists" msgstr "einen Branch kopieren, auch wenn das Ziel bereits existiert" -#: builtin/branch.c:622 +#: builtin/branch.c:638 msgid "list branch names" msgstr "Branchnamen auflisten" -#: builtin/branch.c:623 +#: builtin/branch.c:639 +msgid "show current branch name" +msgstr "Zeige aktuellen Branch-Namen." + +#: builtin/branch.c:640 msgid "create the branch's reflog" msgstr "das Reflog des Branches erzeugen" -#: builtin/branch.c:625 +#: builtin/branch.c:642 msgid "edit the description for the branch" msgstr "die Beschreibung für den Branch bearbeiten" -#: builtin/branch.c:626 +#: builtin/branch.c:643 msgid "force creation, move/rename, deletion" msgstr "Erstellung, Verschiebung/Umbenennung oder Löschung erzwingen" -#: builtin/branch.c:627 +#: builtin/branch.c:644 msgid "print only branches that are merged" msgstr "nur zusammengeführte Branches ausgeben" -#: builtin/branch.c:628 +#: builtin/branch.c:645 msgid "print only branches that are not merged" msgstr "nur nicht zusammengeführte Branches ausgeben" -#: builtin/branch.c:629 +#: builtin/branch.c:646 msgid "list branches in columns" msgstr "Branches in Spalten auflisten" -#: builtin/branch.c:630 builtin/for-each-ref.c:40 builtin/ls-remote.c:70 -#: builtin/tag.c:415 -msgid "key" -msgstr "Schüssel" - -#: builtin/branch.c:631 builtin/for-each-ref.c:41 builtin/ls-remote.c:71 -#: builtin/tag.c:416 -msgid "field name to sort on" -msgstr "sortiere nach diesem Feld" - -#: builtin/branch.c:633 builtin/for-each-ref.c:43 builtin/notes.c:415 +#: builtin/branch.c:649 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:418 +#: builtin/tag.c:427 msgid "object" msgstr "Objekt" -#: builtin/branch.c:634 +#: builtin/branch.c:650 msgid "print only branches of the object" msgstr "nur Branches von diesem Objekt ausgeben" -#: builtin/branch.c:636 builtin/for-each-ref.c:49 builtin/tag.c:425 +#: builtin/branch.c:652 builtin/for-each-ref.c:48 builtin/tag.c:434 msgid "sorting and filtering are case insensitive" msgstr "Sortierung und Filterung sind unabhängig von Groß- und Kleinschreibung" -#: builtin/branch.c:637 builtin/for-each-ref.c:38 builtin/tag.c:423 +#: builtin/branch.c:653 builtin/for-each-ref.c:38 builtin/tag.c:432 #: builtin/verify-tag.c:39 msgid "format to use for the output" msgstr "für die Ausgabe zu verwendendes Format" -#: builtin/branch.c:660 builtin/clone.c:746 +#: builtin/branch.c:676 builtin/clone.c:748 msgid "HEAD not found below refs/heads!" msgstr "HEAD wurde nicht unter \"refs/heads\" gefunden!" -#: builtin/branch.c:683 +#: builtin/branch.c:700 msgid "--column and --verbose are incompatible" msgstr "Die Optionen --column und --verbose sind inkompatibel." -#: builtin/branch.c:698 builtin/branch.c:749 builtin/branch.c:758 +#: builtin/branch.c:715 builtin/branch.c:769 builtin/branch.c:778 msgid "branch name required" msgstr "Branchname erforderlich" -#: builtin/branch.c:725 +#: builtin/branch.c:745 msgid "Cannot give description to detached HEAD" msgstr "zu losgelöstem HEAD kann keine Beschreibung hinterlegt werden" -#: builtin/branch.c:730 +#: builtin/branch.c:750 msgid "cannot edit description of more than one branch" msgstr "Beschreibung von mehr als einem Branch kann nicht bearbeitet werden" -#: builtin/branch.c:737 +#: builtin/branch.c:757 #, c-format msgid "No commit on branch '%s' yet." msgstr "Noch kein Commit in Branch '%s'." -#: builtin/branch.c:740 +#: builtin/branch.c:760 #, c-format msgid "No branch named '%s'." msgstr "Branch '%s' nicht vorhanden." -#: builtin/branch.c:755 +#: builtin/branch.c:775 msgid "too many branches for a copy operation" msgstr "zu viele Branches für eine Kopieroperation angegeben" -#: builtin/branch.c:764 +#: builtin/branch.c:784 msgid "too many arguments for a rename operation" msgstr "zu viele Argumente für eine Umbenennen-Operation angegeben" -#: builtin/branch.c:769 +#: builtin/branch.c:789 msgid "too many arguments to set new upstream" msgstr "zu viele Argumente angegeben, um Upstream-Branch zu setzen" -#: builtin/branch.c:773 +#: builtin/branch.c:793 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." @@ -9148,40 +9879,40 @@ msgstr "" "Konnte keinen neuen Upstream-Branch von HEAD zu %s setzen, da dieser auf\n" "keinen Branch zeigt." -#: builtin/branch.c:776 builtin/branch.c:799 +#: builtin/branch.c:796 builtin/branch.c:819 #, c-format msgid "no such branch '%s'" msgstr "Kein solcher Branch '%s'" -#: builtin/branch.c:780 +#: builtin/branch.c:800 #, c-format msgid "branch '%s' does not exist" msgstr "Branch '%s' existiert nicht" -#: builtin/branch.c:793 +#: builtin/branch.c:813 msgid "too many arguments to unset upstream" msgstr "" "zu viele Argumente angegeben, um Konfiguration zu Upstream-Branch zu " "entfernen" -#: builtin/branch.c:797 +#: builtin/branch.c:817 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:803 +#: builtin/branch.c:823 #, c-format msgid "Branch '%s' has no upstream information" msgstr "Branch '%s' hat keinen Upstream-Branch gesetzt" -#: builtin/branch.c:813 +#: builtin/branch.c:833 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "" "Die Optionen -a und -r bei 'git branch' können nicht gemeimsam mit einem " "Branchnamen verwendet werden." -#: builtin/branch.c:816 +#: builtin/branch.c:836 msgid "" "the '--set-upstream' option is no longer supported. Please use '--track' or " "'--set-upstream-to' instead." @@ -9250,7 +9981,7 @@ msgstr "eine Textkonvertierung auf den Inhalt von Blob-Objekten ausführen" msgid "for blob objects, run filters on object's content" msgstr "für Blob-Objekte, Filter auf Objekt-Inhalte ausführen" -#: builtin/cat-file.c:643 git-submodule.sh:860 +#: builtin/cat-file.c:643 git-submodule.sh:936 msgid "blob" msgstr "Blob" @@ -9315,8 +10046,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:1280 builtin/gc.c:517 -#: builtin/worktree.c:496 +#: builtin/check-ignore.c:21 builtin/checkout.c:1355 builtin/gc.c:538 +#: builtin/worktree.c:499 msgid "suppress progress reporting" msgstr "Fortschrittsanzeige unterdrücken" @@ -9410,8 +10141,8 @@ msgstr "den Inhalt in temporäre Dateien schreiben" #: 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:1857 -#: builtin/worktree.c:669 +#: builtin/submodule--helper.c:1383 builtin/submodule--helper.c:1856 +#: builtin/worktree.c:672 msgid "string" msgstr "Zeichenkette" @@ -9432,127 +10163,143 @@ msgstr "git checkout [<Optionen>] <Branch>" msgid "git checkout [<options>] [<branch>] -- <file>..." msgstr "git checkout [<Optionen>] [<Branch>] -- <Datei>..." -#: builtin/checkout.c:147 builtin/checkout.c:181 +#: builtin/checkout.c:151 builtin/checkout.c:190 #, c-format msgid "path '%s' does not have our version" msgstr "Pfad '%s' hat nicht unsere Version." -#: builtin/checkout.c:149 builtin/checkout.c:183 +#: builtin/checkout.c:153 builtin/checkout.c:192 #, c-format msgid "path '%s' does not have their version" msgstr "Pfad '%s' hat nicht deren Version." -#: builtin/checkout.c:165 +#: builtin/checkout.c:169 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "Pfad '%s' hat nicht alle notwendigen Versionen." -#: builtin/checkout.c:210 +#: builtin/checkout.c:219 #, c-format msgid "path '%s' does not have necessary versions" msgstr "Pfad '%s' hat nicht die notwendigen Versionen." -#: builtin/checkout.c:228 +#: builtin/checkout.c:237 #, c-format msgid "path '%s': cannot merge" msgstr "Pfad '%s': kann nicht zusammenführen" -#: builtin/checkout.c:244 +#: builtin/checkout.c:253 #, c-format msgid "Unable to add merge result for '%s'" msgstr "Konnte Merge-Ergebnis von '%s' nicht hinzufügen." -#: builtin/checkout.c:267 builtin/checkout.c:270 builtin/checkout.c:273 -#: builtin/checkout.c:276 +#: 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' kann nicht mit der Aktualisierung von Pfaden verwendet werden" -#: builtin/checkout.c:279 builtin/checkout.c:282 +#: builtin/checkout.c:343 builtin/checkout.c:346 #, c-format msgid "'%s' cannot be used with %s" msgstr "'%s' kann nicht mit '%s' verwendet werden" -#: builtin/checkout.c:285 +#: builtin/checkout.c:349 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "" "Kann nicht gleichzeitig Pfade aktualisieren und zu Branch '%s' wechseln" -#: builtin/checkout.c:354 builtin/checkout.c:361 +#: builtin/checkout.c:396 builtin/checkout.c:403 #, c-format msgid "path '%s' is unmerged" msgstr "Pfad '%s' ist nicht zusammengeführt." -#: builtin/checkout.c:397 +#: builtin/checkout.c:442 #, c-format msgid "Recreated %d merge conflict" msgid_plural "Recreated %d merge conflicts" msgstr[0] "%d Merge-Konflikt wieder erstellt" msgstr[1] "%d Merge-Konflikte wieder erstellt" -#: builtin/checkout.c:402 +#: builtin/checkout.c:447 #, c-format msgid "Updated %d path from %s" msgid_plural "Updated %d paths from %s" msgstr[0] "%d Pfad von %s aktualisiert" msgstr[1] "%d Pfade von %s aktualisiert" -#: builtin/checkout.c:409 +#: builtin/checkout.c:454 #, c-format msgid "Updated %d path from the index" msgid_plural "Updated %d paths from the index" msgstr[0] "%d Pfad vom Index aktualisiert" msgstr[1] "%d Pfade vom Index aktualisiert" -#: builtin/checkout.c:645 +#: builtin/checkout.c:695 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:782 +#: builtin/checkout.c:744 +#, c-format +msgid "" +"cannot continue with staged changes in the following files:\n" +"%s" +msgstr "" +"Kann nicht mit vorgemerkten Änderungen in folgenden Dateien fortsetzen:\n" +"%s" + +#: builtin/checkout.c:751 +#, c-format +msgid "staged changes in the following files may be lost: %s" +msgstr "" +"Zum Commit vorgemerkte Änderungen in den folgenden Dateien gehen eventuell " +"verloren: %s" + +#: builtin/checkout.c:848 #, 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:824 +#: builtin/checkout.c:890 msgid "HEAD is now at" msgstr "HEAD ist jetzt bei" -#: builtin/checkout.c:828 builtin/clone.c:699 +#: builtin/checkout.c:894 builtin/clone.c:701 msgid "unable to update HEAD" msgstr "Konnte HEAD nicht aktualisieren." -#: builtin/checkout.c:832 +#: builtin/checkout.c:898 #, c-format msgid "Reset branch '%s'\n" msgstr "Setze Branch '%s' neu\n" -#: builtin/checkout.c:835 +#: builtin/checkout.c:901 #, c-format msgid "Already on '%s'\n" msgstr "Bereits auf '%s'\n" -#: builtin/checkout.c:839 +#: builtin/checkout.c:905 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Zu umgesetztem Branch '%s' gewechselt\n" -#: builtin/checkout.c:841 builtin/checkout.c:1212 +#: builtin/checkout.c:907 builtin/checkout.c:1283 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Zu neuem Branch '%s' gewechselt\n" -#: builtin/checkout.c:843 +#: builtin/checkout.c:909 #, c-format msgid "Switched to branch '%s'\n" msgstr "Zu Branch '%s' gewechselt\n" -#: builtin/checkout.c:894 +#: builtin/checkout.c:960 #, c-format msgid " ... and %d more.\n" msgstr " ... und %d weitere.\n" -#: builtin/checkout.c:900 +#: builtin/checkout.c:966 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -9575,7 +10322,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:919 +#: builtin/checkout.c:985 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -9602,24 +10349,24 @@ msgstr[1] "" " git branch <neuer-Branchname> %s\n" "\n" -#: builtin/checkout.c:951 +#: builtin/checkout.c:1017 msgid "internal error in revision walk" msgstr "interner Fehler im Revisionsgang" -#: builtin/checkout.c:955 +#: builtin/checkout.c:1021 msgid "Previous HEAD position was" msgstr "Vorherige Position von HEAD war" -#: builtin/checkout.c:983 builtin/checkout.c:1207 +#: builtin/checkout.c:1052 builtin/checkout.c:1278 msgid "You are on a branch yet to be born" msgstr "Sie sind auf einem Branch, der noch nicht geboren ist" -#: builtin/checkout.c:1104 +#: builtin/checkout.c:1173 #, c-format msgid "only one reference expected, %d given." msgstr "nur eine Referenz erwartet, %d gegeben." -#: builtin/checkout.c:1140 +#: builtin/checkout.c:1209 #, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" @@ -9629,146 +10376,154 @@ msgstr "" "Bitte benutzen Sie -- (und optional --no-guess), um diese\n" "eindeutig voneinander zu unterscheiden." -#: builtin/checkout.c:1153 builtin/worktree.c:290 builtin/worktree.c:445 +#: builtin/checkout.c:1222 builtin/worktree.c:290 builtin/worktree.c:448 #, c-format msgid "invalid reference: %s" msgstr "Ungültige Referenz: %s" -#: builtin/checkout.c:1182 +#: builtin/checkout.c:1251 #, c-format msgid "reference is not a tree: %s" msgstr "Referenz ist kein \"Tree\"-Objekt: %s" -#: builtin/checkout.c:1221 +#: builtin/checkout.c:1292 msgid "paths cannot be used with switching branches" msgstr "Pfade können nicht beim Wechseln von Branches verwendet werden" -#: builtin/checkout.c:1224 builtin/checkout.c:1228 +#: builtin/checkout.c:1295 builtin/checkout.c:1299 builtin/checkout.c:1303 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "'%s' kann nicht beim Wechseln von Branches verwendet werden" -#: builtin/checkout.c:1232 builtin/checkout.c:1235 builtin/checkout.c:1240 -#: builtin/checkout.c:1243 +#: builtin/checkout.c:1307 builtin/checkout.c:1310 builtin/checkout.c:1315 +#: builtin/checkout.c:1318 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' kann nicht mit '%s' verwendet werden" -#: builtin/checkout.c:1248 +#: builtin/checkout.c:1323 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "Kann Branch nicht zu Nicht-Commit '%s' wechseln" -#: builtin/checkout.c:1281 builtin/checkout.c:1283 builtin/clone.c:120 -#: builtin/remote.c:169 builtin/remote.c:171 builtin/worktree.c:489 -#: builtin/worktree.c:491 +#: 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 "Branch" -#: builtin/checkout.c:1282 +#: builtin/checkout.c:1357 msgid "create and checkout a new branch" msgstr "einen neuen Branch erzeugen und auschecken" -#: builtin/checkout.c:1284 +#: builtin/checkout.c:1359 msgid "create/reset and checkout a branch" msgstr "einen Branch erstellen/umsetzen und auschecken" -#: builtin/checkout.c:1285 +#: builtin/checkout.c:1360 msgid "create reflog for new branch" msgstr "das Reflog für den neuen Branch erzeugen" -#: builtin/checkout.c:1286 builtin/worktree.c:493 +#: builtin/checkout.c:1361 builtin/worktree.c:496 msgid "detach HEAD at named commit" msgstr "HEAD bei benanntem Commit loslösen" -#: builtin/checkout.c:1287 +#: builtin/checkout.c:1362 msgid "set upstream info for new branch" msgstr "Informationen zum Upstream-Branch für den neuen Branch setzen" -#: builtin/checkout.c:1289 +#: builtin/checkout.c:1364 msgid "new-branch" msgstr "neuer Branch" -#: builtin/checkout.c:1289 +#: builtin/checkout.c:1364 msgid "new unparented branch" msgstr "neuer Branch ohne Eltern-Commit" -#: builtin/checkout.c:1291 +#: builtin/checkout.c:1366 msgid "checkout our version for unmerged files" msgstr "unsere Variante für nicht zusammengeführte Dateien auschecken" -#: builtin/checkout.c:1294 +#: builtin/checkout.c:1369 msgid "checkout their version for unmerged files" msgstr "ihre Variante für nicht zusammengeführte Dateien auschecken" -#: builtin/checkout.c:1296 +#: builtin/checkout.c:1371 msgid "force checkout (throw away local modifications)" msgstr "Auschecken erzwingen (verwirft lokale Änderungen)" -#: builtin/checkout.c:1298 +#: builtin/checkout.c:1373 msgid "perform a 3-way merge with the new branch" msgstr "einen 3-Wege-Merge mit dem neuen Branch ausführen" -#: builtin/checkout.c:1300 builtin/merge.c:276 +#: builtin/checkout.c:1375 builtin/merge.c:284 msgid "update ignored files (default)" msgstr "ignorierte Dateien aktualisieren (Standard)" -#: builtin/checkout.c:1302 builtin/log.c:1586 parse-options.h:272 +#: builtin/checkout.c:1377 builtin/log.c:1594 parse-options.h:317 msgid "style" msgstr "Stil" -#: builtin/checkout.c:1303 +#: builtin/checkout.c:1378 msgid "conflict style (merge or diff3)" msgstr "Konfliktstil (merge oder diff3)" -#: builtin/checkout.c:1306 +#: builtin/checkout.c:1381 msgid "do not limit pathspecs to sparse entries only" msgstr "keine Einschränkung bei Pfadspezifikationen zum partiellen Auschecken" -#: builtin/checkout.c:1308 +#: builtin/checkout.c:1383 msgid "do not second guess 'git checkout <no-such-branch>'" msgstr "kein zweites Erraten bei 'git checkout <kein-solcher-Branch>'" -#: builtin/checkout.c:1310 +#: builtin/checkout.c:1385 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:1314 builtin/clone.c:87 builtin/fetch.c:141 -#: builtin/merge.c:273 builtin/pull.c:130 builtin/push.c:575 +#: 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 "Fortschrittsanzeige erzwingen" -#: builtin/checkout.c:1345 +#: builtin/checkout.c:1390 +msgid "use overlay mode (default)" +msgstr "benutze Overlay-Modus (Standard)" + +#: builtin/checkout.c:1422 msgid "-b, -B and --orphan are mutually exclusive" msgstr "Die Optionen -b, -B und --orphan schließen sich gegenseitig aus." -#: builtin/checkout.c:1362 +#: builtin/checkout.c:1425 +msgid "-p and --overlay are mutually exclusive" +msgstr "-p und --overlay schließen sich gegenseitig aus." + +#: builtin/checkout.c:1442 msgid "--track needs a branch name" msgstr "Bei der Option --track muss ein Branchname angegeben werden." -#: builtin/checkout.c:1367 +#: builtin/checkout.c:1447 msgid "missing branch name; try -b" msgstr "Kein Branchname; versuchen Sie -b." -#: builtin/checkout.c:1404 +#: builtin/checkout.c:1484 msgid "invalid path specification" msgstr "ungültige Pfadspezifikation" -#: builtin/checkout.c:1411 +#: builtin/checkout.c:1491 #, 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:1415 +#: builtin/checkout.c:1495 #, 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:1419 +#: builtin/checkout.c:1499 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -9776,7 +10531,7 @@ msgstr "" "git checkout: --ours/--theirs, --force und --merge sind inkompatibel wenn\n" "Sie aus dem Index auschecken." -#: builtin/checkout.c:1439 +#: builtin/checkout.c:1519 #, c-format msgid "" "'%s' matched more than one remote tracking branch.\n" @@ -9957,9 +10712,9 @@ msgid "remove whole directories" msgstr "ganze Verzeichnisse löschen" #: builtin/clean.c:913 builtin/describe.c:546 builtin/describe.c:548 -#: builtin/grep.c:897 builtin/log.c:167 builtin/log.c:169 -#: builtin/ls-files.c:557 builtin/name-rev.c:415 builtin/name-rev.c:417 -#: builtin/show-ref.c:178 +#: 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/show-ref.c:179 msgid "pattern" msgstr "Muster" @@ -9999,143 +10754,153 @@ msgstr "" msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<Optionen>] [--] <Repository> [<Verzeichnis>]" -#: builtin/clone.c:89 +#: builtin/clone.c:90 msgid "don't create a checkout" msgstr "kein Auschecken" -#: builtin/clone.c:90 builtin/clone.c:92 builtin/init-db.c:481 +#: builtin/clone.c:91 builtin/clone.c:93 builtin/init-db.c:489 msgid "create a bare repository" msgstr "ein Bare-Repository erstellen" -#: builtin/clone.c:94 +#: builtin/clone.c:95 msgid "create a mirror repository (implies bare)" msgstr "ein Spiegelarchiv erstellen (impliziert --bare)" -#: builtin/clone.c:96 +#: builtin/clone.c:97 msgid "to clone from a local repository" msgstr "von einem lokalen Repository klonen" -#: builtin/clone.c:98 +#: builtin/clone.c:99 msgid "don't use local hardlinks, always copy" msgstr "lokal keine harten Verweise verwenden, immer Kopien" -#: builtin/clone.c:100 +#: builtin/clone.c:101 msgid "setup as shared repository" msgstr "als verteiltes Repository einrichten" -#: builtin/clone.c:102 builtin/clone.c:106 +#: builtin/clone.c:104 msgid "pathspec" msgstr "Pfadspezifikation" -#: builtin/clone.c:102 builtin/clone.c:106 +#: builtin/clone.c:104 msgid "initialize submodules in the clone" msgstr "Submodule im Klon initialisieren" -#: builtin/clone.c:109 +#: builtin/clone.c:107 msgid "number of submodules cloned in parallel" msgstr "Anzahl der parallel zu klonenden Submodule" -#: builtin/clone.c:110 builtin/init-db.c:478 +#: builtin/clone.c:108 builtin/init-db.c:486 msgid "template-directory" msgstr "Vorlagenverzeichnis" -#: builtin/clone.c:111 builtin/init-db.c:479 +#: builtin/clone.c:109 builtin/init-db.c:487 msgid "directory from which templates will be used" msgstr "Verzeichnis, von welchem die Vorlagen verwendet werden" -#: builtin/clone.c:113 builtin/clone.c:115 builtin/submodule--helper.c:1379 -#: builtin/submodule--helper.c:1860 +#: builtin/clone.c:111 builtin/clone.c:113 builtin/submodule--helper.c:1379 +#: builtin/submodule--helper.c:1859 msgid "reference repository" msgstr "Repository referenzieren" -#: builtin/clone.c:117 builtin/submodule--helper.c:1381 -#: builtin/submodule--helper.c:1862 +#: builtin/clone.c:115 builtin/submodule--helper.c:1381 +#: builtin/submodule--helper.c:1861 msgid "use --reference only while cloning" msgstr "--reference nur während des Klonens benutzen" -#: builtin/clone.c:118 builtin/column.c:27 builtin/merge-file.c:46 -#: builtin/pack-objects.c:3303 builtin/repack.c:329 +#: builtin/clone.c:116 builtin/column.c:27 builtin/merge-file.c:46 +#: builtin/pack-objects.c:3306 builtin/repack.c:329 msgid "name" msgstr "Name" -#: builtin/clone.c:119 +#: builtin/clone.c:117 msgid "use <name> instead of 'origin' to track upstream" msgstr "<Name> statt 'origin' für Upstream-Repository verwenden" -#: builtin/clone.c:121 +#: builtin/clone.c:119 msgid "checkout <branch> instead of the remote's HEAD" msgstr "<Branch> auschecken, anstatt HEAD des Remote-Repositories" -#: builtin/clone.c:123 +#: builtin/clone.c:121 msgid "path to git-upload-pack on the remote" msgstr "Pfad zu \"git-upload-pack\" auf der Gegenseite" -#: builtin/clone.c:124 builtin/fetch.c:142 builtin/grep.c:836 -#: builtin/pull.c:218 +#: builtin/clone.c:122 builtin/fetch.c:142 builtin/grep.c:836 +#: builtin/pull.c:225 msgid "depth" msgstr "Tiefe" -#: builtin/clone.c:125 +#: builtin/clone.c:123 msgid "create a shallow clone of that depth" msgstr "" "einen Klon mit unvollständiger Historie (shallow) in dieser Tiefe erstellen" -#: builtin/clone.c:126 builtin/fetch.c:144 builtin/pack-objects.c:3292 +#: builtin/clone.c:124 builtin/fetch.c:144 builtin/pack-objects.c:3295 msgid "time" msgstr "Zeit" -#: builtin/clone.c:127 +#: builtin/clone.c:125 msgid "create a shallow clone since a specific time" msgstr "" "einen Klon mit unvollständiger Historie (shallow) seit einer bestimmten " "Zeit\n" "erstellen" -#: builtin/clone.c:128 builtin/fetch.c:146 builtin/fetch.c:169 -#: builtin/rebase.c:1039 +#: builtin/clone.c:126 builtin/fetch.c:146 builtin/fetch.c:169 +#: builtin/rebase.c:1389 msgid "revision" msgstr "Commit" -#: builtin/clone.c:129 builtin/fetch.c:147 +#: builtin/clone.c:127 builtin/fetch.c:147 msgid "deepen history of shallow clone, excluding rev" msgstr "" "die Historie eines Klons mit unvollständiger Historie (shallow) mittels\n" "Ausschluss eines Commits vertiefen" -#: builtin/clone.c:131 +#: builtin/clone.c:129 msgid "clone only one branch, HEAD or --branch" msgstr "nur einen Branch klonen, HEAD oder --branch" -#: builtin/clone.c:133 +#: builtin/clone.c:131 msgid "don't clone any tags, and make later fetches not to follow them" msgstr "keine Tags klonen, und auch bei späteren Abrufen nicht beachten" -#: builtin/clone.c:135 +#: builtin/clone.c:133 msgid "any cloned submodules will be shallow" msgstr "jedes geklonte Submodul mit unvollständiger Historie (shallow)" -#: builtin/clone.c:136 builtin/init-db.c:487 +#: builtin/clone.c:134 builtin/init-db.c:495 msgid "gitdir" msgstr ".git-Verzeichnis" -#: builtin/clone.c:137 builtin/init-db.c:488 +#: builtin/clone.c:135 builtin/init-db.c:496 msgid "separate git dir from working tree" msgstr "Git-Verzeichnis vom Arbeitsverzeichnis separieren" -#: builtin/clone.c:138 +#: builtin/clone.c:136 msgid "key=value" msgstr "Schlüssel=Wert" -#: builtin/clone.c:139 +#: builtin/clone.c:137 msgid "set config inside the new repository" msgstr "Konfiguration innerhalb des neuen Repositories setzen" -#: builtin/clone.c:140 builtin/fetch.c:165 builtin/pull.c:231 +#: builtin/clone.c:139 builtin/fetch.c:164 builtin/ls-remote.c:76 +#: builtin/push.c:585 builtin/send-pack.c:172 +msgid "server-specific" +msgstr "serverspezifisch" + +#: builtin/clone.c:139 builtin/fetch.c:164 builtin/ls-remote.c:76 +#: builtin/push.c:585 builtin/send-pack.c:173 +msgid "option to transmit" +msgstr "Option übertragen" + +#: builtin/clone.c:140 builtin/fetch.c:165 builtin/pull.c:238 #: builtin/push.c:586 msgid "use IPv4 addresses only" msgstr "nur IPv4-Adressen benutzen" -#: builtin/clone.c:142 builtin/fetch.c:167 builtin/pull.c:234 +#: builtin/clone.c:142 builtin/fetch.c:167 builtin/pull.c:241 #: builtin/push.c:588 msgid "use IPv6 addresses only" msgstr "nur IPv6-Adressen benutzen" @@ -10203,92 +10968,92 @@ msgstr "" msgid "Could not find remote branch %s to clone." msgstr "Konnte zu klonenden Remote-Branch %s nicht finden." -#: builtin/clone.c:687 +#: builtin/clone.c:689 #, c-format msgid "unable to update %s" msgstr "kann %s nicht aktualisieren" -#: builtin/clone.c:737 +#: builtin/clone.c:739 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" "Externer HEAD bezieht sich auf eine nicht existierende Referenz und kann " "nicht ausgecheckt werden.\n" -#: builtin/clone.c:768 +#: builtin/clone.c:770 msgid "unable to checkout working tree" msgstr "Arbeitsverzeichnis konnte nicht ausgecheckt werden" -#: builtin/clone.c:813 +#: builtin/clone.c:815 msgid "unable to write parameters to config file" msgstr "konnte Parameter nicht in Konfigurationsdatei schreiben" -#: builtin/clone.c:876 +#: builtin/clone.c:878 msgid "cannot repack to clean up" msgstr "Kann \"repack\" zum Aufräumen nicht aufrufen" -#: builtin/clone.c:878 +#: builtin/clone.c:880 msgid "cannot unlink temporary alternates file" msgstr "Kann temporäre \"alternates\"-Datei nicht entfernen" -#: builtin/clone.c:918 builtin/receive-pack.c:1941 +#: builtin/clone.c:920 builtin/receive-pack.c:1952 msgid "Too many arguments." msgstr "Zu viele Argumente." -#: builtin/clone.c:922 +#: builtin/clone.c:924 msgid "You must specify a repository to clone." msgstr "Sie müssen ein Repository zum Klonen angeben." -#: builtin/clone.c:935 +#: builtin/clone.c:937 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "Die Optionen --bare und --origin %s sind inkompatibel." -#: builtin/clone.c:938 +#: builtin/clone.c:940 msgid "--bare and --separate-git-dir are incompatible." msgstr "Die Optionen --bare und --separate-git-dir sind inkompatibel." -#: builtin/clone.c:951 +#: builtin/clone.c:953 #, c-format msgid "repository '%s' does not exist" msgstr "Repository '%s' existiert nicht." -#: builtin/clone.c:957 builtin/fetch.c:1608 +#: builtin/clone.c:959 builtin/fetch.c:1610 #, c-format msgid "depth %s is not a positive number" msgstr "Tiefe %s ist keine positive Zahl" -#: builtin/clone.c:967 +#: builtin/clone.c:969 #, 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:977 +#: builtin/clone.c:979 #, c-format msgid "working tree '%s' already exists." msgstr "Arbeitsverzeichnis '%s' existiert bereits." -#: builtin/clone.c:992 builtin/clone.c:1013 builtin/difftool.c:272 -#: builtin/worktree.c:296 builtin/worktree.c:326 +#: builtin/clone.c:994 builtin/clone.c:1015 builtin/difftool.c:264 +#: builtin/worktree.c:296 builtin/worktree.c:328 #, c-format msgid "could not create leading directories of '%s'" msgstr "Konnte führende Verzeichnisse von '%s' nicht erstellen." -#: builtin/clone.c:997 +#: builtin/clone.c:999 #, c-format msgid "could not create work tree dir '%s'" msgstr "Konnte Arbeitsverzeichnis '%s' nicht erstellen" -#: builtin/clone.c:1017 +#: builtin/clone.c:1019 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Klone in Bare-Repository '%s' ...\n" -#: builtin/clone.c:1019 +#: builtin/clone.c:1021 #, c-format msgid "Cloning into '%s'...\n" msgstr "Klone nach '%s' ...\n" -#: builtin/clone.c:1043 +#: builtin/clone.c:1045 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" @@ -10296,45 +11061,45 @@ msgstr "" "'clone --recursive' ist nicht kompatibel mit --reference und --reference-if-" "able" -#: builtin/clone.c:1104 +#: builtin/clone.c:1106 msgid "--depth is ignored in local clones; use file:// instead." msgstr "" "Die Option --depth wird in lokalen Klonen ignoriert; benutzen Sie " "stattdessen file://" -#: builtin/clone.c:1106 +#: builtin/clone.c:1108 msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "" "--shallow-since wird in lokalen Klonen ignoriert; benutzen Sie stattdessen " "file://" -#: builtin/clone.c:1108 +#: builtin/clone.c:1110 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "" "--shallow-exclude wird in lokalen Klonen ignoriert; benutzen Sie stattdessen " "file://" -#: builtin/clone.c:1110 +#: builtin/clone.c:1112 msgid "--filter is ignored in local clones; use file:// instead." msgstr "" "--filter wird in lokalen Klonen ignoriert; benutzen Sie stattdessen file://" -#: builtin/clone.c:1113 +#: builtin/clone.c:1115 msgid "source repository is shallow, ignoring --local" msgstr "" "Quelle ist ein Repository mit unvollständiger Historie (shallow),\n" "ignoriere --local" -#: builtin/clone.c:1118 +#: builtin/clone.c:1120 msgid "--local is ignored" msgstr "--local wird ignoriert" -#: builtin/clone.c:1192 builtin/clone.c:1200 +#: builtin/clone.c:1197 builtin/clone.c:1205 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Remote-Branch %s nicht im Upstream-Repository %s gefunden" -#: builtin/clone.c:1203 +#: builtin/clone.c:1208 msgid "You appear to have cloned an empty repository." msgstr "Sie scheinen ein leeres Repository geklont zu haben." @@ -10370,6 +11135,74 @@ msgstr "Abstand zwischen Spalten" msgid "--command must be the first argument" msgstr "Die Option --command muss an erster Stelle stehen." +#: builtin/commit-tree.c:18 +msgid "" +"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F " +"<file>)...] <tree>" +msgstr "" +"git commit-tree [(-p <Eltern-Commit>)...] [-S[<Key-ID>]] [(-m " +"<Nachricht>)...] [(-F <Datei>)...] <Tree-Objekt>" + +#: builtin/commit-tree.c:31 +#, c-format +msgid "duplicate parent %s ignored" +msgstr "doppelter Vorgänger %s ignoriert" + +#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:520 +#, c-format +msgid "not a valid object name %s" +msgstr "Kein gültiger Objektname: %s" + +#: builtin/commit-tree.c:93 +#, c-format +msgid "git commit-tree: failed to open '%s'" +msgstr "git commit-tree: Fehler beim Öffnen von '%s'" + +#: builtin/commit-tree.c:96 +#, c-format +msgid "git commit-tree: failed to read '%s'" +msgstr "git commit-tree: Fehler beim Lesen von '%s'" + +#: builtin/commit-tree.c:98 +#, c-format +msgid "git commit-tree: failed to close '%s'" +msgstr "git commit-tree: Fehler beim Schließen von '%s'" + +#: builtin/commit-tree.c:111 +msgid "parent" +msgstr "Eltern-Commit" + +#: builtin/commit-tree.c:112 +msgid "id of a parent commit object" +msgstr "ID eines Eltern-Commit-Objektes." + +#: 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 +msgid "message" +msgstr "Beschreibung" + +#: builtin/commit-tree.c:115 builtin/commit.c:1480 +msgid "commit message" +msgstr "Commit-Beschreibung" + +#: builtin/commit-tree.c:118 +msgid "read commit log message from file" +msgstr "Commit-Beschreibung von Datei lesen" + +#: builtin/commit-tree.c:121 builtin/commit.c:1492 builtin/merge.c:283 +#: builtin/pull.c:193 builtin/revert.c:117 +msgid "GPG sign commit" +msgstr "Commit mit GPG signieren" + +#: builtin/commit-tree.c:133 +msgid "must give exactly one tree" +msgstr "Brauche genau ein Tree-Objekt." + +#: builtin/commit-tree.c:140 +msgid "git commit-tree: failed to read" +msgstr "git commit-tree: Fehler beim Lesen" + #: builtin/commit.c:41 msgid "git commit [<options>] [--] <pathspec>..." msgstr "git commit [<Optionen>] [--] <Pfadspezifikation>..." @@ -10425,7 +11258,7 @@ msgstr "" #: builtin/commit.c:312 msgid "failed to unpack HEAD tree object" -msgstr "Fehler beim Entpacken des \"Tree\"-Objektes von HEAD." +msgstr "Fehler beim Entpacken des Tree-Objektes von HEAD." #: builtin/commit.c:353 msgid "unable to create temporary index" @@ -10478,7 +11311,7 @@ msgstr "Commit '%s' hat fehlerhafte Autor-Zeile" msgid "malformed --author parameter" msgstr "Fehlerhafter --author Parameter" -#: builtin/commit.c:652 +#: builtin/commit.c:653 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -10486,38 +11319,38 @@ msgstr "" "Konnte kein Kommentar-Zeichen auswählen, das nicht in\n" "der aktuellen Commit-Beschreibung verwendet wird." -#: builtin/commit.c:689 builtin/commit.c:722 builtin/commit.c:1052 +#: builtin/commit.c:691 builtin/commit.c:724 builtin/commit.c:1069 #, c-format msgid "could not lookup commit %s" msgstr "Konnte Commit %s nicht nachschlagen" -#: builtin/commit.c:701 builtin/shortlog.c:319 +#: builtin/commit.c:703 builtin/shortlog.c:319 #, c-format msgid "(reading log message from standard input)\n" msgstr "(lese Log-Nachricht von Standard-Eingabe)\n" -#: builtin/commit.c:703 +#: builtin/commit.c:705 msgid "could not read log from standard input" msgstr "Konnte Log nicht von Standard-Eingabe lesen." -#: builtin/commit.c:707 +#: builtin/commit.c:709 #, c-format msgid "could not read log file '%s'" msgstr "Konnte Log-Datei '%s' nicht lesen" -#: builtin/commit.c:736 builtin/commit.c:744 +#: builtin/commit.c:740 builtin/commit.c:756 msgid "could not read SQUASH_MSG" msgstr "Konnte SQUASH_MSG nicht lesen" -#: builtin/commit.c:741 +#: builtin/commit.c:747 msgid "could not read MERGE_MSG" msgstr "Konnte MERGE_MSG nicht lesen" -#: builtin/commit.c:795 +#: builtin/commit.c:807 msgid "could not write commit template" msgstr "Konnte Commit-Vorlage nicht schreiben" -#: builtin/commit.c:813 +#: builtin/commit.c:826 #, c-format msgid "" "\n" @@ -10532,7 +11365,7 @@ msgstr "" "\t%s\n" "und versuchen Sie es erneut.\n" -#: builtin/commit.c:818 +#: builtin/commit.c:831 #, c-format msgid "" "\n" @@ -10547,7 +11380,7 @@ msgstr "" "\t%s\n" "und versuchen Sie es erneut.\n" -#: builtin/commit.c:831 +#: builtin/commit.c:844 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -10557,7 +11390,7 @@ msgstr "" "die mit '%c' beginnen, werden ignoriert, und eine leere Beschreibung\n" "bricht den Commit ab.\n" -#: builtin/commit.c:839 +#: builtin/commit.c:852 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -10570,159 +11403,155 @@ msgstr "" "entfernen.\n" "Eine leere Beschreibung bricht den Commit ab.\n" -#: builtin/commit.c:856 +#: builtin/commit.c:869 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sAutor: %.*s <%.*s>" -#: builtin/commit.c:864 +#: builtin/commit.c:877 #, c-format msgid "%sDate: %s" msgstr "%sDatum: %s" -#: builtin/commit.c:871 +#: builtin/commit.c:884 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sCommit-Ersteller: %.*s <%.*s>" -#: builtin/commit.c:889 +#: builtin/commit.c:902 msgid "Cannot read index" msgstr "Kann Index nicht lesen" -#: builtin/commit.c:956 +#: builtin/commit.c:969 msgid "Error building trees" msgstr "Fehler beim Erzeugen der \"Tree\"-Objekte" -#: builtin/commit.c:970 builtin/tag.c:258 +#: builtin/commit.c:983 builtin/tag.c:269 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "" "Bitte liefern Sie eine Beschreibung entweder mit der Option -m oder -F.\n" -#: builtin/commit.c:1014 +#: builtin/commit.c:1027 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "" "--author '%s' ist nicht im Format 'Name <E-Mail>' und stimmt mit keinem " "vorhandenen Autor überein" -#: builtin/commit.c:1028 +#: builtin/commit.c:1041 #, c-format msgid "Invalid ignored mode '%s'" msgstr "Ungültiger ignored-Modus '%s'." -#: builtin/commit.c:1042 builtin/commit.c:1279 +#: builtin/commit.c:1059 builtin/commit.c:1284 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Ungültiger Modus '%s' für unversionierte Dateien" -#: builtin/commit.c:1080 +#: builtin/commit.c:1097 msgid "--long and -z are incompatible" msgstr "Die Optionen --long und -z sind inkompatibel." -#: builtin/commit.c:1113 +#: builtin/commit.c:1130 msgid "Using both --reset-author and --author does not make sense" msgstr "" "Die Optionen --reset-author und --author können nicht gemeinsam verwendet " "werden." -#: builtin/commit.c:1122 +#: builtin/commit.c:1139 msgid "You have nothing to amend." msgstr "Sie haben nichts für \"--amend\"." -#: builtin/commit.c:1125 +#: builtin/commit.c:1142 msgid "You are in the middle of a merge -- cannot amend." msgstr "Ein Merge ist im Gange -- kann \"--amend\" nicht ausführen." -#: builtin/commit.c:1127 +#: builtin/commit.c:1144 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "\"cherry-pick\" ist im Gange -- kann \"--amend\" nicht ausführen." -#: builtin/commit.c:1130 +#: builtin/commit.c:1147 msgid "Options --squash and --fixup cannot be used together" msgstr "" "Die Optionen --squash und --fixup können nicht gemeinsam verwendet werden." -#: builtin/commit.c:1140 +#: builtin/commit.c:1157 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "Es kann nur eine Option von -c/-C/-F/--fixup verwendet werden." -#: builtin/commit.c:1142 +#: builtin/commit.c:1159 msgid "Option -m cannot be combined with -c/-C/-F." msgstr "Die Option -m kann nicht mit -c/-C/-F kombiniert werden." -#: builtin/commit.c:1150 +#: builtin/commit.c:1167 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." -#: builtin/commit.c:1167 +#: builtin/commit.c:1184 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" "Es kann nur eine Option von --include/--only/--all/--interactive/--patch " "verwendet werden." -#: builtin/commit.c:1169 +#: builtin/commit.c:1186 msgid "No paths with --include/--only does not make sense." msgstr "" "Die Optionen --include und --only können nur mit der Angabe von Pfaden " "verwendet werden." -#: builtin/commit.c:1183 builtin/tag.c:546 +#: builtin/commit.c:1192 #, c-format -msgid "Invalid cleanup mode %s" -msgstr "Ungültiger \"cleanup\" Modus %s" - -#: builtin/commit.c:1188 -msgid "Paths with -a does not make sense." -msgstr "Die Option -a kann nicht mit der Angabe von Pfaden verwendet werden." +msgid "paths '%s ...' with -a does not make sense" +msgstr "Pfade '%s ...' mit -a sind nicht sinnvoll" -#: builtin/commit.c:1314 builtin/commit.c:1498 +#: builtin/commit.c:1319 builtin/commit.c:1503 msgid "show status concisely" msgstr "Status im Kurzformat anzeigen" -#: builtin/commit.c:1316 builtin/commit.c:1500 +#: builtin/commit.c:1321 builtin/commit.c:1505 msgid "show branch information" msgstr "Branchinformationen anzeigen" -#: builtin/commit.c:1318 +#: builtin/commit.c:1323 msgid "show stash information" msgstr "Stashinformationen anzeigen" -#: builtin/commit.c:1320 builtin/commit.c:1502 +#: builtin/commit.c:1325 builtin/commit.c:1507 msgid "compute full ahead/behind values" msgstr "voraus/hinterher-Werte berechnen" -#: builtin/commit.c:1322 +#: builtin/commit.c:1327 msgid "version" msgstr "Version" -#: builtin/commit.c:1322 builtin/commit.c:1504 builtin/push.c:561 -#: builtin/worktree.c:640 +#: builtin/commit.c:1327 builtin/commit.c:1509 builtin/push.c:561 +#: builtin/worktree.c:643 msgid "machine-readable output" msgstr "maschinenlesbare Ausgabe" -#: builtin/commit.c:1325 builtin/commit.c:1506 +#: builtin/commit.c:1330 builtin/commit.c:1511 msgid "show status in long format (default)" msgstr "Status im Langformat anzeigen (Standard)" -#: builtin/commit.c:1328 builtin/commit.c:1509 +#: builtin/commit.c:1333 builtin/commit.c:1514 msgid "terminate entries with NUL" msgstr "Einträge mit NUL-Zeichen abschließen" -#: builtin/commit.c:1330 builtin/commit.c:1334 builtin/commit.c:1512 -#: builtin/fast-export.c:1085 builtin/fast-export.c:1088 builtin/rebase.c:1118 -#: builtin/tag.c:400 +#: 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 msgid "mode" msgstr "Modus" -#: builtin/commit.c:1331 builtin/commit.c:1512 +#: builtin/commit.c:1336 builtin/commit.c:1517 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" "unversionierte Dateien anzeigen, optionale Modi: all, normal, no. (Standard: " "all)" -#: builtin/commit.c:1335 +#: builtin/commit.c:1340 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" @@ -10730,11 +11559,11 @@ msgstr "" "ignorierte Dateien anzeigen, optionale Modi: traditional, matching, no. " "(Standard: traditional)" -#: builtin/commit.c:1337 parse-options.h:164 +#: builtin/commit.c:1342 parse-options.h:179 msgid "when" msgstr "wann" -#: builtin/commit.c:1338 +#: builtin/commit.c:1343 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -10742,192 +11571,169 @@ msgstr "" "Änderungen in Submodulen ignorieren, optional wenn: all, dirty, untracked. " "(Standard: all)" -#: builtin/commit.c:1340 +#: builtin/commit.c:1345 msgid "list untracked files in columns" msgstr "unversionierte Dateien in Spalten auflisten" -#: builtin/commit.c:1341 +#: builtin/commit.c:1346 msgid "do not detect renames" msgstr "keine Umbenennungen ermitteln" -#: builtin/commit.c:1343 +#: builtin/commit.c:1348 msgid "detect renames, optionally set similarity index" msgstr "Umbenennungen erkennen, optional Index für Gleichheit setzen" -#: builtin/commit.c:1363 +#: builtin/commit.c:1368 msgid "Unsupported combination of ignored and untracked-files arguments" msgstr "" "Nicht unterstützte Kombination von ignored und untracked-files Argumenten." -#: builtin/commit.c:1468 +#: builtin/commit.c:1473 msgid "suppress summary after successful commit" msgstr "Zusammenfassung nach erfolgreichem Commit unterdrücken" -#: builtin/commit.c:1469 +#: builtin/commit.c:1474 msgid "show diff in commit message template" msgstr "Unterschiede in Commit-Beschreibungsvorlage anzeigen" -#: builtin/commit.c:1471 +#: builtin/commit.c:1476 msgid "Commit message options" msgstr "Optionen für Commit-Beschreibung" -#: builtin/commit.c:1472 builtin/merge.c:264 builtin/tag.c:397 +#: builtin/commit.c:1477 builtin/merge.c:272 builtin/tag.c:408 msgid "read message from file" msgstr "Beschreibung von Datei lesen" -#: builtin/commit.c:1473 +#: builtin/commit.c:1478 msgid "author" msgstr "Autor" -#: builtin/commit.c:1473 +#: builtin/commit.c:1478 msgid "override author for commit" msgstr "Autor eines Commits überschreiben" -#: builtin/commit.c:1474 builtin/gc.c:518 +#: builtin/commit.c:1479 builtin/gc.c:539 msgid "date" msgstr "Datum" -#: builtin/commit.c:1474 +#: builtin/commit.c:1479 msgid "override date for commit" msgstr "Datum eines Commits überschreiben" -#: builtin/commit.c:1475 builtin/merge.c:260 builtin/notes.c:409 -#: builtin/notes.c:575 builtin/tag.c:395 -msgid "message" -msgstr "Beschreibung" - -#: builtin/commit.c:1475 -msgid "commit message" -msgstr "Commit-Beschreibung" - -#: builtin/commit.c:1476 builtin/commit.c:1477 builtin/commit.c:1478 -#: builtin/commit.c:1479 parse-options.h:278 ref-filter.h:92 +#: builtin/commit.c:1481 builtin/commit.c:1482 builtin/commit.c:1483 +#: builtin/commit.c:1484 parse-options.h:323 ref-filter.h:92 msgid "commit" msgstr "Commit" -#: builtin/commit.c:1476 +#: builtin/commit.c:1481 msgid "reuse and edit message from specified commit" msgstr "Beschreibung des angegebenen Commits wiederverwenden und editieren" -#: builtin/commit.c:1477 +#: builtin/commit.c:1482 msgid "reuse message from specified commit" msgstr "Beschreibung des angegebenen Commits wiederverwenden" -#: builtin/commit.c:1478 +#: builtin/commit.c:1483 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "eine automatisch zusammengesetzte Beschreibung zum Nachbessern des " "angegebenen Commits verwenden" -#: builtin/commit.c:1479 +#: builtin/commit.c:1484 msgid "use autosquash formatted message to squash specified commit" msgstr "" "eine automatisch zusammengesetzte Beschreibung beim \"squash\" des " "angegebenen Commits verwenden" -#: builtin/commit.c:1480 +#: builtin/commit.c:1485 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:1481 builtin/log.c:1533 builtin/merge.c:277 -#: builtin/pull.c:156 builtin/revert.c:107 +#: 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:'-Zeile hinzufügen" -#: builtin/commit.c:1482 +#: builtin/commit.c:1487 msgid "use specified template file" msgstr "angegebene Vorlagendatei verwenden" -#: builtin/commit.c:1483 +#: builtin/commit.c:1488 msgid "force edit of commit" msgstr "Bearbeitung des Commits erzwingen" -#: builtin/commit.c:1484 -msgid "default" -msgstr "Standard" - -#: builtin/commit.c:1484 builtin/tag.c:401 -msgid "how to strip spaces and #comments from message" -msgstr "" -"wie Leerzeichen und #Kommentare von der Beschreibung getrennt werden sollen" - -#: builtin/commit.c:1485 +#: builtin/commit.c:1490 msgid "include status in commit message template" msgstr "Status in die Commit-Beschreibungsvorlage einfügen" -#: builtin/commit.c:1487 builtin/merge.c:275 builtin/pull.c:186 -#: builtin/revert.c:115 -msgid "GPG sign commit" -msgstr "Commit mit GPG signieren" - -#: builtin/commit.c:1490 +#: builtin/commit.c:1495 msgid "Commit contents options" msgstr "Optionen für Commit-Inhalt" -#: builtin/commit.c:1491 +#: builtin/commit.c:1496 msgid "commit all changed files" msgstr "alle geänderten Dateien committen" -#: builtin/commit.c:1492 +#: builtin/commit.c:1497 msgid "add specified files to index for commit" msgstr "die angegebenen Dateien zusätzlich zum Commit vormerken" -#: builtin/commit.c:1493 +#: builtin/commit.c:1498 msgid "interactively add files" msgstr "interaktives Hinzufügen von Dateien" -#: builtin/commit.c:1494 +#: builtin/commit.c:1499 msgid "interactively add changes" msgstr "interaktives Hinzufügen von Änderungen" -#: builtin/commit.c:1495 +#: builtin/commit.c:1500 msgid "commit only specified files" msgstr "nur die angegebenen Dateien committen" -#: builtin/commit.c:1496 +#: builtin/commit.c:1501 msgid "bypass pre-commit and commit-msg hooks" msgstr "Hooks pre-commit und commit-msg umgehen" -#: builtin/commit.c:1497 +#: builtin/commit.c:1502 msgid "show what would be committed" msgstr "anzeigen, was committet werden würde" -#: builtin/commit.c:1510 +#: builtin/commit.c:1515 msgid "amend previous commit" msgstr "vorherigen Commit ändern" -#: builtin/commit.c:1511 +#: builtin/commit.c:1516 msgid "bypass post-rewrite hook" msgstr "\"post-rewrite hook\" umgehen" -#: builtin/commit.c:1516 +#: builtin/commit.c:1521 msgid "ok to record an empty change" msgstr "Aufzeichnung einer leeren Änderung erlauben" -#: builtin/commit.c:1518 +#: builtin/commit.c:1523 msgid "ok to record a change with an empty message" msgstr "Aufzeichnung einer Änderung mit einer leeren Beschreibung erlauben" -#: builtin/commit.c:1591 +#: builtin/commit.c:1596 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Beschädigte MERGE_HEAD-Datei (%s)" -#: builtin/commit.c:1598 +#: builtin/commit.c:1603 msgid "could not read MERGE_MODE" msgstr "Konnte MERGE_MODE nicht lesen" -#: builtin/commit.c:1617 +#: builtin/commit.c:1622 #, c-format msgid "could not read commit message: %s" msgstr "Konnte Commit-Beschreibung nicht lesen: %s" -#: builtin/commit.c:1628 +#: builtin/commit.c:1629 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Commit aufgrund leerer Beschreibung abgebrochen.\n" -#: builtin/commit.c:1633 +#: builtin/commit.c:1634 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "Commit abgebrochen; Sie haben die Beschreibung nicht editiert.\n" @@ -10963,36 +11769,41 @@ msgstr "" "git commit-graph write [--object-dir <Objektverzeichnis>] [--append] [--" "reachable|--stdin-packs|--stdin-commits]" -#: builtin/commit-graph.c:48 builtin/commit-graph.c:78 -#: builtin/commit-graph.c:132 builtin/commit-graph.c:190 builtin/fetch.c:153 -#: builtin/log.c:1553 +#: 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 "Verzeichnis" -#: builtin/commit-graph.c:49 builtin/commit-graph.c:79 -#: builtin/commit-graph.c:133 builtin/commit-graph.c:191 +#: 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 "Das Objektverzeichnis zum Speichern des Graphen." -#: builtin/commit-graph.c:135 +#: builtin/commit-graph.c:68 builtin/commit-graph.c:105 +#, c-format +msgid "Could not open commit-graph '%s'" +msgstr "Konnte Commit-Graph '%s' nicht öffnen." + +#: builtin/commit-graph.c:150 msgid "start walk at all refs" msgstr "Durchlauf auf allen Referenzen beginnen" -#: builtin/commit-graph.c:137 +#: builtin/commit-graph.c:152 msgid "scan pack-indexes listed by stdin for commits" msgstr "durch Standard-Eingabe gelistete Pack-Indexe nach Commits scannen" -#: builtin/commit-graph.c:139 +#: builtin/commit-graph.c:154 msgid "start walk at commits listed by stdin" msgstr "Lauf bei Commits beginnen, die über die Standard-Eingabe gelistet sind" -#: builtin/commit-graph.c:141 +#: builtin/commit-graph.c:156 msgid "include all commits already in the commit-graph file" msgstr "" "alle Commits einschließen, die sich bereits in der Commit-Graph-Datei " "befinden" -#: builtin/commit-graph.c:150 +#: builtin/commit-graph.c:165 msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" msgstr "" "Benutzen Sie mindestens eins von --reachable, --stdin-commits, oder --stdin-" @@ -11402,7 +12213,7 @@ msgstr "" msgid "describe %s\n" msgstr "Beschreibe %s\n" -#: builtin/describe.c:513 builtin/log.c:516 +#: builtin/describe.c:513 #, c-format msgid "Not a valid object name %s" msgstr "%s ist kein gültiger Objekt-Name" @@ -11452,7 +12263,7 @@ msgstr "nur Tags, die <Muster> entsprechen, betrachten" msgid "do not consider tags matching <pattern>" msgstr "keine Tags betrachten, die <Muster> entsprechen" -#: builtin/describe.c:551 builtin/name-rev.c:424 +#: builtin/describe.c:551 builtin/name-rev.c:426 msgid "show abbreviated commit object as fallback" msgstr "gekürztes Commit-Objekt anzeigen, wenn sonst nichts zutrifft" @@ -11498,50 +12309,50 @@ msgstr "'%s': keine reguläre Datei oder symbolische Verknüpfung" msgid "invalid option: %s" msgstr "Ungültige Option: %s" -#: builtin/diff.c:364 +#: builtin/diff.c:350 msgid "Not a git repository" msgstr "Kein Git-Repository" -#: builtin/diff.c:408 +#: builtin/diff.c:394 #, c-format msgid "invalid object '%s' given." msgstr "Objekt '%s' ist ungültig." -#: builtin/diff.c:417 +#: builtin/diff.c:403 #, c-format msgid "more than two blobs given: '%s'" msgstr "Mehr als zwei Blobs angegeben: '%s'" -#: builtin/diff.c:422 +#: builtin/diff.c:408 #, c-format msgid "unhandled object '%s' given." msgstr "unbehandeltes Objekt '%s' angegeben" -#: builtin/difftool.c:31 +#: builtin/difftool.c:30 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" msgstr "git difftool [<Optionen>] [<Commit> [<Commit>]] [--] [<Pfad>...]" -#: builtin/difftool.c:261 +#: builtin/difftool.c:253 #, c-format msgid "failed: %d" msgstr "fehlgeschlagen: %d" -#: builtin/difftool.c:303 +#: builtin/difftool.c:295 #, c-format msgid "could not read symlink %s" msgstr "konnte symbolische Verknüpfung %s nicht lesen" -#: builtin/difftool.c:305 +#: builtin/difftool.c:297 #, c-format msgid "could not read symlink file %s" msgstr "Konnte Datei von symbolischer Verknüpfung '%s' nicht lesen." -#: builtin/difftool.c:313 +#: builtin/difftool.c:305 #, c-format msgid "could not read object %s for symlink %s" msgstr "Konnte Objekt '%s' für symbolische Verknüpfung '%s' nicht lesen." -#: builtin/difftool.c:414 +#: builtin/difftool.c:406 msgid "" "combined diff formats('-c' and '--cc') are not supported in\n" "directory diff mode('-d' and '--dir-diff')." @@ -11549,54 +12360,54 @@ msgstr "" "Kombinierte Diff-Formate('-c' und '--cc') werden im Verzeichnis-\n" "Diff-Modus('-d' und '--dir-diff') nicht unterstützt." -#: builtin/difftool.c:634 +#: builtin/difftool.c:626 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "beide Dateien geändert: '%s' und '%s'." -#: builtin/difftool.c:636 +#: builtin/difftool.c:628 msgid "working tree file has been left." msgstr "Datei im Arbeitsverzeichnis belassen." -#: builtin/difftool.c:647 +#: builtin/difftool.c:639 #, c-format msgid "temporary files exist in '%s'." msgstr "Es existieren temporäre Dateien in '%s'." -#: builtin/difftool.c:648 +#: builtin/difftool.c:640 msgid "you may want to cleanup or recover these." msgstr "Sie könnten diese aufräumen oder wiederherstellen." -#: builtin/difftool.c:697 +#: builtin/difftool.c:689 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "`diff.guitool` anstatt `diff.tool` benutzen" -#: builtin/difftool.c:699 +#: builtin/difftool.c:691 msgid "perform a full-directory diff" msgstr "Diff über ganzes Verzeichnis ausführen" -#: builtin/difftool.c:701 +#: builtin/difftool.c:693 msgid "do not prompt before launching a diff tool" msgstr "keine Eingabeaufforderung vor Ausführung eines Diff-Tools" -#: builtin/difftool.c:706 +#: builtin/difftool.c:698 msgid "use symlinks in dir-diff mode" msgstr "symbolische Verknüpfungen im dir-diff Modus verwenden" -#: builtin/difftool.c:707 +#: builtin/difftool.c:699 msgid "tool" msgstr "Tool" -#: builtin/difftool.c:708 +#: builtin/difftool.c:700 msgid "use the specified diff tool" msgstr "das angegebene Diff-Tool benutzen" -#: builtin/difftool.c:710 +#: builtin/difftool.c:702 msgid "print a list of diff tools that may be used with `--tool`" msgstr "" "eine Liste mit Diff-Tools darstellen, die mit `--tool` benutzt werden können" -#: builtin/difftool.c:713 +#: builtin/difftool.c:705 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " "code" @@ -11605,15 +12416,31 @@ msgstr "" "Rückkehrwert\n" "verschieden 0 ausgeführt wurde" -#: builtin/difftool.c:716 +#: builtin/difftool.c:708 msgid "specify a custom command for viewing diffs" msgstr "eigenen Befehl zur Anzeige von Unterschieden angeben" -#: builtin/difftool.c:740 +#: builtin/difftool.c:709 +msgid "passed to `diff`" +msgstr "an 'diff' übergeben" + +#: builtin/difftool.c:724 +msgid "difftool requires worktree or --no-index" +msgstr "difftool benötigt Arbeitsverzeichnis oder --no-index" + +#: builtin/difftool.c:731 +msgid "--dir-diff is incompatible with --no-index" +msgstr "--dir-diff kann nicht mit --no-index verwendet werden" + +#: builtin/difftool.c:734 +msgid "--gui, --tool and --extcmd are mutually exclusive" +msgstr "--gui, --tool und --extcmd schließen sich gegenseitig aus" + +#: builtin/difftool.c:742 msgid "no <tool> given for --tool=<tool>" msgstr "kein <Tool> für --tool=<Tool> angegeben" -#: builtin/difftool.c:747 +#: builtin/difftool.c:749 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "kein <Programm> für --extcmd=<Programm> angegeben" @@ -11657,7 +12484,7 @@ msgstr "die \"done\"-Funktion benutzen, um den Datenstrom abzuschließen" msgid "Skip output of blob data" msgstr "Ausgabe von Blob-Daten überspringen" -#: builtin/fast-export.c:1102 builtin/log.c:1601 +#: builtin/fast-export.c:1102 builtin/log.c:1609 msgid "refspec" msgstr "Refspec" @@ -11671,7 +12498,9 @@ msgstr "Ausgabe anonymisieren" #: builtin/fast-export.c:1106 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" +msgstr "" +"Eltern, die nicht im Fast-Export-Stream sind, anhand ihrer Objekt-ID " +"referenzieren" #: builtin/fast-export.c:1108 msgid "Show original object ids of blobs/commits" @@ -11693,15 +12522,15 @@ msgstr "git fetch --multiple [<Optionen>] [(<Repository> | <Gruppe>)...]" msgid "git fetch --all [<options>]" msgstr "git fetch --all [<Optionen>]" -#: builtin/fetch.c:115 builtin/pull.c:195 +#: builtin/fetch.c:115 builtin/pull.c:202 msgid "fetch from all remotes" msgstr "fordert von allen Remote-Repositories an" -#: builtin/fetch.c:117 builtin/pull.c:198 +#: builtin/fetch.c:117 builtin/pull.c:205 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "an .git/FETCH_HEAD anhängen, anstatt zu überschreiben" -#: builtin/fetch.c:119 builtin/pull.c:201 +#: builtin/fetch.c:119 builtin/pull.c:208 msgid "path to upload pack on remote end" msgstr "Pfad des Programms zum Hochladen von Paketen auf der Gegenseite" @@ -11713,7 +12542,7 @@ msgstr "das Überschreiben einer lokalen Referenz erzwingen" msgid "fetch from multiple remotes" msgstr "von mehreren Remote-Repositories anfordern" -#: builtin/fetch.c:124 builtin/pull.c:205 +#: builtin/fetch.c:124 builtin/pull.c:212 msgid "fetch all tags and associated objects" msgstr "alle Tags und verbundene Objekte anfordern" @@ -11725,7 +12554,7 @@ msgstr "nicht alle Tags anfordern (--no-tags)" msgid "number of submodules fetched in parallel" msgstr "Anzahl der parallel anzufordernden Submodule" -#: builtin/fetch.c:130 builtin/pull.c:208 +#: builtin/fetch.c:130 builtin/pull.c:215 msgid "prune remote-tracking branches no longer on remote" msgstr "" "Remote-Tracking-Branches entfernen, die sich nicht mehr im Remote-Repository " @@ -11737,7 +12566,7 @@ msgstr "" "lokale Tags entfernen, die sich nicht mehr im Remote-Repository befinden, " "und geänderte Tags aktualisieren" -#: builtin/fetch.c:133 builtin/fetch.c:156 builtin/pull.c:133 +#: builtin/fetch.c:133 builtin/fetch.c:156 builtin/pull.c:139 msgid "on-demand" msgstr "bei-Bedarf" @@ -11745,7 +12574,7 @@ msgstr "bei-Bedarf" msgid "control recursive fetching of submodules" msgstr "rekursive Anforderungen von Submodulen kontrollieren" -#: builtin/fetch.c:138 builtin/pull.c:216 +#: builtin/fetch.c:138 builtin/pull.c:223 msgid "keep downloaded pack" msgstr "heruntergeladenes Paket behalten" @@ -11753,7 +12582,7 @@ msgstr "heruntergeladenes Paket behalten" msgid "allow updating of HEAD ref" msgstr "Aktualisierung der \"HEAD\"-Referenz erlauben" -#: builtin/fetch.c:143 builtin/fetch.c:149 builtin/pull.c:219 +#: builtin/fetch.c:143 builtin/fetch.c:149 builtin/pull.c:226 msgid "deepen history of shallow clone" msgstr "" "die Historie eines Klons mit unvollständiger Historie (shallow) vertiefen" @@ -11765,7 +12594,7 @@ msgstr "" "Zeitbasis\n" "vertiefen" -#: builtin/fetch.c:151 builtin/pull.c:222 +#: builtin/fetch.c:151 builtin/pull.c:229 msgid "convert to a complete repository" msgstr "zu einem vollständigen Repository konvertieren" @@ -11781,28 +12610,18 @@ msgstr "" "Standard für die rekursive Anforderung von Submodulen (geringere Priorität\n" "als Konfigurationsdateien)" -#: builtin/fetch.c:161 builtin/pull.c:225 +#: builtin/fetch.c:161 builtin/pull.c:232 msgid "accept refs that update .git/shallow" msgstr "Referenzen, die .git/shallow aktualisieren, akzeptieren" -#: builtin/fetch.c:162 builtin/pull.c:227 +#: builtin/fetch.c:162 builtin/pull.c:234 msgid "refmap" msgstr "Refmap" -#: builtin/fetch.c:163 builtin/pull.c:228 +#: builtin/fetch.c:163 builtin/pull.c:235 msgid "specify fetch refmap" msgstr "Refmap für 'fetch' angeben" -#: builtin/fetch.c:164 builtin/ls-remote.c:77 builtin/push.c:585 -#: builtin/send-pack.c:172 -msgid "server-specific" -msgstr "serverspezifisch" - -#: builtin/fetch.c:164 builtin/ls-remote.c:77 builtin/push.c:585 -#: builtin/send-pack.c:173 -msgid "option to transmit" -msgstr "Option übertragen" - #: builtin/fetch.c:170 msgid "report that we have only objects reachable from this object" msgstr "" @@ -11961,45 +12780,45 @@ msgstr "" msgid "You need to specify a tag name." msgstr "Sie müssen den Namen des Tags angeben." -#: builtin/fetch.c:1592 +#: builtin/fetch.c:1594 msgid "Negative depth in --deepen is not supported" msgstr "Negative Tiefe wird von --deepen nicht unterstützt." -#: builtin/fetch.c:1594 +#: builtin/fetch.c:1596 msgid "--deepen and --depth are mutually exclusive" msgstr "--deepen und --depth schließen sich gegenseitig aus" -#: builtin/fetch.c:1599 +#: builtin/fetch.c:1601 msgid "--depth and --unshallow cannot be used together" msgstr "" "Die Optionen --depth und --unshallow können nicht gemeinsam verwendet werden." -#: builtin/fetch.c:1601 +#: builtin/fetch.c:1603 msgid "--unshallow on a complete repository does not make sense" msgstr "" "Die Option --unshallow kann nicht in einem Repository mit unvollständiger " "Historie verwendet werden." -#: builtin/fetch.c:1617 +#: builtin/fetch.c:1619 msgid "fetch --all does not take a repository argument" msgstr "fetch --all akzeptiert kein Repository als Argument" -#: builtin/fetch.c:1619 +#: builtin/fetch.c:1621 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all kann nicht mit Refspecs verwendet werden." -#: builtin/fetch.c:1628 +#: builtin/fetch.c:1630 #, c-format msgid "No such remote or remote group: %s" msgstr "Kein Remote-Repository (einzeln oder Gruppe): %s" -#: builtin/fetch.c:1635 +#: builtin/fetch.c:1637 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:1651 +#: builtin/fetch.c:1653 msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" @@ -12070,27 +12889,27 @@ 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:424 +#: builtin/for-each-ref.c:39 builtin/tag.c:433 msgid "respect format colors" msgstr "Formatfarben beachten" -#: builtin/for-each-ref.c:43 +#: builtin/for-each-ref.c:42 msgid "print only refs which points at the given object" msgstr "nur auf dieses Objekt zeigende Referenzen ausgeben" -#: builtin/for-each-ref.c:45 +#: builtin/for-each-ref.c:44 msgid "print only refs that are merged" msgstr "nur zusammengeführte Referenzen ausgeben" -#: builtin/for-each-ref.c:46 +#: builtin/for-each-ref.c:45 msgid "print only refs that are not merged" msgstr "nur nicht zusammengeführte Referenzen ausgeben" -#: builtin/for-each-ref.c:47 +#: builtin/for-each-ref.c:46 msgid "print only refs which contain the commit" msgstr "nur Referenzen ausgeben, die diesen Commit enthalten" -#: builtin/for-each-ref.c:48 +#: builtin/for-each-ref.c:47 msgid "print only refs which don't contain the commit" msgstr "nur Referenzen ausgeben, die diesen Commit nicht enthalten" @@ -12128,211 +12947,211 @@ msgstr "" "Fehlerhafte Verknüpfung von %7s %s\n" " nach %7s %s" -#: builtin/fsck.c:253 +#: builtin/fsck.c:295 #, c-format msgid "missing %s %s" msgstr "%s %s fehlt" -#: builtin/fsck.c:279 +#: builtin/fsck.c:321 #, c-format msgid "unreachable %s %s" msgstr "%s %s nicht erreichbar" -#: builtin/fsck.c:298 +#: builtin/fsck.c:340 #, c-format msgid "dangling %s %s" msgstr "%s %s unreferenziert" -#: builtin/fsck.c:307 +#: builtin/fsck.c:349 msgid "could not create lost-found" msgstr "Konnte lost-found nicht erstellen." -#: builtin/fsck.c:318 +#: builtin/fsck.c:360 #, c-format msgid "could not finish '%s'" msgstr "Konnte '%s' nicht abschließen." -#: builtin/fsck.c:335 +#: builtin/fsck.c:377 #, c-format msgid "Checking %s" msgstr "Prüfe %s" -#: builtin/fsck.c:353 +#: builtin/fsck.c:415 #, c-format msgid "Checking connectivity (%d objects)" msgstr "Prüfe Konnektivität (%d Objekte)" -#: builtin/fsck.c:372 +#: builtin/fsck.c:434 #, c-format msgid "Checking %s %s" msgstr "Prüfe %s %s" -#: builtin/fsck.c:376 +#: builtin/fsck.c:438 msgid "broken links" msgstr "Fehlerhafte Verknüpfungen" -#: builtin/fsck.c:385 +#: builtin/fsck.c:447 #, c-format msgid "root %s" msgstr "Wurzel %s" -#: builtin/fsck.c:393 +#: builtin/fsck.c:455 #, c-format msgid "tagged %s %s (%s) in %s" msgstr "%s %s (%s) in %s getaggt" -#: builtin/fsck.c:422 +#: builtin/fsck.c:484 #, c-format msgid "%s: object corrupt or missing" msgstr "%s: Objekt fehlerhaft oder nicht vorhanden" -#: builtin/fsck.c:447 +#: builtin/fsck.c:509 #, c-format msgid "%s: invalid reflog entry %s" msgstr "%s: Ungültiger Reflog-Eintrag %s" -#: builtin/fsck.c:461 +#: builtin/fsck.c:523 #, c-format msgid "Checking reflog %s->%s" msgstr "Prüfe Reflog %s->%s" -#: builtin/fsck.c:495 +#: builtin/fsck.c:557 #, c-format msgid "%s: invalid sha1 pointer %s" msgstr "%s: Ungültiger SHA1-Zeiger %s" -#: builtin/fsck.c:502 +#: builtin/fsck.c:564 #, c-format msgid "%s: not a commit" msgstr "%s: kein Commit" -#: builtin/fsck.c:557 +#: builtin/fsck.c:619 msgid "notice: No default references" msgstr "Notiz: Keine Standardreferenzen" -#: builtin/fsck.c:572 +#: builtin/fsck.c:634 #, c-format msgid "%s: object corrupt or missing: %s" msgstr "%s: Objekt fehlerhaft oder nicht vorhanden: %s" -#: builtin/fsck.c:585 +#: builtin/fsck.c:647 #, c-format msgid "%s: object could not be parsed: %s" msgstr "%s: Objekt konnte nicht geparst werden: %s" -#: builtin/fsck.c:605 +#: builtin/fsck.c:667 #, c-format msgid "bad sha1 file: %s" msgstr "Ungültige SHA1-Datei: %s" -#: builtin/fsck.c:620 +#: builtin/fsck.c:682 msgid "Checking object directory" msgstr "Prüfe Objekt-Verzeichnis" -#: builtin/fsck.c:623 +#: builtin/fsck.c:685 msgid "Checking object directories" msgstr "Prüfe Objekt-Verzeichnisse" -#: builtin/fsck.c:638 +#: builtin/fsck.c:700 #, c-format msgid "Checking %s link" msgstr "Prüfe %s Verknüpfung" -#: builtin/fsck.c:643 builtin/index-pack.c:833 +#: builtin/fsck.c:705 builtin/index-pack.c:841 #, c-format msgid "invalid %s" msgstr "Ungültiger Objekt-Typ %s" -#: builtin/fsck.c:650 +#: builtin/fsck.c:712 #, c-format msgid "%s points to something strange (%s)" msgstr "%s zeigt auf etwas seltsames (%s)" -#: builtin/fsck.c:656 +#: builtin/fsck.c:718 #, c-format msgid "%s: detached HEAD points at nothing" msgstr "%s: losgelöster HEAD zeigt auf nichts" -#: builtin/fsck.c:660 +#: builtin/fsck.c:722 #, c-format msgid "notice: %s points to an unborn branch (%s)" msgstr "Notiz: %s zeigt auf einen ungeborenen Branch (%s)" -#: builtin/fsck.c:672 +#: builtin/fsck.c:734 msgid "Checking cache tree" msgstr "Prüfe Cache-Verzeichnis" -#: builtin/fsck.c:677 +#: builtin/fsck.c:739 #, c-format msgid "%s: invalid sha1 pointer in cache-tree" msgstr "%s: Ungültiger SHA1-Zeiger in Cache-Verzeichnis" -#: builtin/fsck.c:688 +#: builtin/fsck.c:750 msgid "non-tree in cache-tree" msgstr "non-tree in Cache-Verzeichnis" -#: builtin/fsck.c:719 +#: builtin/fsck.c:781 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<Optionen>] [<Objekt>...]" -#: builtin/fsck.c:725 +#: builtin/fsck.c:787 msgid "show unreachable objects" msgstr "unerreichbare Objekte anzeigen" -#: builtin/fsck.c:726 +#: builtin/fsck.c:788 msgid "show dangling objects" msgstr "unreferenzierte Objekte anzeigen" -#: builtin/fsck.c:727 +#: builtin/fsck.c:789 msgid "report tags" msgstr "Tags melden" -#: builtin/fsck.c:728 +#: builtin/fsck.c:790 msgid "report root nodes" msgstr "Hauptwurzeln melden" -#: builtin/fsck.c:729 +#: builtin/fsck.c:791 msgid "make index objects head nodes" msgstr "Index-Objekte in Erreichbarkeitsprüfung einbeziehen" -#: builtin/fsck.c:730 +#: builtin/fsck.c:792 msgid "make reflogs head nodes (default)" msgstr "Reflogs in Erreichbarkeitsprüfung einbeziehen (Standard)" -#: builtin/fsck.c:731 +#: builtin/fsck.c:793 msgid "also consider packs and alternate objects" msgstr "ebenso Pakete und alternative Objekte betrachten" -#: builtin/fsck.c:732 +#: builtin/fsck.c:794 msgid "check only connectivity" msgstr "nur Konnektivität prüfen" -#: builtin/fsck.c:733 +#: builtin/fsck.c:795 msgid "enable more strict checking" msgstr "genauere Prüfung aktivieren" -#: builtin/fsck.c:735 +#: builtin/fsck.c:797 msgid "write dangling objects in .git/lost-found" msgstr "unreferenzierte Objekte nach .git/lost-found schreiben" -#: builtin/fsck.c:736 builtin/prune.c:110 +#: builtin/fsck.c:798 builtin/prune.c:132 msgid "show progress" msgstr "Fortschrittsanzeige anzeigen" -#: builtin/fsck.c:737 +#: builtin/fsck.c:799 msgid "show verbose names for reachable objects" msgstr "ausführliche Namen für erreichbare Objekte anzeigen" -#: builtin/fsck.c:797 +#: builtin/fsck.c:859 builtin/index-pack.c:224 msgid "Checking objects" msgstr "Prüfe Objekte" -#: builtin/fsck.c:825 +#: builtin/fsck.c:887 #, c-format msgid "%s: object missing" msgstr "%s: Objekt nicht vorhanden" -#: builtin/fsck.c:837 +#: builtin/fsck.c:899 #, c-format msgid "invalid parameter: expected sha1, got '%s'" msgstr "Ungültiger Parameter: SHA-1 erwartet, '%s' bekommen" @@ -12346,17 +13165,22 @@ msgstr "git gc [<Optionen>]" msgid "Failed to fstat %s: %s" msgstr "Konnte '%s' nicht lesen: %s" -#: builtin/gc.c:461 builtin/init-db.c:55 +#: builtin/gc.c:126 +#, c-format +msgid "failed to parse '%s' value '%s'" +msgstr "Fehler beim Parsen von '%s' mit dem Wert '%s'" + +#: builtin/gc.c:476 builtin/init-db.c:55 #, c-format msgid "cannot stat '%s'" msgstr "Kann '%s' nicht lesen" -#: builtin/gc.c:470 builtin/notes.c:240 builtin/tag.c:510 +#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:519 #, c-format msgid "cannot read '%s'" msgstr "kann '%s' nicht lesen" -#: builtin/gc.c:477 +#: builtin/gc.c:492 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -12372,58 +13196,58 @@ msgstr "" "\n" "%s" -#: builtin/gc.c:519 +#: builtin/gc.c:540 msgid "prune unreferenced objects" msgstr "unreferenzierte Objekte entfernen" -#: builtin/gc.c:521 +#: builtin/gc.c:542 msgid "be more thorough (increased runtime)" msgstr "mehr Gründlichkeit (erhöht Laufzeit)" -#: builtin/gc.c:522 +#: builtin/gc.c:543 msgid "enable auto-gc mode" msgstr "\"auto-gc\" Modus aktivieren" -#: builtin/gc.c:525 +#: builtin/gc.c:546 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:528 +#: builtin/gc.c:549 msgid "repack all other packs except the largest pack" msgstr "alle anderen Pakete, außer das größte Paket, neu packen" -#: builtin/gc.c:545 +#: builtin/gc.c:566 #, c-format msgid "failed to parse gc.logexpiry value %s" msgstr "Fehler beim Parsen des Wertes '%s' von gc.logexpiry." -#: builtin/gc.c:556 +#: builtin/gc.c:577 #, c-format msgid "failed to parse prune expiry value %s" msgstr "Fehler beim Parsen des \"prune expiry\" Wertes %s" -#: builtin/gc.c:576 +#: builtin/gc.c:597 #, 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:578 +#: builtin/gc.c:599 #, 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:579 +#: builtin/gc.c:600 #, 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:619 +#: builtin/gc.c:640 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" @@ -12431,7 +13255,7 @@ msgstr "" "\"git gc\" wird bereits auf Maschine '%s' pid %<PRIuMAX> ausgeführt\n" "(benutzen Sie --force falls nicht)" -#: builtin/gc.c:672 +#: builtin/gc.c:693 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" @@ -12456,8 +13280,8 @@ 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:1506 builtin/index-pack.c:1697 -#: builtin/pack-objects.c:2717 +#: builtin/grep.c:287 builtin/index-pack.c:1514 builtin/index-pack.c:1705 +#: builtin/pack-objects.c:2720 #, c-format msgid "no threads support, ignoring %s" msgstr "keine Unterstützung von Threads, '%s' wird ignoriert" @@ -12686,11 +13510,11 @@ msgstr "Konnte Commit nicht auflösen: %s" msgid "invalid option combination, ignoring --threads" msgstr "Ungültige Kombination von Optionen, --threads wird ignoriert." -#: builtin/grep.c:1066 builtin/pack-objects.c:3400 +#: builtin/grep.c:1066 builtin/pack-objects.c:3403 msgid "no threads support, ignoring --threads" msgstr "Keine Unterstützung für Threads, --threads wird ignoriert." -#: builtin/grep.c:1069 builtin/index-pack.c:1503 builtin/pack-objects.c:2714 +#: builtin/grep.c:1069 builtin/index-pack.c:1511 builtin/pack-objects.c:2717 #, c-format msgid "invalid number of threads specified (%d)" msgstr "ungültige Anzahl von Threads angegeben (%d)" @@ -12798,30 +13622,30 @@ msgstr "Beschreibung des Befehls ausgeben" msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" msgstr "git help [--all] [--guides] [--man | --web | --info] [<Befehl>]" -#: builtin/help.c:73 +#: builtin/help.c:77 #, c-format msgid "unrecognized help format '%s'" msgstr "nicht erkanntes Hilfeformat: %s" -#: builtin/help.c:100 +#: builtin/help.c:104 msgid "Failed to start emacsclient." msgstr "Konnte emacsclient nicht starten." -#: builtin/help.c:113 +#: builtin/help.c:117 msgid "Failed to parse emacsclient version." msgstr "Konnte Version des emacsclient nicht parsen." -#: builtin/help.c:121 +#: builtin/help.c:125 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "Version des emacsclient '%d' ist zu alt (< 22)." -#: builtin/help.c:139 builtin/help.c:161 builtin/help.c:171 builtin/help.c:179 +#: builtin/help.c:143 builtin/help.c:165 builtin/help.c:175 builtin/help.c:183 #, c-format msgid "failed to exec '%s'" msgstr "Fehler beim Ausführen von '%s'" -#: builtin/help.c:217 +#: builtin/help.c:221 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" @@ -12830,7 +13654,7 @@ msgstr "" "'%s': Pfad für nicht unterstützten Handbuchbetrachter.\n" "Sie könnten stattdessen 'man.<Werkzeug>.cmd' benutzen." -#: builtin/help.c:229 +#: builtin/help.c:233 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" @@ -12839,35 +13663,35 @@ msgstr "" "'%s': Programm für unterstützten Handbuchbetrachter.\n" "Sie könnten stattdessen 'man.<Werkzeug>.path' benutzen." -#: builtin/help.c:346 +#: builtin/help.c:350 #, c-format msgid "'%s': unknown man viewer." msgstr "'%s': unbekannter Handbuch-Betrachter." -#: builtin/help.c:363 +#: builtin/help.c:367 msgid "no man viewer handled the request" msgstr "kein Handbuch-Betrachter konnte mit dieser Anfrage umgehen" -#: builtin/help.c:371 +#: builtin/help.c:375 msgid "no info viewer handled the request" msgstr "kein Informations-Betrachter konnte mit dieser Anfrage umgehen" -#: builtin/help.c:430 builtin/help.c:441 git.c:323 +#: builtin/help.c:434 builtin/help.c:445 git.c:335 #, c-format msgid "'%s' is aliased to '%s'" msgstr "Für '%s' wurde der Alias '%s' angelegt." -#: builtin/help.c:444 git.c:347 +#: builtin/help.c:448 git.c:364 #, c-format msgid "bad alias.%s string: %s" msgstr "Ungültiger alias.%s String: %s" -#: builtin/help.c:473 builtin/help.c:503 +#: builtin/help.c:477 builtin/help.c:507 #, c-format msgid "usage: %s%s" msgstr "Verwendung: %s%s" -#: builtin/help.c:487 +#: builtin/help.c:491 msgid "'git help config' for more information" msgstr "'git help config' für weitere Informationen" @@ -12886,276 +13710,276 @@ msgstr "konnte erwartetes Objekt %s nicht empfangen" msgid "object %s: expected type %s, found %s" msgstr "Objekt %s: erwarteter Typ %s, %s gefunden" -#: builtin/index-pack.c:249 +#: builtin/index-pack.c:257 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "kann %d Byte nicht lesen" msgstr[1] "kann %d Bytes nicht lesen" -#: builtin/index-pack.c:259 +#: builtin/index-pack.c:267 msgid "early EOF" msgstr "zu frühes Dateiende" -#: builtin/index-pack.c:260 +#: builtin/index-pack.c:268 msgid "read error on input" msgstr "Fehler beim Lesen der Eingabe" -#: builtin/index-pack.c:272 +#: builtin/index-pack.c:280 msgid "used more bytes than were available" msgstr "verwendete mehr Bytes als verfügbar waren" -#: builtin/index-pack.c:279 builtin/pack-objects.c:599 +#: builtin/index-pack.c:287 builtin/pack-objects.c:600 msgid "pack too large for current definition of off_t" msgstr "Paket ist zu groß für die aktuelle Definition von off_t" -#: builtin/index-pack.c:282 builtin/unpack-objects.c:94 +#: builtin/index-pack.c:290 builtin/unpack-objects.c:94 msgid "pack exceeds maximum allowed size" msgstr "Paket überschreitet die maximal erlaubte Größe" -#: builtin/index-pack.c:297 builtin/repack.c:250 +#: builtin/index-pack.c:305 builtin/repack.c:250 #, c-format msgid "unable to create '%s'" msgstr "konnte '%s' nicht erstellen" -#: builtin/index-pack.c:303 +#: builtin/index-pack.c:311 #, c-format msgid "cannot open packfile '%s'" msgstr "Kann Paketdatei '%s' nicht öffnen" -#: builtin/index-pack.c:317 +#: builtin/index-pack.c:325 msgid "pack signature mismatch" msgstr "Paketsignatur stimmt nicht überein" -#: builtin/index-pack.c:319 +#: builtin/index-pack.c:327 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "Paketversion %<PRIu32> nicht unterstützt" -#: builtin/index-pack.c:337 +#: builtin/index-pack.c:345 #, c-format msgid "pack has bad object at offset %<PRIuMAX>: %s" msgstr "Paket hat ein ungültiges Objekt bei Versatz %<PRIuMAX>: %s" -#: builtin/index-pack.c:457 +#: builtin/index-pack.c:465 #, c-format msgid "inflate returned %d" msgstr "Dekomprimierung gab %d zurück" -#: builtin/index-pack.c:506 +#: builtin/index-pack.c:514 msgid "offset value overflow for delta base object" msgstr "Wert für Versatz bei Differenzobjekt übergelaufen" -#: builtin/index-pack.c:514 +#: builtin/index-pack.c:522 msgid "delta base offset is out of bound" msgstr "" "Wert für Versatz bei Differenzobjekt liegt außerhalb des gültigen Bereichs" -#: builtin/index-pack.c:522 +#: builtin/index-pack.c:530 #, c-format msgid "unknown object type %d" msgstr "Unbekannter Objekt-Typ %d" -#: builtin/index-pack.c:553 +#: builtin/index-pack.c:561 msgid "cannot pread pack file" msgstr "Kann Paketdatei %s nicht lesen" -#: builtin/index-pack.c:555 +#: builtin/index-pack.c:563 #, c-format msgid "premature end of pack file, %<PRIuMAX> byte missing" msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing" msgstr[0] "frühzeitiges Ende der Paketdatei, vermisse %<PRIuMAX> Byte" msgstr[1] "frühzeitiges Ende der Paketdatei, vermisse %<PRIuMAX> Bytes" -#: builtin/index-pack.c:581 +#: builtin/index-pack.c:589 msgid "serious inflate inconsistency" msgstr "ernsthafte Inkonsistenz nach Dekomprimierung" -#: builtin/index-pack.c:726 builtin/index-pack.c:732 builtin/index-pack.c:755 -#: builtin/index-pack.c:794 builtin/index-pack.c:803 +#: 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 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "SHA1 KOLLISION MIT %s GEFUNDEN !" -#: builtin/index-pack.c:729 builtin/pack-objects.c:152 -#: builtin/pack-objects.c:212 builtin/pack-objects.c:306 +#: builtin/index-pack.c:737 builtin/pack-objects.c:153 +#: builtin/pack-objects.c:213 builtin/pack-objects.c:307 #, c-format msgid "unable to read %s" msgstr "kann %s nicht lesen" -#: builtin/index-pack.c:792 +#: builtin/index-pack.c:800 #, c-format msgid "cannot read existing object info %s" msgstr "Kann existierende Informationen zu Objekt %s nicht lesen." -#: builtin/index-pack.c:800 +#: builtin/index-pack.c:808 #, c-format msgid "cannot read existing object %s" msgstr "Kann existierendes Objekt %s nicht lesen." -#: builtin/index-pack.c:814 +#: builtin/index-pack.c:822 #, c-format msgid "invalid blob object %s" msgstr "ungültiges Blob-Objekt %s" -#: builtin/index-pack.c:817 builtin/index-pack.c:836 +#: builtin/index-pack.c:825 builtin/index-pack.c:844 msgid "fsck error in packed object" msgstr "fsck Fehler in gepacktem Objekt" -#: builtin/index-pack.c:838 +#: builtin/index-pack.c:846 #, c-format msgid "Not all child objects of %s are reachable" msgstr "Nicht alle Kind-Objekte von %s sind erreichbar" -#: builtin/index-pack.c:910 builtin/index-pack.c:941 +#: builtin/index-pack.c:918 builtin/index-pack.c:949 msgid "failed to apply delta" msgstr "Konnte Dateiunterschied nicht anwenden" -#: builtin/index-pack.c:1109 +#: builtin/index-pack.c:1117 msgid "Receiving objects" msgstr "Empfange Objekte" -#: builtin/index-pack.c:1109 +#: builtin/index-pack.c:1117 msgid "Indexing objects" msgstr "Indiziere Objekte" -#: builtin/index-pack.c:1143 +#: builtin/index-pack.c:1151 msgid "pack is corrupted (SHA1 mismatch)" msgstr "Paket ist beschädigt (SHA1 unterschiedlich)" -#: builtin/index-pack.c:1148 +#: builtin/index-pack.c:1156 msgid "cannot fstat packfile" msgstr "kann Paketdatei nicht lesen" -#: builtin/index-pack.c:1151 +#: builtin/index-pack.c:1159 msgid "pack has junk at the end" msgstr "Paketende enthält nicht verwendbaren Inhalt" -#: builtin/index-pack.c:1163 +#: builtin/index-pack.c:1171 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "Fehler beim Ausführen von \"parse_pack_objects()\"" -#: builtin/index-pack.c:1186 +#: builtin/index-pack.c:1194 msgid "Resolving deltas" msgstr "Löse Unterschiede auf" -#: builtin/index-pack.c:1196 builtin/pack-objects.c:2486 +#: builtin/index-pack.c:1204 builtin/pack-objects.c:2489 #, c-format msgid "unable to create thread: %s" msgstr "kann Thread nicht erzeugen: %s" -#: builtin/index-pack.c:1237 +#: builtin/index-pack.c:1245 msgid "confusion beyond insanity" msgstr "Fehler beim Auflösen der Unterschiede" -#: builtin/index-pack.c:1243 +#: builtin/index-pack.c:1251 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" msgstr[0] "abgeschlossen mit %d lokalem Objekt" msgstr[1] "abgeschlossen mit %d lokalen Objekten" -#: builtin/index-pack.c:1255 +#: builtin/index-pack.c:1263 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "Unerwartete Prüfsumme für %s (Festplattenfehler?)" -#: builtin/index-pack.c:1259 +#: builtin/index-pack.c:1267 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "Paket hat %d unaufgelösten Unterschied" msgstr[1] "Paket hat %d unaufgelöste Unterschiede" -#: builtin/index-pack.c:1283 +#: builtin/index-pack.c:1291 #, c-format msgid "unable to deflate appended object (%d)" msgstr "Konnte angehängtes Objekt (%d) nicht komprimieren" -#: builtin/index-pack.c:1360 +#: builtin/index-pack.c:1368 #, c-format msgid "local object %s is corrupt" msgstr "lokales Objekt %s ist beschädigt" -#: builtin/index-pack.c:1374 +#: builtin/index-pack.c:1382 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "Name der Paketdatei '%s' endet nicht mit '.pack'" -#: builtin/index-pack.c:1399 +#: builtin/index-pack.c:1407 #, c-format msgid "cannot write %s file '%s'" msgstr "Kann %s Datei '%s' nicht schreiben." -#: builtin/index-pack.c:1407 +#: builtin/index-pack.c:1415 #, c-format msgid "cannot close written %s file '%s'" msgstr "Kann eben geschriebene %s Datei '%s' nicht schließen." -#: builtin/index-pack.c:1431 +#: builtin/index-pack.c:1439 msgid "error while closing pack file" msgstr "Fehler beim Schließen der Paketdatei" -#: builtin/index-pack.c:1445 +#: builtin/index-pack.c:1453 msgid "cannot store pack file" msgstr "Kann Paketdatei nicht speichern" -#: builtin/index-pack.c:1453 +#: builtin/index-pack.c:1461 msgid "cannot store index file" msgstr "Kann Indexdatei nicht speichern" -#: builtin/index-pack.c:1497 builtin/pack-objects.c:2725 +#: builtin/index-pack.c:1505 builtin/pack-objects.c:2728 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "\"pack.indexversion=%<PRIu32>\" ist ungültig" -#: builtin/index-pack.c:1565 +#: builtin/index-pack.c:1573 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Kann existierende Paketdatei '%s' nicht öffnen" -#: builtin/index-pack.c:1567 +#: builtin/index-pack.c:1575 #, 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:1615 +#: builtin/index-pack.c:1623 #, 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:1622 +#: builtin/index-pack.c:1630 #, 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:1659 +#: builtin/index-pack.c:1667 msgid "Cannot come back to cwd" msgstr "Kann nicht zurück zum Arbeitsverzeichnis wechseln" -#: builtin/index-pack.c:1708 builtin/index-pack.c:1711 -#: builtin/index-pack.c:1727 builtin/index-pack.c:1731 +#: builtin/index-pack.c:1716 builtin/index-pack.c:1719 +#: builtin/index-pack.c:1735 builtin/index-pack.c:1739 #, c-format msgid "bad %s" msgstr "%s ist ungültig" -#: builtin/index-pack.c:1747 +#: builtin/index-pack.c:1755 msgid "--fix-thin cannot be used without --stdin" msgstr "Die Option --fix-thin kann nicht ohne --stdin verwendet werden." -#: builtin/index-pack.c:1749 +#: builtin/index-pack.c:1757 msgid "--stdin requires a git repository" msgstr "--stdin erfordert ein Git-Repository" -#: builtin/index-pack.c:1755 +#: builtin/index-pack.c:1763 msgid "--verify with no packfile name given" msgstr "Die Option --verify wurde ohne Namen der Paketdatei angegeben." -#: builtin/index-pack.c:1803 builtin/unpack-objects.c:580 +#: builtin/index-pack.c:1811 builtin/unpack-objects.c:580 msgid "fsck error in pack objects" msgstr "fsck Fehler beim Packen von Objekten" @@ -13199,42 +14023,42 @@ msgstr "Keine Vorlagen in %s gefunden." msgid "not copying templates from '%s': %s" msgstr "kopiere keine Vorlagen von '%s': %s" -#: builtin/init-db.c:329 +#: builtin/init-db.c:334 #, c-format msgid "unable to handle file type %d" msgstr "kann nicht mit Dateityp %d umgehen" -#: builtin/init-db.c:332 +#: builtin/init-db.c:337 #, c-format msgid "unable to move %s to %s" msgstr "Konnte %s nicht nach %s verschieben" -#: builtin/init-db.c:349 builtin/init-db.c:352 +#: builtin/init-db.c:354 builtin/init-db.c:357 #, c-format msgid "%s already exists" msgstr "%s existiert bereits" -#: builtin/init-db.c:405 +#: builtin/init-db.c:413 #, c-format msgid "Reinitialized existing shared Git repository in %s%s\n" msgstr "Bestehendes verteiltes Git-Repository in %s%s neuinitialisiert\n" -#: builtin/init-db.c:406 +#: builtin/init-db.c:414 #, c-format msgid "Reinitialized existing Git repository in %s%s\n" msgstr "Bestehendes Git-Repository in %s%s neuinitialisiert\n" -#: builtin/init-db.c:410 +#: builtin/init-db.c:418 #, c-format msgid "Initialized empty shared Git repository in %s%s\n" msgstr "Leeres verteiltes Git-Repository in %s%s initialisiert\n" -#: builtin/init-db.c:411 +#: builtin/init-db.c:419 #, c-format msgid "Initialized empty Git repository in %s%s\n" msgstr "Leeres Git-Repository in %s%s initialisiert\n" -#: builtin/init-db.c:460 +#: builtin/init-db.c:468 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" @@ -13242,25 +14066,25 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=<Vorlagenverzeichnis>] [--" "shared[=<Berechtigungen>]] [<Verzeichnis>]" -#: builtin/init-db.c:483 +#: builtin/init-db.c:491 msgid "permissions" msgstr "Berechtigungen" -#: builtin/init-db.c:484 +#: builtin/init-db.c:492 msgid "specify that the git repository is to be shared amongst several users" msgstr "angeben, dass das Git-Repository mit mehreren Benutzern geteilt wird" -#: builtin/init-db.c:518 builtin/init-db.c:523 +#: builtin/init-db.c:526 builtin/init-db.c:531 #, c-format msgid "cannot mkdir %s" msgstr "kann Verzeichnis %s nicht erstellen" -#: builtin/init-db.c:527 +#: builtin/init-db.c:535 #, c-format msgid "cannot chdir to %s" msgstr "kann nicht in Verzeichnis %s wechseln" -#: builtin/init-db.c:548 +#: builtin/init-db.c:556 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" @@ -13269,7 +14093,7 @@ msgstr "" "%s (oder --work-tree=<Verzeichnis>) nicht erlaubt ohne Spezifizierung von %s " "(oder --git-dir=<Verzeichnis>)" -#: builtin/init-db.c:576 +#: builtin/init-db.c:584 #, c-format msgid "Cannot access work tree '%s'" msgstr "Kann nicht auf Arbeitsverzeichnis '%s' zugreifen." @@ -13348,397 +14172,393 @@ msgstr "git log [<Optionen>] [<Commitbereich>] [[--] <Pfad>...]" msgid "git show [<options>] <object>..." msgstr "git show [<Optionen>] <Objekt>..." -#: builtin/log.c:100 +#: builtin/log.c:104 #, c-format msgid "invalid --decorate option: %s" msgstr "Ungültige Option für --decorate: %s" -#: builtin/log.c:163 -msgid "suppress diff output" -msgstr "Ausgabe der Unterschiede unterdrücken" - -#: builtin/log.c:164 +#: builtin/log.c:168 msgid "show source" msgstr "Quelle anzeigen" -#: builtin/log.c:165 +#: builtin/log.c:169 msgid "Use mail map file" msgstr "\"mailmap\"-Datei verwenden" -#: builtin/log.c:167 +#: builtin/log.c:171 msgid "only decorate refs that match <pattern>" msgstr "\"decorate\" nur bei Referenzen anwenden, die <Muster> entsprechen" -#: builtin/log.c:169 +#: builtin/log.c:173 msgid "do not decorate refs that match <pattern>" msgstr "\"decorate\" nicht bei Referenzen anwenden, die <Muster> entsprechen" -#: builtin/log.c:170 +#: builtin/log.c:174 msgid "decorate options" msgstr "decorate-Optionen" -#: builtin/log.c:173 +#: builtin/log.c:177 msgid "Process line range n,m in file, counting from 1" msgstr "Verarbeitet nur Zeilen im Bereich n,m in der Datei, gezählt von 1" -#: builtin/log.c:271 +#: builtin/log.c:275 #, c-format msgid "Final output: %d %s\n" msgstr "letzte Ausgabe: %d %s\n" -#: builtin/log.c:525 +#: builtin/log.c:529 #, c-format msgid "git show %s: bad file" msgstr "git show %s: ungültige Datei" -#: builtin/log.c:540 builtin/log.c:634 +#: builtin/log.c:544 builtin/log.c:638 #, c-format -msgid "Could not read object %s" -msgstr "Kann Objekt %s nicht lesen." +msgid "could not read object %s" +msgstr "Konnte Objekt %s nicht lesen." -#: builtin/log.c:659 +#: builtin/log.c:663 #, c-format -msgid "Unknown type: %d" +msgid "unknown type: %d" msgstr "Unbekannter Typ: %d" -#: builtin/log.c:780 +#: builtin/log.c:784 msgid "format.headers without value" msgstr "format.headers ohne Wert" -#: builtin/log.c:881 +#: builtin/log.c:885 msgid "name of output directory is too long" msgstr "Name des Ausgabeverzeichnisses ist zu lang." -#: builtin/log.c:897 +#: builtin/log.c:901 #, c-format -msgid "Cannot open patch file %s" +msgid "cannot open patch file %s" msgstr "Kann Patch-Datei %s nicht öffnen" -#: builtin/log.c:914 -msgid "Need exactly one range." +#: builtin/log.c:918 +msgid "need exactly one range" msgstr "Brauche genau einen Commit-Bereich." -#: builtin/log.c:924 -msgid "Not a range." +#: builtin/log.c:928 +msgid "not a range" msgstr "Kein Commit-Bereich." -#: builtin/log.c:1047 -msgid "Cover letter needs email format" +#: builtin/log.c:1051 +msgid "cover letter needs email format" msgstr "Anschreiben benötigt E-Mail-Format" -#: builtin/log.c:1132 +#: builtin/log.c:1057 +msgid "failed to create cover-letter file" +msgstr "Fehler beim Erstellen der Datei für das Anschreiben." + +#: builtin/log.c:1136 #, c-format msgid "insane in-reply-to: %s" msgstr "ungültiges in-reply-to: %s" -#: builtin/log.c:1159 +#: builtin/log.c:1163 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<Optionen>] [<seit> | <Commitbereich>]" -#: builtin/log.c:1217 -msgid "Two output directories?" +#: builtin/log.c:1221 +msgid "two output directories?" msgstr "Zwei Ausgabeverzeichnisse?" -#: builtin/log.c:1324 builtin/log.c:2068 builtin/log.c:2070 builtin/log.c:2082 +#: builtin/log.c:1332 builtin/log.c:2076 builtin/log.c:2078 builtin/log.c:2090 #, c-format -msgid "Unknown commit %s" +msgid "unknown commit %s" msgstr "Unbekannter Commit %s" -#: builtin/log.c:1334 builtin/notes.c:897 builtin/tag.c:526 +#: builtin/log.c:1342 builtin/replace.c:58 builtin/replace.c:207 +#: builtin/replace.c:210 #, c-format -msgid "Failed to resolve '%s' as a valid ref." +msgid "failed to resolve '%s' as a valid ref" msgstr "Konnte '%s' nicht als gültige Referenz auflösen." -#: builtin/log.c:1339 -msgid "Could not find exact merge base." +#: builtin/log.c:1347 +msgid "could not find exact merge base" msgstr "Konnte keine exakte Merge-Basis finden." -#: builtin/log.c:1343 +#: builtin/log.c:1351 msgid "" -"Failed to get upstream, if you want to record base commit automatically,\n" +"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." +"Or you could specify base commit by --base=<base-commit-id> manually" msgstr "" "Fehler beim Bestimmen des Upstream-Branches. Wenn Sie den Basis-Commit\n" "automatisch speichern lassen möchten, benutzen Sie bitte\n" "'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:1363 -msgid "Failed to find exact merge base" +#: builtin/log.c:1371 +msgid "failed to find exact merge base" msgstr "Fehler beim Finden einer exakten Merge-Basis." -#: builtin/log.c:1374 +#: builtin/log.c:1382 msgid "base commit should be the ancestor of revision list" msgstr "Basis-Commit sollte der Vorgänger der Revisionsliste sein." -#: builtin/log.c:1378 +#: builtin/log.c:1386 msgid "base commit shouldn't be in revision list" msgstr "Basis-Commit sollte nicht in der Revisionsliste enthalten sein." -#: builtin/log.c:1431 +#: builtin/log.c:1439 msgid "cannot get patch id" msgstr "kann Patch-Id nicht lesen" -#: builtin/log.c:1483 +#: builtin/log.c:1491 msgid "failed to infer range-diff ranges" msgstr "Fehler beim Ableiten des range-diff-Bereichs." -#: builtin/log.c:1528 +#: builtin/log.c:1536 msgid "use [PATCH n/m] even with a single patch" msgstr "[PATCH n/m] auch mit einzelnem Patch verwenden" -#: builtin/log.c:1531 +#: builtin/log.c:1539 msgid "use [PATCH] even with multiple patches" msgstr "[PATCH] auch mit mehreren Patches verwenden" -#: builtin/log.c:1535 +#: builtin/log.c:1543 msgid "print patches to standard out" msgstr "Ausgabe der Patches in Standard-Ausgabe" -#: builtin/log.c:1537 +#: builtin/log.c:1545 msgid "generate a cover letter" msgstr "ein Deckblatt erzeugen" -#: builtin/log.c:1539 +#: builtin/log.c:1547 msgid "use simple number sequence for output file names" msgstr "einfache Nummernfolge für die Namen der Ausgabedateien verwenden" -#: builtin/log.c:1540 +#: builtin/log.c:1548 msgid "sfx" msgstr "Dateiendung" -#: builtin/log.c:1541 +#: builtin/log.c:1549 msgid "use <sfx> instead of '.patch'" msgstr "<Dateiendung> anstatt '.patch' verwenden" -#: builtin/log.c:1543 +#: builtin/log.c:1551 msgid "start numbering patches at <n> instead of 1" msgstr "die Nummerierung der Patches bei <n> anstatt bei 1 beginnen" -#: builtin/log.c:1545 +#: builtin/log.c:1553 msgid "mark the series as Nth re-roll" msgstr "die Serie als n-te Fassung kennzeichnen" -#: builtin/log.c:1547 +#: builtin/log.c:1555 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "[RFC PATCH] anstatt [PATCH] verwenden" -#: builtin/log.c:1550 +#: builtin/log.c:1558 msgid "Use [<prefix>] instead of [PATCH]" msgstr "[<Präfix>] anstatt [PATCH] verwenden" -#: builtin/log.c:1553 +#: builtin/log.c:1561 msgid "store resulting files in <dir>" msgstr "erzeugte Dateien in <Verzeichnis> speichern" -#: builtin/log.c:1556 +#: builtin/log.c:1564 msgid "don't strip/add [PATCH]" msgstr "[PATCH] nicht entfernen/hinzufügen" -#: builtin/log.c:1559 +#: builtin/log.c:1567 msgid "don't output binary diffs" msgstr "keine binären Unterschiede ausgeben" -#: builtin/log.c:1561 +#: builtin/log.c:1569 msgid "output all-zero hash in From header" msgstr "Hash mit Nullen in \"From\"-Header ausgeben" -#: builtin/log.c:1563 +#: builtin/log.c:1571 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:1565 +#: builtin/log.c:1573 msgid "show patch format instead of default (patch + stat)" msgstr "Patchformat anstatt des Standards anzeigen (Patch + Zusammenfassung)" -#: builtin/log.c:1567 +#: builtin/log.c:1575 msgid "Messaging" msgstr "E-Mail-Einstellungen" -#: builtin/log.c:1568 +#: builtin/log.c:1576 msgid "header" msgstr "Header" -#: builtin/log.c:1569 +#: builtin/log.c:1577 msgid "add email header" msgstr "E-Mail-Header hinzufügen" -#: builtin/log.c:1570 builtin/log.c:1572 +#: builtin/log.c:1578 builtin/log.c:1580 msgid "email" msgstr "E-Mail" -#: builtin/log.c:1570 +#: builtin/log.c:1578 msgid "add To: header" msgstr "\"To:\"-Header hinzufügen" -#: builtin/log.c:1572 +#: builtin/log.c:1580 msgid "add Cc: header" msgstr "\"Cc:\"-Header hinzufügen" -#: builtin/log.c:1574 +#: builtin/log.c:1582 msgid "ident" msgstr "Ident" -#: builtin/log.c:1575 +#: builtin/log.c:1583 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:1577 +#: builtin/log.c:1585 msgid "message-id" msgstr "message-id" -#: builtin/log.c:1578 +#: builtin/log.c:1586 msgid "make first mail a reply to <message-id>" msgstr "aus erster E-Mail eine Antwort zu <message-id> machen" -#: builtin/log.c:1579 builtin/log.c:1582 +#: builtin/log.c:1587 builtin/log.c:1590 msgid "boundary" msgstr "Grenze" -#: builtin/log.c:1580 +#: builtin/log.c:1588 msgid "attach the patch" msgstr "den Patch anhängen" -#: builtin/log.c:1583 +#: builtin/log.c:1591 msgid "inline the patch" msgstr "den Patch direkt in die Nachricht einfügen" -#: builtin/log.c:1587 +#: builtin/log.c:1595 msgid "enable message threading, styles: shallow, deep" msgstr "Nachrichtenverkettung aktivieren, Stile: shallow, deep" -#: builtin/log.c:1589 +#: builtin/log.c:1597 msgid "signature" msgstr "Signatur" -#: builtin/log.c:1590 +#: builtin/log.c:1598 msgid "add a signature" msgstr "eine Signatur hinzufügen" -#: builtin/log.c:1591 +#: builtin/log.c:1599 msgid "base-commit" msgstr "Basis-Commit" -#: builtin/log.c:1592 +#: builtin/log.c:1600 msgid "add prerequisite tree info to the patch series" msgstr "erforderliche Revisions-Informationen der Patch-Serie hinzufügen" -#: builtin/log.c:1594 +#: builtin/log.c:1602 msgid "add a signature from a file" msgstr "eine Signatur aus einer Datei hinzufügen" -#: builtin/log.c:1595 +#: builtin/log.c:1603 msgid "don't print the patch filenames" msgstr "keine Dateinamen der Patches anzeigen" -#: builtin/log.c:1597 +#: builtin/log.c:1605 msgid "show progress while generating patches" msgstr "Forschrittsanzeige während der Erzeugung der Patches" -#: builtin/log.c:1598 +#: builtin/log.c:1606 msgid "rev" msgstr "Commit" -#: builtin/log.c:1599 +#: builtin/log.c:1607 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:1602 +#: builtin/log.c:1610 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:1604 +#: builtin/log.c:1612 msgid "percentage by which creation is weighted" msgstr "Prozentsatz mit welchem Erzeugung gewichtet wird" -#: builtin/log.c:1679 +#: builtin/log.c:1687 #, c-format msgid "invalid ident line: %s" msgstr "Ungültige Identifikationszeile: %s" -#: builtin/log.c:1694 +#: builtin/log.c:1702 msgid "-n and -k are mutually exclusive" msgstr "-n und -k schließen sich gegenseitig aus." -#: builtin/log.c:1696 +#: builtin/log.c:1704 msgid "--subject-prefix/--rfc and -k are mutually exclusive" msgstr "--subject-prefix/--rfc und -k schließen sich gegenseitig aus." -#: builtin/log.c:1704 +#: builtin/log.c:1712 msgid "--name-only does not make sense" msgstr "Die Option --name-only kann nicht verwendet werden." -#: builtin/log.c:1706 +#: builtin/log.c:1714 msgid "--name-status does not make sense" msgstr "Die Option --name-status kann nicht verwendet werden." -#: builtin/log.c:1708 +#: builtin/log.c:1716 msgid "--check does not make sense" msgstr "Die Option --check kann nicht verwendet werden." -#: builtin/log.c:1740 +#: builtin/log.c:1748 msgid "standard output, or directory, which one?" msgstr "Standard-Ausgabe oder Verzeichnis, welches von beidem?" -#: builtin/log.c:1742 -#, c-format -msgid "Could not create directory '%s'" -msgstr "Konnte Verzeichnis '%s' nicht erstellen." - -#: builtin/log.c:1829 +#: builtin/log.c:1837 msgid "--interdiff requires --cover-letter or single patch" msgstr "--interdiff erfordert --cover-letter oder einzelnen Patch." -#: builtin/log.c:1833 +#: builtin/log.c:1841 msgid "Interdiff:" msgstr "Interdiff:" -#: builtin/log.c:1834 +#: builtin/log.c:1842 #, c-format msgid "Interdiff against v%d:" msgstr "Interdiff gegen v%d:" -#: builtin/log.c:1840 +#: builtin/log.c:1848 msgid "--creation-factor requires --range-diff" msgstr "--creation-factor erfordert --range-diff" -#: builtin/log.c:1844 +#: builtin/log.c:1852 msgid "--range-diff requires --cover-letter or single patch" msgstr "--range-diff erfordert --cover-letter oder einzelnen Patch." -#: builtin/log.c:1852 +#: builtin/log.c:1860 msgid "Range-diff:" msgstr "Range-Diff:" -#: builtin/log.c:1853 +#: builtin/log.c:1861 #, c-format msgid "Range-diff against v%d:" msgstr "Range-Diff gegen v%d:" -#: builtin/log.c:1864 +#: builtin/log.c:1872 #, c-format msgid "unable to read signature file '%s'" msgstr "Konnte Signatur-Datei '%s' nicht lesen" -#: builtin/log.c:1900 +#: builtin/log.c:1908 msgid "Generating patches" msgstr "Erzeuge Patches" -#: builtin/log.c:1944 -msgid "Failed to create output files" +#: builtin/log.c:1952 +msgid "failed to create output files" msgstr "Fehler beim Erstellen der Ausgabedateien." -#: builtin/log.c:2003 +#: builtin/log.c:2011 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<Upstream> [<Branch> [<Limit>]]]" -#: builtin/log.c:2057 +#: builtin/log.c:2065 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -13869,7 +14689,7 @@ msgstr "" 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:1111 +#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1458 msgid "exec" msgstr "Programm" @@ -13893,13 +14713,13 @@ msgstr "keine Tags anzeigen, die andere Tags enthalten" msgid "take url.<base>.insteadOf into account" msgstr "url.<Basis>.insteadOf berücksichtigen" -#: builtin/ls-remote.c:73 +#: builtin/ls-remote.c:72 msgid "exit with exit code 2 if no matching refs are found" msgstr "" "mit Rückkehrwert 2 beenden, wenn keine übereinstimmenden Referenzen\n" "gefunden wurden" -#: builtin/ls-remote.c:76 +#: builtin/ls-remote.c:75 msgid "show underlying ref in addition to the object pointed by it" msgstr "zusätzlich zum Objekt die darauf verweisenden Referenzen anzeigen" @@ -13946,270 +14766,278 @@ msgstr "" msgid "empty mbox: '%s'" msgstr "Leere mbox: '%s'" -#: builtin/merge.c:53 +#: builtin/merge.c:54 msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<Optionen>] [<Commit>...]" -#: builtin/merge.c:54 +#: builtin/merge.c:55 msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:55 +#: builtin/merge.c:56 msgid "git merge --continue" msgstr "git merge --continue" -#: builtin/merge.c:112 +#: builtin/merge.c:116 msgid "switch `m' requires a value" msgstr "Schalter 'm' erfordert einen Wert." -#: builtin/merge.c:132 +#: builtin/merge.c:139 #, c-format msgid "option `%s' requires a value" msgstr "Option `%s' erfordert einen Wert." -#: builtin/merge.c:178 +#: builtin/merge.c:185 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "Konnte Merge-Strategie '%s' nicht finden.\n" -#: builtin/merge.c:179 +#: builtin/merge.c:186 #, c-format msgid "Available strategies are:" msgstr "Verfügbare Strategien sind:" -#: builtin/merge.c:184 +#: builtin/merge.c:191 #, c-format msgid "Available custom strategies are:" msgstr "Verfügbare benutzerdefinierte Strategien sind:" -#: builtin/merge.c:235 builtin/pull.c:144 +#: builtin/merge.c:242 builtin/pull.c:150 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:238 builtin/pull.c:147 +#: builtin/merge.c:245 builtin/pull.c:153 msgid "show a diffstat at the end of the merge" msgstr "eine Zusammenfassung der Unterschiede am Schluss des Merges anzeigen" -#: builtin/merge.c:239 builtin/pull.c:150 +#: builtin/merge.c:246 builtin/pull.c:156 msgid "(synonym to --stat)" msgstr "(Synonym für --stat)" -#: builtin/merge.c:241 builtin/pull.c:153 +#: builtin/merge.c:248 builtin/pull.c:159 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:244 builtin/pull.c:159 +#: builtin/merge.c:251 builtin/pull.c:165 msgid "create a single commit instead of doing a merge" msgstr "einen einzelnen Commit anstatt eines Merges erzeugen" -#: builtin/merge.c:246 builtin/pull.c:162 +#: builtin/merge.c:253 builtin/pull.c:168 msgid "perform a commit if the merge succeeds (default)" msgstr "einen Commit durchführen, wenn der Merge erfolgreich war (Standard)" -#: builtin/merge.c:248 builtin/pull.c:165 +#: builtin/merge.c:255 builtin/pull.c:171 msgid "edit message before committing" msgstr "Bearbeitung der Beschreibung vor dem Commit" -#: builtin/merge.c:249 +#: builtin/merge.c:257 msgid "allow fast-forward (default)" msgstr "Vorspulen erlauben (Standard)" -#: builtin/merge.c:251 builtin/pull.c:171 +#: builtin/merge.c:259 builtin/pull.c:178 msgid "abort if fast-forward is not possible" msgstr "abbrechen, wenn kein Vorspulen möglich ist" -#: builtin/merge.c:255 builtin/pull.c:174 +#: builtin/merge.c:263 builtin/pull.c:181 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:256 builtin/notes.c:787 builtin/pull.c:178 -#: builtin/rebase.c:1124 builtin/rebase--interactive.c:188 builtin/revert.c:111 +#: builtin/merge.c:264 builtin/notes.c:787 builtin/pull.c:185 +#: builtin/rebase.c:492 builtin/rebase.c:1471 builtin/revert.c:113 msgid "strategy" msgstr "Strategie" -#: builtin/merge.c:257 builtin/pull.c:179 +#: builtin/merge.c:265 builtin/pull.c:186 msgid "merge strategy to use" msgstr "zu verwendende Merge-Strategie" -#: builtin/merge.c:258 builtin/pull.c:182 +#: builtin/merge.c:266 builtin/pull.c:189 msgid "option=value" msgstr "Option=Wert" -#: builtin/merge.c:259 builtin/pull.c:183 +#: builtin/merge.c:267 builtin/pull.c:190 msgid "option for selected merge strategy" msgstr "Option für ausgewählte Merge-Strategie" -#: builtin/merge.c:261 +#: builtin/merge.c:269 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:268 +#: builtin/merge.c:276 msgid "abort the current in-progress merge" msgstr "den sich im Gange befindlichen Merge abbrechen" -#: builtin/merge.c:270 +#: builtin/merge.c:278 msgid "continue the current in-progress merge" msgstr "den sich im Gange befindlichen Merge fortsetzen" -#: builtin/merge.c:272 builtin/pull.c:190 +#: builtin/merge.c:280 builtin/pull.c:197 msgid "allow merging unrelated histories" msgstr "erlaube das Zusammenführen von nicht zusammenhängenden Historien" -#: builtin/merge.c:278 +#: builtin/merge.c:286 msgid "verify commit-msg hook" msgstr "commit-msg Hook überprüfen" -#: builtin/merge.c:303 +#: builtin/merge.c:311 msgid "could not run stash." msgstr "Konnte \"stash\" nicht ausführen." -#: builtin/merge.c:308 +#: builtin/merge.c:316 msgid "stash failed" msgstr "\"stash\" fehlgeschlagen" -#: builtin/merge.c:313 +#: builtin/merge.c:321 #, c-format msgid "not a valid object: %s" msgstr "kein gültiges Objekt: %s" -#: builtin/merge.c:335 builtin/merge.c:352 +#: builtin/merge.c:343 builtin/merge.c:360 msgid "read-tree failed" msgstr "read-tree fehlgeschlagen" -#: builtin/merge.c:382 +#: builtin/merge.c:390 msgid " (nothing to squash)" msgstr " (nichts zu quetschen)" -#: builtin/merge.c:393 +#: builtin/merge.c:401 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Quetsche Commit -- HEAD wird nicht aktualisiert\n" -#: builtin/merge.c:443 +#: builtin/merge.c:451 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "Keine Merge-Commit-Beschreibung -- HEAD wird nicht aktualisiert\n" -#: builtin/merge.c:494 +#: builtin/merge.c:502 #, c-format msgid "'%s' does not point to a commit" msgstr "'%s' zeigt auf keinen Commit" -#: builtin/merge.c:581 +#: builtin/merge.c:589 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Ungültiger branch.%s.mergeoptions String: %s" -#: builtin/merge.c:702 +#: builtin/merge.c:712 msgid "Not handling anything other than two heads merge." msgstr "Es wird nur der Merge von zwei Branches behandelt." -#: builtin/merge.c:716 +#: builtin/merge.c:726 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Unbekannte Option für merge-recursive: -X%s" -#: builtin/merge.c:731 +#: builtin/merge.c:741 #, c-format msgid "unable to write %s" msgstr "konnte %s nicht schreiben" -#: builtin/merge.c:783 +#: builtin/merge.c:793 #, c-format msgid "Could not read from '%s'" msgstr "konnte nicht von '%s' lesen" -#: builtin/merge.c:792 +#: builtin/merge.c:802 #, 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:798 -#, c-format +#: builtin/merge.c:808 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" -"Lines starting with '%c' will be ignored, and an empty message aborts\n" -"the commit.\n" msgstr "" "Bitte geben Sie eine Commit-Beschreibung ein, um zu erklären, warum dieser\n" "Merge erforderlich ist, insbesondere wenn es einen aktualisierten\n" "Upstream-Branch mit einem Thema-Branch zusammenführt.\n" "\n" -"Zeilen beginnend mit '%c' werden ignoriert, und eine leere Beschreibung\n" -"bricht den Commit ab.\n" -#: builtin/merge.c:834 +#: builtin/merge.c:813 +msgid "An empty message aborts the commit.\n" +msgstr "Eine leere Commit-Beschreibung bricht den Commit ab.\n" + +#: builtin/merge.c:816 +#, c-format +msgid "" +"Lines starting with '%c' will be ignored, and an empty message aborts\n" +"the commit.\n" +msgstr "" +"Zeilen, die mit '%c' beginnen, werden ignoriert,\n" +"und eine leere Beschreibung bricht den Commit ab.\n" + +#: builtin/merge.c:857 msgid "Empty commit message." msgstr "Leere Commit-Beschreibung" -#: builtin/merge.c:853 +#: builtin/merge.c:876 #, c-format msgid "Wonderful.\n" msgstr "Wunderbar.\n" -#: builtin/merge.c:906 +#: builtin/merge.c:936 #, 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:945 +#: builtin/merge.c:975 msgid "No current branch." msgstr "Sie befinden sich auf keinem Branch." -#: builtin/merge.c:947 +#: builtin/merge.c:977 msgid "No remote for the current branch." msgstr "Kein Remote-Repository für den aktuellen Branch." -#: builtin/merge.c:949 +#: builtin/merge.c:979 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:954 +#: builtin/merge.c:984 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "Kein Remote-Tracking-Branch für %s von %s" -#: builtin/merge.c:1011 +#: builtin/merge.c:1041 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Fehlerhafter Wert '%s' in Umgebungsvariable '%s'" -#: builtin/merge.c:1114 +#: builtin/merge.c:1144 #, 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:1148 +#: builtin/merge.c:1178 msgid "not something we can merge" msgstr "nichts was wir zusammenführen können" -#: builtin/merge.c:1251 +#: builtin/merge.c:1281 msgid "--abort expects no arguments" msgstr "--abort akzeptiert keine Argumente" -#: builtin/merge.c:1255 +#: builtin/merge.c:1285 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "Es gibt keinen Merge abzubrechen (MERGE_HEAD fehlt)" -#: builtin/merge.c:1267 +#: builtin/merge.c:1297 msgid "--continue expects no arguments" msgstr "--continue erwartet keine Argumente" -#: builtin/merge.c:1271 +#: builtin/merge.c:1301 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "Es ist kein Merge im Gange (MERGE_HEAD fehlt)." -#: builtin/merge.c:1287 +#: builtin/merge.c:1317 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -14217,7 +15045,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:1294 +#: builtin/merge.c:1324 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -14225,96 +15053,96 @@ 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:1297 +#: builtin/merge.c:1327 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:1306 +#: builtin/merge.c:1341 msgid "You cannot combine --squash with --no-ff." msgstr "Sie können --squash nicht mit --no-ff kombinieren." -#: builtin/merge.c:1314 +#: builtin/merge.c:1349 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "Kein Commit angegeben und merge.defaultToUpstream ist nicht gesetzt." -#: builtin/merge.c:1331 +#: builtin/merge.c:1366 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:1333 +#: builtin/merge.c:1368 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:1338 +#: builtin/merge.c:1373 #, c-format msgid "%s - not something we can merge" msgstr "%s - nichts was wir zusammenführen können" -#: builtin/merge.c:1340 +#: builtin/merge.c:1375 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:1422 +#: builtin/merge.c:1454 msgid "refusing to merge unrelated histories" msgstr "Verweigere den Merge von nicht zusammenhängenden Historien." -#: builtin/merge.c:1431 +#: builtin/merge.c:1463 msgid "Already up to date." msgstr "Bereits aktuell." -#: builtin/merge.c:1441 +#: builtin/merge.c:1473 #, c-format msgid "Updating %s..%s\n" msgstr "Aktualisiere %s..%s\n" -#: builtin/merge.c:1483 +#: builtin/merge.c:1515 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Probiere wirklich trivialen \"in-index\"-Merge ...\n" -#: builtin/merge.c:1490 +#: builtin/merge.c:1522 #, c-format msgid "Nope.\n" msgstr "Nein.\n" -#: builtin/merge.c:1515 +#: builtin/merge.c:1547 msgid "Already up to date. Yeeah!" msgstr "Bereits aktuell." -#: builtin/merge.c:1521 +#: builtin/merge.c:1553 msgid "Not possible to fast-forward, aborting." msgstr "Vorspulen nicht möglich, breche ab." -#: builtin/merge.c:1544 builtin/merge.c:1623 +#: builtin/merge.c:1576 builtin/merge.c:1655 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Rücklauf des Verzeichnisses bis zum Ursprung ...\n" -#: builtin/merge.c:1548 +#: builtin/merge.c:1580 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Probiere Merge-Strategie %s ...\n" -#: builtin/merge.c:1614 +#: builtin/merge.c:1646 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Keine Merge-Strategie behandelt diesen Merge.\n" -#: builtin/merge.c:1616 +#: builtin/merge.c:1648 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Merge mit Strategie %s fehlgeschlagen.\n" -#: builtin/merge.c:1625 +#: builtin/merge.c:1657 #, 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:1637 +#: builtin/merge.c:1669 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -14447,20 +15275,20 @@ msgstr "fehlende Objekte erlauben" msgid "allow creation of more than one tree" msgstr "die Erstellung von mehr als einem \"Tree\"-Objekt erlauben" -#: builtin/multi-pack-index.c:8 +#: builtin/multi-pack-index.c:9 msgid "git multi-pack-index [--object-dir=<dir>] (write|verify)" msgstr "git multi-pack-index [--object-dir=<Verzeichnis>] (write|verify)" -#: builtin/multi-pack-index.c:21 +#: builtin/multi-pack-index.c:22 msgid "object directory containing set of packfile and pack-index pairs" msgstr "" "Objekt-Verzeichnis, welches Paare von Packdateien und pack-index enthält" -#: builtin/multi-pack-index.c:39 +#: builtin/multi-pack-index.c:40 builtin/prune-packed.c:67 msgid "too many arguments" msgstr "Zu viele Argumente." -#: builtin/multi-pack-index.c:48 +#: builtin/multi-pack-index.c:51 #, c-format msgid "unrecognized verb: %s" msgstr "Nicht erkanntes Verb: %s" @@ -14555,7 +15383,7 @@ msgstr "%s, Quelle=%s, Ziel=%s" msgid "Renaming %s to %s\n" msgstr "Benenne %s nach %s um\n" -#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:513 +#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:516 #, c-format msgid "renaming '%s' failed" msgstr "Umbenennung von '%s' fehlgeschlagen" @@ -14572,35 +15400,35 @@ msgstr "git name-rev [<Optionen>] --all" msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [<Optionen>] --stdin" -#: builtin/name-rev.c:413 +#: builtin/name-rev.c:415 msgid "print only names (no SHA-1)" msgstr "nur Namen anzeigen (keine SHA-1)" -#: builtin/name-rev.c:414 +#: builtin/name-rev.c:416 msgid "only use tags to name the commits" msgstr "nur Tags verwenden, um die Commits zu benennen" -#: builtin/name-rev.c:416 +#: builtin/name-rev.c:418 msgid "only use refs matching <pattern>" msgstr "nur Referenzen verwenden, die <Muster> entsprechen" -#: builtin/name-rev.c:418 +#: builtin/name-rev.c:420 msgid "ignore refs matching <pattern>" msgstr "ignoriere Referenzen die <Muster> entsprechen" -#: builtin/name-rev.c:420 +#: builtin/name-rev.c:422 msgid "list all commits reachable from all refs" msgstr "alle Commits auflisten, die von allen Referenzen erreichbar sind" -#: builtin/name-rev.c:421 +#: builtin/name-rev.c:423 msgid "read from stdin" msgstr "von der Standard-Eingabe lesen" -#: builtin/name-rev.c:422 +#: builtin/name-rev.c:424 msgid "allow to print `undefined` names (default)" msgstr "Ausgabe von `undefinierten` Namen erlauben (Standard)" -#: builtin/name-rev.c:428 +#: builtin/name-rev.c:430 msgid "dereference tags in the input (internal use)" msgstr "Tags in der Eingabe dereferenzieren (interne Verwendung)" @@ -14748,7 +15576,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:513 +#: builtin/notes.c:242 builtin/tag.c:522 #, c-format msgid "could not open or read '%s'" msgstr "konnte '%s' nicht öffnen oder lesen" @@ -14988,6 +15816,11 @@ msgstr "" "commit',\n" "oder brechen Sie den Merge mit 'git notes merge --abort' ab.\n" +#: builtin/notes.c:897 builtin/tag.c:535 +#, c-format +msgid "Failed to resolve '%s' as a valid ref." +msgstr "Konnte '%s' nicht als gültige Referenz auflösen." + #: builtin/notes.c:900 #, c-format msgid "Object %s has no note\n" @@ -15001,7 +15834,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:108 builtin/worktree.c:165 +#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:165 msgid "do not remove, show only" msgstr "nicht löschen, nur anzeigen" @@ -15017,148 +15850,148 @@ msgstr "Notiz-Referenz" msgid "use notes from <notes-ref>" msgstr "Notizen von <Notiz-Referenz> verwenden" -#: builtin/notes.c:1034 +#: builtin/notes.c:1034 builtin/stash.c:1611 #, c-format msgid "unknown subcommand: %s" msgstr "Unbekannter Unterbefehl: %s" -#: builtin/pack-objects.c:51 +#: builtin/pack-objects.c:52 msgid "" "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" msgstr "" "git pack-objects --stdout [<Optionen>...] [< <Referenzliste> | < " "<Objektliste>]" -#: builtin/pack-objects.c:52 +#: builtin/pack-objects.c:53 msgid "" "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" msgstr "" "git pack-objects [<Optionen>...] <Basis-Name> [< <Referenzliste> | < " "<Objektliste>]" -#: builtin/pack-objects.c:423 +#: builtin/pack-objects.c:424 #, c-format msgid "bad packed object CRC for %s" msgstr "Ungültiges CRC für gepacktes Objekt %s." -#: builtin/pack-objects.c:434 +#: builtin/pack-objects.c:435 #, c-format msgid "corrupt packed object for %s" msgstr "Fehlerhaftes gepacktes Objekt für %s." -#: builtin/pack-objects.c:565 +#: builtin/pack-objects.c:566 #, c-format msgid "recursive delta detected for object %s" msgstr "Rekursiver Unterschied für Objekt %s festgestellt." -#: builtin/pack-objects.c:776 +#: builtin/pack-objects.c:777 #, c-format msgid "ordered %u objects, expected %<PRIu32>" msgstr "%u Objekte geordnet, %<PRIu32> erwartet." -#: builtin/pack-objects.c:789 +#: builtin/pack-objects.c:790 #, c-format msgid "packfile is invalid: %s" msgstr "Packdatei ist ungültig: %s" -#: builtin/pack-objects.c:793 +#: builtin/pack-objects.c:794 #, c-format msgid "unable to open packfile for reuse: %s" msgstr "Konnte Packdatei nicht zur Wiederverwendung öffnen: %s" -#: builtin/pack-objects.c:797 +#: builtin/pack-objects.c:798 msgid "unable to seek in reused packfile" msgstr "Konnte \"seek\" nicht in wiederverwendeter Packdatei ausführen." -#: builtin/pack-objects.c:808 +#: builtin/pack-objects.c:809 msgid "unable to read from reused packfile" msgstr "Konnte nicht von wiederverwendeter Packdatei lesen." -#: builtin/pack-objects.c:836 +#: builtin/pack-objects.c:837 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:849 +#: builtin/pack-objects.c:850 msgid "Writing objects" msgstr "Schreibe Objekte" -#: builtin/pack-objects.c:911 builtin/update-index.c:89 +#: builtin/pack-objects.c:912 builtin/update-index.c:89 #, c-format msgid "failed to stat %s" msgstr "Konnte '%s' nicht lesen" -#: builtin/pack-objects.c:964 +#: builtin/pack-objects.c:965 #, c-format msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" msgstr "Schrieb %<PRIu32> Objekte während %<PRIu32> erwartet waren." -#: builtin/pack-objects.c:1158 +#: builtin/pack-objects.c:1161 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:1586 +#: builtin/pack-objects.c:1589 #, 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:1595 +#: builtin/pack-objects.c:1598 #, 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:1864 +#: builtin/pack-objects.c:1867 msgid "Counting objects" msgstr "Zähle Objekte" -#: builtin/pack-objects.c:1994 +#: builtin/pack-objects.c:1997 #, c-format msgid "unable to get size of %s" msgstr "Konnte Größe von %s nicht bestimmen." -#: builtin/pack-objects.c:2009 +#: builtin/pack-objects.c:2012 #, c-format msgid "unable to parse object header of %s" msgstr "Konnte Kopfbereich von Objekt '%s' nicht parsen." -#: builtin/pack-objects.c:2079 builtin/pack-objects.c:2095 -#: builtin/pack-objects.c:2105 +#: builtin/pack-objects.c:2082 builtin/pack-objects.c:2098 +#: builtin/pack-objects.c:2108 #, c-format msgid "object %s cannot be read" msgstr "Objekt %s kann nicht gelesen werden." -#: builtin/pack-objects.c:2082 builtin/pack-objects.c:2109 +#: builtin/pack-objects.c:2085 builtin/pack-objects.c:2112 #, 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:2119 +#: builtin/pack-objects.c:2122 msgid "suboptimal pack - out of memory" msgstr "ungünstiges Packet - Speicher voll" -#: builtin/pack-objects.c:2445 +#: builtin/pack-objects.c:2448 #, c-format msgid "Delta compression using up to %d threads" msgstr "Delta-Kompression verwendet bis zu %d Threads." -#: builtin/pack-objects.c:2577 +#: builtin/pack-objects.c:2580 #, 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:2664 +#: builtin/pack-objects.c:2667 msgid "Compressing objects" msgstr "Komprimiere Objekte" -#: builtin/pack-objects.c:2670 +#: builtin/pack-objects.c:2673 msgid "inconsistency with delta count" msgstr "Inkonsistenz mit der Anzahl von Deltas" -#: builtin/pack-objects.c:2751 +#: builtin/pack-objects.c:2754 #, c-format msgid "" "expected edge object ID, got garbage:\n" @@ -15167,7 +16000,7 @@ msgstr "" "Erwartete Randobjekt-ID, erhielt nutzlose Daten:\n" " %s" -#: builtin/pack-objects.c:2757 +#: builtin/pack-objects.c:2760 #, c-format msgid "" "expected object ID, got garbage:\n" @@ -15176,267 +16009,267 @@ msgstr "" "Erwartete Objekt-ID, erhielt nutzlose Daten:\n" " %s" -#: builtin/pack-objects.c:2855 +#: builtin/pack-objects.c:2858 msgid "invalid value for --missing" msgstr "Ungültiger Wert für --missing." -#: builtin/pack-objects.c:2914 builtin/pack-objects.c:3022 +#: builtin/pack-objects.c:2917 builtin/pack-objects.c:3025 msgid "cannot open pack index" msgstr "Kann Paketindex nicht öffnen." -#: builtin/pack-objects.c:2945 +#: builtin/pack-objects.c:2948 #, c-format msgid "loose object at %s could not be examined" msgstr "Loses Objekt bei %s konnte nicht untersucht werden." -#: builtin/pack-objects.c:3030 +#: builtin/pack-objects.c:3033 msgid "unable to force loose object" msgstr "Konnte loses Objekt nicht erzwingen." -#: builtin/pack-objects.c:3122 +#: builtin/pack-objects.c:3125 #, c-format msgid "not a rev '%s'" msgstr "'%s' ist kein Commit." -#: builtin/pack-objects.c:3125 +#: builtin/pack-objects.c:3128 #, c-format msgid "bad revision '%s'" msgstr "Ungültiger Commit '%s'." -#: builtin/pack-objects.c:3150 +#: builtin/pack-objects.c:3153 msgid "unable to add recent objects" msgstr "Konnte jüngste Objekte nicht hinzufügen." -#: builtin/pack-objects.c:3203 +#: builtin/pack-objects.c:3206 #, c-format msgid "unsupported index version %s" msgstr "Nicht unterstützte Index-Version %s" -#: builtin/pack-objects.c:3207 +#: builtin/pack-objects.c:3210 #, c-format msgid "bad index version '%s'" msgstr "Ungültige Index-Version '%s'" -#: builtin/pack-objects.c:3237 +#: builtin/pack-objects.c:3240 msgid "do not show progress meter" msgstr "keine Fortschrittsanzeige anzeigen" -#: builtin/pack-objects.c:3239 +#: builtin/pack-objects.c:3242 msgid "show progress meter" msgstr "Fortschrittsanzeige anzeigen" -#: builtin/pack-objects.c:3241 +#: builtin/pack-objects.c:3244 msgid "show progress meter during object writing phase" msgstr "Forschrittsanzeige während des Schreibens von Objekten anzeigen" -#: builtin/pack-objects.c:3244 +#: builtin/pack-objects.c:3247 msgid "similar to --all-progress when progress meter is shown" msgstr "ähnlich zu --all-progress wenn Fortschrittsanzeige darstellt wird" -#: builtin/pack-objects.c:3245 +#: builtin/pack-objects.c:3248 msgid "<version>[,<offset>]" msgstr "<Version>[,<Offset>]" -#: builtin/pack-objects.c:3246 +#: builtin/pack-objects.c:3249 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:3249 +#: builtin/pack-objects.c:3252 msgid "maximum size of each output pack file" msgstr "maximale Größe für jede ausgegebene Paketdatei" -#: builtin/pack-objects.c:3251 +#: builtin/pack-objects.c:3254 msgid "ignore borrowed objects from alternate object store" msgstr "geliehene Objekte von alternativem Objektspeicher ignorieren" -#: builtin/pack-objects.c:3253 +#: builtin/pack-objects.c:3256 msgid "ignore packed objects" msgstr "gepackte Objekte ignorieren" -#: builtin/pack-objects.c:3255 +#: builtin/pack-objects.c:3258 msgid "limit pack window by objects" msgstr "Paketfenster durch Objekte begrenzen" -#: builtin/pack-objects.c:3257 +#: builtin/pack-objects.c:3260 msgid "limit pack window by memory in addition to object limit" msgstr "" "Paketfenster, zusätzlich zur Objektbegrenzung, durch Speicher begrenzen" -#: builtin/pack-objects.c:3259 +#: builtin/pack-objects.c:3262 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:3261 +#: builtin/pack-objects.c:3264 msgid "reuse existing deltas" msgstr "existierende Unterschiede wiederverwenden" -#: builtin/pack-objects.c:3263 +#: builtin/pack-objects.c:3266 msgid "reuse existing objects" msgstr "existierende Objekte wiederverwenden" -#: builtin/pack-objects.c:3265 +#: builtin/pack-objects.c:3268 msgid "use OFS_DELTA objects" msgstr "OFS_DELTA Objekte verwenden" -#: builtin/pack-objects.c:3267 +#: builtin/pack-objects.c:3270 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:3269 +#: builtin/pack-objects.c:3272 msgid "do not create an empty pack output" msgstr "keine leeren Pakete erzeugen" -#: builtin/pack-objects.c:3271 +#: builtin/pack-objects.c:3274 msgid "read revision arguments from standard input" msgstr "Argumente bezüglich Commits von der Standard-Eingabe lesen" -#: builtin/pack-objects.c:3273 +#: builtin/pack-objects.c:3276 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:3276 +#: builtin/pack-objects.c:3279 msgid "include objects reachable from any reference" msgstr "Objekte einschließen, die von jeder Referenz erreichbar sind" -#: builtin/pack-objects.c:3279 +#: builtin/pack-objects.c:3282 msgid "include objects referred by reflog entries" msgstr "" "Objekte einschließen, die von Einträgen des Reflogs referenziert werden" -#: builtin/pack-objects.c:3282 +#: builtin/pack-objects.c:3285 msgid "include objects referred to by the index" msgstr "Objekte einschließen, die vom Index referenziert werden" -#: builtin/pack-objects.c:3285 +#: builtin/pack-objects.c:3288 msgid "output pack to stdout" msgstr "Paket in die Standard-Ausgabe schreiben" -#: builtin/pack-objects.c:3287 +#: builtin/pack-objects.c:3290 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:3289 +#: builtin/pack-objects.c:3292 msgid "keep unreachable objects" msgstr "nicht erreichbare Objekte behalten" -#: builtin/pack-objects.c:3291 +#: builtin/pack-objects.c:3294 msgid "pack loose unreachable objects" msgstr "nicht erreichbare lose Objekte packen" -#: builtin/pack-objects.c:3293 +#: builtin/pack-objects.c:3296 msgid "unpack unreachable objects newer than <time>" msgstr "nicht erreichbare Objekte entpacken, die neuer als <Zeit> sind" -#: builtin/pack-objects.c:3296 +#: builtin/pack-objects.c:3299 msgid "use the sparse reachability algorithm" msgstr "den \"sparse\" Algorithmus zur Bestimmung der Erreichbarkeit benutzen" -#: builtin/pack-objects.c:3298 +#: builtin/pack-objects.c:3301 msgid "create thin packs" msgstr "dünnere Pakete erzeugen" -#: builtin/pack-objects.c:3300 +#: builtin/pack-objects.c:3303 msgid "create packs suitable for shallow fetches" msgstr "" "Pakete geeignet für Abholung mit unvollständiger Historie (shallow) erzeugen" -#: builtin/pack-objects.c:3302 +#: builtin/pack-objects.c:3305 msgid "ignore packs that have companion .keep file" msgstr "Pakete ignorieren, die .keep Dateien haben" -#: builtin/pack-objects.c:3304 +#: builtin/pack-objects.c:3307 msgid "ignore this pack" msgstr "dieses Paket ignorieren" -#: builtin/pack-objects.c:3306 +#: builtin/pack-objects.c:3309 msgid "pack compression level" msgstr "Komprimierungsgrad für Paketierung" -#: builtin/pack-objects.c:3308 +#: builtin/pack-objects.c:3311 msgid "do not hide commits by grafts" msgstr "keine künstlichen Vorgänger-Commits (\"grafts\") verbergen" -#: builtin/pack-objects.c:3310 +#: builtin/pack-objects.c:3313 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:3312 +#: builtin/pack-objects.c:3315 msgid "write a bitmap index together with the pack index" msgstr "Bitmap-Index zusammen mit Pack-Index schreiben" -#: builtin/pack-objects.c:3315 +#: builtin/pack-objects.c:3318 msgid "handling for missing objects" msgstr "Behandlung für fehlende Objekte" -#: builtin/pack-objects.c:3318 +#: builtin/pack-objects.c:3321 msgid "do not pack objects in promisor packfiles" msgstr "" "keine Objekte aus Packdateien von partiell geklonten Remote-Repositories " "packen" -#: builtin/pack-objects.c:3320 +#: builtin/pack-objects.c:3323 msgid "respect islands during delta compression" msgstr "Delta-Islands bei Delta-Kompression beachten" -#: builtin/pack-objects.c:3345 +#: builtin/pack-objects.c:3348 #, 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:3350 +#: builtin/pack-objects.c:3353 #, c-format msgid "pack.deltaCacheLimit is too high, forcing %d" msgstr "pack.deltaCacheLimit ist zu hoch, erzwinge %d" -#: builtin/pack-objects.c:3404 +#: builtin/pack-objects.c:3407 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:3406 +#: builtin/pack-objects.c:3409 msgid "minimum pack size limit is 1 MiB" msgstr "Minimales Limit für die Paketgröße ist 1 MiB." -#: builtin/pack-objects.c:3411 +#: builtin/pack-objects.c:3414 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:3414 +#: builtin/pack-objects.c:3417 msgid "--keep-unreachable and --unpack-unreachable are incompatible" msgstr "--keep-unreachable und --unpack-unreachable sind inkompatibel" -#: builtin/pack-objects.c:3420 +#: builtin/pack-objects.c:3423 msgid "cannot use --filter without --stdout" msgstr "Kann --filter nicht ohne --stdout benutzen." -#: builtin/pack-objects.c:3479 +#: builtin/pack-objects.c:3484 msgid "Enumerating objects" msgstr "Objekte aufzählen" -#: builtin/pack-objects.c:3498 +#: builtin/pack-objects.c:3514 #, c-format msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)" msgstr "" "Gesamt %<PRIu32> (Delta %<PRIu32>), Wiederverwendet %<PRIu32> (Delta " "%<PRIu32>)" -#: builtin/pack-refs.c:7 +#: builtin/pack-refs.c:8 msgid "git pack-refs [<options>]" msgstr "git pack-refs [<Optionen>]" -#: builtin/pack-refs.c:15 +#: builtin/pack-refs.c:16 msgid "pack everything" msgstr "alles packen" -#: builtin/pack-refs.c:16 +#: builtin/pack-refs.c:17 msgid "prune loose refs (default)" msgstr "lose Referenzen entfernen (Standard)" @@ -15452,71 +16285,71 @@ msgstr "Lösche doppelte Objekte" msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--progress] [--expire <Zeit>] [--] [<Branch>...]" -#: builtin/prune.c:109 +#: builtin/prune.c:131 msgid "report pruned objects" msgstr "gelöschte Objekte melden" -#: builtin/prune.c:112 +#: builtin/prune.c:134 msgid "expire objects older than <time>" msgstr "Objekte älter als <Zeit> verfallen lassen" -#: builtin/prune.c:114 +#: builtin/prune.c:136 msgid "limit traversal to objects outside promisor packfiles" msgstr "" "Traversierung auf Objekte außerhalb von Packdateien aus partiell geklonten " "Remote-Repositories einschränken" -#: builtin/prune.c:128 +#: builtin/prune.c:150 msgid "cannot prune in a precious-objects repo" msgstr "kann \"prune\" in precious-objects Repository nicht ausführen" -#: builtin/pull.c:61 builtin/pull.c:63 +#: builtin/pull.c:66 builtin/pull.c:68 #, c-format msgid "Invalid value for %s: %s" msgstr "Ungültiger Wert für %s: %s" -#: builtin/pull.c:83 +#: builtin/pull.c:88 msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "git pull [<Optionen>] [<Repository> [<Refspec>...]]" -#: builtin/pull.c:134 +#: builtin/pull.c:140 msgid "control for recursive fetching of submodules" msgstr "rekursive Anforderungen von Submodulen kontrollieren" -#: builtin/pull.c:138 +#: builtin/pull.c:144 msgid "Options related to merging" msgstr "Optionen bezogen auf Merge" -#: builtin/pull.c:141 +#: builtin/pull.c:147 msgid "incorporate changes by rebasing rather than merging" msgstr "Integration von Änderungen durch Rebase statt Merge" -#: builtin/pull.c:168 builtin/rebase--interactive.c:149 builtin/revert.c:123 +#: builtin/pull.c:175 builtin/rebase.c:447 builtin/revert.c:125 msgid "allow fast-forward" msgstr "Vorspulen erlauben" -#: builtin/pull.c:177 +#: builtin/pull.c:184 msgid "automatically stash/stash pop before and after rebase" msgstr "automatischer Stash/Stash-Pop vor und nach eines Rebase" -#: builtin/pull.c:193 +#: builtin/pull.c:200 msgid "Options related to fetching" msgstr "Optionen bezogen auf Fetch" -#: builtin/pull.c:203 +#: builtin/pull.c:210 msgid "force overwrite of local branch" msgstr "das Überschreiben von lokalen Branches erzwingen" -#: builtin/pull.c:211 +#: builtin/pull.c:218 msgid "number of submodules pulled in parallel" msgstr "Anzahl der parallel mit 'pull' zu verarbeitenden Submodule" -#: builtin/pull.c:306 +#: builtin/pull.c:313 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "Ungültiger Wert für pull.ff: %s" -#: builtin/pull.c:422 +#: builtin/pull.c:430 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." @@ -15524,14 +16357,14 @@ msgstr "" "Es gibt keinen Kandidaten für Rebase innerhalb der Referenzen, die eben " "angefordert wurden." -#: builtin/pull.c:424 +#: builtin/pull.c:432 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:425 +#: builtin/pull.c:433 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." @@ -15539,7 +16372,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:428 +#: builtin/pull.c:436 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -15551,39 +16384,39 @@ msgstr "" "Repository für den aktuellen Branch ist, müssen Sie einen Branch auf\n" "der Befehlszeile angeben." -#: builtin/pull.c:433 builtin/rebase.c:956 git-parse-remote.sh:73 +#: builtin/pull.c:441 builtin/rebase.c:1321 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "Im Moment auf keinem Branch." -#: builtin/pull.c:435 builtin/pull.c:450 git-parse-remote.sh:79 +#: builtin/pull.c:443 builtin/pull.c:458 git-parse-remote.sh:79 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:437 builtin/pull.c:452 git-parse-remote.sh:82 +#: builtin/pull.c:445 builtin/pull.c:460 git-parse-remote.sh:82 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:438 builtin/pull.c:453 +#: builtin/pull.c:446 builtin/pull.c:461 msgid "See git-pull(1) for details." msgstr "Siehe git-pull(1) für weitere Details." -#: builtin/pull.c:440 builtin/pull.c:446 builtin/pull.c:455 -#: builtin/rebase.c:962 git-parse-remote.sh:64 +#: builtin/pull.c:448 builtin/pull.c:454 builtin/pull.c:463 +#: builtin/rebase.c:1327 git-parse-remote.sh:64 msgid "<remote>" msgstr "<Remote-Repository>" -#: builtin/pull.c:440 builtin/pull.c:455 builtin/pull.c:460 -#: git-legacy-rebase.sh:564 git-parse-remote.sh:65 +#: builtin/pull.c:448 builtin/pull.c:463 builtin/pull.c:468 +#: git-parse-remote.sh:65 msgid "<branch>" msgstr "<Branch>" -#: builtin/pull.c:448 builtin/rebase.c:954 git-parse-remote.sh:75 +#: builtin/pull.c:456 builtin/rebase.c:1319 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "Es gibt keine Tracking-Informationen für den aktuellen Branch." -#: builtin/pull.c:457 git-parse-remote.sh:95 +#: builtin/pull.c:465 git-parse-remote.sh:95 msgid "" "If you wish to set tracking information for this branch you can do so with:" msgstr "" @@ -15591,7 +16424,7 @@ msgstr "" "Sie\n" "dies tun mit:" -#: builtin/pull.c:462 +#: builtin/pull.c:470 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -15601,34 +16434,34 @@ msgstr "" "des Remote-Repositories durchzuführen, aber diese Referenz\n" "wurde nicht angefordert." -#: builtin/pull.c:566 +#: builtin/pull.c:574 #, c-format msgid "unable to access commit %s" msgstr "Konnte nicht auf Commit '%s' zugreifen." -#: builtin/pull.c:844 +#: builtin/pull.c:854 msgid "ignoring --verify-signatures for rebase" msgstr "Ignoriere --verify-signatures für Rebase" -#: builtin/pull.c:892 +#: builtin/pull.c:909 msgid "--[no-]autostash option is only valid with --rebase." msgstr "--[no-]autostash ist nur mit --rebase zulässig." -#: builtin/pull.c:900 +#: builtin/pull.c:917 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:904 +#: builtin/pull.c:921 msgid "pull with rebase" msgstr "Pull mit Rebase" -#: builtin/pull.c:905 +#: builtin/pull.c:922 msgid "please commit or stash them." msgstr "Bitte committen Sie die Änderungen oder benutzen Sie \"stash\"." -#: builtin/pull.c:930 +#: builtin/pull.c:947 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -15638,7 +16471,7 @@ msgstr "" "\"fetch\" aktualisierte die Spitze des aktuellen Branches.\n" "Spule Ihr Arbeitsverzeichnis von Commit %s vor." -#: builtin/pull.c:936 +#: builtin/pull.c:953 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -15655,15 +16488,15 @@ msgstr "" "$ git reset --hard\n" "zur Wiederherstellung aus." -#: builtin/pull.c:951 +#: builtin/pull.c:968 msgid "Cannot merge multiple branches into empty head." msgstr "Kann nicht mehrere Branches in einen leeren Branch zusammenführen." -#: builtin/pull.c:955 +#: builtin/pull.c:972 msgid "Cannot rebase onto multiple branches." msgstr "Kann Rebase nicht auf mehrere Branches ausführen." -#: builtin/pull.c:962 +#: builtin/pull.c:979 msgid "cannot rebase with locally recorded submodule modifications" msgstr "" "Kann Rebase nicht mit lokal aufgezeichneten Änderungen in Submodulen " @@ -15992,16 +16825,16 @@ msgstr "Prozentsatz mit welchem Erzeugung gewichtet wird" msgid "use simple diff colors" msgstr "einfache Diff-Farben benutzen" -#: builtin/range-diff.c:61 builtin/range-diff.c:65 +#: builtin/range-diff.c:46 builtin/range-diff.c:50 #, c-format msgid "no .. in range: '%s'" msgstr "Kein .. im Bereich: '%s'" -#: builtin/range-diff.c:75 +#: builtin/range-diff.c:60 msgid "single arg format must be symmetric range" msgstr "Format mit einfachem Argument muss symmetrischer Bereich sein." -#: builtin/range-diff.c:90 +#: builtin/range-diff.c:75 msgid "need two commit ranges" msgstr "Benötige zwei Commit-Bereiche." @@ -16080,7 +16913,11 @@ msgstr "Anwendung des Filters für partielles Auschecken überspringen" msgid "debug unpack-trees" msgstr "unpack-trees protokollieren" -#: builtin/rebase.c:30 +#: builtin/read-tree.c:157 +msgid "suppress feedback messages" +msgstr "Rückmeldungen unterdrücken" + +#: builtin/rebase.c:32 msgid "" "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] " "[<branch>]" @@ -16088,52 +16925,228 @@ msgstr "" "git rebase [-i] [<Optionen>] [--exec <Programm>] [--onto <neue-Basis>] " "[<Upstream>] [<Branch>]" -#: builtin/rebase.c:32 +#: builtin/rebase.c:34 msgid "" "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]" msgstr "" "git rebase [-i] [<Optionen>] [--exec <Programm>] [--onto <neue-Basis>] --" "root [<Branch>]" -#: builtin/rebase.c:34 +#: builtin/rebase.c:36 msgid "git rebase --continue | --abort | --skip | --edit-todo" msgstr "git rebase --continue | --abort | --skip | --edit-todo" -#: builtin/rebase.c:121 builtin/rebase.c:1437 +#: builtin/rebase.c:158 builtin/rebase.c:182 builtin/rebase.c:209 +#, c-format +msgid "unusable todo list: '%s'" +msgstr "Unbenutzbare TODO-Liste: '%s'" + +#: builtin/rebase.c:167 builtin/rebase.c:193 builtin/rebase.c:217 +#, c-format +msgid "could not write '%s'." +msgstr "Konnte '%s' nicht schreiben." + +#: builtin/rebase.c:252 +msgid "no HEAD?" +msgstr "Kein HEAD?" + +#: builtin/rebase.c:279 +#, c-format +msgid "could not create temporary %s" +msgstr "Konnte temporäres Verzeichnis '%s' nicht erstellen." + +#: builtin/rebase.c:285 +msgid "could not mark as interactive" +msgstr "Markierung auf interaktiven Rebase fehlgeschlagen." + +#: builtin/rebase.c:343 +msgid "could not generate todo list" +msgstr "Konnte TODO-Liste nicht erzeugen." + +#: builtin/rebase.c:382 +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:437 +msgid "git rebase--interactive [<options>]" +msgstr "git rebase--interactive [<Optionen>]" + +#: builtin/rebase.c:449 +msgid "keep empty commits" +msgstr "leere Commits behalten" + +#: builtin/rebase.c:451 builtin/revert.c:127 +msgid "allow commits with empty messages" +msgstr "Commits mit leerer Beschreibung erlauben" + +#: builtin/rebase.c:452 +msgid "rebase merge commits" +msgstr "Rebase auf Merge-Commits ausführen" + +#: builtin/rebase.c:454 +msgid "keep original branch points of cousins" +msgstr "originale Branch-Punkte der Cousins behalten" + +#: builtin/rebase.c:456 +msgid "move commits that begin with squash!/fixup!" +msgstr "Commits verschieben, die mit squash!/fixup! beginnen" + +#: builtin/rebase.c:457 +msgid "sign commits" +msgstr "Commits signieren" + +#: builtin/rebase.c:459 builtin/rebase.c:1397 +msgid "display a diffstat of what changed upstream" +msgstr "" +"Zusammenfassung der Unterschiede gegenüber dem Upstream-Branch anzeigen" + +#: builtin/rebase.c:461 +msgid "continue rebase" +msgstr "Rebase fortsetzen" + +#: builtin/rebase.c:463 +msgid "skip commit" +msgstr "Commit auslassen" + +#: builtin/rebase.c:464 +msgid "edit the todo list" +msgstr "die TODO-Liste bearbeiten" + +#: builtin/rebase.c:466 +msgid "show the current patch" +msgstr "den aktuellen Patch anzeigen" + +#: builtin/rebase.c:469 +msgid "shorten commit ids in the todo list" +msgstr "Commit-IDs in der TODO-Liste verkürzen" + +#: builtin/rebase.c:471 +msgid "expand commit ids in the todo list" +msgstr "Commit-IDs in der TODO-Liste erweitern" + +#: builtin/rebase.c:473 +msgid "check the todo list" +msgstr "die TODO-Liste prüfen" + +#: builtin/rebase.c:475 +msgid "rearrange fixup/squash lines" +msgstr "fixup/squash-Zeilen umordnen" + +#: builtin/rebase.c:477 +msgid "insert exec commands in todo list" +msgstr "\"exec\"-Befehle in TODO-Liste einfügen" + +#: builtin/rebase.c:478 +msgid "onto" +msgstr "auf" + +#: builtin/rebase.c:481 +msgid "restrict-revision" +msgstr "Begrenzungscommit" + +#: builtin/rebase.c:481 +msgid "restrict revision" +msgstr "Begrenzungscommit" + +#: builtin/rebase.c:483 +msgid "squash-onto" +msgstr "squash-onto" + +#: builtin/rebase.c:484 +msgid "squash onto" +msgstr "squash onto" + +#: builtin/rebase.c:486 +msgid "the upstream commit" +msgstr "der Upstream-Commit" + +#: builtin/rebase.c:488 +msgid "head-name" +msgstr "head-Name" + +#: builtin/rebase.c:488 +msgid "head name" +msgstr "head-Name" + +#: builtin/rebase.c:493 +msgid "rebase strategy" +msgstr "Rebase-Strategie" + +#: builtin/rebase.c:494 +msgid "strategy-opts" +msgstr "Strategie-Optionen" + +#: builtin/rebase.c:495 +msgid "strategy options" +msgstr "Strategie-Optionen" + +#: builtin/rebase.c:496 +msgid "switch-to" +msgstr "wechseln zu" + +#: builtin/rebase.c:497 +msgid "the branch or commit to checkout" +msgstr "der Branch oder Commit zum Auschecken" + +#: builtin/rebase.c:498 +msgid "onto-name" +msgstr "onto-Name" + +#: builtin/rebase.c:498 +msgid "onto name" +msgstr "onto-Name" + +#: builtin/rebase.c:499 +msgid "cmd" +msgstr "Befehl" + +#: builtin/rebase.c:499 +msgid "the command to run" +msgstr "auszuführender Befehl" + +#: builtin/rebase.c:502 builtin/rebase.c:1480 +msgid "automatically re-schedule any `exec` that fails" +msgstr "jeden fehlgeschlagenen `exec`-Befehl neu ansetzen" + +#: builtin/rebase.c:518 +msgid "--[no-]rebase-cousins has no effect without --rebase-merges" +msgstr "--[no-]rebase-cousins hat ohne --rebase-merges keine Auswirkung" + +#: builtin/rebase.c:534 builtin/rebase.c:1787 #, c-format msgid "%s requires an interactive rebase" msgstr "%s erfordert ein interaktives Rebase" -#: builtin/rebase.c:173 +#: builtin/rebase.c:586 #, c-format msgid "could not get 'onto': '%s'" msgstr "Konnte 'onto' nicht bestimmen: '%s'" -#: builtin/rebase.c:188 +#: builtin/rebase.c:601 #, c-format msgid "invalid orig-head: '%s'" msgstr "Ungültiges orig-head: '%s'" -#: builtin/rebase.c:213 +#: builtin/rebase.c:626 #, c-format msgid "ignoring invalid allow_rerere_autoupdate: '%s'" msgstr "Ignoriere ungültiges allow_rerere_autoupdate: '%s'" -#: builtin/rebase.c:289 +#: builtin/rebase.c:702 #, c-format msgid "Could not read '%s'" msgstr "Konnte '%s' nicht lesen." -#: builtin/rebase.c:307 +#: builtin/rebase.c:720 #, c-format msgid "Cannot store %s" msgstr "Kann %s nicht speichern." -#: builtin/rebase.c:402 +#: builtin/rebase.c:817 msgid "could not determine HEAD revision" msgstr "Konnte HEAD-Commit nicht bestimmen." -#: builtin/rebase.c:522 +#: builtin/rebase.c:940 msgid "" "Resolve all conflicts manually, mark them as resolved with\n" "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n" @@ -16149,7 +17162,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:603 +#: builtin/rebase.c:1021 #, c-format msgid "" "\n" @@ -16169,7 +17182,7 @@ msgstr "" "Infolge dessen kann Git auf diesen Revisionen Rebase nicht\n" "ausführen." -#: builtin/rebase.c:948 +#: builtin/rebase.c:1313 #, c-format msgid "" "%s\n" @@ -16187,7 +17200,7 @@ msgstr "" " git rebase '<Branch>'\n" "\n" -#: builtin/rebase.c:964 +#: builtin/rebase.c:1329 #, c-format msgid "" "If you wish to set tracking information for this branch you can do so with:\n" @@ -16201,168 +17214,165 @@ msgstr "" " git branch --set-upstream-to=%s/<Branch> %s\n" "\n" -#: builtin/rebase.c:994 +#: builtin/rebase.c:1359 msgid "exec commands cannot contain newlines" msgstr "\"exec\"-Befehle können keine neuen Zeilen enthalten" -#: builtin/rebase.c:998 +#: builtin/rebase.c:1363 msgid "empty exec command" msgstr "Leerer \"exec\"-Befehl." -#: builtin/rebase.c:1040 +#: builtin/rebase.c:1390 msgid "rebase onto given branch instead of upstream" msgstr "Rebase auf angegebenen Branch anstelle des Upstream-Branches ausführen" -#: builtin/rebase.c:1042 +#: builtin/rebase.c:1392 msgid "allow pre-rebase hook to run" msgstr "Ausführung des pre-rebase-Hooks erlauben" -#: builtin/rebase.c:1044 +#: builtin/rebase.c:1394 msgid "be quiet. implies --no-stat" msgstr "weniger Ausgaben (impliziert --no-stat)" -#: builtin/rebase.c:1047 -msgid "display a diffstat of what changed upstream" -msgstr "" -"Zusammenfassung der Unterschiede gegenüber dem Upstream-Branch anzeigen" - -#: builtin/rebase.c:1050 +#: builtin/rebase.c:1400 msgid "do not show diffstat of what changed upstream" msgstr "" "Zusammenfassung der Unterschiede gegenüber dem Upstream-Branch verbergen" -#: builtin/rebase.c:1053 +#: builtin/rebase.c:1403 msgid "add a Signed-off-by: line to each commit" msgstr "eine \"Signed-off-by:\"-Zeile zu jedem Commit hinzufügen" -#: builtin/rebase.c:1055 builtin/rebase.c:1059 builtin/rebase.c:1061 +#: builtin/rebase.c:1405 builtin/rebase.c:1409 builtin/rebase.c:1411 msgid "passed to 'git am'" msgstr "an 'git am' übergeben" -#: builtin/rebase.c:1063 builtin/rebase.c:1065 +#: builtin/rebase.c:1413 builtin/rebase.c:1415 msgid "passed to 'git apply'" msgstr "an 'git apply' übergeben" -#: builtin/rebase.c:1067 builtin/rebase.c:1070 +#: builtin/rebase.c:1417 builtin/rebase.c:1420 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:1072 +#: builtin/rebase.c:1422 msgid "continue" msgstr "fortsetzen" -#: builtin/rebase.c:1075 +#: builtin/rebase.c:1425 msgid "skip current patch and continue" msgstr "den aktuellen Patch auslassen und fortfahren" -#: builtin/rebase.c:1077 +#: builtin/rebase.c:1427 msgid "abort and check out the original branch" msgstr "abbrechen und den ursprünglichen Branch auschecken" -#: builtin/rebase.c:1080 +#: builtin/rebase.c:1430 msgid "abort but keep HEAD where it is" msgstr "abbrechen, aber HEAD an aktueller Stelle belassen" -#: builtin/rebase.c:1081 +#: builtin/rebase.c:1431 msgid "edit the todo list during an interactive rebase" msgstr "TODO-Liste während eines interaktiven Rebase bearbeiten" -#: builtin/rebase.c:1084 +#: builtin/rebase.c:1434 msgid "show the patch file being applied or merged" msgstr "den Patch, der gerade angewendet oder zusammengeführt wird, anzeigen" -#: builtin/rebase.c:1087 +#: builtin/rebase.c:1437 msgid "use merging strategies to rebase" msgstr "Merge-Strategien beim Rebase verwenden" -#: builtin/rebase.c:1091 +#: builtin/rebase.c:1441 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:1095 -msgid "try to recreate merges instead of ignoring them" -msgstr "versuchen, Merges wiederherzustellen anstatt sie zu ignorieren" - -#: builtin/rebase.c:1099 -msgid "allow rerere to update index with resolved conflict" +#: builtin/rebase.c:1445 +msgid "(DEPRECATED) try to recreate merges instead of ignoring them" msgstr "" -"Rerere erlauben, den Index mit dem aufgelöstem Konflikt zu aktualisieren" +"(VERALTET) Versuche, Merges wiederherzustellen anstatt sie zu ignorieren" -#: builtin/rebase.c:1102 +#: builtin/rebase.c:1449 msgid "preserve empty commits during rebase" msgstr "leere Commits während des Rebase erhalten" -#: builtin/rebase.c:1104 +#: builtin/rebase.c:1451 msgid "move commits that begin with squash!/fixup! under -i" msgstr "bei -i Commits verschieben, die mit squash!/fixup! beginnen" -#: builtin/rebase.c:1110 +#: builtin/rebase.c:1457 msgid "automatically stash/stash pop before and after" msgstr "automatischer Stash/Stash-Pop davor und danach" -#: builtin/rebase.c:1112 +#: builtin/rebase.c:1459 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:1116 +#: builtin/rebase.c:1463 msgid "allow rebasing commits with empty messages" msgstr "Rebase von Commits mit leerer Beschreibung erlauben" -#: builtin/rebase.c:1119 +#: builtin/rebase.c:1466 msgid "try to rebase merges instead of skipping them" msgstr "" "versuchen, Rebase mit Merges auszuführen, anstatt diese zu überspringen" -#: builtin/rebase.c:1122 +#: builtin/rebase.c:1469 msgid "use 'merge-base --fork-point' to refine upstream" msgstr "" "'git merge-base --fork-point' benutzen, um Upstream-Branch zu bestimmen" -#: builtin/rebase.c:1124 +#: builtin/rebase.c:1471 msgid "use the given merge strategy" msgstr "angegebene Merge-Strategie verwenden" -#: builtin/rebase.c:1126 builtin/revert.c:112 +#: builtin/rebase.c:1473 builtin/revert.c:114 msgid "option" msgstr "Option" -#: builtin/rebase.c:1127 +#: builtin/rebase.c:1474 msgid "pass the argument through to the merge strategy" msgstr "Argument zur Merge-Strategie durchreichen" -#: builtin/rebase.c:1130 +#: builtin/rebase.c:1477 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:1133 builtin/rebase--interactive.c:198 -msgid "automatically re-schedule any `exec` that fails" -msgstr "jeden fehlgeschlagenen `exec`-Befehl neu ansetzen" - -#: builtin/rebase.c:1149 -#, c-format -msgid "could not exec %s" -msgstr "Konnte 'exec %s' nicht ausführen." +#: builtin/rebase.c:1498 +msgid "" +"the rebase.useBuiltin support has been removed!\n" +"See its entry in 'git help config' for details." +msgstr "" +"Die Unterstützung für rebase.useBuiltin wurde entfernt!\n" +"Siehe dessen Eintrag in 'git help config' für Details." -#: builtin/rebase.c:1167 git-legacy-rebase.sh:220 +#: builtin/rebase.c:1504 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:1208 git-legacy-rebase.sh:406 +#: builtin/rebase.c:1545 +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:1549 msgid "No rebase in progress?" msgstr "Kein Rebase im Gange?" -#: builtin/rebase.c:1212 git-legacy-rebase.sh:417 +#: builtin/rebase.c:1553 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:1226 git-legacy-rebase.sh:424 +#: builtin/rebase.c:1576 msgid "Cannot read HEAD" msgstr "Kann HEAD nicht lesen" -#: builtin/rebase.c:1238 git-legacy-rebase.sh:427 +#: builtin/rebase.c:1588 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -16370,21 +17380,21 @@ msgstr "" "Sie müssen alle Merge-Konflikte editieren und diese dann\n" "mittels \"git add\" als aufgelöst markieren" -#: builtin/rebase.c:1257 +#: builtin/rebase.c:1607 msgid "could not discard worktree changes" msgstr "Konnte Änderungen im Arbeitsverzeichnis nicht verwerfen." -#: builtin/rebase.c:1276 +#: builtin/rebase.c:1626 #, c-format msgid "could not move back to %s" msgstr "Konnte nicht zu %s zurückgehen." -#: builtin/rebase.c:1287 builtin/rm.c:369 +#: builtin/rebase.c:1637 builtin/rm.c:369 #, c-format msgid "could not remove '%s'" msgstr "Konnte '%s' nicht löschen" -#: builtin/rebase.c:1313 +#: builtin/rebase.c:1663 #, c-format msgid "" "It seems that there is already a %s directory, and\n" @@ -16405,333 +17415,175 @@ msgstr "" "und führen Sie diesen Befehl nochmal aus. Es wird angehalten, falls noch\n" "etwas Schützenswertes vorhanden ist.\n" -#: builtin/rebase.c:1334 +#: builtin/rebase.c:1684 msgid "switch `C' expects a numerical value" msgstr "Schalter `C' erwartet einen numerischen Wert." -#: builtin/rebase.c:1375 +#: builtin/rebase.c:1725 #, c-format msgid "Unknown mode: %s" msgstr "Unbekannter Modus: %s" -#: builtin/rebase.c:1397 +#: builtin/rebase.c:1747 msgid "--strategy requires --merge or --interactive" msgstr "--strategy erfordert --merge oder --interactive" -#: builtin/rebase.c:1446 +#: builtin/rebase.c:1796 msgid "cannot combine am options with either interactive or merge options" -msgstr "Optionen für \"am\" können nicht mit Optionen für \"interactive\" oder \"merge\" kombiniert werden." +msgstr "" +"Optionen für \"am\" können nicht mit Optionen für \"interactive\" oder " +"\"merge\" kombiniert werden." -#: builtin/rebase.c:1465 +#: builtin/rebase.c:1815 msgid "cannot combine '--preserve-merges' with '--rebase-merges'" -msgstr "'--preserve-merges' kann nicht mit '--rebase-merges' kombiniert werden." +msgstr "" +"'--preserve-merges' kann nicht mit '--rebase-merges' kombiniert werden." -#: builtin/rebase.c:1469 git-legacy-rebase.sh:544 +#: builtin/rebase.c:1819 msgid "" "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'" -msgstr "Fehler: '--preserve-merges' kann nicht mit '--reschedule-failed-exec' kombiniert werden." +msgstr "" +"Fehler: '--preserve-merges' kann nicht mit '--reschedule-failed-exec' " +"kombiniert werden." -#: builtin/rebase.c:1475 +#: builtin/rebase.c:1825 msgid "cannot combine '--rebase-merges' with '--strategy-option'" -msgstr "'--rebase-merges' kann nicht mit '--strategy-option' kombiniert werden." +msgstr "" +"'--rebase-merges' kann nicht mit '--strategy-option' kombiniert werden." -#: builtin/rebase.c:1478 +#: builtin/rebase.c:1828 msgid "cannot combine '--rebase-merges' with '--strategy'" msgstr "'--rebase-merges' kann nicht mit '--strategy' kombiniert werden." -#: builtin/rebase.c:1502 +#: builtin/rebase.c:1852 #, c-format msgid "invalid upstream '%s'" msgstr "Ungültiger Upstream '%s'" -#: builtin/rebase.c:1508 +#: builtin/rebase.c:1858 msgid "Could not create new root commit" msgstr "Konnte neuen Root-Commit nicht erstellen." -#: builtin/rebase.c:1526 +#: builtin/rebase.c:1876 #, c-format msgid "'%s': need exactly one merge base" msgstr "'%s': benötige genau eine Merge-Basis" -#: builtin/rebase.c:1533 +#: builtin/rebase.c:1883 #, c-format msgid "Does not point to a valid commit '%s'" msgstr "'%s' zeigt auf keinen gültigen Commit." -#: builtin/rebase.c:1558 +#: builtin/rebase.c:1908 #, c-format msgid "fatal: no such branch/commit '%s'" msgstr "fatal: Branch/Commit '%s' nicht gefunden" -#: builtin/rebase.c:1566 builtin/submodule--helper.c:38 -#: builtin/submodule--helper.c:1934 +#: builtin/rebase.c:1916 builtin/submodule--helper.c:38 +#: builtin/submodule--helper.c:1933 #, c-format msgid "No such ref: %s" msgstr "Referenz nicht gefunden: %s" -#: builtin/rebase.c:1578 +#: builtin/rebase.c:1927 msgid "Could not resolve HEAD to a revision" msgstr "Konnte HEAD zu keinem Commit auflösen." -#: builtin/rebase.c:1619 git-legacy-rebase.sh:673 +#: builtin/rebase.c:1968 msgid "Cannot autostash" msgstr "Kann automatischen Stash nicht erzeugen." -#: builtin/rebase.c:1622 +#: builtin/rebase.c:1971 #, c-format msgid "Unexpected stash response: '%s'" msgstr "Unerwartete 'stash'-Antwort: '%s'" -#: builtin/rebase.c:1628 +#: builtin/rebase.c:1977 #, c-format msgid "Could not create directory for '%s'" msgstr "Konnte Verzeichnis für '%s' nicht erstellen." -#: builtin/rebase.c:1631 +#: builtin/rebase.c:1980 #, c-format msgid "Created autostash: %s\n" msgstr "Automatischen Stash erzeugt: %s\n" -#: builtin/rebase.c:1634 +#: builtin/rebase.c:1983 msgid "could not reset --hard" msgstr "Konnte 'reset --hard' nicht ausführen." -#: builtin/rebase.c:1635 builtin/reset.c:114 +#: builtin/rebase.c:1984 builtin/reset.c:114 #, c-format msgid "HEAD is now at %s" msgstr "HEAD ist jetzt bei %s" -#: builtin/rebase.c:1651 git-legacy-rebase.sh:682 +#: builtin/rebase.c:2000 msgid "Please commit or stash them." msgstr "Bitte committen Sie die Änderungen oder benutzen Sie \"stash\"." -#: builtin/rebase.c:1678 +#: builtin/rebase.c:2027 #, c-format msgid "could not parse '%s'" msgstr "Konnte '%s' nicht parsen." -#: builtin/rebase.c:1691 +#: builtin/rebase.c:2040 #, c-format msgid "could not switch to %s" msgstr "Konnte nicht zu %s wechseln." -#: builtin/rebase.c:1702 git-legacy-rebase.sh:705 -#, sh-format +#: builtin/rebase.c:2051 msgid "HEAD is up to date." msgstr "HEAD ist aktuell." -#: builtin/rebase.c:1704 +#: builtin/rebase.c:2053 #, c-format msgid "Current branch %s is up to date.\n" msgstr "Aktueller Branch %s ist auf dem neuesten Stand.\n" -#: builtin/rebase.c:1712 git-legacy-rebase.sh:715 -#, sh-format +#: builtin/rebase.c:2061 msgid "HEAD is up to date, rebase forced." msgstr "HEAD ist aktuell, Rebase erzwungen." -#: builtin/rebase.c:1714 +#: builtin/rebase.c:2063 #, 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:1722 git-legacy-rebase.sh:215 +#: builtin/rebase.c:2071 msgid "The pre-rebase hook refused to rebase." msgstr "Der \"pre-rebase hook\" hat den Rebase zurückgewiesen." -#: builtin/rebase.c:1729 +#: builtin/rebase.c:2078 #, c-format msgid "Changes to %s:\n" msgstr "Änderungen zu %s:\n" -#: builtin/rebase.c:1732 +#: builtin/rebase.c:2081 #, c-format msgid "Changes from %s to %s:\n" msgstr "Änderungen von %s zu %s:\n" -#: builtin/rebase.c:1757 +#: builtin/rebase.c:2106 #, 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:1765 +#: builtin/rebase.c:2115 msgid "Could not detach HEAD" msgstr "Konnte HEAD nicht loslösen." -#: builtin/rebase.c:1774 +#: builtin/rebase.c:2124 #, c-format msgid "Fast-forwarded %s to %s.\n" msgstr "Spule %s vor zu %s.\n" -#: builtin/rebase--interactive.c:25 -msgid "no HEAD?" -msgstr "Kein HEAD?" - -#: builtin/rebase--interactive.c:52 -#, c-format -msgid "could not create temporary %s" -msgstr "Konnte temporäres Verzeichnis '%s' nicht erstellen." - -#: builtin/rebase--interactive.c:58 -msgid "could not mark as interactive" -msgstr "Markierung auf interaktiven Rebase fehlgeschlagen." - -#: builtin/rebase--interactive.c:102 -#, c-format -msgid "could not open %s" -msgstr "Konnte '%s' nicht öffnen." - -#: builtin/rebase--interactive.c:115 -msgid "could not generate todo list" -msgstr "Konnte TODO-Liste nicht erzeugen." - -#: builtin/rebase--interactive.c:131 -msgid "git rebase--interactive [<options>]" -msgstr "git rebase--interactive [<Optionen>]" - -#: builtin/rebase--interactive.c:150 -msgid "keep empty commits" -msgstr "leere Commits behalten" - -#: builtin/rebase--interactive.c:152 builtin/revert.c:125 -msgid "allow commits with empty messages" -msgstr "Commits mit leerer Beschreibung erlauben" - -#: builtin/rebase--interactive.c:153 -msgid "rebase merge commits" -msgstr "Rebase auf Merge-Commits ausführen" - -#: builtin/rebase--interactive.c:155 -msgid "keep original branch points of cousins" -msgstr "originale Branch-Punkte der Cousins behalten" - -#: builtin/rebase--interactive.c:157 -msgid "move commits that begin with squash!/fixup!" -msgstr "Commits verschieben, die mit squash!/fixup! beginnen" - -#: builtin/rebase--interactive.c:158 -msgid "sign commits" -msgstr "Commits signieren" - -#: builtin/rebase--interactive.c:160 -msgid "continue rebase" -msgstr "Rebase fortsetzen" - -#: builtin/rebase--interactive.c:162 -msgid "skip commit" -msgstr "Commit auslassen" - -#: builtin/rebase--interactive.c:163 -msgid "edit the todo list" -msgstr "die TODO-Liste bearbeiten" - -#: builtin/rebase--interactive.c:165 -msgid "show the current patch" -msgstr "den aktuellen Patch anzeigen" - -#: builtin/rebase--interactive.c:168 -msgid "shorten commit ids in the todo list" -msgstr "Commit-IDs in der TODO-Liste verkürzen" - -#: builtin/rebase--interactive.c:170 -msgid "expand commit ids in the todo list" -msgstr "Commit-IDs in der TODO-Liste erweitern" - -#: builtin/rebase--interactive.c:172 -msgid "check the todo list" -msgstr "die TODO-Liste prüfen" - -#: builtin/rebase--interactive.c:174 -msgid "rearrange fixup/squash lines" -msgstr "fixup/squash-Zeilen umordnen" - -#: builtin/rebase--interactive.c:176 -msgid "insert exec commands in todo list" -msgstr "\"exec\"-Befehle in TODO-Liste einfügen" - -#: builtin/rebase--interactive.c:177 -msgid "onto" -msgstr "auf" - -#: builtin/rebase--interactive.c:179 -msgid "restrict-revision" -msgstr "Begrenzungscommit" - -#: builtin/rebase--interactive.c:179 -msgid "restrict revision" -msgstr "Begrenzungscommit" - -#: builtin/rebase--interactive.c:180 -msgid "squash-onto" -msgstr "squash-onto" - -#: builtin/rebase--interactive.c:181 -msgid "squash onto" -msgstr "squash onto" - -#: builtin/rebase--interactive.c:183 -msgid "the upstream commit" -msgstr "der Upstream-Commit" - -#: builtin/rebase--interactive.c:184 -msgid "head-name" -msgstr "head-Name" - -#: builtin/rebase--interactive.c:184 -msgid "head name" -msgstr "head-Name" - -#: builtin/rebase--interactive.c:189 -msgid "rebase strategy" -msgstr "Rebase-Strategie" - -#: builtin/rebase--interactive.c:190 -msgid "strategy-opts" -msgstr "Strategie-Optionen" - -#: builtin/rebase--interactive.c:191 -msgid "strategy options" -msgstr "Strategie-Optionen" - -#: builtin/rebase--interactive.c:192 -msgid "switch-to" -msgstr "wechseln zu" - -#: builtin/rebase--interactive.c:193 -msgid "the branch or commit to checkout" -msgstr "der Branch oder Commit zum Auschecken" - -#: builtin/rebase--interactive.c:194 -msgid "onto-name" -msgstr "onto-Name" - -#: builtin/rebase--interactive.c:194 -msgid "onto name" -msgstr "onto-Name" - -#: builtin/rebase--interactive.c:195 -msgid "cmd" -msgstr "Befehl" - -#: builtin/rebase--interactive.c:195 -msgid "the command to run" -msgstr "auszuführender Befehl" - -#: builtin/rebase--interactive.c:224 -msgid "--[no-]rebase-cousins has no effect without --rebase-merges" -msgstr "--[no-]rebase-cousins hat ohne --rebase-merges keine Auswirkung" - -#: builtin/rebase--interactive.c:230 -msgid "a base commit must be provided with --upstream or --onto" -msgstr "Ein Basis-Commit muss mit --upstream oder --onto angegeben werden." - #: builtin/receive-pack.c:33 msgid "git receive-pack <git-dir>" msgstr "git receive-pack <Git-Verzeichnis>" -#: builtin/receive-pack.c:830 +#: builtin/receive-pack.c:833 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" @@ -16763,7 +17615,7 @@ msgstr "" "setzen Sie die Konfigurationsvariable 'receive.denyCurrentBranch' auf\n" "'refuse'." -#: builtin/receive-pack.c:850 +#: builtin/receive-pack.c:853 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" @@ -16784,11 +17636,11 @@ msgstr "" "\n" "Um diese Meldung zu unterdrücken, setzen Sie die Variable auf 'refuse'." -#: builtin/receive-pack.c:1929 +#: builtin/receive-pack.c:1940 msgid "quiet" msgstr "weniger Ausgaben" -#: builtin/receive-pack.c:1943 +#: builtin/receive-pack.c:1954 msgid "You must specify a directory." msgstr "Sie müssen ein Repository angeben." @@ -16797,13 +17649,18 @@ msgid "" "git reflog expire [--expire=<time>] [--expire-unreachable=<time>] [--" "rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] " "<refs>..." -msgstr "git reflog expire [--expire=<Zeit>] [--expire-unreachable=<Zeit>] [--rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] <Referenzen>..." +msgstr "" +"git reflog expire [--expire=<Zeit>] [--expire-unreachable=<Zeit>] [--" +"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] " +"<Referenzen>..." #: builtin/reflog.c:22 msgid "" "git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] " "<refs>..." -msgstr "git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] <Referenzen>..." +msgstr "" +"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] " +"<Referenzen>..." #: builtin/reflog.c:25 msgid "git reflog exists <ref>" @@ -17385,9 +18242,10 @@ msgstr "" "Konnte 'pack-objects' für das Neupacken von Objekten aus partiell geklonten\n" "Remote-Repositories nicht starten." -#: builtin/repack.c:239 builtin/repack.c:411 +#: builtin/repack.c:239 builtin/repack.c:414 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." +msgstr "" +"repack: Erwarte Zeilen mit vollständiger Hex-Objekt-ID nur von pack-objects." #: builtin/repack.c:256 msgid "could not finish pack-objects to repack promisor objects" @@ -17486,11 +18344,11 @@ msgstr "kann Pack-Dateien in precious-objects Repository nicht löschen" msgid "--keep-unreachable and -A are incompatible" msgstr "--keep-unreachable und -A sind inkompatibel" -#: builtin/repack.c:420 +#: builtin/repack.c:423 msgid "Nothing new to pack." msgstr "Nichts Neues zum Packen." -#: builtin/repack.c:481 +#: builtin/repack.c:484 #, c-format msgid "" "WARNING: Some packs in use have been renamed by\n" @@ -17509,7 +18367,7 @@ msgstr "" "WARNUNG: ebenfalls fehl.\n" "WARNUNG: Bitte benennen Sie diese manuell nach %s um:\n" -#: builtin/repack.c:529 +#: builtin/repack.c:532 #, c-format msgid "failed to remove '%s'" msgstr "Fehler beim Löschen von '%s'" @@ -17538,12 +18396,7 @@ msgstr "git replace -d <Objekt>..." msgid "git replace [--format=<format>] [-l [<pattern>]]" msgstr "git replace [--format=<Format>] [-l [<Muster>]]" -#: builtin/replace.c:58 builtin/replace.c:203 builtin/replace.c:206 -#, c-format -msgid "failed to resolve '%s' as a valid ref" -msgstr "Konnte '%s' nicht als gültige Referenz auflösen." - -#: builtin/replace.c:86 +#: builtin/replace.c:90 #, c-format msgid "" "invalid replace format '%s'\n" @@ -17552,27 +18405,27 @@ msgstr "" "Ungültiges Ersetzungsformat '%s'\n" "Gültige Formate sind 'short', 'medium' und 'long'." -#: builtin/replace.c:121 +#: builtin/replace.c:125 #, c-format msgid "replace ref '%s' not found" msgstr "Ersetzende Referenz '%s' nicht gefunden." -#: builtin/replace.c:137 +#: builtin/replace.c:141 #, c-format msgid "Deleted replace ref '%s'" msgstr "Ersetzende Referenz '%s' gelöscht." -#: builtin/replace.c:149 +#: builtin/replace.c:153 #, c-format msgid "'%s' is not a valid ref name" msgstr "'%s' ist kein gültiger Referenzname." -#: builtin/replace.c:154 +#: builtin/replace.c:158 #, c-format msgid "replace ref '%s' already exists" msgstr "Ersetzende Referenz '%s' existiert bereits." -#: builtin/replace.c:174 +#: builtin/replace.c:178 #, c-format msgid "" "Objects must be of the same type.\n" @@ -17584,76 +18437,81 @@ msgstr "" "während '%s' auf ein ersetzendes Objekt vom Typ '%s'\n" "zeigt." -#: builtin/replace.c:225 +#: builtin/replace.c:229 #, c-format msgid "unable to open %s for writing" msgstr "Konnte '%s' nicht zum Schreiben öffnen." -#: builtin/replace.c:238 +#: builtin/replace.c:242 msgid "cat-file reported failure" msgstr "cat-file meldete Fehler." -#: builtin/replace.c:254 +#: builtin/replace.c:258 #, c-format msgid "unable to open %s for reading" msgstr "Konnte '%s' nicht zum Lesen öffnen." -#: builtin/replace.c:268 +#: builtin/replace.c:272 msgid "unable to spawn mktree" msgstr "Konnte mktree nicht ausführen." -#: builtin/replace.c:272 +#: builtin/replace.c:276 msgid "unable to read from mktree" msgstr "Konnte nicht von mktree lesen." -#: builtin/replace.c:281 +#: builtin/replace.c:285 msgid "mktree reported failure" msgstr "mktree meldete Fehler." -#: builtin/replace.c:285 +#: builtin/replace.c:289 msgid "mktree did not return an object name" msgstr "mktree lieferte keinen Objektnamen zurück." -#: builtin/replace.c:294 +#: builtin/replace.c:298 #, c-format msgid "unable to fstat %s" msgstr "Kann fstat auf %s nicht ausführen." -#: builtin/replace.c:299 +#: builtin/replace.c:303 msgid "unable to write object to database" msgstr "Konnte Objekt nicht in Datenbank schreiben." -#: builtin/replace.c:318 builtin/replace.c:371 builtin/replace.c:415 -#: builtin/replace.c:445 +#: builtin/replace.c:322 builtin/replace.c:377 builtin/replace.c:422 +#: builtin/replace.c:452 #, c-format msgid "not a valid object name: '%s'" msgstr "Kein gültiger Objektname: '%s'" -#: builtin/replace.c:322 +#: builtin/replace.c:326 #, c-format msgid "unable to get object type for %s" msgstr "Konnte Objektart von %s nicht bestimmten." -#: builtin/replace.c:338 +#: builtin/replace.c:342 msgid "editing object file failed" msgstr "Bearbeiten von Objektdatei fehlgeschlagen." -#: builtin/replace.c:347 +#: builtin/replace.c:351 #, c-format msgid "new object is the same as the old one: '%s'" msgstr "Neues Objekt ist dasselbe wie das alte: '%s'" -#: builtin/replace.c:407 +#: builtin/replace.c:383 +#, c-format +msgid "could not parse %s as a commit" +msgstr "Konnte nicht %s als Commit parsen." + +#: builtin/replace.c:414 #, c-format msgid "bad mergetag in commit '%s'" msgstr "ungültiger Merge-Tag in Commit '%s'" -#: builtin/replace.c:409 +#: builtin/replace.c:416 #, c-format msgid "malformed mergetag in commit '%s'" msgstr "fehlerhafter Merge-Tag in Commit '%s'" -#: builtin/replace.c:421 +#: builtin/replace.c:428 #, c-format msgid "" "original commit '%s' contains mergetag '%s' that is discarded; use --edit " @@ -17662,31 +18520,31 @@ msgstr "" "Der ursprüngliche Commit '%s' enthält Merge-Tag '%s', der verworfen\n" "wird; benutzen Sie --edit anstatt --graft" -#: builtin/replace.c:460 +#: builtin/replace.c:467 #, c-format msgid "the original commit '%s' has a gpg signature" msgstr "Der originale Commit '%s' hat eine GPG-Signatur." -#: builtin/replace.c:461 +#: builtin/replace.c:468 msgid "the signature will be removed in the replacement commit!" msgstr "Die Signatur wird in dem Ersetzungs-Commit entfernt!" -#: builtin/replace.c:471 +#: builtin/replace.c:478 #, c-format msgid "could not write replacement commit for: '%s'" msgstr "Konnte Ersetzungs-Commit für '%s' nicht schreiben" -#: builtin/replace.c:479 +#: builtin/replace.c:486 #, c-format msgid "graft for '%s' unnecessary" msgstr "Künstlicher Vorgänger (\"graft\") für '%s' nicht notwendig." -#: builtin/replace.c:482 +#: builtin/replace.c:490 #, c-format msgid "new commit is the same as the old one: '%s'" msgstr "Neuer Commit ist derselbe wie der alte: '%s'" -#: builtin/replace.c:515 +#: builtin/replace.c:525 #, c-format msgid "" "could not convert the following graft(s):\n" @@ -17695,71 +18553,71 @@ msgstr "" "Konnte die folgenden künstlichen Vorgänger (\"grafts\") nicht konvertieren:\n" "%s" -#: builtin/replace.c:536 +#: builtin/replace.c:546 msgid "list replace refs" msgstr "ersetzende Referenzen auflisten" -#: builtin/replace.c:537 +#: builtin/replace.c:547 msgid "delete replace refs" msgstr "ersetzende Referenzen löschen" -#: builtin/replace.c:538 +#: builtin/replace.c:548 msgid "edit existing object" msgstr "existierendes Objekt bearbeiten" -#: builtin/replace.c:539 +#: builtin/replace.c:549 msgid "change a commit's parents" msgstr "Eltern-Commits eines Commits ändern" -#: builtin/replace.c:540 +#: builtin/replace.c:550 msgid "convert existing graft file" msgstr "existierende Datei des künstlichen Vorgängers (\"graft\") konvertieren" -#: builtin/replace.c:541 +#: builtin/replace.c:551 msgid "replace the ref if it exists" msgstr "die Referenz ersetzen, wenn sie existiert" -#: builtin/replace.c:543 +#: builtin/replace.c:553 msgid "do not pretty-print contents for --edit" msgstr "keine ansprechende Anzeige des Objektinhaltes für --edit" -#: builtin/replace.c:544 +#: builtin/replace.c:554 msgid "use this format" msgstr "das angegebene Format benutzen" -#: builtin/replace.c:557 +#: builtin/replace.c:567 msgid "--format cannot be used when not listing" msgstr "--format kann nicht beim Auflisten verwendet werden." -#: builtin/replace.c:565 +#: builtin/replace.c:575 msgid "-f only makes sense when writing a replacement" msgstr "-f macht nur beim Schreiben einer Ersetzung Sinn." -#: builtin/replace.c:569 +#: builtin/replace.c:579 msgid "--raw only makes sense with --edit" msgstr "--raw macht nur mit --edit Sinn." -#: builtin/replace.c:575 +#: builtin/replace.c:585 msgid "-d needs at least one argument" msgstr "-d benötigt mindestens ein Argument." -#: builtin/replace.c:581 +#: builtin/replace.c:591 msgid "bad number of arguments" msgstr "Ungültige Anzahl von Argumenten." -#: builtin/replace.c:587 +#: builtin/replace.c:597 msgid "-e needs exactly one argument" msgstr "-e benötigt genau ein Argument." -#: builtin/replace.c:593 +#: builtin/replace.c:603 msgid "-g needs at least one argument" msgstr "-g benötigt mindestens ein Argument." -#: builtin/replace.c:599 +#: builtin/replace.c:609 msgid "--convert-graft-file takes no argument" msgstr "--convert-graft-file erwartet keine Argumente" -#: builtin/replace.c:605 +#: builtin/replace.c:615 msgid "only one pattern can be given with -l" msgstr "Mit -l kann nur ein Muster angegeben werden." @@ -17832,9 +18690,10 @@ msgstr "Fehler beim Finden des \"Tree\"-Objektes von %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:293 +#: builtin/reset.c:293 builtin/stash.c:514 builtin/stash.c:589 +#: builtin/stash.c:613 msgid "be quiet, only report errors" -msgstr "weniger Ausgaben, meldet nur Fehler" +msgstr "weniger Ausgaben, nur Fehler melden" #: builtin/reset.c:295 msgid "reset HEAD and index" @@ -17870,31 +18729,31 @@ msgstr "Konnte '%s' nicht als gültiges \"Tree\"-Objekt auflösen." msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "--patch ist inkompatibel mit --{hard,mixed,soft}" -#: builtin/reset.c:352 +#: builtin/reset.c:353 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "" "--mixed mit Pfaden ist veraltet; benutzen Sie stattdessen 'git reset -- " "<Pfade>'." -#: builtin/reset.c:354 +#: builtin/reset.c:355 #, c-format msgid "Cannot do %s reset with paths." msgstr "Ein '%s'-Reset mit Pfaden ist nicht möglich." -#: builtin/reset.c:364 +#: builtin/reset.c:370 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "'%s'-Reset ist in einem Bare-Repository nicht erlaubt" -#: builtin/reset.c:368 +#: builtin/reset.c:374 msgid "-N can only be used with --mixed" msgstr "-N kann nur mit -mixed benutzt werden" -#: builtin/reset.c:388 +#: builtin/reset.c:395 msgid "Unstaged changes after reset:" msgstr "Nicht zum Commit vorgemerkte Änderungen nach Zurücksetzung:" -#: builtin/reset.c:391 +#: builtin/reset.c:398 #, c-format msgid "" "\n" @@ -17908,34 +18767,34 @@ msgstr "" "das zu verhindern. Setzen Sie die Konfigurationseinstellung reset.quiet\n" "auf \"true\", um das zum Standard zu machen.\n" -#: builtin/reset.c:401 +#: builtin/reset.c:408 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "Konnte Index-Datei nicht zu Commit '%s' setzen." -#: builtin/reset.c:405 +#: builtin/reset.c:412 msgid "Could not write new index file." msgstr "Konnte neue Index-Datei nicht schreiben." -#: builtin/rev-list.c:406 +#: builtin/rev-list.c:405 msgid "cannot combine --exclude-promisor-objects and --missing" msgstr "" "--exclude-promisor-objects und --missing können nicht kombiniert werden." -#: builtin/rev-list.c:464 +#: builtin/rev-list.c:466 msgid "object filtering requires --objects" msgstr "Das Filtern von Objekten erfordert --objects." -#: builtin/rev-list.c:467 +#: builtin/rev-list.c:469 #, c-format msgid "invalid sparse value '%s'" msgstr "Ungültiger \"sparse\"-Wert '%s'." -#: builtin/rev-list.c:508 +#: builtin/rev-list.c:510 msgid "rev-list does not support display of notes" msgstr "rev-list unterstützt keine Anzeige von Notizen" -#: builtin/rev-list.c:511 +#: builtin/rev-list.c:513 msgid "cannot combine --use-bitmap-index with object filtering" msgstr "" "--use-bitmap-index kann nicht mit dem Filtern von Objekten kombiniert werden." @@ -17998,59 +18857,59 @@ msgstr "Option `%s' erwartet eine Nummer größer als 0." msgid "%s: %s cannot be used with %s" msgstr "%s: %s kann nicht mit %s verwendet werden" -#: builtin/revert.c:101 +#: builtin/revert.c:102 msgid "end revert or cherry-pick sequence" msgstr "\"revert\" oder \"cherry-pick\" Ablauf beenden" -#: builtin/revert.c:102 +#: builtin/revert.c:103 msgid "resume revert or cherry-pick sequence" msgstr "\"revert\" oder \"cherry-pick\" Ablauf fortsetzen" -#: builtin/revert.c:103 +#: builtin/revert.c:104 msgid "cancel revert or cherry-pick sequence" msgstr "\"revert\" oder \"cherry-pick\" Ablauf abbrechen" -#: builtin/revert.c:104 +#: builtin/revert.c:106 msgid "don't automatically commit" msgstr "nicht automatisch committen" -#: builtin/revert.c:105 +#: builtin/revert.c:107 msgid "edit the commit message" msgstr "Commit-Beschreibung bearbeiten" -#: builtin/revert.c:108 +#: builtin/revert.c:110 msgid "parent-number" msgstr "Nummer des Elternteils" -#: builtin/revert.c:109 +#: builtin/revert.c:111 msgid "select mainline parent" msgstr "Elternteil der Hauptlinie auswählen" -#: builtin/revert.c:111 +#: builtin/revert.c:113 msgid "merge strategy" msgstr "Merge-Strategie" -#: builtin/revert.c:113 +#: builtin/revert.c:115 msgid "option for merge strategy" msgstr "Option für Merge-Strategie" -#: builtin/revert.c:122 +#: builtin/revert.c:124 msgid "append commit name" msgstr "Commit-Namen anhängen" -#: builtin/revert.c:124 +#: builtin/revert.c:126 msgid "preserve initially empty commits" msgstr "ursprüngliche, leere Commits erhalten" -#: builtin/revert.c:126 +#: builtin/revert.c:128 msgid "keep redundant, empty commits" msgstr "redundante, leere Commits behalten" -#: builtin/revert.c:220 +#: builtin/revert.c:227 msgid "revert failed" msgstr "\"revert\" fehlgeschlagen" -#: builtin/revert.c:233 +#: builtin/revert.c:240 msgid "cherry-pick failed" msgstr "\"cherry-pick\" fehlgeschlagen" @@ -18167,18 +19026,6 @@ msgstr "Referenzen von der Standard-Eingabe lesen" msgid "print status from remote helper" msgstr "Status des Remote-Helpers ausgeben" -#: builtin/serve.c:7 -msgid "git serve [<options>]" -msgstr "git serve [<Optionen>]" - -#: builtin/serve.c:17 builtin/upload-pack.c:23 -msgid "quit after a single request/response exchange" -msgstr "nach einem einzigen Request/Response-Austausch beenden" - -#: builtin/serve.c:19 -msgid "exit immediately after advertising capabilities" -msgstr "direkt nach Anzeige der angebotenen Fähigkeiten beenden" - #: builtin/shortlog.c:14 msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]" msgstr "git shortlog [<Optionen>] [<Commitbereich>] [[--] <Pfad>...]" @@ -18335,24 +19182,24 @@ msgstr[1] "nur %d Einträge können zur selben Zeit angezeigt werden" msgid "no such ref %s" msgstr "Referenz nicht gefunden: %s" -#: builtin/show-branch.c:830 +#: builtin/show-branch.c:832 #, c-format msgid "cannot handle more than %d rev." msgid_plural "cannot handle more than %d revs." msgstr[0] "Kann nicht mehr als %d Commit behandeln." msgstr[1] "Kann nicht mehr als %d Commits behandeln." -#: builtin/show-branch.c:834 +#: builtin/show-branch.c:836 #, c-format msgid "'%s' is not a valid ref." msgstr "'%s' ist keine gültige Referenz." -#: builtin/show-branch.c:837 +#: builtin/show-branch.c:839 #, c-format msgid "cannot find commit %s (%s)" msgstr "kann Commit %s (%s) nicht finden" -#: builtin/show-ref.c:11 +#: builtin/show-ref.c:12 msgid "" "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]" @@ -18360,46 +19207,275 @@ msgstr "" "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<Muster>...] " -#: builtin/show-ref.c:12 +#: builtin/show-ref.c:13 msgid "git show-ref --exclude-existing[=<pattern>]" msgstr "git show-ref --exclude-existing[=<Muster>]" -#: builtin/show-ref.c:161 +#: builtin/show-ref.c:162 msgid "only show tags (can be combined with heads)" msgstr "nur Tags anzeigen (kann mit \"heads\" kombiniert werden)" -#: builtin/show-ref.c:162 +#: builtin/show-ref.c:163 msgid "only show heads (can be combined with tags)" msgstr "nur Branches anzeigen (kann mit \"tags\" kombiniert werden)" -#: builtin/show-ref.c:163 +#: builtin/show-ref.c:164 msgid "stricter reference checking, requires exact ref path" msgstr "strengere Referenzprüfung, erfordert exakten Referenzpfad" -#: builtin/show-ref.c:166 builtin/show-ref.c:168 +#: builtin/show-ref.c:167 builtin/show-ref.c:169 msgid "show the HEAD reference, even if it would be filtered out" msgstr "" "die HEAD-Referenz anzeigen, selbst wenn diese ausgefiltert werden würde" -#: builtin/show-ref.c:170 +#: builtin/show-ref.c:171 msgid "dereference tags into object IDs" msgstr "Tags in Objekt-Identifikationen dereferenzieren" -#: builtin/show-ref.c:172 +#: builtin/show-ref.c:173 msgid "only show SHA1 hash using <n> digits" msgstr "nur SHA1 Hash mit <n> Ziffern anzeigen" -#: builtin/show-ref.c:176 +#: builtin/show-ref.c:177 msgid "do not print results to stdout (useful with --verify)" msgstr "" "keine Ausgabe der Ergebnisse in die Standard-Ausgabe (nützlich mit --verify)" -#: builtin/show-ref.c:178 +#: builtin/show-ref.c:179 msgid "show refs from stdin that aren't in local repository" msgstr "" "Referenzen von der Standard-Eingabe anzeigen, die sich nicht im lokalen " "Repository befinden" +#: builtin/stash.c:22 builtin/stash.c:37 +msgid "git stash list [<options>]" +msgstr "git stash list [<Optionen>]" + +#: builtin/stash.c:23 builtin/stash.c:42 +msgid "git stash show [<options>] [<stash>]" +msgstr "git stash show [<Optionen>] [<Stash>]" + +#: builtin/stash.c:24 builtin/stash.c:47 +msgid "git stash drop [-q|--quiet] [<stash>]" +msgstr "git stash drop [-q|--quiet] [<Stash>]" + +#: builtin/stash.c:25 +msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" +msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<Stash>]" + +#: builtin/stash.c:26 builtin/stash.c:62 +msgid "git stash branch <branchname> [<stash>]" +msgstr "git stash branch <Branch> [<Stash>]" + +#: builtin/stash.c:27 builtin/stash.c:67 +msgid "git stash clear" +msgstr "git stash clear" + +#: builtin/stash.c:28 builtin/stash.c:77 +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 <Nachricht>]\n" +" [--] [<Pfadspezifikation>...]]" + +#: builtin/stash.c:31 builtin/stash.c:84 +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] [<Nachricht>]" + +#: builtin/stash.c:52 +msgid "git stash pop [--index] [-q|--quiet] [<stash>]" +msgstr "git stash pop [--index] [-q|--quiet] [<Stash>]" + +#: builtin/stash.c:57 +msgid "git stash apply [--index] [-q|--quiet] [<stash>]" +msgstr "git stash apply [--index] [-q|--quiet] [<Stash>]" + +#: builtin/stash.c:72 +msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>" +msgstr "git stash store [-m|--message <Nachricht>] [-q|--quiet] <Commit>" + +#: builtin/stash.c:127 +#, c-format +msgid "'%s' is not a stash-like commit" +msgstr "'%s' ist kein \"stash\"-artiger Commit" + +#: builtin/stash.c:147 +#, c-format +msgid "Too many revisions specified:%s" +msgstr "Zu viele Commits angegeben:%s" + +#: builtin/stash.c:161 git-legacy-stash.sh:548 +msgid "No stash entries found." +msgstr "Keine Stash-Einträge gefunden." + +#: builtin/stash.c:175 +#, c-format +msgid "%s is not a valid reference" +msgstr "'%s' ist kein gültiger Referenzname." + +#: builtin/stash.c:224 git-legacy-stash.sh:75 +msgid "git stash clear with parameters is unimplemented" +msgstr "git stash clear mit Parametern ist nicht implementiert" + +#: builtin/stash.c:403 +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:414 +#, c-format +msgid "could not generate diff %s^!." +msgstr "Konnte keinen Diff erzeugen %s^!." + +#: builtin/stash.c:421 +msgid "conflicts in index.Try without --index." +msgstr "Konflikte im Index. Versuchen Sie es ohne --index." + +#: builtin/stash.c:427 +msgid "could not save index tree" +msgstr "Konnte Index-Verzeichnis nicht speichern" + +#: builtin/stash.c:434 +msgid "could not restore untracked files from stash" +msgstr "Konnte unversionierte Dateien vom Stash nicht wiederherstellen." + +#: builtin/stash.c:448 +#, c-format +msgid "Merging %s with %s" +msgstr "Führe %s mit %s zusammen" + +#: builtin/stash.c:458 git-legacy-stash.sh:680 +msgid "Index was not unstashed." +msgstr "Index wurde nicht aus dem Stash zurückgeladen." + +#: builtin/stash.c:516 builtin/stash.c:615 +msgid "attempt to recreate the index" +msgstr "Versuche Index wiederherzustellen." + +#: builtin/stash.c:549 +#, c-format +msgid "Dropped %s (%s)" +msgstr "%s (%s) gelöscht" + +#: builtin/stash.c:552 +#, c-format +msgid "%s: Could not drop stash entry" +msgstr "%s: Konnte Stash-Eintrag nicht löschen" + +#: builtin/stash.c:577 +#, c-format +msgid "'%s' is not a stash reference" +msgstr "'%s' ist keine Stash-Referenz" + +#: builtin/stash.c:627 git-legacy-stash.sh:694 +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:650 git-legacy-stash.sh:712 +msgid "No branch name specified" +msgstr "Kein Branchname spezifiziert" + +#: builtin/stash.c:789 builtin/stash.c:826 +#, c-format +msgid "Cannot update %s with %s" +msgstr "Kann nicht %s mit %s aktualisieren." + +#: builtin/stash.c:807 builtin/stash.c:1474 builtin/stash.c:1510 +msgid "stash message" +msgstr "Stash-Beschreibung" + +#: builtin/stash.c:817 +msgid "\"git stash store\" requires one <commit> argument" +msgstr "\"git stash store\" erwartet ein Argument <Commit>" + +#: builtin/stash.c:1039 git-legacy-stash.sh:217 +msgid "No changes selected" +msgstr "Keine Änderungen ausgewählt" + +#: builtin/stash.c:1135 git-legacy-stash.sh:150 +msgid "You do not have the initial commit yet" +msgstr "Sie haben bisher noch keinen initialen Commit" + +#: builtin/stash.c:1162 git-legacy-stash.sh:165 +msgid "Cannot save the current index state" +msgstr "Kann den aktuellen Zustand des Index nicht speichern" + +#: builtin/stash.c:1171 git-legacy-stash.sh:180 +msgid "Cannot save the untracked files" +msgstr "Kann die unversionierten Dateien nicht speichern" + +#: builtin/stash.c:1182 builtin/stash.c:1191 git-legacy-stash.sh:200 +#: git-legacy-stash.sh:213 +msgid "Cannot save the current worktree state" +msgstr "Kann den aktuellen Zustand des Arbeitsverzeichnisses nicht speichern" + +#: builtin/stash.c:1219 git-legacy-stash.sh:233 +msgid "Cannot record working tree state" +msgstr "Kann Zustand des Arbeitsverzeichnisses nicht aufzeichnen" + +#: builtin/stash.c:1268 git-legacy-stash.sh:337 +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:1284 +msgid "Did you forget to 'git add'?" +msgstr "Haben Sie vielleicht 'git add' vergessen?" + +#: builtin/stash.c:1299 git-legacy-stash.sh:345 +msgid "No local changes to save" +msgstr "Keine lokalen Änderungen zum Speichern" + +#: builtin/stash.c:1306 git-legacy-stash.sh:350 +msgid "Cannot initialize stash" +msgstr "Kann \"stash\" nicht initialisieren" + +#: builtin/stash.c:1321 git-legacy-stash.sh:354 +msgid "Cannot save the current status" +msgstr "Kann den aktuellen Status nicht speichern" + +#: builtin/stash.c:1326 +#, c-format +msgid "Saved working directory and index state %s" +msgstr "Arbeitsverzeichnis und Index-Status %s gespeichert." + +#: builtin/stash.c:1430 git-legacy-stash.sh:384 +msgid "Cannot remove worktree changes" +msgstr "Kann Änderungen im Arbeitsverzeichnis nicht löschen" + +#: builtin/stash.c:1465 builtin/stash.c:1501 +msgid "keep index" +msgstr "behalte Index" + +#: builtin/stash.c:1467 builtin/stash.c:1503 +msgid "stash in patch mode" +msgstr "Stash in Patch-Modus" + +#: builtin/stash.c:1468 builtin/stash.c:1504 +msgid "quiet mode" +msgstr "weniger Ausgaben" + +#: builtin/stash.c:1470 builtin/stash.c:1506 +msgid "include untracked files in stash" +msgstr "unversionierte Dateien in Stash einbeziehen" + +#: builtin/stash.c:1472 builtin/stash.c:1508 +msgid "include ignore files" +msgstr "ignorierte Dateien einbeziehen" + +#: builtin/stash.c:1568 +#, c-format +msgid "could not exec %s" +msgstr "Konnte 'exec %s' nicht ausführen." + #: builtin/stripspace.c:18 msgid "git stripspace [-s | --strip-comments]" msgstr "git stripspace [-s | --strip-comments]" @@ -18418,7 +19494,7 @@ msgstr "" msgid "prepend comment character and space to each line" msgstr "Kommentarzeichen mit Leerzeichen an jede Zeile voranstellen" -#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1943 +#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1942 #, c-format msgid "Expecting a full ref name, got %s" msgstr "Vollständiger Referenzname erwartet, %s erhalten" @@ -18483,8 +19559,8 @@ msgid "Recurse into nested submodules" msgstr "Rekursion in verschachtelte Submodule durchführen" #: builtin/submodule--helper.c:569 -msgid "git submodule--helper foreach [--quiet] [--recursive] <command>" -msgstr "git submodule--helper foreach [--quiet] [--recursive] <Befehl>" +msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>" +msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <Befehl>" #: builtin/submodule--helper.c:596 #, c-format @@ -18523,8 +19599,8 @@ msgid "Suppress output for initializing a submodule" msgstr "Ausgaben bei Initialisierung eines Submoduls unterdrücken" #: builtin/submodule--helper.c:712 -msgid "git submodule--helper init [<path>]" -msgstr "git submodule--helper init [<Pfad>]" +msgid "git submodule--helper init [<options>] [<path>]" +msgstr "git submodule--helper init [<Optionen>] [<Pfad>]" #: builtin/submodule--helper.c:784 builtin/submodule--helper.c:910 #, c-format @@ -18684,7 +19760,7 @@ msgstr "URL von der das Submodul geklont wird" msgid "depth for shallow clones" msgstr "Tiefe des Klons mit unvollständiger Historie (shallow)" -#: builtin/submodule--helper.c:1387 builtin/submodule--helper.c:1872 +#: builtin/submodule--helper.c:1387 builtin/submodule--helper.c:1871 msgid "force cloning progress" msgstr "Fortschrittsanzeige beim Klonen erzwingen" @@ -18747,49 +19823,49 @@ msgstr "Fehler beim Klonen von '%s'. Weiterer Versuch geplant" msgid "Failed to clone '%s' a second time, aborting" msgstr "Zweiter Versuch '%s' zu klonen fehlgeschlagen, breche ab." -#: builtin/submodule--helper.c:1851 builtin/submodule--helper.c:2093 +#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:2092 msgid "path into the working tree" msgstr "Pfad zum Arbeitsverzeichnis" -#: builtin/submodule--helper.c:1854 +#: builtin/submodule--helper.c:1853 msgid "path into the working tree, across nested submodule boundaries" msgstr "" "Pfad zum Arbeitsverzeichnis, über verschachtelte Submodul-Grenzen hinweg" -#: builtin/submodule--helper.c:1858 +#: builtin/submodule--helper.c:1857 msgid "rebase, merge, checkout or none" msgstr "rebase, merge, checkout oder none" -#: builtin/submodule--helper.c:1864 +#: builtin/submodule--helper.c:1863 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." -#: builtin/submodule--helper.c:1867 +#: builtin/submodule--helper.c:1866 msgid "parallel jobs" msgstr "Parallele Ausführungen" -#: builtin/submodule--helper.c:1869 +#: builtin/submodule--helper.c:1868 msgid "whether the initial clone should follow the shallow recommendation" msgstr "" "ob das initiale Klonen den Empfehlungen für eine unvollständige\n" "Historie (shallow) folgen soll" -#: builtin/submodule--helper.c:1870 +#: builtin/submodule--helper.c:1869 msgid "don't print cloning progress" msgstr "keine Fortschrittsanzeige beim Klonen" -#: builtin/submodule--helper.c:1877 +#: builtin/submodule--helper.c:1876 msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" msgstr "git submodule--helper update_clone [--prefix=<Pfad>] [<Pfad>...]" -#: builtin/submodule--helper.c:1890 +#: builtin/submodule--helper.c:1889 msgid "bad value for update parameter" msgstr "Fehlerhafter Wert für --update Parameter" -#: builtin/submodule--helper.c:1938 +#: builtin/submodule--helper.c:1937 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " @@ -18798,44 +19874,52 @@ msgstr "" "Branch von Submodul (%s) ist konfiguriert, den Branch des Hauptprojektes\n" "zu erben, aber das Hauptprojekt befindet sich auf keinem Branch." -#: builtin/submodule--helper.c:2061 +#: builtin/submodule--helper.c:2060 #, c-format msgid "could not get a repository handle for submodule '%s'" msgstr "Konnte kein Repository-Handle für Submodul '%s' erhalten." -#: builtin/submodule--helper.c:2094 +#: builtin/submodule--helper.c:2093 msgid "recurse into submodules" msgstr "Rekursion in Submodule durchführen" -#: builtin/submodule--helper.c:2100 -msgid "git submodule--helper embed-git-dir [<path>...]" -msgstr "git submodule--helper embed-git-dir [<Pfad>...]" +#: builtin/submodule--helper.c:2099 +msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" +msgstr "git submodule--helper absorb-git-dirs [<Optionen>] [<Pfad>...]" #: builtin/submodule--helper.c:2156 msgid "check if it is safe to write to the .gitmodules file" msgstr "prüfen, ob es sicher ist, in die Datei .gitmodules zu schreiben" -#: builtin/submodule--helper.c:2161 -msgid "git submodule--helper config name [value]" -msgstr "git submodule--helper config name [Wert]" +#: builtin/submodule--helper.c:2159 +msgid "unset the config in the .gitmodules file" +msgstr "Konfiguration in der .gitmodules-Datei entfernen" -#: builtin/submodule--helper.c:2162 +#: builtin/submodule--helper.c:2164 +msgid "git submodule--helper config <name> [<value>]" +msgstr "git submodule--helper config <name> [<Wert>]" + +#: builtin/submodule--helper.c:2165 +msgid "git submodule--helper config --unset <name>" +msgstr "git submodule--helper config --unset <Name>" + +#: builtin/submodule--helper.c:2166 msgid "git submodule--helper config --check-writeable" msgstr "git submodule--helper config --check-writeable" -#: builtin/submodule--helper.c:2179 git-submodule.sh:169 +#: builtin/submodule--helper.c:2185 git-submodule.sh:171 #, sh-format msgid "please make sure that the .gitmodules file is in the working tree" msgstr "" "Bitte stellen Sie sicher, dass sich die Datei .gitmodules im " "Arbeitsverzeichnis befindet." -#: builtin/submodule--helper.c:2229 git.c:413 git.c:658 +#: builtin/submodule--helper.c:2235 git.c:433 git.c:685 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s unterstützt kein --super-prefix" -#: builtin/submodule--helper.c:2235 +#: builtin/submodule--helper.c:2241 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "'%s' ist kein gültiger Unterbefehl von submodule--helper" @@ -18871,17 +19955,17 @@ msgstr "Grund für die Aktualisierung" #: builtin/tag.c:25 msgid "" -"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> " -"[<head>]" +"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n" +"\t\t<tagname> [<head>]" msgstr "" -"git tag [-a | -s | -u <Schlüssel-id>] [-f] [-m <Beschreibung> | -F <Datei>] " -"<Tagname> [<Commit>]" +"git tag [-a | -s | -u <Schlüssel-id>] [-f] [-m <Beschreibung> | -F <Datei>]\n" +"\t\t<Tagname> [<Commit>]" -#: builtin/tag.c:26 +#: builtin/tag.c:27 msgid "git tag -d <tagname>..." msgstr "git tag -d <Tagname>..." -#: builtin/tag.c:27 +#: builtin/tag.c:28 msgid "" "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--" "points-at <object>]\n" @@ -18891,21 +19975,21 @@ msgstr "" "points-at <Objekt>]\n" "\t\t[--format=<Muster>] [--[no-]merged [<Commit>]] [<Muster>...]" -#: builtin/tag.c:29 +#: builtin/tag.c:30 msgid "git tag -v [--format=<format>] <tagname>..." msgstr "git tag -v [--format=<Format>] <Tagname>..." -#: builtin/tag.c:87 +#: builtin/tag.c:88 #, c-format msgid "tag '%s' not found." msgstr "Tag '%s' nicht gefunden." -#: builtin/tag.c:103 +#: builtin/tag.c:104 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "Tag '%s' gelöscht (war %s)\n" -#: builtin/tag.c:133 +#: builtin/tag.c:134 #, c-format msgid "" "\n" @@ -18918,7 +20002,7 @@ msgstr "" " %s\n" "ein. Zeilen, die mit '%c' beginnen, werden ignoriert.\n" -#: builtin/tag.c:137 +#: builtin/tag.c:138 #, c-format msgid "" "\n" @@ -18933,146 +20017,160 @@ msgstr "" "ein. Zeilen, die mit '%c' beginnen, werden behalten; Sie dürfen diese\n" "selbst entfernen wenn Sie möchten.\n" -#: builtin/tag.c:191 +#: builtin/tag.c:192 msgid "unable to sign the tag" msgstr "konnte Tag nicht signieren" -#: builtin/tag.c:193 +#: builtin/tag.c:194 msgid "unable to write tag file" msgstr "konnte Tag-Datei nicht schreiben" -#: builtin/tag.c:218 +#: builtin/tag.c:210 +#, c-format +msgid "" +"You have created a nested tag. The object referred to by your new tag is\n" +"already a tag. If you meant to tag the object that it points to, use:\n" +"\n" +"\tgit tag -f %s %s^{}" +msgstr "" +"Sie haben einen verschachtelten Tag erzeugt. Das Objekt, auf welches Ihr\n" +"neues Tag referenziert, ist bereits ein Tag. Wenn Sie das Objekt taggen\n" +"wollten, worauf dieses zeigt, nutzen Sie:\n" +"\n" +"\tgit tag -f %s %s^{}" + +#: builtin/tag.c:226 msgid "bad object type." msgstr "ungültiger Objekt-Typ" -#: builtin/tag.c:267 +#: builtin/tag.c:278 msgid "no tag message?" msgstr "keine Tag-Beschreibung?" -#: builtin/tag.c:274 +#: builtin/tag.c:285 #, c-format msgid "The tag message has been left in %s\n" msgstr "Die Tag-Beschreibung wurde in %s gelassen\n" -#: builtin/tag.c:385 +#: builtin/tag.c:396 msgid "list tag names" msgstr "Tagnamen auflisten" -#: builtin/tag.c:387 +#: builtin/tag.c:398 msgid "print <n> lines of each tag message" msgstr "<n> Zeilen jeder Tag-Beschreibung anzeigen" -#: builtin/tag.c:389 +#: builtin/tag.c:400 msgid "delete tags" msgstr "Tags löschen" -#: builtin/tag.c:390 +#: builtin/tag.c:401 msgid "verify tags" msgstr "Tags überprüfen" -#: builtin/tag.c:392 +#: builtin/tag.c:403 msgid "Tag creation options" msgstr "Optionen für Erstellung von Tags" -#: builtin/tag.c:394 +#: builtin/tag.c:405 msgid "annotated tag, needs a message" msgstr "annotiertes Tag, benötigt eine Beschreibung" -#: builtin/tag.c:396 +#: builtin/tag.c:407 msgid "tag message" msgstr "Tag-Beschreibung" -#: builtin/tag.c:398 +#: builtin/tag.c:409 msgid "force edit of tag message" msgstr "Bearbeitung der Tag-Beschreibung erzwingen" -#: builtin/tag.c:399 +#: builtin/tag.c:410 msgid "annotated and GPG-signed tag" msgstr "annotiertes und GPG-signiertes Tag" -#: builtin/tag.c:403 +#: builtin/tag.c:413 msgid "use another key to sign the tag" msgstr "einen anderen Schlüssel verwenden, um das Tag zu signieren" -#: builtin/tag.c:404 +#: builtin/tag.c:414 msgid "replace the tag if exists" msgstr "das Tag ersetzen, wenn es existiert" -#: builtin/tag.c:405 builtin/update-ref.c:369 +#: builtin/tag.c:415 builtin/update-ref.c:369 msgid "create a reflog" msgstr "Reflog erstellen" -#: builtin/tag.c:407 +#: builtin/tag.c:417 msgid "Tag listing options" msgstr "Optionen für Auflistung der Tags" -#: builtin/tag.c:408 +#: builtin/tag.c:418 msgid "show tag list in columns" msgstr "Liste der Tags in Spalten anzeigen" -#: builtin/tag.c:409 builtin/tag.c:411 +#: builtin/tag.c:419 builtin/tag.c:421 msgid "print only tags that contain the commit" msgstr "nur Tags ausgeben, die diesen Commit beinhalten" -#: builtin/tag.c:410 builtin/tag.c:412 +#: builtin/tag.c:420 builtin/tag.c:422 msgid "print only tags that don't contain the commit" msgstr "nur Tags ausgeben, die diesen Commit nicht enthalten" -#: builtin/tag.c:413 +#: builtin/tag.c:423 msgid "print only tags that are merged" msgstr "nur Tags ausgeben, die gemerged wurden" -#: builtin/tag.c:414 +#: builtin/tag.c:424 msgid "print only tags that are not merged" msgstr "nur Tags ausgeben, die nicht gemerged wurden" -#: builtin/tag.c:419 +#: builtin/tag.c:428 msgid "print only tags of the object" msgstr "nur Tags von dem Objekt ausgeben" -#: builtin/tag.c:463 +#: builtin/tag.c:472 msgid "--column and -n are incompatible" msgstr "--column und -n sind inkompatibel" -#: builtin/tag.c:485 +#: builtin/tag.c:494 msgid "-n option is only allowed in list mode" msgstr "Die Option -n ist nur im Listenmodus erlaubt." -#: builtin/tag.c:487 +#: builtin/tag.c:496 msgid "--contains option is only allowed in list mode" msgstr "Die Option --contains ist nur im Listenmodus erlaubt." -#: builtin/tag.c:489 +#: builtin/tag.c:498 msgid "--no-contains option is only allowed in list mode" msgstr "Die Option --no-contains ist nur im Listenmodus erlaubt." -#: builtin/tag.c:491 +#: builtin/tag.c:500 msgid "--points-at option is only allowed in list mode" msgstr "Die Option --points-at ist nur im Listenmodus erlaubt." -#: builtin/tag.c:493 +#: builtin/tag.c:502 msgid "--merged and --no-merged options are only allowed in list mode" msgstr "Die Optionen --merged und --no-merged sind nur im Listenmodus erlaubt." -#: builtin/tag.c:504 +#: builtin/tag.c:513 msgid "only one -F or -m option is allowed." msgstr "nur eine -F oder -m Option ist erlaubt." -#: builtin/tag.c:523 +#: builtin/tag.c:532 msgid "too many params" msgstr "zu viele Parameter" -#: builtin/tag.c:529 +#: builtin/tag.c:538 #, c-format msgid "'%s' is not a valid tag name." msgstr "'%s' ist kein gültiger Tagname." -#: builtin/tag.c:534 +#: builtin/tag.c:543 #, c-format msgid "tag '%s' already exists" msgstr "Tag '%s' existiert bereits" -#: builtin/tag.c:565 +#: builtin/tag.c:574 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "Tag '%s' aktualisiert (war %s)\n" @@ -19149,147 +20247,147 @@ msgstr " OK" msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [<Optionen>] [--] [<Datei>...]" -#: builtin/update-index.c:962 +#: builtin/update-index.c:971 msgid "continue refresh even when index needs update" msgstr "" "Aktualisierung fortsetzen, auch wenn der Index aktualisiert werden muss" -#: builtin/update-index.c:965 +#: builtin/update-index.c:974 msgid "refresh: ignore submodules" msgstr "Aktualisierung: ignoriert Submodule" -#: builtin/update-index.c:968 +#: builtin/update-index.c:977 msgid "do not ignore new files" msgstr "keine neuen Dateien ignorieren" -#: builtin/update-index.c:970 +#: builtin/update-index.c:979 msgid "let files replace directories and vice-versa" msgstr "Dateien Verzeichnisse ersetzen lassen, und umgedreht" -#: builtin/update-index.c:972 +#: builtin/update-index.c:981 msgid "notice files missing from worktree" msgstr "fehlende Dateien im Arbeitsverzeichnis beachten" -#: builtin/update-index.c:974 +#: builtin/update-index.c:983 msgid "refresh even if index contains unmerged entries" msgstr "" "aktualisieren, auch wenn der Index nicht zusammengeführte Einträge beinhaltet" -#: builtin/update-index.c:977 +#: builtin/update-index.c:986 msgid "refresh stat information" msgstr "Dateiinformationen aktualisieren" -#: builtin/update-index.c:981 +#: builtin/update-index.c:990 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "wie --refresh, ignoriert aber \"assume-unchanged\" Einstellung" -#: builtin/update-index.c:985 +#: builtin/update-index.c:994 msgid "<mode>,<object>,<path>" msgstr "<Modus>,<Objekt>,<Pfad>" -#: builtin/update-index.c:986 +#: builtin/update-index.c:995 msgid "add the specified entry to the index" msgstr "den angegebenen Eintrag zum Commit vormerken" -#: builtin/update-index.c:995 +#: builtin/update-index.c:1005 msgid "mark files as \"not changing\"" msgstr "diese Datei immer als unverändert betrachten" -#: builtin/update-index.c:998 +#: builtin/update-index.c:1008 msgid "clear assumed-unchanged bit" msgstr "\"assumed-unchanged\"-Bit löschen" -#: builtin/update-index.c:1001 +#: builtin/update-index.c:1011 msgid "mark files as \"index-only\"" msgstr "Dateien als \"index-only\" markieren" -#: builtin/update-index.c:1004 +#: builtin/update-index.c:1014 msgid "clear skip-worktree bit" msgstr "\"skip-worktree\"-Bit löschen" -#: builtin/update-index.c:1007 +#: builtin/update-index.c:1017 msgid "add to index only; do not add content to object database" msgstr "" "die Änderungen nur zum Commit vormerken; Inhalt wird nicht der Objekt-" "Datenbank hinzugefügt" -#: builtin/update-index.c:1009 +#: builtin/update-index.c:1019 msgid "remove named paths even if present in worktree" msgstr "" "benannte Pfade löschen, auch wenn sie sich im Arbeitsverzeichnis befinden" -#: builtin/update-index.c:1011 +#: builtin/update-index.c:1021 msgid "with --stdin: input lines are terminated by null bytes" msgstr "mit --stdin: eingegebene Zeilen sind durch NUL-Bytes abgeschlossen" -#: builtin/update-index.c:1013 +#: builtin/update-index.c:1023 msgid "read list of paths to be updated from standard input" msgstr "Liste der zu aktualisierenden Pfade von der Standard-Eingabe lesen" -#: builtin/update-index.c:1017 +#: builtin/update-index.c:1027 msgid "add entries from standard input to the index" msgstr "Einträge von der Standard-Eingabe zum Commit vormerken" -#: builtin/update-index.c:1021 +#: builtin/update-index.c:1031 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "" "wiederholtes Einpflegen der Zustände #2 und #3 für die aufgelisteten Pfade" -#: builtin/update-index.c:1025 +#: builtin/update-index.c:1035 msgid "only update entries that differ from HEAD" msgstr "nur Einträge aktualisieren, die unterschiedlich zu HEAD sind" -#: builtin/update-index.c:1029 +#: builtin/update-index.c:1039 msgid "ignore files missing from worktree" msgstr "fehlende Dateien im Arbeitsverzeichnis ignorieren" -#: builtin/update-index.c:1032 +#: builtin/update-index.c:1042 msgid "report actions to standard output" msgstr "die Aktionen in der Standard-Ausgabe ausgeben" -#: builtin/update-index.c:1034 +#: builtin/update-index.c:1044 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(für Fremdprogramme) keine gespeicherten, nicht aufgelöste Konflikte" -#: builtin/update-index.c:1038 +#: builtin/update-index.c:1048 msgid "write index in this format" msgstr "Index-Datei in diesem Format schreiben" -#: builtin/update-index.c:1040 +#: builtin/update-index.c:1050 msgid "enable or disable split index" msgstr "Splitting des Index aktivieren oder deaktivieren" -#: builtin/update-index.c:1042 +#: builtin/update-index.c:1052 msgid "enable/disable untracked cache" msgstr "Cache für unversionierte Dateien aktivieren oder deaktivieren" -#: builtin/update-index.c:1044 +#: builtin/update-index.c:1054 msgid "test if the filesystem supports untracked cache" msgstr "" "prüfen, ob das Dateisystem einen Cache für unversionierte Dateien unterstützt" -#: builtin/update-index.c:1046 +#: builtin/update-index.c:1056 msgid "enable untracked cache without testing the filesystem" msgstr "" "Cache für unversionierte Dateien ohne Prüfung des Dateisystems aktivieren" -#: builtin/update-index.c:1048 +#: builtin/update-index.c:1058 msgid "write out the index even if is not flagged as changed" msgstr "Index rausschreiben, auch wenn dieser nicht als geändert markiert ist" -#: builtin/update-index.c:1050 +#: builtin/update-index.c:1060 msgid "enable or disable file system monitor" msgstr "Dateisystem-Monitor aktivieren oder deaktivieren" -#: builtin/update-index.c:1052 +#: builtin/update-index.c:1062 msgid "mark files as fsmonitor valid" msgstr "Dateien als \"fsmonitor valid\" markieren" -#: builtin/update-index.c:1055 +#: builtin/update-index.c:1065 msgid "clear fsmonitor valid bit" msgstr "\"fsmonitor valid\"-Bit löschen" -#: builtin/update-index.c:1156 +#: builtin/update-index.c:1168 msgid "" "core.splitIndex is set to false; remove or change it, if you really want to " "enable split index" @@ -19297,7 +20395,7 @@ msgstr "" "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:1165 +#: builtin/update-index.c:1177 msgid "" "core.splitIndex is set to true; remove or change it, if you really want to " "disable split index" @@ -19305,7 +20403,7 @@ msgstr "" "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:1176 +#: builtin/update-index.c:1188 msgid "" "core.untrackedCache is set to true; remove or change it, if you really want " "to disable the untracked cache" @@ -19313,11 +20411,11 @@ 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." -#: builtin/update-index.c:1180 +#: builtin/update-index.c:1192 msgid "Untracked cache disabled" msgstr "Cache für unversionierte Dateien deaktiviert" -#: builtin/update-index.c:1188 +#: builtin/update-index.c:1200 msgid "" "core.untrackedCache is set to false; remove or change it, if you really want " "to enable the untracked cache" @@ -19326,23 +20424,23 @@ msgstr "" "dies,\n" "wenn sie wirklich den Cache für unversionierte Dateien aktivieren möchten." -#: builtin/update-index.c:1192 +#: builtin/update-index.c:1204 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "Cache für unversionierte Dateien für '%s' aktiviert" -#: builtin/update-index.c:1200 +#: builtin/update-index.c:1212 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-" "Monitor\n" "wirklich aktivieren möchten." -#: builtin/update-index.c:1204 +#: builtin/update-index.c:1216 msgid "fsmonitor enabled" msgstr "Dateisystem-Monitor aktiviert" -#: builtin/update-index.c:1207 +#: builtin/update-index.c:1219 msgid "" "core.fsmonitor is set; remove it if you really want to disable fsmonitor" msgstr "" @@ -19350,7 +20448,7 @@ msgstr "" "Monitor\n" "wirklich deaktivieren möchten." -#: builtin/update-index.c:1211 +#: builtin/update-index.c:1223 msgid "fsmonitor disabled" msgstr "Dateisystem-Monitor deaktiviert" @@ -19395,6 +20493,10 @@ msgstr "die Informationsdateien von Grund auf aktualisieren" msgid "git upload-pack [<options>] <dir>" msgstr "git upload-pack [<Optionen>] <Verzeichnis>" +#: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17 +msgid "quit after a single request/response exchange" +msgstr "nach einem einzigen Request/Response-Austausch beenden" + #: builtin/upload-pack.c:25 msgid "exit immediately after initial ref advertisement" msgstr "direkt nach der initialen Angabe der Commits beenden" @@ -19469,7 +20571,7 @@ msgstr "git worktree remove [<Optionen>] <Arbeitsverzeichnis>" msgid "git worktree unlock <path>" msgstr "git worktree unlock <Pfad>" -#: builtin/worktree.c:61 builtin/worktree.c:888 +#: builtin/worktree.c:61 builtin/worktree.c:891 #, c-format msgid "failed to delete '%s'" msgstr "Fehler beim Löschen von '%s'" @@ -19546,129 +20648,129 @@ msgstr "" "Benutzen Sie 'add -f' zum Überschreiben, oder 'prune' oder 'remove' zum\n" "Löschen." -#: builtin/worktree.c:310 +#: builtin/worktree.c:302 #, c-format msgid "could not create directory of '%s'" msgstr "Konnte Verzeichnis '%s' nicht erstellen." -#: builtin/worktree.c:429 builtin/worktree.c:435 +#: builtin/worktree.c:432 builtin/worktree.c:438 #, c-format msgid "Preparing worktree (new branch '%s')" msgstr "Bereite Arbeitsverzeichnis vor (neuer Branch '%s')" -#: builtin/worktree.c:431 +#: builtin/worktree.c:434 #, 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:440 +#: builtin/worktree.c:443 #, c-format msgid "Preparing worktree (checking out '%s')" msgstr "Bereite Arbeitsverzeichnis vor (checke '%s' aus)" -#: builtin/worktree.c:446 +#: builtin/worktree.c:449 #, c-format msgid "Preparing worktree (detached HEAD %s)" msgstr "Bereite Arbeitsverzeichnis vor (losgelöster HEAD %s)" -#: builtin/worktree.c:487 +#: builtin/worktree.c:490 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:490 +#: builtin/worktree.c:493 msgid "create a new branch" msgstr "neuen Branch erstellen" -#: builtin/worktree.c:492 +#: builtin/worktree.c:495 msgid "create or reset a branch" msgstr "Branch erstellen oder umsetzen" -#: builtin/worktree.c:494 +#: builtin/worktree.c:497 msgid "populate the new working tree" msgstr "das neue Arbeitsverzeichnis auschecken" -#: builtin/worktree.c:495 +#: builtin/worktree.c:498 msgid "keep the new working tree locked" msgstr "das neue Arbeitsverzeichnis gesperrt lassen" -#: builtin/worktree.c:498 +#: builtin/worktree.c:501 msgid "set up tracking mode (see git-branch(1))" msgstr "Modus zum Folgen von Branches einstellen (siehe git-branch(1))" -#: builtin/worktree.c:501 +#: builtin/worktree.c:504 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:509 +#: builtin/worktree.c:512 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b, -B und --detach schließen sich gegenseitig aus" -#: builtin/worktree.c:570 +#: builtin/worktree.c:573 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:670 +#: builtin/worktree.c:673 msgid "reason for locking" msgstr "Sperrgrund" -#: builtin/worktree.c:682 builtin/worktree.c:715 builtin/worktree.c:789 -#: builtin/worktree.c:916 +#: builtin/worktree.c:685 builtin/worktree.c:718 builtin/worktree.c:792 +#: builtin/worktree.c:919 #, c-format msgid "'%s' is not a working tree" msgstr "'%s' ist kein Arbeitsverzeichnis" -#: builtin/worktree.c:684 builtin/worktree.c:717 +#: builtin/worktree.c:687 builtin/worktree.c:720 msgid "The main working tree cannot be locked or unlocked" msgstr "Das Hauptarbeitsverzeichnis kann nicht gesperrt oder entsperrt werden." -#: builtin/worktree.c:689 +#: builtin/worktree.c:692 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "'%s' ist bereits gesperrt, Grund: %s" -#: builtin/worktree.c:691 +#: builtin/worktree.c:694 #, c-format msgid "'%s' is already locked" msgstr "'%s' ist bereits gesperrt" -#: builtin/worktree.c:719 +#: builtin/worktree.c:722 #, c-format msgid "'%s' is not locked" msgstr "'%s' ist nicht gesperrt" -#: builtin/worktree.c:760 +#: builtin/worktree.c:763 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:768 +#: builtin/worktree.c:771 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:791 builtin/worktree.c:918 +#: builtin/worktree.c:794 builtin/worktree.c:921 #, c-format msgid "'%s' is a main working tree" msgstr "'%s' ist ein Hauptarbeitsverzeichnis" -#: builtin/worktree.c:796 +#: builtin/worktree.c:799 #, c-format msgid "could not figure out destination name from '%s'" msgstr "Konnte Zielname aus '%s' nicht bestimmen." -#: builtin/worktree.c:802 +#: builtin/worktree.c:805 #, c-format msgid "target '%s' already exists" msgstr "Ziel '%s' existiert bereits." -#: builtin/worktree.c:810 +#: builtin/worktree.c:813 #, c-format msgid "" "cannot move a locked working tree, lock reason: %s\n" @@ -19678,7 +20780,7 @@ msgstr "" "Benutzen Sie 'move -f -f' zum Überschreiben oder entsperren Sie zuerst\n" "das Arbeitsverzeichnis." -#: builtin/worktree.c:812 +#: builtin/worktree.c:815 msgid "" "cannot move a locked working tree;\n" "use 'move -f -f' to override or unlock first" @@ -19687,38 +20789,38 @@ msgstr "" "Benutzen Sie 'move -f -f' zum Überschreiben oder entsperren Sie zuerst\n" "das Arbeitsverzeichnis." -#: builtin/worktree.c:815 +#: builtin/worktree.c:818 #, c-format msgid "validation failed, cannot move working tree: %s" msgstr "Validierung fehlgeschlagen, kann Arbeitszeichnis nicht verschieben: %s" -#: builtin/worktree.c:820 +#: builtin/worktree.c:823 #, c-format msgid "failed to move '%s' to '%s'" msgstr "Fehler beim Verschieben von '%s' nach '%s'" -#: builtin/worktree.c:868 +#: builtin/worktree.c:871 #, c-format msgid "failed to run 'git status' on '%s'" msgstr "Fehler beim Ausführen von 'git status' auf '%s'" -#: builtin/worktree.c:872 +#: builtin/worktree.c:875 #, c-format msgid "'%s' is dirty, use --force to delete it" msgstr "'%s' ist verändert, benutzen Sie --force zum Löschen" -#: builtin/worktree.c:877 +#: builtin/worktree.c:880 #, 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:900 +#: builtin/worktree.c:903 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:923 +#: builtin/worktree.c:926 #, c-format msgid "" "cannot remove a locked working tree, lock reason: %s\n" @@ -19728,7 +20830,7 @@ msgstr "" "Benutzen Sie 'remove -f -f' zum Überschreiben oder entsperren Sie zuerst\n" "das Arbeitsverzeichnis." -#: builtin/worktree.c:925 +#: builtin/worktree.c:928 msgid "" "cannot remove a locked working tree;\n" "use 'remove -f -f' to override or unlock first" @@ -19737,7 +20839,7 @@ msgstr "" "Benutzen Sie 'remove -f -f' zum Überschreiben oder entsperren Sie zuerst\n" "das Arbeitsverzeichnis." -#: builtin/worktree.c:928 +#: builtin/worktree.c:931 #, c-format msgid "validation failed, cannot remove working tree: %s" msgstr "Validierung fehlgeschlagen, kann Arbeitsverzeichnis nicht löschen: %s" @@ -19752,7 +20854,7 @@ msgstr "<Präfix>/" #: builtin/write-tree.c:29 msgid "write tree object for a subdirectory <prefix>" -msgstr "das \"Tree\"-Objekt für ein Unterverzeichnis <Präfix> schreiben" +msgstr "das Tree-Objekt für ein Unterverzeichnis <Präfix> schreiben" #: builtin/write-tree.c:31 msgid "only useful for debugging" @@ -19787,6 +20889,14 @@ msgstr "Commit %s ist nicht als erreichbar gekennzeichnet." msgid "too many commits marked reachable" msgstr "Zu viele Commits als erreichbar gekennzeichnet." +#: t/helper/test-serve-v2.c:7 +msgid "test-tool serve-v2 [<options>]" +msgstr "test-tool serve-v2 [<Optionen>]" + +#: t/helper/test-serve-v2.c:19 +msgid "exit immediately after advertising capabilities" +msgstr "direkt nach Anzeige der angebotenen Fähigkeiten beenden" + #: git.c:27 msgid "" "git [--version] [--help] [-C <path>] [-c <name>=<value>]\n" @@ -19814,47 +20924,47 @@ msgstr "" "oder 'git help <Konzept>', um mehr über einen spezifischen Befehl oder\n" "Konzept zu erfahren." -#: git.c:174 +#: git.c:185 #, c-format msgid "no directory given for --git-dir\n" msgstr "Kein Verzeichnis für --git-dir angegeben.\n" -#: git.c:188 +#: git.c:199 #, c-format msgid "no namespace given for --namespace\n" msgstr "Kein Namespace für --namespace angegeben.\n" -#: git.c:202 +#: git.c:213 #, c-format msgid "no directory given for --work-tree\n" msgstr "Kein Verzeichnis für --work-tree angegeben.\n" -#: git.c:216 +#: git.c:227 #, c-format msgid "no prefix given for --super-prefix\n" msgstr "Kein Präfix für --super-prefix angegeben.\n" -#: git.c:238 +#: git.c:249 #, c-format msgid "-c expects a configuration string\n" msgstr "-c erwartet einen Konfigurationsstring.\n" -#: git.c:276 +#: git.c:287 #, c-format msgid "no directory given for -C\n" msgstr "Kein Verzeichnis für -C angegeben.\n" -#: git.c:301 +#: git.c:313 #, c-format msgid "unknown option: %s\n" msgstr "Unbekannte Option: %s\n" -#: git.c:342 +#: git.c:359 #, c-format msgid "while expanding alias '%s': '%s'" msgstr "beim Erweitern von Alias '%s': '%s'" -#: git.c:351 +#: git.c:368 #, c-format msgid "" "alias '%s' changes environment variables.\n" @@ -19863,51 +20973,53 @@ msgstr "" "Alias '%s' ändert Umgebungsvariablen.\n" "Sie können '!git' im Alias benutzen, um dies zu tun." -#: git.c:359 +#: git.c:376 #, c-format msgid "empty alias for %s" msgstr "leerer Alias für %s" -#: git.c:362 +#: git.c:379 #, c-format msgid "recursive alias: %s" msgstr "rekursiver Alias: %s" -#: git.c:437 +#: git.c:459 msgid "write failure on standard output" msgstr "Fehler beim Schreiben in die Standard-Ausgabe." -#: git.c:439 +#: git.c:461 msgid "unknown write failure on standard output" msgstr "Unbekannter Fehler beim Schreiben in die Standard-Ausgabe." -#: git.c:441 +#: git.c:463 msgid "close failed on standard output" msgstr "Fehler beim Schließen der Standard-Ausgabe." -#: git.c:720 +#: git.c:797 #, 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:770 +#: git.c:847 #, c-format msgid "cannot handle %s as a builtin" msgstr "Kann %s nicht als eingebauten Befehl behandeln." -#: git.c:783 +#: git.c:860 #, c-format msgid "" "usage: %s\n" "\n" -msgstr "Verwendung: %s\n\n" +msgstr "" +"Verwendung: %s\n" +"\n" -#: git.c:803 +#: git.c:880 #, 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" -#: git.c:815 +#: git.c:892 #, c-format msgid "failed to run command '%s': %s\n" msgstr "Fehler beim Ausführen von Befehl '%s': %s\n" @@ -19951,7 +21063,7 @@ msgstr "" msgid "Could not set SSL backend to '%s': already set" msgstr "Konnte SSL-Backend nicht zu '%s' setzen: bereits gesetzt" -#: http.c:1959 +#: http.c:1965 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -19962,31 +21074,163 @@ msgstr "" " gefragt nach: %s\n" " umgeleitet: %s" -#: remote-curl.c:455 +#: remote-curl.c:157 +#, c-format +msgid "invalid quoting in push-option value: '%s'" +msgstr "Ungültiges Quoting beim \"push-option\"-Wert: '%s'" + +#: remote-curl.c:254 +#, c-format +msgid "%sinfo/refs not valid: is this a git repository?" +msgstr "%sinfo/refs nicht gültig: Ist das ein Git-Repository?" + +#: remote-curl.c:355 +msgid "invalid server response; expected service, got flush packet" +msgstr "Ungültige Antwort des Servers. Service erwartet, Flush-Paket bekommen" + +#: remote-curl.c:386 +#, c-format +msgid "invalid server response; got '%s'" +msgstr "Ungültige Serverantwort; '%s' bekommen" + +#: remote-curl.c:446 +#, c-format +msgid "repository '%s' not found" +msgstr "Repository '%s' nicht gefunden." + +#: remote-curl.c:450 +#, c-format +msgid "Authentication failed for '%s'" +msgstr "Authentifizierung fehlgeschlagen für '%s'" + +#: remote-curl.c:454 +#, c-format +msgid "unable to access '%s': %s" +msgstr "konnte nicht auf '%s' zugreifen: %s" + +#: remote-curl.c:460 #, c-format msgid "redirecting to %s" msgstr "Leite nach %s um" -#: parse-options.h:154 +#: remote-curl.c:584 +msgid "shouldn't have EOF when not gentle on EOF" +msgstr "sollte kein EOF haben, wenn nicht behutsam mit EOF" + +#: remote-curl.c:664 +msgid "unable to rewind rpc post data - try increasing http.postBuffer" +msgstr "" +"Konnte nicht RPC-POST-Daten zurückspulen - Versuchen Sie http.postBuffer zu " +"erhöhen" + +#: remote-curl.c:724 +#, c-format +msgid "RPC failed; %s" +msgstr "RPC fehlgeschlagen; %s" + +#: remote-curl.c:764 +msgid "cannot handle pushes this big" +msgstr "Kann solche großen Übertragungen nicht verarbeiten." + +#: remote-curl.c:879 +#, c-format +msgid "cannot deflate request; zlib deflate error %d" +msgstr "Kann Request nicht komprimieren; \"zlib deflate\"-Fehler %d" + +#: remote-curl.c:883 +#, c-format +msgid "cannot deflate request; zlib end error %d" +msgstr "Kann Request nicht komprimieren; \"zlib end\"-Fehler %d" + +#: remote-curl.c:1014 +msgid "dumb http transport does not support shallow capabilities" +msgstr "Dumb HTTP-Transport unterstützt keine shallow-Funktionen" + +#: remote-curl.c:1028 +msgid "fetch failed." +msgstr "\"fetch\" fehlgeschlagen." + +#: remote-curl.c:1076 +msgid "cannot fetch by sha1 over smart http" +msgstr "Kann SHA-1 nicht über Smart-HTTP anfordern" + +#: remote-curl.c:1120 remote-curl.c:1126 +#, c-format +msgid "protocol error: expected sha/ref, got '%s'" +msgstr "Protokollfehler: SHA-1/Referenz erwartet, '%s' bekommen" + +#: remote-curl.c:1138 remote-curl.c:1252 +#, c-format +msgid "http transport does not support %s" +msgstr "HTTP-Transport unterstützt nicht %s" + +#: remote-curl.c:1174 +msgid "git-http-push failed" +msgstr "\"git-http-push\" fehlgeschlagen" + +#: remote-curl.c:1360 +msgid "remote-curl: usage: git remote-curl <remote> [<url>]" +msgstr "remote-curl: Verwendung: git remote-curl <Remote-Repository> [<URL>]" + +#: remote-curl.c:1392 +msgid "remote-curl: error reading command stream from git" +msgstr "remote-curl: Fehler beim Lesen des Kommando-Streams von Git" + +#: remote-curl.c:1399 +msgid "remote-curl: fetch attempted without a local repo" +msgstr "remote-curl: \"fetch\" ohne lokales Repository versucht" + +#: remote-curl.c:1439 +#, c-format +msgid "remote-curl: unknown command '%s' from git" +msgstr "remote-curl: Unbekannter Befehl '%s' von Git" + +#: list-objects-filter-options.h:61 +msgid "args" +msgstr "Argumente" + +#: list-objects-filter-options.h:62 +msgid "object filtering" +msgstr "Filtern nach Objekten" + +#: parse-options.h:170 msgid "expiry-date" msgstr "Verfallsdatum" -#: parse-options.h:169 +#: parse-options.h:184 msgid "no-op (backward compatibility)" msgstr "Kein Effekt (Rückwärtskompatibilität)" -#: parse-options.h:259 +#: parse-options.h:304 msgid "be more verbose" msgstr "erweiterte Ausgaben" -#: parse-options.h:261 +#: parse-options.h:306 msgid "be more quiet" msgstr "weniger Ausgaben" -#: parse-options.h:267 +#: parse-options.h:312 msgid "use <n> digits to display SHA-1s" msgstr "benutze <n> Ziffern zur Anzeige von SHA-1s" +#: parse-options.h:331 +msgid "how to strip spaces and #comments from message" +msgstr "" +"wie Leerzeichen und #Kommentare von der Beschreibung getrennt werden sollen" + +#: ref-filter.h:101 +msgid "key" +msgstr "Schüssel" + +#: ref-filter.h:101 +msgid "field name to sort on" +msgstr "sortiere nach diesem Feld" + +#: rerere.h:44 +msgid "update the index with reused conflict resolution if possible" +msgstr "" +"Index, wenn möglich, mit wiederverwendeter Konfliktauflösung aktualisieren" + #: command-list.h:50 msgid "Add file contents to the index" msgstr "Dateiinhalte zum Commit vormerken" @@ -20258,9 +21502,9 @@ msgid "Instantly browse your working repository in gitweb" msgstr "Ihr aktuelles Repository sofort in gitweb betrachten" #: command-list.h:113 -msgid "add or parse structured information in commit messages" +msgid "Add or parse structured information in commit messages" msgstr "" -"strukturierte Informationen in Commit-Beschreibungen hinzufügen oder parsen" +"Strukturierte Informationen in Commit-Beschreibungen hinzufügen oder parsen" #: command-list.h:114 msgid "The Git repository browser" @@ -20656,19 +21900,6 @@ msgstr "eine einführende Anleitung zu Git" msgid "An overview of recommended workflows with Git" msgstr "Eine Übersicht über empfohlene Arbeitsabläufe mit Git" -#: list-objects-filter-options.h:63 -msgid "args" -msgstr "Argumente" - -#: list-objects-filter-options.h:64 -msgid "object filtering" -msgstr "Filtern nach Objekten" - -#: rerere.h:44 -msgid "update the index with reused conflict resolution if possible" -msgstr "" -"Index, wenn möglich, mit wiederverwendeter Konfliktauflösung aktualisieren" - #: git-bisect.sh:54 msgid "You need to start by \"git bisect start\"" msgstr "Sie müssen mit \"git bisect start\" beginnen." @@ -20793,287 +22024,116 @@ msgstr "Versuche einfachen Merge mit $pretty_name" msgid "Simple merge did not work, trying automatic merge." msgstr "Einfacher Merge hat nicht funktioniert, versuche automatischen Merge." -#: git-legacy-rebase.sh:445 -#, sh-format -msgid "Could not move back to $head_name" -msgstr "Konnte nicht zu $head_name zurückgehen" - -#: git-legacy-rebase.sh:471 -#, sh-format -msgid "" -"It seems that there is already a $state_dir_base directory, and\n" -"I wonder if you are in the middle of another rebase. If that is the\n" -"case, please try\n" -"\t$cmd_live_rebase\n" -"If that is not the case, please\n" -"\t$cmd_clear_stale_rebase\n" -"and run me again. I am stopping in case you still have something\n" -"valuable there." -msgstr "" -"Es sieht so aus, als ob es das Verzeichnis $state_dir_base bereits gibt\n" -"und es könnte ein anderer Rebase im Gange sein. Wenn das der Fall ist,\n" -"probieren Sie bitte\n" -"\t$cmd_live_rebase\n" -"Wenn das nicht der Fall ist, probieren Sie bitte\n" -"\t$cmd_clear_stale_rebase\n" -"und führen Sie diesen Befehl nochmal aus. Es wird angehalten, falls noch\n" -"etwas Schützenswertes vorhanden ist." - -#: git-legacy-rebase.sh:523 -msgid "" -"fatal: cannot combine am options with either interactive or merge options" -msgstr "fatal: Optionen für 'am' können nicht mit Optionen für 'interactive' oder 'merge' kombiniert werden." - -#: git-legacy-rebase.sh:530 -msgid "fatal: cannot combine '--signoff' with '--preserve-merges'" -msgstr "fatal: '--signoff' und '--preserve-merges' können nicht kombiniert werden." - -#: git-legacy-rebase.sh:541 -msgid "fatal: cannot combine '--preserve-merges' with '--rebase-merges'" -msgstr "fatal: '--preserve-merges' und '--rebase-merges' können nicht kombiniert werden." - -#: git-legacy-rebase.sh:550 -msgid "fatal: cannot combine '--rebase-merges' with '--strategy-option'" -msgstr "fatal: '--rebase-merges' und '--strategy-option' können nicht kombiniert werden." - -#: git-legacy-rebase.sh:552 -msgid "fatal: cannot combine '--rebase-merges' with '--strategy'" -msgstr "fatal: '--rebase-merges' und '--strategy' können nicht kombiniert werden." - -#: git-legacy-rebase.sh:578 -#, sh-format -msgid "invalid upstream '$upstream_name'" -msgstr "Ungültiger Upstream-Branch '$upstream_name'." - -#: git-legacy-rebase.sh:602 -#, sh-format -msgid "$onto_name: there are more than one merge bases" -msgstr "$onto_name: es gibt mehr als eine Merge-Basis" - -#: git-legacy-rebase.sh:605 git-legacy-rebase.sh:609 -#, sh-format -msgid "$onto_name: there is no merge base" -msgstr "$onto_name: es gibt keine Merge-Basis" - -#: git-legacy-rebase.sh:614 -#, sh-format -msgid "Does not point to a valid commit: $onto_name" -msgstr "$onto_name zeigt auf keinen gültigen Commit" - -#: git-legacy-rebase.sh:640 -#, sh-format -msgid "fatal: no such branch/commit '$branch_name'" -msgstr "fatal: Branch/Commit '$branch_name' nicht gefunden" - -#: git-legacy-rebase.sh:678 -#, sh-format -msgid "Created autostash: $stash_abbrev" -msgstr "Automatischen Stash erzeugt: $stash_abbrev" - -#: git-legacy-rebase.sh:707 -#, sh-format -msgid "Current branch $branch_name is up to date." -msgstr "Aktueller Branch $branch_name ist auf dem neuesten Stand." - -#: git-legacy-rebase.sh:717 -#, sh-format -msgid "Current branch $branch_name is up to date, rebase forced." -msgstr "" -"Aktueller Branch $branch_name ist auf dem neuesten Stand, Rebase erzwungen." - -#: git-legacy-rebase.sh:731 -#, sh-format -msgid "Changes to $onto:" -msgstr "Änderungen zu $onto:" - -#: git-legacy-rebase.sh:733 -#, sh-format -msgid "Changes from $mb to $onto:" -msgstr "Änderungen von $mb zu $onto:" - -#: git-legacy-rebase.sh:743 -#, sh-format -msgid "Fast-forwarded $branch_name to $onto_name." -msgstr "$branch_name zu $onto_name vorgespult." - -#: git-legacy-rebase.sh:757 -msgid "First, rewinding head to replay your work on top of it..." -msgstr "" -"Zunächst wird der Branch zurückgespult, um Ihre Änderungen\n" -"darauf neu anzuwenden ..." - -#: git-stash.sh:75 -msgid "git stash clear with parameters is unimplemented" -msgstr "git stash clear mit Parametern ist nicht implementiert" - -#: git-stash.sh:125 -msgid "You do not have the initial commit yet" -msgstr "Sie haben bisher noch keinen initialen Commit" - -#: git-stash.sh:140 -msgid "Cannot save the current index state" -msgstr "Kann den aktuellen Zustand des Index nicht speichern" - -#: git-stash.sh:155 -msgid "Cannot save the untracked files" -msgstr "Kann die unversionierten Dateien nicht speichern" - -#: git-stash.sh:175 git-stash.sh:188 -msgid "Cannot save the current worktree state" -msgstr "Kann den aktuellen Zustand des Arbeitsverzeichnisses nicht speichern" - -#: git-stash.sh:192 -msgid "No changes selected" -msgstr "Keine Änderungen ausgewählt" - -#: git-stash.sh:195 +#: git-legacy-stash.sh:220 msgid "Cannot remove temporary index (can't happen)" msgstr "Kann temporären Index nicht löschen (kann nicht passieren)" -#: git-stash.sh:208 -msgid "Cannot record working tree state" -msgstr "Kann Zustand des Arbeitsverzeichnisses nicht aufzeichnen" - -#: git-stash.sh:246 +#: git-legacy-stash.sh:271 #, sh-format msgid "Cannot update $ref_stash with $w_commit" msgstr "Kann $ref_stash nicht mit $w_commit aktualisieren." -#: git-stash.sh:298 +#: git-legacy-stash.sh:323 #, sh-format msgid "error: unknown option for 'stash push': $option" msgstr "Fehler: unbekannte Option für 'stash push': $option" -#: git-stash.sh:312 -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" - -#: git-stash.sh:320 -msgid "No local changes to save" -msgstr "Keine lokalen Änderungen zum Speichern" - -#: git-stash.sh:325 -msgid "Cannot initialize stash" -msgstr "Kann \"stash\" nicht initialisieren" - -#: git-stash.sh:329 -msgid "Cannot save the current status" -msgstr "Kann den aktuellen Status nicht speichern" - -#: git-stash.sh:330 +#: git-legacy-stash.sh:355 #, sh-format msgid "Saved working directory and index state $stash_msg" msgstr "Speicherte Arbeitsverzeichnis und Index-Status $stash_msg" -#: git-stash.sh:359 -msgid "Cannot remove worktree changes" -msgstr "Kann Änderungen im Arbeitsverzeichnis nicht löschen" - -#: git-stash.sh:507 +#: git-legacy-stash.sh:535 #, sh-format msgid "unknown option: $opt" msgstr "unbekannte Option: $opt" -#: git-stash.sh:520 -msgid "No stash entries found." -msgstr "Keine Stash-Einträge gefunden." - -#: git-stash.sh:527 +#: git-legacy-stash.sh:555 #, sh-format msgid "Too many revisions specified: $REV" msgstr "Zu viele Commits angegeben: $REV" -#: git-stash.sh:542 +#: git-legacy-stash.sh:570 #, sh-format msgid "$reference is not a valid reference" msgstr "$reference ist keine gültige Referenz" -#: git-stash.sh:570 +#: git-legacy-stash.sh:598 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "'$args' ist kein \"stash\"-artiger Commit" -#: git-stash.sh:581 +#: git-legacy-stash.sh:609 #, sh-format msgid "'$args' is not a stash reference" msgstr "'$args' ist keine \"stash\"-Referenz" -#: git-stash.sh:589 +#: git-legacy-stash.sh:617 msgid "unable to refresh index" msgstr "Konnte den Index nicht aktualisieren." -#: git-stash.sh:593 +#: git-legacy-stash.sh:621 msgid "Cannot apply a stash in the middle of a merge" msgstr "Kann \"stash\" nicht anwenden, solange ein Merge im Gange ist" -#: git-stash.sh:601 +#: git-legacy-stash.sh:629 msgid "Conflicts in index. Try without --index." msgstr "Konflikte im Index. Versuchen Sie es ohne --index." -#: git-stash.sh:603 +#: git-legacy-stash.sh:631 msgid "Could not save index tree" msgstr "Konnte Index-Verzeichnis nicht speichern" -#: git-stash.sh:612 +#: git-legacy-stash.sh:640 msgid "Could not restore untracked files from stash entry" msgstr "" "Konnte unversionierte Dateien vom Stash-Eintrag nicht wiederherstellen." -#: git-stash.sh:637 +#: git-legacy-stash.sh:665 msgid "Cannot unstage modified files" msgstr "Kann geänderte Dateien nicht aus dem Index entfernen" -#: git-stash.sh:652 -msgid "Index was not unstashed." -msgstr "Index wurde nicht aus dem Stash zurückgeladen." - -#: git-stash.sh:666 -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." - -#: git-stash.sh:675 +#: git-legacy-stash.sh:703 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "${REV} ($s) gelöscht" -#: git-stash.sh:676 +#: git-legacy-stash.sh:704 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "${REV}: Konnte \"stash\"-Eintrag nicht löschen" -#: git-stash.sh:684 -msgid "No branch name specified" -msgstr "Kein Branchname spezifiziert" - -#: git-stash.sh:763 +#: git-legacy-stash.sh:791 msgid "(To restore them type \"git stash apply\")" msgstr "(Zur Wiederherstellung geben Sie \"git stash apply\" ein)" -#: git-submodule.sh:198 +#: git-submodule.sh:200 msgid "Relative path can only be used from the toplevel of the working tree" msgstr "" "Relative Pfade können nur von der obersten Ebene des Arbeitsverzeichnisses " "benutzt werden." -#: git-submodule.sh:208 +#: git-submodule.sh:210 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "repo URL: '$repo' muss absolut sein oder mit ./|../ beginnen" -#: git-submodule.sh:227 +#: git-submodule.sh:229 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "'$sm_path' ist bereits zum Commit vorgemerkt" -#: git-submodule.sh:230 +#: git-submodule.sh:232 #, sh-format msgid "'$sm_path' already exists in the index and is not a submodule" msgstr "'$sm_path' ist bereits zum Commit vorgemerkt und ist kein Submodul" -#: git-submodule.sh:236 +#: git-submodule.sh:239 +#, sh-format +msgid "'$sm_path' does not have a commit checked out" +msgstr "'$sm_path' hat keinen Commit ausgecheckt" + +#: git-submodule.sh:245 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -21084,24 +22144,24 @@ msgstr "" "$sm_path\n" "Benutzen Sie -f wenn Sie diesen wirklich hinzufügen möchten." -#: git-submodule.sh:259 +#: git-submodule.sh:268 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "Füge existierendes Repository in '$sm_path' dem Index hinzu." -#: git-submodule.sh:261 +#: git-submodule.sh:270 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "'$sm_path' existiert bereits und ist kein gültiges Git-Repository" -#: git-submodule.sh:269 +#: git-submodule.sh:278 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "" "Ein Git-Verzeichnis für '$sm_name' wurde lokal gefunden mit den Remote-" "Repositories:" -#: git-submodule.sh:271 +#: git-submodule.sh:280 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from\n" @@ -21119,37 +22179,37 @@ msgstr "" "nicht das korrekte Repository ist oder Sie unsicher sind, was das bedeutet,\n" "wählen Sie einen anderen Namen mit der Option '--name'." -#: git-submodule.sh:277 +#: git-submodule.sh:286 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "Reaktiviere lokales Git-Verzeichnis für Submodul '$sm_name'." -#: git-submodule.sh:289 +#: git-submodule.sh:298 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "Kann Submodul '$sm_path' nicht auschecken" -#: git-submodule.sh:294 +#: git-submodule.sh:303 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "Hinzufügen von Submodul '$sm_path' fehlgeschlagen" -#: git-submodule.sh:303 +#: git-submodule.sh:312 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "Fehler beim Eintragen von Submodul '$sm_path' in die Konfiguration." -#: git-submodule.sh:563 +#: git-submodule.sh:573 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "Konnte aktuellen Commit in Submodul-Pfad '$displaypath' nicht finden." -#: git-submodule.sh:573 +#: git-submodule.sh:583 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "Konnte \"fetch\" in Submodul-Pfad '$sm_path' nicht ausführen" -#: git-submodule.sh:578 +#: git-submodule.sh:588 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " @@ -21158,12 +22218,16 @@ msgstr "" "Konnte aktuellen Commit von ${remote_name}/${branch} in Submodul-Pfad\n" "'$sm_path' nicht finden." -#: git-submodule.sh:596 +#: git-submodule.sh:606 #, sh-format -msgid "Unable to fetch in submodule path '$displaypath'" -msgstr "Konnte \"fetch\" in Submodul-Pfad '$displaypath' nicht ausführen" +msgid "" +"Unable to fetch in submodule path '$displaypath'; trying to directly fetch " +"$sha1:" +msgstr "" +"Konnte \"fetch\" in Submodul-Pfad '$displaypath' nicht ausführen. Versuche " +"$sha1 direkt anzufordern:" -#: git-submodule.sh:602 +#: git-submodule.sh:612 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " @@ -21172,74 +22236,74 @@ msgstr "" "\"fetch\" in Submodul-Pfad '$displaypath' ausgeführt, aber $sha1 nicht\n" "enthalten. Direktes Anfordern dieses Commits ist fehlgeschlagen." -#: git-submodule.sh:609 +#: git-submodule.sh:619 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "Konnte '$sha1' in Submodul-Pfad '$displaypath' nicht auschecken." -#: git-submodule.sh:610 +#: git-submodule.sh:620 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "Submodul-Pfad: '$displaypath': '$sha1' ausgecheckt" -#: git-submodule.sh:614 +#: git-submodule.sh:624 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "Rebase auf '$sha1' in Submodul-Pfad '$displaypath' nicht möglich" -#: git-submodule.sh:615 +#: git-submodule.sh:625 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "Submodul-Pfad '$displaypath': Rebase auf '$sha1'" -#: git-submodule.sh:620 +#: git-submodule.sh:630 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "Merge von '$sha1' in Submodul-Pfad '$displaypath' fehlgeschlagen" -#: git-submodule.sh:621 +#: git-submodule.sh:631 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "Submodul-Pfad '$displaypath': zusammengeführt in '$sha1'" -#: git-submodule.sh:626 +#: git-submodule.sh:636 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "" "Ausführung von '$command $sha1' in Submodul-Pfad '$displaypath' " "fehlgeschlagen" -#: git-submodule.sh:627 +#: git-submodule.sh:637 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "Submodul-Pfad '$displaypath': '$command $sha1'" -#: git-submodule.sh:658 +#: git-submodule.sh:668 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "Fehler bei Rekursion in Submodul-Pfad '$displaypath'" -#: git-submodule.sh:754 +#: git-submodule.sh:830 msgid "The --cached option cannot be used with the --files option" msgstr "" "Die Optionen --cached und --files können nicht gemeinsam verwendet werden." -#: git-submodule.sh:806 +#: git-submodule.sh:882 #, sh-format msgid "unexpected mode $mod_dst" msgstr "unerwarteter Modus $mod_dst" -#: git-submodule.sh:826 +#: git-submodule.sh:902 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr " Warnung: $display_name beinhaltet nicht Commit $sha1_src" -#: git-submodule.sh:829 +#: git-submodule.sh:905 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr " Warnung: $display_name beinhaltet nicht Commit $sha1_dst" -#: git-submodule.sh:832 +#: git-submodule.sh:908 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr "" @@ -21570,75 +22634,75 @@ msgstr "Konnte neu geschriebene Commits nicht initialisieren." msgid "usage: $dashless $USAGE" msgstr "Verwendung: $dashless $USAGE" -#: git-sh-setup.sh:190 +#: git-sh-setup.sh:191 #, sh-format msgid "Cannot chdir to $cdup, the toplevel of the working tree" msgstr "" "Konnte nicht in Verzeichnis $cdup wechseln, der obersten Ebene des\n" "Arbeitsverzeichnisses." -#: git-sh-setup.sh:199 git-sh-setup.sh:206 +#: git-sh-setup.sh:200 git-sh-setup.sh:207 #, sh-format msgid "fatal: $program_name cannot be used without a working tree." msgstr "" "fatal: $program_name kann ohne ein Arbeitsverzeichnis nicht verwendet werden." -#: git-sh-setup.sh:220 +#: git-sh-setup.sh:221 msgid "Cannot rebase: You have unstaged changes." msgstr "" "Rebase nicht möglich: Sie haben Änderungen, die nicht zum Commit vorgemerkt " "sind." -#: git-sh-setup.sh:223 +#: git-sh-setup.sh:224 msgid "Cannot rewrite branches: You have unstaged changes." msgstr "" "Kann Branches nicht neu schreiben: Sie haben Änderungen, die nicht zum " "Commit\n" "vorgemerkt sind." -#: git-sh-setup.sh:226 +#: git-sh-setup.sh:227 msgid "Cannot pull with rebase: You have unstaged changes." msgstr "" "Kann \"pull\" mit \"rebase\" nicht ausführen: Sie haben Änderungen, die " "nicht zum Commit vorgemerkt sind." -#: git-sh-setup.sh:229 +#: git-sh-setup.sh:230 #, sh-format msgid "Cannot $action: You have unstaged changes." msgstr "" "Kann $action nicht ausführen: Sie haben Änderungen, die nicht zum Commit\n" "vorgemerkt sind." -#: git-sh-setup.sh:242 +#: git-sh-setup.sh:243 msgid "Cannot rebase: Your index contains uncommitted changes." msgstr "" "Rebase nicht möglich: Die Staging-Area beinhaltet nicht committete " "Änderungen." -#: git-sh-setup.sh:245 +#: git-sh-setup.sh:246 msgid "Cannot pull with rebase: Your index contains uncommitted changes." msgstr "" "Kann \"pull\" mit \"rebase\" nicht ausführen: Die Staging-Area beinhaltet " "nicht committete Änderungen." -#: git-sh-setup.sh:248 +#: git-sh-setup.sh:249 #, sh-format msgid "Cannot $action: Your index contains uncommitted changes." msgstr "" "Kann $action nicht ausführen: Die Staging-Area beinhaltet nicht committete\n" "Änderungen." -#: git-sh-setup.sh:252 +#: git-sh-setup.sh:253 msgid "Additionally, your index contains uncommitted changes." msgstr "Zusätzlich beinhaltet die Staging-Area nicht committete Änderungen." -#: git-sh-setup.sh:372 +#: git-sh-setup.sh:373 msgid "You need to run this command from the toplevel of the working tree." msgstr "" "Sie müssen den Befehl von der obersten Ebene des Arbeitsverzeichnisses " "ausführen." -#: git-sh-setup.sh:377 +#: git-sh-setup.sh:378 msgid "Unable to determine absolute path of git directory" msgstr "Konnte absoluten Pfad des Git-Verzeichnisses nicht bestimmen." @@ -21938,9 +23002,11 @@ msgid "" msgstr "" "g - Patch-Block zum Hinspringen auswählen\n" "/ - nach Patch-Block suchen, der gegebenem regulärem Ausdruck entspricht\n" -"j - diesen Patch-Block unbestimmt lassen, nächsten unbestimmten Patch-Block anzeigen\n" +"j - diesen Patch-Block unbestimmt lassen, nächsten unbestimmten Patch-Block " +"anzeigen\n" "J - diesen Patch-Block unbestimmt lassen, nächsten Patch-Block anzeigen\n" -"k - diesen Patch-Block unbestimmt lassen, vorherigen unbestimmten Patch-Block anzeigen\n" +"k - diesen Patch-Block unbestimmt lassen, vorherigen unbestimmten Patch-" +"Block anzeigen\n" "K - diesen Patch-Block unbestimmt lassen, vorherigen Patch-Block anzeigen\n" "s - aktuellen Patch-Block in kleinere Patch-Blöcke aufteilen\n" "e - aktuellen Patch-Block manuell editieren\n" @@ -22221,7 +23287,7 @@ msgstr "'%s.final' enthält die verfasste E-Mail.\n" msgid "--dump-aliases incompatible with other options\n" msgstr "--dump-aliases ist mit anderen Optionen inkompatibel\n" -#: git-send-email.perl:395 git-send-email.perl:650 +#: git-send-email.perl:395 git-send-email.perl:656 msgid "Cannot run git format-patch from outside a repository\n" msgstr "" "Kann 'git format-patch' nicht außerhalb eines Repositories ausführen.\n" @@ -22235,38 +23301,38 @@ msgstr "" "Kommandozeile\n" "oder Konfigurationsoption)\n" -#: git-send-email.perl:468 +#: git-send-email.perl:470 #, perl-format msgid "Unknown --suppress-cc field: '%s'\n" msgstr "Unbekanntes --suppress-cc Feld: '%s'\n" -#: git-send-email.perl:497 +#: git-send-email.perl:501 #, perl-format msgid "Unknown --confirm setting: '%s'\n" msgstr "Unbekannte --confirm Einstellung: '%s'\n" -#: git-send-email.perl:525 +#: git-send-email.perl:529 #, perl-format msgid "warning: sendmail alias with quotes is not supported: %s\n" msgstr "" "Warnung: sendemail-Alias mit Anführungszeichen wird nicht unterstützt: %s\n" -#: git-send-email.perl:527 +#: git-send-email.perl:531 #, perl-format msgid "warning: `:include:` not supported: %s\n" msgstr "Warnung: `:include:` wird nicht unterstützt: %s\n" -#: git-send-email.perl:529 +#: git-send-email.perl:533 #, perl-format msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" msgstr "Warnung: `/file` oder `|pipe` Umleitung wird nicht unterstützt: %s\n" -#: git-send-email.perl:534 +#: git-send-email.perl:538 #, perl-format msgid "warning: sendmail line is not recognized: %s\n" msgstr "Warnung: sendmail Zeile wird nicht erkannt: %s\n" -#: git-send-email.perl:616 +#: git-send-email.perl:622 #, perl-format msgid "" "File '%s' exists but it could also be the range of commits\n" @@ -22283,12 +23349,12 @@ msgstr "" " * die Option --format-patch angeben, wenn Sie einen Commit-Bereich " "meinen\n" -#: git-send-email.perl:637 +#: git-send-email.perl:643 #, perl-format msgid "Failed to opendir %s: %s" msgstr "Fehler beim Öffnen von %s: %s" -#: git-send-email.perl:661 +#: git-send-email.perl:667 #, perl-format msgid "" "fatal: %s: %s\n" @@ -22297,7 +23363,7 @@ msgstr "" "fatal: %s: %s\n" "Warnung: Es wurden keine Patches versendet.\n" -#: git-send-email.perl:672 +#: git-send-email.perl:678 msgid "" "\n" "No patch files specified!\n" @@ -22307,17 +23373,17 @@ msgstr "" "keine Patch-Dateien angegeben!\n" "\n" -#: git-send-email.perl:685 +#: git-send-email.perl:691 #, perl-format msgid "No subject line in %s?" msgstr "Keine Betreffzeile in %s?" -#: git-send-email.perl:695 +#: git-send-email.perl:701 #, perl-format msgid "Failed to open for writing %s: %s" msgstr "Fehler beim Öffnen von '%s' zum Schreiben: %s" -#: git-send-email.perl:706 +#: git-send-email.perl:712 msgid "" "Lines beginning in \"GIT:\" will be removed.\n" "Consider including an overall diffstat or table of contents\n" @@ -22332,27 +23398,27 @@ msgstr "" "Leeren Sie den Inhalt des Bodys, wenn Sie keine Zusammenfassung senden " "möchten.\n" -#: git-send-email.perl:730 +#: git-send-email.perl:736 #, perl-format msgid "Failed to open %s: %s" msgstr "Fehler beim Öffnen von %s: %s" -#: git-send-email.perl:747 +#: git-send-email.perl:753 #, perl-format msgid "Failed to open %s.final: %s" msgstr "Fehler beim Öffnen von %s.final: %s" -#: git-send-email.perl:790 +#: git-send-email.perl:796 msgid "Summary email is empty, skipping it\n" msgstr "E-Mail mit Zusammenfassung ist leer, wird ausgelassen\n" #. TRANSLATORS: please keep [y/N] as is. -#: git-send-email.perl:825 +#: git-send-email.perl:831 #, perl-format msgid "Are you sure you want to use <%s> [y/N]? " msgstr "Sind Sie sich sicher, <%s> zu benutzen [y/N]? " -#: git-send-email.perl:880 +#: git-send-email.perl:886 msgid "" "The following files are 8bit, but do not declare a Content-Transfer-" "Encoding.\n" @@ -22360,11 +23426,11 @@ msgstr "" "Die folgenden Dateien sind 8-Bit, aber deklarieren kein\n" "Content-Transfer-Encoding.\n" -#: git-send-email.perl:885 +#: git-send-email.perl:891 msgid "Which 8bit encoding should I declare [UTF-8]? " msgstr "Welches 8-Bit-Encoding soll deklariert werden [UTF-8]? " -#: git-send-email.perl:893 +#: git-send-email.perl:899 #, perl-format msgid "" "Refusing to send because the patch\n" @@ -22378,22 +23444,22 @@ msgstr "" "an,\n" "wenn Sie den Patch wirklich versenden wollen.\n" -#: git-send-email.perl:912 +#: git-send-email.perl:918 msgid "To whom should the emails be sent (if anyone)?" msgstr "An wen sollen die E-Mails versendet werden (wenn überhaupt jemand)?" -#: git-send-email.perl:930 +#: git-send-email.perl:936 #, perl-format msgid "fatal: alias '%s' expands to itself\n" msgstr "fatal: Alias '%s' erweitert sich zu sich selbst\n" -#: git-send-email.perl:942 +#: git-send-email.perl:948 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? " msgstr "" "Message-ID zur Verwendung als In-Reply-To für die erste E-Mail (wenn eine " "existiert)? " -#: git-send-email.perl:1000 git-send-email.perl:1008 +#: git-send-email.perl:1006 git-send-email.perl:1014 #, perl-format msgid "error: unable to extract a valid address from: %s\n" msgstr "Fehler: konnte keine gültige Adresse aus %s extrahieren\n" @@ -22401,18 +23467,18 @@ msgstr "Fehler: konnte keine gültige Adresse aus %s extrahieren\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:1012 +#: git-send-email.perl:1018 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " msgstr "" "Was soll mit dieser Adresse geschehen? (Beenden [q]|Löschen [d]|Bearbeiten " "[e]): " -#: git-send-email.perl:1329 +#: git-send-email.perl:1335 #, perl-format msgid "CA path \"%s\" does not exist" msgstr "CA Pfad \"%s\" existiert nicht" -#: git-send-email.perl:1412 +#: git-send-email.perl:1418 msgid "" " The Cc list above has been expanded by additional\n" " addresses found in the patch commit message. By default\n" @@ -22441,134 +23507,133 @@ 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:1427 +#: git-send-email.perl:1433 msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): " msgstr "" "Diese E-Mail versenden? (Ja [y]|Nein [n]|Bearbeiten [e]|Beenden [q]|Alle " "[a]): " -#: git-send-email.perl:1430 +#: git-send-email.perl:1436 msgid "Send this email reply required" msgstr "Zum Versenden dieser E-Mail ist eine Antwort erforderlich." -#: git-send-email.perl:1458 +#: git-send-email.perl:1464 msgid "The required SMTP server is not properly defined." msgstr "Der erforderliche SMTP-Server ist nicht korrekt definiert." -#: git-send-email.perl:1505 +#: git-send-email.perl:1511 #, perl-format msgid "Server does not support STARTTLS! %s" msgstr "Server unterstützt kein STARTTLS! %s" -#: git-send-email.perl:1510 git-send-email.perl:1514 +#: git-send-email.perl:1516 git-send-email.perl:1520 #, perl-format msgid "STARTTLS failed! %s" msgstr "STARTTLS fehlgeschlagen! %s" -#: git-send-email.perl:1523 +#: git-send-email.perl:1529 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." msgstr "" "Konnte SMTP nicht korrekt initialisieren. Bitte prüfen Sie Ihre " "Konfiguration\n" "und benutzen Sie --smtp-debug." -#: git-send-email.perl:1541 +#: git-send-email.perl:1547 #, perl-format msgid "Failed to send %s\n" msgstr "Fehler beim Senden %s\n" -#: git-send-email.perl:1544 +#: git-send-email.perl:1550 #, perl-format msgid "Dry-Sent %s\n" msgstr "Probeversand %s\n" -#: git-send-email.perl:1544 +#: git-send-email.perl:1550 #, perl-format msgid "Sent %s\n" msgstr "%s gesendet\n" -#: git-send-email.perl:1546 +#: git-send-email.perl:1552 msgid "Dry-OK. Log says:\n" msgstr "Probeversand OK. Log enthält:\n" -#: git-send-email.perl:1546 +#: git-send-email.perl:1552 msgid "OK. Log says:\n" msgstr "OK. Log enthält:\n" -#: git-send-email.perl:1558 +#: git-send-email.perl:1564 msgid "Result: " msgstr "Ergebnis: " -#: git-send-email.perl:1561 +#: git-send-email.perl:1567 msgid "Result: OK\n" msgstr "Ergebnis: OK\n" -#: git-send-email.perl:1579 +#: git-send-email.perl:1585 #, perl-format msgid "can't open file %s" msgstr "Kann Datei %s nicht öffnen" -#: git-send-email.perl:1626 git-send-email.perl:1646 +#: git-send-email.perl:1632 git-send-email.perl:1652 #, perl-format msgid "(mbox) Adding cc: %s from line '%s'\n" msgstr "(mbox) Füge cc: hinzu: %s von Zeile '%s'\n" -#: git-send-email.perl:1632 +#: git-send-email.perl:1638 #, perl-format msgid "(mbox) Adding to: %s from line '%s'\n" msgstr "(mbox) Füge to: hinzu: %s von Zeile '%s'\n" -#: git-send-email.perl:1685 +#: git-send-email.perl:1691 #, perl-format msgid "(non-mbox) Adding cc: %s from line '%s'\n" msgstr "(non-mbox) Füge cc: hinzu: %s von Zeile '%s'\n" -#: git-send-email.perl:1720 +#: git-send-email.perl:1726 #, perl-format msgid "(body) Adding cc: %s from line '%s'\n" msgstr "(body) Füge cc: hinzu: %s von Zeile '%s'\n" -#: git-send-email.perl:1831 +#: git-send-email.perl:1837 #, perl-format msgid "(%s) Could not execute '%s'" msgstr "(%s) Konnte '%s' nicht ausführen" -#: git-send-email.perl:1838 +#: git-send-email.perl:1844 #, perl-format msgid "(%s) Adding %s: %s from: '%s'\n" msgstr "(%s) Füge %s: %s hinzu von: '%s'\n" -#: git-send-email.perl:1842 +#: git-send-email.perl:1848 #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "(%s) Fehler beim Schließen der Pipe nach '%s'" -#: git-send-email.perl:1872 +#: git-send-email.perl:1878 msgid "cannot send message as 7bit" msgstr "Kann Nachricht nicht als 7bit versenden." -#: git-send-email.perl:1880 +#: git-send-email.perl:1886 msgid "invalid transfer encoding" msgstr "Ungültiges Transfer-Encoding" -#: git-send-email.perl:1921 git-send-email.perl:1973 git-send-email.perl:1983 +#: git-send-email.perl:1927 git-send-email.perl:1979 git-send-email.perl:1989 #, perl-format msgid "unable to open %s: %s\n" msgstr "konnte %s nicht öffnen: %s\n" -#: git-send-email.perl:1924 +#: git-send-email.perl:1930 #, perl-format msgid "%s: patch contains a line longer than 998 characters" msgstr "%s: Patch enthält eine Zeile, die länger als 998 Zeichen ist" -#: git-send-email.perl:1941 +#: git-send-email.perl:1947 #, perl-format msgid "Skipping %s with backup suffix '%s'.\n" msgstr "Lasse %s mit Backup-Suffix '%s' aus.\n" #. TRANSLATORS: please keep "[y|N]" as is. -#: git-send-email.perl:1945 +#: git-send-email.perl:1951 #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "Wollen Sie %s wirklich versenden? [y|N]: " - @@ -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: 2019-05-31 14:35+0800\n" -"PO-Revision-Date: 2019-06-03 09:33-0500\n" +"POT-Creation-Date: 2019-06-04 08:24+0800\n" +"PO-Revision-Date: 2019-06-04 18:51-0500\n" "Last-Translator: christopher.diaz.riv@gmail.com\n" "Language-Team: CodeLabora <codelabora@gmail.com>\n" "Language: es\n" @@ -2643,8 +2643,8 @@ msgid "show the given source prefix instead of \"a/\"" msgstr "mostrar el prefijo de fuente dado en lugar de \"a/\"" #: diff.c:5357 -msgid "show the given source prefix instead of \"b/\"" -msgstr "mostrar el prefijo de fuente dado en lugar de \"b/\"" +msgid "show the given destination prefix instead of \"b/\"" +msgstr "mostrar el prefijo de destino en lugar de \"b/\"" #: diff.c:5360 msgid "prepend an additional prefix to every line of output" @@ -3540,7 +3540,11 @@ msgstr "no se pueden combinar múltiples tipos de especificaciones de filtro" msgid "expected 'tree:<depth>'" msgstr "se esperaba 'tree:<depth>'" -#: list-objects-filter-options.c:156 +#: list-objects-filter-options.c:84 +msgid "sparse:path filters support has been dropped" +msgstr "soporte para filtros sparse:path ha sido discontinuado" + +#: list-objects-filter-options.c:158 msgid "cannot change partial clone promisor remote" msgstr "no se puede cambiar un clon parcial remoto promisor" @@ -20755,7 +20759,7 @@ msgstr "no se puede hacer fetch por sha1 sobre smart http" #: remote-curl.c:1120 remote-curl.c:1126 #, c-format -msgid "protocol error: expected sha/ref, got %s'" +msgid "protocol error: expected sha/ref, got '%s'" msgstr "error de protocolo: se esperaba sha/ref, se obtuvo '%s'" #: remote-curl.c:1138 remote-curl.c:1252 @@ -20784,11 +20788,11 @@ msgstr "remote-curl: fetch intentado sin un repositorio local" msgid "remote-curl: unknown command '%s' from git" msgstr "remote-curl: comando '%s' desconocido de git" -#: list-objects-filter-options.h:63 +#: list-objects-filter-options.h:61 msgid "args" msgstr "args" -#: list-objects-filter-options.h:64 +#: list-objects-filter-options.h:62 msgid "object filtering" msgstr "filtrado de objeto" @@ -75,8 +75,8 @@ msgid "" msgstr "" "Project-Id-Version: git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2019-05-31 14:35+0800\n" -"PO-Revision-Date: 2019-05-31 09:39+0200\n" +"POT-Creation-Date: 2019-06-04 08:24+0800\n" +"PO-Revision-Date: 2019-06-04 19:51+0200\n" "Last-Translator: Jean-Noël Avila <jn.avila@free.fr>\n" "Language-Team: Jean-Noël Avila <jn.avila@free.fr>\n" "Language: fr\n" @@ -2750,8 +2750,8 @@ msgid "show the given source prefix instead of \"a/\"" msgstr "afficher le préfixe de source indiqué au lieu de \"a/\"" #: diff.c:5357 -msgid "show the given source prefix instead of \"b/\"" -msgstr "afficher le préfixe de source indiqué au lieu de \"b/\"" +msgid "show the given destination prefix instead of \"b/\"" +msgstr "afficher le préfixe de destination indiqué au lieu de \"b/\"" #: diff.c:5360 msgid "prepend an additional prefix to every line of output" @@ -3671,7 +3671,11 @@ msgstr "impossible de combiner des spécificateurs multiples de filtre" msgid "expected 'tree:<depth>'" msgstr "attendu : 'tree:<profondeur>'" -#: list-objects-filter-options.c:156 +#: list-objects-filter-options.c:84 +msgid "sparse:path filters support has been dropped" +msgstr "sparse : le support des filtres de chemin a été abandonné" + +#: list-objects-filter-options.c:158 msgid "cannot change partial clone promisor remote" msgstr "impossible de modifier le prometteur distant de clone partiel" @@ -19972,8 +19976,10 @@ msgid "" "\n" "\tgit tag -f %s %s^{}" msgstr "" -"Vous avez créé une étiquette nichée. L'objet pointé par votre nouvelle étiquette\n" -"est déjà une étiquette. Si vous vouliez étiqueter l'objet pointé, utilisez :\n" +"Vous avez créé une étiquette nichée. L'objet pointé par votre nouvelle " +"étiquette\n" +"est déjà une étiquette. Si vous vouliez étiqueter l'objet pointé, " +"utilisez :\n" "\n" "\tgit tag -f %s %s^{}" @@ -21086,7 +21092,7 @@ msgstr "impossible de récupérer par sha1 sur http intelligent" #: remote-curl.c:1120 remote-curl.c:1126 #, c-format -msgid "protocol error: expected sha/ref, got %s'" +msgid "protocol error: expected sha/ref, got '%s'" msgstr "erreur de protocole : sha/ref attendu, '%s' trouvé" #: remote-curl.c:1138 remote-curl.c:1252 @@ -21115,11 +21121,11 @@ msgstr "remote-curl : récupération tentée sans dépôt local" msgid "remote-curl: unknown command '%s' from git" msgstr "remote-curl : commande inconnue '%s' depuis git" -#: list-objects-filter-options.h:63 +#: list-objects-filter-options.h:61 msgid "args" msgstr "args" -#: list-objects-filter-options.h:64 +#: list-objects-filter-options.h:62 msgid "object filtering" msgstr "filtrage d'objet" @@ -6,12 +6,13 @@ # Thanks to the former translators, Marco Paolone <marcopaolone AT gmail.com> # and Stefano Lattarini <stefano.lattarini AT gmail.com>, for their # contributions. +# Alessandro Menti <alessandro.menti@alessandromenti.it>, 2019. msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2019-02-15 10:09+0800\n" -"PO-Revision-Date: 2019-02-16 14:52+0100\n" +"POT-Creation-Date: 2019-06-04 08:24+0800\n" +"PO-Revision-Date: 2019-06-03 21:37+0200\n" "Last-Translator: Alessandro Menti <alessandro.menti@alessandromenti.it>\n" "Language-Team: Italian <>\n" "Language: it\n" @@ -19,51 +20,51 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Lokalize 18.12.2\n" +"X-Generator: Lokalize 19.04.1\n" -#: advice.c:101 +#: advice.c:103 #, c-format msgid "%shint: %.*s%s\n" msgstr "%ssuggerimento: %.*s%s\n" -#: advice.c:154 +#: advice.c:156 msgid "Cherry-picking is not possible because you have unmerged files." msgstr "" "Il cherry picking non è possibile perché ci sono file di cui non è stato " "eseguito il merge." -#: advice.c:156 +#: advice.c:158 msgid "Committing is not possible because you have unmerged files." msgstr "" "Il commit non è possibile perché ci sono file di cui non è stato eseguito il " "merge." -#: advice.c:158 +#: advice.c:160 msgid "Merging is not possible because you have unmerged files." msgstr "" "Il merge non è possibile perché ci sono file di cui non è stato eseguito il " "merge." -#: advice.c:160 +#: advice.c:162 msgid "Pulling is not possible because you have unmerged files." msgstr "" "Il pull non è possibile perché ci sono file di cui non è stato eseguito il " "merge." -#: advice.c:162 +#: advice.c:164 msgid "Reverting is not possible because you have unmerged files." msgstr "" "Il revert non è possibile perché ci sono file di cui non è stato eseguito il " "merge." -#: advice.c:164 +#: advice.c:166 #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "" "Impossibile eseguire il %s perché ci sono file di cui non è stato eseguito " "il merge." -#: advice.c:172 +#: advice.c:174 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." @@ -71,23 +72,23 @@ msgstr "" "Correggili nell'albero di lavoro, quindi usa 'git add/rm <file>...' come " "appropriato per risolverli ed esegui un commit." -#: advice.c:180 +#: advice.c:182 msgid "Exiting because of an unresolved conflict." msgstr "Esco a causa di un conflitto non risolto." -#: advice.c:185 builtin/merge.c:1290 +#: advice.c:187 builtin/merge.c:1320 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Il merge non è stato concluso (esiste MERGE_HEAD)." -#: advice.c:187 +#: advice.c:189 msgid "Please, commit your changes before merging." msgstr "Esegui il commit delle modifiche prima di eseguire il merge." -#: advice.c:188 +#: advice.c:190 msgid "Exiting because of unfinished merge." msgstr "Esco a causa di un merge non terminato." -#: advice.c:194 +#: advice.c:196 #, c-format msgid "" "Note: checking out '%s'.\n" @@ -119,103 +120,102 @@ msgstr "" "\n" #: alias.c:50 -#, fuzzy msgid "cmdline ends with \\" -msgstr "termina le voci con NUL" +msgstr "la riga di comando termina con \\" #: alias.c:51 msgid "unclosed quote" -msgstr "" +msgstr "virgolette non chiuse" -#: apply.c:59 +#: apply.c:63 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "opzione spazi bianchi '%s' non riconosciuta" -#: apply.c:75 +#: apply.c:79 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "opzione ignora spazi bianchi '%s' non riconosciuta" -#: apply.c:125 +#: apply.c:129 msgid "--reject and --3way cannot be used together." msgstr "--reject e --3way non possono essere usati insieme." -#: apply.c:127 +#: apply.c:131 msgid "--cached and --3way cannot be used together." msgstr "--cached e --3way non possono essere usati insieme." -#: apply.c:130 +#: apply.c:134 msgid "--3way outside a repository" msgstr "--3way al di fuori di un repository" -#: apply.c:141 +#: apply.c:145 msgid "--index outside a repository" msgstr "--index al di fuori di un repository" -#: apply.c:144 +#: apply.c:148 msgid "--cached outside a repository" msgstr "--cached al di fuori di un repository" -#: apply.c:825 +#: apply.c:829 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "Impossibile preparare l'espressione regolare timestamp %s" -#: apply.c:834 +#: apply.c:838 #, c-format msgid "regexec returned %d for input: %s" msgstr "regexec ha restituito %d per l'input: %s" -#: apply.c:908 +#: apply.c:912 #, c-format msgid "unable to find filename in patch at line %d" msgstr "impossibile trovare il nome del file nella patch alla riga %d" -#: apply.c:946 +#: apply.c:950 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "" "git apply: git-diff errato - atteso /dev/null, ricevuto %s alla riga %d" -#: apply.c:952 +#: apply.c:956 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "" "git apply: git-diff errato - nuovo nome del file inconsistente alla riga %d" -#: apply.c:953 +#: apply.c:957 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "" "git apply: git-diff errato - vecchio nome del file inconsistente alla riga %d" -#: apply.c:958 +#: apply.c:962 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "git apply: git-diff errato - atteso /dev/null alla riga %d" -#: apply.c:987 +#: apply.c:991 #, c-format msgid "invalid mode on line %d: %s" msgstr "modalità non valida alla riga %d: %s" -#: apply.c:1306 +#: apply.c:1310 #, c-format msgid "inconsistent header lines %d and %d" msgstr "righe di intestazione %d e %d inconsistenti" -#: apply.c:1478 +#: apply.c:1482 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recount: riga inattesa: %.*s" -#: apply.c:1547 +#: apply.c:1551 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "frammento di patch senza intestazione alla riga %d: %.*s" -#: apply.c:1567 +#: apply.c:1571 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -230,82 +230,82 @@ msgstr[1] "" "l'intestazione git diff non riporta le informazioni sul file una volta " "rimossi %d componenti iniziali del percorso (riga %d)" -#: apply.c:1580 +#: apply.c:1584 #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "l'intestazione git diff non riporta le informazioni sul file (riga %d)" -#: apply.c:1768 +#: apply.c:1772 msgid "new file depends on old contents" msgstr "il nuovo file dipende da contenuti precedenti" -#: apply.c:1770 +#: apply.c:1774 msgid "deleted file still has contents" msgstr "il file eliminato ha ancora dei contenuti" -#: apply.c:1804 +#: apply.c:1808 #, c-format msgid "corrupt patch at line %d" msgstr "patch corrotta alla riga %d" -#: apply.c:1841 +#: apply.c:1845 #, c-format msgid "new file %s depends on old contents" msgstr "il nuovo file %s dipende da contenuti precedenti" -#: apply.c:1843 +#: apply.c:1847 #, c-format msgid "deleted file %s still has contents" msgstr "il file eliminato %s ha ancora dei contenuti" -#: apply.c:1846 +#: apply.c:1850 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** attenzione: il file %s diventa vuoto ma non è eliminato" -#: apply.c:1993 +#: apply.c:1997 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "patch binaria corrotta alla riga %d: %.*s" -#: apply.c:2030 +#: apply.c:2034 #, c-format msgid "unrecognized binary patch at line %d" msgstr "patch binaria non riconosciuta alla riga %d" -#: apply.c:2192 +#: apply.c:2196 #, c-format msgid "patch with only garbage at line %d" msgstr "patch con soli contenuti garbage alla riga %d" -#: apply.c:2278 +#: apply.c:2282 #, c-format msgid "unable to read symlink %s" msgstr "impossibile leggere il collegamento simbolico %s" -#: apply.c:2282 +#: apply.c:2286 #, c-format msgid "unable to open or read %s" msgstr "impossibile aprire o leggere %s" -#: apply.c:2941 +#: apply.c:2945 #, c-format msgid "invalid start of line: '%c'" msgstr "inizio della riga non valido: '%c'" -#: apply.c:3062 +#: apply.c:3066 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "Applicazione frammento %d riuscita alla riga %d (offset: %d riga)." msgstr[1] "Applicazione frammento %d riuscita alla riga %d (offset: %d righe)." -#: apply.c:3074 +#: apply.c:3078 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "Contesto ridotto a (%ld/%ld) per applicare il frammento alla riga %d" -#: apply.c:3080 +#: apply.c:3084 #, c-format msgid "" "while searching for:\n" @@ -314,460 +314,459 @@ msgstr "" "durante la ricerca per:\n" "%.*s" -#: apply.c:3102 +#: apply.c:3106 #, c-format msgid "missing binary patch data for '%s'" msgstr "dati della patch binaria mancanti per '%s'" -#: apply.c:3110 +#: apply.c:3114 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "" "impossibile applicare una patch binaria al contrario senza l'hunk contrario " "per '%s'" -#: apply.c:3157 +#: apply.c:3161 #, c-format msgid "cannot apply binary patch to '%s' without full index line" msgstr "" "impossibile applicare una patch binaria a '%s' senza la riga d'indice " "completa" -#: apply.c:3167 +#: apply.c:3171 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." msgstr "" -"la patch si applica a '%s' (%s), che non corrisponde ai contenuti attuali " +"la patch si applica a '%s' (%s), che non corrisponde ai contenuti correnti " "del file." -#: apply.c:3175 +#: apply.c:3179 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "la patch si applica a un file vuoto '%s' ma non è vuoto" -#: apply.c:3193 +#: apply.c:3197 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "impossibile leggere la postimmagine %s necessaria per '%s'" -#: apply.c:3206 +#: apply.c:3210 #, c-format msgid "binary patch does not apply to '%s'" msgstr "la patch binaria non si applica correttamente a '%s'" -#: apply.c:3212 +#: apply.c:3216 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" "la patch binaria su '%s' crea risultati non corretti (atteso %s, ricevuto %s)" -#: apply.c:3233 +#: apply.c:3237 #, c-format msgid "patch failed: %s:%ld" msgstr "patch non riuscita: %s:%ld" -#: apply.c:3356 +#: apply.c:3360 #, c-format msgid "cannot checkout %s" msgstr "impossibile eseguire il checkout di '%s'" -#: apply.c:3408 apply.c:3419 apply.c:3465 midx.c:58 setup.c:278 +#: apply.c:3412 apply.c:3423 apply.c:3469 midx.c:59 setup.c:279 #, c-format msgid "failed to read %s" msgstr "lettura di %s non riuscita" -#: apply.c:3416 +#: apply.c:3420 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "lettura di '%s' oltre un collegamento simbolico" -#: apply.c:3445 apply.c:3688 +#: apply.c:3449 apply.c:3692 #, c-format msgid "path %s has been renamed/deleted" msgstr "il percorso %s è stato rinominato/eliminato" -#: apply.c:3531 apply.c:3703 +#: apply.c:3535 apply.c:3707 #, c-format msgid "%s: does not exist in index" -msgstr "%s: non esiste in index" +msgstr "%s: non esiste nell'indice" -#: apply.c:3540 apply.c:3711 +#: apply.c:3544 apply.c:3715 #, c-format msgid "%s: does not match index" -msgstr "%s: non corrisponde a index" +msgstr "%s: non corrisponde all'indice" -#: apply.c:3575 +#: apply.c:3579 msgid "repository lacks the necessary blob to fall back on 3-way merge." msgstr "" "dal repository manca il blob necessario per ripiegare sul merge a tre vie." -#: apply.c:3578 +#: apply.c:3582 #, c-format msgid "Falling back to three-way merge...\n" msgstr "Ripiego sul merge a tre vie...\n" -#: apply.c:3594 apply.c:3598 +#: apply.c:3598 apply.c:3602 #, c-format msgid "cannot read the current contents of '%s'" -msgstr "impossibile leggere i contenuti attuali di '%s'" +msgstr "impossibile leggere i contenuti correnti di '%s'" -#: apply.c:3610 +#: apply.c:3614 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "Ripiego sul merge a tre vie non riuscito...\n" -#: apply.c:3624 +#: apply.c:3628 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "Patch applicata a '%s' con conflitti.\n" -#: apply.c:3629 +#: apply.c:3633 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "Patch '%s' applicata correttamente.\n" -#: apply.c:3655 +#: apply.c:3659 msgid "removal patch leaves file contents" msgstr "la rimozione della patch lascia contenuti del file" -#: apply.c:3728 +#: apply.c:3732 #, c-format msgid "%s: wrong type" msgstr "%s: tipo errato" -#: apply.c:3730 +#: apply.c:3734 #, c-format msgid "%s has type %o, expected %o" msgstr "%s ha il tipo %o, atteso %o" -#: apply.c:3881 apply.c:3883 read-cache.c:820 read-cache.c:846 -#: read-cache.c:1299 +#: apply.c:3885 apply.c:3887 read-cache.c:830 read-cache.c:856 +#: read-cache.c:1309 #, c-format msgid "invalid path '%s'" msgstr "percorso non valido: %s" -#: apply.c:3939 +#: apply.c:3943 #, c-format msgid "%s: already exists in index" -msgstr "%s: esiste già in index" +msgstr "%s: esiste già nell'indice" -#: apply.c:3942 +#: apply.c:3946 #, c-format msgid "%s: already exists in working directory" msgstr "%s: esiste già nella directory di lavoro" -#: apply.c:3962 +#: apply.c:3966 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "" "la nuova modalità (%o) di %s non corrisponde alla vecchia modalità (%o)" -#: apply.c:3967 +#: apply.c:3971 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "" "la nuova modalità (%o) di %s non corrisponde alla vecchia modalità (%o) di %s" -#: apply.c:3987 +#: apply.c:3991 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "il file interessato '%s' si trova oltre un collegamento simbolico" -#: apply.c:3991 +#: apply.c:3995 #, c-format msgid "%s: patch does not apply" msgstr "%s: la patch non si applica correttamente" -#: apply.c:4006 +#: apply.c:4010 #, c-format msgid "Checking patch %s..." msgstr "Controllo della patch %s in corso..." -#: apply.c:4098 +#: apply.c:4102 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "le informazioni SHA1 per il sottomodulo %s sono mancanti o inutili" -#: apply.c:4105 +#: apply.c:4109 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "modifica modalità per %s che non è nell'HEAD corrente" -#: apply.c:4108 +#: apply.c:4112 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "le informazioni SHA1 sono mancanti o inutili (%s)." -#: apply.c:4113 builtin/checkout.c:248 builtin/reset.c:143 +#: 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 non riuscito per il percorso '%s'" -#: apply.c:4117 +#: apply.c:4121 #, c-format msgid "could not add %s to temporary index" -msgstr "impossibile aggiungere %s all'index temporaneo" +msgstr "impossibile aggiungere %s all'indice temporaneo" -#: apply.c:4127 +#: apply.c:4131 #, c-format msgid "could not write temporary index to %s" -msgstr "impossibile scrivere l'index temporaneo in %s" +msgstr "impossibile scrivere l'indice temporaneo in %s" -#: apply.c:4265 +#: apply.c:4269 #, c-format msgid "unable to remove %s from index" -msgstr "impossibile rimuovere %s da index" +msgstr "impossibile rimuovere %s dall'indice" -#: apply.c:4299 +#: apply.c:4303 #, c-format msgid "corrupt patch for submodule %s" msgstr "patch corrotta per il sottomodulo %s" -#: apply.c:4305 +#: apply.c:4309 #, c-format msgid "unable to stat newly created file '%s'" msgstr "impossibile eseguire lo stat del file appena creato '%s'" -#: apply.c:4313 +#: apply.c:4317 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "impossibile creare l'archivio di backup per il file appena creato %s" -#: apply.c:4319 apply.c:4464 +#: apply.c:4323 apply.c:4468 #, c-format msgid "unable to add cache entry for %s" msgstr "impossibile aggiungere la voce della cache per %s" -#: apply.c:4362 +#: apply.c:4366 #, c-format msgid "failed to write to '%s'" msgstr "scrittura in '%s' non riuscita" -#: apply.c:4366 +#: apply.c:4370 #, c-format msgid "closing file '%s'" msgstr "chiusura del file '%s' in corso" -#: apply.c:4436 +#: apply.c:4440 #, c-format msgid "unable to write file '%s' mode %o" msgstr "impossibile scrivere il file '%s' in modalità %o" -#: apply.c:4534 +#: apply.c:4538 #, c-format msgid "Applied patch %s cleanly." msgstr "Patch %s applicata correttamente." -#: apply.c:4542 +#: apply.c:4546 msgid "internal error" msgstr "errore interno" -#: apply.c:4545 +#: apply.c:4549 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "Applicazione della patch %%s con %d frammento respinto..." msgstr[1] "Applicazione della patch %%s con %d frammenti respinti..." -#: apply.c:4556 +#: apply.c:4560 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "nome file .rej troncato a %.*s.rej" -#: apply.c:4564 builtin/fetch.c:837 builtin/fetch.c:1118 +#: apply.c:4568 builtin/fetch.c:837 builtin/fetch.c:1118 #, c-format msgid "cannot open %s" msgstr "impossibile aprire %s" -#: apply.c:4578 +#: apply.c:4582 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Frammento %d applicato correttamente." -#: apply.c:4582 +#: apply.c:4586 #, c-format msgid "Rejected hunk #%d." msgstr "Frammento %d respinto." -#: apply.c:4692 +#: apply.c:4696 #, c-format msgid "Skipped patch '%s'." msgstr "Patch '%s' ignorata." -#: apply.c:4700 +#: apply.c:4704 msgid "unrecognized input" msgstr "input non riconosciuto" -#: apply.c:4720 +#: apply.c:4724 msgid "unable to read index file" msgstr "impossibile leggere il file index" -#: apply.c:4875 +#: apply.c:4879 #, c-format msgid "can't open patch '%s': %s" msgstr "impossibile aprire la patch '%s': %s" -#: apply.c:4902 +#: apply.c:4906 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "%d errore di spazi bianchi soppresso" msgstr[1] "%d errori di spazi bianchi soppressi" -#: apply.c:4908 apply.c:4923 +#: apply.c:4912 apply.c:4927 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "%d riga aggiunge errori di spazi bianchi." msgstr[1] "%d righe aggiungono errori di spazi bianchi." -#: apply.c:4916 +#: apply.c:4920 #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." msgstr[0] "%d riga applicata dopo la correzione di errori di spazi bianchi." msgstr[1] "%d righe applicate dopo la correzione di errori di spazi bianchi." -#: apply.c:4932 builtin/add.c:539 builtin/mv.c:301 builtin/rm.c:390 +#: apply.c:4936 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390 msgid "Unable to write new index file" msgstr "Impossibile scrivere il nuovo file index" -#: apply.c:4959 apply.c:4962 builtin/am.c:2203 builtin/am.c:2206 -#: builtin/clone.c:122 builtin/fetch.c:118 builtin/merge.c:263 -#: builtin/pull.c:200 builtin/submodule--helper.c:407 +#: 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:1850 builtin/submodule--helper.c:1853 -#: builtin/submodule--helper.c:2092 git-add--interactive.perl:197 +#: builtin/submodule--helper.c:1849 builtin/submodule--helper.c:1852 +#: builtin/submodule--helper.c:2091 git-add--interactive.perl:197 msgid "path" msgstr "percorso" -#: apply.c:4960 +#: apply.c:4964 msgid "don't apply changes matching the given path" msgstr "non applicare le modifiche corrispondenti al percorso specificato" -#: apply.c:4963 +#: apply.c:4967 msgid "apply changes matching the given path" msgstr "applica le modifiche corrispondenti al percorso specificato" -#: apply.c:4965 builtin/am.c:2212 +#: apply.c:4969 builtin/am.c:2219 msgid "num" msgstr "num" -#: apply.c:4966 +#: apply.c:4970 msgid "remove <num> leading slashes from traditional diff paths" msgstr "rimuovi <num> barre iniziali dai percorsi diff tradizionali" -#: apply.c:4969 +#: apply.c:4973 msgid "ignore additions made by the patch" msgstr "ignora le aggiunte create dalla patch" -#: apply.c:4971 +#: apply.c:4975 msgid "instead of applying the patch, output diffstat for the input" msgstr "invece di applicare la patch, mostra l'output di diffstat per l'input" -#: apply.c:4975 +#: apply.c:4979 msgid "show number of added and deleted lines in decimal notation" msgstr "mostra il numero di righe aggiunte ed eliminate in notazione decimale" -#: apply.c:4977 +#: apply.c:4981 msgid "instead of applying the patch, output a summary for the input" msgstr "invece di applicare la patch, mostra un riassunto per l'input" -#: apply.c:4979 +#: apply.c:4983 msgid "instead of applying the patch, see if the patch is applicable" msgstr "invece di applicare la patch, verifica se può essere applicata" -#: apply.c:4981 +#: apply.c:4985 msgid "make sure the patch is applicable to the current index" -msgstr "assicura che la patch sia applicabile all'index attuale" +msgstr "assicura che la patch sia applicabile all'indice corrente" -#: apply.c:4983 +#: apply.c:4987 msgid "mark new files with `git add --intent-to-add`" msgstr "contrassegna i nuovi file con `git add --intent-to-add`" -#: apply.c:4985 +#: apply.c:4989 msgid "apply a patch without touching the working tree" msgstr "applica una patch senza modificare l'albero di lavoro" -#: apply.c:4987 +#: apply.c:4991 msgid "accept a patch that touches outside the working area" msgstr "" "accetta una patch che apporta modifiche al di fuori dell'area di lavoro" -#: apply.c:4990 +#: apply.c:4994 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "applica anche la patch (da usare con --stat/--summary/--check)" -#: apply.c:4992 +#: apply.c:4996 msgid "attempt three-way merge if a patch does not apply" msgstr "prova un merge a tre vie se la patch non si applica correttamente" -#: apply.c:4994 +#: apply.c:4998 msgid "build a temporary index based on embedded index information" -msgstr "compila un index temporaneo basato sulle informazioni index incluse" +msgstr "compila un index temporaneo basato sulle informazioni indice incluse" -#: apply.c:4997 builtin/checkout-index.c:173 builtin/ls-files.c:524 +#: apply.c:5001 builtin/checkout-index.c:173 builtin/ls-files.c:524 msgid "paths are separated with NUL character" msgstr "i percorsi sono separati con un carattere NUL" -#: apply.c:4999 +#: apply.c:5003 msgid "ensure at least <n> lines of context match" msgstr "assicura almeno <n> righe di contesto corrispondente" -#: apply.c:5000 builtin/am.c:2191 builtin/interpret-trailers.c:97 +#: 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:3314 builtin/rebase.c:1065 +#: builtin/pack-objects.c:3317 builtin/rebase.c:1415 msgid "action" msgstr "azione" -#: apply.c:5001 +#: apply.c:5005 msgid "detect new or modified lines that have whitespace errors" msgstr "rileva righe nuove o modificate che hanno errori di spazi bianchi" -#: apply.c:5004 apply.c:5007 +#: apply.c:5008 apply.c:5011 msgid "ignore changes in whitespace when finding context" msgstr "ignora modifiche agli spazi bianchi durante la ricerca dei contesti" -#: apply.c:5010 +#: apply.c:5014 msgid "apply the patch in reverse" msgstr "applica la patch in maniera inversa" -#: apply.c:5012 +#: apply.c:5016 msgid "don't expect at least one line of context" msgstr "non aspettare almeno una riga di contesto" -#: apply.c:5014 +#: apply.c:5018 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "lascia i frammenti respinti nei file *.rej corrispondenti" -#: apply.c:5016 +#: apply.c:5020 msgid "allow overlapping hunks" msgstr "consenti la sovrapposizione dei frammenti" -#: apply.c:5017 builtin/add.c:291 builtin/check-ignore.c:22 -#: builtin/commit.c:1312 builtin/count-objects.c:98 builtin/fsck.c:724 -#: builtin/log.c:2037 builtin/mv.c:123 builtin/read-tree.c:128 -#: builtin/rebase--interactive.c:159 +#: 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 msgid "be verbose" msgstr "visualizza ulteriori dettagli" -#: apply.c:5019 +#: apply.c:5023 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" "tollera carattere fine riga rilevato erroneamente come mancante alla fine " "del file" -#: apply.c:5022 +#: apply.c:5026 msgid "do not trust the line counts in the hunk headers" msgstr "" "non fare affidamento sul numero di righe nelle intestazioni dei frammenti" -#: apply.c:5024 builtin/am.c:2200 +#: apply.c:5028 builtin/am.c:2207 msgid "root" msgstr "radice" -#: apply.c:5025 +#: apply.c:5029 msgid "prepend <root> to all filenames" msgstr "anteponi <root> a tutti i nomi file" @@ -790,30 +789,29 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <repository> [--exec <comando>] --list" -#: archive.c:372 builtin/add.c:177 builtin/add.c:515 builtin/rm.c:299 +#: archive.c:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299 #, c-format msgid "pathspec '%s' did not match any files" msgstr "lo specificatore percorso '%s' non corrisponde ad alcun file" #: archive.c:396 -#, fuzzy, c-format +#, c-format msgid "no such ref: %.*s" -msgstr "Remote non esistente: %s" +msgstr "riferimento non esistente: %.*s" #: archive.c:401 -#, fuzzy, c-format +#, c-format msgid "not a valid object name: %s" -msgstr "Non è il nome di un oggetto valido %s" +msgstr "%s non è un nome oggetto valido" #: archive.c:414 -#, fuzzy, c-format +#, c-format msgid "not a tree object: %s" -msgstr "oggetto albero %s non valido" +msgstr "%s non è un oggetto albero valido" #: archive.c:424 -#, fuzzy msgid "current working directory is untracked" -msgstr "impossibile ottenere la directory di lavoro corrente" +msgstr "la directory di lavoro corrente non è tracciata" #: archive.c:455 msgid "fmt" @@ -823,7 +821,7 @@ msgstr "fmt" msgid "archive format" msgstr "formato archivio" -#: archive.c:456 builtin/log.c:1549 +#: archive.c:456 builtin/log.c:1557 msgid "prefix" msgstr "prefisso" @@ -831,11 +829,11 @@ msgstr "prefisso" msgid "prepend prefix to each pathname in the archive" msgstr "anteponi <prefisso> a ogni nome percorso nell'archivio" -#: archive.c:458 builtin/blame.c:820 builtin/blame.c:821 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:162 +#: 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 msgid "file" msgstr "file" @@ -867,8 +865,8 @@ msgstr "comprimi meglio" msgid "list supported archive formats" msgstr "elenca i formati archivio supportati" -#: archive.c:477 builtin/archive.c:91 builtin/clone.c:112 builtin/clone.c:115 -#: builtin/submodule--helper.c:1378 builtin/submodule--helper.c:1859 +#: 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 msgid "repo" msgstr "repository" @@ -876,7 +874,7 @@ msgstr "repository" msgid "retrieve the archive from remote repository <repo>" msgstr "recupera l'archivio dal repository remoto <repository>" -#: archive.c:479 builtin/archive.c:93 builtin/difftool.c:715 +#: archive.c:479 builtin/archive.c:93 builtin/difftool.c:707 #: builtin/notes.c:498 msgid "command" msgstr "comando" @@ -922,16 +920,16 @@ msgstr "modalità file non supportata: 0%o (SHA1: %s)" msgid "cannot read %s" msgstr "impossibile leggere %s" -#: archive-tar.c:458 +#: archive-tar.c:459 #, c-format msgid "unable to start '%s' filter" msgstr "impossibile avviare il filtro '%s'" -#: archive-tar.c:461 +#: archive-tar.c:462 msgid "unable to redirect descriptor" msgstr "impossibile ridirezionare il descrittore" -#: archive-tar.c:468 +#: archive-tar.c:469 #, c-format msgid "'%s' filter reported error" msgstr "il filtro '%s' ha segnalato un errore" @@ -946,7 +944,7 @@ msgstr "il percorso non è codificato validamente in UTF-8: %s" msgid "path too long (%d chars, SHA1: %s): %s" msgstr "percorso troppo lungo (%d caratteri, SHA1: %s): %s" -#: archive-zip.c:474 builtin/pack-objects.c:225 builtin/pack-objects.c:228 +#: archive-zip.c:474 builtin/pack-objects.c:226 builtin/pack-objects.c:229 #, c-format msgid "deflate error (%d)" msgstr "errore deflate (%d)" @@ -962,9 +960,9 @@ msgid "%.*s is not a valid attribute name" msgstr "%.*s non è un nome attributo valido" #: attr.c:368 -#, fuzzy, c-format +#, c-format msgid "%s not allowed: %s:%d" -msgstr "patch non riuscita: %s:%ld" +msgstr "%s non consentito: %s:%d" #: attr.c:408 msgid "" @@ -972,7 +970,7 @@ msgid "" "Use '\\!' for literal leading exclamation." msgstr "" "I pattern negativi sono ignorati negli attributi git\n" -"Utilizzare '\\!' per specificare un punto esclamativo iniziale letteralmente." +"Usare '\\!' per specificare un punto esclamativo iniziale letteralmente." #: bisect.c:468 #, c-format @@ -1048,26 +1046,26 @@ msgstr "Bisezione: dev'essere testata una base del merge\n" msgid "a %s revision is needed" msgstr "è richiesta una revisione %s" -#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:237 +#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:248 #, c-format msgid "could not create file '%s'" msgstr "impossibile creare il file '%s'" -#: bisect.c:937 builtin/merge.c:139 +#: bisect.c:928 builtin/merge.c:146 #, c-format msgid "could not read file '%s'" msgstr "impossibile leggere il file '%s'" -#: bisect.c:967 +#: bisect.c:958 msgid "reading bisect refs failed" msgstr "lettura riferimenti della bisezione non riuscita" -#: bisect.c:986 +#: bisect.c:977 #, c-format msgid "%s was both %s and %s\n" msgstr "%s era sia %s sia %s\n" -#: bisect.c:994 +#: bisect.c:985 #, c-format msgid "" "No testable commit found.\n" @@ -1076,7 +1074,7 @@ msgstr "" "Nessun commit testabile trovato.\n" "Forse hai iniziato il procedimento specificando parametri percorso errati?\n" -#: bisect.c:1013 +#: bisect.c:1004 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -1086,7 +1084,7 @@ msgstr[1] "(circa %d passi)" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. -#: bisect.c:1019 +#: bisect.c:1010 #, 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" @@ -1095,46 +1093,46 @@ msgstr[0] "" msgstr[1] "" "Bisezione in corso: %d revisioni rimanenti da testare dopo questa %s\n" -#: blame.c:1792 +#: blame.c:1794 msgid "--contents and --reverse do not blend well." msgstr "--contents e --reverse non sono compatibili." -#: blame.c:1806 +#: blame.c:1808 msgid "cannot use --contents with final commit object name" msgstr "impossibile usare --contents con il nome oggetto del commit finale" -#: blame.c:1827 +#: blame.c:1829 msgid "--reverse and --first-parent together require specified latest commit" msgstr "" "le opzioni --reverse e --first-parent se usate insieme richiedono che sia " "specificato l'ultimo commit" -#: blame.c:1836 bundle.c:164 ref-filter.c:2071 remote.c:1948 sequencer.c:1993 -#: sequencer.c:4064 builtin/commit.c:1004 builtin/log.c:378 builtin/log.c:936 -#: builtin/log.c:1420 builtin/log.c:1796 builtin/log.c:2086 builtin/merge.c:407 -#: builtin/pack-objects.c:3137 builtin/pack-objects.c:3152 +#: 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 msgid "revision walk setup failed" msgstr "impostazione percorso revisioni non riuscita" -#: blame.c:1854 +#: blame.c:1856 msgid "" "--reverse --first-parent together require range along first-parent chain" msgstr "" "le opzioni --reverse e --first-parent se usate insieme richiedono che sia " "specificato un intervallo nella catena del primo commit genitore" -#: blame.c:1865 +#: blame.c:1867 #, c-format msgid "no such path %s in %s" msgstr "il percorso %s in %s non esiste" -#: blame.c:1876 +#: blame.c:1878 #, c-format msgid "cannot read blob %s for path %s" msgstr "impossibile leggere il blob %s per il percorso %s" -#: branch.c:52 +#: branch.c:53 #, c-format msgid "" "\n" @@ -1147,95 +1145,95 @@ msgstr "" "le informazioni di tracciamento remoto eseguendo\n" "\"git branch --set-upstream-to=%s%s%s\"." -#: branch.c:66 +#: branch.c:67 #, c-format msgid "Not setting branch %s as its own upstream." msgstr "Non imposto il branch %s come upstream di sé stesso." -#: branch.c:92 +#: branch.c:93 #, c-format msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing." msgstr "" "Branch '%s' impostato per tracciare il branch remoto '%s' da '%s' tramite " "rebase." -#: branch.c:93 +#: branch.c:94 #, c-format msgid "Branch '%s' set up to track remote branch '%s' from '%s'." msgstr "Branch '%s' impostato per tracciare il branch remoto '%s' da '%s'." -#: branch.c:97 +#: branch.c:98 #, c-format msgid "Branch '%s' set up to track local branch '%s' by rebasing." msgstr "" "Branch '%s' impostato per tracciare il branch locale '%s' tramite rebase." -#: branch.c:98 +#: branch.c:99 #, c-format msgid "Branch '%s' set up to track local branch '%s'." msgstr "Branch '%s' impostato per tracciare il branch locale '%s'." -#: branch.c:103 +#: branch.c:104 #, c-format msgid "Branch '%s' set up to track remote ref '%s' by rebasing." msgstr "" "Branch '%s' impostato per tracciare il riferimento remoto '%s' tramite " "rebase." -#: branch.c:104 +#: branch.c:105 #, c-format msgid "Branch '%s' set up to track remote ref '%s'." msgstr "Branch '%s' impostato per tracciare il riferimento remoto '%s'." -#: branch.c:108 +#: branch.c:109 #, c-format msgid "Branch '%s' set up to track local ref '%s' by rebasing." msgstr "" "Branch '%s' impostato per tracciare il riferimento locale '%s' tramite " "rebase." -#: branch.c:109 +#: branch.c:110 #, c-format msgid "Branch '%s' set up to track local ref '%s'." msgstr "Branch '%s' impostato per tracciare il riferimento locale '%s'." -#: branch.c:118 +#: branch.c:119 msgid "Unable to write upstream branch configuration" msgstr "Impossibile scrivere la configurazione relativa al branch upstream" -#: branch.c:155 +#: branch.c:156 #, c-format msgid "Not tracking: ambiguous information for ref %s" msgstr "" "Il tracciamento non avverrà: informazioni ambigue per il riferimento %s" -#: branch.c:188 +#: branch.c:189 #, c-format msgid "'%s' is not a valid branch name." msgstr "'%s' non è un nome branch valido." -#: branch.c:207 +#: branch.c:208 #, c-format msgid "A branch named '%s' already exists." msgstr "Un branch denominato '%s' esiste già." -#: branch.c:212 +#: branch.c:213 msgid "Cannot force update the current branch." msgstr "Impossibile eseguire un aggiornamento forzato del branch corrente." -#: branch.c:232 +#: branch.c:233 #, c-format msgid "Cannot setup tracking information; starting point '%s' is not a branch." msgstr "" "Impossibile impostare le informazioni di tracciamento: il punto di partenza " "'%s' non è un branch." -#: branch.c:234 +#: branch.c:235 #, c-format msgid "the requested upstream branch '%s' does not exist" msgstr "il branch upstream richiesto '%s' non esiste" -#: branch.c:236 +#: branch.c:237 msgid "" "\n" "If you are planning on basing your work on an upstream\n" @@ -1253,20 +1251,20 @@ msgstr "" "\n" "Se prevedi di eseguire il push di un nuovo branch locale\n" "che traccerà la sua controparte remota, potresti voler\n" -"utilizzare \"git push -u\" per impostare la configurazione del\n" +"usare \"git push -u\" per impostare la configurazione del\n" "branch upstream durante il push." -#: branch.c:280 +#: branch.c:281 #, c-format msgid "Not a valid object name: '%s'." msgstr "Nome oggetto non valido: '%s'." -#: branch.c:300 +#: branch.c:301 #, c-format msgid "Ambiguous object name: '%s'." msgstr "Nome oggetto ambiguo: '%s'." -#: branch.c:305 +#: branch.c:306 #, c-format msgid "Not a valid branch point: '%s'." msgstr "Punto di branch non valido: '%s'." @@ -1291,8 +1289,8 @@ msgstr "'%s' non sembra essere un file bundle v2" msgid "unrecognized header: %s%s (%d)" msgstr "intestazione non riconosciuta: %s%s (%d)" -#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2215 sequencer.c:2763 -#: builtin/commit.c:776 +#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2281 sequencer.c:2916 +#: builtin/commit.c:788 #, c-format msgid "could not open '%s'" msgstr "impossibile aprire '%s'" @@ -1340,7 +1338,7 @@ msgstr "comando rev-list morto" msgid "ref '%s' is excluded by the rev-list options" msgstr "il ref '%s' è escluso dalle opzioni di rev-list" -#: bundle.c:457 builtin/log.c:193 builtin/log.c:1701 builtin/shortlog.c:306 +#: bundle.c:457 builtin/log.c:197 builtin/log.c:1709 builtin/shortlog.c:306 #, c-format msgid "unrecognized argument: %s" msgstr "argomento non riconosciuto: %s" @@ -1363,9 +1361,8 @@ msgstr "comando index-pack morto" msgid "invalid color value: %.*s" msgstr "valore colore non valido: %.*s" -#: commit.c:50 sequencer.c:2567 builtin/am.c:355 builtin/am.c:399 -#: builtin/am.c:1375 builtin/am.c:2019 builtin/replace.c:376 -#: builtin/replace.c:448 +#: 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 "impossibile analizzare %s" @@ -1389,33 +1386,33 @@ msgstr "" "Il supporto per <GIT_DIR>/info/graft è deprecato\n" "e sarà rimosso in una versione futura di Git.\n" "\n" -"Utilizzare \"git replace --convert-graft-file\"\n" +"Usare \"git replace --convert-graft-file\"\n" "per convertire i graft in ref sostitutivi.\n" "\n" "Per disabilitare questo messaggio, eseguire\n" "\"git config advice.graftFileDeprecated false\"" -#: commit.c:1122 +#: commit.c:1128 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "Il commit %s ha una firma GPG non affidabile, presumibilmente di %s." -#: commit.c:1125 +#: commit.c:1131 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "Il commit %s ha una firma GPG non valida presumibilmente di %s." -#: commit.c:1128 +#: commit.c:1134 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "Il commit %s non ha una firma GPG." -#: commit.c:1131 +#: commit.c:1137 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "Il commit %s ha una firma GPG valida di %s\n" -#: commit.c:1385 +#: 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" @@ -1426,141 +1423,212 @@ msgstr "" "la variabile di configurazione i18n.commitencoding alla codifica usata\n" "dal tuo progetto.\n" -#: commit-graph.c:101 -#, c-format -msgid "graph file %s is too small" -msgstr "il file grafo %s è troppo piccolo" +#: commit-graph.c:105 +msgid "commit-graph file is too small" +msgstr "il file grafo dei commit %s è troppo piccolo" -#: commit-graph.c:136 +#: commit-graph.c:170 #, c-format -msgid "graph signature %X does not match signature %X" -msgstr "la firma del grafo %X non corrisponde alla firma %X" +msgid "commit-graph signature %X does not match signature %X" +msgstr "la firma del grafo dei commit %X non corrisponde alla firma %X" -#: commit-graph.c:143 +#: commit-graph.c:177 #, c-format -msgid "graph version %X does not match version %X" -msgstr "la versione del grafo %X non corrisponde alla versione %X" +msgid "commit-graph version %X does not match version %X" +msgstr "la versione del grafo dei commit %X non corrisponde alla versione %X" -#: commit-graph.c:150 +#: commit-graph.c:184 #, c-format -msgid "hash version %X does not match version %X" -msgstr "la versione dell'hash %X non corrisponde alla versione %X" +msgid "commit-graph hash version %X does not match version %X" +msgstr "" +"la versione hash del grafo dei commit %X non corrisponde alla versione %X" -#: commit-graph.c:173 -msgid "chunk lookup table entry missing; graph file may be incomplete" +#: commit-graph.c:207 +msgid "commit-graph chunk lookup table entry missing; file may be incomplete" msgstr "" +"voce blocco grafo dei commit mancante nella tabella di ricerca; il file " +"potrebbe non essere completo" -#: commit-graph.c:184 +#: commit-graph.c:218 #, c-format -msgid "improper chunk offset %08x%08x" -msgstr "offset blocco improprio %08x%08x" +msgid "commit-graph improper chunk offset %08x%08x" +msgstr "offset blocco grafo dei commit improprio %08x%08x" -#: commit-graph.c:221 +#: commit-graph.c:255 #, c-format -msgid "chunk id %08x appears multiple times" -msgstr "l'ID del blocco %08x compare più volte" +msgid "commit-graph chunk id %08x appears multiple times" +msgstr "l'ID del blocco grafo dei commit %08x compare più volte" -#: commit-graph.c:334 +#: commit-graph.c:390 #, c-format msgid "could not find commit %s" msgstr "impossibile trovare il commit %s" -#: commit-graph.c:671 builtin/pack-objects.c:2646 +#: commit-graph.c:732 builtin/pack-objects.c:2649 #, c-format msgid "unable to get type of object %s" msgstr "impossibile recuperare il tipo dell'oggetto %s" -#: commit-graph.c:704 -#, fuzzy +#: commit-graph.c:765 msgid "Loading known commits in commit graph" -msgstr "Annotazione commit nel grafo dei commit in corso" +msgstr "Caricamento commit noti nel grafo dei commit in corso" -#: commit-graph.c:720 -#, fuzzy +#: commit-graph.c:781 msgid "Expanding reachable commits in commit graph" -msgstr "Annotazione commit nel grafo dei commit in corso" +msgstr "Espansione dei commit raggiungibili nel grafo dei commit in corso" -#: commit-graph.c:732 -#, fuzzy +#: commit-graph.c:793 msgid "Clearing commit marks in commit graph" -msgstr "Verifica dei commit nel grafo dei commit in corso" +msgstr "Rimozione dei contrassegni commit nel grafo dei commit in corso" -#: commit-graph.c:752 +#: commit-graph.c:813 msgid "Computing commit graph generation numbers" msgstr "Calcolo numeri generazione del grafo dei commit in corso" -#: commit-graph.c:869 -#, fuzzy, c-format +#: commit-graph.c:930 +#, c-format msgid "Finding commits for commit graph in %d pack" msgid_plural "Finding commits for commit graph in %d packs" -msgstr[0] "Ricerca dei commit per il grafo dei commit in corso" -msgstr[1] "Ricerca dei commit per il grafo dei commit in corso" +msgstr[0] "Ricerca dei commit per il grafo dei commit in %d pack in corso" +msgstr[1] "Ricerca dei commit per il grafo dei commit in %d pack in corso" -#: commit-graph.c:882 +#: commit-graph.c:943 #, c-format msgid "error adding pack %s" msgstr "errore durante l'aggiunta del pack %s" -#: commit-graph.c:884 +#: commit-graph.c:945 #, c-format msgid "error opening index for %s" -msgstr "errore durante l'apertura dell'index per %s" +msgstr "errore durante l'apertura dell'indice per %s" -#: commit-graph.c:898 -#, fuzzy, c-format +#: 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] "Ricerca dei commit per il grafo dei commit in corso" -msgstr[1] "Ricerca dei commit per il grafo dei commit in corso" +msgstr[0] "" +"Ricerca dei commit per il grafo dei commit da %d riferimento in corso" +msgstr[1] "" +"Ricerca dei commit per il grafo dei commit da %d riferimenti in corso" -#: commit-graph.c:930 -#, fuzzy +#: commit-graph.c:991 msgid "Finding commits for commit graph among packed objects" -msgstr "Ricerca dei commit per il grafo dei commit in corso" +msgstr "" +"Ricerca dei commit per il grafo dei commit fra gli oggetti nei pack in corso" -#: commit-graph.c:943 -#, fuzzy +#: commit-graph.c:1004 msgid "Counting distinct commits in commit graph" -msgstr "Annotazione commit nel grafo dei commit in corso" +msgstr "Conteggio commit distinti nel grafo dei commit in corso" -#: commit-graph.c:956 +#: commit-graph.c:1017 #, c-format msgid "the commit graph format cannot write %d commits" msgstr "" -"il formato del grafo dei commit non può essere utilizzato per scrivere %d " -"commit" +"il formato del grafo dei commit non può essere usato per scrivere %d commit" -#: commit-graph.c:965 -#, fuzzy +#: commit-graph.c:1026 msgid "Finding extra edges in commit graph" -msgstr "Ricerca dei commit per il grafo dei commit in corso" +msgstr "Ricerca degli archi aggiuntivi nel grafo dei commit in corso" -#: commit-graph.c:989 +#: commit-graph.c:1050 msgid "too many commits to write graph" msgstr "troppi commit da scrivere nel grafo" -#: commit-graph.c:996 midx.c:769 +#: commit-graph.c:1057 midx.c:819 #, c-format msgid "unable to create leading directories of %s" msgstr "impossibile creare le prime directory di %s" -#: commit-graph.c:1036 -#, fuzzy, c-format +#: commit-graph.c:1097 +#, c-format msgid "Writing out commit graph in %d pass" msgid_plural "Writing out commit graph in %d passes" -msgstr[0] "Verifica dei commit nel grafo dei commit in corso" -msgstr[1] "Verifica dei commit nel grafo dei commit in corso" +msgstr[0] "Scrittura in %d passaggio del grafo dei commit in corso" +msgstr[1] "Scrittura in %d passaggi del grafo dei commit in corso" -#: commit-graph.c:1109 +#: commit-graph.c:1162 msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "" "il file del grafo dei commit ha un checksum non corretto e probabilmente è " "corrotto" -#: commit-graph.c:1153 +#: commit-graph.c:1172 +#, c-format +msgid "commit-graph has incorrect OID order: %s then %s" +msgstr "il grafo dei commit ha un ordine OID non corretto: %s seguito da %s" + +#: commit-graph.c:1182 commit-graph.c:1197 +#, c-format +msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" +msgstr "" +"il grafo dei commit ha un valore fanout non corretto: fanout[%d] = %u != %u" + +#: commit-graph.c:1189 +#, c-format +msgid "failed to parse commit %s from commit-graph" +msgstr "impossibile analizzare il commit %s nel grafo dei commit" + +#: commit-graph.c:1206 msgid "Verifying commits in commit graph" msgstr "Verifica dei commit nel grafo dei commit in corso" +#: commit-graph.c:1219 +#, c-format +msgid "failed to parse commit %s from object database for commit-graph" +msgstr "" +"impossibile analizzare il commit %s dal database oggetti per il grafo dei " +"commit" + +#: commit-graph.c:1226 +#, c-format +msgid "root tree OID for commit %s in commit-graph is %s != %s" +msgstr "" +"l'OID dell'albero radice per il commit %s nel grafo dei commit è %s != %s" + +#: commit-graph.c:1236 +#, c-format +msgid "commit-graph parent list for commit %s is too long" +msgstr "l'elenco genitori nel grafo dei commit per il commit %s è troppo lungo" + +#: commit-graph.c:1242 +#, c-format +msgid "commit-graph parent for %s is %s != %s" +msgstr "il genitore nel grafo dei commit per %s è %s != %s" + +#: commit-graph.c:1255 +#, c-format +msgid "commit-graph parent list for commit %s terminates early" +msgstr "" +"l'elenco genitori nel grafo dei commit per il commit %s è finito prima del " +"previsto" + +#: commit-graph.c:1260 +#, c-format +msgid "" +"commit-graph has generation number zero for commit %s, but non-zero elsewhere" +msgstr "" +"il grafo dei commit ha un numero generazione zero per il commit %s ma non " +"pari a zero per gli altri" + +#: commit-graph.c:1264 +#, c-format +msgid "" +"commit-graph has non-zero generation number for commit %s, but zero elsewhere" +msgstr "" +"il grafo dei commit ha un numero generazione non pari a zero per il commit " +"%s ma pari a zero per gli altri" + +#: commit-graph.c:1279 +#, c-format +msgid "commit-graph generation for commit %s is %u != %u" +msgstr "il numero generazione nel grafo dei commit per il commit %s è %u != %u" + +#: commit-graph.c:1285 +#, c-format +msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" +msgstr "" +"la data per il commit %s nel grafo dei commit è %<PRIuMAX> != %<PRIuMAX>" + #: compat/obstack.c:406 compat/obstack.c:408 msgid "memory exhausted" msgstr "memoria esaurita" @@ -1604,7 +1672,7 @@ msgstr "la chiave non contiene una sezione: %s" msgid "key does not contain variable name: %s" msgstr "la chiave non contiene un nome variabile: %s" -#: config.c:378 sequencer.c:2330 +#: config.c:378 sequencer.c:2459 #, c-format msgid "invalid key: %s" msgstr "chiave non valida: %s" @@ -1745,141 +1813,141 @@ msgstr "valore malformato per %s: %s" msgid "must be one of nothing, matching, simple, upstream or current" msgstr "dev'essere nothing, matching, simple, upstream o current" -#: config.c:1481 builtin/pack-objects.c:3394 +#: config.c:1483 builtin/pack-objects.c:3397 #, c-format msgid "bad pack compression level %d" msgstr "livello compressione pack %d non valido" -#: config.c:1602 +#: config.c:1604 #, c-format msgid "unable to load config blob object '%s'" msgstr "impossibile caricare l'oggetto blob configurazione '%s'" -#: config.c:1605 +#: config.c:1607 #, c-format msgid "reference '%s' does not point to a blob" msgstr "il riferimento '%s' non punta ad un blob" -#: config.c:1622 +#: config.c:1624 #, c-format msgid "unable to resolve config blob '%s'" msgstr "impossibile risolvere il blob configurazione '%s'" -#: config.c:1652 +#: config.c:1654 #, c-format msgid "failed to parse %s" msgstr "analisi di %s non riuscita" -#: config.c:1705 +#: config.c:1710 msgid "unable to parse command-line config" msgstr "impossibile analizzare la configurazione a riga di comando" -#: config.c:2037 +#: config.c:2059 msgid "unknown error occurred while reading the configuration files" msgstr "" "si è verificato un errore imprevisto durante la lettura dei file di " "configurazione" -#: config.c:2207 +#: config.c:2229 #, c-format msgid "Invalid %s: '%s'" msgstr "%s non valido: '%s'" -#: config.c:2250 +#: config.c:2272 #, c-format msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" msgstr "" "valore core.untrackedCache '%s' non valido; utilizzerò il valore predefinito " "'keep'" -#: config.c:2276 +#: config.c:2298 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "" "il valore splitIndex.maxPercentChange '%d' dovrebbe essere compreso fra 0 e " "100" -#: config.c:2322 +#: config.c:2344 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "impossibile analizzare '%s' dalla configurazione a riga di comando" -#: config.c:2324 +#: config.c:2346 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "variabile configurazione '%s' errata nel file '%s' alla riga %d" -#: config.c:2405 +#: config.c:2427 #, c-format msgid "invalid section name '%s'" msgstr "nome sezione '%s' non valido" -#: config.c:2437 +#: config.c:2459 #, c-format msgid "%s has multiple values" msgstr "%s ha più valori" -#: config.c:2466 +#: config.c:2488 #, c-format msgid "failed to write new configuration file %s" msgstr "scrittura del nuovo file di configurazione %s non riuscita" -#: config.c:2716 config.c:3040 +#: config.c:2740 config.c:3064 #, c-format msgid "could not lock config file %s" msgstr "impossibile bloccare il file di configurazione %s" -#: config.c:2727 +#: config.c:2751 #, c-format msgid "opening %s" msgstr "apertura di %s in corso" -#: config.c:2762 builtin/config.c:328 +#: config.c:2786 builtin/config.c:328 #, c-format msgid "invalid pattern: %s" msgstr "pattern non valido: %s" -#: config.c:2787 +#: config.c:2811 #, c-format msgid "invalid config file %s" msgstr "file di configurazione %s non valido" -#: config.c:2800 config.c:3053 +#: config.c:2824 config.c:3077 #, c-format msgid "fstat on %s failed" msgstr "fstat di %s non riuscita" -#: config.c:2811 +#: config.c:2835 #, c-format msgid "unable to mmap '%s'" msgstr "impossibile eseguire mmap su '%s'" -#: config.c:2820 config.c:3058 +#: config.c:2844 config.c:3082 #, c-format msgid "chmod on %s failed" msgstr "esecuzione chmod su %s non riuscita" -#: config.c:2905 config.c:3155 +#: config.c:2929 config.c:3179 #, c-format msgid "could not write config file %s" msgstr "impossibile scrivere il file di configurazione %s" -#: config.c:2939 +#: config.c:2963 #, c-format msgid "could not set '%s' to '%s'" msgstr "impossibile impostare '%s' a '%s'" -#: config.c:2941 builtin/remote.c:782 +#: config.c:2965 builtin/remote.c:782 #, c-format msgid "could not unset '%s'" msgstr "impossibile eliminare l'impostazione di '%s'" -#: config.c:3031 +#: config.c:3055 #, c-format msgid "invalid section name: %s" msgstr "nome sezione non valido: %s" -#: config.c:3198 +#: config.c:3222 #, c-format msgid "missing value for '%s'" msgstr "valore mancante per %s" @@ -2037,28 +2105,28 @@ msgstr "la variante SSH 'simple' non supporta -6" msgid "ssh variant 'simple' does not support setting port" msgstr "la variante SSH 'simple' non supporta l'impostazione della porta" -#: connect.c:1259 +#: connect.c:1260 #, c-format msgid "strange pathname '%s' blocked" msgstr "percorso strano '%s' bloccato" -#: connect.c:1304 +#: connect.c:1307 msgid "unable to fork" msgstr "impossibile eseguire fork" -#: connected.c:68 builtin/fsck.c:221 builtin/prune.c:146 +#: connected.c:85 builtin/fsck.c:221 builtin/prune.c:43 msgid "Checking connectivity" -msgstr "Controllo connettività in corso" +msgstr "Controllo connessione in corso" -#: connected.c:80 +#: connected.c:97 msgid "Could not run 'git rev-list'" msgstr "Non è stato possibile eseguire 'git-rev-list'" -#: connected.c:100 +#: connected.c:117 msgid "failed write to rev-list" msgstr "scrittura nella rev-list non riuscita" -#: connected.c:107 +#: connected.c:124 msgid "failed to close rev-list's stdin" msgstr "chiusura standard input della rev-list non riuscita" @@ -2106,8 +2174,8 @@ msgid "" "The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-" "tree-encoding." msgstr "" -"Il file '%s' contiene un indicatore dell'ordine dei byte (BOM). Utilizzare " -"UTF-%s come codifica dell'albero di lavoro." +"Il file '%s' contiene un indicatore dell'ordine dei byte (BOM). Usare UTF-%s " +"come codifica dell'albero di lavoro." #: convert.c:304 #, c-format @@ -2120,9 +2188,9 @@ msgid "" "The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-" "%sLE (depending on the byte order) as working-tree-encoding." msgstr "" -"Nel file '%s' manca un indicatore dell'ordine dei byte (BOM). Utilizzare UTF-" -"%sBE o UTF-%sLE (a seconda dell'ordine dei byte) come codifica dell'albero " -"di lavoro." +"Nel file '%s' manca un indicatore dell'ordine dei byte (BOM). Usare UTF-%sBE " +"o UTF-%sLE (a seconda dell'ordine dei byte) come codifica dell'albero di " +"lavoro." #: convert.c:424 convert.c:495 #, c-format @@ -2295,24 +2363,31 @@ msgstr "lettura dell'orderfile '%s' non riuscita" msgid "Performing inexact rename detection" msgstr "Rilevamento ridenominazione non esatta in corso" -#: diff.c:108 -#, c-format -msgid "option '%s' requires a value" -msgstr "l'opzione '%s' richiede un valore" +#: diff-no-index.c:238 +msgid "git diff --no-index [<options>] <path> <path>" +msgstr "git diff --no-index [<opzioni>] <percorso> <percorso>" + +#: diff-no-index.c:263 +msgid "" +"Not a git repository. Use --no-index to compare two paths outside a working " +"tree" +msgstr "" +"Non è un repository Git. Usa --no-index per confrontare due percorsi al di " +"fuori di un albero di lavoro" -#: diff.c:158 +#: diff.c:155 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr "" " Analisi della percentuale di cutoff statistiche directory '%s' non " "riuscita\n" -#: diff.c:163 +#: diff.c:160 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr " Parametro statistiche directory '%s' sconosciuto\n" -#: diff.c:291 +#: diff.c:296 msgid "" "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', " "'dimmed-zebra', 'plain'" @@ -2320,15 +2395,17 @@ msgstr "" "l'impostazione colore per file spostati deve essere 'no', 'default', " "'blocks', 'zebra', 'dimmed-zebra', 'plain'" -#: diff.c:319 +#: diff.c:324 #, 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 "" +"modalità color-moved-ws '%s' sconosciuta, i valori possibili sono 'ignore-" +"space-change', 'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-" +"change'" -#: diff.c:327 -#, fuzzy +#: diff.c:332 msgid "" "color-moved-ws: allow-indentation-change cannot be combined with other " "whitespace modes" @@ -2336,13 +2413,13 @@ msgstr "" "color-moved-ws: allow-indentation-change non può essere combinata con altre " "modalità spazi bianchi" -#: diff.c:400 +#: diff.c:405 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "" "Valore sconosciuto per la variabile di configurazione 'diff.submodule': '%s'" -#: diff.c:460 +#: diff.c:465 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -2351,25 +2428,36 @@ msgstr "" "Trovati errori nella variabile di configurazione 'diff.dirstat':\n" "%s" -#: diff.c:4211 +#: diff.c:4210 #, c-format msgid "external diff died, stopping at %s" msgstr "processo esterno diff morto, mi fermo a %s" -#: diff.c:4553 +#: diff.c:4555 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "" "le opzioni --name-only, --name-status, --check e -s sono mutuamente esclusive" -#: diff.c:4556 +#: diff.c:4558 msgid "-G, -S and --find-object are mutually exclusive" msgstr "le opzioni -G, -S e --find-object sono mutuamente esclusive" -#: diff.c:4634 +#: diff.c:4636 msgid "--follow requires exactly one pathspec" msgstr "--follow richiede esattamente uno specificatore percorso" -#: diff.c:4800 +#: diff.c:4684 +#, c-format +msgid "invalid --stat value: %s" +msgstr "valore non valido per --stat: %s" + +#: diff.c:4689 diff.c:4694 diff.c:4699 diff.c:4704 diff.c:5217 +#: parse-options.c:199 parse-options.c:203 +#, c-format +msgid "%s expects a numerical value" +msgstr "%s richiede un valore numerico" + +#: diff.c:4721 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -2378,23 +2466,523 @@ msgstr "" "Analisi del parametro dell'opzione --dirstat/-X non riuscita:\n" "%s" -#: diff.c:4814 +#: diff.c:4806 +#, c-format +msgid "unknown change class '%c' in --diff-filter=%s" +msgstr "classe modifica '%c' sconosciuta in --diff-filter=%s" + +#: diff.c:4830 +#, c-format +msgid "unknown value after ws-error-highlight=%.*s" +msgstr "valore sconosciuto dopo ws-error-highlight=%.*s" + +#: diff.c:4844 +#, c-format +msgid "unable to resolve '%s'" +msgstr "impossibile risolvere '%s'" + +#: diff.c:4894 diff.c:4900 +#, c-format +msgid "%s expects <n>/<m> form" +msgstr "%s richiede il formato <n>/<m>" + +#: diff.c:4912 +#, c-format +msgid "%s expects a character, got '%s'" +msgstr "%s richiede un carattere, ricevuto '%s'" + +#: diff.c:4933 #, c-format -msgid "Failed to parse --submodule option parameter: '%s'" -msgstr "Analisi del parametro dell'opzione --submodule non riuscita: '%s'" +msgid "bad --color-moved argument: %s" +msgstr "argomento --color-moved errato: %s" + +#: diff.c:4952 +#, c-format +msgid "invalid mode '%s' in --color-moved-ws" +msgstr "modo non valido '%s' in --color-moved-ws" + +#: diff.c:4992 +msgid "" +"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " +"\"histogram\"" +msgstr "" +"l'opzione diff-algorithm accetta i valori \"myers\", \"minimal\", \"patience" +"\" e \"histogram\"" + +#: diff.c:5028 diff.c:5048 +#, c-format +msgid "invalid argument to %s" +msgstr "argomento non valido per %s" + +#: diff.c:5186 +#, c-format +msgid "failed to parse --submodule option parameter: '%s'" +msgstr "analisi del parametro dell'opzione --submodule non riuscita: '%s'" + +#: diff.c:5242 +#, c-format +msgid "bad --word-diff argument: %s" +msgstr "argomento --word-diff errato: %s" + +#: diff.c:5265 +msgid "Diff output format options" +msgstr "Opzioni formato output diff" + +#: diff.c:5267 diff.c:5273 +msgid "generate patch" +msgstr "genera patch" + +#: diff.c:5270 builtin/log.c:167 +msgid "suppress diff output" +msgstr "non visualizzare l'output del diff" + +#: diff.c:5275 diff.c:5389 diff.c:5396 +msgid "<n>" +msgstr "<n>" + +#: diff.c:5276 diff.c:5279 +msgid "generate diffs with <n> lines context" +msgstr "genera diff con <n> righe di contesto" + +#: diff.c:5281 +msgid "generate the diff in raw format" +msgstr "genera il diff in formato grezzo" + +#: diff.c:5284 +msgid "synonym for '-p --raw'" +msgstr "sinonimo di '-p --raw'" + +#: diff.c:5288 +msgid "synonym for '-p --stat'" +msgstr "sinonimo di '-p --stat'" + +#: diff.c:5292 +msgid "machine friendly --stat" +msgstr "--stat leggibile da una macchina" + +#: diff.c:5295 +msgid "output only the last line of --stat" +msgstr "emetti in output solo l'ultima riga di --stat" + +#: diff.c:5297 diff.c:5305 +msgid "<param1,param2>..." +msgstr "<parametro1,parametro2>..." + +#: diff.c:5298 +msgid "" +"output the distribution of relative amount of changes for each sub-directory" +msgstr "" +"emetti in output la distribuzione del numero di modifiche relativo a ogni " +"sottodirectory" + +#: diff.c:5302 +msgid "synonym for --dirstat=cumulative" +msgstr "sinonimo di --dirstat=cumulative" + +#: diff.c:5306 +msgid "synonym for --dirstat=files,param1,param2..." +msgstr "sinonimo di --dirstat=files,parametro1,parametro2..." + +#: diff.c:5310 +msgid "warn if changes introduce conflict markers or whitespace errors" +msgstr "" +"avvisa se le modifiche introducono marcatori conflitto o errori spazi bianchi" + +#: diff.c:5313 +msgid "condensed summary such as creations, renames and mode changes" +msgstr "" +"riassunto conciso (ad es. elementi creati, ridenominati e modifiche modi)" + +#: diff.c:5316 +msgid "show only names of changed files" +msgstr "visualizza solo i nomi dei file modificati" + +#: diff.c:5319 +msgid "show only names and status of changed files" +msgstr "visualizza solo i nomi e lo stato dei file modificati" + +#: diff.c:5321 +msgid "<width>[,<name-width>[,<count>]]" +msgstr "<ampiezza>[,<ampiezza nome>[,<numero>]]" + +#: diff.c:5322 +msgid "generate diffstat" +msgstr "genera diffstat" + +#: diff.c:5324 diff.c:5327 diff.c:5330 +msgid "<width>" +msgstr "<ampiezza>" + +#: diff.c:5325 +msgid "generate diffstat with a given width" +msgstr "genera il diffstat con un'ampiezza specificata" + +#: diff.c:5328 +msgid "generate diffstat with a given name width" +msgstr "genera il diffstat con un'ampiezza nomi specificata" + +#: diff.c:5331 +msgid "generate diffstat with a given graph width" +msgstr "genera il diffstat con un'ampiezza grafo specificata" + +#: diff.c:5333 +msgid "<count>" +msgstr "<numero>" + +#: diff.c:5334 +msgid "generate diffstat with limited lines" +msgstr "genera il diffstat con righe limitate" + +#: diff.c:5337 +msgid "generate compact summary in diffstat" +msgstr "genera riassunto conciso nel diffstat" + +#: diff.c:5340 +msgid "output a binary diff that can be applied" +msgstr "stampa in output un diff binario che può essere applicato" + +#: diff.c:5343 +msgid "show full pre- and post-image object names on the \"index\" lines" +msgstr "visualizza i nomi oggetto pre e post immagine nelle righe \"indice\"" + +#: diff.c:5345 +msgid "show colored diff" +msgstr "visualizza diff colorato" + +#: diff.c:5346 +msgid "<kind>" +msgstr "<tipo>" + +#: diff.c:5347 +msgid "" +"highlight whitespace errors in the 'context', 'old' or 'new' lines in the " +"diff" +msgstr "" +"evidenzia gli errori di spazi bianchi nelle righe 'contesto', 'vecchie' o " +"'nuove' nel diff" + +#: diff.c:5350 +msgid "" +"do not munge pathnames and use NULs as output field terminators in --raw or " +"--numstat" +msgstr "" +"non rimuovere i nomi percorso e usare caratteri NUL come terminatori campo " +"in --raw o --numstat" + +#: diff.c:5353 diff.c:5356 diff.c:5359 diff.c:5465 +msgid "<prefix>" +msgstr "<prefisso>" + +#: diff.c:5354 +msgid "show the given source prefix instead of \"a/\"" +msgstr "visualizza il prefisso sorgente specificato invece di \"a/\"" + +#: diff.c:5357 +#, fuzzy +msgid "show the given destination prefix instead of \"b/\"" +msgstr "visualizza il prefisso sorgente specificato invece di \"b/\"" + +#: diff.c:5360 +msgid "prepend an additional prefix to every line of output" +msgstr "anteponi un prefisso aggiuntivo ad ogni riga dell'output" + +#: diff.c:5363 +msgid "do not show any source or destination prefix" +msgstr "non visualizzare alcun prefisso sorgente o destinazione" + +#: diff.c:5366 +msgid "show context between diff hunks up to the specified number of lines" +msgstr "" +"visualizza il contesto tra gli hunk del diff fino al numero di righe " +"specificato" + +#: diff.c:5370 diff.c:5375 diff.c:5380 +msgid "<char>" +msgstr "<carattere>" + +#: diff.c:5371 +msgid "specify the character to indicate a new line instead of '+'" +msgstr "specifica il carattere che indica una nuova riga al posto di '+'" + +#: diff.c:5376 +msgid "specify the character to indicate an old line instead of '-'" +msgstr "specifica il carattere che indica una vecchia riga al posto di '-'" + +#: diff.c:5381 +msgid "specify the character to indicate a context instead of ' '" +msgstr "specifica il carattere che indica un contesto al posto di ' '" + +#: diff.c:5384 +msgid "Diff rename options" +msgstr "Opzioni rinominazione diff" + +#: diff.c:5385 +msgid "<n>[/<m>]" +msgstr "<n>[/<m>]" + +#: diff.c:5386 +msgid "break complete rewrite changes into pairs of delete and create" +msgstr "" +"spezza modifiche di riscrittura completa in coppie eliminazione/creazione" + +#: diff.c:5390 +msgid "detect renames" +msgstr "rileva le ridenominazioni" + +#: diff.c:5394 +msgid "omit the preimage for deletes" +msgstr "ometti la preimmagine per le eliminazioni" + +#: diff.c:5397 +msgid "detect copies" +msgstr "rileva le copie" + +#: diff.c:5401 +msgid "use unmodified files as source to find copies" +msgstr "usa file non modificati come sorgente per trovare copie" + +#: diff.c:5403 +msgid "disable rename detection" +msgstr "disabilita rilevamento ridenominazione" + +#: diff.c:5406 +msgid "use empty blobs as rename source" +msgstr "usa blob vuoti come sorgente ridenominazione" + +#: diff.c:5408 +msgid "continue listing the history of a file beyond renames" +msgstr "" +"continua a elencare la cronologia di un file al di là delle ridenominazioni" + +#: diff.c:5411 +msgid "" +"prevent rename/copy detection if the number of rename/copy targets exceeds " +"given limit" +msgstr "" +"impedisci il rilevamento ridenominazione/copia se il numero delle " +"destinazioni ridenominazione/copia eccede il limite specificato" + +#: diff.c:5413 +msgid "Diff algorithm options" +msgstr "Opzioni algoritmo diff" + +#: diff.c:5415 +msgid "produce the smallest possible diff" +msgstr "produci il diff più piccolo possibile" + +#: diff.c:5418 +msgid "ignore whitespace when comparing lines" +msgstr "ignora gli spazi bianchi durante il confronto delle righe" + +#: diff.c:5421 +msgid "ignore changes in amount of whitespace" +msgstr "ignora le modifiche al numero degli spazi bianchi" + +#: diff.c:5424 +msgid "ignore changes in whitespace at EOL" +msgstr "ignora modifiche agli spazi bianchi a fine riga" + +#: diff.c:5427 +msgid "ignore carrier-return at the end of line" +msgstr "ignora carattere ritorno a capo a fine riga" + +#: diff.c:5430 +msgid "ignore changes whose lines are all blank" +msgstr "ignora modifiche che riguardano solo righe vuote" + +#: diff.c:5433 +msgid "heuristic to shift diff hunk boundaries for easy reading" +msgstr "" +"euristica per spostare i limiti degli hunk nel diff per una lettura agevole" + +#: diff.c:5436 +msgid "generate diff using the \"patience diff\" algorithm" +msgstr "genera il diff usando l'algoritmo \"patience diff\"" + +#: diff.c:5440 +msgid "generate diff using the \"histogram diff\" algorithm" +msgstr "genera il diff usando l'algoritmo \"histogram diff\"" + +#: diff.c:5442 +msgid "<algorithm>" +msgstr "<algoritmo>" + +#: diff.c:5443 +msgid "choose a diff algorithm" +msgstr "seleziona un algoritmo diff" + +#: diff.c:5445 +msgid "<text>" +msgstr "<testo>" + +#: diff.c:5446 +msgid "generate diff using the \"anchored diff\" algorithm" +msgstr "genera il diff usando l'algoritmo \"anchored diff\"" + +#: diff.c:5448 diff.c:5457 diff.c:5460 +msgid "<mode>" +msgstr "<modalità>" + +#: diff.c:5449 +msgid "show word diff, using <mode> to delimit changed words" +msgstr "" +"visualizza il diff parola per parola usando <modalità> per delimitare le " +"parole modificate" + +#: diff.c:5451 diff.c:5454 diff.c:5499 +msgid "<regex>" +msgstr "<espressione regolare>" + +#: diff.c:5452 +msgid "use <regex> to decide what a word is" +msgstr "usa <espressione regolare> per decidere cosa costituisce una parola" + +#: diff.c:5455 +msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" +msgstr "" +"equivalente di --word-diff=color --word-diff-regex=<espressione regolare>" + +#: diff.c:5458 +msgid "moved lines of code are colored differently" +msgstr "le righe di codice spostate sono colorate in modo diverso" + +#: diff.c:5461 +msgid "how white spaces are ignored in --color-moved" +msgstr "modo in cui sono ignorati gli spazi bianchi in --color-moved" + +#: diff.c:5464 +msgid "Other diff options" +msgstr "Altre opzioni diff" + +#: diff.c:5466 +msgid "when run from subdir, exclude changes outside and show relative paths" +msgstr "" +"se eseguito da una sottodirectory, escludi le modifiche esterne ad essa e " +"visualizza i percorsi relativi" + +#: diff.c:5470 +msgid "treat all files as text" +msgstr "tratta tutti i file come se fossero di testo" + +#: diff.c:5472 +msgid "swap two inputs, reverse the diff" +msgstr "scambia i due input, genera un diff al contrario" + +#: diff.c:5474 +msgid "exit with 1 if there were differences, 0 otherwise" +msgstr "esci con codice 1 se ci sono differenze, con 0 altrimenti" + +#: diff.c:5476 +msgid "disable all output of the program" +msgstr "disabilita l'intero output del programma" -#: diff.c:5900 +#: diff.c:5478 +msgid "allow an external diff helper to be executed" +msgstr "consenti l'esecuzione di un helper diff esterno" + +#: diff.c:5480 +msgid "run external text conversion filters when comparing binary files" +msgstr "" +"esegui filtri di conversione in testo esterni quando si confrontano file " +"binari" + +#: diff.c:5482 +msgid "<when>" +msgstr "<quando>" + +#: diff.c:5483 +msgid "ignore changes to submodules in the diff generation" +msgstr "ignora le modifiche ai sottomoduli durante la generazione del diff" + +#: diff.c:5486 +msgid "<format>" +msgstr "<formato>" + +#: diff.c:5487 +msgid "specify how differences in submodules are shown" +msgstr "specifica come verranno visualizzare le differenze nei sottomoduli" + +#: diff.c:5491 +msgid "hide 'git add -N' entries from the index" +msgstr "nascondi le voci 'git add -N' nell'indice" + +#: diff.c:5494 +msgid "treat 'git add -N' entries as real in the index" +msgstr "tratta le voci 'git add -N' come reali nell'indice" + +#: diff.c:5496 +msgid "<string>" +msgstr "<stringa>" + +#: diff.c:5497 +msgid "" +"look for differences that change the number of occurrences of the specified " +"string" +msgstr "" +"cerca differenze che modificano il numero di occorrenze della stringa " +"specificata" + +#: diff.c:5500 +msgid "" +"look for differences that change the number of occurrences of the specified " +"regex" +msgstr "" +"cerca differenze che modificano il numero di occorrenze dell'espressione " +"regolare specificata" + +#: diff.c:5503 +msgid "show all changes in the changeset with -S or -G" +msgstr "visualizza tutte le modifiche nel changeset con -S o -G" + +#: diff.c:5506 +msgid "treat <string> in -S as extended POSIX regular expression" +msgstr "" +"tratta la <stringa> nell'opzione -S come un'espressione regolare POSIX estesa" + +#: diff.c:5509 +msgid "control the order in which files appear in the output" +msgstr "controlla l'ordine con cui i file appariranno nell'output" + +#: diff.c:5510 +msgid "<object-id>" +msgstr "<ID oggetto>" + +#: diff.c:5511 +msgid "" +"look for differences that change the number of occurrences of the specified " +"object" +msgstr "" +"cerca differenze che modificano il numero di occorrenze dell'oggetto " +"specificato" + +#: diff.c:5513 +msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" +msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]" + +#: diff.c:5514 +msgid "select files by diff type" +msgstr "seleziona file in base al tipo diff" + +#: diff.c:5516 +msgid "<file>" +msgstr "<file>" + +#: diff.c:5517 +msgid "Output to a specific file" +msgstr "Salva l'output in un file specifico" + +#: diff.c:6150 msgid "inexact rename detection was skipped due to too many files." msgstr "" "il rilevamento ridenominazione non esatta è stato omesso per la presenza di " "troppi file." -#: diff.c:5903 +#: diff.c:6153 msgid "only found copies from modified paths due to too many files." msgstr "" "trovate solo copie dai percorsi modificati per la presenza di troppi file." -#: diff.c:5906 +#: diff.c:6156 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." @@ -2402,41 +2990,41 @@ msgstr "" "potresti voler impostare la variabile %s ad almeno %d e riprovare ad " "eseguire il comando." -#: dir.c:538 +#: dir.c:537 #, c-format msgid "pathspec '%s' did not match any file(s) known to git" msgstr "" "lo specificatore percorso '%s' non corrisponde ad alcun file noto a git" -#: dir.c:927 +#: dir.c:926 #, c-format msgid "cannot use %s as an exclude file" msgstr "impossibile usare %s come file di esclusione" -#: dir.c:1842 +#: dir.c:1843 #, c-format msgid "could not open directory '%s'" msgstr "impossibile aprire la directory '%s'" -#: dir.c:2084 +#: dir.c:2085 msgid "failed to get kernel name and information" msgstr "impossibile ottenere il nome e le informazioni sul kernel" -#: dir.c:2208 +#: dir.c:2209 msgid "untracked cache is disabled on this system or location" msgstr "la cache non tracciata è disabilitata su questo sistema o percorso" -#: dir.c:3009 +#: dir.c:3013 #, c-format msgid "index file corrupt in repo %s" -msgstr "index file corrotto nel repository %s" +msgstr "file index corrotto nel repository %s" -#: dir.c:3054 dir.c:3059 +#: dir.c:3058 dir.c:3063 #, c-format msgid "could not create directories for %s" msgstr "impossibile creare le directory per %s" -#: dir.c:3088 +#: dir.c:3092 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "impossibile migrare la directory git da '%s' a '%s'" @@ -2451,7 +3039,7 @@ msgstr "" msgid "Filtering content" msgstr "Filtraggio contenuto in corso" -#: entry.c:465 +#: entry.c:476 #, c-format msgid "could not stat file '%s'" msgstr "impossibile eseguire stat sul file '%s'" @@ -2466,7 +3054,7 @@ msgstr "percorso spazio dei nomi git \"%s\" non valido" msgid "could not set GIT_DIR to '%s'" msgstr "impossibile impostare GIT_DIR a '%s'" -#: exec-cmd.c:361 +#: exec-cmd.c:363 #, c-format msgid "too many args to run %s" msgstr "troppi argomenti per eseguire %s" @@ -2480,9 +3068,8 @@ msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack: attesa lista shallow" #: fetch-pack.c:154 -#, fuzzy msgid "git fetch-pack: expected a flush packet after shallow list" -msgstr "git fetch-pack: attesa lista shallow" +msgstr "git fetch-pack: atteso pacchetto flush dopo lista shallow" #: fetch-pack.c:165 msgid "git fetch-pack: expected ACK/NAK, got a flush packet" @@ -2493,229 +3080,237 @@ msgstr "git fetch-pack: attesi ACK/NAK, ricevuto pacchetto flush" msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "git fetch-pack: attesi ACK/NAK, ricevuto '%s'" -#: fetch-pack.c:256 +#: fetch-pack.c:196 +msgid "unable to write to remote" +msgstr "impossibile scrivere sul remoto" + +#: fetch-pack.c:258 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc richiede multi_ack_detailed" -#: fetch-pack.c:358 fetch-pack.c:1264 +#: fetch-pack.c:360 fetch-pack.c:1271 #, c-format msgid "invalid shallow line: %s" msgstr "riga shallow non valida: '%s'" -#: fetch-pack.c:364 fetch-pack.c:1271 +#: fetch-pack.c:366 fetch-pack.c:1277 #, c-format msgid "invalid unshallow line: %s" msgstr "riga unshallow non valida: '%s'" -#: fetch-pack.c:366 fetch-pack.c:1273 +#: fetch-pack.c:368 fetch-pack.c:1279 #, c-format msgid "object not found: %s" msgstr "oggetto non trovato: %s" -#: fetch-pack.c:369 fetch-pack.c:1276 +#: fetch-pack.c:371 fetch-pack.c:1282 #, c-format msgid "error in object: %s" msgstr "errore nell'oggetto: %s" -#: fetch-pack.c:371 fetch-pack.c:1278 +#: fetch-pack.c:373 fetch-pack.c:1284 #, c-format msgid "no shallow found: %s" msgstr "nessuno shallow trovato: %s" -#: fetch-pack.c:374 fetch-pack.c:1282 +#: fetch-pack.c:376 fetch-pack.c:1288 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "attesi shallow/unshallow, ricevuto %s" -#: fetch-pack.c:415 +#: fetch-pack.c:417 #, c-format msgid "got %s %d %s" msgstr "ricevuto %s %d %s" -#: fetch-pack.c:432 +#: fetch-pack.c:434 #, c-format msgid "invalid commit %s" msgstr "commit non valido: %s" -#: fetch-pack.c:463 +#: fetch-pack.c:465 msgid "giving up" msgstr "smetto di provare" -#: fetch-pack.c:475 progress.c:229 +#: fetch-pack.c:477 progress.c:284 msgid "done" msgstr "fatto" -#: fetch-pack.c:487 +#: fetch-pack.c:489 #, c-format msgid "got %s (%d) %s" msgstr "ricevuto %s (%d) %s" -#: fetch-pack.c:533 +#: fetch-pack.c:535 #, c-format msgid "Marking %s as complete" msgstr "Contrassegno %s come completo" -#: fetch-pack.c:740 +#: fetch-pack.c:744 #, c-format msgid "already have %s (%s)" msgstr "ho già %s (%s)" -#: fetch-pack.c:779 +#: fetch-pack.c:783 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "" "fetch-pack: impossibile eseguire il fork del demultiplexer della banda " "laterlae" -#: fetch-pack.c:787 +#: fetch-pack.c:791 msgid "protocol error: bad pack header" msgstr "errore protocollo: intestazione pack non valida" -#: fetch-pack.c:855 +#: fetch-pack.c:859 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-pack: impossibile eseguire il fork di %s" -#: fetch-pack.c:871 +#: fetch-pack.c:875 #, c-format msgid "%s failed" msgstr "%s non riuscito" -#: fetch-pack.c:873 +#: fetch-pack.c:877 msgid "error in sideband demultiplexer" msgstr "errore nel demultiplexer della banda laterale" -#: fetch-pack.c:902 +#: fetch-pack.c:906 msgid "Server does not support shallow clients" msgstr "Il server non supporta client shallow" -#: fetch-pack.c:906 +#: fetch-pack.c:910 msgid "Server supports multi_ack_detailed" msgstr "Il server supporta multi_ack_detailes" -#: fetch-pack.c:909 +#: fetch-pack.c:913 msgid "Server supports no-done" msgstr "Il server supporta no-done" -#: fetch-pack.c:915 +#: fetch-pack.c:919 msgid "Server supports multi_ack" msgstr "Il server supporta multi_ack" -#: fetch-pack.c:919 +#: fetch-pack.c:923 msgid "Server supports side-band-64k" msgstr "Il server supporta side-band-64k" -#: fetch-pack.c:923 +#: fetch-pack.c:927 msgid "Server supports side-band" msgstr "Il server supporta side-band" -#: fetch-pack.c:927 +#: fetch-pack.c:931 msgid "Server supports allow-tip-sha1-in-want" msgstr "Il server supporta allow-tip-sha1-in-want" -#: fetch-pack.c:931 +#: fetch-pack.c:935 msgid "Server supports allow-reachable-sha1-in-want" msgstr "Il server supporta allow-reachable-sha1-in-want" -#: fetch-pack.c:941 +#: fetch-pack.c:945 msgid "Server supports ofs-delta" msgstr "Il server supporta ofs-delta" -#: fetch-pack.c:947 fetch-pack.c:1140 +#: fetch-pack.c:951 fetch-pack.c:1144 msgid "Server supports filter" msgstr "Il server supporta filter" -#: fetch-pack.c:955 +#: fetch-pack.c:959 #, c-format msgid "Server version is %.*s" msgstr "La versione del server è %.*s" -#: fetch-pack.c:961 +#: fetch-pack.c:965 msgid "Server does not support --shallow-since" msgstr "Il server non supporta --shallow-since" -#: fetch-pack.c:965 +#: fetch-pack.c:969 msgid "Server does not support --shallow-exclude" msgstr "Il server non supporta --shallow-exclude" -#: fetch-pack.c:967 +#: fetch-pack.c:971 msgid "Server does not support --deepen" msgstr "Il server non supporta --deepen" -#: fetch-pack.c:984 +#: fetch-pack.c:988 msgid "no common commits" msgstr "nessun commit in comune" -#: fetch-pack.c:996 fetch-pack.c:1419 +#: fetch-pack.c:1000 fetch-pack.c:1449 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack: recupero non riuscito." -#: fetch-pack.c:1134 +#: fetch-pack.c:1138 msgid "Server does not support shallow requests" msgstr "Il server non supporta le richieste shallow" -#: fetch-pack.c:1184 +#: fetch-pack.c:1171 +msgid "unable to write request to remote" +msgstr "impossibile scrivere la richiesta sul remoto" + +#: fetch-pack.c:1189 #, c-format msgid "error reading section header '%s'" msgstr "errore durante la lettura dell'intestazione di sezione '%s'" -#: fetch-pack.c:1190 +#: fetch-pack.c:1195 #, c-format msgid "expected '%s', received '%s'" msgstr "atteso '%s', ricevuto '%s'" -#: fetch-pack.c:1229 +#: fetch-pack.c:1234 #, c-format msgid "unexpected acknowledgment line: '%s'" msgstr "riga di conferma inattesa: '%s'" -#: fetch-pack.c:1234 +#: fetch-pack.c:1239 #, c-format msgid "error processing acks: %d" msgstr "errore durante l'elaborazione degli ack: %d" -#: fetch-pack.c:1244 +#: fetch-pack.c:1249 msgid "expected packfile to be sent after 'ready'" msgstr "ci si attendeva che il packfile fosse inviato dopo 'ready'" -#: fetch-pack.c:1246 +#: fetch-pack.c:1251 msgid "expected no other sections to be sent after no 'ready'" msgstr "" "ci si attendeva che nessun'altra sezione fosse inviata in assenza di 'ready'" -#: fetch-pack.c:1287 +#: fetch-pack.c:1293 #, c-format msgid "error processing shallow info: %d" msgstr "errore durante l'elaborazione delle informazioni shallow: %d" -#: fetch-pack.c:1308 +#: fetch-pack.c:1340 #, c-format msgid "expected wanted-ref, got '%s'" msgstr "atteso wanted-ref, ricevuto '%s'" -#: fetch-pack.c:1318 +#: fetch-pack.c:1345 #, c-format msgid "unexpected wanted-ref: '%s'" msgstr "wanted-ref inatteso: '%s'" -#: fetch-pack.c:1322 +#: fetch-pack.c:1350 #, c-format msgid "error processing wanted refs: %d" msgstr "errore durante l'elaborazione dei riferimenti desiderati: %d" -#: fetch-pack.c:1646 +#: fetch-pack.c:1676 msgid "no matching remote head" msgstr "nessun head remoto corrispondente" -#: fetch-pack.c:1664 builtin/clone.c:671 +#: fetch-pack.c:1699 builtin/clone.c:673 msgid "remote did not send all necessary objects" msgstr "il remoto non ha inviato tutti gli oggetti necessari" -#: fetch-pack.c:1690 +#: fetch-pack.c:1726 #, c-format msgid "no such remote ref %s" msgstr "riferimento remoto non esistente: %s" -#: fetch-pack.c:1693 +#: fetch-pack.c:1729 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "Il server non consente richieste per l'oggetto non pubblicizzato %s" @@ -2819,29 +3414,29 @@ msgstr "comandi git disponibili altrove nel tuo $PATH" msgid "These are common Git commands used in various situations:" msgstr "Questi sono i comandi Git comuni usati in varie situazioni:" -#: help.c:363 git.c:90 +#: help.c:363 git.c:97 #, c-format msgid "unsupported command listing type '%s'" msgstr "tipo elenco comandi non supportato: '%s'" -#: help.c:410 +#: help.c:403 msgid "The common Git guides are:" msgstr "Le guide Git comuni sono:" -#: help.c:519 +#: help.c:512 msgid "See 'git help <command>' to read about a specific subcommand" msgstr "" "Vedi 'git help <comando>' per saperne di più su un sottocomando specifico" -#: help.c:524 +#: help.c:517 msgid "External commands" msgstr "Comandi esterni" -#: help.c:539 +#: help.c:532 msgid "Command aliases" msgstr "Alias comandi" -#: help.c:603 +#: help.c:596 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" @@ -2850,31 +3445,31 @@ msgstr "" "'%s' sembra essere un comando git, ma non è stato\n" "possibile eseguirlo. Forse git-%s è corrotto?" -#: help.c:662 +#: help.c:655 msgid "Uh oh. Your system reports no Git commands at all." msgstr "Oh oh. Il tuo sistema non riporta alcun comando Git." -#: help.c:684 +#: help.c:677 #, c-format msgid "WARNING: You called a Git command named '%s', which does not exist." msgstr "ATTENZIONE: hai chiamato un comando Git '%s' inesistente." -#: help.c:689 +#: help.c:682 #, c-format msgid "Continuing under the assumption that you meant '%s'." msgstr "Continuo assumendo che intendessi '%s'." -#: help.c:694 +#: help.c:687 #, c-format msgid "Continuing in %0.1f seconds, assuming that you meant '%s'." msgstr "Continuo fra %0.1f secondi assumendo che intendessi '%s'." -#: help.c:702 +#: help.c:695 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "git: '%s' non è un comando git. Vedi 'git --help'." -#: help.c:706 +#: help.c:699 msgid "" "\n" "The most similar command is" @@ -2888,16 +3483,16 @@ msgstr[1] "" "\n" "I comandi maggiormente simili sono" -#: help.c:721 +#: help.c:714 msgid "git version [<options>]" msgstr "git version [<opzioni>]" -#: help.c:789 +#: help.c:782 #, c-format msgid "%s: %s - %s" msgstr "%s: %s - %s" -#: help.c:793 +#: help.c:786 msgid "" "\n" "Did you mean this?" @@ -2911,7 +3506,7 @@ msgstr[1] "" "\n" "Intendevi uno di questi?" -#: ident.c:345 +#: ident.c:349 msgid "" "\n" "*** Please tell me who you are.\n" @@ -2937,49 +3532,69 @@ msgstr "" "Ometti --global per impostare l'identità solo in questo repository.\n" "\n" -#: ident.c:369 +#: ident.c:379 msgid "no email was given and auto-detection is disabled" -msgstr "nessun indirizzo email fornito e rilevamento automatico disabilitato" +msgstr "" +"nessun indirizzo email specificato e rilevamento automatico disabilitato" -#: ident.c:374 +#: ident.c:384 #, c-format msgid "unable to auto-detect email address (got '%s')" msgstr "" "impossibile rilevare automaticamente l'indirizzo email (ho ricavato '%s')" -#: ident.c:384 +#: ident.c:401 msgid "no name was given and auto-detection is disabled" -msgstr "nessun nome fornito e rilevamento automatico disabilitato" +msgstr "nessun nome specificato e rilevamento automatico disabilitato" -#: ident.c:390 +#: ident.c:407 #, c-format msgid "unable to auto-detect name (got '%s')" msgstr "impossibile rilevare automaticamente il nome (ho ricavato '%s')" -#: ident.c:398 +#: ident.c:415 #, c-format msgid "empty ident name (for <%s>) not allowed" msgstr "nome ident vuoto (per <%s>) non consentito" -#: ident.c:404 +#: ident.c:421 #, c-format msgid "name consists only of disallowed characters: %s" msgstr "il nome è composto solo da caratteri non consentiti: %s" -#: ident.c:419 builtin/commit.c:608 +#: ident.c:436 builtin/commit.c:608 #, c-format msgid "invalid date format: %s" msgstr "formato data non valido: %s" +#: list-objects.c:129 +#, c-format +msgid "entry '%s' in tree %s has tree mode, but is not a tree" +msgstr "la voce '%s' nell'albero %s ha la modalità albero, ma non è un albero" + +#: list-objects.c:142 +#, c-format +msgid "entry '%s' in tree %s has blob mode, but is not a blob" +msgstr "la voce '%s' nell'albero %s ha la modalità blob, ma non è un blob" + +#: list-objects.c:378 +#, c-format +msgid "unable to load root tree for commit %s" +msgstr "impossibile caricare l'albero radice per il commit %s" + #: list-objects-filter-options.c:36 msgid "multiple filter-specs cannot be combined" msgstr "non è possibile combinare più specificatori filtro" #: list-objects-filter-options.c:58 msgid "expected 'tree:<depth>'" +msgstr "atteso 'tree:<profondità>'" + +#: list-objects-filter-options.c:84 +msgid "sparse:path filters support has been dropped" msgstr "" -#: list-objects-filter-options.c:152 +#: list-objects-filter-options.c:158 msgid "cannot change partial clone promisor remote" msgstr "impossibile modificare il remoto promettente del clone parziale" @@ -3012,118 +3627,119 @@ msgstr "Impossibile creare '%s.lock': %s" msgid "failed to read the cache" msgstr "lettura della cache non riuscita" -#: merge.c:107 rerere.c:720 builtin/am.c:1884 builtin/am.c:1918 -#: builtin/checkout.c:416 builtin/checkout.c:745 builtin/clone.c:771 +#: 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 "impossibile scrivere il nuovo file index" -#: merge-recursive.c:332 +#: merge-recursive.c:322 msgid "(bad commit)\n" msgstr "(commit non valido)\n" -#: merge-recursive.c:355 +#: merge-recursive.c:345 #, c-format msgid "add_cacheinfo failed for path '%s'; merge aborting." msgstr "add_cacheinfo non riuscito per il percorso '%s'; interrompo il merge." -#: merge-recursive.c:364 +#: merge-recursive.c:354 #, c-format msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." msgstr "" "aggiornamento add_cacheinfo non riuscito per il percorso '%s'; interrompo il " "merge." -#: merge-recursive.c:447 +#: merge-recursive.c:437 msgid "error building trees" msgstr "errore durante la costruzione degli alberi" -#: merge-recursive.c:902 +#: merge-recursive.c:861 #, c-format msgid "failed to create path '%s'%s" msgstr "creazione del percorso '%s' non riuscita%s" -#: merge-recursive.c:913 +#: merge-recursive.c:872 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "Rimuovo %s per fare spazio alla sottodirectory\n" -#: merge-recursive.c:927 merge-recursive.c:946 +#: merge-recursive.c:886 merge-recursive.c:905 msgid ": perhaps a D/F conflict?" msgstr ": forse si tratta di un conflitto D/F?" -#: merge-recursive.c:936 +#: merge-recursive.c:895 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "mi rifiuto di perdere un file non tracciato in '%s'" -#: merge-recursive.c:978 builtin/cat-file.c:40 +#: merge-recursive.c:936 builtin/cat-file.c:40 #, c-format msgid "cannot read object %s '%s'" msgstr "impossibile leggere l'oggetto %s '%s'" -#: merge-recursive.c:980 +#: merge-recursive.c:939 #, c-format msgid "blob expected for %s '%s'" msgstr "atteso blob per %s '%s'" -#: merge-recursive.c:1004 +#: merge-recursive.c:963 #, c-format msgid "failed to open '%s': %s" msgstr "apertura di '%s' non riuscita: %s" -#: merge-recursive.c:1015 +#: merge-recursive.c:974 #, c-format msgid "failed to symlink '%s': %s" msgstr "creazione del collegamento simbolico '%s' non riuscita: %s" -#: merge-recursive.c:1020 +#: merge-recursive.c:979 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "non so che fare con %06o %s '%s'" -#: merge-recursive.c:1211 +#: merge-recursive.c:1175 #, c-format msgid "Failed to merge submodule %s (not checked out)" msgstr "Merge del sottomodulo %s non riuscito (checkout non eseguito)" -#: merge-recursive.c:1218 +#: merge-recursive.c:1182 #, c-format msgid "Failed to merge submodule %s (commits not present)" msgstr "Merge del sottomodulo %s non riuscito (commit non presenti)" -#: merge-recursive.c:1225 +#: merge-recursive.c:1189 #, c-format msgid "Failed to merge submodule %s (commits don't follow merge-base)" msgstr "" "Merge del sottomodulo %s non riuscito (i commit non seguono la base del " "merge)" -#: merge-recursive.c:1233 merge-recursive.c:1245 +#: merge-recursive.c:1197 merge-recursive.c:1209 #, c-format msgid "Fast-forwarding submodule %s to the following commit:" msgstr "Eseguo il fast forward del sottomodulo %s al seguente commit:" -#: merge-recursive.c:1236 merge-recursive.c:1248 +#: merge-recursive.c:1200 merge-recursive.c:1212 #, c-format msgid "Fast-forwarding submodule %s" msgstr "Eseguo il fast forward del sottomodulo %s" -#: merge-recursive.c:1271 +#: merge-recursive.c:1235 #, c-format msgid "Failed to merge submodule %s (merge following commits not found)" msgstr "" "Merge del sottomodulo %s non riuscito (merge dopo i commit non trovato)" -#: merge-recursive.c:1275 +#: merge-recursive.c:1239 #, c-format msgid "Failed to merge submodule %s (not fast-forward)" msgstr "Merge del sottomodulo %s non riuscito (non fast forward)" -#: merge-recursive.c:1276 +#: merge-recursive.c:1240 msgid "Found a possible merge resolution for the submodule:\n" msgstr "Trovata possibile risoluzione merge per il sottomodulo:\n" -#: merge-recursive.c:1279 +#: merge-recursive.c:1243 #, c-format msgid "" "If this is correct simply add it to the index for example\n" @@ -3140,32 +3756,32 @@ msgstr "" "\n" "per accettare questo suggerimento.\n" -#: merge-recursive.c:1288 +#: merge-recursive.c:1252 #, c-format msgid "Failed to merge submodule %s (multiple merges found)" msgstr "Merge del sottomodulo %s non riuscito (più merge trovati)" -#: merge-recursive.c:1361 +#: merge-recursive.c:1325 msgid "Failed to execute internal merge" msgstr "Esecuzione del merge interno non riuscita" -#: merge-recursive.c:1366 +#: merge-recursive.c:1330 #, c-format msgid "Unable to add %s to database" msgstr "Impossibile aggiungere %s al database" -#: merge-recursive.c:1398 +#: merge-recursive.c:1362 #, c-format msgid "Auto-merging %s" msgstr "Merge automatico di %s in corso" -#: merge-recursive.c:1419 +#: merge-recursive.c:1385 #, c-format msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." msgstr "" "Errore: mi rifiuto di perdere il file non tracciato %s; scrivo invece in %s." -#: merge-recursive.c:1486 +#: merge-recursive.c:1457 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -3174,7 +3790,7 @@ msgstr "" "CONFLITTO (%s/eliminazione): %s eliminato in %s e %s in %s. Versione %s di " "%s lasciata nell'albero." -#: merge-recursive.c:1491 +#: merge-recursive.c:1462 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -3183,7 +3799,7 @@ msgstr "" "CONFLITTO (%s/eliminazione): %s eliminato in %s e %s come %s in %s. Versione " "%s di %s lasciata nell'albero." -#: merge-recursive.c:1498 +#: merge-recursive.c:1469 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -3192,7 +3808,7 @@ msgstr "" "CONFLITTO (%s/eliminazione): %s eliminato in %s e %s in %s. Versione %s di " "%s lasciata nell'albero in %s." -#: merge-recursive.c:1503 +#: merge-recursive.c:1474 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -3201,43 +3817,43 @@ msgstr "" "CONFLITTO (%s/eliminazione): %s eliminato in %s e %s come %s in %s. Versione " "%s di %s lasciata nell'albero in %s." -#: merge-recursive.c:1537 +#: merge-recursive.c:1509 msgid "rename" msgstr "ridenominazione" -#: merge-recursive.c:1537 +#: merge-recursive.c:1509 msgid "renamed" msgstr "rinominato" -#: merge-recursive.c:1633 merge-recursive.c:2481 merge-recursive.c:3213 +#: merge-recursive.c:1589 merge-recursive.c:2445 merge-recursive.c:3085 #, c-format msgid "Refusing to lose dirty file at %s" msgstr "Mi rifiuto di perdere un file sporco in %s" -#: merge-recursive.c:1643 +#: merge-recursive.c:1599 #, c-format msgid "Refusing to lose untracked file at %s, even though it's in the way." msgstr "" "Mi rifiuto di perdere un file non tracciato in %s, benché sia d'ostacolo." -#: merge-recursive.c:1706 -#, fuzzy, c-format +#: merge-recursive.c:1657 +#, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s" msgstr "" "CONFLITTO (ridenominazione/aggiunta): elemento ridenominato %s->%s in %s. %s " "aggiunto in %s" -#: merge-recursive.c:1734 +#: merge-recursive.c:1687 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s è una directory in %s; la aggiungo come %s" -#: merge-recursive.c:1739 +#: merge-recursive.c:1692 #, c-format msgid "Refusing to lose untracked file at %s; adding as %s instead" msgstr "Mi rifiuto di perdere un file non tracciato in %s; lo aggiungo come %s" -#: merge-recursive.c:1759 +#: merge-recursive.c:1711 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -3246,18 +3862,18 @@ msgstr "" "CONFLITTO (ridenominazione/ridenominazione): file ridenominato \"%s\"->\"%s" "\" nel branch \"%s\", ridenominato \"%s\"->\"%s\" in \"%s\"%s" -#: merge-recursive.c:1764 +#: merge-recursive.c:1716 msgid " (left unresolved)" msgstr " (lasciato irrisolto)" -#: merge-recursive.c:1868 +#: merge-recursive.c:1825 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" "CONFLITTO (ridenominazione/ridenominazione): file ridenominato %s->%s in %s. " "Ridenominato %s->%s in %s" -#: merge-recursive.c:2064 +#: merge-recursive.c:2030 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to place %s because " @@ -3268,7 +3884,7 @@ msgstr "" "perché la directory %s è stata ridenominata in più directory diverse e " "nessuna directory di destinazione contiene la maggior parte dei file." -#: merge-recursive.c:2096 +#: merge-recursive.c:2062 #, c-format msgid "" "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " @@ -3278,7 +3894,7 @@ msgstr "" "%s è d'ostacolo alle seguenti ridenominazioni directory che spostano in tale " "posizione i seguenti percorsi: %s." -#: merge-recursive.c:2106 +#: merge-recursive.c:2072 #, c-format msgid "" "CONFLICT (implicit dir rename): Cannot map more than one path to %s; " @@ -3288,7 +3904,7 @@ msgstr "" "un percorso in %s; delle ridenominazioni directory implicite hanno tentato " "di spostare in tale posizione i seguenti percorsi: %s" -#: merge-recursive.c:2198 +#: merge-recursive.c:2164 #, c-format msgid "" "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" @@ -3297,7 +3913,7 @@ msgstr "" "CONFLITTO (ridenominazione/ridenominazione): directory ridenominata %s->%s " "in %s. Directory ridenominata %s->%s in %s" -#: merge-recursive.c:2443 +#: merge-recursive.c:2408 #, c-format msgid "" "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " @@ -3306,82 +3922,119 @@ msgstr "" "ATTENZIONE: evito di applicare la ridenominazione %s -> %s a %s perché %s " "stesso è stato ridenominato." -#: merge-recursive.c:3022 +#: merge-recursive.c:2929 #, c-format msgid "cannot read object %s" msgstr "impossibile leggere l'oggetto %s" -#: merge-recursive.c:3025 +#: merge-recursive.c:2932 #, c-format msgid "object %s is not a blob" msgstr "l'oggetto %s non è un blob" -#: merge-recursive.c:3094 +#: merge-recursive.c:2996 msgid "modify" msgstr "modifica" -#: merge-recursive.c:3094 +#: merge-recursive.c:2996 msgid "modified" msgstr "modificato" -#: merge-recursive.c:3105 +#: merge-recursive.c:3008 msgid "content" msgstr "contenuto" -#: merge-recursive.c:3112 +#: merge-recursive.c:3012 msgid "add/add" msgstr "aggiunta/aggiunta" -#: merge-recursive.c:3160 +#: merge-recursive.c:3035 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "Omesso %s (elemento sottoposto a merge uguale a quello esistente)" -#: merge-recursive.c:3182 git-submodule.sh:861 +#: merge-recursive.c:3057 git-submodule.sh:937 msgid "submodule" msgstr "sottomodulo" -#: merge-recursive.c:3183 +#: merge-recursive.c:3058 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "CONFLITTO (%s): conflitto di merge in %s" -#: merge-recursive.c:3216 +#: merge-recursive.c:3088 #, c-format msgid "Adding as %s instead" msgstr "Lo aggiungo come %s" -#: merge-recursive.c:3319 +#: merge-recursive.c:3170 +#, c-format +msgid "" +"Path updated: %s added in %s inside a directory that was renamed in %s; " +"moving it to %s." +msgstr "" +"Percorso aggiornato: %s aggiunto in %s in una directory ridenominata in %s; " +"lo sposto in %s." + +#: merge-recursive.c:3173 +#, 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 "" +"CONFLITTO (posizione file): %s aggiunto in %s in una directory ridenominata " +"in %s, il che suggerisce che forse dovrebbe essere spostato in %s." + +#: merge-recursive.c:3177 +#, c-format +msgid "" +"Path updated: %s renamed to %s in %s, inside a directory that was renamed in " +"%s; moving it to %s." +msgstr "" +"Percorso aggiornato: %s ridenominato in %s in %s in una directory " +"ridenominata in %s; lo sposto in %s." + +#: merge-recursive.c:3180 +#, 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 "" +"CONFLITTO (posizione file): %s ridenominato in %s in %s in una directory " +"ridenominata in %s, il che suggerisce che forse dovrebbe essere spostato in " +"%s." + +#: merge-recursive.c:3294 #, c-format msgid "Removing %s" msgstr "Rimozione di %s" -#: merge-recursive.c:3345 +#: merge-recursive.c:3317 msgid "file/directory" msgstr "file/directory" -#: merge-recursive.c:3351 +#: merge-recursive.c:3322 msgid "directory/file" msgstr "directory/file" -#: merge-recursive.c:3358 +#: merge-recursive.c:3329 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" "CONFLITTO (%s): una directory denominata %s esiste già in %s. Aggiungo %s " "come %s" -#: merge-recursive.c:3367 +#: merge-recursive.c:3338 #, c-format msgid "Adding %s" msgstr "Aggiunta %s" -#: merge-recursive.c:3376 -#, fuzzy, c-format +#: merge-recursive.c:3347 +#, c-format msgid "CONFLICT (add/add): Merge conflict in %s" -msgstr "CONFLITTO (%s): conflitto di merge in %s" +msgstr "CONFLITTO (aggiungi/aggiungi): conflitto di merge in %s" -#: merge-recursive.c:3417 +#: merge-recursive.c:3385 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -3390,149 +4043,161 @@ msgstr "" "Le tue modifiche locali ai seguenti file sarebbero sovrascritte dal merge:\n" " %s" -#: merge-recursive.c:3428 +#: merge-recursive.c:3396 msgid "Already up to date!" msgstr "Già aggiornato!" -#: merge-recursive.c:3437 +#: merge-recursive.c:3405 #, c-format msgid "merging of trees %s and %s failed" msgstr "merge degli alberi %s e %s non riuscito" -#: merge-recursive.c:3536 +#: merge-recursive.c:3504 msgid "Merging:" msgstr "Merge in corso:" -#: merge-recursive.c:3549 +#: merge-recursive.c:3517 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "trovato %u antenato comune:" msgstr[1] "trovati %u antenati comuni:" -#: merge-recursive.c:3588 +#: merge-recursive.c:3556 msgid "merge returned no commit" msgstr "il merge non ha restituito alcun commit" -#: merge-recursive.c:3654 +#: merge-recursive.c:3622 #, c-format msgid "Could not parse object '%s'" msgstr "Impossibile analizzare l'oggetto '%s'" -#: merge-recursive.c:3670 builtin/merge.c:692 builtin/merge.c:850 +#: merge-recursive.c:3638 builtin/merge.c:702 builtin/merge.c:873 msgid "Unable to write index." -msgstr "Impossibile scrivere index." +msgstr "Impossibile scrivere l'indice." -#: midx.c:65 +#: midx.c:66 #, c-format msgid "multi-pack-index file %s is too small" msgstr "il file multi-pack-index %s è troppo piccolo" -#: midx.c:81 +#: midx.c:82 #, c-format msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x" msgstr "la firma del multi-pack-index 0x%08x non corrisponde alla firma 0x%08x" -#: midx.c:86 +#: midx.c:87 #, c-format msgid "multi-pack-index version %d not recognized" msgstr "versione %d multi-pack-index non riconosciuta" -#: midx.c:91 +#: midx.c:92 #, c-format msgid "hash version %u does not match" msgstr "la versione dell'hash %u non corrisponde" -#: midx.c:105 +#: midx.c:106 msgid "invalid chunk offset (too large)" msgstr "offset blocco non valido (troppo grande)" -#: midx.c:129 +#: midx.c:130 msgid "terminating multi-pack-index chunk id appears earlier than expected" msgstr "l'ID blocco finale multi-pack-index compare prima di quanto previsto" -#: midx.c:142 +#: midx.c:143 msgid "multi-pack-index missing required pack-name chunk" msgstr "dal multi-pack-index manca il blocco richiesto pack-name" -#: midx.c:144 +#: midx.c:145 msgid "multi-pack-index missing required OID fanout chunk" msgstr "dal multi-pack-index manca il blocco richiesto fanout OID" -#: midx.c:146 +#: midx.c:147 msgid "multi-pack-index missing required OID lookup chunk" msgstr "dal multi-pack-index manca il blocco richiesto lookup OID" -#: midx.c:148 +#: midx.c:149 msgid "multi-pack-index missing required object offsets chunk" msgstr "dal multi-pack-index manca il blocco richiesto offset oggetti" -#: midx.c:162 +#: midx.c:163 #, c-format msgid "multi-pack-index pack names out of order: '%s' before '%s'" msgstr "nomi pack multi-pack-index in disordine: '%s' appare prima di '%s'" -#: midx.c:205 -#, fuzzy, c-format +#: midx.c:208 +#, c-format msgid "bad pack-int-id: %u (%u total packs)" -msgstr "pack-int-id non valido: %u (%u pack totali" +msgstr "pack-int-id non valido: %u (%u pack totali)" -#: midx.c:246 +#: midx.c:258 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" msgstr "" "nel multi-pack-index è salvato un offset a 64 bit, ma off_t è troppo piccolo" -#: midx.c:271 +#: midx.c:286 msgid "error preparing packfile from multi-pack-index" msgstr "errore durante la preparazione del packfile dal multi-pack-index" -#: midx.c:407 +#: midx.c:457 #, c-format msgid "failed to add packfile '%s'" msgstr "aggiunta del packfile '%s' non riuscita" -#: midx.c:413 +#: midx.c:463 #, c-format msgid "failed to open pack-index '%s'" msgstr "apertura del pack-index '%s' non riuscita" -#: midx.c:507 +#: midx.c:557 #, c-format msgid "failed to locate object %d in packfile" msgstr "ricerca dell'oggetto %d nel packfile non riuscita" -#: midx.c:943 +#: midx.c:993 #, c-format msgid "failed to clear multi-pack-index at %s" msgstr "pulizia del multi-pack-index %s non riuscita" -#: midx.c:981 +#: midx.c:1048 +msgid "Looking for referenced packfiles" +msgstr "Ricerca di file pack referenziati in corso" + +#: midx.c:1063 #, c-format msgid "" "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" msgstr "" "fanout oid in disordine: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" -#: midx.c:992 +#: midx.c:1067 +msgid "Verifying OID order in MIDX" +msgstr "Verifica ordine OID in MIDX in corso" + +#: midx.c:1076 #, c-format msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" msgstr "lookup oid in disordine: oid[%d] = %s >= %s = oid[%d]" -#: midx.c:996 +#: midx.c:1095 +msgid "Sorting objects by packfile" +msgstr "Ordinamento degli oggetti nel packfile in corso" + +#: midx.c:1101 msgid "Verifying object offsets" msgstr "Verifica offset oggetti in corso" -#: midx.c:1004 +#: midx.c:1117 #, c-format msgid "failed to load pack entry for oid[%d] = %s" msgstr "caricamento voce pack per oid[%d] = %s non riuscito" -#: midx.c:1010 +#: midx.c:1123 #, c-format msgid "failed to load pack-index for packfile %s" msgstr "caricamento pack-index per il packfile %s non riuscito" -#: midx.c:1019 +#: midx.c:1132 #, c-format msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>" msgstr "offset oggetto non corretto per oid[%d] = %s: %<PRIx64> != %<PRIx64>" @@ -3615,91 +4280,87 @@ msgid "unable to parse object: %s" msgstr "impossibile analizzare l'oggetto: %s" #: object.c:267 object.c:278 -#, fuzzy, c-format +#, c-format msgid "hash mismatch %s" -msgstr "l'hash SHA1 non corrisponde: %s" +msgstr "hash non corrispondente: %s" -#: packfile.c:607 +#: packfile.c:617 msgid "offset before end of packfile (broken .idx?)" msgstr "offset collocato prima della fine del packfile (.idx corrotto?)" -#: packfile.c:1870 +#: packfile.c:1868 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "" "offset collocato prima dell'inizio dell'indice pack per %s (indice corrotto?)" -#: packfile.c:1874 +#: packfile.c:1872 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "" "offset collocato dopo la fine dell'indice pack per %s (indice troncato?)" -#: parse-options.c:35 -#, fuzzy, c-format +#: parse-options.c:38 +#, c-format msgid "%s requires a value" -msgstr "l'opzione '%s' richiede un valore" +msgstr "%s richiede un valore" -#: parse-options.c:69 -#, fuzzy, c-format +#: parse-options.c:73 +#, c-format msgid "%s is incompatible with %s" -msgstr "--long non è compatibile con --abbrev=0" +msgstr "%s non è compatibile con %s" -#: parse-options.c:74 -#, fuzzy, c-format +#: parse-options.c:78 +#, c-format msgid "%s : incompatible with something else" -msgstr "--dirty non è compatibile con le espressioni commit" +msgstr "%s non è compatibile con qualcos'altro" -#: parse-options.c:88 parse-options.c:92 parse-options.c:260 -#, fuzzy, c-format +#: parse-options.c:92 parse-options.c:96 parse-options.c:319 +#, c-format msgid "%s takes no value" -msgstr "%s ha più valori" +msgstr "%s non richiede un valore" -#: parse-options.c:90 -#, fuzzy, c-format +#: parse-options.c:94 +#, c-format msgid "%s isn't available" -msgstr "%s non è un oggetto valido" - -#: parse-options.c:178 -#, fuzzy, c-format -msgid "%s expects a numerical value" -msgstr "switch '%c' richiede un valore numerico" +msgstr "%s non è disponibile" -#: parse-options.c:194 +#: parse-options.c:219 #, c-format msgid "%s expects a non-negative integer value with an optional k/m/g suffix" msgstr "" +"%s richiede un valore intero non negativo con un suffisso k/m/g facoltativo" -#: parse-options.c:322 +#: parse-options.c:389 #, c-format msgid "ambiguous option: %s (could be --%s%s or --%s%s)" -msgstr "" +msgstr "opzione ambigua: %s (potrebbe essere --%s%s o --%s%s)" -#: parse-options.c:356 parse-options.c:364 +#: parse-options.c:423 parse-options.c:431 #, c-format msgid "did you mean `--%s` (with two dashes ?)" -msgstr "" +msgstr "forse intendevi `--%s` (con due trattini)?" -#: parse-options.c:649 -#, fuzzy, c-format +#: parse-options.c:859 +#, c-format msgid "unknown option `%s'" -msgstr "sconosciuto: %s" +msgstr "opzione sconosciuta `%s'" -#: parse-options.c:651 -#, fuzzy, c-format +#: parse-options.c:861 +#, c-format msgid "unknown switch `%c'" -msgstr "porta %s sconosciuta" +msgstr "opzione `%c` sconosciuta" -#: parse-options.c:653 -#, fuzzy, c-format +#: parse-options.c:863 +#, c-format msgid "unknown non-ascii option in string: `%s'" -msgstr "Commit %s sconosciuto" +msgstr "opzione non ASCII sconosciuta presente nella stringa: `%s'" -#: parse-options.c:675 +#: parse-options.c:887 msgid "..." msgstr "..." -#: parse-options.c:694 +#: parse-options.c:906 #, c-format msgid "usage: %s" msgstr "uso: %s" @@ -3707,41 +4368,46 @@ msgstr "uso: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c:700 +#: parse-options.c:912 #, c-format msgid " or: %s" msgstr " oppure: %s" -#: parse-options.c:703 +#: parse-options.c:915 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:742 +#: parse-options.c:954 msgid "-NUM" msgstr "-NUM" -#: parse-options-cb.c:21 -#, fuzzy, c-format +#: parse-options.c:968 +#, c-format +msgid "alias of --%s" +msgstr "alias di --%s" + +#: parse-options-cb.c:20 parse-options-cb.c:24 +#, c-format msgid "option `%s' expects a numerical value" -msgstr "switch '%c' richiede un valore numerico" +msgstr "l'opzione `%s' richiede un valore numerico" -#: parse-options-cb.c:38 +#: parse-options-cb.c:41 #, c-format msgid "malformed expiration date '%s'" msgstr "data scadenza '%s' malformata" -#: parse-options-cb.c:51 +#: parse-options-cb.c:54 #, c-format msgid "option `%s' expects \"always\", \"auto\", or \"never\"" -msgstr "" +msgstr "l'opzione `%s' richiede \"always\", \"auto\" o \"never\"" -#: parse-options-cb.c:110 +#: parse-options-cb.c:130 parse-options-cb.c:147 #, c-format msgid "malformed object name '%s'" msgstr "nome oggetto '%s' malformato" -#: path.c:894 +#: path.c:897 #, c-format msgid "Could not make %s writable by group" msgstr "Impossibile rendere %s scrivibile dal gruppo" @@ -3824,61 +4490,69 @@ msgid "pathspec '%s' is beyond a symbolic link" msgstr "" "lo specificatore percorso '%s' si trova oltre un collegamento simbolico" -#: pkt-line.c:104 +#: pkt-line.c:92 +msgid "unable to write flush packet" +msgstr "impossibile scrivere il pacchetto flush" + +#: pkt-line.c:99 +msgid "unable to write delim packet" +msgstr "impossibile scrivere il pacchetto delim" + +#: pkt-line.c:106 msgid "flush packet write failed" msgstr "scrittura con flush pacchetto non riuscita" -#: pkt-line.c:144 pkt-line.c:230 +#: pkt-line.c:146 pkt-line.c:232 msgid "protocol error: impossibly long line" msgstr "errore protocollo: riga impossibilmente lunga" -#: pkt-line.c:160 pkt-line.c:162 +#: pkt-line.c:162 pkt-line.c:164 msgid "packet write with format failed" msgstr "scrittura pacchetto con formato non riuscita" -#: pkt-line.c:194 +#: pkt-line.c:196 msgid "packet write failed - data exceeds max packet size" msgstr "" "scrittura pacchetto non riuscita - i dati sono più della dimensione massima " "pacchetto" -#: pkt-line.c:201 pkt-line.c:208 +#: pkt-line.c:203 pkt-line.c:210 msgid "packet write failed" msgstr "scrittura pacchetto non riuscita" -#: pkt-line.c:293 +#: pkt-line.c:295 msgid "read error" msgstr "errore di lettura" -#: pkt-line.c:301 +#: pkt-line.c:303 msgid "the remote end hung up unexpectedly" msgstr "l'interlocutore remoto ha chiuso inaspettatamente la connessione" -#: pkt-line.c:329 +#: pkt-line.c:331 #, c-format msgid "protocol error: bad line length character: %.4s" msgstr "errore protocollo: carattere lunghezza riga non valido: %.4s" -#: pkt-line.c:339 pkt-line.c:344 +#: pkt-line.c:341 pkt-line.c:346 #, c-format msgid "protocol error: bad line length %d" msgstr "errore protocollo: lunghezza riga non valida: %d" -#: pkt-line.c:353 +#: pkt-line.c:362 #, c-format msgid "remote error: %s" msgstr "errore remoto: %s" #: preload-index.c:119 msgid "Refreshing index" -msgstr "Aggiornamento index in corso" +msgstr "Aggiornamento indice in corso" #: preload-index.c:138 #, c-format msgid "unable to create threaded lstat: %s" msgstr "impossibile creare lstat in versione threaded: %s" -#: pretty.c:963 +#: pretty.c:966 msgid "unable to parse --pretty format" msgstr "impossibile analizzare il formato --pretty" @@ -3890,7 +4564,7 @@ msgstr "impossibile avviare `log`" msgid "could not read `log` output" msgstr "impossibile leggere l'output di `log`" -#: range-diff.c:74 sequencer.c:4828 +#: range-diff.c:74 sequencer.c:4897 #, c-format msgid "could not parse commit '%s'" msgstr "impossibile analizzare il commit '%s'" @@ -3902,48 +4576,54 @@ msgstr "generazione del diff non riuscita" #: range-diff.c:455 range-diff.c:457 #, c-format msgid "could not parse log for '%s'" -msgstr "impossibile analizzare il log di '%s'" +msgstr "impossibile analizzare il registro di '%s'" -#: read-cache.c:673 -#, fuzzy, c-format +#: read-cache.c:680 +#, c-format msgid "will not add file alias '%s' ('%s' already exists in index)" -msgstr "%s: esiste già in index" +msgstr "non aggiungerò l'alias file '%s' ('%s' esiste già nell'indice)" -#: read-cache.c:689 -#, fuzzy +#: read-cache.c:696 msgid "cannot create an empty blob in the object database" -msgstr "impossibile scrivere l'oggetto nota" +msgstr "impossibile creare un blob vuoto nel database oggetti" -#: read-cache.c:710 +#: read-cache.c:718 #, c-format msgid "%s: can only add regular files, symbolic links or git-directories" msgstr "" +"%s: è possibile aggiungere solo file regolari, collegamenti simbolici o " +"directory Git" -#: read-cache.c:765 -#, fuzzy, c-format +#: read-cache.c:723 +#, c-format +msgid "'%s' does not have a commit checked out" +msgstr "'%s' non ha un commit di cui è stato eseguito il checkout" + +#: read-cache.c:775 +#, c-format msgid "unable to index file '%s'" -msgstr "impossibile leggere il file index" +msgstr "impossibile indicizzare il file '%s'" -#: read-cache.c:784 -#, fuzzy, c-format +#: read-cache.c:794 +#, c-format msgid "unable to add '%s' to index" -msgstr "Impossibile aggiungere %s al database" +msgstr "impossibile aggiungere '%s' all'indice" -#: read-cache.c:795 -#, fuzzy, c-format +#: read-cache.c:805 +#, c-format msgid "unable to stat '%s'" -msgstr "non è possibile scrivere %s" +msgstr "impossibile eseguire stat su '%s'" -#: read-cache.c:1304 -#, fuzzy, c-format +#: read-cache.c:1314 +#, c-format msgid "'%s' appears as both a file and as a directory" -msgstr "%s esiste e non è una directory" +msgstr "'%s' compare sia come file sia come directory" -#: read-cache.c:1489 +#: read-cache.c:1499 msgid "Refresh index" msgstr "Aggiornamento indice" -#: read-cache.c:1603 +#: read-cache.c:1613 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -3952,7 +4632,7 @@ msgstr "" "index.version impostato, ma il valore non è valido.\n" "Uso la versione %i" -#: read-cache.c:1613 +#: read-cache.c:1623 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -3961,144 +4641,152 @@ msgstr "" "GIT_INDEX_VERSION impostato, ma il valore non è valido.\n" "Uso la versione %i" -#: read-cache.c:1684 +#: read-cache.c:1679 #, c-format msgid "bad signature 0x%08x" -msgstr "" +msgstr "firma non valida: 0x%08x" -#: read-cache.c:1687 -#, fuzzy, c-format +#: read-cache.c:1682 +#, c-format msgid "bad index version %d" -msgstr "versione '%s' di index errata" +msgstr "versione indice non valida: %d" -#: read-cache.c:1696 +#: read-cache.c:1691 msgid "bad index file sha1 signature" -msgstr "" +msgstr "firma SHA1 file indice non valida" -#: read-cache.c:1726 +#: read-cache.c:1721 #, c-format msgid "index uses %.4s extension, which we do not understand" -msgstr "" +msgstr "l'indice usa l'estensione %.4s che non comprendiamo" -#: read-cache.c:1728 +#: read-cache.c:1723 #, c-format msgid "ignoring %.4s extension" -msgstr "" +msgstr "estensione %.4s ignorata" -#: read-cache.c:1765 -#, fuzzy, c-format +#: read-cache.c:1760 +#, c-format msgid "unknown index entry format 0x%08x" -msgstr "Formato archivio '%s' sconosciuto" +msgstr "formato voce indice sconosciuto: 0x%08x" -#: read-cache.c:1781 +#: read-cache.c:1776 #, c-format msgid "malformed name field in the index, near path '%s'" msgstr "campo nome malformato nell'indice, vicino al percorso '%s'" -#: read-cache.c:1836 +#: read-cache.c:1833 msgid "unordered stage entries in index" -msgstr "" +msgstr "voci stage non ordinate nell'indice" -#: read-cache.c:1839 -#, fuzzy, c-format +#: read-cache.c:1836 +#, c-format msgid "multiple stage entries for merged file '%s'" -msgstr "aggiornamenti multipli per il riferimento '%s' non consentiti" +msgstr "voci stage multiple per il file sottoposto a merge '%s'" -#: read-cache.c:1842 -#, fuzzy, c-format +#: read-cache.c:1839 +#, c-format msgid "unordered stage entries for '%s'" -msgstr "impossibile creare le directory per %s" +msgstr "voci stage non ordinate per '%s'" -#: read-cache.c:1949 read-cache.c:2227 rerere.c:565 rerere.c:599 rerere.c:1111 -#: builtin/add.c:459 builtin/check-ignore.c:178 builtin/checkout.c:294 -#: builtin/checkout.c:622 builtin/checkout.c:991 builtin/clean.c:955 -#: builtin/commit.c:344 builtin/diff-tree.c:116 builtin/grep.c:498 +#: 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 msgid "index file corrupt" -msgstr "file index corrotto" +msgstr "file indice corrotto" -#: read-cache.c:2090 +#: read-cache.c:2087 #, c-format msgid "unable to create load_cache_entries thread: %s" msgstr "impossibile creare il thread load_cache_entries: %s" -#: read-cache.c:2103 +#: read-cache.c:2100 #, c-format msgid "unable to join load_cache_entries thread: %s" msgstr "impossibile bloccare il thread load_cache_entries: %s" -#: read-cache.c:2136 -#, fuzzy, c-format +#: read-cache.c:2133 +#, c-format msgid "%s: index file open failed" -msgstr "%s: esecuzione del filtro smudge '%s' non riuscita" +msgstr "%s: apertura del file indice non riuscita" -#: read-cache.c:2140 -#, fuzzy, c-format +#: read-cache.c:2137 +#, c-format msgid "%s: cannot stat the open index" -msgstr "impossibile leggere l'index" +msgstr "%s: impossibile eseguire stat sull'indice aperto" -#: read-cache.c:2144 +#: read-cache.c:2141 #, c-format msgid "%s: index file smaller than expected" -msgstr "" +msgstr "%s: file indice più piccolo della dimensione attesa" -#: read-cache.c:2148 -#, fuzzy, c-format +#: read-cache.c:2145 +#, c-format msgid "%s: unable to map index file" -msgstr "impossibile leggere il file index" +msgstr "%s: impossibile mappare il file indice" -#: read-cache.c:2190 +#: read-cache.c:2187 #, c-format msgid "unable to create load_index_extensions thread: %s" msgstr "impossibile creare il thread load_index_extensions: %s" -#: read-cache.c:2217 +#: read-cache.c:2214 #, c-format msgid "unable to join load_index_extensions thread: %s" msgstr "impossibile bloccare il thread load_index_extensions: %s" -#: read-cache.c:2239 -#, fuzzy, c-format +#: read-cache.c:2246 +#, c-format msgid "could not freshen shared index '%s'" -msgstr "impossibile leggere il bundle '%s'" +msgstr "impossibile aggiornare l'indice condiviso '%s'" -#: read-cache.c:2274 +#: read-cache.c:2293 #, c-format msgid "broken index, expect %s in %s, got %s" -msgstr "" +msgstr "indice corrotto, atteso %s in %s, presente %s" -#: read-cache.c:2971 sequencer.c:4791 wrapper.c:658 builtin/merge.c:1087 +#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1117 #, c-format msgid "could not close '%s'" msgstr "impossibile chiudere '%s'" -#: read-cache.c:3044 sequencer.c:2237 sequencer.c:3647 +#: read-cache.c:3092 sequencer.c:2354 sequencer.c:3807 #, c-format msgid "could not stat '%s'" msgstr "impossibile eseguire lo stat di '%s'" -#: read-cache.c:3057 +#: read-cache.c:3105 #, c-format msgid "unable to open git dir: %s" msgstr "impossibile aprire la directory git: %s" -#: read-cache.c:3069 +#: read-cache.c:3117 #, c-format msgid "unable to unlink: %s" msgstr "impossibile eseguire unlink: %s" -#: read-cache.c:3088 -#, fuzzy, c-format +#: read-cache.c:3142 +#, c-format msgid "cannot fix permission bits on '%s'" -msgstr "impossibile impostare i permessi a '%s'" +msgstr "impossibile correggere i permessi di '%s'" -#: read-cache.c:3237 -#, fuzzy, c-format +#: read-cache.c:3291 +#, c-format msgid "%s: cannot drop to stage #0" -msgstr "%s: impossibile aggiornare il ref" +msgstr "%s: impossibile ripiegare sullo stadio 0" -#: rebase-interactive.c:10 +#: rebase-interactive.c:26 +#, c-format +msgid "" +"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." +msgstr "" +"impostazione %s non riconosciuta per l'opzione rebase.missingCommitsCheck. " +"La ignoro." + +#: rebase-interactive.c:35 msgid "" "\n" "Commands:\n" @@ -4143,7 +4831,14 @@ msgstr "" "Queste righe possono essere riordinate; saranno eseguite dalla prima " "all'ultima.\n" -#: rebase-interactive.c:31 git-rebase--preserve-merges.sh:173 +#: rebase-interactive.c:56 +#, c-format +msgid "Rebase %s onto %s (%d command)" +msgid_plural "Rebase %s onto %s (%d commands)" +msgstr[0] "Rebase di %s su %s (%d comando)" +msgstr[1] "Rebase di %s su %s (%d comandi)" + +#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:173 msgid "" "\n" "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" @@ -4152,7 +4847,7 @@ msgstr "" "Non eliminare alcuna riga. Usa esplicitamente 'drop' per rimuovere un " "commit.\n" -#: rebase-interactive.c:34 git-rebase--preserve-merges.sh:177 +#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:177 msgid "" "\n" "If you remove a line here THAT COMMIT WILL BE LOST.\n" @@ -4160,7 +4855,7 @@ msgstr "" "\n" "Rimuovendo una riga da qui IL COMMIT CORRISPONDENTE ANDRÀ PERDUTO.\n" -#: rebase-interactive.c:40 git-rebase--preserve-merges.sh:816 +#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:816 msgid "" "\n" "You are editing the todo file of an ongoing interactive rebase.\n" @@ -4174,7 +4869,7 @@ msgstr "" " git rebase --continue\n" "\n" -#: rebase-interactive.c:45 git-rebase--preserve-merges.sh:893 +#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:893 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" @@ -4184,125 +4879,156 @@ msgstr "" "Ciò nonostante, se rimuovi tutto, il rebase sarà annullato.\n" "\n" -#: rebase-interactive.c:51 git-rebase--preserve-merges.sh:900 +#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:900 msgid "Note that empty commits are commented out" msgstr "Nota che i commit vuoti sono commentati" -#: rebase-interactive.c:62 rebase-interactive.c:75 sequencer.c:2219 -#: sequencer.c:4569 sequencer.c:4625 sequencer.c:4900 +#: 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 #, c-format -msgid "could not read '%s'." -msgstr "impossibile leggere '%s'." +msgid "could not write '%s'" +msgstr "impossibile scrivere '%s'" + +#: rebase-interactive.c:108 +#, c-format +msgid "could not copy '%s' to '%s'." +msgstr "impossibile copiare '%s' in '%s'." + +#: rebase-interactive.c:173 +#, c-format +msgid "" +"Warning: some commits may have been dropped accidentally.\n" +"Dropped commits (newer to older):\n" +msgstr "" +"Attenzione: è possibile che alcuni commit siano stati scartati " +"accidentalmente.\n" +"Commit scartati (dal più al meno recente):\n" + +#: rebase-interactive.c:180 +#, c-format +msgid "" +"To avoid this message, use \"drop\" to explicitly remove a commit.\n" +"\n" +"Use 'git config rebase.missingCommitsCheck' to change the level of " +"warnings.\n" +"The possible behaviours are: ignore, warn, error.\n" +"\n" +msgstr "" +"Per evitare questo messaggio, usa \"drop\" per rimuovere un commit\n" +"esplicitamente.\n" +"\n" +"Usa 'git config rebase.missingCommitsCheck' per modificare il livello\n" +"degli avvisi.\n" +"I comportamenti possibili sono ignore, warn, error.\n" +"\n" #: refs.c:192 #, c-format msgid "%s does not point to a valid object!" msgstr "%s non punta a un oggetto valido!" -#: refs.c:583 +#: refs.c:597 #, c-format msgid "ignoring dangling symref %s" msgstr "ignoro il riferimento simbolico pendente %s" -#: refs.c:585 ref-filter.c:1976 +#: refs.c:599 ref-filter.c:1982 #, c-format msgid "ignoring broken ref %s" msgstr "ignoro il riferimento rotto %s" -#: refs.c:711 +#: refs.c:734 #, c-format msgid "could not open '%s' for writing: %s" msgstr "impossibile aprire '%s' in scrittura: %s" -#: refs.c:721 refs.c:772 +#: refs.c:744 refs.c:795 #, c-format msgid "could not read ref '%s'" msgstr "impossibile leggere il riferimento '%s'" -#: refs.c:727 +#: refs.c:750 #, c-format msgid "ref '%s' already exists" msgstr "il riferimento '%s' esiste già" -#: refs.c:732 +#: refs.c:755 #, c-format msgid "unexpected object ID when writing '%s'" msgstr "ID oggetto inatteso durante la scrittura di '%s'" -#: refs.c:740 sequencer.c:396 sequencer.c:2549 sequencer.c:2675 -#: sequencer.c:2689 sequencer.c:2923 sequencer.c:4789 sequencer.c:4852 -#: wrapper.c:656 +#: 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 "impossibile scrivere su '%s'" -#: refs.c:767 sequencer.c:4787 sequencer.c:4846 wrapper.c:225 wrapper.c:395 -#: builtin/am.c:713 builtin/rebase.c:575 +#: 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 "impossibile aprire '%s' in scrittura" -#: refs.c:774 +#: refs.c:797 #, c-format msgid "unexpected object ID when deleting '%s'" msgstr "ID oggetto inatteso durante l'eliminazione di '%s'" -#: refs.c:905 +#: refs.c:928 #, c-format msgid "log for ref %s has gap after %s" -msgstr "il log per il riferimento %s ha delle voci mancanti dopo %s" +msgstr "il registro per il riferimento %s ha delle voci mancanti dopo %s" -#: refs.c:911 +#: refs.c:934 #, c-format msgid "log for ref %s unexpectedly ended on %s" -msgstr "il log per il riferimento %s è terminato inaspettatamente a %s" +msgstr "il registro per il riferimento %s è terminato inaspettatamente a %s" -#: refs.c:969 +#: refs.c:993 #, c-format msgid "log for %s is empty" -msgstr "il log per %s è vuoto" +msgstr "il registro per %s è vuoto" -#: refs.c:1061 +#: refs.c:1085 #, c-format msgid "refusing to update ref with bad name '%s'" msgstr "mi rifiuto di aggiornare il riferimento con il nome non valido '%s'" -#: refs.c:1137 +#: refs.c:1161 #, c-format msgid "update_ref failed for ref '%s': %s" msgstr "update_ref per il riferimento '%s' non riuscita: %s" -#: refs.c:1911 +#: refs.c:1942 #, c-format msgid "multiple updates for ref '%s' not allowed" msgstr "aggiornamenti multipli per il riferimento '%s' non consentiti" -#: refs.c:1943 +#: refs.c:1974 msgid "ref updates forbidden inside quarantine environment" msgstr "aggiornamenti riferimento vietati nell'ambiente quarantena" -#: refs.c:2039 refs.c:2069 +#: refs.c:2070 refs.c:2100 #, c-format msgid "'%s' exists; cannot create '%s'" msgstr "'%s' esiste già; impossibile creare '%s'" -#: refs.c:2045 refs.c:2080 +#: refs.c:2076 refs.c:2111 #, c-format msgid "cannot process '%s' and '%s' at the same time" msgstr "impossibile gestire '%s' e '%s' contemporaneamente" -#: refs/files-backend.c:1228 +#: refs/files-backend.c:1234 #, c-format msgid "could not remove reference %s" msgstr "impossibile rimuovere il riferimento %s" -#: refs/files-backend.c:1242 refs/packed-backend.c:1532 +#: 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 "impossibile eliminare il riferimento %s: %s" -#: refs/files-backend.c:1245 refs/packed-backend.c:1545 +#: refs/files-backend.c:1251 refs/packed-backend.c:1545 #, c-format msgid "could not delete references: %s" msgstr "impossibile eliminare i riferimenti: %s" @@ -4312,7 +5038,7 @@ msgstr "impossibile eliminare i riferimenti: %s" msgid "invalid refspec '%s'" msgstr "specificatore riferimento '%s' non valido" -#: ref-filter.c:39 wt-status.c:1861 +#: ref-filter.c:39 wt-status.c:1909 msgid "gone" msgstr "sparito" @@ -4362,14 +5088,14 @@ msgid "%%(objecttype) does not take arguments" msgstr "%%(objecttype) non accetta argomenti" #: ref-filter.c:245 -#, fuzzy, c-format +#, c-format msgid "unrecognized %%(objectsize) argument: %s" -msgstr "argomento %%(objectname) non riconosciuto: %s" +msgstr "argomento %%(objectsize) non riconosciuto: %s" #: ref-filter.c:253 -#, fuzzy, c-format +#, c-format msgid "%%(deltabase) does not take arguments" -msgstr "%%(objectsize) non accetta argomenti" +msgstr "%%(deltabase) non accetta argomenti" #: ref-filter.c:265 #, c-format @@ -4436,17 +5162,17 @@ msgstr "attesa ampiezza positiva con l'atom %%(align)" msgid "unrecognized %%(if) argument: %s" msgstr "argomento %%(if) non riconosciuto: %s" -#: ref-filter.c:527 +#: ref-filter.c:531 #, c-format msgid "malformed field name: %.*s" msgstr "nome campo malformato: %.*s" -#: ref-filter.c:554 +#: ref-filter.c:558 #, c-format msgid "unknown field name: %.*s" msgstr "nome campo sconosciuto: %.*s" -#: ref-filter.c:558 +#: ref-filter.c:562 #, c-format msgid "" "not a git repository, but the field '%.*s' requires access to object data" @@ -4454,62 +5180,62 @@ msgstr "" "non è un repository git, ma il campo '%.*s' richiede l'accesso ai dati " "oggetto" -#: ref-filter.c:682 +#: ref-filter.c:686 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "formato: atomo %%(if) usato senza un atomo %%(then)" -#: ref-filter.c:745 +#: ref-filter.c:749 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "formato: atomo %%(then) usato senza un atomo %%(if)" -#: ref-filter.c:747 +#: ref-filter.c:751 #, c-format msgid "format: %%(then) atom used more than once" msgstr "formato: atomo %%(then) usato più di una volta" -#: ref-filter.c:749 +#: ref-filter.c:753 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "formato: atomo %%(then) usato dopo %%(else)" -#: ref-filter.c:777 +#: ref-filter.c:781 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "formato: atomo %%(else) usato senza un atomo %%(if)" -#: ref-filter.c:779 +#: ref-filter.c:783 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "formato: atomo %%(else) usato senza un atomo %%(then)" -#: ref-filter.c:781 +#: ref-filter.c:785 #, c-format msgid "format: %%(else) atom used more than once" msgstr "formato: atomo %%(else) usato più di una volta" -#: ref-filter.c:796 +#: ref-filter.c:800 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "formato: atomo %%(end) usato senza l'atomo corrispondente" -#: ref-filter.c:853 +#: ref-filter.c:857 #, c-format msgid "malformed format string %s" msgstr "stringa di formato %s malformata" -#: ref-filter.c:1447 +#: ref-filter.c:1453 #, c-format msgid "(no branch, rebasing %s)" msgstr "(nessun branch, eseguo il rebase di %s)" -#: ref-filter.c:1450 +#: ref-filter.c:1456 #, c-format msgid "(no branch, rebasing detached HEAD %s)" msgstr "(nessun branch, eseguo il rebase dell'HEAD scollegato %s)" -#: ref-filter.c:1453 +#: ref-filter.c:1459 #, c-format msgid "(no branch, bisect started on %s)" msgstr "(nessun branch, bisezione avviata su %s)" @@ -4517,7 +5243,7 @@ msgstr "(nessun branch, bisezione avviata su %s)" #. TRANSLATORS: make sure this matches "HEAD #. detached at " in wt-status.c #. -#: ref-filter.c:1461 +#: ref-filter.c:1467 #, c-format msgid "(HEAD detached at %s)" msgstr "(HEAD scollegato su %s)" @@ -4525,72 +5251,73 @@ msgstr "(HEAD scollegato su %s)" #. TRANSLATORS: make sure this matches "HEAD #. detached from " in wt-status.c #. -#: ref-filter.c:1468 +#: ref-filter.c:1474 #, c-format msgid "(HEAD detached from %s)" msgstr "(HEAD scollegato da %s)" -#: ref-filter.c:1472 +#: ref-filter.c:1478 msgid "(no branch)" msgstr "(nessun branch)" -#: ref-filter.c:1506 ref-filter.c:1663 +#: ref-filter.c:1512 ref-filter.c:1669 #, c-format msgid "missing object %s for %s" msgstr "oggetto %s mancante per %s" -#: ref-filter.c:1516 +#: ref-filter.c:1522 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "parse_object_buffer non riuscito su %s per %s" -#: ref-filter.c:1882 +#: ref-filter.c:1888 #, c-format msgid "malformed object at '%s'" msgstr "oggetto malformato in '%s'" -#: ref-filter.c:1971 +#: ref-filter.c:1977 #, c-format msgid "ignoring ref with broken name %s" msgstr "ignoro il riferimento con il nome malformato %s" -#: ref-filter.c:2257 +#: ref-filter.c:2263 #, c-format msgid "format: %%(end) atom missing" msgstr "formato: atomo %%(end) mancante" -#: ref-filter.c:2352 -#, fuzzy, c-format +#: ref-filter.c:2363 +#, c-format msgid "option `%s' is incompatible with --merged" -msgstr "--long non è compatibile con --abbrev=0" +msgstr "l'opzione `%s' non è compatibile con --merged" -#: ref-filter.c:2355 -#, fuzzy, c-format +#: ref-filter.c:2366 +#, c-format msgid "option `%s' is incompatible with --no-merged" -msgstr "--long non è compatibile con --abbrev=0" +msgstr "l'opzione `%s' non è compatibile con --no-merged" -#: ref-filter.c:2365 +#: ref-filter.c:2376 #, c-format msgid "malformed object name %s" msgstr "nome dell'oggetto %s malformato" -#: ref-filter.c:2370 -#, fuzzy, c-format +#: ref-filter.c:2381 +#, c-format msgid "option `%s' must point to a commit" -msgstr "'%s' non punta ad un commit" +msgstr "l'opzione `%s' deve puntare ad un commit" #: remote.c:363 #, c-format msgid "config remote shorthand cannot begin with '/': %s" msgstr "" +"la forma breve della configurazione del remoto non può iniziare con '/': %s" #: remote.c:410 msgid "more than one receivepack given, using the first" -msgstr "" +msgstr "è stata specificata più di una direttiva receivepack, uso la prima" #: remote.c:418 msgid "more than one uploadpack given, using the first" -msgstr "" +msgstr "è stata specificata più di una direttiva uploadpack, uso la prima" #: remote.c:608 #, c-format @@ -4610,22 +5337,24 @@ msgstr "%s traccia sia %s sia %s" #: remote.c:684 #, c-format msgid "key '%s' of pattern had no '*'" -msgstr "" +msgstr "la chiave '%s' del pattern non aveva un '*'" #: remote.c:694 #, c-format msgid "value '%s' of pattern has no '*'" -msgstr "" +msgstr "il valore '%s' del pattern non ha un '*'" #: remote.c:1000 -#, fuzzy, c-format +#, c-format msgid "src refspec %s does not match any" -msgstr "%s: non corrisponde a index" +msgstr "nessuna corrispondenza per lo specificatore riferimento sorgente %s" #: remote.c:1005 #, c-format msgid "src refspec %s matches more than one" msgstr "" +"sono state trovate più corrispondenze per lo specificatore riferimento " +"sorgente %s" #. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is @@ -4644,6 +5373,18 @@ msgid "" "\n" "Neither worked, so we gave up. You must fully qualify the ref." msgstr "" +"La destinazione che hai fornito non è un nome riferimento\n" +"completo (ossia che inizia con \"refs/\"). Abbiamo provato a\n" +"indovinare ciò che intendevi dire:\n" +"\n" +"- cercando un riferimento corrispondente a '%s' nel remoto;\n" +"- controllando se la <sorgente> sottoposta a push ('%s') fosse un\n" +" riferimento compreso fra quelli in \"refs/{heads,tags}/\". In tal\n" +" caso avremmo aggiunto il prefisso corrispondente\n" +" refs/{heads,tags}/ al remoto.\n" +"\n" +"Nessuna delle due opzioni ha funzionato, quindi ci siamo arresi.\n" +"Devi specificare un riferimento completamente qualificato." #: remote.c:1040 #, c-format @@ -4652,6 +5393,9 @@ msgid "" "Did you mean to create a new branch by pushing to\n" "'%s:refs/heads/%s'?" msgstr "" +"La parte <sorgente> dello specificatore riferimento\n" +"è un oggetto tag. Forse intendevi creare un nuovo\n" +"branch eseguendo il push a '%s:refs/heads/%s'?" #: remote.c:1045 #, c-format @@ -4660,6 +5404,9 @@ msgid "" "Did you mean to create a new tag by pushing to\n" "'%s:refs/tags/%s'?" msgstr "" +"La parte <sorgente> dello specificatore riferimento\n" +"è un oggetto tag. Forse intendevi creare un nuovo\n" +"branch eseguendo il push a '%s:refs/tags/%s'?" #: remote.c:1050 #, c-format @@ -4668,6 +5415,10 @@ msgid "" "Did you mean to tag a new tree by pushing to\n" "'%s:refs/tags/%s'?" msgstr "" +"La parte <sorgente> dello specificatore riferimento\n" +"è un oggetto albero. Forse intendevi aggiungere un\n" +"tag a un nuovo albero eseguendo il push a\n" +"'%s:refs/tags/%s'?" #: remote.c:1055 #, c-format @@ -4676,26 +5427,34 @@ msgid "" "Did you mean to tag a new blob by pushing to\n" "'%s:refs/tags/%s'?" msgstr "" +"La parte <sorgente> dello specificatore riferimento\n" +"è un oggetto blob. Forse intendevi aggiungere un\n" +"tag a un nuovo blob eseguendo il push a\n" +"'%s:refs/tags/%s'?" #: remote.c:1091 -#, fuzzy, c-format +#, c-format msgid "%s cannot be resolved to branch" -msgstr "'%s' non può essere usato passando da un branch a un altro" +msgstr "%s non può essere risolto in un branch" #: remote.c:1102 -#, fuzzy, c-format +#, c-format msgid "unable to delete '%s': remote ref does not exist" -msgstr "impossibile scrivere il file '%s' in modalità %o" +msgstr "impossibile eliminare '%s': il riferimento remoto non esiste" #: remote.c:1114 #, c-format msgid "dst refspec %s matches more than one" msgstr "" +"sono state trovate più corrispondenze per lo specificatore riferimento " +"destinazione %s" #: remote.c:1121 #, c-format msgid "dst ref %s receives from more than one src" msgstr "" +"lo specificatore riferimento destinazione %s riceve dati da più di una " +"sorgente" #: remote.c:1624 remote.c:1725 msgid "HEAD does not point to a branch" @@ -4743,51 +5502,51 @@ msgid "cannot resolve 'simple' push to a single destination" msgstr "impossibile risolvere il push 'simple' a una singola destinazione" #: remote.c:1840 -#, fuzzy, c-format +#, c-format msgid "couldn't find remote ref %s" -msgstr "non è stato possibile creare il file '%s'" +msgstr "impossibile trovare il riferimento remoto %s" #: remote.c:1853 #, c-format msgid "* Ignoring funny ref '%s' locally" -msgstr "" +msgstr "* Ignoro localmente il riferimento strano '%s'" -#: remote.c:1990 +#: remote.c:2016 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "Il tuo branch è basato su '%s', ma l'upstream è scomparso.\n" -#: remote.c:1994 +#: remote.c:2020 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (usa \"git branch --unset-upstream\" per correggere la situazione)\n" -#: remote.c:1997 +#: remote.c:2023 #, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "Il tuo branch è aggiornato rispetto a '%s'.\n" -#: remote.c:2001 +#: remote.c:2027 #, c-format msgid "Your branch and '%s' refer to different commits.\n" msgstr "Il tuo branch e '%s' fanno riferimento a commit differenti.\n" -#: remote.c:2004 +#: remote.c:2030 #, c-format msgid " (use \"%s\" for details)\n" msgstr " (usa \"%s\" per visualizzare i dettagli)\n" -#: remote.c:2008 +#: remote.c:2034 #, 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] "Il tuo branch è avanti rispetto a '%s' di %d commit.\n" msgstr[1] "Il tuo branch è avanti rispetto a '%s' di %d commit.\n" -#: remote.c:2014 +#: remote.c:2040 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (usa \"git push\" per pubblicare i tuoi commit locali)\n" -#: remote.c:2017 +#: remote.c:2043 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -4799,11 +5558,11 @@ msgstr[1] "" "Il tuo branch è indietro rispetto a '%s' di %d commit e ne posso eseguire il " "fast forward.\n" -#: remote.c:2025 +#: remote.c:2051 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (usa \"git pull\" per aggiornare il tuo branch locale)\n" -#: remote.c:2028 +#: remote.c:2054 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -4818,14 +5577,14 @@ msgstr[1] "" "Il tuo branch e '%s' sono diventati divergenti\n" "e hanno rispettivamente %d e %d commit differenti.\n" -#: remote.c:2038 +#: remote.c:2064 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr " (usa \"git pull\" per eseguire il merge del branch remoto nel tuo)\n" -#: remote.c:2221 -#, fuzzy, c-format +#: remote.c:2247 +#, c-format msgid "cannot parse expected object name '%s'" -msgstr "impossibile leggere l'oggetto %s '%s'" +msgstr "impossibile analizzare il nome oggetto atteso '%s'" #: replace-object.c:21 #, c-format @@ -4850,12 +5609,6 @@ msgstr "MERGE_RR corrotta" msgid "unable to write rerere record" msgstr "impossibile scrivere il record rerere" -#: rerere.c:485 rerere.c:692 sequencer.c:3186 sequencer.c:3212 -#: builtin/fsck.c:314 -#, c-format -msgid "could not write '%s'" -msgstr "impossibile scrivere '%s'" - #: rerere.c:495 #, c-format msgid "there were errors while writing '%s' (%s)" @@ -4884,8 +5637,7 @@ msgstr "scrittura di '%s' non riuscita" #: rerere.c:714 #, c-format msgid "Staged '%s' using previous resolution." -msgstr "" -"'%s' aggiunto all'area di staging utilizzando la risoluzione precedente." +msgstr "'%s' aggiunto all'area di staging usando la risoluzione precedente." #: rerere.c:753 #, c-format @@ -4895,7 +5647,7 @@ msgstr "Risoluzione per '%s' registrata." #: rerere.c:788 #, c-format msgid "Resolved '%s' using previous resolution." -msgstr "Risolto conflitto in '%s' utilizzando la risoluzione precedente." +msgstr "Risolto conflitto in '%s' usando la risoluzione precedente." #: rerere.c:803 #, c-format @@ -4907,8 +5659,8 @@ msgstr "impossibile eseguire l'unlink dell'oggetto smarrito '%s'" msgid "Recorded preimage for '%s'" msgstr "Salvata preimmagine di '%s'" -#: rerere.c:881 submodule.c:2012 builtin/submodule--helper.c:1417 -#: builtin/submodule--helper.c:1427 +#: rerere.c:881 submodule.c:2024 builtin/log.c:1750 +#: builtin/submodule--helper.c:1417 builtin/submodule--helper.c:1427 #, c-format msgid "could not create directory '%s'" msgstr "impossibile creare la directory '%s'" @@ -4942,29 +5694,33 @@ msgstr "Risoluzione per '%s' dimenticata\n" msgid "unable to open rr-cache directory" msgstr "impossibile aprire la directory cache rr" -#: revision.c:2484 +#: revision.c:2476 msgid "your current branch appears to be broken" -msgstr "sembra che il tuo branch attuale sia rotto" +msgstr "sembra che il tuo branch corrente sia rotto" -#: revision.c:2487 +#: revision.c:2479 #, c-format msgid "your current branch '%s' does not have any commits yet" -msgstr "il tuo branch attuale '%s' non ha ancora commit" +msgstr "il tuo branch corrente '%s' non ha ancora commit" -#: revision.c:2684 +#: revision.c:2679 msgid "--first-parent is incompatible with --bisect" msgstr "--first-parent non è compatibile con --bisect" -#: run-command.c:742 +#: revision.c:2683 +msgid "-L does not yet support diff formats besides -p and -s" +msgstr "-L non supporta ancora formati diff oltre a -p e -s" + +#: run-command.c:763 msgid "open /dev/null failed" msgstr "apertura di /dev/null non riuscita" -#: run-command.c:1231 +#: run-command.c:1269 #, c-format msgid "cannot create async thread: %s" msgstr "impossibile creare il thread async: %s" -#: run-command.c:1295 +#: run-command.c:1333 #, c-format msgid "" "The '%s' hook was ignored because it's not set as executable.\n" @@ -5013,34 +5769,34 @@ msgstr "il ricevente non supporta i push --atomic" msgid "the receiving end does not support push options" msgstr "il ricevente non supporta le opzioni push" -#: sequencer.c:184 +#: sequencer.c:187 #, c-format msgid "invalid commit message cleanup mode '%s'" msgstr "modalità pulizia messaggio commit non valida: '%s'" -#: sequencer.c:288 +#: sequencer.c:292 #, c-format msgid "could not delete '%s'" msgstr "impossibile eliminare '%s'" -#: sequencer.c:314 +#: sequencer.c:318 msgid "revert" msgstr "revert" -#: sequencer.c:316 +#: sequencer.c:320 msgid "cherry-pick" msgstr "cherry-pick" -#: sequencer.c:318 +#: sequencer.c:322 msgid "rebase -i" msgstr "rebase -i" -#: sequencer.c:320 +#: sequencer.c:324 #, c-format msgid "unknown action: %d" msgstr "azione sconosciuta: %d" -#: sequencer.c:378 +#: sequencer.c:382 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -5048,7 +5804,7 @@ msgstr "" "dopo aver risolto i conflitti, contrassegna i percorsi corretti\n" "con 'git add <path>' o 'git rm <path>'" -#: sequencer.c:381 +#: sequencer.c:385 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -5058,110 +5814,115 @@ msgstr "" "con 'git add <path>' o 'git rm <path>' ed esegui\n" "il commit del risultato con 'git commit'" -#: sequencer.c:394 sequencer.c:2671 +#: sequencer.c:398 sequencer.c:2801 #, c-format msgid "could not lock '%s'" msgstr "impossibile bloccare '%s'" -#: sequencer.c:401 +#: sequencer.c:405 #, c-format msgid "could not write eol to '%s'" msgstr "impossibile scrivere il carattere di fine riga in '%s'" -#: sequencer.c:406 sequencer.c:2554 sequencer.c:2677 sequencer.c:2691 -#: sequencer.c:2931 +#: sequencer.c:410 sequencer.c:2684 sequencer.c:2807 sequencer.c:2821 +#: sequencer.c:3084 #, c-format msgid "failed to finalize '%s'" msgstr "finalizzazione di '%s' non riuscita" -#: sequencer.c:429 sequencer.c:931 sequencer.c:1615 sequencer.c:2574 -#: sequencer.c:2913 sequencer.c:3022 builtin/am.c:245 builtin/commit.c:748 -#: builtin/merge.c:1085 builtin/rebase.c:154 +#: 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 "impossibile leggere '%s'" -#: sequencer.c:455 +#: sequencer.c:459 #, c-format msgid "your local changes would be overwritten by %s." msgstr "le tue modifiche locali sarebbero sovrascritte da %s." -#: sequencer.c:459 +#: sequencer.c:463 msgid "commit your changes or stash them to proceed." msgstr "esegui il commit delle modifiche o lo stash per procedere." -#: sequencer.c:491 +#: sequencer.c:495 #, c-format msgid "%s: fast-forward" msgstr "%s: fast forward" +#: sequencer.c:534 builtin/tag.c:555 +#, c-format +msgid "Invalid cleanup mode %s" +msgstr "Modalità pulizia non valida: %s" + #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase -i". #. -#: sequencer.c:582 +#: sequencer.c:629 #, c-format msgid "%s: Unable to write new index file" -msgstr "%s: impossibile scrivere il nuovo file index" +msgstr "%s: impossibile scrivere il nuovo file indice" -#: sequencer.c:598 +#: sequencer.c:646 msgid "unable to update cache tree" msgstr "impossibile aggiornare l'albero cache" -#: sequencer.c:612 +#: sequencer.c:660 msgid "could not resolve HEAD commit" msgstr "impossibile risolvere il commit HEAD" -#: sequencer.c:692 +#: sequencer.c:740 #, c-format msgid "no key present in '%.*s'" msgstr "nessuna chiave presente in '%.*s'" -#: sequencer.c:703 +#: sequencer.c:751 #, c-format msgid "unable to dequote value of '%s'" msgstr "impossibile rimuovere gli apici dal valore di '%s'" -#: sequencer.c:740 wrapper.c:227 wrapper.c:397 builtin/am.c:704 -#: builtin/am.c:796 builtin/merge.c:1082 builtin/rebase.c:617 +#: 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 #, c-format msgid "could not open '%s' for reading" msgstr "impossibile aprire '%s' in lettura" -#: sequencer.c:750 +#: sequencer.c:798 msgid "'GIT_AUTHOR_NAME' already given" -msgstr "'GIT_AUTHOR_NAME' già fornito" +msgstr "'GIT_AUTHOR_NAME' già specificato" -#: sequencer.c:755 +#: sequencer.c:803 msgid "'GIT_AUTHOR_EMAIL' already given" -msgstr "'GIT_AUTHOR_EMAIL' già fornito" +msgstr "'GIT_AUTHOR_EMAIL' già specificato" -#: sequencer.c:760 +#: sequencer.c:808 msgid "'GIT_AUTHOR_DATE' already given" -msgstr "'GIT_AUTHOR_DATE' già fornito" +msgstr "'GIT_AUTHOR_DATE' già specificato" -#: sequencer.c:764 +#: sequencer.c:812 #, c-format msgid "unknown variable '%s'" msgstr "variabile '%s' sconosciuta" -#: sequencer.c:769 +#: sequencer.c:817 msgid "missing 'GIT_AUTHOR_NAME'" msgstr "'GIT_AUTHOR_NAME' mancante" -#: sequencer.c:771 +#: sequencer.c:819 msgid "missing 'GIT_AUTHOR_EMAIL'" msgstr "'GIT_AUTHOR_EMAIL' mancante" -#: sequencer.c:773 +#: sequencer.c:821 msgid "missing 'GIT_AUTHOR_DATE'" msgstr "'GIT_AUTHOR_DATE' mancante" -#: sequencer.c:833 +#: sequencer.c:881 #, c-format msgid "invalid date format '%s' in '%s'" msgstr "formato data '%s' non valido in '%s'" -#: sequencer.c:850 +#: sequencer.c:898 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -5191,15 +5952,15 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:945 +#: sequencer.c:992 msgid "writing root commit" msgstr "scrittura commit radice in corso" -#: sequencer.c:1155 +#: sequencer.c:1213 msgid "'prepare-commit-msg' hook failed" msgstr "hook 'prepare-commit-msg' non riuscito" -#: sequencer.c:1162 +#: sequencer.c:1220 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -5226,7 +5987,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1175 +#: sequencer.c:1233 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -5252,298 +6013,309 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1217 +#: sequencer.c:1275 msgid "couldn't look up newly created commit" msgstr "impossibile trovare il commit appena creato" -#: sequencer.c:1219 +#: sequencer.c:1277 msgid "could not parse newly created commit" msgstr "impossibile analizzare il commit appena creato" -#: sequencer.c:1265 +#: sequencer.c:1323 msgid "unable to resolve HEAD after creating commit" msgstr "impossibile risolvere HEAD dopo la creazione del commit" -#: sequencer.c:1267 +#: sequencer.c:1325 msgid "detached HEAD" msgstr "HEAD scollegato" -#: sequencer.c:1271 +#: sequencer.c:1329 msgid " (root-commit)" msgstr " (commit radice)" -#: sequencer.c:1292 +#: sequencer.c:1350 msgid "could not parse HEAD" msgstr "impossibile analizzare HEAD" -#: sequencer.c:1294 +#: sequencer.c:1352 #, c-format msgid "HEAD %s is not a commit!" msgstr "L'HEAD %s non è un commit!" -#: sequencer.c:1298 builtin/commit.c:1546 +#: sequencer.c:1356 builtin/commit.c:1551 msgid "could not parse HEAD commit" msgstr "impossibile analizzare il commit HEAD" -#: sequencer.c:1350 sequencer.c:1964 +#: sequencer.c:1408 sequencer.c:2001 msgid "unable to parse commit author" msgstr "impossibile analizzare l'autore del commit" -#: sequencer.c:1360 builtin/am.c:1570 builtin/merge.c:678 +#: sequencer.c:1418 builtin/am.c:1572 builtin/merge.c:688 msgid "git write-tree failed to write a tree" msgstr "git write-tree non è riuscito a scrivere un albero" -#: sequencer.c:1377 sequencer.c:1433 +#: sequencer.c:1435 sequencer.c:1496 #, c-format msgid "unable to read commit message from '%s'" msgstr "impossibile leggere il messaggio di commit da '%s'" -#: sequencer.c:1399 builtin/am.c:1591 builtin/commit.c:1649 builtin/merge.c:859 -#: builtin/merge.c:884 +#: sequencer.c:1462 builtin/am.c:1594 builtin/commit.c:1650 builtin/merge.c:882 +#: builtin/merge.c:906 msgid "failed to write commit object" msgstr "scrittura dell'oggetto del commit non riuscita" -#: sequencer.c:1460 +#: sequencer.c:1523 #, c-format msgid "could not parse commit %s" msgstr "impossibile analizzare il commit %s" -#: sequencer.c:1465 +#: sequencer.c:1528 #, c-format msgid "could not parse parent commit %s" msgstr "impossibile analizzare il commit genitore %s" -#: sequencer.c:1565 sequencer.c:1675 +#: sequencer.c:1602 sequencer.c:1712 #, c-format msgid "unknown command: %d" msgstr "comando sconosciuto: %d" -#: sequencer.c:1622 sequencer.c:1647 +#: sequencer.c:1659 sequencer.c:1684 #, c-format msgid "This is a combination of %d commits." msgstr "Questa è una combinazione di %d commit." -#: sequencer.c:1632 sequencer.c:4808 +#: sequencer.c:1669 msgid "need a HEAD to fixup" msgstr "è necessaria un'HEAD per il fixup" -#: sequencer.c:1634 sequencer.c:2958 +#: sequencer.c:1671 sequencer.c:3111 msgid "could not read HEAD" msgstr "impossibile leggere l'HEAD" -#: sequencer.c:1636 +#: sequencer.c:1673 msgid "could not read HEAD's commit message" msgstr "impossibile leggere il messaggio di commit dell'HEAD" -#: sequencer.c:1642 +#: sequencer.c:1679 #, c-format msgid "cannot write '%s'" msgstr "impossibile scrivere '%s'" -#: sequencer.c:1649 git-rebase--preserve-merges.sh:441 +#: sequencer.c:1686 git-rebase--preserve-merges.sh:441 msgid "This is the 1st commit message:" msgstr "Questo è il primo messaggio di commit:" -#: sequencer.c:1657 +#: sequencer.c:1694 #, c-format msgid "could not read commit message of %s" msgstr "impossibile leggere il messaggio di commit di %s" -#: sequencer.c:1664 +#: sequencer.c:1701 #, c-format msgid "This is the commit message #%d:" msgstr "Questo è il messaggio di commit numero %d:" -#: sequencer.c:1670 +#: sequencer.c:1707 #, c-format msgid "The commit message #%d will be skipped:" msgstr "Il messaggio di commit numero %d sarà saltato:" -#: sequencer.c:1758 +#: sequencer.c:1795 msgid "your index file is unmerged." -msgstr "il file index non è stato sottoposto a merge." +msgstr "il file indice non è stato sottoposto a merge." -#: sequencer.c:1765 +#: sequencer.c:1802 msgid "cannot fixup root commit" msgstr "impossibile eseguire il fixup sul commit radice" -#: sequencer.c:1784 +#: sequencer.c:1821 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "il commit %s è un merge ma non è stata specificata l'opzione -m." -#: sequencer.c:1792 sequencer.c:1800 +#: sequencer.c:1829 sequencer.c:1837 #, c-format msgid "commit %s does not have parent %d" msgstr "il commit %s non ha il genitore %d" -#: sequencer.c:1806 +#: sequencer.c:1843 #, c-format msgid "cannot get commit message for %s" msgstr "impossibile ottenere il messaggio di commit per %s" #. TRANSLATORS: The first %s will be a "todo" command like #. "revert" or "pick", the second %s a SHA1. -#: sequencer.c:1825 +#: sequencer.c:1862 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: impossibile analizzare il commit genitore %s" -#: sequencer.c:1890 +#: sequencer.c:1927 #, c-format msgid "could not rename '%s' to '%s'" msgstr "impossibile ridenominare '%s' in '%s'" -#: sequencer.c:1945 +#: sequencer.c:1982 #, c-format msgid "could not revert %s... %s" msgstr "non è stato possibile eseguire il revert di %s... %s" -#: sequencer.c:1946 +#: sequencer.c:1983 #, c-format msgid "could not apply %s... %s" msgstr "non è stato possibile applicare %s... %s" -#: sequencer.c:2005 +#: sequencer.c:2042 #, c-format msgid "git %s: failed to read the index" -msgstr "git %s: lettura di index non riuscita" +msgstr "git %s: lettura dell'indice non riuscita" -#: sequencer.c:2012 +#: sequencer.c:2049 #, c-format msgid "git %s: failed to refresh the index" -msgstr "git %s: aggiornamento di index non riuscito" +msgstr "git %s: aggiornamento dell'indice non riuscito" -#: sequencer.c:2094 +#: sequencer.c:2118 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "%s non accetta argomenti: '%s'" -#: sequencer.c:2103 +#: sequencer.c:2127 #, c-format msgid "missing arguments for %s" msgstr "argomenti mancanti per %s" -#: sequencer.c:2163 +#: sequencer.c:2164 +#, c-format +msgid "could not parse '%.*s'" +msgstr "impossibile analizzare '%.*s'" + +#: sequencer.c:2226 #, c-format msgid "invalid line %d: %.*s" msgstr "riga %d non valida: %.*s" -#: sequencer.c:2171 +#: sequencer.c:2237 #, c-format msgid "cannot '%s' without a previous commit" msgstr "impossibile eseguire '%s' senza un commit precedente" -#: sequencer.c:2243 +#: 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 "impossibile leggere '%s'." + +#: sequencer.c:2360 msgid "please fix this using 'git rebase --edit-todo'." -msgstr "correggi la situazione utilizzando 'git rebase --edit-todo'." +msgstr "correggi la situazione usando 'git rebase --edit-todo'." -#: sequencer.c:2245 +#: sequencer.c:2362 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "foglio istruzioni inutilizzabile: '%s'" -#: sequencer.c:2250 +#: sequencer.c:2367 msgid "no commits parsed." msgstr "nessun commit analizzato." -#: sequencer.c:2261 +#: sequencer.c:2378 msgid "cannot cherry-pick during a revert." msgstr "impossibile eseguire un cherry-pick durante un revert." -#: sequencer.c:2263 +#: sequencer.c:2380 msgid "cannot revert during a cherry-pick." msgstr "impossibile eseguire un revert durante un cherry-pick." -#: sequencer.c:2333 +#: sequencer.c:2462 #, c-format msgid "invalid value for %s: %s" msgstr "valore non valido per %s: %s" -#: sequencer.c:2420 +#: sequencer.c:2549 msgid "unusable squash-onto" msgstr "squash-onto inutilizzabile" -#: sequencer.c:2436 +#: sequencer.c:2565 #, c-format msgid "malformed options sheet: '%s'" msgstr "foglio opzioni malformati: '%s'" -#: sequencer.c:2518 sequencer.c:4067 +#: sequencer.c:2648 sequencer.c:4227 msgid "empty commit set passed" msgstr "è stato passato un insieme di commit vuoto" -#: sequencer.c:2526 +#: sequencer.c:2656 msgid "a cherry-pick or revert is already in progress" msgstr "è già in corso un'operazione di cherry-pick o di revert" -#: sequencer.c:2527 +#: sequencer.c:2657 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "prova \"git cherry-pick (--continue | --quit | -- abort)\"" -#: sequencer.c:2530 +#: sequencer.c:2660 #, c-format msgid "could not create sequencer directory '%s'" msgstr "impossibile creare la directory sequencer '%s'" -#: sequencer.c:2544 +#: sequencer.c:2674 msgid "could not lock HEAD" msgstr "impossibile bloccare HEAD" -#: sequencer.c:2599 sequencer.c:3819 +#: sequencer.c:2729 sequencer.c:3979 msgid "no cherry-pick or revert in progress" msgstr "nessuna operazione di cherry-pick o revert in corso" -#: sequencer.c:2601 +#: sequencer.c:2731 msgid "cannot resolve HEAD" msgstr "impossibile risolvere HEAD" -#: sequencer.c:2603 sequencer.c:2638 +#: sequencer.c:2733 sequencer.c:2768 msgid "cannot abort from a branch yet to be born" msgstr "" "impossibile interrompere l'operazione da un branch che deve essere ancora " "creato" -#: sequencer.c:2624 builtin/grep.c:732 +#: sequencer.c:2754 builtin/grep.c:732 #, c-format msgid "cannot open '%s'" msgstr "impossibile aprire '%s'" -#: sequencer.c:2626 +#: sequencer.c:2756 #, c-format msgid "cannot read '%s': %s" msgstr "impossibile leggere '%s': %s" -#: sequencer.c:2627 +#: sequencer.c:2757 msgid "unexpected end of file" msgstr "fine del file inattesa" -#: sequencer.c:2633 +#: sequencer.c:2763 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "" "il file '%s' in cui è stato salvato l'HEAD prima del cherry pick è corrotto" -#: sequencer.c:2644 +#: sequencer.c:2774 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "" "Sembra che tu abbia spostato l'HEAD. Non eseguo il rewind, controlla l'HEAD!" -#: sequencer.c:2750 sequencer.c:3735 +#: sequencer.c:2903 sequencer.c:3894 #, c-format msgid "could not update %s" msgstr "impossibile aggiornare %s" -#: sequencer.c:2788 sequencer.c:3715 +#: sequencer.c:2941 sequencer.c:3874 msgid "cannot read HEAD" msgstr "impossibile leggere l'HEAD" -#: sequencer.c:2805 +#: sequencer.c:2958 #, c-format msgid "unable to copy '%s' to '%s'" msgstr "impossibile copiare '%s' in '%s'" -#: sequencer.c:2813 +#: sequencer.c:2966 #, c-format msgid "" "You can amend the commit now, with\n" @@ -5562,27 +6334,27 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:2823 +#: sequencer.c:2976 #, c-format msgid "Could not apply %s... %.*s" msgstr "Impossibile applicare %s... %.*s" -#: sequencer.c:2830 +#: sequencer.c:2983 #, c-format msgid "Could not merge %.*s" msgstr "Impossibile eseguire il merge di %.*s" -#: sequencer.c:2844 sequencer.c:2848 builtin/difftool.c:641 +#: sequencer.c:2997 sequencer.c:3001 builtin/difftool.c:633 #, c-format msgid "could not copy '%s' to '%s'" msgstr "impossibile copiare '%s' in '%s'" -#: sequencer.c:2870 sequencer.c:3293 builtin/rebase.c:424 builtin/rebase.c:1230 -#: builtin/rebase.c:1591 builtin/rebase.c:1646 +#: 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 "impossibile leggere l'indice" -#: sequencer.c:2875 +#: sequencer.c:3028 #, c-format msgid "" "execution failed: %s\n" @@ -5597,11 +6369,11 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:2881 +#: sequencer.c:3034 msgid "and made changes to the index and/or the working tree\n" msgstr "e sono state apportate modifiche all'indice e/o all'albero di lavoro\n" -#: sequencer.c:2887 +#: sequencer.c:3040 #, c-format msgid "" "execution succeeded: %s\n" @@ -5618,76 +6390,76 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:2948 +#: sequencer.c:3101 #, c-format msgid "illegal label name: '%.*s'" msgstr "nome etichetta illecito: '%.*s'" -#: sequencer.c:3002 +#: sequencer.c:3155 msgid "writing fake root commit" msgstr "scrittura commit radice falso in corso" -#: sequencer.c:3007 +#: sequencer.c:3160 msgid "writing squash-onto" msgstr "scrittura squash-onto in corso" -#: sequencer.c:3045 builtin/rebase.c:429 builtin/rebase.c:435 +#: sequencer.c:3198 builtin/rebase.c:844 builtin/rebase.c:850 #, c-format msgid "failed to find tree of %s" msgstr "impossibile trovare l'albero di %s" -#: sequencer.c:3063 builtin/rebase.c:448 +#: sequencer.c:3216 builtin/rebase.c:863 msgid "could not write index" msgstr "impossibile scrivere l'indice" -#: sequencer.c:3090 +#: sequencer.c:3243 #, c-format msgid "could not resolve '%s'" msgstr "impossibile risolvere '%s'" -#: sequencer.c:3118 +#: sequencer.c:3271 msgid "cannot merge without a current revision" -msgstr "impossibile eseguire il merge senza una revisione attuale" +msgstr "impossibile eseguire il merge senza una revisione corrente" -#: sequencer.c:3140 +#: sequencer.c:3293 #, c-format msgid "unable to parse '%.*s'" msgstr "impossibile analizzare '%.*s'" -#: sequencer.c:3149 +#: sequencer.c:3302 #, c-format msgid "nothing to merge: '%.*s'" msgstr "non c'è nulla di cui eseguire il merge: '%.*s'" -#: sequencer.c:3161 +#: sequencer.c:3314 msgid "octopus merge cannot be executed on top of a [new root]" msgstr "il merge octopus non può essere eseguito su un [nuovo commit radice]" -#: sequencer.c:3176 +#: sequencer.c:3329 #, c-format msgid "could not get commit message of '%s'" msgstr "impossibile ottenere il messaggio di commit per '%s'" -#: sequencer.c:3325 +#: sequencer.c:3478 #, c-format msgid "could not even attempt to merge '%.*s'" -msgstr "non è stato nemmeno possibile tentare di eseguire il mege di '%.*s'" +msgstr "non è stato nemmeno possibile tentare di eseguire il merge di '%.*s'" -#: sequencer.c:3341 +#: sequencer.c:3494 msgid "merge: Unable to write new index file" -msgstr "merge: impossibile scrivere il nuovo file index" +msgstr "merge: impossibile scrivere il nuovo file indice" -#: sequencer.c:3409 builtin/rebase.c:298 +#: sequencer.c:3562 builtin/rebase.c:711 #, c-format msgid "Applied autostash.\n" msgstr "Stash automatico applicato.\n" -#: sequencer.c:3421 +#: sequencer.c:3574 #, c-format msgid "cannot store %s" msgstr "impossibile memorizzare %s" -#: sequencer.c:3424 builtin/rebase.c:314 +#: sequencer.c:3577 builtin/rebase.c:727 #, c-format msgid "" "Applying autostash resulted in conflicts.\n" @@ -5698,31 +6470,31 @@ msgstr "" "Le tue modifiche sono al sicuro nello stash.\n" "Puoi eseguire \"git stash pop\" o \"git stash drop\" in qualunque momento.\n" -#: sequencer.c:3478 +#: sequencer.c:3638 #, c-format msgid "could not checkout %s" msgstr "impossibile eseguire il checkout di %s" -#: sequencer.c:3492 +#: sequencer.c:3652 #, c-format msgid "%s: not a valid OID" msgstr "%s: non è un OID valido" -#: sequencer.c:3497 git-rebase--preserve-merges.sh:724 +#: sequencer.c:3657 git-rebase--preserve-merges.sh:724 msgid "could not detach HEAD" msgstr "impossibile scollegare l'HEAD" -#: sequencer.c:3512 +#: sequencer.c:3672 #, c-format msgid "Stopped at HEAD\n" msgstr "Fermato a HEAD\n" -#: sequencer.c:3514 +#: sequencer.c:3674 #, c-format msgid "Stopped at %s\n" msgstr "Fermato a %s\n" -#: sequencer.c:3522 +#: sequencer.c:3682 #, c-format msgid "" "Could not execute the todo command\n" @@ -5744,49 +6516,49 @@ msgstr "" " git rebase --edit-todo\n" " git rebase --continue\n" -#: sequencer.c:3597 +#: sequencer.c:3759 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "Fermato a %s... %.*s\n" -#: sequencer.c:3677 +#: sequencer.c:3837 #, c-format msgid "unknown command %d" msgstr "comando %d sconosciuto" -#: sequencer.c:3723 +#: sequencer.c:3882 msgid "could not read orig-head" msgstr "impossibile leggere orig-head" -#: sequencer.c:3728 sequencer.c:4805 +#: sequencer.c:3887 msgid "could not read 'onto'" msgstr "impossibile leggere 'onto'" -#: sequencer.c:3742 +#: sequencer.c:3901 #, c-format msgid "could not update HEAD to %s" msgstr "impossibile aggiornare l'HEAD a %s" -#: sequencer.c:3831 +#: sequencer.c:3991 msgid "cannot rebase: You have unstaged changes." msgstr "" "impossibile eseguire il rebase: ci sono delle modifiche non in staging." -#: sequencer.c:3840 +#: sequencer.c:4000 msgid "cannot amend non-existing commit" msgstr "impossibile modificare un commit inesistente" -#: sequencer.c:3842 +#: sequencer.c:4002 #, c-format msgid "invalid file: '%s'" msgstr "file non valido: '%s'" -#: sequencer.c:3844 +#: sequencer.c:4004 #, c-format msgid "invalid contents: '%s'" msgstr "contenuti non validi: '%s'" -#: sequencer.c:3847 +#: sequencer.c:4007 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -5797,84 +6569,42 @@ msgstr "" "di lavoro. Eseguine prima il commit e quindi esegui nuovamente 'git rebase\n" "--continue'." -#: sequencer.c:3883 sequencer.c:3921 +#: sequencer.c:4043 sequencer.c:4081 #, c-format msgid "could not write file: '%s'" msgstr "impossibile scrivere il file: '%s'" -#: sequencer.c:3936 +#: sequencer.c:4096 msgid "could not remove CHERRY_PICK_HEAD" msgstr "impossibile rimuovere CHERRY_PICK_HEAD" -#: sequencer.c:3943 +#: sequencer.c:4103 msgid "could not commit staged changes." msgstr "impossibile eseguire il commit delle modifiche in staging." -#: sequencer.c:4044 +#: sequencer.c:4204 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: impossibile eseguire il cherry pick di un %s" -#: sequencer.c:4048 +#: sequencer.c:4208 #, c-format msgid "%s: bad revision" msgstr "%s: revisione non valida" -#: sequencer.c:4083 +#: sequencer.c:4243 msgid "can't revert as initial commit" msgstr "impossibile eseguire il revert come commit iniziale" -#: sequencer.c:4529 +#: sequencer.c:4686 msgid "make_script: unhandled options" msgstr "make_script: opzioni non gestite" -#: sequencer.c:4532 +#: sequencer.c:4689 msgid "make_script: error preparing revisions" msgstr "make_script: errore durante la preparazione delle revisioni" -#: sequencer.c:4573 sequencer.c:4629 sequencer.c:4904 -#, c-format -msgid "unusable todo list: '%s'" -msgstr "elenco todo inutilizzabile: '%s'" - -#: sequencer.c:4684 -#, c-format -msgid "" -"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." -msgstr "" -"impostazione %s non riconosciuta per l'opzione rebase.missingCommitsCheck. " -"La ignoro." - -#: sequencer.c:4754 -#, c-format -msgid "" -"Warning: some commits may have been dropped accidentally.\n" -"Dropped commits (newer to older):\n" -msgstr "" -"Attenzione: è possibile che alcuni commit siano stati scartati " -"accidentalmente.\n" -"Commit scartati (dal più al meno recente):\n" - -#: sequencer.c:4761 -#, c-format -msgid "" -"To avoid this message, use \"drop\" to explicitly remove a commit.\n" -"\n" -"Use 'git config rebase.missingCommitsCheck' to change the level of " -"warnings.\n" -"The possible behaviours are: ignore, warn, error.\n" -"\n" -msgstr "" -"Per evitare questo messaggio, utilizza \"drop\" per rimuovere un commit\n" -"esplicitamente.\n" -"\n" -"Utilizza 'git config rebase.missingCommitsCheck' per modificare il livello\n" -"degli avvisi.\n" -"I comportamenti possibili sono ignore, warn, error.\n" -"\n" - -#: sequencer.c:4774 -#, c-format +#: sequencer.c:4847 msgid "" "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" "continue'.\n" @@ -5884,31 +6614,15 @@ msgstr "" "eseguire 'git rebase --continue'.\n" "Oppure puoi interrompere il rebase con 'git rebase --abort'.\n" -#: sequencer.c:4912 sequencer.c:4950 +#: sequencer.c:4959 sequencer.c:4976 msgid "nothing to do" msgstr "nulla da fare" -#: sequencer.c:4916 -#, c-format -msgid "Rebase %s onto %s (%d command)" -msgid_plural "Rebase %s onto %s (%d commands)" -msgstr[0] "Rebase di %s su %s (%d comando)" -msgstr[1] "Rebase di %s su %s (%d comandi)" - -#: sequencer.c:4928 -#, c-format -msgid "could not copy '%s' to '%s'." -msgstr "impossibile copiare '%s' in '%s'." - -#: sequencer.c:4932 sequencer.c:4961 -msgid "could not transform the todo list" -msgstr "impossibile trasformare l'elenco todo" - -#: sequencer.c:4964 +#: sequencer.c:4990 msgid "could not skip unnecessary pick commands" msgstr "impossibile saltare i comandi pick non necessari" -#: sequencer.c:5047 +#: sequencer.c:5073 msgid "the script was already rearranged." msgstr "lo script è già stato riordinato." @@ -5917,17 +6631,17 @@ msgstr "lo script è già stato riordinato." msgid "'%s' is outside repository" msgstr "'%s' è al di fuori del repository" -#: setup.c:172 +#: setup.c:173 #, 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: percorso non esistente nell'albero di lavoro.\n" -"Utilizza 'git <comando> -- <percorso>...' per specificare percorsi non " -"esistenti localmente." +"Usa 'git <comando> -- <percorso>...' per specificare percorsi non esistenti " +"localmente." -#: setup.c:185 +#: setup.c:186 #, c-format msgid "" "ambiguous argument '%s': unknown revision or path not in the working tree.\n" @@ -5936,17 +6650,17 @@ msgid "" msgstr "" "argomento '%s' ambiguo: revisione sconosciuta o percorso non nell'albero di " "lavoro.\n" -"Utilizza '--' per separare i percorsi dalle revisioni, come segue:\n" +"Usa '--' per separare i percorsi dalle revisioni, come segue:\n" "'git <comando> [<revisione>...] -- [<file>...]'" -#: setup.c:234 +#: setup.c:235 #, c-format msgid "option '%s' must come before non-option arguments" msgstr "" "l'opzione '%s' deve essere specificata prima degli argomenti che non " "costituiscono un'opzione" -#: setup.c:253 +#: setup.c:254 #, c-format msgid "" "ambiguous argument '%s': both revision and filename\n" @@ -5954,97 +6668,96 @@ msgid "" "'git <command> [<revision>...] -- [<file>...]'" msgstr "" "argomento '%s' ambiguo: è sia una revisione sia un nome file\n" -"Utilizza '--' per separare i percorsi dalle revisioni, come segue:\n" +"Usa '--' per separare i percorsi dalle revisioni, come segue:\n" "'git <comando> [<revisione>...] -- [<file>...]'" -#: setup.c:389 +#: setup.c:390 msgid "unable to set up work tree using invalid config" msgstr "" -"impossibile preparare l'albero di lavoro utilizzando una configurazione non " -"valida" +"impossibile preparare l'albero di lavoro usando una configurazione non valida" -#: setup.c:393 +#: setup.c:394 msgid "this operation must be run in a work tree" msgstr "quest'operazione deve essere eseguita in un albero di lavoro" -#: setup.c:527 +#: setup.c:540 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "Attesa versione repository Git <= %d, trovata %d" -#: setup.c:535 +#: setup.c:548 msgid "unknown repository extensions found:" msgstr "trovate estensioni repository sconosciute:" -#: setup.c:554 +#: setup.c:567 #, c-format msgid "error opening '%s'" msgstr "errore durante l'apertura di '%s'" -#: setup.c:556 +#: setup.c:569 #, c-format msgid "too large to be a .git file: '%s'" msgstr "'%s' troppo grande per essere un file .git" -#: setup.c:558 +#: setup.c:571 #, c-format msgid "error reading %s" msgstr "errore durante la lettura di %s" -#: setup.c:560 +#: setup.c:573 #, c-format msgid "invalid gitfile format: %s" msgstr "formato file Git non valido: %s" -#: setup.c:562 +#: setup.c:575 #, c-format msgid "no path in gitfile: %s" msgstr "nessun percorso presente nel file Git: %s" -#: setup.c:564 +#: setup.c:577 #, c-format msgid "not a git repository: %s" msgstr "%s non è un repository Git" -#: setup.c:663 +#: setup.c:676 #, c-format msgid "'$%s' too big" msgstr "'$%s' è troppo grande" -#: setup.c:677 +#: setup.c:690 #, c-format msgid "not a git repository: '%s'" msgstr "'%s' non è un repository Git" -#: setup.c:706 setup.c:708 setup.c:739 +#: setup.c:719 setup.c:721 setup.c:752 #, c-format msgid "cannot chdir to '%s'" msgstr "impossibile modificare la directory corrente in '%s'" -#: setup.c:711 setup.c:767 setup.c:777 setup.c:816 setup.c:824 +#: setup.c:724 setup.c:780 setup.c:790 setup.c:829 setup.c:837 msgid "cannot come back to cwd" msgstr "impossibile tornare alla directory di lavoro corrente" -#: setup.c:838 +#: setup.c:851 #, c-format msgid "failed to stat '%*s%s%s'" msgstr "stat di '%*s%s%s' non riuscito" -#: setup.c:1068 +#: setup.c:1083 msgid "Unable to read current working directory" msgstr "Impossibile leggere la directory di lavoro corrente" -#: setup.c:1077 setup.c:1083 +#: setup.c:1092 setup.c:1098 #, c-format msgid "cannot change to '%s'" msgstr "impossibile entrare in '%s'" -#: setup.c:1088 +#: setup.c:1103 #, c-format msgid "not a git repository (or any of the parent directories): %s" msgstr "%s non è un repository Git (né lo è alcuna delle directory genitrici)" -#: setup.c:1094 +#: setup.c:1109 #, c-format msgid "" "not a git repository (or any parent up to mount point %s)\n" @@ -6054,7 +6767,7 @@ msgstr "" "Mi fermo al limite del filesystem (l'opzione GIT_DISCOVERY_ACROSS_FILESYSTEM " "non è impostata)." -#: setup.c:1204 +#: setup.c:1220 #, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" @@ -6064,286 +6777,284 @@ msgstr "" "(0%.3o).\n" "Il proprietario dei file deve avere sempre i permessi di lettura e scrittura." -#: setup.c:1247 +#: setup.c:1264 msgid "open /dev/null or dup failed" msgstr "apertura di /dev/null o dup non riuscita" -#: setup.c:1262 +#: setup.c:1279 msgid "fork failed" msgstr "fork non riuscita" -#: setup.c:1267 +#: setup.c:1284 msgid "setsid failed" msgstr "setsid non riuscita" -#: sha1-file.c:445 +#: sha1-file.c:453 #, c-format msgid "object directory %s does not exist; check .git/objects/info/alternates" msgstr "" "la directory oggetti %s non esiste; controlla .git/objects/info/alternates" -#: sha1-file.c:496 +#: sha1-file.c:504 #, c-format msgid "unable to normalize alternate object path: %s" msgstr "impossibile normalizzare il percorso alternativo oggetto: %s" -#: sha1-file.c:568 +#: sha1-file.c:576 #, c-format msgid "%s: ignoring alternate object stores, nesting too deep" msgstr "" "%s: ignoro gli archivi oggetto alternativi, la nidificazione è troppo " "profonda" -#: sha1-file.c:575 +#: sha1-file.c:583 #, c-format msgid "unable to normalize object directory: %s" msgstr "impossibile normalizzare la directory oggetti: %s" -#: sha1-file.c:618 +#: sha1-file.c:626 msgid "unable to fdopen alternates lockfile" msgstr "impossibile eseguire fdopen sul file di lock alternates" -#: sha1-file.c:636 +#: sha1-file.c:644 msgid "unable to read alternates file" msgstr "impossibile leggere il file alternates" -#: sha1-file.c:643 +#: sha1-file.c:651 msgid "unable to move new alternates file into place" msgstr "impossibile spostare il nuovo file alternates nella posizione corretta" -#: sha1-file.c:678 +#: sha1-file.c:686 #, c-format msgid "path '%s' does not exist" msgstr "il percorso '%s' non esiste" -#: sha1-file.c:704 +#: sha1-file.c:712 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "" "l'aggiunta del repository di riferimento '%s' come checkout collegato non è " "ancora supportata." -#: sha1-file.c:710 +#: sha1-file.c:718 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "il repository di riferimento '%s' non è un repository locale." -#: sha1-file.c:716 +#: sha1-file.c:724 #, c-format msgid "reference repository '%s' is shallow" msgstr "il repository di riferimento '%s' è shallow" -#: sha1-file.c:724 +#: sha1-file.c:732 #, c-format msgid "reference repository '%s' is grafted" msgstr "il repository di riferimento '%s' è un graft" -#: sha1-file.c:838 +#: sha1-file.c:846 #, c-format msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" msgstr "tento di eseguire mmap %<PRIuMAX> al di sopra del limite %<PRIuMAX>" -#: sha1-file.c:863 +#: sha1-file.c:871 msgid "mmap failed" msgstr "mmap non riuscita" -#: sha1-file.c:1027 +#: sha1-file.c:1035 #, c-format msgid "object file %s is empty" msgstr "l'oggetto %s è vuoto" -#: sha1-file.c:1151 sha1-file.c:2288 +#: sha1-file.c:1159 sha1-file.c:2297 #, c-format msgid "corrupt loose object '%s'" msgstr "oggetto sciolto '%s' corrotto" -#: sha1-file.c:1153 sha1-file.c:2292 +#: sha1-file.c:1161 sha1-file.c:2301 #, c-format msgid "garbage at end of loose object '%s'" msgstr "dati inutilizzabili presenti alla fine dell'oggetto sciolto '%s'" -#: sha1-file.c:1195 +#: sha1-file.c:1203 msgid "invalid object type" msgstr "tipo oggetto non valido" -#: sha1-file.c:1279 +#: sha1-file.c:1287 #, c-format msgid "unable to unpack %s header with --allow-unknown-type" msgstr "impossibile decomprimere l'intestazione %s con --allow-unknown-type" -#: sha1-file.c:1282 +#: sha1-file.c:1290 #, c-format msgid "unable to unpack %s header" msgstr "impossibile decomprimere l'intestazione %s" -#: sha1-file.c:1288 +#: sha1-file.c:1296 #, c-format msgid "unable to parse %s header with --allow-unknown-type" msgstr "impossibile analizzare l'intestazione %s con --allow-unknown-type" -#: sha1-file.c:1291 +#: sha1-file.c:1299 #, c-format msgid "unable to parse %s header" msgstr "impossibile analizzare l'intestazione %s" -#: sha1-file.c:1481 +#: sha1-file.c:1490 #, c-format msgid "failed to read object %s" msgstr "lettura dell'oggetto %s non riuscita" -#: sha1-file.c:1485 +#: sha1-file.c:1494 #, c-format msgid "replacement %s not found for %s" msgstr "%s sostitutivo non trovato per %s" -#: sha1-file.c:1489 +#: sha1-file.c:1498 #, c-format msgid "loose object %s (stored in %s) is corrupt" msgstr "l'oggetto sciolto %s (salvato in %s) è corrotto" -#: sha1-file.c:1493 +#: sha1-file.c:1502 #, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "l'oggetto archiviato %s (salvato in %s) è corrotto" -#: sha1-file.c:1595 -#, fuzzy, c-format +#: sha1-file.c:1604 +#, c-format msgid "unable to write file %s" -msgstr "non è possibile scrivere %s" +msgstr "impossibile scrivere il file %s" -#: sha1-file.c:1602 +#: sha1-file.c:1611 #, c-format msgid "unable to set permission to '%s'" msgstr "impossibile impostare i permessi a '%s'" -#: sha1-file.c:1609 +#: sha1-file.c:1618 msgid "file write error" msgstr "errore di scrittura del file" -#: sha1-file.c:1628 -#, fuzzy +#: sha1-file.c:1637 msgid "error when closing loose object file" -msgstr "errore durante la chiusura del file sha1" +msgstr "errore durante la chiusura del file oggetto sciolto" -#: sha1-file.c:1693 +#: sha1-file.c:1702 #, c-format msgid "insufficient permission for adding an object to repository database %s" msgstr "" "permessi non sufficienti per l'aggiunta di un oggetto al database repository " "%s" -#: sha1-file.c:1695 +#: sha1-file.c:1704 msgid "unable to create temporary file" msgstr "impossibile creare il file temporaneo" -#: sha1-file.c:1719 -#, fuzzy +#: sha1-file.c:1728 msgid "unable to write loose object file" -msgstr "impossibile scrivere l'oggetto nota" +msgstr "impossibile scrivere il file oggetto sciolto" -#: sha1-file.c:1725 +#: sha1-file.c:1734 #, c-format msgid "unable to deflate new object %s (%d)" msgstr "impossibile comprimere con deflate il nuovo oggetto %s (%d)" -#: sha1-file.c:1729 +#: sha1-file.c:1738 #, c-format msgid "deflateEnd on object %s failed (%d)" msgstr "deflateEnd non riuscita sull'oggetto %s (%d)" -#: sha1-file.c:1733 +#: sha1-file.c:1742 #, c-format msgid "confused by unstable object source data for %s" msgstr "sono confuso dall'origine dati oggetto non stabile per %s" -#: sha1-file.c:1743 builtin/pack-objects.c:919 +#: sha1-file.c:1752 builtin/pack-objects.c:920 #, c-format msgid "failed utime() on %s" msgstr "utime() di %s non riuscita" -#: sha1-file.c:1818 -#, fuzzy, c-format +#: sha1-file.c:1827 +#, c-format msgid "cannot read object for %s" -msgstr "impossibile leggere l'oggetto %s" +msgstr "impossibile leggere l'oggetto per %s" -#: sha1-file.c:1858 +#: sha1-file.c:1867 msgid "corrupt commit" msgstr "commit corrotto" -#: sha1-file.c:1866 +#: sha1-file.c:1875 msgid "corrupt tag" msgstr "tag corrotto" -#: sha1-file.c:1965 +#: sha1-file.c:1974 #, c-format msgid "read error while indexing %s" msgstr "errore di lettura durante l'indicizzazione di %s" -#: sha1-file.c:1968 +#: sha1-file.c:1977 #, c-format msgid "short read while indexing %s" msgstr "lettura troppo breve durante l'indicizzazione di %s" -#: sha1-file.c:2041 sha1-file.c:2050 +#: sha1-file.c:2050 sha1-file.c:2059 #, c-format msgid "%s: failed to insert into database" msgstr "%s: inserimento del record nel database non riuscito" -#: sha1-file.c:2056 +#: sha1-file.c:2065 #, c-format msgid "%s: unsupported file type" msgstr "%s: tipo di file non supportato" -#: sha1-file.c:2080 +#: sha1-file.c:2089 #, c-format msgid "%s is not a valid object" msgstr "%s non è un oggetto valido" -#: sha1-file.c:2082 +#: sha1-file.c:2091 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s non è un oggetto '%s' valido" -#: sha1-file.c:2109 builtin/index-pack.c:154 +#: sha1-file.c:2118 builtin/index-pack.c:154 #, c-format msgid "unable to open %s" msgstr "impossibile aprire %s" -#: sha1-file.c:2299 sha1-file.c:2351 -#, fuzzy, c-format +#: sha1-file.c:2308 sha1-file.c:2360 +#, c-format msgid "hash mismatch for %s (expected %s)" -msgstr "mancata corrispondenza sha1 per %s (atteso %s)" +msgstr "mancata corrispondenza per %s (atteso %s)" -#: sha1-file.c:2323 +#: sha1-file.c:2332 #, c-format msgid "unable to mmap %s" msgstr "impossibile eseguire mmap su %s" -#: sha1-file.c:2328 +#: sha1-file.c:2337 #, c-format msgid "unable to unpack header of %s" msgstr "impossibile decomprimere l'intestazione di %s" -#: sha1-file.c:2334 +#: sha1-file.c:2343 #, c-format msgid "unable to parse header of %s" msgstr "impossibile analizzare l'intestazione di %s" -#: sha1-file.c:2345 +#: sha1-file.c:2354 #, c-format msgid "unable to unpack contents of %s" msgstr "impossibile decomprimere i contenuti di %s" -#: sha1-name.c:448 +#: sha1-name.c:490 #, c-format msgid "short SHA1 %s is ambiguous" msgstr "lo SHA1 breve %s è ambiguo" -#: sha1-name.c:459 +#: sha1-name.c:501 msgid "The candidates are:" msgstr "I candidati sono:" -#: sha1-name.c:742 +#: sha1-name.c:800 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" @@ -6397,51 +7108,53 @@ msgstr "nel sottomodulo non popolato '%s'" msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "Lo specificatore percorso '%s' è nel sottomodulo '%.*s'" -#: submodule.c:906 +#: submodule.c:910 #, c-format msgid "submodule entry '%s' (%s) is a %s, not a commit" msgstr "la voce sottomodulo '%s' (%s) è un %s, non un commit" -#: submodule.c:1143 builtin/branch.c:656 builtin/submodule--helper.c:1989 +#: submodule.c:1147 builtin/branch.c:672 builtin/submodule--helper.c:1988 msgid "Failed to resolve HEAD as a valid ref." msgstr "Impossibile risolvere HEAD come riferimento valido." -#: submodule.c:1477 -#, fuzzy, c-format +#: submodule.c:1481 +#, c-format msgid "Could not access submodule '%s'" -msgstr "impossibile eseguire l'azione ricorsivamente nel sottomodulo '%s'" +msgstr "Impossibile accedere al sottomodulo '%s'" -#: submodule.c:1639 +#: submodule.c:1651 #, c-format msgid "'%s' not recognized as a git repository" msgstr "'%s' non riconosciuto come repository Git" -#: submodule.c:1777 +#: submodule.c:1789 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "impossibile avviare 'git status' nel sottomodulo '%s'" -#: submodule.c:1790 +#: submodule.c:1802 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "impossibile eseguire 'git status' nel sottomodulo '%s'" -#: submodule.c:1805 -#, fuzzy, c-format +#: submodule.c:1817 +#, c-format msgid "Could not unset core.worktree setting in submodule '%s'" -msgstr "impossibile eseguire 'git status' nel sottomodulo '%s'" +msgstr "" +"Impossibile annullare l'impostazione dell'opzione core.worktree nel " +"sottomodulo '%s'" -#: submodule.c:1895 +#: submodule.c:1907 #, c-format msgid "submodule '%s' has dirty index" msgstr "il sottomodulo '%s' ha l'indice sporco" -#: submodule.c:1947 +#: submodule.c:1959 #, c-format msgid "Submodule '%s' could not be updated." msgstr "Impossibile aggiornare il sottomodulo '%s'." -#: submodule.c:1996 +#: submodule.c:2008 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" @@ -6449,12 +7162,12 @@ msgstr "" "relocate_gitdir non è supportata per il sottomodulo '%s' con più di un " "albero di lavoro" -#: submodule.c:2008 submodule.c:2064 +#: submodule.c:2020 submodule.c:2076 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "impossibile ricercare il nome per il sottomodulo '%s'" -#: submodule.c:2015 +#: submodule.c:2027 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -6465,16 +7178,16 @@ msgstr "" "'%s' a\n" "'%s'\n" -#: submodule.c:2099 +#: submodule.c:2111 #, c-format msgid "could not recurse into submodule '%s'" msgstr "impossibile eseguire l'azione ricorsivamente nel sottomodulo '%s'" -#: submodule.c:2143 +#: submodule.c:2155 msgid "could not start ls-files in .." msgstr "impossibile avviare ls-files in .." -#: submodule.c:2182 +#: submodule.c:2194 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree ha restituito il valore di ritorno inatteso %d" @@ -6484,23 +7197,23 @@ msgstr "ls-tree ha restituito il valore di ritorno inatteso %d" msgid "ignoring suspicious submodule name: %s" msgstr "ignoro un nome sottomodulo sospetto: %s" -#: submodule-config.c:296 +#: submodule-config.c:299 msgid "negative values not allowed for submodule.fetchjobs" msgstr "i valori negativi non sono consentiti per submodule.fetchjobs" -#: submodule-config.c:390 +#: submodule-config.c:397 #, c-format msgid "ignoring '%s' which may be interpreted as a command-line option: %s" msgstr "" "ignoro '%s' che potrebbe essere interpretato come argomento della riga di " "comando: %s" -#: submodule-config.c:479 +#: submodule-config.c:486 #, c-format msgid "invalid value for %s" msgstr "valore non valido per %s" -#: submodule-config.c:754 +#: submodule-config.c:755 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "Impossibile aggiornare la voce .gitmodules %s" @@ -6574,29 +7287,37 @@ msgstr "impossibile leggere il bundle '%s'" msgid "transport: invalid depth option '%s'" msgstr "trasporto: opzione profondità '%s' non valida" -#: transport.c:617 +#: transport.c:259 +msgid "see protocol.version in 'git help config' for more details" +msgstr "vedi protocol.version in 'git help config' per maggiori dettagli" + +#: transport.c:260 +msgid "server options require protocol version 2 or later" +msgstr "le opzioni server richiedono la versione 2 o successiva del protocollo" + +#: transport.c:625 msgid "could not parse transport.color.* config" msgstr "impossibile analizzare la configurazione transport.color.*" -#: transport.c:690 +#: transport.c:698 msgid "support for protocol v2 not implemented yet" msgstr "supporto alla versione 2 del protocollo non ancora implementato" -#: transport.c:817 +#: transport.c:825 #, c-format msgid "unknown value for config '%s': %s" msgstr "valore sconosciuto per la configurazione '%s': %s" -#: transport.c:883 +#: transport.c:891 #, c-format msgid "transport '%s' not allowed" msgstr "trasporto '%s' non consentito" -#: transport.c:937 +#: transport.c:945 msgid "git-over-rsync is no longer supported" msgstr "git-over-rsync non è più supportato" -#: transport.c:1032 +#: transport.c:1040 #, c-format msgid "" "The following submodule paths contain changes that can\n" @@ -6605,7 +7326,7 @@ msgstr "" "I seguenti percorsi sottomodulo contengono modifiche\n" "non trovate su nessun remoto:\n" -#: transport.c:1036 +#: transport.c:1044 #, c-format msgid "" "\n" @@ -6625,26 +7346,26 @@ msgstr "" "\n" "\tgit push --recurse-submodules=on-demand\n" "\n" -"o esegui un cd al percorso e utilizza\n" +"o esegui un cd al percorso e usa\n" "\n" "\tgit push\n" "\n" "per eseguirne il push a un remoto.\n" "\n" -#: transport.c:1044 +#: transport.c:1052 msgid "Aborting." msgstr "Interrompo l'operazione." -#: transport.c:1184 +#: transport.c:1193 msgid "failed to push all needed submodules" msgstr "push di tutti i sottomoduli richiesti non riuscito" -#: transport.c:1317 transport-helper.c:643 +#: transport.c:1326 transport-helper.c:645 msgid "operation not supported by protocol" msgstr "operazione non supportata dal protocollo" -#: transport.c:1421 +#: transport.c:1430 #, c-format msgid "invalid line while parsing alternate refs: %s" msgstr "riga non valida durante l'analisi dei riferimenti degli alternati: %s" @@ -6653,16 +7374,16 @@ msgstr "riga non valida durante l'analisi dei riferimenti degli alternati: %s" msgid "full write to remote helper failed" msgstr "scrittura completa verso l'helper remoto non riuscita" -#: transport-helper.c:132 +#: transport-helper.c:134 #, c-format msgid "unable to find remote helper for '%s'" msgstr "impossibile trovare l'helper remoto per '%s'" -#: transport-helper.c:148 transport-helper.c:557 +#: transport-helper.c:150 transport-helper.c:559 msgid "can't dup helper output fd" msgstr "impossibile duplicare il descrittore file dell'output helper" -#: transport-helper.c:199 +#: transport-helper.c:201 #, c-format msgid "" "unknown mandatory capability %s; this remote helper probably needs newer " @@ -6671,103 +7392,103 @@ msgstr "" "capability necessaria %s sconosciuta; quest'helper remoto probabilmente " "richiede una versione di Git più recente" -#: transport-helper.c:205 +#: transport-helper.c:207 msgid "this remote helper should implement refspec capability" msgstr "questo helper remoto dovrebbe implementare la capability refspec" -#: transport-helper.c:272 transport-helper.c:412 +#: transport-helper.c:274 transport-helper.c:414 #, c-format msgid "%s unexpectedly said: '%s'" msgstr "%s ha inviato un messaggio inatteso: '%s'" -#: transport-helper.c:401 +#: transport-helper.c:403 #, c-format msgid "%s also locked %s" msgstr "%s ha bloccato anche %s" -#: transport-helper.c:479 +#: transport-helper.c:481 msgid "couldn't run fast-import" msgstr "impossibile eseguire fast-import" -#: transport-helper.c:502 +#: transport-helper.c:504 msgid "error while running fast-import" msgstr "errore durante l'esecuzione di fast-import" -#: transport-helper.c:531 transport-helper.c:1097 +#: transport-helper.c:533 transport-helper.c:1099 #, c-format msgid "could not read ref %s" msgstr "impossibile leggere il riferimento %s" -#: transport-helper.c:576 +#: transport-helper.c:578 #, c-format msgid "unknown response to connect: %s" msgstr "risposta inattesa a connect: %s" -#: transport-helper.c:598 +#: transport-helper.c:600 msgid "setting remote service path not supported by protocol" msgstr "" "l'impostazione del percorso del servizio remoto non è supportata dal " "protocollo" -#: transport-helper.c:600 +#: transport-helper.c:602 msgid "invalid remote service path" msgstr "percorso servizio remoto non valido" -#: transport-helper.c:646 +#: transport-helper.c:648 #, c-format msgid "can't connect to subservice %s" msgstr "impossibile connettersi al sottoservizio %s" -#: transport-helper.c:718 +#: transport-helper.c:720 #, c-format msgid "expected ok/error, helper said '%s'" msgstr "attesi ok/error, l'helper ha inviato '%s'" -#: transport-helper.c:771 +#: transport-helper.c:773 #, c-format msgid "helper reported unexpected status of %s" msgstr "l'helper ha segnalato uno stato inatteso di %s" -#: transport-helper.c:832 +#: transport-helper.c:834 #, c-format msgid "helper %s does not support dry-run" msgstr "l'helper %s non supporta dry-run" -#: transport-helper.c:835 +#: transport-helper.c:837 #, c-format msgid "helper %s does not support --signed" msgstr "l'helper %s non supporta --signed" -#: transport-helper.c:838 +#: transport-helper.c:840 #, c-format msgid "helper %s does not support --signed=if-asked" msgstr "l'helper %s non supporta --signed=if-asked" -#: transport-helper.c:845 +#: transport-helper.c:847 #, c-format msgid "helper %s does not support 'push-option'" msgstr "l'helper %s non supporta 'push-option'" -#: transport-helper.c:937 +#: transport-helper.c:939 msgid "remote-helper doesn't support push; refspec needed" msgstr "" "l'helper remoto non supporta il push; è necessario uno specificatore " "riferimento" -#: transport-helper.c:942 +#: transport-helper.c:944 #, c-format msgid "helper %s does not support 'force'" msgstr "l'helper %s non supporta 'force'" -#: transport-helper.c:989 +#: transport-helper.c:991 msgid "couldn't run fast-export" msgstr "impossibile eseguire fast-export" -#: transport-helper.c:994 +#: transport-helper.c:996 msgid "error while running fast-export" msgstr "errore durante l'esecuzione di fast-export" -#: transport-helper.c:1019 +#: transport-helper.c:1021 #, c-format msgid "" "No refs in common and none specified; doing nothing.\n" @@ -6776,47 +7497,47 @@ msgstr "" "Nessun riferimento in comune e nessuno specificato; non eseguo nulla.\n" "Forse dovresti specificare un branch come 'master'.\n" -#: transport-helper.c:1083 +#: transport-helper.c:1085 #, c-format msgid "malformed response in ref list: %s" msgstr "risposta malformata nell'elenco riferimenti: %s" -#: transport-helper.c:1236 +#: transport-helper.c:1238 #, c-format msgid "read(%s) failed" msgstr "read(%s) non riuscita" -#: transport-helper.c:1263 +#: transport-helper.c:1265 #, c-format msgid "write(%s) failed" msgstr "write(%s) non riuscita" -#: transport-helper.c:1312 +#: transport-helper.c:1314 #, c-format msgid "%s thread failed" msgstr "thread %s non riuscito" -#: transport-helper.c:1316 +#: transport-helper.c:1318 #, c-format msgid "%s thread failed to join: %s" msgstr "join non riuscita per il thread %s: %s" -#: transport-helper.c:1335 transport-helper.c:1339 +#: transport-helper.c:1337 transport-helper.c:1341 #, c-format msgid "can't start thread for copying data: %s" msgstr "impossibile avviare il thread per la copia dei dati: %s" -#: transport-helper.c:1376 +#: transport-helper.c:1378 #, c-format msgid "%s process failed to wait" msgstr "wait non riuscita per il processo %s" -#: transport-helper.c:1380 +#: transport-helper.c:1382 #, c-format msgid "%s process failed" msgstr "processo %s non riuscito" -#: transport-helper.c:1398 transport-helper.c:1407 +#: transport-helper.c:1400 transport-helper.c:1409 msgid "can't start thread for copying data" msgstr "impossibile avviare il thread per la copia dei dati" @@ -7076,16 +7797,16 @@ msgstr "" "Impossibile aggiornare il sottomodulo:\n" "%s" -#: unpack-trees.c:253 +#: unpack-trees.c:256 #, c-format msgid "Aborting\n" msgstr "Interrompo l'operazione\n" -#: unpack-trees.c:335 +#: unpack-trees.c:318 msgid "Checking out files" msgstr "Checkout dei file in corso" -#: unpack-trees.c:367 +#: unpack-trees.c:350 msgid "" "the following paths have collided (e.g. case-sensitive paths\n" "on a case-insensitive filesystem) and only one from the same\n" @@ -7125,35 +7846,35 @@ msgstr "numero di porta non valido" msgid "invalid '..' path segment" msgstr "parte percorso '..' non valida" -#: worktree.c:249 builtin/am.c:2094 +#: worktree.c:255 builtin/am.c:2097 #, c-format msgid "failed to read '%s'" -msgstr "impossibile leggere '%s'" +msgstr "lettura di '%s' non riuscita" -#: worktree.c:295 +#: worktree.c:301 #, c-format msgid "'%s' at main working tree is not the repository directory" msgstr "" "'%s' nell'albero di lavoro principale non è la directory del repository" -#: worktree.c:306 +#: worktree.c:312 #, c-format msgid "'%s' file does not contain absolute path to the working tree location" msgstr "" "il file '%s' non contiene il percorso assoluto alla posizione dell'albero di " "lavoro" -#: worktree.c:318 +#: worktree.c:324 #, c-format msgid "'%s' does not exist" msgstr "'%s' non esiste" -#: worktree.c:324 +#: worktree.c:330 #, c-format msgid "'%s' is not a .git file, error code %d" msgstr "'%s' non è un file .git, codice d'errore %d" -#: worktree.c:332 +#: worktree.c:338 #, c-format msgid "'%s' does not point back to '%s'" msgstr "'%s' non punta a '%s'" @@ -7172,167 +7893,167 @@ msgstr "impossibile accedere a '%s'" msgid "unable to get current working directory" msgstr "impossibile ottenere la directory di lavoro corrente" -#: wt-status.c:155 +#: wt-status.c:156 msgid "Unmerged paths:" msgstr "Percorsi non sottoposti a merge:" -#: wt-status.c:182 wt-status.c:209 +#: wt-status.c:183 wt-status.c:210 #, c-format msgid " (use \"git reset %s <file>...\" to unstage)" msgstr "" " (usa \"git reset %s <file>...\" per rimuovere gli elementi dall'area di " "staging)" -#: wt-status.c:184 wt-status.c:211 +#: wt-status.c:185 wt-status.c:212 msgid " (use \"git rm --cached <file>...\" to unstage)" msgstr "" " (usa \"git rm --cached <file>...\" per rimuovere gli elementi dall'area di " "staging)" -#: wt-status.c:188 +#: wt-status.c:189 msgid " (use \"git add <file>...\" to mark resolution)" msgstr "" " (usa \"git add <file>...\" per contrassegnare il conflitto come risolto)" -#: wt-status.c:190 wt-status.c:194 +#: wt-status.c:191 wt-status.c:195 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr "" " (usa \"git add/rm <file>...\" come appropriato per contrassegnare il " "conflitto come risolto)" -#: wt-status.c:192 +#: wt-status.c:193 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr "" " (usa \"git rm <file>...\" per contrassegnare il conflitto come risolto)" -#: wt-status.c:203 wt-status.c:1046 +#: wt-status.c:204 wt-status.c:1064 msgid "Changes to be committed:" msgstr "Modifiche di cui verrà eseguito il commit:" -#: wt-status.c:221 wt-status.c:1055 +#: wt-status.c:222 wt-status.c:1073 msgid "Changes not staged for commit:" msgstr "Modifiche non nell'area di staging per il commit:" -#: wt-status.c:225 +#: wt-status.c:226 msgid " (use \"git add <file>...\" to update what will be committed)" msgstr "" " (usa \"git add <file>...\" per aggiornare gli elementi di cui sarà " "eseguito il commit)" -#: wt-status.c:227 +#: wt-status.c:228 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr "" " (usa \"git add/rm <file>...\" per aggiornare gli elementi di cui sarà " "eseguito il commit)" -#: wt-status.c:228 +#: wt-status.c:229 msgid "" " (use \"git checkout -- <file>...\" to discard changes in working directory)" msgstr "" " (usa \"git checkout -- <file>...\" per scartare le modifiche nella " "directory di lavoro)" -#: wt-status.c:230 +#: wt-status.c:231 msgid " (commit or discard the untracked or modified content in submodules)" msgstr "" " (esegui il commit o scarta il contenuto non tracciato o modificato nei " "sottomoduli)" -#: wt-status.c:242 +#: wt-status.c:243 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr "" " (usa \"git %s <file>...\" per includere l'elemento fra quelli di cui verrà " "eseguito il commit)" -#: wt-status.c:257 +#: wt-status.c:258 msgid "both deleted:" msgstr "entrambi eliminati:" -#: wt-status.c:259 +#: wt-status.c:260 msgid "added by us:" msgstr "aggiunto da noi:" -#: wt-status.c:261 +#: wt-status.c:262 msgid "deleted by them:" msgstr "eliminato da loro:" -#: wt-status.c:263 +#: wt-status.c:264 msgid "added by them:" msgstr "aggiunto da loro:" -#: wt-status.c:265 +#: wt-status.c:266 msgid "deleted by us:" msgstr "eliminato da noi:" -#: wt-status.c:267 +#: wt-status.c:268 msgid "both added:" msgstr "entrambi aggiunti:" -#: wt-status.c:269 +#: wt-status.c:270 msgid "both modified:" msgstr "entrambi modificati:" -#: wt-status.c:279 +#: wt-status.c:280 msgid "new file:" msgstr "nuovo file:" -#: wt-status.c:281 +#: wt-status.c:282 msgid "copied:" msgstr "copiato:" -#: wt-status.c:283 +#: wt-status.c:284 msgid "deleted:" msgstr "eliminato:" -#: wt-status.c:285 +#: wt-status.c:286 msgid "modified:" msgstr "modificato:" -#: wt-status.c:287 +#: wt-status.c:288 msgid "renamed:" msgstr "rinominato:" -#: wt-status.c:289 +#: wt-status.c:290 msgid "typechange:" msgstr "modifica tipo:" -#: wt-status.c:291 +#: wt-status.c:292 msgid "unknown:" msgstr "sconosciuto:" -#: wt-status.c:293 +#: wt-status.c:294 msgid "unmerged:" msgstr "non sottoposto a merge:" -#: wt-status.c:373 +#: wt-status.c:374 msgid "new commits, " msgstr "nuovi commit, " -#: wt-status.c:375 +#: wt-status.c:376 msgid "modified content, " msgstr "contenuto modificato, " -#: wt-status.c:377 +#: wt-status.c:378 msgid "untracked content, " msgstr "contenuto non tracciato, " -#: wt-status.c:884 +#: wt-status.c:896 #, c-format msgid "Your stash currently has %d entry" msgid_plural "Your stash currently has %d entries" msgstr[0] "Lo stash attualmente ha %d voce" msgstr[1] "Lo stash attualmente ha %d voci" -#: wt-status.c:916 +#: wt-status.c:928 msgid "Submodules changed but not updated:" msgstr "Sottomoduli modificati ma non aggiornati:" -#: wt-status.c:918 +#: wt-status.c:930 msgid "Submodule changes to be committed:" msgstr "Modifiche ai sottomoduli di cui verrà eseguito il commit:" -#: wt-status.c:1000 +#: wt-status.c:1012 msgid "" "Do not modify or remove the line above.\n" "Everything below it will be ignored." @@ -7340,111 +8061,111 @@ msgstr "" "Non modificare o rimuovere la riga soprastante.\n" "Tutto ciò che si trova al di sotto di essa sarà ignorato." -#: wt-status.c:1101 +#: wt-status.c:1119 msgid "You have unmerged paths." msgstr "Hai dei percorsi non sottoposti a merge." -#: wt-status.c:1104 +#: wt-status.c:1122 msgid " (fix conflicts and run \"git commit\")" msgstr " (risolvi i conflitti ed esegui \"git commit\")" -#: wt-status.c:1106 +#: wt-status.c:1124 msgid " (use \"git merge --abort\" to abort the merge)" msgstr " (usa \"git merge --abort\" per interrompere il merge)" -#: wt-status.c:1110 +#: wt-status.c:1128 msgid "All conflicts fixed but you are still merging." msgstr "Tutti i conflitti sono stati risolti ma il merge è ancora in corso." -#: wt-status.c:1113 +#: wt-status.c:1131 msgid " (use \"git commit\" to conclude merge)" msgstr " (usa \"git commit\" per terminare il merge)" -#: wt-status.c:1122 +#: wt-status.c:1140 msgid "You are in the middle of an am session." msgstr "Sei nel bel mezzo di una sessione am." -#: wt-status.c:1125 +#: wt-status.c:1143 msgid "The current patch is empty." -msgstr "La patch attuale è vuota." +msgstr "La patch corrente è vuota." -#: wt-status.c:1129 +#: wt-status.c:1147 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (risolvi i conflitti e quindi esegui \"git am --continue\")" -#: wt-status.c:1131 +#: wt-status.c:1149 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (usa \"git am --skip\" per saltare questa patch)" -#: wt-status.c:1133 +#: wt-status.c:1151 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (usa \"git am --abort\" per ripristinare il branch originario)" -#: wt-status.c:1264 +#: wt-status.c:1284 msgid "git-rebase-todo is missing." msgstr "git-rebase-todo è mancante." -#: wt-status.c:1266 +#: wt-status.c:1286 msgid "No commands done." msgstr "Nessun comando eseguito." -#: wt-status.c:1269 +#: wt-status.c:1289 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" msgstr[0] "Ultimo comando eseguito (%d comando eseguito):" msgstr[1] "Ultimi comandi eseguiti (%d comandi eseguiti):" -#: wt-status.c:1280 +#: wt-status.c:1300 #, c-format msgid " (see more in file %s)" msgstr " (vedi di più nel file %s)" -#: wt-status.c:1285 +#: wt-status.c:1305 msgid "No commands remaining." msgstr "Nessun comando rimanente." -#: wt-status.c:1288 +#: wt-status.c:1308 #, c-format msgid "Next command to do (%d remaining command):" msgid_plural "Next commands to do (%d remaining commands):" msgstr[0] "Prossimo comando da eseguire (%d comando rimanente):" msgstr[1] "Prossimi comandi da eseguire (%d comandi rimanenti):" -#: wt-status.c:1296 +#: wt-status.c:1316 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr "" " (usa \"git rebase --edit-todo\" per visualizzare e modificare le " "operazioni)" -#: wt-status.c:1308 +#: wt-status.c:1328 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "Attualmente stai eseguendo il rebase del branch '%s' su '%s'." -#: wt-status.c:1313 +#: wt-status.c:1333 msgid "You are currently rebasing." msgstr "Attualmente stai eseguendo un rebase." -#: wt-status.c:1326 +#: wt-status.c:1346 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (risolvi i conflitti e quindi esegui \"git rebase --continue\")" -#: wt-status.c:1328 +#: wt-status.c:1348 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (usa \"git rebase --skip\" per saltare questa patch)" -#: wt-status.c:1330 +#: wt-status.c:1350 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr "" " (usa \"git rebase --abort\" per eseguire il checkout del branch originario)" -#: wt-status.c:1337 +#: wt-status.c:1357 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr "" " (tutti i conflitti sono stati risolti: esegui \"git rebase --continue\")" -#: wt-status.c:1341 +#: wt-status.c:1361 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." @@ -7452,129 +8173,145 @@ msgstr "" "Attualmente stai dividendo un commit durante il rebase del branch '%s' su " "'%s'." -#: wt-status.c:1346 +#: wt-status.c:1366 msgid "You are currently splitting a commit during a rebase." msgstr "Attualmente stai dividendo un commit durante un rebase." -#: wt-status.c:1349 +#: wt-status.c:1369 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" " (Una volta che la tua directory di lavoro è pulita, esegui \"git rebase --" "continue\")" -#: wt-status.c:1353 +#: wt-status.c:1373 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" "Attualmente stai modificando un commit durante il rebase del branch '%s' su " "'%s'." -#: wt-status.c:1358 +#: wt-status.c:1378 msgid "You are currently editing a commit during a rebase." msgstr "Attualmente stai modificando un commit durante un rebase." -#: wt-status.c:1361 +#: wt-status.c:1381 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " (usa \"git commit --amend\" per correggere il commit corrente)" -#: wt-status.c:1363 +#: wt-status.c:1383 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" " (usa \"git rebase --continue\" una volta soddisfatto delle tue modifiche)" -#: wt-status.c:1372 +#: wt-status.c:1394 +msgid "Cherry-pick currently in progress." +msgstr "Cherry-pick in corso." + +#: wt-status.c:1397 #, c-format msgid "You are currently cherry-picking commit %s." -msgstr "Attualmente stai eseguendo il cherry pick del commit %s." +msgstr "Attualmente stai eseguendo il cherry-pick del commit %s." -#: wt-status.c:1377 +#: wt-status.c:1404 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (risolvi i conflitti ed esegui \"git cherry-pick --continue\")" -#: wt-status.c:1380 +#: wt-status.c:1407 +msgid " (run \"git cherry-pick --continue\" to continue)" +msgstr " (esegui \"git cherry-pick --continue\" per continuare)" + +#: wt-status.c:1410 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" " (tutti i conflitti sono stati risolti: esegui \"git cherry-pick --continue" "\")" -#: wt-status.c:1382 +#: wt-status.c:1412 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" -" (usa \"git cherry-pick --abort\" per annullare l'operazione di cherry pick)" +" (usa \"git cherry-pick --abort\" per annullare l'operazione di cherry-pick)" + +#: wt-status.c:1422 +msgid "Revert currently in progress." +msgstr "Revert in corso." -#: wt-status.c:1390 +#: wt-status.c:1425 #, c-format msgid "You are currently reverting commit %s." msgstr "Attualmente stai eseguendo il revert del commit %s." -#: wt-status.c:1395 +#: wt-status.c:1431 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (risolvi i conflitti ed esegui \"git revert --continue\")" -#: wt-status.c:1398 +#: wt-status.c:1434 +msgid " (run \"git revert --continue\" to continue)" +msgstr " (esegui \"git revert --continue\" per continuare)" + +#: wt-status.c:1437 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr "" " (tutti i conflitti sono stati risolti: esegui \"git revert --continue\")" -#: wt-status.c:1400 +#: wt-status.c:1439 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " (usa \"git revert --abort\" per annullare l'operazione di revert)" -#: wt-status.c:1410 +#: wt-status.c:1449 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "Attualmente stai eseguendo una bisezione partendo dal branch '%s'." -#: wt-status.c:1414 +#: wt-status.c:1453 msgid "You are currently bisecting." msgstr "Attualmente stai eseguendo una bisezione." -#: wt-status.c:1417 +#: wt-status.c:1456 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " (usa \"git bisect reset\" per tornare al branch originario)" -#: wt-status.c:1617 +#: wt-status.c:1665 msgid "On branch " msgstr "Sul branch " -#: wt-status.c:1624 +#: wt-status.c:1672 msgid "interactive rebase in progress; onto " msgstr "rebase interattivo in corso su " -#: wt-status.c:1626 +#: wt-status.c:1674 msgid "rebase in progress; onto " msgstr "rebase in corso su " -#: wt-status.c:1631 +#: wt-status.c:1679 msgid "HEAD detached at " msgstr "HEAD scollegato su " -#: wt-status.c:1633 +#: wt-status.c:1681 msgid "HEAD detached from " msgstr "HEAD scollegato da " -#: wt-status.c:1636 +#: wt-status.c:1684 msgid "Not currently on any branch." msgstr "Attualmente non sei su alcun branch." -#: wt-status.c:1653 +#: wt-status.c:1701 msgid "Initial commit" msgstr "Commit iniziale" -#: wt-status.c:1654 +#: wt-status.c:1702 msgid "No commits yet" msgstr "Non ci sono ancora commit" -#: wt-status.c:1668 +#: wt-status.c:1716 msgid "Untracked files" msgstr "File non tracciati" -#: wt-status.c:1670 +#: wt-status.c:1718 msgid "Ignored files" msgstr "File ignorati" -#: wt-status.c:1674 +#: wt-status.c:1722 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -7586,31 +8323,31 @@ msgstr "" "ma devi stare attento a non dimenticarti di aggiungere\n" "autonomamente i file nuovi (vedi 'git help status')." -#: wt-status.c:1680 +#: wt-status.c:1728 #, c-format msgid "Untracked files not listed%s" msgstr "File non tracciati non elencati%s" -#: wt-status.c:1682 +#: wt-status.c:1730 msgid " (use -u option to show untracked files)" msgstr " (usa l'opzione -u per visualizzare i file non tracciati)" -#: wt-status.c:1688 +#: wt-status.c:1736 msgid "No changes" msgstr "Nessuna modifica" -#: wt-status.c:1693 +#: wt-status.c:1741 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" "nessuna modifica aggiunta al commit (usa \"git add\" e/o \"git commit -a\")\n" -#: wt-status.c:1696 +#: wt-status.c:1744 #, c-format msgid "no changes added to commit\n" msgstr "nessuna modifica aggiunta al commit\n" -#: wt-status.c:1699 +#: wt-status.c:1747 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -7619,68 +8356,68 @@ msgstr "" "non è stato aggiunto nulla al commit ma sono presenti file non tracciati " "(usa \"git add\" per tracciarli)\n" -#: wt-status.c:1702 +#: wt-status.c:1750 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "" "non è stato aggiunto nulla al commit ma sono presenti file non tracciati\n" -#: wt-status.c:1705 +#: wt-status.c:1753 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" "non c'è nulla di cui eseguire il commit (crea/copia dei file e usa \"git add" "\" per tracciarli)\n" -#: wt-status.c:1708 wt-status.c:1713 +#: wt-status.c:1756 wt-status.c:1761 #, c-format msgid "nothing to commit\n" msgstr "non c'è nulla di cui eseguire il commit\n" -#: wt-status.c:1711 +#: wt-status.c:1759 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" "non c'è nulla di cui eseguire il commit (usa -u per visualizzare i file non " "tracciati)\n" -#: wt-status.c:1715 +#: wt-status.c:1763 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "non c'è nulla di cui eseguire il commit, l'albero di lavoro è pulito\n" -#: wt-status.c:1828 +#: wt-status.c:1876 msgid "No commits yet on " msgstr "Non ci sono ancora commit su" -#: wt-status.c:1832 +#: wt-status.c:1880 msgid "HEAD (no branch)" msgstr "HEAD (nessun branch)" -#: wt-status.c:1863 +#: wt-status.c:1911 msgid "different" msgstr "differente" -#: wt-status.c:1865 wt-status.c:1873 +#: wt-status.c:1913 wt-status.c:1921 msgid "behind " msgstr "indietro " -#: wt-status.c:1868 wt-status.c:1871 +#: wt-status.c:1916 wt-status.c:1919 msgid "ahead " msgstr "avanti " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2386 +#: wt-status.c:2443 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "impossibile eseguire %s: ci sono delle modifiche non in staging." -#: wt-status.c:2392 +#: wt-status.c:2449 msgid "additionally, your index contains uncommitted changes." msgstr "" "inoltre, l'indice contiene modifiche di cui non è stato eseguito il commit." -#: wt-status.c:2394 +#: wt-status.c:2451 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "" @@ -7745,7 +8482,7 @@ msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "I seguenti percorsi sono ignorati da uno dei file .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:214 builtin/push.c:560 +#: 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 msgid "dry run" msgstr "test controllato" @@ -7754,7 +8491,7 @@ msgstr "test controllato" msgid "interactive picking" msgstr "scelta interattiva" -#: builtin/add.c:294 builtin/checkout.c:1304 builtin/reset.c:306 +#: builtin/add.c:294 builtin/checkout.c:1379 builtin/reset.c:306 msgid "select hunks interactively" msgstr "seleziona gli hunk in modalità interattiva" @@ -7801,7 +8538,7 @@ msgstr "" "controlla se i file - anche quelli mancanti - sono ignorati durante il test " "controllato" -#: builtin/add.c:309 builtin/update-index.c:991 +#: builtin/add.c:309 builtin/update-index.c:1001 msgid "override the executable bit of the listed files" msgstr "esegui l'override del bit eseguibile dei file elencati" @@ -7850,29 +8587,29 @@ msgstr "aggiunta repository Git incorporato in corso: %s" msgid "Use -f if you really want to add them.\n" msgstr "Usa -f se vuoi davvero aggiungerli.\n" -#: builtin/add.c:380 +#: builtin/add.c:379 msgid "adding files failed" msgstr "aggiunta dei file non riuscita" -#: builtin/add.c:418 +#: builtin/add.c:419 msgid "-A and -u are mutually incompatible" msgstr "-A e -u non sono compatibili fra loro" -#: builtin/add.c:425 +#: builtin/add.c:426 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "L'opzione --ignore-missing può essere usata solo con --dry-run" -#: builtin/add.c:429 +#: builtin/add.c:430 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "Il parametro --chmod '%s' deve essere -x o +x" -#: builtin/add.c:444 +#: builtin/add.c:445 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "Non è stato specificato nulla, non è stato aggiunto nulla.\n" -#: builtin/add.c:445 +#: builtin/add.c:446 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Forse intendevi dire 'git add .'?\n" @@ -7886,106 +8623,106 @@ msgstr "impossibile analizzare lo script author" msgid "'%s' was deleted by the applypatch-msg hook" msgstr "'%s' è stato eliminato dall'hook applypatch-msg" -#: builtin/am.c:473 +#: builtin/am.c:474 #, c-format msgid "Malformed input line: '%s'." msgstr "Riga di input malformata: '%s'." -#: builtin/am.c:510 +#: builtin/am.c:512 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "Copia delle note da '%s' a '%s' non riuscita" -#: builtin/am.c:536 +#: builtin/am.c:538 msgid "fseek failed" msgstr "fseek non riuscita" -#: builtin/am.c:724 +#: builtin/am.c:726 #, c-format msgid "could not parse patch '%s'" msgstr "impossibile analizzare la patch '%s'" -#: builtin/am.c:789 +#: builtin/am.c:791 msgid "Only one StGIT patch series can be applied at once" msgstr "Può essere applicata solo una serie di patch StGIT per volta" -#: builtin/am.c:837 +#: builtin/am.c:839 msgid "invalid timestamp" msgstr "timestamp non valido" -#: builtin/am.c:842 builtin/am.c:854 +#: builtin/am.c:844 builtin/am.c:856 msgid "invalid Date line" msgstr "riga Date non valida" -#: builtin/am.c:849 +#: builtin/am.c:851 msgid "invalid timezone offset" msgstr "offset fuso orario non valido" -#: builtin/am.c:942 +#: builtin/am.c:944 msgid "Patch format detection failed." msgstr "Rilevamento del formato della patch non riuscito." -#: builtin/am.c:947 builtin/clone.c:409 +#: builtin/am.c:949 builtin/clone.c:409 #, c-format msgid "failed to create directory '%s'" msgstr "creazione della directory '%s' non riuscita" -#: builtin/am.c:952 +#: builtin/am.c:954 msgid "Failed to split patches." msgstr "Divisione delle patch non riuscita." -#: builtin/am.c:1082 builtin/commit.c:371 +#: builtin/am.c:1084 builtin/commit.c:371 msgid "unable to write index file" -msgstr "impossibile scrivere il file index" +msgstr "impossibile scrivere il file indice" -#: builtin/am.c:1096 +#: builtin/am.c:1098 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "Una volta risolto questo problema, esegui \"%s --continue\"." -#: builtin/am.c:1097 +#: builtin/am.c:1099 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "Se preferisci saltare questa patch, esegui invece \"%s --skip\"." -#: builtin/am.c:1098 +#: builtin/am.c:1100 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "" "Per ripristinare il branch originario e terminare il patching, esegui \"%s --" "abort\"." -#: builtin/am.c:1181 +#: builtin/am.c:1183 msgid "Patch sent with format=flowed; space at the end of lines might be lost." msgstr "" "Patch inviata con format=flowed; gli spazi al termine delle righe potrebbero " "essere andati perduti." -#: builtin/am.c:1209 +#: builtin/am.c:1211 msgid "Patch is empty." msgstr "La patch è vuota." -#: builtin/am.c:1275 +#: builtin/am.c:1277 #, c-format msgid "invalid ident line: %.*s" msgstr "riga ident non valida: %.*s" -#: builtin/am.c:1297 +#: builtin/am.c:1299 #, c-format msgid "unable to parse commit %s" msgstr "impossibile analizzare il commit %s" -#: builtin/am.c:1493 +#: builtin/am.c:1495 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" "Dal repository mancano i blob necessari per ripiegare sul merge a tre vie." -#: builtin/am.c:1495 +#: builtin/am.c:1497 msgid "Using index info to reconstruct a base tree..." msgstr "" "Utilizzo le informazioni dell'indice per ricostruire un albero di base..." -#: builtin/am.c:1514 +#: builtin/am.c:1516 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -7993,30 +8730,30 @@ msgstr "" "Hai modificato manualmente la patch?\n" "Non può essere applicata ai blob registrati nel suo indice." -#: builtin/am.c:1520 +#: builtin/am.c:1522 msgid "Falling back to patching base and 3-way merge..." msgstr "Ripiego sul patching della base e sul merge a tre vie..." -#: builtin/am.c:1546 +#: builtin/am.c:1548 msgid "Failed to merge in the changes." msgstr "Merge delle modifiche non riuscito." -#: builtin/am.c:1578 +#: builtin/am.c:1580 msgid "applying to an empty history" msgstr "applicazione a una cronologia vuota" -#: builtin/am.c:1624 builtin/am.c:1628 +#: builtin/am.c:1627 builtin/am.c:1631 #, c-format msgid "cannot resume: %s does not exist." msgstr "impossibile riprendere l'attività: %s non esiste." -#: builtin/am.c:1644 +#: builtin/am.c:1647 msgid "cannot be interactive without stdin connected to a terminal." msgstr "" "impossibile eseguire l'attività in modalità interattiva con lo standard " "input non collegato a un terminale." -#: builtin/am.c:1649 +#: builtin/am.c:1652 msgid "Commit Body is:" msgstr "Il corpo del commit è:" @@ -8024,36 +8761,36 @@ msgstr "Il corpo del commit è:" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1659 +#: builtin/am.c:1662 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "" "Applico? Sì [y]/No [n]/Modifica [e]/[V]isualizza patch/[A]ccetta tutto:" -#: builtin/am.c:1709 +#: builtin/am.c:1712 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Indice sporco: impossibile applicare le patch (elemento sporco: %s)" -#: builtin/am.c:1749 builtin/am.c:1817 +#: builtin/am.c:1752 builtin/am.c:1820 #, c-format msgid "Applying: %.*s" msgstr "Applicazione in corso: %.*s" -#: builtin/am.c:1766 +#: builtin/am.c:1769 msgid "No changes -- Patch already applied." msgstr "Nessuna modifica -- patch già applicata." -#: builtin/am.c:1772 +#: builtin/am.c:1775 #, c-format msgid "Patch failed at %s %.*s" msgstr "Patch non riuscita a %s %.*s" -#: builtin/am.c:1776 +#: builtin/am.c:1779 msgid "Use 'git am --show-current-patch' to see the failed patch" msgstr "" "Usa 'git am --show-current-patch' per visualizzare la patch non riuscita" -#: builtin/am.c:1820 +#: builtin/am.c:1823 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -8063,7 +8800,7 @@ msgstr "" "Se non rimane nulla da aggiungere all'area di staging, forse qualcos'altro\n" "ha già introdotto le stesse modifiche; potresti voler saltare questa patch." -#: builtin/am.c:1827 +#: builtin/am.c:1830 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -8076,17 +8813,17 @@ msgstr "" "Potresti eseguire `git rm` su un file per accettarne la risoluzione " "\"eliminato da loro\"." -#: builtin/am.c:1934 builtin/am.c:1938 builtin/am.c:1950 builtin/reset.c:329 +#: builtin/am.c:1937 builtin/am.c:1941 builtin/am.c:1953 builtin/reset.c:329 #: builtin/reset.c:337 #, c-format msgid "Could not parse object '%s'." msgstr "Impossibile analizzare l'oggetto '%s'." -#: builtin/am.c:1986 +#: builtin/am.c:1989 msgid "failed to clean index" msgstr "pulizia dell'indice non riuscita" -#: builtin/am.c:2030 +#: builtin/am.c:2033 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -8095,148 +8832,148 @@ msgstr "" "'am'.\n" "Non ritorno indietro a ORIG_HEAD" -#: builtin/am.c:2123 +#: builtin/am.c:2130 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Valore non valido per --patch-format: %s" -#: builtin/am.c:2159 +#: builtin/am.c:2166 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<opzioni>] [(<mbox> | <Maildir>)...]" -#: builtin/am.c:2160 +#: builtin/am.c:2167 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<opzioni>] (--continue | --skip | --abort)" -#: builtin/am.c:2166 +#: builtin/am.c:2173 msgid "run interactively" msgstr "esegui in modalità interattiva" -#: builtin/am.c:2168 +#: builtin/am.c:2175 msgid "historical option -- no-op" msgstr "opzione storica -- non esegue nulla" -#: builtin/am.c:2170 +#: builtin/am.c:2177 msgid "allow fall back on 3way merging if needed" msgstr "consenti il ripiego sul merge a tre vie se necessario" -#: builtin/am.c:2171 builtin/init-db.c:486 builtin/prune-packed.c:58 -#: builtin/repack.c:306 +#: builtin/am.c:2178 builtin/init-db.c:494 builtin/prune-packed.c:58 +#: builtin/repack.c:306 builtin/stash.c:805 msgid "be quiet" msgstr "non visualizzare messaggi" -#: builtin/am.c:2173 +#: builtin/am.c:2180 msgid "add a Signed-off-by line to the commit message" msgstr "aggiungi una riga Signed-off-by al messaggio di commit" -#: builtin/am.c:2176 +#: builtin/am.c:2183 msgid "recode into utf8 (default)" msgstr "converti codifica in UTF-8 (impostazione predefinita)" -#: builtin/am.c:2178 +#: builtin/am.c:2185 msgid "pass -k flag to git-mailinfo" msgstr "fornisci l'argomento -k a git-mailinfo" -#: builtin/am.c:2180 +#: builtin/am.c:2187 msgid "pass -b flag to git-mailinfo" msgstr "fornisci l'argomento -b a git-mailinfo" -#: builtin/am.c:2182 +#: builtin/am.c:2189 msgid "pass -m flag to git-mailinfo" msgstr "fornisci l'argomento -m a git-mailinfo" -#: builtin/am.c:2184 +#: builtin/am.c:2191 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "fornisci a git-mailsplit l'argomento --keep-cr per il formato mbox" -#: builtin/am.c:2187 +#: builtin/am.c:2194 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "" "non fornire l'argomento --keep-cr a git-mailsplit indipendentemente dal " "valore di am.keepcr" -#: builtin/am.c:2190 +#: builtin/am.c:2197 msgid "strip everything before a scissors line" msgstr "rimuovi tutte le righe prima di una riga \"taglia qui\"" -#: builtin/am.c:2192 builtin/am.c:2195 builtin/am.c:2198 builtin/am.c:2201 -#: builtin/am.c:2204 builtin/am.c:2207 builtin/am.c:2210 builtin/am.c:2213 -#: builtin/am.c:2219 +#: 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 msgid "pass it through git-apply" msgstr "passa l'argomento a git-apply" -#: builtin/am.c:2209 builtin/commit.c:1343 builtin/fmt-merge-msg.c:671 -#: builtin/fmt-merge-msg.c:674 builtin/grep.c:879 builtin/merge.c:240 -#: builtin/pull.c:152 builtin/pull.c:210 builtin/rebase.c:1062 +#: 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:171 builtin/tag.c:386 -#: parse-options.h:144 parse-options.h:146 parse-options.h:266 +#: 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 msgid "n" msgstr "n" -#: builtin/am.c:2215 builtin/branch.c:637 builtin/for-each-ref.c:38 -#: builtin/replace.c:544 builtin/tag.c:422 builtin/verify-tag.c:39 +#: 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 msgid "format" msgstr "formato" -#: builtin/am.c:2216 +#: builtin/am.c:2223 msgid "format the patch(es) are in" msgstr "il formato delle patch" -#: builtin/am.c:2222 +#: builtin/am.c:2229 msgid "override error message when patch failure occurs" msgstr "" "esegui l'override del messaggio d'errore quando si verifica un errore legato " "alle patch" -#: builtin/am.c:2224 +#: builtin/am.c:2231 msgid "continue applying patches after resolving a conflict" msgstr "" "continua l'applicazione delle patch dopo la risoluzione di un conflitto" -#: builtin/am.c:2227 +#: builtin/am.c:2234 msgid "synonyms for --continue" msgstr "sinonimi di --continue" -#: builtin/am.c:2230 +#: builtin/am.c:2237 msgid "skip the current patch" -msgstr "salta la patch attuale" +msgstr "salta la patch corrente" -#: builtin/am.c:2233 +#: builtin/am.c:2240 msgid "restore the original branch and abort the patching operation." msgstr "ripristina il branch originario e interrompi l'operazione di patching." -#: builtin/am.c:2236 +#: builtin/am.c:2243 msgid "abort the patching operation but keep HEAD where it is." msgstr "interrompi l'operazione di patching ma mantieni HEAD dov'è." -#: builtin/am.c:2239 +#: builtin/am.c:2246 msgid "show the patch being applied." msgstr "visualizza la patch in fase di applicazione." -#: builtin/am.c:2243 +#: builtin/am.c:2250 msgid "lie about committer date" msgstr "menti sulla data del commit" -#: builtin/am.c:2245 +#: builtin/am.c:2252 msgid "use current timestamp for author date" -msgstr "usa il timestamp attuale come data autore" +msgstr "usa il timestamp corrente come data autore" -#: builtin/am.c:2247 builtin/commit.c:1486 builtin/merge.c:274 -#: builtin/pull.c:185 builtin/rebase.c:1106 builtin/rebase--interactive.c:185 -#: builtin/revert.c:114 builtin/tag.c:402 +#: 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 msgid "key-id" msgstr "ID chiave" -#: builtin/am.c:2248 builtin/rebase.c:1107 builtin/rebase--interactive.c:186 +#: builtin/am.c:2255 builtin/rebase.c:490 builtin/rebase.c:1454 msgid "GPG-sign commits" msgstr "firma i commit con GPG" -#: builtin/am.c:2251 +#: builtin/am.c:2258 msgid "(internal use for git-rebase)" msgstr "(a uso interno per git-rebase)" -#: builtin/am.c:2269 +#: builtin/am.c:2276 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." @@ -8244,18 +8981,18 @@ msgstr "" "L'opzione -b/--binary non esegue nulla da molto tempo e\n" "sarà rimossa. Non usarla più." -#: builtin/am.c:2276 +#: builtin/am.c:2283 msgid "failed to read the index" msgstr "lettura dell'indice non riuscita" -#: builtin/am.c:2291 +#: builtin/am.c:2298 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "" -"la directory di rebase precedente %s esiste ancora ma è stata fornita " +"la directory di rebase precedente %s esiste ancora ma è stata specificata " "un'mbox." -#: builtin/am.c:2315 +#: builtin/am.c:2322 #, c-format msgid "" "Stray %s directory found.\n" @@ -8264,7 +9001,7 @@ msgstr "" "Trovata directory smarrita %s.\n" "Usa \"git am --abort\" per eliminarla." -#: builtin/am.c:2321 +#: builtin/am.c:2328 msgid "Resolve operation not in progress, we are not resuming." msgstr "Operazione di risoluzione non in corso, non riprendiamo." @@ -8317,46 +9054,47 @@ msgid "git bisect--helper --bisect-clean-state" msgstr "git bisect--helper --bisect-clean-state" #: builtin/bisect--helper.c:25 -#, fuzzy msgid "git bisect--helper --bisect-reset [<commit>]" -msgstr "git bisect--helper --bisect-clean-state" +msgstr "git bisect--helper --bisect-reset [<commit>]" #: builtin/bisect--helper.c:26 -#, fuzzy msgid "" "git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> " "<bad_term>" msgstr "" -"git bisect--helper --write-terms <termine revisione non funzionante> " -"<termine revisione funzionante>" +"git bisect--helper --bisect-write [--no-log] <stato> <revisione> <termine " +"revisione funzionante> <termine revisione non funzionante>" #: builtin/bisect--helper.c:27 -#, fuzzy msgid "" "git bisect--helper --bisect-check-and-set-terms <command> <good_term> " "<bad_term>" msgstr "" -"git bisect--helper --write-terms <termine revisione non funzionante> " -"<termine revisione funzionante>" +"git bisect--helper --bisect-check-and-set-terms <comando> <termine revisione " +"funzionante> <termine revisione non funzionante>" #: builtin/bisect--helper.c:28 -#, fuzzy msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]" msgstr "" -"git bisect--helper --write-terms <termine revisione non funzionante> " -"<termine revisione funzionante>" +"git bisect--helper --bisect-next-check <termine revisione funzionante> " +"<termine revisione non funzionante> [<termine>]" #: builtin/bisect--helper.c:29 msgid "" "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --" "term-new]" msgstr "" +"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --" +"term-new]" #: builtin/bisect--helper.c:30 msgid "" "git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}" "=<term>][--no-checkout] [<bad> [<good>...]] [--] [<paths>...]" msgstr "" +"git bisect--helper --bisect-start [--term-{old,good}=<termine> --term-{new," +"bad}=<termine>][--no-checkout] [<non funzionante> [<funzionante>...]] [--] " +"[<percorsi>...]" #: builtin/bisect--helper.c:86 #, c-format @@ -8382,64 +9120,67 @@ msgid "could not open the file BISECT_TERMS" msgstr "impossibile aprire il file BISECT_TERMS" #: builtin/bisect--helper.c:155 -#, fuzzy, c-format +#, c-format msgid "We are not bisecting.\n" -msgstr "Non stiamo eseguendo un bisect." +msgstr "Non stiamo eseguendo un bisect.\n" #: builtin/bisect--helper.c:163 -#, fuzzy, c-format +#, c-format msgid "'%s' is not a valid commit" -msgstr "'%s' non è un termine valido" +msgstr "'%s' non è un commit valido" #: builtin/bisect--helper.c:174 #, c-format msgid "" "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'." msgstr "" +"impossibile eseguire il checkout dell'HEAD originario '%s'. Prova con 'git " +"bisect reset <commit>'." #: builtin/bisect--helper.c:215 -#, fuzzy, c-format +#, c-format msgid "Bad bisect_write argument: %s" -msgstr "Argomento bisect_write errato: $state" +msgstr "Argomento bisect_write errato: %s" #: builtin/bisect--helper.c:220 -#, fuzzy, c-format +#, c-format msgid "couldn't get the oid of the rev '%s'" -msgstr "impossibile cambiare il significato del termine '%s'" +msgstr "impossibile recuperare l'OID della revisione '%s'" #: builtin/bisect--helper.c:232 -#, fuzzy, c-format +#, c-format msgid "couldn't open the file '%s'" -msgstr "impossibile creare il file '%s'" +msgstr "impossibile aprire il file '%s'" #: builtin/bisect--helper.c:258 #, c-format msgid "Invalid command: you're currently in a %s/%s bisect" -msgstr "" +msgstr "Comando non valido: attualmente stai eseguendo una bisezione %s/%s" #: builtin/bisect--helper.c:285 -#, fuzzy, c-format +#, 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 "" -"Devi specificare almeno una revisione corretta ed una errata.\n" -"(Puoi usare \"git bisect bad\" e \"git bisect good\" per questo scopo.)" +"Devi specificare almeno una revisione %s ed una %s.\n" +"Puoi usare \"git bisect %s\" e \"git bisect %s\" per questo scopo." #: builtin/bisect--helper.c:289 -#, fuzzy, c-format +#, c-format msgid "" "You need to start by \"git bisect start\".\n" "You then 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 "" -"Devi specificare almeno una revisione corretta ed una errata.\n" -"(Puoi usare \"git bisect bad\" e \"git bisect good\" per questo scopo.)" +"Devi iniziare con \"git bisect start\".\n" +"Quindi devi specificare almeno una revisione %s ed una %s.\n" +"Puoi usare \"git bisect %s\" e \"git bisect %s\" a questo scopo." #: builtin/bisect--helper.c:321 -#, fuzzy, c-format +#, c-format msgid "bisecting only with a %s commit" -msgstr "scrittura commit radice in corso" +msgstr "eseguo la bisezione solo con un commit %s" #. TRANSLATORS: Make sure to include [Y] and [n] in your #. translation. The program will only accept English input @@ -8451,7 +9192,7 @@ msgstr "Sei sicuro? [Y/n] " #: builtin/bisect--helper.c:376 msgid "no terms defined" -msgstr "" +msgstr "nessun termine definito" #: builtin/bisect--helper.c:379 #, c-format @@ -8459,6 +9200,8 @@ msgid "" "Your current terms are %s for the old state\n" "and %s for the new state.\n" msgstr "" +"I tuoi termini correnti sono %s per lo stato vecchio\n" +"e %s per lo stato nuovo.\n" #: builtin/bisect--helper.c:389 #, c-format @@ -8466,36 +9209,36 @@ msgid "" "invalid argument %s for 'git bisect terms'.\n" "Supported options are: --term-good|--term-old and --term-bad|--term-new." msgstr "" +"argomento %s non valido per 'git bisect terms'.\n" +"Le opzioni supportate sono: --term-good|--term-old e --term-bad|--term-new." #: builtin/bisect--helper.c:475 -#, fuzzy, c-format +#, c-format msgid "unrecognized option: '%s'" -msgstr "valore non riconosciuto: position:%s" +msgstr "opzione non riconosciuta: '%s'" #: builtin/bisect--helper.c:479 -#, fuzzy, c-format +#, c-format msgid "'%s' does not appear to be a valid revision" -msgstr "'$arg' non sembra essere una revisione valida" +msgstr "sembra che '%s' non sia una revisione valida" #: builtin/bisect--helper.c:511 msgid "bad HEAD - I need a HEAD" -msgstr "" +msgstr "HEAD non valida - ho bisogno di un'HEAD" #: builtin/bisect--helper.c:526 -#, fuzzy, c-format +#, c-format msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'." msgstr "" -"Checkout di '$start_head' non riuscito. Prova 'git bisect reset <branch-" -"valido>'." +"checkout di '%s' non riuscito. Prova con 'git bisect start <branch valido>'." #: builtin/bisect--helper.c:547 msgid "won't bisect on cg-seek'ed tree" -msgstr "" +msgstr "non eseguirò la bisezione su un albero sottoposto a cg-seek" #: builtin/bisect--helper.c:550 -#, fuzzy msgid "bad HEAD - strange symbolic ref" -msgstr "HEAD errato - strano ref simbolico" +msgstr "head non valida - riferimento simbolico strano" #: builtin/bisect--helper.c:627 msgid "perform 'git bisect next'" @@ -8514,32 +9257,29 @@ msgid "check for expected revs" msgstr "controlla se le revisioni attese sono presenti" #: builtin/bisect--helper.c:635 -#, fuzzy msgid "reset the bisection state" -msgstr "pulisci lo stato bisezione" +msgstr "reimposta lo stato della bisezione" #: builtin/bisect--helper.c:637 -#, fuzzy msgid "write out the bisection state in BISECT_LOG" -msgstr "pulisci lo stato bisezione" +msgstr "scrivi lo stato della bisezione in BISECT_LOG" #: builtin/bisect--helper.c:639 -#, fuzzy msgid "check and set terms in a bisection state" -msgstr "pulisci lo stato bisezione" +msgstr "controlla e imposta i termini in uno stato bisezione" #: builtin/bisect--helper.c:641 msgid "check whether bad or good terms exist" msgstr "" +"controlla se esistono termini per revisioni non funzionanti o funzionanti" #: builtin/bisect--helper.c:643 -#, fuzzy msgid "print out the bisect terms" -msgstr "pulisci lo stato bisezione" +msgstr "stampa i termini della bisezione" #: builtin/bisect--helper.c:645 msgid "start the bisect session" -msgstr "" +msgstr "inizia la sessione di bisezione" #: builtin/bisect--helper.c:647 msgid "update BISECT_HEAD instead of checking out the current commit" @@ -8547,7 +9287,7 @@ msgstr "aggiorna BISECT_HEAD anziché eseguire il checkout del commit corrente" #: builtin/bisect--helper.c:649 msgid "no log for BISECT_WRITE" -msgstr "" +msgstr "non registrare le operazioni eseguite per BISECT_WRITE" #: builtin/bisect--helper.c:666 msgid "--write-terms requires two arguments" @@ -8558,184 +9298,178 @@ msgid "--bisect-clean-state requires no arguments" msgstr "--bisect-clean-state non richiede argomenti" #: builtin/bisect--helper.c:677 -#, fuzzy msgid "--bisect-reset requires either no argument or a commit" -msgstr "--bisect-clean-state non richiede argomenti" +msgstr "--bisect-reset richiede o nessun argomento o un commit" #: builtin/bisect--helper.c:681 -#, fuzzy msgid "--bisect-write requires either 4 or 5 arguments" -msgstr "--bisect-clean-state non richiede argomenti" +msgstr "--bisect-write richiede o quattro o cinque argomenti" #: builtin/bisect--helper.c:687 -#, fuzzy msgid "--check-and-set-terms requires 3 arguments" -msgstr "--bisect-clean-state non richiede argomenti" +msgstr "--check-and-set-terms richiede tre argomenti" #: builtin/bisect--helper.c:693 -#, fuzzy msgid "--bisect-next-check requires 2 or 3 arguments" -msgstr "--bisect-clean-state non richiede argomenti" +msgstr "--bisect-next-check richiede due o tre argomenti" #: builtin/bisect--helper.c:699 -#, fuzzy msgid "--bisect-terms requires 0 or 1 argument" -msgstr "--write-terms richiede due argomenti" +msgstr "--bisect-terms richiede zero o un argomento" -#: builtin/blame.c:31 +#: builtin/blame.c:32 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "git blame [<opzioni>] [<opzioni revisione>] [<revisione>] [--] <file>" -#: builtin/blame.c:36 +#: builtin/blame.c:37 msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "le <opzioni revisione> sono documentate in git-rev-list(1)" -#: builtin/blame.c:406 +#: builtin/blame.c:407 #, c-format msgid "expecting a color: %s" msgstr "atteso colore: %s" -#: builtin/blame.c:413 +#: builtin/blame.c:414 msgid "must end with a color" msgstr "deve terminare con un colore" -#: builtin/blame.c:700 +#: builtin/blame.c:701 #, c-format msgid "invalid color '%s' in color.blame.repeatedLines" msgstr "colore '%s' non valido in color.blame.repeatedLines" -#: builtin/blame.c:718 +#: builtin/blame.c:719 msgid "invalid value for blame.coloring" msgstr "valore non valido per blame.coloring" -#: builtin/blame.c:793 +#: builtin/blame.c:794 msgid "Show blame entries as we find them, incrementally" msgstr "" "Visualizza le voci blame incrementalmente, a mano a mano che le troviamo" -#: builtin/blame.c:794 +#: builtin/blame.c:795 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "" "Visualizza un hash SHA-1 vuoto per i commit limite (impostazione " "predefinita: off)" -#: builtin/blame.c:795 +#: builtin/blame.c:796 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "" "Non gestire i commit radice come commit limite (impostazione predefinita: " "off)" -#: builtin/blame.c:796 +#: builtin/blame.c:797 msgid "Show work cost statistics" msgstr "Visualizza le statistiche sul costo dell'operazione" -#: builtin/blame.c:797 +#: builtin/blame.c:798 msgid "Force progress reporting" msgstr "Forza l'indicazione d'avanzamento dell'operazione" -#: builtin/blame.c:798 +#: builtin/blame.c:799 msgid "Show output score for blame entries" msgstr "Visualizza il punteggio di output per le voci blame" -#: builtin/blame.c:799 +#: builtin/blame.c:800 msgid "Show original filename (Default: auto)" msgstr "" "Visualizza il nome file originario (impostazione predefinita: automatico)" -#: builtin/blame.c:800 +#: builtin/blame.c:801 msgid "Show original linenumber (Default: off)" msgstr "" "Visualizza il numero di riga originario (impostazione predefinita: off)" -#: builtin/blame.c:801 +#: builtin/blame.c:802 msgid "Show in a format designed for machine consumption" msgstr "" "Visualizza l'output in un formato progettato per l'utilizzo da parte di una " "macchina" -#: builtin/blame.c:802 +#: builtin/blame.c:803 msgid "Show porcelain format with per-line commit information" msgstr "" "Visualizza il formato porcelain con le informazioni sul commit per ogni riga" -#: builtin/blame.c:803 +#: builtin/blame.c:804 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "" "Usa la stessa modalità di output di git-annotate (impostazione predefinita: " "off)" -#: builtin/blame.c:804 +#: builtin/blame.c:805 msgid "Show raw timestamp (Default: off)" msgstr "Visualizza il timestamp grezzo (impostazione predefinita: off)" -#: builtin/blame.c:805 +#: builtin/blame.c:806 msgid "Show long commit SHA1 (Default: off)" msgstr "" "Visualizza l'hash SHA1 del commit in forma lunga (impostazione predefinita: " "off)" -#: builtin/blame.c:806 +#: builtin/blame.c:807 msgid "Suppress author name and timestamp (Default: off)" msgstr "" "Non visualizzare il nome autore e il timestamp (impostazione predefinita: " "off)" -#: builtin/blame.c:807 +#: builtin/blame.c:808 msgid "Show author email instead of name (Default: off)" msgstr "" "Visualizza l'indirizzo email dell'autore invece del nome (impostazione " "predefinita: off)" -#: builtin/blame.c:808 +#: builtin/blame.c:809 msgid "Ignore whitespace differences" msgstr "Ignora le differenze relative agli spazi bianchi" -#: builtin/blame.c:809 +#: builtin/blame.c:810 msgid "color redundant metadata from previous line differently" msgstr "colora in modo differente i metadati ridondanti della riga precedente" -#: builtin/blame.c:810 +#: builtin/blame.c:811 msgid "color lines by age" msgstr "colora le righe in base all'età" -#: builtin/blame.c:817 +#: builtin/blame.c:818 msgid "Use an experimental heuristic to improve diffs" -msgstr "Utilizza un'euristica sperimentale per migliorare i diff" +msgstr "Usa un'euristica sperimentale per migliorare i diff" -#: builtin/blame.c:819 +#: builtin/blame.c:820 msgid "Spend extra cycles to find better match" -msgstr "Utilizza cicli extra per trovare una corrispondenza migliore" +msgstr "Usa cicli extra per trovare una corrispondenza migliore" -#: builtin/blame.c:820 +#: builtin/blame.c:821 msgid "Use revisions from <file> instead of calling git-rev-list" -msgstr "" -"Utilizza le revisioni salvate in <file> anziché richiamare git-rev-list" +msgstr "Usa le revisioni salvate in <file> anziché richiamare git-rev-list" -#: builtin/blame.c:821 +#: builtin/blame.c:822 msgid "Use <file>'s contents as the final image" msgstr "Usa i contenuti di <file> come immagine finale" -#: builtin/blame.c:822 builtin/blame.c:823 +#: builtin/blame.c:823 builtin/blame.c:824 msgid "score" msgstr "punteggio" -#: builtin/blame.c:822 +#: builtin/blame.c:823 msgid "Find line copies within and across files" msgstr "Trova copie delle righe all'interno e fra file" -#: builtin/blame.c:823 +#: builtin/blame.c:824 msgid "Find line movements within and across files" msgstr "Trova righe spostate all'interno e fra file" -#: builtin/blame.c:824 +#: builtin/blame.c:825 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:824 +#: builtin/blame.c:825 msgid "Process only line range n,m, counting from 1" msgstr "Elabora solo l'intervallo righe n,m, contandole da 1" -#: builtin/blame.c:875 +#: builtin/blame.c:876 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "" "--progress non può essere usato con --incremental o con i formati porcelain" @@ -8748,18 +9482,18 @@ msgstr "" #. your language may need more or fewer display #. columns. #. -#: builtin/blame.c:926 +#: builtin/blame.c:927 msgid "4 years, 11 months ago" msgstr "4 anni, 11 giorni fa" -#: builtin/blame.c:1018 +#: builtin/blame.c:1031 #, c-format msgid "file %s has only %lu line" msgid_plural "file %s has only %lu lines" msgstr[0] "il file %s ha solo %lu riga" msgstr[1] "il file %s ha solo %lu righe" -#: builtin/blame.c:1064 +#: builtin/blame.c:1077 msgid "Blaming lines" msgstr "Eseguo il blame sulle righe" @@ -8872,71 +9606,80 @@ msgstr "Eliminato branch remoto tracciato %s (era %s).\n" msgid "Deleted branch %s (was %s).\n" msgstr "Eliminato branch %s (era %s).\n" -#: builtin/branch.c:421 builtin/tag.c:59 +#: builtin/branch.c:421 builtin/tag.c:60 msgid "unable to parse format string" msgstr "impossibile analizzare la stringa di formato" +#: builtin/branch.c:452 +msgid "could not resolve HEAD" +msgstr "impossibile risolvere HEAD" + #: builtin/branch.c:458 #, c-format +msgid "HEAD (%s) points outside of refs/heads/" +msgstr "HEAD (%s) punta a un oggetto non in refs/heads/" + +#: builtin/branch.c:473 +#, c-format msgid "Branch %s is being rebased at %s" msgstr "Rebase del branch %s in corso in %s" -#: builtin/branch.c:462 +#: builtin/branch.c:477 #, c-format msgid "Branch %s is being bisected at %s" msgstr "Bisezione del branch %s in corso in %s" -#: builtin/branch.c:479 +#: builtin/branch.c:494 msgid "cannot copy the current branch while not on any." msgstr "" "impossibile copiare il branch corrente quando non si è su alcun branch." -#: builtin/branch.c:481 +#: builtin/branch.c:496 msgid "cannot rename the current branch while not on any." msgstr "" "impossibile rinominare il branch corrente quando non si è su alcun branch." -#: builtin/branch.c:492 +#: builtin/branch.c:507 #, c-format msgid "Invalid branch name: '%s'" msgstr "Nome branch non valido: '%s'" -#: builtin/branch.c:519 +#: builtin/branch.c:534 msgid "Branch rename failed" msgstr "Ridenominazione del branch non riuscita" -#: builtin/branch.c:521 +#: builtin/branch.c:536 msgid "Branch copy failed" msgstr "Copia del branch non riuscita" -#: builtin/branch.c:525 +#: builtin/branch.c:540 #, c-format msgid "Created a copy of a misnamed branch '%s'" msgstr "Creata copia del branch mal denominato '%s'" -#: builtin/branch.c:528 +#: builtin/branch.c:543 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "Branch mal denominato '%s' rinominato" -#: builtin/branch.c:534 +#: builtin/branch.c:549 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "Branch rinominato in %s, ma HEAD non è aggiornato!" -#: builtin/branch.c:543 +#: builtin/branch.c:558 msgid "Branch is renamed, but update of config-file failed" msgstr "" "Il branch è stato rinominato, ma l'aggiornamento del file di configurazione " "non è riuscito" -#: builtin/branch.c:545 +#: builtin/branch.c:560 msgid "Branch is copied, but update of config-file failed" msgstr "" "Il branch è stato copiato, ma l'aggiornamento del file di configurazione non " "è riuscito" -#: builtin/branch.c:561 +#: builtin/branch.c:576 #, c-format msgid "" "Please edit the description for the branch\n" @@ -8947,192 +9690,186 @@ msgstr "" " %s\n" "Le righe che iniziano con '%c' saranno omesse.\n" -#: builtin/branch.c:594 +#: builtin/branch.c:610 msgid "Generic options" msgstr "Opzioni generiche" -#: builtin/branch.c:596 +#: builtin/branch.c:612 msgid "show hash and subject, give twice for upstream branch" msgstr "" "visualizza l'hash e l'oggetto, usa l'opzione due volte per il branch upstream" -#: builtin/branch.c:597 +#: builtin/branch.c:613 msgid "suppress informational messages" msgstr "non visualizzare i messaggi informativi" -#: builtin/branch.c:598 +#: builtin/branch.c:614 msgid "set up tracking mode (see git-pull(1))" msgstr "imposta la modalità tracking (vedi git-pull(1))" -#: builtin/branch.c:600 +#: builtin/branch.c:616 msgid "do not use" msgstr "non usare" -#: builtin/branch.c:602 builtin/rebase--interactive.c:182 +#: builtin/branch.c:618 builtin/rebase.c:485 msgid "upstream" msgstr "upstream" -#: builtin/branch.c:602 +#: builtin/branch.c:618 msgid "change the upstream info" msgstr "modifica le informazioni sull'upstream" -#: builtin/branch.c:603 +#: builtin/branch.c:619 msgid "Unset the upstream info" msgstr "Rimuovi le informazioni sull'upstream" -#: builtin/branch.c:604 +#: builtin/branch.c:620 msgid "use colored output" msgstr "usa l'output colorato" -#: builtin/branch.c:605 +#: builtin/branch.c:621 msgid "act on remote-tracking branches" msgstr "agisci sui branch remoti tracciati" -#: builtin/branch.c:607 builtin/branch.c:609 +#: builtin/branch.c:623 builtin/branch.c:625 msgid "print only branches that contain the commit" msgstr "stampa solo i branch che contengono i commit" -#: builtin/branch.c:608 builtin/branch.c:610 +#: builtin/branch.c:624 builtin/branch.c:626 msgid "print only branches that don't contain the commit" msgstr "stampa solo i branch che non contengono i commit" -#: builtin/branch.c:613 +#: builtin/branch.c:629 msgid "Specific git-branch actions:" msgstr "Azioni specifiche di git-branch:" -#: builtin/branch.c:614 +#: builtin/branch.c:630 msgid "list both remote-tracking and local branches" msgstr "elenca sia i branch remoti tracciati sia quelli locali" -#: builtin/branch.c:616 +#: builtin/branch.c:632 msgid "delete fully merged branch" msgstr "elimina il branch completamente sottoposto a merge" -#: builtin/branch.c:617 +#: builtin/branch.c:633 msgid "delete branch (even if not merged)" msgstr "elimina il branch (anche se non è stato sottoposto a merge)" -#: builtin/branch.c:618 +#: builtin/branch.c:634 msgid "move/rename a branch and its reflog" msgstr "sposta/rinomina un branch e il suo registro dei riferimenti" -#: builtin/branch.c:619 +#: builtin/branch.c:635 msgid "move/rename a branch, even if target exists" msgstr "sposta/rinomina un branch anche se la destinazione esiste" -#: builtin/branch.c:620 +#: builtin/branch.c:636 msgid "copy a branch and its reflog" msgstr "copia un branch e il suo registro dei riferimenti" -#: builtin/branch.c:621 +#: builtin/branch.c:637 msgid "copy a branch, even if target exists" msgstr "copia un branch anche se la destinazione esiste" -#: builtin/branch.c:622 +#: builtin/branch.c:638 msgid "list branch names" msgstr "elenca i nomi dei branch" -#: builtin/branch.c:623 +#: builtin/branch.c:639 +msgid "show current branch name" +msgstr "visualizza il nome del branch corrente" + +#: builtin/branch.c:640 msgid "create the branch's reflog" msgstr "crea il registro dei riferimenti del branch" -#: builtin/branch.c:625 +#: builtin/branch.c:642 msgid "edit the description for the branch" msgstr "modifica la descrizione del branch" -#: builtin/branch.c:626 +#: builtin/branch.c:643 msgid "force creation, move/rename, deletion" msgstr "forza la creazione, spostamento/ridenominazione, eliminazione" -#: builtin/branch.c:627 +#: builtin/branch.c:644 msgid "print only branches that are merged" msgstr "stampa solo i branch sottoposti a merge" -#: builtin/branch.c:628 +#: builtin/branch.c:645 msgid "print only branches that are not merged" msgstr "stampa solo i branch non sottoposti a merge" -#: builtin/branch.c:629 +#: builtin/branch.c:646 msgid "list branches in columns" msgstr "elenca i branch in colonne" -#: builtin/branch.c:630 builtin/for-each-ref.c:40 builtin/ls-remote.c:70 -#: builtin/tag.c:415 -msgid "key" -msgstr "chiave" - -#: builtin/branch.c:631 builtin/for-each-ref.c:41 builtin/ls-remote.c:71 -#: builtin/tag.c:416 -msgid "field name to sort on" -msgstr "nome campo in base a cui ordinare" - -#: builtin/branch.c:633 builtin/for-each-ref.c:43 builtin/notes.c:415 +#: builtin/branch.c:649 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:418 +#: builtin/tag.c:427 msgid "object" msgstr "oggetto" -#: builtin/branch.c:634 +#: builtin/branch.c:650 msgid "print only branches of the object" msgstr "stampa solo i branch dell'oggetto" -#: builtin/branch.c:636 builtin/for-each-ref.c:49 builtin/tag.c:425 +#: builtin/branch.c:652 builtin/for-each-ref.c:48 builtin/tag.c:434 msgid "sorting and filtering are case insensitive" msgstr "" "l'ordinamento e il filtraggio non fanno differenza tra maiuscole e minuscole" -#: builtin/branch.c:637 builtin/for-each-ref.c:38 builtin/tag.c:423 +#: builtin/branch.c:653 builtin/for-each-ref.c:38 builtin/tag.c:432 #: builtin/verify-tag.c:39 msgid "format to use for the output" msgstr "formato da usare per l'output" -#: builtin/branch.c:660 builtin/clone.c:746 +#: builtin/branch.c:676 builtin/clone.c:748 msgid "HEAD not found below refs/heads!" msgstr "HEAD non trovato fra i riferimenti/head!" -#: builtin/branch.c:683 +#: builtin/branch.c:700 msgid "--column and --verbose are incompatible" msgstr "--column e --verbose non sono compatibili" -#: builtin/branch.c:698 builtin/branch.c:749 builtin/branch.c:758 +#: builtin/branch.c:715 builtin/branch.c:769 builtin/branch.c:778 msgid "branch name required" msgstr "nome branch richiesto" -#: builtin/branch.c:725 +#: builtin/branch.c:745 msgid "Cannot give description to detached HEAD" msgstr "Impossibile fornire una descrizione per l'HEAD scollegato" -#: builtin/branch.c:730 +#: builtin/branch.c:750 msgid "cannot edit description of more than one branch" msgstr "impossibile modificare la descrizione per più di un branch" -#: builtin/branch.c:737 +#: builtin/branch.c:757 #, c-format msgid "No commit on branch '%s' yet." msgstr "Non esiste ancora nessun commit sul branch '%s'." -#: builtin/branch.c:740 +#: builtin/branch.c:760 #, c-format msgid "No branch named '%s'." msgstr "Non esiste alcun branch denominato '%s'." -#: builtin/branch.c:755 +#: builtin/branch.c:775 msgid "too many branches for a copy operation" msgstr "sono presenti troppi branch per consentire un'operazione di copia" -#: builtin/branch.c:764 +#: builtin/branch.c:784 msgid "too many arguments for a rename operation" msgstr "" "sono presenti troppi argomenti per consentire un'operazione di " "ridenominazione" -#: builtin/branch.c:769 +#: builtin/branch.c:789 msgid "too many arguments to set new upstream" msgstr "" "sono presenti troppi argomenti per consentire l'impostazione del nuovo " "upstream" -#: builtin/branch.c:773 +#: builtin/branch.c:793 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." @@ -9140,38 +9877,38 @@ msgstr "" "impossibile impostare l'upstream di HEAD a %s quando non punta ad alcun " "branch." -#: builtin/branch.c:776 builtin/branch.c:799 +#: builtin/branch.c:796 builtin/branch.c:819 #, c-format msgid "no such branch '%s'" msgstr "branch '%s' non esistente" -#: builtin/branch.c:780 +#: builtin/branch.c:800 #, c-format msgid "branch '%s' does not exist" msgstr "il branch '%s' non esiste" -#: builtin/branch.c:793 +#: builtin/branch.c:813 msgid "too many arguments to unset upstream" msgstr "" "sono presenti troppi argomenti per rimuovere le informazioni sull'upstream" -#: builtin/branch.c:797 +#: builtin/branch.c:817 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" "impossibile rimuovere le informazioni sull'upstream di HEAD quando non punta " "ad alcun branch." -#: builtin/branch.c:803 +#: builtin/branch.c:823 #, c-format msgid "Branch '%s' has no upstream information" msgstr "Il branch '%s' non ha informazioni sull'upstream" -#: builtin/branch.c:813 +#: builtin/branch.c:833 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "" "le opzioni -a e -r per 'git branch' non hanno senso con il nome di un branch" -#: builtin/branch.c:816 +#: builtin/branch.c:836 msgid "" "the '--set-upstream' option is no longer supported. Please use '--track' or " "'--set-upstream-to' instead." @@ -9240,7 +9977,7 @@ msgstr "esegui textconv sul contenuto dell'oggetto (per gli oggetti blob)" msgid "for blob objects, run filters on object's content" msgstr "esegui i filtri sul contenuto dell'oggetto (per gli oggetti blob)" -#: builtin/cat-file.c:643 git-submodule.sh:860 +#: builtin/cat-file.c:643 git-submodule.sh:936 msgid "blob" msgstr "blob" @@ -9304,8 +10041,8 @@ msgstr "leggi i nomi dei file dallo standard input" msgid "terminate input and output records by a NUL character" msgstr "termina i record di input e output con un carattere NUL" -#: builtin/check-ignore.c:21 builtin/checkout.c:1280 builtin/gc.c:517 -#: builtin/worktree.c:496 +#: builtin/check-ignore.c:21 builtin/checkout.c:1355 builtin/gc.c:538 +#: builtin/worktree.c:499 msgid "suppress progress reporting" msgstr "non visualizzare l'avanzamento dell'operazione" @@ -9396,8 +10133,8 @@ msgstr "scrivi il contenuto in file temporanei" #: 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:1857 -#: builtin/worktree.c:669 +#: builtin/submodule--helper.c:1383 builtin/submodule--helper.c:1856 +#: builtin/worktree.c:672 msgid "string" msgstr "stringa" @@ -9417,128 +10154,142 @@ msgstr "git checkout [<opzioni>] <branch>" msgid "git checkout [<options>] [<branch>] -- <file>..." msgstr "git checkout [<opzioni>] [<branch>] -- <file>..." -#: builtin/checkout.c:147 builtin/checkout.c:181 +#: builtin/checkout.c:151 builtin/checkout.c:190 #, c-format msgid "path '%s' does not have our version" msgstr "il percorso '%s' non ha la nostra versione" -#: builtin/checkout.c:149 builtin/checkout.c:183 +#: builtin/checkout.c:153 builtin/checkout.c:192 #, c-format msgid "path '%s' does not have their version" msgstr "il percorso '%s' non ha la loro versione" -#: builtin/checkout.c:165 +#: builtin/checkout.c:169 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "il percorso '%s' non ha tutte le versioni necessarie" -#: builtin/checkout.c:210 +#: builtin/checkout.c:219 #, c-format msgid "path '%s' does not have necessary versions" msgstr "il percorso '%s' non ha le versioni necessarie" -#: builtin/checkout.c:228 +#: builtin/checkout.c:237 #, c-format msgid "path '%s': cannot merge" msgstr "percorso '%s': impossibile eseguire il merge" -#: builtin/checkout.c:244 +#: builtin/checkout.c:253 #, c-format msgid "Unable to add merge result for '%s'" msgstr "Impossibile aggiungere il risultato del merge per '%s'" -#: builtin/checkout.c:267 builtin/checkout.c:270 builtin/checkout.c:273 -#: builtin/checkout.c:276 +#: 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' non può essere usato con i percorsi in fase di aggiornamento" -#: builtin/checkout.c:279 builtin/checkout.c:282 +#: builtin/checkout.c:343 builtin/checkout.c:346 #, c-format msgid "'%s' cannot be used with %s" msgstr "'%s' non può essere usato con %s" -#: builtin/checkout.c:285 +#: builtin/checkout.c:349 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "" "Impossibile aggiornare dei percorsi e passare al branch '%s' " "contemporaneamente." -#: builtin/checkout.c:354 builtin/checkout.c:361 +#: builtin/checkout.c:396 builtin/checkout.c:403 #, c-format msgid "path '%s' is unmerged" msgstr "il percorso '%s' non è stato sottoposto a merge" -#: builtin/checkout.c:397 +#: builtin/checkout.c:442 #, c-format msgid "Recreated %d merge conflict" msgid_plural "Recreated %d merge conflicts" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Ricreato %d conflitto di merge" +msgstr[1] "Ricreati %d conflitti di merge" -#: builtin/checkout.c:402 -#, fuzzy, c-format +#: builtin/checkout.c:447 +#, c-format msgid "Updated %d path from %s" msgid_plural "Updated %d paths from %s" -msgstr[0] "Preimmagine di '%s' aggiornata" -msgstr[1] "Preimmagine di '%s' aggiornata" +msgstr[0] "Aggiornato %d percorso da %s" +msgstr[1] "Aggiornati %d percorsi da %s" -#: builtin/checkout.c:409 -#, fuzzy, c-format +#: builtin/checkout.c:454 +#, c-format msgid "Updated %d path from the index" msgid_plural "Updated %d paths from the index" -msgstr[0] "lettura dell'indice non riuscita" -msgstr[1] "lettura dell'indice non riuscita" +msgstr[0] "Aggiornato %d percorso dall'indice" +msgstr[1] "Aggiornati %d percorsi dall'indice" -#: builtin/checkout.c:645 +#: builtin/checkout.c:695 msgid "you need to resolve your current index first" msgstr "prima devi risolvere l'indice corrente" -#: builtin/checkout.c:782 +#: builtin/checkout.c:744 +#, c-format +msgid "" +"cannot continue with staged changes in the following files:\n" +"%s" +msgstr "" +"impossibile continuare con modifiche in stage nei file seguenti:\n" +"%s" + +#: builtin/checkout.c:751 +#, c-format +msgid "staged changes in the following files may be lost: %s" +msgstr "le modifiche in stage nei seguenti file potrebbero andare perdute: %s" + +#: builtin/checkout.c:848 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "Impossibile esaminare il registro dei riferimenti per '%s': %s\n" -#: builtin/checkout.c:824 +#: builtin/checkout.c:890 msgid "HEAD is now at" msgstr "HEAD si trova ora a" -#: builtin/checkout.c:828 builtin/clone.c:699 +#: builtin/checkout.c:894 builtin/clone.c:701 msgid "unable to update HEAD" msgstr "impossibile aggiornare HEAD" -#: builtin/checkout.c:832 +#: builtin/checkout.c:898 #, c-format msgid "Reset branch '%s'\n" msgstr "Ripristina il branch '%s'\n" -#: builtin/checkout.c:835 +#: builtin/checkout.c:901 #, c-format msgid "Already on '%s'\n" msgstr "Si è già su '%s'\n" -#: builtin/checkout.c:839 +#: builtin/checkout.c:905 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Si è passati al branch '%s' e lo si è reimpostato\n" -#: builtin/checkout.c:841 builtin/checkout.c:1212 +#: builtin/checkout.c:907 builtin/checkout.c:1283 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Si è passati a un nuovo branch '%s'\n" -#: builtin/checkout.c:843 +#: builtin/checkout.c:909 #, c-format msgid "Switched to branch '%s'\n" msgstr "Si è passati al branch '%s'\n" -#: builtin/checkout.c:894 +#: builtin/checkout.c:960 #, c-format msgid " ... and %d more.\n" msgstr " ...e altri %d.\n" -#: builtin/checkout.c:900 +#: builtin/checkout.c:966 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -9561,7 +10312,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:919 +#: builtin/checkout.c:985 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -9588,173 +10339,182 @@ msgstr[1] "" " git branch <nome del nuovo branch> %s\n" "\n" -#: builtin/checkout.c:951 +#: builtin/checkout.c:1017 msgid "internal error in revision walk" msgstr "errore interno durante la visita delle revisioni" -#: builtin/checkout.c:955 +#: builtin/checkout.c:1021 msgid "Previous HEAD position was" msgstr "La precedente posizione di HEAD era" -#: builtin/checkout.c:983 builtin/checkout.c:1207 +#: builtin/checkout.c:1052 builtin/checkout.c:1278 msgid "You are on a branch yet to be born" msgstr "Sei su un branch che deve ancora essere creato" -#: builtin/checkout.c:1104 +#: builtin/checkout.c:1173 #, c-format msgid "only one reference expected, %d given." -msgstr "atteso solo un riferimento, %d forniti." +msgstr "atteso solo un riferimento, %d specificati." -#: builtin/checkout.c:1140 +#: builtin/checkout.c:1209 #, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" "Please use -- (and optionally --no-guess) to disambiguate" msgstr "" +"'%s' potrebbe essere sia un file locale, sia un branch da tracciare.\n" +"Usa -- (e facoltativamente --no-guess) per rimuovere l'ambiguità" -#: builtin/checkout.c:1153 builtin/worktree.c:290 builtin/worktree.c:445 +#: builtin/checkout.c:1222 builtin/worktree.c:290 builtin/worktree.c:448 #, c-format msgid "invalid reference: %s" msgstr "riferimento non valido: %s" -#: builtin/checkout.c:1182 +#: builtin/checkout.c:1251 #, c-format msgid "reference is not a tree: %s" msgstr "il riferimento non è un albero: %s" -#: builtin/checkout.c:1221 +#: builtin/checkout.c:1292 msgid "paths cannot be used with switching branches" msgstr "i percorsi non possono essere usati passando da un branch a un altro" -#: builtin/checkout.c:1224 builtin/checkout.c:1228 +#: builtin/checkout.c:1295 builtin/checkout.c:1299 builtin/checkout.c:1303 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "'%s' non può essere usato passando da un branch a un altro" -#: builtin/checkout.c:1232 builtin/checkout.c:1235 builtin/checkout.c:1240 -#: builtin/checkout.c:1243 +#: builtin/checkout.c:1307 builtin/checkout.c:1310 builtin/checkout.c:1315 +#: builtin/checkout.c:1318 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' non può essere usato con '%s'" -#: builtin/checkout.c:1248 +#: builtin/checkout.c:1323 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "Impossibile cambiare branch per passare a '%s' che non è un commit" -#: builtin/checkout.c:1281 builtin/checkout.c:1283 builtin/clone.c:120 -#: builtin/remote.c:169 builtin/remote.c:171 builtin/worktree.c:489 -#: builtin/worktree.c:491 +#: 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 "branch" -#: builtin/checkout.c:1282 +#: builtin/checkout.c:1357 msgid "create and checkout a new branch" msgstr "crea un nuovo branch ed eseguine il checkout" -#: builtin/checkout.c:1284 +#: builtin/checkout.c:1359 msgid "create/reset and checkout a branch" msgstr "crea/reimposta un branch ed eseguine il checkout" -#: builtin/checkout.c:1285 +#: builtin/checkout.c:1360 msgid "create reflog for new branch" msgstr "crea il registro dei riferimenti per il nuovo branch" -#: builtin/checkout.c:1286 builtin/worktree.c:493 +#: builtin/checkout.c:1361 builtin/worktree.c:496 msgid "detach HEAD at named commit" msgstr "scollega l'HEAD al commit specificato" -#: builtin/checkout.c:1287 +#: builtin/checkout.c:1362 msgid "set upstream info for new branch" msgstr "imposta le informazioni sull'upstream per il nuovo branch" -#: builtin/checkout.c:1289 +#: builtin/checkout.c:1364 msgid "new-branch" msgstr "nuovo branch" -#: builtin/checkout.c:1289 +#: builtin/checkout.c:1364 msgid "new unparented branch" msgstr "nuovo branch senza genitore" -#: builtin/checkout.c:1291 +#: builtin/checkout.c:1366 msgid "checkout our version for unmerged files" msgstr "" "esegui il checkout della nostra versione per i file non sottoposti a merge" -#: builtin/checkout.c:1294 +#: builtin/checkout.c:1369 msgid "checkout their version for unmerged files" msgstr "" "esegui il checkout della loro versione per i file non sottoposti a merge" -#: builtin/checkout.c:1296 +#: builtin/checkout.c:1371 msgid "force checkout (throw away local modifications)" msgstr "esegui forzatamente il checkout (scarta le modifiche locali)" -#: builtin/checkout.c:1298 +#: builtin/checkout.c:1373 msgid "perform a 3-way merge with the new branch" msgstr "esegui un merge a tre vie con il nuovo branch" -#: builtin/checkout.c:1300 builtin/merge.c:276 +#: builtin/checkout.c:1375 builtin/merge.c:284 msgid "update ignored files (default)" msgstr "aggiorna i file ignorati (impostazione predefinita)" -#: builtin/checkout.c:1302 builtin/log.c:1586 parse-options.h:272 +#: builtin/checkout.c:1377 builtin/log.c:1594 parse-options.h:317 msgid "style" msgstr "stile" -#: builtin/checkout.c:1303 +#: builtin/checkout.c:1378 msgid "conflict style (merge or diff3)" msgstr "stile conflitti (merge o diff3)" -#: builtin/checkout.c:1306 +#: builtin/checkout.c:1381 msgid "do not limit pathspecs to sparse entries only" msgstr "non limitare gli specificatori percorso solo alle voci sparse" -#: builtin/checkout.c:1308 -#, fuzzy +#: builtin/checkout.c:1383 msgid "do not second guess 'git checkout <no-such-branch>'" -msgstr "prevedi 'git checkout <branch inesistente>'" +msgstr "non indovinare 'git checkout <branch inesistente>'" -#: builtin/checkout.c:1310 +#: builtin/checkout.c:1385 msgid "do not check if another worktree is holding the given ref" msgstr "" "non controllare se un altro albero di lavoro contiene il riferimento " "specificato" -#: builtin/checkout.c:1314 builtin/clone.c:87 builtin/fetch.c:141 -#: builtin/merge.c:273 builtin/pull.c:130 builtin/push.c:575 +#: 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 "forza l'indicazione d'avanzamento dell'operazione" -#: builtin/checkout.c:1345 +#: builtin/checkout.c:1390 +msgid "use overlay mode (default)" +msgstr "usa modalità overlay (impostazione predefinita)" + +#: builtin/checkout.c:1422 msgid "-b, -B and --orphan are mutually exclusive" msgstr "le opzioni -b, -B e --orphan sono mutuamente esclusive" -#: builtin/checkout.c:1362 +#: builtin/checkout.c:1425 +msgid "-p and --overlay are mutually exclusive" +msgstr "le opzioni -p e --overlay sono mutualmente esclusive" + +#: builtin/checkout.c:1442 msgid "--track needs a branch name" msgstr "--track richiede il nome di un branch" -#: builtin/checkout.c:1367 +#: builtin/checkout.c:1447 msgid "missing branch name; try -b" msgstr "nome del branch mancante; prova con -b" -#: builtin/checkout.c:1404 +#: builtin/checkout.c:1484 msgid "invalid path specification" msgstr "specificatore percorso non valido" -#: builtin/checkout.c:1411 +#: builtin/checkout.c:1491 #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "" "'%s' non è un commit e non si può creare un branch '%s' che parta da esso" -#: builtin/checkout.c:1415 +#: builtin/checkout.c:1495 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: --detach non accetta un percorso '%s' come argomento" -#: builtin/checkout.c:1419 +#: builtin/checkout.c:1499 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -9762,7 +10522,7 @@ msgstr "" "git checkout: --ours/--theirs, --force e --merge sono incompatibili quando\n" "si esegue il checkout dell'indice." -#: builtin/checkout.c:1439 +#: builtin/checkout.c:1519 #, c-format msgid "" "'%s' matched more than one remote tracking branch.\n" @@ -9784,7 +10544,7 @@ msgstr "" "non siamo riusciti nemmeno a portare a termine tale operazione!\n" "\n" "Se intendevi eseguire il checkout di un branch remoto, ad es. 'origin',\n" -"puoi farlo utilizzando la versione completamente qualificata del nome\n" +"puoi farlo usando la versione completamente qualificata del nome\n" "con l'opzione --track:\n" "\n" " git checkout --track origin/<nome>\n" @@ -9944,9 +10704,9 @@ msgid "remove whole directories" msgstr "rimuovi intere directory" #: builtin/clean.c:913 builtin/describe.c:546 builtin/describe.c:548 -#: builtin/grep.c:897 builtin/log.c:167 builtin/log.c:169 -#: builtin/ls-files.c:557 builtin/name-rev.c:415 builtin/name-rev.c:417 -#: builtin/show-ref.c:178 +#: 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/show-ref.c:179 msgid "pattern" msgstr "pattern" @@ -9986,139 +10746,149 @@ msgstr "" msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<opzioni>] [--] <repository> [<directory>]" -#: builtin/clone.c:89 +#: builtin/clone.c:90 msgid "don't create a checkout" msgstr "non creare un checkout" -#: builtin/clone.c:90 builtin/clone.c:92 builtin/init-db.c:481 +#: builtin/clone.c:91 builtin/clone.c:93 builtin/init-db.c:489 msgid "create a bare repository" msgstr "crea un repository spoglio" -#: builtin/clone.c:94 +#: builtin/clone.c:95 msgid "create a mirror repository (implies bare)" msgstr "crea un repository mirror (implica che sia spoglio)" -#: builtin/clone.c:96 +#: builtin/clone.c:97 msgid "to clone from a local repository" msgstr "per clonare da un repository locale" -#: builtin/clone.c:98 +#: builtin/clone.c:99 msgid "don't use local hardlinks, always copy" msgstr "non usare i collegamenti reali locali, copia sempre i file" -#: builtin/clone.c:100 +#: builtin/clone.c:101 msgid "setup as shared repository" msgstr "imposta il repository come condiviso" -#: builtin/clone.c:102 builtin/clone.c:106 +#: builtin/clone.c:104 msgid "pathspec" msgstr "specificatore percorso" -#: builtin/clone.c:102 builtin/clone.c:106 +#: builtin/clone.c:104 msgid "initialize submodules in the clone" msgstr "inizializza sottomoduli durante la clonazione" -#: builtin/clone.c:109 +#: builtin/clone.c:107 msgid "number of submodules cloned in parallel" msgstr "numero di sottomoduli clonati in parallelo" -#: builtin/clone.c:110 builtin/init-db.c:478 +#: builtin/clone.c:108 builtin/init-db.c:486 msgid "template-directory" msgstr "directory modelli" -#: builtin/clone.c:111 builtin/init-db.c:479 +#: builtin/clone.c:109 builtin/init-db.c:487 msgid "directory from which templates will be used" msgstr "directory da cui saranno recuperati i modelli" -#: builtin/clone.c:113 builtin/clone.c:115 builtin/submodule--helper.c:1379 -#: builtin/submodule--helper.c:1860 +#: builtin/clone.c:111 builtin/clone.c:113 builtin/submodule--helper.c:1379 +#: builtin/submodule--helper.c:1859 msgid "reference repository" msgstr "repository di riferimento" -#: builtin/clone.c:117 builtin/submodule--helper.c:1381 -#: builtin/submodule--helper.c:1862 +#: builtin/clone.c:115 builtin/submodule--helper.c:1381 +#: builtin/submodule--helper.c:1861 msgid "use --reference only while cloning" msgstr "usa --reference solo durante la clonazione" -#: builtin/clone.c:118 builtin/column.c:27 builtin/merge-file.c:46 -#: builtin/pack-objects.c:3303 builtin/repack.c:329 +#: builtin/clone.c:116 builtin/column.c:27 builtin/merge-file.c:46 +#: builtin/pack-objects.c:3306 builtin/repack.c:329 msgid "name" msgstr "nome" -#: builtin/clone.c:119 +#: builtin/clone.c:117 msgid "use <name> instead of 'origin' to track upstream" msgstr "usa <nome> anziché 'origin' per tracciare l'upstream" -#: builtin/clone.c:121 +#: builtin/clone.c:119 msgid "checkout <branch> instead of the remote's HEAD" msgstr "esegui il checkout di <branch> anziché dell'HEAD del remoto" -#: builtin/clone.c:123 +#: builtin/clone.c:121 msgid "path to git-upload-pack on the remote" msgstr "percorso al comando remoto git-upload-pack" -#: builtin/clone.c:124 builtin/fetch.c:142 builtin/grep.c:836 -#: builtin/pull.c:218 +#: builtin/clone.c:122 builtin/fetch.c:142 builtin/grep.c:836 +#: builtin/pull.c:225 msgid "depth" msgstr "profondità" -#: builtin/clone.c:125 +#: builtin/clone.c:123 msgid "create a shallow clone of that depth" msgstr "crea un clone shallow con questa profondità" -#: builtin/clone.c:126 builtin/fetch.c:144 builtin/pack-objects.c:3292 +#: builtin/clone.c:124 builtin/fetch.c:144 builtin/pack-objects.c:3295 msgid "time" msgstr "tempo" -#: builtin/clone.c:127 +#: builtin/clone.c:125 msgid "create a shallow clone since a specific time" msgstr "crea un clone shallow a partire dall'istante specificato" -#: builtin/clone.c:128 builtin/fetch.c:146 builtin/fetch.c:169 -#: builtin/rebase.c:1039 +#: builtin/clone.c:126 builtin/fetch.c:146 builtin/fetch.c:169 +#: builtin/rebase.c:1389 msgid "revision" msgstr "revisione" -#: builtin/clone.c:129 builtin/fetch.c:147 +#: builtin/clone.c:127 builtin/fetch.c:147 msgid "deepen history of shallow clone, excluding rev" msgstr "" "aumenta la profondità della cronologia del clone shallow fino alla revisione " "specificata esclusa" -#: builtin/clone.c:131 +#: builtin/clone.c:129 msgid "clone only one branch, HEAD or --branch" msgstr "clona solo un branch, HEAD o quello specificato con --branch" -#: builtin/clone.c:133 +#: builtin/clone.c:131 msgid "don't clone any tags, and make later fetches not to follow them" msgstr "non clonare alcun tag e fai sì che i fetch successivi non li seguano" -#: builtin/clone.c:135 +#: builtin/clone.c:133 msgid "any cloned submodules will be shallow" msgstr "tutti i sottomoduli clonati saranno shallow" -#: builtin/clone.c:136 builtin/init-db.c:487 +#: builtin/clone.c:134 builtin/init-db.c:495 msgid "gitdir" msgstr "directory Git" -#: builtin/clone.c:137 builtin/init-db.c:488 +#: builtin/clone.c:135 builtin/init-db.c:496 msgid "separate git dir from working tree" msgstr "separa la directory Git dall'albero di lavoro" -#: builtin/clone.c:138 +#: builtin/clone.c:136 msgid "key=value" msgstr "chiave=valore" -#: builtin/clone.c:139 +#: builtin/clone.c:137 msgid "set config inside the new repository" msgstr "imposta la configurazione nel nuovo repository" -#: builtin/clone.c:140 builtin/fetch.c:165 builtin/pull.c:231 +#: builtin/clone.c:139 builtin/fetch.c:164 builtin/ls-remote.c:76 +#: builtin/push.c:585 builtin/send-pack.c:172 +msgid "server-specific" +msgstr "specifica del server" + +#: builtin/clone.c:139 builtin/fetch.c:164 builtin/ls-remote.c:76 +#: builtin/push.c:585 builtin/send-pack.c:173 +msgid "option to transmit" +msgstr "opzione da trasmettere" + +#: builtin/clone.c:140 builtin/fetch.c:165 builtin/pull.c:238 #: builtin/push.c:586 msgid "use IPv4 addresses only" msgstr "usa solo indirizzi IPv4" -#: builtin/clone.c:142 builtin/fetch.c:167 builtin/pull.c:234 +#: builtin/clone.c:142 builtin/fetch.c:167 builtin/pull.c:241 #: builtin/push.c:588 msgid "use IPv6 addresses only" msgstr "usa solo indirizzi IPv6" @@ -10187,93 +10957,93 @@ msgstr "" msgid "Could not find remote branch %s to clone." msgstr "Impossibile trovare il branch remoto %s da clonare." -#: builtin/clone.c:687 +#: builtin/clone.c:689 #, c-format msgid "unable to update %s" msgstr "impossibile aggiornare %s" -#: builtin/clone.c:737 +#: builtin/clone.c:739 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" "l'HEAD remoto fa riferimento a un riferimento inesistente, impossibile " "eseguire il checkout.\n" -#: builtin/clone.c:768 +#: builtin/clone.c:770 msgid "unable to checkout working tree" msgstr "impossibile eseguire il checkout dell'albero di lavoro" -#: builtin/clone.c:813 +#: builtin/clone.c:815 msgid "unable to write parameters to config file" msgstr "impossibile scrivere i parametri nel file di configurazione" -#: builtin/clone.c:876 +#: builtin/clone.c:878 msgid "cannot repack to clean up" msgstr "impossibile eseguire il repack per pulire l'area di lavoro" -#: builtin/clone.c:878 +#: builtin/clone.c:880 msgid "cannot unlink temporary alternates file" msgstr "impossibile eseguire l'unlink del file alternates temporaneo" -#: builtin/clone.c:918 builtin/receive-pack.c:1941 +#: builtin/clone.c:920 builtin/receive-pack.c:1952 msgid "Too many arguments." msgstr "Troppi argomenti." -#: builtin/clone.c:922 +#: builtin/clone.c:924 msgid "You must specify a repository to clone." msgstr "Devi specificare un repository da clonare." -#: builtin/clone.c:935 +#: builtin/clone.c:937 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "le opzioni --bare e --origin %s non sono compatibili." -#: builtin/clone.c:938 +#: builtin/clone.c:940 msgid "--bare and --separate-git-dir are incompatible." msgstr "le opzioni --bare e --separate-git-dir non sono compatibili." -#: builtin/clone.c:951 +#: builtin/clone.c:953 #, c-format msgid "repository '%s' does not exist" msgstr "il repository '%s' non esiste" -#: builtin/clone.c:957 builtin/fetch.c:1608 +#: builtin/clone.c:959 builtin/fetch.c:1610 #, c-format msgid "depth %s is not a positive number" msgstr "la profondità %s non è un numero positivo" -#: builtin/clone.c:967 +#: builtin/clone.c:969 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "" "il percorso di destinazione '%s' esiste già e non è una directory vuota." -#: builtin/clone.c:977 +#: builtin/clone.c:979 #, c-format msgid "working tree '%s' already exists." msgstr "l'albero di lavoro '%s' esiste già." -#: builtin/clone.c:992 builtin/clone.c:1013 builtin/difftool.c:272 -#: builtin/worktree.c:296 builtin/worktree.c:326 +#: builtin/clone.c:994 builtin/clone.c:1015 builtin/difftool.c:264 +#: builtin/worktree.c:296 builtin/worktree.c:328 #, c-format msgid "could not create leading directories of '%s'" msgstr "impossibile creare le prime directory di '%s'" -#: builtin/clone.c:997 +#: builtin/clone.c:999 #, c-format msgid "could not create work tree dir '%s'" msgstr "impossibile creare la directory dell'albero di lavoro '%s'" -#: builtin/clone.c:1017 +#: builtin/clone.c:1019 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Clone nel repository spoglio '%s' in corso...\n" -#: builtin/clone.c:1019 +#: builtin/clone.c:1021 #, c-format msgid "Cloning into '%s'...\n" msgstr "Clone in '%s' in corso...\n" -#: builtin/clone.c:1043 +#: builtin/clone.c:1045 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" @@ -10281,36 +11051,36 @@ msgstr "" "il clone --recursive non è compatibile né con --reference né con --reference-" "if-able" -#: builtin/clone.c:1104 +#: builtin/clone.c:1106 msgid "--depth is ignored in local clones; use file:// instead." msgstr "L'opzione --depth è ignorata nei cloni locali; usa file://." -#: builtin/clone.c:1106 +#: builtin/clone.c:1108 msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "L'opzione --shallow-since è ignorata nei cloni locali; usa file://." -#: builtin/clone.c:1108 +#: builtin/clone.c:1110 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "L'opzione --shallow-exclude è ignorata nei cloni locali; usa file://." -#: builtin/clone.c:1110 +#: builtin/clone.c:1112 msgid "--filter is ignored in local clones; use file:// instead." msgstr "L'opzione --filter è ignorata nei cloni locali; usa file://." -#: builtin/clone.c:1113 +#: builtin/clone.c:1115 msgid "source repository is shallow, ignoring --local" msgstr "il repository sorgente è shallow, ignoro l'opzione --local" -#: builtin/clone.c:1118 +#: builtin/clone.c:1120 msgid "--local is ignored" msgstr "l'opzione --local è ignorata" -#: builtin/clone.c:1192 builtin/clone.c:1200 +#: builtin/clone.c:1197 builtin/clone.c:1205 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Il branch remoto %s non è stato trovato nell'upstream %s" -#: builtin/clone.c:1203 +#: builtin/clone.c:1208 msgid "You appear to have cloned an empty repository." msgstr "Sembra che tu abbia clonato un repository vuoto." @@ -10324,7 +11094,7 @@ msgstr "recupera le variabili di configurazione da qui" #: builtin/column.c:28 builtin/column.c:29 msgid "layout to use" -msgstr "layout da utilizzare" +msgstr "layout da usare" #: builtin/column.c:30 msgid "Maximum width" @@ -10346,6 +11116,74 @@ msgstr "Spazi vuoti fra le colonne" msgid "--command must be the first argument" msgstr "--command deve essere il primo argomento" +#: builtin/commit-tree.c:18 +msgid "" +"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F " +"<file>)...] <tree>" +msgstr "" +"git commit-tree [(-p <genitore>)...] [-S[<ID chiave>]] [(-m <messaggio>)...] " +"[(-F <file>)...] <albero>" + +#: builtin/commit-tree.c:31 +#, c-format +msgid "duplicate parent %s ignored" +msgstr "genitore duplicato %s ignorato" + +#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:520 +#, c-format +msgid "not a valid object name %s" +msgstr "%s non è un nome oggetto valido" + +#: builtin/commit-tree.c:93 +#, c-format +msgid "git commit-tree: failed to open '%s'" +msgstr "git commit-tree: apertura di '%s' non riuscita" + +#: builtin/commit-tree.c:96 +#, c-format +msgid "git commit-tree: failed to read '%s'" +msgstr "git commit-tree: lettura di '%s' non riuscita" + +#: builtin/commit-tree.c:98 +#, c-format +msgid "git commit-tree: failed to close '%s'" +msgstr "git commit-tree: chiusura di '%s' non riuscita" + +#: builtin/commit-tree.c:111 +msgid "parent" +msgstr "genitore" + +#: builtin/commit-tree.c:112 +msgid "id of a parent commit object" +msgstr "ID di un oggetto commit genitore" + +#: 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 +msgid "message" +msgstr "messaggio" + +#: builtin/commit-tree.c:115 builtin/commit.c:1480 +msgid "commit message" +msgstr "messaggio di commit" + +#: builtin/commit-tree.c:118 +msgid "read commit log message from file" +msgstr "leggi il messaggio di log del commit da un file" + +#: builtin/commit-tree.c:121 builtin/commit.c:1492 builtin/merge.c:283 +#: builtin/pull.c:193 builtin/revert.c:117 +msgid "GPG sign commit" +msgstr "firma il commit con GPG" + +#: builtin/commit-tree.c:133 +msgid "must give exactly one tree" +msgstr "è necessario fornire esattamente un albero" + +#: builtin/commit-tree.c:140 +msgid "git commit-tree: failed to read" +msgstr "git commit-tree: lettura non riuscita" + #: builtin/commit.c:41 msgid "git commit [<options>] [--] <pathspec>..." msgstr "git commit [<opzioni>] [--] <specificatore percorso>..." @@ -10406,7 +11244,7 @@ msgstr "decompressione dell'oggetto HEAD dell'albero non riuscita" #: builtin/commit.c:353 msgid "unable to create temporary index" -msgstr "impossibile creare l'index temporaneo" +msgstr "impossibile creare l'indice temporaneo" #: builtin/commit.c:359 msgid "interactive add failed" @@ -10414,7 +11252,7 @@ msgstr "aggiunta interattiva non riuscita" #: builtin/commit.c:373 msgid "unable to update temporary index" -msgstr "impossibile aggiornare l'index temporaneo" +msgstr "impossibile aggiornare l'indice temporaneo" #: builtin/commit.c:375 msgid "Failed to update main cache tree" @@ -10434,11 +11272,11 @@ msgstr "impossibile eseguire un commit parziale durante un cherry-pick." #: builtin/commit.c:462 msgid "cannot read the index" -msgstr "impossibile leggere l'index" +msgstr "impossibile leggere l'indice" #: builtin/commit.c:481 msgid "unable to write temporary index file" -msgstr "impossibile scrivere il file index temporaneo" +msgstr "impossibile scrivere il file indice temporaneo" #: builtin/commit.c:579 #, c-format @@ -10454,46 +11292,46 @@ msgstr "il commit '%s' ha una riga autore malformata" msgid "malformed --author parameter" msgstr "parametro --author malformato" -#: builtin/commit.c:652 +#: builtin/commit.c:653 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" msgstr "" -"impossibile selezionare un carattere commento non utilizzato\n" +"impossibile selezionare un carattere commento non usato\n" "nel messaggio di commit corrente" -#: builtin/commit.c:689 builtin/commit.c:722 builtin/commit.c:1052 +#: builtin/commit.c:691 builtin/commit.c:724 builtin/commit.c:1069 #, c-format msgid "could not lookup commit %s" msgstr "impossibile trovare il commit %s" -#: builtin/commit.c:701 builtin/shortlog.c:319 +#: builtin/commit.c:703 builtin/shortlog.c:319 #, c-format msgid "(reading log message from standard input)\n" msgstr "(lettura del messaggio di log dallo standard input)\n" -#: builtin/commit.c:703 +#: builtin/commit.c:705 msgid "could not read log from standard input" msgstr "impossibile leggere il log dallo standard input" -#: builtin/commit.c:707 +#: builtin/commit.c:709 #, c-format msgid "could not read log file '%s'" msgstr "impossibile leggere il file di log '%s'" -#: builtin/commit.c:736 builtin/commit.c:744 +#: builtin/commit.c:740 builtin/commit.c:756 msgid "could not read SQUASH_MSG" msgstr "impossibile leggere SQUASH_MSG" -#: builtin/commit.c:741 +#: builtin/commit.c:747 msgid "could not read MERGE_MSG" msgstr "impossibile leggere MERGE_MSG" -#: builtin/commit.c:795 +#: builtin/commit.c:807 msgid "could not write commit template" msgstr "impossibile scrivere il modello di commit" -#: builtin/commit.c:813 +#: builtin/commit.c:826 #, c-format msgid "" "\n" @@ -10508,7 +11346,7 @@ msgstr "" "\t%s\n" "e riprova.\n" -#: builtin/commit.c:818 +#: builtin/commit.c:831 #, c-format msgid "" "\n" @@ -10523,7 +11361,7 @@ msgstr "" "\t%s\n" "e riprova.\n" -#: builtin/commit.c:831 +#: builtin/commit.c:844 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -10532,7 +11370,7 @@ msgstr "" "Immetti il messaggio di commit per le modifiche. Le righe che iniziano\n" "con '%c' saranno ignorate e un messaggio vuoto interromperà il commit.\n" -#: builtin/commit.c:839 +#: builtin/commit.c:852 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -10543,153 +11381,149 @@ msgstr "" "con '%c' saranno mantenute; puoi rimuoverle autonomamente se lo desideri.\n" "Un messaggio vuoto interromperà il commit.\n" -#: builtin/commit.c:856 +#: builtin/commit.c:869 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sAutore: %.*s <%.*s>" -#: builtin/commit.c:864 +#: builtin/commit.c:877 #, c-format msgid "%sDate: %s" msgstr "%sData: %s" -#: builtin/commit.c:871 +#: builtin/commit.c:884 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sEsecutore commit: %.*s <%.*s>" -#: builtin/commit.c:889 +#: builtin/commit.c:902 msgid "Cannot read index" -msgstr "Impossibile leggere l'index" +msgstr "Impossibile leggere l'indice" -#: builtin/commit.c:956 +#: builtin/commit.c:969 msgid "Error building trees" msgstr "Errore durante la costruzione degli alberi" -#: builtin/commit.c:970 builtin/tag.c:258 +#: builtin/commit.c:983 builtin/tag.c:269 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Fornisci il messaggio usando l'opzione -m o -F.\n" -#: builtin/commit.c:1014 +#: builtin/commit.c:1027 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "" "--author '%s' non è nel formato 'Nome <email>' e non corrisponde ad alcun " "autore esistente" -#: builtin/commit.c:1028 +#: builtin/commit.c:1041 #, c-format msgid "Invalid ignored mode '%s'" msgstr "Modo non valido ignorato: '%s'" -#: builtin/commit.c:1042 builtin/commit.c:1279 +#: builtin/commit.c:1059 builtin/commit.c:1284 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Modo file non tracciati non valido: '%s'" -#: builtin/commit.c:1080 +#: builtin/commit.c:1097 msgid "--long and -z are incompatible" msgstr "--long e -z non sono compatibili" -#: builtin/commit.c:1113 +#: builtin/commit.c:1130 msgid "Using both --reset-author and --author does not make sense" msgstr "L'uso di entrambe le opzioni --reset-author e --author non ha senso" -#: builtin/commit.c:1122 +#: builtin/commit.c:1139 msgid "You have nothing to amend." msgstr "Non c'è nulla da modificare." -#: builtin/commit.c:1125 +#: builtin/commit.c:1142 msgid "You are in the middle of a merge -- cannot amend." msgstr "Sei nel bel mezzo di un merge - impossibile eseguire l'amend." -#: builtin/commit.c:1127 +#: builtin/commit.c:1144 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "Sei nel bel mezzo di un cherry-pick - impossibile eseguire l'amend." -#: builtin/commit.c:1130 +#: builtin/commit.c:1147 msgid "Options --squash and --fixup cannot be used together" msgstr "Le opzioni --squash e --fixup non possono essere usate insieme" -#: builtin/commit.c:1140 +#: builtin/commit.c:1157 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "Solo una delle opzioni -c/-C/-F/--fixup può essere usata." -#: builtin/commit.c:1142 +#: builtin/commit.c:1159 msgid "Option -m cannot be combined with -c/-C/-F." msgstr "L'opzione -m non può essere combinata con -c/-C/-F." -#: builtin/commit.c:1150 +#: builtin/commit.c:1167 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "L'opzione --reset-author può essere usata solo con -C, -c o --amend." -#: builtin/commit.c:1167 +#: builtin/commit.c:1184 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" "Può essere usata solo una delle opzioni --include/--only/--all/--" "interactive/--patch." -#: builtin/commit.c:1169 +#: builtin/commit.c:1186 msgid "No paths with --include/--only does not make sense." msgstr "" "Non specificare un percorso con le opzioni --include/--only non ha senso." -#: builtin/commit.c:1183 builtin/tag.c:546 +#: builtin/commit.c:1192 #, c-format -msgid "Invalid cleanup mode %s" -msgstr "Modalità pulizia non valida: %s" - -#: builtin/commit.c:1188 -msgid "Paths with -a does not make sense." -msgstr "I percorsi con -a non hanno senso." +msgid "paths '%s ...' with -a does not make sense" +msgstr "i percorsi '%s ...' non hanno senso con -a" -#: builtin/commit.c:1314 builtin/commit.c:1498 +#: builtin/commit.c:1319 builtin/commit.c:1503 msgid "show status concisely" msgstr "visualizza concisamente lo stato" -#: builtin/commit.c:1316 builtin/commit.c:1500 +#: builtin/commit.c:1321 builtin/commit.c:1505 msgid "show branch information" msgstr "visualizza le informazioni sul branch" -#: builtin/commit.c:1318 +#: builtin/commit.c:1323 msgid "show stash information" msgstr "visualizza le informazioni sullo stash" -#: builtin/commit.c:1320 builtin/commit.c:1502 +#: builtin/commit.c:1325 builtin/commit.c:1507 msgid "compute full ahead/behind values" msgstr "calcola tutti i valori dopo/prima di" -#: builtin/commit.c:1322 +#: builtin/commit.c:1327 msgid "version" msgstr "versione" -#: builtin/commit.c:1322 builtin/commit.c:1504 builtin/push.c:561 -#: builtin/worktree.c:640 +#: builtin/commit.c:1327 builtin/commit.c:1509 builtin/push.c:561 +#: builtin/worktree.c:643 msgid "machine-readable output" msgstr "output leggibile da una macchina" -#: builtin/commit.c:1325 builtin/commit.c:1506 +#: builtin/commit.c:1330 builtin/commit.c:1511 msgid "show status in long format (default)" msgstr "visualizza lo stato in forma lunga (impostazione predefinita)" -#: builtin/commit.c:1328 builtin/commit.c:1509 +#: builtin/commit.c:1333 builtin/commit.c:1514 msgid "terminate entries with NUL" msgstr "termina le voci con NUL" -#: builtin/commit.c:1330 builtin/commit.c:1334 builtin/commit.c:1512 -#: builtin/fast-export.c:1085 builtin/fast-export.c:1088 builtin/rebase.c:1118 -#: builtin/tag.c:400 +#: 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 msgid "mode" msgstr "modo" -#: builtin/commit.c:1331 builtin/commit.c:1512 +#: builtin/commit.c:1336 builtin/commit.c:1517 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" "visualizza file non tracciati, modalità facoltative: all, normal, no. " "(Impostazione predefinita: all)" -#: builtin/commit.c:1335 +#: builtin/commit.c:1340 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" @@ -10697,11 +11531,11 @@ msgstr "" "visualizza file ignorati, modalità facoltative: traditional, matching, no. " "(Impostazione predefinita: traditional)" -#: builtin/commit.c:1337 parse-options.h:164 +#: builtin/commit.c:1342 parse-options.h:179 msgid "when" msgstr "quando" -#: builtin/commit.c:1338 +#: builtin/commit.c:1343 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -10709,192 +11543,170 @@ msgstr "" "ignora modifiche ai sottomoduli, opzione facoltativa \"quando\": all, dirty, " "untracked. (Impostazione predefinita: all)" -#: builtin/commit.c:1340 +#: builtin/commit.c:1345 msgid "list untracked files in columns" msgstr "elenca i file non tracciati in colonne" -#: builtin/commit.c:1341 +#: builtin/commit.c:1346 msgid "do not detect renames" msgstr "non rilevare le ridenominazioni" -#: builtin/commit.c:1343 +#: builtin/commit.c:1348 msgid "detect renames, optionally set similarity index" msgstr "" "rileva le ridenominazioni, imposta facoltativamente l'indice di similarità" -#: builtin/commit.c:1363 +#: builtin/commit.c:1368 msgid "Unsupported combination of ignored and untracked-files arguments" msgstr "" "Combinazione di argomenti sui file ignorati e non tracciati non supportata" -#: builtin/commit.c:1468 +#: builtin/commit.c:1473 msgid "suppress summary after successful commit" msgstr "" "ometti di visualizzare il riepilogo dopo un commit completato con successo" -#: builtin/commit.c:1469 +#: builtin/commit.c:1474 msgid "show diff in commit message template" msgstr "visualizza il diff nel modello del messaggio di commit" -#: builtin/commit.c:1471 +#: builtin/commit.c:1476 msgid "Commit message options" msgstr "Opzioni messaggio di commit" -#: builtin/commit.c:1472 builtin/merge.c:264 builtin/tag.c:397 +#: builtin/commit.c:1477 builtin/merge.c:272 builtin/tag.c:408 msgid "read message from file" msgstr "leggi il messaggio da un file" -#: builtin/commit.c:1473 +#: builtin/commit.c:1478 msgid "author" msgstr "autore" -#: builtin/commit.c:1473 +#: builtin/commit.c:1478 msgid "override author for commit" msgstr "sovrascrivi l'autore per il commit" -#: builtin/commit.c:1474 builtin/gc.c:518 +#: builtin/commit.c:1479 builtin/gc.c:539 msgid "date" msgstr "data" -#: builtin/commit.c:1474 +#: builtin/commit.c:1479 msgid "override date for commit" msgstr "sovrascrivi la data per il commit" -#: builtin/commit.c:1475 builtin/merge.c:260 builtin/notes.c:409 -#: builtin/notes.c:575 builtin/tag.c:395 -msgid "message" -msgstr "messaggio" - -#: builtin/commit.c:1475 -msgid "commit message" -msgstr "messaggio di commit" - -#: builtin/commit.c:1476 builtin/commit.c:1477 builtin/commit.c:1478 -#: builtin/commit.c:1479 parse-options.h:278 ref-filter.h:92 +#: builtin/commit.c:1481 builtin/commit.c:1482 builtin/commit.c:1483 +#: builtin/commit.c:1484 parse-options.h:323 ref-filter.h:92 msgid "commit" msgstr "commit" -#: builtin/commit.c:1476 +#: builtin/commit.c:1481 msgid "reuse and edit message from specified commit" msgstr "riusa il messaggio del commit specificato per poi modificarlo" -#: builtin/commit.c:1477 +#: builtin/commit.c:1482 msgid "reuse message from specified commit" msgstr "riusa il messaggio del commit specificato" -#: builtin/commit.c:1478 +#: builtin/commit.c:1483 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "usa il messaggio in formato autosquash per correggere il commit specificato" -#: builtin/commit.c:1479 +#: builtin/commit.c:1484 msgid "use autosquash formatted message to squash specified commit" msgstr "" "usa il messaggio in formato autosquash per eseguire lo squash del commit " "specificato" -#: builtin/commit.c:1480 +#: builtin/commit.c:1485 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "il commit ora ha me come autore (opzione usata con -C/-c/--amend)" -#: builtin/commit.c:1481 builtin/log.c:1533 builtin/merge.c:277 -#: builtin/pull.c:156 builtin/revert.c:107 +#: 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 "aggiungi Signed-off-by:" -#: builtin/commit.c:1482 +#: builtin/commit.c:1487 msgid "use specified template file" msgstr "usa il file modello specificato" -#: builtin/commit.c:1483 +#: builtin/commit.c:1488 msgid "force edit of commit" msgstr "forza la modifica del commit" -#: builtin/commit.c:1484 -msgid "default" -msgstr "impostazione predefinita" - -#: builtin/commit.c:1484 builtin/tag.c:401 -msgid "how to strip spaces and #comments from message" -msgstr "come rimuovere gli spazi e i #commenti dal messaggio" - -#: builtin/commit.c:1485 +#: builtin/commit.c:1490 msgid "include status in commit message template" msgstr "includi lo stato nel modello del messaggio di commit" -#: builtin/commit.c:1487 builtin/merge.c:275 builtin/pull.c:186 -#: builtin/revert.c:115 -msgid "GPG sign commit" -msgstr "firma il commit con GPG" - -#: builtin/commit.c:1490 +#: builtin/commit.c:1495 msgid "Commit contents options" msgstr "Opzioni contenuto commit" -#: builtin/commit.c:1491 +#: builtin/commit.c:1496 msgid "commit all changed files" msgstr "esegui il commit di tutti i file modificati" -#: builtin/commit.c:1492 +#: builtin/commit.c:1497 msgid "add specified files to index for commit" -msgstr "aggiungi i file specificati all'index per il commit" +msgstr "aggiungi i file specificati all'indice per il commit" -#: builtin/commit.c:1493 +#: builtin/commit.c:1498 msgid "interactively add files" msgstr "aggiungi i file in modalità interattiva" -#: builtin/commit.c:1494 +#: builtin/commit.c:1499 msgid "interactively add changes" msgstr "aggiungi le modifiche in modalità interattiva" -#: builtin/commit.c:1495 +#: builtin/commit.c:1500 msgid "commit only specified files" msgstr "esegui il commit solo dei file specificati" -#: builtin/commit.c:1496 +#: builtin/commit.c:1501 msgid "bypass pre-commit and commit-msg hooks" msgstr "ignora gli hook pre-commit e commit-msg" -#: builtin/commit.c:1497 +#: builtin/commit.c:1502 msgid "show what would be committed" msgstr "visualizza gli elementi di cui sarebbe eseguito il commit" -#: builtin/commit.c:1510 +#: builtin/commit.c:1515 msgid "amend previous commit" msgstr "modifica il commit precedente" -#: builtin/commit.c:1511 +#: builtin/commit.c:1516 msgid "bypass post-rewrite hook" msgstr "ignora l'hook post-rewrite" -#: builtin/commit.c:1516 +#: builtin/commit.c:1521 msgid "ok to record an empty change" msgstr "accetta di registrare una modifica vuota" -#: builtin/commit.c:1518 +#: builtin/commit.c:1523 msgid "ok to record a change with an empty message" msgstr "accetta di registrare una modifica con un messaggio vuoto" -#: builtin/commit.c:1591 +#: builtin/commit.c:1596 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "File MERGE_HEAD corrotto (%s)" -#: builtin/commit.c:1598 +#: builtin/commit.c:1603 msgid "could not read MERGE_MODE" msgstr "impossibile leggere MERGE_MODE" -#: builtin/commit.c:1617 +#: builtin/commit.c:1622 #, c-format msgid "could not read commit message: %s" msgstr "impossibile leggere il messaggio di commit: %s" -#: builtin/commit.c:1628 +#: builtin/commit.c:1629 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Interrompo il commit a causa di un messaggio di commit vuoto.\n" -#: builtin/commit.c:1633 +#: builtin/commit.c:1634 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "Interrompo il commit; non hai modificato il messaggio.\n" @@ -10931,35 +11743,40 @@ msgstr "" "git commit-graph write [--object-dir <directory oggetti>] [--append] [--" "reachable|--stdin-packs|--stdin-commits]" -#: builtin/commit-graph.c:48 builtin/commit-graph.c:78 -#: builtin/commit-graph.c:132 builtin/commit-graph.c:190 builtin/fetch.c:153 -#: builtin/log.c:1553 +#: 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 "directory" -#: builtin/commit-graph.c:49 builtin/commit-graph.c:79 -#: builtin/commit-graph.c:133 builtin/commit-graph.c:191 +#: 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 "La directory oggetti in cui memorizzare il grafo" -#: builtin/commit-graph.c:135 +#: builtin/commit-graph.c:68 builtin/commit-graph.c:105 +#, c-format +msgid "Could not open commit-graph '%s'" +msgstr "Impossibile aprire il grafo dei commit '%s'" + +#: builtin/commit-graph.c:150 msgid "start walk at all refs" msgstr "inizia la visita da tutti i riferimenti" -#: builtin/commit-graph.c:137 +#: builtin/commit-graph.c:152 msgid "scan pack-indexes listed by stdin for commits" msgstr "" "esamina i pack-index elencati sullo standard input alla ricerca di commit" -#: builtin/commit-graph.c:139 +#: builtin/commit-graph.c:154 msgid "start walk at commits listed by stdin" msgstr "inizia la visita ai commit elencati sullo standard input" -#: builtin/commit-graph.c:141 +#: builtin/commit-graph.c:156 msgid "include all commits already in the commit-graph file" msgstr "includi tutti i commit già presenti nel file commit-graph" -#: builtin/commit-graph.c:150 +#: builtin/commit-graph.c:165 msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" msgstr "usa al più un'opzione fra --reachable, --stdin-commits o --stdin-packs" @@ -11370,7 +12187,7 @@ msgstr "" msgid "describe %s\n" msgstr "descrivi %s\n" -#: builtin/describe.c:513 builtin/log.c:516 +#: builtin/describe.c:513 #, c-format msgid "Not a valid object name %s" msgstr "%s non è un nome oggetto valido" @@ -11420,7 +12237,7 @@ msgstr "considera solo i tag corrispondenti al <pattern>" msgid "do not consider tags matching <pattern>" msgstr "non considerare i tag corrispondenti al <pattern>" -#: builtin/describe.c:551 builtin/name-rev.c:424 +#: builtin/describe.c:551 builtin/name-rev.c:426 msgid "show abbreviated commit object as fallback" msgstr "visualizza l'oggetto commit abbreviato come fallback" @@ -11466,50 +12283,50 @@ msgstr "'%s': non è un file regolare o un collegamento simbolico" msgid "invalid option: %s" msgstr "opzione non valida: %s" -#: builtin/diff.c:364 +#: builtin/diff.c:350 msgid "Not a git repository" msgstr "Non è un repository Git" -#: builtin/diff.c:408 +#: builtin/diff.c:394 #, c-format msgid "invalid object '%s' given." msgstr "specificato oggetto non valido '%s'." -#: builtin/diff.c:417 +#: builtin/diff.c:403 #, c-format msgid "more than two blobs given: '%s'" msgstr "più di due blob specificati: '%s'" -#: builtin/diff.c:422 +#: builtin/diff.c:408 #, c-format msgid "unhandled object '%s' given." msgstr "specificato oggetto non gestito '%s'." -#: builtin/difftool.c:31 +#: builtin/difftool.c:30 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" msgstr "git difftool [<opzioni>] [<commit> [<commit>]] [--] [<percorso>...]" -#: builtin/difftool.c:261 +#: builtin/difftool.c:253 #, c-format msgid "failed: %d" msgstr "non riuscito: %d" -#: builtin/difftool.c:303 +#: builtin/difftool.c:295 #, c-format msgid "could not read symlink %s" msgstr "impossibile leggere il collegamento simbolico %s" -#: builtin/difftool.c:305 +#: builtin/difftool.c:297 #, c-format msgid "could not read symlink file %s" msgstr "impossibile leggere il file collegamento simbolico %s" -#: builtin/difftool.c:313 +#: builtin/difftool.c:305 #, c-format msgid "could not read object %s for symlink %s" msgstr "impossibile leggere l'oggetto %s per il collegamento simbolico %s" -#: builtin/difftool.c:414 +#: builtin/difftool.c:406 msgid "" "combined diff formats('-c' and '--cc') are not supported in\n" "directory diff mode('-d' and '--dir-diff')." @@ -11517,54 +12334,54 @@ msgstr "" "i formati diff combinati ('-c' e '--cc') non sono supportati in\n" "modalità diff directory ('-d' e '--dir-diff')." -#: builtin/difftool.c:634 +#: builtin/difftool.c:626 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "entrambi i file risultano modificati: '%s' e '%s'." -#: builtin/difftool.c:636 +#: builtin/difftool.c:628 msgid "working tree file has been left." msgstr "il file nell'albero di lavoro è stato mantenuto." -#: builtin/difftool.c:647 +#: builtin/difftool.c:639 #, c-format msgid "temporary files exist in '%s'." msgstr "esistono file temporanei in '%s'." -#: builtin/difftool.c:648 +#: builtin/difftool.c:640 msgid "you may want to cleanup or recover these." msgstr "potresti voler ripulirli o ripristinarli." -#: builtin/difftool.c:697 +#: builtin/difftool.c:689 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "usa `diff.guitool` anziché `diff.tool`" -#: builtin/difftool.c:699 +#: builtin/difftool.c:691 msgid "perform a full-directory diff" msgstr "esegui un diff directory completo" -#: builtin/difftool.c:701 +#: builtin/difftool.c:693 msgid "do not prompt before launching a diff tool" msgstr "non chiedere conferma prima di lanciare un tool diff" -#: builtin/difftool.c:706 +#: builtin/difftool.c:698 msgid "use symlinks in dir-diff mode" msgstr "usa collegamenti simbolici in modalità diff directory" -#: builtin/difftool.c:707 +#: builtin/difftool.c:699 msgid "tool" msgstr "strumento" -#: builtin/difftool.c:708 +#: builtin/difftool.c:700 msgid "use the specified diff tool" msgstr "usa lo strumento diff specificato" -#: builtin/difftool.c:710 +#: builtin/difftool.c:702 msgid "print a list of diff tools that may be used with `--tool`" msgstr "" "stampa un elenco di strumenti diff che possono essere usati con `--tool`" -#: builtin/difftool.c:713 +#: builtin/difftool.c:705 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " "code" @@ -11572,15 +12389,31 @@ msgstr "" "fai sì che 'git-difftool' esca quando uno strumento diff invocato " "restituisce un codice d'uscita diverso da zero" -#: builtin/difftool.c:716 +#: builtin/difftool.c:708 msgid "specify a custom command for viewing diffs" msgstr "specifica un comando personalizzato per visualizzare i diff" -#: builtin/difftool.c:740 +#: builtin/difftool.c:709 +msgid "passed to `diff`" +msgstr "fornito a `diff`" + +#: builtin/difftool.c:724 +msgid "difftool requires worktree or --no-index" +msgstr "difftool richiede un albero di lavoro o --no-index" + +#: builtin/difftool.c:731 +msgid "--dir-diff is incompatible with --no-index" +msgstr "--dir-diff non è compatibile con --no-index" + +#: builtin/difftool.c:734 +msgid "--gui, --tool and --extcmd are mutually exclusive" +msgstr "le opzioni --gui, --tool ed --extcmd sono mutualmente esclusive" + +#: builtin/difftool.c:742 msgid "no <tool> given for --tool=<tool>" msgstr "nessuno <strumento> specificato per --tool=<strumento>" -#: builtin/difftool.c:747 +#: builtin/difftool.c:749 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "nessun <comando> specificato per --extcmd=<comando>" @@ -11610,172 +12443,165 @@ msgstr "Importa i contrassegni da questo file" #: builtin/fast-export.c:1096 msgid "Fake a tagger when tags lack one" -msgstr "" +msgstr "Usa un tagger falso se i tag non ne hanno uno" #: builtin/fast-export.c:1098 msgid "Output full tree for each commit" -msgstr "" +msgstr "Visualizza in output l'albero completo per ogni commit" #: builtin/fast-export.c:1100 msgid "Use the done feature to terminate the stream" -msgstr "" +msgstr "Usa la funzionalità \"fatto\" per terminare il flusso" #: builtin/fast-export.c:1101 msgid "Skip output of blob data" -msgstr "" +msgstr "Ometti l'output dei dati dei blob" -#: builtin/fast-export.c:1102 builtin/log.c:1601 +#: builtin/fast-export.c:1102 builtin/log.c:1609 msgid "refspec" -msgstr "" +msgstr "specificatore riferimento" #: builtin/fast-export.c:1103 msgid "Apply refspec to exported refs" -msgstr "" +msgstr "Applica lo specificatore riferimento ai riferimenti esportati" #: builtin/fast-export.c:1104 msgid "anonymize output" -msgstr "" +msgstr "rendi anonimo l'output" #: builtin/fast-export.c:1106 msgid "Reference parents which are not in fast-export stream by object id" msgstr "" +"Fai riferimento ai genitori non nel flusso fast-export tramite l'ID oggetto" #: builtin/fast-export.c:1108 msgid "Show original object ids of blobs/commits" -msgstr "" +msgstr "Visualizza gli ID oggetto originari dei blob/commit" #: builtin/fetch.c:28 -#, fuzzy msgid "git fetch [<options>] [<repository> [<refspec>...]]" -msgstr "git apply [opzioni] [<patch>...]" +msgstr "git fetch [<opzioni>] [<repository> [<specificatore riferimento>...]]" #: builtin/fetch.c:29 msgid "git fetch [<options>] <group>" -msgstr "" +msgstr "git fetch [<opzioni>] <gruppo>" #: builtin/fetch.c:30 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" -msgstr "" +msgstr "git fetch --multiple [<opzioni>] [(<repository> | <gruppo>)...]" #: builtin/fetch.c:31 msgid "git fetch --all [<options>]" -msgstr "" +msgstr "git fetch --all [<opzioni>]" -#: builtin/fetch.c:115 builtin/pull.c:195 +#: builtin/fetch.c:115 builtin/pull.c:202 msgid "fetch from all remotes" -msgstr "" +msgstr "esegui il fetch da tutti i remoti" -#: builtin/fetch.c:117 builtin/pull.c:198 +#: builtin/fetch.c:117 builtin/pull.c:205 msgid "append to .git/FETCH_HEAD instead of overwriting" -msgstr "" +msgstr "aggiungi i dati a .git/FETCH_HEAD anziché sovrascriverli" -#: builtin/fetch.c:119 builtin/pull.c:201 +#: builtin/fetch.c:119 builtin/pull.c:208 msgid "path to upload pack on remote end" -msgstr "" +msgstr "percorso in cui caricare il pack sul remoto" #: builtin/fetch.c:120 -#, fuzzy msgid "force overwrite of local reference" -msgstr "$reference non è un riferimento valido" +msgstr "forza la sovrascrittura del riferimento locale" #: builtin/fetch.c:122 msgid "fetch from multiple remotes" -msgstr "" +msgstr "esegui il fetch da più remoti" -#: builtin/fetch.c:124 builtin/pull.c:205 -#, fuzzy +#: builtin/fetch.c:124 builtin/pull.c:212 msgid "fetch all tags and associated objects" -msgstr "Aggiorna i ref remoti insieme agli oggetti associati" +msgstr "esegui il fetch di tutti i tag e degli oggetti associati" #: builtin/fetch.c:126 msgid "do not fetch all tags (--no-tags)" -msgstr "" +msgstr "non eseguire il fetch di alcun tag (--no-tags)" #: builtin/fetch.c:128 msgid "number of submodules fetched in parallel" -msgstr "" +msgstr "numero di sottomoduli recuperati in parallelo" -#: builtin/fetch.c:130 builtin/pull.c:208 +#: builtin/fetch.c:130 builtin/pull.c:215 msgid "prune remote-tracking branches no longer on remote" msgstr "" +"elimina i branch che ne tracciano uno remoto ma non più presenti sul remoto" #: builtin/fetch.c:132 msgid "prune local tags no longer on remote and clobber changed tags" msgstr "" +"elimina i tag locali non più presenti sul remoto e sovrascrivi i tag " +"modificati" -#: builtin/fetch.c:133 builtin/fetch.c:156 builtin/pull.c:133 +#: builtin/fetch.c:133 builtin/fetch.c:156 builtin/pull.c:139 msgid "on-demand" -msgstr "" +msgstr "a richiesta" #: builtin/fetch.c:134 msgid "control recursive fetching of submodules" -msgstr "" +msgstr "controlla il recupero ricorsivo dei sottomoduli" -#: builtin/fetch.c:138 builtin/pull.c:216 +#: builtin/fetch.c:138 builtin/pull.c:223 msgid "keep downloaded pack" -msgstr "" +msgstr "mantieni il pack scaricato" #: builtin/fetch.c:140 msgid "allow updating of HEAD ref" -msgstr "" +msgstr "consenti l'aggiornamento del riferimento HEAD" -#: builtin/fetch.c:143 builtin/fetch.c:149 builtin/pull.c:219 +#: builtin/fetch.c:143 builtin/fetch.c:149 builtin/pull.c:226 msgid "deepen history of shallow clone" -msgstr "" +msgstr "aumenta la profondità della cronologia di un clone shallow" #: builtin/fetch.c:145 msgid "deepen history of shallow repository based on time" msgstr "" +"aumenta la profondità della cronologia di un clone shallow in base al tempo" -#: builtin/fetch.c:151 builtin/pull.c:222 -#, fuzzy +#: builtin/fetch.c:151 builtin/pull.c:229 msgid "convert to a complete repository" -msgstr "Registra modifiche nel repository" +msgstr "converti in un repository completo" #: builtin/fetch.c:154 msgid "prepend this to submodule path output" -msgstr "" +msgstr "anteponi questo prefisso all'output del percorso del sottomodulo" #: builtin/fetch.c:157 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" msgstr "" +"impostazione predefinita per il recupero ricorsivo dei sottomoduli (a " +"priorità minore rispetto ai file di configurazione)" -#: builtin/fetch.c:161 builtin/pull.c:225 +#: builtin/fetch.c:161 builtin/pull.c:232 msgid "accept refs that update .git/shallow" -msgstr "" +msgstr "accetta i riferimenti che aggiornano .git/shallow" -#: builtin/fetch.c:162 builtin/pull.c:227 +#: builtin/fetch.c:162 builtin/pull.c:234 msgid "refmap" -msgstr "" +msgstr "mappa riferimenti" -#: builtin/fetch.c:163 builtin/pull.c:228 +#: builtin/fetch.c:163 builtin/pull.c:235 msgid "specify fetch refmap" -msgstr "" - -#: builtin/fetch.c:164 builtin/ls-remote.c:77 builtin/push.c:585 -#: builtin/send-pack.c:172 -msgid "server-specific" -msgstr "" - -#: builtin/fetch.c:164 builtin/ls-remote.c:77 builtin/push.c:585 -#: builtin/send-pack.c:173 -msgid "option to transmit" -msgstr "" +msgstr "specifica la mappa dei riferimenti per il fetch" #: builtin/fetch.c:170 msgid "report that we have only objects reachable from this object" -msgstr "" +msgstr "segnala che abbiamo solo oggetti raggiungibili da quest'oggetto" #: builtin/fetch.c:469 msgid "Couldn't find remote ref HEAD" -msgstr "" +msgstr "Impossibile trovare l'HEAD del riferimento remoto" #: builtin/fetch.c:608 #, c-format msgid "configuration fetch.output contains invalid value %s" -msgstr "" +msgstr "il valore dell'opzione fetch.output contiene il valore non valido %s" #: builtin/fetch.c:705 #, c-format @@ -11788,29 +12614,28 @@ msgstr "[aggiornato]" #: builtin/fetch.c:722 builtin/fetch.c:738 builtin/fetch.c:801 msgid "[rejected]" -msgstr "[respinto]" +msgstr "[rifiutato]" #: builtin/fetch.c:723 -#, fuzzy msgid "can't fetch in current branch" -msgstr "Nessun remote per il branch corrente." +msgstr "impossibile eseguire il fetch nel branch corrente" #: builtin/fetch.c:733 msgid "[tag update]" -msgstr "[tag aggiornata]" +msgstr "[tag aggiornato]" #: builtin/fetch.c:734 builtin/fetch.c:771 builtin/fetch.c:784 #: builtin/fetch.c:796 msgid "unable to update local ref" -msgstr "impossibile aggiornare il ref locale" +msgstr "impossibile aggiornare il riferimento locale" #: builtin/fetch.c:738 msgid "would clobber existing tag" -msgstr "" +msgstr "sovrascriverebbe il tag esistente" #: builtin/fetch.c:760 msgid "[new tag]" -msgstr "[nuova tag]" +msgstr "[nuovo tag]" #: builtin/fetch.c:763 msgid "[new branch]" @@ -11818,7 +12643,7 @@ msgstr "[nuovo branch]" #: builtin/fetch.c:766 msgid "[new ref]" -msgstr "[nuovo ref]" +msgstr "[nuovo riferimento]" #: builtin/fetch.c:796 msgid "forced update" @@ -11826,7 +12651,7 @@ msgstr "aggiornamento forzato" #: builtin/fetch.c:801 msgid "non-fast-forward" -msgstr "" +msgstr "non fast-forward" #: builtin/fetch.c:847 #, c-format @@ -11836,7 +12661,7 @@ msgstr "%s non ha inviato tutti gli oggetti necessari\n" #: builtin/fetch.c:868 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" -msgstr "" +msgstr "%s rifiutato perché non è consentito aggiornare radici shallow" #: builtin/fetch.c:959 builtin/fetch.c:1081 #, c-format @@ -11849,18 +12674,19 @@ msgid "" "some local refs could not be updated; try running\n" " 'git remote prune %s' to remove any old, conflicting branches" msgstr "" -"non è stato possibile aggiornare alcuni ref locali; prova con\n" -" 'git remote prune %s' per rimuovere ogni branch che vada in conflitto" +"non è stato possibile aggiornare alcuni riferimenti locali; prova ad " +"eseguire\n" +" 'git remote prune %s' per rimuovere ogni branch vecchio in conflitto" #: builtin/fetch.c:1051 #, c-format msgid " (%s will become dangling)" -msgstr "" +msgstr " (%s diventerà pendente)" #: builtin/fetch.c:1052 #, c-format msgid " (%s has become dangling)" -msgstr "" +msgstr " (%s è diventato pendente)" #: builtin/fetch.c:1084 msgid "[deleted]" @@ -11874,11 +12700,13 @@ msgstr "(nessuno)" #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "" +"Mi rifiuto di eseguire il fetch nel branch corrente %s di un repository non " +"bare" #: builtin/fetch.c:1127 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" -msgstr "" +msgstr "L'opzione \"%s\" con il valore \"%s\" non è valida per %s" #: builtin/fetch.c:1130 #, c-format @@ -11888,187 +12716,188 @@ msgstr "L'opzione \"%s\" è ignorata per %s\n" #: builtin/fetch.c:1434 #, c-format msgid "Fetching %s\n" -msgstr "" +msgstr "Recupero di %s in corso\n" #: builtin/fetch.c:1436 builtin/remote.c:100 #, c-format msgid "Could not fetch %s" -msgstr "" +msgstr "Impossibile recuperare %s" #: builtin/fetch.c:1482 msgid "" "--filter can only be used with the remote configured in extensions." "partialClone" msgstr "" +"--filter può essere usato solo con il remoto configurato nelle estensioni." +"partialClone" #: builtin/fetch.c:1506 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." msgstr "" -"Nessun repository remoto specificato. Per favore, specifica un URL o\n" -"il nome di un remote da cui prelevare nuove revisioni." +"Non è stato specificato alcun repository remoto. Specifica un URL o il\n" +"nome di un remoto da cui dovranno essere recuperate le nuove revisioni." #: builtin/fetch.c:1543 msgid "You need to specify a tag name." msgstr "Devi specificare il nome di un tag." -#: builtin/fetch.c:1592 +#: builtin/fetch.c:1594 msgid "Negative depth in --deepen is not supported" -msgstr "" +msgstr "Le profondità negative in --deepen non sono supportate" -#: builtin/fetch.c:1594 -#, fuzzy +#: builtin/fetch.c:1596 msgid "--deepen and --depth are mutually exclusive" -msgstr "-A e -u sono reciprocamente incompatibili" +msgstr "le opzioni --deepen e --depth sono mutualmente esclusive" -#: builtin/fetch.c:1599 -#, fuzzy +#: builtin/fetch.c:1601 msgid "--depth and --unshallow cannot be used together" -msgstr "-x e -X non possono essere usati insieme" +msgstr "--depth e --unshallow non possono essere usati insieme." -#: builtin/fetch.c:1601 -#, fuzzy +#: builtin/fetch.c:1603 msgid "--unshallow on a complete repository does not make sense" -msgstr "--name-only non ha senso" +msgstr "--unshallow su un repository completo non ha senso" -#: builtin/fetch.c:1617 +#: builtin/fetch.c:1619 msgid "fetch --all does not take a repository argument" -msgstr "fetch --all non richiede il repository come argomento" +msgstr "fetch --all non richiede un repository come argomento" -#: builtin/fetch.c:1619 +#: builtin/fetch.c:1621 msgid "fetch --all does not make sense with refspecs" -msgstr "" +msgstr "fetch --all non ha senso con degli specificatori riferimento" -#: builtin/fetch.c:1628 +#: builtin/fetch.c:1630 #, c-format msgid "No such remote or remote group: %s" -msgstr "" +msgstr "Remoto o gruppo remoti non esistente: %s" -#: builtin/fetch.c:1635 +#: builtin/fetch.c:1637 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "" +"Recuperare un gruppo e specificare gli specificatori riferimento non ha senso" -#: builtin/fetch.c:1651 +#: builtin/fetch.c:1653 msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" msgstr "" +"--filter può essere usato solo con il remoto configurato nelle estensioni." +"partialclone" #: builtin/fmt-merge-msg.c:18 msgid "" "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" msgstr "" +"git fmt-merge-msg [-m <messaggio>] [--log[=<n>] | --no-log] [--file <file>]" #: builtin/fmt-merge-msg.c:672 msgid "populate log with at most <n> entries from shortlog" -msgstr "" +msgstr "popola il registro con al più <n> voci del registro breve" #: builtin/fmt-merge-msg.c:675 msgid "alias for --log (deprecated)" -msgstr "" +msgstr "alias di --log (deprecato)" #: builtin/fmt-merge-msg.c:678 msgid "text" -msgstr "" +msgstr "testo" #: builtin/fmt-merge-msg.c:679 msgid "use <text> as start of message" -msgstr "" +msgstr "usa <testo> come stringa iniziale del messaggio" #: builtin/fmt-merge-msg.c:680 -#, fuzzy msgid "file to read from" -msgstr "Non è stato possibile leggere da '%s'" +msgstr "file da cui leggere" #: builtin/for-each-ref.c:10 -#, fuzzy msgid "git for-each-ref [<options>] [<pattern>]" -msgstr "git apply [opzioni] [<patch>...]" +msgstr "git for-each-ref [<opzioni>] [<pattern>]" #: builtin/for-each-ref.c:11 msgid "git for-each-ref [--points-at <object>]" -msgstr "" +msgstr "git for-each-ref [--points-at <oggetto>]" #: builtin/for-each-ref.c:12 msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]" -msgstr "" +msgstr "git for-each-ref [(--merged | --no-merged) [<commit>]]" #: builtin/for-each-ref.c:13 msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]" -msgstr "" +msgstr "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]" #: builtin/for-each-ref.c:28 msgid "quote placeholders suitably for shells" msgstr "" +"racchiudi i segnaposto fra virgolette in modo da poterli usare in una shell" #: builtin/for-each-ref.c:30 msgid "quote placeholders suitably for perl" msgstr "" +"racchiudi i segnaposto fra virgolette in modo da poterli usare con Perl" #: builtin/for-each-ref.c:32 msgid "quote placeholders suitably for python" msgstr "" +"racchiudi i segnaposto fra virgolette in modo da poterli usare con Python" #: builtin/for-each-ref.c:34 msgid "quote placeholders suitably for Tcl" -msgstr "" +msgstr "racchiudi i segnaposto fra virgolette in modo da poterli usare con Tcl" #: builtin/for-each-ref.c:37 msgid "show only <n> matched refs" -msgstr "" +msgstr "visualizza solo <n> riferimenti corrispondenti" -#: builtin/for-each-ref.c:39 builtin/tag.c:424 +#: builtin/for-each-ref.c:39 builtin/tag.c:433 msgid "respect format colors" -msgstr "" +msgstr "rispetta le stringhe di formato per i colori" -#: builtin/for-each-ref.c:43 -#, fuzzy +#: builtin/for-each-ref.c:42 msgid "print only refs which points at the given object" -msgstr "lo switch 'points-at' richiede un oggetto" +msgstr "stampa solo i riferimenti che puntano all'oggetto dato" -#: builtin/for-each-ref.c:45 +#: builtin/for-each-ref.c:44 msgid "print only refs that are merged" -msgstr "" +msgstr "stampa solo i riferimenti sottoposti a merge" -#: builtin/for-each-ref.c:46 +#: builtin/for-each-ref.c:45 msgid "print only refs that are not merged" -msgstr "" +msgstr "stampa solo i riferimenti non sottoposti a merge" -#: builtin/for-each-ref.c:47 +#: builtin/for-each-ref.c:46 msgid "print only refs which contain the commit" -msgstr "" +msgstr "stampa solo i riferimenti contenenti il commit" -#: builtin/for-each-ref.c:48 +#: builtin/for-each-ref.c:47 msgid "print only refs which don't contain the commit" -msgstr "" +msgstr "stampa solo i riferimenti che non contengono il commit" #: builtin/fsck.c:88 builtin/fsck.c:160 builtin/fsck.c:161 -#, fuzzy msgid "unknown" -msgstr "sconosciuto:" +msgstr "sconosciuto" #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation> #: builtin/fsck.c:120 builtin/fsck.c:136 -#, fuzzy, c-format +#, c-format msgid "error in %s %s: %s" -msgstr "errore nell'oggetto: %s" +msgstr "errore in %s %s: %s" #. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation> #: builtin/fsck.c:131 -#, fuzzy, c-format +#, c-format msgid "warning in %s %s: %s" -msgstr "impossibile aprire %s: %s" +msgstr "avviso in %s %s: %s" #: builtin/fsck.c:157 builtin/fsck.c:159 #, c-format msgid "broken link from %7s %s" -msgstr "" +msgstr "collegamento rotto da %7s %s" #: builtin/fsck.c:168 -#, fuzzy msgid "wrong object type in link" -msgstr "tipo di oggetto %d sconosciuto" +msgstr "tipo oggetto errato nel collegamento" #: builtin/fsck.c:184 #, c-format @@ -12076,246 +12905,243 @@ msgid "" "broken link from %7s %s\n" " to %7s %s" msgstr "" +"collegamento rotto da %7s %s\n" +" a %7s %s" -#: builtin/fsck.c:253 -#, fuzzy, c-format +#: builtin/fsck.c:295 +#, c-format msgid "missing %s %s" -msgstr "oggetto %s mancante per %s" +msgstr "%s mancante %s" -#: builtin/fsck.c:279 -#, fuzzy, c-format +#: builtin/fsck.c:321 +#, c-format msgid "unreachable %s %s" -msgstr "ho già %s (%s)" +msgstr "%s non raggiungibile %s" -#: builtin/fsck.c:298 -#, fuzzy, c-format +#: builtin/fsck.c:340 +#, c-format msgid "dangling %s %s" -msgstr "Aggiornamento di %s..%s\n" +msgstr "%s pendente %s" -#: builtin/fsck.c:307 -#, fuzzy +#: builtin/fsck.c:349 msgid "could not create lost-found" -msgstr "impossibile creare il file '%s'" +msgstr "impossibile creare lost-found" -#: builtin/fsck.c:318 -#, fuzzy, c-format +#: builtin/fsck.c:360 +#, c-format msgid "could not finish '%s'" -msgstr "impossibile eliminare l'impostazione di '%s'" +msgstr "impossibile terminare '%s'" -#: builtin/fsck.c:335 -#, fuzzy, c-format +#: builtin/fsck.c:377 +#, c-format msgid "Checking %s" -msgstr "Ricezione degli oggetti" +msgstr "Controllo di %s in corso" -#: builtin/fsck.c:353 -#, fuzzy, c-format +#: builtin/fsck.c:415 +#, c-format msgid "Checking connectivity (%d objects)" -msgstr "Controllo connettività in corso" +msgstr "Controllo connessione in corso (%d oggetti)" -#: builtin/fsck.c:372 -#, fuzzy, c-format +#: builtin/fsck.c:434 +#, c-format msgid "Checking %s %s" -msgstr "Controllo della patch %s in corso..." +msgstr "Controllo di %s in corso %s" -#: builtin/fsck.c:376 +#: builtin/fsck.c:438 msgid "broken links" -msgstr "" +msgstr "collegamenti rotti" -#: builtin/fsck.c:385 -#, fuzzy, c-format +#: builtin/fsck.c:447 +#, c-format msgid "root %s" -msgstr "radice" +msgstr "radice %s" -#: builtin/fsck.c:393 +#: builtin/fsck.c:455 #, c-format msgid "tagged %s %s (%s) in %s" -msgstr "" +msgstr "eseguito tag di %s %s (%s) in %s" -#: builtin/fsck.c:422 +#: builtin/fsck.c:484 #, c-format msgid "%s: object corrupt or missing" -msgstr "" +msgstr "%s: oggetto corrotto o mancante" -#: builtin/fsck.c:447 -#, fuzzy, c-format +#: builtin/fsck.c:509 +#, c-format msgid "%s: invalid reflog entry %s" -msgstr "riferimento non valido: %s" +msgstr "%s: voce registro riferimenti non valida: %s" -#: builtin/fsck.c:461 -#, fuzzy, c-format +#: builtin/fsck.c:523 +#, c-format msgid "Checking reflog %s->%s" -msgstr "Checkout dei file in corso" +msgstr "Controllo registro riferimenti %s->%s" -#: builtin/fsck.c:495 -#, fuzzy, c-format +#: builtin/fsck.c:557 +#, c-format msgid "%s: invalid sha1 pointer %s" -msgstr "riga shallow non valida: '%s'" +msgstr "%s: puntatore SHA1 non valido: %s" -#: builtin/fsck.c:502 -#, fuzzy, c-format +#: builtin/fsck.c:564 +#, c-format msgid "%s: not a commit" -msgstr "%s %s non è un commit!" +msgstr "%s: non è un commit" -#: builtin/fsck.c:557 -#, fuzzy +#: builtin/fsck.c:619 msgid "notice: No default references" -msgstr "impossibile eliminare i riferimenti: %s" +msgstr "avviso: nessun riferimento predefinito" -#: builtin/fsck.c:572 -#, fuzzy, c-format +#: builtin/fsck.c:634 +#, c-format msgid "%s: object corrupt or missing: %s" -msgstr "oggetto non trovato: %s" +msgstr "%s: oggetto corrotto o mancante: %s" -#: builtin/fsck.c:585 -#, fuzzy, c-format +#: builtin/fsck.c:647 +#, c-format msgid "%s: object could not be parsed: %s" -msgstr "impossibile analizzare %s" +msgstr "%s: impossibile analizzare l'oggetto: %s" -#: builtin/fsck.c:605 -#, fuzzy, c-format +#: builtin/fsck.c:667 +#, c-format msgid "bad sha1 file: %s" -msgstr "riga shallow non valida: '%s'" +msgstr "file SHA1 non valido: %s" -#: builtin/fsck.c:620 -#, fuzzy +#: builtin/fsck.c:682 msgid "Checking object directory" -msgstr "Due directory di output?" +msgstr "Controllo directory oggetti in corso" -#: builtin/fsck.c:623 -#, fuzzy +#: builtin/fsck.c:685 msgid "Checking object directories" -msgstr "Due directory di output?" +msgstr "Controllo directory oggetti in corso" -#: builtin/fsck.c:638 -#, fuzzy, c-format +#: builtin/fsck.c:700 +#, c-format msgid "Checking %s link" -msgstr "Checkout dei file in corso" +msgstr "Controllo collegamento %s" -#: builtin/fsck.c:643 builtin/index-pack.c:833 +#: builtin/fsck.c:705 builtin/index-pack.c:841 #, c-format msgid "invalid %s" msgstr "%s non valido" -#: builtin/fsck.c:650 -#, fuzzy, c-format +#: builtin/fsck.c:712 +#, c-format msgid "%s points to something strange (%s)" -msgstr "%s - non è qualcosa per cui possiamo eseguire il merge" +msgstr "%s punta a qualcosa di strano (%s)" -#: builtin/fsck.c:656 +#: builtin/fsck.c:718 #, c-format msgid "%s: detached HEAD points at nothing" -msgstr "" +msgstr "%s: l'HEAD scollegato non punta a niente" -#: builtin/fsck.c:660 +#: builtin/fsck.c:722 #, c-format msgid "notice: %s points to an unborn branch (%s)" -msgstr "" +msgstr "avviso: %s punta a un branch non nato (%s)" -#: builtin/fsck.c:672 -#, fuzzy +#: builtin/fsck.c:734 msgid "Checking cache tree" -msgstr "Controllo della patch %s in corso..." +msgstr "Controllo cache albero in corso" -#: builtin/fsck.c:677 -#, fuzzy, c-format +#: builtin/fsck.c:739 +#, c-format msgid "%s: invalid sha1 pointer in cache-tree" -msgstr "Impossibile aggiornare l'albero cache principale" +msgstr "%s: puntatore SHA1 non valido nella cache alberi" -#: builtin/fsck.c:688 +#: builtin/fsck.c:750 msgid "non-tree in cache-tree" -msgstr "" +msgstr "oggetto non albero nella cache alberi" -#: builtin/fsck.c:719 -#, fuzzy +#: builtin/fsck.c:781 msgid "git fsck [<options>] [<object>...]" -msgstr "git apply [opzioni] [<patch>...]" +msgstr "git fsck [<opzioni>] [<oggetto>...]" -#: builtin/fsck.c:725 +#: builtin/fsck.c:787 msgid "show unreachable objects" -msgstr "" +msgstr "visualizza oggetti non raggiungibili" -#: builtin/fsck.c:726 -#, fuzzy +#: builtin/fsck.c:788 msgid "show dangling objects" -msgstr "Indicizzazione degli oggetti" +msgstr "visualizza oggetti pendenti" -#: builtin/fsck.c:727 +#: builtin/fsck.c:789 msgid "report tags" -msgstr "" +msgstr "segnala i tag" -#: builtin/fsck.c:728 +#: builtin/fsck.c:790 msgid "report root nodes" -msgstr "" +msgstr "segnala i nodi radice" -#: builtin/fsck.c:729 +#: builtin/fsck.c:791 msgid "make index objects head nodes" -msgstr "" +msgstr "rendi gli oggetti indice nodi head" -#: builtin/fsck.c:730 +#: builtin/fsck.c:792 msgid "make reflogs head nodes (default)" -msgstr "" +msgstr "rendi i registri dei riferimenti nodi head (impostazione predefinita)" -#: builtin/fsck.c:731 +#: builtin/fsck.c:793 msgid "also consider packs and alternate objects" -msgstr "" +msgstr "considera anche i pack e gli oggetti alternativi" -#: builtin/fsck.c:732 +#: builtin/fsck.c:794 msgid "check only connectivity" -msgstr "" +msgstr "controlla solo la connessione" -#: builtin/fsck.c:733 +#: builtin/fsck.c:795 msgid "enable more strict checking" -msgstr "" +msgstr "abilita controlli più restrittivi" -#: builtin/fsck.c:735 +#: builtin/fsck.c:797 msgid "write dangling objects in .git/lost-found" -msgstr "" +msgstr "scrivi oggetti pendenti in .git/lost-found" -#: builtin/fsck.c:736 builtin/prune.c:110 +#: builtin/fsck.c:798 builtin/prune.c:132 msgid "show progress" -msgstr "" +msgstr "visualizza l'avanzamento" -#: builtin/fsck.c:737 -#, fuzzy +#: builtin/fsck.c:799 msgid "show verbose names for reachable objects" -msgstr "Mostra vari tipi di oggetti" +msgstr "visualizza nomi dettagliati per gli oggetti raggiungibili" -#: builtin/fsck.c:797 -#, fuzzy +#: builtin/fsck.c:859 builtin/index-pack.c:224 msgid "Checking objects" -msgstr "Ricezione degli oggetti" +msgstr "Controllo oggetti in corso" -#: builtin/fsck.c:825 -#, fuzzy, c-format +#: builtin/fsck.c:887 +#, c-format msgid "%s: object missing" -msgstr "visualizza dimensioni oggetto" +msgstr "%s: oggetto mancante" -#: builtin/fsck.c:837 -#, fuzzy, c-format +#: builtin/fsck.c:899 +#, c-format msgid "invalid parameter: expected sha1, got '%s'" -msgstr "errore protocollo: atteso SHA1 shallow, ricevuto '%s'" +msgstr "parametro non valido: atteso SHA1, presente '%s'" #: builtin/gc.c:34 -#, fuzzy msgid "git gc [<options>]" -msgstr "git apply [opzioni] [<patch>...]" +msgstr "git gc [<opzioni>]" #: builtin/gc.c:90 -#, fuzzy, c-format +#, c-format msgid "Failed to fstat %s: %s" -msgstr "stat di %s non riuscito\n" +msgstr "fstat di %s non riuscito: %s" + +#: builtin/gc.c:126 +#, c-format +msgid "failed to parse '%s' value '%s'" +msgstr "analisi dell'opzione '%s' con valore '%s' non riuscita" -#: builtin/gc.c:461 builtin/init-db.c:55 +#: builtin/gc.c:476 builtin/init-db.c:55 #, c-format msgid "cannot stat '%s'" msgstr "impossibile eseguire lo stat di '%s'" -#: builtin/gc.c:470 builtin/notes.c:240 builtin/tag.c:510 +#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:519 #, c-format msgid "cannot read '%s'" msgstr "impossibile leggere '%s'" -#: builtin/gc.c:477 +#: builtin/gc.c:492 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -12324,66 +13150,81 @@ msgid "" "\n" "%s" msgstr "" +"L'ultima esecuzione di gc ha segnalato quanto segue. Correggi la causa\n" +"alla radice ed elimina %s.\n" +"L'operazione di pulizia automatica non sarà eseguita fino all'eliminazione\n" +"del file.\n" +"\n" +"%s" -#: builtin/gc.c:519 +#: builtin/gc.c:540 msgid "prune unreferenced objects" -msgstr "" +msgstr "elimina oggetti non referenziati" -#: builtin/gc.c:521 +#: builtin/gc.c:542 msgid "be more thorough (increased runtime)" -msgstr "" +msgstr "sii più accurato (tempi di esecuzione maggiori)" -#: builtin/gc.c:522 +#: builtin/gc.c:543 msgid "enable auto-gc mode" -msgstr "" +msgstr "abilita modalità garbage collector automatica" -#: builtin/gc.c:525 +#: builtin/gc.c:546 msgid "force running gc even if there may be another gc running" msgstr "" +"forza l'esecuzione del garbage collector anche nel caso in cui ve ne " +"potrebbe essere un altro in esecuzione" -#: builtin/gc.c:528 +#: builtin/gc.c:549 msgid "repack all other packs except the largest pack" msgstr "" +"esegui il repack di tutti gli altri pack ad eccezione di quello più grande" -#: builtin/gc.c:545 -#, fuzzy, c-format +#: builtin/gc.c:566 +#, c-format msgid "failed to parse gc.logexpiry value %s" -msgstr "rimozione di %s non riuscita" +msgstr "analisi del valore %s di gc.logexpiry non riuscita" -#: builtin/gc.c:556 -#, fuzzy, c-format +#: builtin/gc.c:577 +#, c-format msgid "failed to parse prune expiry value %s" -msgstr "rimozione di %s non riuscita" +msgstr "analisi del valore %s per la scadenza delle eliminazioni non riuscita" -#: builtin/gc.c:576 +#: builtin/gc.c:597 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "" +"Comprimo il repository in background per ottenere le migliori prestazioni.\n" -#: builtin/gc.c:578 +#: builtin/gc.c:599 #, c-format msgid "Auto packing the repository for optimum performance.\n" -msgstr "" +msgstr "Comprimo il repository per ottenere le migliori prestazioni.\n" -#: builtin/gc.c:579 +#: builtin/gc.c:600 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" -msgstr "" +msgstr "Vedi \"git help gc\" per le operazioni di manutenzione manuali.\n" -#: builtin/gc.c:619 +#: builtin/gc.c:640 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" msgstr "" +"gc è già in esecuzione sul computer '%s' con PID %<PRIuMAX> (usa --force se " +"non lo è)" -#: builtin/gc.c:672 +#: builtin/gc.c:693 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" +"Ci sono troppi oggetti sparsi non raggiungibili; esegui 'git prune' per " +"eliminarli." #: builtin/grep.c:29 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "" +"git grep [<opzioni>] [-e] <pattern> [<revisione>...] [[--] <percorso>...]" #: builtin/grep.c:225 #, c-format @@ -12393,17 +13234,17 @@ msgstr "grep: creazione del thread non riuscita: %s" #: builtin/grep.c:279 #, c-format msgid "invalid number of threads specified (%d) for %s" -msgstr "" +msgstr "specificato numero non valido di thread (%d) per %s" #. TRANSLATORS: %s is the configuration #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c:287 builtin/index-pack.c:1506 builtin/index-pack.c:1697 -#: builtin/pack-objects.c:2717 +#: builtin/grep.c:287 builtin/index-pack.c:1514 builtin/index-pack.c:1705 +#: builtin/pack-objects.c:2720 #, c-format msgid "no threads support, ignoring %s" -msgstr "" +msgstr "non vi è supporto per i thread, ignoro %s" #: builtin/grep.c:466 builtin/grep.c:590 builtin/grep.c:631 #, c-format @@ -12413,7 +13254,7 @@ msgstr "impossibile leggere il tree (%s)" #: builtin/grep.c:646 #, c-format msgid "unable to grep from object of type %s" -msgstr "" +msgstr "impossibile eseguire grep su un oggetto di tipo %s" #: builtin/grep.c:712 #, c-format @@ -12422,344 +13263,346 @@ msgstr "switch '%c' richiede un valore numerico" #: builtin/grep.c:811 msgid "search in index instead of in the work tree" -msgstr "" +msgstr "cerca nell'index anziché nell'albero di lavoro" #: builtin/grep.c:813 msgid "find in contents not managed by git" -msgstr "" +msgstr "la ricerca nei contenuti non è gestita da Git" #: builtin/grep.c:815 msgid "search in both tracked and untracked files" -msgstr "" +msgstr "cerca sia nei file tracciati sia in quelli non tracciati" #: builtin/grep.c:817 msgid "ignore files specified via '.gitignore'" -msgstr "" +msgstr "ignora i file specificati in '.gitignore'" #: builtin/grep.c:819 msgid "recursively search in each submodule" -msgstr "" +msgstr "cerca ricorsivamente in ogni sottomodulo" #: builtin/grep.c:822 msgid "show non-matching lines" -msgstr "" +msgstr "visualizza le righe non corrispondenti" #: builtin/grep.c:824 msgid "case insensitive matching" -msgstr "" +msgstr "ricerca corrispondenze senza differenze maiuscole/minuscole" #: builtin/grep.c:826 msgid "match patterns only at word boundaries" -msgstr "" +msgstr "cerca corrispondenze ai pattern solo a inizio/fine parola" #: builtin/grep.c:828 msgid "process binary files as text" -msgstr "" +msgstr "elabora i file binari come testuali" #: builtin/grep.c:830 msgid "don't match patterns in binary files" -msgstr "" +msgstr "non cercare corrispondenze ai pattern nei file binari" #: builtin/grep.c:833 msgid "process binary files with textconv filters" -msgstr "" +msgstr "elabora i file binari con filtri di conversione in testo" #: builtin/grep.c:835 msgid "search in subdirectories (default)" -msgstr "" +msgstr "cerca nelle sottodirectory (impostazione predefinita)" #: builtin/grep.c:837 msgid "descend at most <depth> levels" -msgstr "" +msgstr "scendi al più di <profondità> livelli" #: builtin/grep.c:841 msgid "use extended POSIX regular expressions" -msgstr "" +msgstr "usa espressioni regolari POSIX estese" #: builtin/grep.c:844 msgid "use basic POSIX regular expressions (default)" -msgstr "" +msgstr "usa espressioni regolari POSIX di base (impostazione predefinita)" #: builtin/grep.c:847 msgid "interpret patterns as fixed strings" -msgstr "" +msgstr "interpreta i pattern come stringhe fisse" #: builtin/grep.c:850 msgid "use Perl-compatible regular expressions" -msgstr "" +msgstr "usa espressioni regolari compatibili con Perl" #: builtin/grep.c:853 msgid "show line numbers" -msgstr "" +msgstr "visualizza numeri di riga" #: builtin/grep.c:854 msgid "show column number of first match" -msgstr "" +msgstr "visualizza il numero di colonna della prima corrispondenza" #: builtin/grep.c:855 msgid "don't show filenames" -msgstr "" +msgstr "non visualizzare i nomi file" #: builtin/grep.c:856 -#, fuzzy msgid "show filenames" -msgstr "%s file:" +msgstr "visualizza i nomi file" #: builtin/grep.c:858 msgid "show filenames relative to top directory" -msgstr "" +msgstr "visualizza i nomi file relativi alla directory di primo livello" #: builtin/grep.c:860 msgid "show only filenames instead of matching lines" -msgstr "" +msgstr "visualizza solo i nomi file anziché le righe corrispondenti" #: builtin/grep.c:862 msgid "synonym for --files-with-matches" -msgstr "" +msgstr "sinonimo di --files-with-matches" #: builtin/grep.c:865 msgid "show only the names of files without match" -msgstr "" +msgstr "visualizza solo i nomi dei file non corrispondenti" #: builtin/grep.c:867 -#, fuzzy msgid "print NUL after filenames" -msgstr "antepone <root> a tutti i nomi file" +msgstr "stampa NUL dopo i nomi file" #: builtin/grep.c:870 msgid "show only matching parts of a line" -msgstr "" +msgstr "visualizza solo le parti corrispondenti di una riga" #: builtin/grep.c:872 msgid "show the number of matches instead of matching lines" -msgstr "" +msgstr "visualizza il numero di corrispondenze anziché le righe corrispondenti" #: builtin/grep.c:873 msgid "highlight matches" -msgstr "" +msgstr "evidenzia corrispondenze" #: builtin/grep.c:875 msgid "print empty line between matches from different files" -msgstr "" +msgstr "stampa una riga vuota fra le corrispondenze in file differenti" #: builtin/grep.c:877 msgid "show filename only once above matches from same file" msgstr "" +"visualizza il nome file solo una volta prima delle corrispondenze nello " +"stesso file" #: builtin/grep.c:880 msgid "show <n> context lines before and after matches" -msgstr "" +msgstr "visualizza <n> righe di contesto prima e dopo le corrispondenze" #: builtin/grep.c:883 msgid "show <n> context lines before matches" -msgstr "" +msgstr "visualizza <n> righe di contesto prima delle corrispondenze" #: builtin/grep.c:885 msgid "show <n> context lines after matches" -msgstr "" +msgstr "visualizza <n> righe di contesto dopo le corrispondenze" #: builtin/grep.c:887 msgid "use <n> worker threads" -msgstr "" +msgstr "usa <n> thread di lavoro" #: builtin/grep.c:888 msgid "shortcut for -C NUM" -msgstr "" +msgstr "scorciatoia per -C NUM" #: builtin/grep.c:891 msgid "show a line with the function name before matches" -msgstr "" +msgstr "visualizza una riga con il nome funzione prima delle corrispondenze" #: builtin/grep.c:893 msgid "show the surrounding function" -msgstr "" +msgstr "visualizza la funzione circostante" #: builtin/grep.c:896 msgid "read patterns from file" -msgstr "" +msgstr "leggi le corrispondenze da un file" #: builtin/grep.c:898 msgid "match <pattern>" -msgstr "" +msgstr "cerca corrispondenze con <pattern>" #: builtin/grep.c:900 msgid "combine patterns specified with -e" -msgstr "" +msgstr "combina i pattern specificati con -e" #: builtin/grep.c:912 msgid "indicate hit with exit status without output" msgstr "" +"segnala una corrispondenza con il codice di uscita senza emettere output" #: builtin/grep.c:914 msgid "show only matches from files that match all patterns" msgstr "" +"visualizza solo le corrispondenze nei file in cui vi sono corrispondenze per " +"tutti i pattern" #: builtin/grep.c:916 msgid "show parse tree for grep expression" -msgstr "" +msgstr "visualizza l'albero di analisi per l'espressione grep" #: builtin/grep.c:920 msgid "pager" -msgstr "" +msgstr "pager" #: builtin/grep.c:920 msgid "show matching files in the pager" -msgstr "" +msgstr "visualizza i file corrispondenti nel pager" #: builtin/grep.c:924 msgid "allow calling of grep(1) (ignored by this build)" -msgstr "" +msgstr "consenti" #: builtin/grep.c:988 -#, fuzzy msgid "no pattern given" -msgstr "nessun modello specificato." +msgstr "nessun pattern specificato" #: builtin/grep.c:1024 -#, fuzzy msgid "--no-index or --untracked cannot be used with revs" -msgstr "--no-index o --untracked non possono essere usate con le revisioni." +msgstr "--no-index o --untracked non possono essere usate con le revisioni" #: builtin/grep.c:1032 -#, fuzzy, c-format +#, c-format msgid "unable to resolve revision: %s" -msgstr "impossibile spostare %s in %s" +msgstr "impossibile risolvere la revisione %s" #: builtin/grep.c:1063 msgid "invalid option combination, ignoring --threads" -msgstr "" +msgstr "combinazione di opzioni non valida, ignoro --threads" -#: builtin/grep.c:1066 builtin/pack-objects.c:3400 +#: builtin/grep.c:1066 builtin/pack-objects.c:3403 msgid "no threads support, ignoring --threads" -msgstr "" +msgstr "non vi è supporto per i thread, ignoro --threads" -#: builtin/grep.c:1069 builtin/index-pack.c:1503 builtin/pack-objects.c:2714 +#: builtin/grep.c:1069 builtin/index-pack.c:1511 builtin/pack-objects.c:2717 #, c-format msgid "invalid number of threads specified (%d)" -msgstr "" +msgstr "specificato numero non valido di thread (%d)" #: builtin/grep.c:1092 msgid "--open-files-in-pager only works on the worktree" -msgstr "" +msgstr "--open-files-in-pager funziona solo sull'albero di lavoro" #: builtin/grep.c:1115 msgid "option not supported with --recurse-submodules" -msgstr "" +msgstr "opzione non supportata con --recurse-submodules" #: builtin/grep.c:1121 -#, fuzzy msgid "--cached or --untracked cannot be used with --no-index" -msgstr "--cached o --untracked non può essere usato con --no-index." +msgstr "--cached o --untracked non possono essere usate con --no-index" #: builtin/grep.c:1127 msgid "--[no-]exclude-standard cannot be used for tracked contents" -msgstr "" +msgstr "--[no-]exclude-standard non può essere usata per i contenuti tracciati" #: builtin/grep.c:1135 msgid "both --cached and trees are given" -msgstr "" +msgstr "sono specificati sia --cached sia degli alberi" #: builtin/hash-object.c:85 msgid "" "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " "[--] <file>..." msgstr "" +"git hash-object [-t <tipo>] [-w] [--path=<file> | --no-filters] [--stdin] " +"[--] <file>..." #: builtin/hash-object.c:86 msgid "git hash-object --stdin-paths" -msgstr "" +msgstr "git hash-object --stdin-paths" #: builtin/hash-object.c:98 msgid "type" -msgstr "" +msgstr "tipo" #: builtin/hash-object.c:98 -#, fuzzy msgid "object type" -msgstr "tipo di oggetto errato." +msgstr "tipo oggetto" #: builtin/hash-object.c:99 msgid "write the object into the object database" -msgstr "" +msgstr "scrivi l'oggetto nel database oggetti" #: builtin/hash-object.c:101 msgid "read the object from stdin" -msgstr "" +msgstr "leggi l'oggetto dallo standard input" #: builtin/hash-object.c:103 msgid "store file as is without filters" -msgstr "" +msgstr "salva il file così com'è senza filtri" #: builtin/hash-object.c:104 msgid "" "just hash any random garbage to create corrupt objects for debugging Git" msgstr "" +"esegui semplicemente l'hash di dati inutili per creare oggetti corrotti al " +"fine di eseguire il debug di Git" #: builtin/hash-object.c:105 msgid "process file as it were from this path" -msgstr "" +msgstr "elabora i file come se fossero in questo percorso" #: builtin/help.c:46 -#, fuzzy msgid "print all available commands" -msgstr "comandi git disponibili in '%s'" +msgstr "stampa tutti i comandi disponibili" #: builtin/help.c:47 msgid "exclude guides" -msgstr "" +msgstr "escludi le guide" #: builtin/help.c:48 msgid "print list of useful guides" -msgstr "" +msgstr "stampa un elenco di guide utili" #: builtin/help.c:49 msgid "print all configuration variable names" -msgstr "" +msgstr "stampa i nomi di tutte le variabili di configurazione" #: builtin/help.c:51 msgid "show man page" -msgstr "" +msgstr "visualizza la pagina man" #: builtin/help.c:52 msgid "show manual in web browser" -msgstr "" +msgstr "visualizza il manuale nel browser Web" #: builtin/help.c:54 msgid "show info page" -msgstr "" +msgstr "visualizza la pagina info" #: builtin/help.c:56 msgid "print command description" -msgstr "" +msgstr "stampa la descrizione del comando" #: builtin/help.c:61 msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" -msgstr "" +msgstr "git help [--all] [--guides] [--man | --web | --info] [<comando>]" -#: builtin/help.c:73 +#: builtin/help.c:77 #, c-format msgid "unrecognized help format '%s'" msgstr "formato di aiuto '%s' non riconosciuto" -#: builtin/help.c:100 +#: builtin/help.c:104 msgid "Failed to start emacsclient." msgstr "Esecuzione di emacsclient non riuscita." -#: builtin/help.c:113 +#: builtin/help.c:117 msgid "Failed to parse emacsclient version." msgstr "Verifica della versione di emacsclient non riuscita." -#: builtin/help.c:121 +#: builtin/help.c:125 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "la versione '%d' di emacsclient è troppo vecchia (<22)." -#: builtin/help.c:139 builtin/help.c:161 builtin/help.c:171 builtin/help.c:179 -#, fuzzy, c-format +#: builtin/help.c:143 builtin/help.c:165 builtin/help.c:175 builtin/help.c:183 +#, c-format msgid "failed to exec '%s'" -msgstr "esecuzione di '%s' non riuscita: %s" +msgstr "esecuzione di '%s' non riuscita" -#: builtin/help.c:217 +#: builtin/help.c:221 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" @@ -12768,7 +13611,7 @@ msgstr "" "'%s': path ad un visualizzatore man pages non supportato.\n" "Usa invece 'man.<tool>.cmd'." -#: builtin/help.c:229 +#: builtin/help.c:233 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" @@ -12777,407 +13620,401 @@ msgstr "" "'%s': comando per visualizzatore man pages supportato.\n" "Per favore usa 'man.<tool>.path' invece." -#: builtin/help.c:346 +#: builtin/help.c:350 #, c-format msgid "'%s': unknown man viewer." msgstr "'%s': visualizzatore man sconosciuto." -#: builtin/help.c:363 +#: builtin/help.c:367 msgid "no man viewer handled the request" msgstr "nessun visualizzatore man ha gestito la richiesta" -#: builtin/help.c:371 +#: builtin/help.c:375 msgid "no info viewer handled the request" msgstr "nessun visualizzatore info ha gestito la richiesta" -#: builtin/help.c:430 builtin/help.c:441 git.c:323 -#, fuzzy, c-format +#: builtin/help.c:434 builtin/help.c:445 git.c:335 +#, c-format msgid "'%s' is aliased to '%s'" -msgstr "'git %s è un alias di '%s'" +msgstr "'%s' è un alias di '%s'" -#: builtin/help.c:444 git.c:347 -#, fuzzy, c-format +#: builtin/help.c:448 git.c:364 +#, c-format msgid "bad alias.%s string: %s" -msgstr "Stringa branch.%s.mergeoptions errata: %s" +msgstr "stringa alias.%s non valida: %s" -#: builtin/help.c:473 builtin/help.c:503 +#: builtin/help.c:477 builtin/help.c:507 #, c-format msgid "usage: %s%s" msgstr "uso: %s%s" -#: builtin/help.c:487 -#, fuzzy +#: builtin/help.c:491 msgid "'git help config' for more information" -msgstr "" -"Vedi 'git help <comando> per maggiori informazioni su un comando specifico." +msgstr "Vedi 'git help config' per maggiori informazioni" #: builtin/index-pack.c:184 #, c-format msgid "object type mismatch at %s" -msgstr "" +msgstr "tipo oggetto non corrispondente in %s" #: builtin/index-pack.c:204 -#, fuzzy, c-format +#, c-format msgid "did not receive expected object %s" -msgstr "Non è stato possibile leggere l'oggetto %s" +msgstr "non si è ricevuto l'oggetto atteso %s" #: builtin/index-pack.c:207 -#, fuzzy, c-format +#, c-format msgid "object %s: expected type %s, found %s" -msgstr "oggetto %s non trovato" +msgstr "oggetto %s: atteso tipo %s, trovato %s" -#: builtin/index-pack.c:249 +#: builtin/index-pack.c:257 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "impossibile riempire %d byte" +msgstr[1] "impossibile riempire %d byte" -#: builtin/index-pack.c:259 +#: builtin/index-pack.c:267 msgid "early EOF" msgstr "EOF prematuro" -#: builtin/index-pack.c:260 +#: builtin/index-pack.c:268 msgid "read error on input" msgstr "errore di lettura in input" -#: builtin/index-pack.c:272 +#: builtin/index-pack.c:280 msgid "used more bytes than were available" msgstr "usati più byte di quelli disponibili" -#: builtin/index-pack.c:279 builtin/pack-objects.c:599 +#: builtin/index-pack.c:287 builtin/pack-objects.c:600 msgid "pack too large for current definition of off_t" msgstr "pack troppo largo per la definizione corrente di off_t" -#: builtin/index-pack.c:282 builtin/unpack-objects.c:94 +#: builtin/index-pack.c:290 builtin/unpack-objects.c:94 msgid "pack exceeds maximum allowed size" -msgstr "" +msgstr "il pack supera la dimensione massima consentita" -#: builtin/index-pack.c:297 builtin/repack.c:250 +#: builtin/index-pack.c:305 builtin/repack.c:250 #, c-format msgid "unable to create '%s'" msgstr "impossibile creare '%s'" -#: builtin/index-pack.c:303 +#: builtin/index-pack.c:311 #, c-format msgid "cannot open packfile '%s'" msgstr "impossibile aprire il file pack '%s'" -#: builtin/index-pack.c:317 +#: builtin/index-pack.c:325 msgid "pack signature mismatch" msgstr "la firma del pack non coincide" -#: builtin/index-pack.c:319 +#: builtin/index-pack.c:327 #, c-format msgid "pack version %<PRIu32> unsupported" -msgstr "" +msgstr "versione pack %<PRIu32> non supportata" -#: builtin/index-pack.c:337 +#: builtin/index-pack.c:345 #, c-format msgid "pack has bad object at offset %<PRIuMAX>: %s" -msgstr "" +msgstr "il pack ha un oggetto danneggiato all'offset %<PRIuMAX>: %s" -#: builtin/index-pack.c:457 +#: builtin/index-pack.c:465 #, c-format msgid "inflate returned %d" -msgstr "" +msgstr "inflate ha restituito il codice %d" -#: builtin/index-pack.c:506 +#: builtin/index-pack.c:514 msgid "offset value overflow for delta base object" -msgstr "" +msgstr "overflow del valore dell'offset base del delta" -#: builtin/index-pack.c:514 +#: builtin/index-pack.c:522 msgid "delta base offset is out of bound" -msgstr "" +msgstr "l'offset base del delta è fuori dall'intervallo consentito" -#: builtin/index-pack.c:522 +#: builtin/index-pack.c:530 #, c-format msgid "unknown object type %d" -msgstr "tipo di oggetto %d sconosciuto" +msgstr "tipo oggetto %d sconosciuto" -#: builtin/index-pack.c:553 +#: builtin/index-pack.c:561 msgid "cannot pread pack file" -msgstr "" +msgstr "impossibile eseguire pread sul file pack" -#: builtin/index-pack.c:555 +#: builtin/index-pack.c:563 #, c-format msgid "premature end of pack file, %<PRIuMAX> byte missing" msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "fine del file pack prematura, %<PRIuMAX> byte mancante" +msgstr[1] "fine del file pack prematura, %<PRIuMAX> byte mancanti" -#: builtin/index-pack.c:581 +#: builtin/index-pack.c:589 msgid "serious inflate inconsistency" -msgstr "" +msgstr "inconsistenza grave di inflate" -#: builtin/index-pack.c:726 builtin/index-pack.c:732 builtin/index-pack.c:755 -#: builtin/index-pack.c:794 builtin/index-pack.c:803 +#: 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 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "TROVATA COLLISIONE SHA1 CON %s !" -#: builtin/index-pack.c:729 builtin/pack-objects.c:152 -#: builtin/pack-objects.c:212 builtin/pack-objects.c:306 -#, fuzzy, c-format +#: builtin/index-pack.c:737 builtin/pack-objects.c:153 +#: builtin/pack-objects.c:213 builtin/pack-objects.c:307 +#, c-format msgid "unable to read %s" -msgstr "non è possibile scrivere %s" +msgstr "impossibile leggere %s" -#: builtin/index-pack.c:792 -#, fuzzy, c-format +#: builtin/index-pack.c:800 +#, c-format msgid "cannot read existing object info %s" -msgstr "non è possibile leggere l'oggetto %s esistente" +msgstr "impossibile leggere le informazioni sull'oggetto esistente: %s" -#: builtin/index-pack.c:800 +#: builtin/index-pack.c:808 #, c-format msgid "cannot read existing object %s" msgstr "non è possibile leggere l'oggetto %s esistente" -#: builtin/index-pack.c:814 +#: builtin/index-pack.c:822 #, c-format msgid "invalid blob object %s" msgstr "oggetto blob %s non valido" -#: builtin/index-pack.c:817 builtin/index-pack.c:836 -#, fuzzy +#: builtin/index-pack.c:825 builtin/index-pack.c:844 msgid "fsck error in packed object" -msgstr "Errore nell'oggetto" +msgstr "errore fsck nell'oggetto sottoposto a pack" -#: builtin/index-pack.c:838 +#: builtin/index-pack.c:846 #, c-format msgid "Not all child objects of %s are reachable" msgstr "Non tutti gli oggetti figlio di %s sono raggiungibili" -#: builtin/index-pack.c:910 builtin/index-pack.c:941 +#: builtin/index-pack.c:918 builtin/index-pack.c:949 msgid "failed to apply delta" msgstr "applicazione del delta non riuscita" -#: builtin/index-pack.c:1109 +#: builtin/index-pack.c:1117 msgid "Receiving objects" msgstr "Ricezione degli oggetti" -#: builtin/index-pack.c:1109 +#: builtin/index-pack.c:1117 msgid "Indexing objects" msgstr "Indicizzazione degli oggetti" -#: builtin/index-pack.c:1143 +#: builtin/index-pack.c:1151 msgid "pack is corrupted (SHA1 mismatch)" msgstr "il pack è corrotto (SHA1 non corrisponde)" -#: builtin/index-pack.c:1148 +#: builtin/index-pack.c:1156 msgid "cannot fstat packfile" -msgstr "" +msgstr "impossibile eseguire fstat sul file pack" -#: builtin/index-pack.c:1151 +#: builtin/index-pack.c:1159 msgid "pack has junk at the end" -msgstr "" +msgstr "il pack ha dati inutili alla fine" -#: builtin/index-pack.c:1163 -#, fuzzy +#: builtin/index-pack.c:1171 msgid "confusion beyond insanity in parse_pack_objects()" -msgstr "confusione al di là della follia" +msgstr "confusione oltre ogni follia in parse_pack_objects()" -#: builtin/index-pack.c:1186 +#: builtin/index-pack.c:1194 msgid "Resolving deltas" msgstr "Risoluzione dei delta" -#: builtin/index-pack.c:1196 builtin/pack-objects.c:2486 -#, fuzzy, c-format +#: builtin/index-pack.c:1204 builtin/pack-objects.c:2489 +#, c-format msgid "unable to create thread: %s" -msgstr "grep: creazione del thread non riuscita: %s" +msgstr "impossibile creare il thread: %s" -#: builtin/index-pack.c:1237 +#: builtin/index-pack.c:1245 msgid "confusion beyond insanity" -msgstr "confusione al di là della follia" +msgstr "confusione oltre ogni follia" -#: builtin/index-pack.c:1243 +#: builtin/index-pack.c:1251 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "completato con %d oggetto locale" +msgstr[1] "completato con %d oggetto locali" -#: builtin/index-pack.c:1255 +#: builtin/index-pack.c:1263 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" -msgstr "" +msgstr "Checksum in coda inatteso per %s (disco corrotto?)" -#: builtin/index-pack.c:1259 +#: builtin/index-pack.c:1267 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "pack ha %d delta irrisolto" msgstr[1] "pack ha %d delta irrisolti" -#: builtin/index-pack.c:1283 +#: builtin/index-pack.c:1291 #, c-format msgid "unable to deflate appended object (%d)" -msgstr "" +msgstr "impossibile eseguire deflate sull'oggetto aggiunto alla fine (%d)" -#: builtin/index-pack.c:1360 +#: builtin/index-pack.c:1368 #, c-format msgid "local object %s is corrupt" msgstr "l'oggetto locale %s è corrotto" -#: builtin/index-pack.c:1374 +#: builtin/index-pack.c:1382 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "il nome del file pack '%s' non termina con '.pack'" -#: builtin/index-pack.c:1399 -#, fuzzy, c-format +#: builtin/index-pack.c:1407 +#, c-format msgid "cannot write %s file '%s'" -msgstr "impossibile scrivere il file keep '%s'" +msgstr "impossibile scrivere il file %s '%s'" -#: builtin/index-pack.c:1407 -#, fuzzy, c-format +#: builtin/index-pack.c:1415 +#, c-format msgid "cannot close written %s file '%s'" -msgstr "impossibile scrivere il file keep '%s'" +msgstr "impossibile chiudere il file %s scritto '%s'" -#: builtin/index-pack.c:1431 +#: builtin/index-pack.c:1439 msgid "error while closing pack file" msgstr "errore nella chiusura del file pack" -#: builtin/index-pack.c:1445 +#: builtin/index-pack.c:1453 msgid "cannot store pack file" msgstr "impossibile archiviare il file pack" -#: builtin/index-pack.c:1453 +#: builtin/index-pack.c:1461 msgid "cannot store index file" msgstr "impossibile archiviare index file" -#: builtin/index-pack.c:1497 builtin/pack-objects.c:2725 -#, fuzzy, c-format +#: builtin/index-pack.c:1505 builtin/pack-objects.c:2728 +#, c-format msgid "bad pack.indexversion=%<PRIu32>" -msgstr "versione '%s' di index errata" +msgstr "pack.indexversion=%<PRIu32> non valida" -#: builtin/index-pack.c:1565 +#: builtin/index-pack.c:1573 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Impossibile aprire il file pack '%s' esistente" -#: builtin/index-pack.c:1567 +#: builtin/index-pack.c:1575 #, c-format msgid "Cannot open existing pack idx file for '%s'" -msgstr "" +msgstr "Impossibile aprire il file pack idx esistente per '%s'" -#: builtin/index-pack.c:1615 +#: builtin/index-pack.c:1623 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "non delta: %d oggetto" msgstr[1] "non delta: %d oggetti" -#: builtin/index-pack.c:1622 +#: builtin/index-pack.c:1630 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "lunghezza della catena = %d: %lu oggetto" msgstr[1] "lunghezza della catena = %d: %lu oggetti" -#: builtin/index-pack.c:1659 +#: builtin/index-pack.c:1667 msgid "Cannot come back to cwd" -msgstr "" +msgstr "impossibile tornare alla directory di lavoro corrente" -#: builtin/index-pack.c:1708 builtin/index-pack.c:1711 -#: builtin/index-pack.c:1727 builtin/index-pack.c:1731 +#: builtin/index-pack.c:1716 builtin/index-pack.c:1719 +#: builtin/index-pack.c:1735 builtin/index-pack.c:1739 #, c-format msgid "bad %s" msgstr "%s errato" -#: builtin/index-pack.c:1747 +#: builtin/index-pack.c:1755 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin non può essere usato senza --stdin" -#: builtin/index-pack.c:1749 -#, fuzzy +#: builtin/index-pack.c:1757 msgid "--stdin requires a git repository" -msgstr "--index al di fuori di un repository" +msgstr "--stdin richiede un repository Git" -#: builtin/index-pack.c:1755 +#: builtin/index-pack.c:1763 msgid "--verify with no packfile name given" msgstr "--verify senza un nome del file pack specificato" -#: builtin/index-pack.c:1803 builtin/unpack-objects.c:580 -#, fuzzy +#: builtin/index-pack.c:1811 builtin/unpack-objects.c:580 msgid "fsck error in pack objects" -msgstr "Errore nell'oggetto" +msgstr "errore fsck negli oggetti sottoposti a pack" #: builtin/init-db.c:61 #, c-format msgid "cannot stat template '%s'" -msgstr "" +msgstr "impossibile eseguire stat sul modello '%s'" #: builtin/init-db.c:66 #, c-format msgid "cannot opendir '%s'" -msgstr "" +msgstr "impossibile aprire la directory '%s'" #: builtin/init-db.c:78 #, c-format msgid "cannot readlink '%s'" -msgstr "" +msgstr "impossibile leggere il link '%s'" #: builtin/init-db.c:80 #, c-format msgid "cannot symlink '%s' '%s'" -msgstr "" +msgstr "impossibile creare il collegamento simbolico da '%s' a '%s'" #: builtin/init-db.c:86 #, c-format msgid "cannot copy '%s' to '%s'" -msgstr "" +msgstr "impossibile copiare '%s' in '%s'" #: builtin/init-db.c:90 #, c-format msgid "ignoring template %s" -msgstr "" +msgstr "ignoro il modello %s" #: builtin/init-db.c:121 -#, fuzzy, c-format +#, c-format msgid "templates not found in %s" -msgstr "Il branch remoto %s non è stato trovato in upstream %s" +msgstr "modelli non trovati in %s" #: builtin/init-db.c:136 -#, fuzzy, c-format +#, c-format msgid "not copying templates from '%s': %s" -msgstr "Copia delle note da '%s' a '%s' non riuscita" +msgstr "non copio i modelli da '%s': %s" -#: builtin/init-db.c:329 +#: builtin/init-db.c:334 #, c-format msgid "unable to handle file type %d" msgstr "impossibile gestire il tipo di file %d" -#: builtin/init-db.c:332 +#: builtin/init-db.c:337 #, c-format msgid "unable to move %s to %s" msgstr "impossibile spostare %s in %s" -#: builtin/init-db.c:349 builtin/init-db.c:352 +#: builtin/init-db.c:354 builtin/init-db.c:357 #, c-format msgid "%s already exists" msgstr "%s esiste già" -#: builtin/init-db.c:405 -#, fuzzy, c-format +#: builtin/init-db.c:413 +#, c-format msgid "Reinitialized existing shared Git repository in %s%s\n" -msgstr "%s%s repository Git in %s%s\n" +msgstr "Reinizializzato repository Git condiviso esistente in %s%s\n" -#: builtin/init-db.c:406 -#, fuzzy, c-format +#: builtin/init-db.c:414 +#, c-format msgid "Reinitialized existing Git repository in %s%s\n" -msgstr "%s%s repository Git in %s%s\n" +msgstr "Reinizializzato repository Git esistente in %s%s\n" -#: builtin/init-db.c:410 +#: builtin/init-db.c:418 #, c-format msgid "Initialized empty shared Git repository in %s%s\n" msgstr "Inizializzato repository Git condiviso vuoto in %s%s\n" -#: builtin/init-db.c:411 +#: builtin/init-db.c:419 #, c-format msgid "Initialized empty Git repository in %s%s\n" msgstr "Inizializzato repository Git vuoto in %s%s\n" -#: builtin/init-db.c:460 +#: builtin/init-db.c:468 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" @@ -13185,25 +14022,25 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=<directory-modello>] [--" "shared[=<permessi>]] [<directory>]" -#: builtin/init-db.c:483 +#: builtin/init-db.c:491 msgid "permissions" msgstr "permessi" -#: builtin/init-db.c:484 +#: builtin/init-db.c:492 msgid "specify that the git repository is to be shared amongst several users" msgstr "specifica che il repository Git deve essere condiviso con più utenti" -#: builtin/init-db.c:518 builtin/init-db.c:523 +#: builtin/init-db.c:526 builtin/init-db.c:531 #, c-format msgid "cannot mkdir %s" msgstr "impossibile creare la directory %s" -#: builtin/init-db.c:527 +#: builtin/init-db.c:535 #, c-format msgid "cannot chdir to %s" msgstr "impossibile modificare la directory corrente in %s" -#: builtin/init-db.c:548 +#: builtin/init-db.c:556 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" @@ -13212,7 +14049,7 @@ msgstr "" "%s (o --work-tree=<directory>) non consentito senza specificare %s (o --git-" "dir=<directory>)" -#: builtin/init-db.c:576 +#: builtin/init-db.c:584 #, c-format msgid "Cannot access work tree '%s'" msgstr "Impossibile accedere all'albero di lavoro '%s'" @@ -13289,508 +14126,516 @@ msgstr "git log [<opzioni>] [<intervallo-revisioni>] [[--] <percorso>...]" msgid "git show [<options>] <object>..." msgstr "git show [<opzioni>] <oggetto>..." -#: builtin/log.c:100 +#: builtin/log.c:104 #, c-format msgid "invalid --decorate option: %s" msgstr "opzione --decorate non valida: %s" -#: builtin/log.c:163 -msgid "suppress diff output" -msgstr "non visualizzare l'output del diff" - -#: builtin/log.c:164 +#: builtin/log.c:168 msgid "show source" msgstr "visualizza sorgente" -#: builtin/log.c:165 +#: builtin/log.c:169 msgid "Use mail map file" msgstr "Usa il file mappatura e-mail" -#: builtin/log.c:167 +#: builtin/log.c:171 msgid "only decorate refs that match <pattern>" msgstr "decora solo i riferimenti corrispondenti a <pattern>" -#: builtin/log.c:169 +#: builtin/log.c:173 msgid "do not decorate refs that match <pattern>" msgstr "non decorare i riferimenti corrispondenti a <pattern>" -#: builtin/log.c:170 +#: builtin/log.c:174 msgid "decorate options" msgstr "opzioni decorazione" -#: builtin/log.c:173 +#: builtin/log.c:177 msgid "Process line range n,m in file, counting from 1" msgstr "Elabora l'intervallo righe n,m nel file, contandole da 1" -#: builtin/log.c:271 +#: builtin/log.c:275 #, c-format msgid "Final output: %d %s\n" msgstr "Output finale: %d %s\n" -#: builtin/log.c:525 +#: builtin/log.c:529 #, c-format msgid "git show %s: bad file" msgstr "git show %s: file non valido" -#: builtin/log.c:540 builtin/log.c:634 +#: builtin/log.c:544 builtin/log.c:638 #, c-format -msgid "Could not read object %s" -msgstr "Impossibile leggere l'oggetto %s" +msgid "could not read object %s" +msgstr "impossibile leggere l'oggetto %s" -#: builtin/log.c:659 +#: builtin/log.c:663 #, c-format -msgid "Unknown type: %d" -msgstr "Tipo sconosciuto: %d" +msgid "unknown type: %d" +msgstr "tipo sconosciuto: %d" -#: builtin/log.c:780 +#: builtin/log.c:784 msgid "format.headers without value" msgstr "format.headers non ha alcun valore" -#: builtin/log.c:881 +#: builtin/log.c:885 msgid "name of output directory is too long" msgstr "il nome della directory di output è troppo lungo" -#: builtin/log.c:897 +#: builtin/log.c:901 #, c-format -msgid "Cannot open patch file %s" -msgstr "Impossibile aprire il file patch %s" +msgid "cannot open patch file %s" +msgstr "impossibile aprire il file patch %s" -#: builtin/log.c:914 -msgid "Need exactly one range." -msgstr "È necessario specificare esattamente un intervallo." +#: builtin/log.c:918 +msgid "need exactly one range" +msgstr "è necessario specificare esattamente un intervallo" -#: builtin/log.c:924 -msgid "Not a range." -msgstr "Il valore non è un intervallo." +#: builtin/log.c:928 +msgid "not a range" +msgstr "il valore non è un intervallo" -#: builtin/log.c:1047 -msgid "Cover letter needs email format" -msgstr "" +#: builtin/log.c:1051 +msgid "cover letter needs email format" +msgstr "la lettera di accompagnamento dev'essere in formato email" -#: builtin/log.c:1132 +#: builtin/log.c:1057 +msgid "failed to create cover-letter file" +msgstr "creazione del file lettera di accompagnamento non riuscita" + +#: builtin/log.c:1136 #, c-format msgid "insane in-reply-to: %s" -msgstr "" +msgstr "valore in-reply-to folle: %s" -#: builtin/log.c:1159 +#: builtin/log.c:1163 msgid "git format-patch [<options>] [<since> | <revision-range>]" -msgstr "" +msgstr "git format-patch [<opzioni>] [<da> | <intervallo revisioni>]" -#: builtin/log.c:1217 -msgid "Two output directories?" -msgstr "Due directory di output?" +#: builtin/log.c:1221 +msgid "two output directories?" +msgstr "due directory di output?" -#: builtin/log.c:1324 builtin/log.c:2068 builtin/log.c:2070 builtin/log.c:2082 +#: builtin/log.c:1332 builtin/log.c:2076 builtin/log.c:2078 builtin/log.c:2090 #, c-format -msgid "Unknown commit %s" -msgstr "Commit %s sconosciuto" +msgid "unknown commit %s" +msgstr "commit %s sconosciuto" -#: builtin/log.c:1334 builtin/notes.c:897 builtin/tag.c:526 +#: builtin/log.c:1342 builtin/replace.c:58 builtin/replace.c:207 +#: builtin/replace.c:210 #, c-format -msgid "Failed to resolve '%s' as a valid ref." -msgstr "" +msgid "failed to resolve '%s' as a valid ref" +msgstr "impossibile risolvere '%s' come riferimento valido" -#: builtin/log.c:1339 -#, fuzzy -msgid "Could not find exact merge base." -msgstr "Non è stato possibile trovare la strategia di merge '%s'.\n" +#: builtin/log.c:1347 +msgid "could not find exact merge base" +msgstr "impossibile trovare esattamente la base del merge" -#: builtin/log.c:1343 +#: builtin/log.c:1351 msgid "" -"Failed to get upstream, if you want to record base commit automatically,\n" +"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." +"Or you could specify base commit by --base=<base-commit-id> manually" msgstr "" +"impossibile recuperare l'upstream, se vuoi registrare automaticamente\n" +"il commit di base usa git branch --set-upstream-to per tracciare un branch\n" +"remoto.\n" +"In alternativa puoi specificare manualmente il commit di base con\n" +"--base=<ID commit di base>" -#: builtin/log.c:1363 -msgid "Failed to find exact merge base" -msgstr "" +#: builtin/log.c:1371 +msgid "failed to find exact merge base" +msgstr "impossibile trovare esattamente la base del merge" -#: builtin/log.c:1374 +#: builtin/log.c:1382 msgid "base commit should be the ancestor of revision list" -msgstr "" +msgstr "il commit di base dovrebbe essere l'antenato dell'elenco revisioni" -#: builtin/log.c:1378 +#: builtin/log.c:1386 msgid "base commit shouldn't be in revision list" -msgstr "" +msgstr "il commit di base non dovrebbe essere nell'elenco revisioni" -#: builtin/log.c:1431 -#, fuzzy +#: builtin/log.c:1439 msgid "cannot get patch id" -msgstr "impossibile usare -a con -d" +msgstr "impossibile ottenere l'ID della patch" -#: builtin/log.c:1483 -#, fuzzy +#: builtin/log.c:1491 msgid "failed to infer range-diff ranges" -msgstr "creazione del link '%s' non riuscita" +msgstr "inferenza degli intervalli range-diff non riuscita" -#: builtin/log.c:1528 +#: builtin/log.c:1536 msgid "use [PATCH n/m] even with a single patch" -msgstr "" +msgstr "usa [PATCH n/m] anche con una singola patch" -#: builtin/log.c:1531 +#: builtin/log.c:1539 msgid "use [PATCH] even with multiple patches" -msgstr "" +msgstr "usa [PATCH] anche con più patch" -#: builtin/log.c:1535 +#: builtin/log.c:1543 msgid "print patches to standard out" -msgstr "" +msgstr "stampa le patch sullo standard output" -#: builtin/log.c:1537 +#: builtin/log.c:1545 msgid "generate a cover letter" -msgstr "" +msgstr "genera una lettera di accompagnamento" -#: builtin/log.c:1539 +#: builtin/log.c:1547 msgid "use simple number sequence for output file names" -msgstr "" +msgstr "usa una sequenza numerica semplice per i nomi file di output" -#: builtin/log.c:1540 +#: builtin/log.c:1548 msgid "sfx" -msgstr "" +msgstr "suff" -#: builtin/log.c:1541 +#: builtin/log.c:1549 msgid "use <sfx> instead of '.patch'" -msgstr "" +msgstr "usa <suff> anziché '.patch'" -#: builtin/log.c:1543 +#: builtin/log.c:1551 msgid "start numbering patches at <n> instead of 1" -msgstr "" +msgstr "inizia a numerare le patch da <n> anziché da 1" -#: builtin/log.c:1545 +#: builtin/log.c:1553 msgid "mark the series as Nth re-roll" -msgstr "" +msgstr "contrassegna la serie come l'n-esima versione revisionata" -#: builtin/log.c:1547 +#: builtin/log.c:1555 msgid "Use [RFC PATCH] instead of [PATCH]" -msgstr "" +msgstr "Usa [RFC PATCH] anziché [PATCH]" -#: builtin/log.c:1550 +#: builtin/log.c:1558 msgid "Use [<prefix>] instead of [PATCH]" -msgstr "" +msgstr "Usa [<prefisso>] anziché [PATCH]" -#: builtin/log.c:1553 +#: builtin/log.c:1561 msgid "store resulting files in <dir>" -msgstr "" +msgstr "salva i file risultanti in <dir>" -#: builtin/log.c:1556 +#: builtin/log.c:1564 msgid "don't strip/add [PATCH]" -msgstr "" +msgstr "non eliminare/aggiungere [PATCH]" -#: builtin/log.c:1559 +#: builtin/log.c:1567 msgid "don't output binary diffs" -msgstr "" +msgstr "non mandare in output diff binari" -#: builtin/log.c:1561 +#: builtin/log.c:1569 msgid "output all-zero hash in From header" -msgstr "" +msgstr "manda in output un hash costituito da soli zeri nell'intestazione From" -#: builtin/log.c:1563 +#: builtin/log.c:1571 msgid "don't include a patch matching a commit upstream" -msgstr "" +msgstr "non includere una patch corrispondente a un commit upstream" -#: builtin/log.c:1565 +#: builtin/log.c:1573 msgid "show patch format instead of default (patch + stat)" msgstr "" +"visualizza il formato della patch anziché l'impostazione predefinita (patch " +"+ stat)" -#: builtin/log.c:1567 +#: builtin/log.c:1575 msgid "Messaging" -msgstr "" +msgstr "Messaggistica" -#: builtin/log.c:1568 -#, fuzzy +#: builtin/log.c:1576 msgid "header" -msgstr "avanti " +msgstr "intestazione" -#: builtin/log.c:1569 +#: builtin/log.c:1577 msgid "add email header" -msgstr "" +msgstr "aggiungi intestazione email" -#: builtin/log.c:1570 builtin/log.c:1572 +#: builtin/log.c:1578 builtin/log.c:1580 msgid "email" -msgstr "" +msgstr "email" -#: builtin/log.c:1570 +#: builtin/log.c:1578 msgid "add To: header" -msgstr "" +msgstr "aggiungi intestazione A:" -#: builtin/log.c:1572 +#: builtin/log.c:1580 msgid "add Cc: header" -msgstr "" +msgstr "aggiungi intestazione Cc:" -#: builtin/log.c:1574 +#: builtin/log.c:1582 msgid "ident" -msgstr "" +msgstr "identità" -#: builtin/log.c:1575 +#: builtin/log.c:1583 msgid "set From address to <ident> (or committer ident if absent)" msgstr "" +"imposta l'indirizzo Da a <identità> (o all'identità di chi ha creato il " +"commit se assente)" -#: builtin/log.c:1577 +#: builtin/log.c:1585 msgid "message-id" -msgstr "" +msgstr "ID messaggio" -#: builtin/log.c:1578 +#: builtin/log.c:1586 msgid "make first mail a reply to <message-id>" -msgstr "" +msgstr "rendi la prima e-mail una risposta a <ID messaggio>" -#: builtin/log.c:1579 builtin/log.c:1582 +#: builtin/log.c:1587 builtin/log.c:1590 msgid "boundary" -msgstr "" +msgstr "delimitatore" -#: builtin/log.c:1580 +#: builtin/log.c:1588 msgid "attach the patch" -msgstr "" +msgstr "allega la patch" -#: builtin/log.c:1583 -#, fuzzy +#: builtin/log.c:1591 msgid "inline the patch" -msgstr "ignora le aggiunte create dalla patch" +msgstr "includi la patch nel messaggio" -#: builtin/log.c:1587 +#: builtin/log.c:1595 msgid "enable message threading, styles: shallow, deep" msgstr "" +"abilita il raggruppamento messaggi per conversazione, stili: superficiale, " +"profondo" -#: builtin/log.c:1589 +#: builtin/log.c:1597 msgid "signature" -msgstr "" +msgstr "firma" -#: builtin/log.c:1590 +#: builtin/log.c:1598 msgid "add a signature" -msgstr "" +msgstr "aggiungi una firma" -#: builtin/log.c:1591 +#: builtin/log.c:1599 msgid "base-commit" -msgstr "" +msgstr "commit di base" -#: builtin/log.c:1592 +#: builtin/log.c:1600 msgid "add prerequisite tree info to the patch series" msgstr "" +"aggiungi le informazioni prerequisito per l'albero alla serie delle patch" -#: builtin/log.c:1594 +#: builtin/log.c:1602 msgid "add a signature from a file" -msgstr "" +msgstr "aggiungi una firma da file" -#: builtin/log.c:1595 -#, fuzzy +#: builtin/log.c:1603 msgid "don't print the patch filenames" -msgstr "Impossibile aprire il file patch %s" +msgstr "non stampare i nomi file delle patch" -#: builtin/log.c:1597 +#: builtin/log.c:1605 msgid "show progress while generating patches" -msgstr "" +msgstr "visualizza l'avanzamento dell'operazione di generazione patch" -#: builtin/log.c:1598 -#, fuzzy +#: builtin/log.c:1606 msgid "rev" -msgstr "revert non riuscito" +msgstr "revisione" -#: builtin/log.c:1599 +#: builtin/log.c:1607 msgid "show changes against <rev> in cover letter or single patch" msgstr "" +"visualizza le modifiche rispetto a <revisione> nella lettera di " +"accompagnamento o in una patch singola" -#: builtin/log.c:1602 +#: builtin/log.c:1610 msgid "show changes against <refspec> in cover letter or single patch" msgstr "" +"visualizza le modifiche rispetto a <specificatore revisione> nella lettera " +"di accompagnamento o in una patch singola" -#: builtin/log.c:1604 +#: builtin/log.c:1612 msgid "percentage by which creation is weighted" -msgstr "" +msgstr "percentuale in base a cui viene pesata la creazione" -#: builtin/log.c:1679 -#, fuzzy, c-format +#: builtin/log.c:1687 +#, c-format msgid "invalid ident line: %s" -msgstr "opzione non valida: %s" +msgstr "riga ident non valida: %s" -#: builtin/log.c:1694 -#, fuzzy +#: builtin/log.c:1702 msgid "-n and -k are mutually exclusive" -msgstr "-A e -u sono reciprocamente incompatibili" +msgstr "le opzioni -n e -k sono mutuamente esclusive" -#: builtin/log.c:1696 +#: builtin/log.c:1704 msgid "--subject-prefix/--rfc and -k are mutually exclusive" -msgstr "" +msgstr "le opzioni --subject-prefix/--rfc e -k sono mutuamente esclusive" -#: builtin/log.c:1704 +#: builtin/log.c:1712 msgid "--name-only does not make sense" msgstr "--name-only non ha senso" -#: builtin/log.c:1706 +#: builtin/log.c:1714 msgid "--name-status does not make sense" msgstr "--name-status non ha senso" -#: builtin/log.c:1708 +#: builtin/log.c:1716 msgid "--check does not make sense" msgstr "--check non ha senso" -#: builtin/log.c:1740 +#: builtin/log.c:1748 msgid "standard output, or directory, which one?" msgstr "standard output, o directory, quale dei due?" -#: builtin/log.c:1742 -#, c-format -msgid "Could not create directory '%s'" -msgstr "Non è stato possibile creare la directory '%s'" - -#: builtin/log.c:1829 +#: builtin/log.c:1837 msgid "--interdiff requires --cover-letter or single patch" -msgstr "" +msgstr "--interdiff richiede --cover-letter o una singola patch" -#: builtin/log.c:1833 +#: builtin/log.c:1841 msgid "Interdiff:" -msgstr "" +msgstr "Interdiff:" -#: builtin/log.c:1834 +#: builtin/log.c:1842 #, c-format msgid "Interdiff against v%d:" -msgstr "" +msgstr "Interdiff rispetto alla versione %d:" -#: builtin/log.c:1840 +#: builtin/log.c:1848 msgid "--creation-factor requires --range-diff" -msgstr "" +msgstr "--creation-factor richiede --range-diff" -#: builtin/log.c:1844 +#: builtin/log.c:1852 msgid "--range-diff requires --cover-letter or single patch" -msgstr "" +msgstr "--range-diff richiede --cover-letter o una singola patch" -#: builtin/log.c:1852 +#: builtin/log.c:1860 msgid "Range-diff:" -msgstr "" +msgstr "Range-diff:" -#: builtin/log.c:1853 +#: builtin/log.c:1861 #, c-format msgid "Range-diff against v%d:" -msgstr "" +msgstr "Range-diff rispetto alla versione %d:" -#: builtin/log.c:1864 -#, fuzzy, c-format +#: builtin/log.c:1872 +#, c-format msgid "unable to read signature file '%s'" -msgstr "impossibile leggere index file" +msgstr "impossibile leggere il file firma '%s'" -#: builtin/log.c:1900 +#: builtin/log.c:1908 msgid "Generating patches" -msgstr "" +msgstr "Generazione delle patch in corso" -#: builtin/log.c:1944 -msgid "Failed to create output files" -msgstr "Creazione dei file di output non riuscita" +#: builtin/log.c:1952 +msgid "failed to create output files" +msgstr "creazione dei file di output non riuscita" -#: builtin/log.c:2003 +#: builtin/log.c:2011 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" -msgstr "" +msgstr "git cherry [-v] [<upstream> [<head> [<limite>]]]" -#: builtin/log.c:2057 +#: builtin/log.c:2065 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" msgstr "" +"Impossibile trovare un branch remoto tracciato, specifica <upstream> " +"manualmente.\n" #: builtin/ls-files.c:470 -#, fuzzy msgid "git ls-files [<options>] [<file>...]" -msgstr "git apply [opzioni] [<patch>...]" +msgstr "git ls-files [<opzioni>] [<file>...]" #: builtin/ls-files.c:526 msgid "identify the file status with tags" -msgstr "" +msgstr "identifica lo stato del file con i tag" #: builtin/ls-files.c:528 msgid "use lowercase letters for 'assume unchanged' files" -msgstr "" +msgstr "usa lettere minuscole per i file che si 'assumono non modificati'" #: builtin/ls-files.c:530 msgid "use lowercase letters for 'fsmonitor clean' files" -msgstr "" +msgstr "usa lettere minuscole per i file 'fsmonitor clean'" #: builtin/ls-files.c:532 msgid "show cached files in the output (default)" -msgstr "" +msgstr "visualizza file in cache nell'output (impostazione predefinita)" #: builtin/ls-files.c:534 -#, fuzzy msgid "show deleted files in the output" -msgstr "il file eliminato %s ha ancora dei contenuti" +msgstr "visualizza file eliminati nell'output" #: builtin/ls-files.c:536 msgid "show modified files in the output" -msgstr "" +msgstr "visualizza file modificati nell'output" #: builtin/ls-files.c:538 msgid "show other files in the output" -msgstr "" +msgstr "visualizza altri file nell'output" #: builtin/ls-files.c:540 msgid "show ignored files in the output" -msgstr "" +msgstr "visualizza file ignorati nell'output" #: builtin/ls-files.c:543 msgid "show staged contents' object name in the output" msgstr "" +"visualizza il nome dell'oggetto \"contenuti nell'area di staging\" " +"nell'output" #: builtin/ls-files.c:545 msgid "show files on the filesystem that need to be removed" -msgstr "" +msgstr "visualizza i file nel filesystem che devono essere rimossi" #: builtin/ls-files.c:547 msgid "show 'other' directories' names only" -msgstr "" +msgstr "visualizza solo i nomi delle directory 'altro'" #: builtin/ls-files.c:549 msgid "show line endings of files" -msgstr "" +msgstr "visualizza i fine riga dei file" #: builtin/ls-files.c:551 -#, fuzzy msgid "don't show empty directories" -msgstr "Due directory di output?" +msgstr "non visualizzare le directory vuote" #: builtin/ls-files.c:554 msgid "show unmerged files in the output" -msgstr "" +msgstr "visualizza file non sottoposti a merge nell'output" #: builtin/ls-files.c:556 msgid "show resolve-undo information" -msgstr "" +msgstr "visualizza informazioni resolve-undo" #: builtin/ls-files.c:558 -#, fuzzy msgid "skip files matching pattern" -msgstr "Stampa le righe corrispondenti ad un modello" +msgstr "salta i file corrispondenti a \"espressione regolare\"" #: builtin/ls-files.c:561 msgid "exclude patterns are read from <file>" -msgstr "" +msgstr "le espressioni regolari di esclusione sono lette da <file>" #: builtin/ls-files.c:564 msgid "read additional per-directory exclude patterns in <file>" msgstr "" +"leggi espressioni regolari di esclusione aggiuntive specifiche per directory " +"da <file>" #: builtin/ls-files.c:566 msgid "add the standard git exclusions" -msgstr "" +msgstr "aggiungi le esclusioni standard di Git" #: builtin/ls-files.c:570 msgid "make the output relative to the project top directory" -msgstr "" +msgstr "rendi l'output relativo alla directory radice del progetto" #: builtin/ls-files.c:573 msgid "recurse through submodules" -msgstr "" +msgstr "esegui ricorsivamente sui sottomoduli" #: builtin/ls-files.c:575 msgid "if any <file> is not in the index, treat this as an error" -msgstr "" +msgstr "se dei <file> non sono nell'indice, consideralo un errore" #: builtin/ls-files.c:576 msgid "tree-ish" -msgstr "" +msgstr "espressione albero" #: builtin/ls-files.c:577 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "" +"fingi che i percorsi rimossi da <espressione albero> in poi siano ancora " +"presenti" #: builtin/ls-files.c:579 msgid "show debugging data" -msgstr "" +msgstr "visualizza informazioni di debug" #: builtin/ls-remote.c:9 msgid "" @@ -13798,451 +14643,460 @@ msgid "" " [-q | --quiet] [--exit-code] [--get-url]\n" " [--symref] [<repository> [<refs>...]]" msgstr "" +"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<eseguibile>]\n" +" [-q | --quiet] [--exit-code] [--get-url]\n" +" [--symref] [<repository> [<riferimenti>...]]" #: builtin/ls-remote.c:59 msgid "do not print remote URL" -msgstr "" +msgstr "non stampare l'URL del remoto" -#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1111 +#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1458 msgid "exec" -msgstr "" +msgstr "eseguibile" #: builtin/ls-remote.c:61 builtin/ls-remote.c:63 msgid "path of git-upload-pack on the remote host" -msgstr "" +msgstr "percorso di git-upload-pack sull'host remoto" #: builtin/ls-remote.c:65 msgid "limit to tags" -msgstr "" +msgstr "limitati ai tag" #: builtin/ls-remote.c:66 msgid "limit to heads" -msgstr "" +msgstr "limitati alle head" #: builtin/ls-remote.c:67 msgid "do not show peeled tags" -msgstr "" +msgstr "non visualizzare i tag rimossi" #: builtin/ls-remote.c:69 msgid "take url.<base>.insteadOf into account" -msgstr "" +msgstr "tieni in considerazione url.<base>.insteadOf" -#: builtin/ls-remote.c:73 +#: builtin/ls-remote.c:72 msgid "exit with exit code 2 if no matching refs are found" msgstr "" +"esci con codice d'uscita 2 se non sono stati trovati riferimenti " +"corrispondenti" -#: builtin/ls-remote.c:76 +#: builtin/ls-remote.c:75 msgid "show underlying ref in addition to the object pointed by it" -msgstr "" +msgstr "visualizza riferimento sottostante oltre all'oggetto a cui punta" #: builtin/ls-tree.c:30 -#, fuzzy msgid "git ls-tree [<options>] <tree-ish> [<path>...]" -msgstr "git apply [opzioni] [<patch>...]" +msgstr "git ls-tree [<opzioni>] <espressione albero> [<percorso>...]" #: builtin/ls-tree.c:128 msgid "only show trees" -msgstr "" +msgstr "visualizza solo alberi" #: builtin/ls-tree.c:130 msgid "recurse into subtrees" -msgstr "" +msgstr "esegui ricorsivamente nei sottoalberi" #: builtin/ls-tree.c:132 msgid "show trees when recursing" -msgstr "" +msgstr "visualizza gli alberi durante la ricorsione" #: builtin/ls-tree.c:135 msgid "terminate entries with NUL byte" -msgstr "" +msgstr "termina le voci con un byte NUL" #: builtin/ls-tree.c:136 -#, fuzzy msgid "include object size" -msgstr "oggetto non valido '%s' specificato." +msgstr "includi dimensioni oggetto" #: builtin/ls-tree.c:138 builtin/ls-tree.c:140 msgid "list only filenames" -msgstr "" +msgstr "elenca solo i nomi file" #: builtin/ls-tree.c:143 msgid "use full path names" -msgstr "" +msgstr "usa nomi percorso completi" #: builtin/ls-tree.c:145 msgid "list entire tree; not just current directory (implies --full-name)" msgstr "" +"elenca l'intero albero; non solo la directory corrente (implica --full-name)" #: builtin/mailsplit.c:241 #, c-format msgid "empty mbox: '%s'" -msgstr "" +msgstr "mbox vuota: '%s'" -#: builtin/merge.c:53 -#, fuzzy +#: builtin/merge.c:54 msgid "git merge [<options>] [<commit>...]" -msgstr "git apply [opzioni] [<patch>...]" +msgstr "git merge [<opzioni>] [<commit>...]" -#: builtin/merge.c:54 +#: builtin/merge.c:55 msgid "git merge --abort" -msgstr "" +msgstr "git merge --abort" -#: builtin/merge.c:55 +#: builtin/merge.c:56 msgid "git merge --continue" -msgstr "" +msgstr "git merge --continue" -#: builtin/merge.c:112 +#: builtin/merge.c:116 msgid "switch `m' requires a value" msgstr "lo switch 'm' richiede un valore" -#: builtin/merge.c:132 -#, fuzzy, c-format +#: builtin/merge.c:139 +#, c-format msgid "option `%s' requires a value" -msgstr "l'opzione '%s' richiede un valore" +msgstr "l'opzione `%s' richiede un valore" -#: builtin/merge.c:178 +#: builtin/merge.c:185 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "Non è stato possibile trovare la strategia di merge '%s'.\n" -#: builtin/merge.c:179 +#: builtin/merge.c:186 #, c-format msgid "Available strategies are:" msgstr "Le strategie disponibili sono:" -#: builtin/merge.c:184 +#: builtin/merge.c:191 #, c-format msgid "Available custom strategies are:" msgstr "Le strategie personalizzate disponibili sono:" -#: builtin/merge.c:235 builtin/pull.c:144 +#: builtin/merge.c:242 builtin/pull.c:150 msgid "do not show a diffstat at the end of the merge" -msgstr "" +msgstr "non visualizzare un diffstat al termine del merge" -#: builtin/merge.c:238 builtin/pull.c:147 +#: builtin/merge.c:245 builtin/pull.c:153 msgid "show a diffstat at the end of the merge" -msgstr "" +msgstr "visualizza un diffstat al termine del merge" -#: builtin/merge.c:239 builtin/pull.c:150 +#: builtin/merge.c:246 builtin/pull.c:156 msgid "(synonym to --stat)" -msgstr "" +msgstr "(sinonimo di --stat)" -#: builtin/merge.c:241 builtin/pull.c:153 +#: builtin/merge.c:248 builtin/pull.c:159 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" +"aggiungi (al più <n>) voci dal registro breve al messaggio di commit del " +"merge" -#: builtin/merge.c:244 builtin/pull.c:159 -#, fuzzy +#: builtin/merge.c:251 builtin/pull.c:165 msgid "create a single commit instead of doing a merge" -msgstr "impossibile eseguire un commit parziale durante un merge." +msgstr "crea un singolo commit anziché eseguire un merge" -#: builtin/merge.c:246 builtin/pull.c:162 +#: builtin/merge.c:253 builtin/pull.c:168 msgid "perform a commit if the merge succeeds (default)" -msgstr "" +msgstr "esegui un commit se il merge ha successo (impostazione predefinita)" -#: builtin/merge.c:248 builtin/pull.c:165 +#: builtin/merge.c:255 builtin/pull.c:171 msgid "edit message before committing" -msgstr "" +msgstr "modifica il messaggio prima di eseguire il commit" -#: builtin/merge.c:249 +#: builtin/merge.c:257 msgid "allow fast-forward (default)" -msgstr "" +msgstr "consenti fast-forward (impostazione predefinita)" -#: builtin/merge.c:251 builtin/pull.c:171 +#: builtin/merge.c:259 builtin/pull.c:178 msgid "abort if fast-forward is not possible" -msgstr "" +msgstr "interrompi se il fast-forward non è possibile" -#: builtin/merge.c:255 builtin/pull.c:174 +#: builtin/merge.c:263 builtin/pull.c:181 msgid "verify that the named commit has a valid GPG signature" -msgstr "" +msgstr "verifica che il commit specificato abbia una firma GPG valida" -#: builtin/merge.c:256 builtin/notes.c:787 builtin/pull.c:178 -#: builtin/rebase.c:1124 builtin/rebase--interactive.c:188 builtin/revert.c:111 +#: builtin/merge.c:264 builtin/notes.c:787 builtin/pull.c:185 +#: builtin/rebase.c:492 builtin/rebase.c:1471 builtin/revert.c:113 msgid "strategy" -msgstr "" +msgstr "strategia" -#: builtin/merge.c:257 builtin/pull.c:179 -#, fuzzy +#: builtin/merge.c:265 builtin/pull.c:186 msgid "merge strategy to use" -msgstr "Tentativo con la strategia di merge %s...\n" +msgstr "strategia di merge da usare" -#: builtin/merge.c:258 builtin/pull.c:182 +#: builtin/merge.c:266 builtin/pull.c:189 msgid "option=value" -msgstr "" +msgstr "opzione=valore" -#: builtin/merge.c:259 builtin/pull.c:183 +#: builtin/merge.c:267 builtin/pull.c:190 msgid "option for selected merge strategy" -msgstr "" +msgstr "opzione per la strategia di merge selezionata" -#: builtin/merge.c:261 +#: builtin/merge.c:269 msgid "merge commit message (for a non-fast-forward merge)" -msgstr "" +msgstr "messaggio di commit del merge (per un merge non fast-forward)" -#: builtin/merge.c:268 -#, fuzzy +#: builtin/merge.c:276 msgid "abort the current in-progress merge" -msgstr "Impossibile salvare lo stato corrente di index" +msgstr "interrompi il merge attualmente in corso" -#: builtin/merge.c:270 +#: builtin/merge.c:278 msgid "continue the current in-progress merge" -msgstr "" +msgstr "continua il merge attualmente in corso" -#: builtin/merge.c:272 builtin/pull.c:190 +#: builtin/merge.c:280 builtin/pull.c:197 msgid "allow merging unrelated histories" -msgstr "" +msgstr "consenti di unire cronologie non correlate" -#: builtin/merge.c:278 +#: builtin/merge.c:286 msgid "verify commit-msg hook" -msgstr "" +msgstr "verifica hook commit-msg" -#: builtin/merge.c:303 +#: builtin/merge.c:311 msgid "could not run stash." msgstr "non è stato possibile eseguire stash." -#: builtin/merge.c:308 +#: builtin/merge.c:316 msgid "stash failed" msgstr "esecuzione di stash non riuscita" -#: builtin/merge.c:313 +#: builtin/merge.c:321 #, c-format msgid "not a valid object: %s" msgstr "non è un oggetto valido: %s" -#: builtin/merge.c:335 builtin/merge.c:352 +#: builtin/merge.c:343 builtin/merge.c:360 msgid "read-tree failed" msgstr "read-tree non riuscito" -#: builtin/merge.c:382 +#: builtin/merge.c:390 msgid " (nothing to squash)" -msgstr "" +msgstr " (nulla di cui eseguire lo squash)" -#: builtin/merge.c:393 +#: builtin/merge.c:401 #, c-format msgid "Squash commit -- not updating HEAD\n" -msgstr "" +msgstr "Commit di squash -- non aggiorno HEAD\n" -#: builtin/merge.c:443 +#: builtin/merge.c:451 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "Nessun messaggio di merge -- HEAD non viene aggiornato\n" -#: builtin/merge.c:494 +#: builtin/merge.c:502 #, c-format msgid "'%s' does not point to a commit" msgstr "'%s' non punta ad un commit" -#: builtin/merge.c:581 +#: builtin/merge.c:589 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Stringa branch.%s.mergeoptions errata: %s" -#: builtin/merge.c:702 +#: builtin/merge.c:712 msgid "Not handling anything other than two heads merge." -msgstr "" +msgstr "Non gestisco nulla che non sia il merge di due head." -#: builtin/merge.c:716 +#: builtin/merge.c:726 #, c-format msgid "Unknown option for merge-recursive: -X%s" -msgstr "Opzione per merge-recursive sconosciuta: -X%s" +msgstr "Opzione sconosciuta per merge-recursive: -X%s" -#: builtin/merge.c:731 +#: builtin/merge.c:741 #, c-format msgid "unable to write %s" -msgstr "non è possibile scrivere %s" +msgstr "impossibile scrivere %s" -#: builtin/merge.c:783 +#: builtin/merge.c:793 #, c-format msgid "Could not read from '%s'" msgstr "Non è stato possibile leggere da '%s'" -#: builtin/merge.c:792 +#: builtin/merge.c:802 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" +"Non eseguo il commit del merge; usa 'git commit' per completare il merge.\n" -#: builtin/merge.c:798 -#, fuzzy, c-format +#: builtin/merge.c:808 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 "" +"Inserisci un messaggio di commit per spiegare perché è necessario\n" +"questo merge, in particolare se si esegue il merge di un upstream\n" +"aggiornato in un topic branch.\n" +"\n" + +#: builtin/merge.c:813 +msgid "An empty message aborts the commit.\n" +msgstr "Un messaggio vuoto interromperà il commit.\n" + +#: builtin/merge.c:816 +#, c-format +msgid "" "Lines starting with '%c' will be ignored, and an empty message aborts\n" "the commit.\n" msgstr "" -"Per favore inserisci il messaggio di commit per le modifiche. Le righe\n" -"che iniziano con '#' verranno ignorate, e un messaggio vuoto annulla il " -"commit.\n" +"Le righe che iniziano con '%c' saranno ignorate e un messaggio vuoto\n" +"interromperà il commit.\n" -#: builtin/merge.c:834 +#: builtin/merge.c:857 msgid "Empty commit message." msgstr "Messaggio di commit vuoto." -#: builtin/merge.c:853 +#: builtin/merge.c:876 #, c-format msgid "Wonderful.\n" msgstr "Splendido.\n" -#: builtin/merge.c:906 +#: builtin/merge.c:936 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" -"Merge automatico fallito; risolvi i conflitti ed eseguire il commit\n" +"Merge automatico fallito; risolvi i conflitti ed esegui il commit\n" "del risultato.\n" -#: builtin/merge.c:945 +#: builtin/merge.c:975 msgid "No current branch." msgstr "Nessun branch corrente." -#: builtin/merge.c:947 +#: builtin/merge.c:977 msgid "No remote for the current branch." msgstr "Nessun remote per il branch corrente." -#: builtin/merge.c:949 +#: builtin/merge.c:979 msgid "No default upstream defined for the current branch." msgstr "Nessun upstream di default definito per il branch corrente." -#: builtin/merge.c:954 +#: builtin/merge.c:984 #, c-format msgid "No remote-tracking branch for %s from %s" -msgstr "" +msgstr "Nessun branch che tracci un remoto per %s da %s" -#: builtin/merge.c:1011 +#: builtin/merge.c:1041 #, c-format msgid "Bad value '%s' in environment '%s'" -msgstr "" +msgstr "Valore errato '%s' nell'ambiente '%s'" -#: builtin/merge.c:1114 -#, fuzzy, c-format +#: builtin/merge.c:1144 +#, c-format msgid "not something we can merge in %s: %s" -msgstr "%s - non è qualcosa per cui possiamo eseguire il merge" +msgstr "non è qualcosa di cui possiamo eseguire il merge in %s: %s" -#: builtin/merge.c:1148 -#, fuzzy +#: builtin/merge.c:1178 msgid "not something we can merge" -msgstr "%s - non è qualcosa per cui possiamo eseguire il merge" +msgstr "non è qualcosa di cui possiamo eseguire il merge" -#: builtin/merge.c:1251 +#: builtin/merge.c:1281 msgid "--abort expects no arguments" -msgstr "" +msgstr "--abort non richiede argomenti" -#: builtin/merge.c:1255 +#: builtin/merge.c:1285 msgid "There is no merge to abort (MERGE_HEAD missing)." -msgstr "Non c'è nessun merge da interrompere (manca MERGE_HEAD)" +msgstr "Non c'è nessun merge da interrompere (MERGE_HEAD mancante)." -#: builtin/merge.c:1267 +#: builtin/merge.c:1297 msgid "--continue expects no arguments" -msgstr "" +msgstr "--continue non richiede argomenti" -#: builtin/merge.c:1271 -#, fuzzy +#: builtin/merge.c:1301 msgid "There is no merge in progress (MERGE_HEAD missing)." -msgstr "Non c'è nessun merge da interrompere (manca MERGE_HEAD)" +msgstr "Non c'è nessun merge in corso (MERGE_HEAD mancante)." -#: builtin/merge.c:1287 -#, fuzzy +#: builtin/merge.c:1317 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." msgstr "" -"Il merge non è stato concluso (esiste MERGE_HEAD).\n" -"Per favore, esegui il commit delle modifiche prima del merge." +"Non hai concluso il merge (MERGE_HEAD esiste).\n" +"Esegui il commit delle modifiche prima di eseguire il merge." -#: builtin/merge.c:1294 -#, fuzzy +#: builtin/merge.c:1324 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." msgstr "" -"Il cherry-pick non è stato concluso (esiste CHERRY_PICK_HEAD).\n" -"Per favore, esegui il commit delle modifiche prima del merge." +"Non hai concluso il cherry-pick (CHERRY_PICK_HEAD esiste).\n" +"Esegui il commit delle modifiche prima di eseguire il merge." -#: builtin/merge.c:1297 +#: builtin/merge.c:1327 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." -msgstr "Il tuo cherry-pick non è stato concluso (CHERRY_PICK_HEAD esiste)." +msgstr "Il cherry-pick non è stato concluso (CHERRY_PICK_HEAD esiste)." -#: builtin/merge.c:1306 +#: builtin/merge.c:1341 msgid "You cannot combine --squash with --no-ff." -msgstr "Impossibile combinare --squash con --no-off." +msgstr "Non è possibile combinare --squash con --no-ff." -#: builtin/merge.c:1314 +#: builtin/merge.c:1349 msgid "No commit specified and merge.defaultToUpstream not set." -msgstr "Nessun commit specificato e merge.defaultToUpstream non definito." +msgstr "Nessun commit specificato e merge.defaultToUpstream non impostato." -#: builtin/merge.c:1331 +#: builtin/merge.c:1366 msgid "Squash commit into empty head not supported yet" -msgstr "" +msgstr "Lo squash di un commit in un'head vuota non è ancora supportato" -#: builtin/merge.c:1333 +#: builtin/merge.c:1368 msgid "Non-fast-forward commit does not make sense into an empty head" -msgstr "" +msgstr "Un commit non fast forward non ha senso in un'head vuota" -#: builtin/merge.c:1338 +#: builtin/merge.c:1373 #, c-format msgid "%s - not something we can merge" msgstr "%s - non è qualcosa per cui possiamo eseguire il merge" -#: builtin/merge.c:1340 +#: builtin/merge.c:1375 msgid "Can merge only exactly one commit into empty head" -msgstr "" +msgstr "Si può eseguire solo il merge di uno e un solo commit in un'head vuota" -#: builtin/merge.c:1422 +#: builtin/merge.c:1454 msgid "refusing to merge unrelated histories" -msgstr "" +msgstr "mi rifiuto di eseguire il merge di cronologie non correlate" -#: builtin/merge.c:1431 -#, fuzzy +#: builtin/merge.c:1463 msgid "Already up to date." -msgstr "aggiornato" +msgstr "Già aggiornato." -#: builtin/merge.c:1441 +#: builtin/merge.c:1473 #, c-format msgid "Updating %s..%s\n" msgstr "Aggiornamento di %s..%s\n" -#: builtin/merge.c:1483 +#: builtin/merge.c:1515 #, c-format msgid "Trying really trivial in-index merge...\n" -msgstr "" +msgstr "Provo con un merge veramente banale dentro l'indice...\n" -#: builtin/merge.c:1490 +#: builtin/merge.c:1522 #, c-format msgid "Nope.\n" msgstr "No.\n" -#: builtin/merge.c:1515 +#: builtin/merge.c:1547 msgid "Already up to date. Yeeah!" -msgstr "" +msgstr "Già aggiornato. Oh sì!" -#: builtin/merge.c:1521 +#: builtin/merge.c:1553 msgid "Not possible to fast-forward, aborting." msgstr "Fast-forward non possibile, stop." -#: builtin/merge.c:1544 builtin/merge.c:1623 +#: builtin/merge.c:1576 builtin/merge.c:1655 #, c-format msgid "Rewinding the tree to pristine...\n" -msgstr "" +msgstr "Ripristino l'albero in uno stato pulito...\n" -#: builtin/merge.c:1548 +#: builtin/merge.c:1580 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Tentativo con la strategia di merge %s...\n" -#: builtin/merge.c:1614 +#: builtin/merge.c:1646 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Nessuna strategia di merge ha gestito il merge.\n" -#: builtin/merge.c:1616 +#: builtin/merge.c:1648 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Merge con la strategia %s fallito.\n" -#: builtin/merge.c:1625 +#: builtin/merge.c:1657 #, c-format msgid "Using the %s to prepare resolving by hand.\n" -msgstr "" +msgstr "Uso %s per preparare una risoluzione manuale.\n" -#: builtin/merge.c:1637 +#: builtin/merge.c:1669 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -14251,188 +15105,192 @@ msgstr "" #: builtin/merge-base.c:32 msgid "git merge-base [-a | --all] <commit> <commit>..." -msgstr "" +msgstr "git merge-base [-a | --all] <commit> <commit>..." #: builtin/merge-base.c:33 msgid "git merge-base [-a | --all] --octopus <commit>..." -msgstr "" +msgstr "git merge-base [-a | --all] --octopus <commit>..." #: builtin/merge-base.c:34 msgid "git merge-base --independent <commit>..." -msgstr "" +msgstr "git merge-base --independent <commit>..." #: builtin/merge-base.c:35 msgid "git merge-base --is-ancestor <commit> <commit>" -msgstr "" +msgstr "git merge-base --is-ancestor <commit> <commit>" #: builtin/merge-base.c:36 msgid "git merge-base --fork-point <ref> [<commit>]" -msgstr "" +msgstr "git merge-base --fork-point <riferimento> [<commit>]" #: builtin/merge-base.c:153 msgid "output all common ancestors" -msgstr "" +msgstr "manda in output tutti gli antenati comuni" #: builtin/merge-base.c:155 msgid "find ancestors for a single n-way merge" -msgstr "" +msgstr "trova gli antenati per un singolo merge a n vie" #: builtin/merge-base.c:157 msgid "list revs not reachable from others" -msgstr "" +msgstr "elenca le revisioni non raggiungibili dalle altre" #: builtin/merge-base.c:159 msgid "is the first one ancestor of the other?" -msgstr "" +msgstr "il primo argomento è antenato dell'altro?" #: builtin/merge-base.c:161 msgid "find where <commit> forked from reflog of <ref>" msgstr "" +"trova il punto di fork di <commit> dal registro dei riferimenti di " +"<riferimento>" #: builtin/merge-file.c:9 msgid "" "git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> " "<orig-file> <file2>" msgstr "" +"git merge-file [<opzioni>] [-L <nome1> [-L <originale> [-L <nome2>]]] " +"<file1> <file originale> <file2>" #: builtin/merge-file.c:35 msgid "send results to standard output" -msgstr "" +msgstr "invia i risultati allo standard output" #: builtin/merge-file.c:36 msgid "use a diff3 based merge" -msgstr "" +msgstr "usa un merge basato su diff3" #: builtin/merge-file.c:37 msgid "for conflicts, use our version" -msgstr "" +msgstr "per i conflitti, usa la nostra versione" #: builtin/merge-file.c:39 msgid "for conflicts, use their version" -msgstr "" +msgstr "per i conflitti, usa la loro versione" #: builtin/merge-file.c:41 msgid "for conflicts, use a union version" -msgstr "" +msgstr "per i conflitti, usa una versione unita" #: builtin/merge-file.c:44 msgid "for conflicts, use this marker size" -msgstr "" +msgstr "per i conflitti, usa questa dimensione dei contrassegni" #: builtin/merge-file.c:45 msgid "do not warn about conflicts" -msgstr "" +msgstr "non emettere avvisi in caso di conflitti" #: builtin/merge-file.c:47 msgid "set labels for file1/orig-file/file2" -msgstr "" +msgstr "imposta etichette per file1/file originale/file2" #: builtin/merge-recursive.c:46 -#, fuzzy, c-format +#, c-format msgid "unknown option %s" -msgstr "sconosciuto: %s" +msgstr "opzione sconosciuta %s" #: builtin/merge-recursive.c:52 -#, fuzzy, c-format +#, c-format msgid "could not parse object '%s'" -msgstr "Non è stato possibile analizzare l'oggetto '%s'." +msgstr "impossibile analizzare l'oggetto '%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] "" -msgstr[1] "" +msgstr[0] "impossibile gestire più di %d base. Ignoro %s." +msgstr[1] "impossibile gestire più di %d basi. Ignoro %s." #: builtin/merge-recursive.c:64 msgid "not handling anything other than two heads merge." -msgstr "" +msgstr "non gestisco nulla che non sia il merge di due head." #: builtin/merge-recursive.c:70 builtin/merge-recursive.c:72 -#, fuzzy, c-format +#, c-format msgid "could not resolve ref '%s'" -msgstr "non è stato possibile creare il file '%s'" +msgstr "impossibile risolvere il riferimento '%s'" #: builtin/merge-recursive.c:78 -#, fuzzy, c-format +#, c-format msgid "Merging %s with %s\n" -msgstr "Rinominazione di %s in %s in corso\n" +msgstr "Merge di %s con %s in corso\n" #: builtin/mktree.c:66 msgid "git mktree [-z] [--missing] [--batch]" -msgstr "" +msgstr "git mktree [-z] [--missing] [--batch]" #: builtin/mktree.c:154 msgid "input is NUL terminated" -msgstr "" +msgstr "l'input è terminato da NUL" #: builtin/mktree.c:155 builtin/write-tree.c:26 -#, fuzzy msgid "allow missing objects" -msgstr "Ricezione degli oggetti" +msgstr "consenti oggetti mancanti" #: builtin/mktree.c:156 msgid "allow creation of more than one tree" -msgstr "" +msgstr "consenti la creazione di più di un albero" -#: builtin/multi-pack-index.c:8 +#: builtin/multi-pack-index.c:9 msgid "git multi-pack-index [--object-dir=<dir>] (write|verify)" -msgstr "" +msgstr "git multi-pack-index [--object-dir=<directory>] (write|verify)" -#: builtin/multi-pack-index.c:21 +#: builtin/multi-pack-index.c:22 msgid "object directory containing set of packfile and pack-index pairs" msgstr "" +"directory oggetti contenente un insieme di coppie packfile e pack-index" -#: builtin/multi-pack-index.c:39 -#, fuzzy +#: builtin/multi-pack-index.c:40 builtin/prune-packed.c:67 msgid "too many arguments" -msgstr "Troppi argomenti." +msgstr "troppi argomenti" -#: builtin/multi-pack-index.c:48 -#, fuzzy, c-format +#: builtin/multi-pack-index.c:51 +#, c-format msgid "unrecognized verb: %s" -msgstr "argomento non riconosciuto: %s" +msgstr "verbo non riconosciuto: %s" #: builtin/mv.c:18 msgid "git mv [<options>] <source>... <destination>" -msgstr "" +msgstr "git mv [<opzioni>] <sorgente>... <destinazione>" #: builtin/mv.c:83 #, c-format msgid "Directory %s is in index and no submodule?" -msgstr "" +msgstr "La directory %s è nell'indice e non è specificato un sottomodulo?" #: builtin/mv.c:85 msgid "Please stage your changes to .gitmodules or stash them to proceed" msgstr "" +"Esegui lo stage delle modifiche a .gitmodules o eseguine lo stash per " +"procedere" #: builtin/mv.c:103 -#, fuzzy, c-format +#, c-format msgid "%.*s is in index" -msgstr "Eh? %.*s si trova in index?" +msgstr "%.*s è nell'indice" #: builtin/mv.c:125 msgid "force move/rename even if target exists" -msgstr "" +msgstr "forza spostamento/ridenominazione anche se la destinazione esiste" #: builtin/mv.c:127 -#, fuzzy msgid "skip move/rename errors" -msgstr "errore del programma" +msgstr "salta errori spostamento/ridenominazione" #: builtin/mv.c:169 -#, fuzzy, c-format +#, c-format msgid "destination '%s' is not a directory" -msgstr "%s esiste e non è una directory" +msgstr "la destinazione '%s' non è una directory" #: builtin/mv.c:180 #, c-format msgid "Checking rename of '%s' to '%s'\n" -msgstr "" +msgstr "Controllo la ridenominazione di '%s' in '%s'\n" #: builtin/mv.c:184 msgid "bad source" -msgstr "" +msgstr "sourgente errata" #: builtin/mv.c:187 msgid "can not move directory into itself" @@ -14468,9 +15326,8 @@ msgid "multiple sources for the same target" msgstr "fonti multiple per la stessa destinazione" #: builtin/mv.c:243 -#, fuzzy msgid "destination directory does not exist" -msgstr "il repository '%s' non esiste" +msgstr "la directory di destinazione non esiste" #: builtin/mv.c:250 #, c-format @@ -14482,168 +15339,171 @@ msgstr "%s, sorgente=%s, destinazione=%s" msgid "Renaming %s to %s\n" msgstr "Rinominazione di %s in %s in corso\n" -#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:513 +#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:516 #, c-format msgid "renaming '%s' failed" msgstr "rinomina di '%s' non riuscita" #: builtin/name-rev.c:355 -#, fuzzy msgid "git name-rev [<options>] <commit>..." -msgstr "git apply [opzioni] [<patch>...]" +msgstr "git name-rev [<opzioni>] <commit>..." #: builtin/name-rev.c:356 msgid "git name-rev [<options>] --all" -msgstr "" +msgstr "git name-rev [<opzioni>] --all" #: builtin/name-rev.c:357 msgid "git name-rev [<options>] --stdin" -msgstr "" +msgstr "git name-rev [<opzioni>] --stdin" -#: builtin/name-rev.c:413 +#: builtin/name-rev.c:415 msgid "print only names (no SHA-1)" -msgstr "" +msgstr "stampa solo i nomi (non lo SHA-1)" -#: builtin/name-rev.c:414 +#: builtin/name-rev.c:416 msgid "only use tags to name the commits" -msgstr "" +msgstr "usa solo tag per denominare i commit" -#: builtin/name-rev.c:416 -#, fuzzy +#: builtin/name-rev.c:418 msgid "only use refs matching <pattern>" -msgstr "Stampa le righe corrispondenti ad un modello" +msgstr "usa solo i riferimenti corrispondenti a <pattern>" -#: builtin/name-rev.c:418 -#, fuzzy +#: builtin/name-rev.c:420 msgid "ignore refs matching <pattern>" -msgstr "Stampa le righe corrispondenti ad un modello" +msgstr "ignora i riferimenti corrispondenti a <pattern>" -#: builtin/name-rev.c:420 +#: builtin/name-rev.c:422 msgid "list all commits reachable from all refs" -msgstr "" +msgstr "elenca tutti i commit raggiungibili da tutti i riferimenti" -#: builtin/name-rev.c:421 +#: builtin/name-rev.c:423 msgid "read from stdin" -msgstr "" +msgstr "leggi dallo standard input" -#: builtin/name-rev.c:422 +#: builtin/name-rev.c:424 msgid "allow to print `undefined` names (default)" -msgstr "" +msgstr "consenti di stampare nomi `non definito` (impostazione predefinita)" -#: builtin/name-rev.c:428 +#: builtin/name-rev.c:430 msgid "dereference tags in the input (internal use)" -msgstr "" +msgstr "dereferenzia tag nell'input (uso interno)" #: builtin/notes.c:28 msgid "git notes [--ref <notes-ref>] [list [<object>]]" -msgstr "" +msgstr "git notes [--ref <riferimento note>] [list [<oggetto>]]" #: builtin/notes.c:29 msgid "" "git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> " "| (-c | -C) <object>] [<object>]" msgstr "" +"git notes [--ref <riferimento note>] add [-f] [--allow-empty] [-m " +"<messaggio> | -F <file> | (-c | -C) <oggetto>] [<oggetto>]" #: builtin/notes.c:30 msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>" msgstr "" +"git notes [--ref <riferimento note>] copy [-f] <oggetto sorgente> <oggetto " +"destinazione>" #: builtin/notes.c:31 msgid "" "git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | " "(-c | -C) <object>] [<object>]" msgstr "" +"git notes [--ref <riferimento note>] append [--allow-empty] [-m <messaggio> " +"| -F <file> | (-c | -C) <oggetto>] [<oggetto>]" #: builtin/notes.c:32 msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]" -msgstr "" +msgstr "git notes [--ref <riferimento note>] edit [--allow-empty] [<oggetto>]" #: builtin/notes.c:33 msgid "git notes [--ref <notes-ref>] show [<object>]" -msgstr "" +msgstr "git notes [--ref <riferimento note>] show [<oggetto>]" #: builtin/notes.c:34 msgid "" "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>" msgstr "" +"git notes [--ref <riferimento note>] merge [-v | -q] [-s <strategia>] " +"<riferimento note>" #: builtin/notes.c:35 msgid "git notes merge --commit [-v | -q]" -msgstr "" +msgstr "git notes merge --commit [-v | -q]" #: builtin/notes.c:36 msgid "git notes merge --abort [-v | -q]" -msgstr "" +msgstr "git notes merge --abort [-v | -q]" #: builtin/notes.c:37 msgid "git notes [--ref <notes-ref>] remove [<object>...]" -msgstr "" +msgstr "git notes [--ref <riferimento note>] remove [<oggetto>...]" #: builtin/notes.c:38 msgid "git notes [--ref <notes-ref>] prune [-n] [-v]" -msgstr "" +msgstr "git notes [--ref <riferimento note>] prune [-n] [-v]" #: builtin/notes.c:39 msgid "git notes [--ref <notes-ref>] get-ref" -msgstr "" +msgstr "git notes [--ref <riferimento note>] get-ref" #: builtin/notes.c:44 msgid "git notes [list [<object>]]" -msgstr "" +msgstr "git notes [list [<oggetto>]]" #: builtin/notes.c:49 -#, fuzzy msgid "git notes add [<options>] [<object>]" -msgstr "git apply [opzioni] [<patch>...]" +msgstr "git notes add [<opzioni>] [<oggetto>]" #: builtin/notes.c:54 msgid "git notes copy [<options>] <from-object> <to-object>" -msgstr "" +msgstr "git notes copy [<oggetto>] <oggetto sorgente> <oggetto destinazione>" #: builtin/notes.c:55 msgid "git notes copy --stdin [<from-object> <to-object>]..." -msgstr "" +msgstr "git notes copy --stdin [<oggetto sorgente> <oggetto destinazione>]..." #: builtin/notes.c:60 -#, fuzzy msgid "git notes append [<options>] [<object>]" -msgstr "git apply [opzioni] [<patch>...]" +msgstr "git notes append [<opzioni>] [<oggetto>]" #: builtin/notes.c:65 msgid "git notes edit [<object>]" -msgstr "" +msgstr "git notes edit [<oggetto>]" #: builtin/notes.c:70 msgid "git notes show [<object>]" -msgstr "" +msgstr "git notes show [<oggetto>]" #: builtin/notes.c:75 msgid "git notes merge [<options>] <notes-ref>" -msgstr "" +msgstr "git notes merge [<opzioni>] <riferimento note>" #: builtin/notes.c:76 msgid "git notes merge --commit [<options>]" -msgstr "" +msgstr "git notes merge --commit [<opzioni>]" #: builtin/notes.c:77 msgid "git notes merge --abort [<options>]" -msgstr "" +msgstr "git notes merge --abort [<opzioni>]" #: builtin/notes.c:82 msgid "git notes remove [<object>]" -msgstr "" +msgstr "git notes remove [<oggetto>]" #: builtin/notes.c:87 msgid "git notes prune [<options>]" -msgstr "" +msgstr "git notes prune [<opzioni>]" #: builtin/notes.c:92 msgid "git notes get-ref" -msgstr "" +msgstr "git notes get-ref" #: builtin/notes.c:97 msgid "Write/edit the notes for the following object:" -msgstr "" +msgstr "Scrivi/modifica le note per l'oggetto seguente:" #: builtin/notes.c:150 #, c-format @@ -14651,30 +15511,28 @@ msgid "unable to start 'show' for object '%s'" msgstr "impossibile avviare 'show' per l'oggetto '%s'" #: builtin/notes.c:154 -#, fuzzy msgid "could not read 'show' output" -msgstr "non è stato possibile leggere '%s'" +msgstr "impossibile leggere l'output di 'show'" #: builtin/notes.c:162 #, c-format msgid "failed to finish 'show' for object '%s'" -msgstr "" +msgstr "impossibile terminare 'show' per l'oggetto '%s'" #: builtin/notes.c:197 -#, fuzzy msgid "please supply the note contents using either -m or -F option" -msgstr "Per favore specifica il contenuto delle note usando le opzioni -m o -F" +msgstr "fornisci i contenuti delle note usando l'opzione -m o -F" #: builtin/notes.c:206 msgid "unable to write note object" msgstr "impossibile scrivere l'oggetto nota" #: builtin/notes.c:208 -#, fuzzy, c-format +#, c-format msgid "the note contents have been left in %s" -msgstr "Il contenuto della nota è stato lasciato in %s" +msgstr "i contenuti della nota sono stati lasciati in %s" -#: builtin/notes.c:242 builtin/tag.c:513 +#: builtin/notes.c:242 builtin/tag.c:522 #, c-format msgid "could not open or read '%s'" msgstr "non è stato possibile aprire o leggere '%s'" @@ -14682,37 +15540,38 @@ msgstr "non è stato possibile aprire o leggere '%s'" #: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315 #: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:526 #: builtin/notes.c:531 builtin/notes.c:610 builtin/notes.c:672 -#, fuzzy, c-format +#, c-format msgid "failed to resolve '%s' as a valid ref." -msgstr "rimozione di %s non riuscita" +msgstr "impossibile risolvere '%s' come riferimento valido." #: builtin/notes.c:265 -#, fuzzy, c-format +#, c-format msgid "failed to read object '%s'." -msgstr "Lettura dell'oggetto '%s' non riuscita." +msgstr "lettura dell'oggetto '%s' non riuscita." #: builtin/notes.c:268 -#, fuzzy, c-format +#, c-format msgid "cannot read note data from non-blob object '%s'." -msgstr "non è possibile leggere l'oggetto %s esistente" +msgstr "impossibile leggere i dati della nota dall'oggetto non blob '%s'." #: builtin/notes.c:309 -#, fuzzy, c-format +#, c-format msgid "malformed input line: '%s'." -msgstr "Riga di input malformata: '%s'." +msgstr "riga di input malformata: '%s'." #: builtin/notes.c:324 -#, fuzzy, c-format +#, c-format msgid "failed to copy notes from '%s' to '%s'" -msgstr "Copia delle note da '%s' a '%s' non riuscita" +msgstr "copia delle note da '%s' a '%s' non riuscita" #. TRANSLATORS: the first %s will be replaced by a git #. notes command: 'add', 'merge', 'remove', etc. #. #: builtin/notes.c:356 -#, fuzzy, c-format +#, c-format msgid "refusing to %s notes in %s (outside of refs/notes/)" -msgstr "Impossibile riscrivere le note in %s (al di fuori di refs/notes/)" +msgstr "" +"mi rifiuto di eseguire %s delle note in %s (al di fuori di 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 @@ -14721,38 +15580,33 @@ msgid "too many parameters" msgstr "troppi parametri" #: builtin/notes.c:389 builtin/notes.c:678 -#, fuzzy, c-format +#, c-format msgid "no note found for object %s." -msgstr "Nessuna nota trovata per l'oggetto %s." +msgstr "nessuna nota trovata per l'oggetto %s." #: builtin/notes.c:410 builtin/notes.c:576 -#, fuzzy msgid "note contents as a string" -msgstr "Il contenuto della nota è stato lasciato in %s" +msgstr "contenuti della nota come stringa" #: builtin/notes.c:413 builtin/notes.c:579 -#, fuzzy msgid "note contents in a file" -msgstr "impossibile archiviare index file" +msgstr "contenuti della nota in un file" #: builtin/notes.c:416 builtin/notes.c:582 -#, fuzzy msgid "reuse and edit specified note object" -msgstr "impossibile scrivere l'oggetto nota" +msgstr "riusa l'oggetto nota specificato per poi modificarlo" #: builtin/notes.c:419 builtin/notes.c:585 -#, fuzzy msgid "reuse specified note object" -msgstr "impossibile scrivere l'oggetto nota" +msgstr "riusa l'oggetto nota specificato" #: builtin/notes.c:422 builtin/notes.c:588 msgid "allow storing empty note" -msgstr "" +msgstr "consenti il salvataggio di una nota vuota" #: builtin/notes.c:423 builtin/notes.c:496 -#, fuzzy msgid "replace existing notes" -msgstr "non è possibile leggere l'oggetto %s esistente" +msgstr "sostituisci le note esistenti" #: builtin/notes.c:448 #, c-format @@ -14760,6 +15614,8 @@ msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "" +"Impossibile aggiungere note. Trovate note esistenti per l'oggetto %s. Usa '-" +"f' per sovrascrivere le note esistenti" #: builtin/notes.c:463 builtin/notes.c:544 #, c-format @@ -14772,13 +15628,13 @@ msgid "Removing note for object %s\n" msgstr "Rimozione della nota per l'oggetto %s\n" #: builtin/notes.c:497 -#, fuzzy msgid "read objects from stdin" -msgstr "oggetto %s errato" +msgstr "leggi oggetti dallo standard input" #: builtin/notes.c:499 msgid "load rewriting config for <command> (implies --stdin)" msgstr "" +"carica la configurazione di riscrittura per <comando> (implica --stdin)" #: builtin/notes.c:517 msgid "too few parameters" @@ -14794,9 +15650,9 @@ msgstr "" "f' per sovrascrivere le note esistenti" #: builtin/notes.c:550 -#, fuzzy, c-format +#, c-format msgid "missing notes on source object %s. Cannot copy." -msgstr "Note mancanti per l'oggetto sorgente %s. Impossibile copiare." +msgstr "note mancanti per l'oggetto sorgente %s. Impossibile copiare." #: builtin/notes.c:603 #, c-format @@ -14805,100 +15661,103 @@ msgid "" "Please use 'git notes add -f -m/-F/-c/-C' instead.\n" msgstr "" "Le opzioni -m/-F/-c/-C per il sottocomando 'edit' sono deprecate.\n" -"Per favore usa 'git notes add -f -m/-F/-c/-C' invece.\n" +"Usa 'git notes add -f -m/-F/-c/-C' al loro posto.\n" #: builtin/notes.c:698 msgid "failed to delete ref NOTES_MERGE_PARTIAL" -msgstr "" +msgstr "eliminazione del riferimento NOTES_MERGE_PARTIAL non riuscita" #: builtin/notes.c:700 msgid "failed to delete ref NOTES_MERGE_REF" -msgstr "" +msgstr "eliminazione del riferimento NOTES_MERGE_REF non riuscita" #: builtin/notes.c:702 msgid "failed to remove 'git notes merge' worktree" -msgstr "" +msgstr "rimozione dell'albero di lavoro di 'git notes merge' non riuscita" #: builtin/notes.c:722 msgid "failed to read ref NOTES_MERGE_PARTIAL" -msgstr "" +msgstr "lettura del riferimento NOTES_MERGE_PARTIAL non riuscita" #: builtin/notes.c:724 msgid "could not find commit from NOTES_MERGE_PARTIAL." -msgstr "" +msgstr "impossibile trovare il commit da NOTES_MERGE_PARTIAL." #: builtin/notes.c:726 msgid "could not parse commit from NOTES_MERGE_PARTIAL." -msgstr "" +msgstr "impossibile analizzare il commit da NOTES_MERGE_PARTIAL." #: builtin/notes.c:739 -#, fuzzy msgid "failed to resolve NOTES_MERGE_REF" -msgstr "rimozione di %s non riuscita" +msgstr "risoluzione di NOTES_MERGE_REF non riuscita" #: builtin/notes.c:742 msgid "failed to finalize notes merge" -msgstr "" +msgstr "finalizzazione del merge delle note non riuscita" #: builtin/notes.c:768 -#, fuzzy, c-format +#, c-format msgid "unknown notes merge strategy %s" -msgstr "Non è stato possibile trovare la strategia di merge '%s'.\n" +msgstr "strategia di merge delle note %s sconosciuta" #: builtin/notes.c:784 -#, fuzzy msgid "General options" -msgstr "opzione non valida: %s" +msgstr "Opzioni generali" #: builtin/notes.c:786 msgid "Merge options" -msgstr "" +msgstr "Opzioni merge" #: builtin/notes.c:788 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" msgstr "" +"risolvi i conflitti delle note usando la strategia data (manual/ours/theirs/" +"union/cat_sort_uniq)" #: builtin/notes.c:790 msgid "Committing unmerged notes" -msgstr "" +msgstr "Commit delle note non sottoposte a merge" #: builtin/notes.c:792 msgid "finalize notes merge by committing unmerged notes" msgstr "" +"finalizza il merge delle note eseguendo il commit delle note non sottoposte " +"a merge" #: builtin/notes.c:794 msgid "Aborting notes merge resolution" -msgstr "" +msgstr "Interruzione della risoluzione del merge delle note" #: builtin/notes.c:796 msgid "abort notes merge" -msgstr "" +msgstr "interrompi il merge delle note" #: builtin/notes.c:807 msgid "cannot mix --commit, --abort or -s/--strategy" -msgstr "" +msgstr "impossibile usare contemporaneamente --commit, --abort o -s/--strategy" #: builtin/notes.c:812 -#, fuzzy msgid "must specify a notes ref to merge" -msgstr "Devi specificare un repository da clonare." +msgstr "devi specificare un riferimento note da sottoporre a merge" #: builtin/notes.c:836 #, c-format msgid "unknown -s/--strategy: %s" -msgstr "" +msgstr "-s/--strategy sconosciuta: %s" #: builtin/notes.c:873 -#, fuzzy, c-format +#, c-format msgid "a notes merge into %s is already in-progress at %s" -msgstr "è già in corso un'operazione di cherry-pick o di revert" +msgstr "è già in corso un'operazione di merge delle note in %s al percorso %s" #: builtin/notes.c:876 #, c-format msgid "failed to store link to current notes ref (%s)" msgstr "" +"salvataggio del collegamento al riferimento corrente delle note (%s) non " +"riuscito" #: builtin/notes.c:878 #, c-format @@ -14907,6 +15766,14 @@ msgid "" "'git notes merge --commit', or abort the merge with 'git notes merge --" "abort'.\n" msgstr "" +"Merge automatico delle note non riuscito. Risolvi i conflitti in %s ed " +"esegui il commit del risultato con 'git notes merge --commit' o interrompi " +"il merge con 'git notes merge --abort'.\n" + +#: builtin/notes.c:897 builtin/tag.c:535 +#, c-format +msgid "Failed to resolve '%s' as a valid ref." +msgstr "Risoluzione di '%s' come riferimento valido non riuscita." #: builtin/notes.c:900 #, c-format @@ -14915,629 +15782,641 @@ msgstr "L'oggetto %s non ha note.\n" #: builtin/notes.c:912 msgid "attempt to remove non-existent note is not an error" -msgstr "" +msgstr "il tentativo di rimuovere una nota inesistente non è un errore" #: builtin/notes.c:915 -#, fuzzy msgid "read object names from the standard input" -msgstr "(lettura del messaggio di log dallo standard input)\n" +msgstr "leggi i nomi degli oggetti dallo standard input" -#: builtin/notes.c:954 builtin/prune.c:108 builtin/worktree.c:165 -#, fuzzy +#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:165 msgid "do not remove, show only" -msgstr "Non è stato possibile rimuovere il branch %s" +msgstr "non rimuovere, limitati a visualizzare" #: builtin/notes.c:955 msgid "report pruned notes" -msgstr "" +msgstr "segnala le note eliminate" #: builtin/notes.c:998 msgid "notes-ref" -msgstr "" +msgstr "riferimento note" #: builtin/notes.c:999 msgid "use notes from <notes-ref>" -msgstr "" +msgstr "usa le note in <riferimento note>" -#: builtin/notes.c:1034 -#, fuzzy, c-format +#: builtin/notes.c:1034 builtin/stash.c:1611 +#, c-format msgid "unknown subcommand: %s" -msgstr "Sottocomando sconosciuto: %s" +msgstr "sottocomando sconosciuto: %s" -#: builtin/pack-objects.c:51 +#: builtin/pack-objects.c:52 msgid "" "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" msgstr "" +"git pack-objects --stdout [<opzioni>...] [< <elenco riferimenti> | < <elenco " +"oggetti>]" -#: builtin/pack-objects.c:52 +#: builtin/pack-objects.c:53 msgid "" "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" msgstr "" +"git pack-objects [<opzioni>...] <nome base> [< <elenco riferimenti> | < " +"<elenco oggetti>]" -#: builtin/pack-objects.c:423 -#, fuzzy, c-format +#: builtin/pack-objects.c:424 +#, c-format msgid "bad packed object CRC for %s" -msgstr "oggetto %s errato" +msgstr "CRC oggetto sottoposto a pack %s errato" -#: builtin/pack-objects.c:434 -#, fuzzy, c-format +#: builtin/pack-objects.c:435 +#, c-format msgid "corrupt packed object for %s" -msgstr "patch corrotta per il sottoprogetto %s" +msgstr "oggetto sottoposto a pack %s corrotto" -#: builtin/pack-objects.c:565 +#: builtin/pack-objects.c:566 #, c-format msgid "recursive delta detected for object %s" -msgstr "" +msgstr "rilevato delta ricorsivo per l'oggetto %s" -#: builtin/pack-objects.c:776 +#: builtin/pack-objects.c:777 #, c-format msgid "ordered %u objects, expected %<PRIu32>" -msgstr "" +msgstr "%u oggetti ordinati, attesi %<PRIu32>" -#: builtin/pack-objects.c:789 -#, fuzzy, c-format +#: builtin/pack-objects.c:790 +#, c-format msgid "packfile is invalid: %s" -msgstr "%s non valido" +msgstr "packfile non valido: %s" -#: builtin/pack-objects.c:793 -#, fuzzy, c-format +#: builtin/pack-objects.c:794 +#, c-format msgid "unable to open packfile for reuse: %s" -msgstr "impossibile aprire o leggere %s" +msgstr "impossibile aprire il packfile per il suo riuso: %s" -#: builtin/pack-objects.c:797 -#, fuzzy +#: builtin/pack-objects.c:798 msgid "unable to seek in reused packfile" -msgstr "impossibile leggere index file" +msgstr "impossibile eseguire seek nel packfile riusato" -#: builtin/pack-objects.c:808 -#, fuzzy +#: builtin/pack-objects.c:809 msgid "unable to read from reused packfile" -msgstr "impossibile leggere index file" +msgstr "impossibile leggere dal packfile riusato" -#: builtin/pack-objects.c:836 +#: builtin/pack-objects.c:837 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "" +"disabilito la scrittura delle bitmap, i pack sono divisi a causa " +"dell'impostazione pack.packSizeLimit" -#: builtin/pack-objects.c:849 -#, fuzzy +#: builtin/pack-objects.c:850 msgid "Writing objects" -msgstr "Ricezione degli oggetti" +msgstr "Scrittura degli oggetti in corso" -#: builtin/pack-objects.c:911 builtin/update-index.c:89 -#, fuzzy, c-format +#: builtin/pack-objects.c:912 builtin/update-index.c:89 +#, c-format msgid "failed to stat %s" -msgstr "stat di %s non riuscito\n" +msgstr "stat di %s non riuscito" -#: builtin/pack-objects.c:964 +#: builtin/pack-objects.c:965 #, c-format msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" -msgstr "" +msgstr "scritti %<PRIu32> oggetti quando me ne attendevo %<PRIu32>" -#: builtin/pack-objects.c:1158 +#: builtin/pack-objects.c:1161 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" +"disabilito la scrittura delle bitmap perché alcuni oggetti non saranno " +"sottoposti a pack" -#: builtin/pack-objects.c:1586 +#: builtin/pack-objects.c:1589 #, c-format msgid "delta base offset overflow in pack for %s" -msgstr "" +msgstr "overflow dell'offset base del delta nel pack per %s" -#: builtin/pack-objects.c:1595 +#: builtin/pack-objects.c:1598 #, c-format msgid "delta base offset out of bound for %s" -msgstr "" +msgstr "offset base del delta fuori dall'intervallo consentito per %s" -#: builtin/pack-objects.c:1864 -#, fuzzy +#: builtin/pack-objects.c:1867 msgid "Counting objects" -msgstr "Indicizzazione degli oggetti" +msgstr "Conteggio degli oggetti in corso" -#: builtin/pack-objects.c:1994 -#, fuzzy, c-format +#: builtin/pack-objects.c:1997 +#, c-format msgid "unable to get size of %s" -msgstr "impossibile spostare %s in %s" +msgstr "impossibile recuperare le dimensioni di %s" -#: builtin/pack-objects.c:2009 -#, fuzzy, c-format +#: builtin/pack-objects.c:2012 +#, c-format msgid "unable to parse object header of %s" -msgstr "impossibile aprire o leggere %s" +msgstr "impossibile analizzare l'intestazione oggetto di %s" -#: builtin/pack-objects.c:2079 builtin/pack-objects.c:2095 -#: builtin/pack-objects.c:2105 -#, fuzzy, c-format +#: builtin/pack-objects.c:2082 builtin/pack-objects.c:2098 +#: builtin/pack-objects.c:2108 +#, c-format msgid "object %s cannot be read" -msgstr "oggetto %s non trovato" +msgstr "impossibile leggere l'oggetto %s" -#: builtin/pack-objects.c:2082 builtin/pack-objects.c:2109 +#: builtin/pack-objects.c:2085 builtin/pack-objects.c:2112 #, c-format msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)" msgstr "" +"oggetto %s: lunghezza oggetto inconsistente (%<PRIuMAX> contro %<PRIuMAX>)" -#: builtin/pack-objects.c:2119 +#: builtin/pack-objects.c:2122 msgid "suboptimal pack - out of memory" -msgstr "" +msgstr "pack subottimo - memoria esaurita" -#: builtin/pack-objects.c:2445 +#: builtin/pack-objects.c:2448 #, c-format msgid "Delta compression using up to %d threads" -msgstr "" +msgstr "Compressione delta in corso, uso fino a %d thread" -#: builtin/pack-objects.c:2577 -#, fuzzy, c-format +#: builtin/pack-objects.c:2580 +#, c-format msgid "unable to pack objects reachable from tag %s" -msgstr "impossibile aggiungere la voce della cache per %s" +msgstr "impossibile eseguire il pack degli oggetti raggiungibili dal tag %s" -#: builtin/pack-objects.c:2664 -#, fuzzy +#: builtin/pack-objects.c:2667 msgid "Compressing objects" -msgstr "Indicizzazione degli oggetti" +msgstr "Compressione oggetti in corso" -#: builtin/pack-objects.c:2670 +#: builtin/pack-objects.c:2673 msgid "inconsistency with delta count" -msgstr "" +msgstr "inconsistenza con il numero dei delta" -#: builtin/pack-objects.c:2751 +#: builtin/pack-objects.c:2754 #, c-format msgid "" "expected edge object ID, got garbage:\n" " %s" msgstr "" +"atteso ID oggetto arco, ricevuti dati errati:\n" +" %s" -#: builtin/pack-objects.c:2757 +#: builtin/pack-objects.c:2760 #, c-format msgid "" "expected object ID, got garbage:\n" " %s" msgstr "" +"atteso ID oggetto, ricevuti dati errati:\n" +" %s" -#: builtin/pack-objects.c:2855 -#, fuzzy +#: builtin/pack-objects.c:2858 msgid "invalid value for --missing" -msgstr "Valore non valido per %s: %s" +msgstr "valore non valido per --missing" -#: builtin/pack-objects.c:2914 builtin/pack-objects.c:3022 -#, fuzzy +#: builtin/pack-objects.c:2917 builtin/pack-objects.c:3025 msgid "cannot open pack index" -msgstr "impossibile archiviare il file pack" +msgstr "impossibile aprire l'indice pack" -#: builtin/pack-objects.c:2945 +#: builtin/pack-objects.c:2948 #, c-format msgid "loose object at %s could not be examined" -msgstr "" +msgstr "impossibile esaminare l'oggetto sciolto %s" -#: builtin/pack-objects.c:3030 -#, fuzzy +#: builtin/pack-objects.c:3033 msgid "unable to force loose object" -msgstr "impossibile scrivere l'oggetto nota" +msgstr "impossibile forzare l'oggetto sciolto" -#: builtin/pack-objects.c:3122 -#, fuzzy, c-format +#: builtin/pack-objects.c:3125 +#, c-format msgid "not a rev '%s'" -msgstr "impossibile leggere '%s'" +msgstr "'%s' non è una revisione" -#: builtin/pack-objects.c:3125 -#, fuzzy, c-format +#: builtin/pack-objects.c:3128 +#, c-format msgid "bad revision '%s'" -msgstr "repository '%s' errato" +msgstr "revisione '%s' errata" -#: builtin/pack-objects.c:3150 -#, fuzzy +#: builtin/pack-objects.c:3153 msgid "unable to add recent objects" -msgstr "impossibile scrivere l'oggetto nota" +msgstr "impossibile aggiungere gli oggetti recenti" -#: builtin/pack-objects.c:3203 +#: builtin/pack-objects.c:3206 #, c-format msgid "unsupported index version %s" msgstr "versione %s di index non supportata" -#: builtin/pack-objects.c:3207 +#: builtin/pack-objects.c:3210 #, c-format msgid "bad index version '%s'" msgstr "versione '%s' di index errata" -#: builtin/pack-objects.c:3237 +#: builtin/pack-objects.c:3240 msgid "do not show progress meter" -msgstr "" +msgstr "non visualizzare la barra di avanzamento" -#: builtin/pack-objects.c:3239 +#: builtin/pack-objects.c:3242 msgid "show progress meter" -msgstr "" +msgstr "visualizza la barra di avanzamento" -#: builtin/pack-objects.c:3241 +#: builtin/pack-objects.c:3244 msgid "show progress meter during object writing phase" msgstr "" +"visualizza la barra di avanzamento durante la fase di scrittura oggetti" -#: builtin/pack-objects.c:3244 +#: builtin/pack-objects.c:3247 msgid "similar to --all-progress when progress meter is shown" -msgstr "" +msgstr "simile a --all-progress quando è visualizzata la barra di avanzamento" -#: builtin/pack-objects.c:3245 +#: builtin/pack-objects.c:3248 msgid "<version>[,<offset>]" -msgstr "" +msgstr "<versione>[,<offset>]" -#: builtin/pack-objects.c:3246 +#: builtin/pack-objects.c:3249 msgid "write the pack index file in the specified idx format version" -msgstr "" +msgstr "scrivi il file indice pack usando la versione formato idx specificata" -#: builtin/pack-objects.c:3249 -#, fuzzy +#: builtin/pack-objects.c:3252 msgid "maximum size of each output pack file" -msgstr "Creazione dei file di output non riuscita" +msgstr "dimensione massima di ogni file pack in output" -#: builtin/pack-objects.c:3251 +#: builtin/pack-objects.c:3254 msgid "ignore borrowed objects from alternate object store" -msgstr "" +msgstr "ignora gli oggetti presi in prestito dallo store oggetti alternativo" -#: builtin/pack-objects.c:3253 -#, fuzzy +#: builtin/pack-objects.c:3256 msgid "ignore packed objects" -msgstr "Non è stato possibile leggere l'oggetto %s" +msgstr "ignora gli oggetti sottoposti a pack" -#: builtin/pack-objects.c:3255 +#: builtin/pack-objects.c:3258 msgid "limit pack window by objects" -msgstr "" +msgstr "limita la finestra di pack al numero di oggetti specificato" -#: builtin/pack-objects.c:3257 +#: builtin/pack-objects.c:3260 msgid "limit pack window by memory in addition to object limit" msgstr "" +"limita la finestra di pack alla memoria specificata in aggiunta al limite " +"sugli oggetti" -#: builtin/pack-objects.c:3259 +#: builtin/pack-objects.c:3262 msgid "maximum length of delta chain allowed in the resulting pack" -msgstr "" +msgstr "lunghezza massima della catena di delta consentita nel pack risultante" -#: builtin/pack-objects.c:3261 -#, fuzzy +#: builtin/pack-objects.c:3264 msgid "reuse existing deltas" -msgstr "Risoluzione dei delta" +msgstr "riusa i delta esistenti" -#: builtin/pack-objects.c:3263 -#, fuzzy +#: builtin/pack-objects.c:3266 msgid "reuse existing objects" -msgstr "non è possibile leggere l'oggetto %s esistente" +msgstr "riusa gli oggetti esistenti" -#: builtin/pack-objects.c:3265 +#: builtin/pack-objects.c:3268 msgid "use OFS_DELTA objects" -msgstr "" +msgstr "usa oggetti OFS_DELTA" -#: builtin/pack-objects.c:3267 +#: builtin/pack-objects.c:3270 msgid "use threads when searching for best delta matches" msgstr "" +"usa più thread durante la ricerca delle migliori corrispondenze per i delta" -#: builtin/pack-objects.c:3269 +#: builtin/pack-objects.c:3272 msgid "do not create an empty pack output" -msgstr "" +msgstr "non creare un output pack vuoto" -#: builtin/pack-objects.c:3271 -#, fuzzy +#: builtin/pack-objects.c:3274 msgid "read revision arguments from standard input" -msgstr "(lettura del messaggio di log dallo standard input)\n" +msgstr "leggi gli argomenti revisione dallo standard input" -#: builtin/pack-objects.c:3273 +#: builtin/pack-objects.c:3276 msgid "limit the objects to those that are not yet packed" -msgstr "" +msgstr "limita gli oggetti a quelli non ancora sottoposti a pack" -#: builtin/pack-objects.c:3276 +#: builtin/pack-objects.c:3279 msgid "include objects reachable from any reference" -msgstr "" +msgstr "includi gli oggetti raggiungibili da qualunque riferimento" -#: builtin/pack-objects.c:3279 +#: builtin/pack-objects.c:3282 msgid "include objects referred by reflog entries" -msgstr "" +msgstr "includi gli oggetti referenziati da voci del log riferimenti" -#: builtin/pack-objects.c:3282 -#, fuzzy +#: builtin/pack-objects.c:3285 msgid "include objects referred to by the index" -msgstr "Aggiunge il contenuto del file a index" +msgstr "includi gli oggetti referenziati dall'indice" -#: builtin/pack-objects.c:3285 +#: builtin/pack-objects.c:3288 msgid "output pack to stdout" -msgstr "" +msgstr "invia il pack in output sullo standard output" -#: builtin/pack-objects.c:3287 +#: builtin/pack-objects.c:3290 msgid "include tag objects that refer to objects to be packed" msgstr "" +"includi gli oggetti tag che fanno riferimento agli oggetti da sottoporre a " +"pack" -#: builtin/pack-objects.c:3289 +#: builtin/pack-objects.c:3292 msgid "keep unreachable objects" -msgstr "" +msgstr "mantieni gli oggetti non raggiungibili" -#: builtin/pack-objects.c:3291 +#: builtin/pack-objects.c:3294 msgid "pack loose unreachable objects" -msgstr "" +msgstr "esegui il pack degli oggetti non raggiungibili sciolti" -#: builtin/pack-objects.c:3293 +#: builtin/pack-objects.c:3296 msgid "unpack unreachable objects newer than <time>" -msgstr "" +msgstr "decomprimi gli oggetti non raggiungibili più recenti di <tempo>" -#: builtin/pack-objects.c:3296 +#: builtin/pack-objects.c:3299 msgid "use the sparse reachability algorithm" -msgstr "" +msgstr "usa l'algoritmo di raggiungibilità sparse" -#: builtin/pack-objects.c:3298 +#: builtin/pack-objects.c:3301 msgid "create thin packs" -msgstr "" +msgstr "crea pack thin" -#: builtin/pack-objects.c:3300 +#: builtin/pack-objects.c:3303 msgid "create packs suitable for shallow fetches" -msgstr "" +msgstr "crea pack adatti per fetch shallow" -#: builtin/pack-objects.c:3302 +#: builtin/pack-objects.c:3305 msgid "ignore packs that have companion .keep file" -msgstr "" +msgstr "ignora i pack che hanno un file .keep che li accompagna" -#: builtin/pack-objects.c:3304 +#: builtin/pack-objects.c:3307 msgid "ignore this pack" -msgstr "" +msgstr "ignora questo pack" -#: builtin/pack-objects.c:3306 +#: builtin/pack-objects.c:3309 msgid "pack compression level" -msgstr "" +msgstr "livello compressione pack" -#: builtin/pack-objects.c:3308 -#, fuzzy +#: builtin/pack-objects.c:3311 msgid "do not hide commits by grafts" -msgstr "non è stato possibile scrivere il modello di commit" +msgstr "non nascondere i commit innestati" -#: builtin/pack-objects.c:3310 +#: builtin/pack-objects.c:3313 msgid "use a bitmap index if available to speed up counting objects" msgstr "" +"usa un indice bitmap se disponibile per velocizzare il conteggio degli " +"oggetti" -#: builtin/pack-objects.c:3312 +#: builtin/pack-objects.c:3315 msgid "write a bitmap index together with the pack index" -msgstr "" +msgstr "scrivi un indice bitmap insieme all'indice pack" -#: builtin/pack-objects.c:3315 -#, fuzzy +#: builtin/pack-objects.c:3318 msgid "handling for missing objects" -msgstr "non è possibile leggere l'oggetto %s esistente" +msgstr "azione da eseguire sugli oggetti mancanti" -#: builtin/pack-objects.c:3318 +#: builtin/pack-objects.c:3321 msgid "do not pack objects in promisor packfiles" -msgstr "" +msgstr "non eseguire il pack degli oggetti nei file pack promettenti" -#: builtin/pack-objects.c:3320 +#: builtin/pack-objects.c:3323 msgid "respect islands during delta compression" -msgstr "" +msgstr "rispetta le isole durante la compressione delta" -#: builtin/pack-objects.c:3345 +#: builtin/pack-objects.c:3348 #, c-format msgid "delta chain depth %d is too deep, forcing %d" -msgstr "" +msgstr "la profondità della catena dei delta (%d) è troppo elevata, forzo %d" -#: builtin/pack-objects.c:3350 +#: builtin/pack-objects.c:3353 #, c-format msgid "pack.deltaCacheLimit is too high, forcing %d" -msgstr "" +msgstr "il valore pack.deltaCacheLimit è troppo elevato, forzo %d" -#: builtin/pack-objects.c:3404 +#: builtin/pack-objects.c:3407 msgid "--max-pack-size cannot be used to build a pack for transfer" msgstr "" +"--max-pack-size non può essere usato per generare un pack da trasferire" -#: builtin/pack-objects.c:3406 +#: builtin/pack-objects.c:3409 msgid "minimum pack size limit is 1 MiB" -msgstr "" +msgstr "il limite minimo delle dimensioni dei pack è 1 MiB" -#: builtin/pack-objects.c:3411 -#, fuzzy +#: builtin/pack-objects.c:3414 msgid "--thin cannot be used to build an indexable pack" -msgstr "--fix-thin non può essere usato senza --stdin" +msgstr "--thin non può essere usato per generare un pack indicizzabile" -#: builtin/pack-objects.c:3414 -#, fuzzy +#: builtin/pack-objects.c:3417 msgid "--keep-unreachable and --unpack-unreachable are incompatible" -msgstr "--column e --verbose non sono compatibili" +msgstr "--keep-unreachable e --unpack-unreachable non sono compatibili" -#: builtin/pack-objects.c:3420 -#, fuzzy +#: builtin/pack-objects.c:3423 msgid "cannot use --filter without --stdout" -msgstr "impossibile usare -a con -d" +msgstr "impossibile usare --filter senza --stdout" -#: builtin/pack-objects.c:3479 -#, fuzzy +#: builtin/pack-objects.c:3484 msgid "Enumerating objects" -msgstr "Indicizzazione degli oggetti" +msgstr "Enumerazione degli oggetti in corso" -#: builtin/pack-objects.c:3498 +#: builtin/pack-objects.c:3514 #, c-format msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)" msgstr "" +"%<PRIu32> oggetti totali (%<PRIu32> delta), %<PRIu32> riutilizzati " +"(%<PRIu32> delta)" -#: builtin/pack-refs.c:7 +#: builtin/pack-refs.c:8 msgid "git pack-refs [<options>]" -msgstr "" +msgstr "git pack-refs [<opzioni>]" -#: builtin/pack-refs.c:15 +#: builtin/pack-refs.c:16 msgid "pack everything" -msgstr "" +msgstr "esegui il pack di tutto" -#: builtin/pack-refs.c:16 +#: builtin/pack-refs.c:17 msgid "prune loose refs (default)" -msgstr "" +msgstr "elimina i riferimenti sciolti (impostazione predefinita)" #: builtin/prune-packed.c:9 msgid "git prune-packed [-n | --dry-run] [-q | --quiet]" -msgstr "" +msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]" #: builtin/prune-packed.c:42 -#, fuzzy msgid "Removing duplicate objects" -msgstr "Rimozione della nota per l'oggetto %s\n" +msgstr "Rimozione oggetti duplicati in corso" #: builtin/prune.c:12 msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]" -msgstr "" +msgstr "git prune [-n] [-v] [--progress] [--expire <tempo>] [--] [<head>...]" -#: builtin/prune.c:109 -#, fuzzy +#: builtin/prune.c:131 msgid "report pruned objects" -msgstr "Errore nell'oggetto" +msgstr "segnala gli oggetti ripuliti" -#: builtin/prune.c:112 +#: builtin/prune.c:134 msgid "expire objects older than <time>" -msgstr "" +msgstr "fai scadere oggetti più vecchi di <tempo>" -#: builtin/prune.c:114 +#: builtin/prune.c:136 msgid "limit traversal to objects outside promisor packfiles" -msgstr "" +msgstr "limita la visita agli oggetti al di fuori dei file pack promettenti" -#: builtin/prune.c:128 -#, fuzzy +#: builtin/prune.c:150 msgid "cannot prune in a precious-objects repo" -msgstr "non è possibile leggere l'oggetto %s esistente" +msgstr "" +"impossibile eseguire l'eliminazione in un repository 'oggetti preziosi'" -#: builtin/pull.c:61 builtin/pull.c:63 +#: builtin/pull.c:66 builtin/pull.c:68 #, c-format msgid "Invalid value for %s: %s" msgstr "Valore non valido per %s: %s" -#: builtin/pull.c:83 -#, fuzzy +#: builtin/pull.c:88 msgid "git pull [<options>] [<repository> [<refspec>...]]" -msgstr "git apply [opzioni] [<patch>...]" +msgstr "git pull [<opzioni>] [<repository> [<specificatore riferimento>...]]" -#: builtin/pull.c:134 +#: builtin/pull.c:140 msgid "control for recursive fetching of submodules" -msgstr "" +msgstr "controlla il recupero ricorsivo dei sottomoduli" -#: builtin/pull.c:138 +#: builtin/pull.c:144 msgid "Options related to merging" -msgstr "" +msgstr "Opzioni relative al merge" -#: builtin/pull.c:141 +#: builtin/pull.c:147 msgid "incorporate changes by rebasing rather than merging" -msgstr "" +msgstr "incorpora le modifiche eseguendo un rebase anziché un merge" -#: builtin/pull.c:168 builtin/rebase--interactive.c:149 builtin/revert.c:123 +#: builtin/pull.c:175 builtin/rebase.c:447 builtin/revert.c:125 msgid "allow fast-forward" -msgstr "" +msgstr "consenti fast-forward" -#: builtin/pull.c:177 +#: builtin/pull.c:184 msgid "automatically stash/stash pop before and after rebase" -msgstr "" +msgstr "esegui stash/stash pop automaticamente prima e dopo il rebase" -#: builtin/pull.c:193 +#: builtin/pull.c:200 msgid "Options related to fetching" -msgstr "" +msgstr "Opzioni relative al fetch" -#: builtin/pull.c:203 +#: builtin/pull.c:210 msgid "force overwrite of local branch" -msgstr "" +msgstr "forza la sovrascrittura del branch locale" -#: builtin/pull.c:211 +#: builtin/pull.c:218 msgid "number of submodules pulled in parallel" -msgstr "" +msgstr "numero di sottomoduli recuperati in parallelo" -#: builtin/pull.c:306 -#, fuzzy, c-format +#: builtin/pull.c:313 +#, c-format msgid "Invalid value for pull.ff: %s" -msgstr "Valore non valido per %s: %s" +msgstr "Valore non valido per pull.ff: %s" -#: builtin/pull.c:422 +#: builtin/pull.c:430 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." msgstr "" +"Non ci sono candidati in base ai quali eseguire il rebase fra i riferimenti " +"appena recuperati." -#: builtin/pull.c:424 +#: builtin/pull.c:432 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "" +"Non ci sono candidati in base ai quali eseguire il merge fra i riferimenti " +"appena recuperati." -#: builtin/pull.c:425 +#: builtin/pull.c:433 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." msgstr "" +"In generale, questo significa che hai fornito uno specificatore\n" +"riferimento che non aveva corrispondenze nel remoto." -#: builtin/pull.c:428 +#: builtin/pull.c:436 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" "a branch. Because this is not the default configured remote\n" "for your current branch, you must specify a branch on the command line." msgstr "" +"Hai chiesto di eseguire un pull dal remoto '%s' ma non hai\n" +"specificato un branch. Dal momento che questo non è il remoto\n" +"configurato come predefinito per il branch corrente, devi\n" +"specificare un branch sulla riga di comando." -#: builtin/pull.c:433 builtin/rebase.c:956 git-parse-remote.sh:73 -#, fuzzy +#: builtin/pull.c:441 builtin/rebase.c:1321 git-parse-remote.sh:73 msgid "You are not currently on a branch." -msgstr "Nessun remote per il branch corrente." +msgstr "Attualmente non sei su un branch." -#: builtin/pull.c:435 builtin/pull.c:450 git-parse-remote.sh:79 +#: builtin/pull.c:443 builtin/pull.c:458 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." -msgstr "" +msgstr "Specifica il branch in base a cui vuoi effettuare il rebase." -#: builtin/pull.c:437 builtin/pull.c:452 git-parse-remote.sh:82 +#: builtin/pull.c:445 builtin/pull.c:460 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." -msgstr "" +msgstr "Specifica il branch in base a cui vuoi effettuare il merge." -#: builtin/pull.c:438 builtin/pull.c:453 +#: builtin/pull.c:446 builtin/pull.c:461 msgid "See git-pull(1) for details." -msgstr "" +msgstr "Vedi git-pull(1) per ulteriori dettagli." -#: builtin/pull.c:440 builtin/pull.c:446 builtin/pull.c:455 -#: builtin/rebase.c:962 git-parse-remote.sh:64 -#, fuzzy +#: builtin/pull.c:448 builtin/pull.c:454 builtin/pull.c:463 +#: builtin/rebase.c:1327 git-parse-remote.sh:64 msgid "<remote>" -msgstr "* remote %s" +msgstr "<remoto>" -#: builtin/pull.c:440 builtin/pull.c:455 builtin/pull.c:460 -#: git-legacy-rebase.sh:564 git-parse-remote.sh:65 -#, fuzzy +#: builtin/pull.c:448 builtin/pull.c:463 builtin/pull.c:468 +#: git-parse-remote.sh:65 msgid "<branch>" -msgstr "Sul branch " +msgstr "<branch>" -#: builtin/pull.c:448 builtin/rebase.c:954 git-parse-remote.sh:75 -#, fuzzy +#: builtin/pull.c:456 builtin/rebase.c:1319 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." -msgstr "Nessun remote per il branch corrente." +msgstr "Non ci sono informazioni di tracciamento per il branch corrente." -#: builtin/pull.c:457 git-parse-remote.sh:95 +#: builtin/pull.c:465 git-parse-remote.sh:95 msgid "" "If you wish to set tracking information for this branch you can do so with:" msgstr "" +"Se vuoi impostare le informazioni di tracciamento per questo branch puoi " +"farlo con:" -#: builtin/pull.c:462 +#: builtin/pull.c:470 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" "from the remote, but no such ref was fetched." msgstr "" +"La tua configurazione specifica che deve essere eseguito\n" +"il merge con il riferimento '%s' del remoto, ma un tale\n" +"riferimento non è stato recuperato." -#: builtin/pull.c:566 -#, fuzzy, c-format +#: builtin/pull.c:574 +#, c-format msgid "unable to access commit %s" -msgstr "Non è stato possibile analizzare il commit %s\n" +msgstr "impossibile accedere al commit %s" -#: builtin/pull.c:844 +#: builtin/pull.c:854 msgid "ignoring --verify-signatures for rebase" -msgstr "" +msgstr "ignoro --verify-signature per il rebase" -#: builtin/pull.c:892 -#, fuzzy +#: builtin/pull.c:909 msgid "--[no-]autostash option is only valid with --rebase." -msgstr "l'opzione --contains è consentita solo con -l." +msgstr "l'opzione --[no-]autostash option è valida solo con --rebase." -#: builtin/pull.c:900 +#: builtin/pull.c:917 msgid "Updating an unborn branch with changes added to the index." -msgstr "" +msgstr "Aggiorno un branch non nato con le modifiche aggiunte all'indice." -#: builtin/pull.c:904 +#: builtin/pull.c:921 msgid "pull with rebase" -msgstr "" +msgstr "pull con rebase" -#: builtin/pull.c:905 +#: builtin/pull.c:922 msgid "please commit or stash them." -msgstr "" +msgstr "eseguine il commit o lo stash." -#: builtin/pull.c:930 +#: builtin/pull.c:947 #, c-format msgid "" "fetch updated the current branch head.\n" "fast-forwarding your working tree from\n" "commit %s." msgstr "" +"il fetch ha aggiornato l'head del\n" +"branch corrente.\n" +"Eseguo il fast-forward dell'albero\n" +"di lavoro dal commit %s." -#: builtin/pull.c:936 +#: builtin/pull.c:953 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -15547,29 +16426,36 @@ msgid "" "$ git reset --hard\n" "to recover." msgstr "" +"Impossibile eseguire il fast-forward dell'albero\n" +"di lavoro.\n" +"Dopo esserti assicurato di aver salvato tutto ciò\n" +"che è importante dall'output di\n" +"$ git diff %s\n" +"esegui\n" +"$ git reset --hard\n" +"per eseguire il ripristino." -#: builtin/pull.c:951 -#, fuzzy +#: builtin/pull.c:968 msgid "Cannot merge multiple branches into empty head." -msgstr "Impossibile eseguire il merge di branch multipli in un head vuoto" +msgstr "Impossibile eseguire il merge di più branch in un head vuoto." -#: builtin/pull.c:955 -#, fuzzy +#: builtin/pull.c:972 msgid "Cannot rebase onto multiple branches." -msgstr "Impossibile eseguire il rebase su branch multipli" +msgstr "Impossibile eseguire il rebase su più branch." -#: builtin/pull.c:962 +#: builtin/pull.c:979 msgid "cannot rebase with locally recorded submodule modifications" msgstr "" +"impossibile eseguire il rebase se ci sono delle modifiche registrate " +"localmente ai sottomoduli" #: builtin/push.c:19 -#, fuzzy msgid "git push [<options>] [<repository> [<refspec>...]]" -msgstr "git apply [opzioni] [<patch>...]" +msgstr "git push [<opzioni>] [<repository> [<specificatore riferimento>...]]" #: builtin/push.c:111 msgid "tag shorthand without <tag>" -msgstr "" +msgstr "esegui il tag della forma breve senza <tag>" #: builtin/push.c:121 msgid "--delete only accepts plain target ref names" @@ -15580,6 +16466,9 @@ msgid "" "\n" "To choose either option permanently, see push.default in 'git help config'." msgstr "" +"\n" +"Per scegliere permanentemente una delle due opzioni, vedi push.default in " +"'git help config'." #: builtin/push.c:170 #, c-format @@ -15595,6 +16484,16 @@ msgid "" " git push %s HEAD\n" "%s" msgstr "" +"Il branch upstream del branch attuale non corrisponde al\n" +"nome del branch attuale. Per eseguire il push al branch upstream\n" +"del remoto, usa\n" +"\n" +" git push %s HEAD:%s\n" +"\n" +"Per eseguire il push al branch con lo stesso nome del remoto, usa\n" +"\n" +" git push %s HEAD\n" +"%s" #: builtin/push.c:185 #, c-format @@ -15605,6 +16504,11 @@ msgid "" "\n" " git push %s HEAD:<name-of-remote-branch>\n" msgstr "" +"Attualmente non sei su un branch.\n" +"Per eseguire ora il push della cronologia che ha condotto\n" +"allo stato corrente (HEAD scollegato), usa\n" +"\n" +" git push %s HEAD:<nome del branch remoto>\n" #: builtin/push.c:199 #, c-format @@ -15615,8 +16519,8 @@ msgid "" " git push --set-upstream %s %s\n" msgstr "" "Il branch corrente %s non ha alcun branch upstream.\n" -"Per eseguire il push del branch corrente ed impostare remote come upstream, " -"usa\n" +"Per eseguire il push del branch corrente ed impostare il remoto come " +"upstream, usa\n" "\n" " git push --set-upstream %s %s\n" @@ -15624,7 +16528,7 @@ msgstr "" #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." msgstr "" -"Il branch corrente %s ha branch multipli in upstream; push non eseguito." +"Il branch corrente %s ha più branch upstream, mi rifiuto di eseguire il push." #: builtin/push.c:210 #, c-format @@ -15633,6 +16537,9 @@ msgid "" "your current branch '%s', without telling me what to push\n" "to update which remote branch." msgstr "" +"Stai eseguendo il push al remoto '%s', che non è l'upstream del\n" +"branch corrente '%s', senza dirmi di cosa devo eseguire il push\n" +"per aggiornare quale branch remoto." #: builtin/push.c:269 msgid "" @@ -15648,6 +16555,12 @@ msgid "" "'git pull ...') before pushing again.\n" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" +"Gli aggiornamenti sono stati rifiutati perché l'ultimo commit del branch\n" +"attuale è rimasto indietro rispetto alla sua controparte remota.\n" +"Integra le modifiche remote (ad es. con 'git pull ...') prima di\n" +"eseguire nuovamente il push.\n" +"Vedi la 'Nota sui fast-forward' in 'git push --help' per ulteriori\n" +"dettagli." #: builtin/push.c:282 msgid "" @@ -15656,6 +16569,13 @@ msgid "" "(e.g. 'git pull ...') before pushing again.\n" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" +"Gli aggiornamenti sono stati rifiutati perché l'ultimo commit di un\n" +"branch di cui è stato eseguito il push è rimasto indietro rispetto\n" +"alla sua controparte remota. Esegui il checkout di questo branch e\n" +"integra le modifiche remote (ad es. con 'git pull ...') prima di\n" +"eseguire nuovamente il push.\n" +"Vedi la 'Nota sui fast-forward' in 'git push --help' per ulteriori\n" +"dettagli." #: builtin/push.c:288 msgid "" @@ -15665,10 +16585,18 @@ msgid "" "(e.g., 'git pull ...') before pushing again.\n" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" +"Gli aggiornamenti sono stati rifiutati perché il remoto contiene delle\n" +"modifiche che non hai localmente. Ciò solitamente è causato da un push\n" +"da un altro repository allo stesso riferimento. Potresti voler integrare\n" +"le modifiche remote (ad es. con 'git pull ...') prima di eseguire\n" +"nuovamente il push.\n" +"Vedi la 'Nota sui fast-forward' in 'git push --help' per ulteriori\n" +"dettagli." #: builtin/push.c:295 msgid "Updates were rejected because the tag already exists in the remote." msgstr "" +"Gli aggiornamenti sono stati rifiutati perché il tag esiste già nel remoto." #: builtin/push.c:298 msgid "" @@ -15676,16 +16604,20 @@ msgid "" "or update a remote ref to make it point at a non-commit object,\n" "without using the '--force' option.\n" msgstr "" +"Non puoi aggiornare un riferimento remoto che punta a un oggetto\n" +"diverso da un commit o aggiornare un riferimento remoto per farlo\n" +"puntare a un oggetto diverso da un commit senza usare l'opzione\n" +"'--force'.\n" #: builtin/push.c:359 #, c-format msgid "Pushing to %s\n" -msgstr "" +msgstr "Push su %s in corso\n" #: builtin/push.c:364 #, c-format msgid "failed to push some refs to '%s'" -msgstr "" +msgstr "push di alcuni riferimenti su '%s' non riuscito" #: builtin/push.c:398 #, c-format @@ -15715,76 +16647,74 @@ msgstr "" " git push <nome>\n" #: builtin/push.c:554 -#, fuzzy msgid "repository" -msgstr "repository '%s' errato" +msgstr "repository" #: builtin/push.c:555 builtin/send-pack.c:164 msgid "push all refs" -msgstr "" +msgstr "esegui il push di tutti i riferimenti" #: builtin/push.c:556 builtin/send-pack.c:166 msgid "mirror all refs" -msgstr "" +msgstr "esegui il mirror di tutti i riferimenti" #: builtin/push.c:558 -#, fuzzy msgid "delete refs" -msgstr "elimina" +msgstr "elimina riferimenti" #: builtin/push.c:559 msgid "push tags (can't be used with --all or --mirror)" -msgstr "" +msgstr "esegui il push dei tag (non può essere usato con --all o --mirror)" #: builtin/push.c:562 builtin/send-pack.c:167 -#, fuzzy msgid "force updates" -msgstr "aggiornamento forzato" +msgstr "forza gli aggiornamenti" #: builtin/push.c:564 builtin/send-pack.c:181 msgid "<refname>:<expect>" -msgstr "" +msgstr "<nome riferimento>:<valore atteso>" #: builtin/push.c:565 builtin/send-pack.c:182 msgid "require old value of ref to be at this value" msgstr "" +"richiedi che il vecchio valore del riferimento corrisponda a questo valore" #: builtin/push.c:568 msgid "control recursive pushing of submodules" -msgstr "" +msgstr "controlla il push ricorsivo dei sottomoduli" #: builtin/push.c:570 builtin/send-pack.c:175 msgid "use thin pack" -msgstr "" +msgstr "usa un thin pack" #: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:161 #: builtin/send-pack.c:162 msgid "receive pack program" -msgstr "" +msgstr "programma ricezione pack" #: builtin/push.c:573 msgid "set upstream for git pull/status" -msgstr "" +msgstr "imposta l'upstream per git pull/status" #: builtin/push.c:576 msgid "prune locally removed refs" -msgstr "" +msgstr "elimina i riferimenti rimossi localmente" #: builtin/push.c:578 msgid "bypass pre-push hook" -msgstr "" +msgstr "ignora l'hook pre-push" #: builtin/push.c:579 msgid "push missing but relevant tags" -msgstr "" +msgstr "esegui il push dei tag mancanti ma rilevanti" #: builtin/push.c:582 builtin/send-pack.c:169 msgid "GPG sign the push" -msgstr "" +msgstr "firma il push con GPG" #: builtin/push.c:584 builtin/send-pack.c:176 msgid "request atomic transaction on remote side" -msgstr "" +msgstr "richiedi l'atomicità della transazione al remoto" #: builtin/push.c:602 msgid "--delete is incompatible with --all, --mirror and --tags" @@ -15800,7 +16730,7 @@ msgstr "--all e --tags non sono compatibili" #: builtin/push.c:609 msgid "--all can't be combined with refspecs" -msgstr "" +msgstr "--all non può essere combinato con degli specificatori riferimento" #: builtin/push.c:613 msgid "--mirror and --tags are incompatible" @@ -15808,7 +16738,7 @@ msgstr "--mirror e --tags non sono compatibili" #: builtin/push.c:615 msgid "--mirror can't be combined with refspecs" -msgstr "" +msgstr "--mirror non può essere combinato con degli specificatori riferimento" #: builtin/push.c:618 msgid "--all and --mirror are incompatible" @@ -15816,41 +16746,45 @@ msgstr "--all e --mirror non sono compatibili" #: builtin/push.c:637 msgid "push options must not have new line characters" -msgstr "" +msgstr "le opzioni push non devono avere caratteri di fine riga" #: builtin/range-diff.c:8 msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>" msgstr "" +"git range-diff [<opzioni>] <vecchia base>..<vecchio ultimo commit> <nuova " +"base>..<nuovo ultimo commit>" #: builtin/range-diff.c:9 msgid "git range-diff [<options>] <old-tip>...<new-tip>" msgstr "" +"git range-diff [<opzioni>] <vecchio ultimo commit>...<nuovo ultimo commit>" #: builtin/range-diff.c:10 msgid "git range-diff [<options>] <base> <old-tip> <new-tip>" msgstr "" +"git range-diff [<opzioni>] <base> <vecchio ultimo commit> <nuovo ultimo " +"commit>" #: builtin/range-diff.c:21 msgid "Percentage by which creation is weighted" -msgstr "" +msgstr "Percentuale in base a cui viene pesata la creazione" #: builtin/range-diff.c:23 msgid "use simple diff colors" -msgstr "" +msgstr "usa colori semplici per il diff" -#: builtin/range-diff.c:61 builtin/range-diff.c:65 -#, fuzzy, c-format +#: builtin/range-diff.c:46 builtin/range-diff.c:50 +#, c-format msgid "no .. in range: '%s'" -msgstr "Nessun branch esistente: '%s'" +msgstr "nessun .. nell'intervallo: '%s'" -#: builtin/range-diff.c:75 +#: builtin/range-diff.c:60 msgid "single arg format must be symmetric range" -msgstr "" +msgstr "il formato dell'unico argomento dev'essere un intervallo simmetrico" -#: builtin/range-diff.c:90 -#, fuzzy +#: builtin/range-diff.c:75 msgid "need two commit ranges" -msgstr "nuovi commit, " +msgstr "devono essere specificati due intervalli commit" #: builtin/read-tree.c:41 msgid "" @@ -15858,129 +16792,309 @@ msgid "" "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" "index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])" msgstr "" +"git read-tree [(-m [--trivial] [--aggressive] | --reset | --" +"prefix=<prefisso>) [-u [--exclude-per-directory=<gitignore>] | -i]] [--no-" +"sparse-checkout] [--index-output=<file>] (--empty | <espressione albero 1> " +"[<espressione albero 2> [<espressione albero 3>]])" #: builtin/read-tree.c:124 -#, fuzzy msgid "write resulting index to <file>" -msgstr "file index corrotto" +msgstr "scrivi l'indice risultante in <file>" #: builtin/read-tree.c:127 -#, fuzzy msgid "only empty the index" -msgstr "Non è stato possibile leggere index" +msgstr "svuota solo l'indice" #: builtin/read-tree.c:129 msgid "Merging" -msgstr "" +msgstr "Merge" #: builtin/read-tree.c:131 msgid "perform a merge in addition to a read" -msgstr "" +msgstr "esegui il merge oltre a una lettura" #: builtin/read-tree.c:133 msgid "3-way merge if no file level merging required" -msgstr "" +msgstr "merge a tre vie se non sono richiesti merge a livello di file" #: builtin/read-tree.c:135 msgid "3-way merge in presence of adds and removes" -msgstr "" +msgstr "merge a tre vie se sono presenti aggiunte ed eliminazioni" #: builtin/read-tree.c:137 msgid "same as -m, but discard unmerged entries" -msgstr "" +msgstr "come -m, ma scarta le voci non sottoposte a merge" #: builtin/read-tree.c:138 msgid "<subdirectory>/" -msgstr "" +msgstr "<sottodirectory>/" #: builtin/read-tree.c:139 msgid "read the tree into the index under <subdirectory>/" -msgstr "" +msgstr "leggi l'albero nell'indice in <sottodirectory>/" #: builtin/read-tree.c:142 msgid "update working tree with merge result" -msgstr "" +msgstr "aggiorna l'albero di lavoro con il risultato del merge" #: builtin/read-tree.c:144 -#, fuzzy msgid "gitignore" -msgstr "Ignorato" +msgstr "gitignore" #: builtin/read-tree.c:145 msgid "allow explicitly ignored files to be overwritten" -msgstr "" +msgstr "consenti la sovrascrittura dei file ignorati esplicitamente" #: builtin/read-tree.c:148 msgid "don't check the working tree after merging" -msgstr "" +msgstr "non controllare l'albero di lavoro dopo il merge" #: builtin/read-tree.c:149 msgid "don't update the index or the work tree" -msgstr "" +msgstr "non aggiornare l'indice o l'albero di lavoro" #: builtin/read-tree.c:151 msgid "skip applying sparse checkout filter" -msgstr "" +msgstr "salta l'applicazione del filtro checkout sparse" #: builtin/read-tree.c:153 msgid "debug unpack-trees" -msgstr "" +msgstr "esegui il debug di unpack-trees" -#: builtin/rebase.c:30 -#, fuzzy +#: builtin/read-tree.c:157 +msgid "suppress feedback messages" +msgstr "non visualizzare i messaggi di feedback" + +#: builtin/rebase.c:32 msgid "" "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] " "[<branch>]" msgstr "" -"git archive --remote <repository> [--exec <comando>] [<opzioni>] <albero> " -"[<percorso>...]" +"git rebase [-i] [options] [--exec <comando>] [--onto <nuova base>] " +"[<upstream>] [<branch>]" -#: builtin/rebase.c:32 +#: builtin/rebase.c:34 msgid "" "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]" msgstr "" +"git rebase [-i] [options] [--exec <comando>] [--onto <nuova base>] --root " +"[<branch>]" -#: builtin/rebase.c:34 -#, fuzzy +#: builtin/rebase.c:36 msgid "git rebase --continue | --abort | --skip | --edit-todo" -msgstr "prova \"git cherry-pick (--continue | --quit | -- abort)\"" +msgstr "git rebase --continue | --abort | --skip | --edit-todo" -#: builtin/rebase.c:121 builtin/rebase.c:1437 -#, fuzzy, c-format +#: builtin/rebase.c:158 builtin/rebase.c:182 builtin/rebase.c:209 +#, c-format +msgid "unusable todo list: '%s'" +msgstr "elenco todo inutilizzabile: '%s'" + +#: builtin/rebase.c:167 builtin/rebase.c:193 builtin/rebase.c:217 +#, c-format +msgid "could not write '%s'." +msgstr "impossibile scrivere '%s'." + +#: builtin/rebase.c:252 +msgid "no HEAD?" +msgstr "nessun'HEAD?" + +#: builtin/rebase.c:279 +#, c-format +msgid "could not create temporary %s" +msgstr "impossibile creare un %s temporaneo" + +#: builtin/rebase.c:285 +msgid "could not mark as interactive" +msgstr "impossibile contrassegnare come interattivo" + +#: builtin/rebase.c:343 +msgid "could not generate todo list" +msgstr "impossibile generare l'elenco todo" + +#: builtin/rebase.c:382 +msgid "a base commit must be provided with --upstream or --onto" +msgstr "" +"le opzioni --upstream o --onto richiedono che sia fornito un commit di base" + +#: builtin/rebase.c:437 +msgid "git rebase--interactive [<options>]" +msgstr "git rebase --interactive [<opzioni>]" + +#: builtin/rebase.c:449 +msgid "keep empty commits" +msgstr "mantieni i commit vuoti" + +#: builtin/rebase.c:451 builtin/revert.c:127 +msgid "allow commits with empty messages" +msgstr "consenti commit con messaggi vuoti" + +#: builtin/rebase.c:452 +msgid "rebase merge commits" +msgstr "esegui il rebase dei commit di merge" + +#: builtin/rebase.c:454 +msgid "keep original branch points of cousins" +msgstr "mantieni i punti di branch originali dei cugini" + +#: builtin/rebase.c:456 +msgid "move commits that begin with squash!/fixup!" +msgstr "sposta i commit che iniziano con squash!/fixup!" + +#: builtin/rebase.c:457 +msgid "sign commits" +msgstr "firma i commit" + +#: builtin/rebase.c:459 builtin/rebase.c:1397 +msgid "display a diffstat of what changed upstream" +msgstr "visualizza un diffstat delle modifiche upstream" + +#: builtin/rebase.c:461 +msgid "continue rebase" +msgstr "continua il rebase" + +#: builtin/rebase.c:463 +msgid "skip commit" +msgstr "salta il commit" + +#: builtin/rebase.c:464 +msgid "edit the todo list" +msgstr "modifica l'elenco todo" + +#: builtin/rebase.c:466 +msgid "show the current patch" +msgstr "visualizza la patch corrente" + +#: builtin/rebase.c:469 +msgid "shorten commit ids in the todo list" +msgstr "abbrevia gli ID dei commit nell'elenco todo" + +#: builtin/rebase.c:471 +msgid "expand commit ids in the todo list" +msgstr "espandi gli ID dei commit nell'elenco todo" + +#: builtin/rebase.c:473 +msgid "check the todo list" +msgstr "controlla l'elenco todo" + +#: builtin/rebase.c:475 +msgid "rearrange fixup/squash lines" +msgstr "ridisponi le righe fixup/squash" + +#: builtin/rebase.c:477 +msgid "insert exec commands in todo list" +msgstr "inserisci i comandi exec nell'elenco todo" + +#: builtin/rebase.c:478 +msgid "onto" +msgstr "su" + +#: builtin/rebase.c:481 +msgid "restrict-revision" +msgstr "revisioni-limite" + +#: builtin/rebase.c:481 +msgid "restrict revision" +msgstr "limita la revisione" + +#: builtin/rebase.c:483 +msgid "squash-onto" +msgstr "squash-su" + +#: builtin/rebase.c:484 +msgid "squash onto" +msgstr "esegui lo squash su" + +#: builtin/rebase.c:486 +msgid "the upstream commit" +msgstr "il commit upstream" + +#: builtin/rebase.c:488 +msgid "head-name" +msgstr "nome head" + +#: builtin/rebase.c:488 +msgid "head name" +msgstr "nome head" + +#: builtin/rebase.c:493 +msgid "rebase strategy" +msgstr "strategia di rebase" + +#: builtin/rebase.c:494 +msgid "strategy-opts" +msgstr "opzioni strategia" + +#: builtin/rebase.c:495 +msgid "strategy options" +msgstr "opzioni strategia" + +#: builtin/rebase.c:496 +msgid "switch-to" +msgstr "passa a" + +#: builtin/rebase.c:497 +msgid "the branch or commit to checkout" +msgstr "il branch o il commit di cui eseguire il checkout" + +#: builtin/rebase.c:498 +msgid "onto-name" +msgstr "nome" + +#: builtin/rebase.c:498 +msgid "onto name" +msgstr "sul nome" + +#: builtin/rebase.c:499 +msgid "cmd" +msgstr "comando" + +#: builtin/rebase.c:499 +msgid "the command to run" +msgstr "il comando da eseguire" + +#: builtin/rebase.c:502 builtin/rebase.c:1480 +msgid "automatically re-schedule any `exec` that fails" +msgstr "schedula nuovamente le operazioni `exec` non riuscite automaticamente" + +#: builtin/rebase.c:518 +msgid "--[no-]rebase-cousins has no effect without --rebase-merges" +msgstr "--[no-]rebase-cousins non ha effetto senza --rebase-merges" + +#: builtin/rebase.c:534 builtin/rebase.c:1787 +#, c-format msgid "%s requires an interactive rebase" -msgstr "add interattivo non riuscito" +msgstr "%s richiede un rebase interattivo" -#: builtin/rebase.c:173 -#, fuzzy, c-format +#: builtin/rebase.c:586 +#, c-format msgid "could not get 'onto': '%s'" -msgstr "impossibile impostare '%s' a '%s'" +msgstr "impossibile ottenere 'onto': '%s'" -#: builtin/rebase.c:188 -#, fuzzy, c-format +#: builtin/rebase.c:601 +#, c-format msgid "invalid orig-head: '%s'" -msgstr "%s non valido: '%s'" +msgstr "orig-head non valida: '%s'" -#: builtin/rebase.c:213 +#: builtin/rebase.c:626 #, c-format msgid "ignoring invalid allow_rerere_autoupdate: '%s'" -msgstr "" +msgstr "ignoro il valore non valido per allow_rerere_autoupdate: '%s'" -#: builtin/rebase.c:289 -#, fuzzy, c-format +#: builtin/rebase.c:702 +#, c-format msgid "Could not read '%s'" -msgstr "non è stato possibile leggere '%s'" +msgstr "Impossibile leggere '%s'" -#: builtin/rebase.c:307 -#, fuzzy, c-format +#: builtin/rebase.c:720 +#, c-format msgid "Cannot store %s" -msgstr "impossibile eseguire lo stat di '%s'" +msgstr "Impossibile memorizzare %s" -#: builtin/rebase.c:402 -#, fuzzy +#: builtin/rebase.c:817 msgid "could not determine HEAD revision" -msgstr "non è stato possibile analizzare il commit HEAD" +msgstr "impossibile determinare la revisione HEAD" -#: builtin/rebase.c:522 +#: builtin/rebase.c:940 msgid "" "Resolve all conflicts manually, mark them as resolved with\n" "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n" @@ -15988,8 +17102,15 @@ msgid "" "To abort and get back to the state before \"git rebase\", run \"git rebase --" "abort\"." msgstr "" +"Risolvi manualmente tutti i conflitti, contrassegnali come\n" +"risolti con \"git add/rm <file in conflitto>\", quindi esegui\n" +"\"git rebase --continue\".\n" +"In alternativa, puoi saltare questo commit: esegui \"git rebase\n" +"--skip\".\n" +"Per interrompere l'operazione e tornare allo stato precedente\n" +"il \"git rebase\", esegui \"git rebase --abort\"." -#: builtin/rebase.c:603 +#: builtin/rebase.c:1021 #, c-format msgid "" "\n" @@ -16000,8 +17121,15 @@ msgid "" "\n" "As a result, git cannot rebase them." msgstr "" +"\n" +"Git ha riscontrato un errore durante la preparazione delle patch\n" +"per applicare nuovamente queste revisioni:\n" +"\n" +" %s\n" +"\n" +"Di conseguenza, Git non può eseguirne il rebase." -#: builtin/rebase.c:948 +#: builtin/rebase.c:1313 #, c-format msgid "" "%s\n" @@ -16011,205 +17139,205 @@ msgid "" " git rebase '<branch>'\n" "\n" msgstr "" +"%s\n" +"Specifica il branch su cui effettuare il rebase.\n" +"Vedi git-rebase(1) per i dettagli.\n" +"\n" +" git rebase '<branch>'\n" +"\n" -#: builtin/rebase.c:964 -#, fuzzy, c-format +#: builtin/rebase.c:1329 +#, c-format msgid "" "If you wish to set tracking information for this branch you can do so with:\n" "\n" " git branch --set-upstream-to=%s/<branch> %s\n" "\n" msgstr "" -"Se si vuole mantenerle creando un nuovo branch, questo potrebbe essere\n" -"un buon momento per farlo con:\n" +"Se vuoi impostare le informazioni di tracciamento per questo branch puoi " +"farlo con:\n" "\n" -" git branch nuovo_nome_branch %s\n" +" git branch --set-upstream-to=%s/<branch> %s\n" "\n" -#: builtin/rebase.c:994 +#: builtin/rebase.c:1359 msgid "exec commands cannot contain newlines" -msgstr "" +msgstr "i comandi exec non possono contenere caratteri di fine riga" -#: builtin/rebase.c:998 +#: builtin/rebase.c:1363 msgid "empty exec command" -msgstr "" +msgstr "comando exec vuoto" -#: builtin/rebase.c:1040 -#, fuzzy +#: builtin/rebase.c:1390 msgid "rebase onto given branch instead of upstream" -msgstr "Non imposto il branch %s come upstream di sé stesso." +msgstr "esegui il rebase sul branch specificato anziché su quello upstream" -#: builtin/rebase.c:1042 +#: builtin/rebase.c:1392 msgid "allow pre-rebase hook to run" -msgstr "" +msgstr "consenti l'esecuzione dell'hook pre-rebase" -#: builtin/rebase.c:1044 +#: builtin/rebase.c:1394 msgid "be quiet. implies --no-stat" -msgstr "" - -#: builtin/rebase.c:1047 -msgid "display a diffstat of what changed upstream" -msgstr "" +msgstr "sii silenzioso. implica --no-stat" -#: builtin/rebase.c:1050 +#: builtin/rebase.c:1400 msgid "do not show diffstat of what changed upstream" -msgstr "" +msgstr "non visualizzare un diffstat delle modifiche upstream" -#: builtin/rebase.c:1053 +#: builtin/rebase.c:1403 msgid "add a Signed-off-by: line to each commit" -msgstr "" +msgstr "aggiungi una riga Signed-off-by: a ogni commit" -#: builtin/rebase.c:1055 builtin/rebase.c:1059 builtin/rebase.c:1061 +#: builtin/rebase.c:1405 builtin/rebase.c:1409 builtin/rebase.c:1411 msgid "passed to 'git am'" -msgstr "" +msgstr "passato a 'git am'" -#: builtin/rebase.c:1063 builtin/rebase.c:1065 +#: builtin/rebase.c:1413 builtin/rebase.c:1415 msgid "passed to 'git apply'" -msgstr "" +msgstr "passato a 'git apply'" -#: builtin/rebase.c:1067 builtin/rebase.c:1070 +#: builtin/rebase.c:1417 builtin/rebase.c:1420 msgid "cherry-pick all commits, even if unchanged" -msgstr "" +msgstr "esegui il cherry-pick di tutti i commit, anche se non modificati" -#: builtin/rebase.c:1072 +#: builtin/rebase.c:1422 msgid "continue" -msgstr "" +msgstr "continua" -#: builtin/rebase.c:1075 -#, fuzzy +#: builtin/rebase.c:1425 msgid "skip current patch and continue" -msgstr "Impossibile salvare lo stato attuale" +msgstr "salta la patch corrente e continua" -#: builtin/rebase.c:1077 +#: builtin/rebase.c:1427 msgid "abort and check out the original branch" -msgstr "" +msgstr "interrompi ed esegui il checkout del branch originario" -#: builtin/rebase.c:1080 +#: builtin/rebase.c:1430 msgid "abort but keep HEAD where it is" -msgstr "" +msgstr "interrompi ma mantieni l'HEAD dov'è" -#: builtin/rebase.c:1081 +#: builtin/rebase.c:1431 msgid "edit the todo list during an interactive rebase" -msgstr "" +msgstr "modifica l'elenco todo durante un rebase interattivo" -#: builtin/rebase.c:1084 -#, fuzzy +#: builtin/rebase.c:1434 msgid "show the patch file being applied or merged" -msgstr "Nessuna modifica -- patch già applicata." +msgstr "" +"visualizza il file patch che sta per essere applicato o sottoposto a merge" -#: builtin/rebase.c:1087 -#, fuzzy +#: builtin/rebase.c:1437 msgid "use merging strategies to rebase" -msgstr "Tentativo con la strategia di merge %s...\n" +msgstr "usa le strategie di merge per eseguire il rebase" -#: builtin/rebase.c:1091 +#: builtin/rebase.c:1441 msgid "let the user edit the list of commits to rebase" msgstr "" +"consenti all'utente di modificare l'elenco dei commit di cui eseguire il " +"rebase" -#: builtin/rebase.c:1095 -msgid "try to recreate merges instead of ignoring them" -msgstr "" - -#: builtin/rebase.c:1099 -msgid "allow rerere to update index with resolved conflict" -msgstr "" +#: builtin/rebase.c:1445 +msgid "(DEPRECATED) try to recreate merges instead of ignoring them" +msgstr "(DEPRECATO) prova a ricreare i merge anziché ignorarli" -#: builtin/rebase.c:1102 -#, fuzzy +#: builtin/rebase.c:1449 msgid "preserve empty commits during rebase" -msgstr "Impossibile eseguire il revert come commit iniziale" +msgstr "mantieni i commit vuoti durante il rebase" -#: builtin/rebase.c:1104 +#: builtin/rebase.c:1451 msgid "move commits that begin with squash!/fixup! under -i" -msgstr "" +msgstr "sposta i commit che iniziano con squash!/fixup! in -i" -#: builtin/rebase.c:1110 +#: builtin/rebase.c:1457 msgid "automatically stash/stash pop before and after" -msgstr "" +msgstr "esegui stash/stash pop automaticamente prima e dopo" -#: builtin/rebase.c:1112 +#: builtin/rebase.c:1459 msgid "add exec lines after each commit of the editable list" -msgstr "" +msgstr "aggiungi righe exec dopo ogni commit della lista modificabile" -#: builtin/rebase.c:1116 -#, fuzzy +#: builtin/rebase.c:1463 msgid "allow rebasing commits with empty messages" -msgstr "il commit ha un messaggio vuoto" +msgstr "consenti il rebase di commit con messaggi vuoti" -#: builtin/rebase.c:1119 +#: builtin/rebase.c:1466 msgid "try to rebase merges instead of skipping them" -msgstr "" +msgstr "prova ad eseguire il rebase dei merge anziché saltarli" -#: builtin/rebase.c:1122 +#: builtin/rebase.c:1469 msgid "use 'merge-base --fork-point' to refine upstream" msgstr "" +"usa 'merge-base --fork-point' per ridefinire più precisamente l'upstream" -#: builtin/rebase.c:1124 -#, fuzzy +#: builtin/rebase.c:1471 msgid "use the given merge strategy" -msgstr "Tentativo con la strategia di merge %s...\n" +msgstr "usa la strategia di merge specificata" -#: builtin/rebase.c:1126 builtin/revert.c:112 -#, fuzzy +#: builtin/rebase.c:1473 builtin/revert.c:114 msgid "option" -msgstr "azione" +msgstr "opzione" -#: builtin/rebase.c:1127 +#: builtin/rebase.c:1474 msgid "pass the argument through to the merge strategy" -msgstr "" +msgstr "passa l'argomento alla strategia di merge" -#: builtin/rebase.c:1130 +#: builtin/rebase.c:1477 msgid "rebase all reachable commits up to the root(s)" -msgstr "" +msgstr "esegui il rebase di tutti i commit raggiungibili fino a quelli radice" -#: builtin/rebase.c:1133 builtin/rebase--interactive.c:198 -msgid "automatically re-schedule any `exec` that fails" +#: builtin/rebase.c:1498 +msgid "" +"the rebase.useBuiltin support has been removed!\n" +"See its entry in 'git help config' for details." msgstr "" +"il supporto per rebase.useBuiltin è stato rimosso!\n" +"Vedi la voce relativa in 'git help config' per i dettagli." -#: builtin/rebase.c:1149 -#, fuzzy, c-format -msgid "could not exec %s" -msgstr "impossibile analizzare %s" - -#: builtin/rebase.c:1167 git-legacy-rebase.sh:220 +#: builtin/rebase.c:1504 msgid "It looks like 'git am' is in progress. Cannot rebase." -msgstr "" +msgstr "Sembra che 'git am' sia in corso. Impossibile eseguire il rebase." -#: builtin/rebase.c:1208 git-legacy-rebase.sh:406 +#: builtin/rebase.c:1545 +msgid "" +"git rebase --preserve-merges is deprecated. Use --rebase-merges instead." +msgstr "git rebase --preserve-merges è deprecato. Usa --rebase-merges." + +#: builtin/rebase.c:1549 msgid "No rebase in progress?" -msgstr "" +msgstr "Nessun rebase in corso?" -#: builtin/rebase.c:1212 git-legacy-rebase.sh:417 +#: builtin/rebase.c:1553 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "" +"L'azione --edit-todo può essere usata solo durante un rebase interattivo." -#: builtin/rebase.c:1226 git-legacy-rebase.sh:424 -#, fuzzy +#: builtin/rebase.c:1576 msgid "Cannot read HEAD" -msgstr "impossibile risolvere HEAD" +msgstr "Impossibile leggere l'HEAD" -#: builtin/rebase.c:1238 git-legacy-rebase.sh:427 +#: builtin/rebase.c:1588 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" msgstr "" +"Devi modificare tutti i conflitti di merge e\n" +"quindi contrassegnarli come risolti usando\n" +"git add" -#: builtin/rebase.c:1257 -#, fuzzy +#: builtin/rebase.c:1607 msgid "could not discard worktree changes" -msgstr "non è stato possibile leggere il messaggio di commit: %s" +msgstr "impossibile scartare le modifiche all'albero di lavoro" -#: builtin/rebase.c:1276 -#, fuzzy, c-format +#: builtin/rebase.c:1626 +#, c-format msgid "could not move back to %s" -msgstr "Non è stato possibile rimuovere il branch %s" +msgstr "impossibile ritornare a %s" -#: builtin/rebase.c:1287 builtin/rm.c:369 -#, fuzzy, c-format +#: builtin/rebase.c:1637 builtin/rm.c:369 +#, c-format msgid "could not remove '%s'" -msgstr "non è stato possibile leggere '%s'" +msgstr "impossibile rimuovere '%s'" -#: builtin/rebase.c:1313 +#: builtin/rebase.c:1663 #, c-format msgid "" "It seems that there is already a %s directory, and\n" @@ -16221,359 +17349,180 @@ msgid "" "and run me again. I am stopping in case you still have something\n" "valuable there.\n" msgstr "" +"Sembra che esista già una directory %s e mi domando\n" +"se tu sia già nel bel mezzo di un altro rebase. Se questo è il caso,\n" +"prova con il comando\n" +"\t%s\n" +"Se questo non è il caso, esegui\n" +"\t%s\n" +"ed eseguimi di nuovo. Mi fermo nel caso in cui tu abbia ancora\n" +"salvato qualcosa di importante lì.\n" -#: builtin/rebase.c:1334 -#, fuzzy +#: builtin/rebase.c:1684 msgid "switch `C' expects a numerical value" -msgstr "switch '%c' richiede un valore numerico" +msgstr "l'opzione `C` richiede un valore numerico" -#: builtin/rebase.c:1375 -#, fuzzy, c-format +#: builtin/rebase.c:1725 +#, c-format msgid "Unknown mode: %s" -msgstr "sconosciuto: %s" +msgstr "Modo sconosciuto: %s" -#: builtin/rebase.c:1397 +#: builtin/rebase.c:1747 msgid "--strategy requires --merge or --interactive" -msgstr "" +msgstr "--strategy richiede --merge o --interactive" -#: builtin/rebase.c:1446 +#: builtin/rebase.c:1796 msgid "cannot combine am options with either interactive or merge options" -msgstr "" +msgstr "non è possibile combinare le opzioni am con quelle interactive o merge" -#: builtin/rebase.c:1465 -#, fuzzy +#: builtin/rebase.c:1815 msgid "cannot combine '--preserve-merges' with '--rebase-merges'" -msgstr "Impossibile combinare --no-ff con --ff-only." +msgstr "impossibile combinare '--preserve-merges' con '--rebase-merges'" -#: builtin/rebase.c:1469 git-legacy-rebase.sh:544 -#, fuzzy +#: builtin/rebase.c:1819 msgid "" "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'" -msgstr "Impossibile combinare --no-ff con --ff-only." +msgstr "" +"errore: impossibile combinare '--preserve-merges' con '--reschedule-failed-" +"exec'" -#: builtin/rebase.c:1475 -#, fuzzy +#: builtin/rebase.c:1825 msgid "cannot combine '--rebase-merges' with '--strategy-option'" -msgstr "Impossibile combinare --no-ff con --ff-only." +msgstr "impossibile combinare '--rebase-merges' con '--strategy-option'" -#: builtin/rebase.c:1478 -#, fuzzy +#: builtin/rebase.c:1828 msgid "cannot combine '--rebase-merges' with '--strategy'" -msgstr "Impossibile combinare --no-ff con --ff-only." +msgstr "impossibile combinare '--rebase-merges' con '--strategy'" -#: builtin/rebase.c:1502 -#, fuzzy, c-format +#: builtin/rebase.c:1852 +#, c-format msgid "invalid upstream '%s'" -msgstr "percorso non valido: %s" +msgstr "upstream non valido: '%s'" -#: builtin/rebase.c:1508 -#, fuzzy +#: builtin/rebase.c:1858 msgid "Could not create new root commit" -msgstr "non è stato possibile analizzare il commit appena creato" +msgstr "Impossibile creare il nuovo commit radice" -#: builtin/rebase.c:1526 -#, fuzzy, c-format +#: builtin/rebase.c:1876 +#, c-format msgid "'%s': need exactly one merge base" -msgstr "Non è stato possibile trovare la strategia di merge '%s'.\n" +msgstr "'%s': è necessario specificare esattamente una base per il merge" -#: builtin/rebase.c:1533 -#, fuzzy, c-format +#: builtin/rebase.c:1883 +#, c-format msgid "Does not point to a valid commit '%s'" -msgstr "'%s' non punta ad un commit" +msgstr "'%s' non punta a un commit valido" -#: builtin/rebase.c:1558 -#, fuzzy, c-format +#: builtin/rebase.c:1908 +#, c-format msgid "fatal: no such branch/commit '%s'" -msgstr "Nessun branch esistente: '%s'" +msgstr "errore fatale: branch/commit '%s' inesistente" -#: builtin/rebase.c:1566 builtin/submodule--helper.c:38 -#: builtin/submodule--helper.c:1934 -#, fuzzy, c-format +#: builtin/rebase.c:1916 builtin/submodule--helper.c:38 +#: builtin/submodule--helper.c:1933 +#, c-format msgid "No such ref: %s" -msgstr "Remote non esistente: %s" +msgstr "Riferimento non esistente: %s" -#: builtin/rebase.c:1578 -#, fuzzy +#: builtin/rebase.c:1927 msgid "Could not resolve HEAD to a revision" -msgstr "Non è stato possibile risolvere il commit HEAD\n" +msgstr "Impossibile risolvere HEAD come revisione" -#: builtin/rebase.c:1619 git-legacy-rebase.sh:673 -#, fuzzy +#: builtin/rebase.c:1968 msgid "Cannot autostash" -msgstr "Impossibile inizializzare stash" +msgstr "Impossibile eseguire lo stash automatico" -#: builtin/rebase.c:1622 -#, fuzzy, c-format +#: builtin/rebase.c:1971 +#, c-format msgid "Unexpected stash response: '%s'" -msgstr "fine del file inattesa" +msgstr "Risposta stash non attesa: '%s'" -#: builtin/rebase.c:1628 -#, fuzzy, c-format +#: builtin/rebase.c:1977 +#, c-format msgid "Could not create directory for '%s'" -msgstr "Non è stato possibile creare la directory '%s'" +msgstr "Impossibile creare la directory '%s'" -#: builtin/rebase.c:1631 -#, fuzzy, c-format +#: builtin/rebase.c:1980 +#, c-format msgid "Created autostash: %s\n" -msgstr "Impossibile inizializzare stash" +msgstr "Stash automatico creato: %s\n" -#: builtin/rebase.c:1634 -#, fuzzy +#: builtin/rebase.c:1983 msgid "could not reset --hard" -msgstr "Non è stato possibile leggere index" +msgstr "impossibile eseguire reset --hard" -#: builtin/rebase.c:1635 builtin/reset.c:114 +#: builtin/rebase.c:1984 builtin/reset.c:114 #, c-format msgid "HEAD is now at %s" msgstr "HEAD ora si trova a %s" -#: builtin/rebase.c:1651 git-legacy-rebase.sh:682 +#: builtin/rebase.c:2000 msgid "Please commit or stash them." -msgstr "" +msgstr "Eseguine il commit o lo stash." -#: builtin/rebase.c:1678 -#, fuzzy, c-format +#: builtin/rebase.c:2027 +#, c-format msgid "could not parse '%s'" -msgstr "impossibile analizzare %s" +msgstr "impossibile analizzare '%s'" -#: builtin/rebase.c:1691 -#, fuzzy, c-format +#: builtin/rebase.c:2040 +#, c-format msgid "could not switch to %s" -msgstr "Non è stato possibile scrivere su '%s'" +msgstr "impossibile passare a %s" -#: builtin/rebase.c:1702 git-legacy-rebase.sh:705 -#, fuzzy, sh-format +#: builtin/rebase.c:2051 msgid "HEAD is up to date." -msgstr "HEAD si trova ora a" +msgstr "HEAD è aggiornato." -#: builtin/rebase.c:1704 -#, fuzzy, c-format +#: builtin/rebase.c:2053 +#, c-format msgid "Current branch %s is up to date.\n" -msgstr "Il tuo branch è avanti rispetto a '%s' di %d commit.\n" +msgstr "Il branch corrente %s è aggiornato.\n" -#: builtin/rebase.c:1712 git-legacy-rebase.sh:715 -#, sh-format +#: builtin/rebase.c:2061 msgid "HEAD is up to date, rebase forced." -msgstr "" +msgstr "HEAD è aggiornato, forzo il rebase." -#: builtin/rebase.c:1714 -#, fuzzy, c-format +#: builtin/rebase.c:2063 +#, c-format msgid "Current branch %s is up to date, rebase forced.\n" -msgstr "Il tuo branch è avanti rispetto a '%s' di %d commit.\n" +msgstr "Il branch corrente %s è aggiornato, forzo il rebase.\n" -#: builtin/rebase.c:1722 git-legacy-rebase.sh:215 +#: builtin/rebase.c:2071 msgid "The pre-rebase hook refused to rebase." -msgstr "" +msgstr "L'hook pre-rebase ha rifiutato di consentire il rebase." -#: builtin/rebase.c:1729 -#, fuzzy, c-format +#: builtin/rebase.c:2078 +#, c-format msgid "Changes to %s:\n" -msgstr "Rinominazione di %s in %s in corso\n" +msgstr "Modifiche a %s:\n" -#: builtin/rebase.c:1732 -#, fuzzy, c-format +#: builtin/rebase.c:2081 +#, c-format msgid "Changes from %s to %s:\n" -msgstr "Rinominazione di %s in %s in corso\n" +msgstr "Modifiche da %s a %s:\n" -#: builtin/rebase.c:1757 +#: builtin/rebase.c:2106 #, c-format msgid "First, rewinding head to replay your work on top of it...\n" msgstr "" +"Per prima cosa, ripristino l'head per riapplicare le tue modifiche su di " +"esso...\n" -#: builtin/rebase.c:1765 -#, fuzzy +#: builtin/rebase.c:2115 msgid "Could not detach HEAD" -msgstr "non è stato possibile analizzare il commit HEAD" +msgstr "Impossibile scollegare l'HEAD" -#: builtin/rebase.c:1774 -#, fuzzy, c-format +#: builtin/rebase.c:2124 +#, c-format msgid "Fast-forwarded %s to %s.\n" -msgstr "Eseguo il fast forward del sottomodulo %s" - -#: builtin/rebase--interactive.c:25 -msgid "no HEAD?" -msgstr "" - -#: builtin/rebase--interactive.c:52 -#, fuzzy, c-format -msgid "could not create temporary %s" -msgstr "non è stato possibile creare il file del repository '%s'" - -#: builtin/rebase--interactive.c:58 -#, fuzzy -msgid "could not mark as interactive" -msgstr "Non è stato possibile leggere index" - -#: builtin/rebase--interactive.c:102 -#, fuzzy, c-format -msgid "could not open %s" -msgstr "impossibile aprire '%s'" - -#: builtin/rebase--interactive.c:115 -#, fuzzy -msgid "could not generate todo list" -msgstr "Non è stato possibile scrivere su %s" - -#: builtin/rebase--interactive.c:131 -#, fuzzy -msgid "git rebase--interactive [<options>]" -msgstr "git apply [opzioni] [<patch>...]" - -#: builtin/rebase--interactive.c:150 -#, fuzzy -msgid "keep empty commits" -msgstr "è stato passato un set di commit vuoto" - -#: builtin/rebase--interactive.c:152 builtin/revert.c:125 -#, fuzzy -msgid "allow commits with empty messages" -msgstr "il commit ha un messaggio vuoto" - -#: builtin/rebase--interactive.c:153 -msgid "rebase merge commits" -msgstr "" - -#: builtin/rebase--interactive.c:155 -msgid "keep original branch points of cousins" -msgstr "" - -#: builtin/rebase--interactive.c:157 -msgid "move commits that begin with squash!/fixup!" -msgstr "" - -#: builtin/rebase--interactive.c:158 -#, fuzzy -msgid "sign commits" -msgstr "nuovi commit, " - -#: builtin/rebase--interactive.c:160 -msgid "continue rebase" -msgstr "" - -#: builtin/rebase--interactive.c:162 -#, fuzzy -msgid "skip commit" -msgstr "nuovi commit, " - -#: builtin/rebase--interactive.c:163 -#, fuzzy -msgid "edit the todo list" -msgstr "Non è stato possibile scrivere su %s" - -#: builtin/rebase--interactive.c:165 -#, fuzzy -msgid "show the current patch" -msgstr "Impossibile salvare lo stato attuale" - -#: builtin/rebase--interactive.c:168 -msgid "shorten commit ids in the todo list" -msgstr "" - -#: builtin/rebase--interactive.c:170 -msgid "expand commit ids in the todo list" -msgstr "" - -#: builtin/rebase--interactive.c:172 -msgid "check the todo list" -msgstr "" - -#: builtin/rebase--interactive.c:174 -msgid "rearrange fixup/squash lines" -msgstr "" - -#: builtin/rebase--interactive.c:176 -msgid "insert exec commands in todo list" -msgstr "" - -#: builtin/rebase--interactive.c:177 -msgid "onto" -msgstr "" - -#: builtin/rebase--interactive.c:179 -msgid "restrict-revision" -msgstr "" - -#: builtin/rebase--interactive.c:179 -msgid "restrict revision" -msgstr "" - -#: builtin/rebase--interactive.c:180 -msgid "squash-onto" -msgstr "" - -#: builtin/rebase--interactive.c:181 -msgid "squash onto" -msgstr "" - -#: builtin/rebase--interactive.c:183 -msgid "the upstream commit" -msgstr "" - -#: builtin/rebase--interactive.c:184 -#, fuzzy -msgid "head-name" -msgstr "avanti " - -#: builtin/rebase--interactive.c:184 -#, fuzzy -msgid "head name" -msgstr "avanti " - -#: builtin/rebase--interactive.c:189 -#, fuzzy -msgid "rebase strategy" -msgstr "Tentativo con la strategia di merge %s...\n" - -#: builtin/rebase--interactive.c:190 -msgid "strategy-opts" -msgstr "" - -#: builtin/rebase--interactive.c:191 -#, fuzzy -msgid "strategy options" -msgstr "Tentativo con la strategia di merge %s...\n" - -#: builtin/rebase--interactive.c:192 -msgid "switch-to" -msgstr "" - -#: builtin/rebase--interactive.c:193 -msgid "the branch or commit to checkout" -msgstr "" - -#: builtin/rebase--interactive.c:194 -#, fuzzy -msgid "onto-name" -msgstr "* remote %s" - -#: builtin/rebase--interactive.c:194 -#, fuzzy -msgid "onto name" -msgstr "* remote %s" - -#: builtin/rebase--interactive.c:195 -#, fuzzy -msgid "cmd" -msgstr "comando" - -#: builtin/rebase--interactive.c:195 -#, fuzzy -msgid "the command to run" -msgstr "Nessun commit analizzato." - -#: builtin/rebase--interactive.c:224 -msgid "--[no-]rebase-cousins has no effect without --rebase-merges" -msgstr "" - -#: builtin/rebase--interactive.c:230 -msgid "a base commit must be provided with --upstream or --onto" -msgstr "" +msgstr "Fast-forward da %s a %s eseguito.\n" #: builtin/receive-pack.c:33 msgid "git receive-pack <git-dir>" -msgstr "" +msgstr "git receive-pack <directory Git>" -#: builtin/receive-pack.c:830 +#: builtin/receive-pack.c:833 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" @@ -16589,8 +17538,24 @@ msgid "" "To squelch this message and still keep the default behaviour, set\n" "'receive.denyCurrentBranch' configuration variable to 'refuse'." msgstr "" +"Per impostazione predefinita, l'aggiornamento del branch corrente\n" +"in un repository non spoglio è negato, perché renderebbe l'indice\n" +"e l'albero di lavoro inconsistenti con i dati di cui si è eseguito\n" +"il push e richiederebbe 'git reset --hard' per ripristinare la\n" +"corrispondenza dell'albero di lavoro con HEAD.\n" +"\n" +"Puoi impostare la variabile di configurazione\n" +"'receive.denyCurrentBranch' a 'ignore' o 'warn' nel repository\n" +"remoto per consentire il push nel branch corrente; ciò nonostante,\n" +"questo non è raccomandato a meno che tu non provveda ad aggiornare\n" +"il suo albero di lavoro in modo che corrisponda a ciò di cui hai\n" +"eseguito il push in qualche altro modo.\n" +"\n" +"Per non visualizzare più questo messaggio e mantenere comunque\n" +"il comportamento predefinito, imposta la variabile di\n" +"configurazione 'receive.denyCurrentBranch' a 'refuse'." -#: builtin/receive-pack.c:850 +#: builtin/receive-pack.c:853 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" @@ -16601,15 +17566,25 @@ msgid "" "\n" "To squelch this message, you can set it to 'refuse'." msgstr "" +"Per impostazione predefinita, l'eliminazione del branch corrente\n" +"è negata, perché il prossimo 'git clone' farebbe sì che non venga\n" +"eseguito il checkout di nessun file, causando confusione.\n" +"\n" +"Puoi impostare la variabile di configurazione\n" +"'receive.denyDeleteCurrent' a 'warn' o 'ignore' nel repository\n" +"remoto per consentire l'eliminazione del branch corrente, con o\n" +"senza un messaggio d'avviso.\n" +"\n" +"Per non visualizzare più questo messaggio, puoi impostarla a\n" +"'refuse'." -#: builtin/receive-pack.c:1929 +#: builtin/receive-pack.c:1940 msgid "quiet" -msgstr "" +msgstr "non visualizzare messaggi" -#: builtin/receive-pack.c:1943 -#, fuzzy +#: builtin/receive-pack.c:1954 msgid "You must specify a directory." -msgstr "Devi specificare un repository da clonare." +msgstr "Devi specificare una directory." #: builtin/reflog.c:17 msgid "" @@ -16617,134 +17592,141 @@ msgid "" "rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] " "<refs>..." msgstr "" +"git reflog expire [--expire=<tempo>] [--expire-unreachable=<tempo>] [--" +"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] " +"<riferimenti>..." #: builtin/reflog.c:22 msgid "" "git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] " "<refs>..." msgstr "" +"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] " +"<riferimenti>..." #: builtin/reflog.c:25 msgid "git reflog exists <ref>" -msgstr "" +msgstr "git reflog exists <riferimento>" #: builtin/reflog.c:567 builtin/reflog.c:572 -#, fuzzy, c-format +#, c-format msgid "'%s' is not a valid timestamp" -msgstr "'%s' non è un nome di remoto valido" +msgstr "'%s' non è un timestamp valido" #: builtin/reflog.c:605 -#, fuzzy, c-format +#, c-format msgid "Marking reachable objects..." -msgstr "Non è stato possibile leggere l'oggetto %s" +msgstr "Contrassegno gli oggetti raggiungibili..." #: builtin/reflog.c:643 #, c-format msgid "%s points nowhere!" -msgstr "" +msgstr "%s non punta a niente!" #: builtin/reflog.c:695 -#, fuzzy msgid "no reflog specified to delete" -msgstr "nessun remote specificato" +msgstr "nessun registro riferimenti da eliminare specificato" #: builtin/reflog.c:704 -#, fuzzy, c-format +#, c-format msgid "not a reflog: %s" -msgstr "impossibile leggere '%s'" +msgstr "non è un registro riferimenti: %s" #: builtin/reflog.c:709 -#, fuzzy, c-format +#, c-format msgid "no reflog for '%s'" -msgstr "impossibile analizzare il log di '%s'" +msgstr "log riferimenti non esistente per '%s'" #: builtin/reflog.c:755 -#, fuzzy, c-format +#, c-format msgid "invalid ref format: %s" -msgstr "formato data non valido: %s" +msgstr "formato riferimento non valido: %s" #: builtin/reflog.c:764 msgid "git reflog [ show | expire | delete | exists ]" -msgstr "" +msgstr "git reflog [ show | expire | delete | exists ]" #: builtin/remote.c:16 msgid "git remote [-v | --verbose]" -msgstr "" +msgstr "git remote [-v | --verbose]" #: builtin/remote.c:17 msgid "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <name> <url>" msgstr "" +"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" +"mirror=<fetch|push>] <nome> <URL>" #: builtin/remote.c:18 builtin/remote.c:38 msgid "git remote rename <old> <new>" -msgstr "" +msgstr "git remote rename <vecchio> <nuovo>" #: builtin/remote.c:19 builtin/remote.c:43 msgid "git remote remove <name>" -msgstr "" +msgstr "git remote remove <nome>" #: builtin/remote.c:20 builtin/remote.c:48 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" -msgstr "" +msgstr "git remote set-head <nome> (-a | --auto | -d | --delete | <branch>)" #: builtin/remote.c:21 msgid "git remote [-v | --verbose] show [-n] <name>" -msgstr "" +msgstr "git remote [-v | --verbose] show [-n] <nome>" #: builtin/remote.c:22 msgid "git remote prune [-n | --dry-run] <name>" -msgstr "" +msgstr "git remote prune [-n | --dry-run] <nome>" #: builtin/remote.c:23 msgid "" "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" msgstr "" +"git remote [-v | --verbose] update [-p | --prune] [(<gruppo> | <remoto>)...]" #: builtin/remote.c:24 msgid "git remote set-branches [--add] <name> <branch>..." -msgstr "" +msgstr "git remote set-branches [--add] <nome> <branch>..." #: builtin/remote.c:25 builtin/remote.c:74 msgid "git remote get-url [--push] [--all] <name>" -msgstr "" +msgstr "git remote get-url [--push] [--all] <nome>" #: builtin/remote.c:26 builtin/remote.c:79 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" -msgstr "" +msgstr "git remote set-url [--push] <nome> <nuovo URL> [<vecchio URL>]" #: builtin/remote.c:27 builtin/remote.c:80 msgid "git remote set-url --add <name> <newurl>" -msgstr "" +msgstr "git remote set-url --add <nome> <nuovo URL>" #: builtin/remote.c:28 builtin/remote.c:81 msgid "git remote set-url --delete <name> <url>" -msgstr "" +msgstr "git remote set-url --delete <nome> <URL>" #: builtin/remote.c:33 msgid "git remote add [<options>] <name> <url>" -msgstr "" +msgstr "git remote add [<opzioni>] <nome> <URL>" #: builtin/remote.c:53 msgid "git remote set-branches <name> <branch>..." -msgstr "" +msgstr "git remote set-branches <nome> <branch>..." #: builtin/remote.c:54 msgid "git remote set-branches --add <name> <branch>..." -msgstr "" +msgstr "git remote set-branches --add <nome> <branch>..." #: builtin/remote.c:59 msgid "git remote show [<options>] <name>" -msgstr "" +msgstr "git remote show [<opzioni>] <nome>" #: builtin/remote.c:64 msgid "git remote prune [<options>] <name>" -msgstr "" +msgstr "git remote prune [<opzioni>] <nome>" #: builtin/remote.c:69 msgid "git remote update [<options>] [<group> | <remote>]..." -msgstr "" +msgstr "git remote update [<opzioni>] [<gruppo> | <remoto>]..." #: builtin/remote.c:98 #, c-format @@ -16765,30 +17747,29 @@ msgid "unknown mirror argument: %s" msgstr "argomento di mirror sconosciuto: %s" #: builtin/remote.c:163 -#, fuzzy msgid "fetch the remote branches" -msgstr " Branch remoto:%s" +msgstr "recupera i branch remoti" #: builtin/remote.c:165 msgid "import all tags and associated objects when fetching" -msgstr "" +msgstr "importa tutti i tag e gli oggetti associati durante il recupero" #: builtin/remote.c:168 msgid "or do not fetch any tag at all (--no-tags)" -msgstr "" +msgstr "o non recuperare alcun tag (--no-tags)" #: builtin/remote.c:170 msgid "branch(es) to track" -msgstr "" +msgstr "branch da tracciare" #: builtin/remote.c:171 -#, fuzzy msgid "master branch" -msgstr " Branch remoto:%s" +msgstr "branch master" #: builtin/remote.c:173 msgid "set up remote as a mirror to push to or fetch from" msgstr "" +"imposta il remoto come mirror su cui eseguire push o da cui recuperare dati" #: builtin/remote.c:185 msgid "specifying a master branch makes no sense with --mirror" @@ -16797,6 +17778,8 @@ msgstr "specificare un branch master con --mirror non ha senso" #: builtin/remote.c:187 msgid "specifying branches to track makes sense only with fetch mirrors" msgstr "" +"specificare i branch da tracciare ha senso solo con i mirror da cui " +"recuperare dati" #: builtin/remote.c:194 builtin/remote.c:636 #, c-format @@ -16811,12 +17794,13 @@ msgstr "'%s' non è un nome di remoto valido" #: builtin/remote.c:238 #, c-format msgid "Could not setup master '%s'" -msgstr "Non è stato possibile configurare il master '%s'" +msgstr "Impossibile configurare il master '%s'" #: builtin/remote.c:344 #, c-format msgid "Could not get fetch map for refspec %s" msgstr "" +"Impossibile ottenere la mappa di recupero per lo specificatore riferimento %s" #: builtin/remote.c:443 builtin/remote.c:451 msgid "(matching)" @@ -16827,15 +17811,16 @@ msgid "(delete)" msgstr "(elimina)" #: builtin/remote.c:629 builtin/remote.c:765 builtin/remote.c:864 -#, fuzzy, c-format +#, c-format msgid "No such remote: '%s'" -msgstr "Remote '%s' non esistente" +msgstr "Remoto non esistente: '%s'" #: builtin/remote.c:646 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "" -"Non è stato possibile rinominare la sezione di configurazione da '%s' in '%s'" +"Non è stato possibile ridenominare la sezione di configurazione da '%s' in " +"'%s'" #: builtin/remote.c:666 #, c-format @@ -16844,6 +17829,9 @@ msgid "" "\t%s\n" "\tPlease update the configuration manually if necessary." msgstr "" +"Non aggiorno lo specificatore riferimento di recupero non predefinito\n" +"\t%s\n" +"\tAggiorna la configurazione manualmente se necessario." #: builtin/remote.c:702 #, c-format @@ -16865,54 +17853,55 @@ msgid_plural "" msgstr[0] "" "Nota: un branch al di fuori della gerarchia refs/remotes/ non è stato " "eliminato;\n" -"per eliminarlo, usare:" +"per eliminarlo, usa:" msgstr[1] "" "Nota: alcuni branch al di fuori della gerarchia refs/remotes/ non sono stati " "eliminati;\n" -"per eliminarli, usare:" +"per eliminarli, usa:" #: builtin/remote.c:816 #, c-format msgid "Could not remove config section '%s'" -msgstr "Non è stato possibile rimuovere la sezione di configurazione '%s'" +msgstr "Impossibile rimuovere la sezione di configurazione '%s'" #: builtin/remote.c:917 #, c-format msgid " new (next fetch will store in remotes/%s)" -msgstr "" +msgstr " nuovo (il prossimo fetch lo salverà in remotes/%s)" #: builtin/remote.c:920 msgid " tracked" -msgstr "" +msgstr " tracciato" #: builtin/remote.c:922 msgid " stale (use 'git remote prune' to remove)" -msgstr " vecchio (usare 'git remote prune' per rimuoverlo)" +msgstr " vecchio (usa 'git remote prune' per rimuoverlo)" #: builtin/remote.c:924 msgid " ???" -msgstr "???" +msgstr " ???" #: builtin/remote.c:965 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "" -"branch.%s.merge non valido; impossibile eseguire il rebase su > 1 branch" +"valore branch.%s.merge non valido; impossibile eseguire il rebase su più di " +"un branch" #: builtin/remote.c:974 #, c-format msgid "rebases interactively onto remote %s" -msgstr "" +msgstr "rebase interattivo sul remoto %s" #: builtin/remote.c:976 #, c-format msgid "rebases interactively (with merges) onto remote %s" -msgstr "" +msgstr "rebase interattivo (con merge) sul remoto %s" #: builtin/remote.c:979 #, c-format msgid "rebases onto remote %s" -msgstr "" +msgstr "rebase sul remoto %s" #: builtin/remote.c:983 #, c-format @@ -16925,9 +17914,9 @@ msgid "merges with remote %s" msgstr "merge con il remote %s" #: builtin/remote.c:989 -#, fuzzy, c-format +#, c-format msgid "%-*s and with remote %s\n" -msgstr " e con il remote" +msgstr "%-*s e con il remoto %s\n" #: builtin/remote.c:1032 msgid "create" @@ -16943,7 +17932,7 @@ msgstr "aggiornato" #: builtin/remote.c:1042 msgid "fast-forwardable" -msgstr "" +msgstr "fast-forward possibile" #: builtin/remote.c:1045 msgid "local out of date" @@ -16952,17 +17941,17 @@ msgstr "locale non aggiornato" #: builtin/remote.c:1052 #, c-format msgid " %-*s forces to %-*s (%s)" -msgstr "" +msgstr " %-*s esegue un aggiornamento forzato su %-*s (%s)" #: builtin/remote.c:1055 #, c-format msgid " %-*s pushes to %-*s (%s)" -msgstr "" +msgstr " %-*s esegue il push su %-*s (%s)" #: builtin/remote.c:1059 #, c-format msgid " %-*s forces to %s" -msgstr "" +msgstr " %-*s esegue un aggiornamento forzato su %s" #: builtin/remote.c:1062 #, c-format @@ -16971,17 +17960,17 @@ msgstr " %-*s esegue il push su %s" #: builtin/remote.c:1130 msgid "do not query remotes" -msgstr "" +msgstr "non interrogare i remoti" #: builtin/remote.c:1157 #, c-format msgid "* remote %s" -msgstr "* remote %s" +msgstr "* remoto %s" #: builtin/remote.c:1158 #, c-format msgid " Fetch URL: %s" -msgstr "" +msgstr " URL recupero: %s" #: builtin/remote.c:1159 builtin/remote.c:1175 builtin/remote.c:1314 msgid "(no URL)" @@ -16994,7 +17983,7 @@ msgstr "(nessun URL)" #: builtin/remote.c:1173 builtin/remote.c:1175 #, c-format msgid " Push URL: %s" -msgstr "" +msgstr " URL push: %s" #: builtin/remote.c:1177 builtin/remote.c:1179 builtin/remote.c:1181 #, c-format @@ -17003,12 +17992,11 @@ msgstr " branch HEAD: %s" #: builtin/remote.c:1177 msgid "(not queried)" -msgstr "" +msgstr "(non interrogato)" #: builtin/remote.c:1179 -#, fuzzy msgid "(unknown)" -msgstr "sconosciuto: %s" +msgstr "(sconosciuto)" #: builtin/remote.c:1183 #, c-format @@ -17026,7 +18014,7 @@ msgstr[1] " Branch remoti:%s" #: builtin/remote.c:1198 builtin/remote.c:1224 msgid " (status not queried)" -msgstr "" +msgstr " (stato non richiesto)" #: builtin/remote.c:1207 msgid " Local branch configured for 'git pull':" @@ -17036,7 +18024,7 @@ msgstr[1] " Branch locali configurati per 'git pull':" #: builtin/remote.c:1215 msgid " Local refs will be mirrored by 'git push'" -msgstr "" +msgstr " I riferimenti locali saranno copiati da 'git push'" #: builtin/remote.c:1221 #, c-format @@ -17047,11 +18035,11 @@ msgstr[1] " Ref locali configurati per 'git push'%s:" #: builtin/remote.c:1242 msgid "set refs/remotes/<name>/HEAD according to remote" -msgstr "" +msgstr "imposta refs/remotes/<nome>/HEAD in base al remoto" #: builtin/remote.c:1244 msgid "delete refs/remotes/<name>/HEAD" -msgstr "" +msgstr "elimina refs/remotes/<nome>/HEAD" #: builtin/remote.c:1259 msgid "Cannot determine remote HEAD" @@ -17059,7 +18047,7 @@ msgstr "Impossibile determinare l'HEAD remoto" #: builtin/remote.c:1261 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" -msgstr "" +msgstr "Branch HEAD remoti multipli. Scegline uno esplicitamente con:" #: builtin/remote.c:1271 #, c-format @@ -17079,17 +18067,17 @@ msgstr "Non è stato possibile configurare %s" #: builtin/remote.c:1299 #, c-format msgid " %s will become dangling!" -msgstr "" +msgstr " %s diventerà pendente!" #: builtin/remote.c:1300 #, c-format msgid " %s has become dangling!" -msgstr "" +msgstr " %s è diventato pendente!" #: builtin/remote.c:1310 #, c-format msgid "Pruning %s" -msgstr "" +msgstr "Eliminazione di %s in corso" #: builtin/remote.c:1311 #, c-format @@ -17099,16 +18087,16 @@ msgstr "URL: %s" #: builtin/remote.c:1327 #, c-format msgid " * [would prune] %s" -msgstr "" +msgstr " * [sarebbe eliminato] %s" #: builtin/remote.c:1330 #, c-format msgid " * [pruned] %s" -msgstr "" +msgstr " * [eliminato] %s" #: builtin/remote.c:1375 msgid "prune remotes after fetching" -msgstr "" +msgstr "elimina remoti dopo il fetch" #: builtin/remote.c:1438 builtin/remote.c:1492 builtin/remote.c:1560 #, c-format @@ -17116,9 +18104,8 @@ msgid "No such remote '%s'" msgstr "Remote '%s' non esistente" #: builtin/remote.c:1454 -#, fuzzy msgid "add branch" -msgstr "Sul branch " +msgstr "aggiungi branch" #: builtin/remote.c:1461 msgid "no remote specified" @@ -17126,29 +18113,28 @@ msgstr "nessun remote specificato" #: builtin/remote.c:1478 msgid "query push URLs rather than fetch URLs" -msgstr "" +msgstr "interroga gli URL per il push anziché gli URL per il fetch" #: builtin/remote.c:1480 msgid "return all URLs" -msgstr "" +msgstr "restituisci tutti gli URL" #: builtin/remote.c:1508 -#, fuzzy, c-format +#, c-format msgid "no URLs configured for remote '%s'" -msgstr "Nessun upstream configurato per il branch '%s'" +msgstr "nessun URL configurato per il remoto '%s'" #: builtin/remote.c:1534 msgid "manipulate push URLs" -msgstr "" +msgstr "manipola gli URL per il push" #: builtin/remote.c:1536 msgid "add URL" -msgstr "" +msgstr "aggiungi URL" #: builtin/remote.c:1538 -#, fuzzy msgid "delete URLs" -msgstr "elimina" +msgstr "elimina URL" #: builtin/remote.c:1545 msgid "--add --delete doesn't make sense" @@ -17157,7 +18143,7 @@ msgstr "--add --delete non ha senso" #: builtin/remote.c:1584 #, c-format msgid "Invalid old URL pattern: %s" -msgstr "" +msgstr "Pattern URL vecchio non valido: %s" #: builtin/remote.c:1592 #, c-format @@ -17166,11 +18152,12 @@ msgstr "Nessuna URL trovata: %s" #: builtin/remote.c:1594 msgid "Will not delete all non-push URLs" -msgstr "" +msgstr "Non eliminerò tutti gli URL non push" #: builtin/remote.c:1610 msgid "be verbose; must be placed before a subcommand" msgstr "" +"visualizza ulteriori dettagli; deve essere collocato prima di un sottocomando" #: builtin/remote.c:1641 #, c-format @@ -17179,121 +18166,129 @@ msgstr "Sottocomando sconosciuto: %s" #: builtin/repack.c:22 msgid "git repack [<options>]" -msgstr "" +msgstr "git repack [<opzioni>]" #: builtin/repack.c:27 msgid "" "Incremental repacks are incompatible with bitmap indexes. Use\n" "--no-write-bitmap-index or disable the pack.writebitmaps configuration." msgstr "" +"I repack incrementali non sono compatibili con gli indici bitmap.\n" +"Usa --no-write-bitmap-index o disabilita l'opzione di configurazione\n" +"pack.writebitmaps." #: builtin/repack.c:200 msgid "could not start pack-objects to repack promisor objects" msgstr "" +"impossibile avviare pack-objects per eseguire il repack degli oggetti " +"promettenti" -#: builtin/repack.c:239 builtin/repack.c:411 +#: builtin/repack.c:239 builtin/repack.c:414 msgid "repack: Expecting full hex object ID lines only from pack-objects." msgstr "" +"repack: Da pack-objects mi attendevo solo righe con gli ID completi " +"esadecimali degli oggetti." #: builtin/repack.c:256 msgid "could not finish pack-objects to repack promisor objects" msgstr "" +"impossibile portare a termine pack-objects per eseguire il repack degli " +"oggetti promettenti" #: builtin/repack.c:294 msgid "pack everything in a single pack" -msgstr "" +msgstr "esegui il pack di tutto in un singolo pack" #: builtin/repack.c:296 msgid "same as -a, and turn unreachable objects loose" -msgstr "" +msgstr "come -a e rendi sciolti gli oggetti non raggiungibili" #: builtin/repack.c:299 msgid "remove redundant packs, and run git-prune-packed" -msgstr "" +msgstr "rimuovi i pack ridondanti ed esegui git-prune-packed" #: builtin/repack.c:301 msgid "pass --no-reuse-delta to git-pack-objects" -msgstr "" +msgstr "fornisci l'opzione --no-reuse-delta a git-pack-objects" #: builtin/repack.c:303 msgid "pass --no-reuse-object to git-pack-objects" -msgstr "" +msgstr "fornisci l'opzione --no-reuse-object a git-pack-objects" #: builtin/repack.c:305 msgid "do not run git-update-server-info" -msgstr "" +msgstr "non eseguire git-update-server-info" #: builtin/repack.c:308 msgid "pass --local to git-pack-objects" -msgstr "" +msgstr "fornisci l'opzione --local a git-pack-objects" #: builtin/repack.c:310 msgid "write bitmap index" -msgstr "" +msgstr "scrivi l'indice bitmap" #: builtin/repack.c:312 msgid "pass --delta-islands to git-pack-objects" -msgstr "" +msgstr "fornisci l'opzione --delta-islands a git-pack-objects" #: builtin/repack.c:313 msgid "approxidate" -msgstr "" +msgstr "data approssimativa" #: builtin/repack.c:314 msgid "with -A, do not loosen objects older than this" -msgstr "" +msgstr "con -A, non rendere sciolti gli oggetti meno recenti di questa data" #: builtin/repack.c:316 msgid "with -a, repack unreachable objects" -msgstr "" +msgstr "con -a, esegui il repack degli oggetti non raggiungibili" #: builtin/repack.c:318 msgid "size of the window used for delta compression" -msgstr "" +msgstr "dimensione della finestra usata per la compressione delta" #: builtin/repack.c:319 builtin/repack.c:325 msgid "bytes" -msgstr "" +msgstr "byte" #: builtin/repack.c:320 msgid "same as the above, but limit memory size instead of entries count" msgstr "" +"come sopra, ma limita le dimensioni della memoria invece del numero di voci" #: builtin/repack.c:322 msgid "limits the maximum delta depth" -msgstr "" +msgstr "limita la profondità massima dei delta" #: builtin/repack.c:324 msgid "limits the maximum number of threads" -msgstr "" +msgstr "limita il numero massimo di thread" #: builtin/repack.c:326 msgid "maximum size of each packfile" -msgstr "" +msgstr "dimensione massima di ogni file pack" #: builtin/repack.c:328 msgid "repack objects in packs marked with .keep" -msgstr "" +msgstr "esegui il repack degli oggetti nei pack contrassegnati con .keep" #: builtin/repack.c:330 msgid "do not repack this pack" -msgstr "" +msgstr "non eseguire il repack di questo pack" #: builtin/repack.c:340 msgid "cannot delete packs in a precious-objects repo" -msgstr "" +msgstr "impossibile eliminare i pack in un repository 'oggetti preziosi'" #: builtin/repack.c:344 -#, fuzzy msgid "--keep-unreachable and -A are incompatible" -msgstr "--column e -n non sono compatibili" +msgstr "--keep-unreachable e -A non sono compatibili" -#: builtin/repack.c:420 -#, fuzzy +#: builtin/repack.c:423 msgid "Nothing new to pack." -msgstr "nulla da fare" +msgstr "Non ci sono oggetti nuovi di cui eseguire il pack." -#: builtin/repack.c:481 +#: builtin/repack.c:484 #, c-format msgid "" "WARNING: Some packs in use have been renamed by\n" @@ -17304,390 +18299,401 @@ msgid "" "WARNING: original names also failed.\n" "WARNING: Please rename them in %s manually:\n" msgstr "" +"AVVISO: Alcuni pack in uso sono stati ridenominati\n" +"AVVISO: aggiungendo il prefisso old- al loro nome\n" +"AVVISO: per consentirne la sostituzione con la\n" +"AVVISO: nuova versione del file. Ma l'operazione\n" +"AVVISO: non è riuscita e anche il tentativo di\n" +"AVVISO: ridenominarli con il loro nome originale\n" +"AVVISO: non è riuscito. Ridenominali manualmente\n" +"AVVISO: entro %s:\n" -#: builtin/repack.c:529 -#, fuzzy, c-format +#: builtin/repack.c:532 +#, c-format msgid "failed to remove '%s'" -msgstr "rimozione di %s non riuscita" +msgstr "eliminazione di '%s' non riuscita" #: builtin/replace.c:22 msgid "git replace [-f] <object> <replacement>" -msgstr "" +msgstr "git replace [-f] <oggetto> <oggetto sostitutivo>" #: builtin/replace.c:23 msgid "git replace [-f] --edit <object>" -msgstr "" +msgstr "git replace [-f] --edit <oggetto>" #: builtin/replace.c:24 msgid "git replace [-f] --graft <commit> [<parent>...]" -msgstr "" +msgstr "git replace [-f] --graft <commit> [<genitore>...]" #: builtin/replace.c:25 msgid "git replace [-f] --convert-graft-file" -msgstr "" +msgstr "git replace [-f] --convert-graft-file" #: builtin/replace.c:26 msgid "git replace -d <object>..." -msgstr "" +msgstr "git replace -d <oggetto>..." #: builtin/replace.c:27 msgid "git replace [--format=<format>] [-l [<pattern>]]" -msgstr "" - -#: builtin/replace.c:58 builtin/replace.c:203 builtin/replace.c:206 -#, fuzzy, c-format -msgid "failed to resolve '%s' as a valid ref" -msgstr "rimozione di %s non riuscita" +msgstr "git replace [--format=<formato>] [-l [<pattern>]]" -#: builtin/replace.c:86 +#: builtin/replace.c:90 #, c-format msgid "" "invalid replace format '%s'\n" "valid formats are 'short', 'medium' and 'long'" msgstr "" +"formato sostituzione non valido: '%s'\n" +"i formati validi sono 'short', 'medium' e 'long'" -#: builtin/replace.c:121 -#, fuzzy, c-format +#: builtin/replace.c:125 +#, c-format msgid "replace ref '%s' not found" -msgstr "branch '%s' non trovato." +msgstr "riferimento sostitutivo '%s' non trovato" -#: builtin/replace.c:137 +#: builtin/replace.c:141 #, c-format msgid "Deleted replace ref '%s'" -msgstr "" +msgstr "Eliminato riferimento sostitutivo '%s'" -#: builtin/replace.c:149 -#, fuzzy, c-format +#: builtin/replace.c:153 +#, c-format msgid "'%s' is not a valid ref name" -msgstr "'%s' non è un nome di remoto valido" +msgstr "'%s' non è un nome riferimento valido" -#: builtin/replace.c:154 -#, fuzzy, c-format +#: builtin/replace.c:158 +#, c-format msgid "replace ref '%s' already exists" -msgstr "il tag '%s' esiste già" +msgstr "il riferimento sostitutivo '%s' esiste già" -#: builtin/replace.c:174 +#: builtin/replace.c:178 #, c-format msgid "" "Objects must be of the same type.\n" "'%s' points to a replaced object of type '%s'\n" "while '%s' points to a replacement object of type '%s'." msgstr "" +"Gli oggetti devono essere dello stesso tipo.\n" +"'%s' punta a un oggetto sostituito di tipo '%s'\n" +"mentre '%s' punta a un oggetto sostitutivo di tipo '%s'." -#: builtin/replace.c:225 -#, fuzzy, c-format +#: builtin/replace.c:229 +#, c-format msgid "unable to open %s for writing" -msgstr "Non è stato possibile aprire '%s' per la scrittura" +msgstr "impossibile aprire '%s' in scrittura" -#: builtin/replace.c:238 +#: builtin/replace.c:242 msgid "cat-file reported failure" -msgstr "" +msgstr "cat-file ha segnalato un errore" -#: builtin/replace.c:254 -#, fuzzy, c-format +#: builtin/replace.c:258 +#, c-format msgid "unable to open %s for reading" -msgstr "impossibile aprire o leggere %s" +msgstr "impossibile aprire %s in lettura" -#: builtin/replace.c:268 -#, fuzzy +#: builtin/replace.c:272 msgid "unable to spawn mktree" -msgstr "impossibile leggere il tree (%s)" +msgstr "impossibile lanciare mktree" -#: builtin/replace.c:272 -#, fuzzy +#: builtin/replace.c:276 msgid "unable to read from mktree" -msgstr "impossibile leggere il tree (%s)" +msgstr "impossibile leggere da mktree" -#: builtin/replace.c:281 -#, fuzzy +#: builtin/replace.c:285 msgid "mktree reported failure" -msgstr "revert non riuscito" +msgstr "mktree ha segnalato un errore" -#: builtin/replace.c:285 +#: builtin/replace.c:289 msgid "mktree did not return an object name" -msgstr "" +msgstr "mktree non ha restituito un nome oggetto" -#: builtin/replace.c:294 -#, fuzzy, c-format +#: builtin/replace.c:298 +#, c-format msgid "unable to fstat %s" -msgstr "non è possibile scrivere %s" +msgstr "impossibile eseguire fstat su %s" -#: builtin/replace.c:299 -#, fuzzy +#: builtin/replace.c:303 msgid "unable to write object to database" -msgstr "impossibile scrivere l'oggetto nota" +msgstr "impossibile scrivere l'oggetto nel database" -#: builtin/replace.c:318 builtin/replace.c:371 builtin/replace.c:415 -#: builtin/replace.c:445 -#, fuzzy, c-format +#: builtin/replace.c:322 builtin/replace.c:377 builtin/replace.c:422 +#: builtin/replace.c:452 +#, c-format msgid "not a valid object name: '%s'" -msgstr "Non è il nome di un oggetto valido %s" +msgstr "nome oggetto non valido: '%s'" -#: builtin/replace.c:322 -#, fuzzy, c-format +#: builtin/replace.c:326 +#, c-format msgid "unable to get object type for %s" -msgstr "impossibile aggiungere la voce della cache per %s" +msgstr "impossibile recuperare il tipo dell'oggetto %s" -#: builtin/replace.c:338 -#, fuzzy +#: builtin/replace.c:342 msgid "editing object file failed" -msgstr "aggiornamento dei file non riuscito" +msgstr "modifica del file oggetto non riuscita" -#: builtin/replace.c:347 +#: builtin/replace.c:351 #, c-format msgid "new object is the same as the old one: '%s'" -msgstr "" +msgstr "il nuovo oggetto è lo stesso di quello vecchio: '%s'" -#: builtin/replace.c:407 -#, fuzzy, c-format +#: builtin/replace.c:383 +#, c-format +msgid "could not parse %s as a commit" +msgstr "impossibile analizzare %s come commit" + +#: builtin/replace.c:414 +#, c-format msgid "bad mergetag in commit '%s'" -msgstr "repository '%s' errato" +msgstr "tag merge non valido nel commit '%s'" -#: builtin/replace.c:409 -#, fuzzy, c-format +#: builtin/replace.c:416 +#, c-format msgid "malformed mergetag in commit '%s'" -msgstr "nome oggetto '%s' malformato" +msgstr "tag merge malformato nel commit '%s'" -#: builtin/replace.c:421 +#: builtin/replace.c:428 #, c-format msgid "" "original commit '%s' contains mergetag '%s' that is discarded; use --edit " "instead of --graft" msgstr "" +"il commit originario '%s' contiene il tag merge '%s' che è stato scartato; " +"usa --edit anziché --graft" -#: builtin/replace.c:460 +#: builtin/replace.c:467 #, c-format msgid "the original commit '%s' has a gpg signature" -msgstr "" +msgstr "il commit originario '%s' ha una firma GPG" -#: builtin/replace.c:461 +#: builtin/replace.c:468 msgid "the signature will be removed in the replacement commit!" -msgstr "" +msgstr "la firma sarà rimossa nel commit sostitutivo!" -#: builtin/replace.c:471 -#, fuzzy, c-format +#: builtin/replace.c:478 +#, c-format msgid "could not write replacement commit for: '%s'" -msgstr "Non è stato possibile scrivere su '%s'" +msgstr "impossibile scrivere il commit sostitutivo per '%s'" -#: builtin/replace.c:479 +#: builtin/replace.c:486 #, c-format msgid "graft for '%s' unnecessary" -msgstr "" +msgstr "graft per '%s' non necessario" -#: builtin/replace.c:482 +#: builtin/replace.c:490 #, c-format msgid "new commit is the same as the old one: '%s'" -msgstr "" +msgstr "il nuovo commit è lo stesso di quello vecchio: '%s'" -#: builtin/replace.c:515 -#, fuzzy, c-format +#: builtin/replace.c:525 +#, c-format msgid "" "could not convert the following graft(s):\n" "%s" -msgstr "non è stato possibile verificare il tag '%s'" +msgstr "" +"impossibile convertire i seguenti graft:\n" +"%s" -#: builtin/replace.c:536 +#: builtin/replace.c:546 msgid "list replace refs" -msgstr "" +msgstr "elenca i riferimenti sostitutivi" -#: builtin/replace.c:537 +#: builtin/replace.c:547 msgid "delete replace refs" -msgstr "" +msgstr "elimina i riferimenti sostitutivi" -#: builtin/replace.c:538 -#, fuzzy +#: builtin/replace.c:548 msgid "edit existing object" -msgstr "Indicizzazione degli oggetti" +msgstr "modifica l'oggetto esistente" -#: builtin/replace.c:539 -#, fuzzy +#: builtin/replace.c:549 msgid "change a commit's parents" -msgstr "Nessun commit analizzato." +msgstr "cambia i genitori di un commit" -#: builtin/replace.c:540 +#: builtin/replace.c:550 msgid "convert existing graft file" -msgstr "" +msgstr "converti un file graft esistente" -#: builtin/replace.c:541 +#: builtin/replace.c:551 msgid "replace the ref if it exists" -msgstr "" +msgstr "sostituisci il riferimento se esiste" -#: builtin/replace.c:543 +#: builtin/replace.c:553 msgid "do not pretty-print contents for --edit" -msgstr "" +msgstr "non stampare i contenuti in un formato leggibile (per --edit)" -#: builtin/replace.c:544 +#: builtin/replace.c:554 msgid "use this format" -msgstr "" +msgstr "usa questo formato" -#: builtin/replace.c:557 -#, fuzzy +#: builtin/replace.c:567 msgid "--format cannot be used when not listing" -msgstr "--fix-thin non può essere usato senza --stdin" +msgstr "--format non può essere usato quando non si elencano voci" -#: builtin/replace.c:565 +#: builtin/replace.c:575 msgid "-f only makes sense when writing a replacement" -msgstr "" +msgstr "-f ha senso solo se si sta scrivendo un oggetto sostitutivo" -#: builtin/replace.c:569 +#: builtin/replace.c:579 msgid "--raw only makes sense with --edit" -msgstr "" +msgstr "--raw ha senso solo con --edit" -#: builtin/replace.c:575 +#: builtin/replace.c:585 msgid "-d needs at least one argument" -msgstr "" +msgstr "-d richiede almeno un argomento" -#: builtin/replace.c:581 +#: builtin/replace.c:591 msgid "bad number of arguments" -msgstr "" +msgstr "numero di argomenti errato" -#: builtin/replace.c:587 +#: builtin/replace.c:597 msgid "-e needs exactly one argument" -msgstr "" +msgstr "-e richiede esattamente un argomento" -#: builtin/replace.c:593 +#: builtin/replace.c:603 msgid "-g needs at least one argument" -msgstr "" +msgstr "-g richiede almeno un argomento" -#: builtin/replace.c:599 +#: builtin/replace.c:609 msgid "--convert-graft-file takes no argument" -msgstr "" +msgstr "--convert-graft-file non richiede argomenti" -#: builtin/replace.c:605 +#: builtin/replace.c:615 msgid "only one pattern can be given with -l" -msgstr "" +msgstr "con -l può essere specificato solo un pattern" #: builtin/rerere.c:13 msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]" msgstr "" +"git rerere [clear | forget <percorso>... | status | remaining | diff | gc]" #: builtin/rerere.c:60 -#, fuzzy msgid "register clean resolutions in index" -msgstr "%s: esiste già in index" +msgstr "registra le risoluzioni pulite nell'indice" #: builtin/rerere.c:79 msgid "'git rerere forget' without paths is deprecated" -msgstr "" +msgstr "'git rerere forget' senza percorsi è deprecato" #: builtin/rerere.c:113 -#, fuzzy, c-format +#, c-format msgid "unable to generate diff for '%s'" -msgstr "creazione del link '%s' non riuscita" +msgstr "impossibile generare il diff per '%s'" #: builtin/reset.c:32 msgid "" "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" msgstr "" +"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" #: builtin/reset.c:33 msgid "git reset [-q] [<tree-ish>] [--] <paths>..." -msgstr "" +msgstr "git reset [-q] [<espressione albero>] [--] <percorsi>..." #: builtin/reset.c:34 msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" -msgstr "" +msgstr "git reset --patch [<espressione albero>] [--] [<percorsi>...]" #: builtin/reset.c:40 msgid "mixed" -msgstr "" +msgstr "misto" #: builtin/reset.c:40 msgid "soft" -msgstr "" +msgstr "soft" #: builtin/reset.c:40 msgid "hard" -msgstr "" +msgstr "hard" #: builtin/reset.c:40 msgid "merge" -msgstr "" +msgstr "merge" #: builtin/reset.c:40 msgid "keep" -msgstr "" +msgstr "keep" #: builtin/reset.c:81 msgid "You do not have a valid HEAD." -msgstr "" +msgstr "Non hai un HEAD valido." #: builtin/reset.c:83 msgid "Failed to find tree of HEAD." -msgstr "" +msgstr "Impossibile trovare l'albero di HEAD." #: builtin/reset.c:89 #, c-format msgid "Failed to find tree of %s." -msgstr "" +msgstr "Impossibile trovare l'albero di %s." #: builtin/reset.c:193 #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "Impossibile eseguire un %s reset nel corso di un merge." -#: builtin/reset.c:293 +#: builtin/reset.c:293 builtin/stash.c:514 builtin/stash.c:589 +#: builtin/stash.c:613 msgid "be quiet, only report errors" -msgstr "" +msgstr "non visualizzare messaggi, segnala solo gli errori" #: builtin/reset.c:295 msgid "reset HEAD and index" -msgstr "" +msgstr "reimposta l'HEAD e l'indice" #: builtin/reset.c:296 msgid "reset only HEAD" -msgstr "" +msgstr "reimposta solo l'HEAD" #: builtin/reset.c:298 builtin/reset.c:300 msgid "reset HEAD, index and working tree" -msgstr "" +msgstr "reimposta l'HEAD, l'indice e l'albero di lavoro" #: builtin/reset.c:302 msgid "reset HEAD but keep local changes" -msgstr "" +msgstr "reimposta l'HEAD ma mantieni le modifiche locali" #: builtin/reset.c:308 msgid "record only the fact that removed paths will be added later" msgstr "" +"salva solo il fatto che i percorsi rimossi saranno aggiunti successivamente" #: builtin/reset.c:326 -#, fuzzy, c-format +#, c-format msgid "Failed to resolve '%s' as a valid revision." -msgstr "Verifica della versione di emacsclient non riuscita." +msgstr "Risoluzione di '%s' come revisione valida non riuscita." #: builtin/reset.c:334 -#, fuzzy, c-format +#, c-format msgid "Failed to resolve '%s' as a valid tree." -msgstr "Lettura dell'oggetto '%s' non riuscita." +msgstr "Risoluzione di '%s' come albero valido non riuscita." #: builtin/reset.c:343 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "--patch non è compatibile con --{hard,mixed,soft}" -#: builtin/reset.c:352 +#: builtin/reset.c:353 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "--mixed con i path è deprecata; usa invece 'git reset -- <path>'." -#: builtin/reset.c:354 +#: builtin/reset.c:355 #, c-format msgid "Cannot do %s reset with paths." -msgstr "" +msgstr "Impossibile eseguire un %s reset con dei percorsi." -#: builtin/reset.c:364 +#: builtin/reset.c:370 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "%s reset non è consentito in un repository spoglio" -#: builtin/reset.c:368 -#, fuzzy +#: builtin/reset.c:374 msgid "-N can only be used with --mixed" -msgstr "-B non può essere usata con -b" +msgstr "-N può essere usato solo con --mixed" -#: builtin/reset.c:388 +#: builtin/reset.c:395 msgid "Unstaged changes after reset:" -msgstr "" +msgstr "Modifiche non nell'area di staging dopo il reset:" -#: builtin/reset.c:391 +#: builtin/reset.c:398 #, c-format msgid "" "\n" @@ -17695,53 +18701,58 @@ msgid "" "use '--quiet' to avoid this. Set the config setting reset.quiet to true\n" "to make this the default.\n" msgstr "" +"\n" +"Ci sono voluti %.2f secondi per elencare le modifiche non nell'area di\n" +"staging dopo il reset. Puoi usare '--quiet' per non visualizzare questo\n" +"messaggio. Imposta l'opzione di configurazione reset.quiet a true per\n" +"rendere tale comportamento quello predefinito.\n" -#: builtin/reset.c:401 +#: builtin/reset.c:408 #, c-format msgid "Could not reset index file to revision '%s'." -msgstr "Non è stato possibile ripristinare index file alla revisione '%s'." +msgstr "Impossibile ripristinare il file indice alla revisione '%s'." -#: builtin/reset.c:405 +#: builtin/reset.c:412 msgid "Could not write new index file." -msgstr "Non è stato possibile scrivere il nuovo index file." +msgstr "Impossibile scrivere il nuovo file indice." -#: builtin/rev-list.c:406 +#: builtin/rev-list.c:405 msgid "cannot combine --exclude-promisor-objects and --missing" -msgstr "" +msgstr "impossibile combinare --exclude-promisor-objects e --missing" -#: builtin/rev-list.c:464 +#: builtin/rev-list.c:466 msgid "object filtering requires --objects" -msgstr "" +msgstr "il filtraggio oggetti richiede --objects" -#: builtin/rev-list.c:467 -#, fuzzy, c-format +#: builtin/rev-list.c:469 +#, c-format msgid "invalid sparse value '%s'" -msgstr "Valore di %s errato: '%s'" +msgstr "valore sparse non valido: '%s'" -#: builtin/rev-list.c:508 +#: builtin/rev-list.c:510 msgid "rev-list does not support display of notes" -msgstr "" +msgstr "rev-list non supporta la visualizzazione delle note" -#: builtin/rev-list.c:511 +#: builtin/rev-list.c:513 msgid "cannot combine --use-bitmap-index with object filtering" -msgstr "" +msgstr "impossibile combinare --use-bitmap-index con il filtraggio oggetti" #: builtin/rev-parse.c:408 -#, fuzzy msgid "git rev-parse --parseopt [<options>] -- [<args>...]" -msgstr "git apply [opzioni] [<patch>...]" +msgstr "git rev-parse --parseopt [<opzioni>] -- [<argomenti>...]" #: builtin/rev-parse.c:413 msgid "keep the `--` passed as an arg" -msgstr "" +msgstr "mantieni la stringa passata `--` come argomento" #: builtin/rev-parse.c:415 msgid "stop parsing after the first non-option argument" msgstr "" +"termina l'analisi dopo il primo argomento non corrispondente a un'opzione" #: builtin/rev-parse.c:418 msgid "output in stuck long form" -msgstr "" +msgstr "emetti l'output in forma \"stuck long\"" #: builtin/rev-parse.c:551 msgid "" @@ -17751,101 +18762,99 @@ msgid "" "\n" "Run \"git rev-parse --parseopt -h\" for more information on the first usage." msgstr "" +"git rev-parse --parseopt [<opzioni>] -- [<argomenti>...]\n" +" o: git rev-parse --sq-quote [<argomento>...]\n" +" o: git rev-parse [<opzioni>] [<argomento>...]\n" +"\n" +"Esegui \"git rev-parse --parseopt -h\" per ulteriori informazioni sulla " +"prima\n" +"modalità d'uso." #: builtin/revert.c:24 -#, fuzzy msgid "git revert [<options>] <commit-ish>..." -msgstr "git apply [opzioni] [<patch>...]" +msgstr "git revert [<opzioni>] <espressione commit>..." #: builtin/revert.c:25 msgid "git revert <subcommand>" -msgstr "" +msgstr "git revert <sottocomando>" #: builtin/revert.c:30 -#, fuzzy msgid "git cherry-pick [<options>] <commit-ish>..." -msgstr "git apply [opzioni] [<patch>...]" +msgstr "git cherry-pick [<opzioni>] <espressione commit>..." #: builtin/revert.c:31 -#, fuzzy msgid "git cherry-pick <subcommand>" -msgstr "cherry-pick non riuscito" +msgstr "git cherry-pick <sottocomando>" #: builtin/revert.c:72 -#, fuzzy, c-format +#, c-format msgid "option `%s' expects a number greater than zero" -msgstr "switch '%c' richiede un valore numerico" +msgstr "l'opzione `%s' richiede un numero maggiore di zero" #: builtin/revert.c:92 #, c-format msgid "%s: %s cannot be used with %s" msgstr "%s: %s non può essere usata con %s" -#: builtin/revert.c:101 +#: builtin/revert.c:102 msgid "end revert or cherry-pick sequence" -msgstr "" +msgstr "termina la sequenza revert o cherry-pick" -#: builtin/revert.c:102 +#: builtin/revert.c:103 msgid "resume revert or cherry-pick sequence" -msgstr "" +msgstr "riprendi la sequenza revert o cherry-pick" -#: builtin/revert.c:103 +#: builtin/revert.c:104 msgid "cancel revert or cherry-pick sequence" -msgstr "" +msgstr "annulla la sequenza revert o cherry-pick" -#: builtin/revert.c:104 -#, fuzzy +#: builtin/revert.c:106 msgid "don't automatically commit" -msgstr "Impossibile eseguire il revert come commit iniziale" +msgstr "non eseguire il commit automaticamente" -#: builtin/revert.c:105 -#, fuzzy +#: builtin/revert.c:107 msgid "edit the commit message" -msgstr "Messaggio di commit vuoto." +msgstr "modifica il messaggio di commit" -#: builtin/revert.c:108 +#: builtin/revert.c:110 msgid "parent-number" -msgstr "" +msgstr "numero-genitore" -#: builtin/revert.c:109 +#: builtin/revert.c:111 msgid "select mainline parent" -msgstr "" +msgstr "seleziona il genitore mainline" -#: builtin/revert.c:111 -#, fuzzy +#: builtin/revert.c:113 msgid "merge strategy" -msgstr "Tentativo con la strategia di merge %s...\n" +msgstr "strategia di merge" -#: builtin/revert.c:113 -#, fuzzy +#: builtin/revert.c:115 msgid "option for merge strategy" -msgstr "Tentativo con la strategia di merge %s...\n" +msgstr "opzione per la strategia di merge" -#: builtin/revert.c:122 +#: builtin/revert.c:124 msgid "append commit name" -msgstr "" +msgstr "aggiungi il nome del commit alla fine" -#: builtin/revert.c:124 -#, fuzzy +#: builtin/revert.c:126 msgid "preserve initially empty commits" -msgstr "Impossibile eseguire il revert come commit iniziale" +msgstr "mantieni i commit inizialmente vuoti" -#: builtin/revert.c:126 +#: builtin/revert.c:128 msgid "keep redundant, empty commits" -msgstr "" +msgstr "mantieni i commit ridondanti e vuoti" -#: builtin/revert.c:220 +#: builtin/revert.c:227 msgid "revert failed" msgstr "revert non riuscito" -#: builtin/revert.c:233 +#: builtin/revert.c:240 msgid "cherry-pick failed" msgstr "cherry-pick non riuscito" #: builtin/rm.c:19 -#, fuzzy msgid "git rm [<options>] [--] <file>..." -msgstr "git apply [opzioni] [<patch>...]" +msgstr "git rm [<opzioni>] [--] <file>..." #: builtin/rm.c:207 msgid "" @@ -17855,64 +18864,72 @@ msgid_plural "" "the following files have staged content different from both the\n" "file and the HEAD:" msgstr[0] "" +"il seguente file ha contenuti nell'area di staging che\n" +"differiscono sia rispetto a quelli del file sia rispetto a HEAD:" msgstr[1] "" +"i seguenti file hanno contenuti nell'area di staging che\n" +"differiscono sia rispetto a quelli del file sia rispetto a HEAD:" #: builtin/rm.c:212 msgid "" "\n" "(use -f to force removal)" msgstr "" +"\n" +"(usa -f per forzarne la rimozione)" #: builtin/rm.c:216 msgid "the following file has changes staged in the index:" msgid_plural "the following files have changes staged in the index:" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "il seguente file ha delle modifiche in staging nell'indice:" +msgstr[1] "i seguenti file hanno delle modifiche in staging nell'indice:" #: builtin/rm.c:220 builtin/rm.c:229 -#, fuzzy msgid "" "\n" "(use --cached to keep the file, or -f to force removal)" msgstr "" -"'%s' contiene delle modifiche locali\n" -"(usa --cached per mantenere il file, o -f per forzare la rimozione)" +"\n" +"(usa --cached per mantenere il file o -f per forzarne la rimozione)" #: builtin/rm.c:226 msgid "the following file has local modifications:" msgid_plural "the following files have local modifications:" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "il seguente file ha delle modifiche locali:" +msgstr[1] "i seguenti file hanno delle modifiche locali:" #: builtin/rm.c:242 msgid "do not list removed files" -msgstr "" +msgstr "non elencare i file rimossi" #: builtin/rm.c:243 -#, fuzzy msgid "only remove from the index" -msgstr "impossibile rimuovere %s da index" +msgstr "rimuovi solo dall'indice" #: builtin/rm.c:244 msgid "override the up-to-date check" -msgstr "" +msgstr "ignora il controllo sullo stato di aggiornamento" #: builtin/rm.c:245 msgid "allow recursive removal" -msgstr "" +msgstr "consenti rimozioni ricorsive" #: builtin/rm.c:247 msgid "exit with a zero status even if nothing matched" msgstr "" +"esci con codice d'uscita zero anche nel caso in cui non vi siano " +"corrispondenze" #: builtin/rm.c:289 msgid "please stage your changes to .gitmodules or stash them to proceed" msgstr "" +"esegui lo stage delle modifiche a .gitmodules o eseguine lo stash per " +"procedere" #: builtin/rm.c:307 #, c-format msgid "not removing '%s' recursively without -r" -msgstr "" +msgstr "non rimuovo '%s' ricorsivamente senza -r" #: builtin/rm.c:346 #, c-format @@ -17926,71 +18943,62 @@ msgid "" "[<ref>...]\n" " --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] [<host>:]<directory> " +"[<riferimento>...]\n" +" --all e uno specificatore <riferimento> sono mutualmente esclusivi." #: builtin/send-pack.c:163 -#, fuzzy msgid "remote name" -msgstr "* remote %s" +msgstr "nome remoto" #: builtin/send-pack.c:177 msgid "use stateless RPC protocol" -msgstr "" +msgstr "usa protocollo RPC senza stato" #: builtin/send-pack.c:178 msgid "read refs from stdin" -msgstr "" +msgstr "leggi i riferimento dallo standard input" #: builtin/send-pack.c:179 msgid "print status from remote helper" -msgstr "" - -#: builtin/serve.c:7 -msgid "git serve [<options>]" -msgstr "" - -#: builtin/serve.c:17 builtin/upload-pack.c:23 -msgid "quit after a single request/response exchange" -msgstr "" - -#: builtin/serve.c:19 -msgid "exit immediately after advertising capabilities" -msgstr "" +msgstr "stampa lo stato dell'helper remoto" #: builtin/shortlog.c:14 msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]" -msgstr "" +msgstr "git shortlog [<opzioni>] [<intervallo revisioni>] [[--] <percorso>...]" #: builtin/shortlog.c:15 msgid "git log --pretty=short | git shortlog [<options>]" -msgstr "" +msgstr "git log --pretty=short | git shortlog [<opzioni>]" #: builtin/shortlog.c:264 msgid "Group by committer rather than author" -msgstr "" +msgstr "Raggruppa per persona che ha eseguito il commit anziché per autore" #: builtin/shortlog.c:266 msgid "sort output according to the number of commits per author" -msgstr "" +msgstr "ordina l'output in base al numero di commit per autore" #: builtin/shortlog.c:268 msgid "Suppress commit descriptions, only provides commit count" -msgstr "" +msgstr "Ometti le descrizioni dei commit, fornisci solo il numero dei commit" #: builtin/shortlog.c:270 msgid "Show the email address of each author" -msgstr "" +msgstr "Visualizza l'indirizzo email di ogni autore" #: builtin/shortlog.c:271 msgid "<w>[,<i1>[,<i2>]]" -msgstr "" +msgstr "<w>[,<i1>[,<i2>]]" #: builtin/shortlog.c:272 msgid "Linewrap output" -msgstr "" +msgstr "Output a capo automatico" #: builtin/shortlog.c:301 msgid "too many arguments given outside repository" -msgstr "" +msgstr "troppi argomenti forniti oltre al repository" #: builtin/show-branch.c:13 msgid "" @@ -17999,223 +19007,461 @@ msgid "" "\t\t[--more=<n> | --list | --independent | --merge-base]\n" "\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]" msgstr "" +"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" +"\t\t[--current] [--color[=<quando>] | --no-color] [--sparse]\n" +"\t\t[--more=<n> | --list | --independent | --merge-base]\n" +"\t\t[--no-name | --sha1-name] [--topics] [(<revisione> | <glob>)...]" #: builtin/show-branch.c:17 msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" msgstr "" +"git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<riferimento>]" #: builtin/show-branch.c:395 #, c-format msgid "ignoring %s; cannot handle more than %d ref" msgid_plural "ignoring %s; cannot handle more than %d refs" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "ignoro %s; non posso gestire più di %d riferimento" +msgstr[1] "ignoro %s; non posso gestire più di %d riferimenti" #: builtin/show-branch.c:549 #, c-format msgid "no matching refs with %s" -msgstr "" +msgstr "nessun riferimento corrispondente a %s" #: builtin/show-branch.c:646 msgid "show remote-tracking and local branches" -msgstr "" +msgstr "visualizza i branch che ne tracciano uno remoto e quelli locali" #: builtin/show-branch.c:648 msgid "show remote-tracking branches" -msgstr "" +msgstr "visualizza i branch che ne tracciano uno remoto" #: builtin/show-branch.c:650 msgid "color '*!+-' corresponding to the branch" -msgstr "" +msgstr "colore '*!+-' corrispondente al branch" #: builtin/show-branch.c:652 msgid "show <n> more commits after the common ancestor" -msgstr "" +msgstr "visualizza <n> commit ulteriori rispetto all'antenato comune" #: builtin/show-branch.c:654 msgid "synonym to more=-1" -msgstr "" +msgstr "sinonimo di more=-1" #: builtin/show-branch.c:655 msgid "suppress naming strings" -msgstr "" +msgstr "non visualizzare le stringhe di denominazione" #: builtin/show-branch.c:657 -#, fuzzy msgid "include the current branch" -msgstr "Nessun branch corrente." +msgstr "includi il branch corrente" #: builtin/show-branch.c:659 -#, fuzzy msgid "name commits with their object names" -msgstr "impossibile scrivere l'oggetto nota" +msgstr "denomina i commit con i loro nomi oggetto" #: builtin/show-branch.c:661 msgid "show possible merge bases" -msgstr "" +msgstr "visualizza le basi merge possibili" #: builtin/show-branch.c:663 msgid "show refs unreachable from any other ref" -msgstr "" +msgstr "visualizza i riferimenti non raggiungibili da nessun altro" #: builtin/show-branch.c:665 msgid "show commits in topological order" -msgstr "" +msgstr "visualizza i commit in ordine topologico" #: builtin/show-branch.c:668 msgid "show only commits not on the first branch" -msgstr "" +msgstr "visualizza solo i commit non sul primo branch" #: builtin/show-branch.c:670 msgid "show merges reachable from only one tip" -msgstr "" +msgstr "visualizza i merge raggiungibili solo dall'ultimo commit di un branch" #: builtin/show-branch.c:672 msgid "topologically sort, maintaining date order where possible" msgstr "" +"esegui un ordinamento topologico mantenendo l'ordine delle date ove possibile" #: builtin/show-branch.c:675 msgid "<n>[,<base>]" -msgstr "" +msgstr "<n>[,<base>]" #: builtin/show-branch.c:676 msgid "show <n> most recent ref-log entries starting at base" msgstr "" +"visualizza le <n> voci più recenti del log dei riferimenti partendo da base" #: builtin/show-branch.c:712 -#, fuzzy msgid "" "--reflog is incompatible with --all, --remotes, --independent or --merge-base" -msgstr "--delete non è compatibile con --all, --mirror e --tags" +msgstr "" +"--reflog non è compatibile con --all, --remotes, --independent o --merge-base" #: builtin/show-branch.c:736 msgid "no branches given, and HEAD is not valid" -msgstr "" +msgstr "nessun branch fornito e l'HEAD non è valido" #: builtin/show-branch.c:739 -#, fuzzy msgid "--reflog option needs one branch name" -msgstr "--track necessita del nome di un branch" +msgstr "l'opzione --reflog richiede il nome di un branch" #: builtin/show-branch.c:742 #, 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] "" -msgstr[1] "" +msgstr[0] "può essere visualizzata solo %d voce per volta." +msgstr[1] "possono essere visualizzate solo %d voci per volta." #: builtin/show-branch.c:746 -#, fuzzy, c-format +#, c-format msgid "no such ref %s" -msgstr "Remote non esistente: %s" +msgstr "riferimento non esistente: %s" -#: builtin/show-branch.c:830 +#: builtin/show-branch.c:832 #, c-format msgid "cannot handle more than %d rev." msgid_plural "cannot handle more than %d revs." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "impossibile gestire più di %d revisione." +msgstr[1] "impossibile gestire più di %d revisioni." -#: builtin/show-branch.c:834 -#, fuzzy, c-format +#: builtin/show-branch.c:836 +#, c-format msgid "'%s' is not a valid ref." -msgstr "'%s' non è un nome tag valido." +msgstr "'%s' non è un riferimento valido." -#: builtin/show-branch.c:837 -#, fuzzy, c-format +#: builtin/show-branch.c:839 +#, c-format msgid "cannot find commit %s (%s)" -msgstr "Commit %s sconosciuto" +msgstr "impossibile trovare il commit %s (%s)" -#: builtin/show-ref.c:11 +#: builtin/show-ref.c:12 msgid "" "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]" msgstr "" +"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" +"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]" -#: builtin/show-ref.c:12 +#: builtin/show-ref.c:13 msgid "git show-ref --exclude-existing[=<pattern>]" -msgstr "" +msgstr "git show-ref --exclude-existing[=<pattern>]" -#: builtin/show-ref.c:161 +#: builtin/show-ref.c:162 msgid "only show tags (can be combined with heads)" -msgstr "" +msgstr "visualizza solo i tag (l'opzione può essere combinata con heads)" -#: builtin/show-ref.c:162 +#: builtin/show-ref.c:163 msgid "only show heads (can be combined with tags)" -msgstr "" +msgstr "visualizza solo le head (l'opzione può essere combinata con tags)" -#: builtin/show-ref.c:163 +#: builtin/show-ref.c:164 msgid "stricter reference checking, requires exact ref path" msgstr "" +"controllo più stringente dei riferimenti, richiede un percorso esatto al " +"riferimento" -#: builtin/show-ref.c:166 builtin/show-ref.c:168 +#: builtin/show-ref.c:167 builtin/show-ref.c:169 msgid "show the HEAD reference, even if it would be filtered out" -msgstr "" +msgstr "visualizza il riferimento HEAD anche se filtrato" -#: builtin/show-ref.c:170 +#: builtin/show-ref.c:171 msgid "dereference tags into object IDs" -msgstr "" +msgstr "dereferenzia i tag in ID oggetto" -#: builtin/show-ref.c:172 +#: builtin/show-ref.c:173 msgid "only show SHA1 hash using <n> digits" -msgstr "" +msgstr "visualizza l'hash SHA1 usando solo <n> caratteri" -#: builtin/show-ref.c:176 +#: builtin/show-ref.c:177 msgid "do not print results to stdout (useful with --verify)" -msgstr "" +msgstr "non stampare i risultati sullo standard output (utile con --verify)" -#: builtin/show-ref.c:178 +#: builtin/show-ref.c:179 msgid "show refs from stdin that aren't in local repository" msgstr "" +"visualizza i riferimenti dati sullo standard input che non sono nel " +"repository locale" + +#: builtin/stash.c:22 builtin/stash.c:37 +msgid "git stash list [<options>]" +msgstr "git stash list [<opzioni>]" + +#: builtin/stash.c:23 builtin/stash.c:42 +msgid "git stash show [<options>] [<stash>]" +msgstr "git stash show [<opzioni>] [<stash>]" + +#: builtin/stash.c:24 builtin/stash.c:47 +msgid "git stash drop [-q|--quiet] [<stash>]" +msgstr "git stash drop [-q|--quiet] [<stash>]" + +#: builtin/stash.c:25 +msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" +msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" + +#: builtin/stash.c:26 builtin/stash.c:62 +msgid "git stash branch <branchname> [<stash>]" +msgstr "git stash branch <nome branch> [<stash>]" + +#: builtin/stash.c:27 builtin/stash.c:67 +msgid "git stash clear" +msgstr "git stash clear" + +#: builtin/stash.c:28 builtin/stash.c:77 +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 <messaggio>]\n" +" [--] [<specificatore percorso>...]]" + +#: builtin/stash.c:31 builtin/stash.c:84 +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] [<messaggio>]" + +#: builtin/stash.c:52 +msgid "git stash pop [--index] [-q|--quiet] [<stash>]" +msgstr "git stash pop [--index] [-q|--quiet] [<stash>]" + +#: builtin/stash.c:57 +msgid "git stash apply [--index] [-q|--quiet] [<stash>]" +msgstr "git stash apply [--index] [-q|--quiet] [<stash>]" + +#: builtin/stash.c:72 +msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>" +msgstr "git stash store [-m|--message <messaggio>] [-q|--quiet] <commit>" + +#: builtin/stash.c:127 +#, c-format +msgid "'%s' is not a stash-like commit" +msgstr "'%s' non è un commit simile a uno stash" + +#: builtin/stash.c:147 +#, c-format +msgid "Too many revisions specified:%s" +msgstr "Troppe revisioni specificate:%s" + +#: builtin/stash.c:161 git-legacy-stash.sh:548 +msgid "No stash entries found." +msgstr "Nessuna voce di stash trovata." + +#: builtin/stash.c:175 +#, c-format +msgid "%s is not a valid reference" +msgstr "%s non è un riferimento valido" + +#: builtin/stash.c:224 git-legacy-stash.sh:75 +msgid "git stash clear with parameters is unimplemented" +msgstr "git stash clear con parametri non è implementato" + +#: builtin/stash.c:403 +msgid "cannot apply a stash in the middle of a merge" +msgstr "impossibile applicare uno stash nel mezzo di un merge" + +#: builtin/stash.c:414 +#, c-format +msgid "could not generate diff %s^!." +msgstr "impossibile generare il diff %s^!" + +#: builtin/stash.c:421 +msgid "conflicts in index.Try without --index." +msgstr "ci sono conflitti nell'indice. Prova senza --index." + +#: builtin/stash.c:427 +msgid "could not save index tree" +msgstr "impossibile salvare l'albero indice" + +#: builtin/stash.c:434 +msgid "could not restore untracked files from stash" +msgstr "non è stato possibile ripristinare i file non tracciati dallo stash" + +#: builtin/stash.c:448 +#, c-format +msgid "Merging %s with %s" +msgstr "Merge di %s con %s in corso" + +#: builtin/stash.c:458 git-legacy-stash.sh:680 +msgid "Index was not unstashed." +msgstr "L'indice non è stato rimosso dallo stash." + +#: builtin/stash.c:516 builtin/stash.c:615 +msgid "attempt to recreate the index" +msgstr "tenta di ricreare l'indice" + +#: builtin/stash.c:549 +#, c-format +msgid "Dropped %s (%s)" +msgstr "Ho scartato %s (%s)" + +#: builtin/stash.c:552 +#, c-format +msgid "%s: Could not drop stash entry" +msgstr "%s: Impossibile scartare la voce di stash" + +#: builtin/stash.c:577 +#, c-format +msgid "'%s' is not a stash reference" +msgstr "'%s' non è un riferimento stash" + +#: builtin/stash.c:627 git-legacy-stash.sh:694 +msgid "The stash entry is kept in case you need it again." +msgstr "" +"La voce di stash è mantenuta nel caso in cui tu ne abbia nuovamente bisogno." + +#: builtin/stash.c:650 git-legacy-stash.sh:712 +msgid "No branch name specified" +msgstr "Nome del branch non specificato" + +#: builtin/stash.c:789 builtin/stash.c:826 +#, c-format +msgid "Cannot update %s with %s" +msgstr "Impossibile aggiornare %s con %s" + +#: builtin/stash.c:807 builtin/stash.c:1474 builtin/stash.c:1510 +msgid "stash message" +msgstr "messaggio di stash" + +#: builtin/stash.c:817 +msgid "\"git stash store\" requires one <commit> argument" +msgstr "\"git stash store\" richiede un argomento <commit>" + +#: builtin/stash.c:1039 git-legacy-stash.sh:217 +msgid "No changes selected" +msgstr "Nessuna modifica selezionata" + +#: builtin/stash.c:1135 git-legacy-stash.sh:150 +msgid "You do not have the initial commit yet" +msgstr "Non hai ancora un commit iniziale" + +#: builtin/stash.c:1162 git-legacy-stash.sh:165 +msgid "Cannot save the current index state" +msgstr "Impossibile salvare lo stato corrente di index" + +#: builtin/stash.c:1171 git-legacy-stash.sh:180 +msgid "Cannot save the untracked files" +msgstr "Impossibile salvare i file non tracciati" + +#: builtin/stash.c:1182 builtin/stash.c:1191 git-legacy-stash.sh:200 +#: git-legacy-stash.sh:213 +msgid "Cannot save the current worktree state" +msgstr "Impossibile salvare lo stato corrente dell'albero di lavoro" + +#: builtin/stash.c:1219 git-legacy-stash.sh:233 +msgid "Cannot record working tree state" +msgstr "Impossibile registrare lo stato dell'albero di lavoro" + +#: builtin/stash.c:1268 git-legacy-stash.sh:337 +msgid "Can't use --patch and --include-untracked or --all at the same time" +msgstr "" +"Impossibile usare --patch e --include-untracked o --all allo stesso tempo" + +#: builtin/stash.c:1284 +msgid "Did you forget to 'git add'?" +msgstr "Ti sei scordato di eseguire 'git add'?" + +#: builtin/stash.c:1299 git-legacy-stash.sh:345 +msgid "No local changes to save" +msgstr "Nessuna modifica locale da salvare" + +#: builtin/stash.c:1306 git-legacy-stash.sh:350 +msgid "Cannot initialize stash" +msgstr "Impossibile inizializzare stash" + +#: builtin/stash.c:1321 git-legacy-stash.sh:354 +msgid "Cannot save the current status" +msgstr "Impossibile salvare lo stato attuale" + +#: builtin/stash.c:1326 +#, c-format +msgid "Saved working directory and index state %s" +msgstr "Directory di lavoro e stato indice salvati: %s" + +#: builtin/stash.c:1430 git-legacy-stash.sh:384 +msgid "Cannot remove worktree changes" +msgstr "Impossibile rimuovere le modifiche all'albero di lavoro" + +#: builtin/stash.c:1465 builtin/stash.c:1501 +msgid "keep index" +msgstr "mantieni l'indice" + +#: builtin/stash.c:1467 builtin/stash.c:1503 +msgid "stash in patch mode" +msgstr "esegui lo stash in modalità patch" + +#: builtin/stash.c:1468 builtin/stash.c:1504 +msgid "quiet mode" +msgstr "modalità silenziosa" + +#: builtin/stash.c:1470 builtin/stash.c:1506 +msgid "include untracked files in stash" +msgstr "includi i file non tracciati nello stash" + +#: builtin/stash.c:1472 builtin/stash.c:1508 +msgid "include ignore files" +msgstr "includi i file ignorati" + +#: builtin/stash.c:1568 +#, c-format +msgid "could not exec %s" +msgstr "impossibile eseguire %s" #: builtin/stripspace.c:18 msgid "git stripspace [-s | --strip-comments]" -msgstr "" +msgstr "git stripspace [-s | --strip-comments]" #: builtin/stripspace.c:19 msgid "git stripspace [-c | --comment-lines]" -msgstr "" +msgstr "git stripspace [-c | --comment-lines]" #: builtin/stripspace.c:37 msgid "skip and remove all lines starting with comment character" -msgstr "" +msgstr "salta e rimuovi tutte le righe che iniziano con un carattere commento" #: builtin/stripspace.c:40 msgid "prepend comment character and space to each line" -msgstr "" +msgstr "anteponi il carattere commento e uno spazio a ogni riga" -#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1943 +#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1942 #, c-format msgid "Expecting a full ref name, got %s" -msgstr "" +msgstr "Atteso nome riferimento completo, ricevuto %s" #: builtin/submodule--helper.c:62 msgid "submodule--helper print-default-remote takes no arguments" -msgstr "" +msgstr "submodule--helper print-default-remote non richiede argomenti" #: builtin/submodule--helper.c:100 -#, fuzzy, c-format +#, c-format msgid "cannot strip one component off url '%s'" -msgstr "impossibile scrivere il file keep '%s'" +msgstr "impossibile rimuovere un componente dall'URL '%s'" #: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1367 msgid "alternative anchor for relative paths" -msgstr "" +msgstr "ancoraggio alternativo per i percorsi relativi" #: builtin/submodule--helper.c:413 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" -msgstr "" +msgstr "git submodule--helper list [--prefix=<percorso>] [<percorso>...]" #: builtin/submodule--helper.c:470 builtin/submodule--helper.c:627 #: builtin/submodule--helper.c:650 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" -msgstr "" +msgstr "Nessun URL trovato in .gitmodules per il percorso del sottomodulo '%s'" #: builtin/submodule--helper.c:522 -#, fuzzy, c-format +#, c-format msgid "Entering '%s'\n" -msgstr "sovrascrittura di %s in corso" +msgstr "Entro in '%s'\n" #: builtin/submodule--helper.c:525 #, c-format @@ -18223,6 +19469,8 @@ msgid "" "run_command returned non-zero status for %s\n" "." msgstr "" +"run_command ha restituito un codice diverso da zero per %s\n" +"." #: builtin/submodule--helper.c:546 #, c-format @@ -18231,18 +19479,21 @@ msgid "" "submodules of %s\n" "." msgstr "" +"run_command ha restituito un codice diverso da zero durante la ricorsione " +"nei sottomoduli innestati di %s\n" +"." #: builtin/submodule--helper.c:562 msgid "Suppress output of entering each submodule command" -msgstr "" +msgstr "Non visualizzare l'output dei comandi eseguiti in ogni sottomodulo" #: builtin/submodule--helper.c:564 builtin/submodule--helper.c:1049 msgid "Recurse into nested submodules" -msgstr "" +msgstr "Esegui ricorsivamente sui sottomoduli innestati" #: builtin/submodule--helper.c:569 -msgid "git submodule--helper foreach [--quiet] [--recursive] <command>" -msgstr "" +msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>" +msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <comando>" #: builtin/submodule--helper.c:596 #, c-format @@ -18250,34 +19501,38 @@ msgid "" "could not look up configuration '%s'. Assuming this repository is its own " "authoritative upstream." msgstr "" +"impossibile trovare la configurazione '%s'. Assumo che questo repository sia " +"il proprio repository autoritativo upstream." #: builtin/submodule--helper.c:664 -#, fuzzy, c-format +#, c-format msgid "Failed to register url for submodule path '%s'" -msgstr "Lettura dell'oggetto '%s' non riuscita." +msgstr "Registrazione dell'URL per il percorso sottomodulo '%s' non riuscita" #: builtin/submodule--helper.c:668 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" -msgstr "" +msgstr "Sottomodulo '%s' (%s) registrato per il percorso '%s'\n" #: builtin/submodule--helper.c:678 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" msgstr "" +"avviso: suggerita modalità comando aggiornamento per il sottomodulo '%s'\n" #: builtin/submodule--helper.c:685 #, c-format msgid "Failed to register update mode for submodule path '%s'" msgstr "" +"Registrazione della modalità aggiornamento per il percorso sottomodulo '%s'" #: builtin/submodule--helper.c:707 msgid "Suppress output for initializing a submodule" -msgstr "" +msgstr "Non visualizzare l'output dell'inizializzazione del sottomodulo" #: builtin/submodule--helper.c:712 -msgid "git submodule--helper init [<path>]" -msgstr "" +msgid "git submodule--helper init [<options>] [<path>]" +msgstr "git submodule--helper init [<opzioni>] [<percorso>]" #: builtin/submodule--helper.c:784 builtin/submodule--helper.c:910 #, c-format @@ -18290,9 +19545,9 @@ msgid "could not resolve HEAD ref inside the submodule '%s'" msgstr "" #: builtin/submodule--helper.c:850 builtin/submodule--helper.c:1019 -#, fuzzy, c-format +#, c-format msgid "failed to recurse into submodule '%s'" -msgstr "creazione del link '%s' non riuscita" +msgstr "ricorsione nel sottomodulo '%s' non riuscita" #: builtin/submodule--helper.c:874 builtin/submodule--helper.c:1185 msgid "Suppress submodule status output" @@ -18327,14 +19582,14 @@ msgid "failed to register url for submodule path '%s'" msgstr "" #: builtin/submodule--helper.c:989 -#, fuzzy, c-format +#, c-format msgid "failed to get the default remote for submodule '%s'" -msgstr "creazione della directory '%s' non riuscita" +msgstr "recupero del remoto predefinito per il sottomodulo '%s' non riuscito" #: builtin/submodule--helper.c:1000 -#, fuzzy, c-format +#, c-format msgid "failed to update remote for submodule '%s'" -msgstr "creazione della directory '%s' non riuscita" +msgstr "aggiornamento del remoto per il sottomodulo '%s' non riuscito" #: builtin/submodule--helper.c:1047 msgid "Suppress output of synchronizing submodule url" @@ -18359,19 +19614,19 @@ msgid "" msgstr "" #: builtin/submodule--helper.c:1128 -#, fuzzy, c-format +#, c-format msgid "Cleared directory '%s'\n" -msgstr "Non è stato possibile creare la directory '%s'" +msgstr "Directory '%s' ripulita\n" #: builtin/submodule--helper.c:1130 -#, fuzzy, c-format +#, c-format msgid "Could not remove submodule work tree '%s'\n" -msgstr "Non è stato possibile rimuovere il branch %s" +msgstr "Impossibile rimuovere l'albero di lavoro del sottomodulo '%s'\n" #: builtin/submodule--helper.c:1141 -#, fuzzy, c-format +#, c-format msgid "could not create empty submodule directory %s" -msgstr "Non è stato possibile creare la directory '%s'" +msgstr "impossibile creare la directory vuota del sottomodulo %s" #: builtin/submodule--helper.c:1157 #, c-format @@ -18392,9 +19647,8 @@ msgid "" msgstr "" #: builtin/submodule--helper.c:1206 -#, fuzzy msgid "Use '--all' if you really want to deinitialize all submodules" -msgstr "Usa -f se vuoi davvero aggiungerli.\n" +msgstr "" #: builtin/submodule--helper.c:1301 builtin/submodule--helper.c:1304 #, c-format @@ -18427,7 +19681,7 @@ msgstr "" msgid "depth for shallow clones" msgstr "" -#: builtin/submodule--helper.c:1387 builtin/submodule--helper.c:1872 +#: builtin/submodule--helper.c:1387 builtin/submodule--helper.c:1871 msgid "force cloning progress" msgstr "" @@ -18438,24 +19692,24 @@ msgid "" msgstr "" #: builtin/submodule--helper.c:1423 -#, c-format +#, fuzzy, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "" #: builtin/submodule--helper.c:1437 #, fuzzy, c-format msgid "could not get submodule directory for '%s'" -msgstr "Non è stato possibile creare la directory '%s'" +msgstr "" #: builtin/submodule--helper.c:1473 #, fuzzy, c-format msgid "Invalid update mode '%s' for submodule path '%s'" -msgstr "creazione della directory '%s' non riuscita" +msgstr "" #: builtin/submodule--helper.c:1477 #, fuzzy, c-format msgid "Invalid update mode '%s' configured for submodule path '%s'" -msgstr "Lettura dell'oggetto '%s' non riuscita." +msgstr "" #: builtin/submodule--helper.c:1570 #, c-format @@ -18465,7 +19719,7 @@ msgstr "" #: builtin/submodule--helper.c:1574 #, fuzzy msgid "Maybe you want to use 'update --init'?" -msgstr "Forse intendevi dire 'git add .'?\n" +msgstr "" #: builtin/submodule--helper.c:1604 #, c-format @@ -18475,101 +19729,110 @@ msgstr "" #: builtin/submodule--helper.c:1633 #, fuzzy, c-format msgid "Skipping submodule '%s'" -msgstr "Il path '%s' è nel sottomodulo '%.*s'" +msgstr "" #: builtin/submodule--helper.c:1777 #, fuzzy, c-format msgid "Failed to clone '%s'. Retry scheduled" -msgstr "Copia delle note da '%s' a '%s' non riuscita" +msgstr "" #: builtin/submodule--helper.c:1788 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "" -#: builtin/submodule--helper.c:1851 builtin/submodule--helper.c:2093 +#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:2092 msgid "path into the working tree" msgstr "" -#: builtin/submodule--helper.c:1854 +#: builtin/submodule--helper.c:1853 msgid "path into the working tree, across nested submodule boundaries" msgstr "" -#: builtin/submodule--helper.c:1858 +#: builtin/submodule--helper.c:1857 msgid "rebase, merge, checkout or none" msgstr "" -#: builtin/submodule--helper.c:1864 +#: builtin/submodule--helper.c:1863 msgid "Create a shallow clone truncated to the specified number of revisions" msgstr "" -#: builtin/submodule--helper.c:1867 +#: builtin/submodule--helper.c:1866 msgid "parallel jobs" msgstr "" -#: builtin/submodule--helper.c:1869 +#: builtin/submodule--helper.c:1868 msgid "whether the initial clone should follow the shallow recommendation" msgstr "" -#: builtin/submodule--helper.c:1870 +#: builtin/submodule--helper.c:1869 msgid "don't print cloning progress" msgstr "" -#: builtin/submodule--helper.c:1877 +#: builtin/submodule--helper.c:1876 msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" msgstr "" -#: builtin/submodule--helper.c:1890 +#: builtin/submodule--helper.c:1889 #, fuzzy msgid "bad value for update parameter" -msgstr "parametro --author malformato" +msgstr "" -#: builtin/submodule--helper.c:1938 +#: builtin/submodule--helper.c:1937 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " "the superproject is not on any branch" msgstr "" -#: builtin/submodule--helper.c:2061 +#: builtin/submodule--helper.c:2060 #, fuzzy, c-format msgid "could not get a repository handle for submodule '%s'" -msgstr "non è stato possibile aprire o leggere '%s'" +msgstr "" -#: builtin/submodule--helper.c:2094 +#: builtin/submodule--helper.c:2093 msgid "recurse into submodules" msgstr "" -#: builtin/submodule--helper.c:2100 -msgid "git submodule--helper embed-git-dir [<path>...]" -msgstr "" +#: builtin/submodule--helper.c:2099 +msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" +msgstr "git submodule--helper absorb-git-dirs [<opzioni>] [<percorso>...]" #: builtin/submodule--helper.c:2156 msgid "check if it is safe to write to the .gitmodules file" msgstr "" -#: builtin/submodule--helper.c:2161 -msgid "git submodule--helper config name [value]" +#: builtin/submodule--helper.c:2159 +#, fuzzy +msgid "unset the config in the .gitmodules file" +msgstr "" + +#: builtin/submodule--helper.c:2164 +msgid "git submodule--helper config <name> [<value>]" msgstr "" -#: builtin/submodule--helper.c:2162 +#: builtin/submodule--helper.c:2165 +msgid "git submodule--helper config --unset <name>" +msgstr "" + +#: builtin/submodule--helper.c:2166 msgid "git submodule--helper config --check-writeable" msgstr "" -#: builtin/submodule--helper.c:2179 git-submodule.sh:169 +#: builtin/submodule--helper.c:2185 git-submodule.sh:171 #, sh-format msgid "please make sure that the .gitmodules file is in the working tree" msgstr "" -#: builtin/submodule--helper.c:2229 git.c:413 git.c:658 +#: builtin/submodule--helper.c:2235 git.c:433 git.c:685 #, c-format msgid "%s doesn't support --super-prefix" msgstr "" -#: builtin/submodule--helper.c:2235 +#: builtin/submodule--helper.c:2241 #, fuzzy, c-format msgid "'%s' is not a valid submodule--helper subcommand" -msgstr "'%s' non è un nome di remoto valido" +msgstr "" #: builtin/symbolic-ref.c:8 msgid "git symbolic-ref [<options>] <name> [<ref>]" @@ -18586,7 +19849,7 @@ msgstr "" #: builtin/symbolic-ref.c:41 #, fuzzy msgid "delete symbolic ref" -msgstr "HEAD errato - strano ref simbolico" +msgstr "" #: builtin/symbolic-ref.c:42 msgid "shorten ref output" @@ -18602,36 +19865,36 @@ msgstr "" #: builtin/tag.c:25 msgid "" -"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> " -"[<head>]" +"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n" +"\t\t<tagname> [<head>]" msgstr "" -#: builtin/tag.c:26 +#: builtin/tag.c:27 msgid "git tag -d <tagname>..." msgstr "" -#: builtin/tag.c:27 +#: 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 "" -#: builtin/tag.c:29 +#: builtin/tag.c:30 msgid "git tag -v [--format=<format>] <tagname>..." msgstr "" -#: builtin/tag.c:87 +#: builtin/tag.c:88 #, c-format msgid "tag '%s' not found." msgstr "tag '%s' non trovato." -#: builtin/tag.c:103 +#: builtin/tag.c:104 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "Tag '%s' eliminato (era %s)\n" -#: builtin/tag.c:133 +#: builtin/tag.c:134 #, fuzzy, c-format msgid "" "\n" @@ -18639,13 +19902,8 @@ msgid "" " %s\n" "Lines starting with '%c' will be ignored.\n" msgstr "" -"\n" -"#\n" -"# Scrivere un messaggio associato al tag\n" -"# Le righe che iniziano con '#' verranno ignorate.\n" -"#\n" -#: builtin/tag.c:137 +#: builtin/tag.c:138 #, fuzzy, c-format msgid "" "\n" @@ -18654,162 +19912,161 @@ msgid "" "Lines starting with '%c' will be kept; you may remove them yourself if you " "want to.\n" msgstr "" -"\n" -"#\n" -"# Scrivere un messaggio associato al tag\n" -"# Le righe che iniziano con '#' verranno mantenute; possono essere comunque " -"rimosse manualmente.\n" -"#\n" -#: builtin/tag.c:191 +#: builtin/tag.c:192 msgid "unable to sign the tag" msgstr "impossibile firmare il tag" -#: builtin/tag.c:193 +#: builtin/tag.c:194 msgid "unable to write tag file" msgstr "impossibile scrivere il file di tag" -#: builtin/tag.c:218 +#: builtin/tag.c:210 +#, c-format +msgid "" +"You have created a nested tag. The object referred to by your new tag is\n" +"already a tag. If you meant to tag the object that it points to, use:\n" +"\n" +"\tgit tag -f %s %s^{}" +msgstr "" + +#: builtin/tag.c:226 msgid "bad object type." msgstr "tipo di oggetto errato." -#: builtin/tag.c:267 +#: builtin/tag.c:278 msgid "no tag message?" msgstr "nessun messaggio per il tag?" -#: builtin/tag.c:274 +#: builtin/tag.c:285 #, c-format msgid "The tag message has been left in %s\n" msgstr "Il messaggio del tag è stato lasciato in %s\n" -#: builtin/tag.c:385 +#: builtin/tag.c:396 msgid "list tag names" msgstr "" -#: builtin/tag.c:387 +#: builtin/tag.c:398 msgid "print <n> lines of each tag message" msgstr "" -#: builtin/tag.c:389 -#, fuzzy +#: builtin/tag.c:400 msgid "delete tags" -msgstr "elimina" +msgstr "elimina tag" -#: builtin/tag.c:390 +#: builtin/tag.c:401 msgid "verify tags" msgstr "" -#: builtin/tag.c:392 +#: builtin/tag.c:403 msgid "Tag creation options" msgstr "" -#: builtin/tag.c:394 -#, fuzzy +#: builtin/tag.c:405 msgid "annotated tag, needs a message" -msgstr "nessun messaggio per il tag?" +msgstr "tag annotato, richiede un messaggio" -#: builtin/tag.c:396 -#, fuzzy +#: builtin/tag.c:407 msgid "tag message" -msgstr "nessun messaggio per il tag?" +msgstr "messaggio tag" -#: builtin/tag.c:398 -#, fuzzy +#: builtin/tag.c:409 msgid "force edit of tag message" -msgstr "nessun messaggio per il tag?" +msgstr "forza modifica del messaggio tag" -#: builtin/tag.c:399 +#: builtin/tag.c:410 msgid "annotated and GPG-signed tag" msgstr "" -#: builtin/tag.c:403 +#: builtin/tag.c:413 #, fuzzy msgid "use another key to sign the tag" msgstr "impossibile firmare il tag" -#: builtin/tag.c:404 +#: builtin/tag.c:414 msgid "replace the tag if exists" msgstr "" -#: builtin/tag.c:405 builtin/update-ref.c:369 +#: builtin/tag.c:415 builtin/update-ref.c:369 msgid "create a reflog" msgstr "" -#: builtin/tag.c:407 +#: builtin/tag.c:417 msgid "Tag listing options" msgstr "" -#: builtin/tag.c:408 +#: builtin/tag.c:418 msgid "show tag list in columns" msgstr "" -#: builtin/tag.c:409 builtin/tag.c:411 +#: builtin/tag.c:419 builtin/tag.c:421 msgid "print only tags that contain the commit" msgstr "" -#: builtin/tag.c:410 builtin/tag.c:412 +#: builtin/tag.c:420 builtin/tag.c:422 msgid "print only tags that don't contain the commit" msgstr "" -#: builtin/tag.c:413 +#: builtin/tag.c:423 msgid "print only tags that are merged" msgstr "" -#: builtin/tag.c:414 +#: builtin/tag.c:424 msgid "print only tags that are not merged" msgstr "" -#: builtin/tag.c:419 +#: builtin/tag.c:428 msgid "print only tags of the object" msgstr "" -#: builtin/tag.c:463 +#: builtin/tag.c:472 msgid "--column and -n are incompatible" msgstr "--column e -n non sono compatibili" -#: builtin/tag.c:485 +#: builtin/tag.c:494 #, fuzzy msgid "-n option is only allowed in list mode" msgstr "l'opzione -n è consentita solo con -l." -#: builtin/tag.c:487 +#: builtin/tag.c:496 #, fuzzy msgid "--contains option is only allowed in list mode" msgstr "l'opzione --contains è consentita solo con -l." -#: builtin/tag.c:489 +#: builtin/tag.c:498 #, fuzzy msgid "--no-contains option is only allowed in list mode" msgstr "l'opzione --contains è consentita solo con -l." -#: builtin/tag.c:491 +#: builtin/tag.c:500 #, fuzzy msgid "--points-at option is only allowed in list mode" msgstr "l'opzione --points-at è consentita solo con -l." -#: builtin/tag.c:493 +#: builtin/tag.c:502 msgid "--merged and --no-merged options are only allowed in list mode" msgstr "" -#: builtin/tag.c:504 +#: builtin/tag.c:513 msgid "only one -F or -m option is allowed." msgstr "è consentita una sola opzione tra -F e -m." -#: builtin/tag.c:523 +#: builtin/tag.c:532 msgid "too many params" msgstr "troppi parametri" -#: builtin/tag.c:529 +#: builtin/tag.c:538 #, c-format msgid "'%s' is not a valid tag name." msgstr "'%s' non è un nome tag valido." -#: builtin/tag.c:534 +#: builtin/tag.c:543 #, c-format msgid "tag '%s' already exists" msgstr "il tag '%s' esiste già" -#: builtin/tag.c:565 +#: builtin/tag.c:574 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "Tag '%s' aggiornato (era %s)\n" @@ -18876,191 +20133,191 @@ msgstr "" msgid "git update-index [<options>] [--] [<file>...]" msgstr "" -#: builtin/update-index.c:962 +#: builtin/update-index.c:971 msgid "continue refresh even when index needs update" msgstr "" -#: builtin/update-index.c:965 +#: builtin/update-index.c:974 msgid "refresh: ignore submodules" msgstr "" -#: builtin/update-index.c:968 +#: builtin/update-index.c:977 #, fuzzy msgid "do not ignore new files" msgstr "impossibile archiviare index file" -#: builtin/update-index.c:970 +#: builtin/update-index.c:979 msgid "let files replace directories and vice-versa" msgstr "" -#: builtin/update-index.c:972 +#: builtin/update-index.c:981 msgid "notice files missing from worktree" msgstr "" -#: builtin/update-index.c:974 +#: builtin/update-index.c:983 msgid "refresh even if index contains unmerged entries" msgstr "" -#: builtin/update-index.c:977 +#: builtin/update-index.c:986 msgid "refresh stat information" msgstr "" -#: builtin/update-index.c:981 +#: builtin/update-index.c:990 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "" -#: builtin/update-index.c:985 +#: builtin/update-index.c:994 msgid "<mode>,<object>,<path>" msgstr "" -#: builtin/update-index.c:986 +#: builtin/update-index.c:995 #, fuzzy msgid "add the specified entry to the index" msgstr "Aggiunge il contenuto del file a index" -#: builtin/update-index.c:995 +#: builtin/update-index.c:1005 msgid "mark files as \"not changing\"" msgstr "" -#: builtin/update-index.c:998 +#: builtin/update-index.c:1008 msgid "clear assumed-unchanged bit" msgstr "" -#: builtin/update-index.c:1001 +#: builtin/update-index.c:1011 msgid "mark files as \"index-only\"" msgstr "" -#: builtin/update-index.c:1004 +#: builtin/update-index.c:1014 msgid "clear skip-worktree bit" msgstr "" -#: builtin/update-index.c:1007 +#: builtin/update-index.c:1017 msgid "add to index only; do not add content to object database" msgstr "" -#: builtin/update-index.c:1009 +#: builtin/update-index.c:1019 msgid "remove named paths even if present in worktree" msgstr "" -#: builtin/update-index.c:1011 +#: builtin/update-index.c:1021 msgid "with --stdin: input lines are terminated by null bytes" msgstr "" -#: builtin/update-index.c:1013 +#: builtin/update-index.c:1023 #, fuzzy msgid "read list of paths to be updated from standard input" msgstr "(lettura del messaggio di log dallo standard input)\n" -#: builtin/update-index.c:1017 +#: builtin/update-index.c:1027 #, fuzzy msgid "add entries from standard input to the index" msgstr "non è stato possibile leggere il log dallo standard input" -#: builtin/update-index.c:1021 +#: builtin/update-index.c:1031 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "" -#: builtin/update-index.c:1025 +#: builtin/update-index.c:1035 msgid "only update entries that differ from HEAD" msgstr "" -#: builtin/update-index.c:1029 +#: builtin/update-index.c:1039 msgid "ignore files missing from worktree" msgstr "" -#: builtin/update-index.c:1032 +#: builtin/update-index.c:1042 msgid "report actions to standard output" msgstr "" -#: builtin/update-index.c:1034 +#: builtin/update-index.c:1044 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "" -#: builtin/update-index.c:1038 +#: builtin/update-index.c:1048 msgid "write index in this format" msgstr "" -#: builtin/update-index.c:1040 +#: builtin/update-index.c:1050 #, fuzzy msgid "enable or disable split index" msgstr "Impossibile scrivere index." -#: builtin/update-index.c:1042 +#: builtin/update-index.c:1052 msgid "enable/disable untracked cache" msgstr "" -#: builtin/update-index.c:1044 +#: builtin/update-index.c:1054 msgid "test if the filesystem supports untracked cache" msgstr "" -#: builtin/update-index.c:1046 +#: builtin/update-index.c:1056 msgid "enable untracked cache without testing the filesystem" msgstr "" -#: builtin/update-index.c:1048 +#: builtin/update-index.c:1058 msgid "write out the index even if is not flagged as changed" msgstr "" -#: builtin/update-index.c:1050 +#: builtin/update-index.c:1060 #, fuzzy msgid "enable or disable file system monitor" msgstr "impossibile gestire il tipo di file %d" -#: builtin/update-index.c:1052 +#: builtin/update-index.c:1062 msgid "mark files as fsmonitor valid" msgstr "" -#: builtin/update-index.c:1055 +#: builtin/update-index.c:1065 msgid "clear fsmonitor valid bit" msgstr "" -#: builtin/update-index.c:1156 +#: builtin/update-index.c:1168 msgid "" "core.splitIndex is set to false; remove or change it, if you really want to " "enable split index" msgstr "" -#: builtin/update-index.c:1165 +#: builtin/update-index.c:1177 msgid "" "core.splitIndex is set to true; remove or change it, if you really want to " "disable split index" msgstr "" -#: builtin/update-index.c:1176 +#: builtin/update-index.c:1188 msgid "" "core.untrackedCache is set to true; remove or change it, if you really want " "to disable the untracked cache" msgstr "" -#: builtin/update-index.c:1180 +#: builtin/update-index.c:1192 msgid "Untracked cache disabled" msgstr "" -#: builtin/update-index.c:1188 +#: builtin/update-index.c:1200 msgid "" "core.untrackedCache is set to false; remove or change it, if you really want " "to enable the untracked cache" msgstr "" -#: builtin/update-index.c:1192 +#: builtin/update-index.c:1204 #, fuzzy, c-format msgid "Untracked cache enabled for '%s'" msgstr "make_cache_entry non riuscito per il path '%s'" -#: builtin/update-index.c:1200 +#: builtin/update-index.c:1212 msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor" msgstr "" -#: builtin/update-index.c:1204 +#: builtin/update-index.c:1216 msgid "fsmonitor enabled" msgstr "" -#: builtin/update-index.c:1207 +#: builtin/update-index.c:1219 msgid "" "core.fsmonitor is set; remove it if you really want to disable fsmonitor" msgstr "" -#: builtin/update-index.c:1211 +#: builtin/update-index.c:1223 msgid "fsmonitor disabled" msgstr "" @@ -19104,6 +20361,10 @@ msgstr "" msgid "git upload-pack [<options>] <dir>" msgstr "" +#: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17 +msgid "quit after a single request/response exchange" +msgstr "" + #: builtin/upload-pack.c:25 msgid "exit immediately after initial ref advertisement" msgstr "" @@ -19179,7 +20440,7 @@ msgstr "" msgid "git worktree unlock <path>" msgstr "" -#: builtin/worktree.c:61 builtin/worktree.c:888 +#: builtin/worktree.c:61 builtin/worktree.c:891 #, fuzzy, c-format msgid "failed to delete '%s'" msgstr "apertura di '%s' non riuscita" @@ -19248,178 +20509,178 @@ msgid "" "use 'add -f' to override, or 'prune' or 'remove' to clear" msgstr "" -#: builtin/worktree.c:310 +#: builtin/worktree.c:302 #, fuzzy, c-format msgid "could not create directory of '%s'" msgstr "Non è stato possibile creare la directory '%s'" -#: builtin/worktree.c:429 builtin/worktree.c:435 +#: builtin/worktree.c:432 builtin/worktree.c:438 #, fuzzy, c-format msgid "Preparing worktree (new branch '%s')" msgstr "Errore nella rimozione del branch '%s'" -#: builtin/worktree.c:431 +#: builtin/worktree.c:434 #, c-format msgid "Preparing worktree (resetting branch '%s'; was at %s)" msgstr "" -#: builtin/worktree.c:440 +#: builtin/worktree.c:443 #, c-format msgid "Preparing worktree (checking out '%s')" msgstr "" -#: builtin/worktree.c:446 +#: builtin/worktree.c:449 #, c-format msgid "Preparing worktree (detached HEAD %s)" msgstr "" -#: builtin/worktree.c:487 +#: builtin/worktree.c:490 msgid "checkout <branch> even if already checked out in other worktree" msgstr "" -#: builtin/worktree.c:490 +#: builtin/worktree.c:493 #, fuzzy msgid "create a new branch" msgstr "[nuovo branch]" -#: builtin/worktree.c:492 +#: builtin/worktree.c:495 #, fuzzy msgid "create or reset a branch" msgstr "Elenca, crea o elimina branch" -#: builtin/worktree.c:494 +#: builtin/worktree.c:497 msgid "populate the new working tree" msgstr "" -#: builtin/worktree.c:495 +#: builtin/worktree.c:498 msgid "keep the new working tree locked" msgstr "" -#: builtin/worktree.c:498 +#: builtin/worktree.c:501 msgid "set up tracking mode (see git-branch(1))" msgstr "" -#: builtin/worktree.c:501 +#: builtin/worktree.c:504 msgid "try to match the new branch name with a remote-tracking branch" msgstr "" -#: builtin/worktree.c:509 +#: builtin/worktree.c:512 #, fuzzy msgid "-b, -B, and --detach are mutually exclusive" msgstr "-A e -u sono reciprocamente incompatibili" -#: builtin/worktree.c:570 +#: builtin/worktree.c:573 msgid "--[no-]track can only be used if a new branch is created" msgstr "" -#: builtin/worktree.c:670 +#: builtin/worktree.c:673 msgid "reason for locking" msgstr "" -#: builtin/worktree.c:682 builtin/worktree.c:715 builtin/worktree.c:789 -#: builtin/worktree.c:916 +#: builtin/worktree.c:685 builtin/worktree.c:718 builtin/worktree.c:792 +#: builtin/worktree.c:919 #, fuzzy, c-format msgid "'%s' is not a working tree" msgstr "'%s' non è un commit" -#: builtin/worktree.c:684 builtin/worktree.c:717 +#: builtin/worktree.c:687 builtin/worktree.c:720 msgid "The main working tree cannot be locked or unlocked" msgstr "" -#: builtin/worktree.c:689 +#: builtin/worktree.c:692 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "" -#: builtin/worktree.c:691 +#: builtin/worktree.c:694 #, fuzzy, c-format msgid "'%s' is already locked" msgstr "il tag '%s' esiste già" -#: builtin/worktree.c:719 +#: builtin/worktree.c:722 #, fuzzy, c-format msgid "'%s' is not locked" msgstr "'%s' non è un commit" -#: builtin/worktree.c:760 +#: builtin/worktree.c:763 msgid "working trees containing submodules cannot be moved or removed" msgstr "" -#: builtin/worktree.c:768 +#: builtin/worktree.c:771 msgid "force move even if worktree is dirty or locked" msgstr "" -#: builtin/worktree.c:791 builtin/worktree.c:918 +#: builtin/worktree.c:794 builtin/worktree.c:921 #, c-format msgid "'%s' is a main working tree" msgstr "" -#: builtin/worktree.c:796 +#: builtin/worktree.c:799 #, fuzzy, c-format msgid "could not figure out destination name from '%s'" msgstr "Non è stato possibile leggere da '%s'" -#: builtin/worktree.c:802 +#: builtin/worktree.c:805 #, fuzzy, c-format msgid "target '%s' already exists" msgstr "il tag '%s' esiste già" -#: builtin/worktree.c:810 +#: builtin/worktree.c:813 #, 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:812 +#: builtin/worktree.c:815 msgid "" "cannot move a locked working tree;\n" "use 'move -f -f' to override or unlock first" msgstr "" -#: builtin/worktree.c:815 +#: builtin/worktree.c:818 #, c-format msgid "validation failed, cannot move working tree: %s" msgstr "" -#: builtin/worktree.c:820 +#: builtin/worktree.c:823 #, fuzzy, c-format msgid "failed to move '%s' to '%s'" msgstr "impossibile spostare %s in %s" -#: builtin/worktree.c:868 +#: builtin/worktree.c:871 #, fuzzy, c-format msgid "failed to run 'git status' on '%s'" msgstr "stat di '%s' non riuscito" -#: builtin/worktree.c:872 +#: builtin/worktree.c:875 #, c-format msgid "'%s' is dirty, use --force to delete it" msgstr "" -#: builtin/worktree.c:877 +#: builtin/worktree.c:880 #, fuzzy, c-format msgid "failed to run 'git status' on '%s', code %d" msgstr "stat di '%s' non riuscito" -#: builtin/worktree.c:900 +#: builtin/worktree.c:903 msgid "force removal even if worktree is dirty or locked" msgstr "" -#: builtin/worktree.c:923 +#: builtin/worktree.c:926 #, 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:925 +#: builtin/worktree.c:928 msgid "" "cannot remove a locked working tree;\n" "use 'remove -f -f' to override or unlock first" msgstr "" -#: builtin/worktree.c:928 +#: builtin/worktree.c:931 #, c-format msgid "validation failed, cannot remove working tree: %s" msgstr "" @@ -19463,6 +20724,15 @@ msgstr "il path '%s' non ha la nostra versione" msgid "too many commits marked reachable" msgstr "troppi commit da scrivere nel grafo" +#: t/helper/test-serve-v2.c:7 +#, fuzzy +msgid "test-tool serve-v2 [<options>]" +msgstr "git apply [opzioni] [<patch>...]" + +#: t/helper/test-serve-v2.c:19 +msgid "exit immediately after advertising capabilities" +msgstr "" + #: git.c:27 msgid "" "git [--version] [--help] [-C <path>] [-c <name>=<value>]\n" @@ -19480,99 +20750,99 @@ msgid "" "to read about a specific subcommand or concept." msgstr "" -#: git.c:174 +#: git.c:185 #, c-format msgid "no directory given for --git-dir\n" msgstr "" -#: git.c:188 +#: git.c:199 #, c-format msgid "no namespace given for --namespace\n" msgstr "" -#: git.c:202 +#: git.c:213 #, c-format msgid "no directory given for --work-tree\n" msgstr "" -#: git.c:216 +#: git.c:227 #, c-format msgid "no prefix given for --super-prefix\n" msgstr "" -#: git.c:238 +#: git.c:249 #, c-format msgid "-c expects a configuration string\n" msgstr "" -#: git.c:276 +#: git.c:287 #, c-format msgid "no directory given for -C\n" msgstr "" -#: git.c:301 +#: git.c:313 #, fuzzy, c-format msgid "unknown option: %s\n" msgstr "sconosciuto: %s" -#: git.c:342 +#: git.c:359 #, c-format msgid "while expanding alias '%s': '%s'" msgstr "" -#: git.c:351 +#: git.c:368 #, c-format msgid "" "alias '%s' changes environment variables.\n" "You can use '!git' in the alias to do this" msgstr "" -#: git.c:359 +#: git.c:376 #, c-format msgid "empty alias for %s" msgstr "" -#: git.c:362 +#: git.c:379 #, c-format msgid "recursive alias: %s" msgstr "" -#: git.c:437 +#: git.c:459 msgid "write failure on standard output" msgstr "" -#: git.c:439 +#: git.c:461 msgid "unknown write failure on standard output" msgstr "" -#: git.c:441 +#: git.c:463 #, fuzzy msgid "close failed on standard output" msgstr "riga configurazione %d errata nello standard input" -#: git.c:720 +#: git.c:797 #, c-format msgid "alias loop detected: expansion of '%s' does not terminate:%s" msgstr "" -#: git.c:770 +#: git.c:847 #, fuzzy, c-format msgid "cannot handle %s as a builtin" msgstr "impossibile usare %s come file di esclusione" -#: git.c:783 +#: git.c:860 #, fuzzy, c-format msgid "" "usage: %s\n" "\n" msgstr "uso: %s" -#: git.c:803 +#: git.c:880 #, c-format msgid "expansion of alias '%s' failed; '%s' is not a git command\n" msgstr "" -#: git.c:815 +#: git.c:892 #, fuzzy, c-format msgid "failed to run command '%s': %s\n" msgstr "esecuzione di '%s' non riuscita: %s" @@ -19613,7 +20883,7 @@ msgstr "" msgid "Could not set SSL backend to '%s': already set" msgstr "Non è stato possibile rimuovere il branch %s" -#: http.c:1959 +#: http.c:1965 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -19621,31 +20891,164 @@ msgid "" " redirect: %s" msgstr "" -#: remote-curl.c:455 +#: remote-curl.c:157 +#, fuzzy, c-format +msgid "invalid quoting in push-option value: '%s'" +msgstr "Valore di %s errato: '%s'" + +#: remote-curl.c:254 +#, fuzzy, c-format +msgid "%sinfo/refs not valid: is this a git repository?" +msgstr "'%s' non riconosciuto come repository Git" + +#: remote-curl.c:355 +#, fuzzy +msgid "invalid server response; expected service, got flush packet" +msgstr "git archive: attesi ACK/NAK, ricevuto pacchetto di flush" + +#: remote-curl.c:386 +#, fuzzy, c-format +msgid "invalid server response; got '%s'" +msgstr "responso ls-refs non valido: %s" + +#: remote-curl.c:446 +#, fuzzy, c-format +msgid "repository '%s' not found" +msgstr "branch '%s' non trovato." + +#: remote-curl.c:450 +#, fuzzy, c-format +msgid "Authentication failed for '%s'" +msgstr "valore mancante per %s" + +#: remote-curl.c:454 +#, fuzzy, c-format +msgid "unable to access '%s': %s" +msgstr "impossibile accedere a '%s'" + +#: remote-curl.c:460 #, c-format msgid "redirecting to %s" msgstr "" -#: parse-options.h:154 +#: remote-curl.c:584 +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" +msgstr "" + +#: remote-curl.c:724 +#, fuzzy, c-format +msgid "RPC failed; %s" +msgstr "non riuscito: %d" + +#: remote-curl.c:764 +#, fuzzy +msgid "cannot handle pushes this big" +msgstr "impossibile usare %s come file di esclusione" + +#: remote-curl.c:879 +#, c-format +msgid "cannot deflate request; zlib deflate error %d" +msgstr "" + +#: remote-curl.c:883 +#, c-format +msgid "cannot deflate request; zlib end error %d" +msgstr "" + +#: remote-curl.c:1014 +#, fuzzy +msgid "dumb http transport does not support shallow capabilities" +msgstr "Il server non supporta client shallow" + +#: remote-curl.c:1028 +#, fuzzy +msgid "fetch failed." +msgstr "esecuzione di stash non riuscita" + +#: remote-curl.c:1076 +msgid "cannot fetch by sha1 over smart http" +msgstr "" + +#: remote-curl.c:1120 remote-curl.c:1126 +#, fuzzy, c-format +msgid "protocol error: expected sha/ref, got '%s'" +msgstr "errore protocollo: atteso SHA1 shallow, ricevuto '%s'" + +#: remote-curl.c:1138 remote-curl.c:1252 +#, fuzzy, c-format +msgid "http transport does not support %s" +msgstr "la variante SSH 'simple' non supporta -4" + +#: remote-curl.c:1174 +#, fuzzy +msgid "git-http-push failed" +msgstr "esecuzione di stash non riuscita" + +#: remote-curl.c:1360 +msgid "remote-curl: usage: git remote-curl <remote> [<url>]" +msgstr "" + +#: remote-curl.c:1392 +msgid "remote-curl: error reading command stream from git" +msgstr "" + +#: remote-curl.c:1399 +msgid "remote-curl: fetch attempted without a local repo" +msgstr "" + +#: remote-curl.c:1439 +#, c-format +msgid "remote-curl: unknown command '%s' from git" +msgstr "" + +#: list-objects-filter-options.h:61 +msgid "args" +msgstr "" + +#: list-objects-filter-options.h:62 +msgid "object filtering" +msgstr "" + +#: parse-options.h:170 msgid "expiry-date" msgstr "" -#: parse-options.h:169 +#: parse-options.h:184 msgid "no-op (backward compatibility)" msgstr "" -#: parse-options.h:259 +#: parse-options.h:304 msgid "be more verbose" msgstr "più dettagliato" -#: parse-options.h:261 +#: parse-options.h:306 msgid "be more quiet" msgstr "meno dettagliato" -#: parse-options.h:267 +#: parse-options.h:312 msgid "use <n> digits to display SHA-1s" msgstr "usare <n> cifre per mostrare gli hash SHA-1" +#: parse-options.h:331 +msgid "how to strip spaces and #comments from message" +msgstr "come rimuovere gli spazi e i #commenti dal messaggio" + +#: ref-filter.h:101 +msgid "key" +msgstr "chiave" + +#: ref-filter.h:101 +msgid "field name to sort on" +msgstr "nome campo in base a cui ordinare" + +#: rerere.h:44 +msgid "update the index with reused conflict resolution if possible" +msgstr "" + #: command-list.h:50 msgid "Add file contents to the index" msgstr "Aggiunge il contenuto del file a index" @@ -19909,7 +21312,7 @@ msgid "Instantly browse your working repository in gitweb" msgstr "" #: command-list.h:113 -msgid "add or parse structured information in commit messages" +msgid "Add or parse structured information in commit messages" msgstr "" #: command-list.h:114 @@ -20310,18 +21713,6 @@ msgstr "" msgid "An overview of recommended workflows with Git" msgstr "" -#: list-objects-filter-options.h:63 -msgid "args" -msgstr "" - -#: list-objects-filter-options.h:64 -msgid "object filtering" -msgstr "" - -#: rerere.h:44 -msgid "update the index with reused conflict resolution if possible" -msgstr "" - #: git-bisect.sh:54 msgid "You need to start by \"git bisect start\"" msgstr "Devi iniziare con \"git bisect start\"" @@ -20445,277 +21836,114 @@ msgstr "" msgid "Simple merge did not work, trying automatic merge." msgstr "" -#: git-legacy-rebase.sh:445 -#, fuzzy, sh-format -msgid "Could not move back to $head_name" -msgstr "Non è stato possibile rimuovere il branch %s" - -#: git-legacy-rebase.sh:471 -#, sh-format -msgid "" -"It seems that there is already a $state_dir_base directory, and\n" -"I wonder if you are in the middle of another rebase. If that is the\n" -"case, please try\n" -"\t$cmd_live_rebase\n" -"If that is not the case, please\n" -"\t$cmd_clear_stale_rebase\n" -"and run me again. I am stopping in case you still have something\n" -"valuable there." -msgstr "" - -#: git-legacy-rebase.sh:523 -msgid "" -"fatal: cannot combine am options with either interactive or merge options" -msgstr "" - -#: git-legacy-rebase.sh:530 -#, fuzzy -msgid "fatal: cannot combine '--signoff' with '--preserve-merges'" -msgstr "Impossibile combinare --no-ff con --ff-only." - -#: git-legacy-rebase.sh:541 -#, fuzzy -msgid "fatal: cannot combine '--preserve-merges' with '--rebase-merges'" -msgstr "Impossibile combinare --no-ff con --ff-only." - -#: git-legacy-rebase.sh:550 -#, fuzzy -msgid "fatal: cannot combine '--rebase-merges' with '--strategy-option'" -msgstr "Impossibile combinare --no-ff con --ff-only." - -#: git-legacy-rebase.sh:552 -#, fuzzy -msgid "fatal: cannot combine '--rebase-merges' with '--strategy'" -msgstr "Impossibile combinare --no-ff con --ff-only." - -#: git-legacy-rebase.sh:578 -#, sh-format -msgid "invalid upstream '$upstream_name'" -msgstr "" - -#: git-legacy-rebase.sh:602 -#, sh-format -msgid "$onto_name: there are more than one merge bases" -msgstr "" - -#: git-legacy-rebase.sh:605 git-legacy-rebase.sh:609 -#, sh-format -msgid "$onto_name: there is no merge base" -msgstr "" - -#: git-legacy-rebase.sh:614 -#, fuzzy, sh-format -msgid "Does not point to a valid commit: $onto_name" -msgstr "'%s' non punta ad un commit" - -#: git-legacy-rebase.sh:640 -#, sh-format -msgid "fatal: no such branch/commit '$branch_name'" -msgstr "" - -#: git-legacy-rebase.sh:678 -#, sh-format -msgid "Created autostash: $stash_abbrev" -msgstr "" - -#: git-legacy-rebase.sh:707 -#, sh-format -msgid "Current branch $branch_name is up to date." -msgstr "" - -#: git-legacy-rebase.sh:717 -#, sh-format -msgid "Current branch $branch_name is up to date, rebase forced." -msgstr "" - -#: git-legacy-rebase.sh:731 -#, fuzzy, sh-format -msgid "Changes to $onto:" -msgstr "Modifiche di cui verrà eseguito il commit:" - -#: git-legacy-rebase.sh:733 -#, sh-format -msgid "Changes from $mb to $onto:" -msgstr "" - -#: git-legacy-rebase.sh:743 -#, sh-format -msgid "Fast-forwarded $branch_name to $onto_name." -msgstr "" - -#: git-legacy-rebase.sh:757 -msgid "First, rewinding head to replay your work on top of it..." -msgstr "" - -#: git-stash.sh:75 -msgid "git stash clear with parameters is unimplemented" -msgstr "git stash clear con parametri non è implementato" - -#: git-stash.sh:125 -msgid "You do not have the initial commit yet" -msgstr "Non hai ancora un commit iniziale" - -#: git-stash.sh:140 -msgid "Cannot save the current index state" -msgstr "Impossibile salvare lo stato corrente di index" - -#: git-stash.sh:155 -#, fuzzy -msgid "Cannot save the untracked files" -msgstr "Impossibile salvare lo stato corrente di index" - -#: git-stash.sh:175 git-stash.sh:188 -msgid "Cannot save the current worktree state" -msgstr "" - -#: git-stash.sh:192 -msgid "No changes selected" -msgstr "Nessuna modifica selezionata" - -#: git-stash.sh:195 +#: git-legacy-stash.sh:220 msgid "Cannot remove temporary index (can't happen)" msgstr "" -#: git-stash.sh:208 -msgid "Cannot record working tree state" -msgstr "" - -#: git-stash.sh:246 +#: git-legacy-stash.sh:271 #, sh-format msgid "Cannot update $ref_stash with $w_commit" msgstr "" -#: git-stash.sh:298 +#: git-legacy-stash.sh:323 #, sh-format msgid "error: unknown option for 'stash push': $option" msgstr "" -#: git-stash.sh:312 -msgid "Can't use --patch and --include-untracked or --all at the same time" -msgstr "" - -#: git-stash.sh:320 -msgid "No local changes to save" -msgstr "Nessuna modifica locale da salvare" - -#: git-stash.sh:325 -msgid "Cannot initialize stash" -msgstr "Impossibile inizializzare stash" - -#: git-stash.sh:329 -msgid "Cannot save the current status" -msgstr "Impossibile salvare lo stato attuale" - -#: git-stash.sh:330 +#: git-legacy-stash.sh:355 #, sh-format msgid "Saved working directory and index state $stash_msg" msgstr "" -#: git-stash.sh:359 -msgid "Cannot remove worktree changes" -msgstr "" - -#: git-stash.sh:507 +#: git-legacy-stash.sh:535 #, sh-format msgid "unknown option: $opt" msgstr "" -#: git-stash.sh:520 -#, fuzzy -msgid "No stash entries found." -msgstr "Nessuno stash trovato." - -#: git-stash.sh:527 +#: git-legacy-stash.sh:555 #, sh-format msgid "Too many revisions specified: $REV" msgstr "Troppe revisioni specificate: $REV" -#: git-stash.sh:542 +#: git-legacy-stash.sh:570 #, fuzzy, sh-format msgid "$reference is not a valid reference" msgstr "$reference non è un riferimento valido" -#: git-stash.sh:570 +#: git-legacy-stash.sh:598 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "'$args' non è un commit di tipo stash" -#: git-stash.sh:581 +#: git-legacy-stash.sh:609 #, sh-format msgid "'$args' is not a stash reference" msgstr "'$args' non è un referimento a uno stash" -#: git-stash.sh:589 +#: git-legacy-stash.sh:617 msgid "unable to refresh index" msgstr "impossibile aggiornare index" -#: git-stash.sh:593 +#: git-legacy-stash.sh:621 msgid "Cannot apply a stash in the middle of a merge" msgstr "Impossibile applicare uno stash nel mezzo di un merge" -#: git-stash.sh:601 +#: git-legacy-stash.sh:629 msgid "Conflicts in index. Try without --index." msgstr "Ci sono conflitti in index. Prova senza --index." -#: git-stash.sh:603 +#: git-legacy-stash.sh:631 msgid "Could not save index tree" msgstr "" -#: git-stash.sh:612 +#: git-legacy-stash.sh:640 #, fuzzy msgid "Could not restore untracked files from stash entry" msgstr "non è stato possibile leggere il log dallo standard input" -#: git-stash.sh:637 +#: git-legacy-stash.sh:665 msgid "Cannot unstage modified files" msgstr "" -#: git-stash.sh:652 -msgid "Index was not unstashed." -msgstr "" - -#: git-stash.sh:666 -msgid "The stash entry is kept in case you need it again." -msgstr "" - -#: git-stash.sh:675 +#: git-legacy-stash.sh:703 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "${REV} eliminata ($s)" -#: git-stash.sh:676 +#: git-legacy-stash.sh:704 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "${REV}: non è stato possibile rimuovere la voce di stash" -#: git-stash.sh:684 -msgid "No branch name specified" -msgstr "Nome del branch non specificato" - -#: git-stash.sh:763 +#: git-legacy-stash.sh:791 msgid "(To restore them type \"git stash apply\")" msgstr "(Per ripristinarli digita \"git stash apply\")" -#: git-submodule.sh:198 +#: git-submodule.sh:200 msgid "Relative path can only be used from the toplevel of the working tree" msgstr "" -#: git-submodule.sh:208 +#: git-submodule.sh:210 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "repo URL: '$repo' deve essere assoluto o iniziare con ./|../" -#: git-submodule.sh:227 +#: git-submodule.sh:229 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "'$sm_path' esiste già in index" -#: git-submodule.sh:230 +#: git-submodule.sh:232 #, fuzzy, sh-format msgid "'$sm_path' already exists in the index and is not a submodule" msgstr "'$sm_path' esiste già in index" -#: git-submodule.sh:236 +#: git-submodule.sh:239 +#, fuzzy, sh-format +msgid "'$sm_path' does not have a commit checked out" +msgstr "il percorso '%s' non ha la loro versione" + +#: git-submodule.sh:245 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -20726,22 +21954,22 @@ msgstr "" "$sm_path\n" "Usa -f se vuoi davvero aggiungerlo." -#: git-submodule.sh:259 +#: git-submodule.sh:268 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "" -#: git-submodule.sh:261 +#: git-submodule.sh:270 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "'$sm_path' esiste già e non è un repository git valido" -#: git-submodule.sh:269 +#: git-submodule.sh:278 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "" -#: git-submodule.sh:271 +#: git-submodule.sh:280 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from\n" @@ -20752,121 +21980,123 @@ msgid "" "option." msgstr "" -#: git-submodule.sh:277 +#: git-submodule.sh:286 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "" -#: git-submodule.sh:289 +#: git-submodule.sh:298 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "" -#: git-submodule.sh:294 +#: git-submodule.sh:303 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "" -#: git-submodule.sh:303 +#: git-submodule.sh:312 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "" -#: git-submodule.sh:563 +#: git-submodule.sh:573 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:573 +#: git-submodule.sh:583 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:578 +#: git-submodule.sh:588 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " "'$sm_path'" msgstr "" -#: git-submodule.sh:596 +#: git-submodule.sh:606 #, sh-format -msgid "Unable to fetch in submodule path '$displaypath'" +msgid "" +"Unable to fetch in submodule path '$displaypath'; trying to directly fetch " +"$sha1:" msgstr "" -#: git-submodule.sh:602 +#: git-submodule.sh:612 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " "Direct fetching of that commit failed." msgstr "" -#: git-submodule.sh:609 +#: git-submodule.sh:619 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:610 +#: git-submodule.sh:620 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "" -#: git-submodule.sh:614 +#: git-submodule.sh:624 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:615 +#: git-submodule.sh:625 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "" -#: git-submodule.sh:620 +#: git-submodule.sh:630 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:621 +#: git-submodule.sh:631 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "" -#: git-submodule.sh:626 +#: git-submodule.sh:636 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:627 +#: git-submodule.sh:637 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "" -#: git-submodule.sh:658 +#: git-submodule.sh:668 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:754 +#: git-submodule.sh:830 #, fuzzy msgid "The --cached option cannot be used with the --files option" msgstr "--cached non può essere usata con --files" -#: git-submodule.sh:806 +#: git-submodule.sh:882 #, sh-format msgid "unexpected mode $mod_dst" msgstr "modalità $mod_dst inattesa" -#: git-submodule.sh:826 +#: git-submodule.sh:902 #, fuzzy, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr " Attenzione: $name non contiene commit $sha1_src" -#: git-submodule.sh:829 +#: git-submodule.sh:905 #, fuzzy, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr " Attenzione: $name non contiene commit $sha1_dst" -#: git-submodule.sh:832 +#: git-submodule.sh:908 #, fuzzy, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr " Attenzione: $name non contiene commit $sha1_src e $sha1_dst" @@ -21135,56 +22365,56 @@ msgstr "Non è stato possibile analizzare il commit %s\n" msgid "usage: $dashless $USAGE" msgstr "" -#: git-sh-setup.sh:190 +#: git-sh-setup.sh:191 #, sh-format msgid "Cannot chdir to $cdup, the toplevel of the working tree" msgstr "" -#: git-sh-setup.sh:199 git-sh-setup.sh:206 +#: git-sh-setup.sh:200 git-sh-setup.sh:207 #, sh-format msgid "fatal: $program_name cannot be used without a working tree." msgstr "" -#: git-sh-setup.sh:220 +#: git-sh-setup.sh:221 #, fuzzy msgid "Cannot rebase: You have unstaged changes." msgstr "Impossibile eseguire il rebase su branch multipli" -#: git-sh-setup.sh:223 +#: git-sh-setup.sh:224 msgid "Cannot rewrite branches: You have unstaged changes." msgstr "" -#: git-sh-setup.sh:226 +#: git-sh-setup.sh:227 msgid "Cannot pull with rebase: You have unstaged changes." msgstr "" -#: git-sh-setup.sh:229 +#: git-sh-setup.sh:230 #, sh-format msgid "Cannot $action: You have unstaged changes." msgstr "" -#: git-sh-setup.sh:242 +#: git-sh-setup.sh:243 msgid "Cannot rebase: Your index contains uncommitted changes." msgstr "" -#: git-sh-setup.sh:245 +#: git-sh-setup.sh:246 msgid "Cannot pull with rebase: Your index contains uncommitted changes." msgstr "" -#: git-sh-setup.sh:248 +#: git-sh-setup.sh:249 #, sh-format msgid "Cannot $action: Your index contains uncommitted changes." msgstr "" -#: git-sh-setup.sh:252 +#: git-sh-setup.sh:253 msgid "Additionally, your index contains uncommitted changes." msgstr "" -#: git-sh-setup.sh:372 +#: git-sh-setup.sh:373 msgid "You need to run this command from the toplevel of the working tree." msgstr "" -#: git-sh-setup.sh:377 +#: git-sh-setup.sh:378 msgid "Unable to determine absolute path of git directory" msgstr "" @@ -21676,7 +22906,7 @@ msgstr "" msgid "--dump-aliases incompatible with other options\n" msgstr "--patch non è compatibile con tutte le altre opzioni" -#: git-send-email.perl:395 git-send-email.perl:650 +#: git-send-email.perl:395 git-send-email.perl:656 #, fuzzy msgid "Cannot run git format-patch from outside a repository\n" msgstr "--cached al di fuori di un repository" @@ -21687,37 +22917,37 @@ msgid "" "configuration option)\n" msgstr "" -#: git-send-email.perl:468 +#: git-send-email.perl:470 #, perl-format msgid "Unknown --suppress-cc field: '%s'\n" msgstr "" -#: git-send-email.perl:497 +#: git-send-email.perl:501 #, fuzzy, perl-format msgid "Unknown --confirm setting: '%s'\n" msgstr "Commit %s sconosciuto" -#: git-send-email.perl:525 +#: git-send-email.perl:529 #, perl-format msgid "warning: sendmail alias with quotes is not supported: %s\n" msgstr "" -#: git-send-email.perl:527 +#: git-send-email.perl:531 #, perl-format msgid "warning: `:include:` not supported: %s\n" msgstr "" -#: git-send-email.perl:529 +#: git-send-email.perl:533 #, perl-format msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" msgstr "" -#: git-send-email.perl:534 +#: git-send-email.perl:538 #, perl-format msgid "warning: sendmail line is not recognized: %s\n" msgstr "" -#: git-send-email.perl:616 +#: git-send-email.perl:622 #, perl-format msgid "" "File '%s' exists but it could also be the range of commits\n" @@ -21727,19 +22957,19 @@ msgid "" " * Giving --format-patch option if you mean a range.\n" msgstr "" -#: git-send-email.perl:637 +#: git-send-email.perl:643 #, fuzzy, perl-format msgid "Failed to opendir %s: %s" msgstr "apertura di '%s' non riuscita" -#: git-send-email.perl:661 +#: git-send-email.perl:667 #, perl-format msgid "" "fatal: %s: %s\n" "warning: no patches were sent\n" msgstr "" -#: git-send-email.perl:672 +#: git-send-email.perl:678 #, fuzzy msgid "" "\n" @@ -21747,17 +22977,17 @@ msgid "" "\n" msgstr "Nome del branch non specificato" -#: git-send-email.perl:685 +#: git-send-email.perl:691 #, perl-format msgid "No subject line in %s?" msgstr "" -#: git-send-email.perl:695 +#: git-send-email.perl:701 #, fuzzy, perl-format msgid "Failed to open for writing %s: %s" msgstr "Non è stato possibile aprire '%s' per la scrittura" -#: git-send-email.perl:706 +#: git-send-email.perl:712 msgid "" "Lines beginning in \"GIT:\" will be removed.\n" "Consider including an overall diffstat or table of contents\n" @@ -21766,37 +22996,37 @@ msgid "" "Clear the body content if you don't wish to send a summary.\n" msgstr "" -#: git-send-email.perl:730 +#: git-send-email.perl:736 #, fuzzy, perl-format msgid "Failed to open %s: %s" msgstr "apertura di '%s' non riuscita" -#: git-send-email.perl:747 +#: git-send-email.perl:753 #, fuzzy, perl-format msgid "Failed to open %s.final: %s" msgstr "apertura di '%s' non riuscita" -#: git-send-email.perl:790 +#: git-send-email.perl:796 msgid "Summary email is empty, skipping it\n" msgstr "" #. TRANSLATORS: please keep [y/N] as is. -#: git-send-email.perl:825 +#: git-send-email.perl:831 #, perl-format msgid "Are you sure you want to use <%s> [y/N]? " msgstr "" -#: git-send-email.perl:880 +#: git-send-email.perl:886 msgid "" "The following files are 8bit, but do not declare a Content-Transfer-" "Encoding.\n" msgstr "" -#: git-send-email.perl:885 +#: git-send-email.perl:891 msgid "Which 8bit encoding should I declare [UTF-8]? " msgstr "" -#: git-send-email.perl:893 +#: git-send-email.perl:899 #, perl-format msgid "" "Refusing to send because the patch\n" @@ -21805,20 +23035,20 @@ msgid "" "want to send.\n" msgstr "" -#: git-send-email.perl:912 +#: git-send-email.perl:918 msgid "To whom should the emails be sent (if anyone)?" msgstr "" -#: git-send-email.perl:930 +#: git-send-email.perl:936 #, perl-format msgid "fatal: alias '%s' expands to itself\n" msgstr "" -#: git-send-email.perl:942 +#: git-send-email.perl:948 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? " msgstr "" -#: git-send-email.perl:1000 git-send-email.perl:1008 +#: git-send-email.perl:1006 git-send-email.perl:1014 #, perl-format msgid "error: unable to extract a valid address from: %s\n" msgstr "" @@ -21826,16 +23056,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:1012 +#: git-send-email.perl:1018 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " msgstr "" -#: git-send-email.perl:1329 +#: git-send-email.perl:1335 #, fuzzy, perl-format msgid "CA path \"%s\" does not exist" msgstr "il repository '%s' non esiste" -#: git-send-email.perl:1412 +#: git-send-email.perl:1418 msgid "" " The Cc list above has been expanded by additional\n" " addresses found in the patch commit message. By default\n" @@ -21852,133 +23082,180 @@ 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:1427 +#: git-send-email.perl:1433 msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): " msgstr "" -#: git-send-email.perl:1430 +#: git-send-email.perl:1436 msgid "Send this email reply required" msgstr "" -#: git-send-email.perl:1458 +#: git-send-email.perl:1464 msgid "The required SMTP server is not properly defined." msgstr "" -#: git-send-email.perl:1505 +#: git-send-email.perl:1511 #, perl-format msgid "Server does not support STARTTLS! %s" msgstr "" -#: git-send-email.perl:1510 git-send-email.perl:1514 +#: git-send-email.perl:1516 git-send-email.perl:1520 #, perl-format msgid "STARTTLS failed! %s" msgstr "" -#: git-send-email.perl:1523 +#: git-send-email.perl:1529 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." msgstr "" -#: git-send-email.perl:1541 +#: git-send-email.perl:1547 #, fuzzy, perl-format msgid "Failed to send %s\n" msgstr "stat di %s non riuscito\n" -#: git-send-email.perl:1544 +#: git-send-email.perl:1550 #, perl-format msgid "Dry-Sent %s\n" msgstr "" -#: git-send-email.perl:1544 +#: git-send-email.perl:1550 #, fuzzy, perl-format msgid "Sent %s\n" msgstr "Rimozione di %s\n" -#: git-send-email.perl:1546 +#: git-send-email.perl:1552 msgid "Dry-OK. Log says:\n" msgstr "" -#: git-send-email.perl:1546 +#: git-send-email.perl:1552 msgid "OK. Log says:\n" msgstr "" -#: git-send-email.perl:1558 +#: git-send-email.perl:1564 msgid "Result: " msgstr "" -#: git-send-email.perl:1561 +#: git-send-email.perl:1567 msgid "Result: OK\n" msgstr "" -#: git-send-email.perl:1579 +#: git-send-email.perl:1585 #, fuzzy, perl-format msgid "can't open file %s" msgstr "impossibile aprire il file pack '%s'" -#: git-send-email.perl:1626 git-send-email.perl:1646 +#: git-send-email.perl:1632 git-send-email.perl:1652 #, perl-format msgid "(mbox) Adding cc: %s from line '%s'\n" msgstr "" -#: git-send-email.perl:1632 +#: git-send-email.perl:1638 #, perl-format msgid "(mbox) Adding to: %s from line '%s'\n" msgstr "" -#: git-send-email.perl:1685 +#: git-send-email.perl:1691 #, perl-format msgid "(non-mbox) Adding cc: %s from line '%s'\n" msgstr "" -#: git-send-email.perl:1720 +#: git-send-email.perl:1726 #, perl-format msgid "(body) Adding cc: %s from line '%s'\n" msgstr "" -#: git-send-email.perl:1831 +#: git-send-email.perl:1837 #, fuzzy, perl-format msgid "(%s) Could not execute '%s'" msgstr "Non è stato possibile impostare '%s'" -#: git-send-email.perl:1838 +#: git-send-email.perl:1844 #, perl-format msgid "(%s) Adding %s: %s from: '%s'\n" msgstr "" -#: git-send-email.perl:1842 +#: git-send-email.perl:1848 #, fuzzy, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "copia del file in '%s' non riuscita" -#: git-send-email.perl:1872 +#: git-send-email.perl:1878 msgid "cannot send message as 7bit" msgstr "" -#: git-send-email.perl:1880 +#: git-send-email.perl:1886 #, fuzzy msgid "invalid transfer encoding" msgstr "riferimento non valido: %s" -#: git-send-email.perl:1921 git-send-email.perl:1973 git-send-email.perl:1983 +#: git-send-email.perl:1927 git-send-email.perl:1979 git-send-email.perl:1989 #, fuzzy, perl-format msgid "unable to open %s: %s\n" msgstr "impossibile spostare %s in %s" -#: git-send-email.perl:1924 +#: git-send-email.perl:1930 #, perl-format msgid "%s: patch contains a line longer than 998 characters" msgstr "" -#: git-send-email.perl:1941 +#: git-send-email.perl:1947 #, perl-format msgid "Skipping %s with backup suffix '%s'.\n" msgstr "" #. TRANSLATORS: please keep "[y|N]" as is. -#: git-send-email.perl:1945 +#: git-send-email.perl:1951 #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "Inviare %s? [y|N]:" +#~ msgid "hash version %X does not match version %X" +#~ msgstr "la versione dell'hash %X non corrisponde alla versione %X" + +#~ msgid "option '%s' requires a value" +#~ msgstr "l'opzione '%s' richiede un valore" + +#~ msgid "could not transform the todo list" +#~ msgstr "impossibile trasformare l'elenco todo" + +#~ msgid "default" +#~ msgstr "impostazione predefinita" + +#~ msgid "Could not create directory '%s'" +#~ msgstr "Non è stato possibile creare la directory '%s'" + +#, fuzzy +#~ msgid "could not open %s" +#~ msgstr "impossibile aprire '%s'" + +#, fuzzy +#~ msgid "Could not move back to $head_name" +#~ msgstr "Non è stato possibile rimuovere il branch %s" + +#, fuzzy +#~ msgid "fatal: cannot combine '--signoff' with '--preserve-merges'" +#~ msgstr "Impossibile combinare --no-ff con --ff-only." + +#, fuzzy +#~ msgid "fatal: cannot combine '--preserve-merges' with '--rebase-merges'" +#~ msgstr "Impossibile combinare --no-ff con --ff-only." + +#, fuzzy +#~ msgid "fatal: cannot combine '--rebase-merges' with '--strategy-option'" +#~ msgstr "Impossibile combinare --no-ff con --ff-only." + +#, fuzzy +#~ msgid "fatal: cannot combine '--rebase-merges' with '--strategy'" +#~ msgstr "Impossibile combinare --no-ff con --ff-only." + +#, fuzzy +#~ msgid "Does not point to a valid commit: $onto_name" +#~ msgstr "'%s' non punta ad un commit" + +#, fuzzy +#~ msgid "Changes to $onto:" +#~ msgstr "Modifiche di cui verrà eseguito il commit:" + #~ msgid "ignoring unknown color-moved-ws mode '%s'" #~ msgstr "modalità color-moved-ws sconosciuta '%s' ignorata" @@ -22000,9 +23277,6 @@ msgstr "Inviare %s? [y|N]:" #~ msgid "unable to write sha1 filename %s" #~ msgstr "impossibile scrivere il file sha1 con nome %s" -#~ msgid "unable to write sha1 file" -#~ msgstr "impossibile scrivere il file sha1" - #~ msgid "cannot read sha1_file for %s" #~ msgstr "impossibile leggere il file sha1 per %s" @@ -22017,10 +23291,6 @@ msgstr "Inviare %s? [y|N]:" #~ msgstr "non è stato possibile leggere il file di log '%s'" #, fuzzy -#~ msgid "bad quoting on %s value in '%s'" -#~ msgstr "Valore di %s errato: '%s'" - -#, fuzzy #~ msgid "Can't stat %s" #~ msgstr "impossibile eseguire lo stat di '%s'" diff --git a/po/zh_CN.po b/po/zh_CN.po index d22365907d..075c5c5d4d 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -3,7 +3,7 @@ # Copyright (C) 2012,2013 Jiang Xin <worldhello.net AT gmail.com> # This file is distributed under the same license as the Git package. # Contributors: -# - Fangyi Zhou <fangyi.zhou AT yuriko.moe> +# - Fangyi Zhou <me AT fangyi.io> # - Jiang Xin <worldhello.net AT gmail.com> # - Lian Cheng <rhythm.mail AT gmail.com> # - Ray Chen <oldsharp AT gmail.com> @@ -45,6 +45,7 @@ # commit-ish (also committish) | 提交号 # conflict | 冲突 # core Git | 核心 Git 工具 +# cover letter | 附函 # DAG | 有向无环图 # dangling object | 悬空对象 # detached HEAD | 分离头指针 @@ -138,8 +139,8 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2019-02-15 10:09+0800\n" -"PO-Revision-Date: 2019-02-15 10:26+0800\n" +"POT-Creation-Date: 2019-06-04 08:24+0800\n" +"PO-Revision-Date: 2019-06-04 09:04+0800\n" "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n" "Language-Team: GitHub <https://github.com/jiangxin/git/>\n" "Language: zh_CN\n" @@ -148,37 +149,37 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: advice.c:101 +#: advice.c:103 #, c-format msgid "%shint: %.*s%s\n" msgstr "%s提示:%.*s%s\n" -#: advice.c:154 +#: advice.c:156 msgid "Cherry-picking is not possible because you have unmerged files." msgstr "无法拣选,因为您有未合并的文件。" -#: advice.c:156 +#: advice.c:158 msgid "Committing is not possible because you have unmerged files." msgstr "无法提交,因为您有未合并的文件。" -#: advice.c:158 +#: advice.c:160 msgid "Merging is not possible because you have unmerged files." msgstr "无法合并,因为您有未合并的文件。" -#: advice.c:160 +#: advice.c:162 msgid "Pulling is not possible because you have unmerged files." msgstr "无法拉取,因为您有未合并的文件。" -#: advice.c:162 +#: advice.c:164 msgid "Reverting is not possible because you have unmerged files." msgstr "无法回退,因为您有未合并的文件。" -#: advice.c:164 +#: advice.c:166 #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "无法 %s,因为您有未合并的文件。" -#: advice.c:172 +#: advice.c:174 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." @@ -186,23 +187,23 @@ msgstr "" "请在工作区改正文件,然后酌情使用 'git add/rm <文件>' 命令标记\n" "解决方案并提交。" -#: advice.c:180 +#: advice.c:182 msgid "Exiting because of an unresolved conflict." msgstr "因为存在未解决的冲突而退出。" -#: advice.c:185 builtin/merge.c:1290 +#: advice.c:187 builtin/merge.c:1320 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。" -#: advice.c:187 +#: advice.c:189 msgid "Please, commit your changes before merging." msgstr "请在合并前先提交您的修改。" -#: advice.c:188 +#: advice.c:190 msgid "Exiting because of unfinished merge." msgstr "因为存在未完成的合并而退出。" -#: advice.c:194 +#: advice.c:196 #, c-format msgid "" "Note: checking out '%s'.\n" @@ -237,92 +238,92 @@ msgstr "命令行以 \\ 结尾" msgid "unclosed quote" msgstr "未关闭的引号" -#: apply.c:59 +#: apply.c:63 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "未能识别的空白字符选项 '%s'" -#: apply.c:75 +#: apply.c:79 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "未能识别的空白字符忽略选项 '%s'" -#: apply.c:125 +#: apply.c:129 msgid "--reject and --3way cannot be used together." msgstr "--reject 和 --3way 不能同时使用。" -#: apply.c:127 +#: apply.c:131 msgid "--cached and --3way cannot be used together." msgstr "--cached 和 --3way 不能同时使用。" -#: apply.c:130 +#: apply.c:134 msgid "--3way outside a repository" msgstr "--3way 在一个仓库之外" -#: apply.c:141 +#: apply.c:145 msgid "--index outside a repository" msgstr "--index 在一个仓库之外" -#: apply.c:144 +#: apply.c:148 msgid "--cached outside a repository" msgstr "--cached 在一个仓库之外" -#: apply.c:825 +#: apply.c:829 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "无法准备时间戳正则表达式 %s" -#: apply.c:834 +#: apply.c:838 #, c-format msgid "regexec returned %d for input: %s" msgstr "regexec 返回 %d,输入为:%s" -#: apply.c:908 +#: apply.c:912 #, c-format msgid "unable to find filename in patch at line %d" msgstr "不能在补丁的第 %d 行找到文件名" -#: apply.c:946 +#: apply.c:950 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s" -#: apply.c:952 +#: apply.c:956 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致" -#: apply.c:953 +#: apply.c:957 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致" -#: apply.c:958 +#: apply.c:962 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null" -#: apply.c:987 +#: apply.c:991 #, c-format msgid "invalid mode on line %d: %s" msgstr "第 %d 行包含无效文件模式:%s" -#: apply.c:1306 +#: apply.c:1310 #, c-format msgid "inconsistent header lines %d and %d" msgstr "不一致的文件头,%d 行和 %d 行" -#: apply.c:1478 +#: apply.c:1482 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recount:意外的行:%.*s" -#: apply.c:1547 +#: apply.c:1551 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "第 %d 行的补丁片段没有头信息:%.*s" -#: apply.c:1567 +#: apply.c:1571 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -333,82 +334,82 @@ msgid_plural "" msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)" msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)" -#: apply.c:1580 +#: apply.c:1584 #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "git diff 的头信息中缺乏文件名信息(第 %d 行)" -#: apply.c:1768 +#: apply.c:1772 msgid "new file depends on old contents" msgstr "新文件依赖旧内容" -#: apply.c:1770 +#: apply.c:1774 msgid "deleted file still has contents" msgstr "删除的文件仍有内容" -#: apply.c:1804 +#: apply.c:1808 #, c-format msgid "corrupt patch at line %d" msgstr "补丁在第 %d 行损坏" -#: apply.c:1841 +#: apply.c:1845 #, c-format msgid "new file %s depends on old contents" msgstr "新文件 %s 依赖旧内容" -#: apply.c:1843 +#: apply.c:1847 #, c-format msgid "deleted file %s still has contents" msgstr "删除的文件 %s 仍有内容" -#: apply.c:1846 +#: apply.c:1850 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** 警告:文件 %s 成为空文件但并未删除" -#: apply.c:1993 +#: apply.c:1997 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "二进制补丁在第 %d 行损坏:%.*s" -#: apply.c:2030 +#: apply.c:2034 #, c-format msgid "unrecognized binary patch at line %d" msgstr "未能识别的二进制补丁位于第 %d 行" -#: apply.c:2192 +#: apply.c:2196 #, c-format msgid "patch with only garbage at line %d" msgstr "补丁文件的第 %d 行只有垃圾数据" -#: apply.c:2278 +#: apply.c:2282 #, c-format msgid "unable to read symlink %s" msgstr "无法读取符号链接 %s" -#: apply.c:2282 +#: apply.c:2286 #, c-format msgid "unable to open or read %s" msgstr "不能打开或读取 %s" -#: apply.c:2941 +#: apply.c:2945 #, c-format msgid "invalid start of line: '%c'" msgstr "无效的行首字符:'%c'" -#: apply.c:3062 +#: apply.c:3066 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "块 #%d 成功应用于 %d(偏移 %d 行)" msgstr[1] "块 #%d 成功应用于 %d(偏移 %d 行)" -#: apply.c:3074 +#: apply.c:3078 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段" -#: apply.c:3080 +#: apply.c:3084 #, c-format msgid "" "while searching for:\n" @@ -417,446 +418,445 @@ msgstr "" "当查询:\n" "%.*s" -#: apply.c:3102 +#: apply.c:3106 #, c-format msgid "missing binary patch data for '%s'" msgstr "缺失 '%s' 的二进制补丁数据" -#: apply.c:3110 +#: apply.c:3114 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "不能反向应用一个缺少到 '%s' 的反向数据块的二进制补丁" -#: apply.c:3157 +#: apply.c:3161 #, c-format msgid "cannot apply binary patch to '%s' without full index line" msgstr "不能在 '%s' 上应用没有完整索引行的二进制补丁" -#: apply.c:3167 +#: apply.c:3171 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." msgstr "补丁应用到 '%s'(%s),但是和当前内容不匹配。" -#: apply.c:3175 +#: apply.c:3179 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "补丁应用到空文件 '%s',但其并非空文件" -#: apply.c:3193 +#: apply.c:3197 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "无法读取 '%2$s' 必需的目标文件 %1$s" -#: apply.c:3206 +#: apply.c:3210 #, c-format msgid "binary patch does not apply to '%s'" msgstr "二进制补丁未应用到 '%s'" -#: apply.c:3212 +#: apply.c:3216 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)" -#: apply.c:3233 +#: apply.c:3237 #, c-format msgid "patch failed: %s:%ld" msgstr "打补丁失败:%s:%ld" -#: apply.c:3356 +#: apply.c:3360 #, c-format msgid "cannot checkout %s" msgstr "不能检出 %s" -#: apply.c:3408 apply.c:3419 apply.c:3465 midx.c:58 setup.c:278 +#: apply.c:3412 apply.c:3423 apply.c:3469 midx.c:59 setup.c:279 #, c-format msgid "failed to read %s" msgstr "无法读取 %s" -#: apply.c:3416 +#: apply.c:3420 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "读取位于符号链接中的 '%s'" -#: apply.c:3445 apply.c:3688 +#: apply.c:3449 apply.c:3692 #, c-format msgid "path %s has been renamed/deleted" msgstr "路径 %s 已经被重命名/删除" -#: apply.c:3531 apply.c:3703 +#: apply.c:3535 apply.c:3707 #, c-format msgid "%s: does not exist in index" msgstr "%s:不存在于索引中" -#: apply.c:3540 apply.c:3711 +#: apply.c:3544 apply.c:3715 #, c-format msgid "%s: does not match index" msgstr "%s:和索引不匹配" -#: apply.c:3575 +#: apply.c:3579 msgid "repository lacks the necessary blob to fall back on 3-way merge." msgstr "仓库缺乏必要的数据对象以进行三方合并。" -#: apply.c:3578 +#: apply.c:3582 #, c-format msgid "Falling back to three-way merge...\n" msgstr "回落到三方合并...\n" -#: apply.c:3594 apply.c:3598 +#: apply.c:3598 apply.c:3602 #, c-format msgid "cannot read the current contents of '%s'" msgstr "无法读取 '%s' 的当前内容" -#: apply.c:3610 +#: apply.c:3614 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "无法回落到三方合并...\n" -#: apply.c:3624 +#: apply.c:3628 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "应用补丁到 '%s' 存在冲突。\n" -#: apply.c:3629 +#: apply.c:3633 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "成功应用补丁到 '%s'。\n" -#: apply.c:3655 +#: apply.c:3659 msgid "removal patch leaves file contents" msgstr "移除补丁仍留下了文件内容" -#: apply.c:3728 +#: apply.c:3732 #, c-format msgid "%s: wrong type" msgstr "%s:错误类型" -#: apply.c:3730 +#: apply.c:3734 #, c-format msgid "%s has type %o, expected %o" msgstr "%s 的类型是 %o,应为 %o" -#: apply.c:3881 apply.c:3883 read-cache.c:820 read-cache.c:846 -#: read-cache.c:1299 +#: apply.c:3885 apply.c:3887 read-cache.c:830 read-cache.c:856 +#: read-cache.c:1309 #, c-format msgid "invalid path '%s'" msgstr "无效路径 '%s'" -#: apply.c:3939 +#: apply.c:3943 #, c-format msgid "%s: already exists in index" msgstr "%s:已经存在于索引中" -#: apply.c:3942 +#: apply.c:3946 #, c-format msgid "%s: already exists in working directory" msgstr "%s:已经存在于工作区中" -#: apply.c:3962 +#: apply.c:3966 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配" -#: apply.c:3967 +#: apply.c:3971 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配" -#: apply.c:3987 +#: apply.c:3991 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "受影响的文件 '%s' 位于符号链接中" -#: apply.c:3991 +#: apply.c:3995 #, c-format msgid "%s: patch does not apply" msgstr "%s:补丁未应用" -#: apply.c:4006 +#: apply.c:4010 #, c-format msgid "Checking patch %s..." msgstr "正在检查补丁 %s..." -#: apply.c:4098 +#: apply.c:4102 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "子模组 %s 的 sha1 信息缺失或无效" -#: apply.c:4105 +#: apply.c:4109 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "%s 的模式变更,但它不在当前 HEAD 中" -#: apply.c:4108 +#: apply.c:4112 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "sha1 信息缺失或无效(%s)。" -#: apply.c:4113 builtin/checkout.c:248 builtin/reset.c:143 +#: apply.c:4117 builtin/checkout.c:257 builtin/reset.c:143 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "对路径 '%s' 的 make_cache_entry 操作失败" -#: apply.c:4117 +#: apply.c:4121 #, c-format msgid "could not add %s to temporary index" msgstr "不能在临时索引中添加 %s" -#: apply.c:4127 +#: apply.c:4131 #, c-format msgid "could not write temporary index to %s" msgstr "不能把临时索引写入到 %s" -#: apply.c:4265 +#: apply.c:4269 #, c-format msgid "unable to remove %s from index" msgstr "不能从索引中移除 %s" -#: apply.c:4299 +#: apply.c:4303 #, c-format msgid "corrupt patch for submodule %s" msgstr "子模组 %s 损坏的补丁" -#: apply.c:4305 +#: apply.c:4309 #, c-format msgid "unable to stat newly created file '%s'" msgstr "不能对新建文件 '%s' 调用 stat" -#: apply.c:4313 +#: apply.c:4317 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "不能为新建文件 %s 创建后端存储" -#: apply.c:4319 apply.c:4464 +#: apply.c:4323 apply.c:4468 #, c-format msgid "unable to add cache entry for %s" msgstr "无法为 %s 添加缓存条目" -#: apply.c:4362 +#: apply.c:4366 #, c-format msgid "failed to write to '%s'" msgstr "写入 '%s' 失败" -#: apply.c:4366 +#: apply.c:4370 #, c-format msgid "closing file '%s'" msgstr "关闭文件 '%s'" -#: apply.c:4436 +#: apply.c:4440 #, c-format msgid "unable to write file '%s' mode %o" msgstr "不能写文件 '%s' 权限 %o" -#: apply.c:4534 +#: apply.c:4538 #, c-format msgid "Applied patch %s cleanly." msgstr "成功应用补丁 %s。" -#: apply.c:4542 +#: apply.c:4546 msgid "internal error" msgstr "内部错误" -#: apply.c:4545 +#: apply.c:4549 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..." msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..." -#: apply.c:4556 +#: apply.c:4560 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "截短 .rej 文件名为 %.*s.rej" -#: apply.c:4564 builtin/fetch.c:837 builtin/fetch.c:1118 +#: apply.c:4568 builtin/fetch.c:837 builtin/fetch.c:1118 #, c-format msgid "cannot open %s" msgstr "不能打开 %s" -#: apply.c:4578 +#: apply.c:4582 #, c-format msgid "Hunk #%d applied cleanly." msgstr "第 #%d 个片段成功应用。" -#: apply.c:4582 +#: apply.c:4586 #, c-format msgid "Rejected hunk #%d." msgstr "拒绝第 #%d 个片段。" -#: apply.c:4692 +#: apply.c:4696 #, c-format msgid "Skipped patch '%s'." msgstr "略过补丁 '%s'。" -#: apply.c:4700 +#: apply.c:4704 msgid "unrecognized input" msgstr "未能识别的输入" -#: apply.c:4720 +#: apply.c:4724 msgid "unable to read index file" msgstr "无法读取索引文件" -#: apply.c:4875 +#: apply.c:4879 #, c-format msgid "can't open patch '%s': %s" msgstr "不能打开补丁 '%s':%s" -#: apply.c:4902 +#: apply.c:4906 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "抑制下仍有 %d 个空白字符误用" msgstr[1] "抑制下仍有 %d 个空白字符误用" -#: apply.c:4908 apply.c:4923 +#: apply.c:4912 apply.c:4927 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "%d 行新增了空白字符误用。" msgstr[1] "%d 行新增了空白字符误用。" -#: apply.c:4916 +#: apply.c:4920 #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." msgstr[0] "修复空白错误后,应用了 %d 行。" msgstr[1] "修复空白错误后,应用了 %d 行。" -#: apply.c:4932 builtin/add.c:539 builtin/mv.c:301 builtin/rm.c:390 +#: apply.c:4936 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390 msgid "Unable to write new index file" msgstr "无法写入新索引文件" -#: apply.c:4959 apply.c:4962 builtin/am.c:2203 builtin/am.c:2206 -#: builtin/clone.c:122 builtin/fetch.c:118 builtin/merge.c:263 -#: builtin/pull.c:200 builtin/submodule--helper.c:407 +#: 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:1850 builtin/submodule--helper.c:1853 -#: builtin/submodule--helper.c:2092 git-add--interactive.perl:197 +#: 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:4960 +#: apply.c:4964 msgid "don't apply changes matching the given path" msgstr "不要应用与给出路径向匹配的变更" -#: apply.c:4963 +#: apply.c:4967 msgid "apply changes matching the given path" msgstr "应用与给出路径向匹配的变更" -#: apply.c:4965 builtin/am.c:2212 +#: apply.c:4969 builtin/am.c:2219 msgid "num" msgstr "数字" -#: apply.c:4966 +#: apply.c:4970 msgid "remove <num> leading slashes from traditional diff paths" msgstr "从传统的 diff 路径中移除指定数量的前导斜线" -#: apply.c:4969 +#: apply.c:4973 msgid "ignore additions made by the patch" msgstr "忽略补丁中的添加的文件" -#: apply.c:4971 +#: apply.c:4975 msgid "instead of applying the patch, output diffstat for the input" msgstr "不应用补丁,而是显示输入的差异统计(diffstat)" -#: apply.c:4975 +#: apply.c:4979 msgid "show number of added and deleted lines in decimal notation" msgstr "以十进制数显示添加和删除的行数" -#: apply.c:4977 +#: apply.c:4981 msgid "instead of applying the patch, output a summary for the input" msgstr "不应用补丁,而是显示输入的概要" -#: apply.c:4979 +#: apply.c:4983 msgid "instead of applying the patch, see if the patch is applicable" msgstr "不应用补丁,而是查看补丁是否可应用" -#: apply.c:4981 +#: apply.c:4985 msgid "make sure the patch is applicable to the current index" msgstr "确认补丁可以应用到当前索引" -#: apply.c:4983 +#: apply.c:4987 msgid "mark new files with `git add --intent-to-add`" msgstr "使用命令 `git add --intent-to-add` 标记新增文件" -#: apply.c:4985 +#: apply.c:4989 msgid "apply a patch without touching the working tree" msgstr "应用补丁而不修改工作区" -#: apply.c:4987 +#: apply.c:4991 msgid "accept a patch that touches outside the working area" msgstr "接受修改工作区之外文件的补丁" -#: apply.c:4990 +#: apply.c:4994 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)" -#: apply.c:4992 +#: apply.c:4996 msgid "attempt three-way merge if a patch does not apply" msgstr "如果一个补丁不能应用则尝试三方合并" -#: apply.c:4994 +#: apply.c:4998 msgid "build a temporary index based on embedded index information" msgstr "创建一个临时索引基于嵌入的索引信息" -#: apply.c:4997 builtin/checkout-index.c:173 builtin/ls-files.c:524 +#: apply.c:5001 builtin/checkout-index.c:173 builtin/ls-files.c:524 msgid "paths are separated with NUL character" msgstr "路径以 NUL 字符分隔" -#: apply.c:4999 +#: apply.c:5003 msgid "ensure at least <n> lines of context match" msgstr "确保至少匹配 <n> 行上下文" -#: apply.c:5000 builtin/am.c:2191 builtin/interpret-trailers.c:97 +#: 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:3314 builtin/rebase.c:1065 +#: builtin/pack-objects.c:3317 builtin/rebase.c:1415 msgid "action" msgstr "动作" -#: apply.c:5001 +#: apply.c:5005 msgid "detect new or modified lines that have whitespace errors" msgstr "检查新增和修改的行中间的空白字符滥用" -#: apply.c:5004 apply.c:5007 +#: apply.c:5008 apply.c:5011 msgid "ignore changes in whitespace when finding context" msgstr "查找上下文时忽略空白字符的变更" -#: apply.c:5010 +#: apply.c:5014 msgid "apply the patch in reverse" msgstr "反向应用补丁" -#: apply.c:5012 +#: apply.c:5016 msgid "don't expect at least one line of context" msgstr "无需至少一行上下文" -#: apply.c:5014 +#: apply.c:5018 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中" -#: apply.c:5016 +#: apply.c:5020 msgid "allow overlapping hunks" msgstr "允许重叠的补丁片段" -#: apply.c:5017 builtin/add.c:291 builtin/check-ignore.c:22 -#: builtin/commit.c:1312 builtin/count-objects.c:98 builtin/fsck.c:724 -#: builtin/log.c:2037 builtin/mv.c:123 builtin/read-tree.c:128 -#: builtin/rebase--interactive.c:159 +#: 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 msgid "be verbose" msgstr "冗长输出" -#: apply.c:5019 +#: apply.c:5023 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "允许不正确的文件末尾换行符" -#: apply.c:5022 +#: apply.c:5026 msgid "do not trust the line counts in the hunk headers" msgstr "不信任补丁片段的头信息中的行号" -#: apply.c:5024 builtin/am.c:2200 +#: apply.c:5028 builtin/am.c:2207 msgid "root" msgstr "根目录" -#: apply.c:5025 +#: apply.c:5029 msgid "prepend <root> to all filenames" msgstr "为所有文件名前添加 <根目录>" @@ -878,7 +878,7 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <仓库> [--exec <命令>] --list" -#: archive.c:372 builtin/add.c:177 builtin/add.c:515 builtin/rm.c:299 +#: archive.c:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299 #, c-format msgid "pathspec '%s' did not match any files" msgstr "路径规格 '%s' 未匹配任何文件" @@ -910,7 +910,7 @@ msgstr "格式" msgid "archive format" msgstr "归档格式" -#: archive.c:456 builtin/log.c:1549 +#: archive.c:456 builtin/log.c:1557 msgid "prefix" msgstr "前缀" @@ -918,11 +918,11 @@ msgstr "前缀" msgid "prepend prefix to each pathname in the archive" msgstr "为归档中每个路径名加上前缀" -#: archive.c:458 builtin/blame.c:820 builtin/blame.c:821 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:162 +#: 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 msgid "file" msgstr "文件" @@ -954,8 +954,8 @@ msgstr "压缩效果更好" msgid "list supported archive formats" msgstr "列出支持的归档格式" -#: archive.c:477 builtin/archive.c:91 builtin/clone.c:112 builtin/clone.c:115 -#: builtin/submodule--helper.c:1378 builtin/submodule--helper.c:1859 +#: 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 msgid "repo" msgstr "仓库" @@ -963,7 +963,7 @@ msgstr "仓库" msgid "retrieve the archive from remote repository <repo>" msgstr "从远程仓库(<仓库>)提取归档文件" -#: archive.c:479 builtin/archive.c:93 builtin/difftool.c:715 +#: archive.c:479 builtin/archive.c:93 builtin/difftool.c:707 #: builtin/notes.c:498 msgid "command" msgstr "命令" @@ -1009,16 +1009,16 @@ msgstr "不支持的文件模式:0%o (SHA1: %s)" msgid "cannot read %s" msgstr "不能读取 %s" -#: archive-tar.c:458 +#: archive-tar.c:459 #, c-format msgid "unable to start '%s' filter" msgstr "无法启动 '%s' 过滤器" -#: archive-tar.c:461 +#: archive-tar.c:462 msgid "unable to redirect descriptor" msgstr "无法重定向描述符" -#: archive-tar.c:468 +#: archive-tar.c:469 #, c-format msgid "'%s' filter reported error" msgstr "'%s' 过滤器报告了错误" @@ -1033,7 +1033,7 @@ msgstr "路径不是有效的 UTF-8:%s" msgid "path too long (%d chars, SHA1: %s): %s" msgstr "路径太长(%d 字符,SHA1:%s):%s" -#: archive-zip.c:474 builtin/pack-objects.c:225 builtin/pack-objects.c:228 +#: archive-zip.c:474 builtin/pack-objects.c:226 builtin/pack-objects.c:229 #, c-format msgid "deflate error (%d)" msgstr "压缩错误 (%d)" @@ -1051,7 +1051,7 @@ msgstr "%.*s 不是一个有效的属性名" #: attr.c:368 #, c-format msgid "%s not allowed: %s:%d" -msgstr "不允许 %s :%s:%d" +msgstr "不允许 %s:%s:%d" #: attr.c:408 msgid "" @@ -1135,26 +1135,26 @@ msgstr "二分查找中:合并基线必须是经过测试的\n" msgid "a %s revision is needed" msgstr "需要一个 %s 版本" -#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:237 +#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:248 #, c-format msgid "could not create file '%s'" msgstr "不能创建文件 '%s'" -#: bisect.c:937 builtin/merge.c:139 +#: bisect.c:928 builtin/merge.c:146 #, c-format msgid "could not read file '%s'" msgstr "不能读取文件 '%s'" -#: bisect.c:967 +#: bisect.c:958 msgid "reading bisect refs failed" msgstr "读取二分查找引用失败" -#: bisect.c:986 +#: bisect.c:977 #, c-format msgid "%s was both %s and %s\n" msgstr "%s 同时为 %s 和 %s\n" -#: bisect.c:994 +#: bisect.c:985 #, c-format msgid "" "No testable commit found.\n" @@ -1163,7 +1163,7 @@ msgstr "" "没有发现可测试的提交。\n" "可能您在运行时使用了错误的路径参数?\n" -#: bisect.c:1013 +#: bisect.c:1004 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -1173,49 +1173,49 @@ msgstr[1] "(大概 %d 步)" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. -#: bisect.c:1019 +#: bisect.c:1010 #, 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] "二分查找中:在此之后,还剩 %d 个版本待测试 %s\n" msgstr[1] "二分查找中:在此之后,还剩 %d 个版本待测试 %s\n" -#: blame.c:1792 +#: blame.c:1794 msgid "--contents and --reverse do not blend well." msgstr "--contents 和 --reverse 不能混用。" -#: blame.c:1806 +#: blame.c:1808 msgid "cannot use --contents with final commit object name" msgstr "不能将 --contents 和最终的提交对象名共用" -#: blame.c:1827 +#: blame.c:1829 msgid "--reverse and --first-parent together require specified latest commit" msgstr "--reverse 和 --first-parent 共用,需要指定最新的提交" -#: blame.c:1836 bundle.c:164 ref-filter.c:2071 remote.c:1948 sequencer.c:1993 -#: sequencer.c:4064 builtin/commit.c:1004 builtin/log.c:378 builtin/log.c:936 -#: builtin/log.c:1420 builtin/log.c:1796 builtin/log.c:2086 builtin/merge.c:407 -#: builtin/pack-objects.c:3137 builtin/pack-objects.c:3152 +#: 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 msgid "revision walk setup failed" msgstr "版本遍历设置失败" -#: blame.c:1854 +#: blame.c:1856 msgid "" "--reverse --first-parent together require range along first-parent chain" msgstr "--reverse 和 --first-parent 共用,需要第一祖先链上的提交范围" -#: blame.c:1865 +#: blame.c:1867 #, c-format msgid "no such path %s in %s" msgstr "在 %2$s 中无此路径 %1$s" -#: blame.c:1876 +#: blame.c:1878 #, c-format msgid "cannot read blob %s for path %s" msgstr "不能为路径 %2$s 读取数据对象 %1$s" -#: branch.c:52 +#: branch.c:53 #, c-format msgid "" "\n" @@ -1227,85 +1227,85 @@ msgstr "" "在修复错误后,您可以尝试修改远程跟踪分支,通过执行命令\n" "\"git branch --set-upstream-to=%s%s%s\" 。" -#: branch.c:66 +#: branch.c:67 #, c-format msgid "Not setting branch %s as its own upstream." msgstr "未设置分支 %s 作为它自己的上游。" -#: branch.c:92 +#: branch.c:93 #, c-format msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing." msgstr "分支 '%1$s' 设置为使用变基来跟踪来自 '%3$s' 的远程分支 '%2$s'。" -#: branch.c:93 +#: branch.c:94 #, c-format msgid "Branch '%s' set up to track remote branch '%s' from '%s'." msgstr "分支 '%1$s' 设置为跟踪来自 '%3$s' 的远程分支 '%2$s'。" -#: branch.c:97 +#: branch.c:98 #, c-format msgid "Branch '%s' set up to track local branch '%s' by rebasing." msgstr "分支 '%s' 设置为使用变基来跟踪本地分支 '%s'。" -#: branch.c:98 +#: branch.c:99 #, c-format msgid "Branch '%s' set up to track local branch '%s'." msgstr "分支 '%s' 设置为跟踪本地分支 '%s'。" -#: branch.c:103 +#: branch.c:104 #, c-format msgid "Branch '%s' set up to track remote ref '%s' by rebasing." msgstr "分支 '%s' 设置为使用变基来跟踪远程引用 '%s'。" -#: branch.c:104 +#: branch.c:105 #, c-format msgid "Branch '%s' set up to track remote ref '%s'." msgstr "分支 '%s' 设置为跟踪远程引用 '%s'。" -#: branch.c:108 +#: branch.c:109 #, c-format msgid "Branch '%s' set up to track local ref '%s' by rebasing." msgstr "分支 '%s' 设置为使用变基来跟踪本地引用 '%s'。" -#: branch.c:109 +#: branch.c:110 #, c-format msgid "Branch '%s' set up to track local ref '%s'." msgstr "分支 '%s' 设置为跟踪本地引用 '%s'。" -#: branch.c:118 +#: branch.c:119 msgid "Unable to write upstream branch configuration" msgstr "无法写入上游分支配置" -#: branch.c:155 +#: branch.c:156 #, c-format msgid "Not tracking: ambiguous information for ref %s" msgstr "未跟踪:引用 %s 有歧义" -#: branch.c:188 +#: branch.c:189 #, c-format msgid "'%s' is not a valid branch name." msgstr "'%s' 不是一个有效的分支名称。" -#: branch.c:207 +#: branch.c:208 #, c-format msgid "A branch named '%s' already exists." msgstr "一个分支名 '%s' 已经存在。" -#: branch.c:212 +#: branch.c:213 msgid "Cannot force update the current branch." msgstr "无法强制更新当前分支。" -#: branch.c:232 +#: branch.c:233 #, c-format msgid "Cannot setup tracking information; starting point '%s' is not a branch." msgstr "无法设置跟踪信息;起始点 '%s' 不是一个分支。" -#: branch.c:234 +#: branch.c:235 #, c-format msgid "the requested upstream branch '%s' does not exist" msgstr "请求的上游分支 '%s' 不存在" -#: branch.c:236 +#: branch.c:237 msgid "" "\n" "If you are planning on basing your work on an upstream\n" @@ -1323,17 +1323,17 @@ msgstr "" "如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支,\n" "您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。" -#: branch.c:280 +#: branch.c:281 #, c-format msgid "Not a valid object name: '%s'." msgstr "不是一个有效的对象名:'%s'。" -#: branch.c:300 +#: branch.c:301 #, c-format msgid "Ambiguous object name: '%s'." msgstr "歧义的对象名:'%s'。" -#: branch.c:305 +#: branch.c:306 #, c-format msgid "Not a valid branch point: '%s'." msgstr "无效的分支点:'%s'。" @@ -1358,8 +1358,8 @@ msgstr "'%s' 不像是一个 v2 版本的包文件" msgid "unrecognized header: %s%s (%d)" msgstr "未能识别的包头:%s%s (%d)" -#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2215 sequencer.c:2763 -#: builtin/commit.c:776 +#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2281 sequencer.c:2916 +#: builtin/commit.c:788 #, c-format msgid "could not open '%s'" msgstr "不能打开 '%s'" @@ -1407,7 +1407,7 @@ msgstr "rev-list 终止" msgid "ref '%s' is excluded by the rev-list options" msgstr "引用 '%s' 被 rev-list 选项排除" -#: bundle.c:457 builtin/log.c:193 builtin/log.c:1701 builtin/shortlog.c:306 +#: bundle.c:457 builtin/log.c:197 builtin/log.c:1709 builtin/shortlog.c:306 #, c-format msgid "unrecognized argument: %s" msgstr "未能识别的参数:%s" @@ -1430,9 +1430,8 @@ msgstr "index-pack 终止" msgid "invalid color value: %.*s" msgstr "无效的颜色值:%.*s" -#: commit.c:50 sequencer.c:2567 builtin/am.c:355 builtin/am.c:399 -#: builtin/am.c:1375 builtin/am.c:2019 builtin/replace.c:376 -#: builtin/replace.c:448 +#: 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" @@ -1462,27 +1461,27 @@ msgstr "" "设置 \"git config advice.graftFileDeprecated false\"\n" "可关闭本消息" -#: commit.c:1122 +#: commit.c:1128 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。" -#: commit.c:1125 +#: commit.c:1131 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。" -#: commit.c:1128 +#: commit.c:1134 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "提交 %s 没有 GPG 签名。" -#: commit.c:1131 +#: commit.c:1137 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n" -#: commit.c:1385 +#: 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" @@ -1492,131 +1491,192 @@ msgstr "" "您可以通过修补提交来改正提交说明,或者将配置变量 i18n.commitencoding\n" "设置为您项目所用的字符编码。\n" -#: commit-graph.c:101 -#, c-format -msgid "graph file %s is too small" -msgstr "图形文件 %s 太小" +#: commit-graph.c:105 +msgid "commit-graph file is too small" +msgstr "提交图形文件太小" -#: commit-graph.c:136 +#: commit-graph.c:170 #, c-format -msgid "graph signature %X does not match signature %X" -msgstr "图形签名 %X 和签名 %X 不匹配" +msgid "commit-graph signature %X does not match signature %X" +msgstr "提交图形签名 %X 和签名 %X 不匹配" -#: commit-graph.c:143 +#: commit-graph.c:177 #, c-format -msgid "graph version %X does not match version %X" -msgstr "图形版本 %X 和版本 %X 不匹配" +msgid "commit-graph version %X does not match version %X" +msgstr "提交图形版本 %X 和版本 %X 不匹配" -#: commit-graph.c:150 +#: commit-graph.c:184 #, c-format -msgid "hash version %X does not match version %X" -msgstr "散列版本 %X 和版本 %X 不匹配" +msgid "commit-graph hash version %X does not match version %X" +msgstr "提交图形哈希版本 %X 和版本 %X 不匹配" -#: commit-graph.c:173 -msgid "chunk lookup table entry missing; graph file may be incomplete" -msgstr "块查找表条目丢失,图形文件可能不完整" +#: commit-graph.c:207 +msgid "commit-graph chunk lookup table entry missing; file may be incomplete" +msgstr "提交图形块查找表条目丢失,文件可能不完整" -#: commit-graph.c:184 +#: commit-graph.c:218 #, c-format -msgid "improper chunk offset %08x%08x" -msgstr "不正确的块偏移 %08x%08x" +msgid "commit-graph improper chunk offset %08x%08x" +msgstr "提交图形不正确的块偏移 %08x%08x" -#: commit-graph.c:221 +#: commit-graph.c:255 #, c-format -msgid "chunk id %08x appears multiple times" -msgstr "块 id %08x 出现了多次" +msgid "commit-graph chunk id %08x appears multiple times" +msgstr "提交图形块 id %08x 出现了多次" -#: commit-graph.c:334 +#: commit-graph.c:390 #, c-format msgid "could not find commit %s" msgstr "无法找到提交 %s" -#: commit-graph.c:671 builtin/pack-objects.c:2646 +#: commit-graph.c:732 builtin/pack-objects.c:2649 #, c-format msgid "unable to get type of object %s" msgstr "无法获得对象 %s 类型" -#: commit-graph.c:704 +#: commit-graph.c:765 msgid "Loading known commits in commit graph" msgstr "正在加载提交图中的已知提交" -#: commit-graph.c:720 +#: commit-graph.c:781 msgid "Expanding reachable commits in commit graph" msgstr "正在扩展提交图中的可达提交" -#: commit-graph.c:732 +#: commit-graph.c:793 msgid "Clearing commit marks in commit graph" msgstr "正在清除提交图中的提交标记" -#: commit-graph.c:752 +#: commit-graph.c:813 msgid "Computing commit graph generation numbers" msgstr "正在计算提交图世代数字" -#: commit-graph.c:869 +#: commit-graph.c:930 #, c-format msgid "Finding commits for commit graph in %d pack" msgid_plural "Finding commits for commit graph in %d packs" msgstr[0] "正在 %d 个包中查找提交图的提交" msgstr[1] "正在 %d 个包中查找提交图的提交" -#: commit-graph.c:882 +#: commit-graph.c:943 #, c-format msgid "error adding pack %s" msgstr "添加包 %s 出错" -#: commit-graph.c:884 +#: commit-graph.c:945 #, c-format msgid "error opening index for %s" msgstr "为 %s 打开索引出错" -#: commit-graph.c:898 +#: 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 个引用中查找提交图的提交" -#: commit-graph.c:930 +#: commit-graph.c:991 msgid "Finding commits for commit graph among packed objects" msgstr "正在打包对象中查找提交图的提交" -#: commit-graph.c:943 +#: commit-graph.c:1004 msgid "Counting distinct commits in commit graph" msgstr "正在计算提交图中不同的提交" -#: commit-graph.c:956 +#: commit-graph.c:1017 #, c-format msgid "the commit graph format cannot write %d commits" msgstr "提交图格式不能写入 %d 个提交" -#: commit-graph.c:965 +#: commit-graph.c:1026 msgid "Finding extra edges in commit graph" msgstr "正在查找提交图中额外的边" -#: commit-graph.c:989 +#: commit-graph.c:1050 msgid "too many commits to write graph" msgstr "提交太多不能画图" -#: commit-graph.c:996 midx.c:769 +#: commit-graph.c:1057 midx.c:819 #, c-format msgid "unable to create leading directories of %s" msgstr "不能为 %s 创建先导目录" -#: commit-graph.c:1036 +#: commit-graph.c:1097 #, c-format msgid "Writing out commit graph in %d pass" msgid_plural "Writing out commit graph in %d passes" msgstr[0] "正在用 %d 步写出提交图" msgstr[1] "正在用 %d 步写出提交图" -#: commit-graph.c:1109 +#: commit-graph.c:1162 msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "提交图文件的校验码错误,可能已经损坏" -#: commit-graph.c:1153 +#: commit-graph.c:1172 +#, c-format +msgid "commit-graph has incorrect OID order: %s then %s" +msgstr "提交图形的对象 ID 顺序不正确:%s 然后 %s" + +#: commit-graph.c:1182 commit-graph.c:1197 +#, c-format +msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" +msgstr "提交图形有不正确的扇出值:fanout[%d] = %u != %u" + +#: commit-graph.c:1189 +#, c-format +msgid "failed to parse commit %s from commit-graph" +msgstr "无法从提交图形中解析提交 %s" + +#: commit-graph.c:1206 msgid "Verifying commits in commit graph" msgstr "正在校验提交图中的提交" +#: commit-graph.c:1219 +#, c-format +msgid "failed to parse commit %s from object database for commit-graph" +msgstr "无法从提交图形的对象库中解析提交 %s" + +#: commit-graph.c:1226 +#, c-format +msgid "root tree OID for commit %s in commit-graph is %s != %s" +msgstr "提交图形中的提交 %s 的根树对象 ID 是 %s != %s" + +#: commit-graph.c:1236 +#, c-format +msgid "commit-graph parent list for commit %s is too long" +msgstr "提交 %s 的提交图形父提交列表太长了" + +#: commit-graph.c:1242 +#, c-format +msgid "commit-graph parent for %s is %s != %s" +msgstr "%s 的提交图形父提交是 %s != %s" + +#: commit-graph.c:1255 +#, c-format +msgid "commit-graph parent list for commit %s terminates early" +msgstr "提交 %s 的提交图形父提交列表过早终止" + +#: commit-graph.c:1260 +#, c-format +msgid "" +"commit-graph has generation number zero for commit %s, but non-zero elsewhere" +msgstr "提交图形中提交 %s 的世代号是零,但其它地方非零" + +#: commit-graph.c:1264 +#, c-format +msgid "" +"commit-graph has non-zero generation number for commit %s, but zero elsewhere" +msgstr "提交图形中提交 %s 的世代号非零,但其它地方是零" + +#: commit-graph.c:1279 +#, c-format +msgid "commit-graph generation for commit %s is %u != %u" +msgstr "提交图形中的提交 %s 的世代号是 %u != %u" + +#: commit-graph.c:1285 +#, c-format +msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" +msgstr "提交图形中提交 %s 的提交日期是 %<PRIuMAX> != %<PRIuMAX>" + #: compat/obstack.c:406 compat/obstack.c:408 msgid "memory exhausted" msgstr "内存耗尽" @@ -1659,7 +1719,7 @@ msgstr "键名没有包含一个小节名称:%s" msgid "key does not contain variable name: %s" msgstr "键名没有包含变量名:%s" -#: config.c:378 sequencer.c:2330 +#: config.c:378 sequencer.c:2459 #, c-format msgid "invalid key: %s" msgstr "无效键名:%s" @@ -1795,135 +1855,135 @@ msgstr "%s 的取值格式错误:%s" msgid "must be one of nothing, matching, simple, upstream or current" msgstr "必须是其中之一:nothing、matching、simple、upstream 或 current" -#: config.c:1481 builtin/pack-objects.c:3394 +#: config.c:1483 builtin/pack-objects.c:3397 #, c-format msgid "bad pack compression level %d" msgstr "错误的打包压缩级别 %d" -#: config.c:1602 +#: config.c:1604 #, c-format msgid "unable to load config blob object '%s'" msgstr "无法从数据对象 '%s' 加载配置" -#: config.c:1605 +#: config.c:1607 #, c-format msgid "reference '%s' does not point to a blob" msgstr "引用 '%s' 没有指向一个数据对象" -#: config.c:1622 +#: config.c:1624 #, c-format msgid "unable to resolve config blob '%s'" msgstr "不能解析配置对象 '%s'" -#: config.c:1652 +#: config.c:1654 #, c-format msgid "failed to parse %s" msgstr "解析 %s 失败" -#: config.c:1705 +#: config.c:1710 msgid "unable to parse command-line config" msgstr "无法解析命令行中的配置" -#: config.c:2037 +#: config.c:2059 msgid "unknown error occurred while reading the configuration files" msgstr "在读取配置文件时遇到未知错误" -#: config.c:2207 +#: config.c:2229 #, c-format msgid "Invalid %s: '%s'" msgstr "无效 %s:'%s'" -#: config.c:2250 +#: config.c:2272 #, c-format msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" msgstr "未知的 core.untrackedCache 取值 '%s',使用默认值 'keep'" -#: config.c:2276 +#: config.c:2298 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "splitIndex.maxPercentChange 的取值 '%d' 应该介于 0 和 100 之间" -#: config.c:2322 +#: config.c:2344 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "无法解析命令行配置中的 '%s'" -#: config.c:2324 +#: config.c:2346 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'" -#: config.c:2405 +#: config.c:2427 #, c-format msgid "invalid section name '%s'" msgstr "无效的小节名称 '%s'" -#: config.c:2437 +#: config.c:2459 #, c-format msgid "%s has multiple values" msgstr "%s 有多个取值" -#: config.c:2466 +#: config.c:2488 #, c-format msgid "failed to write new configuration file %s" msgstr "写入新的配置文件 %s 失败" -#: config.c:2716 config.c:3040 +#: config.c:2740 config.c:3064 #, c-format msgid "could not lock config file %s" msgstr "不能锁定配置文件 %s" -#: config.c:2727 +#: config.c:2751 #, c-format msgid "opening %s" msgstr "打开 %s" -#: config.c:2762 builtin/config.c:328 +#: config.c:2786 builtin/config.c:328 #, c-format msgid "invalid pattern: %s" msgstr "无效模式:%s" -#: config.c:2787 +#: config.c:2811 #, c-format msgid "invalid config file %s" msgstr "无效的配置文件 %s" -#: config.c:2800 config.c:3053 +#: config.c:2824 config.c:3077 #, c-format msgid "fstat on %s failed" msgstr "对 %s 调用 fstat 失败" -#: config.c:2811 +#: config.c:2835 #, c-format msgid "unable to mmap '%s'" msgstr "不能 mmap '%s'" -#: config.c:2820 config.c:3058 +#: config.c:2844 config.c:3082 #, c-format msgid "chmod on %s failed" msgstr "对 %s 调用 chmod 失败" -#: config.c:2905 config.c:3155 +#: config.c:2929 config.c:3179 #, c-format msgid "could not write config file %s" msgstr "不能写入配置文件 %s" -#: config.c:2939 +#: config.c:2963 #, c-format msgid "could not set '%s' to '%s'" msgstr "不能设置 '%s' 为 '%s'" -#: config.c:2941 builtin/remote.c:782 +#: config.c:2965 builtin/remote.c:782 #, c-format msgid "could not unset '%s'" msgstr "不能取消设置 '%s'" -#: config.c:3031 +#: config.c:3055 #, c-format msgid "invalid section name: %s" msgstr "无效的小节名称:%s" -#: config.c:3198 +#: config.c:3222 #, c-format msgid "missing value for '%s'" msgstr "%s 的取值缺失" @@ -2077,28 +2137,28 @@ msgstr "ssh 变体 'simple' 不支持 -6" msgid "ssh variant 'simple' does not support setting port" msgstr "ssh 变体 'simple' 不支持设置端口" -#: connect.c:1259 +#: connect.c:1260 #, c-format msgid "strange pathname '%s' blocked" msgstr "已阻止奇怪的路径名 '%s'" -#: connect.c:1304 +#: connect.c:1307 msgid "unable to fork" msgstr "无法 fork" -#: connected.c:68 builtin/fsck.c:221 builtin/prune.c:146 +#: connected.c:85 builtin/fsck.c:221 builtin/prune.c:43 msgid "Checking connectivity" msgstr "正在检查连通性" -#: connected.c:80 +#: connected.c:97 msgid "Could not run 'git rev-list'" msgstr "不能执行 'git rev-list'" -#: connected.c:100 +#: connected.c:117 msgid "failed write to rev-list" msgstr "写入 rev-list 失败" -#: connected.c:107 +#: connected.c:124 msgid "failed to close rev-list's stdin" msgstr "关闭 rev-list 的标准输入失败" @@ -2326,24 +2386,29 @@ msgstr "读取排序文件 '%s' 失败" msgid "Performing inexact rename detection" msgstr "正在进行非精确的重命名探测" -#: diff.c:108 -#, c-format -msgid "option '%s' requires a value" -msgstr "选项 '%s' 需要一个值" +#: diff-no-index.c:238 +msgid "git diff --no-index [<options>] <path> <path>" +msgstr "git diff --no-index [<选项>] <路径> <路径>" + +#: diff-no-index.c:263 +msgid "" +"Not a git repository. Use --no-index to compare two paths outside a working " +"tree" +msgstr "不是一个 git 仓库。使用 --no-index 比较工作区之外的两个路径" # 译者:注意保持前导空格 -#: diff.c:158 +#: diff.c:155 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr " 无法解析 dirstat 截止(cut-off)百分比 '%s'\n" # 译者:注意保持前导空格 -#: diff.c:163 +#: diff.c:160 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr " 未知的 dirstat 参数 '%s'\n" -#: diff.c:291 +#: diff.c:296 msgid "" "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', " "'dimmed-zebra', 'plain'" @@ -2351,7 +2416,7 @@ msgstr "" "移动的颜色设置必须是 'no'、'default'、'blocks'、'zebra'、'dimmed_zebra' 或 " "'plain'" -#: diff.c:319 +#: diff.c:324 #, c-format msgid "" "unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', " @@ -2360,18 +2425,18 @@ msgstr "" "未知的 color-moved-ws 模式 '%s',可能的取值有 'ignore-space-change'、'ignore-" "space-at-eol'、'ignore-all-space'、'allow-indentation-change'" -#: diff.c:327 +#: diff.c:332 msgid "" "color-moved-ws: allow-indentation-change cannot be combined with other " "whitespace modes" msgstr "color-moved-ws:allow-indentation-change 不能与其它空白字符模式共用" -#: diff.c:400 +#: diff.c:405 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "配置变量 'diff.submodule' 未知的取值:'%s'" -#: diff.c:460 +#: diff.c:465 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -2380,24 +2445,35 @@ msgstr "" "发现配置变量 'diff.dirstat' 中的错误:\n" "%s" -#: diff.c:4211 +#: diff.c:4210 #, c-format msgid "external diff died, stopping at %s" msgstr "外部 diff 退出,停止在 %s" -#: diff.c:4553 +#: diff.c:4555 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-only、--name-status、--check 和 -s 是互斥的" -#: diff.c:4556 +#: diff.c:4558 msgid "-G, -S and --find-object are mutually exclusive" msgstr "-G、-S 和 --find-object 是互斥的" -#: diff.c:4634 +#: diff.c:4636 msgid "--follow requires exactly one pathspec" msgstr "--follow 明确要求只跟一个路径规格" -#: diff.c:4800 +#: diff.c:4684 +#, c-format +msgid "invalid --stat value: %s" +msgstr "无效的 --stat 值:%s" + +#: diff.c:4689 diff.c:4694 diff.c:4699 diff.c:4704 diff.c:5217 +#: parse-options.c:199 parse-options.c:203 +#, c-format +msgid "%s expects a numerical value" +msgstr "%s 期望一个数字值" + +#: diff.c:4721 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -2406,59 +2482,530 @@ msgstr "" "无法解析 --dirstat/-X 选项的参数:\n" "%s" -#: diff.c:4814 +#: diff.c:4806 #, c-format -msgid "Failed to parse --submodule option parameter: '%s'" +msgid "unknown change class '%c' in --diff-filter=%s" +msgstr "--diff-filter=%2$s 中未知的变更类 '%1$c'" + +#: diff.c:4830 +#, c-format +msgid "unknown value after ws-error-highlight=%.*s" +msgstr "ws-error-highlight=%.*s 之后未知的值" + +#: diff.c:4844 +#, c-format +msgid "unable to resolve '%s'" +msgstr "不能解析 '%s'" + +#: diff.c:4894 diff.c:4900 +#, c-format +msgid "%s expects <n>/<m> form" +msgstr "%s 期望 <n>/<m> 格式" + +#: diff.c:4912 +#, c-format +msgid "%s expects a character, got '%s'" +msgstr "%s 期望一个字符,得到 '%s'" + +#: diff.c:4933 +#, c-format +msgid "bad --color-moved argument: %s" +msgstr "坏的 --color-moved 参数:%s" + +#: diff.c:4952 +#, c-format +msgid "invalid mode '%s' in --color-moved-ws" +msgstr "--color-moved-ws 中的无效模式 '%s' " + +#: diff.c:4992 +msgid "" +"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " +"\"histogram\"" +msgstr "" +"diff-algorithm 选项有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\"" + +#: diff.c:5028 diff.c:5048 +#, c-format +msgid "invalid argument to %s" +msgstr "%s 的参数无效" + +#: diff.c:5186 +#, c-format +msgid "failed to parse --submodule option parameter: '%s'" msgstr "无法解析 --submodule 选项的参数:'%s'" -#: diff.c:5900 +#: diff.c:5242 +#, c-format +msgid "bad --word-diff argument: %s" +msgstr "坏的 --word-diff 参数:%s" + +#: diff.c:5265 +msgid "Diff output format options" +msgstr "差异输出格式化选项" + +#: diff.c:5267 diff.c:5273 +msgid "generate patch" +msgstr "生成补丁" + +#: diff.c:5270 builtin/log.c:167 +msgid "suppress diff output" +msgstr "不显示差异输出" + +#: diff.c:5275 diff.c:5389 diff.c:5396 +msgid "<n>" +msgstr "<n>" + +#: diff.c:5276 diff.c:5279 +msgid "generate diffs with <n> lines context" +msgstr "生成含 <n> 行上下文的差异" + +#: diff.c:5281 +msgid "generate the diff in raw format" +msgstr "生成原始格式的差异" + +#: diff.c:5284 +msgid "synonym for '-p --raw'" +msgstr "和 '-p --raw' 同义" + +#: diff.c:5288 +msgid "synonym for '-p --stat'" +msgstr "和 '-p --stat' 同义" + +#: diff.c:5292 +msgid "machine friendly --stat" +msgstr "机器友好的 --stat" + +#: diff.c:5295 +msgid "output only the last line of --stat" +msgstr "只输出 --stat 的最后一行" + +#: diff.c:5297 diff.c:5305 +msgid "<param1,param2>..." +msgstr "<参数1,参数2>..." + +#: diff.c:5298 +msgid "" +"output the distribution of relative amount of changes for each sub-directory" +msgstr "输出每个子目录相对变更的分布" + +#: diff.c:5302 +msgid "synonym for --dirstat=cumulative" +msgstr "和 --dirstat=cumulative 同义" + +#: diff.c:5306 +msgid "synonym for --dirstat=files,param1,param2..." +msgstr "是 --dirstat=files,param1,param2... 的同义词" + +#: diff.c:5310 +msgid "warn if changes introduce conflict markers or whitespace errors" +msgstr "如果变更中引入冲突定界符或空白错误,给出警告" + +#: diff.c:5313 +msgid "condensed summary such as creations, renames and mode changes" +msgstr "精简摘要,例如创建、重命名和模式变更" + +#: diff.c:5316 +msgid "show only names of changed files" +msgstr "只显示变更文件的文件名" + +#: diff.c:5319 +msgid "show only names and status of changed files" +msgstr "只显示变更文件的文件名和状态" + +#: diff.c:5321 +msgid "<width>[,<name-width>[,<count>]]" +msgstr "<宽度>[,<文件名宽度>[,<次数>]]" + +#: diff.c:5322 +msgid "generate diffstat" +msgstr "生成差异统计(diffstat)" + +#: diff.c:5324 diff.c:5327 diff.c:5330 +msgid "<width>" +msgstr "<宽度>" + +#: diff.c:5325 +msgid "generate diffstat with a given width" +msgstr "使用给定的长度生成差异统计" + +#: diff.c:5328 +msgid "generate diffstat with a given name width" +msgstr "使用给定的文件名长度生成差异统计" + +#: diff.c:5331 +msgid "generate diffstat with a given graph width" +msgstr "使用给定的图形长度生成差异统计" + +#: diff.c:5333 +msgid "<count>" +msgstr "<次数>" + +#: diff.c:5334 +msgid "generate diffstat with limited lines" +msgstr "生成有限行数的差异统计" + +#: diff.c:5337 +msgid "generate compact summary in diffstat" +msgstr "生成差异统计的简洁摘要" + +#: diff.c:5340 +msgid "output a binary diff that can be applied" +msgstr "输出一个可以应用的二进制差异" + +#: diff.c:5343 +msgid "show full pre- and post-image object names on the \"index\" lines" +msgstr "在 \"index\" 行显示完整的前后对象名称" + +#: diff.c:5345 +msgid "show colored diff" +msgstr "显示带颜色的差异" + +#: diff.c:5346 +msgid "<kind>" +msgstr "<类型>" + +#: diff.c:5347 +msgid "" +"highlight whitespace errors in the 'context', 'old' or 'new' lines in the " +"diff" +msgstr "对于差异中的上下文、旧的和新的行,加亮显示错误的空白字符" + +#: diff.c:5350 +msgid "" +"do not munge pathnames and use NULs as output field terminators in --raw or " +"--numstat" +msgstr "" +"在 --raw 或者 --numstat 中,不对路径字符转码并使用 NUL 字符做为输出字段的分隔" +"符" + +#: diff.c:5353 diff.c:5356 diff.c:5359 diff.c:5465 +msgid "<prefix>" +msgstr "<前缀>" + +#: diff.c:5354 +msgid "show the given source prefix instead of \"a/\"" +msgstr "显示给定的源前缀取代 \"a/\"" + +#: diff.c:5357 +msgid "show the given destination prefix instead of \"b/\"" +msgstr "显示给定的目标前缀取代 \"b/\"" + +#: diff.c:5360 +msgid "prepend an additional prefix to every line of output" +msgstr "输出的每一行附加前缀" + +#: diff.c:5363 +msgid "do not show any source or destination prefix" +msgstr "不显示任何源和目标前缀" + +#: diff.c:5366 +msgid "show context between diff hunks up to the specified number of lines" +msgstr "显示指定行数的差异块间的上下文" + +#: diff.c:5370 diff.c:5375 diff.c:5380 +msgid "<char>" +msgstr "<字符>" + +#: diff.c:5371 +msgid "specify the character to indicate a new line instead of '+'" +msgstr "指定一个字符取代 '+' 来表示新的一行" + +#: diff.c:5376 +msgid "specify the character to indicate an old line instead of '-'" +msgstr "指定一个字符取代 '-' 来表示旧的一行" + +#: diff.c:5381 +msgid "specify the character to indicate a context instead of ' '" +msgstr "指定一个字符取代 ' ' 来表示一行上下文" + +#: diff.c:5384 +msgid "Diff rename options" +msgstr "差异重命名选项" + +#: diff.c:5385 +msgid "<n>[/<m>]" +msgstr "<n>[/<m>]" + +#: diff.c:5386 +msgid "break complete rewrite changes into pairs of delete and create" +msgstr "将完全重写的变更打破为成对的删除和创建" + +#: diff.c:5390 +msgid "detect renames" +msgstr "检测重命名" + +#: diff.c:5394 +msgid "omit the preimage for deletes" +msgstr "省略删除操作的差异输出" + +#: diff.c:5397 +msgid "detect copies" +msgstr "检测拷贝" + +#: diff.c:5401 +msgid "use unmodified files as source to find copies" +msgstr "使用未修改的文件做为发现拷贝的源" + +#: diff.c:5403 +msgid "disable rename detection" +msgstr "禁用重命名探测" + +#: diff.c:5406 +msgid "use empty blobs as rename source" +msgstr "使用空的数据对象做为重命名的源" + +#: diff.c:5408 +msgid "continue listing the history of a file beyond renames" +msgstr "继续列出文件重命名以外的历史记录" + +#: diff.c:5411 +msgid "" +"prevent rename/copy detection if the number of rename/copy targets exceeds " +"given limit" +msgstr "如果重命名/拷贝目标超过给定的限制,禁止重命名/拷贝检测" + +#: diff.c:5413 +msgid "Diff algorithm options" +msgstr "差异算法选项" + +#: diff.c:5415 +msgid "produce the smallest possible diff" +msgstr "生成尽可能小的差异" + +#: diff.c:5418 +msgid "ignore whitespace when comparing lines" +msgstr "行比较时忽略空白字符" + +#: diff.c:5421 +msgid "ignore changes in amount of whitespace" +msgstr "忽略空白字符的变更" + +#: diff.c:5424 +msgid "ignore changes in whitespace at EOL" +msgstr "忽略行尾的空白字符变更" + +#: diff.c:5427 +msgid "ignore carrier-return at the end of line" +msgstr "忽略行尾的回车符(CR)" + +#: diff.c:5430 +msgid "ignore changes whose lines are all blank" +msgstr "忽略整行都是空白的变更" + +#: diff.c:5433 +msgid "heuristic to shift diff hunk boundaries for easy reading" +msgstr "启发式转换差异边界以便阅读" + +#: diff.c:5436 +msgid "generate diff using the \"patience diff\" algorithm" +msgstr "使用 \"patience diff\" 算法生成差异" + +#: diff.c:5440 +msgid "generate diff using the \"histogram diff\" algorithm" +msgstr "使用 \"histogram diff\" 算法生成差异" + +#: diff.c:5442 +msgid "<algorithm>" +msgstr "<算法>" + +#: diff.c:5443 +msgid "choose a diff algorithm" +msgstr "选择一个差异算法" + +#: diff.c:5445 +msgid "<text>" +msgstr "<文本>" + +#: diff.c:5446 +msgid "generate diff using the \"anchored diff\" algorithm" +msgstr "使用 \"anchored diff\" 算法生成差异" + +#: diff.c:5448 diff.c:5457 diff.c:5460 +msgid "<mode>" +msgstr "<模式>" + +#: diff.c:5449 +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 +msgid "use <regex> to decide what a word is" +msgstr "使用 <正则表达式> 确定何为一个词" + +#: diff.c:5455 +msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" +msgstr "相当于 --word-diff=color --word-diff-regex=<正则>" + +#: diff.c:5458 +msgid "moved lines of code are colored differently" +msgstr "移动的代码行用不同方式着色" + +#: diff.c:5461 +msgid "how white spaces are ignored in --color-moved" +msgstr "在 --color-moved 下如何忽略空白字符" + +#: diff.c:5464 +msgid "Other diff options" +msgstr "其它差异选项" + +#: diff.c:5466 +msgid "when run from subdir, exclude changes outside and show relative paths" +msgstr "当从子目录运行,排除目录之外的变更并显示相对路径" + +#: diff.c:5470 +msgid "treat all files as text" +msgstr "把所有文件当做文本处理" + +#: diff.c:5472 +msgid "swap two inputs, reverse the diff" +msgstr "交换两个输入,反转差异" + +#: diff.c:5474 +msgid "exit with 1 if there were differences, 0 otherwise" +msgstr "有差异时退出码为 1,否则为 0" + +#: diff.c:5476 +msgid "disable all output of the program" +msgstr "禁用本程序的所有输出" + +#: diff.c:5478 +msgid "allow an external diff helper to be executed" +msgstr "允许执行一个外置的差异助手" + +#: diff.c:5480 +msgid "run external text conversion filters when comparing binary files" +msgstr "当比较二进制文件时,运行外部的文本转换过滤器" + +#: diff.c:5482 +msgid "<when>" +msgstr "<何时>" + +#: diff.c:5483 +msgid "ignore changes to submodules in the diff generation" +msgstr "在生成差异时,忽略子模组的更改" + +#: diff.c:5486 +msgid "<format>" +msgstr "<格式>" + +#: diff.c:5487 +msgid "specify how differences in submodules are shown" +msgstr "指定子模组的差异如何显示" + +#: diff.c:5491 +msgid "hide 'git add -N' entries from the index" +msgstr "隐藏索引中 'git add -N' 条目" + +#: diff.c:5494 +msgid "treat 'git add -N' entries as real in the index" +msgstr "将索引中 'git add -N' 条目当做真实的" + +#: diff.c:5496 +msgid "<string>" +msgstr "<字符串>" + +#: diff.c:5497 +msgid "" +"look for differences that change the number of occurrences of the specified " +"string" +msgstr "查找改变了指定字符串出现次数的差异" + +#: diff.c:5500 +msgid "" +"look for differences that change the number of occurrences of the specified " +"regex" +msgstr "查找改变指定正则匹配出现次数的差异" + +#: diff.c:5503 +msgid "show all changes in the changeset with -S or -G" +msgstr "显示使用 -S 或 -G 的变更集的所有变更" + +#: diff.c:5506 +msgid "treat <string> in -S as extended POSIX regular expression" +msgstr "将 -S 的 <string> 当做扩展的 POSIX 正则表达式" + +#: diff.c:5509 +msgid "control the order in which files appear in the output" +msgstr "控制输出中的文件显示顺序" + +#: diff.c:5510 +msgid "<object-id>" +msgstr "<对象 ID>" + +#: diff.c:5511 +msgid "" +"look for differences that change the number of occurrences of the specified " +"object" +msgstr "查找改变指定对象出现次数的差异" + +#: diff.c:5513 +msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" +msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]" + +#: diff.c:5514 +msgid "select files by diff type" +msgstr "通过差异类型选择文件" + +#: diff.c:5516 +msgid "<file>" +msgstr "<文件>" + +#: diff.c:5517 +msgid "Output to a specific file" +msgstr "输出到一个指定的文件" + +#: diff.c:6150 msgid "inexact rename detection was skipped due to too many files." msgstr "因为文件太多,略过不严格的重命名检查。" -#: diff.c:5903 +#: diff.c:6153 msgid "only found copies from modified paths due to too many files." msgstr "因为文件太多,只在修改的路径中查找拷贝。" -#: diff.c:5906 +#: diff.c:6156 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." msgstr "您可能想要将变量 %s 设置为至少 %d 并再次执行此命令。" -#: dir.c:538 +#: dir.c:537 #, c-format msgid "pathspec '%s' did not match any file(s) known to git" msgstr "路径规格 '%s' 未匹配任何 git 已知文件" -#: dir.c:927 +#: dir.c:926 #, c-format msgid "cannot use %s as an exclude file" msgstr "不能将 %s 用作排除文件" -#: dir.c:1842 +#: dir.c:1843 #, c-format msgid "could not open directory '%s'" msgstr "不能打开目录 '%s'" -#: dir.c:2084 +#: dir.c:2085 msgid "failed to get kernel name and information" msgstr "无法获得内核名称和信息" -#: dir.c:2208 +#: dir.c:2209 msgid "untracked cache is disabled on this system or location" msgstr "缓存未跟踪文件在本系统或位置中被禁用" -#: dir.c:3009 +#: dir.c:3013 #, c-format msgid "index file corrupt in repo %s" msgstr "仓库 %s 中的索引文件损坏" -#: dir.c:3054 dir.c:3059 +#: dir.c:3058 dir.c:3063 #, c-format msgid "could not create directories for %s" msgstr "不能为 %s 创建目录" -#: dir.c:3088 +#: dir.c:3092 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "不能从 '%s' 迁移 git 目录到 '%s'" @@ -2472,7 +3019,7 @@ msgstr "提示:等待您的编辑器关闭文件...%c" msgid "Filtering content" msgstr "过滤内容" -#: entry.c:465 +#: entry.c:476 #, c-format msgid "could not stat file '%s'" msgstr "不能对文件 '%s' 调用 stat" @@ -2487,7 +3034,7 @@ msgstr "错误的 git 名字空间路径 \"%s\"" msgid "could not set GIT_DIR to '%s'" msgstr "不能设置 GIT_DIR 为 '%s'" -#: exec-cmd.c:361 +#: exec-cmd.c:363 #, c-format msgid "too many args to run %s" msgstr "执行 %s 的参数太多" @@ -2513,226 +3060,234 @@ msgstr "git fetch-pack:期望 ACK/NAK,却得到 flush 包" msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "git fetch-pack:应为 ACK/NAK,却得到 '%s'" -#: fetch-pack.c:256 +#: fetch-pack.c:196 +msgid "unable to write to remote" +msgstr "无法写到远程" + +#: fetch-pack.c:258 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc 需要 multi_ack_detailed" -#: fetch-pack.c:358 fetch-pack.c:1264 +#: fetch-pack.c:360 fetch-pack.c:1271 #, c-format msgid "invalid shallow line: %s" msgstr "无效的 shallow 信息:%s" -#: fetch-pack.c:364 fetch-pack.c:1271 +#: fetch-pack.c:366 fetch-pack.c:1277 #, c-format msgid "invalid unshallow line: %s" msgstr "无效的 unshallow 信息:%s" -#: fetch-pack.c:366 fetch-pack.c:1273 +#: fetch-pack.c:368 fetch-pack.c:1279 #, c-format msgid "object not found: %s" msgstr "对象未找到:%s" -#: fetch-pack.c:369 fetch-pack.c:1276 +#: fetch-pack.c:371 fetch-pack.c:1282 #, c-format msgid "error in object: %s" msgstr "对象中出错:%s" -#: fetch-pack.c:371 fetch-pack.c:1278 +#: fetch-pack.c:373 fetch-pack.c:1284 #, c-format msgid "no shallow found: %s" msgstr "未发现 shallow:%s" -#: fetch-pack.c:374 fetch-pack.c:1282 +#: fetch-pack.c:376 fetch-pack.c:1288 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "应为 shallow/unshallow,却得到 %s" -#: fetch-pack.c:415 +#: fetch-pack.c:417 #, c-format msgid "got %s %d %s" msgstr "得到 %s %d %s" -#: fetch-pack.c:432 +#: fetch-pack.c:434 #, c-format msgid "invalid commit %s" msgstr "无效提交 %s" -#: fetch-pack.c:463 +#: fetch-pack.c:465 msgid "giving up" msgstr "放弃" -#: fetch-pack.c:475 progress.c:229 +#: fetch-pack.c:477 progress.c:284 msgid "done" msgstr "完成" -#: fetch-pack.c:487 +#: fetch-pack.c:489 #, c-format msgid "got %s (%d) %s" msgstr "得到 %s (%d) %s" -#: fetch-pack.c:533 +#: fetch-pack.c:535 #, c-format msgid "Marking %s as complete" msgstr "标记 %s 为完成" -#: fetch-pack.c:740 +#: fetch-pack.c:744 #, c-format msgid "already have %s (%s)" msgstr "已经有 %s(%s)" -#: fetch-pack.c:779 +#: fetch-pack.c:783 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-pack:无法派生 sideband 多路输出" -#: fetch-pack.c:787 +#: fetch-pack.c:791 msgid "protocol error: bad pack header" msgstr "协议错误:坏的包头" -#: fetch-pack.c:855 +#: fetch-pack.c:859 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-pack:无法派生进程 %s" -#: fetch-pack.c:871 +#: fetch-pack.c:875 #, c-format msgid "%s failed" msgstr "%s 失败" -#: fetch-pack.c:873 +#: fetch-pack.c:877 msgid "error in sideband demultiplexer" msgstr "sideband 多路输出出错" -#: fetch-pack.c:902 +#: fetch-pack.c:906 msgid "Server does not support shallow clients" msgstr "服务器不支持 shalllow 客户端" -#: fetch-pack.c:906 +#: fetch-pack.c:910 msgid "Server supports multi_ack_detailed" msgstr "服务器支持 multi_ack_detailed" -#: fetch-pack.c:909 +#: fetch-pack.c:913 msgid "Server supports no-done" msgstr "服务器支持 no-done" -#: fetch-pack.c:915 +#: fetch-pack.c:919 msgid "Server supports multi_ack" msgstr "服务器支持 multi_ack" -#: fetch-pack.c:919 +#: fetch-pack.c:923 msgid "Server supports side-band-64k" msgstr "服务器支持 side-band-64k" -#: fetch-pack.c:923 +#: fetch-pack.c:927 msgid "Server supports side-band" msgstr "服务器支持 side-band" -#: fetch-pack.c:927 +#: fetch-pack.c:931 msgid "Server supports allow-tip-sha1-in-want" msgstr "服务器支持 allow-tip-sha1-in-want" -#: fetch-pack.c:931 +#: fetch-pack.c:935 msgid "Server supports allow-reachable-sha1-in-want" msgstr "服务器支持 allow-reachable-sha1-in-want" -#: fetch-pack.c:941 +#: fetch-pack.c:945 msgid "Server supports ofs-delta" msgstr "服务器支持 ofs-delta" -#: fetch-pack.c:947 fetch-pack.c:1140 +#: fetch-pack.c:951 fetch-pack.c:1144 msgid "Server supports filter" msgstr "服务器支持 filter" -#: fetch-pack.c:955 +#: fetch-pack.c:959 #, c-format msgid "Server version is %.*s" msgstr "服务器版本 %.*s" -#: fetch-pack.c:961 +#: fetch-pack.c:965 msgid "Server does not support --shallow-since" msgstr "服务器不支持 --shallow-since" -#: fetch-pack.c:965 +#: fetch-pack.c:969 msgid "Server does not support --shallow-exclude" msgstr "服务器不支持 --shallow-exclude" -#: fetch-pack.c:967 +#: fetch-pack.c:971 msgid "Server does not support --deepen" msgstr "服务器不支持 --deepen" -#: fetch-pack.c:984 +#: fetch-pack.c:988 msgid "no common commits" msgstr "没有共同的提交" -#: fetch-pack.c:996 fetch-pack.c:1419 +#: fetch-pack.c:1000 fetch-pack.c:1449 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack:获取失败。" -#: fetch-pack.c:1134 +#: fetch-pack.c:1138 msgid "Server does not support shallow requests" msgstr "服务器不支持 shalllow 请求" -#: fetch-pack.c:1184 +#: fetch-pack.c:1171 +msgid "unable to write request to remote" +msgstr "无法将请求写到远程" + +#: fetch-pack.c:1189 #, c-format msgid "error reading section header '%s'" msgstr "读取节标题 '%s' 出错" -#: fetch-pack.c:1190 +#: fetch-pack.c:1195 #, c-format msgid "expected '%s', received '%s'" msgstr "预期 '%s',得到 '%s'" -#: fetch-pack.c:1229 +#: fetch-pack.c:1234 #, c-format msgid "unexpected acknowledgment line: '%s'" msgstr "意外的确认行:'%s'" -#: fetch-pack.c:1234 +#: fetch-pack.c:1239 #, c-format msgid "error processing acks: %d" msgstr "处理 ack 出错:%d" -#: fetch-pack.c:1244 +#: fetch-pack.c:1249 msgid "expected packfile to be sent after 'ready'" msgstr "预期在 'ready' 之后发送 packfile" -#: fetch-pack.c:1246 +#: fetch-pack.c:1251 msgid "expected no other sections to be sent after no 'ready'" msgstr "在没有 'ready' 不应该发送其它小节" -#: fetch-pack.c:1287 +#: fetch-pack.c:1293 #, c-format msgid "error processing shallow info: %d" msgstr "处理浅克隆信息出错:%d" -#: fetch-pack.c:1308 +#: fetch-pack.c:1340 #, c-format msgid "expected wanted-ref, got '%s'" msgstr "预期 wanted-ref,得到 '%s'" -#: fetch-pack.c:1318 +#: fetch-pack.c:1345 #, c-format msgid "unexpected wanted-ref: '%s'" msgstr "意外的 wanted-ref:'%s'" -#: fetch-pack.c:1322 +#: fetch-pack.c:1350 #, c-format msgid "error processing wanted refs: %d" msgstr "处理要获取的引用出错:%d" -#: fetch-pack.c:1646 +#: fetch-pack.c:1676 msgid "no matching remote head" msgstr "没有匹配的远程分支" -#: fetch-pack.c:1664 builtin/clone.c:671 +#: fetch-pack.c:1699 builtin/clone.c:673 msgid "remote did not send all necessary objects" msgstr "远程没有发送所有必需的对象" -#: fetch-pack.c:1690 +#: fetch-pack.c:1726 #, c-format msgid "no such remote ref %s" msgstr "没有这样的远程引用 %s" -#: fetch-pack.c:1693 +#: fetch-pack.c:1729 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "服务器不允许请求未公开的对象 %s" @@ -2836,28 +3391,28 @@ msgstr "在 $PATH 路径中的其他地方可用的 git 命令" msgid "These are common Git commands used in various situations:" msgstr "这些是各种场合常见的 Git 命令:" -#: help.c:363 git.c:90 +#: help.c:363 git.c:97 #, c-format msgid "unsupported command listing type '%s'" msgstr "不支持的命令列表类型 '%s'" -#: help.c:410 +#: help.c:403 msgid "The common Git guides are:" msgstr "最常用的 Git 向导有:" -#: help.c:519 +#: help.c:512 msgid "See 'git help <command>' to read about a specific subcommand" msgstr "执行 'git help <command>' 来查看特定子命令" -#: help.c:524 +#: help.c:517 msgid "External commands" msgstr "外部命令" -#: help.c:539 +#: help.c:532 msgid "Command aliases" msgstr "命令别名" -#: help.c:603 +#: help.c:596 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" @@ -2866,31 +3421,31 @@ msgstr "" "'%s' 像是一个 git 命令,但却无法运行。\n" "可能是 git-%s 受损?" -#: help.c:662 +#: help.c:655 msgid "Uh oh. Your system reports no Git commands at all." msgstr "唉呀,您的系统中未发现 Git 命令。" -#: help.c:684 +#: help.c:677 #, c-format msgid "WARNING: You called a Git command named '%s', which does not exist." msgstr "警告:您运行了一个并不存在的 Git 命令 '%s'。" -#: help.c:689 +#: help.c:682 #, c-format msgid "Continuing under the assumption that you meant '%s'." msgstr "假定你想要的是 '%s' 并继续。" -#: help.c:694 +#: help.c:687 #, c-format msgid "Continuing in %0.1f seconds, assuming that you meant '%s'." msgstr "假定你想要的是 '%2$s',在 %1$0.1f 秒钟后继续。" -#: help.c:702 +#: help.c:695 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。" -#: help.c:706 +#: help.c:699 msgid "" "\n" "The most similar command is" @@ -2904,16 +3459,16 @@ msgstr[1] "" "\n" "最相似的命令是" -#: help.c:721 +#: help.c:714 msgid "git version [<options>]" msgstr "git version [<选项>]" -#: help.c:789 +#: help.c:782 #, c-format msgid "%s: %s - %s" msgstr "%s:%s - %s" -#: help.c:793 +#: help.c:786 msgid "" "\n" "Did you mean this?" @@ -2927,7 +3482,7 @@ msgstr[1] "" "\n" "您指的是这其中的某一个么?" -#: ident.c:345 +#: ident.c:349 msgid "" "\n" "*** Please tell me who you are.\n" @@ -2952,39 +3507,54 @@ msgstr "" "来设置您账号的缺省身份标识。\n" "如果仅在本仓库设置身份标识,则省略 --global 参数。\n" -#: ident.c:369 +#: ident.c:379 msgid "no email was given and auto-detection is disabled" msgstr "未提供邮件地址且自动探测被禁用" -#: ident.c:374 +#: ident.c:384 #, c-format msgid "unable to auto-detect email address (got '%s')" msgstr "无法自动探测邮件地址(得到 '%s')" -#: ident.c:384 +#: ident.c:401 msgid "no name was given and auto-detection is disabled" msgstr "未提供姓名且自动探测被禁用" -#: ident.c:390 +#: ident.c:407 #, c-format msgid "unable to auto-detect name (got '%s')" msgstr "无法自动探测姓名(得到 '%s')" -#: ident.c:398 +#: ident.c:415 #, c-format msgid "empty ident name (for <%s>) not allowed" msgstr "不允许空的姓名(对于 <%s>)" -#: ident.c:404 +#: ident.c:421 #, c-format msgid "name consists only of disallowed characters: %s" msgstr "姓名中仅包含禁用字符:%s" -#: ident.c:419 builtin/commit.c:608 +#: ident.c:436 builtin/commit.c:608 #, 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" +msgstr "树 %2$s 中的条目 '%1$s' 具有树的属性,但不是一个树对象" + +#: list-objects.c:142 +#, c-format +msgid "entry '%s' in tree %s has blob mode, but is not a blob" +msgstr "树 %2$s 中的条目 '%1$s' 具有数据对象的属性,但不是一个数据对象" + +#: list-objects.c:378 +#, c-format +msgid "unable to load root tree for commit %s" +msgstr "无法为提交 %s 加载根树" + #: list-objects-filter-options.c:36 msgid "multiple filter-specs cannot be combined" msgstr "不能混用多种过滤规格" @@ -2993,7 +3563,11 @@ msgstr "不能混用多种过滤规格" msgid "expected 'tree:<depth>'" msgstr "期望 'tree:<深度>'" -#: list-objects-filter-options.c:152 +#: list-objects-filter-options.c:84 +msgid "sparse:path filters support has been dropped" +msgstr "sparse:path 过滤器支持已被删除" + +#: list-objects-filter-options.c:158 msgid "cannot change partial clone promisor remote" msgstr "无法修改部分克隆的 promisor 远程仓库" @@ -3024,113 +3598,114 @@ msgstr "不能创建 '%s.lock':%s" msgid "failed to read the cache" msgstr "读取缓存失败" -#: merge.c:107 rerere.c:720 builtin/am.c:1884 builtin/am.c:1918 -#: builtin/checkout.c:416 builtin/checkout.c:745 builtin/clone.c:771 +#: 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-recursive.c:332 +#: merge-recursive.c:322 msgid "(bad commit)\n" msgstr "(坏提交)\n" -#: merge-recursive.c:355 +#: merge-recursive.c:345 #, c-format msgid "add_cacheinfo failed for path '%s'; merge aborting." msgstr "add_cacheinfo 对路径 '%s' 执行失败,合并终止。" -#: merge-recursive.c:364 +#: merge-recursive.c:354 #, c-format msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." msgstr "add_cacheinfo 无法刷新路径 '%s',合并终止。" -#: merge-recursive.c:447 +#: merge-recursive.c:437 msgid "error building trees" msgstr "创建树出错" -#: merge-recursive.c:902 +#: merge-recursive.c:861 #, c-format msgid "failed to create path '%s'%s" msgstr "创建路径 '%s'%s 失败" -#: merge-recursive.c:913 +#: merge-recursive.c:872 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "删除 %s 以便为子目录留出空间\n" -#: merge-recursive.c:927 merge-recursive.c:946 +#: merge-recursive.c:886 merge-recursive.c:905 msgid ": perhaps a D/F conflict?" msgstr ":可能是一个目录/文件冲突?" -#: merge-recursive.c:936 +#: merge-recursive.c:895 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "拒绝丢弃 '%s' 中的未跟踪文件" -#: merge-recursive.c:978 builtin/cat-file.c:40 +#: merge-recursive.c:936 builtin/cat-file.c:40 #, c-format msgid "cannot read object %s '%s'" msgstr "不能读取对象 %s '%s'" -#: merge-recursive.c:980 +#: merge-recursive.c:939 #, c-format msgid "blob expected for %s '%s'" msgstr "%s '%s' 应为数据对象" -#: merge-recursive.c:1004 +#: merge-recursive.c:963 #, c-format msgid "failed to open '%s': %s" msgstr "打开 '%s' 失败:%s" -#: merge-recursive.c:1015 +#: merge-recursive.c:974 #, c-format msgid "failed to symlink '%s': %s" msgstr "创建符号链接 '%s' 失败:%s" -#: merge-recursive.c:1020 +#: merge-recursive.c:979 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "不知道如何处理 %06o %s '%s'" -#: merge-recursive.c:1211 +#: merge-recursive.c:1175 #, c-format msgid "Failed to merge submodule %s (not checked out)" msgstr "无法合并子模组 %s (没有检出)" -#: merge-recursive.c:1218 +#: merge-recursive.c:1182 #, c-format msgid "Failed to merge submodule %s (commits not present)" msgstr "无法合并子模组 %s(提交不存在)" -#: merge-recursive.c:1225 +#: merge-recursive.c:1189 #, c-format msgid "Failed to merge submodule %s (commits don't follow merge-base)" msgstr "无法合并子模组 %s (提交未跟随合并基线)" -#: merge-recursive.c:1233 merge-recursive.c:1245 +#: merge-recursive.c:1197 merge-recursive.c:1209 #, c-format msgid "Fast-forwarding submodule %s to the following commit:" msgstr "子模组 %s 快进到如下提交:" -#: merge-recursive.c:1236 merge-recursive.c:1248 +#: merge-recursive.c:1200 merge-recursive.c:1212 #, c-format msgid "Fast-forwarding submodule %s" msgstr "快进子模组 %s" -#: merge-recursive.c:1271 +#: merge-recursive.c:1235 #, c-format msgid "Failed to merge submodule %s (merge following commits not found)" msgstr "无法合并子模组 %s (没发现合并跟随的提交)" -#: merge-recursive.c:1275 +#: merge-recursive.c:1239 #, c-format msgid "Failed to merge submodule %s (not fast-forward)" msgstr "无法合并子模组 %s(非快进)" -#: merge-recursive.c:1276 +#: merge-recursive.c:1240 msgid "Found a possible merge resolution for the submodule:\n" msgstr "找到子模组的一个可能的合并方案:\n" -#: merge-recursive.c:1279 +#: merge-recursive.c:1243 #, c-format msgid "" "If this is correct simply add it to the index for example\n" @@ -3146,31 +3721,31 @@ msgstr "" "\n" "以接受此建议。\n" -#: merge-recursive.c:1288 +#: merge-recursive.c:1252 #, c-format msgid "Failed to merge submodule %s (multiple merges found)" msgstr "无法合并子模组 %s (发现多个合并)" -#: merge-recursive.c:1361 +#: merge-recursive.c:1325 msgid "Failed to execute internal merge" msgstr "无法执行内部合并" -#: merge-recursive.c:1366 +#: merge-recursive.c:1330 #, c-format msgid "Unable to add %s to database" msgstr "不能添加 %s 至对象库" -#: merge-recursive.c:1398 +#: merge-recursive.c:1362 #, c-format msgid "Auto-merging %s" msgstr "自动合并 %s" -#: merge-recursive.c:1419 +#: merge-recursive.c:1385 #, c-format msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." msgstr "错误:拒绝丢失未跟踪文件 '%s',而是写入 %s。" -#: merge-recursive.c:1486 +#: merge-recursive.c:1457 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -3179,7 +3754,7 @@ msgstr "" "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 的 %6$s 版" "本被保留。" -#: merge-recursive.c:1491 +#: merge-recursive.c:1462 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -3188,7 +3763,7 @@ msgstr "" "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %6$s 中的 %5$s 被 %4$s。%8$s 的 " "%7$s 版本被保留。" -#: merge-recursive.c:1498 +#: merge-recursive.c:1469 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -3197,7 +3772,7 @@ msgstr "" "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 的 %6$s 版" "本保留在 %8$s 中。" -#: merge-recursive.c:1503 +#: merge-recursive.c:1474 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -3206,40 +3781,40 @@ msgstr "" "冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %6$s 中的 %5$s 被 %4$s。%8$s 的 " "%7$s 版本保留在 %9$s 中。" -#: merge-recursive.c:1537 +#: merge-recursive.c:1509 msgid "rename" msgstr "重命名" -#: merge-recursive.c:1537 +#: merge-recursive.c:1509 msgid "renamed" msgstr "重命名" -#: merge-recursive.c:1633 merge-recursive.c:2481 merge-recursive.c:3213 +#: merge-recursive.c:1589 merge-recursive.c:2445 merge-recursive.c:3085 #, c-format msgid "Refusing to lose dirty file at %s" msgstr "拒绝丢失脏文件 '%s'" -#: merge-recursive.c:1643 +#: merge-recursive.c:1599 #, c-format msgid "Refusing to lose untracked file at %s, even though it's in the way." msgstr "拒绝在 '%s' 处失去未跟踪文件,即使它存在于重命名中。" -#: merge-recursive.c:1706 +#: merge-recursive.c:1657 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s" msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s" -#: merge-recursive.c:1734 +#: merge-recursive.c:1687 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加" -#: merge-recursive.c:1739 +#: merge-recursive.c:1692 #, c-format msgid "Refusing to lose untracked file at %s; adding as %s instead" msgstr "拒绝丢失未跟踪文件 '%s',而是添加为 %s" -#: merge-recursive.c:1759 +#: merge-recursive.c:1711 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -3248,18 +3823,18 @@ msgstr "" "冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 " "\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s" -#: merge-recursive.c:1764 +#: merge-recursive.c:1716 msgid " (left unresolved)" msgstr "(留下未解决)" -#: merge-recursive.c:1868 +#: merge-recursive.c:1825 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" "冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->" "%5$s" -#: merge-recursive.c:2064 +#: merge-recursive.c:2030 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to place %s because " @@ -3269,7 +3844,7 @@ msgstr "" "冲突(分割的目录重命名):不清楚 %s 应该放在哪里,因为目录 %s 被重命名到多个" "其它目录,没有目录包含大部分文件。" -#: merge-recursive.c:2096 +#: merge-recursive.c:2062 #, c-format msgid "" "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " @@ -3278,7 +3853,7 @@ msgstr "" "冲突(隐式目录重命名):处于隐式目录重命名的现存文件/目录 %s,将以下路径放" "在:%s。" -#: merge-recursive.c:2106 +#: merge-recursive.c:2072 #, c-format msgid "" "CONFLICT (implicit dir rename): Cannot map more than one path to %s; " @@ -3287,7 +3862,7 @@ msgstr "" "冲突(隐式目录重命名):无法映射一个以上路径到 %s,隐式目录重命名尝试将这些路" "径放置于此:%s" -#: merge-recursive.c:2198 +#: merge-recursive.c:2164 #, c-format msgid "" "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" @@ -3296,87 +3871,122 @@ msgstr "" "冲突(重命名/重命名):在 %3$s 中重命名目录 %1$s->%2$s,在 %6$s 中重命名目录 " "%4$s->%5$s" -#: merge-recursive.c:2443 +#: merge-recursive.c:2408 #, c-format msgid "" "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " "renamed." msgstr "警告:避免应用 %s -> %s 的重命名到 %s,因为 %s 本身已被重命名。" -#: merge-recursive.c:3022 +#: merge-recursive.c:2929 #, c-format msgid "cannot read object %s" msgstr "不能读取对象 %s" -#: merge-recursive.c:3025 +#: merge-recursive.c:2932 #, c-format msgid "object %s is not a blob" msgstr "对象 %s 不是一个数据对象" -#: merge-recursive.c:3094 +#: merge-recursive.c:2996 msgid "modify" msgstr "修改" -#: merge-recursive.c:3094 +#: merge-recursive.c:2996 msgid "modified" msgstr "修改" -#: merge-recursive.c:3105 +#: merge-recursive.c:3008 msgid "content" msgstr "内容" -#: merge-recursive.c:3112 +#: merge-recursive.c:3012 msgid "add/add" msgstr "添加/添加" -#: merge-recursive.c:3160 +#: merge-recursive.c:3035 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "略过 %s(已经做过相同合并)" -#: merge-recursive.c:3182 git-submodule.sh:861 +#: merge-recursive.c:3057 git-submodule.sh:937 msgid "submodule" msgstr "子模组" -#: merge-recursive.c:3183 +#: merge-recursive.c:3058 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "冲突(%s):合并冲突于 %s" -#: merge-recursive.c:3216 +#: merge-recursive.c:3088 #, c-format msgid "Adding as %s instead" msgstr "而是以 %s 为名添加" -#: merge-recursive.c:3319 +#: merge-recursive.c:3170 +#, c-format +msgid "" +"Path updated: %s added in %s inside a directory that was renamed in %s; " +"moving it to %s." +msgstr "" +"路径已更新:%s 添加到 %s,位于一个被重命名到 %s 的目录中,将其移动到 %s。" + +#: merge-recursive.c:3173 +#, 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 "" +"冲突(文件位置):%s 添加到 %s,位于一个被重命名为 %s 的目录中,建议将其移动" +"到 %s。" + +#: merge-recursive.c:3177 +#, c-format +msgid "" +"Path updated: %s renamed to %s in %s, inside a directory that was renamed in " +"%s; moving it to %s." +msgstr "" +"路径已更新:%1$s 重命名为 %3$s 中的 %2$s,而该目录被重命名到 %4$s 中,将其移" +"动到 %5$s。" + +#: merge-recursive.c:3180 +#, 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 "" +"冲突(文件位置):%1$s 重命名为 %3$s 中的 %2$s,而该目录被重命名到 %4$s 中," +"建议将其移动到 %5$s。" + +#: merge-recursive.c:3294 #, c-format msgid "Removing %s" msgstr "删除 %s" -#: merge-recursive.c:3345 +#: merge-recursive.c:3317 msgid "file/directory" msgstr "文件/目录" -#: merge-recursive.c:3351 +#: merge-recursive.c:3322 msgid "directory/file" msgstr "目录/文件" -#: merge-recursive.c:3358 +#: merge-recursive.c:3329 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s" -#: merge-recursive.c:3367 +#: merge-recursive.c:3338 #, c-format msgid "Adding %s" msgstr "添加 %s" -#: merge-recursive.c:3376 +#: merge-recursive.c:3347 #, c-format msgid "CONFLICT (add/add): Merge conflict in %s" msgstr "冲突(add/add):合并冲突于 %s" -#: merge-recursive.c:3417 +#: merge-recursive.c:3385 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -3385,147 +3995,159 @@ msgstr "" "您对下列文件的本地修改将被合并操作覆盖:\n" " %s" -#: merge-recursive.c:3428 +#: merge-recursive.c:3396 msgid "Already up to date!" msgstr "已经是最新的!" -#: merge-recursive.c:3437 +#: merge-recursive.c:3405 #, c-format msgid "merging of trees %s and %s failed" msgstr "无法合并树 %s 和 %s" -#: merge-recursive.c:3536 +#: merge-recursive.c:3504 msgid "Merging:" msgstr "合并:" -#: merge-recursive.c:3549 +#: merge-recursive.c:3517 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "发现 %u 个共同祖先:" msgstr[1] "发现 %u 个共同祖先:" -#: merge-recursive.c:3588 +#: merge-recursive.c:3556 msgid "merge returned no commit" msgstr "合并未返回提交" -#: merge-recursive.c:3654 +#: merge-recursive.c:3622 #, c-format msgid "Could not parse object '%s'" msgstr "不能解析对象 '%s'" -#: merge-recursive.c:3670 builtin/merge.c:692 builtin/merge.c:850 +#: merge-recursive.c:3638 builtin/merge.c:702 builtin/merge.c:873 msgid "Unable to write index." msgstr "不能写入索引。" -#: midx.c:65 +#: midx.c:66 #, c-format msgid "multi-pack-index file %s is too small" msgstr "多包索引文件 %s 太小" -#: midx.c:81 +#: midx.c:82 #, c-format msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x" msgstr "多包索引签名 0x%08x 和签名 0x%08x 不匹配" -#: midx.c:86 +#: midx.c:87 #, c-format msgid "multi-pack-index version %d not recognized" msgstr "multi-pack-index 版本 %d 不能被识别" -#: midx.c:91 +#: midx.c:92 #, c-format msgid "hash version %u does not match" msgstr "散列版本 %u 不匹配" -#: midx.c:105 +#: midx.c:106 msgid "invalid chunk offset (too large)" msgstr "无效的块偏移(太大)" -#: midx.c:129 +#: midx.c:130 msgid "terminating multi-pack-index chunk id appears earlier than expected" msgstr "终止多包索引块 id 出现时间早于预期" -#: midx.c:142 +#: midx.c:143 msgid "multi-pack-index missing required pack-name chunk" msgstr "多包索引缺少必需的包名块" -#: midx.c:144 +#: midx.c:145 msgid "multi-pack-index missing required OID fanout chunk" -msgstr "多包索引缺少必需的 OID 扇出块" +msgstr "多包索引缺少必需的对象 ID 扇出块" -#: midx.c:146 +#: midx.c:147 msgid "multi-pack-index missing required OID lookup chunk" -msgstr "多包索引缺少必需的 OID 查询块" +msgstr "多包索引缺少必需的对象 ID 查询块" -#: midx.c:148 +#: midx.c:149 msgid "multi-pack-index missing required object offsets chunk" msgstr "多包索引缺少必需的对象偏移块" -#: midx.c:162 +#: midx.c:163 #, c-format msgid "multi-pack-index pack names out of order: '%s' before '%s'" msgstr "多包索引包名无序:'%s' 在 '%s' 之前" -#: midx.c:205 +#: midx.c:208 #, c-format msgid "bad pack-int-id: %u (%u total packs)" msgstr "错的 pack-int-id:%u(共有 %u 个包)" -#: midx.c:246 +#: midx.c:258 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" msgstr "多包索引存储一个64位偏移,但是 off_t 太小" -#: midx.c:271 +#: midx.c:286 msgid "error preparing packfile from multi-pack-index" msgstr "从多包索引准备 packfile 出错" -#: midx.c:407 +#: midx.c:457 #, c-format msgid "failed to add packfile '%s'" msgstr "添加包文件 '%s' 失败" -#: midx.c:413 +#: midx.c:463 #, c-format msgid "failed to open pack-index '%s'" msgstr "打开包索引 '%s' 失败" -#: midx.c:507 +#: midx.c:557 #, c-format msgid "failed to locate object %d in packfile" msgstr "在包文件中定位对象 %d 失败" -#: midx.c:943 +#: midx.c:993 #, c-format msgid "failed to clear multi-pack-index at %s" msgstr "清理位于 %s 的多包索引失败" -#: midx.c:981 +#: midx.c:1048 +msgid "Looking for referenced packfiles" +msgstr "正在查找引用的包文件" + +#: midx.c:1063 #, c-format msgid "" "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" -msgstr "对象ID扇出无序:fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" +msgstr "对象 ID 扇出无序:fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" -#: midx.c:992 +#: midx.c:1067 +msgid "Verifying OID order in MIDX" +msgstr "正在校验 MIDX 中的对象 ID 顺序" + +#: midx.c:1076 #, c-format msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" -msgstr "对象ID查询无序:oid[%d] = %s >= %s = oid[%d]" +msgstr "对象 ID 查询无序:oid[%d] = %s >= %s = oid[%d]" + +#: midx.c:1095 +msgid "Sorting objects by packfile" +msgstr "通过包文件为对象排序" -#: midx.c:996 +#: midx.c:1101 msgid "Verifying object offsets" msgstr "校验对象偏移" -#: midx.c:1004 +#: midx.c:1117 #, c-format msgid "failed to load pack entry for oid[%d] = %s" msgstr "为 oid[%d] = %s 加载包条目失败" -#: midx.c:1010 +#: midx.c:1123 #, c-format msgid "failed to load pack-index for packfile %s" msgstr "为包文件 %s 加载包索引失败" -#: midx.c:1019 +#: midx.c:1132 #, c-format msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>" msgstr "oid[%d] = %s 错误的对象偏移:%<PRIx64> != %<PRIx64>" @@ -3609,85 +4231,80 @@ msgstr "不能解析对象:%s" msgid "hash mismatch %s" msgstr "哈希值与 %s 不匹配" -#: packfile.c:607 +#: packfile.c:617 msgid "offset before end of packfile (broken .idx?)" msgstr "偏移量在包文件结束之前(损坏的 .idx?)" -#: packfile.c:1870 +#: packfile.c:1868 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "偏移量在 %s 的包索引开始之前(损坏的索引?)" -#: packfile.c:1874 +#: packfile.c:1872 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "偏移量越过了 %s 的包索引的结尾(被截断的索引?)" -#: parse-options.c:35 +#: parse-options.c:38 #, c-format msgid "%s requires a value" msgstr "%s 需要一个值" -#: parse-options.c:69 +#: parse-options.c:73 #, c-format msgid "%s is incompatible with %s" msgstr "%s 与 %s 不兼容" -#: parse-options.c:74 +#: parse-options.c:78 #, c-format msgid "%s : incompatible with something else" msgstr "%s:和其它的不兼容" -#: parse-options.c:88 parse-options.c:92 parse-options.c:260 +#: parse-options.c:92 parse-options.c:96 parse-options.c:319 #, c-format msgid "%s takes no value" msgstr "%s 不取值" -#: parse-options.c:90 +#: parse-options.c:94 #, c-format msgid "%s isn't available" msgstr "%s 不可用" -#: parse-options.c:178 -#, c-format -msgid "%s expects a numerical value" -msgstr "%s 期望一个数字值" - -#: parse-options.c:194 +#: parse-options.c:219 #, c-format msgid "%s expects a non-negative integer value with an optional k/m/g suffix" msgstr "%s 期望一个非负整数和一个可选的 k/m/g 后缀" -#: parse-options.c:322 +#: parse-options.c:389 #, c-format msgid "ambiguous option: %s (could be --%s%s or --%s%s)" msgstr "有歧义的选项:%s(可以是 --%s%s 或 --%s%s)" -#: parse-options.c:356 parse-options.c:364 +#: parse-options.c:423 parse-options.c:431 #, c-format msgid "did you mean `--%s` (with two dashes ?)" msgstr "你的意思是 `--%s`(有两个短线?)" -#: parse-options.c:649 +#: parse-options.c:859 #, c-format msgid "unknown option `%s'" msgstr "未知选项 `%s'" -#: parse-options.c:651 +#: parse-options.c:861 #, c-format msgid "unknown switch `%c'" msgstr "未知开关 `%c'" -#: parse-options.c:653 +#: parse-options.c:863 #, c-format msgid "unknown non-ascii option in string: `%s'" -msgstr "字符串中未知的非ascii字符选项:`%s'" +msgstr "字符串中未知的非 ascii 字符选项:`%s'" -#: parse-options.c:675 +#: parse-options.c:887 msgid "..." msgstr "..." -#: parse-options.c:694 +#: parse-options.c:906 #, c-format msgid "usage: %s" msgstr "用法:%s" @@ -3695,42 +4312,47 @@ msgstr "用法:%s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c:700 +#: parse-options.c:912 #, c-format msgid " or: %s" msgstr " 或:%s" # 译者:为保证在输出中对齐,注意调整句中空格! -#: parse-options.c:703 +#: parse-options.c:915 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:742 +#: parse-options.c:954 msgid "-NUM" msgstr "-数字" -#: parse-options-cb.c:21 +#: parse-options.c:968 +#, c-format +msgid "alias of --%s" +msgstr "--%s 的别名" + +#: parse-options-cb.c:20 parse-options-cb.c:24 #, c-format msgid "option `%s' expects a numerical value" msgstr "选项 `%s' 期望一个数字值" -#: parse-options-cb.c:38 +#: parse-options-cb.c:41 #, c-format msgid "malformed expiration date '%s'" msgstr "格式错误的到期时间:'%s'" -#: parse-options-cb.c:51 +#: parse-options-cb.c:54 #, c-format msgid "option `%s' expects \"always\", \"auto\", or \"never\"" msgstr "选项 `%s' 期望 \"always\"、\"auto\" 或 \"never\"" -#: parse-options-cb.c:110 +#: parse-options-cb.c:130 parse-options-cb.c:147 #, c-format msgid "malformed object name '%s'" msgstr "格式错误的对象名 '%s'" -#: path.c:894 +#: path.c:897 #, c-format msgid "Could not make %s writable by group" msgstr "不能设置 %s 为组可写" @@ -3806,45 +4428,53 @@ msgstr "%s:路径规格神奇前缀不被此命令支持:%s" msgid "pathspec '%s' is beyond a symbolic link" msgstr "路径规格 '%s' 位于符号链接中" -#: pkt-line.c:104 +#: pkt-line.c:92 +msgid "unable to write flush packet" +msgstr "无法写 flush 包" + +#: pkt-line.c:99 +msgid "unable to write delim packet" +msgstr "无法写 delim 包" + +#: pkt-line.c:106 msgid "flush packet write failed" msgstr "flush 包写错误" -#: pkt-line.c:144 pkt-line.c:230 +#: pkt-line.c:146 pkt-line.c:232 msgid "protocol error: impossibly long line" msgstr "协议错误:不可能的长行" -#: pkt-line.c:160 pkt-line.c:162 +#: pkt-line.c:162 pkt-line.c:164 msgid "packet write with format failed" msgstr "格式化包写入错误" -#: pkt-line.c:194 +#: pkt-line.c:196 msgid "packet write failed - data exceeds max packet size" msgstr "写数据包失败:数据超过了包的最大长度" -#: pkt-line.c:201 pkt-line.c:208 +#: pkt-line.c:203 pkt-line.c:210 msgid "packet write failed" msgstr "数据包写入失败" -#: pkt-line.c:293 +#: pkt-line.c:295 msgid "read error" msgstr "读取错误" -#: pkt-line.c:301 +#: pkt-line.c:303 msgid "the remote end hung up unexpectedly" msgstr "远端意外挂断了" -#: pkt-line.c:329 +#: pkt-line.c:331 #, c-format msgid "protocol error: bad line length character: %.4s" msgstr "协议错误:错误的行长度字符串:%.4s" -#: pkt-line.c:339 pkt-line.c:344 +#: pkt-line.c:341 pkt-line.c:346 #, c-format msgid "protocol error: bad line length %d" msgstr "协议错误:错误的行长度 %d" -#: pkt-line.c:353 +#: pkt-line.c:362 #, c-format msgid "remote error: %s" msgstr "远程错误:%s" @@ -3858,7 +4488,7 @@ msgstr "正在刷新索引" msgid "unable to create threaded lstat: %s" msgstr "无法创建线程 lstat:%s" -#: pretty.c:963 +#: pretty.c:966 msgid "unable to parse --pretty format" msgstr "不能解析 --pretty 格式" @@ -3870,7 +4500,7 @@ msgstr "不能启动 `log`" msgid "could not read `log` output" msgstr "不能读取 `log` 的输出" -#: range-diff.c:74 sequencer.c:4828 +#: range-diff.c:74 sequencer.c:4897 #, c-format msgid "could not parse commit '%s'" msgstr "不能解析提交 '%s'" @@ -3884,45 +4514,50 @@ msgstr "生成 diff 失败" msgid "could not parse log for '%s'" msgstr "不能解析 '%s' 的日志" -#: read-cache.c:673 +#: read-cache.c:680 #, c-format msgid "will not add file alias '%s' ('%s' already exists in index)" msgstr "将不会添加文件别名 '%s'('%s' 已经存在于索引中)" -#: read-cache.c:689 +#: read-cache.c:696 msgid "cannot create an empty blob in the object database" msgstr "不能在对象数据库中创建空的数据对象" -#: read-cache.c:710 +#: read-cache.c:718 #, c-format msgid "%s: can only add regular files, symbolic links or git-directories" msgstr "%s:只能添加常规文件、符号链接或 git 目录" -#: read-cache.c:765 +#: read-cache.c:723 +#, c-format +msgid "'%s' does not have a commit checked out" +msgstr "'%s' 没有检出一个提交" + +#: read-cache.c:775 #, c-format msgid "unable to index file '%s'" msgstr "无法索引文件 '%s'" -#: read-cache.c:784 +#: read-cache.c:794 #, c-format msgid "unable to add '%s' to index" msgstr "无法在索引中添加 '%s'" -#: read-cache.c:795 +#: read-cache.c:805 #, c-format msgid "unable to stat '%s'" msgstr "无法对 %s 执行 stat" -#: read-cache.c:1304 +#: read-cache.c:1314 #, c-format msgid "'%s' appears as both a file and as a directory" -msgstr "'%s' 既显示为文件又显示为目录" +msgstr "'%s' 看起来既是文件又是目录" -#: read-cache.c:1489 +#: read-cache.c:1499 msgid "Refresh index" msgstr "刷新索引" -#: read-cache.c:1603 +#: read-cache.c:1613 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -3931,7 +4566,7 @@ msgstr "" "设置了 index.version,但是取值无效。\n" "使用版本 %i" -#: read-cache.c:1613 +#: read-cache.c:1623 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -3940,145 +4575,151 @@ msgstr "" "设置了 GIT_INDEX_VERSION,但是取值无效。\n" "使用版本 %i" -#: read-cache.c:1684 +#: read-cache.c:1679 #, c-format msgid "bad signature 0x%08x" msgstr "坏的签名 0x%08x" -#: read-cache.c:1687 +#: read-cache.c:1682 #, c-format msgid "bad index version %d" msgstr "坏的索引版本 %d" -#: read-cache.c:1696 +#: read-cache.c:1691 msgid "bad index file sha1 signature" -msgstr "坏的索引文件哈希值签名" +msgstr "坏的索引文件 sha1 签名" -#: read-cache.c:1726 +#: read-cache.c:1721 #, c-format msgid "index uses %.4s extension, which we do not understand" msgstr "索引使用不被支持的 %.4s 扩展" # -#: read-cache.c:1728 +#: read-cache.c:1723 #, c-format msgid "ignoring %.4s extension" msgstr "忽略 %.4s 扩展" -#: read-cache.c:1765 +#: read-cache.c:1760 #, c-format msgid "unknown index entry format 0x%08x" msgstr "未知的索引条目格式 0x%08x" -#: read-cache.c:1781 +#: read-cache.c:1776 #, c-format msgid "malformed name field in the index, near path '%s'" msgstr "索引中靠近路径 '%s' 有错误的名称字段" -#: read-cache.c:1836 +#: read-cache.c:1833 msgid "unordered stage entries in index" msgstr "索引中有未排序的暂存条目" -#: read-cache.c:1839 +#: read-cache.c:1836 #, c-format msgid "multiple stage entries for merged file '%s'" msgstr "合并文件 '%s' 有多个暂存条目" -#: read-cache.c:1842 +#: read-cache.c:1839 #, c-format msgid "unordered stage entries for '%s'" msgstr "'%s' 的未排序暂存条目" -#: read-cache.c:1949 read-cache.c:2227 rerere.c:565 rerere.c:599 rerere.c:1111 -#: builtin/add.c:459 builtin/check-ignore.c:178 builtin/checkout.c:294 -#: builtin/checkout.c:622 builtin/checkout.c:991 builtin/clean.c:955 -#: builtin/commit.c:344 builtin/diff-tree.c:116 builtin/grep.c:498 +#: 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 msgid "index file corrupt" msgstr "索引文件损坏" -#: read-cache.c:2090 +#: read-cache.c:2087 #, c-format msgid "unable to create load_cache_entries thread: %s" msgstr "无法创建 load_cache_entries 线程:%s" -#: read-cache.c:2103 +#: read-cache.c:2100 #, c-format msgid "unable to join load_cache_entries thread: %s" msgstr "无法加入 load_cache_entries 线程:%s" -#: read-cache.c:2136 +#: read-cache.c:2133 #, c-format msgid "%s: index file open failed" msgstr "%s:打开索引文件失败" -#: read-cache.c:2140 +#: read-cache.c:2137 #, c-format msgid "%s: cannot stat the open index" msgstr "%s:不能对打开的索引执行 stat 操作" -#: read-cache.c:2144 +#: read-cache.c:2141 #, c-format msgid "%s: index file smaller than expected" msgstr "%s:索引文件比预期的小" -#: read-cache.c:2148 +#: read-cache.c:2145 #, c-format msgid "%s: unable to map index file" msgstr "%s:无法对索引文件执行 map 操作" -#: read-cache.c:2190 +#: read-cache.c:2187 #, c-format msgid "unable to create load_index_extensions thread: %s" msgstr "无法创建 load_index_extensions 线程:%s" -#: read-cache.c:2217 +#: read-cache.c:2214 #, c-format msgid "unable to join load_index_extensions thread: %s" msgstr "无法加入 load_index_extensions 线程:%s" -#: read-cache.c:2239 +#: read-cache.c:2246 #, c-format msgid "could not freshen shared index '%s'" msgstr "无法刷新共享索引 '%s'" -#: read-cache.c:2274 +#: read-cache.c:2293 #, c-format msgid "broken index, expect %s in %s, got %s" msgstr "损坏的索引,期望在 %2$s 中的 %1$s,得到 %3$s" -#: read-cache.c:2971 sequencer.c:4791 wrapper.c:658 builtin/merge.c:1087 +#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1117 #, c-format msgid "could not close '%s'" msgstr "不能关闭 '%s'" -#: read-cache.c:3044 sequencer.c:2237 sequencer.c:3647 +#: read-cache.c:3092 sequencer.c:2354 sequencer.c:3807 #, c-format msgid "could not stat '%s'" msgstr "不能对 '%s' 调用 stat" -#: read-cache.c:3057 +#: read-cache.c:3105 #, c-format msgid "unable to open git dir: %s" msgstr "不能打开 git 目录:%s" -#: read-cache.c:3069 +#: read-cache.c:3117 #, c-format msgid "unable to unlink: %s" msgstr "无法删除:%s" -#: read-cache.c:3088 +#: read-cache.c:3142 #, c-format msgid "cannot fix permission bits on '%s'" msgstr "不能修复 '%s' 的权限位" -#: read-cache.c:3237 +#: read-cache.c:3291 #, c-format msgid "%s: cannot drop to stage #0" msgstr "%s:不能落到暂存区 #0" -#: rebase-interactive.c:10 +#: rebase-interactive.c:26 +#, c-format +msgid "" +"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." +msgstr "选项 rebase.missingCommitsCheck 的值 %s 无法识别。已忽略。" + +#: rebase-interactive.c:35 msgid "" "\n" "Commands:\n" @@ -4118,7 +4759,14 @@ msgstr "" "\n" "可以对这些行重新排序,将从上至下执行。\n" -#: rebase-interactive.c:31 git-rebase--preserve-merges.sh:173 +#: rebase-interactive.c:56 +#, c-format +msgid "Rebase %s onto %s (%d command)" +msgid_plural "Rebase %s onto %s (%d commands)" +msgstr[0] "变基 %s 到 %s(%d 个提交)" +msgstr[1] "变基 %s 到 %s(%d 个提交)" + +#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:173 msgid "" "\n" "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" @@ -4126,7 +4774,7 @@ msgstr "" "\n" "不要删除任意一行。使用 'drop' 显式地删除一个提交。\n" -#: rebase-interactive.c:34 git-rebase--preserve-merges.sh:177 +#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:177 msgid "" "\n" "If you remove a line here THAT COMMIT WILL BE LOST.\n" @@ -4134,7 +4782,7 @@ msgstr "" "\n" "如果您在这里删除一行,对应的提交将会丢失。\n" -#: rebase-interactive.c:40 git-rebase--preserve-merges.sh:816 +#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:816 msgid "" "\n" "You are editing the todo file of an ongoing interactive rebase.\n" @@ -4148,7 +4796,7 @@ msgstr "" " git rebase --continue\n" "\n" -#: rebase-interactive.c:45 git-rebase--preserve-merges.sh:893 +#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:893 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" @@ -4158,125 +4806,153 @@ msgstr "" "然而,如果您删除全部内容,变基操作将会终止。\n" "\n" -#: rebase-interactive.c:51 git-rebase--preserve-merges.sh:900 +#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:900 msgid "Note that empty commits are commented out" msgstr "注意空提交已被注释掉" -#: rebase-interactive.c:62 rebase-interactive.c:75 sequencer.c:2219 -#: sequencer.c:4569 sequencer.c:4625 sequencer.c:4900 +#: 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 #, c-format -msgid "could not read '%s'." -msgstr "不能读取 '%s'。" +msgid "could not write '%s'" +msgstr "不能写入 '%s'" + +#: rebase-interactive.c:108 +#, c-format +msgid "could not copy '%s' to '%s'." +msgstr "不能拷贝 '%s' 至 '%s'。" + +#: rebase-interactive.c:173 +#, 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 +#, c-format +msgid "" +"To avoid this message, use \"drop\" to explicitly remove a commit.\n" +"\n" +"Use 'git config rebase.missingCommitsCheck' to change the level of " +"warnings.\n" +"The possible behaviours are: ignore, warn, error.\n" +"\n" +msgstr "" +"为避免这条信息,使用 \"drop\" 指令显式地删除一个提交。\n" +"\n" +"使用 'git config rebase.missingCommitsCheck' 来修改警告级别。\n" +"可选值有:ignore、warn、error。\n" +"\n" #: refs.c:192 #, c-format msgid "%s does not point to a valid object!" msgstr "%s 没有指向一个有效的对象!" -#: refs.c:583 +#: refs.c:597 #, c-format msgid "ignoring dangling symref %s" msgstr "忽略悬空符号引用 %s" -#: refs.c:585 ref-filter.c:1976 +#: refs.c:599 ref-filter.c:1982 #, c-format msgid "ignoring broken ref %s" msgstr "忽略损坏的引用 %s" -#: refs.c:711 +#: refs.c:734 #, c-format msgid "could not open '%s' for writing: %s" msgstr "无法为写入打开 '%s':%s" -#: refs.c:721 refs.c:772 +#: refs.c:744 refs.c:795 #, c-format msgid "could not read ref '%s'" msgstr "无法读取引用 '%s'" -#: refs.c:727 +#: refs.c:750 #, c-format msgid "ref '%s' already exists" msgstr "引用 '%s' 已经存在" -#: refs.c:732 +#: refs.c:755 #, c-format msgid "unexpected object ID when writing '%s'" msgstr "写入 '%s' 时意外的对象 ID" -#: refs.c:740 sequencer.c:396 sequencer.c:2549 sequencer.c:2675 -#: sequencer.c:2689 sequencer.c:2923 sequencer.c:4789 sequencer.c:4852 -#: wrapper.c:656 +#: 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:767 sequencer.c:4787 sequencer.c:4846 wrapper.c:225 wrapper.c:395 -#: builtin/am.c:713 builtin/rebase.c:575 +#: 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:774 +#: refs.c:797 #, c-format msgid "unexpected object ID when deleting '%s'" msgstr "删除 '%s' 时意外的对象 ID" -#: refs.c:905 +#: refs.c:928 #, c-format msgid "log for ref %s has gap after %s" msgstr "引用 %s 的日志在 %s 之后有缺口" -#: refs.c:911 +#: refs.c:934 #, c-format msgid "log for ref %s unexpectedly ended on %s" msgstr "引用 %s 的日志意外终止于 %s " -#: refs.c:969 +#: refs.c:993 #, c-format msgid "log for %s is empty" msgstr "%s 的日志为空" -#: refs.c:1061 +#: refs.c:1085 #, c-format msgid "refusing to update ref with bad name '%s'" msgstr "拒绝更新有错误名称 '%s' 的引用" -#: refs.c:1137 +#: refs.c:1161 #, c-format msgid "update_ref failed for ref '%s': %s" msgstr "对引用 '%s' 执行 update_ref 失败:%s" -#: refs.c:1911 +#: refs.c:1942 #, c-format msgid "multiple updates for ref '%s' not allowed" msgstr "不允许对引用 '%s' 多次更新" -#: refs.c:1943 +#: refs.c:1974 msgid "ref updates forbidden inside quarantine environment" msgstr "在隔离环境中禁止更新引用" -#: refs.c:2039 refs.c:2069 +#: refs.c:2070 refs.c:2100 #, c-format msgid "'%s' exists; cannot create '%s'" msgstr "'%s' 已存在,无法创建 '%s'" -#: refs.c:2045 refs.c:2080 +#: refs.c:2076 refs.c:2111 #, c-format msgid "cannot process '%s' and '%s' at the same time" msgstr "无法同时处理 '%s' 和 '%s'" -#: refs/files-backend.c:1228 +#: refs/files-backend.c:1234 #, c-format msgid "could not remove reference %s" msgstr "无法删除引用 %s" -#: refs/files-backend.c:1242 refs/packed-backend.c:1532 +#: 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:1245 refs/packed-backend.c:1545 +#: refs/files-backend.c:1251 refs/packed-backend.c:1545 #, c-format msgid "could not delete references: %s" msgstr "无法删除引用:%s" @@ -4286,7 +4962,7 @@ msgstr "无法删除引用:%s" msgid "invalid refspec '%s'" msgstr "无效的引用表达式:'%s'" -#: ref-filter.c:39 wt-status.c:1861 +#: ref-filter.c:39 wt-status.c:1909 msgid "gone" msgstr "丢失" @@ -4410,78 +5086,78 @@ msgstr "元素 %%(align) 需要一个正数的宽度" msgid "unrecognized %%(if) argument: %s" msgstr "未能识别的 %%(if) 参数:%s" -#: ref-filter.c:527 +#: ref-filter.c:531 #, c-format msgid "malformed field name: %.*s" msgstr "格式错误的字段名:%.*s" -#: ref-filter.c:554 +#: ref-filter.c:558 #, c-format msgid "unknown field name: %.*s" msgstr "未知的字段名:%.*s" -#: ref-filter.c:558 +#: ref-filter.c:562 #, c-format msgid "" "not a git repository, but the field '%.*s' requires access to object data" msgstr "不是一个 git 仓库,但是字段 '%.*s' 需要访问对象数据" -#: ref-filter.c:682 +#: ref-filter.c:686 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "格式:使用了 %%(if) 元素而没有 %%(then) 元素" -#: ref-filter.c:745 +#: ref-filter.c:749 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "格式:使用了 %%(then) 元素而没有 %%(if) 元素" -#: ref-filter.c:747 +#: ref-filter.c:751 #, c-format msgid "format: %%(then) atom used more than once" msgstr "格式:%%(then) 元素用了多次" -#: ref-filter.c:749 +#: ref-filter.c:753 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "格式:%%(then) 元素用在了 %%(else) 之后" -#: ref-filter.c:777 +#: ref-filter.c:781 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "格式:使用了 %%(else) 元素而没有 %%(if) 元素" -#: ref-filter.c:779 +#: ref-filter.c:783 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "格式:使用了 %%(else) 元素而没有 %%(then) 元素" -#: ref-filter.c:781 +#: ref-filter.c:785 #, c-format msgid "format: %%(else) atom used more than once" msgstr "格式:%%(else) 元素用了多次" -#: ref-filter.c:796 +#: ref-filter.c:800 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "格式:使用了 %%(end) 元素却没有它的对应元素" -#: ref-filter.c:853 +#: ref-filter.c:857 #, c-format msgid "malformed format string %s" msgstr "错误的格式化字符串 %s" -#: ref-filter.c:1447 +#: ref-filter.c:1453 #, c-format msgid "(no branch, rebasing %s)" msgstr "(非分支,正变基 %s)" -#: ref-filter.c:1450 +#: ref-filter.c:1456 #, c-format msgid "(no branch, rebasing detached HEAD %s)" msgstr "(非分支,正变基分离头指针 %s)" -#: ref-filter.c:1453 +#: ref-filter.c:1459 #, c-format msgid "(no branch, bisect started on %s)" msgstr "(非分支,二分查找开始于 %s)" @@ -4489,7 +5165,7 @@ msgstr "(非分支,二分查找开始于 %s)" #. TRANSLATORS: make sure this matches "HEAD #. detached at " in wt-status.c #. -#: ref-filter.c:1461 +#: ref-filter.c:1467 #, c-format msgid "(HEAD detached at %s)" msgstr "(头指针分离于 %s)" @@ -4497,56 +5173,56 @@ msgstr "(头指针分离于 %s)" #. TRANSLATORS: make sure this matches "HEAD #. detached from " in wt-status.c #. -#: ref-filter.c:1468 +#: ref-filter.c:1474 #, c-format msgid "(HEAD detached from %s)" msgstr "(头指针分离自 %s)" -#: ref-filter.c:1472 +#: ref-filter.c:1478 msgid "(no branch)" msgstr "(非分支)" -#: ref-filter.c:1506 ref-filter.c:1663 +#: ref-filter.c:1512 ref-filter.c:1669 #, c-format msgid "missing object %s for %s" msgstr "缺失 %2$s 的对象 %1$s" -#: ref-filter.c:1516 +#: ref-filter.c:1522 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "parse_object_buffer 失败于 %2$s 的 %1$s" -#: ref-filter.c:1882 +#: ref-filter.c:1888 #, c-format msgid "malformed object at '%s'" msgstr "格式错误的对象 '%s'" -#: ref-filter.c:1971 +#: ref-filter.c:1977 #, c-format msgid "ignoring ref with broken name %s" msgstr "忽略带有错误名称 %s 的引用" -#: ref-filter.c:2257 +#: ref-filter.c:2263 #, c-format msgid "format: %%(end) atom missing" msgstr "格式:缺少 %%(end) 元素" -#: ref-filter.c:2352 +#: ref-filter.c:2363 #, c-format msgid "option `%s' is incompatible with --merged" msgstr "选项 `%s' 和 --merged 不兼容" -#: ref-filter.c:2355 +#: ref-filter.c:2366 #, c-format msgid "option `%s' is incompatible with --no-merged" msgstr "选项 `%s' 和 --no-merged 不兼容" -#: ref-filter.c:2365 +#: ref-filter.c:2376 #, c-format msgid "malformed object name %s" msgstr "格式错误的对象名 %s" -#: ref-filter.c:2370 +#: ref-filter.c:2381 #, c-format msgid "option `%s' must point to a commit" msgstr "选项 `%s' 必须指向一个提交" @@ -4554,7 +5230,7 @@ msgstr "选项 `%s' 必须指向一个提交" #: remote.c:363 #, c-format msgid "config remote shorthand cannot begin with '/': %s" -msgstr "配置的远程名称不能以 '/' 开始:%s" +msgstr "配置的远程短名称不能以 '/' 开始:%s" #: remote.c:410 msgid "more than one receivepack given, using the first" @@ -4589,7 +5265,6 @@ msgstr "模式的键 '%s' 没有 '*'" msgid "value '%s' of pattern has no '*'" msgstr "模式的值 '%s' 没有 '*'" -# #: remote.c:1000 #, c-format msgid "src refspec %s does not match any" @@ -4738,42 +5413,42 @@ msgstr "无法找到远程引用 %s" msgid "* Ignoring funny ref '%s' locally" msgstr "* 在本地忽略可笑的引用 '%s'" -#: remote.c:1990 +#: remote.c:2016 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "您的分支基于 '%s',但此上游分支已经不存在。\n" -#: remote.c:1994 +#: remote.c:2020 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (使用 \"git branch --unset-upstream\" 来修复)\n" -#: remote.c:1997 +#: remote.c:2023 #, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "您的分支与上游分支 '%s' 一致。\n" -#: remote.c:2001 +#: remote.c:2027 #, c-format msgid "Your branch and '%s' refer to different commits.\n" msgstr "您的分支和 '%s' 指向不同的提交。\n" -#: remote.c:2004 +#: remote.c:2030 #, c-format msgid " (use \"%s\" for details)\n" msgstr " (使用 \"%s\" 查看详情)\n" -#: remote.c:2008 +#: remote.c:2034 #, 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] "您的分支领先 '%s' 共 %d 个提交。\n" msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n" -#: remote.c:2014 +#: remote.c:2040 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (使用 \"git push\" 来发布您的本地提交)\n" -#: remote.c:2017 +#: remote.c:2043 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -4782,11 +5457,11 @@ msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n" msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n" # 译者:注意保持前导空格 -#: remote.c:2025 +#: remote.c:2051 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (使用 \"git pull\" 来更新您的本地分支)\n" -#: remote.c:2028 +#: remote.c:2054 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -4802,11 +5477,11 @@ msgstr[1] "" "并且分别有 %d 和 %d 处不同的提交。\n" # 译者:注意保持前导空格 -#: remote.c:2038 +#: remote.c:2064 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr " (使用 \"git pull\" 来合并远程分支)\n" -#: remote.c:2221 +#: remote.c:2247 #, c-format msgid "cannot parse expected object name '%s'" msgstr "无法解析期望的对象名 '%s'" @@ -4834,12 +5509,6 @@ msgstr "损坏的 MERGE_RR" msgid "unable to write rerere record" msgstr "无法写入 rerere 记录" -#: rerere.c:485 rerere.c:692 sequencer.c:3186 sequencer.c:3212 -#: builtin/fsck.c:314 -#, c-format -msgid "could not write '%s'" -msgstr "不能写入 '%s'" - #: rerere.c:495 #, c-format msgid "there were errors while writing '%s' (%s)" @@ -4890,8 +5559,8 @@ msgstr "不能删除 stray '%s'" msgid "Recorded preimage for '%s'" msgstr "为 '%s' 记录 preimage" -#: rerere.c:881 submodule.c:2012 builtin/submodule--helper.c:1417 -#: builtin/submodule--helper.c:1427 +#: rerere.c:881 submodule.c:2024 builtin/log.c:1750 +#: builtin/submodule--helper.c:1417 builtin/submodule--helper.c:1427 #, c-format msgid "could not create directory '%s'" msgstr "不能创建目录 '%s'" @@ -4925,29 +5594,33 @@ msgstr "忘记 '%s' 的解决方案\n" msgid "unable to open rr-cache directory" msgstr "不能打开 rr-cache 目录" -#: revision.c:2484 +#: revision.c:2476 msgid "your current branch appears to be broken" msgstr "您的当前分支好像被损坏" -#: revision.c:2487 +#: revision.c:2479 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "您的当前分支 '%s' 尚无任何提交" -#: revision.c:2684 +#: revision.c:2679 msgid "--first-parent is incompatible with --bisect" msgstr "--first-parent 与 --bisect 不兼容" -#: run-command.c:742 +#: revision.c:2683 +msgid "-L does not yet support diff formats besides -p and -s" +msgstr "-L 尚不支持 -p 和 -s 之外的差异格式" + +#: run-command.c:763 msgid "open /dev/null failed" msgstr "不能打开 /dev/null" -#: run-command.c:1231 +#: run-command.c:1269 #, c-format msgid "cannot create async thread: %s" msgstr "不能创建 async 线程:%s" -#: run-command.c:1295 +#: run-command.c:1333 #, c-format msgid "" "The '%s' hook was ignored because it's not set as executable.\n" @@ -4992,34 +5665,34 @@ msgstr "接收端不支持原子推送" msgid "the receiving end does not support push options" msgstr "接收端不支持推送选项" -#: sequencer.c:184 +#: sequencer.c:187 #, c-format msgid "invalid commit message cleanup mode '%s'" msgstr "无效的提交信息清理模式 '%s'" -#: sequencer.c:288 +#: sequencer.c:292 #, c-format msgid "could not delete '%s'" msgstr "无法删除 '%s'" -#: sequencer.c:314 +#: sequencer.c:318 msgid "revert" msgstr "还原" -#: sequencer.c:316 +#: sequencer.c:320 msgid "cherry-pick" msgstr "拣选" -#: sequencer.c:318 +#: sequencer.c:322 msgid "rebase -i" msgstr "rebase -i" -#: sequencer.c:320 +#: sequencer.c:324 #, c-format msgid "unknown action: %d" msgstr "未知动作:%d" -#: sequencer.c:378 +#: sequencer.c:382 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -5027,7 +5700,7 @@ msgstr "" "冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n" "命令标记修正后的文件" -#: sequencer.c:381 +#: sequencer.c:385 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -5036,110 +5709,115 @@ msgstr "" "冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n" "对修正后的文件做标记,然后用 'git commit' 提交" -#: sequencer.c:394 sequencer.c:2671 +#: sequencer.c:398 sequencer.c:2801 #, c-format msgid "could not lock '%s'" msgstr "不能锁定 '%s'" -#: sequencer.c:401 +#: sequencer.c:405 #, c-format msgid "could not write eol to '%s'" msgstr "不能将换行符写入 '%s'" -#: sequencer.c:406 sequencer.c:2554 sequencer.c:2677 sequencer.c:2691 -#: sequencer.c:2931 +#: sequencer.c:410 sequencer.c:2684 sequencer.c:2807 sequencer.c:2821 +#: sequencer.c:3084 #, c-format msgid "failed to finalize '%s'" msgstr "无法完成 '%s'" -#: sequencer.c:429 sequencer.c:931 sequencer.c:1615 sequencer.c:2574 -#: sequencer.c:2913 sequencer.c:3022 builtin/am.c:245 builtin/commit.c:748 -#: builtin/merge.c:1085 builtin/rebase.c:154 +#: 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:455 +#: sequencer.c:459 #, c-format msgid "your local changes would be overwritten by %s." msgstr "您的本地修改将被%s覆盖。" -#: sequencer.c:459 +#: sequencer.c:463 msgid "commit your changes or stash them to proceed." msgstr "提交您的修改或贮藏后再继续。" -#: sequencer.c:491 +#: sequencer.c:495 #, c-format msgid "%s: fast-forward" msgstr "%s:快进" +#: sequencer.c:534 builtin/tag.c:555 +#, c-format +msgid "Invalid cleanup mode %s" +msgstr "无效的清理模式 %s" + #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase -i". #. -#: sequencer.c:582 +#: sequencer.c:629 #, c-format msgid "%s: Unable to write new index file" msgstr "%s:无法写入新索引文件" -#: sequencer.c:598 +#: sequencer.c:646 msgid "unable to update cache tree" msgstr "不能更新缓存树" -#: sequencer.c:612 +#: sequencer.c:660 msgid "could not resolve HEAD commit" msgstr "不能解析 HEAD 提交" -#: sequencer.c:692 +#: sequencer.c:740 #, c-format msgid "no key present in '%.*s'" msgstr "在 '%.*s' 中没有 key" -#: sequencer.c:703 +#: sequencer.c:751 #, c-format msgid "unable to dequote value of '%s'" msgstr "无法为 '%s' 的值去引号" -#: sequencer.c:740 wrapper.c:227 wrapper.c:397 builtin/am.c:704 -#: builtin/am.c:796 builtin/merge.c:1082 builtin/rebase.c:617 +#: 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 #, c-format msgid "could not open '%s' for reading" msgstr "无法打开 '%s' 进行读取" -#: sequencer.c:750 +#: sequencer.c:798 msgid "'GIT_AUTHOR_NAME' already given" msgstr "已经给出 'GIT_AUTHOR_NAME'" -#: sequencer.c:755 +#: sequencer.c:803 msgid "'GIT_AUTHOR_EMAIL' already given" msgstr "已经给出 'GIT_AUTHOR_EMAIL'" -#: sequencer.c:760 +#: sequencer.c:808 msgid "'GIT_AUTHOR_DATE' already given" msgstr "已经给出 'GIT_AUTHOR_DATE'" -#: sequencer.c:764 +#: sequencer.c:812 #, c-format msgid "unknown variable '%s'" msgstr "未知变量 '%s'" -#: sequencer.c:769 +#: sequencer.c:817 msgid "missing 'GIT_AUTHOR_NAME'" msgstr "缺少 'GIT_AUTHOR_NAME'" -#: sequencer.c:771 +#: sequencer.c:819 msgid "missing 'GIT_AUTHOR_EMAIL'" msgstr "缺少 'GIT_AUTHOR_EMAIL'" -#: sequencer.c:773 +#: sequencer.c:821 msgid "missing 'GIT_AUTHOR_DATE'" msgstr "缺少 'GIT_AUTHOR_DATE'" -#: sequencer.c:833 +#: sequencer.c:881 #, c-format msgid "invalid date format '%s' in '%s'" msgstr "'%2$s' 中无效的日期格式 '%1$s'" -#: sequencer.c:850 +#: sequencer.c:898 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -5168,15 +5846,15 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:945 +#: sequencer.c:992 msgid "writing root commit" msgstr "写根提交" -#: sequencer.c:1155 +#: sequencer.c:1213 msgid "'prepare-commit-msg' hook failed" msgstr "'prepare-commit-msg' 钩子失败" -#: sequencer.c:1162 +#: sequencer.c:1220 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -5200,7 +5878,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1175 +#: sequencer.c:1233 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -5223,295 +5901,306 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1217 +#: sequencer.c:1275 msgid "couldn't look up newly created commit" msgstr "无法找到新创建的提交" -#: sequencer.c:1219 +#: sequencer.c:1277 msgid "could not parse newly created commit" msgstr "不能解析新创建的提交" -#: sequencer.c:1265 +#: sequencer.c:1323 msgid "unable to resolve HEAD after creating commit" msgstr "创建提交后,不能解析 HEAD" -#: sequencer.c:1267 +#: sequencer.c:1325 msgid "detached HEAD" msgstr "分离头指针" # 译者:中文字符串拼接,可删除前导空格 -#: sequencer.c:1271 +#: sequencer.c:1329 msgid " (root-commit)" msgstr "(根提交)" -#: sequencer.c:1292 +#: sequencer.c:1350 msgid "could not parse HEAD" msgstr "不能解析 HEAD" -#: sequencer.c:1294 +#: sequencer.c:1352 #, c-format msgid "HEAD %s is not a commit!" msgstr "HEAD %s 不是一个提交!" -#: sequencer.c:1298 builtin/commit.c:1546 +#: sequencer.c:1356 builtin/commit.c:1551 msgid "could not parse HEAD commit" msgstr "不能解析 HEAD 提交" -#: sequencer.c:1350 sequencer.c:1964 +#: sequencer.c:1408 sequencer.c:2001 msgid "unable to parse commit author" msgstr "不能解析提交作者" -#: sequencer.c:1360 builtin/am.c:1570 builtin/merge.c:678 +#: sequencer.c:1418 builtin/am.c:1572 builtin/merge.c:688 msgid "git write-tree failed to write a tree" msgstr "git write-tree 无法写入树对象" -#: sequencer.c:1377 sequencer.c:1433 +#: sequencer.c:1435 sequencer.c:1496 #, c-format msgid "unable to read commit message from '%s'" msgstr "不能从 '%s' 读取提交说明" -#: sequencer.c:1399 builtin/am.c:1591 builtin/commit.c:1649 builtin/merge.c:859 -#: builtin/merge.c:884 +#: sequencer.c:1462 builtin/am.c:1594 builtin/commit.c:1650 builtin/merge.c:882 +#: builtin/merge.c:906 msgid "failed to write commit object" msgstr "写提交对象失败" -#: sequencer.c:1460 +#: sequencer.c:1523 #, c-format msgid "could not parse commit %s" msgstr "不能解析提交 %s" -#: sequencer.c:1465 +#: sequencer.c:1528 #, c-format msgid "could not parse parent commit %s" msgstr "不能解析父提交 %s" -#: sequencer.c:1565 sequencer.c:1675 +#: sequencer.c:1602 sequencer.c:1712 #, c-format msgid "unknown command: %d" msgstr "未知命令:%d" -#: sequencer.c:1622 sequencer.c:1647 +#: sequencer.c:1659 sequencer.c:1684 #, c-format msgid "This is a combination of %d commits." msgstr "这是一个 %d 个提交的组合。" -#: sequencer.c:1632 sequencer.c:4808 +#: sequencer.c:1669 msgid "need a HEAD to fixup" msgstr "需要一个 HEAD 来修复" -#: sequencer.c:1634 sequencer.c:2958 +#: sequencer.c:1671 sequencer.c:3111 msgid "could not read HEAD" msgstr "不能读取 HEAD" -#: sequencer.c:1636 +#: sequencer.c:1673 msgid "could not read HEAD's commit message" msgstr "不能读取 HEAD 的提交说明" -#: sequencer.c:1642 +#: sequencer.c:1679 #, c-format msgid "cannot write '%s'" msgstr "不能写 '%s'" -#: sequencer.c:1649 git-rebase--preserve-merges.sh:441 +#: sequencer.c:1686 git-rebase--preserve-merges.sh:441 msgid "This is the 1st commit message:" msgstr "这是第一个提交说明:" -#: sequencer.c:1657 +#: sequencer.c:1694 #, c-format msgid "could not read commit message of %s" msgstr "不能读取 %s 的提交说明" -#: sequencer.c:1664 +#: sequencer.c:1701 #, c-format msgid "This is the commit message #%d:" msgstr "这是提交说明 #%d:" -#: sequencer.c:1670 +#: sequencer.c:1707 #, c-format msgid "The commit message #%d will be skipped:" msgstr "提交说明 #%d 将被跳过:" -#: sequencer.c:1758 +#: sequencer.c:1795 msgid "your index file is unmerged." msgstr "您的索引文件未完成合并。" -#: sequencer.c:1765 +#: sequencer.c:1802 msgid "cannot fixup root commit" msgstr "不能修复根提交" -#: sequencer.c:1784 +#: sequencer.c:1821 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "提交 %s 是一个合并提交但未提供 -m 选项。" -#: sequencer.c:1792 sequencer.c:1800 +#: sequencer.c:1829 sequencer.c:1837 #, c-format msgid "commit %s does not have parent %d" msgstr "提交 %s 没有第 %d 个父提交" -#: sequencer.c:1806 +#: sequencer.c:1843 #, 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:1825 +#: sequencer.c:1862 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s:不能解析父提交 %s" -#: sequencer.c:1890 +#: sequencer.c:1927 #, c-format msgid "could not rename '%s' to '%s'" msgstr "不能将 '%s' 重命名为 '%s'" -#: sequencer.c:1945 +#: sequencer.c:1982 #, c-format msgid "could not revert %s... %s" msgstr "不能还原 %s... %s" -#: sequencer.c:1946 +#: sequencer.c:1983 #, c-format msgid "could not apply %s... %s" msgstr "不能应用 %s... %s" -#: sequencer.c:2005 +#: sequencer.c:2042 #, c-format msgid "git %s: failed to read the index" msgstr "git %s:无法读取索引" -#: sequencer.c:2012 +#: sequencer.c:2049 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s:无法刷新索引" -#: sequencer.c:2094 +#: sequencer.c:2118 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "%s 不接受参数:'%s'" -#: sequencer.c:2103 +#: sequencer.c:2127 #, c-format msgid "missing arguments for %s" msgstr "缺少 %s 的参数" -#: sequencer.c:2163 +#: sequencer.c:2164 +#, c-format +msgid "could not parse '%.*s'" +msgstr "无法解析 '%.*s'" + +#: sequencer.c:2226 #, c-format msgid "invalid line %d: %.*s" msgstr "无效行 %d:%.*s" -#: sequencer.c:2171 +#: sequencer.c:2237 #, c-format msgid "cannot '%s' without a previous commit" msgstr "没有父提交的情况下不能 '%s'" -#: sequencer.c:2243 +#: 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:2360 msgid "please fix this using 'git rebase --edit-todo'." msgstr "请用 'git rebase --edit-todo' 来修改。" -#: sequencer.c:2245 +#: sequencer.c:2362 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "不可用的指令清单:'%s'" -#: sequencer.c:2250 +#: sequencer.c:2367 msgid "no commits parsed." msgstr "没有解析提交。" -#: sequencer.c:2261 +#: sequencer.c:2378 msgid "cannot cherry-pick during a revert." msgstr "不能在回退中执行拣选。" -#: sequencer.c:2263 +#: sequencer.c:2380 msgid "cannot revert during a cherry-pick." msgstr "不能在拣选中执行回退。" -#: sequencer.c:2333 +#: sequencer.c:2462 #, c-format msgid "invalid value for %s: %s" msgstr "%s 的值无效:%s" -#: sequencer.c:2420 +#: sequencer.c:2549 msgid "unusable squash-onto" msgstr "不可用的 squash-onto" -#: sequencer.c:2436 +#: sequencer.c:2565 #, c-format msgid "malformed options sheet: '%s'" msgstr "格式错误的选项清单:'%s'" -#: sequencer.c:2518 sequencer.c:4067 +#: sequencer.c:2648 sequencer.c:4227 msgid "empty commit set passed" msgstr "提供了空的提交集" -#: sequencer.c:2526 +#: sequencer.c:2656 msgid "a cherry-pick or revert is already in progress" msgstr "一个拣选或还原操作已在进行" -#: sequencer.c:2527 +#: sequencer.c:2657 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\"" -#: sequencer.c:2530 +#: sequencer.c:2660 #, c-format msgid "could not create sequencer directory '%s'" msgstr "不能创建序列目录 '%s'" -#: sequencer.c:2544 +#: sequencer.c:2674 msgid "could not lock HEAD" msgstr "不能锁定 HEAD" -#: sequencer.c:2599 sequencer.c:3819 +#: sequencer.c:2729 sequencer.c:3979 msgid "no cherry-pick or revert in progress" msgstr "拣选或还原操作并未进行" -#: sequencer.c:2601 +#: sequencer.c:2731 msgid "cannot resolve HEAD" msgstr "不能解析 HEAD" -#: sequencer.c:2603 sequencer.c:2638 +#: sequencer.c:2733 sequencer.c:2768 msgid "cannot abort from a branch yet to be born" msgstr "不能从尚未建立的分支终止" -#: sequencer.c:2624 builtin/grep.c:732 +#: sequencer.c:2754 builtin/grep.c:732 #, c-format msgid "cannot open '%s'" msgstr "不能打开 '%s'" -#: sequencer.c:2626 +#: sequencer.c:2756 #, c-format msgid "cannot read '%s': %s" msgstr "不能读取 '%s':%s" -#: sequencer.c:2627 +#: sequencer.c:2757 msgid "unexpected end of file" msgstr "意外的文件结束" -#: sequencer.c:2633 +#: sequencer.c:2763 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏" -#: sequencer.c:2644 +#: sequencer.c:2774 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "您好像移动了 HEAD。未能回退,检查您的 HEAD!" -#: sequencer.c:2750 sequencer.c:3735 +#: sequencer.c:2903 sequencer.c:3894 #, c-format msgid "could not update %s" msgstr "不能更新 %s" -#: sequencer.c:2788 sequencer.c:3715 +#: sequencer.c:2941 sequencer.c:3874 msgid "cannot read HEAD" msgstr "不能读取 HEAD" -#: sequencer.c:2805 +#: sequencer.c:2958 #, c-format msgid "unable to copy '%s' to '%s'" msgstr "无法拷贝 '%s' 至 '%s'" -#: sequencer.c:2813 +#: sequencer.c:2966 #, c-format msgid "" "You can amend the commit now, with\n" @@ -5530,28 +6219,28 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:2823 +#: sequencer.c:2976 #, c-format msgid "Could not apply %s... %.*s" msgstr "不能应用 %s... %.*s" -#: sequencer.c:2830 +#: sequencer.c:2983 #, c-format msgid "Could not merge %.*s" msgstr "不能合并 %.*s" -#: sequencer.c:2844 sequencer.c:2848 builtin/difftool.c:641 +#: sequencer.c:2997 sequencer.c:3001 builtin/difftool.c:633 #, c-format msgid "could not copy '%s' to '%s'" msgstr "不能拷贝 '%s' 至 '%s'" -#: sequencer.c:2870 sequencer.c:3293 builtin/rebase.c:424 builtin/rebase.c:1230 -#: builtin/rebase.c:1591 builtin/rebase.c:1646 +#: 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:2875 +#: sequencer.c:3028 #, c-format msgid "" "execution failed: %s\n" @@ -5566,11 +6255,11 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:2881 +#: sequencer.c:3034 msgid "and made changes to the index and/or the working tree\n" msgstr "并且修改索引和/或工作区\n" -#: sequencer.c:2887 +#: sequencer.c:3040 #, c-format msgid "" "execution succeeded: %s\n" @@ -5587,76 +6276,76 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:2948 +#: sequencer.c:3101 #, c-format msgid "illegal label name: '%.*s'" msgstr "非法的标签名称:'%.*s'" -#: sequencer.c:3002 +#: sequencer.c:3155 msgid "writing fake root commit" msgstr "写伪根提交" -#: sequencer.c:3007 +#: sequencer.c:3160 msgid "writing squash-onto" msgstr "写入 squash-onto" -#: sequencer.c:3045 builtin/rebase.c:429 builtin/rebase.c:435 +#: sequencer.c:3198 builtin/rebase.c:844 builtin/rebase.c:850 #, c-format msgid "failed to find tree of %s" msgstr "无法找到 %s 指向的树。" -#: sequencer.c:3063 builtin/rebase.c:448 +#: sequencer.c:3216 builtin/rebase.c:863 msgid "could not write index" msgstr "不能写入索引" -#: sequencer.c:3090 +#: sequencer.c:3243 #, c-format msgid "could not resolve '%s'" msgstr "无法解析 '%s'" -#: sequencer.c:3118 +#: sequencer.c:3271 msgid "cannot merge without a current revision" msgstr "没有当前版本不能合并" -#: sequencer.c:3140 +#: sequencer.c:3293 #, c-format msgid "unable to parse '%.*s'" msgstr "无法解析 '%.*s'" -#: sequencer.c:3149 +#: sequencer.c:3302 #, c-format msgid "nothing to merge: '%.*s'" msgstr "无可用合并:'%.*s'" -#: sequencer.c:3161 +#: sequencer.c:3314 msgid "octopus merge cannot be executed on top of a [new root]" msgstr "章鱼合并不能在一个新的根提交上执行" -#: sequencer.c:3176 +#: sequencer.c:3329 #, c-format msgid "could not get commit message of '%s'" msgstr "不能获取 '%s' 的提交说明" -#: sequencer.c:3325 +#: sequencer.c:3478 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "甚至不能尝试合并 '%.*s'" -#: sequencer.c:3341 +#: sequencer.c:3494 msgid "merge: Unable to write new index file" msgstr "合并:无法写入新索引文件" -#: sequencer.c:3409 builtin/rebase.c:298 +#: sequencer.c:3562 builtin/rebase.c:711 #, c-format msgid "Applied autostash.\n" msgstr "已应用 autostash。\n" -#: sequencer.c:3421 +#: sequencer.c:3574 #, c-format msgid "cannot store %s" msgstr "不能存储 %s" -#: sequencer.c:3424 builtin/rebase.c:314 +#: sequencer.c:3577 builtin/rebase.c:727 #, c-format msgid "" "Applying autostash resulted in conflicts.\n" @@ -5667,31 +6356,31 @@ msgstr "" "您的修改安全地保存在贮藏区中。\n" "您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n" -#: sequencer.c:3478 +#: sequencer.c:3638 #, c-format msgid "could not checkout %s" msgstr "不能检出 %s" -#: sequencer.c:3492 +#: sequencer.c:3652 #, c-format msgid "%s: not a valid OID" -msgstr "%s:不是一个有效的对象ID" +msgstr "%s:不是一个有效的对象 ID" -#: sequencer.c:3497 git-rebase--preserve-merges.sh:724 +#: sequencer.c:3657 git-rebase--preserve-merges.sh:724 msgid "could not detach HEAD" msgstr "不能分离头指针" -#: sequencer.c:3512 +#: sequencer.c:3672 #, c-format msgid "Stopped at HEAD\n" msgstr "停止在 HEAD\n" -#: sequencer.c:3514 +#: sequencer.c:3674 #, c-format msgid "Stopped at %s\n" msgstr "停止在 %s\n" -#: sequencer.c:3522 +#: sequencer.c:3682 #, c-format msgid "" "Could not execute the todo command\n" @@ -5711,48 +6400,48 @@ msgstr "" " git rebase --edit-todo\n" " git rebase --continue\n" -#: sequencer.c:3597 +#: sequencer.c:3759 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "停止在 %s... %.*s\n" -#: sequencer.c:3677 +#: sequencer.c:3837 #, c-format msgid "unknown command %d" msgstr "未知命令 %d" -#: sequencer.c:3723 +#: sequencer.c:3882 msgid "could not read orig-head" msgstr "不能读取 orig-head" -#: sequencer.c:3728 sequencer.c:4805 +#: sequencer.c:3887 msgid "could not read 'onto'" msgstr "不能读取 'onto'" -#: sequencer.c:3742 +#: sequencer.c:3901 #, c-format msgid "could not update HEAD to %s" msgstr "不能更新 HEAD 为 %s" -#: sequencer.c:3831 +#: sequencer.c:3991 msgid "cannot rebase: You have unstaged changes." msgstr "不能变基:您有未暂存的变更。" -#: sequencer.c:3840 +#: sequencer.c:4000 msgid "cannot amend non-existing commit" msgstr "不能修补不存在的提交" -#: sequencer.c:3842 +#: sequencer.c:4002 #, c-format msgid "invalid file: '%s'" msgstr "无效文件:'%s'" -#: sequencer.c:3844 +#: sequencer.c:4004 #, c-format msgid "invalid contents: '%s'" msgstr "无效内容:'%s'" -#: sequencer.c:3847 +#: sequencer.c:4007 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -5761,79 +6450,42 @@ msgstr "" "\n" "您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。" -#: sequencer.c:3883 sequencer.c:3921 +#: sequencer.c:4043 sequencer.c:4081 #, c-format msgid "could not write file: '%s'" msgstr "不能写入文件:'%s'" -#: sequencer.c:3936 +#: sequencer.c:4096 msgid "could not remove CHERRY_PICK_HEAD" msgstr "不能删除 CHERRY_PICK_HEAD" -#: sequencer.c:3943 +#: sequencer.c:4103 msgid "could not commit staged changes." msgstr "不能提交暂存的修改。" -#: sequencer.c:4044 +#: sequencer.c:4204 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s:不能拣选一个%s" -#: sequencer.c:4048 +#: sequencer.c:4208 #, c-format msgid "%s: bad revision" msgstr "%s:错误的版本" -#: sequencer.c:4083 +#: sequencer.c:4243 msgid "can't revert as initial commit" msgstr "不能作为初始提交回退" -#: sequencer.c:4529 +#: sequencer.c:4686 msgid "make_script: unhandled options" msgstr "make_script:有未能处理的选项" -#: sequencer.c:4532 +#: sequencer.c:4689 msgid "make_script: error preparing revisions" msgstr "make_script:准备版本时错误" -#: sequencer.c:4573 sequencer.c:4629 sequencer.c:4904 -#, c-format -msgid "unusable todo list: '%s'" -msgstr "不可用的待办列表:'%s'" - -#: sequencer.c:4684 -#, c-format -msgid "" -"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." -msgstr "选项 rebase.missingCommitsCheck 的值 %s 无法识别。已忽略。" - -#: sequencer.c:4754 -#, c-format -msgid "" -"Warning: some commits may have been dropped accidentally.\n" -"Dropped commits (newer to older):\n" -msgstr "" -"警告:一些提交可能被意外丢弃。\n" -"丢弃的提交(从新到旧):\n" - -#: sequencer.c:4761 -#, c-format -msgid "" -"To avoid this message, use \"drop\" to explicitly remove a commit.\n" -"\n" -"Use 'git config rebase.missingCommitsCheck' to change the level of " -"warnings.\n" -"The possible behaviours are: ignore, warn, error.\n" -"\n" -msgstr "" -"为避免这条信息,使用 \"drop\" 指令显式地删除一个提交。\n" -"\n" -"使用 'git config rebase.missingCommitsCheck' 来修改警告级别。\n" -"可选值有:ignore、warn、error。\n" -"\n" - -#: sequencer.c:4774 -#, c-format +#: sequencer.c:4847 msgid "" "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" "continue'.\n" @@ -5842,31 +6494,15 @@ msgstr "" "您可以用 'git rebase --edit-todo' 修正,然后执行 'git rebase --continue'。\n" "或者您可以用 'git rebase --abort' 终止变基。\n" -#: sequencer.c:4912 sequencer.c:4950 +#: sequencer.c:4959 sequencer.c:4976 msgid "nothing to do" msgstr "无事可做" -#: sequencer.c:4916 -#, c-format -msgid "Rebase %s onto %s (%d command)" -msgid_plural "Rebase %s onto %s (%d commands)" -msgstr[0] "变基 %s 到 %s(%d 个提交)" -msgstr[1] "变基 %s 到 %s(%d 个提交)" - -#: sequencer.c:4928 -#, c-format -msgid "could not copy '%s' to '%s'." -msgstr "不能拷贝 '%s' 至 '%s'。" - -#: sequencer.c:4932 sequencer.c:4961 -msgid "could not transform the todo list" -msgstr "无法改变待办列表" - -#: sequencer.c:4964 +#: sequencer.c:4990 msgid "could not skip unnecessary pick commands" msgstr "无法跳过不必要的拣选" -#: sequencer.c:5047 +#: sequencer.c:5073 msgid "the script was already rearranged." msgstr "脚本已经重新编排。" @@ -5875,7 +6511,7 @@ msgstr "脚本已经重新编排。" msgid "'%s' is outside repository" msgstr "'%s' 在仓库之外" -#: setup.c:172 +#: setup.c:173 #, c-format msgid "" "%s: no such path in the working tree.\n" @@ -5884,7 +6520,7 @@ msgstr "" "%s:工作区中无此路径。\n" "使用命令 'git <命令> -- <路径>...' 来指定本地不存在的路径。" -#: setup.c:185 +#: setup.c:186 #, c-format msgid "" "ambiguous argument '%s': unknown revision or path not in the working tree.\n" @@ -5895,12 +6531,12 @@ msgstr "" "使用 '--' 来分隔版本和路径,例如:\n" "'git <命令> [<版本>...] -- [<文件>...]'" -#: setup.c:234 +#: setup.c:235 #, c-format msgid "option '%s' must come before non-option arguments" msgstr "选项 '%s' 必须在其他非选项参数之前" -#: setup.c:253 +#: setup.c:254 #, c-format msgid "" "ambiguous argument '%s': both revision and filename\n" @@ -5911,92 +6547,92 @@ msgstr "" "使用 '--' 来分隔版本和路径,例如:\n" "'git <命令> [<版本>...] -- [<文件>...]'" -#: setup.c:389 +#: setup.c:390 msgid "unable to set up work tree using invalid config" msgstr "无法使用无效配置来创建工作区" -#: setup.c:393 +#: setup.c:394 msgid "this operation must be run in a work tree" msgstr "该操作必须在一个工作区中运行" -#: setup.c:527 +#: setup.c:540 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "期望 git 仓库版本 <= %d,却得到 %d" -#: setup.c:535 +#: setup.c:548 msgid "unknown repository extensions found:" msgstr "发现未知的仓库扩展:" -#: setup.c:554 +#: setup.c:567 #, c-format msgid "error opening '%s'" msgstr "打开 '%s' 出错" -#: setup.c:556 +#: setup.c:569 #, c-format msgid "too large to be a .git file: '%s'" msgstr "文件太大,无法作为 .git 文件:'%s'" -#: setup.c:558 +#: setup.c:571 #, c-format msgid "error reading %s" msgstr "读取 %s 出错" -#: setup.c:560 +#: setup.c:573 #, c-format msgid "invalid gitfile format: %s" msgstr "无效的 gitfile 格式:%s" -#: setup.c:562 +#: setup.c:575 #, c-format msgid "no path in gitfile: %s" msgstr "在 gitfile 中没有路径:%s" -#: setup.c:564 +#: setup.c:577 #, c-format msgid "not a git repository: %s" msgstr "不是一个 git 仓库:%s" -#: setup.c:663 +#: setup.c:676 #, c-format msgid "'$%s' too big" msgstr "'$%s' 太大" -#: setup.c:677 +#: setup.c:690 #, c-format msgid "not a git repository: '%s'" msgstr "不是一个 git 仓库:'%s'" -#: setup.c:706 setup.c:708 setup.c:739 +#: setup.c:719 setup.c:721 setup.c:752 #, c-format msgid "cannot chdir to '%s'" msgstr "不能切换目录到 '%s'" -#: setup.c:711 setup.c:767 setup.c:777 setup.c:816 setup.c:824 +#: setup.c:724 setup.c:780 setup.c:790 setup.c:829 setup.c:837 msgid "cannot come back to cwd" msgstr "无法返回当前工作目录" -#: setup.c:838 +#: setup.c:851 #, c-format msgid "failed to stat '%*s%s%s'" msgstr "获取 '%*s%s%s' 状态(stat)失败" -#: setup.c:1068 +#: setup.c:1083 msgid "Unable to read current working directory" msgstr "不能读取当前工作目录" -#: setup.c:1077 setup.c:1083 +#: setup.c:1092 setup.c:1098 #, c-format msgid "cannot change to '%s'" msgstr "不能切换到 '%s'" -#: setup.c:1088 +#: setup.c:1103 #, c-format msgid "not a git repository (or any of the parent directories): %s" msgstr "不是一个 git 仓库(或者任何父目录):%s" -#: setup.c:1094 +#: setup.c:1109 #, c-format msgid "" "not a git repository (or any parent up to mount point %s)\n" @@ -6005,7 +6641,7 @@ msgstr "" "不是一个 git 仓库(或者直至挂载点 %s 的任何父目录)\n" "停止在文件系统边界(未设置 GIT_DISCOVERY_ACROSS_FILESYSTEM)。" -#: setup.c:1204 +#: setup.c:1220 #, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" @@ -6014,277 +6650,277 @@ msgstr "" "参数 core.sharedRepository 的文件属性值有问题(0%.3o)。\n" "文件属主必须始终拥有读写权限。" -#: setup.c:1247 +#: setup.c:1264 msgid "open /dev/null or dup failed" msgstr "不能打开或者复制 /dev/null" -#: setup.c:1262 +#: setup.c:1279 msgid "fork failed" msgstr "fork 失败" -#: setup.c:1267 +#: setup.c:1284 msgid "setsid failed" msgstr "setsid 失败" -#: sha1-file.c:445 +#: sha1-file.c:453 #, c-format msgid "object directory %s does not exist; check .git/objects/info/alternates" msgstr "对象目录 %s 不存在,检查 .git/objects/info/alternates" -#: sha1-file.c:496 +#: sha1-file.c:504 #, c-format msgid "unable to normalize alternate object path: %s" msgstr "无法规范化备用对象路径:%s" -#: sha1-file.c:568 +#: sha1-file.c:576 #, c-format msgid "%s: ignoring alternate object stores, nesting too deep" msgstr "%s:忽略备用对象库,嵌套太深" -#: sha1-file.c:575 +#: sha1-file.c:583 #, c-format msgid "unable to normalize object directory: %s" msgstr "无法规范化对象目录: %s" -#: sha1-file.c:618 +#: sha1-file.c:626 msgid "unable to fdopen alternates lockfile" msgstr "无法 fdopen 替换锁文件" -#: sha1-file.c:636 +#: sha1-file.c:644 msgid "unable to read alternates file" msgstr "无法读取替代文件" -#: sha1-file.c:643 +#: sha1-file.c:651 msgid "unable to move new alternates file into place" msgstr "无法将新的替代文件移动到位" -#: sha1-file.c:678 +#: sha1-file.c:686 #, c-format msgid "path '%s' does not exist" msgstr "路径 '%s' 不存在" -#: sha1-file.c:704 +#: sha1-file.c:712 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。" -#: sha1-file.c:710 +#: sha1-file.c:718 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "参考仓库 '%s' 不是一个本地仓库。" -#: sha1-file.c:716 +#: sha1-file.c:724 #, c-format msgid "reference repository '%s' is shallow" msgstr "参考仓库 '%s' 是一个浅克隆" -#: sha1-file.c:724 +#: sha1-file.c:732 #, c-format msgid "reference repository '%s' is grafted" msgstr "参考仓库 '%s' 已被移植" -#: sha1-file.c:838 +#: sha1-file.c:846 #, c-format msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" msgstr "尝试 mmap %<PRIuMAX>,超过了最大值 %<PRIuMAX>" -#: sha1-file.c:863 +#: sha1-file.c:871 msgid "mmap failed" msgstr "mmap 失败" -#: sha1-file.c:1027 +#: sha1-file.c:1035 #, c-format msgid "object file %s is empty" msgstr "对象文件 %s 为空" -#: sha1-file.c:1151 sha1-file.c:2288 +#: sha1-file.c:1159 sha1-file.c:2297 #, c-format msgid "corrupt loose object '%s'" msgstr "损坏的松散对象 '%s'" -#: sha1-file.c:1153 sha1-file.c:2292 +#: sha1-file.c:1161 sha1-file.c:2301 #, c-format msgid "garbage at end of loose object '%s'" msgstr "松散对象 '%s' 后面有垃圾数据" -#: sha1-file.c:1195 +#: sha1-file.c:1203 msgid "invalid object type" msgstr "无效的对象类型" -#: sha1-file.c:1279 +#: sha1-file.c:1287 #, c-format msgid "unable to unpack %s header with --allow-unknown-type" msgstr "无法用 --allow-unknown-type 参数解开 %s 头信息" -#: sha1-file.c:1282 +#: sha1-file.c:1290 #, c-format msgid "unable to unpack %s header" msgstr "无法解开 %s 头部" -#: sha1-file.c:1288 +#: sha1-file.c:1296 #, c-format msgid "unable to parse %s header with --allow-unknown-type" msgstr "无法用 --allow-unknown-type 参数解析 %s 头信息" -#: sha1-file.c:1291 +#: sha1-file.c:1299 #, c-format msgid "unable to parse %s header" msgstr "无法解析 %s 头部" -#: sha1-file.c:1481 +#: sha1-file.c:1490 #, c-format msgid "failed to read object %s" msgstr "读取对象 %s 失败" -#: sha1-file.c:1485 +#: sha1-file.c:1494 #, c-format msgid "replacement %s not found for %s" msgstr "找不到 %2$s 的替代 %1$s" -#: sha1-file.c:1489 +#: sha1-file.c:1498 #, c-format msgid "loose object %s (stored in %s) is corrupt" msgstr "松散对象 %s(保存在 %s)已损坏" -#: sha1-file.c:1493 +#: sha1-file.c:1502 #, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "打包对象 %s(保存在 %s)已损坏" -#: sha1-file.c:1595 +#: sha1-file.c:1604 #, c-format msgid "unable to write file %s" msgstr "无法写文件 %s" -#: sha1-file.c:1602 +#: sha1-file.c:1611 #, c-format msgid "unable to set permission to '%s'" msgstr "无法为 '%s' 设置权限" -#: sha1-file.c:1609 +#: sha1-file.c:1618 msgid "file write error" msgstr "文件写错误" -#: sha1-file.c:1628 +#: sha1-file.c:1637 msgid "error when closing loose object file" msgstr "关闭松散对象文件时出错" -#: sha1-file.c:1693 +#: sha1-file.c:1702 #, c-format msgid "insufficient permission for adding an object to repository database %s" msgstr "权限不足,无法在仓库对象库 %s 中添加对象" -#: sha1-file.c:1695 +#: sha1-file.c:1704 msgid "unable to create temporary file" msgstr "无法创建临时文件" -#: sha1-file.c:1719 +#: sha1-file.c:1728 msgid "unable to write loose object file" msgstr "不能写松散对象文件" -#: sha1-file.c:1725 +#: sha1-file.c:1734 #, c-format msgid "unable to deflate new object %s (%d)" msgstr "不能压缩新对象 %s(%d)" -#: sha1-file.c:1729 +#: sha1-file.c:1738 #, c-format msgid "deflateEnd on object %s failed (%d)" msgstr "在对象 %s 上调用 deflateEnd 失败(%d)" -#: sha1-file.c:1733 +#: sha1-file.c:1742 #, c-format msgid "confused by unstable object source data for %s" msgstr "被 %s 的不稳定对象源数据搞糊涂了" -#: sha1-file.c:1743 builtin/pack-objects.c:919 +#: sha1-file.c:1752 builtin/pack-objects.c:920 #, c-format msgid "failed utime() on %s" msgstr "在 %s 上调用 utime() 失败" -#: sha1-file.c:1818 +#: sha1-file.c:1827 #, c-format msgid "cannot read object for %s" msgstr "不能读取对象 %s" -#: sha1-file.c:1858 +#: sha1-file.c:1867 msgid "corrupt commit" msgstr "损坏的提交" -#: sha1-file.c:1866 +#: sha1-file.c:1875 msgid "corrupt tag" msgstr "损坏的标签" -#: sha1-file.c:1965 +#: sha1-file.c:1974 #, c-format msgid "read error while indexing %s" msgstr "索引 %s 时读取错误" -#: sha1-file.c:1968 +#: sha1-file.c:1977 #, c-format msgid "short read while indexing %s" msgstr "索引 %s 时读入不完整" -#: sha1-file.c:2041 sha1-file.c:2050 +#: sha1-file.c:2050 sha1-file.c:2059 #, c-format msgid "%s: failed to insert into database" msgstr "%s:插入数据库失败" -#: sha1-file.c:2056 +#: sha1-file.c:2065 #, c-format msgid "%s: unsupported file type" msgstr "%s:不支持的文件类型" -#: sha1-file.c:2080 +#: sha1-file.c:2089 #, c-format msgid "%s is not a valid object" msgstr "%s 不是一个有效的对象" -#: sha1-file.c:2082 +#: sha1-file.c:2091 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s 不是一个有效的 '%s' 对象" -#: sha1-file.c:2109 builtin/index-pack.c:154 +#: sha1-file.c:2118 builtin/index-pack.c:154 #, c-format msgid "unable to open %s" msgstr "不能打开 %s" -#: sha1-file.c:2299 sha1-file.c:2351 +#: sha1-file.c:2308 sha1-file.c:2360 #, c-format msgid "hash mismatch for %s (expected %s)" msgstr "%s 的哈希值不匹配(预期 %s)" -#: sha1-file.c:2323 +#: sha1-file.c:2332 #, c-format msgid "unable to mmap %s" msgstr "不能 mmap %s" -#: sha1-file.c:2328 +#: sha1-file.c:2337 #, c-format msgid "unable to unpack header of %s" msgstr "无法解压缩 %s 的头部" -#: sha1-file.c:2334 +#: sha1-file.c:2343 #, c-format msgid "unable to parse header of %s" msgstr "无法解析 %s 的头部" -#: sha1-file.c:2345 +#: sha1-file.c:2354 #, c-format msgid "unable to unpack contents of %s" msgstr "无法解压缩 %s 的内容" -#: sha1-name.c:448 +#: sha1-name.c:490 #, c-format msgid "short SHA1 %s is ambiguous" msgstr "短 SHA1 %s 存在歧义" -#: sha1-name.c:459 +#: sha1-name.c:501 msgid "The candidates are:" msgstr "候选者有:" -#: sha1-name.c:742 +#: sha1-name.c:800 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" @@ -6333,62 +6969,62 @@ msgstr "位于未检出的子模组 '%s'" msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "路径规格 '%s' 在子模组 '%.*s' 中" -#: submodule.c:906 +#: submodule.c:910 #, c-format msgid "submodule entry '%s' (%s) is a %s, not a commit" msgstr "子模组条目 '%s'(%s)是一个 %s,不是一个提交" -#: submodule.c:1143 builtin/branch.c:656 builtin/submodule--helper.c:1989 +#: submodule.c:1147 builtin/branch.c:672 builtin/submodule--helper.c:1988 msgid "Failed to resolve HEAD as a valid ref." msgstr "无法将 HEAD 解析为有效引用。" -#: submodule.c:1477 +#: submodule.c:1481 #, c-format msgid "Could not access submodule '%s'" msgstr "无法访问子模组 '%s'" -#: submodule.c:1639 +#: submodule.c:1651 #, c-format msgid "'%s' not recognized as a git repository" msgstr "无法将 '%s' 识别为一个 git 仓库" -#: submodule.c:1777 +#: submodule.c:1789 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "无法在子模组 '%s' 中启动 'git status'" -#: submodule.c:1790 +#: submodule.c:1802 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "无法在子模组 '%s' 中执行 'git status'" -#: submodule.c:1805 +#: submodule.c:1817 #, c-format msgid "Could not unset core.worktree setting in submodule '%s'" msgstr "无法在子模组 '%s' 中取消 core.worktree 的设置" -#: submodule.c:1895 +#: submodule.c:1907 #, c-format msgid "submodule '%s' has dirty index" msgstr "子模组 '%s' 中有脏索引" -#: submodule.c:1947 +#: submodule.c:1959 #, c-format msgid "Submodule '%s' could not be updated." msgstr "子模组 '%s' 无法被更新。" -#: submodule.c:1996 +#: submodule.c:2008 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" msgstr "不支持对有多个工作区的子模组 '%s' 执行 relocate_gitdir" -#: submodule.c:2008 submodule.c:2064 +#: submodule.c:2020 submodule.c:2076 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "不能查询子模组 '%s' 的名称" -#: submodule.c:2015 +#: submodule.c:2027 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -6399,16 +7035,16 @@ msgstr "" "'%s' 迁移至\n" "'%s'\n" -#: submodule.c:2099 +#: submodule.c:2111 #, c-format msgid "could not recurse into submodule '%s'" msgstr "无法递归进子模组路径 '%s'" -#: submodule.c:2143 +#: submodule.c:2155 msgid "could not start ls-files in .." msgstr "无法在 .. 中启动 ls-files" -#: submodule.c:2182 +#: submodule.c:2194 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree 返回未知返回值 %d" @@ -6418,21 +7054,21 @@ msgstr "ls-tree 返回未知返回值 %d" msgid "ignoring suspicious submodule name: %s" msgstr "忽略可疑的子模组名称:%s" -#: submodule-config.c:296 +#: submodule-config.c:299 msgid "negative values not allowed for submodule.fetchjobs" msgstr "submodule.fetchjobs 不允许为负值" -#: submodule-config.c:390 +#: submodule-config.c:397 #, c-format msgid "ignoring '%s' which may be interpreted as a command-line option: %s" msgstr "忽略可能被解析为命令行选项的 '%s':%s" -#: submodule-config.c:479 +#: submodule-config.c:486 #, c-format msgid "invalid value for %s" msgstr "%s 的值无效" -#: submodule-config.c:754 +#: submodule-config.c:755 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "不能更新 .gitmodules 条目 %s" @@ -6506,36 +7142,44 @@ msgstr "无法读取 bundle '%s'" msgid "transport: invalid depth option '%s'" msgstr "传输:无效的深度选项 '%s'" -#: transport.c:617 +#: transport.c:259 +msgid "see protocol.version in 'git help config' for more details" +msgstr "查看 'git help config' 中的 protocol.version 获取更多信息" + +#: transport.c:260 +msgid "server options require protocol version 2 or later" +msgstr "服务端选项需要版本 2 协议或更高" + +#: transport.c:625 msgid "could not parse transport.color.* config" msgstr "不能解析 transport.color.* 配置" -#: transport.c:690 +#: transport.c:698 msgid "support for protocol v2 not implemented yet" msgstr "协议 v2 的支持尚未实现" -#: transport.c:817 +#: transport.c:825 #, c-format msgid "unknown value for config '%s': %s" msgstr "配置 '%s' 的取值未知:%s" -#: transport.c:883 +#: transport.c:891 #, c-format msgid "transport '%s' not allowed" msgstr "传输 '%s' 不允许" -#: transport.c:937 +#: transport.c:945 msgid "git-over-rsync is no longer supported" msgstr "不再支持 git-over-rsync" -#: transport.c:1032 +#: 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:1036 +#: transport.c:1044 #, c-format msgid "" "\n" @@ -6562,19 +7206,19 @@ msgstr "" "以推送至远程。\n" "\n" -#: transport.c:1044 +#: transport.c:1052 msgid "Aborting." msgstr "正在终止。" -#: transport.c:1184 +#: transport.c:1193 msgid "failed to push all needed submodules" msgstr "不能推送全部需要的子模组" -#: transport.c:1317 transport-helper.c:643 +#: transport.c:1326 transport-helper.c:645 msgid "operation not supported by protocol" msgstr "协议不支持该操作" -#: transport.c:1421 +#: transport.c:1430 #, c-format msgid "invalid line while parsing alternate refs: %s" msgstr "解析备用引用时无效的行:%s" @@ -6583,115 +7227,115 @@ msgstr "解析备用引用时无效的行:%s" msgid "full write to remote helper failed" msgstr "完整写入远程助手失败" -#: transport-helper.c:132 +#: transport-helper.c:134 #, c-format msgid "unable to find remote helper for '%s'" msgstr "无法为 '%s' 找到远程助手" -#: transport-helper.c:148 transport-helper.c:557 +#: transport-helper.c:150 transport-helper.c:559 msgid "can't dup helper output fd" msgstr "无法复制助手输出文件句柄" -#: transport-helper.c:199 +#: transport-helper.c:201 #, c-format msgid "" "unknown mandatory capability %s; this remote helper probably needs newer " "version of Git" msgstr "未知的强制能力 %s,该远程助手可能需要新版本的Git" -#: transport-helper.c:205 +#: transport-helper.c:207 msgid "this remote helper should implement refspec capability" msgstr "远程助手需要实现 refspec 能力" -#: transport-helper.c:272 transport-helper.c:412 +#: transport-helper.c:274 transport-helper.c:414 #, c-format msgid "%s unexpectedly said: '%s'" msgstr "%s 意外地说:'%s'" -#: transport-helper.c:401 +#: transport-helper.c:403 #, c-format msgid "%s also locked %s" msgstr "%s 也锁定了 %s" -#: transport-helper.c:479 +#: transport-helper.c:481 msgid "couldn't run fast-import" msgstr "不能执行 fast-import" -#: transport-helper.c:502 +#: transport-helper.c:504 msgid "error while running fast-import" msgstr "执行 fast-import 出错" -#: transport-helper.c:531 transport-helper.c:1097 +#: transport-helper.c:533 transport-helper.c:1099 #, c-format msgid "could not read ref %s" msgstr "无法读取引用 %s" -#: transport-helper.c:576 +#: transport-helper.c:578 #, c-format msgid "unknown response to connect: %s" msgstr "连接时未知的响应:%s" -#: transport-helper.c:598 +#: transport-helper.c:600 msgid "setting remote service path not supported by protocol" msgstr "协议不支持设置远程服务路径" -#: transport-helper.c:600 +#: transport-helper.c:602 msgid "invalid remote service path" msgstr "无效的远程服务路径" -#: transport-helper.c:646 +#: transport-helper.c:648 #, c-format msgid "can't connect to subservice %s" msgstr "不能连接到子服务 %s" -#: transport-helper.c:718 +#: transport-helper.c:720 #, c-format msgid "expected ok/error, helper said '%s'" msgstr "预期 ok/error,助手说 '%s'" -#: transport-helper.c:771 +#: transport-helper.c:773 #, c-format msgid "helper reported unexpected status of %s" msgstr "助手报告 %s 的意外状态" -#: transport-helper.c:832 +#: transport-helper.c:834 #, c-format msgid "helper %s does not support dry-run" msgstr "助手 %s 不支持 dry-run" -#: transport-helper.c:835 +#: transport-helper.c:837 #, c-format msgid "helper %s does not support --signed" msgstr "助手 %s 不支持 --signed" -#: transport-helper.c:838 +#: transport-helper.c:840 #, c-format msgid "helper %s does not support --signed=if-asked" msgstr "助手 %s 不支持 --signed=if-asked" -#: transport-helper.c:845 +#: transport-helper.c:847 #, c-format msgid "helper %s does not support 'push-option'" msgstr "助手 %s 不支持 'push-option'" -#: transport-helper.c:937 +#: transport-helper.c:939 msgid "remote-helper doesn't support push; refspec needed" msgstr "remote-heper 不支持 push,需要引用表达式" -#: transport-helper.c:942 +#: transport-helper.c:944 #, c-format msgid "helper %s does not support 'force'" msgstr "助手 %s 不支持 'force'" -#: transport-helper.c:989 +#: transport-helper.c:991 msgid "couldn't run fast-export" msgstr "无法执行 fast-export" -#: transport-helper.c:994 +#: transport-helper.c:996 msgid "error while running fast-export" msgstr "执行 fast-export 时出错" -#: transport-helper.c:1019 +#: transport-helper.c:1021 #, c-format msgid "" "No refs in common and none specified; doing nothing.\n" @@ -6700,47 +7344,47 @@ msgstr "" "没有共同的引用并且也没有指定,什么也不会做。\n" "可能您应该指定一个分支如 'master'。\n" -#: transport-helper.c:1083 +#: transport-helper.c:1085 #, c-format msgid "malformed response in ref list: %s" msgstr "引用列表中格式错误的响应:%s" -#: transport-helper.c:1236 +#: transport-helper.c:1238 #, c-format msgid "read(%s) failed" msgstr "读取(%s)失败" -#: transport-helper.c:1263 +#: transport-helper.c:1265 #, c-format msgid "write(%s) failed" msgstr "写(%s)失败" -#: transport-helper.c:1312 +#: transport-helper.c:1314 #, c-format msgid "%s thread failed" msgstr "%s 线程失败" -#: transport-helper.c:1316 +#: transport-helper.c:1318 #, c-format msgid "%s thread failed to join: %s" msgstr "%s 线程等待失败:%s" -#: transport-helper.c:1335 transport-helper.c:1339 +#: transport-helper.c:1337 transport-helper.c:1341 #, c-format msgid "can't start thread for copying data: %s" msgstr "不能启动线程来拷贝数据:%s" -#: transport-helper.c:1376 +#: transport-helper.c:1378 #, c-format msgid "%s process failed to wait" msgstr "%s 进程等待失败" -#: transport-helper.c:1380 +#: transport-helper.c:1382 #, c-format msgid "%s process failed" msgstr "%s 进程失败" -#: transport-helper.c:1398 transport-helper.c:1407 +#: transport-helper.c:1400 transport-helper.c:1409 msgid "can't start thread for copying data" msgstr "不能启动线程来拷贝数据" @@ -6976,16 +7620,16 @@ msgstr "" "无法更新子模组:\n" "%s" -#: unpack-trees.c:253 +#: unpack-trees.c:256 #, c-format msgid "Aborting\n" msgstr "终止中\n" -#: unpack-trees.c:335 +#: unpack-trees.c:318 msgid "Checking out files" msgstr "正在检出文件" -#: unpack-trees.c:367 +#: unpack-trees.c:350 msgid "" "the following paths have collided (e.g. case-sensitive paths\n" "on a case-insensitive filesystem) and only one from the same\n" @@ -7023,32 +7667,32 @@ msgstr "无效的端口号" msgid "invalid '..' path segment" msgstr "无效的 '..' 路径片段" -#: worktree.c:249 builtin/am.c:2094 +#: worktree.c:255 builtin/am.c:2097 #, c-format msgid "failed to read '%s'" msgstr "读取 '%s' 失败" -#: worktree.c:295 +#: worktree.c:301 #, c-format msgid "'%s' at main working tree is not the repository directory" msgstr "在主工作区的 '%s' 不是仓库目录" -#: worktree.c:306 +#: worktree.c:312 #, c-format msgid "'%s' file does not contain absolute path to the working tree location" msgstr "文件 '%s' 不包含工作区的绝对路径" -#: worktree.c:318 +#: worktree.c:324 #, c-format msgid "'%s' does not exist" msgstr "'%s' 不存在" -#: worktree.c:324 +#: worktree.c:330 #, c-format msgid "'%s' is not a .git file, error code %d" msgstr "'%s' 不是一个 .git 文件,错误码 %d" -#: worktree.c:332 +#: worktree.c:338 #, c-format msgid "'%s' does not point back to '%s'" msgstr "'%s' 没有指回到 '%s'" @@ -7067,162 +7711,162 @@ msgstr "不能访问 '%s'" msgid "unable to get current working directory" msgstr "不能获取当前工作目录" -#: wt-status.c:155 +#: wt-status.c:156 msgid "Unmerged paths:" msgstr "未合并的路径:" # 译者:注意保持前导空格 -#: wt-status.c:182 wt-status.c:209 +#: wt-status.c:183 wt-status.c:210 #, c-format msgid " (use \"git reset %s <file>...\" to unstage)" msgstr " (使用 \"git reset %s <文件>...\" 以取消暂存)" # 译者:注意保持前导空格 -#: wt-status.c:184 wt-status.c:211 +#: wt-status.c:185 wt-status.c:212 msgid " (use \"git rm --cached <file>...\" to unstage)" msgstr " (使用 \"git rm --cached <文件>...\" 以取消暂存)" # 译者:注意保持前导空格 -#: wt-status.c:188 +#: wt-status.c:189 msgid " (use \"git add <file>...\" to mark resolution)" msgstr " (使用 \"git add <文件>...\" 标记解决方案)" # 译者:注意保持前导空格 -#: wt-status.c:190 wt-status.c:194 +#: wt-status.c:191 wt-status.c:195 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr " (酌情使用 \"git add/rm <文件>...\" 标记解决方案)" # 译者:注意保持前导空格 -#: wt-status.c:192 +#: wt-status.c:193 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (使用 \"git rm <文件>...\" 标记解决方案)" -#: wt-status.c:203 wt-status.c:1046 +#: wt-status.c:204 wt-status.c:1064 msgid "Changes to be committed:" msgstr "要提交的变更:" -#: wt-status.c:221 wt-status.c:1055 +#: wt-status.c:222 wt-status.c:1073 msgid "Changes not staged for commit:" msgstr "尚未暂存以备提交的变更:" # 译者:注意保持前导空格 -#: wt-status.c:225 +#: wt-status.c:226 msgid " (use \"git add <file>...\" to update what will be committed)" msgstr " (使用 \"git add <文件>...\" 更新要提交的内容)" # 译者:注意保持前导空格 -#: wt-status.c:227 +#: wt-status.c:228 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr " (使用 \"git add/rm <文件>...\" 更新要提交的内容)" # 译者:注意保持前导空格 -#: wt-status.c:228 +#: wt-status.c:229 msgid "" " (use \"git checkout -- <file>...\" to discard changes in working directory)" msgstr " (使用 \"git checkout -- <文件>...\" 丢弃工作区的改动)" # 译者:注意保持前导空格 -#: wt-status.c:230 +#: wt-status.c:231 msgid " (commit or discard the untracked or modified content in submodules)" msgstr " (提交或丢弃子模组中未跟踪或修改的内容)" # 译者:注意保持前导空格 -#: wt-status.c:242 +#: wt-status.c:243 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr " (使用 \"git %s <文件>...\" 以包含要提交的内容)" -#: wt-status.c:257 +#: wt-status.c:258 msgid "both deleted:" msgstr "双方删除:" -#: wt-status.c:259 +#: wt-status.c:260 msgid "added by us:" msgstr "由我们添加:" -#: wt-status.c:261 +#: wt-status.c:262 msgid "deleted by them:" msgstr "由他们删除:" -#: wt-status.c:263 +#: wt-status.c:264 msgid "added by them:" msgstr "由他们添加:" -#: wt-status.c:265 +#: wt-status.c:266 msgid "deleted by us:" msgstr "由我们删除:" -#: wt-status.c:267 +#: wt-status.c:268 msgid "both added:" msgstr "双方添加:" -#: wt-status.c:269 +#: wt-status.c:270 msgid "both modified:" msgstr "双方修改:" -#: wt-status.c:279 +#: wt-status.c:280 msgid "new file:" msgstr "新文件:" -#: wt-status.c:281 +#: wt-status.c:282 msgid "copied:" msgstr "拷贝:" -#: wt-status.c:283 +#: wt-status.c:284 msgid "deleted:" msgstr "删除:" -#: wt-status.c:285 +#: wt-status.c:286 msgid "modified:" msgstr "修改:" -#: wt-status.c:287 +#: wt-status.c:288 msgid "renamed:" msgstr "重命名:" -#: wt-status.c:289 +#: wt-status.c:290 msgid "typechange:" msgstr "类型变更:" -#: wt-status.c:291 +#: wt-status.c:292 msgid "unknown:" msgstr "未知:" -#: wt-status.c:293 +#: wt-status.c:294 msgid "unmerged:" msgstr "未合并:" # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字 -#: wt-status.c:373 +#: wt-status.c:374 msgid "new commits, " msgstr "新提交, " # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字 -#: wt-status.c:375 +#: wt-status.c:376 msgid "modified content, " msgstr "修改的内容, " # 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字 -#: wt-status.c:377 +#: wt-status.c:378 msgid "untracked content, " msgstr "未跟踪的内容, " -#: wt-status.c:884 +#: wt-status.c:896 #, c-format msgid "Your stash currently has %d entry" msgid_plural "Your stash currently has %d entries" msgstr[0] "您的贮藏区当前有 %d 条记录" msgstr[1] "您的贮藏区当前有 %d 条记录" -#: wt-status.c:916 +#: wt-status.c:928 msgid "Submodules changed but not updated:" msgstr "子模组已修改但尚未更新:" -#: wt-status.c:918 +#: wt-status.c:930 msgid "Submodule changes to be committed:" msgstr "要提交的子模组变更:" -#: wt-status.c:1000 +#: wt-status.c:1012 msgid "" "Do not modify or remove the line above.\n" "Everything below it will be ignored." @@ -7230,77 +7874,77 @@ msgstr "" "不要改动或删除上面的一行。\n" "其下所有内容都将被忽略。" -#: wt-status.c:1101 +#: wt-status.c:1119 msgid "You have unmerged paths." msgstr "您有尚未合并的路径。" # 译者:注意保持前导空格 -#: wt-status.c:1104 +#: wt-status.c:1122 msgid " (fix conflicts and run \"git commit\")" msgstr " (解决冲突并运行 \"git commit\")" # 译者:注意保持前导空格 -#: wt-status.c:1106 +#: wt-status.c:1124 msgid " (use \"git merge --abort\" to abort the merge)" msgstr " (使用 \"git merge --abort\" 终止合并)" -#: wt-status.c:1110 +#: wt-status.c:1128 msgid "All conflicts fixed but you are still merging." msgstr "所有冲突已解决但您仍处于合并中。" # 译者:注意保持前导空格 -#: wt-status.c:1113 +#: wt-status.c:1131 msgid " (use \"git commit\" to conclude merge)" msgstr " (使用 \"git commit\" 结束合并)" -#: wt-status.c:1122 +#: wt-status.c:1140 msgid "You are in the middle of an am session." msgstr "您正处于 am 操作过程中。" -#: wt-status.c:1125 +#: wt-status.c:1143 msgid "The current patch is empty." msgstr "当前的补丁为空。" # 译者:注意保持前导空格 -#: wt-status.c:1129 +#: wt-status.c:1147 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (解决冲突,然后运行 \"git am --continue\")" # 译者:注意保持前导空格 -#: wt-status.c:1131 +#: wt-status.c:1149 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (使用 \"git am --skip\" 跳过此补丁)" # 译者:注意保持前导空格 -#: wt-status.c:1133 +#: wt-status.c:1151 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (使用 \"git am --abort\" 恢复原有分支)" -#: wt-status.c:1264 +#: wt-status.c:1284 msgid "git-rebase-todo is missing." msgstr "git-rebase-todo 丢失。" -#: wt-status.c:1266 +#: wt-status.c:1286 msgid "No commands done." msgstr "没有命令被执行。" -#: wt-status.c:1269 +#: wt-status.c:1289 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" msgstr[0] "最后一条命令已完成(%d 条命令被执行):" msgstr[1] "最后的命令已完成(%d 条命令被执行):" -#: wt-status.c:1280 +#: wt-status.c:1300 #, c-format msgid " (see more in file %s)" msgstr " (更多参见文件 %s)" -#: wt-status.c:1285 +#: wt-status.c:1305 msgid "No commands remaining." msgstr "未剩下任何命令。" -#: wt-status.c:1288 +#: wt-status.c:1308 #, c-format msgid "Next command to do (%d remaining command):" msgid_plural "Next commands to do (%d remaining commands):" @@ -7308,169 +7952,187 @@ msgstr[0] "接下来要执行的命令(剩余 %d 条命令):" msgstr[1] "接下来要执行的命令(剩余 %d 条命令):" # 译者:注意保持前导空格 -#: wt-status.c:1296 +#: wt-status.c:1316 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr " (使用 \"git rebase --edit-todo\" 来查看和编辑)" -#: wt-status.c:1308 +#: wt-status.c:1328 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。" -#: wt-status.c:1313 +#: wt-status.c:1333 msgid "You are currently rebasing." msgstr "您在执行变基操作。" # 译者:注意保持前导空格 -#: wt-status.c:1326 +#: wt-status.c:1346 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (解决冲突,然后运行 \"git rebase --continue\")" # 译者:注意保持前导空格 -#: wt-status.c:1328 +#: wt-status.c:1348 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (使用 \"git rebase --skip\" 跳过此补丁)" # 译者:注意保持前导空格 -#: wt-status.c:1330 +#: wt-status.c:1350 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " (使用 \"git rebase --abort\" 以检出原有分支)" # 译者:注意保持前导空格 -#: wt-status.c:1337 +#: wt-status.c:1357 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (所有冲突已解决:运行 \"git rebase --continue\")" -#: wt-status.c:1341 +#: wt-status.c:1361 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。" -#: wt-status.c:1346 +#: wt-status.c:1366 msgid "You are currently splitting a commit during a rebase." msgstr "您在执行变基操作时拆分提交。" # 译者:注意保持前导空格 -#: wt-status.c:1349 +#: wt-status.c:1369 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr " (一旦您工作目录提交干净后,运行 \"git rebase --continue\")" -#: wt-status.c:1353 +#: wt-status.c:1373 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。" -#: wt-status.c:1358 +#: wt-status.c:1378 msgid "You are currently editing a commit during a rebase." msgstr "您在执行变基操作时编辑提交。" # 译者:注意保持前导空格 -#: wt-status.c:1361 +#: wt-status.c:1381 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " (使用 \"git commit --amend\" 修补当前提交)" # 译者:注意保持前导空格 -#: wt-status.c:1363 +#: wt-status.c:1383 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr " (当您对您的修改满意后执行 \"git rebase --continue\")" -#: wt-status.c:1372 +#: wt-status.c:1394 +msgid "Cherry-pick currently in progress." +msgstr "拣选操作正在进行中。" + +#: wt-status.c:1397 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "您在执行拣选提交 %s 的操作。" # 译者:注意保持前导空格 -#: wt-status.c:1377 +#: wt-status.c:1404 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (解决冲突并运行 \"git cherry-pick --continue\")" # 译者:注意保持前导空格 -#: wt-status.c:1380 +#: wt-status.c:1407 +msgid " (run \"git cherry-pick --continue\" to continue)" +msgstr " (执行 \"git cherry-pick --continue\" 以继续)" + +# 译者:注意保持前导空格 +#: wt-status.c:1410 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr " (所有冲突已解决:运行 \"git cherry-pick --continue\")" # 译者:注意保持前导空格 -#: wt-status.c:1382 +#: wt-status.c:1412 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr " (使用 \"git cherry-pick --abort\" 以取消拣选操作)" -#: wt-status.c:1390 +#: wt-status.c:1422 +msgid "Revert currently in progress." +msgstr "还原操作正在行中。" + +#: wt-status.c:1425 #, c-format msgid "You are currently reverting commit %s." msgstr "您在执行反转提交 %s 的操作。" # 译者:注意保持前导空格 -#: wt-status.c:1395 +#: wt-status.c:1431 msgid " (fix conflicts and run \"git revert --continue\")" -msgstr " (解决冲突并运行 \"git revert --continue\")" +msgstr " (解决冲突并执行 \"git revert --continue\")" + +# 译者:注意保持前导空格 +#: wt-status.c:1434 +msgid " (run \"git revert --continue\" to continue)" +msgstr " (执行 \"git revert --continue\" 以继续)" # 译者:注意保持前导空格 -#: wt-status.c:1398 +#: wt-status.c:1437 msgid " (all conflicts fixed: run \"git revert --continue\")" -msgstr " (所有冲突已解决:运行 \"git revert --continue\")" +msgstr " (所有冲突已解决:执行 \"git revert --continue\")" # 译者:注意保持前导空格 -#: wt-status.c:1400 +#: wt-status.c:1439 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " (使用 \"git revert --abort\" 以取消反转提交操作)" -#: wt-status.c:1410 +#: wt-status.c:1449 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "您在执行从分支 '%s' 开始的二分查找操作。" -#: wt-status.c:1414 +#: wt-status.c:1453 msgid "You are currently bisecting." msgstr "您在执行二分查找操作。" # 译者:注意保持前导空格 -#: wt-status.c:1417 +#: wt-status.c:1456 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " (使用 \"git bisect reset\" 以回到原有分支)" -#: wt-status.c:1617 +#: wt-status.c:1665 msgid "On branch " msgstr "位于分支 " -#: wt-status.c:1624 +#: wt-status.c:1672 msgid "interactive rebase in progress; onto " msgstr "交互式变基操作正在进行中;至 " -#: wt-status.c:1626 +#: wt-status.c:1674 msgid "rebase in progress; onto " msgstr "变基操作正在进行中;至 " -#: wt-status.c:1631 +#: wt-status.c:1679 msgid "HEAD detached at " msgstr "头指针分离于 " -#: wt-status.c:1633 +#: wt-status.c:1681 msgid "HEAD detached from " msgstr "头指针分离自 " -#: wt-status.c:1636 +#: wt-status.c:1684 msgid "Not currently on any branch." msgstr "当前不在任何分支上。" -#: wt-status.c:1653 +#: wt-status.c:1701 msgid "Initial commit" msgstr "初始提交" -#: wt-status.c:1654 +#: wt-status.c:1702 msgid "No commits yet" msgstr "尚无提交" -#: wt-status.c:1668 +#: wt-status.c:1716 msgid "Untracked files" msgstr "未跟踪的文件" -#: wt-status.c:1670 +#: wt-status.c:1718 msgid "Ignored files" msgstr "忽略的文件" -#: wt-status.c:1674 +#: wt-status.c:1722 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -7480,97 +8142,97 @@ msgstr "" "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度,\n" "但您需要小心不要忘了添加新文件(参见 'git help status')。" -#: wt-status.c:1680 +#: wt-status.c:1728 #, c-format msgid "Untracked files not listed%s" msgstr "未跟踪的文件没有列出%s" # 译者:中文字符串拼接,可删除前导空格 -#: wt-status.c:1682 +#: wt-status.c:1730 msgid " (use -u option to show untracked files)" msgstr "(使用 -u 参数显示未跟踪的文件)" -#: wt-status.c:1688 +#: wt-status.c:1736 msgid "No changes" msgstr "没有修改" -#: wt-status.c:1693 +#: wt-status.c:1741 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n" -#: wt-status.c:1696 +#: wt-status.c:1744 #, c-format msgid "no changes added to commit\n" msgstr "修改尚未加入提交\n" -#: wt-status.c:1699 +#: wt-status.c:1747 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " "track)\n" msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n" -#: wt-status.c:1702 +#: wt-status.c:1750 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "提交为空,但是存在尚未跟踪的文件\n" # 译者:中文字符串拼接,可删除前导空格 -#: wt-status.c:1705 +#: wt-status.c:1753 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n" -#: wt-status.c:1708 wt-status.c:1713 +#: wt-status.c:1756 wt-status.c:1761 #, c-format msgid "nothing to commit\n" msgstr "无文件要提交\n" # 译者:中文字符串拼接,可删除前导空格 -#: wt-status.c:1711 +#: wt-status.c:1759 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n" # 译者:中文字符串拼接,可删除前导空格 -#: wt-status.c:1715 +#: wt-status.c:1763 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "无文件要提交,干净的工作区\n" -#: wt-status.c:1828 +#: wt-status.c:1876 msgid "No commits yet on " msgstr "尚无提交在 " -#: wt-status.c:1832 +#: wt-status.c:1880 msgid "HEAD (no branch)" msgstr "HEAD(非分支)" -#: wt-status.c:1863 +#: wt-status.c:1911 msgid "different" msgstr "不同" # 译者:注意保持句尾空格 -#: wt-status.c:1865 wt-status.c:1873 +#: wt-status.c:1913 wt-status.c:1921 msgid "behind " msgstr "落后 " -#: wt-status.c:1868 wt-status.c:1871 +#: wt-status.c:1916 wt-status.c:1919 msgid "ahead " msgstr "领先 " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2386 +#: wt-status.c:2443 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "不能%s:您有未暂存的变更。" -#: wt-status.c:2392 +#: wt-status.c:2449 msgid "additionally, your index contains uncommitted changes." msgstr "另外,您的索引中包含未提交的变更。" -#: wt-status.c:2394 +#: wt-status.c:2451 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "不能%s:您的索引中包含未提交的变更。" @@ -7633,7 +8295,7 @@ 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:214 builtin/push.c:560 +#: 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 msgid "dry run" msgstr "演习" @@ -7642,7 +8304,7 @@ msgstr "演习" msgid "interactive picking" msgstr "交互式拣选" -#: builtin/add.c:294 builtin/checkout.c:1304 builtin/reset.c:306 +#: builtin/add.c:294 builtin/checkout.c:1379 builtin/reset.c:306 msgid "select hunks interactively" msgstr "交互式挑选数据块" @@ -7686,7 +8348,7 @@ msgstr "跳过因出错不能添加的文件" msgid "check if - even missing - files are ignored in dry run" msgstr "检查在演习模式下文件(即使不存在)是否被忽略" -#: builtin/add.c:309 builtin/update-index.c:991 +#: builtin/add.c:309 builtin/update-index.c:1001 msgid "override the executable bit of the listed files" msgstr "覆盖列表里文件的可执行位" @@ -7733,29 +8395,29 @@ msgstr "正在添加嵌入式 git 仓库:%s" msgid "Use -f if you really want to add them.\n" msgstr "使用 -f 参数如果您确实要添加它们。\n" -#: builtin/add.c:380 +#: builtin/add.c:379 msgid "adding files failed" msgstr "添加文件失败" -#: builtin/add.c:418 +#: builtin/add.c:419 msgid "-A and -u are mutually incompatible" msgstr "-A 和 -u 选项互斥" -#: builtin/add.c:425 +#: builtin/add.c:426 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用" -#: builtin/add.c:429 +#: builtin/add.c:430 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "参数 --chmod 取值 '%s' 必须是 -x 或 +x" -#: builtin/add.c:444 +#: builtin/add.c:445 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "没有指定文件,也没有文件被添加。\n" -#: builtin/add.c:445 +#: builtin/add.c:446 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "也许您想要执行 'git add .'?\n" @@ -7769,100 +8431,100 @@ msgstr "不能解析作者脚本" msgid "'%s' was deleted by the applypatch-msg hook" msgstr "'%s' 被 applypatch-msg 钩子删除" -#: builtin/am.c:473 +#: builtin/am.c:474 #, c-format msgid "Malformed input line: '%s'." msgstr "非法的输入行:'%s'。" -#: builtin/am.c:510 +#: builtin/am.c:512 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "从 '%s' 拷贝注解到 '%s' 时失败" -#: builtin/am.c:536 +#: builtin/am.c:538 msgid "fseek failed" msgstr "fseek 失败" -#: builtin/am.c:724 +#: builtin/am.c:726 #, c-format msgid "could not parse patch '%s'" msgstr "无法解析补丁 '%s'" -#: builtin/am.c:789 +#: builtin/am.c:791 msgid "Only one StGIT patch series can be applied at once" msgstr "一次只能有一个 StGIT 补丁队列被应用" -#: builtin/am.c:837 +#: builtin/am.c:839 msgid "invalid timestamp" msgstr "无效的时间戳" -#: builtin/am.c:842 builtin/am.c:854 +#: builtin/am.c:844 builtin/am.c:856 msgid "invalid Date line" msgstr "无效的日期行" -#: builtin/am.c:849 +#: builtin/am.c:851 msgid "invalid timezone offset" msgstr "无效的时区偏移值" -#: builtin/am.c:942 +#: builtin/am.c:944 msgid "Patch format detection failed." msgstr "补丁格式探测失败。" -#: builtin/am.c:947 builtin/clone.c:409 +#: builtin/am.c:949 builtin/clone.c:409 #, c-format msgid "failed to create directory '%s'" msgstr "创建目录 '%s' 失败" -#: builtin/am.c:952 +#: builtin/am.c:954 msgid "Failed to split patches." msgstr "拆分补丁失败。" -#: builtin/am.c:1082 builtin/commit.c:371 +#: builtin/am.c:1084 builtin/commit.c:371 msgid "unable to write index file" msgstr "无法写入索引文件" -#: builtin/am.c:1096 +#: builtin/am.c:1098 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "当您解决这一问题,执行 \"%s --continue\"。" -#: builtin/am.c:1097 +#: builtin/am.c:1099 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "如果您想要跳过这一补丁,则执行 \"%s --skip\"。" -#: builtin/am.c:1098 +#: builtin/am.c:1100 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "若要复原至原始分支并停止补丁操作,执行 \"%s --abort\"。" -#: builtin/am.c:1181 +#: builtin/am.c:1183 msgid "Patch sent with format=flowed; space at the end of lines might be lost." msgstr "补丁使用 format=flowed 格式发送,行尾的空格可能会丢失。" -#: builtin/am.c:1209 +#: builtin/am.c:1211 msgid "Patch is empty." msgstr "补丁为空。" -#: builtin/am.c:1275 +#: builtin/am.c:1277 #, c-format msgid "invalid ident line: %.*s" msgstr "无效的身份标识:%.*s" -#: builtin/am.c:1297 +#: builtin/am.c:1299 #, c-format msgid "unable to parse commit %s" msgstr "不能解析提交 %s" -#: builtin/am.c:1493 +#: builtin/am.c:1495 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "仓库缺乏必要的数据对象以进行三方合并。" -#: builtin/am.c:1495 +#: builtin/am.c:1497 msgid "Using index info to reconstruct a base tree..." msgstr "使用索引来重建一个(三方合并的)基础目录树..." -#: builtin/am.c:1514 +#: builtin/am.c:1516 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -7870,28 +8532,28 @@ msgstr "" "您是否曾手动编辑过您的补丁?\n" "无法应用补丁到索引中的数据对象上。" -#: builtin/am.c:1520 +#: builtin/am.c:1522 msgid "Falling back to patching base and 3-way merge..." msgstr "回落到基础版本上打补丁及进行三方合并..." -#: builtin/am.c:1546 +#: builtin/am.c:1548 msgid "Failed to merge in the changes." msgstr "无法合并变更。" -#: builtin/am.c:1578 +#: builtin/am.c:1580 msgid "applying to an empty history" msgstr "正应用到一个空历史上" -#: builtin/am.c:1624 builtin/am.c:1628 +#: builtin/am.c:1627 builtin/am.c:1631 #, c-format msgid "cannot resume: %s does not exist." msgstr "无法继续:%s 不存在。" -#: builtin/am.c:1644 +#: builtin/am.c:1647 msgid "cannot be interactive without stdin connected to a terminal." msgstr "标准输入没有和终端关联,不能进行交互式操作。" -#: builtin/am.c:1649 +#: builtin/am.c:1652 msgid "Commit Body is:" msgstr "提交内容为:" @@ -7900,34 +8562,34 @@ msgstr "提交内容为:" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1659 +#: builtin/am.c:1662 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "应用?是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]:" -#: builtin/am.c:1709 +#: builtin/am.c:1712 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "脏索引:不能应用补丁(脏文件:%s)" -#: builtin/am.c:1749 builtin/am.c:1817 +#: builtin/am.c:1752 builtin/am.c:1820 #, c-format msgid "Applying: %.*s" msgstr "应用:%.*s" -#: builtin/am.c:1766 +#: builtin/am.c:1769 msgid "No changes -- Patch already applied." msgstr "没有变更 —— 补丁已经应用过。" -#: builtin/am.c:1772 +#: builtin/am.c:1775 #, c-format msgid "Patch failed at %s %.*s" msgstr "打补丁失败于 %s %.*s" -#: builtin/am.c:1776 +#: builtin/am.c:1779 msgid "Use 'git am --show-current-patch' to see the failed patch" msgstr "用 'git am --show-current-patch' 命令查看失败的补丁" -#: builtin/am.c:1820 +#: builtin/am.c:1823 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -7937,7 +8599,7 @@ msgstr "" "如果没有什么要添加到暂存区的,则很可能是其它提交已经引入了相同的变更。\n" "您也许想要跳过这个补丁。" -#: builtin/am.c:1827 +#: builtin/am.c:1830 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -7948,159 +8610,159 @@ msgstr "" "您应该对已经冲突解决的每一个文件执行 'git add' 来标记已经完成。 \n" "你可以对 \"由他们删除\" 的文件执行 `git rm` 命令。" -#: builtin/am.c:1934 builtin/am.c:1938 builtin/am.c:1950 builtin/reset.c:329 +#: builtin/am.c:1937 builtin/am.c:1941 builtin/am.c:1953 builtin/reset.c:329 #: builtin/reset.c:337 #, c-format msgid "Could not parse object '%s'." msgstr "不能解析对象 '%s'。" -#: builtin/am.c:1986 +#: builtin/am.c:1989 msgid "failed to clean index" msgstr "清空索引失败" -#: builtin/am.c:2030 +#: builtin/am.c:2033 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD" -#: builtin/am.c:2123 +#: builtin/am.c:2130 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "无效的 --patch-format 值:%s" -#: builtin/am.c:2159 +#: builtin/am.c:2166 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<选项>] [(<mbox> | <Maildir>)...]" -#: builtin/am.c:2160 +#: builtin/am.c:2167 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<选项>] (--continue | --skip | --abort)" -#: builtin/am.c:2166 +#: builtin/am.c:2173 msgid "run interactively" msgstr "以交互式方式运行" -#: builtin/am.c:2168 +#: builtin/am.c:2175 msgid "historical option -- no-op" msgstr "老的参数 —— 无作用" -#: builtin/am.c:2170 +#: builtin/am.c:2177 msgid "allow fall back on 3way merging if needed" msgstr "如果必要,允许使用三方合并。" -#: builtin/am.c:2171 builtin/init-db.c:486 builtin/prune-packed.c:58 -#: builtin/repack.c:306 +#: builtin/am.c:2178 builtin/init-db.c:494 builtin/prune-packed.c:58 +#: builtin/repack.c:306 builtin/stash.c:805 msgid "be quiet" msgstr "静默模式" -#: builtin/am.c:2173 +#: builtin/am.c:2180 msgid "add a Signed-off-by line to the commit message" msgstr "在提交说明中添加一个 Signed-off-by 签名" -#: builtin/am.c:2176 +#: builtin/am.c:2183 msgid "recode into utf8 (default)" msgstr "使用 utf8 字符集(默认)" -#: builtin/am.c:2178 +#: builtin/am.c:2185 msgid "pass -k flag to git-mailinfo" msgstr "向 git-mailinfo 传递 -k 参数" -#: builtin/am.c:2180 +#: builtin/am.c:2187 msgid "pass -b flag to git-mailinfo" msgstr "向 git-mailinfo 传递 -b 参数" -#: builtin/am.c:2182 +#: builtin/am.c:2189 msgid "pass -m flag to git-mailinfo" msgstr "向 git-mailinfo 传递 -m 参数" -#: builtin/am.c:2184 +#: builtin/am.c:2191 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "针对 mbox 格式,向 git-mailsplit 传递 --keep-cr 参数" -#: builtin/am.c:2187 +#: builtin/am.c:2194 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "不向 git-mailsplit 传递 --keep-cr 参数,覆盖 am.keepcr 的设置" -#: builtin/am.c:2190 +#: builtin/am.c:2197 msgid "strip everything before a scissors line" msgstr "丢弃裁切线前的所有内容" -#: builtin/am.c:2192 builtin/am.c:2195 builtin/am.c:2198 builtin/am.c:2201 -#: builtin/am.c:2204 builtin/am.c:2207 builtin/am.c:2210 builtin/am.c:2213 -#: builtin/am.c:2219 +#: 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 msgid "pass it through git-apply" msgstr "传递给 git-apply" -#: builtin/am.c:2209 builtin/commit.c:1343 builtin/fmt-merge-msg.c:671 -#: builtin/fmt-merge-msg.c:674 builtin/grep.c:879 builtin/merge.c:240 -#: builtin/pull.c:152 builtin/pull.c:210 builtin/rebase.c:1062 +#: 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:171 builtin/tag.c:386 -#: parse-options.h:144 parse-options.h:146 parse-options.h:266 +#: 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 msgid "n" msgstr "n" -#: builtin/am.c:2215 builtin/branch.c:637 builtin/for-each-ref.c:38 -#: builtin/replace.c:544 builtin/tag.c:422 builtin/verify-tag.c:39 +#: 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 msgid "format" msgstr "格式" -#: builtin/am.c:2216 +#: builtin/am.c:2223 msgid "format the patch(es) are in" msgstr "补丁的格式" -#: builtin/am.c:2222 +#: builtin/am.c:2229 msgid "override error message when patch failure occurs" msgstr "打补丁失败时显示的错误信息" -#: builtin/am.c:2224 +#: builtin/am.c:2231 msgid "continue applying patches after resolving a conflict" msgstr "冲突解决后继续应用补丁" -#: builtin/am.c:2227 +#: builtin/am.c:2234 msgid "synonyms for --continue" msgstr "和 --continue 同义" -#: builtin/am.c:2230 +#: builtin/am.c:2237 msgid "skip the current patch" msgstr "跳过当前补丁" -#: builtin/am.c:2233 +#: builtin/am.c:2240 msgid "restore the original branch and abort the patching operation." msgstr "恢复原始分支并终止打补丁操作。" -#: builtin/am.c:2236 +#: builtin/am.c:2243 msgid "abort the patching operation but keep HEAD where it is." msgstr "终止补丁操作但保持 HEAD 不变。" -#: builtin/am.c:2239 +#: builtin/am.c:2246 msgid "show the patch being applied." msgstr "显示正在应用的补丁。" -#: builtin/am.c:2243 +#: builtin/am.c:2250 msgid "lie about committer date" msgstr "将作者日期作为提交日期" -#: builtin/am.c:2245 +#: builtin/am.c:2252 msgid "use current timestamp for author date" msgstr "用当前时间作为作者日期" -#: builtin/am.c:2247 builtin/commit.c:1486 builtin/merge.c:274 -#: builtin/pull.c:185 builtin/rebase.c:1106 builtin/rebase--interactive.c:185 -#: builtin/revert.c:114 builtin/tag.c:402 +#: 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 msgid "key-id" msgstr "key-id" -#: builtin/am.c:2248 builtin/rebase.c:1107 builtin/rebase--interactive.c:186 +#: builtin/am.c:2255 builtin/rebase.c:490 builtin/rebase.c:1454 msgid "GPG-sign commits" msgstr "使用 GPG 签名提交" -#: builtin/am.c:2251 +#: builtin/am.c:2258 msgid "(internal use for git-rebase)" msgstr "(内部使用,用于 git-rebase)" -#: builtin/am.c:2269 +#: builtin/am.c:2276 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." @@ -8108,16 +8770,16 @@ msgstr "" "参数 -b/--binary 已经很长时间不做任何实质操作了,并且将被移除。\n" "请不要再使用它了。" -#: builtin/am.c:2276 +#: builtin/am.c:2283 msgid "failed to read the index" msgstr "读取索引失败" -#: builtin/am.c:2291 +#: builtin/am.c:2298 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "之前的变基目录 %s 仍然存在,但却提供了 mbox。" -#: builtin/am.c:2315 +#: builtin/am.c:2322 #, c-format msgid "" "Stray %s directory found.\n" @@ -8126,7 +8788,7 @@ msgstr "" "发现了错误的 %s 目录。\n" "使用 \"git am --abort\" 删除它。" -#: builtin/am.c:2321 +#: builtin/am.c:2328 msgid "Resolve operation not in progress, we are not resuming." msgstr "解决操作未进行,我们不会继续。" @@ -8262,7 +8924,7 @@ msgstr "坏的 bisect_write 参数:%s" #: builtin/bisect--helper.c:220 #, c-format msgid "couldn't get the oid of the rev '%s'" -msgstr "无法获取版本 '%s' 的对象ID" +msgstr "无法获取版本 '%s' 的对象 ID" #: builtin/bisect--helper.c:232 #, c-format @@ -8297,7 +8959,7 @@ msgstr "" #: builtin/bisect--helper.c:321 #, c-format msgid "bisecting only with a %s commit" -msgstr "二分查找只有一个 %s 提交" +msgstr "在只有一个 %s 提交的情况下二分查找" # 译者:注意保持句尾空格 #. TRANSLATORS: Make sure to include [Y] and [n] in your @@ -8393,7 +9055,7 @@ msgstr "打印二分查找术语" #: builtin/bisect--helper.c:645 msgid "start the bisect session" -msgstr "启动二分查找会话" +msgstr "启动二分查找过程" #: builtin/bisect--helper.c:647 msgid "update BISECT_HEAD instead of checking out the current commit" @@ -8431,141 +9093,141 @@ msgstr "--bisect-next-check 需要 2 或 3 个参数" msgid "--bisect-terms requires 0 or 1 argument" msgstr "--bisect-terms 需要 0 或 1 个参数" -#: builtin/blame.c:31 +#: builtin/blame.c:32 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>" -#: builtin/blame.c:36 +#: builtin/blame.c:37 msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中" -#: builtin/blame.c:406 +#: builtin/blame.c:407 #, c-format msgid "expecting a color: %s" msgstr "期望一个颜色:%s" -#: builtin/blame.c:413 +#: builtin/blame.c:414 msgid "must end with a color" msgstr "必须以一个颜色结尾" -#: builtin/blame.c:700 +#: builtin/blame.c:701 #, c-format msgid "invalid color '%s' in color.blame.repeatedLines" msgstr "设置 color.blame.repeatedLines 中的无效颜色 '%s'" -#: builtin/blame.c:718 +#: builtin/blame.c:719 msgid "invalid value for blame.coloring" msgstr "设置 blame.coloring 中的无效取值" -#: builtin/blame.c:793 +#: builtin/blame.c:794 msgid "Show blame entries as we find them, incrementally" msgstr "增量式地显示发现的 blame 条目" -#: builtin/blame.c:794 +#: builtin/blame.c:795 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "边界提交显示空的 SHA-1(默认:关闭)" -#: builtin/blame.c:795 +#: builtin/blame.c:796 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "不把根提交作为边界(默认:关闭)" -#: builtin/blame.c:796 +#: builtin/blame.c:797 msgid "Show work cost statistics" msgstr "显示命令消耗统计" -#: builtin/blame.c:797 +#: builtin/blame.c:798 msgid "Force progress reporting" msgstr "强制进度显示" -#: builtin/blame.c:798 +#: builtin/blame.c:799 msgid "Show output score for blame entries" msgstr "显示判断 blame 条目位移的得分诊断信息" -#: builtin/blame.c:799 +#: builtin/blame.c:800 msgid "Show original filename (Default: auto)" msgstr "显示原始文件名(默认:自动)" -#: builtin/blame.c:800 +#: builtin/blame.c:801 msgid "Show original linenumber (Default: off)" msgstr "显示原始的行号(默认:关闭)" -#: builtin/blame.c:801 +#: builtin/blame.c:802 msgid "Show in a format designed for machine consumption" msgstr "显示为一个适合机器读取的格式" -#: builtin/blame.c:802 +#: builtin/blame.c:803 msgid "Show porcelain format with per-line commit information" msgstr "为每一行显示机器适用的提交信息" -#: builtin/blame.c:803 +#: builtin/blame.c:804 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)" -#: builtin/blame.c:804 +#: builtin/blame.c:805 msgid "Show raw timestamp (Default: off)" msgstr "显示原始时间戳(默认:关闭)" -#: builtin/blame.c:805 +#: builtin/blame.c:806 msgid "Show long commit SHA1 (Default: off)" msgstr "显示长的 SHA1 提交号(默认:关闭)" -#: builtin/blame.c:806 +#: builtin/blame.c:807 msgid "Suppress author name and timestamp (Default: off)" msgstr "隐藏作者名字和时间戳(默认:关闭)" -#: builtin/blame.c:807 +#: builtin/blame.c:808 msgid "Show author email instead of name (Default: off)" msgstr "显示作者的邮箱而不是名字(默认:关闭)" -#: builtin/blame.c:808 +#: builtin/blame.c:809 msgid "Ignore whitespace differences" msgstr "忽略空白差异" -#: builtin/blame.c:809 +#: builtin/blame.c:810 msgid "color redundant metadata from previous line differently" msgstr "使用颜色间隔输出与前一行不同的重复元信息" -#: builtin/blame.c:810 +#: builtin/blame.c:811 msgid "color lines by age" msgstr "依据时间着色" -#: builtin/blame.c:817 +#: builtin/blame.c:818 msgid "Use an experimental heuristic to improve diffs" msgstr "使用一个试验性的启发式算法改进差异显示" -#: builtin/blame.c:819 +#: builtin/blame.c:820 msgid "Spend extra cycles to find better match" msgstr "花费额外的循环来找到更好的匹配" -#: builtin/blame.c:820 +#: builtin/blame.c:821 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list" -#: builtin/blame.c:821 +#: builtin/blame.c:822 msgid "Use <file>'s contents as the final image" msgstr "使用 <文件> 的内容作为最终的图片" -#: builtin/blame.c:822 builtin/blame.c:823 +#: builtin/blame.c:823 builtin/blame.c:824 msgid "score" msgstr "得分" -#: builtin/blame.c:822 +#: builtin/blame.c:823 msgid "Find line copies within and across files" msgstr "找到文件内及跨文件的行拷贝" -#: builtin/blame.c:823 +#: builtin/blame.c:824 msgid "Find line movements within and across files" msgstr "找到文件内及跨文件的行移动" -#: builtin/blame.c:824 +#: builtin/blame.c:825 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:824 +#: builtin/blame.c:825 msgid "Process only line range n,m, counting from 1" msgstr "只处理行范围在 n 和 m 之间的,从 1 开始" -#: builtin/blame.c:875 +#: builtin/blame.c:876 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "--progress 不能和 --incremental 或 --porcelain 同时使用" @@ -8577,18 +9239,18 @@ msgstr "--progress 不能和 --incremental 或 --porcelain 同时使用" #. your language may need more or fewer display #. columns. #. -#: builtin/blame.c:926 +#: builtin/blame.c:927 msgid "4 years, 11 months ago" msgstr "4 年 11 个月前" -#: builtin/blame.c:1018 +#: builtin/blame.c:1031 #, c-format msgid "file %s has only %lu line" msgid_plural "file %s has only %lu lines" msgstr[0] "文件 %s 只有 %lu 行" msgstr[1] "文件 %s 只有 %lu 行" -#: builtin/blame.c:1064 +#: builtin/blame.c:1077 msgid "Blaming lines" msgstr "追踪代码行" @@ -8701,65 +9363,74 @@ msgstr "已删除远程跟踪分支 %s(曾为 %s)。\n" msgid "Deleted branch %s (was %s).\n" msgstr "已删除分支 %s(曾为 %s)。\n" -#: builtin/branch.c:421 builtin/tag.c:59 +#: builtin/branch.c:421 builtin/tag.c:60 msgid "unable to parse format string" msgstr "不能解析格式化字符串" +#: builtin/branch.c:452 +msgid "could not resolve HEAD" +msgstr "不能解析 HEAD 提交" + #: builtin/branch.c:458 #, c-format +msgid "HEAD (%s) points outside of refs/heads/" +msgstr "HEAD (%s) 指向 refs/heads/ 之外" + +#: builtin/branch.c:473 +#, c-format msgid "Branch %s is being rebased at %s" msgstr "分支 %s 正被变基到 %s" -#: builtin/branch.c:462 +#: builtin/branch.c:477 #, c-format msgid "Branch %s is being bisected at %s" msgstr "分支 %s 正被二分查找于 %s" -#: builtin/branch.c:479 +#: builtin/branch.c:494 msgid "cannot copy the current branch while not on any." msgstr "无法拷贝当前分支因为不处于任何分支上。" -#: builtin/branch.c:481 +#: builtin/branch.c:496 msgid "cannot rename the current branch while not on any." msgstr "无法重命名当前分支因为不处于任何分支上。" -#: builtin/branch.c:492 +#: builtin/branch.c:507 #, c-format msgid "Invalid branch name: '%s'" msgstr "无效的分支名:'%s'" -#: builtin/branch.c:519 +#: builtin/branch.c:534 msgid "Branch rename failed" msgstr "分支重命名失败" -#: builtin/branch.c:521 +#: builtin/branch.c:536 msgid "Branch copy failed" msgstr "分支拷贝失败" -#: builtin/branch.c:525 +#: builtin/branch.c:540 #, c-format msgid "Created a copy of a misnamed branch '%s'" msgstr "已为错误命名的分支 '%s' 创建了一个副本" -#: builtin/branch.c:528 +#: builtin/branch.c:543 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "已将错误命名的分支 '%s' 重命名" -#: builtin/branch.c:534 +#: builtin/branch.c:549 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "分支重命名为 %s,但 HEAD 没有更新!" -#: builtin/branch.c:543 +#: builtin/branch.c:558 msgid "Branch is renamed, but update of config-file failed" msgstr "分支被重命名,但更新配置文件失败" -#: builtin/branch.c:545 +#: builtin/branch.c:560 msgid "Branch is copied, but update of config-file failed" msgstr "分支已拷贝,但更新配置文件失败" -#: builtin/branch.c:561 +#: builtin/branch.c:576 #, c-format msgid "" "Please edit the description for the branch\n" @@ -8770,219 +9441,213 @@ msgstr "" " %s\n" "以 '%c' 开头的行将被过滤。\n" -#: builtin/branch.c:594 +#: builtin/branch.c:610 msgid "Generic options" msgstr "通用选项" -#: builtin/branch.c:596 +#: builtin/branch.c:612 msgid "show hash and subject, give twice for upstream branch" msgstr "显示哈希值和主题,若参数出现两次则显示上游分支" -#: builtin/branch.c:597 +#: builtin/branch.c:613 msgid "suppress informational messages" msgstr "不显示信息" -#: builtin/branch.c:598 +#: builtin/branch.c:614 msgid "set up tracking mode (see git-pull(1))" msgstr "设置跟踪模式(参见 git-pull(1))" -#: builtin/branch.c:600 +#: builtin/branch.c:616 msgid "do not use" msgstr "不要使用" -#: builtin/branch.c:602 builtin/rebase--interactive.c:182 +#: builtin/branch.c:618 builtin/rebase.c:485 msgid "upstream" msgstr "上游" -#: builtin/branch.c:602 +#: builtin/branch.c:618 msgid "change the upstream info" msgstr "改变上游信息" -#: builtin/branch.c:603 +#: builtin/branch.c:619 msgid "Unset the upstream info" msgstr "取消上游信息的设置" -#: builtin/branch.c:604 +#: builtin/branch.c:620 msgid "use colored output" msgstr "使用彩色输出" -#: builtin/branch.c:605 +#: builtin/branch.c:621 msgid "act on remote-tracking branches" msgstr "作用于远程跟踪分支" -#: builtin/branch.c:607 builtin/branch.c:609 +#: builtin/branch.c:623 builtin/branch.c:625 msgid "print only branches that contain the commit" msgstr "只打印包含该提交的分支" -#: builtin/branch.c:608 builtin/branch.c:610 +#: builtin/branch.c:624 builtin/branch.c:626 msgid "print only branches that don't contain the commit" msgstr "只打印不包含该提交的分支" -#: builtin/branch.c:613 +#: builtin/branch.c:629 msgid "Specific git-branch actions:" msgstr "具体的 git-branch 动作:" -#: builtin/branch.c:614 +#: builtin/branch.c:630 msgid "list both remote-tracking and local branches" msgstr "列出远程跟踪及本地分支" -#: builtin/branch.c:616 +#: builtin/branch.c:632 msgid "delete fully merged branch" msgstr "删除完全合并的分支" -#: builtin/branch.c:617 +#: builtin/branch.c:633 msgid "delete branch (even if not merged)" msgstr "删除分支(即使没有合并)" -#: builtin/branch.c:618 +#: builtin/branch.c:634 msgid "move/rename a branch and its reflog" msgstr "移动/重命名一个分支,以及它的引用日志" -#: builtin/branch.c:619 +#: builtin/branch.c:635 msgid "move/rename a branch, even if target exists" msgstr "移动/重命名一个分支,即使目标已存在" -#: builtin/branch.c:620 +#: builtin/branch.c:636 msgid "copy a branch and its reflog" msgstr "拷贝一个分支和它的引用日志" -#: builtin/branch.c:621 +#: builtin/branch.c:637 msgid "copy a branch, even if target exists" msgstr "拷贝一个分支,即使目标已存在" -#: builtin/branch.c:622 +#: builtin/branch.c:638 msgid "list branch names" msgstr "列出分支名" -#: builtin/branch.c:623 +#: builtin/branch.c:639 +msgid "show current branch name" +msgstr "显示当前分支名" + +#: builtin/branch.c:640 msgid "create the branch's reflog" msgstr "创建分支的引用日志" -#: builtin/branch.c:625 +#: builtin/branch.c:642 msgid "edit the description for the branch" msgstr "标记分支的描述" -#: builtin/branch.c:626 +#: builtin/branch.c:643 msgid "force creation, move/rename, deletion" msgstr "强制创建、移动/重命名、删除" -#: builtin/branch.c:627 +#: builtin/branch.c:644 msgid "print only branches that are merged" msgstr "只打印已经合并的分支" -#: builtin/branch.c:628 +#: builtin/branch.c:645 msgid "print only branches that are not merged" msgstr "只打印尚未合并的分支" -#: builtin/branch.c:629 +#: builtin/branch.c:646 msgid "list branches in columns" msgstr "以列的方式显示分支" -#: builtin/branch.c:630 builtin/for-each-ref.c:40 builtin/ls-remote.c:70 -#: builtin/tag.c:415 -msgid "key" -msgstr "key" - -#: builtin/branch.c:631 builtin/for-each-ref.c:41 builtin/ls-remote.c:71 -#: builtin/tag.c:416 -msgid "field name to sort on" -msgstr "排序的字段名" - -#: builtin/branch.c:633 builtin/for-each-ref.c:43 builtin/notes.c:415 +#: builtin/branch.c:649 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:418 +#: builtin/tag.c:427 msgid "object" msgstr "对象" -#: builtin/branch.c:634 +#: builtin/branch.c:650 msgid "print only branches of the object" msgstr "只打印指向该对象的分支" -#: builtin/branch.c:636 builtin/for-each-ref.c:49 builtin/tag.c:425 +#: builtin/branch.c:652 builtin/for-each-ref.c:48 builtin/tag.c:434 msgid "sorting and filtering are case insensitive" msgstr "排序和过滤属于大小写不敏感" -#: builtin/branch.c:637 builtin/for-each-ref.c:38 builtin/tag.c:423 +#: builtin/branch.c:653 builtin/for-each-ref.c:38 builtin/tag.c:432 #: builtin/verify-tag.c:39 msgid "format to use for the output" msgstr "输出格式" -#: builtin/branch.c:660 builtin/clone.c:746 +#: builtin/branch.c:676 builtin/clone.c:748 msgid "HEAD not found below refs/heads!" msgstr "HEAD 没有位于 /refs/heads 之下!" -#: builtin/branch.c:683 +#: builtin/branch.c:700 msgid "--column and --verbose are incompatible" msgstr "--column 和 --verbose 不兼容" -#: builtin/branch.c:698 builtin/branch.c:749 builtin/branch.c:758 +#: builtin/branch.c:715 builtin/branch.c:769 builtin/branch.c:778 msgid "branch name required" msgstr "必须提供分支名" -#: builtin/branch.c:725 +#: builtin/branch.c:745 msgid "Cannot give description to detached HEAD" msgstr "不能向分离头指针提供描述" -#: builtin/branch.c:730 +#: builtin/branch.c:750 msgid "cannot edit description of more than one branch" msgstr "不能为一个以上的分支编辑描述" -#: builtin/branch.c:737 +#: builtin/branch.c:757 #, c-format msgid "No commit on branch '%s' yet." msgstr "分支 '%s' 尚无提交。" -#: builtin/branch.c:740 +#: builtin/branch.c:760 #, c-format msgid "No branch named '%s'." msgstr "没有分支 '%s'。" -#: builtin/branch.c:755 +#: builtin/branch.c:775 msgid "too many branches for a copy operation" msgstr "为拷贝操作提供了太多的分支名" -#: builtin/branch.c:764 +#: builtin/branch.c:784 msgid "too many arguments for a rename operation" msgstr "为重命名操作提供了太多的参数" -#: builtin/branch.c:769 +#: builtin/branch.c:789 msgid "too many arguments to set new upstream" msgstr "为设置新上游提供了太多的参数" -#: builtin/branch.c:773 +#: builtin/branch.c:793 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." msgstr "无法设置 HEAD 的上游为 %s,因为 HEAD 没有指向任何分支。" -#: builtin/branch.c:776 builtin/branch.c:799 +#: builtin/branch.c:796 builtin/branch.c:819 #, c-format msgid "no such branch '%s'" msgstr "没有此分支 '%s'" -#: builtin/branch.c:780 +#: builtin/branch.c:800 #, c-format msgid "branch '%s' does not exist" msgstr "分支 '%s' 不存在" -#: builtin/branch.c:793 +#: builtin/branch.c:813 msgid "too many arguments to unset upstream" msgstr "为取消上游设置操作提供了太多的参数" -#: builtin/branch.c:797 +#: builtin/branch.c:817 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支" -#: builtin/branch.c:803 +#: builtin/branch.c:823 #, c-format msgid "Branch '%s' has no upstream information" msgstr "分支 '%s' 没有上游信息" -#: builtin/branch.c:813 +#: builtin/branch.c:833 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义" -#: builtin/branch.c:816 +#: builtin/branch.c:836 msgid "" "the '--set-upstream' option is no longer supported. Please use '--track' or " "'--set-upstream-to' instead." @@ -9050,7 +9715,7 @@ msgstr "对于数据对象,对其内容做文本转换" msgid "for blob objects, run filters on object's content" msgstr "对于数据对象,对其内容做过滤" -#: builtin/cat-file.c:643 git-submodule.sh:860 +#: builtin/cat-file.c:643 git-submodule.sh:936 msgid "blob" msgstr "数据对象" @@ -9110,8 +9775,8 @@ msgstr "从标准输入读出文件名" msgid "terminate input and output records by a NUL character" msgstr "输入和输出的记录使用 NUL 字符终结" -#: builtin/check-ignore.c:21 builtin/checkout.c:1280 builtin/gc.c:517 -#: builtin/worktree.c:496 +#: builtin/check-ignore.c:21 builtin/checkout.c:1355 builtin/gc.c:538 +#: builtin/worktree.c:499 msgid "suppress progress reporting" msgstr "不显示进度报告" @@ -9202,8 +9867,8 @@ 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:1857 -#: builtin/worktree.c:669 +#: builtin/submodule--helper.c:1383 builtin/submodule--helper.c:1856 +#: builtin/worktree.c:672 msgid "string" msgstr "字符串" @@ -9223,127 +9888,141 @@ msgstr "git checkout [<选项>] <分支>" msgid "git checkout [<options>] [<branch>] -- <file>..." msgstr "git checkout [<选项>] [<分支>] -- <文件>..." -#: builtin/checkout.c:147 builtin/checkout.c:181 +#: builtin/checkout.c:151 builtin/checkout.c:190 #, c-format msgid "path '%s' does not have our version" msgstr "路径 '%s' 没有我们的版本" -#: builtin/checkout.c:149 builtin/checkout.c:183 +#: builtin/checkout.c:153 builtin/checkout.c:192 #, c-format msgid "path '%s' does not have their version" msgstr "路径 '%s' 没有他们的版本" -#: builtin/checkout.c:165 +#: builtin/checkout.c:169 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "路径 '%s' 没有全部必需的版本" -#: builtin/checkout.c:210 +#: builtin/checkout.c:219 #, c-format msgid "path '%s' does not have necessary versions" msgstr "路径 '%s' 没有必需的版本" -#: builtin/checkout.c:228 +#: builtin/checkout.c:237 #, c-format msgid "path '%s': cannot merge" msgstr "path '%s':无法合并" -#: builtin/checkout.c:244 +#: builtin/checkout.c:253 #, c-format msgid "Unable to add merge result for '%s'" msgstr "无法为 '%s' 添加合并结果" -#: builtin/checkout.c:267 builtin/checkout.c:270 builtin/checkout.c:273 -#: builtin/checkout.c:276 +#: 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:279 builtin/checkout.c:282 +#: builtin/checkout.c:343 builtin/checkout.c:346 #, c-format msgid "'%s' cannot be used with %s" msgstr "'%s' 不能和 %s 同时使用" -#: builtin/checkout.c:285 +#: builtin/checkout.c:349 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "不能同时更新路径并切换到分支'%s'。" -#: builtin/checkout.c:354 builtin/checkout.c:361 +#: builtin/checkout.c:396 builtin/checkout.c:403 #, c-format msgid "path '%s' is unmerged" msgstr "路径 '%s' 未合并" -#: builtin/checkout.c:397 +#: builtin/checkout.c:442 #, c-format msgid "Recreated %d merge conflict" msgid_plural "Recreated %d merge conflicts" msgstr[0] "重新创建了 %d 个合并冲突" msgstr[1] "重新创建了 %d 个合并冲突" -#: builtin/checkout.c:402 +#: builtin/checkout.c:447 #, c-format msgid "Updated %d path from %s" msgid_plural "Updated %d paths from %s" msgstr[0] "从 %2$s 更新了 %1$d 个路径" msgstr[1] "从 %2$s 更新了 %1$d 个路径" -#: builtin/checkout.c:409 +#: builtin/checkout.c:454 #, c-format msgid "Updated %d path from the index" msgid_plural "Updated %d paths from the index" msgstr[0] "从索引区更新了 %d 个路径" msgstr[1] "从索引区更新了 %d 个路径" -#: builtin/checkout.c:645 +#: builtin/checkout.c:695 msgid "you need to resolve your current index first" msgstr "您需要先解决当前索引的冲突" -#: builtin/checkout.c:782 +#: builtin/checkout.c:744 +#, c-format +msgid "" +"cannot continue with staged changes in the following files:\n" +"%s" +msgstr "" +"不能继续,下列文件有暂存的修改:\n" +"%s" + +#: builtin/checkout.c:751 +#, c-format +msgid "staged changes in the following files may be lost: %s" +msgstr "下列文件暂存的修改可能会丢失:%s" + +#: builtin/checkout.c:848 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "不能对 '%s' 执行 reflog 操作:%s\n" -#: builtin/checkout.c:824 +#: builtin/checkout.c:890 msgid "HEAD is now at" msgstr "HEAD 目前位于" -#: builtin/checkout.c:828 builtin/clone.c:699 +#: builtin/checkout.c:894 builtin/clone.c:701 msgid "unable to update HEAD" msgstr "不能更新 HEAD" -#: builtin/checkout.c:832 +#: builtin/checkout.c:898 #, c-format msgid "Reset branch '%s'\n" msgstr "重置分支 '%s'\n" -#: builtin/checkout.c:835 +#: builtin/checkout.c:901 #, c-format msgid "Already on '%s'\n" msgstr "已经位于 '%s'\n" -#: builtin/checkout.c:839 +#: builtin/checkout.c:905 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "切换并重置分支 '%s'\n" -#: builtin/checkout.c:841 builtin/checkout.c:1212 +#: builtin/checkout.c:907 builtin/checkout.c:1283 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "切换到一个新分支 '%s'\n" -#: builtin/checkout.c:843 +#: builtin/checkout.c:909 #, c-format msgid "Switched to branch '%s'\n" msgstr "切换到分支 '%s'\n" # 译者:注意保持前导空格 -#: builtin/checkout.c:894 +#: builtin/checkout.c:960 #, c-format msgid " ... and %d more.\n" msgstr " ... 及其它 %d 个。\n" -#: builtin/checkout.c:900 +#: builtin/checkout.c:966 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -9364,7 +10043,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:919 +#: builtin/checkout.c:985 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -9391,24 +10070,24 @@ msgstr[1] "" " git branch <新分支名> %s\n" "\n" -#: builtin/checkout.c:951 +#: builtin/checkout.c:1017 msgid "internal error in revision walk" msgstr "在版本遍历时遇到内部错误" -#: builtin/checkout.c:955 +#: builtin/checkout.c:1021 msgid "Previous HEAD position was" msgstr "之前的 HEAD 位置是" -#: builtin/checkout.c:983 builtin/checkout.c:1207 +#: builtin/checkout.c:1052 builtin/checkout.c:1278 msgid "You are on a branch yet to be born" msgstr "您位于一个尚未初始化的分支" -#: builtin/checkout.c:1104 +#: builtin/checkout.c:1173 #, c-format msgid "only one reference expected, %d given." msgstr "应只有一个引用,却给出了 %d 个" -#: builtin/checkout.c:1140 +#: builtin/checkout.c:1209 #, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" @@ -9417,150 +10096,158 @@ msgstr "" "'%s' 既可以是一个本地文件,也可以是一个跟踪分支。\n" "请使用 --(和可选的 --no-guess)来消除歧义" -#: builtin/checkout.c:1153 builtin/worktree.c:290 builtin/worktree.c:445 +#: builtin/checkout.c:1222 builtin/worktree.c:290 builtin/worktree.c:448 #, c-format msgid "invalid reference: %s" msgstr "无效引用:%s" -#: builtin/checkout.c:1182 +#: builtin/checkout.c:1251 #, c-format msgid "reference is not a tree: %s" msgstr "引用不是一个树:%s" -#: builtin/checkout.c:1221 +#: builtin/checkout.c:1292 msgid "paths cannot be used with switching branches" msgstr "路径不能和切换分支同时使用" -#: builtin/checkout.c:1224 builtin/checkout.c:1228 +#: builtin/checkout.c:1295 builtin/checkout.c:1299 builtin/checkout.c:1303 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "'%s' 不能和切换分支同时使用" -#: builtin/checkout.c:1232 builtin/checkout.c:1235 builtin/checkout.c:1240 -#: builtin/checkout.c:1243 +#: builtin/checkout.c:1307 builtin/checkout.c:1310 builtin/checkout.c:1315 +#: builtin/checkout.c:1318 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' 不能和 '%s' 同时使用" -#: builtin/checkout.c:1248 +#: builtin/checkout.c:1323 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "不能切换分支到一个非提交 '%s'" -#: builtin/checkout.c:1281 builtin/checkout.c:1283 builtin/clone.c:120 -#: builtin/remote.c:169 builtin/remote.c:171 builtin/worktree.c:489 -#: builtin/worktree.c:491 +#: 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:1282 +#: builtin/checkout.c:1357 msgid "create and checkout a new branch" msgstr "创建并检出一个新的分支" -#: builtin/checkout.c:1284 +#: builtin/checkout.c:1359 msgid "create/reset and checkout a branch" msgstr "创建/重置并检出一个分支" -#: builtin/checkout.c:1285 +#: builtin/checkout.c:1360 msgid "create reflog for new branch" msgstr "为新的分支创建引用日志" -#: builtin/checkout.c:1286 builtin/worktree.c:493 +#: builtin/checkout.c:1361 builtin/worktree.c:496 msgid "detach HEAD at named commit" msgstr "HEAD 从指定的提交分离" -#: builtin/checkout.c:1287 +#: builtin/checkout.c:1362 msgid "set upstream info for new branch" msgstr "为新的分支设置上游信息" -#: builtin/checkout.c:1289 +#: builtin/checkout.c:1364 msgid "new-branch" msgstr "新分支" -#: builtin/checkout.c:1289 +#: builtin/checkout.c:1364 msgid "new unparented branch" msgstr "新的没有父提交的分支" -#: builtin/checkout.c:1291 +#: builtin/checkout.c:1366 msgid "checkout our version for unmerged files" msgstr "对尚未合并的文件检出我们的版本" -#: builtin/checkout.c:1294 +#: builtin/checkout.c:1369 msgid "checkout their version for unmerged files" msgstr "对尚未合并的文件检出他们的版本" -#: builtin/checkout.c:1296 +#: builtin/checkout.c:1371 msgid "force checkout (throw away local modifications)" msgstr "强制检出(丢弃本地修改)" -#: builtin/checkout.c:1298 +#: builtin/checkout.c:1373 msgid "perform a 3-way merge with the new branch" msgstr "和新的分支执行三方合并" -#: builtin/checkout.c:1300 builtin/merge.c:276 +#: builtin/checkout.c:1375 builtin/merge.c:284 msgid "update ignored files (default)" msgstr "更新忽略的文件(默认)" -#: builtin/checkout.c:1302 builtin/log.c:1586 parse-options.h:272 +#: builtin/checkout.c:1377 builtin/log.c:1594 parse-options.h:317 msgid "style" msgstr "风格" -#: builtin/checkout.c:1303 +#: builtin/checkout.c:1378 msgid "conflict style (merge or diff3)" msgstr "冲突输出风格(merge 或 diff3)" -#: builtin/checkout.c:1306 +#: builtin/checkout.c:1381 msgid "do not limit pathspecs to sparse entries only" msgstr "对路径不做稀疏检出的限制" -#: builtin/checkout.c:1308 +#: builtin/checkout.c:1383 msgid "do not second guess 'git checkout <no-such-branch>'" msgstr "不要二次猜测 'git checkout <无此分支>'" -#: builtin/checkout.c:1310 +#: builtin/checkout.c:1385 msgid "do not check if another worktree is holding the given ref" msgstr "不检查指定的引用是否被其他工作区所占用" -#: builtin/checkout.c:1314 builtin/clone.c:87 builtin/fetch.c:141 -#: builtin/merge.c:273 builtin/pull.c:130 builtin/push.c:575 +#: 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:1345 +#: builtin/checkout.c:1390 +msgid "use overlay mode (default)" +msgstr "使用叠加模式(默认)" + +#: builtin/checkout.c:1422 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-b、-B 和 --orphan 是互斥的" -#: builtin/checkout.c:1362 +#: builtin/checkout.c:1425 +msgid "-p and --overlay are mutually exclusive" +msgstr "-p 和 --overlay 互斥" + +#: builtin/checkout.c:1442 msgid "--track needs a branch name" msgstr "--track 需要一个分支名" -#: builtin/checkout.c:1367 +#: builtin/checkout.c:1447 msgid "missing branch name; try -b" msgstr "缺少分支名,尝试 -b" -#: builtin/checkout.c:1404 +#: builtin/checkout.c:1484 msgid "invalid path specification" msgstr "无效的路径规格" -#: builtin/checkout.c:1411 +#: builtin/checkout.c:1491 #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "'%s' 不是一个提交,不能基于它创建分支 '%s'" -#: builtin/checkout.c:1415 +#: builtin/checkout.c:1495 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout:--detach 不能接收路径参数 '%s'" -#: builtin/checkout.c:1419 +#: builtin/checkout.c:1499 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." msgstr "" "git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。" -#: builtin/checkout.c:1439 +#: builtin/checkout.c:1519 #, c-format msgid "" "'%s' matched more than one remote tracking branch.\n" @@ -9737,9 +10424,9 @@ msgid "remove whole directories" msgstr "删除整个目录" #: builtin/clean.c:913 builtin/describe.c:546 builtin/describe.c:548 -#: builtin/grep.c:897 builtin/log.c:167 builtin/log.c:169 -#: builtin/ls-files.c:557 builtin/name-rev.c:415 builtin/name-rev.c:417 -#: builtin/show-ref.c:178 +#: 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/show-ref.c:179 msgid "pattern" msgstr "模式" @@ -9777,137 +10464,147 @@ msgstr "" msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<选项>] [--] <仓库> [<路径>]" -#: builtin/clone.c:89 +#: builtin/clone.c:90 msgid "don't create a checkout" msgstr "不创建一个检出" -#: builtin/clone.c:90 builtin/clone.c:92 builtin/init-db.c:481 +#: builtin/clone.c:91 builtin/clone.c:93 builtin/init-db.c:489 msgid "create a bare repository" msgstr "创建一个纯仓库" -#: builtin/clone.c:94 +#: builtin/clone.c:95 msgid "create a mirror repository (implies bare)" msgstr "创建一个镜像仓库(也是纯仓库)" -#: builtin/clone.c:96 +#: builtin/clone.c:97 msgid "to clone from a local repository" msgstr "从本地仓库克隆" -#: builtin/clone.c:98 +#: builtin/clone.c:99 msgid "don't use local hardlinks, always copy" msgstr "不使用本地硬链接,始终复制" -#: builtin/clone.c:100 +#: builtin/clone.c:101 msgid "setup as shared repository" msgstr "设置为共享仓库" -#: builtin/clone.c:102 builtin/clone.c:106 +#: builtin/clone.c:104 msgid "pathspec" msgstr "路径规格" -#: builtin/clone.c:102 builtin/clone.c:106 +#: builtin/clone.c:104 msgid "initialize submodules in the clone" msgstr "在克隆时初始化子模组" -#: builtin/clone.c:109 +#: builtin/clone.c:107 msgid "number of submodules cloned in parallel" msgstr "并发克隆的子模组的数量" -#: builtin/clone.c:110 builtin/init-db.c:478 +#: builtin/clone.c:108 builtin/init-db.c:486 msgid "template-directory" msgstr "模板目录" -#: builtin/clone.c:111 builtin/init-db.c:479 +#: builtin/clone.c:109 builtin/init-db.c:487 msgid "directory from which templates will be used" msgstr "模板目录将被使用" -#: builtin/clone.c:113 builtin/clone.c:115 builtin/submodule--helper.c:1379 -#: builtin/submodule--helper.c:1860 +#: builtin/clone.c:111 builtin/clone.c:113 builtin/submodule--helper.c:1379 +#: builtin/submodule--helper.c:1859 msgid "reference repository" msgstr "参考仓库" -#: builtin/clone.c:117 builtin/submodule--helper.c:1381 -#: builtin/submodule--helper.c:1862 +#: builtin/clone.c:115 builtin/submodule--helper.c:1381 +#: builtin/submodule--helper.c:1861 msgid "use --reference only while cloning" msgstr "仅在克隆时参考 --reference 指向的本地仓库" -#: builtin/clone.c:118 builtin/column.c:27 builtin/merge-file.c:46 -#: builtin/pack-objects.c:3303 builtin/repack.c:329 +#: builtin/clone.c:116 builtin/column.c:27 builtin/merge-file.c:46 +#: builtin/pack-objects.c:3306 builtin/repack.c:329 msgid "name" msgstr "名称" -#: builtin/clone.c:119 +#: builtin/clone.c:117 msgid "use <name> instead of 'origin' to track upstream" msgstr "使用 <名称> 而不是 'origin' 去跟踪上游" -#: builtin/clone.c:121 +#: builtin/clone.c:119 msgid "checkout <branch> instead of the remote's HEAD" msgstr "检出 <分支> 而不是远程 HEAD" -#: builtin/clone.c:123 +#: builtin/clone.c:121 msgid "path to git-upload-pack on the remote" msgstr "远程 git-upload-pack 路径" -#: builtin/clone.c:124 builtin/fetch.c:142 builtin/grep.c:836 -#: builtin/pull.c:218 +#: builtin/clone.c:122 builtin/fetch.c:142 builtin/grep.c:836 +#: builtin/pull.c:225 msgid "depth" msgstr "深度" -#: builtin/clone.c:125 +#: builtin/clone.c:123 msgid "create a shallow clone of that depth" msgstr "创建一个指定深度的浅克隆" -#: builtin/clone.c:126 builtin/fetch.c:144 builtin/pack-objects.c:3292 +#: builtin/clone.c:124 builtin/fetch.c:144 builtin/pack-objects.c:3295 msgid "time" msgstr "时间" -#: builtin/clone.c:127 +#: builtin/clone.c:125 msgid "create a shallow clone since a specific time" msgstr "从一个特定时间创建一个浅克隆" -#: builtin/clone.c:128 builtin/fetch.c:146 builtin/fetch.c:169 -#: builtin/rebase.c:1039 +#: builtin/clone.c:126 builtin/fetch.c:146 builtin/fetch.c:169 +#: builtin/rebase.c:1389 msgid "revision" msgstr "版本" -#: builtin/clone.c:129 builtin/fetch.c:147 +#: builtin/clone.c:127 builtin/fetch.c:147 msgid "deepen history of shallow clone, excluding rev" msgstr "深化浅克隆的历史,除了特定版本" -#: builtin/clone.c:131 +#: builtin/clone.c:129 msgid "clone only one branch, HEAD or --branch" msgstr "只克隆一个分支、HEAD 或 --branch" -#: builtin/clone.c:133 +#: builtin/clone.c:131 msgid "don't clone any tags, and make later fetches not to follow them" msgstr "不要克隆任何标签,并且后续获取操作也不下载它们" -#: builtin/clone.c:135 +#: builtin/clone.c:133 msgid "any cloned submodules will be shallow" msgstr "子模组将以浅下载模式克隆" -#: builtin/clone.c:136 builtin/init-db.c:487 +#: builtin/clone.c:134 builtin/init-db.c:495 msgid "gitdir" msgstr "git目录" -#: builtin/clone.c:137 builtin/init-db.c:488 +#: builtin/clone.c:135 builtin/init-db.c:496 msgid "separate git dir from working tree" msgstr "git目录和工作区分离" -#: builtin/clone.c:138 +#: builtin/clone.c:136 msgid "key=value" msgstr "key=value" -#: builtin/clone.c:139 +#: builtin/clone.c:137 msgid "set config inside the new repository" msgstr "在新仓库中设置配置信息" -#: builtin/clone.c:140 builtin/fetch.c:165 builtin/pull.c:231 +#: builtin/clone.c:139 builtin/fetch.c:164 builtin/ls-remote.c:76 +#: builtin/push.c:585 builtin/send-pack.c:172 +msgid "server-specific" +msgstr "server-specific" + +#: builtin/clone.c:139 builtin/fetch.c:164 builtin/ls-remote.c:76 +#: builtin/push.c:585 builtin/send-pack.c:173 +msgid "option to transmit" +msgstr "传输选项" + +#: builtin/clone.c:140 builtin/fetch.c:165 builtin/pull.c:238 #: builtin/push.c:586 msgid "use IPv4 addresses only" msgstr "只使用 IPv4 地址" -#: builtin/clone.c:142 builtin/fetch.c:167 builtin/pull.c:234 +#: builtin/clone.c:142 builtin/fetch.c:167 builtin/pull.c:241 #: builtin/push.c:588 msgid "use IPv6 addresses only" msgstr "只使用 IPv6 地址" @@ -9975,125 +10672,125 @@ msgstr "" msgid "Could not find remote branch %s to clone." msgstr "不能发现要克隆的远程分支 %s。" -#: builtin/clone.c:687 +#: builtin/clone.c:689 #, c-format msgid "unable to update %s" msgstr "不能更新 %s" -#: builtin/clone.c:737 +#: builtin/clone.c:739 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n" -#: builtin/clone.c:768 +#: builtin/clone.c:770 msgid "unable to checkout working tree" msgstr "不能检出工作区" -#: builtin/clone.c:813 +#: builtin/clone.c:815 msgid "unable to write parameters to config file" msgstr "无法将参数写入配置文件" -#: builtin/clone.c:876 +#: builtin/clone.c:878 msgid "cannot repack to clean up" msgstr "无法执行 repack 来清理" -#: builtin/clone.c:878 +#: builtin/clone.c:880 msgid "cannot unlink temporary alternates file" msgstr "无法删除临时的 alternates 文件" -#: builtin/clone.c:918 builtin/receive-pack.c:1941 +#: builtin/clone.c:920 builtin/receive-pack.c:1952 msgid "Too many arguments." msgstr "太多参数。" -#: builtin/clone.c:922 +#: builtin/clone.c:924 msgid "You must specify a repository to clone." msgstr "您必须指定一个仓库来克隆。" -#: builtin/clone.c:935 +#: builtin/clone.c:937 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "--bare 和 --origin %s 选项不兼容。" -#: builtin/clone.c:938 +#: builtin/clone.c:940 msgid "--bare and --separate-git-dir are incompatible." msgstr "--bare 和 --separate-git-dir 选项不兼容。" -#: builtin/clone.c:951 +#: builtin/clone.c:953 #, c-format msgid "repository '%s' does not exist" msgstr "仓库 '%s' 不存在" -#: builtin/clone.c:957 builtin/fetch.c:1608 +#: builtin/clone.c:959 builtin/fetch.c:1610 #, c-format msgid "depth %s is not a positive number" msgstr "深度 %s 不是一个正数" -#: builtin/clone.c:967 +#: builtin/clone.c:969 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。" -#: builtin/clone.c:977 +#: builtin/clone.c:979 #, c-format msgid "working tree '%s' already exists." msgstr "工作区 '%s' 已经存在。" -#: builtin/clone.c:992 builtin/clone.c:1013 builtin/difftool.c:272 -#: builtin/worktree.c:296 builtin/worktree.c:326 +#: builtin/clone.c:994 builtin/clone.c:1015 builtin/difftool.c:264 +#: builtin/worktree.c:296 builtin/worktree.c:328 #, c-format msgid "could not create leading directories of '%s'" msgstr "不能为 '%s' 创建先导目录" -#: builtin/clone.c:997 +#: builtin/clone.c:999 #, c-format msgid "could not create work tree dir '%s'" msgstr "不能创建工作区目录 '%s'" -#: builtin/clone.c:1017 +#: builtin/clone.c:1019 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "克隆到纯仓库 '%s'...\n" -#: builtin/clone.c:1019 +#: builtin/clone.c:1021 #, c-format msgid "Cloning into '%s'...\n" msgstr "正克隆到 '%s'...\n" -#: builtin/clone.c:1043 +#: builtin/clone.c:1045 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" msgstr "clone --recursive 和 --reference 以及 --reference-if-able 不兼容" -#: builtin/clone.c:1104 +#: builtin/clone.c:1106 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth 在本地克隆时被忽略,请改用 file:// 协议。" -#: builtin/clone.c:1106 +#: builtin/clone.c:1108 msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "--shallow-since 在本地克隆时被忽略,请改用 file:// 协议。" -#: builtin/clone.c:1108 +#: builtin/clone.c:1110 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "--shallow-exclude 在本地克隆时被忽略,请改用 file:// 协议。" -#: builtin/clone.c:1110 +#: builtin/clone.c:1112 msgid "--filter is ignored in local clones; use file:// instead." msgstr "--filter 在本地克隆时被忽略,请改用 file:// 协议。" -#: builtin/clone.c:1113 +#: builtin/clone.c:1115 msgid "source repository is shallow, ignoring --local" msgstr "源仓库是浅克隆,忽略 --local" -#: builtin/clone.c:1118 +#: builtin/clone.c:1120 msgid "--local is ignored" msgstr "--local 被忽略" -#: builtin/clone.c:1192 builtin/clone.c:1200 +#: builtin/clone.c:1197 builtin/clone.c:1205 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "远程分支 %s 在上游 %s 未发现" -#: builtin/clone.c:1203 +#: builtin/clone.c:1208 msgid "You appear to have cloned an empty repository." msgstr "您似乎克隆了一个空仓库。" @@ -10129,6 +10826,74 @@ msgstr "两列之间的填充空间" msgid "--command must be the first argument" msgstr "--command 必须是第一个参数" +#: builtin/commit-tree.c:18 +msgid "" +"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F " +"<file>)...] <tree>" +msgstr "" +"git commit-tree [(-p <父提交>)...] [-S[<keyid>]] [(-m <消息>)...] [(-F <文件" +">)...] <树>" + +#: builtin/commit-tree.c:31 +#, c-format +msgid "duplicate parent %s ignored" +msgstr "忽略重复的父提交 %s" + +#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:520 +#, c-format +msgid "not a valid object name %s" +msgstr "不是一个有效的对象名 %s" + +#: builtin/commit-tree.c:93 +#, c-format +msgid "git commit-tree: failed to open '%s'" +msgstr "git commit-tree:无法打开 '%s'" + +#: builtin/commit-tree.c:96 +#, c-format +msgid "git commit-tree: failed to read '%s'" +msgstr "git commit-tree:无法读取 '%s'" + +#: builtin/commit-tree.c:98 +#, c-format +msgid "git commit-tree: failed to close '%s'" +msgstr "git commit-tree:无法关闭 '%s'" + +#: builtin/commit-tree.c:111 +msgid "parent" +msgstr "父提交" + +#: builtin/commit-tree.c:112 +msgid "id of a parent commit object" +msgstr "父提交对象 ID" + +#: 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 +msgid "message" +msgstr "说明" + +#: builtin/commit-tree.c:115 builtin/commit.c:1480 +msgid "commit message" +msgstr "提交说明" + +#: builtin/commit-tree.c:118 +msgid "read commit log message from file" +msgstr "从文件中读取提交说明" + +#: builtin/commit-tree.c:121 builtin/commit.c:1492 builtin/merge.c:283 +#: builtin/pull.c:193 builtin/revert.c:117 +msgid "GPG sign commit" +msgstr "GPG 提交签名" + +#: builtin/commit-tree.c:133 +msgid "must give exactly one tree" +msgstr "必须精确地提供一个树" + +#: builtin/commit-tree.c:140 +msgid "git commit-tree: failed to read" +msgstr "git commit-tree:读取失败" + #: builtin/commit.c:41 msgid "git commit [<options>] [--] <pathspec>..." msgstr "git commit [<选项>] [--] <路径规格>..." @@ -10234,44 +10999,44 @@ msgstr "提交 '%s' 有格式错误的作者信息" msgid "malformed --author parameter" msgstr "格式错误的 --author 参数" -#: builtin/commit.c:652 +#: builtin/commit.c:653 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" msgstr "无法选择一个未被当前提交说明使用的注释字符" -#: builtin/commit.c:689 builtin/commit.c:722 builtin/commit.c:1052 +#: builtin/commit.c:691 builtin/commit.c:724 builtin/commit.c:1069 #, c-format msgid "could not lookup commit %s" msgstr "不能查询提交 %s" -#: builtin/commit.c:701 builtin/shortlog.c:319 +#: builtin/commit.c:703 builtin/shortlog.c:319 #, c-format msgid "(reading log message from standard input)\n" msgstr "(正从标准输入中读取日志信息)\n" -#: builtin/commit.c:703 +#: builtin/commit.c:705 msgid "could not read log from standard input" msgstr "不能从标准输入中读取日志信息" -#: builtin/commit.c:707 +#: builtin/commit.c:709 #, c-format msgid "could not read log file '%s'" msgstr "不能读取日志文件 '%s'" -#: builtin/commit.c:736 builtin/commit.c:744 +#: builtin/commit.c:740 builtin/commit.c:756 msgid "could not read SQUASH_MSG" msgstr "不能读取 SQUASH_MSG" -#: builtin/commit.c:741 +#: builtin/commit.c:747 msgid "could not read MERGE_MSG" msgstr "不能读取 MERGE_MSG" -#: builtin/commit.c:795 +#: builtin/commit.c:807 msgid "could not write commit template" msgstr "不能写提交模版" -#: builtin/commit.c:813 +#: builtin/commit.c:826 #, c-format msgid "" "\n" @@ -10285,7 +11050,7 @@ msgstr "" "\t%s\n" "然后重试。\n" -#: builtin/commit.c:818 +#: builtin/commit.c:831 #, c-format msgid "" "\n" @@ -10299,7 +11064,7 @@ msgstr "" "\t%s\n" "然后重试。\n" -#: builtin/commit.c:831 +#: builtin/commit.c:844 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -10308,7 +11073,7 @@ msgstr "" "请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n" "说明将会终止提交。\n" -#: builtin/commit.c:839 +#: builtin/commit.c:852 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -10319,346 +11084,319 @@ msgstr "" "也可以删除它们。一个空的提交说明将会终止提交。\n" # 译者:为保证在输出中对齐,注意调整句中空格! -#: builtin/commit.c:856 +#: builtin/commit.c:869 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%s作者: %.*s <%.*s>" # 译者:为保证在输出中对齐,注意调整句中空格! -#: builtin/commit.c:864 +#: builtin/commit.c:877 #, c-format msgid "%sDate: %s" msgstr "%s日期: %s" # 译者:为保证在输出中对齐,注意调整句中空格! -#: builtin/commit.c:871 +#: builtin/commit.c:884 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%s提交者:%.*s <%.*s>" -#: builtin/commit.c:889 +#: builtin/commit.c:902 msgid "Cannot read index" msgstr "无法读取索引" -#: builtin/commit.c:956 +#: builtin/commit.c:969 msgid "Error building trees" msgstr "无法创建树对象" -#: builtin/commit.c:970 builtin/tag.c:258 +#: builtin/commit.c:983 builtin/tag.c:269 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "请使用 -m 或 -F 选项提供提交说明。\n" -#: builtin/commit.c:1014 +#: builtin/commit.c:1027 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "--author '%s' 不是 '姓名 <邮箱>' 格式,且未能在现有作者中找到匹配" -#: builtin/commit.c:1028 +#: builtin/commit.c:1041 #, c-format msgid "Invalid ignored mode '%s'" msgstr "无效的忽略模式 '%s'" -#: builtin/commit.c:1042 builtin/commit.c:1279 +#: builtin/commit.c:1059 builtin/commit.c:1284 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "无效的未追踪文件参数 '%s'" -#: builtin/commit.c:1080 +#: builtin/commit.c:1097 msgid "--long and -z are incompatible" msgstr "--long 和 -z 选项不兼容" -#: builtin/commit.c:1113 +#: builtin/commit.c:1130 msgid "Using both --reset-author and --author does not make sense" msgstr "同时使用 --reset-author 和 --author 没有意义" -#: builtin/commit.c:1122 +#: builtin/commit.c:1139 msgid "You have nothing to amend." msgstr "您没有可修补的提交。" -#: builtin/commit.c:1125 +#: builtin/commit.c:1142 msgid "You are in the middle of a merge -- cannot amend." msgstr "您正处于一个合并过程中 -- 无法修补提交。" -#: builtin/commit.c:1127 +#: builtin/commit.c:1144 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "您正处于一个拣选过程中 -- 无法修补提交。" -#: builtin/commit.c:1130 +#: builtin/commit.c:1147 msgid "Options --squash and --fixup cannot be used together" msgstr "选项 --squash 和 --fixup 不能同时使用" -#: builtin/commit.c:1140 +#: builtin/commit.c:1157 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "只能用一个 -c/-C/-F/--fixup 选项。" -#: builtin/commit.c:1142 +#: builtin/commit.c:1159 msgid "Option -m cannot be combined with -c/-C/-F." msgstr "选项 -m 不能和 -c/-C/-F 同时使用。" -#: builtin/commit.c:1150 +#: builtin/commit.c:1167 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。" -#: builtin/commit.c:1167 +#: builtin/commit.c:1184 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。" -#: builtin/commit.c:1169 +#: builtin/commit.c:1186 msgid "No paths with --include/--only does not make sense." msgstr "参数 --include/--only 不跟路径没有意义。" -#: builtin/commit.c:1183 builtin/tag.c:546 +#: builtin/commit.c:1192 #, c-format -msgid "Invalid cleanup mode %s" -msgstr "无效的清理模式 %s" - -#: builtin/commit.c:1188 -msgid "Paths with -a does not make sense." -msgstr "路径和 -a 选项同时使用没有意义。" +msgid "paths '%s ...' with -a does not make sense" +msgstr "路径 '%s ...' 和 -a 选项同时使用没有意义" -#: builtin/commit.c:1314 builtin/commit.c:1498 +#: builtin/commit.c:1319 builtin/commit.c:1503 msgid "show status concisely" msgstr "以简洁的格式显示状态" -#: builtin/commit.c:1316 builtin/commit.c:1500 +#: builtin/commit.c:1321 builtin/commit.c:1505 msgid "show branch information" msgstr "显示分支信息" -#: builtin/commit.c:1318 +#: builtin/commit.c:1323 msgid "show stash information" msgstr "显示贮藏区信息" -#: builtin/commit.c:1320 builtin/commit.c:1502 +#: builtin/commit.c:1325 builtin/commit.c:1507 msgid "compute full ahead/behind values" msgstr "计算完整的领先/落后值" -#: builtin/commit.c:1322 +#: builtin/commit.c:1327 msgid "version" msgstr "版本" -#: builtin/commit.c:1322 builtin/commit.c:1504 builtin/push.c:561 -#: builtin/worktree.c:640 +#: builtin/commit.c:1327 builtin/commit.c:1509 builtin/push.c:561 +#: builtin/worktree.c:643 msgid "machine-readable output" msgstr "机器可读的输出" -#: builtin/commit.c:1325 builtin/commit.c:1506 +#: builtin/commit.c:1330 builtin/commit.c:1511 msgid "show status in long format (default)" msgstr "以长格式显示状态(默认)" -#: builtin/commit.c:1328 builtin/commit.c:1509 +#: builtin/commit.c:1333 builtin/commit.c:1514 msgid "terminate entries with NUL" msgstr "条目以 NUL 字符结尾" -#: builtin/commit.c:1330 builtin/commit.c:1334 builtin/commit.c:1512 -#: builtin/fast-export.c:1085 builtin/fast-export.c:1088 builtin/rebase.c:1118 -#: builtin/tag.c:400 +#: 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 msgid "mode" msgstr "模式" -#: builtin/commit.c:1331 builtin/commit.c:1512 +#: builtin/commit.c:1336 builtin/commit.c:1517 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)" -#: builtin/commit.c:1335 +#: builtin/commit.c:1340 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" msgstr "" "显示已忽略的文件,可选模式:traditional、matching、no。(默认:traditional)" -#: builtin/commit.c:1337 parse-options.h:164 +#: builtin/commit.c:1342 parse-options.h:179 msgid "when" msgstr "何时" -#: builtin/commit.c:1338 +#: builtin/commit.c:1343 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "" "忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)" -#: builtin/commit.c:1340 +#: builtin/commit.c:1345 msgid "list untracked files in columns" msgstr "以列的方式显示未跟踪的文件" -#: builtin/commit.c:1341 +#: builtin/commit.c:1346 msgid "do not detect renames" msgstr "不检测重命名" -#: builtin/commit.c:1343 +#: builtin/commit.c:1348 msgid "detect renames, optionally set similarity index" msgstr "检测重命名,可以设置索引相似度" -#: builtin/commit.c:1363 +#: builtin/commit.c:1368 msgid "Unsupported combination of ignored and untracked-files arguments" msgstr "不支持已忽略和未跟踪文件参数的组合" -#: builtin/commit.c:1468 +#: builtin/commit.c:1473 msgid "suppress summary after successful commit" msgstr "提交成功后不显示概述信息" -#: builtin/commit.c:1469 +#: builtin/commit.c:1474 msgid "show diff in commit message template" msgstr "在提交说明模板里显示差异" -#: builtin/commit.c:1471 +#: builtin/commit.c:1476 msgid "Commit message options" msgstr "提交说明选项" -#: builtin/commit.c:1472 builtin/merge.c:264 builtin/tag.c:397 +#: builtin/commit.c:1477 builtin/merge.c:272 builtin/tag.c:408 msgid "read message from file" msgstr "从文件中读取提交说明" -#: builtin/commit.c:1473 +#: builtin/commit.c:1478 msgid "author" msgstr "作者" -#: builtin/commit.c:1473 +#: builtin/commit.c:1478 msgid "override author for commit" msgstr "提交时覆盖作者" -#: builtin/commit.c:1474 builtin/gc.c:518 +#: builtin/commit.c:1479 builtin/gc.c:539 msgid "date" msgstr "日期" -#: builtin/commit.c:1474 +#: builtin/commit.c:1479 msgid "override date for commit" msgstr "提交时覆盖日期" -#: builtin/commit.c:1475 builtin/merge.c:260 builtin/notes.c:409 -#: builtin/notes.c:575 builtin/tag.c:395 -msgid "message" -msgstr "说明" - -#: builtin/commit.c:1475 -msgid "commit message" -msgstr "提交说明" - -#: builtin/commit.c:1476 builtin/commit.c:1477 builtin/commit.c:1478 -#: builtin/commit.c:1479 parse-options.h:278 ref-filter.h:92 +#: builtin/commit.c:1481 builtin/commit.c:1482 builtin/commit.c:1483 +#: builtin/commit.c:1484 parse-options.h:323 ref-filter.h:92 msgid "commit" msgstr "提交" -#: builtin/commit.c:1476 +#: builtin/commit.c:1481 msgid "reuse and edit message from specified commit" msgstr "重用并编辑指定提交的提交说明" -#: builtin/commit.c:1477 +#: builtin/commit.c:1482 msgid "reuse message from specified commit" msgstr "重用指定提交的提交说明" -#: builtin/commit.c:1478 +#: builtin/commit.c:1483 msgid "use autosquash formatted message to fixup specified commit" msgstr "使用 autosquash 格式的提交说明用以修正指定的提交" -#: builtin/commit.c:1479 +#: builtin/commit.c:1484 msgid "use autosquash formatted message to squash specified commit" msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交" -#: builtin/commit.c:1480 +#: builtin/commit.c:1485 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)" -#: builtin/commit.c:1481 builtin/log.c:1533 builtin/merge.c:277 -#: builtin/pull.c:156 builtin/revert.c:107 +#: 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:1482 +#: builtin/commit.c:1487 msgid "use specified template file" msgstr "使用指定的模板文件" -#: builtin/commit.c:1483 +#: builtin/commit.c:1488 msgid "force edit of commit" msgstr "强制编辑提交" -# 译者:可选值,不能翻译(或是原文中笔误,应为 mode) -#: builtin/commit.c:1484 -msgid "default" -msgstr "default" - -#: builtin/commit.c:1484 builtin/tag.c:401 -msgid "how to strip spaces and #comments from message" -msgstr "设置如何删除提交说明里的空格和#注释" - -#: builtin/commit.c:1485 +#: builtin/commit.c:1490 msgid "include status in commit message template" msgstr "在提交说明模板里包含状态信息" -#: builtin/commit.c:1487 builtin/merge.c:275 builtin/pull.c:186 -#: builtin/revert.c:115 -msgid "GPG sign commit" -msgstr "GPG 提交签名" - -#: builtin/commit.c:1490 +#: builtin/commit.c:1495 msgid "Commit contents options" msgstr "提交内容选项" -#: builtin/commit.c:1491 +#: builtin/commit.c:1496 msgid "commit all changed files" msgstr "提交所有改动的文件" -#: builtin/commit.c:1492 +#: builtin/commit.c:1497 msgid "add specified files to index for commit" msgstr "添加指定的文件到索引区等待提交" -#: builtin/commit.c:1493 +#: builtin/commit.c:1498 msgid "interactively add files" msgstr "交互式添加文件" -#: builtin/commit.c:1494 +#: builtin/commit.c:1499 msgid "interactively add changes" msgstr "交互式添加变更" -#: builtin/commit.c:1495 +#: builtin/commit.c:1500 msgid "commit only specified files" msgstr "只提交指定的文件" -#: builtin/commit.c:1496 +#: builtin/commit.c:1501 msgid "bypass pre-commit and commit-msg hooks" msgstr "绕过 pre-commit 和 commit-msg 钩子" -#: builtin/commit.c:1497 +#: builtin/commit.c:1502 msgid "show what would be committed" msgstr "显示将要提交的内容" -#: builtin/commit.c:1510 +#: builtin/commit.c:1515 msgid "amend previous commit" msgstr "修改先前的提交" -#: builtin/commit.c:1511 +#: builtin/commit.c:1516 msgid "bypass post-rewrite hook" msgstr "绕过 post-rewrite 钩子" -#: builtin/commit.c:1516 +#: builtin/commit.c:1521 msgid "ok to record an empty change" msgstr "允许一个空提交" -#: builtin/commit.c:1518 +#: builtin/commit.c:1523 msgid "ok to record a change with an empty message" msgstr "允许空的提交说明" -#: builtin/commit.c:1591 +#: builtin/commit.c:1596 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "损坏的 MERGE_HEAD 文件(%s)" -#: builtin/commit.c:1598 +#: builtin/commit.c:1603 msgid "could not read MERGE_MODE" msgstr "不能读取 MERGE_MODE" -#: builtin/commit.c:1617 +#: builtin/commit.c:1622 #, c-format msgid "could not read commit message: %s" msgstr "不能读取提交说明:%s" -#: builtin/commit.c:1628 +#: builtin/commit.c:1629 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "终止提交因为提交说明为空。\n" -#: builtin/commit.c:1633 +#: builtin/commit.c:1634 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "终止提交;您未更改来自模版的提交说明。\n" @@ -10692,34 +11430,39 @@ msgstr "" "git commit-graph write [--object-dir <对象目录>] [--append] [--reachable|--" "stdin-packs|--stdin-commits]" -#: builtin/commit-graph.c:48 builtin/commit-graph.c:78 -#: builtin/commit-graph.c:132 builtin/commit-graph.c:190 builtin/fetch.c:153 -#: builtin/log.c:1553 +#: 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:49 builtin/commit-graph.c:79 -#: builtin/commit-graph.c:133 builtin/commit-graph.c:191 +#: 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:135 +#: builtin/commit-graph.c:68 builtin/commit-graph.c:105 +#, c-format +msgid "Could not open commit-graph '%s'" +msgstr "无法打开提交图形 '%s'" + +#: builtin/commit-graph.c:150 msgid "start walk at all refs" msgstr "开始遍历所有引用" -#: builtin/commit-graph.c:137 +#: builtin/commit-graph.c:152 msgid "scan pack-indexes listed by stdin for commits" msgstr "从标准输入中的包索引文件列表中扫描提交" -#: builtin/commit-graph.c:139 +#: builtin/commit-graph.c:154 msgid "start walk at commits listed by stdin" msgstr "从标准输入中的提交开始扫描" -#: builtin/commit-graph.c:141 +#: builtin/commit-graph.c:156 msgid "include all commits already in the commit-graph file" msgstr "包含 commit-graph 文件中已有所有提交" -#: builtin/commit-graph.c:150 +#: builtin/commit-graph.c:165 msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" msgstr "不能同时使用 --reachable、--stdin-commits 或 --stdin-packs" @@ -11118,7 +11861,7 @@ msgstr "" msgid "describe %s\n" msgstr "描述 %s\n" -#: builtin/describe.c:513 builtin/log.c:516 +#: builtin/describe.c:513 #, c-format msgid "Not a valid object name %s" msgstr "不是一个有效的对象名 %s" @@ -11168,7 +11911,7 @@ msgstr "只考虑匹配 <模式> 的标签" msgid "do not consider tags matching <pattern>" msgstr "不考虑匹配 <模式> 的标签" -#: builtin/describe.c:551 builtin/name-rev.c:424 +#: builtin/describe.c:551 builtin/name-rev.c:426 msgid "show abbreviated commit object as fallback" msgstr "显示简写的提交号作为后备" @@ -11210,50 +11953,50 @@ msgstr "'%s':不是一个正规文件或符号链接" msgid "invalid option: %s" msgstr "无效选项:%s" -#: builtin/diff.c:364 +#: builtin/diff.c:350 msgid "Not a git repository" msgstr "不是一个 git 仓库" -#: builtin/diff.c:408 +#: builtin/diff.c:394 #, c-format msgid "invalid object '%s' given." msgstr "提供了无效对象 '%s'。" -#: builtin/diff.c:417 +#: builtin/diff.c:403 #, c-format msgid "more than two blobs given: '%s'" msgstr "提供了超过两个数据对象:'%s'" -#: builtin/diff.c:422 +#: builtin/diff.c:408 #, c-format msgid "unhandled object '%s' given." msgstr "无法处理的对象 '%s'。" -#: builtin/difftool.c:31 +#: builtin/difftool.c:30 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" msgstr "git difftool [<选项>] [<提交> [<提交>]] [--] [<路径>...]" -#: builtin/difftool.c:261 +#: builtin/difftool.c:253 #, c-format msgid "failed: %d" msgstr "失败:%d" -#: builtin/difftool.c:303 +#: builtin/difftool.c:295 #, c-format msgid "could not read symlink %s" msgstr "无法读取符号链接 %s" -#: builtin/difftool.c:305 +#: builtin/difftool.c:297 #, c-format msgid "could not read symlink file %s" msgstr "无法读取符号链接文件 %s" -#: builtin/difftool.c:313 +#: builtin/difftool.c:305 #, c-format msgid "could not read object %s for symlink %s" msgstr "无法读取符号链接 %2$s 指向的对象 %1$s" -#: builtin/difftool.c:414 +#: builtin/difftool.c:406 msgid "" "combined diff formats('-c' and '--cc') are not supported in\n" "directory diff mode('-d' and '--dir-diff')." @@ -11261,67 +12004,83 @@ msgstr "" "不支持在目录比较模式('-d' 和 '--dir-diff')中采用组合差异格式('-c' 和 '--" "cc')。" -#: builtin/difftool.c:634 +#: builtin/difftool.c:626 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "两个文件都被修改:'%s' 和 '%s'。" -#: builtin/difftool.c:636 +#: builtin/difftool.c:628 msgid "working tree file has been left." msgstr "工作区文件被留了下来。" -#: builtin/difftool.c:647 +#: builtin/difftool.c:639 #, c-format msgid "temporary files exist in '%s'." msgstr "临时文件存在于 '%s'。" -#: builtin/difftool.c:648 +#: builtin/difftool.c:640 msgid "you may want to cleanup or recover these." msgstr "您可能想要清理或者恢复它们。" -#: builtin/difftool.c:697 +#: builtin/difftool.c:689 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "使用 `diff.guitool` 代替 `diff.tool`" -#: builtin/difftool.c:699 +#: builtin/difftool.c:691 msgid "perform a full-directory diff" msgstr "执行一个全目录差异比较" -#: builtin/difftool.c:701 +#: builtin/difftool.c:693 msgid "do not prompt before launching a diff tool" msgstr "启动差异比较工具之前不提示" -#: builtin/difftool.c:706 +#: builtin/difftool.c:698 msgid "use symlinks in dir-diff mode" msgstr "在 dir-diff 模式中使用符号链接" -#: builtin/difftool.c:707 +#: builtin/difftool.c:699 msgid "tool" msgstr "工具" -#: builtin/difftool.c:708 +#: builtin/difftool.c:700 msgid "use the specified diff tool" msgstr "使用指定的差异比较工具" -#: builtin/difftool.c:710 +#: builtin/difftool.c:702 msgid "print a list of diff tools that may be used with `--tool`" msgstr "显示可以用在 `--tool` 参数后的差异工具列表" -#: builtin/difftool.c:713 +#: builtin/difftool.c:705 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " "code" msgstr "当执行 diff 工具返回非零退出码时,使 'git-difftool' 退出" -#: builtin/difftool.c:716 +#: builtin/difftool.c:708 msgid "specify a custom command for viewing diffs" msgstr "指定一个用于查看差异的自定义命令" -#: builtin/difftool.c:740 +#: builtin/difftool.c:709 +msgid "passed to `diff`" +msgstr "传递给 `diff`" + +#: builtin/difftool.c:724 +msgid "difftool requires worktree or --no-index" +msgstr "difftool 要求工作区或者 --no-index" + +#: builtin/difftool.c:731 +msgid "--dir-diff is incompatible with --no-index" +msgstr "--dir-diff 和 --no-index 不兼容" + +#: builtin/difftool.c:734 +msgid "--gui, --tool and --extcmd are mutually exclusive" +msgstr "--gui、--tool 和 --extcmd 互斥" + +#: builtin/difftool.c:742 msgid "no <tool> given for --tool=<tool>" msgstr "没有为 --tool=<工具> 参数提供 <工具>" -#: builtin/difftool.c:747 +#: builtin/difftool.c:749 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "没有为 --extcmd=<命令> 参数提供 <命令>" @@ -11365,7 +12124,7 @@ msgstr "使用 done 功能来终止流" msgid "Skip output of blob data" msgstr "跳过数据对象的输出" -#: builtin/fast-export.c:1102 builtin/log.c:1601 +#: builtin/fast-export.c:1102 builtin/log.c:1609 msgid "refspec" msgstr "引用规格" @@ -11379,11 +12138,11 @@ msgstr "匿名输出" #: builtin/fast-export.c:1106 msgid "Reference parents which are not in fast-export stream by object id" -msgstr "引用父对象ID不在 fast-export 流中" +msgstr "引用父对象 ID 不在 fast-export 流中" #: builtin/fast-export.c:1108 msgid "Show original object ids of blobs/commits" -msgstr "显示数据对象/提交的原始对象ID" +msgstr "显示数据对象/提交的原始对象 ID" #: builtin/fetch.c:28 msgid "git fetch [<options>] [<repository> [<refspec>...]]" @@ -11401,15 +12160,15 @@ msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]" msgid "git fetch --all [<options>]" msgstr "git fetch --all [<选项>]" -#: builtin/fetch.c:115 builtin/pull.c:195 +#: builtin/fetch.c:115 builtin/pull.c:202 msgid "fetch from all remotes" msgstr "从所有的远程抓取" -#: builtin/fetch.c:117 builtin/pull.c:198 +#: builtin/fetch.c:117 builtin/pull.c:205 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它" -#: builtin/fetch.c:119 builtin/pull.c:201 +#: builtin/fetch.c:119 builtin/pull.c:208 msgid "path to upload pack on remote end" msgstr "上传包到远程的路径" @@ -11421,7 +12180,7 @@ msgstr "强制覆盖本地引用" msgid "fetch from multiple remotes" msgstr "从多个远程抓取" -#: builtin/fetch.c:124 builtin/pull.c:205 +#: builtin/fetch.c:124 builtin/pull.c:212 msgid "fetch all tags and associated objects" msgstr "抓取所有的标签和关联对象" @@ -11433,7 +12192,7 @@ msgstr "不抓取任何标签(--no-tags)" msgid "number of submodules fetched in parallel" msgstr "子模组获取的并发数" -#: builtin/fetch.c:130 builtin/pull.c:208 +#: builtin/fetch.c:130 builtin/pull.c:215 msgid "prune remote-tracking branches no longer on remote" msgstr "清除远程已经不存在的分支的跟踪分支" @@ -11442,7 +12201,7 @@ msgid "prune local tags no longer on remote and clobber changed tags" msgstr "清除远程不存在的本地标签,并且替换变更标签" # 译者:可选值,不能翻译 -#: builtin/fetch.c:133 builtin/fetch.c:156 builtin/pull.c:133 +#: builtin/fetch.c:133 builtin/fetch.c:156 builtin/pull.c:139 msgid "on-demand" msgstr "on-demand" @@ -11450,7 +12209,7 @@ msgstr "on-demand" msgid "control recursive fetching of submodules" msgstr "控制子模组的递归抓取" -#: builtin/fetch.c:138 builtin/pull.c:216 +#: builtin/fetch.c:138 builtin/pull.c:223 msgid "keep downloaded pack" msgstr "保持下载包" @@ -11458,7 +12217,7 @@ msgstr "保持下载包" msgid "allow updating of HEAD ref" msgstr "允许更新 HEAD 引用" -#: builtin/fetch.c:143 builtin/fetch.c:149 builtin/pull.c:219 +#: builtin/fetch.c:143 builtin/fetch.c:149 builtin/pull.c:226 msgid "deepen history of shallow clone" msgstr "深化浅克隆的历史" @@ -11466,7 +12225,7 @@ msgstr "深化浅克隆的历史" msgid "deepen history of shallow repository based on time" msgstr "基于时间来深化浅克隆的历史" -#: builtin/fetch.c:151 builtin/pull.c:222 +#: builtin/fetch.c:151 builtin/pull.c:229 msgid "convert to a complete repository" msgstr "转换为一个完整的仓库" @@ -11480,28 +12239,18 @@ msgid "" "files)" msgstr "递归获取子模组的缺省值(比配置文件优先级低)" -#: builtin/fetch.c:161 builtin/pull.c:225 +#: builtin/fetch.c:161 builtin/pull.c:232 msgid "accept refs that update .git/shallow" msgstr "接受更新 .git/shallow 的引用" -#: builtin/fetch.c:162 builtin/pull.c:227 +#: builtin/fetch.c:162 builtin/pull.c:234 msgid "refmap" msgstr "引用映射" -#: builtin/fetch.c:163 builtin/pull.c:228 +#: builtin/fetch.c:163 builtin/pull.c:235 msgid "specify fetch refmap" msgstr "指定获取操作的引用映射" -#: builtin/fetch.c:164 builtin/ls-remote.c:77 builtin/push.c:585 -#: builtin/send-pack.c:172 -msgid "server-specific" -msgstr "server-specific" - -#: builtin/fetch.c:164 builtin/ls-remote.c:77 builtin/push.c:585 -#: builtin/send-pack.c:173 -msgid "option to transmit" -msgstr "传输选项" - #: builtin/fetch.c:170 msgid "report that we have only objects reachable from this object" msgstr "报告我们只拥有从该对象开始可达的对象" @@ -11650,40 +12399,40 @@ msgstr "未指定远程仓库。请通过一个 URL 或远程仓库名指定, msgid "You need to specify a tag name." msgstr "您需要指定一个标签名称。" -#: builtin/fetch.c:1592 +#: builtin/fetch.c:1594 msgid "Negative depth in --deepen is not supported" msgstr "--deepen 不支持负数深度" -#: builtin/fetch.c:1594 +#: builtin/fetch.c:1596 msgid "--deepen and --depth are mutually exclusive" msgstr "--deepen 和 --depth 是互斥的" -#: builtin/fetch.c:1599 +#: builtin/fetch.c:1601 msgid "--depth and --unshallow cannot be used together" msgstr "--depth 和 --unshallow 不能同时使用" -#: builtin/fetch.c:1601 +#: builtin/fetch.c:1603 msgid "--unshallow on a complete repository does not make sense" msgstr "对于一个完整的仓库,参数 --unshallow 没有意义" -#: builtin/fetch.c:1617 +#: builtin/fetch.c:1619 msgid "fetch --all does not take a repository argument" msgstr "fetch --all 不能带一个仓库参数" -#: builtin/fetch.c:1619 +#: builtin/fetch.c:1621 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all 带引用规格没有任何意义" -#: builtin/fetch.c:1628 +#: builtin/fetch.c:1630 #, c-format msgid "No such remote or remote group: %s" msgstr "没有这样的远程或远程组:%s" -#: builtin/fetch.c:1635 +#: builtin/fetch.c:1637 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "获取组并指定引用规格没有意义" -#: builtin/fetch.c:1651 +#: builtin/fetch.c:1653 msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" @@ -11750,27 +12499,27 @@ msgstr "引用占位符适用于 Tcl" msgid "show only <n> matched refs" msgstr "只显示 <n> 个匹配的引用" -#: builtin/for-each-ref.c:39 builtin/tag.c:424 +#: builtin/for-each-ref.c:39 builtin/tag.c:433 msgid "respect format colors" msgstr "遵照格式中的颜色输出" -#: builtin/for-each-ref.c:43 +#: builtin/for-each-ref.c:42 msgid "print only refs which points at the given object" msgstr "只打印指向给定对象的引用" -#: builtin/for-each-ref.c:45 +#: builtin/for-each-ref.c:44 msgid "print only refs that are merged" msgstr "只打印已经合并的引用" -#: builtin/for-each-ref.c:46 +#: builtin/for-each-ref.c:45 msgid "print only refs that are not merged" msgstr "只打印没有合并的引用" -#: builtin/for-each-ref.c:47 +#: builtin/for-each-ref.c:46 msgid "print only refs which contain the commit" msgstr "只打印包含该提交的引用" -#: builtin/for-each-ref.c:48 +#: builtin/for-each-ref.c:47 msgid "print only refs which don't contain the commit" msgstr "只打印不包含该提交的引用" @@ -11808,211 +12557,211 @@ msgstr "" "损坏的链接来自于 %7s %s\n" " 到 %7s %s" -#: builtin/fsck.c:253 +#: builtin/fsck.c:295 #, c-format msgid "missing %s %s" msgstr "缺失 %s %s" -#: builtin/fsck.c:279 +#: builtin/fsck.c:321 #, c-format msgid "unreachable %s %s" -msgstr "不可访问 %s %s" +msgstr "不可达 %s %s" -#: builtin/fsck.c:298 +#: builtin/fsck.c:340 #, c-format msgid "dangling %s %s" msgstr "悬空 %s %s" -#: builtin/fsck.c:307 +#: builtin/fsck.c:349 msgid "could not create lost-found" msgstr "不能创建 lost-found" -#: builtin/fsck.c:318 +#: builtin/fsck.c:360 #, c-format msgid "could not finish '%s'" msgstr "不能完成 '%s'" -#: builtin/fsck.c:335 +#: builtin/fsck.c:377 #, c-format msgid "Checking %s" msgstr "正在检查 %s" -#: builtin/fsck.c:353 +#: builtin/fsck.c:415 #, c-format msgid "Checking connectivity (%d objects)" msgstr "正在检查连通性(%d 个对象)" -#: builtin/fsck.c:372 +#: builtin/fsck.c:434 #, c-format msgid "Checking %s %s" msgstr "正在检查 %s %s" -#: builtin/fsck.c:376 +#: builtin/fsck.c:438 msgid "broken links" msgstr "损坏的链接" -#: builtin/fsck.c:385 +#: builtin/fsck.c:447 #, c-format msgid "root %s" msgstr "根 %s" -#: builtin/fsck.c:393 +#: builtin/fsck.c:455 #, c-format msgid "tagged %s %s (%s) in %s" msgstr "标记 %s %s (%s) 于 %s" -#: builtin/fsck.c:422 +#: builtin/fsck.c:484 #, c-format msgid "%s: object corrupt or missing" msgstr "%s:对象损坏或丢失" -#: builtin/fsck.c:447 +#: builtin/fsck.c:509 #, c-format msgid "%s: invalid reflog entry %s" msgstr "%s:无效的引用日志条目 %s" -#: builtin/fsck.c:461 +#: builtin/fsck.c:523 #, c-format msgid "Checking reflog %s->%s" msgstr "正在检查引用日志 %s->%s" -#: builtin/fsck.c:495 +#: builtin/fsck.c:557 #, c-format msgid "%s: invalid sha1 pointer %s" msgstr "%s:无效的 sha1 指针 %s" -#: builtin/fsck.c:502 +#: builtin/fsck.c:564 #, c-format msgid "%s: not a commit" msgstr "%s:不是一个提交" -#: builtin/fsck.c:557 +#: builtin/fsck.c:619 msgid "notice: No default references" msgstr "注意:无默认引用" -#: builtin/fsck.c:572 +#: builtin/fsck.c:634 #, c-format msgid "%s: object corrupt or missing: %s" msgstr "%s:对象损坏或丢失:%s" -#: builtin/fsck.c:585 +#: builtin/fsck.c:647 #, c-format msgid "%s: object could not be parsed: %s" msgstr "%s:不能解析对象:%s" -#: builtin/fsck.c:605 +#: builtin/fsck.c:667 #, c-format msgid "bad sha1 file: %s" msgstr "坏的 sha1 文件:%s" -#: builtin/fsck.c:620 +#: builtin/fsck.c:682 msgid "Checking object directory" msgstr "正在检查对象目录" -#: builtin/fsck.c:623 +#: builtin/fsck.c:685 msgid "Checking object directories" msgstr "正在检查对象目录" -#: builtin/fsck.c:638 +#: builtin/fsck.c:700 #, c-format msgid "Checking %s link" msgstr "正在检查 %s 链接" -#: builtin/fsck.c:643 builtin/index-pack.c:833 +#: builtin/fsck.c:705 builtin/index-pack.c:841 #, c-format msgid "invalid %s" msgstr "无效的 %s" -#: builtin/fsck.c:650 +#: builtin/fsck.c:712 #, c-format msgid "%s points to something strange (%s)" msgstr "%s 指向奇怪的东西(%s)" -#: builtin/fsck.c:656 +#: builtin/fsck.c:718 #, c-format msgid "%s: detached HEAD points at nothing" msgstr "%s:分离头指针的指向不存在" -#: builtin/fsck.c:660 +#: builtin/fsck.c:722 #, c-format msgid "notice: %s points to an unborn branch (%s)" msgstr "注意:%s 指向一个尚未诞生的分支(%s)" -#: builtin/fsck.c:672 +#: builtin/fsck.c:734 msgid "Checking cache tree" msgstr "正在检查缓存树" -#: builtin/fsck.c:677 +#: builtin/fsck.c:739 #, c-format msgid "%s: invalid sha1 pointer in cache-tree" msgstr "%s:cache-tree 中无效的 sha1 指针" -#: builtin/fsck.c:688 +#: builtin/fsck.c:750 msgid "non-tree in cache-tree" msgstr "cache-tree 中非树对象" -#: builtin/fsck.c:719 +#: builtin/fsck.c:781 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<选项>] [<对象>...]" -#: builtin/fsck.c:725 +#: builtin/fsck.c:787 msgid "show unreachable objects" msgstr "显示不可达的对象" -#: builtin/fsck.c:726 +#: builtin/fsck.c:788 msgid "show dangling objects" msgstr "显示悬空的对象" -#: builtin/fsck.c:727 +#: builtin/fsck.c:789 msgid "report tags" msgstr "报告标签" -#: builtin/fsck.c:728 +#: builtin/fsck.c:790 msgid "report root nodes" msgstr "报告根节点" -#: builtin/fsck.c:729 +#: builtin/fsck.c:791 msgid "make index objects head nodes" msgstr "将索引亦作为检查的头节点" -#: builtin/fsck.c:730 +#: builtin/fsck.c:792 msgid "make reflogs head nodes (default)" msgstr "将引用日志作为检查的头节点(默认)" -#: builtin/fsck.c:731 +#: builtin/fsck.c:793 msgid "also consider packs and alternate objects" msgstr "也考虑包和备用对象" -#: builtin/fsck.c:732 +#: builtin/fsck.c:794 msgid "check only connectivity" msgstr "仅检查连通性" -#: builtin/fsck.c:733 +#: builtin/fsck.c:795 msgid "enable more strict checking" msgstr "启用更严格的检查" -#: builtin/fsck.c:735 +#: builtin/fsck.c:797 msgid "write dangling objects in .git/lost-found" msgstr "将悬空对象写入 .git/lost-found 中" -#: builtin/fsck.c:736 builtin/prune.c:110 +#: builtin/fsck.c:798 builtin/prune.c:132 msgid "show progress" msgstr "显示进度" -#: builtin/fsck.c:737 +#: builtin/fsck.c:799 msgid "show verbose names for reachable objects" msgstr "显示可达对象的详细名称" -#: builtin/fsck.c:797 +#: builtin/fsck.c:859 builtin/index-pack.c:224 msgid "Checking objects" msgstr "正在检查对象" -#: builtin/fsck.c:825 +#: builtin/fsck.c:887 #, c-format msgid "%s: object missing" msgstr "%s:对象缺失" -#: builtin/fsck.c:837 +#: builtin/fsck.c:899 #, c-format msgid "invalid parameter: expected sha1, got '%s'" msgstr "无效的参数:期望 sha1,得到 '%s'" @@ -12026,17 +12775,22 @@ msgstr "git gc [<选项>]" msgid "Failed to fstat %s: %s" msgstr "对 %s 调用 fstat 失败:%s" -#: builtin/gc.c:461 builtin/init-db.c:55 +#: builtin/gc.c:126 +#, c-format +msgid "failed to parse '%s' value '%s'" +msgstr "无法解析 '%s' 值 '%s'" + +#: builtin/gc.c:476 builtin/init-db.c:55 #, c-format msgid "cannot stat '%s'" msgstr "不能对 '%s' 调用 stat" -#: builtin/gc.c:470 builtin/notes.c:240 builtin/tag.c:510 +#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:519 #, c-format msgid "cannot read '%s'" msgstr "不能读取 '%s'" -#: builtin/gc.c:477 +#: builtin/gc.c:492 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -12050,59 +12804,59 @@ msgstr "" "\n" "%s" -#: builtin/gc.c:519 +#: builtin/gc.c:540 msgid "prune unreferenced objects" msgstr "清除未引用的对象" -#: builtin/gc.c:521 +#: builtin/gc.c:542 msgid "be more thorough (increased runtime)" msgstr "更彻底(增加运行时间)" -#: builtin/gc.c:522 +#: builtin/gc.c:543 msgid "enable auto-gc mode" msgstr "启用自动垃圾回收模式" -#: builtin/gc.c:525 +#: builtin/gc.c:546 msgid "force running gc even if there may be another gc running" msgstr "强制执行 gc 即使另外一个 gc 正在执行" -#: builtin/gc.c:528 +#: builtin/gc.c:549 msgid "repack all other packs except the largest pack" msgstr "除了最大的包之外,对所有其它包文件重新打包" -#: builtin/gc.c:545 +#: builtin/gc.c:566 #, c-format msgid "failed to parse gc.logexpiry value %s" msgstr "解析 gc.logexpiry 的值 %s 失败" -#: builtin/gc.c:556 +#: builtin/gc.c:577 #, c-format msgid "failed to parse prune expiry value %s" msgstr "解析清除期限值 %s 失败" -#: builtin/gc.c:576 +#: builtin/gc.c:597 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "自动在后台执行仓库打包以求最佳性能。\n" -#: builtin/gc.c:578 +#: builtin/gc.c:599 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "自动打包仓库以求最佳性能。\n" -#: builtin/gc.c:579 +#: builtin/gc.c:600 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "手工维护参见 \"git help gc\"。\n" -#: builtin/gc.c:619 +#: builtin/gc.c:640 #, 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:672 +#: builtin/gc.c:693 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。" @@ -12125,8 +12879,8 @@ msgstr "为 %2$s 设定的线程数 (%1$d) 无效" #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c:287 builtin/index-pack.c:1506 builtin/index-pack.c:1697 -#: builtin/pack-objects.c:2717 +#: builtin/grep.c:287 builtin/index-pack.c:1514 builtin/index-pack.c:1705 +#: builtin/pack-objects.c:2720 #, c-format msgid "no threads support, ignoring %s" msgstr "没有线程支持,忽略 %s" @@ -12352,11 +13106,11 @@ msgstr "不能解析版本:%s" msgid "invalid option combination, ignoring --threads" msgstr "无效的选项组合,忽略 --threads" -#: builtin/grep.c:1066 builtin/pack-objects.c:3400 +#: builtin/grep.c:1066 builtin/pack-objects.c:3403 msgid "no threads support, ignoring --threads" msgstr "没有线程支持,忽略 --threads" -#: builtin/grep.c:1069 builtin/index-pack.c:1503 builtin/pack-objects.c:2714 +#: builtin/grep.c:1069 builtin/index-pack.c:1511 builtin/pack-objects.c:2717 #, c-format msgid "invalid number of threads specified (%d)" msgstr "指定的线程数无效(%d)" @@ -12458,30 +13212,30 @@ msgstr "打印命令描述" msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]" -#: builtin/help.c:73 +#: builtin/help.c:77 #, c-format msgid "unrecognized help format '%s'" msgstr "未能识别的帮助格式 '%s'" -#: builtin/help.c:100 +#: builtin/help.c:104 msgid "Failed to start emacsclient." msgstr "无法启动 emacsclient。" -#: builtin/help.c:113 +#: builtin/help.c:117 msgid "Failed to parse emacsclient version." msgstr "无法解析 emacsclient 版本。" -#: builtin/help.c:121 +#: builtin/help.c:125 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "emacsclient 版本 '%d' 太老(< 22)。" -#: builtin/help.c:139 builtin/help.c:161 builtin/help.c:171 builtin/help.c:179 +#: builtin/help.c:143 builtin/help.c:165 builtin/help.c:175 builtin/help.c:183 #, c-format msgid "failed to exec '%s'" msgstr "执行 '%s' 失败" -#: builtin/help.c:217 +#: builtin/help.c:221 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" @@ -12490,7 +13244,7 @@ msgstr "" "'%s':不支持的 man 手册查看器的路径。\n" "请使用 'man.<工具>.cmd'。" -#: builtin/help.c:229 +#: builtin/help.c:233 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" @@ -12499,35 +13253,35 @@ msgstr "" "'%s': 支持的 man 手册查看器命令。\n" "请使用 'man.<工具>.path'。" -#: builtin/help.c:346 +#: builtin/help.c:350 #, c-format msgid "'%s': unknown man viewer." msgstr "'%s':未知的 man 查看器。" -#: builtin/help.c:363 +#: builtin/help.c:367 msgid "no man viewer handled the request" msgstr "没有 man 查看器处理此请求" -#: builtin/help.c:371 +#: builtin/help.c:375 msgid "no info viewer handled the request" msgstr "没有 info 查看器处理此请求" -#: builtin/help.c:430 builtin/help.c:441 git.c:323 +#: builtin/help.c:434 builtin/help.c:445 git.c:335 #, c-format msgid "'%s' is aliased to '%s'" msgstr "'%s' 是 '%s' 的别名" -#: builtin/help.c:444 git.c:347 +#: builtin/help.c:448 git.c:364 #, c-format msgid "bad alias.%s string: %s" msgstr "坏的 alias.%s 字符串:%s" -#: builtin/help.c:473 builtin/help.c:503 +#: builtin/help.c:477 builtin/help.c:507 #, c-format msgid "usage: %s%s" msgstr "用法:%s%s" -#: builtin/help.c:487 +#: builtin/help.c:491 msgid "'git help config' for more information" msgstr "'git help config' 获取更多信息" @@ -12546,275 +13300,275 @@ msgstr "未能获取预期的对象 %s" msgid "object %s: expected type %s, found %s" msgstr "对象 %s:应为类型 %s,却是 %s" -#: builtin/index-pack.c:249 +#: builtin/index-pack.c:257 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "无法填充 %d 字节" msgstr[1] "无法填充 %d 字节" -#: builtin/index-pack.c:259 +#: builtin/index-pack.c:267 msgid "early EOF" msgstr "过早的文件结束符(EOF)" -#: builtin/index-pack.c:260 +#: builtin/index-pack.c:268 msgid "read error on input" msgstr "输入上的读错误" -#: builtin/index-pack.c:272 +#: builtin/index-pack.c:280 msgid "used more bytes than were available" msgstr "用掉了超过可用的字节" -#: builtin/index-pack.c:279 builtin/pack-objects.c:599 +#: builtin/index-pack.c:287 builtin/pack-objects.c:600 msgid "pack too large for current definition of off_t" msgstr "包太大超过了当前 off_t 的定义" -#: builtin/index-pack.c:282 builtin/unpack-objects.c:94 +#: builtin/index-pack.c:290 builtin/unpack-objects.c:94 msgid "pack exceeds maximum allowed size" msgstr "包超过了最大允许值" -#: builtin/index-pack.c:297 builtin/repack.c:250 +#: builtin/index-pack.c:305 builtin/repack.c:250 #, c-format msgid "unable to create '%s'" msgstr "不能创建 '%s'" -#: builtin/index-pack.c:303 +#: builtin/index-pack.c:311 #, c-format msgid "cannot open packfile '%s'" msgstr "无法打开包文件 '%s'" -#: builtin/index-pack.c:317 +#: builtin/index-pack.c:325 msgid "pack signature mismatch" msgstr "包签名不匹配" -#: builtin/index-pack.c:319 +#: builtin/index-pack.c:327 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "不支持包版本 %<PRIu32>" -#: builtin/index-pack.c:337 +#: builtin/index-pack.c:345 #, c-format msgid "pack has bad object at offset %<PRIuMAX>: %s" msgstr "包中有错误的对象位于偏移量 %<PRIuMAX>:%s" -#: builtin/index-pack.c:457 +#: builtin/index-pack.c:465 #, c-format msgid "inflate returned %d" msgstr "解压缩返回 %d" -#: builtin/index-pack.c:506 +#: builtin/index-pack.c:514 msgid "offset value overflow for delta base object" msgstr "偏移值覆盖了 delta 基准对象" -#: builtin/index-pack.c:514 +#: builtin/index-pack.c:522 msgid "delta base offset is out of bound" msgstr "delta 基准偏移越界" -#: builtin/index-pack.c:522 +#: builtin/index-pack.c:530 #, c-format msgid "unknown object type %d" msgstr "未知对象类型 %d" -#: builtin/index-pack.c:553 +#: builtin/index-pack.c:561 msgid "cannot pread pack file" msgstr "无法读取包文件" -#: builtin/index-pack.c:555 +#: builtin/index-pack.c:563 #, c-format msgid "premature end of pack file, %<PRIuMAX> byte missing" msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing" msgstr[0] "包文件过早结束,缺少 %<PRIuMAX> 字节" msgstr[1] "包文件过早结束,缺少 %<PRIuMAX> 字节" -#: builtin/index-pack.c:581 +#: builtin/index-pack.c:589 msgid "serious inflate inconsistency" msgstr "解压缩严重的不一致" -#: builtin/index-pack.c:726 builtin/index-pack.c:732 builtin/index-pack.c:755 -#: builtin/index-pack.c:794 builtin/index-pack.c:803 +#: 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 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "发现 %s 出现 SHA1 冲突!" -#: builtin/index-pack.c:729 builtin/pack-objects.c:152 -#: builtin/pack-objects.c:212 builtin/pack-objects.c:306 +#: builtin/index-pack.c:737 builtin/pack-objects.c:153 +#: builtin/pack-objects.c:213 builtin/pack-objects.c:307 #, c-format msgid "unable to read %s" msgstr "不能读 %s" -#: builtin/index-pack.c:792 +#: builtin/index-pack.c:800 #, c-format msgid "cannot read existing object info %s" msgstr "不能读取现存对象信息 %s" -#: builtin/index-pack.c:800 +#: builtin/index-pack.c:808 #, c-format msgid "cannot read existing object %s" msgstr "不能读取现存对象 %s" -#: builtin/index-pack.c:814 +#: builtin/index-pack.c:822 #, c-format msgid "invalid blob object %s" msgstr "无效的数据对象 %s" -#: builtin/index-pack.c:817 builtin/index-pack.c:836 +#: builtin/index-pack.c:825 builtin/index-pack.c:844 msgid "fsck error in packed object" msgstr "对打包对象 fsck 检查出错" -#: builtin/index-pack.c:838 +#: builtin/index-pack.c:846 #, c-format msgid "Not all child objects of %s are reachable" msgstr "%s 的所有子对象并非都可达" -#: builtin/index-pack.c:910 builtin/index-pack.c:941 +#: builtin/index-pack.c:918 builtin/index-pack.c:949 msgid "failed to apply delta" msgstr "应用 delta 失败" -#: builtin/index-pack.c:1109 +#: builtin/index-pack.c:1117 msgid "Receiving objects" msgstr "接收对象中" -#: builtin/index-pack.c:1109 +#: builtin/index-pack.c:1117 msgid "Indexing objects" msgstr "索引对象中" -#: builtin/index-pack.c:1143 +#: builtin/index-pack.c:1151 msgid "pack is corrupted (SHA1 mismatch)" msgstr "包冲突(SHA1 不匹配)" -#: builtin/index-pack.c:1148 +#: builtin/index-pack.c:1156 msgid "cannot fstat packfile" msgstr "不能对包文件调用 fstat" -#: builtin/index-pack.c:1151 +#: builtin/index-pack.c:1159 msgid "pack has junk at the end" msgstr "包的结尾有垃圾数据" -#: builtin/index-pack.c:1163 +#: builtin/index-pack.c:1171 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "parse_pack_objects() 中遇到不可理喻的问题" -#: builtin/index-pack.c:1186 +#: builtin/index-pack.c:1194 msgid "Resolving deltas" msgstr "处理 delta 中" -#: builtin/index-pack.c:1196 builtin/pack-objects.c:2486 +#: builtin/index-pack.c:1204 builtin/pack-objects.c:2489 #, c-format msgid "unable to create thread: %s" msgstr "不能创建线程:%s" -#: builtin/index-pack.c:1237 +#: builtin/index-pack.c:1245 msgid "confusion beyond insanity" msgstr "不可理喻" -#: builtin/index-pack.c:1243 +#: builtin/index-pack.c:1251 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" msgstr[0] "完成 %d 个本地对象" msgstr[1] "完成 %d 个本地对象" -#: builtin/index-pack.c:1255 +#: builtin/index-pack.c:1263 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)" -#: builtin/index-pack.c:1259 +#: builtin/index-pack.c:1267 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "包有 %d 个未解决的 delta" msgstr[1] "包有 %d 个未解决的 delta" -#: builtin/index-pack.c:1283 +#: builtin/index-pack.c:1291 #, c-format msgid "unable to deflate appended object (%d)" msgstr "不能压缩附加对象(%d)" -#: builtin/index-pack.c:1360 +#: builtin/index-pack.c:1368 #, c-format msgid "local object %s is corrupt" msgstr "本地对象 %s 已损坏" -#: builtin/index-pack.c:1374 +#: builtin/index-pack.c:1382 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "包文件名 '%s' 没有以 '.pack' 结尾" -#: builtin/index-pack.c:1399 +#: builtin/index-pack.c:1407 #, c-format msgid "cannot write %s file '%s'" msgstr "无法写入 %s 文件 '%s'" -#: builtin/index-pack.c:1407 +#: builtin/index-pack.c:1415 #, c-format msgid "cannot close written %s file '%s'" msgstr "无法关闭已写入的 %s 文件 '%s'" -#: builtin/index-pack.c:1431 +#: builtin/index-pack.c:1439 msgid "error while closing pack file" msgstr "关闭包文件时出错" -#: builtin/index-pack.c:1445 +#: builtin/index-pack.c:1453 msgid "cannot store pack file" msgstr "无法存储包文件" -#: builtin/index-pack.c:1453 +#: builtin/index-pack.c:1461 msgid "cannot store index file" msgstr "无法存储索引文件" -#: builtin/index-pack.c:1497 builtin/pack-objects.c:2725 +#: builtin/index-pack.c:1505 builtin/pack-objects.c:2728 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "坏的 pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1565 +#: builtin/index-pack.c:1573 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "无法打开现存包文件 '%s'" -#: builtin/index-pack.c:1567 +#: builtin/index-pack.c:1575 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "无法为 %s 打开包索引文件" -#: builtin/index-pack.c:1615 +#: builtin/index-pack.c:1623 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "非 delta:%d 个对象" msgstr[1] "非 delta:%d 个对象" -#: builtin/index-pack.c:1622 +#: builtin/index-pack.c:1630 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "链长 = %d: %lu 对象" msgstr[1] "链长 = %d: %lu 对象" -#: builtin/index-pack.c:1659 +#: builtin/index-pack.c:1667 msgid "Cannot come back to cwd" msgstr "无法返回当前工作目录" -#: builtin/index-pack.c:1708 builtin/index-pack.c:1711 -#: builtin/index-pack.c:1727 builtin/index-pack.c:1731 +#: builtin/index-pack.c:1716 builtin/index-pack.c:1719 +#: builtin/index-pack.c:1735 builtin/index-pack.c:1739 #, c-format msgid "bad %s" msgstr "错误选项 %s" -#: builtin/index-pack.c:1747 +#: builtin/index-pack.c:1755 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin 不能和 --stdin 同时使用" -#: builtin/index-pack.c:1749 +#: builtin/index-pack.c:1757 msgid "--stdin requires a git repository" msgstr "--stdin 需要一个 git 仓库" -#: builtin/index-pack.c:1755 +#: builtin/index-pack.c:1763 msgid "--verify with no packfile name given" msgstr "--verify 没有提供包文件名参数" -#: builtin/index-pack.c:1803 builtin/unpack-objects.c:580 +#: builtin/index-pack.c:1811 builtin/unpack-objects.c:580 msgid "fsck error in pack objects" msgstr "在打包对象中 fsck 检查出错" @@ -12858,42 +13612,42 @@ msgstr "没有在 %s 中找到模版" msgid "not copying templates from '%s': %s" msgstr "没有从 '%s' 复制模版:%s" -#: builtin/init-db.c:329 +#: builtin/init-db.c:334 #, c-format msgid "unable to handle file type %d" msgstr "不能处理 %d 类型的文件" -#: builtin/init-db.c:332 +#: builtin/init-db.c:337 #, c-format msgid "unable to move %s to %s" msgstr "不能移动 %s 至 %s" -#: builtin/init-db.c:349 builtin/init-db.c:352 +#: builtin/init-db.c:354 builtin/init-db.c:357 #, c-format msgid "%s already exists" msgstr "%s 已经存在" -#: builtin/init-db.c:405 +#: builtin/init-db.c:413 #, c-format msgid "Reinitialized existing shared Git repository in %s%s\n" msgstr "重新初始化已存在的共享 Git 仓库于 %s%s\n" -#: builtin/init-db.c:406 +#: builtin/init-db.c:414 #, c-format msgid "Reinitialized existing Git repository in %s%s\n" msgstr "重新初始化已存在的 Git 仓库于 %s%s\n" -#: builtin/init-db.c:410 +#: builtin/init-db.c:418 #, c-format msgid "Initialized empty shared Git repository in %s%s\n" msgstr "已初始化空的共享 Git 仓库于 %s%s\n" -#: builtin/init-db.c:411 +#: builtin/init-db.c:419 #, c-format msgid "Initialized empty Git repository in %s%s\n" msgstr "已初始化空的 Git 仓库于 %s%s\n" -#: builtin/init-db.c:460 +#: builtin/init-db.c:468 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" @@ -12901,32 +13655,32 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] " "[<目录>]" -#: builtin/init-db.c:483 +#: builtin/init-db.c:491 msgid "permissions" msgstr "权限" -#: builtin/init-db.c:484 +#: builtin/init-db.c:492 msgid "specify that the git repository is to be shared amongst several users" msgstr "指定 git 仓库是多个用户之间共享的" -#: builtin/init-db.c:518 builtin/init-db.c:523 +#: builtin/init-db.c:526 builtin/init-db.c:531 #, c-format msgid "cannot mkdir %s" msgstr "不能创建目录 %s" -#: builtin/init-db.c:527 +#: builtin/init-db.c:535 #, c-format msgid "cannot chdir to %s" msgstr "不能切换目录到 %s" -#: builtin/init-db.c:548 +#: builtin/init-db.c:556 #, 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:576 +#: builtin/init-db.c:584 #, c-format msgid "Cannot access work tree '%s'" msgstr "不能访问工作区 '%s'" @@ -13003,391 +13757,387 @@ msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]" msgid "git show [<options>] <object>..." msgstr "git show [<选项>] <对象>..." -#: builtin/log.c:100 +#: builtin/log.c:104 #, c-format msgid "invalid --decorate option: %s" msgstr "无效的 --decorate 选项:%s" -#: builtin/log.c:163 -msgid "suppress diff output" -msgstr "不显示差异输出" - -#: builtin/log.c:164 +#: builtin/log.c:168 msgid "show source" msgstr "显示源" -#: builtin/log.c:165 +#: builtin/log.c:169 msgid "Use mail map file" msgstr "使用邮件映射文件" -#: builtin/log.c:167 +#: builtin/log.c:171 msgid "only decorate refs that match <pattern>" msgstr "只修饰与 <模式> 匹配的引用" -#: builtin/log.c:169 +#: builtin/log.c:173 msgid "do not decorate refs that match <pattern>" msgstr "不修饰和 <模式> 匹配的引用" -#: builtin/log.c:170 +#: builtin/log.c:174 msgid "decorate options" msgstr "修饰选项" -#: builtin/log.c:173 +#: builtin/log.c:177 msgid "Process line range n,m in file, counting from 1" msgstr "处理文件中第 n 到 m 之间的行,从 1 开始" -#: builtin/log.c:271 +#: builtin/log.c:275 #, c-format msgid "Final output: %d %s\n" msgstr "最终输出:%d %s\n" -#: builtin/log.c:525 +#: builtin/log.c:529 #, c-format msgid "git show %s: bad file" msgstr "git show %s: 损坏的文件" -#: builtin/log.c:540 builtin/log.c:634 +#: builtin/log.c:544 builtin/log.c:638 #, c-format -msgid "Could not read object %s" +msgid "could not read object %s" msgstr "不能读取对象 %s" -#: builtin/log.c:659 +#: builtin/log.c:663 #, c-format -msgid "Unknown type: %d" +msgid "unknown type: %d" msgstr "未知类型:%d" -#: builtin/log.c:780 +#: builtin/log.c:784 msgid "format.headers without value" msgstr "format.headers 没有值" -#: builtin/log.c:881 +#: builtin/log.c:885 msgid "name of output directory is too long" msgstr "输出目录名太长" -#: builtin/log.c:897 +#: builtin/log.c:901 #, c-format -msgid "Cannot open patch file %s" +msgid "cannot open patch file %s" msgstr "无法打开补丁文件 %s" -#: builtin/log.c:914 -msgid "Need exactly one range." -msgstr "只需要一个范围。" +#: builtin/log.c:918 +msgid "need exactly one range" +msgstr "只需要一个范围" + +#: builtin/log.c:928 +msgid "not a range" +msgstr "不是一个范围" -#: builtin/log.c:924 -msgid "Not a range." -msgstr "不是一个范围。" +#: builtin/log.c:1051 +msgid "cover letter needs email format" +msgstr "附函需要邮件地址格式" -#: builtin/log.c:1047 -msgid "Cover letter needs email format" -msgstr "信封需要邮件地址格式" +#: builtin/log.c:1057 +msgid "failed to create cover-letter file" +msgstr "无法创建附函文件" -#: builtin/log.c:1132 +#: builtin/log.c:1136 #, c-format msgid "insane in-reply-to: %s" msgstr "不正常的 in-reply-to:%s" -#: builtin/log.c:1159 +#: builtin/log.c:1163 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<选项>] [<从> | <版本范围>]" -#: builtin/log.c:1217 -msgid "Two output directories?" +#: builtin/log.c:1221 +msgid "two output directories?" msgstr "两个输出目录?" -#: builtin/log.c:1324 builtin/log.c:2068 builtin/log.c:2070 builtin/log.c:2082 +#: builtin/log.c:1332 builtin/log.c:2076 builtin/log.c:2078 builtin/log.c:2090 #, c-format -msgid "Unknown commit %s" +msgid "unknown commit %s" msgstr "未知提交 %s" -#: builtin/log.c:1334 builtin/notes.c:897 builtin/tag.c:526 +#: builtin/log.c:1342 builtin/replace.c:58 builtin/replace.c:207 +#: builtin/replace.c:210 #, c-format -msgid "Failed to resolve '%s' as a valid ref." -msgstr "无法解析 '%s' 为一个有效引用。" +msgid "failed to resolve '%s' as a valid ref" +msgstr "无法将 '%s' 解析为一个有效引用" -#: builtin/log.c:1339 -msgid "Could not find exact merge base." -msgstr "不能找到准确的合并基线。" +#: builtin/log.c:1347 +msgid "could not find exact merge base" +msgstr "不能找到准确的合并基线" -#: builtin/log.c:1343 +#: builtin/log.c:1351 msgid "" -"Failed to get upstream, if you want to record base commit automatically,\n" +"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." +"Or you could specify base commit by --base=<base-commit-id> manually" msgstr "" "无法得到上游地址,如果你想自动记录基线提交,请使用命令\n" "git branch --set-upstream-to 来跟踪一个远程分支。或者你可以通过\n" -"参数 --base=<基线提交> 手动指定一个基线提交。" +"参数 --base=<基线提交> 手动指定一个基线提交" -#: builtin/log.c:1363 -msgid "Failed to find exact merge base" +#: builtin/log.c:1371 +msgid "failed to find exact merge base" msgstr "无法找到准确的合并基线" -#: builtin/log.c:1374 +#: builtin/log.c:1382 msgid "base commit should be the ancestor of revision list" msgstr "基线提交应该是版本列表的祖先" -#: builtin/log.c:1378 +#: builtin/log.c:1386 msgid "base commit shouldn't be in revision list" msgstr "基线提交不应该出现在版本列表中" -#: builtin/log.c:1431 +#: builtin/log.c:1439 msgid "cannot get patch id" msgstr "无法得到补丁 id" -#: builtin/log.c:1483 +#: builtin/log.c:1491 msgid "failed to infer range-diff ranges" msgstr "无法推断 range-diff 范围" -#: builtin/log.c:1528 +#: builtin/log.c:1536 msgid "use [PATCH n/m] even with a single patch" msgstr "使用 [PATCH n/m],即使只有一个补丁" -#: builtin/log.c:1531 +#: builtin/log.c:1539 msgid "use [PATCH] even with multiple patches" msgstr "使用 [PATCH],即使有多个补丁" -#: builtin/log.c:1535 +#: builtin/log.c:1543 msgid "print patches to standard out" msgstr "打印补丁到标准输出" -#: builtin/log.c:1537 +#: builtin/log.c:1545 msgid "generate a cover letter" -msgstr "生成一封附信" +msgstr "生成一封附函" -#: builtin/log.c:1539 +#: builtin/log.c:1547 msgid "use simple number sequence for output file names" msgstr "使用简单的数字序列作为输出文件名" -#: builtin/log.c:1540 +#: builtin/log.c:1548 msgid "sfx" msgstr "后缀" -#: builtin/log.c:1541 +#: builtin/log.c:1549 msgid "use <sfx> instead of '.patch'" msgstr "使用 <后缀> 代替 '.patch'" -#: builtin/log.c:1543 +#: builtin/log.c:1551 msgid "start numbering patches at <n> instead of 1" msgstr "补丁以 <n> 开始编号,而不是1" -#: builtin/log.c:1545 +#: builtin/log.c:1553 msgid "mark the series as Nth re-roll" msgstr "标记补丁系列是第几次重制" -#: builtin/log.c:1547 +#: builtin/log.c:1555 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "使用 [RFC PATCH] 代替 [PATCH]" -#: builtin/log.c:1550 +#: builtin/log.c:1558 msgid "Use [<prefix>] instead of [PATCH]" msgstr "使用 [<前缀>] 代替 [PATCH]" -#: builtin/log.c:1553 +#: builtin/log.c:1561 msgid "store resulting files in <dir>" msgstr "把结果文件存储在 <目录>" -#: builtin/log.c:1556 +#: builtin/log.c:1564 msgid "don't strip/add [PATCH]" msgstr "不删除/添加 [PATCH]" -#: builtin/log.c:1559 +#: builtin/log.c:1567 msgid "don't output binary diffs" msgstr "不输出二进制差异" -#: builtin/log.c:1561 +#: builtin/log.c:1569 msgid "output all-zero hash in From header" msgstr "在 From 头信息中输出全为零的哈希值" -#: builtin/log.c:1563 +#: builtin/log.c:1571 msgid "don't include a patch matching a commit upstream" msgstr "不包含已在上游提交中的补丁" -#: builtin/log.c:1565 +#: builtin/log.c:1573 msgid "show patch format instead of default (patch + stat)" msgstr "显示纯补丁格式而非默认的(补丁+状态)" -#: builtin/log.c:1567 +#: builtin/log.c:1575 msgid "Messaging" msgstr "邮件发送" -#: builtin/log.c:1568 +#: builtin/log.c:1576 msgid "header" msgstr "header" -#: builtin/log.c:1569 +#: builtin/log.c:1577 msgid "add email header" msgstr "添加邮件头" -#: builtin/log.c:1570 builtin/log.c:1572 +#: builtin/log.c:1578 builtin/log.c:1580 msgid "email" msgstr "邮件地址" -#: builtin/log.c:1570 +#: builtin/log.c:1578 msgid "add To: header" msgstr "添加收件人" -#: builtin/log.c:1572 +#: builtin/log.c:1580 msgid "add Cc: header" msgstr "添加抄送" -#: builtin/log.c:1574 +#: builtin/log.c:1582 msgid "ident" msgstr "标识" -#: builtin/log.c:1575 +#: builtin/log.c:1583 msgid "set From address to <ident> (or committer ident if absent)" msgstr "将 From 地址设置为 <标识>(如若不提供,则用提交者 ID 做为地址)" -#: builtin/log.c:1577 +#: builtin/log.c:1585 msgid "message-id" msgstr "邮件标识" -#: builtin/log.c:1578 +#: builtin/log.c:1586 msgid "make first mail a reply to <message-id>" msgstr "使第一封邮件作为对 <邮件标识> 的回复" -#: builtin/log.c:1579 builtin/log.c:1582 +#: builtin/log.c:1587 builtin/log.c:1590 msgid "boundary" msgstr "边界" -#: builtin/log.c:1580 +#: builtin/log.c:1588 msgid "attach the patch" msgstr "附件方式添加补丁" -#: builtin/log.c:1583 +#: builtin/log.c:1591 msgid "inline the patch" msgstr "内联显示补丁" -#: builtin/log.c:1587 +#: builtin/log.c:1595 msgid "enable message threading, styles: shallow, deep" msgstr "启用邮件线索,风格:浅,深" -#: builtin/log.c:1589 +#: builtin/log.c:1597 msgid "signature" msgstr "签名" -#: builtin/log.c:1590 +#: builtin/log.c:1598 msgid "add a signature" msgstr "添加一个签名" -#: builtin/log.c:1591 +#: builtin/log.c:1599 msgid "base-commit" msgstr "基线提交" -#: builtin/log.c:1592 +#: builtin/log.c:1600 msgid "add prerequisite tree info to the patch series" msgstr "为补丁列表添加前置树信息" -#: builtin/log.c:1594 +#: builtin/log.c:1602 msgid "add a signature from a file" msgstr "从文件添加一个签名" -#: builtin/log.c:1595 +#: builtin/log.c:1603 msgid "don't print the patch filenames" msgstr "不要打印补丁文件名" -#: builtin/log.c:1597 +#: builtin/log.c:1605 msgid "show progress while generating patches" msgstr "在生成补丁时显示进度" -#: builtin/log.c:1598 +#: builtin/log.c:1606 msgid "rev" msgstr "版本" -#: builtin/log.c:1599 +#: builtin/log.c:1607 msgid "show changes against <rev> in cover letter or single patch" msgstr "在附函或单个补丁中显示和 <rev> 的差异" -#: builtin/log.c:1602 +#: builtin/log.c:1610 msgid "show changes against <refspec> in cover letter or single patch" msgstr "在附函或单个补丁中显示和 <refspec> 的差异" -#: builtin/log.c:1604 +#: builtin/log.c:1612 msgid "percentage by which creation is weighted" msgstr "创建权重的百分比" -#: builtin/log.c:1679 +#: builtin/log.c:1687 #, c-format msgid "invalid ident line: %s" msgstr "包含无效的身份标识:%s" -#: builtin/log.c:1694 +#: builtin/log.c:1702 msgid "-n and -k are mutually exclusive" msgstr "-n 和 -k 互斥" -#: builtin/log.c:1696 +#: builtin/log.c:1704 msgid "--subject-prefix/--rfc and -k are mutually exclusive" msgstr "--subject-prefix/--rfc 和 -k 互斥" -#: builtin/log.c:1704 +#: builtin/log.c:1712 msgid "--name-only does not make sense" msgstr "--name-only 无意义" -#: builtin/log.c:1706 +#: builtin/log.c:1714 msgid "--name-status does not make sense" msgstr "--name-status 无意义" -#: builtin/log.c:1708 +#: builtin/log.c:1716 msgid "--check does not make sense" msgstr "--check 无意义" -#: builtin/log.c:1740 +#: builtin/log.c:1748 msgid "standard output, or directory, which one?" msgstr "标准输出或目录,哪一个?" -#: builtin/log.c:1742 -#, c-format -msgid "Could not create directory '%s'" -msgstr "不能创建目录 '%s'" - -#: builtin/log.c:1829 +#: builtin/log.c:1837 msgid "--interdiff requires --cover-letter or single patch" msgstr "--interdiff 需要 --cover-letter 或单一补丁" -#: builtin/log.c:1833 +#: builtin/log.c:1841 msgid "Interdiff:" msgstr "版本间差异:" -#: builtin/log.c:1834 +#: builtin/log.c:1842 #, c-format msgid "Interdiff against v%d:" msgstr "对 v%d 的版本差异:" -#: builtin/log.c:1840 +#: builtin/log.c:1848 msgid "--creation-factor requires --range-diff" msgstr "--creation-factor 需要 --range-diff" -#: builtin/log.c:1844 +#: builtin/log.c:1852 msgid "--range-diff requires --cover-letter or single patch" msgstr "--range-diff 需要 --cover-letter 或单一补丁" -#: builtin/log.c:1852 +#: builtin/log.c:1860 msgid "Range-diff:" msgstr "范围差异:" -#: builtin/log.c:1853 +#: builtin/log.c:1861 #, c-format msgid "Range-diff against v%d:" msgstr "对 v%d 的范围差异:" -#: builtin/log.c:1864 +#: builtin/log.c:1872 #, c-format msgid "unable to read signature file '%s'" msgstr "无法读取签名文件 '%s'" -#: builtin/log.c:1900 +#: builtin/log.c:1908 msgid "Generating patches" msgstr "生成补丁" -#: builtin/log.c:1944 -msgid "Failed to create output files" +#: builtin/log.c:1952 +msgid "failed to create output files" msgstr "无法创建输出文件" -#: builtin/log.c:2003 +#: builtin/log.c:2011 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]" -#: builtin/log.c:2057 +#: builtin/log.c:2065 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -13511,7 +14261,7 @@ msgstr "" msgid "do not print remote URL" msgstr "不打印远程 URL" -#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1111 +#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1458 msgid "exec" msgstr "exec" @@ -13535,11 +14285,11 @@ msgstr "不显示已解析的标签" msgid "take url.<base>.insteadOf into account" msgstr "参考 url.<base>.insteadOf 设置" -#: builtin/ls-remote.c:73 +#: builtin/ls-remote.c:72 msgid "exit with exit code 2 if no matching refs are found" msgstr "若未找到匹配的引用则以退出码2退出" -#: builtin/ls-remote.c:76 +#: builtin/ls-remote.c:75 msgid "show underlying ref in addition to the object pointed by it" msgstr "除了显示指向的对象外,显示指向的引用名" @@ -13584,261 +14334,268 @@ msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)" msgid "empty mbox: '%s'" msgstr "空的 mbox:'%s'" -#: builtin/merge.c:53 +#: builtin/merge.c:54 msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<选项>] [<提交>...]" -#: builtin/merge.c:54 +#: builtin/merge.c:55 msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:55 +#: builtin/merge.c:56 msgid "git merge --continue" msgstr "git merge --continue" -#: builtin/merge.c:112 +#: builtin/merge.c:116 msgid "switch `m' requires a value" msgstr "开关 `m' 需要一个值" -#: builtin/merge.c:132 +#: builtin/merge.c:139 #, c-format msgid "option `%s' requires a value" msgstr "选项 `%s' 需要一个值" -#: builtin/merge.c:178 +#: builtin/merge.c:185 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "不能找到合并策略 '%s'。\n" -#: builtin/merge.c:179 +#: builtin/merge.c:186 #, c-format msgid "Available strategies are:" msgstr "可用的策略有:" -#: builtin/merge.c:184 +#: builtin/merge.c:191 #, c-format msgid "Available custom strategies are:" msgstr "可用的自定义策略有:" -#: builtin/merge.c:235 builtin/pull.c:144 +#: builtin/merge.c:242 builtin/pull.c:150 msgid "do not show a diffstat at the end of the merge" msgstr "在合并的最后不显示差异统计" -#: builtin/merge.c:238 builtin/pull.c:147 +#: builtin/merge.c:245 builtin/pull.c:153 msgid "show a diffstat at the end of the merge" msgstr "在合并的最后显示差异统计" -#: builtin/merge.c:239 builtin/pull.c:150 +#: builtin/merge.c:246 builtin/pull.c:156 msgid "(synonym to --stat)" msgstr "(和 --stat 同义)" -#: builtin/merge.c:241 builtin/pull.c:153 +#: builtin/merge.c:248 builtin/pull.c:159 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录" -#: builtin/merge.c:244 builtin/pull.c:159 +#: builtin/merge.c:251 builtin/pull.c:165 msgid "create a single commit instead of doing a merge" msgstr "创建一个单独的提交而不是做一次合并" -#: builtin/merge.c:246 builtin/pull.c:162 +#: builtin/merge.c:253 builtin/pull.c:168 msgid "perform a commit if the merge succeeds (default)" msgstr "如果合并成功,执行一次提交(默认)" -#: builtin/merge.c:248 builtin/pull.c:165 +#: builtin/merge.c:255 builtin/pull.c:171 msgid "edit message before committing" msgstr "在提交前编辑提交说明" -#: builtin/merge.c:249 +#: builtin/merge.c:257 msgid "allow fast-forward (default)" msgstr "允许快进(默认)" -#: builtin/merge.c:251 builtin/pull.c:171 +#: builtin/merge.c:259 builtin/pull.c:178 msgid "abort if fast-forward is not possible" msgstr "如果不能快进就放弃合并" -#: builtin/merge.c:255 builtin/pull.c:174 +#: builtin/merge.c:263 builtin/pull.c:181 msgid "verify that the named commit has a valid GPG signature" msgstr "验证指定的提交是否包含一个有效的 GPG 签名" -#: builtin/merge.c:256 builtin/notes.c:787 builtin/pull.c:178 -#: builtin/rebase.c:1124 builtin/rebase--interactive.c:188 builtin/revert.c:111 +#: builtin/merge.c:264 builtin/notes.c:787 builtin/pull.c:185 +#: builtin/rebase.c:492 builtin/rebase.c:1471 builtin/revert.c:113 msgid "strategy" msgstr "策略" -#: builtin/merge.c:257 builtin/pull.c:179 +#: builtin/merge.c:265 builtin/pull.c:186 msgid "merge strategy to use" msgstr "要使用的合并策略" -#: builtin/merge.c:258 builtin/pull.c:182 +#: builtin/merge.c:266 builtin/pull.c:189 msgid "option=value" msgstr "option=value" -#: builtin/merge.c:259 builtin/pull.c:183 +#: builtin/merge.c:267 builtin/pull.c:190 msgid "option for selected merge strategy" msgstr "所选的合并策略的选项" -#: builtin/merge.c:261 +#: builtin/merge.c:269 msgid "merge commit message (for a non-fast-forward merge)" msgstr "合并的提交说明(针对非快进式合并)" -#: builtin/merge.c:268 +#: builtin/merge.c:276 msgid "abort the current in-progress merge" msgstr "放弃当前正在进行的合并" -#: builtin/merge.c:270 +#: builtin/merge.c:278 msgid "continue the current in-progress merge" msgstr "继续当前正在进行的合并" -#: builtin/merge.c:272 builtin/pull.c:190 +#: builtin/merge.c:280 builtin/pull.c:197 msgid "allow merging unrelated histories" msgstr "允许合并不相关的历史" -#: builtin/merge.c:278 +#: builtin/merge.c:286 msgid "verify commit-msg hook" msgstr "校验 commit-msg 钩子" -#: builtin/merge.c:303 +#: builtin/merge.c:311 msgid "could not run stash." msgstr "不能运行贮藏。" -#: builtin/merge.c:308 +#: builtin/merge.c:316 msgid "stash failed" msgstr "贮藏失败" -#: builtin/merge.c:313 +#: builtin/merge.c:321 #, c-format msgid "not a valid object: %s" msgstr "不是一个有效对象:%s" -#: builtin/merge.c:335 builtin/merge.c:352 +#: builtin/merge.c:343 builtin/merge.c:360 msgid "read-tree failed" msgstr "读取树失败" # 译者:注意保持前导空格 -#: builtin/merge.c:382 +#: builtin/merge.c:390 msgid " (nothing to squash)" msgstr " (无可压缩)" -#: builtin/merge.c:393 +#: builtin/merge.c:401 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "压缩提交 -- 未更新 HEAD\n" -#: builtin/merge.c:443 +#: builtin/merge.c:451 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "无合并信息 -- 未更新 HEAD\n" -#: builtin/merge.c:494 +#: builtin/merge.c:502 #, c-format msgid "'%s' does not point to a commit" msgstr "'%s' 没有指向一个提交" -#: builtin/merge.c:581 +#: builtin/merge.c:589 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "坏的 branch.%s.mergeoptions 字符串:%s" -#: builtin/merge.c:702 +#: builtin/merge.c:712 msgid "Not handling anything other than two heads merge." msgstr "未处理两个头合并之外的任何操作。" -#: builtin/merge.c:716 +#: builtin/merge.c:726 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "merge-recursive 的未知选项:-X%s" -#: builtin/merge.c:731 +#: builtin/merge.c:741 #, c-format msgid "unable to write %s" msgstr "不能写 %s" -#: builtin/merge.c:783 +#: builtin/merge.c:793 #, c-format msgid "Could not read from '%s'" msgstr "不能从 '%s' 读取" -#: builtin/merge.c:792 +#: builtin/merge.c:802 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "未提交合并,使用 'git commit' 完成此次合并。\n" -#: builtin/merge.c:798 -#, c-format +#: builtin/merge.c:808 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" -"Lines starting with '%c' will be ignored, and an empty message aborts\n" -"the commit.\n" msgstr "" "请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n" "合并到主题分支。\n" "\n" -"以 '%c' 开头的行将被忽略,而且空提交说明将会终止提交。\n" -#: builtin/merge.c:834 +#: builtin/merge.c:813 +msgid "An empty message aborts the commit.\n" +msgstr "空的提交说明会终止提交。\n" + +#: builtin/merge.c:816 +#, c-format +msgid "" +"Lines starting with '%c' will be ignored, and an empty message aborts\n" +"the commit.\n" +msgstr "以 '%c' 开始的行将被忽略,而空的提交说明将终止提交。\n" + +#: builtin/merge.c:857 msgid "Empty commit message." msgstr "空提交信息。" -#: builtin/merge.c:853 +#: builtin/merge.c:876 #, c-format msgid "Wonderful.\n" msgstr "太棒了。\n" -#: builtin/merge.c:906 +#: builtin/merge.c:936 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "自动合并失败,修正冲突然后提交修正的结果。\n" -#: builtin/merge.c:945 +#: builtin/merge.c:975 msgid "No current branch." msgstr "没有当前分支。" -#: builtin/merge.c:947 +#: builtin/merge.c:977 msgid "No remote for the current branch." msgstr "当前分支没有对应的远程仓库。" -#: builtin/merge.c:949 +#: builtin/merge.c:979 msgid "No default upstream defined for the current branch." msgstr "当前分支没有定义默认的上游分支。" -#: builtin/merge.c:954 +#: builtin/merge.c:984 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "对于 %s 没有来自 %s 的远程跟踪分支" -#: builtin/merge.c:1011 +#: builtin/merge.c:1041 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "环境 '%2$s' 中存在坏的取值 '%1$s'" -#: builtin/merge.c:1114 +#: builtin/merge.c:1144 #, c-format msgid "not something we can merge in %s: %s" msgstr "不能在 %s 中合并:%s" -#: builtin/merge.c:1148 +#: builtin/merge.c:1178 msgid "not something we can merge" msgstr "不能合并" -#: builtin/merge.c:1251 +#: builtin/merge.c:1281 msgid "--abort expects no arguments" msgstr "--abort 不带参数" -#: builtin/merge.c:1255 +#: builtin/merge.c:1285 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "没有要终止的合并(MERGE_HEAD 丢失)。" -#: builtin/merge.c:1267 +#: builtin/merge.c:1297 msgid "--continue expects no arguments" msgstr "--continue 不带参数" -#: builtin/merge.c:1271 +#: builtin/merge.c:1301 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "没有进行中的合并(MERGE_HEAD 丢失)。" -#: builtin/merge.c:1287 +#: builtin/merge.c:1317 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -13846,7 +14603,7 @@ msgstr "" "您尚未结束您的合并(存在 MERGE_HEAD)。\n" "请在合并前先提交您的修改。" -#: builtin/merge.c:1294 +#: builtin/merge.c:1324 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -13854,92 +14611,92 @@ msgstr "" "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n" "请在合并前先提交您的修改。" -#: builtin/merge.c:1297 +#: builtin/merge.c:1327 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。" -#: builtin/merge.c:1306 +#: builtin/merge.c:1341 msgid "You cannot combine --squash with --no-ff." msgstr "您不能将 --squash 与 --no-ff 同时使用。" -#: builtin/merge.c:1314 +#: builtin/merge.c:1349 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "未指定提交并且 merge.defaultToUpstream 未设置。" -#: builtin/merge.c:1331 +#: builtin/merge.c:1366 msgid "Squash commit into empty head not supported yet" msgstr "尚不支持到空分支的压缩提交" -#: builtin/merge.c:1333 +#: builtin/merge.c:1368 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "到空分支的非快进式提交没有意义" -#: builtin/merge.c:1338 +#: builtin/merge.c:1373 #, c-format msgid "%s - not something we can merge" msgstr "%s - 不能被合并" -#: builtin/merge.c:1340 +#: builtin/merge.c:1375 msgid "Can merge only exactly one commit into empty head" msgstr "只能将一个提交合并到空分支上" -#: builtin/merge.c:1422 +#: builtin/merge.c:1454 msgid "refusing to merge unrelated histories" msgstr "拒绝合并无关的历史" -#: builtin/merge.c:1431 +#: builtin/merge.c:1463 msgid "Already up to date." msgstr "已经是最新的。" -#: builtin/merge.c:1441 +#: builtin/merge.c:1473 #, c-format msgid "Updating %s..%s\n" msgstr "更新 %s..%s\n" -#: builtin/merge.c:1483 +#: builtin/merge.c:1515 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "尝试非常小的索引内合并...\n" -#: builtin/merge.c:1490 +#: builtin/merge.c:1522 #, c-format msgid "Nope.\n" msgstr "无。\n" -#: builtin/merge.c:1515 +#: builtin/merge.c:1547 msgid "Already up to date. Yeeah!" msgstr "已经是最新的。耶!" -#: builtin/merge.c:1521 +#: builtin/merge.c:1553 msgid "Not possible to fast-forward, aborting." msgstr "无法快进,终止。" -#: builtin/merge.c:1544 builtin/merge.c:1623 +#: builtin/merge.c:1576 builtin/merge.c:1655 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "将树回滚至原始状态...\n" -#: builtin/merge.c:1548 +#: builtin/merge.c:1580 #, c-format msgid "Trying merge strategy %s...\n" msgstr "尝试合并策略 %s...\n" -#: builtin/merge.c:1614 +#: builtin/merge.c:1646 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "没有合并策略处理此合并。\n" -#: builtin/merge.c:1616 +#: builtin/merge.c:1648 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "使用策略 %s 合并失败。\n" -#: builtin/merge.c:1625 +#: builtin/merge.c:1657 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "使用 %s 以准备手工解决。\n" -#: builtin/merge.c:1637 +#: builtin/merge.c:1669 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "自动合并进展顺利,按要求在提交前停止\n" @@ -14071,19 +14828,19 @@ msgstr "允许丢失的对象" msgid "allow creation of more than one tree" msgstr "允许创建一个以上的树" -#: builtin/multi-pack-index.c:8 +#: builtin/multi-pack-index.c:9 msgid "git multi-pack-index [--object-dir=<dir>] (write|verify)" msgstr "git multi-pack-index [--object-dir=<目录>] (write|verify)" -#: builtin/multi-pack-index.c:21 +#: builtin/multi-pack-index.c:22 msgid "object directory containing set of packfile and pack-index pairs" msgstr "包含成对包文件和包索引的对象目录" -#: builtin/multi-pack-index.c:39 +#: builtin/multi-pack-index.c:40 builtin/prune-packed.c:67 msgid "too many arguments" msgstr "太多参数" -#: builtin/multi-pack-index.c:48 +#: builtin/multi-pack-index.c:51 #, c-format msgid "unrecognized verb: %s" msgstr "未能识别的动作:%s" @@ -14175,7 +14932,7 @@ msgstr "%s,源=%s,目标=%s" msgid "Renaming %s to %s\n" msgstr "重命名 %s 至 %s\n" -#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:513 +#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:516 #, c-format msgid "renaming '%s' failed" msgstr "重命名 '%s' 失败" @@ -14192,35 +14949,35 @@ msgstr "git name-rev [<选项>] --all" msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [<选项>] --stdin" -#: builtin/name-rev.c:413 +#: builtin/name-rev.c:415 msgid "print only names (no SHA-1)" msgstr "只打印名称(无 SHA-1)" -#: builtin/name-rev.c:414 +#: builtin/name-rev.c:416 msgid "only use tags to name the commits" msgstr "只使用标签来命名提交" -#: builtin/name-rev.c:416 +#: builtin/name-rev.c:418 msgid "only use refs matching <pattern>" msgstr "只使用和 <模式> 相匹配的引用" -#: builtin/name-rev.c:418 +#: builtin/name-rev.c:420 msgid "ignore refs matching <pattern>" msgstr "忽略和 <模式> 相匹配的引用" -#: builtin/name-rev.c:420 +#: builtin/name-rev.c:422 msgid "list all commits reachable from all refs" msgstr "列出可以从所有引用访问的提交" -#: builtin/name-rev.c:421 +#: builtin/name-rev.c:423 msgid "read from stdin" msgstr "从标准输入读取" -#: builtin/name-rev.c:422 +#: builtin/name-rev.c:424 msgid "allow to print `undefined` names (default)" msgstr "允许打印 `未定义` 的名称(默认)" -#: builtin/name-rev.c:428 +#: builtin/name-rev.c:430 msgid "dereference tags in the input (internal use)" msgstr "反向解析输入中的标签(内部使用)" @@ -14364,7 +15121,7 @@ msgstr "不能写注解对象" msgid "the note contents have been left in %s" msgstr "注解内容被留在 %s 中" -#: builtin/notes.c:242 builtin/tag.c:513 +#: builtin/notes.c:242 builtin/tag.c:522 #, c-format msgid "could not open or read '%s'" msgstr "不能打开或读取 '%s'" @@ -14589,6 +15346,11 @@ msgstr "" "自动合并说明失败。修改 %s 中的冲突并且使用命令 'git notes merge --commit' 提" "交结果,或者使用命令 'git notes merge --abort' 终止合并。\n" +#: builtin/notes.c:897 builtin/tag.c:535 +#, c-format +msgid "Failed to resolve '%s' as a valid ref." +msgstr "无法解析 '%s' 为一个有效引用。" + #: builtin/notes.c:900 #, c-format msgid "Object %s has no note\n" @@ -14602,7 +15364,7 @@ msgstr "尝试删除不存在的注解不是一个错误" msgid "read object names from the standard input" msgstr "从标准输入读取对象名称" -#: builtin/notes.c:954 builtin/prune.c:108 builtin/worktree.c:165 +#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:165 msgid "do not remove, show only" msgstr "不删除,只显示" @@ -14618,140 +15380,139 @@ msgstr "注解引用" msgid "use notes from <notes-ref>" msgstr "从 <注解引用> 使用注解" -#: builtin/notes.c:1034 +#: builtin/notes.c:1034 builtin/stash.c:1611 #, c-format msgid "unknown subcommand: %s" msgstr "未知子命令:%s" -#: builtin/pack-objects.c:51 +#: builtin/pack-objects.c:52 msgid "" "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" msgstr "git pack-objects --stdout [<选项>...] [< <引用列表> | < <对象列表>]" -#: builtin/pack-objects.c:52 +#: builtin/pack-objects.c:53 msgid "" "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" msgstr "git pack-objects [<选项>...] <前缀名称> [< <引用列表> | < <对象列表>]" -#: builtin/pack-objects.c:423 +#: builtin/pack-objects.c:424 #, c-format msgid "bad packed object CRC for %s" msgstr "%s 错的包对象 CRC" -#: builtin/pack-objects.c:434 +#: builtin/pack-objects.c:435 #, c-format msgid "corrupt packed object for %s" msgstr "%s 损坏的包对象" -#: builtin/pack-objects.c:565 +#: builtin/pack-objects.c:566 #, c-format msgid "recursive delta detected for object %s" msgstr "发现对象 %s 递归 delta" -#: builtin/pack-objects.c:776 +#: builtin/pack-objects.c:777 #, c-format msgid "ordered %u objects, expected %<PRIu32>" msgstr "排序了 %u 个对象,预期 %<PRIu32> 个" -#: builtin/pack-objects.c:789 +#: builtin/pack-objects.c:790 #, c-format msgid "packfile is invalid: %s" msgstr "无效的包文件:%s" -#: builtin/pack-objects.c:793 +#: builtin/pack-objects.c:794 #, c-format msgid "unable to open packfile for reuse: %s" msgstr "无法为重用打开包文件:%s" -#: builtin/pack-objects.c:797 +#: builtin/pack-objects.c:798 msgid "unable to seek in reused packfile" msgstr "无法在重用的包文件中查找" -#: builtin/pack-objects.c:808 +#: builtin/pack-objects.c:809 msgid "unable to read from reused packfile" msgstr "无法读取索引文件" -#: builtin/pack-objects.c:836 +#: builtin/pack-objects.c:837 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "禁用 bitmap 写入,因为 pack.packSizeLimit 设置使得包被切分为多个" -#: builtin/pack-objects.c:849 +#: builtin/pack-objects.c:850 msgid "Writing objects" msgstr "写入对象中" -#: builtin/pack-objects.c:911 builtin/update-index.c:89 +#: builtin/pack-objects.c:912 builtin/update-index.c:89 #, c-format msgid "failed to stat %s" msgstr "对 %s 调用 stat 失败" -#: builtin/pack-objects.c:964 +#: builtin/pack-objects.c:965 #, c-format msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" msgstr "写入 %<PRIu32> 个对象而预期 %<PRIu32> 个" -#: builtin/pack-objects.c:1158 +#: builtin/pack-objects.c:1161 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "禁用 bitmap 写入,因为一些对象将不会被打包" -#: builtin/pack-objects.c:1586 +#: builtin/pack-objects.c:1589 #, c-format msgid "delta base offset overflow in pack for %s" msgstr "%s 压缩中 delta 基准偏移越界" -#: builtin/pack-objects.c:1595 +#: builtin/pack-objects.c:1598 #, c-format msgid "delta base offset out of bound for %s" msgstr "%s 的 delta 基准偏移越界" -#: builtin/pack-objects.c:1864 +#: builtin/pack-objects.c:1867 msgid "Counting objects" msgstr "对象计数中" -#: builtin/pack-objects.c:1994 +#: builtin/pack-objects.c:1997 #, c-format msgid "unable to get size of %s" msgstr "不能得到 %s 的大小" -#: builtin/pack-objects.c:2009 +#: builtin/pack-objects.c:2012 #, c-format msgid "unable to parse object header of %s" msgstr "无法解析对象 %s 头信息" -#: builtin/pack-objects.c:2079 builtin/pack-objects.c:2095 -#: builtin/pack-objects.c:2105 +#: builtin/pack-objects.c:2082 builtin/pack-objects.c:2098 +#: builtin/pack-objects.c:2108 #, c-format msgid "object %s cannot be read" msgstr "对象 %s 无法读取" -#: builtin/pack-objects.c:2082 builtin/pack-objects.c:2109 +#: builtin/pack-objects.c:2085 builtin/pack-objects.c:2112 #, c-format msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)" msgstr "对象 %s 不一致的对象长度(%<PRIuMAX> vs %<PRIuMAX>)" -#: builtin/pack-objects.c:2119 +#: builtin/pack-objects.c:2122 msgid "suboptimal pack - out of memory" msgstr "次优(suboptimal)打包 - 内存不足" -#: builtin/pack-objects.c:2445 +#: builtin/pack-objects.c:2448 #, c-format msgid "Delta compression using up to %d threads" msgstr "使用 %d 个线程进行压缩" -#: builtin/pack-objects.c:2577 +#: builtin/pack-objects.c:2580 #, c-format msgid "unable to pack objects reachable from tag %s" msgstr "无法为标签 %s 压缩对象" -#: builtin/pack-objects.c:2664 +#: builtin/pack-objects.c:2667 msgid "Compressing objects" msgstr "压缩对象中" -#: builtin/pack-objects.c:2670 +#: builtin/pack-objects.c:2673 msgid "inconsistency with delta count" msgstr "不一致的差异计数" -# -#: builtin/pack-objects.c:2751 +#: builtin/pack-objects.c:2754 #, c-format msgid "" "expected edge object ID, got garbage:\n" @@ -14760,7 +15521,7 @@ msgstr "" "预期边界对象(edge object)ID,却得到垃圾数据:\n" " %s" -#: builtin/pack-objects.c:2757 +#: builtin/pack-objects.c:2760 #, c-format msgid "" "expected object ID, got garbage:\n" @@ -14769,251 +15530,251 @@ msgstr "" "预期对象 ID,却得到垃圾数据:\n" " %s" -#: builtin/pack-objects.c:2855 +#: builtin/pack-objects.c:2858 msgid "invalid value for --missing" msgstr "选项 --missing 的值无效" -#: builtin/pack-objects.c:2914 builtin/pack-objects.c:3022 +#: builtin/pack-objects.c:2917 builtin/pack-objects.c:3025 msgid "cannot open pack index" msgstr "无法打开包文件索引" -#: builtin/pack-objects.c:2945 +#: builtin/pack-objects.c:2948 #, c-format msgid "loose object at %s could not be examined" msgstr "无法检查 %s 处的松散对象" -#: builtin/pack-objects.c:3030 +#: builtin/pack-objects.c:3033 msgid "unable to force loose object" msgstr "无法强制松散对象" -#: builtin/pack-objects.c:3122 +#: builtin/pack-objects.c:3125 #, c-format msgid "not a rev '%s'" msgstr "不是一个版本 '%s'" -#: builtin/pack-objects.c:3125 +#: builtin/pack-objects.c:3128 #, c-format msgid "bad revision '%s'" msgstr "坏的版本 '%s'" -#: builtin/pack-objects.c:3150 +#: builtin/pack-objects.c:3153 msgid "unable to add recent objects" msgstr "无法添加最近的对象" -#: builtin/pack-objects.c:3203 +#: builtin/pack-objects.c:3206 #, c-format msgid "unsupported index version %s" msgstr "不支持的索引版本 %s" -#: builtin/pack-objects.c:3207 +#: builtin/pack-objects.c:3210 #, c-format msgid "bad index version '%s'" msgstr "坏的索引版本 '%s'" -#: builtin/pack-objects.c:3237 +#: builtin/pack-objects.c:3240 msgid "do not show progress meter" msgstr "不显示进度表" -#: builtin/pack-objects.c:3239 +#: builtin/pack-objects.c:3242 msgid "show progress meter" msgstr "显示进度表" -#: builtin/pack-objects.c:3241 +#: builtin/pack-objects.c:3244 msgid "show progress meter during object writing phase" msgstr "在对象写入阶段显示进度表" -#: builtin/pack-objects.c:3244 +#: builtin/pack-objects.c:3247 msgid "similar to --all-progress when progress meter is shown" msgstr "当进度表显示时类似于 --all-progress" -#: builtin/pack-objects.c:3245 +#: builtin/pack-objects.c:3248 msgid "<version>[,<offset>]" msgstr "<版本>[,<偏移>]" -#: builtin/pack-objects.c:3246 +#: builtin/pack-objects.c:3249 msgid "write the pack index file in the specified idx format version" msgstr "用指定的 idx 格式版本来写包索引文件" -#: builtin/pack-objects.c:3249 +#: builtin/pack-objects.c:3252 msgid "maximum size of each output pack file" msgstr "每个输出包的最大尺寸" -#: builtin/pack-objects.c:3251 +#: builtin/pack-objects.c:3254 msgid "ignore borrowed objects from alternate object store" msgstr "忽略从备用对象存储里借用对象" -#: builtin/pack-objects.c:3253 +#: builtin/pack-objects.c:3256 msgid "ignore packed objects" msgstr "忽略包对象" -#: builtin/pack-objects.c:3255 +#: builtin/pack-objects.c:3258 msgid "limit pack window by objects" msgstr "限制打包窗口的对象数" -#: builtin/pack-objects.c:3257 +#: builtin/pack-objects.c:3260 msgid "limit pack window by memory in addition to object limit" msgstr "除对象数量限制外设置打包窗口的内存限制" -#: builtin/pack-objects.c:3259 +#: builtin/pack-objects.c:3262 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "打包允许的 delta 链的最大长度" -#: builtin/pack-objects.c:3261 +#: builtin/pack-objects.c:3264 msgid "reuse existing deltas" msgstr "重用已存在的 deltas" -#: builtin/pack-objects.c:3263 +#: builtin/pack-objects.c:3266 msgid "reuse existing objects" msgstr "重用已存在的对象" -#: builtin/pack-objects.c:3265 +#: builtin/pack-objects.c:3268 msgid "use OFS_DELTA objects" msgstr "使用 OFS_DELTA 对象" -#: builtin/pack-objects.c:3267 +#: builtin/pack-objects.c:3270 msgid "use threads when searching for best delta matches" msgstr "使用线程查询最佳 delta 匹配" -#: builtin/pack-objects.c:3269 +#: builtin/pack-objects.c:3272 msgid "do not create an empty pack output" msgstr "不创建空的包输出" -#: builtin/pack-objects.c:3271 +#: builtin/pack-objects.c:3274 msgid "read revision arguments from standard input" msgstr "从标准输入读取版本号参数" -#: builtin/pack-objects.c:3273 +#: builtin/pack-objects.c:3276 msgid "limit the objects to those that are not yet packed" msgstr "限制那些尚未打包的对象" -#: builtin/pack-objects.c:3276 +#: builtin/pack-objects.c:3279 msgid "include objects reachable from any reference" msgstr "包括可以从任何引用访问到的对象" -#: builtin/pack-objects.c:3279 +#: builtin/pack-objects.c:3282 msgid "include objects referred by reflog entries" msgstr "包括被引用日志引用到的对象" -#: builtin/pack-objects.c:3282 +#: builtin/pack-objects.c:3285 msgid "include objects referred to by the index" msgstr "包括被索引引用到的对象" -#: builtin/pack-objects.c:3285 +#: builtin/pack-objects.c:3288 msgid "output pack to stdout" msgstr "输出包到标准输出" -#: builtin/pack-objects.c:3287 +#: builtin/pack-objects.c:3290 msgid "include tag objects that refer to objects to be packed" msgstr "包括那些引用了待打包对象的标签对象" -#: builtin/pack-objects.c:3289 +#: builtin/pack-objects.c:3292 msgid "keep unreachable objects" msgstr "维持不可达的对象" -#: builtin/pack-objects.c:3291 +#: builtin/pack-objects.c:3294 msgid "pack loose unreachable objects" msgstr "打包松散的不可达对象" -#: builtin/pack-objects.c:3293 +#: builtin/pack-objects.c:3296 msgid "unpack unreachable objects newer than <time>" msgstr "将比给定 <时间> 新的无法访问的对象解包" -#: builtin/pack-objects.c:3296 +#: builtin/pack-objects.c:3299 msgid "use the sparse reachability algorithm" msgstr "使用稀疏可达性算法" -#: builtin/pack-objects.c:3298 +#: builtin/pack-objects.c:3301 msgid "create thin packs" msgstr "创建精简包" -#: builtin/pack-objects.c:3300 +#: builtin/pack-objects.c:3303 msgid "create packs suitable for shallow fetches" msgstr "创建适合浅克隆仓库获取的包" -#: builtin/pack-objects.c:3302 +#: builtin/pack-objects.c:3305 msgid "ignore packs that have companion .keep file" msgstr "忽略配有 .keep 文件的包" -#: builtin/pack-objects.c:3304 +#: builtin/pack-objects.c:3307 msgid "ignore this pack" msgstr "忽略该 pack" -#: builtin/pack-objects.c:3306 +#: builtin/pack-objects.c:3309 msgid "pack compression level" msgstr "打包压缩级别" -#: builtin/pack-objects.c:3308 +#: builtin/pack-objects.c:3311 msgid "do not hide commits by grafts" msgstr "显示被移植隐藏的提交" -#: builtin/pack-objects.c:3310 +#: builtin/pack-objects.c:3313 msgid "use a bitmap index if available to speed up counting objects" msgstr "使用 bitmap 索引(如果有的话)以提高对象计数时的速度" -#: builtin/pack-objects.c:3312 +#: builtin/pack-objects.c:3315 msgid "write a bitmap index together with the pack index" msgstr "在建立包索引的同时创建 bitmap 索引" -#: builtin/pack-objects.c:3315 +#: builtin/pack-objects.c:3318 msgid "handling for missing objects" msgstr "处理丢失的对象" -#: builtin/pack-objects.c:3318 +#: builtin/pack-objects.c:3321 msgid "do not pack objects in promisor packfiles" msgstr "不要打包 promisor 包文件中的对象" -#: builtin/pack-objects.c:3320 +#: builtin/pack-objects.c:3323 msgid "respect islands during delta compression" msgstr "在增量压缩时参考数据岛" -#: builtin/pack-objects.c:3345 +#: builtin/pack-objects.c:3348 #, c-format msgid "delta chain depth %d is too deep, forcing %d" msgstr "增量链深度 %d 太深了,强制为 %d" -#: builtin/pack-objects.c:3350 +#: builtin/pack-objects.c:3353 #, c-format msgid "pack.deltaCacheLimit is too high, forcing %d" msgstr "配置 pack.deltaCacheLimit 太高了,强制为 %d" -#: builtin/pack-objects.c:3404 +#: builtin/pack-objects.c:3407 msgid "--max-pack-size cannot be used to build a pack for transfer" msgstr "不能使用 --max-pack-size 来构建传输用的包文件" -#: builtin/pack-objects.c:3406 +#: builtin/pack-objects.c:3409 msgid "minimum pack size limit is 1 MiB" msgstr "最小的包文件大小是 1 MiB" -#: builtin/pack-objects.c:3411 +#: builtin/pack-objects.c:3414 msgid "--thin cannot be used to build an indexable pack" msgstr "--thin 不能用于创建一个可索引包" -#: builtin/pack-objects.c:3414 +#: builtin/pack-objects.c:3417 msgid "--keep-unreachable and --unpack-unreachable are incompatible" msgstr "--keep-unreachable 和 --unpack-unreachable 不兼容" -#: builtin/pack-objects.c:3420 +#: builtin/pack-objects.c:3423 msgid "cannot use --filter without --stdout" msgstr "不能在没有 --stdout 的情况下使用 --filter" -#: builtin/pack-objects.c:3479 +#: builtin/pack-objects.c:3484 msgid "Enumerating objects" msgstr "枚举对象" -#: builtin/pack-objects.c:3498 +#: builtin/pack-objects.c:3514 #, c-format msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)" msgstr "总共 %<PRIu32> (差异 %<PRIu32>),复用 %<PRIu32> (差异 %<PRIu32>)" -#: builtin/pack-refs.c:7 +#: builtin/pack-refs.c:8 msgid "git pack-refs [<options>]" msgstr "git pack-refs [<选项>]" -#: builtin/pack-refs.c:15 +#: builtin/pack-refs.c:16 msgid "pack everything" msgstr "打包一切" -#: builtin/pack-refs.c:16 +#: builtin/pack-refs.c:17 msgid "prune loose refs (default)" msgstr "清除松散的引用(默认)" @@ -15029,86 +15790,86 @@ msgstr "正在删除重复对象" msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--progress] [--expire <时间>] [--] [<head>...]" -#: builtin/prune.c:109 +#: builtin/prune.c:131 msgid "report pruned objects" msgstr "报告清除的对象" -#: builtin/prune.c:112 +#: builtin/prune.c:134 msgid "expire objects older than <time>" msgstr "使早于给定时间的对象过期" -#: builtin/prune.c:114 +#: builtin/prune.c:136 msgid "limit traversal to objects outside promisor packfiles" msgstr "限制遍历 promisor 包以外的对象" -#: builtin/prune.c:128 +#: builtin/prune.c:150 msgid "cannot prune in a precious-objects repo" msgstr "不能在珍品仓库中执行清理操作" -#: builtin/pull.c:61 builtin/pull.c:63 +#: builtin/pull.c:66 builtin/pull.c:68 #, c-format msgid "Invalid value for %s: %s" msgstr "%s 的值无效:%s" -#: builtin/pull.c:83 +#: builtin/pull.c:88 msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "git pull [<选项>] [<仓库> [<引用规格>...]]" -#: builtin/pull.c:134 +#: builtin/pull.c:140 msgid "control for recursive fetching of submodules" msgstr "控制子模组的递归获取" -#: builtin/pull.c:138 +#: builtin/pull.c:144 msgid "Options related to merging" msgstr "和合并相关的选项" -#: builtin/pull.c:141 +#: builtin/pull.c:147 msgid "incorporate changes by rebasing rather than merging" msgstr "使用变基操作取代合并操作以合入修改" -#: builtin/pull.c:168 builtin/rebase--interactive.c:149 builtin/revert.c:123 +#: builtin/pull.c:175 builtin/rebase.c:447 builtin/revert.c:125 msgid "allow fast-forward" msgstr "允许快进式" -#: builtin/pull.c:177 +#: builtin/pull.c:184 msgid "automatically stash/stash pop before and after rebase" msgstr "变基操作前后执行自动贮藏和弹出贮藏" -#: builtin/pull.c:193 +#: builtin/pull.c:200 msgid "Options related to fetching" msgstr "和获取相关的参数" -#: builtin/pull.c:203 +#: builtin/pull.c:210 msgid "force overwrite of local branch" msgstr "强制覆盖本地分支" -#: builtin/pull.c:211 +#: builtin/pull.c:218 msgid "number of submodules pulled in parallel" msgstr "并发拉取的子模组的数量" -#: builtin/pull.c:306 +#: builtin/pull.c:313 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "pull.ff 的取值无效:%s" -#: builtin/pull.c:422 +#: builtin/pull.c:430 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." msgstr "在您刚刚获取到的引用中没有变基操作的候选。" -#: builtin/pull.c:424 +#: builtin/pull.c:432 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "在您刚刚获取到的引用中没有合并操作的候选。" -#: builtin/pull.c:425 +#: builtin/pull.c:433 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." msgstr "通常这意味着您提供了一个通配符引用规格但未能和远端匹配。" -#: builtin/pull.c:428 +#: builtin/pull.c:436 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -15118,42 +15879,42 @@ msgstr "" "您要求从远程 '%s' 拉取,但是未指定一个分支。因为这不是当前\n" "分支默认的远程仓库,您必须在命令行中指定一个分支名。" -#: builtin/pull.c:433 builtin/rebase.c:956 git-parse-remote.sh:73 +#: builtin/pull.c:441 builtin/rebase.c:1321 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "您当前不在一个分支上。" -#: builtin/pull.c:435 builtin/pull.c:450 git-parse-remote.sh:79 +#: builtin/pull.c:443 builtin/pull.c:458 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." msgstr "请指定您要变基到哪一个分支。" -#: builtin/pull.c:437 builtin/pull.c:452 git-parse-remote.sh:82 +#: builtin/pull.c:445 builtin/pull.c:460 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." msgstr "请指定您要合并哪一个分支。" -#: builtin/pull.c:438 builtin/pull.c:453 +#: builtin/pull.c:446 builtin/pull.c:461 msgid "See git-pull(1) for details." msgstr "详见 git-pull(1)。" -#: builtin/pull.c:440 builtin/pull.c:446 builtin/pull.c:455 -#: builtin/rebase.c:962 git-parse-remote.sh:64 +#: builtin/pull.c:448 builtin/pull.c:454 builtin/pull.c:463 +#: builtin/rebase.c:1327 git-parse-remote.sh:64 msgid "<remote>" msgstr "<远程>" -#: builtin/pull.c:440 builtin/pull.c:455 builtin/pull.c:460 -#: git-legacy-rebase.sh:564 git-parse-remote.sh:65 +#: builtin/pull.c:448 builtin/pull.c:463 builtin/pull.c:468 +#: git-parse-remote.sh:65 msgid "<branch>" msgstr "<分支>" -#: builtin/pull.c:448 builtin/rebase.c:954 git-parse-remote.sh:75 +#: builtin/pull.c:456 builtin/rebase.c:1319 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "当前分支没有跟踪信息。" -#: builtin/pull.c:457 git-parse-remote.sh:95 +#: builtin/pull.c:465 git-parse-remote.sh:95 msgid "" "If you wish to set tracking information for this branch you can do so with:" msgstr "如果您想要为此分支创建跟踪信息,您可以执行:" -#: builtin/pull.c:462 +#: builtin/pull.c:470 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -15162,32 +15923,32 @@ msgstr "" "您的配置中指定要合并远程的引用 '%s',\n" "但是没有获取到这个引用。" -#: builtin/pull.c:566 +#: builtin/pull.c:574 #, c-format msgid "unable to access commit %s" msgstr "无法访问提交 %s" -#: builtin/pull.c:844 +#: builtin/pull.c:854 msgid "ignoring --verify-signatures for rebase" msgstr "为变基操作忽略 --verify-signatures" -#: builtin/pull.c:892 +#: builtin/pull.c:909 msgid "--[no-]autostash option is only valid with --rebase." msgstr "--[no-]autostash 选项只在使用 --rebase 时有效。" -#: builtin/pull.c:900 +#: builtin/pull.c:917 msgid "Updating an unborn branch with changes added to the index." msgstr "更新尚未诞生的分支,变更添加至索引。" -#: builtin/pull.c:904 +#: builtin/pull.c:921 msgid "pull with rebase" msgstr "变基式拉取" -#: builtin/pull.c:905 +#: builtin/pull.c:922 msgid "please commit or stash them." msgstr "请提交或贮藏它们。" -#: builtin/pull.c:930 +#: builtin/pull.c:947 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -15197,7 +15958,7 @@ msgstr "" "fetch 更新了当前的分支。快进您的工作区\n" "至提交 %s。" -#: builtin/pull.c:936 +#: builtin/pull.c:953 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -15214,15 +15975,15 @@ msgstr "" "$ git reset --hard\n" "恢复之前的状态。" -#: builtin/pull.c:951 +#: builtin/pull.c:968 msgid "Cannot merge multiple branches into empty head." msgstr "无法将多个分支合并到空分支。" -#: builtin/pull.c:955 +#: builtin/pull.c:972 msgid "Cannot rebase onto multiple branches." msgstr "无法变基到多个分支。" -#: builtin/pull.c:962 +#: builtin/pull.c:979 msgid "cannot rebase with locally recorded submodule modifications" msgstr "本地子模组中有修改,无法变基" @@ -15522,16 +16283,16 @@ msgstr "创建权重的百分比" msgid "use simple diff colors" msgstr "使用简单差异颜色" -#: builtin/range-diff.c:61 builtin/range-diff.c:65 +#: builtin/range-diff.c:46 builtin/range-diff.c:50 #, c-format msgid "no .. in range: '%s'" msgstr "没有在范围中使用 ..:'%s'" -#: builtin/range-diff.c:75 +#: builtin/range-diff.c:60 msgid "single arg format must be symmetric range" msgstr "单个参数格式必须是对称范围(即包含...)" -#: builtin/range-diff.c:90 +#: builtin/range-diff.c:75 msgid "need two commit ranges" msgstr "需要两个提交范围" @@ -15609,58 +16370,237 @@ msgstr "跳过应用稀疏检出过滤器" msgid "debug unpack-trees" msgstr "调试 unpack-trees" -#: builtin/rebase.c:30 +#: builtin/read-tree.c:157 +msgid "suppress feedback messages" +msgstr "抑制反馈信息" + +#: builtin/rebase.c:32 msgid "" "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] " "[<branch>]" msgstr "" "git rebase [-i] [选项] [--exec <命令>] [--onto <新基线>] [<上游>] [<分支>]" -#: builtin/rebase.c:32 +#: builtin/rebase.c:34 msgid "" "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]" msgstr "" "git rebase [-i] [选项] [--exec <命令>] [--onto <新基线>] --root [<分支>]" -#: builtin/rebase.c:34 +#: builtin/rebase.c:36 msgid "git rebase --continue | --abort | --skip | --edit-todo" msgstr "git rebase --continue | --abort | --skip | --edit-todo" -#: builtin/rebase.c:121 builtin/rebase.c:1437 +#: builtin/rebase.c:158 builtin/rebase.c:182 builtin/rebase.c:209 +#, 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 "不能写入 '%s'。" + +#: builtin/rebase.c:252 +msgid "no HEAD?" +msgstr "没有 HEAD?" + +#: builtin/rebase.c:279 +#, c-format +msgid "could not create temporary %s" +msgstr "无法创建临时的 %s" + +#: builtin/rebase.c:285 +msgid "could not mark as interactive" +msgstr "无法标记为交互式" + +#: builtin/rebase.c:343 +msgid "could not generate todo list" +msgstr "无法生成待办列表" + +#: builtin/rebase.c:382 +msgid "a base commit must be provided with --upstream or --onto" +msgstr "使用 --upstream 或 --onto 必须提供一个基线提交" + +#: builtin/rebase.c:437 +msgid "git rebase--interactive [<options>]" +msgstr "git rebase--interactive [<选项>]" + +#: builtin/rebase.c:449 +msgid "keep empty commits" +msgstr "保持空提交" + +#: builtin/rebase.c:451 builtin/revert.c:127 +msgid "allow commits with empty messages" +msgstr "允许提交说明为空" + +#: builtin/rebase.c:452 +msgid "rebase merge commits" +msgstr "对合并提交变基" + +#: builtin/rebase.c:454 +msgid "keep original branch points of cousins" +msgstr "保持兄弟提交的原始分支点" + +#: builtin/rebase.c:456 +msgid "move commits that begin with squash!/fixup!" +msgstr "移动以 squash!/fixup! 开头的提交" + +#: builtin/rebase.c:457 +msgid "sign commits" +msgstr "签名提交" + +#: builtin/rebase.c:459 builtin/rebase.c:1397 +msgid "display a diffstat of what changed upstream" +msgstr "显示上游变化的差异统计" + +#: builtin/rebase.c:461 +msgid "continue rebase" +msgstr "继续变基" + +#: builtin/rebase.c:463 +msgid "skip commit" +msgstr "跳过提交" + +#: builtin/rebase.c:464 +msgid "edit the todo list" +msgstr "变基待办列表" + +#: builtin/rebase.c:466 +msgid "show the current patch" +msgstr "显示当前补丁" + +#: builtin/rebase.c:469 +msgid "shorten commit ids in the todo list" +msgstr "缩短待办列表中的提交号" + +#: builtin/rebase.c:471 +msgid "expand commit ids in the todo list" +msgstr "扩展待办列表中的提交号" + +#: builtin/rebase.c:473 +msgid "check the todo list" +msgstr "检查待办列表" + +#: builtin/rebase.c:475 +msgid "rearrange fixup/squash lines" +msgstr "重新排列 fixup/squash 行" + +#: builtin/rebase.c:477 +msgid "insert exec commands in todo list" +msgstr "在待办列表中插入 exec 执行命令" + +#: builtin/rebase.c:478 +msgid "onto" +msgstr "onto" + +#: builtin/rebase.c:481 +msgid "restrict-revision" +msgstr "restrict-revision" + +#: builtin/rebase.c:481 +msgid "restrict revision" +msgstr "限制版本" + +#: builtin/rebase.c:483 +msgid "squash-onto" +msgstr "squash-onto" + +#: builtin/rebase.c:484 +msgid "squash onto" +msgstr "squash onto" + +#: builtin/rebase.c:486 +msgid "the upstream commit" +msgstr "上游提交" + +#: builtin/rebase.c:488 +msgid "head-name" +msgstr "head-name" + +#: builtin/rebase.c:488 +msgid "head name" +msgstr "head 名称" + +#: builtin/rebase.c:493 +msgid "rebase strategy" +msgstr "变基策略" + +#: builtin/rebase.c:494 +msgid "strategy-opts" +msgstr "strategy-opts" + +#: builtin/rebase.c:495 +msgid "strategy options" +msgstr "策略选项" + +#: builtin/rebase.c:496 +msgid "switch-to" +msgstr "切换到" + +#: builtin/rebase.c:497 +msgid "the branch or commit to checkout" +msgstr "要检出的分支或提交" + +#: builtin/rebase.c:498 +msgid "onto-name" +msgstr "onto-name" + +#: builtin/rebase.c:498 +msgid "onto name" +msgstr "onto name" + +#: builtin/rebase.c:499 +msgid "cmd" +msgstr "cmd" + +#: builtin/rebase.c:499 +msgid "the command to run" +msgstr "要执行的命令" + +#: builtin/rebase.c:502 builtin/rebase.c:1480 +msgid "automatically re-schedule any `exec` that fails" +msgstr "自动重新安排任何失败的 `exec`" + +#: builtin/rebase.c:518 +msgid "--[no-]rebase-cousins has no effect without --rebase-merges" +msgstr "不使用 --rebase-merges,则 --[no-]rebase-cousins 没有效果" + +#: builtin/rebase.c:534 builtin/rebase.c:1787 #, c-format msgid "%s requires an interactive rebase" msgstr "%s 需要交互式变基" -#: builtin/rebase.c:173 +#: builtin/rebase.c:586 #, c-format msgid "could not get 'onto': '%s'" msgstr "无法获取 'onto':'%s'" -#: builtin/rebase.c:188 +#: builtin/rebase.c:601 #, c-format msgid "invalid orig-head: '%s'" msgstr "无效的原始 head:'%s'" -#: builtin/rebase.c:213 +#: builtin/rebase.c:626 #, c-format msgid "ignoring invalid allow_rerere_autoupdate: '%s'" msgstr "忽略无效的 allow_rerere_autoupdate:'%s'" -#: builtin/rebase.c:289 +#: builtin/rebase.c:702 #, c-format msgid "Could not read '%s'" msgstr "不能读取 '%s'" -#: builtin/rebase.c:307 +#: builtin/rebase.c:720 #, c-format msgid "Cannot store %s" msgstr "不能存储 %s" -#: builtin/rebase.c:402 +#: builtin/rebase.c:817 msgid "could not determine HEAD revision" msgstr "不能确定 HEAD 版本" -#: builtin/rebase.c:522 +#: builtin/rebase.c:940 msgid "" "Resolve all conflicts manually, mark them as resolved with\n" "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n" @@ -15673,7 +16613,7 @@ msgstr "" "\"git rebase --skip\" 命令跳过这个提交。如果想要终止执行并回到\n" "\"git rebase\" 执行之前的状态,执行 \"git rebase --abort\"。" -#: builtin/rebase.c:603 +#: builtin/rebase.c:1021 #, c-format msgid "" "\n" @@ -15691,7 +16631,7 @@ msgstr "" "\n" "因此 git 无法对其变基。" -#: builtin/rebase.c:948 +#: builtin/rebase.c:1313 #, c-format msgid "" "%s\n" @@ -15708,7 +16648,7 @@ msgstr "" " git rebase '<branch>'\n" "\n" -#: builtin/rebase.c:964 +#: builtin/rebase.c:1329 #, c-format msgid "" "If you wish to set tracking information for this branch you can do so with:\n" @@ -15721,161 +16661,157 @@ msgstr "" " git branch --set-upstream-to=%s/<branch> %s\n" "\n" -#: builtin/rebase.c:994 +#: builtin/rebase.c:1359 msgid "exec commands cannot contain newlines" msgstr "exec 命令不能包含换行符" -#: builtin/rebase.c:998 +#: builtin/rebase.c:1363 msgid "empty exec command" msgstr "空的 exec 命令" -#: builtin/rebase.c:1040 +#: builtin/rebase.c:1390 msgid "rebase onto given branch instead of upstream" msgstr "变基到给定的分支而非上游" -#: builtin/rebase.c:1042 +#: builtin/rebase.c:1392 msgid "allow pre-rebase hook to run" msgstr "允许执行 pre-rebase 钩子" -#: builtin/rebase.c:1044 +#: builtin/rebase.c:1394 msgid "be quiet. implies --no-stat" msgstr "安静。暗示 --no-stat" -#: builtin/rebase.c:1047 -msgid "display a diffstat of what changed upstream" -msgstr "显示上游变化的 diffstat" - -#: builtin/rebase.c:1050 +#: builtin/rebase.c:1400 msgid "do not show diffstat of what changed upstream" -msgstr "不显示上游变化的 diffstat" +msgstr "不显示上游变化的差异统计" -#: builtin/rebase.c:1053 +#: builtin/rebase.c:1403 msgid "add a Signed-off-by: line to each commit" msgstr "为每一个提交添加一个 Signed-off-by: 签名" -#: builtin/rebase.c:1055 builtin/rebase.c:1059 builtin/rebase.c:1061 +#: builtin/rebase.c:1405 builtin/rebase.c:1409 builtin/rebase.c:1411 msgid "passed to 'git am'" msgstr "传递给 'git am'" -#: builtin/rebase.c:1063 builtin/rebase.c:1065 +#: builtin/rebase.c:1413 builtin/rebase.c:1415 msgid "passed to 'git apply'" msgstr "传递给 'git apply'" -#: builtin/rebase.c:1067 builtin/rebase.c:1070 +#: builtin/rebase.c:1417 builtin/rebase.c:1420 msgid "cherry-pick all commits, even if unchanged" msgstr "拣选所有提交,即使未修改" -#: builtin/rebase.c:1072 +#: builtin/rebase.c:1422 msgid "continue" msgstr "继续" -#: builtin/rebase.c:1075 +#: builtin/rebase.c:1425 msgid "skip current patch and continue" msgstr "跳过当前补丁并继续" # 译者:注意保持前导空格 -#: builtin/rebase.c:1077 +#: builtin/rebase.c:1427 msgid "abort and check out the original branch" msgstr "终止并检出原有分支" -#: builtin/rebase.c:1080 +#: builtin/rebase.c:1430 msgid "abort but keep HEAD where it is" msgstr "终止但保持 HEAD 不变" -#: builtin/rebase.c:1081 +#: builtin/rebase.c:1431 msgid "edit the todo list during an interactive rebase" msgstr "在交互式变基中编辑待办列表" -#: builtin/rebase.c:1084 +#: builtin/rebase.c:1434 msgid "show the patch file being applied or merged" msgstr "显示正在应用或合并的补丁文件" -#: builtin/rebase.c:1087 +#: builtin/rebase.c:1437 msgid "use merging strategies to rebase" msgstr "使用合并策略进行变基" -#: builtin/rebase.c:1091 +#: builtin/rebase.c:1441 msgid "let the user edit the list of commits to rebase" msgstr "让用户编辑要变基的提交列表" -#: builtin/rebase.c:1095 -msgid "try to recreate merges instead of ignoring them" -msgstr "尝试重建合并提交而非忽略它们" +#: builtin/rebase.c:1445 +msgid "(DEPRECATED) try to recreate merges instead of ignoring them" +msgstr "(已弃用)尝试重建合并提交而非忽略它们" -#: builtin/rebase.c:1099 -msgid "allow rerere to update index with resolved conflict" -msgstr "允许 rerere 用已解决的冲突更新索引" - -#: builtin/rebase.c:1102 +#: builtin/rebase.c:1449 msgid "preserve empty commits during rebase" msgstr "变基时保留空提交" -#: builtin/rebase.c:1104 +#: builtin/rebase.c:1451 msgid "move commits that begin with squash!/fixup! under -i" msgstr "在 -i 交互模式下,移动以 squash!/fixup! 开头的提交" -#: builtin/rebase.c:1110 +#: builtin/rebase.c:1457 msgid "automatically stash/stash pop before and after" msgstr "在操作前后执行自动贮藏和弹出贮藏" -#: builtin/rebase.c:1112 +#: builtin/rebase.c:1459 msgid "add exec lines after each commit of the editable list" msgstr "可编辑列表的每一个提交下面增加一行 exec" -#: builtin/rebase.c:1116 +#: builtin/rebase.c:1463 msgid "allow rebasing commits with empty messages" msgstr "允许针对空提交说明的提交变基" -#: builtin/rebase.c:1119 +#: builtin/rebase.c:1466 msgid "try to rebase merges instead of skipping them" msgstr "尝试对合并提交变基而不是忽略它们" -#: builtin/rebase.c:1122 +#: builtin/rebase.c:1469 msgid "use 'merge-base --fork-point' to refine upstream" msgstr "使用 'merge-base --fork-point' 来优化上游" -#: builtin/rebase.c:1124 +#: builtin/rebase.c:1471 msgid "use the given merge strategy" msgstr "使用给定的合并策略" -#: builtin/rebase.c:1126 builtin/revert.c:112 +#: builtin/rebase.c:1473 builtin/revert.c:114 msgid "option" msgstr "选项" -#: builtin/rebase.c:1127 +#: builtin/rebase.c:1474 msgid "pass the argument through to the merge strategy" msgstr "将参数传递给合并策略" -#: builtin/rebase.c:1130 +#: builtin/rebase.c:1477 msgid "rebase all reachable commits up to the root(s)" msgstr "将所有可达的提交变基到根提交" -#: builtin/rebase.c:1133 builtin/rebase--interactive.c:198 -msgid "automatically re-schedule any `exec` that fails" -msgstr "自动重新安排任何失败的 `exec`" - -#: builtin/rebase.c:1149 -#, c-format -msgid "could not exec %s" -msgstr "不能执行 %s" +#: builtin/rebase.c:1498 +msgid "" +"the rebase.useBuiltin support has been removed!\n" +"See its entry in 'git help config' for details." +msgstr "" +"对 rebase.useBuiltin 的支持已被删除!\n" +"详见 'git help config' 中的条目。" -#: builtin/rebase.c:1167 git-legacy-rebase.sh:220 +#: builtin/rebase.c:1504 msgid "It looks like 'git am' is in progress. Cannot rebase." msgstr "看起来 'git-am' 正在执行中。无法变基。" -#: builtin/rebase.c:1208 git-legacy-rebase.sh:406 +#: builtin/rebase.c:1545 +msgid "" +"git rebase --preserve-merges is deprecated. Use --rebase-merges instead." +msgstr "git rebase --preserve-merges 被弃用。用 --rebase-merges 代替。" + +#: builtin/rebase.c:1549 msgid "No rebase in progress?" msgstr "没有正在进行的变基?" -#: builtin/rebase.c:1212 git-legacy-rebase.sh:417 +#: builtin/rebase.c:1553 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "动作 --edit-todo 只能用在交互式变基过程中。" -#: builtin/rebase.c:1226 git-legacy-rebase.sh:424 +#: builtin/rebase.c:1576 msgid "Cannot read HEAD" msgstr "不能读取 HEAD" -#: builtin/rebase.c:1238 git-legacy-rebase.sh:427 +#: builtin/rebase.c:1588 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -15883,21 +16819,21 @@ msgstr "" "您必须编辑所有的合并冲突,然后通过 git add\n" "命令将它们标记为已解决" -#: builtin/rebase.c:1257 +#: builtin/rebase.c:1607 msgid "could not discard worktree changes" msgstr "无法丢弃工作区变更" -#: builtin/rebase.c:1276 +#: builtin/rebase.c:1626 #, c-format msgid "could not move back to %s" msgstr "无法移回 %s" -#: builtin/rebase.c:1287 builtin/rm.c:369 +#: builtin/rebase.c:1637 builtin/rm.c:369 #, c-format msgid "could not remove '%s'" msgstr "无法删除 '%s'" -#: builtin/rebase.c:1313 +#: builtin/rebase.c:1663 #, c-format msgid "" "It seems that there is already a %s directory, and\n" @@ -15916,332 +16852,168 @@ msgstr "" "\t%s\n" "然后再重新执行。 为避免丢失重要数据,我已经停止当前操作。\n" -#: builtin/rebase.c:1334 +#: builtin/rebase.c:1684 msgid "switch `C' expects a numerical value" msgstr "开关 `C' 期望一个数字值" -#: builtin/rebase.c:1375 +#: builtin/rebase.c:1725 #, c-format msgid "Unknown mode: %s" msgstr "未知模式:%s" -#: builtin/rebase.c:1397 +#: builtin/rebase.c:1747 msgid "--strategy requires --merge or --interactive" msgstr "--strategy 需要 --merge 或 --interactive" -#: builtin/rebase.c:1446 +#: builtin/rebase.c:1796 msgid "cannot combine am options with either interactive or merge options" -msgstr "不能将 am 选项与交互或合并选项组合一起" +msgstr "不能将 am 选项与交互或合并选项同时使用" -#: builtin/rebase.c:1465 +#: builtin/rebase.c:1815 msgid "cannot combine '--preserve-merges' with '--rebase-merges'" -msgstr "不能将 '--preserve-merges' 和 '--rebase-merges' 组合一起" +msgstr "不能将 '--preserve-merges' 和 '--rebase-merges' 同时使用" -#: builtin/rebase.c:1469 git-legacy-rebase.sh:544 +#: builtin/rebase.c:1819 msgid "" "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'" msgstr "" -"错误:不能将 '--preserve-merges' 和 '--reschedule-failed-exec' 组合一起" +"错误:不能将 '--preserve-merges' 和 '--reschedule-failed-exec' 同时使用" -#: builtin/rebase.c:1475 +#: builtin/rebase.c:1825 msgid "cannot combine '--rebase-merges' with '--strategy-option'" -msgstr "不能将 '--rebase-merges' 和 '--strategy-option' 组合一起" +msgstr "不能将 '--rebase-merges' 和 '--strategy-option' 同时使用" -#: builtin/rebase.c:1478 +#: builtin/rebase.c:1828 msgid "cannot combine '--rebase-merges' with '--strategy'" -msgstr "不能将 '--rebase-merges' 和 '--strategy' 组合一起" +msgstr "不能将 '--rebase-merges' 和 '--strategy' 同时使用" -#: builtin/rebase.c:1502 +#: builtin/rebase.c:1852 #, c-format msgid "invalid upstream '%s'" msgstr "无效的上游 '%s'" -#: builtin/rebase.c:1508 +#: builtin/rebase.c:1858 msgid "Could not create new root commit" msgstr "不能创建新的根提交" -#: builtin/rebase.c:1526 +#: builtin/rebase.c:1876 #, c-format msgid "'%s': need exactly one merge base" msgstr "'%s':只需要一个合并基线" -#: builtin/rebase.c:1533 +#: builtin/rebase.c:1883 #, c-format msgid "Does not point to a valid commit '%s'" msgstr "没有指向一个有效的提交 '%s'" -#: builtin/rebase.c:1558 +#: builtin/rebase.c:1908 #, c-format msgid "fatal: no such branch/commit '%s'" msgstr "致命错误:无此分支/提交 '%s'" -#: builtin/rebase.c:1566 builtin/submodule--helper.c:38 -#: builtin/submodule--helper.c:1934 +#: builtin/rebase.c:1916 builtin/submodule--helper.c:38 +#: builtin/submodule--helper.c:1933 #, c-format msgid "No such ref: %s" msgstr "没有这样的引用:%s" -#: builtin/rebase.c:1578 +#: builtin/rebase.c:1927 msgid "Could not resolve HEAD to a revision" msgstr "无法将 HEAD 解析为一个版本" -#: builtin/rebase.c:1619 git-legacy-rebase.sh:673 +#: builtin/rebase.c:1968 msgid "Cannot autostash" msgstr "无法 autostash" -#: builtin/rebase.c:1622 +#: builtin/rebase.c:1971 #, c-format msgid "Unexpected stash response: '%s'" msgstr "意外的 stash 响应:'%s'" -#: builtin/rebase.c:1628 +#: builtin/rebase.c:1977 #, c-format msgid "Could not create directory for '%s'" msgstr "不能为 '%s' 创建目录" -#: builtin/rebase.c:1631 +#: builtin/rebase.c:1980 #, c-format msgid "Created autostash: %s\n" msgstr "创建了 autostash:%s\n" -#: builtin/rebase.c:1634 +#: builtin/rebase.c:1983 msgid "could not reset --hard" msgstr "无法 reset --hard" -#: builtin/rebase.c:1635 builtin/reset.c:114 +#: builtin/rebase.c:1984 builtin/reset.c:114 #, c-format msgid "HEAD is now at %s" msgstr "HEAD 现在位于 %s" -#: builtin/rebase.c:1651 git-legacy-rebase.sh:682 +#: builtin/rebase.c:2000 msgid "Please commit or stash them." msgstr "请提交或贮藏修改。" -#: builtin/rebase.c:1678 +#: builtin/rebase.c:2027 #, c-format msgid "could not parse '%s'" msgstr "无法解析 '%s'" -#: builtin/rebase.c:1691 +#: builtin/rebase.c:2040 #, c-format msgid "could not switch to %s" msgstr "无法切换到 %s" -#: builtin/rebase.c:1702 git-legacy-rebase.sh:705 -#, sh-format +#: builtin/rebase.c:2051 msgid "HEAD is up to date." msgstr "HEAD 是最新的。" -#: builtin/rebase.c:1704 +#: builtin/rebase.c:2053 #, c-format msgid "Current branch %s is up to date.\n" msgstr "当前分支 %s 是最新的。\n" -#: builtin/rebase.c:1712 git-legacy-rebase.sh:715 -#, sh-format +#: builtin/rebase.c:2061 msgid "HEAD is up to date, rebase forced." msgstr "HEAD 是最新的,强制变基。" -#: builtin/rebase.c:1714 +#: builtin/rebase.c:2063 #, c-format msgid "Current branch %s is up to date, rebase forced.\n" msgstr "当前分支 %s 是最新的,强制变基。\n" -#: builtin/rebase.c:1722 git-legacy-rebase.sh:215 +#: builtin/rebase.c:2071 msgid "The pre-rebase hook refused to rebase." msgstr "pre-rebase 钩子拒绝了变基操作。" -#: builtin/rebase.c:1729 +#: builtin/rebase.c:2078 #, c-format msgid "Changes to %s:\n" msgstr "到 %s 的变更:\n" -#: builtin/rebase.c:1732 +#: builtin/rebase.c:2081 #, c-format msgid "Changes from %s to %s:\n" msgstr "从 %s 到 %s 的变更:\n" -#: builtin/rebase.c:1757 +#: builtin/rebase.c:2106 #, c-format msgid "First, rewinding head to replay your work on top of it...\n" msgstr "首先,回退头指针以便在其上重放您的工作...\n" -#: builtin/rebase.c:1765 +#: builtin/rebase.c:2115 msgid "Could not detach HEAD" msgstr "无法分离头指针" -#: builtin/rebase.c:1774 +#: builtin/rebase.c:2124 #, c-format msgid "Fast-forwarded %s to %s.\n" msgstr "快进 %s 到 %s。\n" -#: builtin/rebase--interactive.c:25 -msgid "no HEAD?" -msgstr "没有 HEAD?" - -#: builtin/rebase--interactive.c:52 -#, c-format -msgid "could not create temporary %s" -msgstr "无法创建临时的 %s" - -#: builtin/rebase--interactive.c:58 -msgid "could not mark as interactive" -msgstr "无法标记为交互式" - -#: builtin/rebase--interactive.c:102 -#, c-format -msgid "could not open %s" -msgstr "无法打开 %s" - -#: builtin/rebase--interactive.c:115 -msgid "could not generate todo list" -msgstr "无法生成待办列表" - -#: builtin/rebase--interactive.c:131 -msgid "git rebase--interactive [<options>]" -msgstr "git rebase--interactive [<选项>]" - -#: builtin/rebase--interactive.c:150 -msgid "keep empty commits" -msgstr "保持空提交" - -#: builtin/rebase--interactive.c:152 builtin/revert.c:125 -msgid "allow commits with empty messages" -msgstr "允许提交说明为空" - -#: builtin/rebase--interactive.c:153 -msgid "rebase merge commits" -msgstr "对合并提交变基" - -#: builtin/rebase--interactive.c:155 -msgid "keep original branch points of cousins" -msgstr "保持兄弟提交的原始分支点" - -#: builtin/rebase--interactive.c:157 -msgid "move commits that begin with squash!/fixup!" -msgstr "移动以 squash!/fixup! 开头的提交" - -#: builtin/rebase--interactive.c:158 -msgid "sign commits" -msgstr "签名提交" - -#: builtin/rebase--interactive.c:160 -msgid "continue rebase" -msgstr "继续变基" - -#: builtin/rebase--interactive.c:162 -msgid "skip commit" -msgstr "跳过提交" - -#: builtin/rebase--interactive.c:163 -msgid "edit the todo list" -msgstr "变基待办列表" - -#: builtin/rebase--interactive.c:165 -msgid "show the current patch" -msgstr "显示当前补丁" - -#: builtin/rebase--interactive.c:168 -msgid "shorten commit ids in the todo list" -msgstr "缩短待办列表中的提交号" - -#: builtin/rebase--interactive.c:170 -msgid "expand commit ids in the todo list" -msgstr "扩展待办列表中的提交号" - -#: builtin/rebase--interactive.c:172 -msgid "check the todo list" -msgstr "检查待办列表" - -#: builtin/rebase--interactive.c:174 -msgid "rearrange fixup/squash lines" -msgstr "重新排列 fixup/squash 行" - -#: builtin/rebase--interactive.c:176 -msgid "insert exec commands in todo list" -msgstr "在待办列表中插入 exec 执行命令" - -#: builtin/rebase--interactive.c:177 -msgid "onto" -msgstr "onto" - -#: builtin/rebase--interactive.c:179 -msgid "restrict-revision" -msgstr "restrict-revision" - -#: builtin/rebase--interactive.c:179 -msgid "restrict revision" -msgstr "限制版本" - -#: builtin/rebase--interactive.c:180 -msgid "squash-onto" -msgstr "squash-onto" - -#: builtin/rebase--interactive.c:181 -msgid "squash onto" -msgstr "squash onto" - -#: builtin/rebase--interactive.c:183 -msgid "the upstream commit" -msgstr "上游提交" - -#: builtin/rebase--interactive.c:184 -msgid "head-name" -msgstr "head-name" - -#: builtin/rebase--interactive.c:184 -msgid "head name" -msgstr "head 名称" - -#: builtin/rebase--interactive.c:189 -msgid "rebase strategy" -msgstr "变基策略" - -#: builtin/rebase--interactive.c:190 -msgid "strategy-opts" -msgstr "strategy-opts" - -#: builtin/rebase--interactive.c:191 -msgid "strategy options" -msgstr "策略选项" - -#: builtin/rebase--interactive.c:192 -msgid "switch-to" -msgstr "切换到" - -#: builtin/rebase--interactive.c:193 -msgid "the branch or commit to checkout" -msgstr "要检出的分支或提交" - -#: builtin/rebase--interactive.c:194 -msgid "onto-name" -msgstr "onto-name" - -#: builtin/rebase--interactive.c:194 -msgid "onto name" -msgstr "onto name" - -#: builtin/rebase--interactive.c:195 -msgid "cmd" -msgstr "cmd" - -#: builtin/rebase--interactive.c:195 -msgid "the command to run" -msgstr "要执行的命令" - -#: builtin/rebase--interactive.c:224 -msgid "--[no-]rebase-cousins has no effect without --rebase-merges" -msgstr "不使用 --rebase-merges,则 --[no-]rebase-cousins 没有效果" - -#: builtin/rebase--interactive.c:230 -msgid "a base commit must be provided with --upstream or --onto" -msgstr "使用 --upstream 或 --onto 必须提供一个基线提交" - #: builtin/receive-pack.c:33 msgid "git receive-pack <git-dir>" msgstr "git receive-pack <仓库目录>" -#: builtin/receive-pack.c:830 +#: builtin/receive-pack.c:833 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" @@ -16267,7 +17039,7 @@ msgstr "" "若要屏蔽此信息且保持默认行为,设置 'receive.denyCurrentBranch'\n" "配置变量为 'refuse'。" -#: builtin/receive-pack.c:850 +#: builtin/receive-pack.c:853 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" @@ -16286,11 +17058,11 @@ msgstr "" "\n" "若要屏蔽此信息,您可以设置它为 'refuse'。" -#: builtin/receive-pack.c:1929 +#: builtin/receive-pack.c:1940 msgid "quiet" msgstr "静默模式" -#: builtin/receive-pack.c:1943 +#: builtin/receive-pack.c:1954 msgid "You must specify a directory." msgstr "您必须指定一个目录。" @@ -16873,15 +17645,15 @@ msgstr "" #: builtin/repack.c:200 msgid "could not start pack-objects to repack promisor objects" -msgstr "无法运行 pack-objects 来重新打包 promisor 对象" +msgstr "无法开始 pack-objects 来重新打包 promisor 对象" -#: builtin/repack.c:239 builtin/repack.c:411 +#: builtin/repack.c:239 builtin/repack.c:414 msgid "repack: Expecting full hex object ID lines only from pack-objects." -msgstr "repack:期望来自 pack-objects 的完整十六进制对象ID。" +msgstr "repack:期望来自 pack-objects 的完整十六进制对象 ID。" #: builtin/repack.c:256 msgid "could not finish pack-objects to repack promisor objects" -msgstr "无法结束 pack-objects 来重新打包 promisor 对象" +msgstr "无法完成 pack-objects 来重新打包 promisor 对象" #: builtin/repack.c:294 msgid "pack everything in a single pack" @@ -16971,11 +17743,11 @@ msgstr "不能删除珍品仓库中的打包文件" msgid "--keep-unreachable and -A are incompatible" msgstr "--keep-unreachable 和 -A 不兼容" -#: builtin/repack.c:420 +#: builtin/repack.c:423 msgid "Nothing new to pack." msgstr "没有新的要打包。" -#: builtin/repack.c:481 +#: builtin/repack.c:484 #, c-format msgid "" "WARNING: Some packs in use have been renamed by\n" @@ -16991,7 +17763,7 @@ msgstr "" "警告:并且尝试重命名改回原有文件名的操作也失败。\n" "警告:请手动将 %s 下的这些文件重命名:\n" -#: builtin/repack.c:529 +#: builtin/repack.c:532 #, c-format msgid "failed to remove '%s'" msgstr "删除 '%s' 失败" @@ -17020,12 +17792,7 @@ msgstr "git replace -d <对象>..." msgid "git replace [--format=<format>] [-l [<pattern>]]" msgstr "git replace [--format=<格式>] [-l [<模式>]]" -#: builtin/replace.c:58 builtin/replace.c:203 builtin/replace.c:206 -#, c-format -msgid "failed to resolve '%s' as a valid ref" -msgstr "无法将 '%s' 解析为一个有效引用" - -#: builtin/replace.c:86 +#: builtin/replace.c:90 #, c-format msgid "" "invalid replace format '%s'\n" @@ -17034,27 +17801,27 @@ msgstr "" "无效的替换格式 '%s'\n" "有效的格式有 'short'、'medium' 和 'long'" -#: builtin/replace.c:121 +#: builtin/replace.c:125 #, c-format msgid "replace ref '%s' not found" msgstr "未发现替换引用 '%s'" -#: builtin/replace.c:137 +#: builtin/replace.c:141 #, c-format msgid "Deleted replace ref '%s'" msgstr "已删除替换引用 '%s'" -#: builtin/replace.c:149 +#: builtin/replace.c:153 #, c-format msgid "'%s' is not a valid ref name" msgstr "'%s' 不是一个有效的引用名" -#: builtin/replace.c:154 +#: builtin/replace.c:158 #, c-format msgid "replace ref '%s' already exists" msgstr "替换引用 '%s' 已经存在" -#: builtin/replace.c:174 +#: builtin/replace.c:178 #, c-format msgid "" "Objects must be of the same type.\n" @@ -17065,107 +17832,112 @@ msgstr "" "'%s' 指向 '%s' 类型的替换对象\n" "而 '%s' 指向 '%s' 类型的替换对象。" -#: builtin/replace.c:225 +#: builtin/replace.c:229 #, c-format msgid "unable to open %s for writing" msgstr "无法为写入打开 %s" -#: builtin/replace.c:238 +#: builtin/replace.c:242 msgid "cat-file reported failure" msgstr "cat-file 报告失败" -#: builtin/replace.c:254 +#: builtin/replace.c:258 #, c-format msgid "unable to open %s for reading" msgstr "无法为读取打开 %s" -#: builtin/replace.c:268 +#: builtin/replace.c:272 msgid "unable to spawn mktree" msgstr "无法启动 mktree" -#: builtin/replace.c:272 +#: builtin/replace.c:276 msgid "unable to read from mktree" msgstr "无法从 mktree 读取" -#: builtin/replace.c:281 +#: builtin/replace.c:285 msgid "mktree reported failure" msgstr "mktree 报告失败" -#: builtin/replace.c:285 +#: builtin/replace.c:289 msgid "mktree did not return an object name" msgstr "mktree 没有返回一个对象名" -#: builtin/replace.c:294 +#: builtin/replace.c:298 #, c-format msgid "unable to fstat %s" msgstr "无法对 %s 执行 fstat" -#: builtin/replace.c:299 +#: builtin/replace.c:303 msgid "unable to write object to database" msgstr "无法向数据库写入对象" -#: builtin/replace.c:318 builtin/replace.c:371 builtin/replace.c:415 -#: builtin/replace.c:445 +#: builtin/replace.c:322 builtin/replace.c:377 builtin/replace.c:422 +#: builtin/replace.c:452 #, c-format msgid "not a valid object name: '%s'" msgstr "不是一个有效的对象名:'%s'" -#: builtin/replace.c:322 +#: builtin/replace.c:326 #, c-format msgid "unable to get object type for %s" msgstr "无法得到 %s 的对象类型" -#: builtin/replace.c:338 +#: builtin/replace.c:342 msgid "editing object file failed" msgstr "编辑对象文件失败" -#: builtin/replace.c:347 +#: builtin/replace.c:351 #, c-format msgid "new object is the same as the old one: '%s'" msgstr "新对象和旧对象相同:'%s'" -#: builtin/replace.c:407 +#: builtin/replace.c:383 +#, c-format +msgid "could not parse %s as a commit" +msgstr "无法将 %s 解析为一个提交" + +#: builtin/replace.c:414 #, c-format msgid "bad mergetag in commit '%s'" msgstr "提交 '%s' 中含有损坏的合并标签" -#: builtin/replace.c:409 +#: builtin/replace.c:416 #, c-format msgid "malformed mergetag in commit '%s'" msgstr "提交 '%s' 中含有格式错误的合并标签" -#: builtin/replace.c:421 +#: builtin/replace.c:428 #, 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:460 +#: builtin/replace.c:467 #, c-format msgid "the original commit '%s' has a gpg signature" msgstr "原始提交 '%s' 中有一个 gpg 签名" -#: builtin/replace.c:461 +#: builtin/replace.c:468 msgid "the signature will be removed in the replacement commit!" msgstr "在替换的提交中签名将被移除!" -#: builtin/replace.c:471 +#: builtin/replace.c:478 #, c-format msgid "could not write replacement commit for: '%s'" msgstr "不能为 '%s' 写替换提交" -#: builtin/replace.c:479 +#: builtin/replace.c:486 #, c-format msgid "graft for '%s' unnecessary" msgstr "对 '%s' 移植没有必要" -#: builtin/replace.c:482 +#: builtin/replace.c:490 #, c-format msgid "new commit is the same as the old one: '%s'" msgstr "新提交和旧的一样:'%s'" -#: builtin/replace.c:515 +#: builtin/replace.c:525 #, c-format msgid "" "could not convert the following graft(s):\n" @@ -17174,71 +17946,71 @@ msgstr "" "不能转换下列移植:\n" "%s" -#: builtin/replace.c:536 +#: builtin/replace.c:546 msgid "list replace refs" msgstr "列出替换的引用" -#: builtin/replace.c:537 +#: builtin/replace.c:547 msgid "delete replace refs" msgstr "删除替换的引用" -#: builtin/replace.c:538 +#: builtin/replace.c:548 msgid "edit existing object" msgstr "编辑现存的对象" -#: builtin/replace.c:539 +#: builtin/replace.c:549 msgid "change a commit's parents" msgstr "修改一个提交的父提交" -#: builtin/replace.c:540 +#: builtin/replace.c:550 msgid "convert existing graft file" msgstr "转换现存的移植文件" -#: builtin/replace.c:541 +#: builtin/replace.c:551 msgid "replace the ref if it exists" msgstr "如果存在则替换引用" -#: builtin/replace.c:543 +#: builtin/replace.c:553 msgid "do not pretty-print contents for --edit" msgstr "不要为 --edit 操作美观显示内容" -#: builtin/replace.c:544 +#: builtin/replace.c:554 msgid "use this format" msgstr "使用此格式" -#: builtin/replace.c:557 +#: builtin/replace.c:567 msgid "--format cannot be used when not listing" msgstr "不列出时不能使用 --format" -#: builtin/replace.c:565 +#: builtin/replace.c:575 msgid "-f only makes sense when writing a replacement" msgstr "只有写一个替换时 -f 才有意义" -#: builtin/replace.c:569 +#: builtin/replace.c:579 msgid "--raw only makes sense with --edit" msgstr "--raw 只有和 --edit 共用才有意义" -#: builtin/replace.c:575 +#: builtin/replace.c:585 msgid "-d needs at least one argument" msgstr "-d 需要至少一个参数" -#: builtin/replace.c:581 +#: builtin/replace.c:591 msgid "bad number of arguments" msgstr "错误的参数个数" -#: builtin/replace.c:587 +#: builtin/replace.c:597 msgid "-e needs exactly one argument" msgstr "-e 需要且仅需要一个参数" -#: builtin/replace.c:593 +#: builtin/replace.c:603 msgid "-g needs at least one argument" msgstr "-g 需要至少一个参数" -#: builtin/replace.c:599 +#: builtin/replace.c:609 msgid "--convert-graft-file takes no argument" msgstr "--convert-graft-file 不带参数" -#: builtin/replace.c:605 +#: builtin/replace.c:615 msgid "only one pattern can be given with -l" msgstr "只能为 -l 提供一个模式" @@ -17311,7 +18083,8 @@ msgstr "无法找到 %s 指向的树。" msgid "Cannot do a %s reset in the middle of a merge." msgstr "在合并过程中不能做%s重置操作。" -#: builtin/reset.c:293 +#: builtin/reset.c:293 builtin/stash.c:514 builtin/stash.c:589 +#: builtin/stash.c:613 msgid "be quiet, only report errors" msgstr "安静模式,只报告错误" @@ -17349,31 +18122,31 @@ msgstr "无法将 '%s' 解析为一个有效的树对象。" msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容" -#: builtin/reset.c:352 +#: builtin/reset.c:353 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "--mixed 带路径已弃用,而是用 'git reset -- <路径>'。" # 译者:汉字之间无空格,故删除%s前后空格 -#: builtin/reset.c:354 +#: builtin/reset.c:355 #, c-format msgid "Cannot do %s reset with paths." msgstr "不能带路径进行%s重置。" # 译者:汉字之间无空格,故删除%s前后空格 -#: builtin/reset.c:364 +#: builtin/reset.c:370 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "不能对纯仓库进行%s重置" -#: builtin/reset.c:368 +#: builtin/reset.c:374 msgid "-N can only be used with --mixed" msgstr "-N 只能和 --mixed 同时使用" -#: builtin/reset.c:388 +#: builtin/reset.c:395 msgid "Unstaged changes after reset:" msgstr "重置后取消暂存的变更:" -#: builtin/reset.c:391 +#: builtin/reset.c:398 #, c-format msgid "" "\n" @@ -17385,33 +18158,33 @@ msgstr "" "重置后,枚举未暂存变更花费了 %.2f 秒。 您可以使用 '--quiet' 避免此情况。\n" "将配置变量 reset.quiet 设置为 true 可使其成为默认值。\n" -#: builtin/reset.c:401 +#: builtin/reset.c:408 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "不能重置索引文件至版本 '%s'。" -#: builtin/reset.c:405 +#: builtin/reset.c:412 msgid "Could not write new index file." msgstr "不能写入新的索引文件。" -#: builtin/rev-list.c:406 +#: builtin/rev-list.c:405 msgid "cannot combine --exclude-promisor-objects and --missing" msgstr "不能同时使用 --exclude-promisor-objects 和 --missing 选项" -#: builtin/rev-list.c:464 +#: builtin/rev-list.c:466 msgid "object filtering requires --objects" msgstr "对象过滤需要 --objects" -#: builtin/rev-list.c:467 +#: builtin/rev-list.c:469 #, c-format msgid "invalid sparse value '%s'" msgstr "无效的稀疏值 '%s'" -#: builtin/rev-list.c:508 +#: builtin/rev-list.c:510 msgid "rev-list does not support display of notes" msgstr "rev-list 不支持显示注解" -#: builtin/rev-list.c:511 +#: builtin/rev-list.c:513 msgid "cannot combine --use-bitmap-index with object filtering" msgstr "不能将 --use-bitmap-index 和对象过滤组合使用" @@ -17471,59 +18244,59 @@ msgstr "选项 `%s' 期望一个大于零的数字" msgid "%s: %s cannot be used with %s" msgstr "%s:%s 不能和 %s 同时使用" -#: builtin/revert.c:101 +#: builtin/revert.c:102 msgid "end revert or cherry-pick sequence" msgstr "终止反转或拣选操作" -#: builtin/revert.c:102 +#: builtin/revert.c:103 msgid "resume revert or cherry-pick sequence" msgstr "继续反转或拣选操作" -#: builtin/revert.c:103 +#: builtin/revert.c:104 msgid "cancel revert or cherry-pick sequence" msgstr "取消反转或拣选操作" -#: builtin/revert.c:104 +#: builtin/revert.c:106 msgid "don't automatically commit" msgstr "不要自动提交" -#: builtin/revert.c:105 +#: builtin/revert.c:107 msgid "edit the commit message" msgstr "编辑提交说明" -#: builtin/revert.c:108 +#: builtin/revert.c:110 msgid "parent-number" msgstr "父编号" -#: builtin/revert.c:109 +#: builtin/revert.c:111 msgid "select mainline parent" msgstr "选择主干父提交编号" -#: builtin/revert.c:111 +#: builtin/revert.c:113 msgid "merge strategy" msgstr "合并策略" -#: builtin/revert.c:113 +#: builtin/revert.c:115 msgid "option for merge strategy" msgstr "合并策略的选项" -#: builtin/revert.c:122 +#: builtin/revert.c:124 msgid "append commit name" msgstr "追加提交名称" -#: builtin/revert.c:124 +#: builtin/revert.c:126 msgid "preserve initially empty commits" msgstr "保留初始化的空提交" -#: builtin/revert.c:126 +#: builtin/revert.c:128 msgid "keep redundant, empty commits" msgstr "保持多余的、空的提交" -#: builtin/revert.c:220 +#: builtin/revert.c:227 msgid "revert failed" msgstr "还原失败" -#: builtin/revert.c:233 +#: builtin/revert.c:240 msgid "cherry-pick failed" msgstr "拣选失败" @@ -17630,18 +18403,6 @@ msgstr "从标准输入读取引用" msgid "print status from remote helper" msgstr "打印来自远程 helper 的状态" -#: builtin/serve.c:7 -msgid "git serve [<options>]" -msgstr "git serve [<选项>]" - -#: builtin/serve.c:17 builtin/upload-pack.c:23 -msgid "quit after a single request/response exchange" -msgstr "在一次单独的请求/响应之后退出" - -#: builtin/serve.c:19 -msgid "exit immediately after advertising capabilities" -msgstr "对能力广告之后立即退出" - #: builtin/shortlog.c:14 msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]" msgstr "git shortlog [<选项>] [<版本范围>] [[--] <路径>...]" @@ -17795,24 +18556,24 @@ msgstr[1] "一次只能显示 %d 个条目。" msgid "no such ref %s" msgstr "无此引用 %s" -#: builtin/show-branch.c:830 +#: builtin/show-branch.c:832 #, c-format msgid "cannot handle more than %d rev." msgid_plural "cannot handle more than %d revs." msgstr[0] "不能处理 %d 个以上的版本。" msgstr[1] "不能处理 %d 个以上的版本。" -#: builtin/show-branch.c:834 +#: builtin/show-branch.c:836 #, c-format msgid "'%s' is not a valid ref." msgstr "'%s' 不是一个有效的引用。" -#: builtin/show-branch.c:837 +#: builtin/show-branch.c:839 #, c-format msgid "cannot find commit %s (%s)" msgstr "不能找到提交 %s(%s)" -#: builtin/show-ref.c:11 +#: builtin/show-ref.c:12 msgid "" "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]" @@ -17820,42 +18581,268 @@ msgstr "" "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模式>...]" -#: builtin/show-ref.c:12 +#: builtin/show-ref.c:13 msgid "git show-ref --exclude-existing[=<pattern>]" msgstr "git show-ref --exclude-existing[=<模式>]" -#: builtin/show-ref.c:161 +#: builtin/show-ref.c:162 msgid "only show tags (can be combined with heads)" msgstr "只显示标签(可以和头共用)" -#: builtin/show-ref.c:162 +#: builtin/show-ref.c:163 msgid "only show heads (can be combined with tags)" msgstr "只显示头(可以和标签共用)" -#: builtin/show-ref.c:163 +#: builtin/show-ref.c:164 msgid "stricter reference checking, requires exact ref path" msgstr "更严格的引用检测,需要精确的引用路径" -#: builtin/show-ref.c:166 builtin/show-ref.c:168 +#: builtin/show-ref.c:167 builtin/show-ref.c:169 msgid "show the HEAD reference, even if it would be filtered out" msgstr "显示 HEAD 引用,即使被过滤掉" -#: builtin/show-ref.c:170 +#: builtin/show-ref.c:171 msgid "dereference tags into object IDs" msgstr "转换标签到对象 ID" -#: builtin/show-ref.c:172 +#: builtin/show-ref.c:173 msgid "only show SHA1 hash using <n> digits" msgstr "只显示使用 <n> 个数字的 SHA1 哈希" -#: builtin/show-ref.c:176 +#: builtin/show-ref.c:177 msgid "do not print results to stdout (useful with --verify)" msgstr "不打印结果到标准输出(例如与 --verify 参数共用)" -#: builtin/show-ref.c:178 +#: builtin/show-ref.c:179 msgid "show refs from stdin that aren't in local repository" msgstr "显示从标准输入中读入的不在本地仓库中的引用" +#: builtin/stash.c:22 builtin/stash.c:37 +msgid "git stash list [<options>]" +msgstr "git stash list [<选项>]" + +#: builtin/stash.c:23 builtin/stash.c:42 +msgid "git stash show [<options>] [<stash>]" +msgstr "git stash show [<选项>] [<stash>]" + +#: builtin/stash.c:24 builtin/stash.c:47 +msgid "git stash drop [-q|--quiet] [<stash>]" +msgstr "git stash drop [-q|--quiet] [<stash>]" + +#: builtin/stash.c:25 +msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" +msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" + +#: builtin/stash.c:26 builtin/stash.c:62 +msgid "git stash branch <branchname> [<stash>]" +msgstr "git stash branch <分支名> [<stash>]" + +#: builtin/stash.c:27 builtin/stash.c:67 +msgid "git stash clear" +msgstr "git stash clear" + +#: builtin/stash.c:28 builtin/stash.c:77 +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:31 builtin/stash.c:84 +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 +msgid "git stash pop [--index] [-q|--quiet] [<stash>]" +msgstr "git stash pop [--index] [-q|--quiet] [<stash>]" + +#: builtin/stash.c:57 +msgid "git stash apply [--index] [-q|--quiet] [<stash>]" +msgstr "git stash apply [--index] [-q|--quiet] [<stash>]" + +#: builtin/stash.c:72 +msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>" +msgstr "git stash store [-m|--message <消息>] [-q|--quiet] <提交>" + +#: builtin/stash.c:127 +#, c-format +msgid "'%s' is not a stash-like commit" +msgstr "'%s' 不像是一个贮藏提交" + +#: builtin/stash.c:147 +#, c-format +msgid "Too many revisions specified:%s" +msgstr "指定了太多的版本:%s" + +#: builtin/stash.c:161 git-legacy-stash.sh:548 +msgid "No stash entries found." +msgstr "未发现贮藏条目。" + +#: builtin/stash.c:175 +#, c-format +msgid "%s is not a valid reference" +msgstr "%s 不是一个有效的引用名" + +#: builtin/stash.c:224 git-legacy-stash.sh:75 +msgid "git stash clear with parameters is unimplemented" +msgstr "git stash clear 不支持参数" + +#: builtin/stash.c:403 +msgid "cannot apply a stash in the middle of a merge" +msgstr "无法在合并过程应用贮藏" + +#: builtin/stash.c:414 +#, 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:427 +msgid "could not save index tree" +msgstr "不能保存索引树" + +#: builtin/stash.c:434 +msgid "could not restore untracked files from stash" +msgstr "无法从贮藏条目中恢复未跟踪文件" + +#: builtin/stash.c:448 +#, c-format +msgid "Merging %s with %s" +msgstr "正在合并 %s 和 %s" + +#: builtin/stash.c:458 git-legacy-stash.sh:680 +msgid "Index was not unstashed." +msgstr "索引未从贮藏中恢复。" + +#: builtin/stash.c:516 builtin/stash.c:615 +msgid "attempt to recreate the index" +msgstr "尝试重建索引" + +#: builtin/stash.c:549 +#, c-format +msgid "Dropped %s (%s)" +msgstr "丢弃了 %s(%s)" + +#: builtin/stash.c:552 +#, c-format +msgid "%s: Could not drop stash entry" +msgstr "%s:无法丢弃贮藏条目" + +#: builtin/stash.c:577 +#, c-format +msgid "'%s' is not a stash reference" +msgstr "'%s' 不是一个贮藏引用" + +#: builtin/stash.c:627 git-legacy-stash.sh:694 +msgid "The stash entry is kept in case you need it again." +msgstr "贮藏条目被保留以备您再次需要。" + +#: builtin/stash.c:650 git-legacy-stash.sh:712 +msgid "No branch name specified" +msgstr "未指定分支名" + +#: builtin/stash.c:789 builtin/stash.c:826 +#, c-format +msgid "Cannot update %s with %s" +msgstr "无法用 %2$s 更新 %1$s" + +#: builtin/stash.c:807 builtin/stash.c:1474 builtin/stash.c:1510 +msgid "stash message" +msgstr "贮藏说明" + +#: builtin/stash.c:817 +msgid "\"git stash store\" requires one <commit> argument" +msgstr "\"git stash store\" 需要一个 <提交> 参数" + +#: builtin/stash.c:1039 git-legacy-stash.sh:217 +msgid "No changes selected" +msgstr "没有选择变更" + +#: builtin/stash.c:1135 git-legacy-stash.sh:150 +msgid "You do not have the initial commit yet" +msgstr "您尚未建立初始提交" + +#: builtin/stash.c:1162 git-legacy-stash.sh:165 +msgid "Cannot save the current index state" +msgstr "无法保存当前索引状态" + +#: builtin/stash.c:1171 git-legacy-stash.sh:180 +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 +msgid "Cannot save the current worktree state" +msgstr "无法保存当前工作区状态" + +#: builtin/stash.c:1219 git-legacy-stash.sh:233 +msgid "Cannot record working tree state" +msgstr "不能记录工作区状态" + +#: builtin/stash.c:1268 git-legacy-stash.sh:337 +msgid "Can't use --patch and --include-untracked or --all at the same time" +msgstr "不能同时使用参数 --patch 和 --include-untracked 或 --all" + +#: builtin/stash.c:1284 +msgid "Did you forget to 'git add'?" +msgstr "您是否忘了执行 'git add'?" + +#: builtin/stash.c:1299 git-legacy-stash.sh:345 +msgid "No local changes to save" +msgstr "没有要保存的本地修改" + +#: builtin/stash.c:1306 git-legacy-stash.sh:350 +msgid "Cannot initialize stash" +msgstr "无法初始化贮藏" + +#: builtin/stash.c:1321 git-legacy-stash.sh:354 +msgid "Cannot save the current status" +msgstr "无法保存当前状态" + +#: builtin/stash.c:1326 +#, c-format +msgid "Saved working directory and index state %s" +msgstr "保存工作目录和索引状态 %s" + +#: builtin/stash.c:1430 git-legacy-stash.sh:384 +msgid "Cannot remove worktree changes" +msgstr "无法删除工作区变更" + +#: builtin/stash.c:1465 builtin/stash.c:1501 +msgid "keep index" +msgstr "保持索引" + +#: builtin/stash.c:1467 builtin/stash.c:1503 +msgid "stash in patch mode" +msgstr "以补丁模式贮藏" + +#: builtin/stash.c:1468 builtin/stash.c:1504 +msgid "quiet mode" +msgstr "静默模式" + +#: builtin/stash.c:1470 builtin/stash.c:1506 +msgid "include untracked files in stash" +msgstr "贮藏中包含未跟踪文件" + +#: builtin/stash.c:1472 builtin/stash.c:1508 +msgid "include ignore files" +msgstr "包含忽略的文件" + +#: builtin/stash.c:1568 +#, c-format +msgid "could not exec %s" +msgstr "不能执行 %s" + #: builtin/stripspace.c:18 msgid "git stripspace [-s | --strip-comments]" msgstr "git stripspace [-s | --strip-comments]" @@ -17872,7 +18859,7 @@ msgstr "跳过和移除所有的注释行" msgid "prepend comment character and space to each line" msgstr "为每一行的行首添加注释符和空格" -#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1943 +#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1942 #, c-format msgid "Expecting a full ref name, got %s" msgstr "期望一个完整的引用名称,却得到 %s" @@ -17933,8 +18920,8 @@ msgid "Recurse into nested submodules" msgstr "递归进入嵌套子模组中" #: builtin/submodule--helper.c:569 -msgid "git submodule--helper foreach [--quiet] [--recursive] <command>" -msgstr "git submodule--helper foreach [--quiet] [--recursive] <命令>" +msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>" +msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <命令>" #: builtin/submodule--helper.c:596 #, c-format @@ -17953,7 +18940,6 @@ msgstr "无法为子模组 '%s' 注册 url" msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "子模组 '%s'(%s)已对路径 '%s' 注册\n" -# #: builtin/submodule--helper.c:678 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" @@ -17969,8 +18955,8 @@ msgid "Suppress output for initializing a submodule" msgstr "阻止子模组初始化的输出" #: builtin/submodule--helper.c:712 -msgid "git submodule--helper init [<path>]" -msgstr "git submodule--helper init [<路径>]" +msgid "git submodule--helper init [<options>] [<path>]" +msgstr "git submodule--helper init [<选项>] [<路径>]" #: builtin/submodule--helper.c:784 builtin/submodule--helper.c:910 #, c-format @@ -18122,7 +19108,7 @@ msgstr "克隆子模组的 url 地址" msgid "depth for shallow clones" msgstr "浅克隆的深度" -#: builtin/submodule--helper.c:1387 builtin/submodule--helper.c:1872 +#: builtin/submodule--helper.c:1387 builtin/submodule--helper.c:1871 msgid "force cloning progress" msgstr "强制显示克隆进度" @@ -18183,85 +19169,93 @@ msgstr "克隆 '%s' 失败。按计划重试" msgid "Failed to clone '%s' a second time, aborting" msgstr "第二次尝试克隆 '%s' 失败,退出" -#: builtin/submodule--helper.c:1851 builtin/submodule--helper.c:2093 +#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:2092 msgid "path into the working tree" msgstr "到工作区的路径" -#: builtin/submodule--helper.c:1854 +#: builtin/submodule--helper.c:1853 msgid "path into the working tree, across nested submodule boundaries" msgstr "工作区中的路径,递归嵌套子模组" -#: builtin/submodule--helper.c:1858 +#: builtin/submodule--helper.c:1857 msgid "rebase, merge, checkout or none" msgstr "rebase、merge、checkout 或 none" -#: builtin/submodule--helper.c:1864 +#: builtin/submodule--helper.c:1863 msgid "Create a shallow clone truncated to the specified number of revisions" msgstr "创建一个指定深度的浅克隆" -#: builtin/submodule--helper.c:1867 +#: builtin/submodule--helper.c:1866 msgid "parallel jobs" msgstr "并发任务" -#: builtin/submodule--helper.c:1869 +#: builtin/submodule--helper.c:1868 msgid "whether the initial clone should follow the shallow recommendation" msgstr "初始克隆是否应该遵守推荐的浅克隆选项" -#: builtin/submodule--helper.c:1870 +#: builtin/submodule--helper.c:1869 msgid "don't print cloning progress" msgstr "不要输出克隆进度" -#: builtin/submodule--helper.c:1877 +#: 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:1890 +#: builtin/submodule--helper.c:1889 msgid "bad value for update parameter" msgstr "update 参数取值错误" -#: builtin/submodule--helper.c:1938 +#: builtin/submodule--helper.c:1937 #, 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:2061 +#: builtin/submodule--helper.c:2060 #, c-format msgid "could not get a repository handle for submodule '%s'" msgstr "无法获得子模组 '%s' 的仓库句柄" -#: builtin/submodule--helper.c:2094 +#: builtin/submodule--helper.c:2093 msgid "recurse into submodules" msgstr "在子模组中递归" -#: builtin/submodule--helper.c:2100 -msgid "git submodule--helper embed-git-dir [<path>...]" -msgstr "git submodule--helper embed-git-dir [<路径>...]" +#: builtin/submodule--helper.c:2099 +msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" +msgstr "git submodule--helper absorb-git-dirs [<选项>] [<路径>...]" #: builtin/submodule--helper.c:2156 msgid "check if it is safe to write to the .gitmodules file" msgstr "检查写入 .gitmodules 文件是否安全" -#: builtin/submodule--helper.c:2161 -msgid "git submodule--helper config name [value]" -msgstr "git submodule--helper config name [value]" +#: builtin/submodule--helper.c:2159 +msgid "unset the config in the .gitmodules file" +msgstr "取消 .gitmodules 文件中的设置" -#: builtin/submodule--helper.c:2162 +#: builtin/submodule--helper.c:2164 +msgid "git submodule--helper config <name> [<value>]" +msgstr "git submodule--helper config <名称> [<值>]" + +#: builtin/submodule--helper.c:2165 +msgid "git submodule--helper config --unset <name>" +msgstr "git submodule--helper config --unset <名称>" + +#: builtin/submodule--helper.c:2166 msgid "git submodule--helper config --check-writeable" msgstr "git submodule--helper config --check-writeable" -#: builtin/submodule--helper.c:2179 git-submodule.sh:169 +#: builtin/submodule--helper.c:2185 git-submodule.sh:171 #, sh-format msgid "please make sure that the .gitmodules file is in the working tree" msgstr "请确认 .gitmodules 文件在工作区里" -#: builtin/submodule--helper.c:2229 git.c:413 git.c:658 +#: builtin/submodule--helper.c:2235 git.c:433 git.c:685 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s 不支持 --super-prefix" -#: builtin/submodule--helper.c:2235 +#: builtin/submodule--helper.c:2241 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "'%s' 不是一个有效的 submodule--helper 子命令" @@ -18296,16 +19290,17 @@ msgstr "更新的原因" #: builtin/tag.c:25 msgid "" -"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> " -"[<head>]" +"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n" +"\t\t<tagname> [<head>]" msgstr "" -"git tag [-a | -s | -u <key-id>] [-f] [-m <说明> | -F <文件>] <标签名> [<头>]" +"git tag [-a | -s | -u <key-id>] [-f] [-m <消息> | -F <文件>]\n" +"\t\t<标签名> [<头>]" -#: builtin/tag.c:26 +#: builtin/tag.c:27 msgid "git tag -d <tagname>..." msgstr "git tag -d <标签名>..." -#: builtin/tag.c:27 +#: builtin/tag.c:28 msgid "" "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--" "points-at <object>]\n" @@ -18315,21 +19310,21 @@ msgstr "" "at <对象>]\n" "\t\t[--format=<格式>] [--[no-]merged [<提交>]] [<模式>...]" -#: builtin/tag.c:29 +#: builtin/tag.c:30 msgid "git tag -v [--format=<format>] <tagname>..." msgstr "git tag -v [--format=<格式>] <标签名>..." -#: builtin/tag.c:87 +#: builtin/tag.c:88 #, c-format msgid "tag '%s' not found." msgstr "未发现标签 '%s'。" -#: builtin/tag.c:103 +#: builtin/tag.c:104 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "已删除标签 '%s'(曾为 %s)\n" -#: builtin/tag.c:133 +#: builtin/tag.c:134 #, c-format msgid "" "\n" @@ -18342,7 +19337,7 @@ msgstr "" " %s\n" "以 '%c' 开头的行将被忽略。\n" -#: builtin/tag.c:137 +#: builtin/tag.c:138 #, c-format msgid "" "\n" @@ -18356,146 +19351,159 @@ msgstr "" " %s\n" "以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n" -#: builtin/tag.c:191 +#: builtin/tag.c:192 msgid "unable to sign the tag" msgstr "无法签署标签" -#: builtin/tag.c:193 +#: builtin/tag.c:194 msgid "unable to write tag file" msgstr "无法写标签文件" -#: builtin/tag.c:218 +#: builtin/tag.c:210 +#, c-format +msgid "" +"You have created a nested tag. The object referred to by your new tag is\n" +"already a tag. If you meant to tag the object that it points to, use:\n" +"\n" +"\tgit tag -f %s %s^{}" +msgstr "" +"您创建了一个嵌套的标签。您的新标签指向的对象已经是一个标签。如果您想要\n" +"对其指向的目标创建标签,使用:\n" +"\n" +"\tgit tag -f %s %s^{}" + +#: builtin/tag.c:226 msgid "bad object type." msgstr "坏的对象类型。" -#: builtin/tag.c:267 +#: builtin/tag.c:278 msgid "no tag message?" msgstr "无标签说明?" -#: builtin/tag.c:274 +#: builtin/tag.c:285 #, c-format msgid "The tag message has been left in %s\n" msgstr "标签说明被保留在 %s\n" -#: builtin/tag.c:385 +#: builtin/tag.c:396 msgid "list tag names" msgstr "列出标签名称" -#: builtin/tag.c:387 +#: builtin/tag.c:398 msgid "print <n> lines of each tag message" msgstr "每个标签信息打印 <n> 行" -#: builtin/tag.c:389 +#: builtin/tag.c:400 msgid "delete tags" msgstr "删除标签" -#: builtin/tag.c:390 +#: builtin/tag.c:401 msgid "verify tags" msgstr "验证标签" -#: builtin/tag.c:392 +#: builtin/tag.c:403 msgid "Tag creation options" msgstr "标签创建选项" -#: builtin/tag.c:394 +#: builtin/tag.c:405 msgid "annotated tag, needs a message" msgstr "附注标签,需要一个说明" -#: builtin/tag.c:396 +#: builtin/tag.c:407 msgid "tag message" msgstr "标签说明" -#: builtin/tag.c:398 +#: builtin/tag.c:409 msgid "force edit of tag message" msgstr "强制编辑标签说明" -#: builtin/tag.c:399 +#: builtin/tag.c:410 msgid "annotated and GPG-signed tag" msgstr "附注并附加 GPG 签名的标签" -#: builtin/tag.c:403 +#: builtin/tag.c:413 msgid "use another key to sign the tag" msgstr "使用另外的私钥签名该标签" -#: builtin/tag.c:404 +#: builtin/tag.c:414 msgid "replace the tag if exists" msgstr "如果存在,替换现有的标签" -#: builtin/tag.c:405 builtin/update-ref.c:369 +#: builtin/tag.c:415 builtin/update-ref.c:369 msgid "create a reflog" msgstr "创建引用日志" -#: builtin/tag.c:407 +#: builtin/tag.c:417 msgid "Tag listing options" msgstr "标签列表选项" -#: builtin/tag.c:408 +#: builtin/tag.c:418 msgid "show tag list in columns" msgstr "以列的方式显示标签列表" -#: builtin/tag.c:409 builtin/tag.c:411 +#: builtin/tag.c:419 builtin/tag.c:421 msgid "print only tags that contain the commit" msgstr "只打印包含该提交的标签" -#: builtin/tag.c:410 builtin/tag.c:412 +#: builtin/tag.c:420 builtin/tag.c:422 msgid "print only tags that don't contain the commit" msgstr "只打印不包含该提交的标签" -#: builtin/tag.c:413 +#: builtin/tag.c:423 msgid "print only tags that are merged" msgstr "只打印已经合并的标签" -#: builtin/tag.c:414 +#: builtin/tag.c:424 msgid "print only tags that are not merged" msgstr "只打印尚未合并的标签" -#: builtin/tag.c:419 +#: builtin/tag.c:428 msgid "print only tags of the object" msgstr "只打印指向该对象的标签" -#: builtin/tag.c:463 +#: builtin/tag.c:472 msgid "--column and -n are incompatible" msgstr "--column 和 -n 不兼容" -#: builtin/tag.c:485 +#: builtin/tag.c:494 msgid "-n option is only allowed in list mode" msgstr "-n 选项只允许用在列表显示模式" -#: builtin/tag.c:487 +#: builtin/tag.c:496 msgid "--contains option is only allowed in list mode" msgstr "--contains 选项只允许用在列表显示模式" -#: builtin/tag.c:489 +#: builtin/tag.c:498 msgid "--no-contains option is only allowed in list mode" msgstr "--no-contains 选项只允许用在列表显示模式" -#: builtin/tag.c:491 +#: builtin/tag.c:500 msgid "--points-at option is only allowed in list mode" msgstr "--points-at 选项只允许用在列表显示模式" -#: builtin/tag.c:493 +#: builtin/tag.c:502 msgid "--merged and --no-merged options are only allowed in list mode" msgstr "--merged 和 --no-merged 选项只允许用在列表显示模式" -#: builtin/tag.c:504 +#: builtin/tag.c:513 msgid "only one -F or -m option is allowed." msgstr "只允许一个 -F 或 -m 选项。" -#: builtin/tag.c:523 +#: builtin/tag.c:532 msgid "too many params" msgstr "太多参数" -#: builtin/tag.c:529 +#: builtin/tag.c:538 #, c-format msgid "'%s' is not a valid tag name." msgstr "'%s' 不是一个有效的标签名称。" -#: builtin/tag.c:534 +#: builtin/tag.c:543 #, c-format msgid "tag '%s' already exists" msgstr "标签 '%s' 已存在" -#: builtin/tag.c:565 +#: builtin/tag.c:574 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "已更新标签 '%s'(曾为 %s)\n" @@ -18561,153 +19569,153 @@ msgstr " OK" msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [<选项>] [--] [<文件>...]" -#: builtin/update-index.c:962 +#: builtin/update-index.c:971 msgid "continue refresh even when index needs update" msgstr "当索引需要更新时继续刷新" -#: builtin/update-index.c:965 +#: builtin/update-index.c:974 msgid "refresh: ignore submodules" msgstr "刷新:忽略子模组" -#: builtin/update-index.c:968 +#: builtin/update-index.c:977 msgid "do not ignore new files" msgstr "不忽略新的文件" -#: builtin/update-index.c:970 +#: builtin/update-index.c:979 msgid "let files replace directories and vice-versa" msgstr "让文件替换目录(反之亦然)" -#: builtin/update-index.c:972 +#: builtin/update-index.c:981 msgid "notice files missing from worktree" msgstr "通知文件从工作区丢失" -#: builtin/update-index.c:974 +#: builtin/update-index.c:983 msgid "refresh even if index contains unmerged entries" msgstr "即使索引区包含未合并的条目也执行刷新" -#: builtin/update-index.c:977 +#: builtin/update-index.c:986 msgid "refresh stat information" msgstr "刷新统计信息" -#: builtin/update-index.c:981 +#: builtin/update-index.c:990 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置" -#: builtin/update-index.c:985 +#: builtin/update-index.c:994 msgid "<mode>,<object>,<path>" msgstr "<存取模式>,<对象>,<路径>" -#: builtin/update-index.c:986 +#: builtin/update-index.c:995 msgid "add the specified entry to the index" msgstr "添加指定的条目到索引区" -#: builtin/update-index.c:995 +#: builtin/update-index.c:1005 msgid "mark files as \"not changing\"" msgstr "把文件标记为 \"没有变更\"" -#: builtin/update-index.c:998 +#: builtin/update-index.c:1008 msgid "clear assumed-unchanged bit" msgstr "清除 assumed-unchanged 位" -#: builtin/update-index.c:1001 +#: builtin/update-index.c:1011 msgid "mark files as \"index-only\"" msgstr "把文件标记为 \"仅索引\"" -#: builtin/update-index.c:1004 +#: builtin/update-index.c:1014 msgid "clear skip-worktree bit" msgstr "清除 skip-worktree 位" -#: builtin/update-index.c:1007 +#: builtin/update-index.c:1017 msgid "add to index only; do not add content to object database" msgstr "只添加到索引区;不添加对象到对象库" -#: builtin/update-index.c:1009 +#: builtin/update-index.c:1019 msgid "remove named paths even if present in worktree" msgstr "即使存在工作区里,也删除路径" -#: builtin/update-index.c:1011 +#: builtin/update-index.c:1021 msgid "with --stdin: input lines are terminated by null bytes" msgstr "携带 --stdin:输入的行以 null 字符终止" -#: builtin/update-index.c:1013 +#: builtin/update-index.c:1023 msgid "read list of paths to be updated from standard input" msgstr "从标准输入中读取需要更新的路径列表" -#: builtin/update-index.c:1017 +#: builtin/update-index.c:1027 msgid "add entries from standard input to the index" msgstr "从标准输入添加条目到索引区" -#: builtin/update-index.c:1021 +#: builtin/update-index.c:1031 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "为指定文件重新生成第2和第3暂存区" -#: builtin/update-index.c:1025 +#: builtin/update-index.c:1035 msgid "only update entries that differ from HEAD" msgstr "只更新与 HEAD 不同的条目" -#: builtin/update-index.c:1029 +#: builtin/update-index.c:1039 msgid "ignore files missing from worktree" msgstr "忽略工作区丢失的文件" -#: builtin/update-index.c:1032 +#: builtin/update-index.c:1042 msgid "report actions to standard output" msgstr "在标准输出显示操作" -#: builtin/update-index.c:1034 +#: builtin/update-index.c:1044 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(for porcelains) 忘记保存的未解决的冲突" -#: builtin/update-index.c:1038 +#: builtin/update-index.c:1048 msgid "write index in this format" msgstr "以这种格式写入索引区" -#: builtin/update-index.c:1040 +#: builtin/update-index.c:1050 msgid "enable or disable split index" msgstr "启用或禁用索引拆分" -#: builtin/update-index.c:1042 +#: builtin/update-index.c:1052 msgid "enable/disable untracked cache" msgstr "启用/禁用对未跟踪文件的缓存" -#: builtin/update-index.c:1044 +#: builtin/update-index.c:1054 msgid "test if the filesystem supports untracked cache" msgstr "测试文件系统是否支持未跟踪文件缓存" -#: builtin/update-index.c:1046 +#: builtin/update-index.c:1056 msgid "enable untracked cache without testing the filesystem" msgstr "无需检测文件系统,启用对未跟踪文件的缓存" -#: builtin/update-index.c:1048 +#: builtin/update-index.c:1058 msgid "write out the index even if is not flagged as changed" msgstr "即使没有被标记为已更改,也要写出索引" -#: builtin/update-index.c:1050 +#: builtin/update-index.c:1060 msgid "enable or disable file system monitor" msgstr "启用或禁用文件系统监控" -#: builtin/update-index.c:1052 +#: builtin/update-index.c:1062 msgid "mark files as fsmonitor valid" msgstr "标记文件为 fsmonitor 有效" -#: builtin/update-index.c:1055 +#: builtin/update-index.c:1065 msgid "clear fsmonitor valid bit" msgstr "清除 fsmonitor 有效位" -#: builtin/update-index.c:1156 +#: builtin/update-index.c:1168 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:1165 +#: builtin/update-index.c:1177 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:1176 +#: builtin/update-index.c:1188 msgid "" "core.untrackedCache is set to true; remove or change it, if you really want " "to disable the untracked cache" @@ -18715,11 +19723,11 @@ msgstr "" "core.untrackedCache 被设置为 true。如果您确实要禁用未跟踪文件缓存,请删除或修" "改它。" -#: builtin/update-index.c:1180 +#: builtin/update-index.c:1192 msgid "Untracked cache disabled" msgstr "缓存未跟踪文件被禁用" -#: builtin/update-index.c:1188 +#: builtin/update-index.c:1200 msgid "" "core.untrackedCache is set to false; remove or change it, if you really want " "to enable the untracked cache" @@ -18727,25 +19735,25 @@ msgstr "" "core.untrackedCache 被设置为 false。如果您确实要启用未跟踪文件缓存,请删除或" "修改它。" -#: builtin/update-index.c:1192 +#: builtin/update-index.c:1204 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "缓存未跟踪文件在 '%s' 启用" -#: builtin/update-index.c:1200 +#: builtin/update-index.c:1212 msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor" msgstr "core.fsmonitor 未设置;如果想要启用 fsmonitor 请设置该选项" -#: builtin/update-index.c:1204 +#: builtin/update-index.c:1216 msgid "fsmonitor enabled" msgstr "fsmonitor 被启用" -#: builtin/update-index.c:1207 +#: builtin/update-index.c:1219 msgid "" "core.fsmonitor is set; remove it if you really want to disable fsmonitor" msgstr "core.fsmonitor 已设置;如果想要禁用 fsmonitor 请移除该选项" -#: builtin/update-index.c:1211 +#: builtin/update-index.c:1223 msgid "fsmonitor disabled" msgstr "fsmonitor 被禁用" @@ -18789,6 +19797,10 @@ msgstr "从头开始更新文件信息" msgid "git upload-pack [<options>] <dir>" msgstr "git upload-pack [<选项>] <目录>" +#: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17 +msgid "quit after a single request/response exchange" +msgstr "在一次单独的请求/响应之后退出" + #: builtin/upload-pack.c:25 msgid "exit immediately after initial ref advertisement" msgstr "在初始的引用广告后立即退出" @@ -18861,7 +19873,7 @@ msgstr "git worktree remove [<选项>] <工作区>" msgid "git worktree unlock <path>" msgstr "git worktree unlock <路径>" -#: builtin/worktree.c:61 builtin/worktree.c:888 +#: builtin/worktree.c:61 builtin/worktree.c:891 #, c-format msgid "failed to delete '%s'" msgstr "删除 '%s' 失败" @@ -18934,120 +19946,120 @@ msgstr "" "'%s' 是一个丢失但已经注册的工作区,使用\n" "'add -f' 覆盖,或 'prune' 或 'remove' 清除" -#: builtin/worktree.c:310 +#: builtin/worktree.c:302 #, c-format msgid "could not create directory of '%s'" msgstr "不能创建目录 '%s'" -#: builtin/worktree.c:429 builtin/worktree.c:435 +#: builtin/worktree.c:432 builtin/worktree.c:438 #, c-format msgid "Preparing worktree (new branch '%s')" msgstr "准备工作区(新分支 '%s')" -#: builtin/worktree.c:431 +#: builtin/worktree.c:434 #, c-format msgid "Preparing worktree (resetting branch '%s'; was at %s)" msgstr "准备工作区(重置分支 '%s',之前为 %s)" -#: builtin/worktree.c:440 +#: builtin/worktree.c:443 #, c-format msgid "Preparing worktree (checking out '%s')" msgstr "准备工作区(检出 '%s')" -#: builtin/worktree.c:446 +#: builtin/worktree.c:449 #, c-format msgid "Preparing worktree (detached HEAD %s)" msgstr "准备工作区(分离头指针 %s)" -#: builtin/worktree.c:487 +#: builtin/worktree.c:490 msgid "checkout <branch> even if already checked out in other worktree" msgstr "检出 <分支>,即使已经被检出到其它工作区" -#: builtin/worktree.c:490 +#: builtin/worktree.c:493 msgid "create a new branch" msgstr "创建一个新分支" -#: builtin/worktree.c:492 +#: builtin/worktree.c:495 msgid "create or reset a branch" msgstr "创建或重置一个分支" -#: builtin/worktree.c:494 +#: builtin/worktree.c:497 msgid "populate the new working tree" msgstr "生成新的工作区" -#: builtin/worktree.c:495 +#: builtin/worktree.c:498 msgid "keep the new working tree locked" msgstr "锁定新工作区" -#: builtin/worktree.c:498 +#: builtin/worktree.c:501 msgid "set up tracking mode (see git-branch(1))" msgstr "设置跟踪模式(参见 git-branch(1))" -#: builtin/worktree.c:501 +#: builtin/worktree.c:504 msgid "try to match the new branch name with a remote-tracking branch" msgstr "尝试为新分支名匹配一个远程跟踪分支" -#: builtin/worktree.c:509 +#: builtin/worktree.c:512 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b、-B 和 --detach 是互斥的" -#: builtin/worktree.c:570 +#: builtin/worktree.c:573 msgid "--[no-]track can only be used if a new branch is created" msgstr "只能在创建新分支时使用选项 --[no-]track " -#: builtin/worktree.c:670 +#: builtin/worktree.c:673 msgid "reason for locking" msgstr "锁定原因" -#: builtin/worktree.c:682 builtin/worktree.c:715 builtin/worktree.c:789 -#: builtin/worktree.c:916 +#: builtin/worktree.c:685 builtin/worktree.c:718 builtin/worktree.c:792 +#: builtin/worktree.c:919 #, c-format msgid "'%s' is not a working tree" msgstr "'%s' 不是一个工作区" -#: builtin/worktree.c:684 builtin/worktree.c:717 +#: builtin/worktree.c:687 builtin/worktree.c:720 msgid "The main working tree cannot be locked or unlocked" msgstr "主工作区无法被加锁或解锁" -#: builtin/worktree.c:689 +#: builtin/worktree.c:692 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "'%s' 已被锁定,原因:%s" -#: builtin/worktree.c:691 +#: builtin/worktree.c:694 #, c-format msgid "'%s' is already locked" msgstr "'%s' 已被锁定" -#: builtin/worktree.c:719 +#: builtin/worktree.c:722 #, c-format msgid "'%s' is not locked" msgstr "'%s' 未被锁定" -#: builtin/worktree.c:760 +#: builtin/worktree.c:763 msgid "working trees containing submodules cannot be moved or removed" msgstr "不能移动或删除包含子模组的工作区" -#: builtin/worktree.c:768 +#: builtin/worktree.c:771 msgid "force move even if worktree is dirty or locked" msgstr "强制移动,即使工作区是脏的或已锁定" -#: builtin/worktree.c:791 builtin/worktree.c:918 +#: builtin/worktree.c:794 builtin/worktree.c:921 #, c-format msgid "'%s' is a main working tree" msgstr "'%s' 是一个主工作区" -#: builtin/worktree.c:796 +#: builtin/worktree.c:799 #, c-format msgid "could not figure out destination name from '%s'" msgstr "无法从 '%s' 算出目标名称" -#: builtin/worktree.c:802 +#: builtin/worktree.c:805 #, c-format msgid "target '%s' already exists" msgstr "目标 '%s' 已存在" -#: builtin/worktree.c:810 +#: builtin/worktree.c:813 #, c-format msgid "" "cannot move a locked working tree, lock reason: %s\n" @@ -19056,7 +20068,7 @@ msgstr "" "无法移动一个锁定的工作区,锁定原因:%s\n" "使用 'move -f -f' 覆盖或先解锁" -#: builtin/worktree.c:812 +#: builtin/worktree.c:815 msgid "" "cannot move a locked working tree;\n" "use 'move -f -f' to override or unlock first" @@ -19064,36 +20076,36 @@ msgstr "" "无法移动一个锁定的工作区,\n" "使用 'move -f -f' 覆盖或先解锁" -#: builtin/worktree.c:815 +#: builtin/worktree.c:818 #, c-format msgid "validation failed, cannot move working tree: %s" msgstr "验证失败,无法移动工作区:%s" -#: builtin/worktree.c:820 +#: builtin/worktree.c:823 #, c-format msgid "failed to move '%s' to '%s'" msgstr "移动 '%s' 到 '%s' 失败" -#: builtin/worktree.c:868 +#: builtin/worktree.c:871 #, c-format msgid "failed to run 'git status' on '%s'" msgstr "在 '%s' 中执行 'git status' 失败" -#: builtin/worktree.c:872 +#: builtin/worktree.c:875 #, c-format msgid "'%s' is dirty, use --force to delete it" msgstr "'%s' 是脏的,使用 --force 删除" -#: builtin/worktree.c:877 +#: builtin/worktree.c:880 #, c-format msgid "failed to run 'git status' on '%s', code %d" msgstr "在 '%s' 中执行 'git status' 失败,退出码 %d" -#: builtin/worktree.c:900 +#: builtin/worktree.c:903 msgid "force removal even if worktree is dirty or locked" msgstr "强制删除,即使工作区是脏的或已锁定" -#: builtin/worktree.c:923 +#: builtin/worktree.c:926 #, c-format msgid "" "cannot remove a locked working tree, lock reason: %s\n" @@ -19102,7 +20114,7 @@ msgstr "" "无法删除一个锁定的工作区,锁定原因:%s\n" "使用 'remove -f -f' 覆盖或先解锁" -#: builtin/worktree.c:925 +#: builtin/worktree.c:928 msgid "" "cannot remove a locked working tree;\n" "use 'remove -f -f' to override or unlock first" @@ -19110,7 +20122,7 @@ msgstr "" "无法删除一个锁定的工作区,\n" "使用 'remove -f -f' 覆盖或先解锁" -#: builtin/worktree.c:928 +#: builtin/worktree.c:931 #, c-format msgid "validation failed, cannot remove working tree: %s" msgstr "验证失败,无法删除工作区:%s" @@ -19157,6 +20169,14 @@ msgstr "提交 %s 没有标记为可达" msgid "too many commits marked reachable" msgstr "太多提交标记为可达" +#: t/helper/test-serve-v2.c:7 +msgid "test-tool serve-v2 [<options>]" +msgstr "test-tool serve-v2 [<选项>]" + +#: t/helper/test-serve-v2.c:19 +msgid "exit immediately after advertising capabilities" +msgstr "对能力广告之后立即退出" + #: git.c:27 msgid "" "git [--version] [--help] [-C <path>] [-c <name>=<value>]\n" @@ -19183,47 +20203,47 @@ msgstr "" "查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n" "帮助。" -#: git.c:174 +#: git.c:185 #, c-format msgid "no directory given for --git-dir\n" msgstr "没有为 --git-dir 提供目录\n" -#: git.c:188 +#: git.c:199 #, c-format msgid "no namespace given for --namespace\n" msgstr "没有为 --namespace 提供命名空间\n" -#: git.c:202 +#: git.c:213 #, c-format msgid "no directory given for --work-tree\n" msgstr "没有为 --work-tree 提供目录\n" -#: git.c:216 +#: git.c:227 #, c-format msgid "no prefix given for --super-prefix\n" msgstr "没有为 --super-prefix 提供前缀\n" -#: git.c:238 +#: git.c:249 #, c-format msgid "-c expects a configuration string\n" msgstr "应为 -c 提供一个配置字符串\n" -#: git.c:276 +#: git.c:287 #, c-format msgid "no directory given for -C\n" msgstr "没有为 -C 提供目录\n" -#: git.c:301 +#: git.c:313 #, c-format msgid "unknown option: %s\n" msgstr "未知选项:%s\n" -#: git.c:342 +#: git.c:359 #, c-format msgid "while expanding alias '%s': '%s'" -msgstr "在扩展别名'%s' 时:'%s'" +msgstr "在扩展别名 '%s' 时:'%s'" -#: git.c:351 +#: git.c:368 #, c-format msgid "" "alias '%s' changes environment variables.\n" @@ -19232,39 +20252,39 @@ msgstr "" "别名 '%s' 修改环境变量。您可以使用在别名中\n" "使用 '!git'" -#: git.c:359 +#: git.c:376 #, c-format msgid "empty alias for %s" msgstr "%s 的空别名" -#: git.c:362 +#: git.c:379 #, c-format msgid "recursive alias: %s" -msgstr "别名递归:%s" +msgstr "递归的别名:%s" -#: git.c:437 +#: git.c:459 msgid "write failure on standard output" msgstr "在标准输出写入失败" -#: git.c:439 +#: git.c:461 msgid "unknown write failure on standard output" msgstr "到标准输出的未知写入错误" -#: git.c:441 +#: git.c:463 msgid "close failed on standard output" msgstr "标准输出关闭失败" -#: git.c:720 +#: git.c:797 #, c-format msgid "alias loop detected: expansion of '%s' does not terminate:%s" msgstr "检测到别名循环:'%s'的扩展未终止:%s" -#: git.c:770 +#: git.c:847 #, c-format msgid "cannot handle %s as a builtin" msgstr "不能作为内置命令处理 %s" -#: git.c:783 +#: git.c:860 #, c-format msgid "" "usage: %s\n" @@ -19273,12 +20293,12 @@ msgstr "" "用法:%s\n" "\n" -#: git.c:803 +#: git.c:880 #, c-format msgid "expansion of alias '%s' failed; '%s' is not a git command\n" msgstr "展开别名命令 '%s' 失败,'%s' 不是一个 git 命令\n" -#: git.c:815 +#: git.c:892 #, c-format msgid "failed to run command '%s': %s\n" msgstr "运行命令 '%s' 失败:%s\n" @@ -19319,7 +20339,7 @@ msgstr "无法设置 SSL 后端为 '%s':cURL: cURL 没有使用 SSL 后端构 msgid "Could not set SSL backend to '%s': already set" msgstr "无法将 SSL 后端设置为 '%s':已经设置" -#: http.c:1959 +#: http.c:1965 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -19330,31 +20350,159 @@ msgstr "" " 请求:%s\n" " 重定向:%s" -#: remote-curl.c:455 +#: remote-curl.c:157 +#, c-format +msgid "invalid quoting in push-option value: '%s'" +msgstr "在 push-option 取值中无效的引号:'%s'" + +#: remote-curl.c:254 +#, c-format +msgid "%sinfo/refs not valid: is this a git repository?" +msgstr "%sinfo/refs 无效:这是一个 git 仓库么?" + +#: remote-curl.c:355 +msgid "invalid server response; expected service, got flush packet" +msgstr "无效的服务端响应。预期服务,得到 flush 包" + +#: remote-curl.c:386 +#, c-format +msgid "invalid server response; got '%s'" +msgstr "无效的服务端响应,得到 '%s'" + +#: remote-curl.c:446 +#, c-format +msgid "repository '%s' not found" +msgstr "仓库 '%s' 未找到" + +#: remote-curl.c:450 +#, c-format +msgid "Authentication failed for '%s'" +msgstr "'%s' 鉴权失败" + +#: remote-curl.c:454 +#, c-format +msgid "unable to access '%s': %s" +msgstr "无法访问 '%s':%s" + +#: remote-curl.c:460 #, c-format msgid "redirecting to %s" msgstr "重定向到 %s" -#: parse-options.h:154 +#: remote-curl.c:584 +msgid "shouldn't have EOF when not gentle on EOF" +msgstr "当没有设置温和处理文件结束符(EOF)时,不应该有文件结束符" + +#: remote-curl.c:664 +msgid "unable to rewind rpc post data - try increasing http.postBuffer" +msgstr "无法倒回 rpc post 数据 - 尝试增加 http.postBuffer" + +#: remote-curl.c:724 +#, c-format +msgid "RPC failed; %s" +msgstr "RPC 失败。%s" + +#: remote-curl.c:764 +msgid "cannot handle pushes this big" +msgstr "不能处理这么大的推送" + +#: remote-curl.c:879 +#, c-format +msgid "cannot deflate request; zlib deflate error %d" +msgstr "不能压缩请求,zlib 压缩错误 %d" + +#: remote-curl.c:883 +#, c-format +msgid "cannot deflate request; zlib end error %d" +msgstr "不能压缩请求,zlib 结束错误 %d" + +#: remote-curl.c:1014 +msgid "dumb http transport does not support shallow capabilities" +msgstr "哑 http 传输不支持 shalllow 能力" + +#: remote-curl.c:1028 +msgid "fetch failed." +msgstr "获取失败。" + +#: remote-curl.c:1076 +msgid "cannot fetch by sha1 over smart http" +msgstr "无法通过智能 HTTP 获取 sha1" + +#: remote-curl.c:1120 remote-curl.c:1126 +#, c-format +msgid "protocol error: expected sha/ref, got '%s'" +msgstr "协议错误:期望 sha/ref,却得到 '%s'" + +#: remote-curl.c:1138 remote-curl.c:1252 +#, c-format +msgid "http transport does not support %s" +msgstr "http 传输协议不支持 %s" + +#: remote-curl.c:1174 +msgid "git-http-push failed" +msgstr "git-http-push 失败" + +#: remote-curl.c:1360 +msgid "remote-curl: usage: git remote-curl <remote> [<url>]" +msgstr "remote-curl:用法:git remote-curl <远程> [<url>]" + +#: remote-curl.c:1392 +msgid "remote-curl: error reading command stream from git" +msgstr "remote-curl:错误读取来自 git 的命令流" + +#: remote-curl.c:1399 +msgid "remote-curl: fetch attempted without a local repo" +msgstr "remote-curl:尝试没有本地仓库下获取" + +#: remote-curl.c:1439 +#, c-format +msgid "remote-curl: unknown command '%s' from git" +msgstr "remote-curl:未知的来自 git 的命令 '%s'" + +#: list-objects-filter-options.h:61 +msgid "args" +msgstr "参数" + +#: list-objects-filter-options.h:62 +msgid "object filtering" +msgstr "对象过滤" + +#: parse-options.h:170 msgid "expiry-date" msgstr "到期时间" -#: parse-options.h:169 +#: parse-options.h:184 msgid "no-op (backward compatibility)" msgstr "空操作(向后兼容)" -#: parse-options.h:259 +#: parse-options.h:304 msgid "be more verbose" msgstr "更加详细" -#: parse-options.h:261 +#: parse-options.h:306 msgid "be more quiet" msgstr "更加安静" -#: parse-options.h:267 +#: parse-options.h:312 msgid "use <n> digits to display SHA-1s" msgstr "用 <n> 位数字显示 SHA-1 哈希值" +#: parse-options.h:331 +msgid "how to strip spaces and #comments from message" +msgstr "设置如何删除提交说明里的空格和#注释" + +#: ref-filter.h:101 +msgid "key" +msgstr "key" + +#: ref-filter.h:101 +msgid "field name to sort on" +msgstr "排序的字段名" + +#: rerere.h:44 +msgid "update the index with reused conflict resolution if possible" +msgstr "如果可能,重用冲突解决更新索引" + #: command-list.h:50 msgid "Add file contents to the index" msgstr "添加文件内容至索引" @@ -19561,7 +20709,7 @@ msgstr "清除不必要的文件和优化本地仓库" #: command-list.h:101 msgid "Extract commit ID from an archive created using git-archive" -msgstr "从 git-archive 创建的归档文件中提取提交ID" +msgstr "从 git-archive 创建的归档文件中提取提交 ID" #: command-list.h:102 msgid "Print lines matching a pattern" @@ -19573,7 +20721,7 @@ msgstr "一个便携的 Git 图形客户端" #: command-list.h:104 msgid "Compute object ID and optionally creates a blob from a file" -msgstr "从一个文件计算对象ID,并可以创建 blob 数据对象" +msgstr "从一个文件计算对象 ID,并可以创建 blob 数据对象" #: command-list.h:105 msgid "Display help information about Git" @@ -19608,7 +20756,7 @@ msgid "Instantly browse your working repository in gitweb" msgstr "在 gitweb 中即时浏览您的工作仓库" #: command-list.h:113 -msgid "add or parse structured information in commit messages" +msgid "Add or parse structured information in commit messages" msgstr "添加或解析提交说明中的结构化信息" #: command-list.h:114 @@ -19714,7 +20862,7 @@ msgstr "帮助解析远程仓库访问参数的例程" #: command-list.h:139 msgid "Compute unique ID for a patch" -msgstr "计算一个补丁的唯一ID" +msgstr "计算一个补丁的唯一 ID" #: command-list.h:140 msgid "Prune all unreachable objects from the object database" @@ -19992,18 +21140,6 @@ msgstr "一个 Git 教程" msgid "An overview of recommended workflows with Git" msgstr "Git 推荐的工作流概览" -#: list-objects-filter-options.h:63 -msgid "args" -msgstr "参数" - -#: list-objects-filter-options.h:64 -msgid "object filtering" -msgstr "对象过滤" - -#: rerere.h:44 -msgid "update the index with reused conflict resolution if possible" -msgstr "如果可能,重用冲突解决更新索引" - #: git-bisect.sh:54 msgid "You need to start by \"git bisect start\"" msgstr "您需要执行 \"git bisect start\" 来开始" @@ -20126,276 +21262,113 @@ msgstr "尝试和 $pretty_name 的简单合并" msgid "Simple merge did not work, trying automatic merge." msgstr "简单合并未生效,尝试自动合并。" -#: git-legacy-rebase.sh:445 -#, sh-format -msgid "Could not move back to $head_name" -msgstr "无法移回 $head_name" - -#: git-legacy-rebase.sh:471 -#, sh-format -msgid "" -"It seems that there is already a $state_dir_base directory, and\n" -"I wonder if you are in the middle of another rebase. If that is the\n" -"case, please try\n" -"\t$cmd_live_rebase\n" -"If that is not the case, please\n" -"\t$cmd_clear_stale_rebase\n" -"and run me again. I am stopping in case you still have something\n" -"valuable there." -msgstr "" -"好像已有 $state_dir_base 目录,我怀疑您正处于另外一个变基操作\n" -"过程中。 如果是这样,请执行\n" -"\t$cmd_live_rebase\n" -"如果不是这样,请执行\n" -"\t$cmd_clear_stale_rebase\n" -"然后再重新执行变基操作。 为避免丢失重要数据,我已经停止当前操作。" - -#: git-legacy-rebase.sh:523 -msgid "" -"fatal: cannot combine am options with either interactive or merge options" -msgstr "致命错误:不能将 am 选项和交互或合并选项组合一起" - -#: git-legacy-rebase.sh:530 -msgid "fatal: cannot combine '--signoff' with '--preserve-merges'" -msgstr "致命错误:不能将 '--signoff' 和 '--preserve-merges' 组合一起" - -#: git-legacy-rebase.sh:541 -msgid "fatal: cannot combine '--preserve-merges' with '--rebase-merges'" -msgstr "致命错误:不能将 '--preserve-merges' 和 '--rebase-merges' 组合一起" - -#: git-legacy-rebase.sh:550 -msgid "fatal: cannot combine '--rebase-merges' with '--strategy-option'" -msgstr "致命错误:不能将 '--rebase-merges' 和 '--strategy-option' 组合一起" - -#: git-legacy-rebase.sh:552 -msgid "fatal: cannot combine '--rebase-merges' with '--strategy'" -msgstr "致命错误:不能将 '--rebase-merges' 和 '--strategy' 组合一起" - -#: git-legacy-rebase.sh:578 -#, sh-format -msgid "invalid upstream '$upstream_name'" -msgstr "无效的上游 '$upstream_name'" - -#: git-legacy-rebase.sh:602 -#, sh-format -msgid "$onto_name: there are more than one merge bases" -msgstr "$onto_name: 有一个以上的合并基准" - -#: git-legacy-rebase.sh:605 git-legacy-rebase.sh:609 -#, sh-format -msgid "$onto_name: there is no merge base" -msgstr "$onto_name: 没有合并基准" - -#: git-legacy-rebase.sh:614 -#, sh-format -msgid "Does not point to a valid commit: $onto_name" -msgstr "没有指向一个有效的提交:$onto_name" - -#: git-legacy-rebase.sh:640 -#, sh-format -msgid "fatal: no such branch/commit '$branch_name'" -msgstr "致命错误:无此分支/提交 '$branch_name'" - -#: git-legacy-rebase.sh:678 -#, sh-format -msgid "Created autostash: $stash_abbrev" -msgstr "创建了 autostash: $stash_abbrev" - -#: git-legacy-rebase.sh:707 -#, sh-format -msgid "Current branch $branch_name is up to date." -msgstr "当前分支 $branch_name 是最新的。" - -#: git-legacy-rebase.sh:717 -#, sh-format -msgid "Current branch $branch_name is up to date, rebase forced." -msgstr "当前分支 $branch_name 是最新的,强制变基。" - -#: git-legacy-rebase.sh:731 -#, sh-format -msgid "Changes to $onto:" -msgstr "到 $onto 的变更:" - -#: git-legacy-rebase.sh:733 -#, sh-format -msgid "Changes from $mb to $onto:" -msgstr "从 $mb 到 $onto 的变更:" - -#: git-legacy-rebase.sh:743 -#, sh-format -msgid "Fast-forwarded $branch_name to $onto_name." -msgstr "快进 $branch_name 至 $onto_name。" - -#: git-legacy-rebase.sh:757 -msgid "First, rewinding head to replay your work on top of it..." -msgstr "首先,回退分支以便在上面重放您的工作..." - -#: git-stash.sh:75 -msgid "git stash clear with parameters is unimplemented" -msgstr "git stash clear 不支持参数" - -#: git-stash.sh:125 -msgid "You do not have the initial commit yet" -msgstr "您尚未建立初始提交" - -#: git-stash.sh:140 -msgid "Cannot save the current index state" -msgstr "无法保存当前索引状态" - -#: git-stash.sh:155 -msgid "Cannot save the untracked files" -msgstr "无法保存未跟踪文件" - -#: git-stash.sh:175 git-stash.sh:188 -msgid "Cannot save the current worktree state" -msgstr "无法保存当前工作区状态" - -#: git-stash.sh:192 -msgid "No changes selected" -msgstr "没有选择变更" - -#: git-stash.sh:195 +#: git-legacy-stash.sh:220 msgid "Cannot remove temporary index (can't happen)" msgstr "无法删除临时索引(不应发生)" -#: git-stash.sh:208 -msgid "Cannot record working tree state" -msgstr "不能记录工作区状态" - -#: git-stash.sh:246 +#: git-legacy-stash.sh:271 #, sh-format msgid "Cannot update $ref_stash with $w_commit" msgstr "无法用 $w_commit 更新 $ref_stash" -#: git-stash.sh:298 +#: git-legacy-stash.sh:323 #, sh-format msgid "error: unknown option for 'stash push': $option" msgstr "错误:'stash push' 的未知选项:$option" -#: git-stash.sh:312 -msgid "Can't use --patch and --include-untracked or --all at the same time" -msgstr "不能同时使用参数 --patch 和 --include-untracked 或 --all" - -#: git-stash.sh:320 -msgid "No local changes to save" -msgstr "没有要保存的本地修改" - -#: git-stash.sh:325 -msgid "Cannot initialize stash" -msgstr "无法初始化贮藏" - -#: git-stash.sh:329 -msgid "Cannot save the current status" -msgstr "无法保存当前状态" - -#: git-stash.sh:330 +#: git-legacy-stash.sh:355 #, sh-format msgid "Saved working directory and index state $stash_msg" msgstr "保存工作目录和索引状态 $stash_msg" -#: git-stash.sh:359 -msgid "Cannot remove worktree changes" -msgstr "无法删除工作区变更" - -#: git-stash.sh:507 +#: git-legacy-stash.sh:535 #, sh-format msgid "unknown option: $opt" msgstr "未知选项: $opt" -#: git-stash.sh:520 -msgid "No stash entries found." -msgstr "未发现贮藏条目。" - -#: git-stash.sh:527 +#: git-legacy-stash.sh:555 #, sh-format msgid "Too many revisions specified: $REV" msgstr "指定了太多的版本:$REV" -#: git-stash.sh:542 +#: git-legacy-stash.sh:570 #, sh-format msgid "$reference is not a valid reference" msgstr "$reference 不是一个有效的引用" -#: git-stash.sh:570 +#: git-legacy-stash.sh:598 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "'$args' 不是贮藏式提交" -#: git-stash.sh:581 +#: git-legacy-stash.sh:609 #, sh-format msgid "'$args' is not a stash reference" msgstr "'$args' 不是一个贮藏引用" -#: git-stash.sh:589 +#: git-legacy-stash.sh:617 msgid "unable to refresh index" msgstr "无法刷新索引" -#: git-stash.sh:593 +#: git-legacy-stash.sh:621 msgid "Cannot apply a stash in the middle of a merge" msgstr "无法在合并过程应用贮藏" -#: git-stash.sh:601 +#: git-legacy-stash.sh:629 msgid "Conflicts in index. Try without --index." msgstr "索引中有冲突。尝试不使用 --index。" -#: git-stash.sh:603 +#: git-legacy-stash.sh:631 msgid "Could not save index tree" msgstr "不能保存索引树" -#: git-stash.sh:612 +#: git-legacy-stash.sh:640 msgid "Could not restore untracked files from stash entry" msgstr "无法从贮藏条目中恢复未跟踪文件" -#: git-stash.sh:637 +#: git-legacy-stash.sh:665 msgid "Cannot unstage modified files" msgstr "无法将修改的文件取消暂存" -#: git-stash.sh:652 -msgid "Index was not unstashed." -msgstr "索引未从贮藏中恢复。" - -#: git-stash.sh:666 -msgid "The stash entry is kept in case you need it again." -msgstr "贮藏条目被保留以备您再次需要。" - -#: git-stash.sh:675 +#: git-legacy-stash.sh:703 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "丢弃了 ${REV} ($s)" -#: git-stash.sh:676 +#: git-legacy-stash.sh:704 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "${REV}:无法丢弃贮藏条目" -#: git-stash.sh:684 -msgid "No branch name specified" -msgstr "未指定分支名" - -#: git-stash.sh:763 +#: git-legacy-stash.sh:791 msgid "(To restore them type \"git stash apply\")" msgstr "(为恢复数据输入 \"git stash apply\")" -#: git-submodule.sh:198 +#: git-submodule.sh:200 msgid "Relative path can only be used from the toplevel of the working tree" msgstr "只能在工作区的顶级目录中使用相对路径" -#: git-submodule.sh:208 +#: git-submodule.sh:210 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "仓库 URL:'$repo' 必须是绝对路径或以 ./|../ 起始" -#: git-submodule.sh:227 +#: git-submodule.sh:229 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "'$sm_path' 已经存在于索引中" -#: git-submodule.sh:230 +#: git-submodule.sh:232 #, sh-format msgid "'$sm_path' already exists in the index and is not a submodule" msgstr "'$sm_path' 已经存在于索引中且不是一个子模组" -#: git-submodule.sh:236 +#: git-submodule.sh:239 +#, sh-format +msgid "'$sm_path' does not have a commit checked out" +msgstr "'$sm_path' 没有检出的提交" + +#: git-submodule.sh:245 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -20406,22 +21379,22 @@ msgstr "" "$sm_path\n" "如果您确实想添加它,使用 -f 参数。" -#: git-submodule.sh:259 +#: git-submodule.sh:268 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "添加位于 '$sm_path' 的现存仓库到索引" -#: git-submodule.sh:261 +#: git-submodule.sh:270 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "'$sm_path' 已存在且不是一个有效的 git 仓库" -#: git-submodule.sh:269 +#: git-submodule.sh:278 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "本地发现 '$sm_name' 的一个 git 目录,与其对应的远程仓库:" -#: git-submodule.sh:271 +#: git-submodule.sh:280 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from\n" @@ -20436,49 +21409,51 @@ msgstr "" "使用 '--force' 选项。如果本地 git 目录不是正确的仓库\n" "或者您不确定这里的含义,使用 '--name' 选项选择另外的名称。" -#: git-submodule.sh:277 +#: git-submodule.sh:286 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "激活本地 git 目录到子模组 '$sm_name'。" -#: git-submodule.sh:289 +#: git-submodule.sh:298 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "不能检出子模组 '$sm_path'" -#: git-submodule.sh:294 +#: git-submodule.sh:303 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "无法添加子模组 '$sm_path'" -#: git-submodule.sh:303 +#: git-submodule.sh:312 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "无法注册子模组 '$sm_path'" -#: git-submodule.sh:563 +#: git-submodule.sh:573 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "无法在子模组路径 '$displaypath' 中找到当前版本" -#: git-submodule.sh:573 +#: git-submodule.sh:583 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "无法在子模组路径 '$sm_path' 中获取" -#: git-submodule.sh:578 +#: git-submodule.sh:588 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " "'$sm_path'" msgstr "无法在子模组路径 '$sm_path' 中找到当前版本 ${remote_name}/${branch}" -#: git-submodule.sh:596 +#: git-submodule.sh:606 #, sh-format -msgid "Unable to fetch in submodule path '$displaypath'" -msgstr "无法在子模组路径 '$displaypath' 中获取" +msgid "" +"Unable to fetch in submodule path '$displaypath'; trying to directly fetch " +"$sha1:" +msgstr "无法在子模组路径 '$displaypath' 中获取,尝试直接获取 $sha1:" -#: git-submodule.sh:602 +#: git-submodule.sh:612 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " @@ -20486,74 +21461,74 @@ msgid "" msgstr "" "获取了子模组路径 '$displaypath',但是它没有包含 $sha1。直接获取该提交失败。" -#: git-submodule.sh:609 +#: git-submodule.sh:619 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'" -#: git-submodule.sh:610 +#: git-submodule.sh:620 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "子模组路径 '$displaypath':检出 '$sha1'" -#: git-submodule.sh:614 +#: git-submodule.sh:624 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'" -#: git-submodule.sh:615 +#: git-submodule.sh:625 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "子模组路径 '$displaypath':变基至 '$sha1'" -#: git-submodule.sh:620 +#: git-submodule.sh:630 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中" -#: git-submodule.sh:621 +#: git-submodule.sh:631 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "子模组路径 '$displaypath':已合并入 '$sha1'" -#: git-submodule.sh:626 +#: git-submodule.sh:636 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "在子模组 '$displaypath' 中执行 '$command $sha1' 失败" -#: git-submodule.sh:627 +#: git-submodule.sh:637 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "子模组 '$displaypath':'$command $sha1'" -#: git-submodule.sh:658 +#: git-submodule.sh:668 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "无法递归进子模组路径 '$displaypath'" -#: git-submodule.sh:754 +#: git-submodule.sh:830 msgid "The --cached option cannot be used with the --files option" msgstr "选项 --cached 不能和选项 --files 同时使用" -#: git-submodule.sh:806 +#: git-submodule.sh:882 #, sh-format msgid "unexpected mode $mod_dst" msgstr "意外的模式 $mod_dst" # 译者:注意保持前导空格 -#: git-submodule.sh:826 +#: git-submodule.sh:902 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr " 警告:$display_name 未包含提交 $sha1_src" # 译者:注意保持前导空格 -#: git-submodule.sh:829 +#: git-submodule.sh:905 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr " 警告:$display_name 未包含提交 $sha1_dst" # 译者:注意保持前导空格 -#: git-submodule.sh:832 +#: 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" @@ -20864,55 +21839,55 @@ msgstr "不能对重写提交进行初始化" msgid "usage: $dashless $USAGE" msgstr "用法:$dashless $USAGE" -#: git-sh-setup.sh:190 +#: git-sh-setup.sh:191 #, sh-format msgid "Cannot chdir to $cdup, the toplevel of the working tree" msgstr "不能切换目录到 $cdup,工作区的顶级目录" -#: git-sh-setup.sh:199 git-sh-setup.sh:206 +#: git-sh-setup.sh:200 git-sh-setup.sh:207 #, sh-format msgid "fatal: $program_name cannot be used without a working tree." msgstr "致命错误:$program_name 不能在没有工作区的情况下使用" -#: git-sh-setup.sh:220 +#: git-sh-setup.sh:221 msgid "Cannot rebase: You have unstaged changes." msgstr "不能变基:您有未暂存的变更。" -#: git-sh-setup.sh:223 +#: git-sh-setup.sh:224 msgid "Cannot rewrite branches: You have unstaged changes." msgstr "不能重写分支:您有未暂存的变更。" -#: git-sh-setup.sh:226 +#: git-sh-setup.sh:227 msgid "Cannot pull with rebase: You have unstaged changes." msgstr "无法通过变基方式拉取:您有未暂存的变更。" -#: git-sh-setup.sh:229 +#: git-sh-setup.sh:230 #, sh-format msgid "Cannot $action: You have unstaged changes." msgstr "不能 $action:您有未暂存的变更。" -#: git-sh-setup.sh:242 +#: git-sh-setup.sh:243 msgid "Cannot rebase: Your index contains uncommitted changes." msgstr "不能变基:您的索引中包含未提交的变更。" -#: git-sh-setup.sh:245 +#: git-sh-setup.sh:246 msgid "Cannot pull with rebase: Your index contains uncommitted changes." msgstr "无法通过变基方式拉取:您的索引中包含未提交的变更。" -#: git-sh-setup.sh:248 +#: git-sh-setup.sh:249 #, sh-format msgid "Cannot $action: Your index contains uncommitted changes." msgstr "不能 $action:您的索引中包含未提交的变更。" -#: git-sh-setup.sh:252 +#: git-sh-setup.sh:253 msgid "Additionally, your index contains uncommitted changes." msgstr "而且您的索引中包含未提交的变更。" -#: git-sh-setup.sh:372 +#: git-sh-setup.sh:373 msgid "You need to run this command from the toplevel of the working tree." msgstr "您需要在工作区的顶级目录中运行这个命令。" -#: git-sh-setup.sh:377 +#: git-sh-setup.sh:378 msgid "Unable to determine absolute path of git directory" msgstr "不能确定 git 目录的绝对路径" @@ -21453,7 +22428,7 @@ msgstr "'%s.final' 包含编辑的邮件。\n" msgid "--dump-aliases incompatible with other options\n" msgstr "--dump-aliases 和其它选项不兼容\n" -#: git-send-email.perl:395 git-send-email.perl:650 +#: git-send-email.perl:395 git-send-email.perl:656 msgid "Cannot run git format-patch from outside a repository\n" msgstr "不能在仓库之外运行 git format-patch\n" @@ -21463,37 +22438,37 @@ msgid "" "configuration option)\n" msgstr "`batch-size` 和 `relogin` 必须同时定义(通过命令行或者配置选项)\n" -#: git-send-email.perl:468 +#: git-send-email.perl:470 #, perl-format msgid "Unknown --suppress-cc field: '%s'\n" msgstr "未知的 --suppress-cc 字段:'%s'\n" -#: git-send-email.perl:497 +#: git-send-email.perl:501 #, perl-format msgid "Unknown --confirm setting: '%s'\n" msgstr "未知的 --confirm 设置:'%s'\n" -#: git-send-email.perl:525 +#: git-send-email.perl:529 #, perl-format msgid "warning: sendmail alias with quotes is not supported: %s\n" msgstr "警告:不支持带引号的 sendmail 别名:%s\n" -#: git-send-email.perl:527 +#: git-send-email.perl:531 #, perl-format msgid "warning: `:include:` not supported: %s\n" msgstr "警告:不支持 `:include:`:%s\n" -#: git-send-email.perl:529 +#: git-send-email.perl:533 #, perl-format msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" msgstr "警告:不支持 `/file` 或 `|pipe` 重定向:%s\n" -#: git-send-email.perl:534 +#: git-send-email.perl:538 #, perl-format msgid "warning: sendmail line is not recognized: %s\n" msgstr "警告:不能识别的 sendmail 行:%s\n" -#: git-send-email.perl:616 +#: git-send-email.perl:622 #, perl-format msgid "" "File '%s' exists but it could also be the range of commits\n" @@ -21508,12 +22483,12 @@ msgstr "" " * 如果含义为一个文件,使用 \"./%s\",或者\n" " * 如果含义为一个范围,使用 --format-patch 选项。\n" -#: git-send-email.perl:637 +#: git-send-email.perl:643 #, perl-format msgid "Failed to opendir %s: %s" msgstr "无法打开目录 %s: %s" -#: git-send-email.perl:661 +#: git-send-email.perl:667 #, perl-format msgid "" "fatal: %s: %s\n" @@ -21522,7 +22497,7 @@ msgstr "" "致命错误:%s:%s\n" "警告:补丁未能发送\n" -#: git-send-email.perl:672 +#: git-send-email.perl:678 msgid "" "\n" "No patch files specified!\n" @@ -21532,17 +22507,17 @@ msgstr "" "未指定补丁文件!\n" "\n" -#: git-send-email.perl:685 +#: git-send-email.perl:691 #, perl-format msgid "No subject line in %s?" msgstr "在 %s 中没有标题行?" -#: git-send-email.perl:695 +#: git-send-email.perl:701 #, perl-format msgid "Failed to open for writing %s: %s" msgstr "为写入打开 %s 失败: %s" -#: git-send-email.perl:706 +#: git-send-email.perl:712 msgid "" "Lines beginning in \"GIT:\" will be removed.\n" "Consider including an overall diffstat or table of contents\n" @@ -21551,41 +22526,41 @@ msgid "" "Clear the body content if you don't wish to send a summary.\n" msgstr "" "以 \"GIT:\" 开头的行将被删除。\n" -"考虑包含一个整体的 diffstat 或者您正在写的补丁的目录。\n" +"考虑包含一个整体的差异统计或者您正在写的补丁的目录。\n" "\n" "如果您不想发送摘要,清除内容。\n" -#: git-send-email.perl:730 +#: git-send-email.perl:736 #, perl-format msgid "Failed to open %s: %s" msgstr "无法打开 %s: %s" -#: git-send-email.perl:747 +#: git-send-email.perl:753 #, perl-format msgid "Failed to open %s.final: %s" msgstr "无法打开 %s.final: %s" -#: git-send-email.perl:790 +#: git-send-email.perl:796 msgid "Summary email is empty, skipping it\n" msgstr "摘要邮件为空,跳过\n" #. TRANSLATORS: please keep [y/N] as is. -#: git-send-email.perl:825 +#: git-send-email.perl:831 #, perl-format msgid "Are you sure you want to use <%s> [y/N]? " msgstr "您确认要使用 <%s> [y/N]?" -#: git-send-email.perl:880 +#: git-send-email.perl:886 msgid "" "The following files are 8bit, but do not declare a Content-Transfer-" "Encoding.\n" msgstr "如下文件含 8bit 内容,但没有声明一个 Content-Transfer-Encoding。\n" -#: git-send-email.perl:885 +#: git-send-email.perl:891 msgid "Which 8bit encoding should I declare [UTF-8]? " msgstr "要声明 8bit 为什么样的编码格式 [UTF-8]?" -#: git-send-email.perl:893 +#: git-send-email.perl:899 #, perl-format msgid "" "Refusing to send because the patch\n" @@ -21597,20 +22572,20 @@ msgstr "" "\t%s\n" "包含模版标题 '*** SUBJECT HERE ***'。如果确实想要发送,使用参数 --force。\n" -#: git-send-email.perl:912 +#: git-send-email.perl:918 msgid "To whom should the emails be sent (if anyone)?" msgstr "邮件将要发送给谁?" -#: git-send-email.perl:930 +#: git-send-email.perl:936 #, perl-format msgid "fatal: alias '%s' expands to itself\n" msgstr "致命错误:别名 '%s' 扩展为它自己\n" -#: git-send-email.perl:942 +#: git-send-email.perl:948 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:1000 git-send-email.perl:1008 +#: git-send-email.perl:1006 git-send-email.perl:1014 #, perl-format msgid "error: unable to extract a valid address from: %s\n" msgstr "错误:不能从 %s 中提取一个有效的邮件地址\n" @@ -21618,16 +22593,16 @@ msgstr "错误:不能从 %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:1012 +#: git-send-email.perl:1018 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " msgstr "如何处理这个地址?([q]uit|[d]rop|[e]dit):" -#: git-send-email.perl:1329 +#: git-send-email.perl:1335 #, perl-format msgid "CA path \"%s\" does not exist" msgstr "CA 路径 \"%s\" 不存在" -#: git-send-email.perl:1412 +#: git-send-email.perl:1418 msgid "" " The Cc list above has been expanded by additional\n" " addresses found in the patch commit message. By default\n" @@ -21652,128 +22627,128 @@ 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:1427 +#: git-send-email.perl:1433 msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): " msgstr "发送这封邮件?([y]es|[n]o|[e]dit|[q]uit|[a]ll): " -#: git-send-email.perl:1430 +#: git-send-email.perl:1436 msgid "Send this email reply required" msgstr "发送要求的邮件回复" -#: git-send-email.perl:1458 +#: git-send-email.perl:1464 msgid "The required SMTP server is not properly defined." msgstr "要求的 SMTP 服务器未被正确定义。" -#: git-send-email.perl:1505 +#: git-send-email.perl:1511 #, perl-format msgid "Server does not support STARTTLS! %s" msgstr "服务器不支持 STARTTLS!%s" -#: git-send-email.perl:1510 git-send-email.perl:1514 +#: git-send-email.perl:1516 git-send-email.perl:1520 #, perl-format msgid "STARTTLS failed! %s" msgstr "STARTTLS 失败!%s" -#: git-send-email.perl:1523 +#: git-send-email.perl:1529 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." msgstr "无法正确地初始化 SMTP。检查配置并使用 --smtp-debug。" -#: git-send-email.perl:1541 +#: git-send-email.perl:1547 #, perl-format msgid "Failed to send %s\n" msgstr "无法发送 %s\n" -#: git-send-email.perl:1544 +#: git-send-email.perl:1550 #, perl-format msgid "Dry-Sent %s\n" msgstr "演习发送 %s\n" -#: git-send-email.perl:1544 +#: git-send-email.perl:1550 #, perl-format msgid "Sent %s\n" msgstr "正发送 %s\n" -#: git-send-email.perl:1546 +#: git-send-email.perl:1552 msgid "Dry-OK. Log says:\n" msgstr "演习成功。日志说:\n" -#: git-send-email.perl:1546 +#: git-send-email.perl:1552 msgid "OK. Log says:\n" msgstr "OK。日志说:\n" -#: git-send-email.perl:1558 +#: git-send-email.perl:1564 msgid "Result: " msgstr "结果:" -#: git-send-email.perl:1561 +#: git-send-email.perl:1567 msgid "Result: OK\n" msgstr "结果:OK\n" -#: git-send-email.perl:1579 +#: git-send-email.perl:1585 #, perl-format msgid "can't open file %s" msgstr "无法打开文件 %s" -#: git-send-email.perl:1626 git-send-email.perl:1646 +#: git-send-email.perl:1632 git-send-email.perl:1652 #, perl-format msgid "(mbox) Adding cc: %s from line '%s'\n" msgstr "(mbox) 添加 cc:%s 自行 '%s'\n" -#: git-send-email.perl:1632 +#: git-send-email.perl:1638 #, perl-format msgid "(mbox) Adding to: %s from line '%s'\n" msgstr "(mbox) 添加 to:%s 自行 '%s'\n" -#: git-send-email.perl:1685 +#: git-send-email.perl:1691 #, perl-format msgid "(non-mbox) Adding cc: %s from line '%s'\n" msgstr "(non-mbox) 添加 cc:%s 自行 '%s'\n" -#: git-send-email.perl:1720 +#: git-send-email.perl:1726 #, perl-format msgid "(body) Adding cc: %s from line '%s'\n" msgstr "(body) 添加 cc: %s 自行 '%s'\n" -#: git-send-email.perl:1831 +#: git-send-email.perl:1837 #, perl-format msgid "(%s) Could not execute '%s'" msgstr "(%s) 不能执行 '%s'" -#: git-send-email.perl:1838 +#: git-send-email.perl:1844 #, perl-format msgid "(%s) Adding %s: %s from: '%s'\n" msgstr "(%s) 添加 %s: %s 自:'%s'\n" -#: git-send-email.perl:1842 +#: git-send-email.perl:1848 #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "(%s) 无法关闭管道至 '%s'" -#: git-send-email.perl:1872 +#: git-send-email.perl:1878 msgid "cannot send message as 7bit" msgstr "不能以 7bit 形式发送信息" -#: git-send-email.perl:1880 +#: git-send-email.perl:1886 msgid "invalid transfer encoding" msgstr "无效的传送编码" -#: git-send-email.perl:1921 git-send-email.perl:1973 git-send-email.perl:1983 +#: git-send-email.perl:1927 git-send-email.perl:1979 git-send-email.perl:1989 #, perl-format msgid "unable to open %s: %s\n" msgstr "不能打开 %s:%s\n" -#: git-send-email.perl:1924 +#: git-send-email.perl:1930 #, perl-format msgid "%s: patch contains a line longer than 998 characters" msgstr "%s:补丁包含一个超过 998 字符的行" -#: git-send-email.perl:1941 +#: git-send-email.perl:1947 #, 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:1945 +#: git-send-email.perl:1951 #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "您真的要发送 %s?[y|N]:" |