diff options
| author | Jiang Xin <worldhello.net@gmail.com> | 2018-09-04 03:49:54 +0300 |
|---|---|---|
| committer | Jiang Xin <worldhello.net@gmail.com> | 2018-09-04 03:49:54 +0300 |
| commit | fb996aadc64eaf6dba715c04cc74ff1bc583b73f (patch) | |
| tree | 461fda96d81871f5b2be2e75228abb46465e9e27 | |
| parent | 2f743933341f276111103550fbf383a34dfcfd38 (diff) | |
| parent | a123a47f40b963b448a4920fccc34a089f603afd (diff) | |
Merge branch 'master' of git://github.com/git-l10n/git-po
* 'master' of git://github.com/git-l10n/git-po:
l10n: ru.po: update Russian translation
l10n: git.pot: v2.19.0 round 1 (382 new, 30 removed)
l10n: de.po: translate 108 new messages
l10n: zh_CN: review for git 2.18.0
l10n: sv.po: Update Swedish translation(3608t0f0u)
| -rw-r--r-- | po/de.po | 5179 | ||||
| -rw-r--r-- | po/git.pot | 6984 | ||||
| -rw-r--r-- | po/ru.po | 10148 | ||||
| -rw-r--r-- | po/sv.po | 38 | ||||
| -rw-r--r-- | po/zh_CN.po | 16 |
5 files changed, 13907 insertions, 8458 deletions
@@ -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: 2018-03-16 07:29+0800\n" +"POT-Creation-Date: 2018-05-31 23:32+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:62 +#: advice.c:92 #, c-format -msgid "hint: %.*s\n" -msgstr "Hinweis: %.*s\n" +msgid "%shint: %.*s%s\n" +msgstr "%sHinweis: %.*s%s\n" -#: advice.c:90 +#: advice.c:137 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:92 +#: advice.c:139 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:94 +#: advice.c:141 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:96 +#: advice.c:143 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:98 +#: advice.c:145 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:100 +#: advice.c:147 #, 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:108 +#: advice.c:155 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:116 +#: advice.c:163 msgid "Exiting because of an unresolved conflict." msgstr "Beende wegen unaufgelöstem Konflikt." -#: advice.c:121 builtin/merge.c:1251 +#: advice.c:168 builtin/merge.c:1249 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Sie haben Ihren Merge nicht abgeschlossen (MERGE_HEAD existiert)." -#: advice.c:123 +#: advice.c:170 msgid "Please, commit your changes before merging." msgstr "Bitte committen Sie Ihre Änderungen, bevor Sie mergen." -#: advice.c:124 +#: advice.c:171 msgid "Exiting because of unfinished merge." msgstr "Beende wegen nicht abgeschlossenem Merge." -#: advice.c:130 +#: advice.c:177 #, c-format msgid "" "Note: checking out '%s'.\n" @@ -360,7 +360,7 @@ msgstr "Anwendung des Patches fehlgeschlagen: %s:%ld" msgid "cannot checkout %s" msgstr "kann %s nicht auschecken" -#: apply.c:3396 apply.c:3407 apply.c:3453 setup.c:277 +#: apply.c:3396 apply.c:3407 apply.c:3453 setup.c:278 #, c-format msgid "failed to read %s" msgstr "Fehler beim Lesen von %s" @@ -561,7 +561,7 @@ msgstr[1] "Wende Patch %%s mit %d Zurückweisungen an..." msgid "truncating .rej filename to %.*s.rej" msgstr "Verkürze Name von .rej Datei zu %.*s.rej" -#: apply.c:4545 builtin/fetch.c:775 builtin/fetch.c:1025 +#: apply.c:4545 builtin/fetch.c:786 builtin/fetch.c:1036 #, c-format msgid "cannot open %s" msgstr "kann '%s' nicht öffnen" @@ -615,15 +615,15 @@ 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:4894 builtin/add.c:539 builtin/mv.c:298 builtin/rm.c:390 +#: apply.c:4894 builtin/add.c:538 builtin/mv.c:300 builtin/rm.c:389 msgid "Unable to write new index file" msgstr "Konnte neue Index-Datei nicht schreiben." #: apply.c:4921 apply.c:4924 builtin/am.c:2254 builtin/am.c:2257 -#: builtin/clone.c:118 builtin/fetch.c:127 builtin/pull.c:193 -#: builtin/submodule--helper.c:403 builtin/submodule--helper.c:1197 -#: builtin/submodule--helper.c:1200 builtin/submodule--helper.c:1567 -#: builtin/submodule--helper.c:1570 builtin/submodule--helper.c:1787 +#: builtin/clone.c:120 builtin/fetch.c:126 builtin/pull.c:198 +#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1210 +#: builtin/submodule--helper.c:1213 builtin/submodule--helper.c:1584 +#: builtin/submodule--helper.c:1587 builtin/submodule--helper.c:1807 #: git-add--interactive.perl:197 msgid "path" msgstr "Pfad" @@ -711,7 +711,7 @@ msgstr "" #: apply.c:4960 builtin/am.c:2242 builtin/interpret-trailers.c:95 #: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99 -#: builtin/pack-objects.c:3035 +#: builtin/pack-objects.c:3177 msgid "action" msgstr "Aktion" @@ -740,9 +740,9 @@ msgstr "" msgid "allow overlapping hunks" msgstr "sich überlappende Patch-Blöcke erlauben" -#: apply.c:4977 builtin/add.c:292 builtin/check-ignore.c:21 -#: builtin/commit.c:1276 builtin/count-objects.c:96 builtin/fsck.c:665 -#: builtin/log.c:1901 builtin/mv.c:123 builtin/read-tree.c:125 +#: apply.c:4977 builtin/add.c:290 builtin/check-ignore.c:21 +#: builtin/commit.c:1301 builtin/count-objects.c:98 builtin/fsck.c:666 +#: builtin/log.c:1901 builtin/mv.c:122 builtin/read-tree.c:124 msgid "be verbose" msgstr "erweiterte Ausgaben" @@ -781,7 +781,7 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <Repository> [--exec <Programm>] --list" -#: archive.c:351 builtin/add.c:176 builtin/add.c:515 builtin/rm.c:299 +#: archive.c:351 builtin/add.c:176 builtin/add.c:514 builtin/rm.c:298 #, c-format msgid "pathspec '%s' did not match any files" msgstr "Pfadspezifikation '%s' stimmt mit keinen Dateien überein" @@ -802,10 +802,10 @@ 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:439 builtin/blame.c:702 builtin/blame.c:703 builtin/config.c:62 -#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:869 +#: archive.c:439 builtin/blame.c:813 builtin/blame.c:814 builtin/config.c:127 +#: builtin/fast-export.c:1007 builtin/fast-export.c:1009 builtin/grep.c:869 #: builtin/hash-object.c:103 builtin/ls-files.c:551 builtin/ls-files.c:554 -#: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:120 +#: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:119 #: parse-options.h:165 msgid "file" msgstr "Datei" @@ -838,8 +838,8 @@ msgstr "besser komprimieren" msgid "list supported archive formats" msgstr "unterstützte Archivformate auflisten" -#: archive.c:458 builtin/archive.c:90 builtin/clone.c:108 builtin/clone.c:111 -#: builtin/submodule--helper.c:1209 builtin/submodule--helper.c:1576 +#: archive.c:458 builtin/archive.c:90 builtin/clone.c:110 builtin/clone.c:113 +#: builtin/submodule--helper.c:1222 builtin/submodule--helper.c:1593 msgid "repo" msgstr "Repository" @@ -890,22 +890,22 @@ msgstr "" "Verneinende Muster werden in Git-Attributen ignoriert.\n" "Benutzen Sie '\\!' für führende Ausrufezeichen." -#: bisect.c:460 +#: bisect.c:461 #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "Ungültiger Inhalt bzgl. Anführungsstriche in Datei '%s': %s" -#: bisect.c:668 +#: bisect.c:669 #, c-format msgid "We cannot bisect more!\n" msgstr "Keine binäre Suche mehr möglich!\n" -#: bisect.c:722 +#: bisect.c:723 #, c-format msgid "Not a valid commit name %s" msgstr "%s ist kein gültiger Commit-Name" -#: bisect.c:746 +#: bisect.c:747 #, c-format msgid "" "The merge base %s is bad.\n" @@ -914,7 +914,7 @@ msgstr "" "Die Merge-Basis %s ist fehlerhaft.\n" "Das bedeutet, der Fehler wurde zwischen %s und [%s] behoben.\n" -#: bisect.c:751 +#: bisect.c:752 #, c-format msgid "" "The merge base %s is new.\n" @@ -923,7 +923,7 @@ msgstr "" "Die Merge-Basis %s ist neu.\n" "Das bedeutet, die Eigenschaft hat sich zwischen %s und [%s] geändert.\n" -#: bisect.c:756 +#: bisect.c:757 #, c-format msgid "" "The merge base %s is %s.\n" @@ -932,7 +932,7 @@ msgstr "" "Die Merge-Basis %s ist %s.\n" "Das bedeutet, der erste '%s' Commit befindet sich zwischen %s und [%s].\n" -#: bisect.c:764 +#: bisect.c:765 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -943,7 +943,7 @@ msgstr "" "git bisect kann in diesem Fall nicht richtig arbeiten.\n" "Vielleicht verwechselten Sie %s und %s Commits?\n" -#: bisect.c:777 +#: bisect.c:778 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -955,36 +955,36 @@ msgstr "" "erste %s Commit zwischen %s und %s befindet.\n" "Es wird dennoch fortgesetzt." -#: bisect.c:810 +#: bisect.c:811 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "binäre Suche: eine Merge-Basis muss geprüft werden\n" -#: bisect.c:850 +#: bisect.c:851 #, c-format msgid "a %s revision is needed" msgstr "ein %s Commit wird benötigt" -#: bisect.c:869 builtin/notes.c:175 builtin/tag.c:235 +#: bisect.c:870 builtin/notes.c:175 builtin/tag.c:236 #, c-format msgid "could not create file '%s'" msgstr "konnte Datei '%s' nicht erstellen" -#: bisect.c:920 +#: bisect.c:921 #, c-format msgid "could not read file '%s'" msgstr "Konnte Datei '%s' nicht lesen" -#: bisect.c:950 +#: bisect.c:951 msgid "reading bisect refs failed" msgstr "Lesen von Referenzen für binäre Suche fehlgeschlagen" -#: bisect.c:969 +#: bisect.c:970 #, c-format msgid "%s was both %s and %s\n" msgstr "%s war sowohl %s als auch %s\n" -#: bisect.c:977 +#: bisect.c:978 #, c-format msgid "" "No testable commit found.\n" @@ -993,7 +993,7 @@ msgstr "" "Kein testbarer Commit gefunden.\n" "Vielleicht starteten Sie mit falschen Pfad-Parametern?\n" -#: bisect.c:996 +#: bisect.c:997 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -1003,54 +1003,54 @@ msgstr[1] "(ungefähr %d Schritte)" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. -#: bisect.c:1002 +#: bisect.c:1003 #, 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:1758 +#: blame.c:1756 msgid "--contents and --reverse do not blend well." msgstr "--contents und --reverse funktionieren gemeinsam nicht." -#: blame.c:1769 +#: blame.c:1767 msgid "cannot use --contents with final commit object name" msgstr "" "kann --contents nicht mit endgültigem Namen des Commit-Objektes benutzen" -#: blame.c:1789 +#: blame.c:1787 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:1798 bundle.c:160 ref-filter.c:1978 sequencer.c:1699 -#: sequencer.c:2901 builtin/commit.c:976 builtin/log.c:366 builtin/log.c:920 -#: builtin/log.c:1371 builtin/log.c:1702 builtin/log.c:1950 builtin/merge.c:370 -#: builtin/shortlog.c:191 +#: blame.c:1796 bundle.c:160 ref-filter.c:2075 sequencer.c:1860 +#: sequencer.c:3631 builtin/commit.c:981 builtin/log.c:366 builtin/log.c:920 +#: builtin/log.c:1371 builtin/log.c:1702 builtin/log.c:1950 builtin/merge.c:371 +#: builtin/shortlog.c:192 msgid "revision walk setup failed" msgstr "Einrichtung des Revisionsgangs fehlgeschlagen" -#: blame.c:1816 +#: blame.c:1814 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:1827 +#: blame.c:1825 #, c-format msgid "no such path %s in %s" msgstr "Pfad %s nicht in %s" -#: blame.c:1838 +#: blame.c:1836 #, c-format msgid "cannot read blob %s for path %s" msgstr "kann Blob %s für Pfad '%s' nicht lesen" -#: branch.c:53 +#: branch.c:54 #, c-format msgid "" "\n" @@ -1064,89 +1064,89 @@ msgstr "" "\"git branch --set-upstream-to=%s%s%s\"\n" "erneut setzen." -#: branch.c:67 +#: branch.c:68 #, c-format msgid "Not setting branch %s as its own upstream." msgstr "Branch %s kann nicht sein eigener Upstream-Branch sein." -#: branch.c:93 +#: branch.c:94 #, 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:94 +#: branch.c:95 #, 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:98 +#: branch.c:99 #, 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:99 +#: branch.c:100 #, c-format msgid "Branch '%s' set up to track local branch '%s'." msgstr "Branch '%s' folgt nun lokalem Branch '%s'." -#: branch.c:104 +#: branch.c:105 #, 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:105 +#: branch.c:106 #, c-format msgid "Branch '%s' set up to track remote ref '%s'." msgstr "Branch '%s' folgt nun Remote-Referenz '%s'." -#: branch.c:109 +#: branch.c:110 #, 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:110 +#: branch.c:111 #, c-format msgid "Branch '%s' set up to track local ref '%s'." msgstr "Branch '%s' folgt nun lokaler Referenz '%s'." -#: branch.c:119 +#: branch.c:120 msgid "Unable to write upstream branch configuration" msgstr "Konnte Konfiguration zu Upstream-Branch nicht schreiben." -#: branch.c:156 +#: branch.c:157 #, c-format msgid "Not tracking: ambiguous information for ref %s" msgstr "" "Konfiguration zum Folgen von Branch nicht eingerichtet. Referenz %s ist " "mehrdeutig." -#: branch.c:189 +#: branch.c:190 #, c-format msgid "'%s' is not a valid branch name." msgstr "'%s' ist kein gültiger Branchname." -#: branch.c:208 +#: branch.c:209 #, c-format msgid "A branch named '%s' already exists." msgstr "Branch '%s' existiert bereits." -#: branch.c:213 +#: branch.c:214 msgid "Cannot force update the current branch." msgstr "Kann Aktualisierung des aktuellen Branches nicht erzwingen." -#: branch.c:233 +#: branch.c:234 #, 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:235 +#: branch.c:236 #, c-format msgid "the requested upstream branch '%s' does not exist" msgstr "der angeforderte Upstream-Branch '%s' existiert nicht" -#: branch.c:237 +#: branch.c:238 msgid "" "\n" "If you are planning on basing your work on an upstream\n" @@ -1167,27 +1167,27 @@ 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'" -#: branch.c:359 +#: branch.c:360 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "'%s' ist bereits in '%s' ausgecheckt" -#: branch.c:382 +#: branch.c:383 #, c-format msgid "HEAD of working tree %s is not updated" msgstr "HEAD des Arbeitsverzeichnisses %s ist nicht aktualisiert." @@ -1202,7 +1202,7 @@ msgstr "'%s' sieht nicht wie eine v2 Paketdatei aus" msgid "unrecognized header: %s%s (%d)" msgstr "nicht erkannter Kopfbereich: %s%s (%d)" -#: bundle.c:88 sequencer.c:1879 sequencer.c:2337 builtin/commit.c:750 +#: bundle.c:88 sequencer.c:2080 sequencer.c:2557 builtin/commit.c:755 #, c-format msgid "could not open '%s'" msgstr "Konnte '%s' nicht öffnen" @@ -1246,7 +1246,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:450 builtin/log.c:183 builtin/log.c:1607 builtin/shortlog.c:296 +#: bundle.c:450 builtin/log.c:183 builtin/log.c:1607 builtin/shortlog.c:303 #, c-format msgid "unrecognized argument: %s" msgstr "nicht erkanntes Argument: %s" @@ -1269,18 +1269,40 @@ msgstr "Erstellung der Paketindexdatei abgebrochen" msgid "invalid color value: %.*s" msgstr "Ungültiger Farbwert: %.*s" -#: commit.c:41 sequencer.c:2141 builtin/am.c:421 builtin/am.c:465 -#: builtin/am.c:1436 builtin/am.c:2072 +#: commit.c:43 sequencer.c:2363 builtin/am.c:421 builtin/am.c:465 +#: builtin/am.c:1436 builtin/am.c:2072 builtin/replace.c:376 +#: builtin/replace.c:448 #, c-format msgid "could not parse %s" msgstr "konnte %s nicht parsen" -#: commit.c:43 +#: commit.c:45 #, c-format msgid "%s %s is not a commit!" msgstr "%s %s ist kein Commit!" -#: commit.c:1506 +#: commit.c:182 +msgid "" +"Support for <GIT_DIR>/info/grafts is deprecated\n" +"and will be removed in a future Git version.\n" +"\n" +"Please use \"git replace --convert-graft-file\"\n" +"to convert the grafts into replace refs.\n" +"\n" +"Turn this message off by running\n" +"\"git config advice.graftFileDeprecated false\"" +msgstr "" +"Die Unterstützung für <GIT_DIR>/info/grafts ist veraltet\n" +"und wird in zukünftigen Git Versionen entfernt.\n" +"\n" +"Bitte benutzen Sie \"git replace --convert-graft-file\"\n" +"zum Konvertieren der künstlichen Vorgänger (\"grafts\")\n" +"in ersetzende Referenzen.<\n" +"\n" +"Sie können diese Meldung unterdrücken, indem Sie\n" +"\"git config advice.graftFileDeprecated false\" ausführen." + +#: commit.c:1537 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" @@ -1292,187 +1314,201 @@ msgstr "" "Encoding,\n" "welches von ihrem Projekt verwendet wird.\n" +#: commit-graph.c:669 +#, c-format +msgid "the commit graph format cannot write %d commits" +msgstr "Das Commit-Graph Format kann nicht %d Commits schreiben." + +#: commit-graph.c:696 +msgid "too many commits to write graph" +msgstr "Zu viele Commits zum Schreiben des Graphen." + +#: commit-graph.c:707 builtin/init-db.c:516 builtin/init-db.c:521 +#, c-format +msgid "cannot mkdir %s" +msgstr "kann Verzeichnis %s nicht erstellen" + #: compat/obstack.c:405 compat/obstack.c:407 msgid "memory exhausted" msgstr "Speicher verbraucht" -#: config.c:186 +#: config.c:187 msgid "relative config include conditionals must come from files" msgstr "" "Bedingungen für das Einbinden von Konfigurationen aus relativen Pfaden " "müssen\n" "aus Dateien kommen." -#: config.c:720 +#: config.c:788 #, c-format msgid "bad config line %d in blob %s" msgstr "Ungültige Konfigurationszeile %d in Blob %s" -#: config.c:724 +#: config.c:792 #, c-format msgid "bad config line %d in file %s" msgstr "Ungültige Konfigurationszeile %d in Datei %s" -#: config.c:728 +#: config.c:796 #, c-format msgid "bad config line %d in standard input" msgstr "Ungültige Konfigurationszeile %d in Standard-Eingabe" -#: config.c:732 +#: config.c:800 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "Ungültige Konfigurationszeile %d in Submodul-Blob %s" -#: config.c:736 +#: config.c:804 #, c-format msgid "bad config line %d in command line %s" msgstr "Ungültige Konfigurationszeile %d in Kommandozeile %s" -#: config.c:740 +#: config.c:808 #, c-format msgid "bad config line %d in %s" msgstr "Ungültige Konfigurationszeile %d in %s" -#: config.c:868 +#: config.c:936 msgid "out of range" msgstr "Außerhalb des Bereichs" -#: config.c:868 +#: config.c:936 msgid "invalid unit" msgstr "Ungültige Einheit" -#: config.c:874 +#: config.c:942 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "Ungültiger numerischer Wert '%s' für Konfiguration '%s': %s" -#: config.c:879 +#: config.c:947 #, c-format msgid "bad numeric config value '%s' for '%s' in blob %s: %s" msgstr "Ungültiger numerischer Wert '%s' für Konfiguration '%s' in Blob %s: %s" -#: config.c:882 +#: config.c:950 #, c-format msgid "bad numeric config value '%s' for '%s' in file %s: %s" msgstr "" "Ungültiger numerischer Wert '%s' für Konfiguration '%s' in Datei %s: %s" -#: config.c:885 +#: config.c:953 #, c-format msgid "bad numeric config value '%s' for '%s' in standard input: %s" msgstr "" "Ungültiger numerischer Wert '%s' für Konfiguration '%s' in Standard-Eingabe: " "%s" -#: config.c:888 +#: config.c:956 #, c-format msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" msgstr "" "Ungültiger numerischer Wert '%s' für Konfiguration '%s' in Submodul-Blob %s: " "%s" -#: config.c:891 +#: config.c:959 #, c-format msgid "bad numeric config value '%s' for '%s' in command line %s: %s" msgstr "" "Ungültiger numerischer Wert '%s' für Konfiguration '%s' in Befehlszeile %s: " "%s" -#: config.c:894 +#: config.c:962 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "Ungültiger numerischer Wert '%s' für Konfiguration '%s' in %s: %s" -#: config.c:989 +#: config.c:1057 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "Fehler beim Erweitern des Nutzerverzeichnisses in: '%s'" -#: config.c:998 +#: config.c:1066 #, c-format msgid "'%s' for '%s' is not a valid timestamp" msgstr "'%s' ist kein gültiger Zeitstempel für '%s'" -#: config.c:1094 config.c:1105 +#: config.c:1171 config.c:1182 #, c-format msgid "bad zlib compression level %d" msgstr "ungültiger zlib Komprimierungsgrad %d" -#: config.c:1225 +#: config.c:1307 #, c-format msgid "invalid mode for object creation: %s" msgstr "Ungültiger Modus für Objekterstellung: %s" -#: config.c:1386 +#: config.c:1473 #, c-format msgid "bad pack compression level %d" msgstr "ungültiger Komprimierungsgrad (%d) für Paketierung" -#: config.c:1582 +#: config.c:1681 msgid "unable to parse command-line config" msgstr "" "Konnte die über die Befehlszeile angegebene Konfiguration nicht parsen." -#: config.c:1914 +#: config.c:2013 msgid "unknown error occurred while reading the configuration files" msgstr "" "Es trat ein unbekannter Fehler beim Lesen der Konfigurationsdateien auf." -#: config.c:2101 +#: config.c:2200 #, c-format msgid "Invalid %s: '%s'" msgstr "Ungültiger %s: '%s'" -#: config.c:2144 +#: config.c:2243 #, c-format msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" msgstr "" "Unbekannter Wert '%s' in core.untrackedCache; benutze Standardwert 'keep'" -#: config.c:2170 +#: config.c:2269 #, 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:2195 +#: config.c:2294 #, 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:2197 +#: config.c:2296 #, 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:2256 +#: config.c:2402 #, c-format msgid "%s has multiple values" msgstr "%s hat mehrere Werte" -#: config.c:2599 config.c:2816 +#: config.c:2766 config.c:3019 #, c-format msgid "fstat on %s failed" msgstr "fstat auf %s fehlgeschlagen" -#: config.c:2706 +#: config.c:2905 #, c-format msgid "could not set '%s' to '%s'" msgstr "Konnte '%s' nicht zu '%s' setzen." -#: config.c:2708 builtin/remote.c:776 +#: config.c:2907 builtin/remote.c:779 #, c-format msgid "could not unset '%s'" msgstr "Konnte '%s' nicht aufheben." -#: connect.c:52 +#: connect.c:60 msgid "The remote end hung up upon initial contact" msgstr "Die Gegenseite hat nach dem ersten Kontakt abgebrochen." -#: connect.c:54 +#: connect.c:62 msgid "" "Could not read from remote repository.\n" "\n" @@ -1485,7 +1521,7 @@ msgstr "" "bestehen\n" "und das Repository existiert." -#: connected.c:66 builtin/fsck.c:198 builtin/prune.c:144 +#: connected.c:66 builtin/fsck.c:201 builtin/prune.c:145 msgid "Checking connectivity" msgstr "Prüfe Konnektivität" @@ -1501,12 +1537,12 @@ msgstr "Fehler beim Schreiben nach rev-list" msgid "failed to close rev-list's stdin" msgstr "Fehler beim Schließen von rev-list's Standard-Eingabe" -#: convert.c:205 +#: convert.c:206 #, c-format msgid "CRLF would be replaced by LF in %s." msgstr "CRLF würde in %s durch LF ersetzt werden." -#: convert.c:207 +#: convert.c:208 #, c-format msgid "" "CRLF will be replaced by LF in %s.\n" @@ -1516,12 +1552,12 @@ msgstr "" "Die Datei wird ihre ursprünglichen Zeilenenden im Arbeitsverzeichnis " "behalten." -#: convert.c:215 +#: convert.c:216 #, c-format msgid "LF would be replaced by CRLF in %s" msgstr "LF würde in %s durch CRLF ersetzt werden." -#: convert.c:217 +#: convert.c:218 #, c-format msgid "" "LF will be replaced by CRLF in %s.\n" @@ -1531,6 +1567,49 @@ msgstr "" "Die Datei wird ihre ursprünglichen Zeilenenden im Arbeitsverzeichnis " "behalten." +#: convert.c:279 +#, c-format +msgid "BOM is prohibited in '%s' if encoded as %s" +msgstr "BOM ist in '%s' unzulässig, wenn als %s codiert." + +#: convert.c:286 +#, c-format +msgid "" +"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-" +"tree-encoding." +msgstr "" +"Die Datei '%s' enthält ein Byte-Order-Mark (BOM). Bitte benutzen Sie UTF-%s\n" +"als Codierung im Arbeitsverzeichnis." + +#: convert.c:304 +#, c-format +msgid "BOM is required in '%s' if encoded as %s" +msgstr "BOM ist erforderlich in '%s', wenn als %s codiert." + +#: convert.c:306 +#, c-format +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 "" +"Der Datei '%s' fehlt ein Byte-Order-Mark (BOM). Bitte benutzen Sie UTF-%sBE\n" +"oder UTF-%sLE (abhängig von der Byte-Reihenfolge) als Codierung im\n" +"Arbeitsverzeichnis." + +#: convert.c:424 +#, c-format +msgid "failed to encode '%s' from %s to %s" +msgstr "Fehler beim Codieren von '%s' von %s nach %s." + +#: convert.c:467 +#, c-format +msgid "encoding '%s' from %s to %s and back is not the same" +msgstr "Die Codierung '%s' von %s nach %s und zurück ist nicht dasselbe." + +#: convert.c:1225 +msgid "true/false are no valid working-tree-encodings" +msgstr "true/false sind keine gültigen Codierungen im Arbeitsverzeichnis." + #: date.c:116 msgid "in the future" msgstr "in der Zukunft" @@ -1646,25 +1725,25 @@ msgstr "" "Fehler in 'diff.dirstat' Konfigurationsvariable gefunden:\n" "%s" -#: diff.c:3822 +#: diff.c:3823 #, c-format msgid "external diff died, stopping at %s" msgstr "externes Diff-Programm unerwartet beendet, angehalten bei %s" -#: diff.c:4146 +#: diff.c:4153 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:4149 +#: diff.c:4156 msgid "-G, -S and --find-object are mutually exclusive" msgstr "-G, -S und --find-object schließen sich gegenseitig aus" -#: diff.c:4237 +#: diff.c:4244 msgid "--follow requires exactly one pathspec" msgstr "--follow erfordert genau eine Pfadspezifikation" -#: diff.c:4403 +#: diff.c:4410 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -1673,22 +1752,22 @@ msgstr "" "Fehler beim Parsen des --dirstat/-X Optionsparameters:\n" "%s" -#: diff.c:4417 +#: diff.c:4424 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "Fehler beim Parsen des --submodule Optionsparameters: '%s'" -#: diff.c:5493 +#: diff.c:5500 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:5496 +#: diff.c:5503 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:5499 +#: diff.c:5506 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." @@ -1696,27 +1775,27 @@ msgstr "" "Sie könnten die Variable %s auf mindestens %d setzen und den Befehl\n" "erneut versuchen." -#: dir.c:1866 +#: dir.c:1867 #, c-format msgid "could not open directory '%s'" msgstr "Konnte Verzeichnis '%s' nicht öffnen." -#: dir.c:2108 +#: dir.c:2109 msgid "failed to get kernel name and information" msgstr "Fehler beim Sammeln von Namen und Informationen zum Kernel" -#: dir.c:2232 +#: dir.c:2233 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:3024 dir.c:3029 +#: dir.c:3075 dir.c:3080 #, c-format msgid "could not create directories for %s" msgstr "Konnte Verzeichnisse für '%s' nicht erstellen." -#: dir.c:3054 +#: dir.c:3109 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "Konnte Git-Verzeichnis nicht von '%s' nach '%s' migrieren." @@ -1739,201 +1818,205 @@ msgstr "Konnte Datei '%s' nicht lesen." msgid "Remote with no URL" msgstr "Remote-Repository ohne URL" -#: fetch-pack.c:253 +#: fetch-pack.c:254 msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack: erwartete shallow-Liste" -#: fetch-pack.c:265 +#: fetch-pack.c:266 msgid "git fetch-pack: expected ACK/NAK, got a flush packet" msgstr "git fetch-pack: ACK/NAK erwartet, Flush-Paket bekommen" -#: fetch-pack.c:284 builtin/archive.c:63 +#: fetch-pack.c:285 builtin/archive.c:63 #, c-format msgid "remote error: %s" msgstr "Fehler am anderen Ende: %s" -#: fetch-pack.c:285 +#: fetch-pack.c:286 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "git fetch-pack: ACK/NAK erwartet, '%s' bekommen" -#: fetch-pack.c:337 +#: fetch-pack.c:338 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc benötigt multi_ack_detailed" -#: fetch-pack.c:428 +#: fetch-pack.c:429 fetch-pack.c:1310 #, c-format msgid "invalid shallow line: %s" msgstr "Ungültige shallow-Zeile: %s" -#: fetch-pack.c:434 +#: fetch-pack.c:435 fetch-pack.c:1316 #, c-format msgid "invalid unshallow line: %s" msgstr "Ungültige unshallow-Zeile: %s" -#: fetch-pack.c:436 +#: fetch-pack.c:437 fetch-pack.c:1318 #, c-format msgid "object not found: %s" msgstr "Objekt nicht gefunden: %s" -#: fetch-pack.c:439 +#: fetch-pack.c:440 fetch-pack.c:1321 #, c-format msgid "error in object: %s" msgstr "Fehler in Objekt: %s" -#: fetch-pack.c:441 +#: fetch-pack.c:442 fetch-pack.c:1323 #, c-format msgid "no shallow found: %s" msgstr "Kein shallow-Objekt gefunden: %s" -#: fetch-pack.c:444 +#: fetch-pack.c:445 fetch-pack.c:1326 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "shallow/unshallow erwartet, %s bekommen" -#: fetch-pack.c:485 +#: fetch-pack.c:486 #, c-format msgid "got %s %d %s" msgstr "%s %d %s bekommen" -#: fetch-pack.c:499 +#: fetch-pack.c:500 #, c-format msgid "invalid commit %s" msgstr "Ungültiger Commit %s" -#: fetch-pack.c:532 +#: fetch-pack.c:533 msgid "giving up" msgstr "Gebe auf" -#: fetch-pack.c:542 progress.c:229 +#: fetch-pack.c:543 progress.c:229 msgid "done" msgstr "Fertig" -#: fetch-pack.c:554 +#: fetch-pack.c:555 #, c-format msgid "got %s (%d) %s" msgstr "%s (%d) %s bekommen" -#: fetch-pack.c:600 +#: fetch-pack.c:601 #, c-format msgid "Marking %s as complete" msgstr "Markiere %s als vollständig" -#: fetch-pack.c:788 +#: fetch-pack.c:828 #, c-format msgid "already have %s (%s)" msgstr "habe %s (%s) bereits" -#: fetch-pack.c:829 +#: fetch-pack.c:869 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-pack: Fehler beim Starten des sideband demultiplexer" -#: fetch-pack.c:837 +#: fetch-pack.c:877 msgid "protocol error: bad pack header" msgstr "Protokollfehler: ungültiger Pack-Header" -#: fetch-pack.c:895 +#: fetch-pack.c:944 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-pack: konnte %s nicht starten" -#: fetch-pack.c:911 +#: fetch-pack.c:960 #, c-format msgid "%s failed" msgstr "%s fehlgeschlagen" -#: fetch-pack.c:913 +#: fetch-pack.c:962 msgid "error in sideband demultiplexer" msgstr "Fehler in sideband demultiplexer" -#: fetch-pack.c:940 +#: fetch-pack.c:989 msgid "Server does not support shallow clients" msgstr "Server unterstützt keine shallow-Clients" -#: fetch-pack.c:944 +#: fetch-pack.c:993 msgid "Server supports multi_ack_detailed" msgstr "Server unterstützt multi_ack_detailed" -#: fetch-pack.c:947 +#: fetch-pack.c:996 msgid "Server supports no-done" msgstr "Server unterstützt no-done" -#: fetch-pack.c:953 +#: fetch-pack.c:1002 msgid "Server supports multi_ack" msgstr "Server unterstützt multi_ack" -#: fetch-pack.c:957 +#: fetch-pack.c:1006 msgid "Server supports side-band-64k" msgstr "Server unterstützt side-band-64k" -#: fetch-pack.c:961 +#: fetch-pack.c:1010 msgid "Server supports side-band" msgstr "Server unterstützt side-band" -#: fetch-pack.c:965 +#: fetch-pack.c:1014 msgid "Server supports allow-tip-sha1-in-want" msgstr "Server unterstützt allow-tip-sha1-in-want" -#: fetch-pack.c:969 +#: fetch-pack.c:1018 msgid "Server supports allow-reachable-sha1-in-want" msgstr "Server unterstützt allow-reachable-sha1-in-want" -#: fetch-pack.c:979 +#: fetch-pack.c:1028 msgid "Server supports ofs-delta" msgstr "Server unterstützt ofs-delta" -#: fetch-pack.c:985 +#: fetch-pack.c:1034 fetch-pack.c:1204 msgid "Server supports filter" msgstr "Server unterstützt Filter" -#: fetch-pack.c:993 +#: fetch-pack.c:1042 #, c-format msgid "Server version is %.*s" msgstr "Server-Version ist %.*s" -#: fetch-pack.c:999 +#: fetch-pack.c:1048 msgid "Server does not support --shallow-since" msgstr "Server unterstützt kein --shallow-since" -#: fetch-pack.c:1003 +#: fetch-pack.c:1052 msgid "Server does not support --shallow-exclude" msgstr "Server unterstützt kein --shallow-exclude" -#: fetch-pack.c:1005 +#: fetch-pack.c:1054 msgid "Server does not support --deepen" msgstr "Server unterstützt kein --deepen" -#: fetch-pack.c:1016 +#: fetch-pack.c:1065 msgid "no common commits" msgstr "keine gemeinsamen Commits" -#: fetch-pack.c:1028 +#: fetch-pack.c:1077 fetch-pack.c:1414 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack: Abholen fehlgeschlagen." -#: fetch-pack.c:1190 +#: fetch-pack.c:1199 +msgid "Server does not support shallow requests" +msgstr "Server unterstützt keine shallow-Anfragen." + +#: fetch-pack.c:1584 msgid "no matching remote head" msgstr "kein übereinstimmender Remote-Branch" -#: fetch-pack.c:1212 +#: fetch-pack.c:1610 #, c-format msgid "no such remote ref %s" msgstr "keine solche Remote-Referenz %s" -#: fetch-pack.c:1215 +#: fetch-pack.c:1613 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "Der Server lehnt Anfrage nach nicht angebotenem Objekt %s ab." -#: gpg-interface.c:181 +#: gpg-interface.c:185 msgid "gpg failed to sign the data" msgstr "gpg beim Signieren der Daten fehlgeschlagen" -#: gpg-interface.c:211 +#: gpg-interface.c:210 msgid "could not create temporary file" msgstr "konnte temporäre Datei nicht erstellen" -#: gpg-interface.c:214 +#: gpg-interface.c:213 #, c-format msgid "failed writing detached signature to '%s'" msgstr "Fehler beim Schreiben der losgelösten Signatur nach '%s'" @@ -1943,18 +2026,18 @@ msgstr "Fehler beim Schreiben der losgelösten Signatur nach '%s'" msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "Ignoriere ungültige Farbe '%.*s' in log.graphColors" -#: grep.c:2022 +#: grep.c:2020 #, c-format msgid "'%s': unable to read %s" msgstr "'%s': konnte %s nicht lesen" -#: grep.c:2039 setup.c:163 builtin/clone.c:407 builtin/diff.c:81 +#: grep.c:2037 setup.c:164 builtin/clone.c:409 builtin/diff.c:81 #: builtin/rm.c:134 #, c-format msgid "failed to stat '%s'" msgstr "Konnte '%s' nicht lesen" -#: grep.c:2050 +#: grep.c:2048 #, c-format msgid "'%s': short read" msgstr "'%s': read() zu kurz" @@ -2097,7 +2180,7 @@ msgstr "Leerer Name in Identifikation (für <%s>) nicht erlaubt." msgid "name consists only of disallowed characters: %s" msgstr "Name besteht nur aus nicht erlaubten Zeichen: %s" -#: ident.c:416 builtin/commit.c:582 +#: ident.c:416 builtin/commit.c:587 #, c-format msgid "invalid date format: %s" msgstr "Ungültiges Datumsformat: %s" @@ -2135,82 +2218,161 @@ msgstr "" msgid "Unable to create '%s.lock': %s" msgstr "Konnte '%s.lock' nicht erstellen: %s" -#: merge.c:74 +#: merge.c:71 msgid "failed to read the cache" msgstr "Lesen des Zwischenspeichers fehlgeschlagen" -#: merge.c:134 builtin/am.c:1946 builtin/am.c:1980 builtin/checkout.c:378 -#: builtin/checkout.c:599 builtin/clone.c:759 +#: merge.c:136 builtin/am.c:1946 builtin/am.c:1980 builtin/checkout.c:378 +#: builtin/checkout.c:606 builtin/clone.c:761 msgid "unable to write new index file" msgstr "Konnte neue Index-Datei nicht schreiben." -#: merge-recursive.c:235 +#: merge-recursive.c:298 msgid "(bad commit)\n" msgstr "(ungültiger Commit)\n" -#: merge-recursive.c:257 merge-recursive.c:265 +#: merge-recursive.c:320 #, c-format -msgid "addinfo_cache failed for path '%s'" -msgstr "addinfo_cache für Pfad '%s' fehlgeschlagen" +msgid "add_cacheinfo failed for path '%s'; merge aborting." +msgstr "add_cacheinfo für Pfad '%s' fehlgeschlagen; Merge wird abgebrochen." -#: merge-recursive.c:329 +#: merge-recursive.c:328 +#, 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:410 msgid "error building trees" msgstr "Fehler beim Erstellen der \"Tree\"-Objekte" -#: merge-recursive.c:771 +#: merge-recursive.c:881 #, c-format msgid "failed to create path '%s'%s" msgstr "Fehler beim Erstellen des Pfades '%s'%s" -#: merge-recursive.c:782 +#: merge-recursive.c:892 #, 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:796 merge-recursive.c:815 +#: merge-recursive.c:906 merge-recursive.c:925 msgid ": perhaps a D/F conflict?" msgstr ": vielleicht ein Verzeichnis/Datei-Konflikt?" -#: merge-recursive.c:805 +#: merge-recursive.c:915 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "verweigere, da unversionierte Dateien in '%s' verloren gehen würden" -#: merge-recursive.c:847 builtin/cat-file.c:37 +#: merge-recursive.c:957 builtin/cat-file.c:37 #, c-format msgid "cannot read object %s '%s'" msgstr "kann Objekt %s '%s' nicht lesen" -#: merge-recursive.c:849 +#: merge-recursive.c:959 #, c-format msgid "blob expected for %s '%s'" msgstr "Blob erwartet für %s '%s'" -#: merge-recursive.c:873 +#: merge-recursive.c:983 #, c-format msgid "failed to open '%s': %s" msgstr "Fehler beim Öffnen von '%s': %s" -#: merge-recursive.c:884 +#: merge-recursive.c:994 #, c-format msgid "failed to symlink '%s': %s" msgstr "Fehler beim Erstellen einer symbolischen Verknüpfung für '%s': %s" -#: merge-recursive.c:889 +#: merge-recursive.c:999 #, 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:1029 +#: merge-recursive.c:1186 +#, c-format +msgid "Failed to merge submodule %s (not checked out)" +msgstr "Fehler beim Merge von Submodul %s (nicht ausgecheckt)." + +#: merge-recursive.c:1193 +#, c-format +msgid "Failed to merge submodule %s (commits not present)" +msgstr "Fehler beim Merge von Submodul %s (Commits nicht vorhanden)." + +#: merge-recursive.c:1200 +#, 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:1208 merge-recursive.c:1220 +#, c-format +msgid "Fast-forwarding submodule %s to the following commit:" +msgstr "Spule Submodul %s zu dem folgenden Commit vor:" + +#: merge-recursive.c:1211 merge-recursive.c:1223 +#, c-format +msgid "Fast-forwarding submodule %s to %s" +msgstr "Spule Submodul %s vor zu %s" + +#: merge-recursive.c:1245 +#, 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:1249 +#, c-format +msgid "Failed to merge submodule %s (not fast-forward)" +msgstr "Fehler beim Merge von Submodul %s (kein Vorspulen)" + +#: merge-recursive.c:1250 +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:1253 +#, c-format +msgid "" +"If this is correct simply add it to the index for example\n" +"by using:\n" +"\n" +" git update-index --cacheinfo 160000 %s \"%s\"\n" +"\n" +"which will accept this suggestion.\n" +msgstr "" +"Falls das korrekt ist, fügen Sie es einfach der Staging-Area, zum Beispiel mit:\n" +"\n" +" git update-index --cacheinfo 160000 %s \"%s\"\n" +"\n" +"hinzu, um diesen Vorschlag zu akzeptieren.\n" + +#: merge-recursive.c:1262 +#, c-format +msgid "Failed to merge submodule %s (multiple merges found)" +msgstr "Fehler beim Merge von Submodul %s (mehrere Merges gefunden)" + +#: merge-recursive.c:1321 msgid "Failed to execute internal merge" msgstr "Fehler bei Ausführung des internen Merges" -#: merge-recursive.c:1034 +#: merge-recursive.c:1326 #, c-format msgid "Unable to add %s to database" msgstr "Konnte %s nicht zur Datenbank hinzufügen" -#: merge-recursive.c:1146 +#: merge-recursive.c:1358 +#, c-format +msgid "Auto-merging %s" +msgstr "automatischer Merge von %s" + +#: merge-recursive.c:1423 +#, 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:1475 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -2219,7 +2381,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:1151 +#: merge-recursive.c:1480 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -2228,7 +2390,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:1158 +#: merge-recursive.c:1487 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -2237,7 +2399,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:1163 +#: merge-recursive.c:1492 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -2246,20 +2408,31 @@ 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:1197 +#: merge-recursive.c:1526 msgid "rename" msgstr "umbenennen" -#: merge-recursive.c:1197 +#: merge-recursive.c:1526 msgid "renamed" msgstr "umbenannt" -#: merge-recursive.c:1254 +#: merge-recursive.c:1580 merge-recursive.c:1736 merge-recursive.c:2368 +#: merge-recursive.c:3086 +#, c-format +msgid "Refusing to lose dirty file at %s" +msgstr "Verweigere geänderte Datei bei %s zu verlieren." + +#: merge-recursive.c:1594 #, 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:1279 +#: merge-recursive.c:1599 +#, 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:1625 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -2268,144 +2441,191 @@ msgstr "" "KONFLIKT (umbenennen/umbenennen): Benenne um \"%s\"->\"%s\" in Branch \"%s\" " "und \"%s\"->\"%s\" in Branch \"%s\"%s" -#: merge-recursive.c:1284 +#: merge-recursive.c:1630 msgid " (left unresolved)" msgstr " (bleibt unaufgelöst)" -#: merge-recursive.c:1346 +#: merge-recursive.c:1694 #, 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:1379 +#: merge-recursive.c:1733 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "Benenne stattdessen %s nach %s und %s nach %s um" -#: merge-recursive.c:1582 +#: merge-recursive.c:1745 +#, 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:1951 +#, c-format +msgid "" +"CONFLICT (directory rename split): Unclear where to place %s because " +"directory %s was renamed to multiple other directories, with no destination " +"getting a majority of the files." +msgstr "" +"KONFLIKT (Aufteilung Verzeichnisumbenennung): Unklar, wo %s zu platzieren ist,\n" +"weil Verzeichnis %s zu mehreren anderen Verzeichnissen umbenannt wurde, wobei\n" +"keines dieser Ziele die Mehrheit der Dateien erhielt." + +#: merge-recursive.c:1983 +#, c-format +msgid "" +"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " +"implicit directory rename(s) putting the following path(s) there: %s." +msgstr "" +"KONFLIKT (implizite Verzeichnisumbenennung): Existierende Datei/Pfad bei %s im\n" +"Weg von impliziter Verzeichnisumbenennung, die versucht, einen oder mehrere\n" +"Pfade dahin zu setzen: %s." + +#: merge-recursive.c:1993 +#, c-format +msgid "" +"CONFLICT (implicit dir rename): Cannot map more than one path to %s; " +"implicit directory renames tried to put these paths there: %s" +msgstr "" +"KONFLIKT (implizite Verzeichnisumbenennung): Kann nicht mehr als ein Pfad zu\n" +"%s mappen; implizite Verzeichnisumbenennungen versuchten diese Pfade dahin\n" +"zu setzen: %s" + +#: merge-recursive.c:2085 +#, c-format +msgid "" +"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" +">%s in %s" +msgstr "" +"KONFLIKT (umbenennen/umbenennen): Benenne Verzeichnis um %s->%s in %s.\n" +"Benenne Verzeichnis um %s->%s in %s" + +#: merge-recursive.c:2330 +#, c-format +msgid "" +"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " +"renamed." +msgstr "WARNUNG: Vermeide Umbenennung %s -> %s von %s, weil %s selbst umbenannt wurde." + +#: merge-recursive.c:2736 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" msgstr "" "KONFLIKT (umbenennen/hinzufügen): Benenne um %s->%s in %s. %s hinzugefügt in " "%s" -#: merge-recursive.c:1597 +#: merge-recursive.c:2751 #, c-format msgid "Adding merged %s" msgstr "Füge zusammengeführte Datei %s hinzu" -#: merge-recursive.c:1604 merge-recursive.c:1834 +#: merge-recursive.c:2758 merge-recursive.c:3089 #, c-format msgid "Adding as %s instead" msgstr "Füge stattdessen als %s hinzu" -#: merge-recursive.c:1661 +#: merge-recursive.c:2914 #, c-format msgid "cannot read object %s" msgstr "kann Objekt %s nicht lesen" -#: merge-recursive.c:1664 +#: merge-recursive.c:2917 #, c-format msgid "object %s is not a blob" msgstr "Objekt %s ist kein Blob" -#: merge-recursive.c:1733 +#: merge-recursive.c:2986 msgid "modify" msgstr "ändern" -#: merge-recursive.c:1733 +#: merge-recursive.c:2986 msgid "modified" msgstr "geändert" -#: merge-recursive.c:1743 +#: merge-recursive.c:2997 msgid "content" msgstr "Inhalt" -#: merge-recursive.c:1750 +#: merge-recursive.c:3004 msgid "add/add" msgstr "hinzufügen/hinzufügen" -#: merge-recursive.c:1786 +#: merge-recursive.c:3046 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "%s ausgelassen (Ergebnis des Merges existiert bereits)" -#: merge-recursive.c:1800 -#, c-format -msgid "Auto-merging %s" -msgstr "automatischer Merge von %s" - -#: merge-recursive.c:1804 git-submodule.sh:879 +#: merge-recursive.c:3055 git-submodule.sh:895 msgid "submodule" msgstr "Submodul" -#: merge-recursive.c:1805 +#: merge-recursive.c:3056 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "KONFLIKT (%s): Merge-Konflikt in %s" -#: merge-recursive.c:1899 +#: merge-recursive.c:3178 #, c-format msgid "Removing %s" msgstr "Entferne %s" -#: merge-recursive.c:1925 +#: merge-recursive.c:3204 msgid "file/directory" msgstr "Datei/Verzeichnis" -#: merge-recursive.c:1931 +#: merge-recursive.c:3210 msgid "directory/file" msgstr "Verzeichnis/Datei" -#: merge-recursive.c:1938 +#: merge-recursive.c:3217 #, 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:1947 +#: merge-recursive.c:3226 #, c-format msgid "Adding %s" msgstr "Füge %s hinzu" -#: merge-recursive.c:1987 +#: merge-recursive.c:3267 #, c-format msgid "Dirty index: cannot merge (dirty: %s)" msgstr "Geänderter Index: kann nicht mergen (geändert: %s)" -#: merge-recursive.c:1991 +#: merge-recursive.c:3271 msgid "Already up to date!" msgstr "Bereits aktuell!" -#: merge-recursive.c:2000 +#: merge-recursive.c:3280 #, c-format msgid "merging of trees %s and %s failed" msgstr "Zusammenführen der \"Tree\"-Objekte %s und %s fehlgeschlagen" -#: merge-recursive.c:2097 +#: merge-recursive.c:3379 msgid "Merging:" msgstr "Merge:" -#: merge-recursive.c:2110 +#: merge-recursive.c:3392 #, 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:2149 +#: merge-recursive.c:3431 msgid "merge returned no commit" msgstr "Merge hat keinen Commit zurückgegeben" -#: merge-recursive.c:2212 +#: merge-recursive.c:3495 #, c-format msgid "Could not parse object '%s'" msgstr "Konnte Objekt '%s' nicht parsen." -#: merge-recursive.c:2228 builtin/merge.c:657 builtin/merge.c:816 +#: merge-recursive.c:3511 builtin/merge.c:658 builtin/merge.c:815 msgid "Unable to write index." msgstr "Konnte Index nicht schreiben." @@ -2454,30 +2674,30 @@ msgstr "" msgid "Bad %s value: '%s'" msgstr "Ungültiger %s Wert: '%s'" -#: object.c:239 +#: object.c:242 #, c-format msgid "unable to parse object: %s" msgstr "Konnte Objekt '%s' nicht parsen." -#: packfile.c:561 +#: packfile.c:563 msgid "offset before end of packfile (broken .idx?)" msgstr "Offset vor Ende der Packdatei (fehlerhafte Indexdatei?)" -#: packfile.c:1694 +#: packfile.c:1742 #, 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:1698 +#: packfile.c:1746 #, 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:619 +#: parse-options.c:621 msgid "..." msgstr "..." -#: parse-options.c:638 +#: parse-options.c:640 #, c-format msgid "usage: %s" msgstr "Verwendung: %s" @@ -2485,26 +2705,31 @@ msgstr "Verwendung: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c:644 +#: parse-options.c:646 #, c-format msgid " or: %s" msgstr " oder: %s" -#: parse-options.c:647 +#: parse-options.c:649 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:686 +#: parse-options.c:688 msgid "-NUM" msgstr "-NUM" -#: parse-options-cb.c:108 +#: parse-options-cb.c:44 +#, c-format +msgid "malformed expiration date '%s'" +msgstr "Fehlerhaftes Ablaufdatum '%s'" + +#: parse-options-cb.c:112 #, c-format msgid "malformed object name '%s'" msgstr "fehlerhafter Objekt-Name '%s'" -#: path.c:891 +#: path.c:892 #, c-format msgid "Could not make %s writable by group" msgstr "Konnte Gruppenschreibrecht für %s nicht setzen." @@ -2589,7 +2814,7 @@ msgstr "Pfadspezifikation '%s' ist hinter einer symbolischen Verknüpfung" msgid "unable to parse --pretty format" msgstr "Konnte --pretty Format nicht parsen." -#: read-cache.c:1473 +#: read-cache.c:1500 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -2598,7 +2823,7 @@ msgstr "" "index.version gesetzt, aber Wert ungültig.\n" "Verwende Version %i" -#: read-cache.c:1483 +#: read-cache.c:1510 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -2607,54 +2832,55 @@ msgstr "" "GIT_INDEX_VERSION gesetzt, aber Wert ungültig.\n" "Verwende Version %i" -#: read-cache.c:2375 sequencer.c:3248 wrapper.c:658 builtin/merge.c:1049 +#: read-cache.c:2404 sequencer.c:4337 wrapper.c:658 builtin/merge.c:1047 #, c-format msgid "could not close '%s'" msgstr "Konnte '%s' nicht schließen" -#: read-cache.c:2448 sequencer.c:1900 sequencer.c:2627 +#: read-cache.c:2477 sequencer.c:2101 sequencer.c:3233 #, c-format msgid "could not stat '%s'" msgstr "Konnte '%s' nicht lesen." -#: read-cache.c:2461 +#: read-cache.c:2490 #, c-format msgid "unable to open git dir: %s" msgstr "konnte Git-Verzeichnis nicht öffnen: %s" -#: read-cache.c:2473 +#: read-cache.c:2502 #, c-format msgid "unable to unlink: %s" msgstr "Konnte '%s' nicht entfernen." -#: refs.c:706 +#: refs.c:732 sequencer.c:4333 sequencer.c:4392 wrapper.c:225 wrapper.c:395 +#: builtin/am.c:779 #, c-format -msgid "Could not open '%s' for writing" +msgid "could not open '%s' for writing" msgstr "Konnte '%s' nicht zum Schreiben öffnen." -#: refs.c:1850 +#: refs.c:1880 msgid "ref updates forbidden inside quarantine environment" msgstr "" "Aktualisierungen von Referenzen ist innerhalb der Quarantäne-Umgebung " "verboten." -#: refs/files-backend.c:1189 +#: refs/files-backend.c:1191 #, c-format msgid "could not remove reference %s" msgstr "Konnte Referenz %s nicht löschen" -#: refs/files-backend.c:1203 refs/packed-backend.c:1528 -#: refs/packed-backend.c:1538 +#: refs/files-backend.c:1205 refs/packed-backend.c:1531 +#: refs/packed-backend.c:1541 #, c-format msgid "could not delete reference %s: %s" msgstr "Konnte Referenz %s nicht entfernen: %s" -#: refs/files-backend.c:1206 refs/packed-backend.c:1541 +#: refs/files-backend.c:1208 refs/packed-backend.c:1544 #, c-format msgid "could not delete references: %s" msgstr "Konnte Referenzen nicht entfernen: %s" -#: ref-filter.c:35 wt-status.c:1842 +#: ref-filter.c:35 wt-status.c:1850 msgid "gone" msgstr "entfernt" @@ -2673,157 +2899,162 @@ msgstr "%d hinterher" msgid "ahead %d, behind %d" msgstr "%d voraus, %d hinterher" -#: ref-filter.c:107 +#: ref-filter.c:121 #, c-format msgid "expected format: %%(color:<color>)" msgstr "Erwartetes Format: %%(color:<Farbe>)" -#: ref-filter.c:109 +#: ref-filter.c:123 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "nicht erkannte Farbe: %%(color:%s)" -#: ref-filter.c:129 +#: ref-filter.c:145 #, c-format msgid "Integer value expected refname:lstrip=%s" msgstr "Positiver Wert erwartet refname:lstrip=%s" -#: ref-filter.c:133 +#: ref-filter.c:149 #, c-format msgid "Integer value expected refname:rstrip=%s" msgstr "Positiver Wert erwartet refname:rstrip=%s" -#: ref-filter.c:135 +#: ref-filter.c:151 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "nicht erkanntes %%(%s) Argument: %s" -#: ref-filter.c:184 +#: ref-filter.c:206 #, c-format msgid "%%(body) does not take arguments" msgstr "%%(body) akzeptiert keine Argumente" -#: ref-filter.c:191 +#: ref-filter.c:215 #, c-format msgid "%%(subject) does not take arguments" msgstr "%%(subject) akzeptiert keine Argumente" -#: ref-filter.c:209 +#: ref-filter.c:235 #, c-format msgid "unknown %%(trailers) argument: %s" msgstr "unbekanntes %%(trailers) Argument: %s" -#: ref-filter.c:232 +#: ref-filter.c:264 #, c-format msgid "positive value expected contents:lines=%s" msgstr "Positiver Wert erwartet contents:lines=%s" -#: ref-filter.c:234 +#: ref-filter.c:266 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "nicht erkanntes %%(contents) Argument: %s" -#: ref-filter.c:247 +#: ref-filter.c:281 #, c-format msgid "positive value expected objectname:short=%s" msgstr "Positiver Wert erwartet objectname:short=%s" -#: ref-filter.c:251 +#: ref-filter.c:285 #, c-format msgid "unrecognized %%(objectname) argument: %s" msgstr "nicht erkanntes %%(objectname) Argument: %s" -#: ref-filter.c:278 +#: ref-filter.c:315 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "Erwartetes Format: %%(align:<Breite>,<Position>)" -#: ref-filter.c:290 +#: ref-filter.c:327 #, c-format msgid "unrecognized position:%s" msgstr "nicht erkannte Position:%s" -#: ref-filter.c:294 +#: ref-filter.c:334 #, c-format msgid "unrecognized width:%s" msgstr "nicht erkannte Breite:%s" -#: ref-filter.c:300 +#: ref-filter.c:343 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "nicht erkanntes %%(align) Argument: %s" -#: ref-filter.c:304 +#: ref-filter.c:351 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "Positive Breitenangabe für %%(align) erwartet" -#: ref-filter.c:319 +#: ref-filter.c:369 #, c-format msgid "unrecognized %%(if) argument: %s" msgstr "nicht erkanntes %%(if) Argument: %s" -#: ref-filter.c:409 +#: ref-filter.c:464 #, c-format msgid "malformed field name: %.*s" msgstr "Fehlerhafter Feldname: %.*s" -#: ref-filter.c:435 +#: ref-filter.c:491 #, c-format msgid "unknown field name: %.*s" msgstr "Unbekannter Feldname: %.*s" -#: ref-filter.c:547 +#: ref-filter.c:608 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "format: %%(if) Atom ohne ein %%(then) Atom verwendet" -#: ref-filter.c:607 +#: ref-filter.c:671 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "format: %%(then) Atom ohne ein %%(if) Atom verwendet" -#: ref-filter.c:609 +#: ref-filter.c:673 #, c-format msgid "format: %%(then) atom used more than once" msgstr "format: %%(then) Atom mehr als einmal verwendet" -#: ref-filter.c:611 +#: ref-filter.c:675 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "format: %%(then) Atom nach %%(else) verwendet" -#: ref-filter.c:637 +#: ref-filter.c:703 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "format: %%(else) Atom ohne ein %%(if) Atom verwendet" -#: ref-filter.c:639 +#: ref-filter.c:705 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "Format: %%(else) Atom ohne ein %%(then) Atom verwendet" -#: ref-filter.c:641 +#: ref-filter.c:707 #, c-format msgid "format: %%(else) atom used more than once" msgstr "Format: %%(end) Atom mehr als einmal verwendet" -#: ref-filter.c:654 +#: ref-filter.c:722 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "Format: %%(end) Atom ohne zugehöriges Atom verwendet" -#: ref-filter.c:709 +#: ref-filter.c:779 #, c-format msgid "malformed format string %s" msgstr "Fehlerhafter Formatierungsstring %s" -#: ref-filter.c:1313 +#: ref-filter.c:1387 #, c-format msgid "(no branch, rebasing %s)" msgstr "(kein Branch, Rebase von Branch %s im Gange)" -#: ref-filter.c:1316 +#: ref-filter.c:1390 +#, c-format +msgid "(no branch, rebasing detached HEAD %s)" +msgstr "(kein Branch, Rebase von losgelöstem HEAD %s)" + +#: ref-filter.c:1393 #, c-format msgid "(no branch, bisect started on %s)" msgstr "(kein Branch, binäre Suche begonnen bei %s)" @@ -2831,7 +3062,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:1324 +#: ref-filter.c:1401 #, c-format msgid "(HEAD detached at %s)" msgstr "(HEAD losgelöst bei %s)" @@ -2839,150 +3070,150 @@ msgstr "(HEAD losgelöst bei %s)" #. TRANSLATORS: make sure this matches "HEAD #. detached from " in wt-status.c #. -#: ref-filter.c:1331 +#: ref-filter.c:1408 #, c-format msgid "(HEAD detached from %s)" msgstr "(HEAD losgelöst von %s)" -#: ref-filter.c:1335 +#: ref-filter.c:1412 msgid "(no branch)" msgstr "(kein Branch)" -#: ref-filter.c:1364 +#: ref-filter.c:1442 #, c-format msgid "missing object %s for %s" msgstr "Objekt %s fehlt für %s" -#: ref-filter.c:1367 +#: ref-filter.c:1445 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "parse_object_buffer bei %s für %s fehlgeschlagen" -#: ref-filter.c:1819 +#: ref-filter.c:1902 #, c-format msgid "malformed object at '%s'" msgstr "fehlerhaftes Objekt bei '%s'" -#: ref-filter.c:1886 +#: ref-filter.c:1984 #, c-format msgid "ignoring ref with broken name %s" msgstr "Ignoriere Referenz mit fehlerhaftem Namen %s" -#: ref-filter.c:1891 +#: ref-filter.c:1989 #, c-format msgid "ignoring broken ref %s" msgstr "Ignoriere fehlerhafte Referenz %s" -#: ref-filter.c:2152 +#: ref-filter.c:2261 #, c-format msgid "format: %%(end) atom missing" msgstr "Format: %%(end) Atom fehlt" -#: ref-filter.c:2246 +#: ref-filter.c:2365 #, c-format msgid "malformed object name %s" msgstr "Missgebildeter Objektname %s" -#: remote.c:795 +#: remote.c:605 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "Kann 'fetch' nicht für sowohl %s als auch %s nach %s ausführen." -#: remote.c:799 +#: remote.c:609 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s folgt üblicherweise %s, nicht %s" -#: remote.c:803 +#: remote.c:613 #, c-format msgid "%s tracks both %s and %s" msgstr "%s folgt sowohl %s als auch %s" -#: remote.c:811 +#: remote.c:621 msgid "Internal error" msgstr "Interner Fehler" -#: remote.c:1726 remote.c:1828 +#: remote.c:1534 remote.c:1635 msgid "HEAD does not point to a branch" msgstr "HEAD zeigt auf keinen Branch" -#: remote.c:1735 +#: remote.c:1543 #, c-format msgid "no such branch: '%s'" msgstr "Kein solcher Branch: '%s'" -#: remote.c:1738 +#: remote.c:1546 #, c-format msgid "no upstream configured for branch '%s'" msgstr "Kein Upstream-Branch für Branch '%s' konfiguriert." -#: remote.c:1744 +#: remote.c:1552 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "Upstream-Branch '%s' nicht als Remote-Tracking-Branch gespeichert" -#: remote.c:1759 +#: remote.c:1567 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "" "Ziel für \"push\" '%s' auf Remote-Repository '%s' hat keinen lokal gefolgten " "Branch" -#: remote.c:1771 +#: remote.c:1579 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "Branch '%s' hat keinen Upstream-Branch gesetzt" -#: remote.c:1782 +#: remote.c:1589 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "Push-Refspecs für '%s' beinhalten nicht '%s'" -#: remote.c:1795 +#: remote.c:1602 msgid "push has no destination (push.default is 'nothing')" msgstr "kein Ziel für \"push\" (push.default ist 'nothing')" -#: remote.c:1817 +#: remote.c:1624 msgid "cannot resolve 'simple' push to a single destination" msgstr "kann einzelnes Ziel für \"push\" im Modus 'simple' nicht auflösen" -#: remote.c:2132 +#: remote.c:1939 #, 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:2136 +#: remote.c:1943 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (benutzen Sie \"git branch --unset-upstream\" zum Beheben)\n" -#: remote.c:2139 +#: remote.c:1946 #, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "Ihr Branch ist auf demselben Stand wie '%s'.\n" -#: remote.c:2143 +#: remote.c:1950 #, c-format msgid "Your branch and '%s' refer to different commits.\n" msgstr "Ihr Branch und '%s' zeigen auf unterschiedliche Commits.\n" -#: remote.c:2146 +#: remote.c:1953 #, c-format msgid " (use \"%s\" for details)\n" msgstr " (benutzen Sie \"%s\" für Details)\n" -#: remote.c:2150 +#: remote.c:1957 #, 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:2156 +#: remote.c:1963 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (benutzen Sie \"git push\", um lokale Commits zu publizieren)\n" -#: remote.c:2159 +#: remote.c:1966 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -2992,12 +3223,12 @@ msgstr[0] "" msgstr[1] "" "Ihr Branch ist %2$d Commits hinter '%1$s', und kann vorgespult werden.\n" -#: remote.c:2167 +#: remote.c:1974 msgid " (use \"git pull\" to update your local branch)\n" msgstr "" " (benutzen Sie \"git pull\", um Ihren lokalen Branch zu aktualisieren)\n" -#: remote.c:2170 +#: remote.c:1977 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -3012,30 +3243,30 @@ msgstr[1] "" "Ihr Branch und '%s' sind divergiert,\n" "und haben jeweils %d und %d unterschiedliche Commits.\n" -#: remote.c:2180 +#: remote.c:1987 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" -#: revision.c:2277 +#: revision.c:2289 msgid "your current branch appears to be broken" msgstr "Ihr aktueller Branch scheint fehlerhaft zu sein." -#: revision.c:2280 +#: revision.c:2292 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "Ihr aktueller Branch '%s' hat noch keine Commits." -#: revision.c:2477 +#: revision.c:2489 msgid "--first-parent is incompatible with --bisect" msgstr "Die Optionen --first-parent und --bisect sind inkompatibel." -#: run-command.c:731 +#: run-command.c:728 msgid "open /dev/null failed" msgstr "Öffnen von /dev/null fehlgeschlagen" -#: run-command.c:1274 +#: run-command.c:1271 #, c-format msgid "" "The '%s' hook was ignored because it's not set as executable.\n" @@ -3084,29 +3315,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:158 +#: sequencer.c:174 #, c-format msgid "invalid commit message cleanup mode '%s'" msgstr "Ungültiger \"cleanup\"-Modus '%s' für Commit-Beschreibungen." -#: sequencer.c:267 +#: sequencer.c:274 +#, c-format +msgid "could not delete '%s'" +msgstr "Konnte '%s' nicht löschen." + +#: sequencer.c:300 msgid "revert" msgstr "Revert" -#: sequencer.c:269 +#: sequencer.c:302 msgid "cherry-pick" msgstr "Cherry-Pick" -#: sequencer.c:271 +#: sequencer.c:304 msgid "rebase -i" msgstr "interaktives Rebase" -#: sequencer.c:273 +#: sequencer.c:306 #, c-format msgid "Unknown action: %d" msgstr "Unbekannte Aktion: %d" -#: sequencer.c:330 +#: sequencer.c:363 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -3114,7 +3350,7 @@ msgstr "" "nach Auflösung der Konflikte markieren Sie die korrigierten Pfade\n" "mit 'git add <Pfade>' oder 'git rm <Pfade>'" -#: sequencer.c:333 +#: sequencer.c:366 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -3124,44 +3360,46 @@ msgstr "" "mit 'git add <Pfade>' oder 'git rm <Pfade>' und tragen Sie das Ergebnis mit\n" "'git commit' ein" -#: sequencer.c:346 sequencer.c:2245 +#: sequencer.c:379 sequencer.c:2467 #, c-format msgid "could not lock '%s'" msgstr "Konnte '%s' nicht sperren" -#: sequencer.c:349 sequencer.c:2124 sequencer.c:2250 sequencer.c:2264 -#: sequencer.c:3246 sequencer.c:3310 wrapper.c:656 +#: sequencer.c:381 sequencer.c:2345 sequencer.c:2471 sequencer.c:2485 +#: sequencer.c:2693 sequencer.c:4335 sequencer.c:4398 wrapper.c:656 #, c-format msgid "could not write to '%s'" msgstr "Konnte nicht nach '%s' schreiben." -#: sequencer.c:353 +#: sequencer.c:386 #, c-format msgid "could not write eol to '%s'" msgstr "Konnte EOL nicht nach '%s' schreiben." -#: sequencer.c:356 sequencer.c:2128 sequencer.c:2252 +#: sequencer.c:391 sequencer.c:2350 sequencer.c:2473 sequencer.c:2487 +#: sequencer.c:2701 #, c-format msgid "failed to finalize '%s'" msgstr "Fehler beim Fertigstellen von '%s'." -#: sequencer.c:379 sequencer.c:1340 sequencer.c:2148 builtin/am.c:259 -#: builtin/commit.c:722 builtin/merge.c:1047 +#: sequencer.c:414 sequencer.c:803 sequencer.c:1492 sequencer.c:2370 +#: sequencer.c:2683 sequencer.c:2787 builtin/am.c:259 builtin/commit.c:727 +#: builtin/merge.c:1045 #, c-format msgid "could not read '%s'" msgstr "Konnte '%s' nicht lesen" -#: sequencer.c:405 +#: sequencer.c:440 #, c-format msgid "your local changes would be overwritten by %s." msgstr "Ihre lokalen Änderungen würden durch den %s überschrieben werden." -#: sequencer.c:409 +#: sequencer.c:444 msgid "commit your changes or stash them to proceed." msgstr "" "Committen Sie Ihre Änderungen oder benutzen Sie \"stash\", um fortzufahren." -#: sequencer.c:438 +#: sequencer.c:473 #, c-format msgid "%s: fast-forward" msgstr "%s: Vorspulen" @@ -3169,20 +3407,20 @@ msgstr "%s: Vorspulen" #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase -i". #. -#: sequencer.c:526 +#: sequencer.c:562 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: Konnte neue Index-Datei nicht schreiben" -#: sequencer.c:542 -msgid "could not resolve HEAD commit" -msgstr "Konnte HEAD-Commit nicht auflösen." - -#: sequencer.c:562 +#: sequencer.c:578 msgid "unable to update cache tree" msgstr "Konnte Cache-Verzeichnis nicht aktualisieren." -#: sequencer.c:658 +#: sequencer.c:591 +msgid "could not resolve HEAD commit" +msgstr "Konnte HEAD-Commit nicht auflösen." + +#: sequencer.c:748 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -3213,11 +3451,15 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:915 +#: sequencer.c:817 +msgid "writing root commit" +msgstr "Root-Commit schreiben" + +#: sequencer.c:1042 msgid "'prepare-commit-msg' hook failed" msgstr "'prepare-commit-msg' Hook fehlgeschlagen." -#: sequencer.c:922 +#: sequencer.c:1049 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -3245,7 +3487,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:935 +#: sequencer.c:1062 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -3271,329 +3513,315 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:975 +#: sequencer.c:1102 msgid "couldn't look up newly created commit" msgstr "Konnte neu erstellten Commit nicht nachschlagen." -#: sequencer.c:977 +#: sequencer.c:1104 msgid "could not parse newly created commit" msgstr "Konnte neu erstellten Commit nicht analysieren." -#: sequencer.c:1023 +#: sequencer.c:1150 msgid "unable to resolve HEAD after creating commit" msgstr "Konnte HEAD nicht auflösen, nachdem der Commit erstellt wurde." -#: sequencer.c:1025 +#: sequencer.c:1152 msgid "detached HEAD" msgstr "losgelöster HEAD" -#: sequencer.c:1029 +#: sequencer.c:1156 msgid " (root-commit)" msgstr " (Basis-Commit)" -#: sequencer.c:1050 +#: sequencer.c:1177 msgid "could not parse HEAD" msgstr "Konnte HEAD nicht parsen." -#: sequencer.c:1052 +#: sequencer.c:1179 #, c-format msgid "HEAD %s is not a commit!" msgstr "HEAD %s ist kein Commit!" -#: sequencer.c:1056 builtin/commit.c:1491 +#: sequencer.c:1183 builtin/commit.c:1528 msgid "could not parse HEAD commit" msgstr "Konnte Commit von HEAD nicht analysieren." -#: sequencer.c:1107 sequencer.c:1673 +#: sequencer.c:1234 sequencer.c:1831 msgid "unable to parse commit author" msgstr "Konnte Commit-Autor nicht parsen." -#: sequencer.c:1117 builtin/am.c:1630 builtin/merge.c:643 +#: sequencer.c:1244 builtin/am.c:1630 builtin/merge.c:644 msgid "git write-tree failed to write a tree" msgstr "\"git write-tree\" schlug beim Schreiben eines \"Tree\"-Objektes fehl" -#: sequencer.c:1134 sequencer.c:1186 +#: sequencer.c:1261 sequencer.c:1316 #, c-format msgid "unable to read commit message from '%s'" msgstr "Konnte Commit-Beschreibung von '%s' nicht lesen." -#: sequencer.c:1154 builtin/am.c:1650 builtin/commit.c:1594 builtin/merge.c:826 -#: builtin/merge.c:851 +#: sequencer.c:1283 builtin/am.c:1650 builtin/commit.c:1631 builtin/merge.c:824 +#: builtin/merge.c:849 msgid "failed to write commit object" msgstr "Fehler beim Schreiben des Commit-Objektes." -#: sequencer.c:1213 +#: sequencer.c:1343 #, c-format msgid "could not parse commit %s" msgstr "Konnte Commit %s nicht parsen." -#: sequencer.c:1218 +#: sequencer.c:1348 #, c-format msgid "could not parse parent commit %s" msgstr "Konnte Eltern-Commit %s nicht parsen." -#: sequencer.c:1347 -#, c-format -msgid "" -"unexpected 1st line of squash message:\n" -"\n" -"\t%.*s" -msgstr "" -"unerwartete erste Zeile der Squash-Beschreibung:\n" -"\n" -"\t%.*s" - -#: sequencer.c:1353 -#, c-format -msgid "" -"invalid 1st line of squash message:\n" -"\n" -"\t%.*s" -msgstr "" -"ungültige erste Zeile der Squash-Beschreibung:\n" -"\n" -"\t%.*s" - -#: sequencer.c:1359 sequencer.c:1384 +#: sequencer.c:1499 sequencer.c:1524 #, c-format msgid "This is a combination of %d commits." msgstr "Das ist eine Kombination aus %d Commits." -#: sequencer.c:1368 sequencer.c:3265 +#: sequencer.c:1509 sequencer.c:4354 msgid "need a HEAD to fixup" msgstr "benötige HEAD für fixup" -#: sequencer.c:1370 +#: sequencer.c:1511 sequencer.c:2728 msgid "could not read HEAD" msgstr "Konnte HEAD nicht lesen" -#: sequencer.c:1372 +#: sequencer.c:1513 msgid "could not read HEAD's commit message" msgstr "Konnte Commit-Beschreibung von HEAD nicht lesen" -#: sequencer.c:1378 +#: sequencer.c:1519 #, c-format msgid "cannot write '%s'" msgstr "kann '%s' nicht schreiben" -#: sequencer.c:1387 git-rebase--interactive.sh:452 +#: sequencer.c:1526 git-rebase--interactive.sh:457 msgid "This is the 1st commit message:" msgstr "Das ist die erste Commit-Beschreibung:" -#: sequencer.c:1395 +#: sequencer.c:1534 #, c-format msgid "could not read commit message of %s" msgstr "Konnte Commit-Beschreibung von %s nicht lesen." -#: sequencer.c:1402 +#: sequencer.c:1541 #, c-format msgid "This is the commit message #%d:" msgstr "Das ist Commit-Beschreibung #%d:" -#: sequencer.c:1407 +#: sequencer.c:1547 #, c-format msgid "The commit message #%d will be skipped:" msgstr "Die Commit-Beschreibung #%d wird ausgelassen:" -#: sequencer.c:1412 +#: sequencer.c:1552 #, c-format msgid "unknown command: %d" msgstr "Unbekannter Befehl: %d" -#: sequencer.c:1479 +#: sequencer.c:1630 msgid "your index file is unmerged." msgstr "Ihre Index-Datei ist nicht zusammengeführt." -#: sequencer.c:1498 +#: sequencer.c:1637 +msgid "cannot fixup root commit" +msgstr "kann fixup nicht auf Root-Commit anwenden" + +#: sequencer.c:1656 #, 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:1506 +#: sequencer.c:1664 #, c-format msgid "commit %s does not have parent %d" msgstr "Commit %s hat keinen Eltern-Commit %d" -#: sequencer.c:1510 +#: sequencer.c:1668 #, c-format msgid "mainline was specified but commit %s is not a merge." msgstr "Hauptlinie wurde spezifiziert, aber Commit %s ist kein Merge." -#: sequencer.c:1516 +#: sequencer.c:1674 #, 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:1535 +#: sequencer.c:1693 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: kann Eltern-Commit %s nicht parsen" -#: sequencer.c:1600 sequencer.c:2397 +#: sequencer.c:1758 #, c-format msgid "could not rename '%s' to '%s'" msgstr "Konnte '%s' nicht zu '%s' umbenennen." -#: sequencer.c:1654 +#: sequencer.c:1812 #, c-format msgid "could not revert %s... %s" msgstr "Konnte \"revert\" nicht auf %s... (%s) ausführen" -#: sequencer.c:1655 +#: sequencer.c:1813 #, c-format msgid "could not apply %s... %s" msgstr "Konnte %s... (%s) nicht anwenden" -#: sequencer.c:1702 +#: sequencer.c:1863 msgid "empty commit set passed" msgstr "leere Menge von Commits übergeben" -#: sequencer.c:1712 +#: sequencer.c:1873 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: Fehler beim Lesen des Index" -#: sequencer.c:1718 +#: sequencer.c:1880 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: Fehler beim Aktualisieren des Index" -#: sequencer.c:1792 +#: sequencer.c:1960 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "%s akzeptiert keine Argumente: '%s'" -#: sequencer.c:1801 +#: sequencer.c:1969 #, c-format msgid "missing arguments for %s" msgstr "Fehlende Argumente für %s." -#: sequencer.c:1844 +#: sequencer.c:2028 #, c-format msgid "invalid line %d: %.*s" msgstr "Ungültige Zeile %d: %.*s" -#: sequencer.c:1852 +#: sequencer.c:2036 #, c-format msgid "cannot '%s' without a previous commit" msgstr "Kann '%s' nicht ohne vorherigen Commit ausführen" -#: sequencer.c:1883 sequencer.c:3056 sequencer.c:3091 +#: sequencer.c:2084 sequencer.c:4137 sequencer.c:4172 #, c-format msgid "could not read '%s'." msgstr "Konnte '%s' nicht lesen." -#: sequencer.c:1906 +#: sequencer.c:2107 msgid "please fix this using 'git rebase --edit-todo'." msgstr "" "Bitte beheben Sie dieses, indem Sie 'git rebase --edit-todo' ausführen." -#: sequencer.c:1908 +#: sequencer.c:2109 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "Unbenutzbares Instruktionsblatt: '%s'" -#: sequencer.c:1913 +#: sequencer.c:2114 msgid "no commits parsed." msgstr "Keine Commits geparst." -#: sequencer.c:1924 +#: sequencer.c:2125 msgid "cannot cherry-pick during a revert." msgstr "Kann Cherry-Pick nicht während eines Reverts ausführen." -#: sequencer.c:1926 +#: sequencer.c:2127 msgid "cannot revert during a cherry-pick." msgstr "Kann Revert nicht während eines Cherry-Picks ausführen." -#: sequencer.c:1993 +#: sequencer.c:2194 #, c-format msgid "invalid key: %s" msgstr "Ungültiger Schlüssel: %s" -#: sequencer.c:1996 +#: sequencer.c:2197 #, c-format msgid "invalid value for %s: %s" msgstr "Ungültiger Wert für %s: %s" -#: sequencer.c:2062 +#: sequencer.c:2268 +msgid "unusable squash-onto" +msgstr "Unbenutzbares squash-onto." + +#: sequencer.c:2284 #, c-format msgid "malformed options sheet: '%s'" msgstr "Fehlerhaftes Optionsblatt: '%s'" -#: sequencer.c:2100 +#: sequencer.c:2322 msgid "a cherry-pick or revert is already in progress" msgstr "\"cherry-pick\" oder \"revert\" ist bereits im Gang" -#: sequencer.c:2101 +#: sequencer.c:2323 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "versuchen Sie \"git cherry-pick (--continue | --quit | --abort)\"" -#: sequencer.c:2104 +#: sequencer.c:2326 #, c-format msgid "could not create sequencer directory '%s'" msgstr "Konnte \"sequencer\"-Verzeichnis '%s' nicht erstellen." -#: sequencer.c:2118 +#: sequencer.c:2340 msgid "could not lock HEAD" msgstr "Konnte HEAD nicht sperren" -#: sequencer.c:2173 sequencer.c:2761 +#: sequencer.c:2395 sequencer.c:3402 msgid "no cherry-pick or revert in progress" msgstr "kein \"cherry-pick\" oder \"revert\" im Gang" -#: sequencer.c:2175 +#: sequencer.c:2397 msgid "cannot resolve HEAD" msgstr "kann HEAD nicht auflösen" -#: sequencer.c:2177 sequencer.c:2212 +#: sequencer.c:2399 sequencer.c:2434 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:2198 builtin/grep.c:720 +#: sequencer.c:2420 builtin/grep.c:720 #, c-format msgid "cannot open '%s'" msgstr "kann '%s' nicht öffnen" -#: sequencer.c:2200 +#: sequencer.c:2422 #, c-format msgid "cannot read '%s': %s" msgstr "Kann '%s' nicht lesen: %s" -#: sequencer.c:2201 +#: sequencer.c:2423 msgid "unexpected end of file" msgstr "Unerwartetes Dateiende" -#: sequencer.c:2207 +#: sequencer.c:2429 #, 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:2218 +#: sequencer.c:2440 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:2324 sequencer.c:2679 +#: sequencer.c:2544 sequencer.c:3320 #, c-format msgid "could not update %s" msgstr "Konnte %s nicht aktualisieren." -#: sequencer.c:2362 sequencer.c:2659 +#: sequencer.c:2582 sequencer.c:3300 msgid "cannot read HEAD" msgstr "Kann HEAD nicht lesen" -#: sequencer.c:2402 builtin/difftool.c:639 +#: sequencer.c:2617 sequencer.c:2621 builtin/difftool.c:639 #, c-format msgid "could not copy '%s' to '%s'" msgstr "Konnte '%s' nicht nach '%s' kopieren." -#: sequencer.c:2421 +#: sequencer.c:2640 msgid "could not read index" msgstr "Konnte den Index nicht lesen." -#: sequencer.c:2426 +#: sequencer.c:2645 #, c-format msgid "" "execution failed: %s\n" @@ -3609,11 +3837,11 @@ msgstr "" "\n" "ausführen.\n" -#: sequencer.c:2432 +#: sequencer.c:2651 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:2438 +#: sequencer.c:2657 #, c-format msgid "" "execution succeeded: %s\n" @@ -3631,17 +3859,62 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:2497 +#: sequencer.c:2770 +msgid "writing fake root commit" +msgstr "unechten Root-Commit schreiben" + +#: sequencer.c:2775 +msgid "writing squash-onto" +msgstr "squash-onto schreiben" + +#: sequencer.c:2810 +#, c-format +msgid "failed to find tree of %s" +msgstr "Fehler beim Finden des \"Tree\"-Objektes von %s." + +#: sequencer.c:2828 +msgid "could not write index" +msgstr "Konnte Index nicht schreiben." + +#: sequencer.c:2860 +msgid "cannot merge without a current revision" +msgstr "Kann nicht ohne einen aktuellen Commit mergen." + +#: sequencer.c:2883 +#, c-format +msgid "could not resolve '%s'" +msgstr "Konnte '%s' nicht auflösen." + +#: sequencer.c:2905 +#, c-format +msgid "could not get commit message of '%s'" +msgstr "Konnte keine Commit-Beschreibung von '%s' bekommen." + +#: sequencer.c:2915 sequencer.c:2940 +#, c-format +msgid "could not write '%s'" +msgstr "Konnte '%s' nicht schreiben." + +#: sequencer.c:3004 +#, c-format +msgid "could not even attempt to merge '%.*s'" +msgstr "Konnte nicht einmal versuchen '%.*s' zu mergen." + +#: sequencer.c:3020 +msgid "merge: Unable to write new index file" +msgstr "merge: Konnte neue Index-Datei nicht schreiben." + +#: sequencer.c:3087 #, c-format msgid "Applied autostash.\n" msgstr "Automatischen Stash angewendet.\n" -#: sequencer.c:2509 +#: sequencer.c:3099 #, c-format msgid "cannot store %s" msgstr "kann %s nicht speichern" -#: sequencer.c:2512 git-rebase.sh:178 +#: sequencer.c:3102 git-rebase.sh:188 #, c-format msgid "" "Applying autostash resulted in conflicts.\n" @@ -3652,54 +3925,71 @@ msgstr "" "Ihre Änderungen sind im Stash sicher.\n" "Sie können jederzeit \"git stash pop\" oder \"git stash drop\" ausführen.\n" -#: sequencer.c:2595 +#: sequencer.c:3133 +#, c-format +msgid "" +"Could not execute the todo command\n" +"\n" +" %.*s\n" +"It has been rescheduled; To edit the command before continuing, please\n" +"edit the todo list first:\n" +"\n" +" git rebase --edit-todo\n" +" git rebase --continue\n" +msgstr "" +"Konnte TODO-Befehl nicht ausführen\n" +"\n" +" %.*s\n" +"Dieser wurde neu angesetzt; Um den Befehl zu bearbeiten, bevor fortgesetzt wird,\n" +"bearbeiten Sie bitte zuerst die TODO-Liste:\n" +"\n" +" git rebase --edit-todo\n" +" git rebase --continue\n" + +#: sequencer.c:3201 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "Angehalten bei %s... %.*s\n" -#: sequencer.c:2637 +#: sequencer.c:3263 #, c-format msgid "unknown command %d" msgstr "Unbekannter Befehl %d" -#: sequencer.c:2667 +#: sequencer.c:3308 msgid "could not read orig-head" msgstr "Konnte orig-head nicht lesen." -#: sequencer.c:2672 sequencer.c:3262 +#: sequencer.c:3313 sequencer.c:4351 msgid "could not read 'onto'" msgstr "Konnte 'onto' nicht lesen." -#: sequencer.c:2686 +#: sequencer.c:3327 #, c-format msgid "could not update HEAD to %s" msgstr "Konnte HEAD nicht auf %s aktualisieren." -#: sequencer.c:2770 +#: sequencer.c:3413 msgid "cannot rebase: You have unstaged changes." msgstr "" "Rebase nicht möglich: Sie haben Änderungen, die nicht zum Commit\n" "vorgemerkt sind." -#: sequencer.c:2775 -msgid "could not remove CHERRY_PICK_HEAD" -msgstr "Konnte CHERRY_PICK_HEAD nicht löschen." - -#: sequencer.c:2784 +#: sequencer.c:3422 msgid "cannot amend non-existing commit" msgstr "Kann nicht existierenden Commit nicht nachbessern." -#: sequencer.c:2786 +#: sequencer.c:3424 #, c-format msgid "invalid file: '%s'" msgstr "Ungültige Datei: '%s'" -#: sequencer.c:2788 +#: sequencer.c:3426 #, c-format msgid "invalid contents: '%s'" msgstr "Ungültige Inhalte: '%s'" -#: sequencer.c:2791 +#: sequencer.c:3429 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -3710,38 +4000,47 @@ msgstr "" "committen Sie diese zuerst und führen Sie dann 'git rebase --continue'\n" "erneut aus." -#: sequencer.c:2801 +#: sequencer.c:3454 sequencer.c:3492 +#, c-format +msgid "could not write file: '%s'" +msgstr "Konnte Datei nicht schreiben: '%s'" + +#: sequencer.c:3507 +msgid "could not remove CHERRY_PICK_HEAD" +msgstr "Konnte CHERRY_PICK_HEAD nicht löschen." + +#: sequencer.c:3514 msgid "could not commit staged changes." msgstr "Konnte Änderungen aus der Staging-Area nicht committen." -#: sequencer.c:2881 +#: sequencer.c:3611 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: %s kann nicht in \"cherry-pick\" benutzt werden" -#: sequencer.c:2885 +#: sequencer.c:3615 #, c-format msgid "%s: bad revision" msgstr "%s: ungültiger Commit" -#: sequencer.c:2918 +#: sequencer.c:3648 msgid "can't revert as initial commit" msgstr "Kann nicht als allerersten Commit einen Revert ausführen." -#: sequencer.c:3023 +#: sequencer.c:4097 msgid "make_script: unhandled options" msgstr "make_script: unbehandelte Optionen" -#: sequencer.c:3026 +#: sequencer.c:4100 msgid "make_script: error preparing revisions" msgstr "make_script: Fehler beim Vorbereiten der Commits" -#: sequencer.c:3060 sequencer.c:3095 +#: sequencer.c:4141 sequencer.c:4176 #, c-format msgid "unusable todo list: '%s'" msgstr "Unbenutzbare TODO-Liste: '%s'" -#: sequencer.c:3146 +#: sequencer.c:4235 #, c-format msgid "" "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." @@ -3749,7 +4048,7 @@ msgstr "" "Nicht erkannte Einstellung %s für Option rebase.missingCommitsCheck. " "Ignoriere." -#: sequencer.c:3212 +#: sequencer.c:4301 #, c-format msgid "" "Warning: some commits may have been dropped accidentally.\n" @@ -3758,7 +4057,7 @@ msgstr "" "Warnung: Einige Commits könnten aus Versehen entfernt worden sein.\n" "Entfernte Commits (neu zu alt):\n" -#: sequencer.c:3219 +#: sequencer.c:4308 #, c-format msgid "" "To avoid this message, use \"drop\" to explicitly remove a commit.\n" @@ -3775,7 +4074,7 @@ msgstr "" "Warnungen zu ändern.\n" "Die möglichen Verhaltensweisen sind: ignore, warn, error.\n" -#: sequencer.c:3231 +#: sequencer.c:4320 #, c-format msgid "" "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" @@ -3786,27 +4085,21 @@ msgstr "" "'git rebase --continue' aus.\n" "Oder Sie können den Rebase mit 'git rebase --abort' abbrechen.\n" -#: sequencer.c:3244 sequencer.c:3304 wrapper.c:225 wrapper.c:395 -#: builtin/am.c:779 -#, c-format -msgid "could not open '%s' for writing" -msgstr "Konnte '%s' nicht zum Schreiben öffnen." - -#: sequencer.c:3285 +#: sequencer.c:4374 #, c-format msgid "could not parse commit '%s'" msgstr "Konnte Commit '%s' nicht parsen." -#: sequencer.c:3401 +#: sequencer.c:4489 msgid "the script was already rearranged." msgstr "Das Script wurde bereits umgeordnet." -#: setup.c:122 +#: setup.c:123 #, c-format msgid "'%s' is outside repository" msgstr "'%s' liegt außerhalb des Repositories." -#: setup.c:171 +#: setup.c:172 #, c-format msgid "" "%s: no such path in the working tree.\n" @@ -3816,7 +4109,7 @@ msgstr "" "Benutzen Sie 'git <Befehl> -- <Pfad>...' zur Angabe von Pfaden, die lokal\n" "nicht existieren." -#: setup.c:184 +#: setup.c:185 #, c-format msgid "" "ambiguous argument '%s': unknown revision or path not in the working tree.\n" @@ -3828,12 +4121,13 @@ msgstr "" "Benutzen Sie '--', um Pfade und Commits zu trennen, ähnlich wie:\n" "'git <Befehl> [<Commit>...] -- [<Datei>...]'" -#: setup.c:233 +#: setup.c:234 #, c-format msgid "option '%s' must come before non-option arguments" -msgstr "Die Option '%s' muss vor den Argumenten kommen, die keine Optionen sind." +msgstr "" +"Die Option '%s' muss vor den Argumenten kommen, die keine Optionen sind." -#: setup.c:252 +#: setup.c:253 #, c-format msgid "" "ambiguous argument '%s': both revision and filename\n" @@ -3844,92 +4138,93 @@ msgstr "" "Benutzen Sie '--', um Pfade und Commits zu trennen, ähnlich wie:\n" "'git <Befehl> [<Commit>...] -- [<Datei>...]'" -#: setup.c:388 +#: setup.c:389 msgid "unable to set up work tree using invalid config" -msgstr "Konnte Arbeitsverzeichnis mit ungültiger Konfiguration nicht einrichten." +msgstr "" +"Konnte Arbeitsverzeichnis mit ungültiger Konfiguration nicht einrichten." -#: setup.c:395 +#: setup.c:393 msgid "this operation must be run in a work tree" msgstr "Diese Operation muss in einem Arbeitsverzeichnis ausgeführt werden." -#: setup.c:506 +#: setup.c:503 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "Erwartete Git-Repository-Version <= %d, %d gefunden" -#: setup.c:514 +#: setup.c:511 msgid "unknown repository extensions found:" msgstr "Unbekannte Repository-Erweiterungen gefunden:" -#: setup.c:533 +#: setup.c:530 #, c-format msgid "error opening '%s'" msgstr "Fehler beim Öffnen von '%s'." -#: setup.c:535 +#: setup.c:532 #, c-format msgid "too large to be a .git file: '%s'" msgstr "Zu groß, um eine .git-Datei zu sein: '%s'" -#: setup.c:537 +#: setup.c:534 #, c-format msgid "error reading %s" msgstr "Fehler beim Lesen von '%s'." -#: setup.c:539 +#: setup.c:536 #, c-format msgid "invalid gitfile format: %s" msgstr "Ungültiges gitfile-Format: %s" -#: setup.c:541 +#: setup.c:538 #, c-format msgid "no path in gitfile: %s" msgstr "Kein Pfad in gitfile: %s" -#: setup.c:543 +#: setup.c:540 #, c-format msgid "not a git repository: %s" msgstr "Kein Git-Repository: %s" -#: setup.c:642 +#: setup.c:639 #, c-format msgid "'$%s' too big" msgstr "'$%s' zu groß" -#: setup.c:656 +#: setup.c:653 #, c-format msgid "not a git repository: '%s'" msgstr "Kein Git-Repository: '%s'" -#: setup.c:685 setup.c:687 setup.c:718 +#: setup.c:682 setup.c:684 setup.c:715 #, c-format msgid "cannot chdir to '%s'" msgstr "Kann nicht in Verzeichnis '%s' wechseln." -#: setup.c:690 setup.c:746 setup.c:756 setup.c:795 setup.c:803 setup.c:818 +#: setup.c:687 setup.c:743 setup.c:753 setup.c:792 setup.c:800 setup.c:815 msgid "cannot come back to cwd" msgstr "Kann nicht zum aktuellen Arbeitsverzeichnis zurückwechseln." -#: setup.c:816 +#: setup.c:813 #, 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:827 +#: setup.c:824 #, c-format msgid "failed to stat '%*s%s%s'" msgstr "Konnte '%*s%s%s' nicht lesen." -#: setup.c:1057 +#: setup.c:1054 msgid "Unable to read current working directory" msgstr "Konnte aktuelles Arbeitsverzeichnis nicht lesen." -#: setup.c:1069 setup.c:1075 +#: setup.c:1066 setup.c:1072 #, c-format msgid "cannot change to '%s'" msgstr "Kann nicht nach '%s' wechseln." -#: setup.c:1088 +#: setup.c:1085 #, c-format msgid "" "not a git repository (or any parent up to mount point %s)\n" @@ -3939,7 +4234,7 @@ msgstr "" "%s)\n" "Stoppe bei Dateisystemgrenze (GIT_DISCOVERY_ACROSS_FILESYSTEM nicht gesetzt)." -#: setup.c:1172 +#: setup.c:1168 #, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" @@ -3948,58 +4243,58 @@ 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:1215 +#: setup.c:1211 msgid "open /dev/null or dup failed" msgstr "Öffnen von /dev/null oder dup fehlgeschlagen." -#: setup.c:1230 +#: setup.c:1226 msgid "fork failed" msgstr "fork fehlgeschlagen" -#: setup.c:1235 +#: setup.c:1231 msgid "setsid failed" msgstr "setsid fehlgeschlagen" -#: sha1_file.c:592 +#: sha1-file.c:625 #, c-format msgid "path '%s' does not exist" msgstr "Pfad '%s' existiert nicht" -#: sha1_file.c:618 +#: sha1-file.c:651 #, 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:624 +#: sha1-file.c:657 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "Referenziertes Repository '%s' ist kein lokales Repository." -#: sha1_file.c:630 +#: sha1-file.c:663 #, c-format msgid "reference repository '%s' is shallow" msgstr "" "Referenziertes Repository '%s' hat eine unvollständige Historie (shallow)." -#: sha1_file.c:638 +#: sha1-file.c:671 #, c-format msgid "reference repository '%s' is grafted" msgstr "" "Referenziertes Repository '%s' ist mit künstlichen Vorgängern (\"grafts\") " "eingehängt." -#: sha1_name.c:422 +#: sha1-name.c:442 #, c-format msgid "short SHA1 %s is ambiguous" msgstr "Kurzer SHA-1 %s ist mehrdeutig." -#: sha1_name.c:433 +#: sha1-name.c:453 msgid "The candidates are:" msgstr "Die Kandidaten sind:" -#: sha1_name.c:693 +#: sha1-name.c:695 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" @@ -4024,71 +4319,71 @@ msgstr "" "indem Sie \"git config advice.objectNameWarning false\"\n" "ausführen." -#: submodule.c:96 submodule.c:130 +#: submodule.c:97 submodule.c:131 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" "Kann nicht zusammengeführte .gitmodules-Datei nicht ändern, lösen\n" "Sie zuerst die Konflikte auf" -#: submodule.c:100 submodule.c:134 +#: submodule.c:101 submodule.c:135 #, c-format msgid "Could not find section in .gitmodules where path=%s" msgstr "Konnte keine Sektion in .gitmodules mit Pfad \"%s\" finden" -#: submodule.c:108 +#: submodule.c:109 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "Konnte Eintrag '%s' in .gitmodules nicht aktualisieren" -#: submodule.c:141 +#: submodule.c:142 #, c-format msgid "Could not remove .gitmodules entry for %s" msgstr "Konnte Eintrag '%s' nicht aus .gitmodules entfernen" -#: submodule.c:152 +#: submodule.c:153 msgid "staging updated .gitmodules failed" msgstr "Konnte aktualisierte .gitmodules-Datei nicht zum Commit vormerken" -#: submodule.c:312 +#: submodule.c:315 #, c-format msgid "in unpopulated submodule '%s'" msgstr "In nicht ausgechecktem Submodul '%s'." -#: submodule.c:343 +#: submodule.c:346 #, c-format msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "Pfadspezifikation '%s' befindet sich in Submodul '%.*s'" -#: submodule.c:833 +#: submodule.c:837 #, 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:1065 builtin/branch.c:648 builtin/submodule--helper.c:1724 +#: submodule.c:1069 builtin/branch.c:651 builtin/submodule--helper.c:1743 msgid "Failed to resolve HEAD as a valid ref." msgstr "Konnte HEAD nicht als gültige Referenz auflösen." -#: submodule.c:1370 +#: submodule.c:1373 #, c-format msgid "'%s' not recognized as a git repository" msgstr "'%s' nicht als Git-Repository erkannt" -#: submodule.c:1508 +#: submodule.c:1511 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "Konnte 'git status' in Submodul '%s' nicht starten." -#: submodule.c:1521 +#: submodule.c:1524 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "Konnte 'git status' in Submodul '%s' nicht ausführen." -#: submodule.c:1614 +#: submodule.c:1617 #, c-format msgid "submodule '%s' has dirty index" msgstr "Submodul '%s' hat einen geänderten Index." -#: submodule.c:1878 +#: submodule.c:1716 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" @@ -4096,18 +4391,18 @@ msgstr "" "relocate_gitdir für Submodul '%s' mit mehr als einem Arbeitsverzeichnis\n" "wird nicht unterstützt" -#: submodule.c:1890 submodule.c:1946 +#: submodule.c:1728 submodule.c:1784 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "konnte Name für Submodul '%s' nicht nachschlagen" -#: submodule.c:1894 builtin/submodule--helper.c:1246 -#: builtin/submodule--helper.c:1256 +#: submodule.c:1732 builtin/submodule--helper.c:1261 +#: builtin/submodule--helper.c:1271 #, c-format msgid "could not create directory '%s'" msgstr "Konnte Verzeichnis '%s' nicht erstellen." -#: submodule.c:1897 +#: submodule.c:1735 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -4118,29 +4413,30 @@ msgstr "" "'%s' nach\n" "'%s'\n" -#: submodule.c:1981 +#: submodule.c:1819 #, c-format msgid "could not recurse into submodule '%s'" msgstr "Fehler bei Rekursion in Submodul-Pfad '%s'" -#: submodule.c:2025 +#: submodule.c:1863 msgid "could not start ls-files in .." msgstr "Konnte 'ls-files' nicht in .. starten" -#: submodule.c:2045 -msgid "BUG: returned path string doesn't match cwd?" -msgstr "FEHLER: zurückgegebene Zeichenkette für Pfad entspricht nicht cwd?" - -#: submodule.c:2064 +#: submodule.c:1902 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree mit unerwartetem Rückgabewert %d beendet" -#: submodule-config.c:263 +#: submodule-config.c:230 +#, c-format +msgid "ignoring suspicious submodule name: %s" +msgstr "Ignoriere verdächtigen Submodulnamen: %s" + +#: submodule-config.c:294 msgid "negative values not allowed for submodule.fetchjobs" msgstr "Negative Werte für submodule.fetchjobs nicht erlaubt." -#: submodule-config.c:436 +#: submodule-config.c:467 #, c-format msgid "invalid value for %s" msgstr "Ungültiger Wert für %s" @@ -4156,7 +4452,7 @@ msgstr "Ausführen des Anhang-Befehls '%s' fehlgeschlagen" msgid "unknown value '%s' for key '%s'" msgstr "unbekannter Wert '%s' für Schlüssel %s" -#: trailer.c:539 trailer.c:544 builtin/remote.c:290 +#: trailer.c:539 trailer.c:544 builtin/remote.c:293 #, c-format msgid "more than one %s" msgstr "mehr als ein %s" @@ -4199,17 +4495,21 @@ msgstr "konnte temporäre Datei '%s' nicht öffnen" msgid "could not rename temporary file to %s" msgstr "konnte temporäre Datei nicht zu %s umbenennen" -#: transport.c:63 +#: transport.c:116 #, c-format msgid "Would set upstream of '%s' to '%s' of '%s'\n" msgstr "Würde Upstream-Branch von '%s' zu '%s' von '%s' setzen\n" -#: transport.c:152 +#: transport.c:208 #, c-format msgid "transport: invalid depth option '%s'" msgstr "transport: ungültige --depth Option '%s'" -#: transport.c:916 +#: transport.c:584 +msgid "could not parse transport.color.* config" +msgstr "Konnte transport.color.* Konfiguration nicht parsen." + +#: transport.c:996 #, c-format msgid "" "The following submodule paths contain changes that can\n" @@ -4218,7 +4518,7 @@ msgstr "" "Die folgenden Submodul-Pfade enthalten Änderungen, die in keinem\n" "Remote-Repository gefunden wurden:\n" -#: transport.c:920 +#: transport.c:1000 #, c-format msgid "" "\n" @@ -4245,11 +4545,11 @@ msgstr "" "zum Versenden zu einem Remote-Repository.\n" "\n" -#: transport.c:928 +#: transport.c:1008 msgid "Aborting." msgstr "Abbruch." -#: transport-helper.c:1079 +#: transport-helper.c:1087 #, c-format msgid "Could not read ref %s" msgstr "Konnte Referenz %s nicht lesen." @@ -4266,11 +4566,11 @@ msgstr "fehlerhafter Modus in Tree-Eintrag" msgid "empty filename in tree entry" msgstr "leerer Dateiname in Tree-Eintrag" -#: tree-walk.c:114 +#: tree-walk.c:113 msgid "too-short tree file" msgstr "zu kurze Tree-Datei" -#: unpack-trees.c:108 +#: unpack-trees.c:111 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -4281,7 +4581,7 @@ msgstr "" "%%sBitte committen oder stashen Sie Ihre Änderungen, bevor Sie Branches\n" "wechseln." -#: unpack-trees.c:110 +#: unpack-trees.c:113 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -4291,7 +4591,7 @@ msgstr "" "überschrieben werden:\n" "%%s" -#: unpack-trees.c:113 +#: unpack-trees.c:116 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -4301,7 +4601,7 @@ msgstr "" "überschrieben werden:\n" "%%sBitte committen oder stashen Sie Ihre Änderungen, bevor Sie mergen." -#: unpack-trees.c:115 +#: unpack-trees.c:118 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -4311,7 +4611,7 @@ msgstr "" "überschrieben werden:\n" "%%s" -#: unpack-trees.c:118 +#: unpack-trees.c:121 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -4321,7 +4621,7 @@ msgstr "" "überschrieben werden:\n" "%%sBitte committen oder stashen Sie Ihre Änderungen, bevor Sie %s ausführen." -#: unpack-trees.c:120 +#: unpack-trees.c:123 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -4330,7 +4630,7 @@ msgstr "" "Ihre lokalen Änderungen würden durch %s überschrieben werden.\n" "%%s" -#: unpack-trees.c:125 +#: unpack-trees.c:128 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" @@ -4340,7 +4640,7 @@ msgstr "" "Dateien in diesen Verzeichnissen verloren gehen:\n" "%s" -#: unpack-trees.c:129 +#: unpack-trees.c:132 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -4350,7 +4650,7 @@ msgstr "" "den Checkout entfernt werden:\n" "%%sBitte verschieben oder entfernen Sie diese, bevor Sie Branches wechseln." -#: unpack-trees.c:131 +#: unpack-trees.c:134 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -4361,7 +4661,7 @@ msgstr "" "Checkout entfernt werden:\n" "%%s" -#: unpack-trees.c:134 +#: unpack-trees.c:137 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -4371,7 +4671,7 @@ msgstr "" "den Merge entfernt werden:\n" "%%sBitte verschieben oder entfernen Sie diese, bevor sie mergen." -#: unpack-trees.c:136 +#: unpack-trees.c:139 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -4382,7 +4682,7 @@ msgstr "" "Merge entfernt werden:\n" "%%s" -#: unpack-trees.c:139 +#: unpack-trees.c:142 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -4392,7 +4692,7 @@ msgstr "" "den %s entfernt werden:\n" "%%sBitte verschieben oder entfernen Sie diese, bevor sie %s ausführen." -#: unpack-trees.c:141 +#: unpack-trees.c:144 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -4402,7 +4702,7 @@ msgstr "" "den %s entfernt werden:\n" "%%s" -#: unpack-trees.c:146 +#: unpack-trees.c:150 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -4413,7 +4713,7 @@ msgstr "" "den Checkout überschrieben werden:\n" "%%sBitte verschieben oder entfernen Sie diese, bevor Sie Branches wechseln." -#: unpack-trees.c:148 +#: unpack-trees.c:152 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -4425,7 +4725,7 @@ msgstr "" "Checkout überschrieben werden:\n" "%%s" -#: unpack-trees.c:151 +#: unpack-trees.c:155 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -4435,7 +4735,7 @@ msgstr "" "den Merge überschrieben werden:\n" "%%sBitte verschieben oder entfernen Sie diese, bevor Sie mergen." -#: unpack-trees.c:153 +#: unpack-trees.c:157 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -4445,7 +4745,7 @@ msgstr "" "den Merge überschrieben werden:\n" "%%s" -#: unpack-trees.c:156 +#: unpack-trees.c:160 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -4455,7 +4755,7 @@ msgstr "" "den %s überschrieben werden:\n" "%%sBitte verschieben oder entfernen Sie diese, bevor sie %s ausführen." -#: unpack-trees.c:158 +#: unpack-trees.c:162 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -4466,12 +4766,12 @@ msgstr "" "%s überschrieben werden:\n" "%%s" -#: unpack-trees.c:165 +#: unpack-trees.c:170 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "Eintrag '%s' überschneidet sich mit '%s'. Kann nicht verbinden." -#: unpack-trees.c:168 +#: unpack-trees.c:173 #, c-format msgid "" "Cannot update sparse checkout: the following entries are not up to date:\n" @@ -4481,7 +4781,7 @@ msgstr "" "sind nicht aktuell:\n" "%s" -#: unpack-trees.c:170 +#: unpack-trees.c:175 #, c-format msgid "" "The following working tree files would be overwritten by sparse checkout " @@ -4492,7 +4792,7 @@ msgstr "" "über einen partiellen Checkout überschrieben werden:\n" "%s" -#: unpack-trees.c:172 +#: unpack-trees.c:177 #, c-format msgid "" "The following working tree files would be removed by sparse checkout " @@ -4503,7 +4803,7 @@ msgstr "" "über einen partiellen Checkout entfernt werden:\n" "%s" -#: unpack-trees.c:174 +#: unpack-trees.c:179 #, c-format msgid "" "Cannot update submodule:\n" @@ -4512,12 +4812,12 @@ msgstr "" "Kann Submodul nicht aktualisieren:\n" "%s" -#: unpack-trees.c:251 +#: unpack-trees.c:262 #, c-format msgid "Aborting\n" msgstr "Abbruch\n" -#: unpack-trees.c:333 +#: unpack-trees.c:344 msgid "Checking out files" msgstr "Checke Dateien aus" @@ -4586,7 +4886,7 @@ msgid "could not open '%s' for reading and writing" msgstr "Konnte '%s' nicht zum Lesen und Schreiben öffnen." #: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:770 -#: builtin/am.c:862 builtin/merge.c:1044 +#: builtin/am.c:862 builtin/merge.c:1042 #, c-format msgid "could not open '%s' for reading" msgstr "Konnte '%s' nicht zum Lesen öffnen." @@ -4600,167 +4900,167 @@ msgstr "konnte nicht auf '%s' zugreifen" msgid "unable to get current working directory" msgstr "Konnte aktuelles Arbeitsverzeichnis nicht bekommen." -#: wt-status.c:151 +#: wt-status.c:154 msgid "Unmerged paths:" msgstr "Nicht zusammengeführte Pfade:" -#: wt-status.c:178 wt-status.c:205 +#: wt-status.c:181 wt-status.c:208 #, 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:180 wt-status.c:207 +#: wt-status.c:183 wt-status.c:210 msgid " (use \"git rm --cached <file>...\" to unstage)" msgstr "" " (benutzen Sie \"git rm --cached <Datei>...\" zum Entfernen aus der Staging-" "Area)" -#: wt-status.c:184 +#: wt-status.c:187 msgid " (use \"git add <file>...\" to mark resolution)" msgstr "" " (benutzen Sie \"git add/rm <Datei>...\", um die Auflösung zu markieren)" -#: wt-status.c:186 wt-status.c:190 +#: wt-status.c:189 wt-status.c:193 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:188 +#: wt-status.c:191 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr "" " (benutzen Sie \"git add/rm <Datei>...\", um die Auflösung zu markieren)" -#: wt-status.c:199 wt-status.c:1007 +#: wt-status.c:202 wt-status.c:1015 msgid "Changes to be committed:" msgstr "zum Commit vorgemerkte Änderungen:" -#: wt-status.c:217 wt-status.c:1016 +#: wt-status.c:220 wt-status.c:1024 msgid "Changes not staged for commit:" msgstr "Änderungen, die nicht zum Commit vorgemerkt sind:" -#: wt-status.c:221 +#: wt-status.c:224 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:223 +#: wt-status.c:226 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:224 +#: wt-status.c:227 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:226 +#: wt-status.c:229 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:238 +#: wt-status.c:241 #, 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:253 +#: wt-status.c:256 msgid "both deleted:" msgstr "beide gelöscht:" -#: wt-status.c:255 +#: wt-status.c:258 msgid "added by us:" msgstr "von uns hinzugefügt:" -#: wt-status.c:257 +#: wt-status.c:260 msgid "deleted by them:" msgstr "von denen gelöscht:" -#: wt-status.c:259 +#: wt-status.c:262 msgid "added by them:" msgstr "von denen hinzugefügt:" -#: wt-status.c:261 +#: wt-status.c:264 msgid "deleted by us:" msgstr "von uns gelöscht:" -#: wt-status.c:263 +#: wt-status.c:266 msgid "both added:" msgstr "von beiden hinzugefügt:" -#: wt-status.c:265 +#: wt-status.c:268 msgid "both modified:" msgstr "von beiden geändert:" -#: wt-status.c:275 +#: wt-status.c:278 msgid "new file:" msgstr "neue Datei:" -#: wt-status.c:277 +#: wt-status.c:280 msgid "copied:" msgstr "kopiert:" -#: wt-status.c:279 +#: wt-status.c:282 msgid "deleted:" msgstr "gelöscht:" -#: wt-status.c:281 +#: wt-status.c:284 msgid "modified:" msgstr "geändert:" -#: wt-status.c:283 +#: wt-status.c:286 msgid "renamed:" msgstr "umbenannt:" -#: wt-status.c:285 +#: wt-status.c:288 msgid "typechange:" msgstr "Typänderung:" -#: wt-status.c:287 +#: wt-status.c:290 msgid "unknown:" msgstr "unbekannt:" -#: wt-status.c:289 +#: wt-status.c:292 msgid "unmerged:" msgstr "nicht gemerged:" -#: wt-status.c:369 +#: wt-status.c:372 msgid "new commits, " msgstr "neue Commits, " -#: wt-status.c:371 +#: wt-status.c:374 msgid "modified content, " msgstr "geänderter Inhalt, " -#: wt-status.c:373 +#: wt-status.c:376 msgid "untracked content, " msgstr "unversionierter Inhalt, " -#: wt-status.c:847 +#: wt-status.c:853 #, 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:879 +#: wt-status.c:885 msgid "Submodules changed but not updated:" msgstr "Submodule geändert, aber nicht aktualisiert:" -#: wt-status.c:881 +#: wt-status.c:887 msgid "Submodule changes to be committed:" msgstr "Änderungen in Submodul zum Committen:" -#: wt-status.c:963 +#: wt-status.c:969 msgid "" "Do not modify or remove the line above.\n" "Everything below it will be ignored." @@ -4768,114 +5068,114 @@ msgstr "" "Ändern oder entfernen Sie nicht die obige Zeile.\n" "Alles unterhalb von ihr wird ignoriert." -#: wt-status.c:1076 +#: wt-status.c:1084 msgid "You have unmerged paths." msgstr "Sie haben nicht zusammengeführte Pfade." -#: wt-status.c:1079 +#: wt-status.c:1087 msgid " (fix conflicts and run \"git commit\")" msgstr " (beheben Sie die Konflikte und führen Sie \"git commit\" aus)" -#: wt-status.c:1081 +#: wt-status.c:1089 msgid " (use \"git merge --abort\" to abort the merge)" msgstr " (benutzen Sie \"git merge --abort\", um den Merge abzubrechen)" -#: wt-status.c:1086 +#: wt-status.c:1094 msgid "All conflicts fixed but you are still merging." msgstr "Alle Konflikte sind behoben, aber Sie sind immer noch beim Merge." -#: wt-status.c:1089 +#: wt-status.c:1097 msgid " (use \"git commit\" to conclude merge)" msgstr " (benutzen Sie \"git commit\", um den Merge abzuschließen)" -#: wt-status.c:1099 +#: wt-status.c:1107 msgid "You are in the middle of an am session." msgstr "Eine \"am\"-Sitzung ist im Gange." -#: wt-status.c:1102 +#: wt-status.c:1110 msgid "The current patch is empty." msgstr "Der aktuelle Patch ist leer." -#: wt-status.c:1106 +#: wt-status.c:1114 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:1108 +#: wt-status.c:1116 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (benutzen Sie \"git am --skip\", um diesen Patch auszulassen)" -#: wt-status.c:1110 +#: wt-status.c:1118 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:1242 +#: wt-status.c:1250 msgid "git-rebase-todo is missing." msgstr "git-rebase-todo fehlt." -#: wt-status.c:1244 +#: wt-status.c:1252 msgid "No commands done." msgstr "Keine Befehle ausgeführt." -#: wt-status.c:1247 +#: wt-status.c:1255 #, 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:1258 +#: wt-status.c:1266 #, c-format msgid " (see more in file %s)" msgstr " (mehr Informationen in Datei %s)" -#: wt-status.c:1263 +#: wt-status.c:1271 msgid "No commands remaining." msgstr "Keine Befehle verbleibend." -#: wt-status.c:1266 +#: wt-status.c:1274 #, 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:1274 +#: wt-status.c:1282 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr " (benutzen Sie \"git rebase --edit-todo\" zum Ansehen und Bearbeiten)" -#: wt-status.c:1287 +#: wt-status.c:1295 #, 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:1292 +#: wt-status.c:1300 msgid "You are currently rebasing." msgstr "Sie sind gerade beim Rebase." -#: wt-status.c:1306 +#: wt-status.c:1314 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:1308 +#: wt-status.c:1316 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (benutzen Sie \"git rebase --skip\", um diesen Patch auszulassen)" -#: wt-status.c:1310 +#: wt-status.c:1318 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:1316 +#: wt-status.c:1324 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (alle Konflikte behoben: führen Sie \"git rebase --continue\" aus)" -#: wt-status.c:1320 +#: wt-status.c:1328 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." @@ -4883,138 +5183,138 @@ msgstr "" "Sie teilen gerade einen Commit auf, während ein Rebase von Branch '%s' auf " "'%s' im Gange ist." -#: wt-status.c:1325 +#: wt-status.c:1333 msgid "You are currently splitting a commit during a rebase." msgstr "Sie teilen gerade einen Commit während eines Rebase auf." -#: wt-status.c:1328 +#: wt-status.c:1336 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:1332 +#: wt-status.c:1340 #, 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:1337 +#: wt-status.c:1345 msgid "You are currently editing a commit during a rebase." msgstr "Sie editieren gerade einen Commit während eines Rebase." -#: wt-status.c:1340 +#: wt-status.c:1348 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr "" " (benutzen Sie \"git commit --amend\", um den aktuellen Commit " "nachzubessern)" -#: wt-status.c:1342 +#: wt-status.c:1350 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:1352 +#: wt-status.c:1360 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "Sie führen gerade \"cherry-pick\" von Commit %s aus." -#: wt-status.c:1357 +#: wt-status.c:1365 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:1360 +#: wt-status.c:1368 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" " (alle Konflikte behoben: führen Sie \"git cherry-pick --continue\" aus)" -#: wt-status.c:1362 +#: wt-status.c:1370 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:1371 +#: wt-status.c:1379 #, c-format msgid "You are currently reverting commit %s." msgstr "Sie sind gerade an einem Revert von Commit '%s'." -#: wt-status.c:1376 +#: wt-status.c:1384 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:1379 +#: wt-status.c:1387 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (alle Konflikte behoben: führen Sie \"git revert --continue\" aus)" -#: wt-status.c:1381 +#: wt-status.c:1389 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr "" " (benutzen Sie \"git revert --abort\", um die Revert-Operation abzubrechen)" -#: wt-status.c:1392 +#: wt-status.c:1400 #, 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:1396 +#: wt-status.c:1404 msgid "You are currently bisecting." msgstr "Sie sind gerade bei einer binären Suche." -#: wt-status.c:1399 +#: wt-status.c:1407 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:1596 +#: wt-status.c:1604 msgid "On branch " msgstr "Auf Branch " -#: wt-status.c:1602 +#: wt-status.c:1610 msgid "interactive rebase in progress; onto " msgstr "interaktives Rebase im Gange; auf " -#: wt-status.c:1604 +#: wt-status.c:1612 msgid "rebase in progress; onto " msgstr "Rebase im Gange; auf " -#: wt-status.c:1609 +#: wt-status.c:1617 msgid "HEAD detached at " msgstr "HEAD losgelöst bei " -#: wt-status.c:1611 +#: wt-status.c:1619 msgid "HEAD detached from " msgstr "HEAD losgelöst von " -#: wt-status.c:1614 +#: wt-status.c:1622 msgid "Not currently on any branch." msgstr "Im Moment auf keinem Branch." -#: wt-status.c:1634 +#: wt-status.c:1642 msgid "Initial commit" msgstr "Initialer Commit" -#: wt-status.c:1635 +#: wt-status.c:1643 msgid "No commits yet" msgstr "Noch keine Commits" -#: wt-status.c:1649 +#: wt-status.c:1657 msgid "Untracked files" msgstr "Unversionierte Dateien" -#: wt-status.c:1651 +#: wt-status.c:1659 msgid "Ignored files" msgstr "Ignorierte Dateien" -#: wt-status.c:1655 +#: wt-status.c:1663 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -5025,32 +5325,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:1661 +#: wt-status.c:1669 #, c-format msgid "Untracked files not listed%s" msgstr "Unversionierte Dateien nicht aufgelistet%s" -#: wt-status.c:1663 +#: wt-status.c:1671 msgid " (use -u option to show untracked files)" msgstr " (benutzen Sie die Option -u, um unversionierte Dateien anzuzeigen)" -#: wt-status.c:1669 +#: wt-status.c:1677 msgid "No changes" msgstr "Keine Änderungen" -#: wt-status.c:1674 +#: wt-status.c:1682 #, 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:1677 +#: wt-status.c:1685 #, c-format msgid "no changes added to commit\n" msgstr "keine Änderungen zum Commit vorgemerkt\n" -#: wt-status.c:1680 +#: wt-status.c:1688 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -5059,73 +5359,73 @@ msgstr "" "nichts zum Commit vorgemerkt, aber es gibt unversionierte Dateien\n" "(benutzen Sie \"git add\" zum Versionieren)\n" -#: wt-status.c:1683 +#: wt-status.c:1691 #, 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:1686 +#: wt-status.c:1694 #, 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:1689 wt-status.c:1694 +#: wt-status.c:1697 wt-status.c:1702 #, c-format msgid "nothing to commit\n" msgstr "nichts zu committen\n" -#: wt-status.c:1692 +#: wt-status.c:1700 #, 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:1696 +#: wt-status.c:1704 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "nichts zu committen, Arbeitsverzeichnis unverändert\n" -#: wt-status.c:1809 +#: wt-status.c:1817 msgid "No commits yet on " msgstr "Noch keine Commits in " -#: wt-status.c:1813 +#: wt-status.c:1821 msgid "HEAD (no branch)" msgstr "HEAD (kein Branch)" -#: wt-status.c:1844 +#: wt-status.c:1852 msgid "different" msgstr "unterschiedlich" -#: wt-status.c:1846 wt-status.c:1854 +#: wt-status.c:1854 wt-status.c:1862 msgid "behind " msgstr "hinterher " -#: wt-status.c:1849 wt-status.c:1852 +#: wt-status.c:1857 wt-status.c:1860 msgid "ahead " msgstr "voraus " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2358 +#: wt-status.c:2366 #, 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:2364 +#: wt-status.c:2372 msgid "additionally, your index contains uncommitted changes." msgstr "Zusätzlich enthält die Staging-Area nicht committete Änderungen." -#: wt-status.c:2366 +#: wt-status.c:2374 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "" "%s nicht möglich: Die Staging-Area enthält nicht committete Änderungen." -#: compat/precompose_utf8.c:58 builtin/clone.c:440 +#: compat/precompose_utf8.c:58 builtin/clone.c:442 #, c-format msgid "failed to unlink '%s'" msgstr "Konnte '%s' nicht entfernen." @@ -5139,7 +5439,7 @@ msgstr "git add [<Optionen>] [--] <Pfadspezifikation>..." msgid "unexpected diff status %c" msgstr "unerwarteter Differenz-Status %c" -#: builtin/add.c:88 builtin/commit.c:257 +#: builtin/add.c:88 builtin/commit.c:266 msgid "updating files failed" msgstr "Aktualisierung der Dateien fehlgeschlagen" @@ -5184,84 +5484,84 @@ msgstr "Leerer Patch. Abgebrochen." msgid "Could not apply '%s'" msgstr "Konnte '%s' nicht anwenden." -#: builtin/add.c:271 +#: builtin/add.c:269 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" "Die folgenden Pfade werden durch eine Ihrer \".gitignore\" Dateien " "ignoriert:\n" -#: builtin/add.c:291 builtin/clean.c:911 builtin/fetch.c:146 builtin/mv.c:124 -#: builtin/prune-packed.c:55 builtin/pull.c:207 builtin/push.c:541 -#: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164 +#: builtin/add.c:289 builtin/clean.c:911 builtin/fetch.c:145 builtin/mv.c:123 +#: builtin/prune-packed.c:55 builtin/pull.c:212 builtin/push.c:557 +#: builtin/remote.c:1342 builtin/rm.c:240 builtin/send-pack.c:165 msgid "dry run" msgstr "Probelauf" -#: builtin/add.c:294 +#: builtin/add.c:292 msgid "interactive picking" msgstr "interaktives Auswählen" -#: builtin/add.c:295 builtin/checkout.c:1128 builtin/reset.c:302 +#: builtin/add.c:293 builtin/checkout.c:1135 builtin/reset.c:302 msgid "select hunks interactively" msgstr "Blöcke interaktiv auswählen" -#: builtin/add.c:296 +#: builtin/add.c:294 msgid "edit current diff and apply" msgstr "aktuelle Unterschiede editieren und anwenden" -#: builtin/add.c:297 +#: builtin/add.c:295 msgid "allow adding otherwise ignored files" msgstr "das Hinzufügen andernfalls ignorierter Dateien erlauben" -#: builtin/add.c:298 +#: builtin/add.c:296 msgid "update tracked files" msgstr "versionierte Dateien aktualisieren" -#: builtin/add.c:299 +#: builtin/add.c:297 msgid "renormalize EOL of tracked files (implies -u)" msgstr "" "erneutes Normalisieren der Zeilenenden von versionierten Dateien (impliziert " "-u)" -#: builtin/add.c:300 +#: builtin/add.c:298 msgid "record only the fact that the path will be added later" msgstr "nur speichern, dass der Pfad später hinzugefügt werden soll" -#: builtin/add.c:301 +#: builtin/add.c:299 msgid "add changes from all tracked and untracked files" msgstr "" "Änderungen von allen versionierten und unversionierten Dateien hinzufügen" -#: builtin/add.c:304 +#: builtin/add.c:302 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "gelöschte Pfade im Arbeitsverzeichnis ignorieren (genau wie --no-all)" -#: builtin/add.c:306 +#: builtin/add.c:304 msgid "don't add, only refresh the index" msgstr "nichts hinzufügen, nur den Index aktualisieren" -#: builtin/add.c:307 +#: builtin/add.c:305 msgid "just skip files which cannot be added because of errors" msgstr "" "Dateien überspringen, die aufgrund von Fehlern nicht hinzugefügt werden " "konnten" -#: builtin/add.c:308 +#: builtin/add.c:306 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:964 +#: builtin/add.c:307 builtin/update-index.c:974 msgid "(+/-)x" msgstr "(+/-)x" -#: builtin/add.c:309 builtin/update-index.c:965 +#: builtin/add.c:307 builtin/update-index.c:975 msgid "override the executable bit of the listed files" msgstr "das \"ausführbar\"-Bit der aufgelisteten Dateien überschreiben" -#: builtin/add.c:311 +#: builtin/add.c:309 msgid "warn when adding an embedded repository" msgstr "warnen wenn eingebettetes Repository hinzugefügt wird" -#: builtin/add.c:326 +#: builtin/add.c:324 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -5295,48 +5595,48 @@ msgstr "" "\n" "Siehe \"git help submodule\" für weitere Informationen." -#: builtin/add.c:354 +#: builtin/add.c:352 #, c-format msgid "adding embedded git repository: %s" msgstr "Füge eingebettetes Repository hinzu: %s" -#: builtin/add.c:372 +#: builtin/add.c:370 #, c-format 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:378 msgid "adding files failed" msgstr "Hinzufügen von Dateien fehlgeschlagen" -#: builtin/add.c:417 +#: builtin/add.c:416 msgid "-A and -u are mutually incompatible" msgstr "Die Optionen -A und -u sind zueinander inkompatibel." -#: builtin/add.c:424 +#: builtin/add.c:423 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:428 +#: builtin/add.c:427 #, 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:443 +#: builtin/add.c:442 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "Nichts spezifiziert, nichts hinzugefügt.\n" -#: builtin/add.c:444 +#: builtin/add.c:443 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Meinten Sie vielleicht 'git add .'?\n" -#: builtin/add.c:449 builtin/check-ignore.c:177 builtin/checkout.c:280 -#: builtin/checkout.c:483 builtin/clean.c:958 builtin/commit.c:316 +#: builtin/add.c:448 builtin/check-ignore.c:177 builtin/checkout.c:280 +#: builtin/checkout.c:483 builtin/clean.c:958 builtin/commit.c:325 #: builtin/diff-tree.c:114 builtin/mv.c:144 builtin/reset.c:241 -#: builtin/rm.c:271 builtin/submodule--helper.c:326 +#: builtin/rm.c:270 builtin/submodule--helper.c:328 msgid "index file corrupt" msgstr "Index-Datei beschädigt" @@ -5388,7 +5688,7 @@ msgstr "Ungültiger Offset in der Zeitzone" msgid "Patch format detection failed." msgstr "Patch-Formaterkennung fehlgeschlagen." -#: builtin/am.c:1013 builtin/clone.c:405 +#: builtin/am.c:1013 builtin/clone.c:407 #, c-format msgid "failed to create directory '%s'" msgstr "Fehler beim Erstellen von Verzeichnis '%s'" @@ -5397,7 +5697,7 @@ msgstr "Fehler beim Erstellen von Verzeichnis '%s'" msgid "Failed to split patches." msgstr "Fehler beim Aufteilen der Patches." -#: builtin/am.c:1148 builtin/commit.c:342 +#: builtin/am.c:1148 builtin/commit.c:351 msgid "unable to write index file" msgstr "Konnte Index-Datei nicht schreiben." @@ -5583,7 +5883,7 @@ msgid "allow fall back on 3way merging if needed" msgstr "erlaube, falls notwendig, das Zurückfallen auf einen 3-Wege-Merge" #: builtin/am.c:2222 builtin/init-db.c:484 builtin/prune-packed.c:57 -#: builtin/repack.c:182 +#: builtin/repack.c:192 msgid "be quiet" msgstr "weniger Ausgaben" @@ -5625,16 +5925,17 @@ msgstr "alles vor einer Scheren-Zeile entfernen" msgid "pass it through git-apply" msgstr "an git-apply übergeben" -#: builtin/am.c:2260 builtin/fmt-merge-msg.c:665 builtin/fmt-merge-msg.c:668 -#: builtin/grep.c:853 builtin/merge.c:206 builtin/pull.c:145 builtin/pull.c:203 -#: builtin/repack.c:191 builtin/repack.c:195 builtin/repack.c:197 -#: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:382 -#: parse-options.h:144 parse-options.h:146 parse-options.h:257 +#: builtin/am.c:2260 builtin/commit.c:1332 builtin/fmt-merge-msg.c:665 +#: builtin/fmt-merge-msg.c:668 builtin/grep.c:853 builtin/merge.c:207 +#: builtin/pull.c:150 builtin/pull.c:208 builtin/repack.c:201 +#: builtin/repack.c:205 builtin/repack.c:207 builtin/show-branch.c:631 +#: builtin/show-ref.c:169 builtin/tag.c:383 parse-options.h:144 +#: parse-options.h:146 parse-options.h:258 msgid "n" msgstr "Anzahl" -#: builtin/am.c:2266 builtin/branch.c:629 builtin/for-each-ref.c:38 -#: builtin/replace.c:445 builtin/tag.c:418 builtin/verify-tag.c:39 +#: builtin/am.c:2266 builtin/branch.c:632 builtin/for-each-ref.c:38 +#: builtin/replace.c:543 builtin/tag.c:419 builtin/verify-tag.c:39 msgid "format" msgstr "Format" @@ -5679,8 +5980,8 @@ msgstr "Autor-Datum als Commit-Datum verwenden" msgid "use current timestamp for author date" msgstr "aktuellen Zeitstempel als Autor-Datum verwenden" -#: builtin/am.c:2298 builtin/commit.c:1431 builtin/merge.c:237 -#: builtin/pull.c:178 builtin/revert.c:112 builtin/tag.c:398 +#: builtin/am.c:2298 builtin/commit.c:1468 builtin/merge.c:238 +#: builtin/pull.c:183 builtin/revert.c:112 builtin/tag.c:399 msgid "key-id" msgstr "GPG-Schlüsselkennung" @@ -5819,120 +6120,146 @@ msgstr "--write-terms benötigt zwei Argumente." msgid "--bisect-clean-state requires no arguments" msgstr "--bisect-clean-state erwartet keine Argumente." -#: builtin/blame.c:27 +#: builtin/blame.c:29 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "git blame [<Optionen>] [<rev-opts>] [<Commit>] [--] <Datei>" -#: builtin/blame.c:32 +#: builtin/blame.c:34 msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "<rev-opts> sind dokumentiert in git-rev-list(1)" -#: builtin/blame.c:677 +#: builtin/blame.c:404 +#, c-format +msgid "expecting a color: %s" +msgstr "Erwarte eine Farbe: %s" + +#: builtin/blame.c:411 +msgid "must end with a color" +msgstr "Muss mit einer Farbe enden." + +#: builtin/blame.c:697 +#, c-format +msgid "invalid color '%s' in color.blame.repeatedLines" +msgstr "Ungültige Farbe '%s' in color.blame.repeatedLines." + +#: builtin/blame.c:715 +msgid "invalid value for blame.coloring" +msgstr "Ungültiger Wert für blame.coloring." + +#: builtin/blame.c:786 msgid "Show blame entries as we find them, incrementally" msgstr "\"blame\"-Einträge schrittweise anzeigen, während wir sie generieren" -#: builtin/blame.c:678 +#: builtin/blame.c:787 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "leere SHA-1 für Grenz-Commits anzeigen (Standard: aus)" -#: builtin/blame.c:679 +#: builtin/blame.c:788 msgid "Do not treat root commits as boundaries (Default: off)" -msgstr "Ursprungs-Commits nicht als Grenzen behandeln (Standard: aus)" +msgstr "Root-Commits nicht als Grenzen behandeln (Standard: aus)" -#: builtin/blame.c:680 +#: builtin/blame.c:789 msgid "Show work cost statistics" msgstr "Statistiken zum Arbeitsaufwand anzeigen" -#: builtin/blame.c:681 +#: builtin/blame.c:790 msgid "Force progress reporting" msgstr "Fortschrittsanzeige erzwingen" -#: builtin/blame.c:682 +#: builtin/blame.c:791 msgid "Show output score for blame entries" msgstr "Ausgabebewertung für \"blame\"-Einträge anzeigen" -#: builtin/blame.c:683 +#: builtin/blame.c:792 msgid "Show original filename (Default: auto)" msgstr "ursprünglichen Dateinamen anzeigen (Standard: auto)" -#: builtin/blame.c:684 +#: builtin/blame.c:793 msgid "Show original linenumber (Default: off)" msgstr "ursprüngliche Zeilennummer anzeigen (Standard: aus)" -#: builtin/blame.c:685 +#: builtin/blame.c:794 msgid "Show in a format designed for machine consumption" msgstr "Anzeige in einem Format für maschinelle Auswertung" -#: builtin/blame.c:686 +#: builtin/blame.c:795 msgid "Show porcelain format with per-line commit information" msgstr "" "Anzeige in Format für Fremdprogramme mit Commit-Informationen pro Zeile" -#: builtin/blame.c:687 +#: builtin/blame.c:796 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "" "Den gleichen Ausgabemodus benutzen wie \"git-annotate\" (Standard: aus)" -#: builtin/blame.c:688 +#: builtin/blame.c:797 msgid "Show raw timestamp (Default: off)" msgstr "Unbearbeiteten Zeitstempel anzeigen (Standard: aus)" -#: builtin/blame.c:689 +#: builtin/blame.c:798 msgid "Show long commit SHA1 (Default: off)" msgstr "Langen Commit-SHA1 anzeigen (Standard: aus)" -#: builtin/blame.c:690 +#: builtin/blame.c:799 msgid "Suppress author name and timestamp (Default: off)" msgstr "Den Namen des Autors und den Zeitstempel unterdrücken (Standard: aus)" -#: builtin/blame.c:691 +#: builtin/blame.c:800 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:692 +#: builtin/blame.c:801 msgid "Ignore whitespace differences" msgstr "Unterschiede im Whitespace ignorieren" -#: builtin/blame.c:699 +#: builtin/blame.c:802 +msgid "color redundant metadata from previous line differently" +msgstr "redundante Metadaten der vorherigen Zeile unterschiedlich einfärben" + +#: builtin/blame.c:803 +msgid "color lines by age" +msgstr "Zeilen nach Alter einfärben" + +#: builtin/blame.c:810 msgid "Use an experimental heuristic to improve diffs" msgstr "" "eine experimentelle Heuristik zur Verbesserung der Darstellung\n" "von Unterschieden verwenden" -#: builtin/blame.c:701 +#: builtin/blame.c:812 msgid "Spend extra cycles to find better match" msgstr "Länger arbeiten, um bessere Übereinstimmungen zu finden" -#: builtin/blame.c:702 +#: builtin/blame.c:813 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "Commits von <Datei> benutzen, anstatt \"git-rev-list\" aufzurufen" -#: builtin/blame.c:703 +#: builtin/blame.c:814 msgid "Use <file>'s contents as the final image" msgstr "Inhalte der <Datei>en als endgültiges Abbild benutzen" -#: builtin/blame.c:704 builtin/blame.c:705 +#: builtin/blame.c:815 builtin/blame.c:816 msgid "score" msgstr "Bewertung" -#: builtin/blame.c:704 +#: builtin/blame.c:815 msgid "Find line copies within and across files" msgstr "kopierte Zeilen innerhalb oder zwischen Dateien finden" -#: builtin/blame.c:705 +#: builtin/blame.c:816 msgid "Find line movements within and across files" msgstr "verschobene Zeilen innerhalb oder zwischen Dateien finden" -#: builtin/blame.c:706 +#: builtin/blame.c:817 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:706 +#: builtin/blame.c:817 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:753 +#: builtin/blame.c:866 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "" "--progress kann nicht mit --incremental oder Formaten für Fremdprogramme\n" @@ -5946,18 +6273,18 @@ msgstr "" #. your language may need more or fewer display #. columns. #. -#: builtin/blame.c:804 +#: builtin/blame.c:917 msgid "4 years, 11 months ago" msgstr "vor 4 Jahren und 11 Monaten" -#: builtin/blame.c:890 +#: builtin/blame.c:1003 #, 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:936 +#: builtin/blame.c:1049 msgid "Blaming lines" msgstr "Verarbeite Zeilen" @@ -6069,72 +6396,72 @@ 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:417 builtin/tag.c:58 +#: builtin/branch.c:416 builtin/tag.c:58 msgid "unable to parse format string" msgstr "Konnte Formatierungsstring nicht parsen." -#: builtin/branch.c:450 +#: builtin/branch.c:453 #, c-format msgid "Branch %s is being rebased at %s" msgstr "Branch %s wird auf %s umgesetzt" -#: builtin/branch.c:454 +#: builtin/branch.c:457 #, c-format msgid "Branch %s is being bisected at %s" msgstr "Binäre Suche von Branch %s zu %s im Gange" -#: builtin/branch.c:471 +#: builtin/branch.c:474 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:473 +#: builtin/branch.c:476 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:484 +#: builtin/branch.c:487 #, c-format msgid "Invalid branch name: '%s'" msgstr "Ungültiger Branchname: '%s'" -#: builtin/branch.c:511 +#: builtin/branch.c:514 msgid "Branch rename failed" msgstr "Umbenennung des Branches fehlgeschlagen" -#: builtin/branch.c:513 +#: builtin/branch.c:516 msgid "Branch copy failed" msgstr "Kopie des Branches fehlgeschlagen" -#: builtin/branch.c:517 +#: builtin/branch.c:520 #, c-format msgid "Created a copy of a misnamed branch '%s'" msgstr "Kopie eines falsch benannten Branches '%s' erstellt." -#: builtin/branch.c:520 +#: builtin/branch.c:523 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "falsch benannten Branch '%s' umbenannt" -#: builtin/branch.c:526 +#: builtin/branch.c:529 #, 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:535 +#: builtin/branch.c:538 msgid "Branch is renamed, but update of config-file failed" msgstr "" "Branch ist umbenannt, aber die Aktualisierung der Konfigurationsdatei ist " "fehlgeschlagen." -#: builtin/branch.c:537 +#: builtin/branch.c:540 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:553 +#: builtin/branch.c:556 #, c-format msgid "" "Please edit the description for the branch\n" @@ -6145,185 +6472,187 @@ msgstr "" " %s\n" "Zeilen, die mit '%c' beginnen, werden entfernt.\n" -#: builtin/branch.c:586 +#: builtin/branch.c:589 msgid "Generic options" msgstr "Allgemeine Optionen" -#: builtin/branch.c:588 +#: builtin/branch.c:591 msgid "show hash and subject, give twice for upstream branch" msgstr "Hash und Betreff anzeigen; -vv: zusätzlich Upstream-Branch" -#: builtin/branch.c:589 +#: builtin/branch.c:592 msgid "suppress informational messages" msgstr "Informationsmeldungen unterdrücken" -#: builtin/branch.c:590 +#: builtin/branch.c:593 msgid "set up tracking mode (see git-pull(1))" msgstr "Modus zum Folgen von Branches einstellen (siehe git-pull(1))" -#: builtin/branch.c:592 +#: builtin/branch.c:595 msgid "do not use" msgstr "nicht verwenden" -#: builtin/branch.c:594 +#: builtin/branch.c:597 msgid "upstream" msgstr "Upstream" -#: builtin/branch.c:594 +#: builtin/branch.c:597 msgid "change the upstream info" msgstr "Informationen zum Upstream-Branch ändern" -#: builtin/branch.c:595 +#: builtin/branch.c:598 msgid "Unset the upstream info" msgstr "Informationen zum Upstream-Branch entfernen" -#: builtin/branch.c:596 +#: builtin/branch.c:599 msgid "use colored output" msgstr "farbige Ausgaben verwenden" -#: builtin/branch.c:597 +#: builtin/branch.c:600 msgid "act on remote-tracking branches" msgstr "auf Remote-Tracking-Branches wirken" -#: builtin/branch.c:599 builtin/branch.c:601 +#: builtin/branch.c:602 builtin/branch.c:604 msgid "print only branches that contain the commit" msgstr "nur Branches ausgeben, die diesen Commit enthalten" -#: builtin/branch.c:600 builtin/branch.c:602 +#: builtin/branch.c:603 builtin/branch.c:605 msgid "print only branches that don't contain the commit" msgstr "nur Branches ausgeben, die diesen Commit nicht enthalten" -#: builtin/branch.c:605 +#: builtin/branch.c:608 msgid "Specific git-branch actions:" msgstr "spezifische Aktionen für \"git-branch\":" -#: builtin/branch.c:606 +#: builtin/branch.c:609 msgid "list both remote-tracking and local branches" msgstr "Remote-Tracking und lokale Branches auflisten" -#: builtin/branch.c:608 +#: builtin/branch.c:611 msgid "delete fully merged branch" msgstr "vollständig zusammengeführten Branch entfernen" -#: builtin/branch.c:609 +#: builtin/branch.c:612 msgid "delete branch (even if not merged)" msgstr "Branch löschen (auch wenn nicht zusammengeführt)" -#: builtin/branch.c:610 +#: builtin/branch.c:613 msgid "move/rename a branch and its reflog" msgstr "einen Branch und dessen Reflog verschieben/umbenennen" -#: builtin/branch.c:611 +#: builtin/branch.c:614 msgid "move/rename a branch, even if target exists" msgstr "" "einen Branch verschieben/umbenennen, auch wenn das Ziel bereits existiert" -#: builtin/branch.c:612 +#: builtin/branch.c:615 msgid "copy a branch and its reflog" msgstr "einen Branch und dessen Reflog kopieren" -#: builtin/branch.c:613 +#: builtin/branch.c:616 msgid "copy a branch, even if target exists" msgstr "einen Branch kopieren, auch wenn das Ziel bereits existiert" -#: builtin/branch.c:614 +#: builtin/branch.c:617 msgid "list branch names" msgstr "Branchnamen auflisten" -#: builtin/branch.c:615 +#: builtin/branch.c:618 msgid "create the branch's reflog" msgstr "das Reflog des Branches erzeugen" -#: builtin/branch.c:617 +#: builtin/branch.c:620 msgid "edit the description for the branch" msgstr "die Beschreibung für den Branch bearbeiten" -#: builtin/branch.c:618 +#: builtin/branch.c:621 msgid "force creation, move/rename, deletion" msgstr "Erstellung, Verschiebung/Umbenennung oder Löschung erzwingen" -#: builtin/branch.c:619 +#: builtin/branch.c:622 msgid "print only branches that are merged" msgstr "nur zusammengeführte Branches ausgeben" -#: builtin/branch.c:620 +#: builtin/branch.c:623 msgid "print only branches that are not merged" msgstr "nur nicht zusammengeführte Branches ausgeben" -#: builtin/branch.c:621 +#: builtin/branch.c:624 msgid "list branches in columns" msgstr "Branches in Spalten auflisten" -#: builtin/branch.c:622 builtin/for-each-ref.c:40 builtin/tag.c:411 +#: builtin/branch.c:625 builtin/for-each-ref.c:40 builtin/ls-remote.c:70 +#: builtin/tag.c:412 msgid "key" msgstr "Schüssel" -#: builtin/branch.c:623 builtin/for-each-ref.c:41 builtin/tag.c:412 +#: builtin/branch.c:626 builtin/for-each-ref.c:41 builtin/ls-remote.c:71 +#: builtin/tag.c:413 msgid "field name to sort on" msgstr "sortiere nach diesem Feld" -#: builtin/branch.c:625 builtin/for-each-ref.c:43 builtin/notes.c:408 +#: builtin/branch.c:628 builtin/for-each-ref.c:43 builtin/notes.c:408 #: builtin/notes.c:411 builtin/notes.c:571 builtin/notes.c:574 -#: builtin/tag.c:414 +#: builtin/tag.c:415 msgid "object" msgstr "Objekt" -#: builtin/branch.c:626 +#: builtin/branch.c:629 msgid "print only branches of the object" msgstr "nur Branches von diesem Objekt ausgeben" -#: builtin/branch.c:628 builtin/for-each-ref.c:49 builtin/tag.c:421 +#: builtin/branch.c:631 builtin/for-each-ref.c:49 builtin/tag.c:422 msgid "sorting and filtering are case insensitive" msgstr "Sortierung und Filterung sind unabhängig von Groß- und Kleinschreibung" -#: builtin/branch.c:629 builtin/for-each-ref.c:38 builtin/tag.c:419 +#: builtin/branch.c:632 builtin/for-each-ref.c:38 builtin/tag.c:420 #: builtin/verify-tag.c:39 msgid "format to use for the output" msgstr "für die Ausgabe zu verwendendes Format" -#: builtin/branch.c:652 builtin/clone.c:735 +#: builtin/branch.c:655 builtin/clone.c:737 msgid "HEAD not found below refs/heads!" msgstr "HEAD wurde nicht unter \"refs/heads\" gefunden!" -#: builtin/branch.c:675 +#: builtin/branch.c:678 msgid "--column and --verbose are incompatible" msgstr "Die Optionen --column und --verbose sind inkompatibel." -#: builtin/branch.c:690 builtin/branch.c:742 builtin/branch.c:751 +#: builtin/branch.c:693 builtin/branch.c:745 builtin/branch.c:754 msgid "branch name required" msgstr "Branchname erforderlich" -#: builtin/branch.c:718 +#: builtin/branch.c:721 msgid "Cannot give description to detached HEAD" msgstr "zu losgelöstem HEAD kann keine Beschreibung hinterlegt werden" -#: builtin/branch.c:723 +#: builtin/branch.c:726 msgid "cannot edit description of more than one branch" msgstr "Beschreibung von mehr als einem Branch kann nicht bearbeitet werden" -#: builtin/branch.c:730 +#: builtin/branch.c:733 #, c-format msgid "No commit on branch '%s' yet." msgstr "Noch kein Commit in Branch '%s'." -#: builtin/branch.c:733 +#: builtin/branch.c:736 #, c-format msgid "No branch named '%s'." msgstr "Branch '%s' nicht vorhanden." -#: builtin/branch.c:748 +#: builtin/branch.c:751 msgid "too many branches for a copy operation" msgstr "zu viele Branches für eine Kopieroperation angegeben" -#: builtin/branch.c:757 +#: builtin/branch.c:760 msgid "too many arguments for a rename operation" msgstr "zu viele Argumente für eine Umbenennen-Operation angegeben" -#: builtin/branch.c:762 +#: builtin/branch.c:765 msgid "too many arguments to set new upstream" msgstr "zu viele Argumente angegeben, um Upstream-Branch zu setzen" -#: builtin/branch.c:766 +#: builtin/branch.c:769 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." @@ -6331,40 +6660,40 @@ msgstr "" "Konnte keinen neuen Upstream-Branch von HEAD zu %s setzen, da dieser auf\n" "keinen Branch zeigt." -#: builtin/branch.c:769 builtin/branch.c:791 builtin/branch.c:807 +#: builtin/branch.c:772 builtin/branch.c:794 builtin/branch.c:810 #, c-format msgid "no such branch '%s'" msgstr "Kein solcher Branch '%s'" -#: builtin/branch.c:773 +#: builtin/branch.c:776 #, c-format msgid "branch '%s' does not exist" msgstr "Branch '%s' existiert nicht" -#: builtin/branch.c:785 +#: builtin/branch.c:788 msgid "too many arguments to unset upstream" msgstr "" "zu viele Argumente angegeben, um Konfiguration zu Upstream-Branch zu " "entfernen" -#: builtin/branch.c:789 +#: builtin/branch.c:792 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:795 +#: builtin/branch.c:798 #, c-format msgid "Branch '%s' has no upstream information" msgstr "Branch '%s' hat keinen Upstream-Branch gesetzt" -#: builtin/branch.c:810 +#: builtin/branch.c:813 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:813 +#: builtin/branch.c:816 msgid "" "the '--set-upstream' option is no longer supported. Please use '--track' or " "'--set-upstream-to' instead." @@ -6385,7 +6714,7 @@ msgstr "Um ein Paket zu erstellen wird ein Repository benötigt." msgid "Need a repository to unbundle." msgstr "Zum Entpacken wird ein Repository benötigt." -#: builtin/cat-file.c:523 +#: builtin/cat-file.c:525 msgid "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <type> | --textconv | --filters) [--path=<path>] <object>" @@ -6393,7 +6722,7 @@ msgstr "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <Art> | --textconv | --filters) [--path=<Pfad>] <Objekt>" -#: builtin/cat-file.c:524 +#: builtin/cat-file.c:526 msgid "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" @@ -6401,68 +6730,68 @@ msgstr "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" -#: builtin/cat-file.c:561 +#: builtin/cat-file.c:563 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<Art> kann sein: blob, tree, commit, tag" -#: builtin/cat-file.c:562 +#: builtin/cat-file.c:564 msgid "show object type" msgstr "Objektart anzeigen" -#: builtin/cat-file.c:563 +#: builtin/cat-file.c:565 msgid "show object size" msgstr "Objektgröße anzeigen" -#: builtin/cat-file.c:565 +#: builtin/cat-file.c:567 msgid "exit with zero when there's no error" msgstr "mit Rückgabewert 0 beenden, wenn kein Fehler aufgetreten ist" -#: builtin/cat-file.c:566 +#: builtin/cat-file.c:568 msgid "pretty-print object's content" msgstr "ansprechende Anzeige des Objektinhaltes" -#: builtin/cat-file.c:568 +#: builtin/cat-file.c:570 msgid "for blob objects, run textconv on object's content" msgstr "eine Textkonvertierung auf den Inhalt von Blob-Objekten ausführen" -#: builtin/cat-file.c:570 +#: builtin/cat-file.c:572 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:571 git-submodule.sh:878 +#: builtin/cat-file.c:573 git-submodule.sh:894 msgid "blob" msgstr "Blob" -#: builtin/cat-file.c:572 +#: builtin/cat-file.c:574 msgid "use a specific path for --textconv/--filters" msgstr "einen bestimmten Pfad für --textconv/--filters verwenden" -#: builtin/cat-file.c:574 +#: builtin/cat-file.c:576 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "-s und -t mit beschädigten Objekten erlauben" -#: builtin/cat-file.c:575 +#: builtin/cat-file.c:577 msgid "buffer --batch output" msgstr "Ausgabe von --batch puffern" -#: builtin/cat-file.c:577 +#: builtin/cat-file.c:579 msgid "show info and content of objects fed from the standard input" msgstr "" "Anzeige von Informationen und Inhalt von Objekten, gelesen von der Standard-" "Eingabe" -#: builtin/cat-file.c:580 +#: builtin/cat-file.c:582 msgid "show info about objects fed from the standard input" msgstr "" "Anzeige von Informationen über Objekte, gelesen von der Standard-Eingabe" -#: builtin/cat-file.c:583 +#: builtin/cat-file.c:585 msgid "follow in-tree symlinks (used with --batch or --batch-check)" msgstr "" "symbolischen Verknüpfungen innerhalb des Repositories folgen (verwendet mit " "--batch oder --batch-check)" -#: builtin/cat-file.c:585 +#: builtin/cat-file.c:587 msgid "show all objects with --batch or --batch-check" msgstr "alle Objekte mit --batch oder --batch-check anzeigen" @@ -6490,7 +6819,7 @@ 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:20 builtin/checkout.c:1106 builtin/gc.c:358 +#: builtin/check-ignore.c:20 builtin/checkout.c:1113 builtin/gc.c:500 msgid "suppress progress reporting" msgstr "Fortschrittsanzeige unterdrücken" @@ -6583,9 +6912,9 @@ msgid "write the content to temporary files" msgstr "den Inhalt in temporäre Dateien schreiben" #: builtin/checkout-index.c:173 builtin/column.c:31 -#: builtin/submodule--helper.c:1203 builtin/submodule--helper.c:1206 -#: builtin/submodule--helper.c:1212 builtin/submodule--helper.c:1574 -#: builtin/worktree.c:570 +#: builtin/submodule--helper.c:1216 builtin/submodule--helper.c:1219 +#: builtin/submodule--helper.c:1227 builtin/submodule--helper.c:1591 +#: builtin/worktree.c:610 msgid "string" msgstr "Zeichenkette" @@ -6658,54 +6987,54 @@ msgstr "" msgid "path '%s' is unmerged" msgstr "Pfad '%s' ist nicht zusammengeführt." -#: builtin/checkout.c:505 +#: builtin/checkout.c:506 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:636 +#: builtin/checkout.c:643 #, 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:677 +#: builtin/checkout.c:684 msgid "HEAD is now at" msgstr "HEAD ist jetzt bei" -#: builtin/checkout.c:681 builtin/clone.c:689 +#: builtin/checkout.c:688 builtin/clone.c:691 msgid "unable to update HEAD" msgstr "Konnte HEAD nicht aktualisieren." -#: builtin/checkout.c:685 +#: builtin/checkout.c:692 #, c-format msgid "Reset branch '%s'\n" msgstr "Setze Branch '%s' neu\n" -#: builtin/checkout.c:688 +#: builtin/checkout.c:695 #, c-format msgid "Already on '%s'\n" msgstr "Bereits auf '%s'\n" -#: builtin/checkout.c:692 +#: builtin/checkout.c:699 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Zu umgesetztem Branch '%s' gewechselt\n" -#: builtin/checkout.c:694 builtin/checkout.c:1039 +#: builtin/checkout.c:701 builtin/checkout.c:1046 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Zu neuem Branch '%s' gewechselt\n" -#: builtin/checkout.c:696 +#: builtin/checkout.c:703 #, c-format msgid "Switched to branch '%s'\n" msgstr "Zu Branch '%s' gewechselt\n" -#: builtin/checkout.c:747 +#: builtin/checkout.c:754 #, c-format msgid " ... and %d more.\n" msgstr " ... und %d weitere.\n" -#: builtin/checkout.c:753 +#: builtin/checkout.c:760 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -6728,7 +7057,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:772 +#: builtin/checkout.c:779 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -6755,163 +7084,163 @@ msgstr[1] "" " git branch <neuer-Branchname> %s\n" "\n" -#: builtin/checkout.c:804 +#: builtin/checkout.c:811 msgid "internal error in revision walk" msgstr "interner Fehler im Revisionsgang" -#: builtin/checkout.c:808 +#: builtin/checkout.c:815 msgid "Previous HEAD position was" msgstr "Vorherige Position von HEAD war" -#: builtin/checkout.c:836 builtin/checkout.c:1034 +#: builtin/checkout.c:843 builtin/checkout.c:1041 msgid "You are on a branch yet to be born" msgstr "Sie sind auf einem Branch, der noch nicht geboren ist" -#: builtin/checkout.c:940 +#: builtin/checkout.c:947 #, c-format msgid "only one reference expected, %d given." msgstr "nur eine Referenz erwartet, %d gegeben." -#: builtin/checkout.c:980 builtin/worktree.c:249 +#: builtin/checkout.c:987 builtin/worktree.c:240 builtin/worktree.c:389 #, c-format msgid "invalid reference: %s" msgstr "Ungültige Referenz: %s" -#: builtin/checkout.c:1009 +#: builtin/checkout.c:1016 #, c-format msgid "reference is not a tree: %s" msgstr "Referenz ist kein \"Tree\"-Objekt: %s" -#: builtin/checkout.c:1048 +#: builtin/checkout.c:1055 msgid "paths cannot be used with switching branches" msgstr "Pfade können nicht beim Wechseln von Branches verwendet werden" -#: builtin/checkout.c:1051 builtin/checkout.c:1055 +#: builtin/checkout.c:1058 builtin/checkout.c:1062 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "'%s' kann nicht beim Wechseln von Branches verwendet werden" -#: builtin/checkout.c:1059 builtin/checkout.c:1062 builtin/checkout.c:1067 -#: builtin/checkout.c:1070 +#: builtin/checkout.c:1066 builtin/checkout.c:1069 builtin/checkout.c:1074 +#: builtin/checkout.c:1077 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' kann nicht mit '%s' verwendet werden" -#: builtin/checkout.c:1075 +#: builtin/checkout.c:1082 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "Kann Branch nicht zu Nicht-Commit '%s' wechseln" -#: builtin/checkout.c:1107 builtin/checkout.c:1109 builtin/clone.c:116 -#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:387 -#: builtin/worktree.c:389 +#: builtin/checkout.c:1114 builtin/checkout.c:1116 builtin/clone.c:118 +#: builtin/remote.c:167 builtin/remote.c:169 builtin/worktree.c:433 +#: builtin/worktree.c:435 msgid "branch" msgstr "Branch" -#: builtin/checkout.c:1108 +#: builtin/checkout.c:1115 msgid "create and checkout a new branch" msgstr "einen neuen Branch erzeugen und auschecken" -#: builtin/checkout.c:1110 +#: builtin/checkout.c:1117 msgid "create/reset and checkout a branch" msgstr "einen Branch erstellen/umsetzen und auschecken" -#: builtin/checkout.c:1111 +#: builtin/checkout.c:1118 msgid "create reflog for new branch" msgstr "das Reflog für den neuen Branch erzeugen" -#: builtin/checkout.c:1112 builtin/worktree.c:391 +#: builtin/checkout.c:1119 builtin/worktree.c:437 msgid "detach HEAD at named commit" msgstr "HEAD bei benanntem Commit loslösen" -#: builtin/checkout.c:1113 +#: builtin/checkout.c:1120 msgid "set upstream info for new branch" msgstr "Informationen zum Upstream-Branch für den neuen Branch setzen" -#: builtin/checkout.c:1115 +#: builtin/checkout.c:1122 msgid "new-branch" msgstr "neuer Branch" -#: builtin/checkout.c:1115 +#: builtin/checkout.c:1122 msgid "new unparented branch" msgstr "neuer Branch ohne Eltern-Commit" -#: builtin/checkout.c:1116 +#: builtin/checkout.c:1123 msgid "checkout our version for unmerged files" msgstr "unsere Variante für nicht zusammengeführte Dateien auschecken" -#: builtin/checkout.c:1118 +#: builtin/checkout.c:1125 msgid "checkout their version for unmerged files" msgstr "ihre Variante für nicht zusammengeführte Dateien auschecken" -#: builtin/checkout.c:1120 +#: builtin/checkout.c:1127 msgid "force checkout (throw away local modifications)" msgstr "Auschecken erzwingen (verwirft lokale Änderungen)" -#: builtin/checkout.c:1122 +#: builtin/checkout.c:1129 msgid "perform a 3-way merge with the new branch" msgstr "einen 3-Wege-Merge mit dem neuen Branch ausführen" -#: builtin/checkout.c:1124 builtin/merge.c:239 +#: builtin/checkout.c:1131 builtin/merge.c:240 msgid "update ignored files (default)" msgstr "ignorierte Dateien aktualisieren (Standard)" -#: builtin/checkout.c:1126 builtin/log.c:1499 parse-options.h:263 +#: builtin/checkout.c:1133 builtin/log.c:1499 parse-options.h:264 msgid "style" msgstr "Stil" -#: builtin/checkout.c:1127 +#: builtin/checkout.c:1134 msgid "conflict style (merge or diff3)" msgstr "Konfliktstil (merge oder diff3)" -#: builtin/checkout.c:1130 +#: builtin/checkout.c:1137 msgid "do not limit pathspecs to sparse entries only" msgstr "keine Einschränkung bei Pfadspezifikationen zum partiellen Auschecken" -#: builtin/checkout.c:1132 +#: builtin/checkout.c:1139 msgid "second guess 'git checkout <no-such-branch>'" msgstr "second guess 'git checkout <no-such-branch>'" -#: builtin/checkout.c:1134 +#: builtin/checkout.c:1141 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:1138 builtin/clone.c:83 builtin/fetch.c:150 -#: builtin/merge.c:236 builtin/pull.c:123 builtin/push.c:556 -#: builtin/send-pack.c:173 +#: builtin/checkout.c:1145 builtin/clone.c:85 builtin/fetch.c:149 +#: builtin/merge.c:237 builtin/pull.c:128 builtin/push.c:572 +#: builtin/send-pack.c:174 msgid "force progress reporting" msgstr "Fortschrittsanzeige erzwingen" -#: builtin/checkout.c:1168 +#: builtin/checkout.c:1175 msgid "-b, -B and --orphan are mutually exclusive" msgstr "Die Optionen -b, -B und --orphan schließen sich gegenseitig aus." -#: builtin/checkout.c:1185 +#: builtin/checkout.c:1192 msgid "--track needs a branch name" msgstr "Bei der Option --track muss ein Branchname angegeben werden." -#: builtin/checkout.c:1190 +#: builtin/checkout.c:1197 msgid "Missing branch name; try -b" msgstr "Vermisse Branchnamen; versuchen Sie -b" -#: builtin/checkout.c:1226 +#: builtin/checkout.c:1233 msgid "invalid path specification" msgstr "ungültige Pfadspezifikation" -#: builtin/checkout.c:1233 +#: builtin/checkout.c:1240 #, 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:1237 +#: builtin/checkout.c:1244 #, 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:1241 +#: builtin/checkout.c:1248 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -6950,7 +7279,7 @@ msgstr "Würde Repository %s überspringen\n" msgid "failed to remove %s" msgstr "Fehler beim Löschen von %s" -#: builtin/clean.c:302 git-add--interactive.perl:572 +#: builtin/clean.c:302 git-add--interactive.perl:579 #, c-format msgid "" "Prompt help:\n" @@ -6963,7 +7292,7 @@ msgstr "" "foo - Element anhand eines eindeutigen Präfix auswählen\n" " - (leer) nichts auswählen\n" -#: builtin/clean.c:306 git-add--interactive.perl:581 +#: builtin/clean.c:306 git-add--interactive.perl:588 #, c-format msgid "" "Prompt help:\n" @@ -6984,8 +7313,8 @@ msgstr "" "* - alle Elemente auswählen\n" " - (leer) Auswahl beenden\n" -#: builtin/clean.c:522 git-add--interactive.perl:547 -#: git-add--interactive.perl:552 +#: builtin/clean.c:522 git-add--interactive.perl:554 +#: git-add--interactive.perl:559 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "Wie bitte (%s)?\n" @@ -7010,7 +7339,7 @@ msgstr "Wählen Sie Einträge zum Löschen" msgid "Remove %s [y/N]? " msgstr "'%s' löschen [y/N]? " -#: builtin/clean.c:788 git-add--interactive.perl:1710 +#: builtin/clean.c:788 git-add--interactive.perl:1717 #, c-format msgid "Bye.\n" msgstr "Tschüss.\n" @@ -7033,11 +7362,11 @@ msgstr "" "help - diese Meldung anzeigen\n" "? - Hilfe zur Auswahl mittels Eingabe anzeigen" -#: builtin/clean.c:823 git-add--interactive.perl:1786 +#: builtin/clean.c:823 git-add--interactive.perl:1793 msgid "*** Commands ***" msgstr "*** Befehle ***" -#: builtin/clean.c:824 git-add--interactive.perl:1783 +#: builtin/clean.c:824 git-add--interactive.perl:1790 msgid "What now" msgstr "Was nun" @@ -7106,150 +7435,152 @@ msgstr "" "clean.requireForce standardmäßig auf \"true\" gesetzt und weder -i, -n noch -" "f gegeben; \"clean\" verweigert" -#: builtin/clone.c:40 +#: builtin/clone.c:42 msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<Optionen>] [--] <Repository> [<Verzeichnis>]" -#: builtin/clone.c:85 +#: builtin/clone.c:87 msgid "don't create a checkout" msgstr "kein Auschecken" -#: builtin/clone.c:86 builtin/clone.c:88 builtin/init-db.c:479 +#: builtin/clone.c:88 builtin/clone.c:90 builtin/init-db.c:479 msgid "create a bare repository" msgstr "ein Bare-Repository erstellen" -#: builtin/clone.c:90 +#: builtin/clone.c:92 msgid "create a mirror repository (implies bare)" msgstr "ein Spiegelarchiv erstellen (impliziert --bare)" -#: builtin/clone.c:92 +#: builtin/clone.c:94 msgid "to clone from a local repository" msgstr "von einem lokalen Repository klonen" -#: builtin/clone.c:94 +#: builtin/clone.c:96 msgid "don't use local hardlinks, always copy" msgstr "lokal keine harten Verweise verwenden, immer Kopien" -#: builtin/clone.c:96 +#: builtin/clone.c:98 msgid "setup as shared repository" msgstr "als verteiltes Repository einrichten" -#: builtin/clone.c:98 builtin/clone.c:102 +#: builtin/clone.c:100 builtin/clone.c:104 msgid "pathspec" msgstr "Pfadspezifikation" -#: builtin/clone.c:98 builtin/clone.c:102 +#: builtin/clone.c:100 builtin/clone.c:104 msgid "initialize submodules in the clone" msgstr "Submodule im Klon initialisieren" -#: builtin/clone.c:105 +#: builtin/clone.c:107 msgid "number of submodules cloned in parallel" msgstr "Anzahl der parallel zu klonenden Submodule" -#: builtin/clone.c:106 builtin/init-db.c:476 +#: builtin/clone.c:108 builtin/init-db.c:476 msgid "template-directory" msgstr "Vorlagenverzeichnis" -#: builtin/clone.c:107 builtin/init-db.c:477 +#: builtin/clone.c:109 builtin/init-db.c:477 msgid "directory from which templates will be used" msgstr "Verzeichnis, von welchem die Vorlagen verwendet werden" -#: builtin/clone.c:109 builtin/clone.c:111 builtin/submodule--helper.c:1210 -#: builtin/submodule--helper.c:1577 +#: builtin/clone.c:111 builtin/clone.c:113 builtin/submodule--helper.c:1223 +#: builtin/submodule--helper.c:1594 msgid "reference repository" msgstr "Repository referenzieren" -#: builtin/clone.c:113 +#: builtin/clone.c:115 builtin/submodule--helper.c:1225 +#: builtin/submodule--helper.c:1596 msgid "use --reference only while cloning" msgstr "--reference nur während des Klonens benutzen" -#: builtin/clone.c:114 builtin/column.c:27 builtin/merge-file.c:44 +#: builtin/clone.c:116 builtin/column.c:27 builtin/merge-file.c:44 +#: builtin/pack-objects.c:3166 builtin/repack.c:213 msgid "name" msgstr "Name" -#: builtin/clone.c:115 +#: 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:117 +#: builtin/clone.c:119 msgid "checkout <branch> instead of the remote's HEAD" msgstr "<Branch> auschecken, anstatt HEAD des Remote-Repositories" -#: builtin/clone.c:119 +#: 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:120 builtin/fetch.c:151 builtin/grep.c:813 -#: builtin/pull.c:211 +#: builtin/clone.c:122 builtin/fetch.c:150 builtin/grep.c:813 +#: builtin/pull.c:216 msgid "depth" msgstr "Tiefe" -#: builtin/clone.c:121 +#: 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:122 builtin/fetch.c:153 builtin/pack-objects.c:3017 +#: builtin/clone.c:124 builtin/fetch.c:152 builtin/pack-objects.c:3157 #: parse-options.h:154 msgid "time" msgstr "Zeit" -#: builtin/clone.c:123 +#: 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:124 builtin/fetch.c:155 +#: builtin/clone.c:126 builtin/fetch.c:154 msgid "revision" msgstr "Commit" -#: builtin/clone.c:125 builtin/fetch.c:156 +#: builtin/clone.c:127 builtin/fetch.c:155 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:127 +#: builtin/clone.c:129 msgid "clone only one branch, HEAD or --branch" msgstr "nur einen Branch klonen, HEAD oder --branch" -#: builtin/clone.c:129 +#: 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:131 +#: builtin/clone.c:133 msgid "any cloned submodules will be shallow" msgstr "jedes geklonte Submodul mit unvollständiger Historie (shallow)" -#: builtin/clone.c:132 builtin/init-db.c:485 +#: builtin/clone.c:134 builtin/init-db.c:485 msgid "gitdir" msgstr ".git-Verzeichnis" -#: builtin/clone.c:133 builtin/init-db.c:486 +#: builtin/clone.c:135 builtin/init-db.c:486 msgid "separate git dir from working tree" msgstr "Git-Verzeichnis vom Arbeitsverzeichnis separieren" -#: builtin/clone.c:134 +#: builtin/clone.c:136 msgid "key=value" msgstr "Schlüssel=Wert" -#: builtin/clone.c:135 +#: builtin/clone.c:137 msgid "set config inside the new repository" msgstr "Konfiguration innerhalb des neuen Repositories setzen" -#: builtin/clone.c:136 builtin/fetch.c:173 builtin/pull.c:224 -#: builtin/push.c:567 +#: builtin/clone.c:138 builtin/fetch.c:173 builtin/pull.c:229 +#: builtin/push.c:583 msgid "use IPv4 addresses only" msgstr "nur IPv4-Adressen benutzen" -#: builtin/clone.c:138 builtin/fetch.c:175 builtin/pull.c:227 -#: builtin/push.c:569 +#: builtin/clone.c:140 builtin/fetch.c:175 builtin/pull.c:232 +#: builtin/push.c:585 msgid "use IPv6 addresses only" msgstr "nur IPv6-Adressen benutzen" -#: builtin/clone.c:276 +#: builtin/clone.c:278 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -7257,42 +7588,42 @@ msgstr "" "Konnte keinen Verzeichnisnamen erraten.\n" "Bitte geben Sie ein Verzeichnis auf der Befehlszeile an." -#: builtin/clone.c:329 +#: builtin/clone.c:331 #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "info: Konnte Alternative für '%s' nicht hinzufügen: %s\n" -#: builtin/clone.c:401 +#: builtin/clone.c:403 #, c-format msgid "failed to open '%s'" msgstr "Fehler beim Öffnen von '%s'" -#: builtin/clone.c:409 +#: builtin/clone.c:411 #, c-format msgid "%s exists and is not a directory" msgstr "%s existiert und ist kein Verzeichnis" -#: builtin/clone.c:423 +#: builtin/clone.c:425 #, c-format msgid "failed to stat %s\n" msgstr "Konnte %s nicht lesen\n" -#: builtin/clone.c:445 +#: builtin/clone.c:447 #, c-format msgid "failed to create link '%s'" msgstr "Konnte Verweis '%s' nicht erstellen" -#: builtin/clone.c:449 +#: builtin/clone.c:451 #, c-format msgid "failed to copy file to '%s'" msgstr "Konnte Datei nicht nach '%s' kopieren" -#: builtin/clone.c:475 +#: builtin/clone.c:477 #, c-format msgid "done.\n" msgstr "Fertig.\n" -#: builtin/clone.c:489 +#: builtin/clone.c:491 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -7302,101 +7633,101 @@ msgstr "" "Sie können mit 'git status' prüfen, was ausgecheckt worden ist\n" "und das Auschecken mit 'git checkout -f HEAD' erneut versuchen.\n" -#: builtin/clone.c:566 +#: builtin/clone.c:568 #, c-format msgid "Could not find remote branch %s to clone." msgstr "Konnte zu klonenden Remote-Branch %s nicht finden." -#: builtin/clone.c:661 +#: builtin/clone.c:663 msgid "remote did not send all necessary objects" msgstr "Remote-Repository hat nicht alle erforderlichen Objekte gesendet." -#: builtin/clone.c:677 +#: builtin/clone.c:679 #, c-format msgid "unable to update %s" msgstr "kann %s nicht aktualisieren" -#: builtin/clone.c:726 +#: builtin/clone.c:728 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:756 +#: builtin/clone.c:758 msgid "unable to checkout working tree" msgstr "Arbeitsverzeichnis konnte nicht ausgecheckt werden" -#: builtin/clone.c:801 +#: builtin/clone.c:803 msgid "unable to write parameters to config file" msgstr "konnte Parameter nicht in Konfigurationsdatei schreiben" -#: builtin/clone.c:864 +#: builtin/clone.c:866 msgid "cannot repack to clean up" msgstr "Kann \"repack\" zum Aufräumen nicht aufrufen" -#: builtin/clone.c:866 +#: builtin/clone.c:868 msgid "cannot unlink temporary alternates file" msgstr "Kann temporäre \"alternates\"-Datei nicht entfernen" -#: builtin/clone.c:906 builtin/receive-pack.c:1946 +#: builtin/clone.c:907 builtin/receive-pack.c:1947 msgid "Too many arguments." msgstr "Zu viele Argumente." -#: builtin/clone.c:910 +#: builtin/clone.c:911 msgid "You must specify a repository to clone." msgstr "Sie müssen ein Repository zum Klonen angeben." -#: builtin/clone.c:923 +#: builtin/clone.c:924 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "Die Optionen --bare und --origin %s sind inkompatibel." -#: builtin/clone.c:926 +#: builtin/clone.c:927 msgid "--bare and --separate-git-dir are incompatible." msgstr "Die Optionen --bare und --separate-git-dir sind inkompatibel." -#: builtin/clone.c:939 +#: builtin/clone.c:940 #, c-format msgid "repository '%s' does not exist" msgstr "Repository '%s' existiert nicht." -#: builtin/clone.c:945 builtin/fetch.c:1455 +#: builtin/clone.c:946 builtin/fetch.c:1460 #, c-format msgid "depth %s is not a positive number" msgstr "Tiefe %s ist keine positive Zahl" -#: builtin/clone.c:955 +#: builtin/clone.c:956 #, 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:965 +#: builtin/clone.c:966 #, c-format msgid "working tree '%s' already exists." msgstr "Arbeitsverzeichnis '%s' existiert bereits." -#: builtin/clone.c:980 builtin/clone.c:1001 builtin/difftool.c:270 -#: builtin/worktree.c:255 builtin/worktree.c:285 +#: builtin/clone.c:981 builtin/clone.c:1002 builtin/difftool.c:270 +#: builtin/worktree.c:246 builtin/worktree.c:276 #, c-format msgid "could not create leading directories of '%s'" msgstr "Konnte führende Verzeichnisse von '%s' nicht erstellen." -#: builtin/clone.c:985 +#: builtin/clone.c:986 #, c-format msgid "could not create work tree dir '%s'" msgstr "Konnte Arbeitsverzeichnis '%s' nicht erstellen" -#: builtin/clone.c:1005 +#: builtin/clone.c:1006 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Klone in Bare-Repository '%s' ...\n" -#: builtin/clone.c:1007 +#: builtin/clone.c:1008 #, c-format msgid "Cloning into '%s'...\n" msgstr "Klone nach '%s' ...\n" -#: builtin/clone.c:1031 +#: builtin/clone.c:1032 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" @@ -7424,7 +7755,8 @@ msgstr "" #: builtin/clone.c:1099 msgid "--filter is ignored in local clones; use file:// instead." -msgstr "--filter wird in lokalen Klonen ignoriert; benutzen Sie stattdessen file://" +msgstr "" +"--filter wird in lokalen Klonen ignoriert; benutzen Sie stattdessen file://" #: builtin/clone.c:1102 msgid "source repository is shallow, ignoring --local" @@ -7473,7 +7805,7 @@ msgstr "Abstand zum rechten Rand" msgid "Padding space between columns" msgstr "Abstand zwischen Spalten" -#: builtin/column.c:52 +#: builtin/column.c:51 msgid "--command must be the first argument" msgstr "Die Option --command muss an erster Stelle stehen." @@ -7530,62 +7862,62 @@ msgstr "" "Benutzen Sie anschließend \"git cherry-pick --continue\", um die\n" "Cherry-Pick-Operation mit den verbleibenden Commits fortzusetzen.\n" -#: builtin/commit.c:284 +#: builtin/commit.c:293 msgid "failed to unpack HEAD tree object" msgstr "Fehler beim Entpacken des \"Tree\"-Objektes von HEAD." -#: builtin/commit.c:325 +#: builtin/commit.c:334 msgid "unable to create temporary index" msgstr "Konnte temporären Index nicht erstellen." -#: builtin/commit.c:331 +#: builtin/commit.c:340 msgid "interactive add failed" msgstr "interaktives Hinzufügen fehlgeschlagen" -#: builtin/commit.c:344 +#: builtin/commit.c:353 msgid "unable to update temporary index" msgstr "Konnte temporären Index nicht aktualisieren." -#: builtin/commit.c:346 +#: builtin/commit.c:355 msgid "Failed to update main cache tree" msgstr "Konnte Haupt-Cache-Verzeichnis nicht aktualisieren" -#: builtin/commit.c:371 builtin/commit.c:395 builtin/commit.c:444 +#: builtin/commit.c:380 builtin/commit.c:403 builtin/commit.c:449 msgid "unable to write new_index file" msgstr "Konnte new_index Datei nicht schreiben" -#: builtin/commit.c:427 +#: builtin/commit.c:432 msgid "cannot do a partial commit during a merge." msgstr "Kann keinen Teil-Commit durchführen, während ein Merge im Gange ist." -#: builtin/commit.c:429 +#: builtin/commit.c:434 msgid "cannot do a partial commit during a cherry-pick." msgstr "" "Kann keinen Teil-Commit durchführen, während \"cherry-pick\" im Gange ist." -#: builtin/commit.c:437 +#: builtin/commit.c:442 msgid "cannot read the index" msgstr "Kann Index nicht lesen" -#: builtin/commit.c:456 +#: builtin/commit.c:461 msgid "unable to write temporary index file" msgstr "Konnte temporäre Index-Datei nicht schreiben." -#: builtin/commit.c:553 +#: builtin/commit.c:558 #, c-format msgid "commit '%s' lacks author header" msgstr "Commit '%s' fehlt Autor-Kopfbereich" -#: builtin/commit.c:555 +#: builtin/commit.c:560 #, c-format msgid "commit '%s' has malformed author line" msgstr "Commit '%s' hat fehlerhafte Autor-Zeile" -#: builtin/commit.c:574 +#: builtin/commit.c:579 msgid "malformed --author parameter" msgstr "Fehlerhafter --author Parameter" -#: builtin/commit.c:626 +#: builtin/commit.c:631 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -7593,38 +7925,38 @@ msgstr "" "Konnte kein Kommentar-Zeichen auswählen, das nicht in\n" "der aktuellen Commit-Beschreibung verwendet wird." -#: builtin/commit.c:663 builtin/commit.c:696 builtin/commit.c:1024 +#: builtin/commit.c:668 builtin/commit.c:701 builtin/commit.c:1029 #, c-format msgid "could not lookup commit %s" msgstr "Konnte Commit %s nicht nachschlagen" -#: builtin/commit.c:675 builtin/shortlog.c:309 +#: builtin/commit.c:680 builtin/shortlog.c:316 #, c-format msgid "(reading log message from standard input)\n" msgstr "(lese Log-Nachricht von Standard-Eingabe)\n" -#: builtin/commit.c:677 +#: builtin/commit.c:682 msgid "could not read log from standard input" msgstr "Konnte Log nicht von Standard-Eingabe lesen." -#: builtin/commit.c:681 +#: builtin/commit.c:686 #, c-format msgid "could not read log file '%s'" msgstr "Konnte Log-Datei '%s' nicht lesen" -#: builtin/commit.c:710 builtin/commit.c:718 +#: builtin/commit.c:715 builtin/commit.c:723 msgid "could not read SQUASH_MSG" msgstr "Konnte SQUASH_MSG nicht lesen" -#: builtin/commit.c:715 +#: builtin/commit.c:720 msgid "could not read MERGE_MSG" msgstr "Konnte MERGE_MSG nicht lesen" -#: builtin/commit.c:769 +#: builtin/commit.c:774 msgid "could not write commit template" msgstr "Konnte Commit-Vorlage nicht schreiben" -#: builtin/commit.c:787 +#: builtin/commit.c:792 #, c-format msgid "" "\n" @@ -7639,7 +7971,7 @@ msgstr "" "\t%s\n" "und versuchen Sie es erneut.\n" -#: builtin/commit.c:792 +#: builtin/commit.c:797 #, c-format msgid "" "\n" @@ -7654,7 +7986,7 @@ msgstr "" "\t%s\n" "und versuchen Sie es erneut.\n" -#: builtin/commit.c:805 +#: builtin/commit.c:810 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -7664,7 +7996,7 @@ msgstr "" "die mit '%c' beginnen, werden ignoriert, und eine leere Beschreibung\n" "bricht den Commit ab.\n" -#: builtin/commit.c:813 +#: builtin/commit.c:818 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -7677,158 +8009,158 @@ msgstr "" "entfernen.\n" "Eine leere Beschreibung bricht den Commit ab.\n" -#: builtin/commit.c:830 +#: builtin/commit.c:835 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sAutor: %.*s <%.*s>" -#: builtin/commit.c:838 +#: builtin/commit.c:843 #, c-format msgid "%sDate: %s" msgstr "%sDatum: %s" -#: builtin/commit.c:845 +#: builtin/commit.c:850 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sCommit-Ersteller: %.*s <%.*s>" -#: builtin/commit.c:862 +#: builtin/commit.c:867 msgid "Cannot read index" msgstr "Kann Index nicht lesen" -#: builtin/commit.c:928 +#: builtin/commit.c:933 msgid "Error building trees" msgstr "Fehler beim Erzeugen der \"Tree\"-Objekte" -#: builtin/commit.c:942 builtin/tag.c:256 +#: builtin/commit.c:947 builtin/tag.c:257 #, 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:986 +#: builtin/commit.c:991 #, 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:1000 +#: builtin/commit.c:1005 #, c-format msgid "Invalid ignored mode '%s'" msgstr "Ungültiger ignored-Modus '%s'." -#: builtin/commit.c:1014 builtin/commit.c:1264 +#: builtin/commit.c:1019 builtin/commit.c:1269 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Ungültiger Modus '%s' für unversionierte Dateien" -#: builtin/commit.c:1052 +#: builtin/commit.c:1057 msgid "--long and -z are incompatible" msgstr "Die Optionen --long und -z sind inkompatibel." -#: builtin/commit.c:1085 +#: builtin/commit.c:1090 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:1094 +#: builtin/commit.c:1099 msgid "You have nothing to amend." msgstr "Sie haben nichts für \"--amend\"." -#: builtin/commit.c:1097 +#: builtin/commit.c:1102 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:1099 +#: builtin/commit.c:1104 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:1102 +#: builtin/commit.c:1107 msgid "Options --squash and --fixup cannot be used together" msgstr "" "Die Optionen --squash und --fixup können nicht gemeinsam verwendet werden." -#: builtin/commit.c:1112 +#: builtin/commit.c:1117 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:1114 +#: builtin/commit.c:1119 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:1122 +#: builtin/commit.c:1127 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:1139 +#: builtin/commit.c:1144 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:1141 +#: builtin/commit.c:1146 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:1155 builtin/tag.c:542 +#: builtin/commit.c:1160 builtin/tag.c:543 #, c-format msgid "Invalid cleanup mode %s" msgstr "Ungültiger \"cleanup\" Modus %s" -#: builtin/commit.c:1160 +#: builtin/commit.c:1165 msgid "Paths with -a does not make sense." msgstr "Die Option -a kann nicht mit der Angabe von Pfaden verwendet werden." -#: builtin/commit.c:1278 builtin/commit.c:1443 +#: builtin/commit.c:1303 builtin/commit.c:1480 msgid "show status concisely" msgstr "Status im Kurzformat anzeigen" -#: builtin/commit.c:1280 builtin/commit.c:1445 +#: builtin/commit.c:1305 builtin/commit.c:1482 msgid "show branch information" msgstr "Branchinformationen anzeigen" -#: builtin/commit.c:1282 +#: builtin/commit.c:1307 msgid "show stash information" msgstr "Stashinformationen anzeigen" -#: builtin/commit.c:1284 builtin/commit.c:1447 +#: builtin/commit.c:1309 builtin/commit.c:1484 msgid "compute full ahead/behind values" msgstr "voraus/hinterher-Werte berechnen" -#: builtin/commit.c:1286 +#: builtin/commit.c:1311 msgid "version" msgstr "Version" -#: builtin/commit.c:1286 builtin/commit.c:1449 builtin/push.c:542 -#: builtin/worktree.c:541 +#: builtin/commit.c:1311 builtin/commit.c:1486 builtin/push.c:558 +#: builtin/worktree.c:581 msgid "machine-readable output" msgstr "maschinenlesbare Ausgabe" -#: builtin/commit.c:1289 builtin/commit.c:1451 +#: builtin/commit.c:1314 builtin/commit.c:1488 msgid "show status in long format (default)" msgstr "Status im Langformat anzeigen (Standard)" -#: builtin/commit.c:1292 builtin/commit.c:1454 +#: builtin/commit.c:1317 builtin/commit.c:1491 msgid "terminate entries with NUL" msgstr "Einträge mit NUL-Zeichen abschließen" -#: builtin/commit.c:1294 builtin/commit.c:1298 builtin/commit.c:1457 -#: builtin/fast-export.c:999 builtin/fast-export.c:1002 builtin/tag.c:396 +#: builtin/commit.c:1319 builtin/commit.c:1323 builtin/commit.c:1494 +#: builtin/fast-export.c:1001 builtin/fast-export.c:1004 builtin/tag.c:397 msgid "mode" msgstr "Modus" -#: builtin/commit.c:1295 builtin/commit.c:1457 +#: builtin/commit.c:1320 builtin/commit.c:1494 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:1299 +#: builtin/commit.c:1324 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" @@ -7836,11 +8168,11 @@ msgstr "" "ignorierte Dateien anzeigen, optionale Modi: traditional, matching, no. " "(Standard: traditional)" -#: builtin/commit.c:1301 parse-options.h:167 +#: builtin/commit.c:1326 parse-options.h:167 msgid "when" msgstr "wann" -#: builtin/commit.c:1302 +#: builtin/commit.c:1327 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -7848,189 +8180,197 @@ msgstr "" "Änderungen in Submodulen ignorieren, optional wenn: all, dirty, untracked. " "(Standard: all)" -#: builtin/commit.c:1304 +#: builtin/commit.c:1329 msgid "list untracked files in columns" msgstr "unversionierte Dateien in Spalten auflisten" -#: builtin/commit.c:1323 +#: builtin/commit.c:1330 +msgid "do not detect renames" +msgstr "keine Umbenennungen ermitteln" + +#: builtin/commit.c:1332 +msgid "detect renames, optionally set similarity index" +msgstr "Umbenennungen erkennen, optional Index für Gleichheit setzen" + +#: builtin/commit.c:1352 msgid "Unsupported combination of ignored and untracked-files arguments" msgstr "" "Nicht unterstützte Kombination von ignored und untracked-files Argumenten." -#: builtin/commit.c:1413 +#: builtin/commit.c:1450 msgid "suppress summary after successful commit" msgstr "Zusammenfassung nach erfolgreichem Commit unterdrücken" -#: builtin/commit.c:1414 +#: builtin/commit.c:1451 msgid "show diff in commit message template" msgstr "Unterschiede in Commit-Beschreibungsvorlage anzeigen" -#: builtin/commit.c:1416 +#: builtin/commit.c:1453 msgid "Commit message options" msgstr "Optionen für Commit-Beschreibung" -#: builtin/commit.c:1417 builtin/tag.c:393 +#: builtin/commit.c:1454 builtin/tag.c:394 msgid "read message from file" msgstr "Beschreibung von Datei lesen" -#: builtin/commit.c:1418 +#: builtin/commit.c:1455 msgid "author" msgstr "Autor" -#: builtin/commit.c:1418 +#: builtin/commit.c:1455 msgid "override author for commit" msgstr "Autor eines Commits überschreiben" -#: builtin/commit.c:1419 builtin/gc.c:359 +#: builtin/commit.c:1456 builtin/gc.c:501 msgid "date" msgstr "Datum" -#: builtin/commit.c:1419 +#: builtin/commit.c:1456 msgid "override date for commit" msgstr "Datum eines Commits überschreiben" -#: builtin/commit.c:1420 builtin/merge.c:226 builtin/notes.c:402 -#: builtin/notes.c:565 builtin/tag.c:391 +#: builtin/commit.c:1457 builtin/merge.c:227 builtin/notes.c:402 +#: builtin/notes.c:565 builtin/tag.c:392 msgid "message" msgstr "Beschreibung" -#: builtin/commit.c:1420 +#: builtin/commit.c:1457 msgid "commit message" msgstr "Commit-Beschreibung" -#: builtin/commit.c:1421 builtin/commit.c:1422 builtin/commit.c:1423 -#: builtin/commit.c:1424 parse-options.h:269 ref-filter.h:92 +#: builtin/commit.c:1458 builtin/commit.c:1459 builtin/commit.c:1460 +#: builtin/commit.c:1461 parse-options.h:270 ref-filter.h:92 msgid "commit" msgstr "Commit" -#: builtin/commit.c:1421 +#: builtin/commit.c:1458 msgid "reuse and edit message from specified commit" msgstr "Beschreibung des angegebenen Commits wiederverwenden und editieren" -#: builtin/commit.c:1422 +#: builtin/commit.c:1459 msgid "reuse message from specified commit" msgstr "Beschreibung des angegebenen Commits wiederverwenden" -#: builtin/commit.c:1423 +#: builtin/commit.c:1460 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "eine automatisch zusammengesetzte Beschreibung zum Nachbessern des " "angegebenen Commits verwenden" -#: builtin/commit.c:1424 +#: builtin/commit.c:1461 msgid "use autosquash formatted message to squash specified commit" msgstr "" "eine automatisch zusammengesetzte Beschreibung beim \"squash\" des " "angegebenen Commits verwenden" -#: builtin/commit.c:1425 +#: builtin/commit.c:1462 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:1426 builtin/log.c:1446 builtin/merge.c:240 -#: builtin/pull.c:149 builtin/revert.c:105 +#: builtin/commit.c:1463 builtin/log.c:1446 builtin/merge.c:241 +#: builtin/pull.c:154 builtin/revert.c:105 msgid "add Signed-off-by:" msgstr "'Signed-off-by:'-Zeile hinzufügen" -#: builtin/commit.c:1427 +#: builtin/commit.c:1464 msgid "use specified template file" msgstr "angegebene Vorlagendatei verwenden" -#: builtin/commit.c:1428 +#: builtin/commit.c:1465 msgid "force edit of commit" msgstr "Bearbeitung des Commits erzwingen" -#: builtin/commit.c:1429 +#: builtin/commit.c:1466 msgid "default" msgstr "Standard" -#: builtin/commit.c:1429 builtin/tag.c:397 +#: builtin/commit.c:1466 builtin/tag.c:398 msgid "how to strip spaces and #comments from message" msgstr "" "wie Leerzeichen und #Kommentare von der Beschreibung getrennt werden sollen" -#: builtin/commit.c:1430 +#: builtin/commit.c:1467 msgid "include status in commit message template" msgstr "Status in die Commit-Beschreibungsvorlage einfügen" -#: builtin/commit.c:1432 builtin/merge.c:238 builtin/pull.c:179 +#: builtin/commit.c:1469 builtin/merge.c:239 builtin/pull.c:184 #: builtin/revert.c:113 msgid "GPG sign commit" msgstr "Commit mit GPG signieren" -#: builtin/commit.c:1435 +#: builtin/commit.c:1472 msgid "Commit contents options" msgstr "Optionen für Commit-Inhalt" -#: builtin/commit.c:1436 +#: builtin/commit.c:1473 msgid "commit all changed files" msgstr "alle geänderten Dateien committen" -#: builtin/commit.c:1437 +#: builtin/commit.c:1474 msgid "add specified files to index for commit" msgstr "die angegebenen Dateien zusätzlich zum Commit vormerken" -#: builtin/commit.c:1438 +#: builtin/commit.c:1475 msgid "interactively add files" msgstr "interaktives Hinzufügen von Dateien" -#: builtin/commit.c:1439 +#: builtin/commit.c:1476 msgid "interactively add changes" msgstr "interaktives Hinzufügen von Änderungen" -#: builtin/commit.c:1440 +#: builtin/commit.c:1477 msgid "commit only specified files" msgstr "nur die angegebenen Dateien committen" -#: builtin/commit.c:1441 +#: builtin/commit.c:1478 msgid "bypass pre-commit and commit-msg hooks" msgstr "Hooks pre-commit und commit-msg umgehen" -#: builtin/commit.c:1442 +#: builtin/commit.c:1479 msgid "show what would be committed" msgstr "anzeigen, was committet werden würde" -#: builtin/commit.c:1455 +#: builtin/commit.c:1492 msgid "amend previous commit" msgstr "vorherigen Commit ändern" -#: builtin/commit.c:1456 +#: builtin/commit.c:1493 msgid "bypass post-rewrite hook" msgstr "\"post-rewrite hook\" umgehen" -#: builtin/commit.c:1461 +#: builtin/commit.c:1498 msgid "ok to record an empty change" msgstr "Aufzeichnung einer leeren Änderung erlauben" -#: builtin/commit.c:1463 +#: builtin/commit.c:1500 msgid "ok to record a change with an empty message" msgstr "Aufzeichnung einer Änderung mit einer leeren Beschreibung erlauben" -#: builtin/commit.c:1536 +#: builtin/commit.c:1573 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Beschädigte MERGE_HEAD-Datei (%s)" -#: builtin/commit.c:1543 +#: builtin/commit.c:1580 msgid "could not read MERGE_MODE" msgstr "Konnte MERGE_MODE nicht lesen" -#: builtin/commit.c:1562 +#: builtin/commit.c:1599 #, c-format msgid "could not read commit message: %s" msgstr "Konnte Commit-Beschreibung nicht lesen: %s" -#: builtin/commit.c:1573 +#: builtin/commit.c:1610 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Commit aufgrund leerer Beschreibung abgebrochen.\n" -#: builtin/commit.c:1578 +#: builtin/commit.c:1615 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "Commit abgebrochen; Sie haben die Beschreibung nicht editiert.\n" -#: builtin/commit.c:1613 +#: builtin/commit.c:1650 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -8041,149 +8381,211 @@ msgstr "" "voll und Ihr Kontingent nicht aufgebraucht ist und führen Sie\n" "anschließend \"git reset HEAD\" zu Wiederherstellung aus." +#: builtin/commit-graph.c:9 +msgid "git commit-graph [--object-dir <objdir>]" +msgstr "git commit-graph [--object-dir <Objektverzeichnis>]" + +#: builtin/commit-graph.c:10 builtin/commit-graph.c:16 +msgid "git commit-graph read [--object-dir <objdir>]" +msgstr "git commit-graph read [--object-dir <Objektverzeichnis>]" + +#: builtin/commit-graph.c:11 builtin/commit-graph.c:21 +msgid "" +"git commit-graph write [--object-dir <objdir>] [--append] [--stdin-packs|--" +"stdin-commits]" +msgstr "git commit-graph write [--object-dir <Objektverzeichnis>] [--append] [--stdin-packs|--stdin-commits]" + +#: builtin/commit-graph.c:39 builtin/commit-graph.c:92 +#: builtin/commit-graph.c:147 builtin/fetch.c:161 builtin/log.c:1466 +msgid "dir" +msgstr "Verzeichnis" + +#: builtin/commit-graph.c:40 builtin/commit-graph.c:93 +#: builtin/commit-graph.c:148 +msgid "The object directory to store the graph" +msgstr "Das Objektverzeichnis zum Speichern des Graphen." + +#: builtin/commit-graph.c:95 +msgid "scan pack-indexes listed by stdin for commits" +msgstr "durch Standard-Eingabe gelistete Pack-Indexe nach Commits scannen" + +#: builtin/commit-graph.c:97 +msgid "start walk at commits listed by stdin" +msgstr "Lauf bei Commits beginnen, die über die Standard-Eingabe gelistet sind" + +#: builtin/commit-graph.c:99 +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:108 +msgid "cannot use both --stdin-commits and --stdin-packs" +msgstr "Kann nicht --stdin-commits und --stdin-packs benutzen." + #: builtin/config.c:10 msgid "git config [<options>]" msgstr "git config [<Optionen>]" -#: builtin/config.c:58 +#: builtin/config.c:101 +#, c-format +msgid "unrecognized --type argument, %s" +msgstr "nicht erkanntes --type Argument, %s" + +#: builtin/config.c:123 msgid "Config file location" msgstr "Ort der Konfigurationsdatei" -#: builtin/config.c:59 +#: builtin/config.c:124 msgid "use global config file" msgstr "globale Konfigurationsdatei verwenden" -#: builtin/config.c:60 +#: builtin/config.c:125 msgid "use system config file" msgstr "systemweite Konfigurationsdatei verwenden" -#: builtin/config.c:61 +#: builtin/config.c:126 msgid "use repository config file" msgstr "Konfigurationsdatei des Repositories verwenden" -#: builtin/config.c:62 +#: builtin/config.c:127 msgid "use given config file" msgstr "die angegebene Konfigurationsdatei verwenden" -#: builtin/config.c:63 +#: builtin/config.c:128 msgid "blob-id" msgstr "Blob-Id" -#: builtin/config.c:63 +#: builtin/config.c:128 msgid "read config from given blob object" msgstr "Konfiguration von angegebenem Blob-Objekt lesen" -#: builtin/config.c:64 +#: builtin/config.c:129 msgid "Action" msgstr "Aktion" -#: builtin/config.c:65 +#: builtin/config.c:130 msgid "get value: name [value-regex]" msgstr "Wert zurückgeben: Name [Wert-regex]" -#: builtin/config.c:66 +#: builtin/config.c:131 msgid "get all values: key [value-regex]" msgstr "alle Werte zurückgeben: Schlüssel [Wert-regex]" -#: builtin/config.c:67 +#: builtin/config.c:132 msgid "get values for regexp: name-regex [value-regex]" msgstr "Werte für den regulären Ausdruck zurückgeben: Name-regex [Wert-regex]" -#: builtin/config.c:68 +#: builtin/config.c:133 msgid "get value specific for the URL: section[.var] URL" msgstr "Wert spezifisch für eine URL zurückgeben: section[.var] URL" -#: builtin/config.c:69 +#: builtin/config.c:134 msgid "replace all matching variables: name value [value_regex]" msgstr "alle passenden Variablen ersetzen: Name Wert [Wert-regex] " -#: builtin/config.c:70 +#: builtin/config.c:135 msgid "add a new variable: name value" msgstr "neue Variable hinzufügen: Name Wert" -#: builtin/config.c:71 +#: builtin/config.c:136 msgid "remove a variable: name [value-regex]" msgstr "eine Variable entfernen: Name [Wert-regex]" -#: builtin/config.c:72 +#: builtin/config.c:137 msgid "remove all matches: name [value-regex]" msgstr "alle Übereinstimmungen entfernen: Name [Wert-regex]" -#: builtin/config.c:73 +#: builtin/config.c:138 msgid "rename section: old-name new-name" msgstr "eine Sektion umbenennen: alter-Name neuer-Name" -#: builtin/config.c:74 +#: builtin/config.c:139 msgid "remove a section: name" msgstr "eine Sektion entfernen: Name" -#: builtin/config.c:75 +#: builtin/config.c:140 msgid "list all" msgstr "alles auflisten" -#: builtin/config.c:76 +#: builtin/config.c:141 msgid "open an editor" msgstr "einen Editor öffnen" -#: builtin/config.c:77 +#: builtin/config.c:142 msgid "find the color configured: slot [default]" msgstr "die konfigurierte Farbe finden: Slot [Standard]" -#: builtin/config.c:78 +#: builtin/config.c:143 msgid "find the color setting: slot [stdout-is-tty]" msgstr "die Farbeinstellung finden: Slot [Standard-Ausgabe-ist-Terminal]" -#: builtin/config.c:79 +#: builtin/config.c:144 msgid "Type" msgstr "Typ" -#: builtin/config.c:80 +#: builtin/config.c:145 +msgid "value is given this type" +msgstr "Wert ist mit diesem Typ angegeben" + +#: builtin/config.c:146 msgid "value is \"true\" or \"false\"" msgstr "Wert ist \"true\" oder \"false\"" -#: builtin/config.c:81 +#: builtin/config.c:147 msgid "value is decimal number" msgstr "Wert ist eine Dezimalzahl" -#: builtin/config.c:82 +#: builtin/config.c:148 msgid "value is --bool or --int" msgstr "Wert ist --bool oder --int" -#: builtin/config.c:83 +#: builtin/config.c:149 msgid "value is a path (file or directory name)" msgstr "Wert ist ein Pfad (Datei oder Verzeichnisname)" -#: builtin/config.c:84 +#: builtin/config.c:150 msgid "value is an expiry date" msgstr "Wert ist ein Verfallsdatum" -#: builtin/config.c:85 +#: builtin/config.c:151 msgid "Other" msgstr "Sonstiges" -#: builtin/config.c:86 +#: builtin/config.c:152 msgid "terminate values with NUL byte" msgstr "schließt Werte mit NUL-Byte ab" -#: builtin/config.c:87 +#: builtin/config.c:153 msgid "show variable names only" msgstr "nur Variablennamen anzeigen" -#: builtin/config.c:88 +#: builtin/config.c:154 msgid "respect include directives on lookup" msgstr "beachtet \"include\"-Direktiven beim Nachschlagen" -#: builtin/config.c:89 +#: builtin/config.c:155 msgid "show origin of config (file, standard input, blob, command line)" msgstr "" "Ursprung der Konfiguration anzeigen (Datei, Standard-Eingabe, Blob, " "Befehlszeile)" -#: builtin/config.c:335 +#: builtin/config.c:156 +msgid "value" +msgstr "Wert" + +#: builtin/config.c:156 +msgid "with --get, use default value when missing entry" +msgstr "mit --get, benutze den Standardwert, wenn der Eintrag fehlt" + +#: builtin/config.c:332 +#, c-format +msgid "failed to format default config value: %s" +msgstr "Fehler beim Formatieren des Standardkonfigurationswertes: %s" + +#: builtin/config.c:431 msgid "unable to parse default color value" msgstr "konnte Standard-Farbwert nicht parsen" -#: builtin/config.c:479 +#: builtin/config.c:575 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -8198,16 +8600,20 @@ msgstr "" "#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c:507 +#: builtin/config.c:603 msgid "--local can only be used inside a git repository" msgstr "--local kann nur innerhalb eines Git-Repositories verwendet werden." -#: builtin/config.c:632 +#: builtin/config.c:606 +msgid "--blob can only be used inside a git repository" +msgstr "--blob kann nur innerhalb eines Git-Repositories verwendet werden." + +#: builtin/config.c:735 #, c-format msgid "cannot create configuration file %s" msgstr "Konnte Konfigurationsdatei '%s' nicht erstellen." -#: builtin/config.c:645 +#: builtin/config.c:748 #, c-format msgid "" "cannot overwrite multiple values with a single value\n" @@ -8217,11 +8623,11 @@ msgstr "" " Benutzen Sie einen regulären Ausdruck, --add oder --replace, um %s\n" " zu ändern." -#: builtin/count-objects.c:88 +#: builtin/count-objects.c:90 msgid "git count-objects [-v] [-H | --human-readable]" msgstr "git count-objects [-v] [-H | --human-readable]" -#: builtin/count-objects.c:98 +#: builtin/count-objects.c:100 msgid "print sizes in human readable format" msgstr "gibt Größenangaben in menschenlesbaren Format aus" @@ -8533,157 +8939,155 @@ msgstr "kein <Tool> für --tool=<Tool> angegeben" msgid "no <cmd> given for --extcmd=<cmd>" msgstr "kein <Programm> für --extcmd=<Programm> angegeben" -#: builtin/fast-export.c:26 +#: builtin/fast-export.c:27 msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [rev-list-opts]" -#: builtin/fast-export.c:998 +#: builtin/fast-export.c:1000 msgid "show progress after <n> objects" msgstr "Fortschritt nach <n> Objekten anzeigen" -#: builtin/fast-export.c:1000 +#: builtin/fast-export.c:1002 msgid "select handling of signed tags" msgstr "Behandlung von signierten Tags wählen" -#: builtin/fast-export.c:1003 +#: builtin/fast-export.c:1005 msgid "select handling of tags that tag filtered objects" msgstr "Behandlung von Tags wählen, die gefilterte Objekte markieren" -#: builtin/fast-export.c:1006 +#: builtin/fast-export.c:1008 msgid "Dump marks to this file" msgstr "Kennzeichen in diese Datei schreiben" -#: builtin/fast-export.c:1008 +#: builtin/fast-export.c:1010 msgid "Import marks from this file" msgstr "Kennzeichen von dieser Datei importieren" -#: builtin/fast-export.c:1010 +#: builtin/fast-export.c:1012 msgid "Fake a tagger when tags lack one" msgstr "künstlich einen Tag-Ersteller erzeugen, wenn das Tag keinen hat" -#: builtin/fast-export.c:1012 +#: builtin/fast-export.c:1014 msgid "Output full tree for each commit" msgstr "für jeden Commit das gesamte Verzeichnis ausgeben" -#: builtin/fast-export.c:1014 +#: builtin/fast-export.c:1016 msgid "Use the done feature to terminate the stream" msgstr "die \"done\"-Funktion benutzen, um den Datenstrom abzuschließen" -#: builtin/fast-export.c:1015 +#: builtin/fast-export.c:1017 msgid "Skip output of blob data" msgstr "Ausgabe von Blob-Daten überspringen" -#: builtin/fast-export.c:1016 +#: builtin/fast-export.c:1018 msgid "refspec" msgstr "Refspec" -#: builtin/fast-export.c:1017 +#: builtin/fast-export.c:1019 msgid "Apply refspec to exported refs" msgstr "Refspec auf exportierte Referenzen anwenden" -#: builtin/fast-export.c:1018 +#: builtin/fast-export.c:1020 msgid "anonymize output" msgstr "Ausgabe anonymisieren" -#: builtin/fetch.c:25 +#: builtin/fetch.c:26 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [<Optionen>] [<Repository> [<Refspec>...]]" -#: builtin/fetch.c:26 +#: builtin/fetch.c:27 msgid "git fetch [<options>] <group>" msgstr "git fetch [<Optionen>] <Gruppe>" -#: builtin/fetch.c:27 +#: builtin/fetch.c:28 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [<Optionen>] [(<Repository> | <Gruppe>)...]" -#: builtin/fetch.c:28 +#: builtin/fetch.c:29 msgid "git fetch --all [<options>]" msgstr "git fetch --all [<Optionen>]" -#: builtin/fetch.c:124 builtin/pull.c:188 +#: builtin/fetch.c:123 builtin/pull.c:193 msgid "fetch from all remotes" msgstr "fordert von allen Remote-Repositories an" -#: builtin/fetch.c:126 builtin/pull.c:191 +#: builtin/fetch.c:125 builtin/pull.c:196 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "an .git/FETCH_HEAD anhängen, anstatt zu überschreiben" -#: builtin/fetch.c:128 builtin/pull.c:194 +#: builtin/fetch.c:127 builtin/pull.c:199 msgid "path to upload pack on remote end" msgstr "Pfad des Programms zum Hochladen von Paketen auf der Gegenseite" -#: builtin/fetch.c:129 builtin/pull.c:196 +#: builtin/fetch.c:128 builtin/pull.c:201 msgid "force overwrite of local branch" msgstr "das Überschreiben von lokalen Branches erzwingen" -#: builtin/fetch.c:131 +#: builtin/fetch.c:130 msgid "fetch from multiple remotes" msgstr "von mehreren Remote-Repositories anfordern" -#: builtin/fetch.c:133 builtin/pull.c:198 +#: builtin/fetch.c:132 builtin/pull.c:203 msgid "fetch all tags and associated objects" msgstr "alle Tags und verbundene Objekte anfordern" -#: builtin/fetch.c:135 +#: builtin/fetch.c:134 msgid "do not fetch all tags (--no-tags)" msgstr "nicht alle Tags anfordern (--no-tags)" -#: builtin/fetch.c:137 +#: builtin/fetch.c:136 msgid "number of submodules fetched in parallel" msgstr "Anzahl der parallel anzufordernden Submodule" -#: builtin/fetch.c:139 builtin/pull.c:201 +#: builtin/fetch.c:138 builtin/pull.c:206 msgid "prune remote-tracking branches no longer on remote" msgstr "" "Remote-Tracking-Branches entfernen, die sich nicht mehr im Remote-Repository " "befinden" -#: builtin/fetch.c:141 +#: builtin/fetch.c:140 msgid "prune local tags no longer on remote and clobber changed tags" -msgstr "lokale Tags entfernen, die sich nicht mehr im Remote-Repository befinden, und geänderte Tags aktualisieren" +msgstr "" +"lokale Tags entfernen, die sich nicht mehr im Remote-Repository befinden, " +"und geänderte Tags aktualisieren" -#: builtin/fetch.c:142 builtin/fetch.c:165 builtin/pull.c:126 +#: builtin/fetch.c:141 builtin/fetch.c:164 builtin/pull.c:131 msgid "on-demand" msgstr "bei-Bedarf" -#: builtin/fetch.c:143 +#: builtin/fetch.c:142 msgid "control recursive fetching of submodules" msgstr "rekursive Anforderungen von Submodulen kontrollieren" -#: builtin/fetch.c:147 builtin/pull.c:209 +#: builtin/fetch.c:146 builtin/pull.c:214 msgid "keep downloaded pack" msgstr "heruntergeladenes Paket behalten" -#: builtin/fetch.c:149 +#: builtin/fetch.c:148 msgid "allow updating of HEAD ref" msgstr "Aktualisierung der \"HEAD\"-Referenz erlauben" -#: builtin/fetch.c:152 builtin/fetch.c:158 builtin/pull.c:212 +#: builtin/fetch.c:151 builtin/fetch.c:157 builtin/pull.c:217 msgid "deepen history of shallow clone" msgstr "" "die Historie eines Klons mit unvollständiger Historie (shallow) vertiefen" -#: builtin/fetch.c:154 +#: builtin/fetch.c:153 msgid "deepen history of shallow repository based on time" msgstr "" "die Historie eines Klons mit unvollständiger Historie (shallow) auf " "Zeitbasis\n" "vertiefen" -#: builtin/fetch.c:160 builtin/pull.c:215 +#: builtin/fetch.c:159 builtin/pull.c:220 msgid "convert to a complete repository" msgstr "zu einem vollständigen Repository konvertieren" -#: builtin/fetch.c:162 builtin/log.c:1466 -msgid "dir" -msgstr "Verzeichnis" - -#: builtin/fetch.c:163 +#: builtin/fetch.c:162 msgid "prepend this to submodule path output" msgstr "dies an die Ausgabe der Submodul-Pfade voranstellen" -#: builtin/fetch.c:166 +#: builtin/fetch.c:165 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" @@ -8691,91 +9095,101 @@ msgstr "" "Standard für die rekursive Anforderung von Submodulen (geringere Priorität\n" "als Konfigurationsdateien)" -#: builtin/fetch.c:170 builtin/pull.c:218 +#: builtin/fetch.c:169 builtin/pull.c:223 msgid "accept refs that update .git/shallow" msgstr "Referenzen, die .git/shallow aktualisieren, akzeptieren" -#: builtin/fetch.c:171 builtin/pull.c:220 +#: builtin/fetch.c:170 builtin/pull.c:225 msgid "refmap" msgstr "Refmap" -#: builtin/fetch.c:172 builtin/pull.c:221 +#: builtin/fetch.c:171 builtin/pull.c:226 msgid "specify fetch refmap" msgstr "Refmap für 'fetch' angeben" -#: builtin/fetch.c:431 +#: builtin/fetch.c:172 builtin/ls-remote.c:77 builtin/push.c:582 +#: builtin/send-pack.c:172 +msgid "server-specific" +msgstr "serverspezifisch" + +#: builtin/fetch.c:172 builtin/ls-remote.c:77 builtin/push.c:582 +#: builtin/send-pack.c:173 +msgid "option to transmit" +msgstr "Option übertragen" + +#: builtin/fetch.c:442 msgid "Couldn't find remote ref HEAD" msgstr "Konnte Remote-Referenz von HEAD nicht finden." -#: builtin/fetch.c:549 +#: builtin/fetch.c:560 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "Konfiguration fetch.output enthält ungültigen Wert %s" -#: builtin/fetch.c:642 +#: builtin/fetch.c:653 #, c-format msgid "object %s not found" msgstr "Objekt %s nicht gefunden" -#: builtin/fetch.c:646 +#: builtin/fetch.c:657 msgid "[up to date]" msgstr "[aktuell]" -#: builtin/fetch.c:659 builtin/fetch.c:739 +#: builtin/fetch.c:670 builtin/fetch.c:750 msgid "[rejected]" msgstr "[zurückgewiesen]" -#: builtin/fetch.c:660 +#: builtin/fetch.c:671 msgid "can't fetch in current branch" msgstr "kann \"fetch\" im aktuellen Branch nicht ausführen" -#: builtin/fetch.c:669 +#: builtin/fetch.c:680 msgid "[tag update]" msgstr "[Tag Aktualisierung]" -#: builtin/fetch.c:670 builtin/fetch.c:703 builtin/fetch.c:719 -#: builtin/fetch.c:734 +#: builtin/fetch.c:681 builtin/fetch.c:714 builtin/fetch.c:730 +#: builtin/fetch.c:745 msgid "unable to update local ref" msgstr "kann lokale Referenz nicht aktualisieren" -#: builtin/fetch.c:689 +#: builtin/fetch.c:700 msgid "[new tag]" msgstr "[neues Tag]" -#: builtin/fetch.c:692 +#: builtin/fetch.c:703 msgid "[new branch]" msgstr "[neuer Branch]" -#: builtin/fetch.c:695 +#: builtin/fetch.c:706 msgid "[new ref]" msgstr "[neue Referenz]" -#: builtin/fetch.c:734 +#: builtin/fetch.c:745 msgid "forced update" msgstr "Aktualisierung erzwungen" -#: builtin/fetch.c:739 +#: builtin/fetch.c:750 msgid "non-fast-forward" msgstr "kein Vorspulen" -#: builtin/fetch.c:784 +#: builtin/fetch.c:795 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s hat nicht alle erforderlichen Objekte gesendet\n" -#: builtin/fetch.c:804 +#: builtin/fetch.c:815 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "" -"%s wurde zurückgewiesen, da Ursprungs-Commits von Repositories mit " -"unvollständiger Historie (shallow) nicht aktualisiert werden dürfen." +"%s wurde zurückgewiesen, da Root-Commits von Repositories mit unvollständiger\n" +"Historie (shallow) nicht aktualisiert werden dürfen." -#: builtin/fetch.c:892 builtin/fetch.c:988 +#: builtin/fetch.c:903 builtin/fetch.c:999 #, c-format msgid "From %.*s\n" msgstr "Von %.*s\n" -#: builtin/fetch.c:903 +#: builtin/fetch.c:914 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -8784,59 +9198,59 @@ msgstr "" "Einige lokale Referenzen konnten nicht aktualisiert werden; versuchen Sie\n" "'git remote prune %s', um jeden älteren, widersprüchlichen Branch zu löschen." -#: builtin/fetch.c:958 +#: builtin/fetch.c:969 #, c-format msgid " (%s will become dangling)" msgstr " (%s wird unreferenziert)" -#: builtin/fetch.c:959 +#: builtin/fetch.c:970 #, c-format msgid " (%s has become dangling)" msgstr " (%s wurde unreferenziert)" -#: builtin/fetch.c:991 +#: builtin/fetch.c:1002 msgid "[deleted]" msgstr "[gelöscht]" -#: builtin/fetch.c:992 builtin/remote.c:1024 +#: builtin/fetch.c:1003 builtin/remote.c:1033 msgid "(none)" msgstr "(nichts)" -#: builtin/fetch.c:1015 +#: builtin/fetch.c:1026 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "" "Der \"fetch\" in den aktuellen Branch %s von einem Nicht-Bare-Repository " "wurde verweigert." -#: builtin/fetch.c:1034 +#: builtin/fetch.c:1045 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "Option \"%s\" Wert \"%s\" ist nicht gültig für %s" -#: builtin/fetch.c:1037 +#: builtin/fetch.c:1048 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "Option \"%s\" wird ignoriert für %s\n" -#: builtin/fetch.c:1277 +#: builtin/fetch.c:1287 #, c-format msgid "Fetching %s\n" msgstr "Fordere an von %s\n" -#: builtin/fetch.c:1279 builtin/remote.c:97 +#: builtin/fetch.c:1289 builtin/remote.c:98 #, c-format msgid "Could not fetch %s" msgstr "Konnte nicht von %s anfordern" -#: builtin/fetch.c:1325 builtin/fetch.c:1498 +#: builtin/fetch.c:1335 builtin/fetch.c:1503 msgid "" "--filter can only be used with the remote configured in core.partialClone" msgstr "" "--filter kann nur mit den Remote-Repositories verwendet werden,\n" "die in core.partialClone konfiguriert sind." -#: builtin/fetch.c:1350 +#: builtin/fetch.c:1358 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -8845,43 +9259,43 @@ msgstr "" "oder den Namen des Remote-Repositories an, von welchem neue\n" "Commits angefordert werden sollen." -#: builtin/fetch.c:1394 +#: builtin/fetch.c:1395 msgid "You need to specify a tag name." msgstr "Sie müssen den Namen des Tags angeben." -#: builtin/fetch.c:1439 +#: builtin/fetch.c:1444 msgid "Negative depth in --deepen is not supported" msgstr "Negative Tiefe wird von --deepen nicht unterstützt." -#: builtin/fetch.c:1441 +#: builtin/fetch.c:1446 msgid "--deepen and --depth are mutually exclusive" msgstr "--deepen und --depth schließen sich gegenseitig aus" -#: builtin/fetch.c:1446 +#: builtin/fetch.c:1451 msgid "--depth and --unshallow cannot be used together" msgstr "" "Die Optionen --depth und --unshallow können nicht gemeinsam verwendet werden." -#: builtin/fetch.c:1448 +#: builtin/fetch.c:1453 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:1464 +#: builtin/fetch.c:1469 msgid "fetch --all does not take a repository argument" msgstr "fetch --all akzeptiert kein Repository als Argument" -#: builtin/fetch.c:1466 +#: builtin/fetch.c:1471 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all kann nicht mit Refspecs verwendet werden." -#: builtin/fetch.c:1475 +#: builtin/fetch.c:1480 #, c-format msgid "No such remote or remote group: %s" msgstr "Kein Remote-Repository (einzeln oder Gruppe): %s" -#: builtin/fetch.c:1482 +#: builtin/fetch.c:1487 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" @@ -8950,7 +9364,7 @@ msgstr "Platzhalter als Tcl-String formatieren" msgid "show only <n> matched refs" msgstr "nur <n> passende Referenzen anzeigen" -#: builtin/for-each-ref.c:39 builtin/tag.c:420 +#: builtin/for-each-ref.c:39 builtin/tag.c:421 msgid "respect format colors" msgstr "Formatfarben beachten" @@ -8974,81 +9388,81 @@ msgstr "nur Referenzen ausgeben, die diesen Commit enthalten" msgid "print only refs which don't contain the commit" msgstr "nur Referenzen ausgeben, die diesen Commit nicht enthalten" -#: builtin/fsck.c:568 +#: builtin/fsck.c:569 msgid "Checking object directories" msgstr "Prüfe Objekt-Verzeichnisse" -#: builtin/fsck.c:660 +#: builtin/fsck.c:661 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<Optionen>] [<Objekt>...]" -#: builtin/fsck.c:666 +#: builtin/fsck.c:667 msgid "show unreachable objects" msgstr "unerreichbare Objekte anzeigen" -#: builtin/fsck.c:667 +#: builtin/fsck.c:668 msgid "show dangling objects" msgstr "unreferenzierte Objekte anzeigen" -#: builtin/fsck.c:668 +#: builtin/fsck.c:669 msgid "report tags" msgstr "Tags melden" -#: builtin/fsck.c:669 +#: builtin/fsck.c:670 msgid "report root nodes" msgstr "Hauptwurzeln melden" -#: builtin/fsck.c:670 +#: builtin/fsck.c:671 msgid "make index objects head nodes" msgstr "Index-Objekte in Erreichbarkeitsprüfung einbeziehen" -#: builtin/fsck.c:671 +#: builtin/fsck.c:672 msgid "make reflogs head nodes (default)" msgstr "Reflogs in Erreichbarkeitsprüfung einbeziehen (Standard)" -#: builtin/fsck.c:672 +#: builtin/fsck.c:673 msgid "also consider packs and alternate objects" msgstr "ebenso Pakete und alternative Objekte betrachten" -#: builtin/fsck.c:673 +#: builtin/fsck.c:674 msgid "check only connectivity" msgstr "nur Konnektivität prüfen" -#: builtin/fsck.c:674 +#: builtin/fsck.c:675 msgid "enable more strict checking" msgstr "genauere Prüfung aktivieren" -#: builtin/fsck.c:676 +#: builtin/fsck.c:677 msgid "write dangling objects in .git/lost-found" msgstr "unreferenzierte Objekte nach .git/lost-found schreiben" -#: builtin/fsck.c:677 builtin/prune.c:108 +#: builtin/fsck.c:678 builtin/prune.c:109 msgid "show progress" msgstr "Fortschrittsanzeige anzeigen" -#: builtin/fsck.c:678 +#: builtin/fsck.c:679 msgid "show verbose names for reachable objects" msgstr "ausführliche Namen für erreichbare Objekte anzeigen" -#: builtin/fsck.c:742 +#: builtin/fsck.c:745 msgid "Checking objects" msgstr "Prüfe Objekte" -#: builtin/gc.c:27 +#: builtin/gc.c:33 msgid "git gc [<options>]" msgstr "git gc [<Optionen>]" -#: builtin/gc.c:80 +#: builtin/gc.c:88 #, c-format msgid "Failed to fstat %s: %s" msgstr "Konnte '%s' nicht lesen: %s" -#: builtin/gc.c:312 +#: builtin/gc.c:452 #, c-format msgid "Can't stat %s" msgstr "Kann '%s' nicht lesen." -#: builtin/gc.c:321 +#: builtin/gc.c:461 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -9064,49 +9478,58 @@ msgstr "" "\n" "%s" -#: builtin/gc.c:360 +#: builtin/gc.c:502 msgid "prune unreferenced objects" msgstr "unreferenzierte Objekte entfernen" -#: builtin/gc.c:362 +#: builtin/gc.c:504 msgid "be more thorough (increased runtime)" msgstr "mehr Gründlichkeit (erhöht Laufzeit)" -#: builtin/gc.c:363 +#: builtin/gc.c:505 msgid "enable auto-gc mode" msgstr "\"auto-gc\" Modus aktivieren" -#: builtin/gc.c:366 +#: builtin/gc.c:508 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:384 +#: builtin/gc.c:511 +msgid "repack all other packs except the largest pack" +msgstr "alle anderen Pakete, außer das größte Paket, neu packen" + +#: builtin/gc.c:528 #, c-format -msgid "Failed to parse gc.logexpiry value %s" -msgstr "Fehler beim Parsen des Wertes '%s' von gc.logexpiry" +msgid "failed to parse gc.logexpiry value %s" +msgstr "Fehler beim Parsen des Wertes '%s' von gc.logexpiry." -#: builtin/gc.c:412 +#: builtin/gc.c:539 +#, c-format +msgid "failed to parse prune expiry value %s" +msgstr "Fehler beim Parsen des \"prune expiry\" Wertes %s" + +#: builtin/gc.c:559 #, 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:414 +#: builtin/gc.c:561 #, 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:415 +#: builtin/gc.c:562 #, 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:440 +#: builtin/gc.c:598 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" @@ -9114,23 +9537,23 @@ msgstr "" "\"git gc\" wird bereits auf Maschine '%s' pid %<PRIuMAX> ausgeführt\n" "(benutzen Sie --force falls nicht)" -#: builtin/gc.c:487 +#: builtin/gc.c:645 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" "Es gibt zu viele unerreichbare lose Objekte; führen Sie 'git prune' aus, um " "diese zu löschen." -#: builtin/grep.c:27 +#: builtin/grep.c:28 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "git grep [<Optionen>] [-e] <Muster> [<Commit>...] [[--] <Pfad>...]" -#: builtin/grep.c:225 +#: builtin/grep.c:226 #, c-format msgid "grep: failed to create thread: %s" msgstr "grep: Fehler beim Erzeugen eines Thread: %s" -#: builtin/grep.c:283 +#: builtin/grep.c:284 #, c-format msgid "invalid number of threads specified (%d) for %s" msgstr "ungültige Anzahl von Threads (%d) für %s angegeben" @@ -9139,17 +9562,17 @@ msgstr "ungültige Anzahl von Threads (%d) für %s angegeben" #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c:292 builtin/index-pack.c:1523 builtin/index-pack.c:1712 +#: builtin/grep.c:293 builtin/index-pack.c:1531 builtin/index-pack.c:1723 #, c-format msgid "no threads support, ignoring %s" msgstr "keine Unterstützung von Threads, '%s' wird ignoriert" -#: builtin/grep.c:460 builtin/grep.c:580 builtin/grep.c:622 +#: builtin/grep.c:461 builtin/grep.c:582 builtin/grep.c:623 #, c-format msgid "unable to read tree (%s)" msgstr "konnte \"Tree\"-Objekt (%s) nicht lesen" -#: builtin/grep.c:637 +#: builtin/grep.c:638 #, c-format msgid "unable to grep from object of type %s" msgstr "kann \"grep\" nicht mit Objekten des Typs %s durchführen" @@ -9352,7 +9775,7 @@ msgstr "--no-index oder --untracked können nicht mit Commits verwendet werden" msgid "unable to resolve revision: %s" msgstr "Konnte Commit nicht auflösen: %s" -#: builtin/grep.c:1036 builtin/index-pack.c:1519 +#: builtin/grep.c:1036 builtin/index-pack.c:1527 #, c-format msgid "invalid number of threads specified (%d)" msgstr "ungültige Anzahl von Threads angegeben (%d)" @@ -9558,300 +9981,304 @@ msgstr "Für '%s' wurde der Alias '%s' angelegt." msgid "usage: %s%s" msgstr "Verwendung: %s%s" -#: builtin/index-pack.c:157 +#: builtin/index-pack.c:158 #, c-format msgid "unable to open %s" msgstr "kann %s nicht öffnen" -#: builtin/index-pack.c:207 +#: builtin/index-pack.c:208 #, c-format msgid "object type mismatch at %s" msgstr "Objekt-Typen passen bei %s nicht zusammen" -#: builtin/index-pack.c:227 +#: builtin/index-pack.c:228 #, c-format msgid "did not receive expected object %s" msgstr "konnte erwartetes Objekt %s nicht empfangen" -#: builtin/index-pack.c:230 +#: builtin/index-pack.c:231 #, c-format msgid "object %s: expected type %s, found %s" msgstr "Objekt %s: erwarteter Typ %s, %s gefunden" -#: builtin/index-pack.c:272 +#: builtin/index-pack.c:273 #, 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:282 +#: builtin/index-pack.c:283 msgid "early EOF" msgstr "zu frühes Dateiende" -#: builtin/index-pack.c:283 +#: builtin/index-pack.c:284 msgid "read error on input" msgstr "Fehler beim Lesen der Eingabe" -#: builtin/index-pack.c:295 +#: builtin/index-pack.c:296 msgid "used more bytes than were available" msgstr "verwendete mehr Bytes als verfügbar waren" -#: builtin/index-pack.c:302 +#: builtin/index-pack.c:303 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:305 builtin/unpack-objects.c:93 +#: builtin/index-pack.c:306 builtin/unpack-objects.c:93 msgid "pack exceeds maximum allowed size" msgstr "Paket überschreitet die maximal erlaubte Größe" -#: builtin/index-pack.c:320 +#: builtin/index-pack.c:321 #, c-format msgid "unable to create '%s'" msgstr "konnte '%s' nicht erstellen" -#: builtin/index-pack.c:326 +#: builtin/index-pack.c:327 #, c-format msgid "cannot open packfile '%s'" msgstr "Kann Paketdatei '%s' nicht öffnen" -#: builtin/index-pack.c:340 +#: builtin/index-pack.c:341 msgid "pack signature mismatch" msgstr "Paketsignatur stimmt nicht überein" -#: builtin/index-pack.c:342 +#: builtin/index-pack.c:343 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "Paketversion %<PRIu32> nicht unterstützt" -#: builtin/index-pack.c:360 +#: builtin/index-pack.c:361 #, 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:481 +#: builtin/index-pack.c:482 #, c-format msgid "inflate returned %d" msgstr "Dekomprimierung gab %d zurück" -#: builtin/index-pack.c:530 +#: builtin/index-pack.c:531 msgid "offset value overflow for delta base object" msgstr "Wert für Versatz bei Differenzobjekt übergelaufen" -#: builtin/index-pack.c:538 +#: builtin/index-pack.c:539 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:546 +#: builtin/index-pack.c:547 #, c-format msgid "unknown object type %d" msgstr "Unbekannter Objekt-Typ %d" -#: builtin/index-pack.c:577 +#: builtin/index-pack.c:578 msgid "cannot pread pack file" msgstr "Kann Paketdatei %s nicht lesen" -#: builtin/index-pack.c:579 +#: builtin/index-pack.c:580 #, 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:605 +#: builtin/index-pack.c:606 msgid "serious inflate inconsistency" msgstr "ernsthafte Inkonsistenz nach Dekomprimierung" -#: builtin/index-pack.c:750 builtin/index-pack.c:756 builtin/index-pack.c:779 -#: builtin/index-pack.c:818 builtin/index-pack.c:827 +#: builtin/index-pack.c:751 builtin/index-pack.c:757 builtin/index-pack.c:780 +#: builtin/index-pack.c:819 builtin/index-pack.c:828 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "SHA1 KOLLISION MIT %s GEFUNDEN !" -#: builtin/index-pack.c:753 builtin/pack-objects.c:182 -#: builtin/pack-objects.c:276 +#: builtin/index-pack.c:754 builtin/pack-objects.c:198 +#: builtin/pack-objects.c:292 #, c-format msgid "unable to read %s" msgstr "kann %s nicht lesen" -#: builtin/index-pack.c:816 +#: builtin/index-pack.c:817 #, c-format msgid "cannot read existing object info %s" msgstr "Kann existierende Informationen zu Objekt %s nicht lesen." -#: builtin/index-pack.c:824 +#: builtin/index-pack.c:825 #, c-format msgid "cannot read existing object %s" msgstr "Kann existierendes Objekt %s nicht lesen." -#: builtin/index-pack.c:838 +#: builtin/index-pack.c:839 #, c-format msgid "invalid blob object %s" msgstr "ungültiges Blob-Objekt %s" -#: builtin/index-pack.c:853 +#: builtin/index-pack.c:842 builtin/index-pack.c:860 +msgid "fsck error in packed object" +msgstr "fsck Fehler in gepacktem Objekt" + +#: builtin/index-pack.c:857 #, c-format msgid "invalid %s" msgstr "Ungültiger Objekt-Typ %s" -#: builtin/index-pack.c:856 -msgid "Error in object" -msgstr "Fehler in Objekt" - -#: builtin/index-pack.c:858 +#: builtin/index-pack.c:862 #, c-format msgid "Not all child objects of %s are reachable" msgstr "Nicht alle Kind-Objekte von %s sind erreichbar" -#: builtin/index-pack.c:930 builtin/index-pack.c:961 +#: builtin/index-pack.c:934 builtin/index-pack.c:965 msgid "failed to apply delta" msgstr "Konnte Dateiunterschied nicht anwenden" -#: builtin/index-pack.c:1131 +#: builtin/index-pack.c:1135 msgid "Receiving objects" msgstr "Empfange Objekte" -#: builtin/index-pack.c:1131 +#: builtin/index-pack.c:1135 msgid "Indexing objects" msgstr "Indiziere Objekte" -#: builtin/index-pack.c:1165 +#: builtin/index-pack.c:1169 msgid "pack is corrupted (SHA1 mismatch)" msgstr "Paket ist beschädigt (SHA1 unterschiedlich)" -#: builtin/index-pack.c:1170 +#: builtin/index-pack.c:1174 msgid "cannot fstat packfile" msgstr "kann Paketdatei nicht lesen" -#: builtin/index-pack.c:1173 +#: builtin/index-pack.c:1177 msgid "pack has junk at the end" msgstr "Paketende enthält nicht verwendbaren Inhalt" -#: builtin/index-pack.c:1185 +#: builtin/index-pack.c:1189 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "Fehler beim Ausführen von \"parse_pack_objects()\"" -#: builtin/index-pack.c:1208 +#: builtin/index-pack.c:1212 msgid "Resolving deltas" msgstr "Löse Unterschiede auf" -#: builtin/index-pack.c:1219 +#: builtin/index-pack.c:1223 #, c-format msgid "unable to create thread: %s" msgstr "kann Thread nicht erzeugen: %s" -#: builtin/index-pack.c:1261 +#: builtin/index-pack.c:1265 msgid "confusion beyond insanity" msgstr "Fehler beim Auflösen der Unterschiede" -#: builtin/index-pack.c:1267 +#: builtin/index-pack.c:1271 #, 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:1279 +#: builtin/index-pack.c:1283 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "Unerwartete Prüfsumme für %s (Festplattenfehler?)" -#: builtin/index-pack.c:1283 +#: builtin/index-pack.c:1287 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "Paket hat %d unaufgelöste Unterschied" msgstr[1] "Paket hat %d unaufgelöste Unterschiede" -#: builtin/index-pack.c:1307 +#: builtin/index-pack.c:1311 #, c-format msgid "unable to deflate appended object (%d)" msgstr "Konnte angehängtes Objekt (%d) nicht komprimieren" -#: builtin/index-pack.c:1383 +#: builtin/index-pack.c:1388 #, c-format msgid "local object %s is corrupt" msgstr "lokales Objekt %s ist beschädigt" -#: builtin/index-pack.c:1397 +#: builtin/index-pack.c:1402 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "Name der Paketdatei '%s' endet nicht mit '.pack'" -#: builtin/index-pack.c:1422 +#: builtin/index-pack.c:1427 #, c-format msgid "cannot write %s file '%s'" msgstr "Kann %s Datei '%s' nicht schreiben." -#: builtin/index-pack.c:1430 +#: builtin/index-pack.c:1435 #, c-format msgid "cannot close written %s file '%s'" msgstr "Kann eben geschriebene %s Datei '%s' nicht schließen." -#: builtin/index-pack.c:1454 +#: builtin/index-pack.c:1459 msgid "error while closing pack file" msgstr "Fehler beim Schließen der Paketdatei" -#: builtin/index-pack.c:1468 +#: builtin/index-pack.c:1473 msgid "cannot store pack file" msgstr "Kann Paketdatei nicht speichern" -#: builtin/index-pack.c:1476 +#: builtin/index-pack.c:1481 msgid "cannot store index file" msgstr "Kann Indexdatei nicht speichern" -#: builtin/index-pack.c:1513 +#: builtin/index-pack.c:1521 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "\"pack.indexversion=%<PRIu32>\" ist ungültig" -#: builtin/index-pack.c:1581 +#: builtin/index-pack.c:1590 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Kann existierende Paketdatei '%s' nicht öffnen" -#: builtin/index-pack.c:1583 +#: builtin/index-pack.c:1592 #, 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:1631 +#: builtin/index-pack.c:1640 #, 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:1638 +#: builtin/index-pack.c:1647 #, 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:1675 +#: builtin/index-pack.c:1684 msgid "Cannot come back to cwd" msgstr "Kann nicht zurück zum Arbeitsverzeichnis wechseln" -#: builtin/index-pack.c:1724 builtin/index-pack.c:1727 -#: builtin/index-pack.c:1743 builtin/index-pack.c:1747 +#: builtin/index-pack.c:1735 builtin/index-pack.c:1738 +#: builtin/index-pack.c:1754 builtin/index-pack.c:1758 #, c-format msgid "bad %s" msgstr "%s ist ungültig" -#: builtin/index-pack.c:1763 +#: builtin/index-pack.c:1774 msgid "--fix-thin cannot be used without --stdin" msgstr "Die Option --fix-thin kann nicht ohne --stdin verwendet werden." -#: builtin/index-pack.c:1765 +#: builtin/index-pack.c:1776 msgid "--stdin requires a git repository" msgstr "--stdin erfordert ein Git-Repository" -#: builtin/index-pack.c:1771 +#: builtin/index-pack.c:1782 msgid "--verify with no packfile name given" msgstr "Die Option --verify wurde ohne Namen der Paketdatei angegeben." +#: builtin/index-pack.c:1832 builtin/unpack-objects.c:578 +msgid "fsck error in pack objects" +msgstr "fsck Fehler beim Packen von Objekten" + #: builtin/init-db.c:55 #, c-format msgid "cannot stat '%s'" @@ -9948,11 +10375,6 @@ msgstr "Berechtigungen" 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:516 builtin/init-db.c:521 -#, c-format -msgid "cannot mkdir %s" -msgstr "kann Verzeichnis %s nicht erstellen" - #: builtin/init-db.c:525 #, c-format msgid "cannot chdir to %s" @@ -10138,7 +10560,7 @@ msgstr "Zwei Ausgabeverzeichnisse?" msgid "Unknown commit %s" msgstr "Unbekannter Commit %s" -#: builtin/log.c:1289 builtin/notes.c:887 builtin/tag.c:522 +#: builtin/log.c:1289 builtin/notes.c:887 builtin/tag.c:523 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "Konnte '%s' nicht als gültige Referenz auflösen." @@ -10497,7 +10919,7 @@ msgstr "" msgid "show debugging data" msgstr "Ausgaben zur Fehlersuche anzeigen" -#: builtin/ls-remote.c:7 +#: builtin/ls-remote.c:9 msgid "" "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" " [-q | --quiet] [--exit-code] [--get-url]\n" @@ -10507,41 +10929,41 @@ msgstr "" " [-q | --quiet] [--exit-code] [--get-url]\n" " [--symref] [<Repository> [<Referenzen>...]]" -#: builtin/ls-remote.c:52 +#: builtin/ls-remote.c:59 msgid "do not print remote URL" msgstr "URL des Remote-Repositories nicht ausgeben" -#: builtin/ls-remote.c:53 builtin/ls-remote.c:55 +#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 msgid "exec" msgstr "Programm" -#: builtin/ls-remote.c:54 builtin/ls-remote.c:56 +#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 msgid "path of git-upload-pack on the remote host" msgstr "Pfad zu \"git-upload-pack\" auf der Gegenseite" -#: builtin/ls-remote.c:58 +#: builtin/ls-remote.c:65 msgid "limit to tags" msgstr "auf Tags einschränken" -#: builtin/ls-remote.c:59 +#: builtin/ls-remote.c:66 msgid "limit to heads" msgstr "auf Branches einschränken" -#: builtin/ls-remote.c:60 +#: builtin/ls-remote.c:67 msgid "do not show peeled tags" msgstr "keine Tags anzeigen, die andere Tags enthalten" -#: builtin/ls-remote.c:62 +#: builtin/ls-remote.c:69 msgid "take url.<base>.insteadOf into account" msgstr "url.<Basis>.insteadOf berücksichtigen" -#: builtin/ls-remote.c:64 +#: builtin/ls-remote.c:73 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:67 +#: builtin/ls-remote.c:76 msgid "show underlying ref in addition to the object pointed by it" msgstr "zusätzlich zum Objekt die darauf verweisenden Referenzen anzeigen" @@ -10588,154 +11010,154 @@ msgstr "" msgid "empty mbox: '%s'" msgstr "Leere mbox: '%s'" -#: builtin/merge.c:49 +#: builtin/merge.c:50 msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<Optionen>] [<Commit>...]" -#: builtin/merge.c:50 +#: builtin/merge.c:51 msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:51 +#: builtin/merge.c:52 msgid "git merge --continue" msgstr "git merge --continue" -#: builtin/merge.c:108 +#: builtin/merge.c:109 msgid "switch `m' requires a value" msgstr "Schalter 'm' erfordert einen Wert." -#: builtin/merge.c:145 +#: builtin/merge.c:146 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "Konnte Merge-Strategie '%s' nicht finden.\n" -#: builtin/merge.c:146 +#: builtin/merge.c:147 #, c-format msgid "Available strategies are:" msgstr "Verfügbare Strategien sind:" -#: builtin/merge.c:151 +#: builtin/merge.c:152 #, c-format msgid "Available custom strategies are:" msgstr "Verfügbare benutzerdefinierte Strategien sind:" -#: builtin/merge.c:201 builtin/pull.c:137 +#: builtin/merge.c:202 builtin/pull.c:142 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:204 builtin/pull.c:140 +#: builtin/merge.c:205 builtin/pull.c:145 msgid "show a diffstat at the end of the merge" msgstr "eine Zusammenfassung der Unterschiede am Schluss des Merges anzeigen" -#: builtin/merge.c:205 builtin/pull.c:143 +#: builtin/merge.c:206 builtin/pull.c:148 msgid "(synonym to --stat)" msgstr "(Synonym für --stat)" -#: builtin/merge.c:207 builtin/pull.c:146 +#: builtin/merge.c:208 builtin/pull.c:151 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:210 builtin/pull.c:152 +#: builtin/merge.c:211 builtin/pull.c:157 msgid "create a single commit instead of doing a merge" msgstr "einen einzelnen Commit anstatt eines Merges erzeugen" -#: builtin/merge.c:212 builtin/pull.c:155 +#: builtin/merge.c:213 builtin/pull.c:160 msgid "perform a commit if the merge succeeds (default)" msgstr "einen Commit durchführen, wenn der Merge erfolgreich war (Standard)" -#: builtin/merge.c:214 builtin/pull.c:158 +#: builtin/merge.c:215 builtin/pull.c:163 msgid "edit message before committing" msgstr "Bearbeitung der Beschreibung vor dem Commit" -#: builtin/merge.c:215 +#: builtin/merge.c:216 msgid "allow fast-forward (default)" msgstr "Vorspulen erlauben (Standard)" -#: builtin/merge.c:217 builtin/pull.c:164 +#: builtin/merge.c:218 builtin/pull.c:169 msgid "abort if fast-forward is not possible" msgstr "abbrechen, wenn kein Vorspulen möglich ist" -#: builtin/merge.c:221 builtin/pull.c:167 +#: builtin/merge.c:222 builtin/pull.c:172 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:222 builtin/notes.c:777 builtin/pull.c:171 +#: builtin/merge.c:223 builtin/notes.c:777 builtin/pull.c:176 #: builtin/revert.c:109 msgid "strategy" msgstr "Strategie" -#: builtin/merge.c:223 builtin/pull.c:172 +#: builtin/merge.c:224 builtin/pull.c:177 msgid "merge strategy to use" msgstr "zu verwendende Merge-Strategie" -#: builtin/merge.c:224 builtin/pull.c:175 +#: builtin/merge.c:225 builtin/pull.c:180 msgid "option=value" msgstr "Option=Wert" -#: builtin/merge.c:225 builtin/pull.c:176 +#: builtin/merge.c:226 builtin/pull.c:181 msgid "option for selected merge strategy" msgstr "Option für ausgewählte Merge-Strategie" -#: builtin/merge.c:227 +#: builtin/merge.c:228 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:231 +#: builtin/merge.c:232 msgid "abort the current in-progress merge" msgstr "den sich im Gange befindlichen Merge abbrechen" -#: builtin/merge.c:233 +#: builtin/merge.c:234 msgid "continue the current in-progress merge" msgstr "den sich im Gange befindlichen Merge fortsetzen" -#: builtin/merge.c:235 builtin/pull.c:183 +#: builtin/merge.c:236 builtin/pull.c:188 msgid "allow merging unrelated histories" msgstr "erlaube das Zusammenführen von nicht zusammenhängenden Historien" -#: builtin/merge.c:241 +#: builtin/merge.c:242 msgid "verify commit-msg hook" msgstr "commit-msg Hook überprüfen" -#: builtin/merge.c:266 +#: builtin/merge.c:267 msgid "could not run stash." msgstr "Konnte \"stash\" nicht ausführen." -#: builtin/merge.c:271 +#: builtin/merge.c:272 msgid "stash failed" msgstr "\"stash\" fehlgeschlagen" -#: builtin/merge.c:276 +#: builtin/merge.c:277 #, c-format msgid "not a valid object: %s" msgstr "kein gültiges Objekt: %s" -#: builtin/merge.c:298 builtin/merge.c:315 +#: builtin/merge.c:299 builtin/merge.c:316 msgid "read-tree failed" msgstr "read-tree fehlgeschlagen" -#: builtin/merge.c:345 +#: builtin/merge.c:346 msgid " (nothing to squash)" msgstr " (nichts zu quetschen)" -#: builtin/merge.c:356 +#: builtin/merge.c:357 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Quetsche Commit -- HEAD wird nicht aktualisiert\n" -#: builtin/merge.c:406 +#: builtin/merge.c:407 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "Keine Merge-Commit-Beschreibung -- HEAD wird nicht aktualisiert\n" -#: builtin/merge.c:456 +#: builtin/merge.c:457 #, c-format msgid "'%s' does not point to a commit" msgstr "'%s' zeigt auf keinen Commit" -#: builtin/merge.c:546 +#: builtin/merge.c:547 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Ungültiger branch.%s.mergeoptions String: %s" @@ -10754,19 +11176,19 @@ msgstr "Unbekannte Option für merge-recursive: -X%s" msgid "unable to write %s" msgstr "konnte %s nicht schreiben" -#: builtin/merge.c:749 +#: builtin/merge.c:748 #, c-format msgid "Could not read from '%s'" msgstr "konnte nicht von '%s' lesen" -#: builtin/merge.c:758 +#: builtin/merge.c:757 #, 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:764 +#: builtin/merge.c:763 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -10782,71 +11204,71 @@ msgstr "" "Zeilen beginnend mit '%c' werden ignoriert, und eine leere Beschreibung\n" "bricht den Commit ab.\n" -#: builtin/merge.c:800 +#: builtin/merge.c:799 msgid "Empty commit message." msgstr "Leere Commit-Beschreibung" -#: builtin/merge.c:820 +#: builtin/merge.c:818 #, c-format msgid "Wonderful.\n" msgstr "Wunderbar.\n" -#: builtin/merge.c:873 +#: builtin/merge.c:871 #, 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:912 +#: builtin/merge.c:910 msgid "No current branch." msgstr "Sie befinden sich auf keinem Branch." -#: builtin/merge.c:914 +#: builtin/merge.c:912 msgid "No remote for the current branch." msgstr "Kein Remote-Repository für den aktuellen Branch." -#: builtin/merge.c:916 +#: builtin/merge.c:914 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:921 +#: builtin/merge.c:919 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "Kein Remote-Tracking-Branch für %s von %s" -#: builtin/merge.c:974 +#: builtin/merge.c:972 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Fehlerhafter Wert '%s' in Umgebungsvariable '%s'" -#: builtin/merge.c:1076 +#: builtin/merge.c:1074 #, 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:1110 +#: builtin/merge.c:1108 msgid "not something we can merge" msgstr "nichts was wir zusammenführen können" -#: builtin/merge.c:1212 +#: builtin/merge.c:1210 msgid "--abort expects no arguments" msgstr "--abort akzeptiert keine Argumente" -#: builtin/merge.c:1216 +#: builtin/merge.c:1214 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "Es gibt keinen Merge abzubrechen (MERGE_HEAD fehlt)" -#: builtin/merge.c:1228 +#: builtin/merge.c:1226 msgid "--continue expects no arguments" msgstr "--continue erwartet keine Argumente" -#: builtin/merge.c:1232 +#: builtin/merge.c:1230 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "Es ist kein Merge im Gange (MERGE_HEAD fehlt)." -#: builtin/merge.c:1248 +#: builtin/merge.c:1246 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -10854,7 +11276,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:1255 +#: builtin/merge.c:1253 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -10862,117 +11284,117 @@ 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:1258 +#: builtin/merge.c:1256 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:1267 +#: builtin/merge.c:1265 msgid "You cannot combine --squash with --no-ff." msgstr "Sie können --squash nicht mit --no-ff kombinieren." -#: builtin/merge.c:1275 +#: builtin/merge.c:1273 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "Kein Commit angegeben und merge.defaultToUpstream ist nicht gesetzt." -#: builtin/merge.c:1292 +#: builtin/merge.c:1290 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:1294 +#: builtin/merge.c:1292 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:1299 +#: builtin/merge.c:1297 #, c-format msgid "%s - not something we can merge" msgstr "%s - nichts was wir zusammenführen können" -#: builtin/merge.c:1301 +#: builtin/merge.c:1299 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:1335 +#: builtin/merge.c:1333 #, 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." -#: builtin/merge.c:1338 +#: builtin/merge.c:1336 #, 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." -#: builtin/merge.c:1341 +#: builtin/merge.c:1339 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "Commit %s hat keine GPG-Signatur." -#: builtin/merge.c:1344 +#: builtin/merge.c:1342 #, 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" -#: builtin/merge.c:1403 +#: builtin/merge.c:1401 msgid "refusing to merge unrelated histories" msgstr "Verweigere den Merge von nicht zusammenhängenden Historien." -#: builtin/merge.c:1412 +#: builtin/merge.c:1410 msgid "Already up to date." msgstr "Bereits aktuell." -#: builtin/merge.c:1422 +#: builtin/merge.c:1420 #, c-format msgid "Updating %s..%s\n" msgstr "Aktualisiere %s..%s\n" -#: builtin/merge.c:1463 +#: builtin/merge.c:1461 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Probiere wirklich trivialen \"in-index\"-Merge ...\n" -#: builtin/merge.c:1470 +#: builtin/merge.c:1468 #, c-format msgid "Nope.\n" msgstr "Nein.\n" -#: builtin/merge.c:1495 +#: builtin/merge.c:1493 msgid "Already up to date. Yeeah!" msgstr "Bereits aktuell." -#: builtin/merge.c:1501 +#: builtin/merge.c:1499 msgid "Not possible to fast-forward, aborting." msgstr "Vorspulen nicht möglich, breche ab." -#: builtin/merge.c:1524 builtin/merge.c:1603 +#: builtin/merge.c:1522 builtin/merge.c:1601 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Rücklauf des Verzeichnisses bis zum Ursprung ...\n" -#: builtin/merge.c:1528 +#: builtin/merge.c:1526 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Probiere Merge-Strategie %s ...\n" -#: builtin/merge.c:1594 +#: builtin/merge.c:1592 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Keine Merge-Strategie behandelt diesen Merge.\n" -#: builtin/merge.c:1596 +#: builtin/merge.c:1594 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Merge mit Strategie %s fehlgeschlagen.\n" -#: builtin/merge.c:1605 +#: builtin/merge.c:1603 #, 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:1617 +#: builtin/merge.c:1615 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -11109,28 +11531,28 @@ msgstr "die Erstellung von mehr als einem \"Tree\"-Objekt erlauben" msgid "git mv [<options>] <source>... <destination>" msgstr "git mv [<Optionen>] <Quelle>... <Ziel>" -#: builtin/mv.c:83 +#: builtin/mv.c:82 #, c-format msgid "Directory %s is in index and no submodule?" msgstr "Verzeichnis %s ist zum Commit vorgemerkt und kein Submodul?" -#: builtin/mv.c:85 builtin/rm.c:289 +#: builtin/mv.c:84 builtin/rm.c:288 msgid "Please stage your changes to .gitmodules or stash them to proceed" msgstr "" "Bitte merken Sie Ihre Änderungen in .gitmodules zum Commit vor oder " "benutzen\n" "Sie \"stash\", um fortzufahren." -#: builtin/mv.c:103 +#: builtin/mv.c:102 #, c-format msgid "%.*s is in index" msgstr "%.*s ist zum Commit vorgemerkt" -#: builtin/mv.c:125 +#: builtin/mv.c:124 msgid "force move/rename even if target exists" msgstr "Verschieben/Umbenennen erzwingen, auch wenn das Ziel existiert" -#: builtin/mv.c:127 +#: builtin/mv.c:126 msgid "skip move/rename errors" msgstr "Fehler beim Verschieben oder Umbenennen überspringen" @@ -11195,7 +11617,7 @@ msgstr "%s, Quelle=%s, Ziel=%s" msgid "Renaming %s to %s\n" msgstr "Benenne %s nach %s um\n" -#: builtin/mv.c:276 builtin/remote.c:712 builtin/repack.c:394 +#: builtin/mv.c:276 builtin/remote.c:715 builtin/repack.c:409 #, c-format msgid "renaming '%s' failed" msgstr "Umbenennung von '%s' fehlgeschlagen" @@ -11388,12 +11810,12 @@ 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:234 builtin/tag.c:506 +#: builtin/notes.c:234 builtin/tag.c:507 #, c-format msgid "cannot read '%s'" msgstr "kann '%s' nicht lesen" -#: builtin/notes.c:236 builtin/tag.c:509 +#: builtin/notes.c:236 builtin/tag.c:510 #, c-format msgid "could not open or read '%s'" msgstr "konnte '%s' nicht öffnen oder lesen" @@ -11646,7 +12068,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:943 builtin/prune.c:106 builtin/worktree.c:160 +#: builtin/notes.c:943 builtin/prune.c:107 builtin/worktree.c:151 msgid "do not remove, show only" msgstr "nicht löschen, nur anzeigen" @@ -11667,225 +12089,255 @@ msgstr "Notizen von <Notiz-Referenz> verwenden" msgid "unknown subcommand: %s" msgstr "Unbekannter Unterbefehl: %s" -#: builtin/pack-objects.c:33 +#: builtin/pack-objects.c:48 msgid "" "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" msgstr "" "git pack-objects --stdout [<Optionen>...] [< <Referenzliste> | < " "<Objektliste>]" -#: builtin/pack-objects.c:34 +#: builtin/pack-objects.c:49 msgid "" "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" msgstr "" "git pack-objects [<Optionen>...] <Basis-Name> [< <Referenzliste> | < " "<Objektliste>]" -#: builtin/pack-objects.c:195 builtin/pack-objects.c:198 +#: builtin/pack-objects.c:211 builtin/pack-objects.c:214 #, c-format msgid "deflate error (%d)" msgstr "Fehler beim Komprimieren (%d)" -#: builtin/pack-objects.c:791 +#: builtin/pack-objects.c:810 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:804 +#: builtin/pack-objects.c:823 msgid "Writing objects" msgstr "Schreibe Objekte" -#: builtin/pack-objects.c:1084 +#: builtin/pack-objects.c:1106 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:2454 +#: builtin/pack-objects.c:1765 +msgid "Counting objects" +msgstr "Zähle Objekte" + +#: builtin/pack-objects.c:1895 +#, c-format +msgid "unable to get size of %s" +msgstr "Konnte Größe von %s nicht bestimmen." + +#: builtin/pack-objects.c:1910 +#, c-format +msgid "unable to parse object header of %s" +msgstr "Konnte Kopfbereich von Objekt '%s' nicht parsen." + +#: builtin/pack-objects.c:2564 msgid "Compressing objects" msgstr "Komprimiere Objekte" -#: builtin/pack-objects.c:2625 +#: builtin/pack-objects.c:2735 msgid "invalid value for --missing" msgstr "Ungültiger Wert für --missing." -#: builtin/pack-objects.c:2928 +#: builtin/pack-objects.c:3067 #, c-format msgid "unsupported index version %s" msgstr "Nicht unterstützte Index-Version %s" -#: builtin/pack-objects.c:2932 +#: builtin/pack-objects.c:3071 #, c-format msgid "bad index version '%s'" msgstr "Ungültige Index-Version '%s'" -#: builtin/pack-objects.c:2962 +#: builtin/pack-objects.c:3102 msgid "do not show progress meter" msgstr "keine Fortschrittsanzeige anzeigen" -#: builtin/pack-objects.c:2964 +#: builtin/pack-objects.c:3104 msgid "show progress meter" msgstr "Fortschrittsanzeige anzeigen" -#: builtin/pack-objects.c:2966 +#: builtin/pack-objects.c:3106 msgid "show progress meter during object writing phase" msgstr "Forschrittsanzeige während des Schreibens von Objekten anzeigen" -#: builtin/pack-objects.c:2969 +#: builtin/pack-objects.c:3109 msgid "similar to --all-progress when progress meter is shown" msgstr "ähnlich zu --all-progress wenn Fortschrittsanzeige darstellt wird" -#: builtin/pack-objects.c:2970 +#: builtin/pack-objects.c:3110 msgid "version[,offset]" msgstr "version[,offset]" -#: builtin/pack-objects.c:2971 +#: builtin/pack-objects.c:3111 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:2974 +#: builtin/pack-objects.c:3114 msgid "maximum size of each output pack file" msgstr "maximale Größe für jede ausgegebene Paketdatei" -#: builtin/pack-objects.c:2976 +#: builtin/pack-objects.c:3116 msgid "ignore borrowed objects from alternate object store" msgstr "geliehene Objekte von alternativem Objektspeicher ignorieren" -#: builtin/pack-objects.c:2978 +#: builtin/pack-objects.c:3118 msgid "ignore packed objects" msgstr "gepackte Objekte ignorieren" -#: builtin/pack-objects.c:2980 +#: builtin/pack-objects.c:3120 msgid "limit pack window by objects" msgstr "Paketfenster durch Objekte begrenzen" -#: builtin/pack-objects.c:2982 +#: builtin/pack-objects.c:3122 msgid "limit pack window by memory in addition to object limit" msgstr "" "Paketfenster, zusätzlich zur Objektbegrenzung, durch Speicher begrenzen" -#: builtin/pack-objects.c:2984 +#: builtin/pack-objects.c:3124 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:2986 +#: builtin/pack-objects.c:3126 msgid "reuse existing deltas" msgstr "existierende Unterschiede wiederverwenden" -#: builtin/pack-objects.c:2988 +#: builtin/pack-objects.c:3128 msgid "reuse existing objects" msgstr "existierende Objekte wiederverwenden" -#: builtin/pack-objects.c:2990 +#: builtin/pack-objects.c:3130 msgid "use OFS_DELTA objects" msgstr "OFS_DELTA Objekte verwenden" -#: builtin/pack-objects.c:2992 +#: builtin/pack-objects.c:3132 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:2994 +#: builtin/pack-objects.c:3134 msgid "do not create an empty pack output" msgstr "keine leeren Pakete erzeugen" -#: builtin/pack-objects.c:2996 +#: builtin/pack-objects.c:3136 msgid "read revision arguments from standard input" msgstr "Argumente bezüglich Commits von der Standard-Eingabe lesen" -#: builtin/pack-objects.c:2998 +#: builtin/pack-objects.c:3138 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:3001 +#: builtin/pack-objects.c:3141 msgid "include objects reachable from any reference" msgstr "Objekte einschließen, die von jeder Referenz erreichbar sind" -#: builtin/pack-objects.c:3004 +#: builtin/pack-objects.c:3144 msgid "include objects referred by reflog entries" msgstr "" "Objekte einschließen, die von Einträgen des Reflogs referenziert werden" -#: builtin/pack-objects.c:3007 +#: builtin/pack-objects.c:3147 msgid "include objects referred to by the index" msgstr "Objekte einschließen, die vom Index referenziert werden" -#: builtin/pack-objects.c:3010 +#: builtin/pack-objects.c:3150 msgid "output pack to stdout" msgstr "Paket in die Standard-Ausgabe schreiben" -#: builtin/pack-objects.c:3012 +#: builtin/pack-objects.c:3152 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:3014 +#: builtin/pack-objects.c:3154 msgid "keep unreachable objects" msgstr "nicht erreichbare Objekte behalten" -#: builtin/pack-objects.c:3016 +#: builtin/pack-objects.c:3156 msgid "pack loose unreachable objects" msgstr "nicht erreichbare lose Objekte packen" -#: builtin/pack-objects.c:3018 +#: builtin/pack-objects.c:3158 msgid "unpack unreachable objects newer than <time>" msgstr "nicht erreichbare Objekte entpacken, die neuer als <Zeit> sind" -#: builtin/pack-objects.c:3021 +#: builtin/pack-objects.c:3161 msgid "create thin packs" msgstr "dünnere Pakete erzeugen" -#: builtin/pack-objects.c:3023 +#: builtin/pack-objects.c:3163 msgid "create packs suitable for shallow fetches" msgstr "" "Pakete geeignet für Abholung mit unvollständiger Historie (shallow) erzeugen" -#: builtin/pack-objects.c:3025 +#: builtin/pack-objects.c:3165 msgid "ignore packs that have companion .keep file" msgstr "Pakete ignorieren, die .keep Dateien haben" -#: builtin/pack-objects.c:3027 +#: builtin/pack-objects.c:3167 +msgid "ignore this pack" +msgstr "dieses Paket ignorieren" + +#: builtin/pack-objects.c:3169 msgid "pack compression level" msgstr "Komprimierungsgrad für Paketierung" -#: builtin/pack-objects.c:3029 +#: builtin/pack-objects.c:3171 msgid "do not hide commits by grafts" msgstr "keine künstlichen Vorgänger-Commits (\"grafts\") verbergen" -#: builtin/pack-objects.c:3031 +#: builtin/pack-objects.c:3173 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:3033 +#: builtin/pack-objects.c:3175 msgid "write a bitmap index together with the pack index" msgstr "Bitmap-Index zusammen mit Pack-Index schreiben" -#: builtin/pack-objects.c:3036 +#: builtin/pack-objects.c:3178 msgid "handling for missing objects" msgstr "Behandlung für fehlende Objekte" -#: builtin/pack-objects.c:3039 +#: builtin/pack-objects.c:3181 msgid "do not pack objects in promisor packfiles" -msgstr "keine Objekte aus Packdateien von partiell geklonten Remote-Repositories packen" +msgstr "" +"keine Objekte aus Packdateien von partiell geklonten Remote-Repositories " +"packen" -#: builtin/pack-objects.c:3178 -msgid "Counting objects" -msgstr "Zähle Objekte" +#: builtin/pack-objects.c:3205 +#, 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:3210 +#, c-format +msgid "pack.deltaCacheLimit is too high, forcing %d" +msgstr "pack.deltaCacheLimit ist zu hoch, erzwinge %d" -#: builtin/pack-refs.c:6 +#: builtin/pack-objects.c:3338 +msgid "Enumerating objects" +msgstr "Objekte aufzählen" + +#: builtin/pack-refs.c:7 msgid "git pack-refs [<options>]" msgstr "git pack-refs [<Optionen>]" -#: builtin/pack-refs.c:14 +#: builtin/pack-refs.c:15 msgid "pack everything" msgstr "alles packen" -#: builtin/pack-refs.c:15 +#: builtin/pack-refs.c:16 msgid "prune loose refs (default)" msgstr "lose Referenzen entfernen (Standard)" @@ -11901,65 +12353,67 @@ 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:107 +#: builtin/prune.c:108 msgid "report pruned objects" msgstr "gelöschte Objekte melden" -#: builtin/prune.c:110 +#: builtin/prune.c:111 msgid "expire objects older than <time>" msgstr "Objekte älter als <Zeit> verfallen lassen" -#: builtin/prune.c:112 +#: builtin/prune.c:113 msgid "limit traversal to objects outside promisor packfiles" -msgstr "Traversierung auf Objekte außerhalb von Packdateien aus partiell geklonten Remote-Repositories einschränken" +msgstr "" +"Traversierung auf Objekte außerhalb von Packdateien aus partiell geklonten " +"Remote-Repositories einschränken" -#: builtin/prune.c:126 +#: builtin/prune.c:127 msgid "cannot prune in a precious-objects repo" msgstr "kann \"prune\" in precious-objects Repository nicht ausführen" -#: builtin/pull.c:54 builtin/pull.c:56 +#: builtin/pull.c:59 builtin/pull.c:61 #, c-format msgid "Invalid value for %s: %s" msgstr "Ungültiger Wert für %s: %s" -#: builtin/pull.c:76 +#: builtin/pull.c:81 msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "git pull [<Optionen>] [<Repository> [<Refspec>...]]" -#: builtin/pull.c:127 +#: builtin/pull.c:132 msgid "control for recursive fetching of submodules" msgstr "rekursive Anforderungen von Submodulen kontrollieren" -#: builtin/pull.c:131 +#: builtin/pull.c:136 msgid "Options related to merging" msgstr "Optionen bezogen auf Merge" -#: builtin/pull.c:134 +#: builtin/pull.c:139 msgid "incorporate changes by rebasing rather than merging" msgstr "Integration von Änderungen durch Rebase statt Merge" -#: builtin/pull.c:161 builtin/rebase--helper.c:23 builtin/revert.c:121 +#: builtin/pull.c:166 builtin/rebase--helper.c:23 builtin/revert.c:121 msgid "allow fast-forward" msgstr "Vorspulen erlauben" -#: builtin/pull.c:170 +#: builtin/pull.c:175 msgid "automatically stash/stash pop before and after rebase" msgstr "automatischer Stash/Stash-Pop vor und nach eines Rebase" -#: builtin/pull.c:186 +#: builtin/pull.c:191 msgid "Options related to fetching" msgstr "Optionen bezogen auf Fetch" -#: builtin/pull.c:204 +#: builtin/pull.c:209 msgid "number of submodules pulled in parallel" msgstr "Anzahl der parallel mit 'pull' zu verarbeitenden Submodule" -#: builtin/pull.c:299 +#: builtin/pull.c:304 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "Ungültiger Wert für pull.ff: %s" -#: builtin/pull.c:415 +#: builtin/pull.c:420 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." @@ -11967,14 +12421,14 @@ msgstr "" "Es gibt keinen Kandidaten für Rebase innerhalb der Referenzen, die eben " "angefordert wurden." -#: builtin/pull.c:417 +#: builtin/pull.c:422 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:418 +#: builtin/pull.c:423 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." @@ -11982,7 +12436,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:421 +#: builtin/pull.c:426 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -11994,39 +12448,39 @@ msgstr "" "Repository für den aktuellen Branch ist, müssen Sie einen Branch auf\n" "der Befehlszeile angeben." -#: builtin/pull.c:426 git-parse-remote.sh:73 +#: builtin/pull.c:431 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "Im Moment auf keinem Branch." -#: builtin/pull.c:428 builtin/pull.c:443 git-parse-remote.sh:79 +#: builtin/pull.c:433 builtin/pull.c:448 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:430 builtin/pull.c:445 git-parse-remote.sh:82 +#: builtin/pull.c:435 builtin/pull.c:450 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:431 builtin/pull.c:446 +#: builtin/pull.c:436 builtin/pull.c:451 msgid "See git-pull(1) for details." msgstr "Siehe git-pull(1) für weitere Details." -#: builtin/pull.c:433 builtin/pull.c:439 builtin/pull.c:448 +#: builtin/pull.c:438 builtin/pull.c:444 builtin/pull.c:453 #: git-parse-remote.sh:64 msgid "<remote>" msgstr "<Remote-Repository>" -#: builtin/pull.c:433 builtin/pull.c:448 builtin/pull.c:453 git-rebase.sh:477 +#: builtin/pull.c:438 builtin/pull.c:453 builtin/pull.c:458 git-rebase.sh:523 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "<Branch>" -#: builtin/pull.c:441 git-parse-remote.sh:75 +#: builtin/pull.c:446 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:450 git-parse-remote.sh:95 +#: builtin/pull.c:455 git-parse-remote.sh:95 msgid "" "If you wish to set tracking information for this branch you can do so with:" msgstr "" @@ -12034,7 +12488,7 @@ msgstr "" "Sie\n" "dies tun mit:" -#: builtin/pull.c:455 +#: builtin/pull.c:460 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -12044,29 +12498,29 @@ msgstr "" "des Remote-Repositories durchzuführen, aber diese Referenz\n" "wurde nicht angefordert." -#: builtin/pull.c:819 +#: builtin/pull.c:826 msgid "ignoring --verify-signatures for rebase" msgstr "Ignoriere --verify-signatures für Rebase" -#: builtin/pull.c:867 +#: builtin/pull.c:874 msgid "--[no-]autostash option is only valid with --rebase." msgstr "--[no-]autostash ist nur mit --rebase zulässig." -#: builtin/pull.c:875 +#: builtin/pull.c:882 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:878 +#: builtin/pull.c:885 msgid "pull with rebase" msgstr "Pull mit Rebase" -#: builtin/pull.c:879 +#: builtin/pull.c:886 msgid "please commit or stash them." msgstr "Bitte committen Sie die Änderungen oder benutzen Sie \"stash\"." -#: builtin/pull.c:904 +#: builtin/pull.c:911 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -12076,7 +12530,7 @@ msgstr "" "\"fetch\" aktualisierte die Spitze des aktuellen Branches.\n" "Spule Ihr Arbeitsverzeichnis von Commit %s vor." -#: builtin/pull.c:909 +#: builtin/pull.c:916 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -12093,33 +12547,33 @@ msgstr "" "$ git reset --hard\n" "zur Wiederherstellung aus." -#: builtin/pull.c:924 +#: builtin/pull.c:931 msgid "Cannot merge multiple branches into empty head." msgstr "Kann nicht mehrere Branches in einen leeren Branch zusammenführen." -#: builtin/pull.c:928 +#: builtin/pull.c:935 msgid "Cannot rebase onto multiple branches." msgstr "Kann Rebase nicht auf mehrere Branches ausführen." -#: builtin/pull.c:935 +#: builtin/pull.c:942 msgid "cannot rebase with locally recorded submodule modifications" msgstr "" "Kann Rebase nicht mit lokal aufgezeichneten Änderungen in Submodulen " "ausführen." -#: builtin/push.c:17 +#: builtin/push.c:19 msgid "git push [<options>] [<repository> [<refspec>...]]" msgstr "git push [<Optionen>] [<Repository> [<Refspec>...]]" -#: builtin/push.c:92 +#: builtin/push.c:111 msgid "tag shorthand without <tag>" msgstr "Kurzschrift für Tag ohne <Tag>" -#: builtin/push.c:102 +#: builtin/push.c:121 msgid "--delete only accepts plain target ref names" msgstr "Die Option --delete akzeptiert nur reine Referenznamen als Ziel." -#: builtin/push.c:146 +#: builtin/push.c:165 msgid "" "\n" "To choose either option permanently, see push.default in 'git help config'." @@ -12128,7 +12582,7 @@ msgstr "" "Um eine Variante permanent zu verwenden, siehe push.default in 'git help " "config'." -#: builtin/push.c:149 +#: builtin/push.c:168 #, c-format msgid "" "The upstream branch of your current branch does not match\n" @@ -12154,7 +12608,7 @@ msgstr "" " git push %s %s\n" "%s" -#: builtin/push.c:164 +#: builtin/push.c:183 #, c-format msgid "" "You are not currently on a branch.\n" @@ -12169,7 +12623,7 @@ msgstr "" "\n" " git push %s HEAD:<Name-des-Remote-Branches>\n" -#: builtin/push.c:178 +#: builtin/push.c:197 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -12183,13 +12637,13 @@ msgstr "" "\n" " git push --set-upstream %s %s\n" -#: builtin/push.c:186 +#: builtin/push.c:205 #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." msgstr "" "Der aktuelle Branch %s hat mehrere Upstream-Branches, \"push\" verweigert." -#: builtin/push.c:189 +#: builtin/push.c:208 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -12200,14 +12654,14 @@ msgstr "" "Branches '%s' ist, ohne anzugeben, was versendet werden soll, um welchen\n" "Remote-Branch zu aktualisieren." -#: builtin/push.c:248 +#: builtin/push.c:267 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "" "Sie haben keine Refspec für \"push\" angegeben, und push.default ist " "\"nothing\"." -#: builtin/push.c:255 +#: builtin/push.c:274 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -12221,7 +12675,7 @@ msgstr "" "Siehe auch die Sektion 'Note about fast-forwards' in 'git push --help'\n" "für weitere Details." -#: builtin/push.c:261 +#: builtin/push.c:280 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. Check out this branch and integrate the remote changes\n" @@ -12235,7 +12689,7 @@ msgstr "" "Siehe auch die Sektion 'Note about fast-forwards' in 'git push --help'\n" "für weitere Details." -#: builtin/push.c:267 +#: builtin/push.c:286 msgid "" "Updates were rejected because the remote contains work that you do\n" "not have locally. This is usually caused by another repository pushing\n" @@ -12254,13 +12708,13 @@ msgstr "" "Siehe auch die Sektion 'Note about fast-forwards' in 'git push --help'\n" "für weitere Details." -#: builtin/push.c:274 +#: builtin/push.c:293 msgid "Updates were rejected because the tag already exists in the remote." msgstr "" "Aktualisierungen wurden zurückgewiesen, weil das Tag bereits\n" "im Remote-Repository existiert." -#: builtin/push.c:277 +#: builtin/push.c:296 msgid "" "You cannot update a remote ref that points at a non-commit object,\n" "or update a remote ref to make it point at a non-commit object,\n" @@ -12270,22 +12724,22 @@ msgstr "" "das kein Commit ist, oder es auf ein solches Objekt zeigen lassen, ohne\n" "die Option '--force' zu verwenden.\n" -#: builtin/push.c:337 +#: builtin/push.c:357 #, c-format msgid "Pushing to %s\n" msgstr "Versende nach %s\n" -#: builtin/push.c:341 +#: builtin/push.c:361 #, c-format msgid "failed to push some refs to '%s'" msgstr "Fehler beim Versenden einiger Referenzen nach '%s'" -#: builtin/push.c:372 +#: builtin/push.c:395 #, c-format msgid "bad repository '%s'" msgstr "ungültiges Repository '%s'" -#: builtin/push.c:373 +#: builtin/push.c:396 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -12307,112 +12761,104 @@ msgstr "" "\n" " git push <Name>\n" -#: builtin/push.c:391 -msgid "--all and --tags are incompatible" -msgstr "Die Optionen --all und --tags sind inkompatibel." - -#: builtin/push.c:392 -msgid "--all can't be combined with refspecs" -msgstr "Die Option --all kann nicht mit Refspecs kombiniert werden." - -#: builtin/push.c:397 -msgid "--mirror and --tags are incompatible" -msgstr "Die Optionen --mirror und --tags sind inkompatibel." - -#: builtin/push.c:398 -msgid "--mirror can't be combined with refspecs" -msgstr "Die Option --mirror kann nicht mit Refspecs kombiniert werden." - -#: builtin/push.c:403 -msgid "--all and --mirror are incompatible" -msgstr "Die Optionen --all und --mirror sind inkompatibel." - -#: builtin/push.c:535 +#: builtin/push.c:551 msgid "repository" msgstr "Repository" -#: builtin/push.c:536 builtin/send-pack.c:163 +#: builtin/push.c:552 builtin/send-pack.c:164 msgid "push all refs" msgstr "alle Referenzen versenden" -#: builtin/push.c:537 builtin/send-pack.c:165 +#: builtin/push.c:553 builtin/send-pack.c:166 msgid "mirror all refs" msgstr "alle Referenzen spiegeln" -#: builtin/push.c:539 +#: builtin/push.c:555 msgid "delete refs" msgstr "Referenzen löschen" -#: builtin/push.c:540 +#: builtin/push.c:556 msgid "push tags (can't be used with --all or --mirror)" msgstr "Tags versenden (kann nicht mit --all oder --mirror verwendet werden)" -#: builtin/push.c:543 builtin/send-pack.c:166 +#: builtin/push.c:559 builtin/send-pack.c:167 msgid "force updates" msgstr "Aktualisierung erzwingen" -#: builtin/push.c:545 builtin/send-pack.c:180 +#: builtin/push.c:561 builtin/send-pack.c:181 msgid "refname>:<expect" msgstr "Referenzname>:<Erwartungswert" -#: builtin/push.c:546 builtin/send-pack.c:181 +#: builtin/push.c:562 builtin/send-pack.c:182 msgid "require old value of ref to be at this value" msgstr "Referenz muss sich auf dem angegebenen Wert befinden" -#: builtin/push.c:549 +#: builtin/push.c:565 msgid "control recursive pushing of submodules" msgstr "rekursiven \"push\" von Submodulen steuern" -#: builtin/push.c:551 builtin/send-pack.c:174 +#: builtin/push.c:567 builtin/send-pack.c:175 msgid "use thin pack" msgstr "kleinere Pakete verwenden" -#: builtin/push.c:552 builtin/push.c:553 builtin/send-pack.c:160 -#: builtin/send-pack.c:161 +#: builtin/push.c:568 builtin/push.c:569 builtin/send-pack.c:161 +#: builtin/send-pack.c:162 msgid "receive pack program" msgstr "'receive pack' Programm" -#: builtin/push.c:554 +#: builtin/push.c:570 msgid "set upstream for git pull/status" msgstr "Upstream für \"git pull/status\" setzen" -#: builtin/push.c:557 +#: builtin/push.c:573 msgid "prune locally removed refs" msgstr "lokal gelöschte Referenzen entfernen" -#: builtin/push.c:559 +#: builtin/push.c:575 msgid "bypass pre-push hook" msgstr "\"pre-push hook\" umgehen" -#: builtin/push.c:560 +#: builtin/push.c:576 msgid "push missing but relevant tags" msgstr "fehlende, aber relevante Tags versenden" -#: builtin/push.c:563 builtin/send-pack.c:168 +#: builtin/push.c:579 builtin/send-pack.c:169 msgid "GPG sign the push" msgstr "signiert \"push\" mit GPG" -#: builtin/push.c:565 builtin/send-pack.c:175 +#: builtin/push.c:581 builtin/send-pack.c:176 msgid "request atomic transaction on remote side" msgstr "Referenzen atomar versenden" -#: builtin/push.c:566 builtin/send-pack.c:171 -msgid "server-specific" -msgstr "serverspezifisch" - -#: builtin/push.c:566 builtin/send-pack.c:172 -msgid "option to transmit" -msgstr "Option übertragen" - -#: builtin/push.c:583 +#: builtin/push.c:599 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "Die Option --delete ist inkompatibel mit --all, --mirror und --tags." -#: builtin/push.c:585 +#: builtin/push.c:601 msgid "--delete doesn't make sense without any refs" msgstr "Die Option --delete kann nur mit Referenzen verwendet werden." #: builtin/push.c:604 +msgid "--all and --tags are incompatible" +msgstr "Die Optionen --all und --tags sind inkompatibel." + +#: builtin/push.c:606 +msgid "--all can't be combined with refspecs" +msgstr "Die Option --all kann nicht mit Refspecs kombiniert werden." + +#: builtin/push.c:610 +msgid "--mirror and --tags are incompatible" +msgstr "Die Optionen --mirror und --tags sind inkompatibel." + +#: builtin/push.c:612 +msgid "--mirror can't be combined with refspecs" +msgstr "Die Option --mirror kann nicht mit Refspecs kombiniert werden." + +#: builtin/push.c:615 +msgid "--all and --mirror are incompatible" +msgstr "Die Optionen --all und --mirror sind inkompatibel." + +#: builtin/push.c:634 msgid "push options must not have new line characters" msgstr "Push-Optionen dürfen keine Zeilenvorschubzeichen haben" @@ -12427,67 +12873,67 @@ msgstr "" "index-output=<Datei>] (--empty | <Commit-Referenz1> [<Commit-Referenz2> " "[<Commit-Referenz3>]])" -#: builtin/read-tree.c:121 +#: builtin/read-tree.c:120 msgid "write resulting index to <file>" msgstr "resultierenden Index nach <Datei> schreiben" -#: builtin/read-tree.c:124 +#: builtin/read-tree.c:123 msgid "only empty the index" msgstr "nur den Index leeren" -#: builtin/read-tree.c:126 +#: builtin/read-tree.c:125 msgid "Merging" msgstr "Merge" -#: builtin/read-tree.c:128 +#: builtin/read-tree.c:127 msgid "perform a merge in addition to a read" msgstr "einen Merge, zusätzlich zum Lesen, ausführen" -#: builtin/read-tree.c:130 +#: builtin/read-tree.c:129 msgid "3-way merge if no file level merging required" msgstr "3-Wege-Merge, wenn kein Merge auf Dateiebene erforderlich ist" -#: builtin/read-tree.c:132 +#: builtin/read-tree.c:131 msgid "3-way merge in presence of adds and removes" msgstr "3-Wege-Merge bei Vorhandensein von hinzugefügten/entfernten Zeilen" -#: builtin/read-tree.c:134 +#: builtin/read-tree.c:133 msgid "same as -m, but discard unmerged entries" msgstr "genau wie -m, aber nicht zusammengeführte Einträge verwerfen" -#: builtin/read-tree.c:135 +#: builtin/read-tree.c:134 msgid "<subdirectory>/" msgstr "<Unterverzeichnis>/" -#: builtin/read-tree.c:136 +#: builtin/read-tree.c:135 msgid "read the tree into the index under <subdirectory>/" msgstr "das Verzeichnis in den Index unter <Unterverzeichnis>/ lesen" -#: builtin/read-tree.c:139 +#: builtin/read-tree.c:138 msgid "update working tree with merge result" msgstr "Arbeitsverzeichnis mit dem Ergebnis des Merges aktualisieren" -#: builtin/read-tree.c:141 +#: builtin/read-tree.c:140 msgid "gitignore" msgstr "gitignore" -#: builtin/read-tree.c:142 +#: builtin/read-tree.c:141 msgid "allow explicitly ignored files to be overwritten" msgstr "explizit ignorierte Dateien zu überschreiben erlauben" -#: builtin/read-tree.c:145 +#: builtin/read-tree.c:144 msgid "don't check the working tree after merging" msgstr "das Arbeitsverzeichnis nach dem Merge nicht prüfen" -#: builtin/read-tree.c:146 +#: builtin/read-tree.c:145 msgid "don't update the index or the work tree" msgstr "weder den Index, noch das Arbeitsverzeichnis aktualisieren" -#: builtin/read-tree.c:148 +#: builtin/read-tree.c:147 msgid "skip applying sparse checkout filter" msgstr "Anwendung des Filters für partielles Auschecken überspringen" -#: builtin/read-tree.c:150 +#: builtin/read-tree.c:149 msgid "debug unpack-trees" msgstr "unpack-trees protokollieren" @@ -12504,46 +12950,58 @@ msgid "allow commits with empty messages" msgstr "Commits mit leerer Beschreibung erlauben" #: builtin/rebase--helper.c:27 +msgid "rebase merge commits" +msgstr "Rebase auf Merge-Commits ausführen" + +#: builtin/rebase--helper.c:29 +msgid "keep original branch points of cousins" +msgstr "originale Branch-Punkte der Cousins behalten" + +#: builtin/rebase--helper.c:30 msgid "continue rebase" msgstr "Rebase fortsetzen" -#: builtin/rebase--helper.c:29 +#: builtin/rebase--helper.c:32 msgid "abort rebase" msgstr "Rebase abbrechen" -#: builtin/rebase--helper.c:32 +#: builtin/rebase--helper.c:35 msgid "make rebase script" msgstr "Rebase-Skript erstellen" -#: builtin/rebase--helper.c:34 +#: builtin/rebase--helper.c:37 msgid "shorten commit ids in the todo list" msgstr "Commit-IDs in der TODO-Liste verkürzen" -#: builtin/rebase--helper.c:36 +#: builtin/rebase--helper.c:39 msgid "expand commit ids in the todo list" msgstr "Commit-IDs in der TODO-Liste erweitern" -#: builtin/rebase--helper.c:38 +#: builtin/rebase--helper.c:41 msgid "check the todo list" msgstr "die TODO-Liste prüfen" -#: builtin/rebase--helper.c:40 +#: builtin/rebase--helper.c:43 msgid "skip unnecessary picks" msgstr "nicht erforderliche \"pick\"-Befehle auslassen" -#: builtin/rebase--helper.c:42 +#: builtin/rebase--helper.c:45 msgid "rearrange fixup/squash lines" msgstr "fixup/squash-Zeilen umordnen" -#: builtin/rebase--helper.c:44 +#: builtin/rebase--helper.c:47 msgid "insert exec commands in todo list" msgstr "\"exec\"-Befehle in TODO-Liste einfügen" -#: builtin/receive-pack.c:30 +#: builtin/rebase--helper.c:68 +msgid "--[no-]rebase-cousins has no effect without --rebase-merges" +msgstr "--[no-]rebase-cousins hat ohne --rebase-merges keine Auswirkung" + +#: builtin/receive-pack.c:31 msgid "git receive-pack <git-dir>" msgstr "git receive-pack <Git-Verzeichnis>" -#: builtin/receive-pack.c:841 +#: builtin/receive-pack.c:842 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" @@ -12575,7 +13033,7 @@ msgstr "" "setzen Sie die Konfigurationsvariable 'receive.denyCurrentBranch' auf\n" "'refuse'." -#: builtin/receive-pack.c:861 +#: builtin/receive-pack.c:862 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" @@ -12596,11 +13054,11 @@ msgstr "" "\n" "Um diese Meldung zu unterdrücken, setzen Sie die Variable auf 'refuse'." -#: builtin/receive-pack.c:1934 +#: builtin/receive-pack.c:1935 msgid "quiet" msgstr "weniger Ausgaben" -#: builtin/receive-pack.c:1948 +#: builtin/receive-pack.c:1949 msgid "You must specify a directory." msgstr "Sie müssen ein Repository angeben." @@ -12609,11 +13067,11 @@ msgstr "Sie müssen ein Repository angeben." msgid "'%s' is not a valid timestamp" msgstr "'%s' ist kein gültiger Zeitstempel" -#: builtin/remote.c:13 +#: builtin/remote.c:14 msgid "git remote [-v | --verbose]" msgstr "git remote [-v | --verbose]" -#: builtin/remote.c:14 +#: builtin/remote.c:15 msgid "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <name> <url>" @@ -12621,82 +13079,82 @@ msgstr "" "git remote add [-t <Branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <Name> <URL>" -#: builtin/remote.c:15 builtin/remote.c:35 +#: builtin/remote.c:16 builtin/remote.c:36 msgid "git remote rename <old> <new>" msgstr "git remote rename <alt> <neu>" -#: builtin/remote.c:16 builtin/remote.c:40 +#: builtin/remote.c:17 builtin/remote.c:41 msgid "git remote remove <name>" msgstr "git remote remove <Name>" -#: builtin/remote.c:17 builtin/remote.c:45 +#: builtin/remote.c:18 builtin/remote.c:46 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" msgstr "git remote set-head <Name> (-a | --auto | -d | --delete | <Branch>)" -#: builtin/remote.c:18 +#: builtin/remote.c:19 msgid "git remote [-v | --verbose] show [-n] <name>" msgstr "git remote [-v | --verbose] show [-n] <Name>" -#: builtin/remote.c:19 +#: builtin/remote.c:20 msgid "git remote prune [-n | --dry-run] <name>" msgstr "git remote prune [-n | --dry-run] <Name>" -#: builtin/remote.c:20 +#: builtin/remote.c:21 msgid "" "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" msgstr "" "git remote [-v | --verbose] update [-p | --prune] [(<Gruppe> | <Remote>)...]" -#: builtin/remote.c:21 +#: builtin/remote.c:22 msgid "git remote set-branches [--add] <name> <branch>..." msgstr "git remote set-branches [--add] <Name> <Branch>..." -#: builtin/remote.c:22 builtin/remote.c:71 +#: builtin/remote.c:23 builtin/remote.c:72 msgid "git remote get-url [--push] [--all] <name>" msgstr "git remote get-url [--push] [--all] <Name>" -#: builtin/remote.c:23 builtin/remote.c:76 +#: builtin/remote.c:24 builtin/remote.c:77 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" msgstr "git remote set-url [--push] <Name> <neueURL> [<alteURL>]" -#: builtin/remote.c:24 builtin/remote.c:77 +#: builtin/remote.c:25 builtin/remote.c:78 msgid "git remote set-url --add <name> <newurl>" msgstr "git remote set-url --add <Name> <neueURL>" -#: builtin/remote.c:25 builtin/remote.c:78 +#: builtin/remote.c:26 builtin/remote.c:79 msgid "git remote set-url --delete <name> <url>" msgstr "git remote set-url --delete <Name> <URL>" -#: builtin/remote.c:30 +#: builtin/remote.c:31 msgid "git remote add [<options>] <name> <url>" msgstr "git remote add [<Optionen>] <Name> <URL>" -#: builtin/remote.c:50 +#: builtin/remote.c:51 msgid "git remote set-branches <name> <branch>..." msgstr "git remote set-branches <Name> <Branch>..." -#: builtin/remote.c:51 +#: builtin/remote.c:52 msgid "git remote set-branches --add <name> <branch>..." msgstr "git remote set-branches --add <Name> <Branch>..." -#: builtin/remote.c:56 +#: builtin/remote.c:57 msgid "git remote show [<options>] <name>" msgstr "git remote show [<Optionen>] <Name>" -#: builtin/remote.c:61 +#: builtin/remote.c:62 msgid "git remote prune [<options>] <name>" msgstr "git remote prune [<Optionen>] <Name>" -#: builtin/remote.c:66 +#: builtin/remote.c:67 msgid "git remote update [<options>] [<group> | <remote>]..." msgstr "git remote update [<Optionen>] [<Gruppe> | <externesRepository>]..." -#: builtin/remote.c:95 +#: builtin/remote.c:96 #, c-format msgid "Updating %s" msgstr "Aktualisiere %s" -#: builtin/remote.c:127 +#: builtin/remote.c:128 msgid "" "--mirror is dangerous and deprecated; please\n" "\t use --mirror=fetch or --mirror=push instead" @@ -12704,92 +13162,92 @@ msgstr "" "--mirror ist gefährlich und veraltet; bitte\n" "\t benutzen Sie stattdessen --mirror=fetch oder --mirror=push" -#: builtin/remote.c:144 +#: builtin/remote.c:145 #, c-format msgid "unknown mirror argument: %s" msgstr "unbekanntes Argument für Option --mirror: %s" -#: builtin/remote.c:160 +#: builtin/remote.c:161 msgid "fetch the remote branches" msgstr "die Remote-Branches anfordern" -#: builtin/remote.c:162 +#: builtin/remote.c:163 msgid "import all tags and associated objects when fetching" msgstr "alle Tags und verbundene Objekte beim Anfordern importieren" -#: builtin/remote.c:165 +#: builtin/remote.c:166 msgid "or do not fetch any tag at all (--no-tags)" msgstr "oder fordere gar keine Tags an (--no-tags)" -#: builtin/remote.c:167 +#: builtin/remote.c:168 msgid "branch(es) to track" msgstr "Branch(es) zur Übernahme" -#: builtin/remote.c:168 +#: builtin/remote.c:169 msgid "master branch" msgstr "Hauptbranch" -#: builtin/remote.c:169 +#: builtin/remote.c:170 msgid "push|fetch" msgstr "push|fetch" -#: builtin/remote.c:170 +#: builtin/remote.c:171 msgid "set up remote as a mirror to push to or fetch from" msgstr "" "Aufsetzen des Remote-Repositories als Spiegel-Repository für \"push\" und " "\"fetch\"" -#: builtin/remote.c:182 +#: builtin/remote.c:183 msgid "specifying a master branch makes no sense with --mirror" msgstr "" "Die Option --mirror kann nicht mit der Angabe eines Hauptbranches verwendet " "werden." -#: builtin/remote.c:184 +#: builtin/remote.c:185 msgid "specifying branches to track makes sense only with fetch mirrors" msgstr "" "Die Angabe von zu folgenden Branches kann nur mit dem Anfordern von " "Spiegelarchiven verwendet werden." -#: builtin/remote.c:191 builtin/remote.c:631 +#: builtin/remote.c:192 builtin/remote.c:634 #, c-format msgid "remote %s already exists." msgstr "externes Repository %s existiert bereits" -#: builtin/remote.c:195 builtin/remote.c:635 +#: builtin/remote.c:196 builtin/remote.c:638 #, c-format msgid "'%s' is not a valid remote name" msgstr "'%s' ist kein gültiger Name für ein Remote-Repository" -#: builtin/remote.c:235 +#: builtin/remote.c:236 #, c-format msgid "Could not setup master '%s'" msgstr "Konnte symbolische Referenz für Hauptbranch von '%s' nicht einrichten" -#: builtin/remote.c:337 +#: builtin/remote.c:342 #, c-format msgid "Could not get fetch map for refspec %s" msgstr "Konnte Fetch-Map für Refspec %s nicht bekommen" -#: builtin/remote.c:438 builtin/remote.c:446 +#: builtin/remote.c:441 builtin/remote.c:449 msgid "(matching)" msgstr "(übereinstimmend)" -#: builtin/remote.c:450 +#: builtin/remote.c:453 msgid "(delete)" msgstr "(lösche)" -#: builtin/remote.c:624 builtin/remote.c:759 builtin/remote.c:858 +#: builtin/remote.c:627 builtin/remote.c:762 builtin/remote.c:861 #, c-format msgid "No such remote: %s" msgstr "Kein solches Remote-Repository: %s" -#: builtin/remote.c:641 +#: builtin/remote.c:644 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "Konnte Sektion '%s' in Konfiguration nicht nach '%s' umbenennen" -#: builtin/remote.c:661 +#: builtin/remote.c:664 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -12800,17 +13258,17 @@ msgstr "" "\t%s\n" "\tBitte aktualisieren Sie, falls notwendig, die Konfiguration manuell." -#: builtin/remote.c:697 +#: builtin/remote.c:700 #, c-format msgid "deleting '%s' failed" msgstr "Konnte '%s' nicht löschen" -#: builtin/remote.c:731 +#: builtin/remote.c:734 #, c-format msgid "creating '%s' failed" msgstr "Konnte '%s' nicht erstellen" -#: builtin/remote.c:796 +#: builtin/remote.c:799 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -12826,113 +13284,118 @@ msgstr[1] "" "entfernt;\n" "um diese zu entfernen, benutzen Sie:" -#: builtin/remote.c:810 +#: builtin/remote.c:813 #, c-format msgid "Could not remove config section '%s'" msgstr "Konnte Sektion '%s' nicht aus Konfiguration entfernen" -#: builtin/remote.c:911 +#: builtin/remote.c:914 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " neu (wird bei nächstem \"fetch\" in remotes/%s gespeichert)" -#: builtin/remote.c:914 +#: builtin/remote.c:917 msgid " tracked" msgstr " gefolgt" -#: builtin/remote.c:916 +#: builtin/remote.c:919 msgid " stale (use 'git remote prune' to remove)" msgstr " veraltet (benutzen Sie 'git remote prune' zum Löschen)" -#: builtin/remote.c:918 +#: builtin/remote.c:921 msgid " ???" msgstr " ???" -#: builtin/remote.c:959 +#: builtin/remote.c:962 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "ungültiges branch.%s.merge; kann Rebase nicht auf > 1 Branch ausführen" -#: builtin/remote.c:967 +#: builtin/remote.c:971 #, c-format msgid "rebases interactively onto remote %s" msgstr "interaktiver Rebase auf Remote-Branch %s" -#: builtin/remote.c:968 +#: builtin/remote.c:973 +#, c-format +msgid "rebases interactively (with merges) onto remote %s" +msgstr "interaktiver Rebase (mit Merges) auf Remote-Branch %s" + +#: builtin/remote.c:976 #, c-format msgid "rebases onto remote %s" msgstr "Rebase auf Remote-Branch %s" -#: builtin/remote.c:971 +#: builtin/remote.c:980 #, c-format msgid " merges with remote %s" msgstr " führt mit Remote-Branch %s zusammen" -#: builtin/remote.c:974 +#: builtin/remote.c:983 #, c-format msgid "merges with remote %s" msgstr "führt mit Remote-Branch %s zusammen" -#: builtin/remote.c:977 +#: builtin/remote.c:986 #, c-format msgid "%-*s and with remote %s\n" msgstr "%-*s und mit Remote-Branch %s\n" -#: builtin/remote.c:1020 +#: builtin/remote.c:1029 msgid "create" msgstr "erstellt" -#: builtin/remote.c:1023 +#: builtin/remote.c:1032 msgid "delete" msgstr "gelöscht" -#: builtin/remote.c:1027 +#: builtin/remote.c:1036 msgid "up to date" msgstr "aktuell" -#: builtin/remote.c:1030 +#: builtin/remote.c:1039 msgid "fast-forwardable" msgstr "vorspulbar" -#: builtin/remote.c:1033 +#: builtin/remote.c:1042 msgid "local out of date" msgstr "lokal nicht aktuell" -#: builtin/remote.c:1040 +#: builtin/remote.c:1049 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s erzwingt Versandt nach %-*s (%s)" -#: builtin/remote.c:1043 +#: builtin/remote.c:1052 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s versendet nach %-*s (%s)" -#: builtin/remote.c:1047 +#: builtin/remote.c:1056 #, c-format msgid " %-*s forces to %s" msgstr " %-*s erzwingt Versand nach %s" -#: builtin/remote.c:1050 +#: builtin/remote.c:1059 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s versendet nach %s" -#: builtin/remote.c:1118 +#: builtin/remote.c:1127 msgid "do not query remotes" msgstr "keine Abfrage von Remote-Repositories" -#: builtin/remote.c:1145 +#: builtin/remote.c:1154 #, c-format msgid "* remote %s" msgstr "* Remote-Repository %s" -#: builtin/remote.c:1146 +#: builtin/remote.c:1155 #, c-format msgid " Fetch URL: %s" msgstr " URL zum Abholen: %s" -#: builtin/remote.c:1147 builtin/remote.c:1163 builtin/remote.c:1302 +#: builtin/remote.c:1156 builtin/remote.c:1172 builtin/remote.c:1311 msgid "(no URL)" msgstr "(keine URL)" @@ -12940,25 +13403,25 @@ msgstr "(keine URL)" #. with the one in " Fetch URL: %s" #. translation. #. -#: builtin/remote.c:1161 builtin/remote.c:1163 +#: builtin/remote.c:1170 builtin/remote.c:1172 #, c-format msgid " Push URL: %s" msgstr " URL zum Versenden: %s" -#: builtin/remote.c:1165 builtin/remote.c:1167 builtin/remote.c:1169 +#: builtin/remote.c:1174 builtin/remote.c:1176 builtin/remote.c:1178 #, c-format msgid " HEAD branch: %s" msgstr " Hauptbranch: %s" -#: builtin/remote.c:1165 +#: builtin/remote.c:1174 msgid "(not queried)" msgstr "(nicht abgefragt)" -#: builtin/remote.c:1167 +#: builtin/remote.c:1176 msgid "(unknown)" msgstr "(unbekannt)" -#: builtin/remote.c:1171 +#: builtin/remote.c:1180 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" @@ -12966,163 +13429,163 @@ msgstr "" " Hauptbranch (externer HEAD ist mehrdeutig, könnte einer der folgenden " "sein):\n" -#: builtin/remote.c:1183 +#: builtin/remote.c:1192 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " Remote-Branch:%s" msgstr[1] " Remote-Branches:%s" -#: builtin/remote.c:1186 builtin/remote.c:1212 +#: builtin/remote.c:1195 builtin/remote.c:1221 msgid " (status not queried)" msgstr " (Zustand nicht abgefragt)" -#: builtin/remote.c:1195 +#: builtin/remote.c:1204 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] " Lokaler Branch konfiguriert für 'git pull':" msgstr[1] " Lokale Branches konfiguriert für 'git pull':" -#: builtin/remote.c:1203 +#: builtin/remote.c:1212 msgid " Local refs will be mirrored by 'git push'" msgstr " Lokale Referenzen werden von 'git push' gespiegelt" -#: builtin/remote.c:1209 +#: builtin/remote.c:1218 #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" msgstr[0] " Lokale Referenz konfiguriert für 'git push'%s:" msgstr[1] " Lokale Referenzen konfiguriert für 'git push'%s:" -#: builtin/remote.c:1230 +#: builtin/remote.c:1239 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "setzt refs/remotes/<Name>/HEAD gemäß dem Remote-Repository" -#: builtin/remote.c:1232 +#: builtin/remote.c:1241 msgid "delete refs/remotes/<name>/HEAD" msgstr "entfernt refs/remotes/<Name>/HEAD" -#: builtin/remote.c:1247 +#: builtin/remote.c:1256 msgid "Cannot determine remote HEAD" msgstr "Kann HEAD des Remote-Repositories nicht bestimmen" -#: builtin/remote.c:1249 +#: builtin/remote.c:1258 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "" "Mehrere Hauptbranches im Remote-Repository. Bitte wählen Sie explizit einen " "aus mit:" -#: builtin/remote.c:1259 +#: builtin/remote.c:1268 #, c-format msgid "Could not delete %s" msgstr "Konnte %s nicht entfernen" -#: builtin/remote.c:1267 +#: builtin/remote.c:1276 #, c-format msgid "Not a valid ref: %s" msgstr "keine gültige Referenz: %s" -#: builtin/remote.c:1269 +#: builtin/remote.c:1278 #, c-format msgid "Could not setup %s" msgstr "Konnte %s nicht einrichten" -#: builtin/remote.c:1287 +#: builtin/remote.c:1296 #, c-format msgid " %s will become dangling!" msgstr " %s wird unreferenziert!" -#: builtin/remote.c:1288 +#: builtin/remote.c:1297 #, c-format msgid " %s has become dangling!" msgstr " %s wurde unreferenziert!" -#: builtin/remote.c:1298 +#: builtin/remote.c:1307 #, c-format msgid "Pruning %s" msgstr "entferne veraltete Branches von %s" -#: builtin/remote.c:1299 +#: builtin/remote.c:1308 #, c-format msgid "URL: %s" msgstr "URL: %s" -#: builtin/remote.c:1315 +#: builtin/remote.c:1324 #, c-format msgid " * [would prune] %s" msgstr " * [würde veralteten Branch entfernen] %s" -#: builtin/remote.c:1318 +#: builtin/remote.c:1327 #, c-format msgid " * [pruned] %s" msgstr "* [veralteten Branch entfernt] %s" -#: builtin/remote.c:1363 +#: builtin/remote.c:1372 msgid "prune remotes after fetching" msgstr "entferne veraltete Branches im Remote-Repository nach \"fetch\"" -#: builtin/remote.c:1426 builtin/remote.c:1480 builtin/remote.c:1548 +#: builtin/remote.c:1435 builtin/remote.c:1489 builtin/remote.c:1557 #, c-format msgid "No such remote '%s'" msgstr "Kein solches Remote-Repository '%s'" -#: builtin/remote.c:1442 +#: builtin/remote.c:1451 msgid "add branch" msgstr "Branch hinzufügen" -#: builtin/remote.c:1449 +#: builtin/remote.c:1458 msgid "no remote specified" msgstr "kein Remote-Repository angegeben" -#: builtin/remote.c:1466 +#: builtin/remote.c:1475 msgid "query push URLs rather than fetch URLs" msgstr "nur URLs für Push ausgeben" -#: builtin/remote.c:1468 +#: builtin/remote.c:1477 msgid "return all URLs" msgstr "alle URLs ausgeben" -#: builtin/remote.c:1496 +#: builtin/remote.c:1505 #, c-format msgid "no URLs configured for remote '%s'" msgstr "Keine URLs für Remote-Repository '%s' konfiguriert." -#: builtin/remote.c:1522 +#: builtin/remote.c:1531 msgid "manipulate push URLs" msgstr "URLs für \"push\" manipulieren" -#: builtin/remote.c:1524 +#: builtin/remote.c:1533 msgid "add URL" msgstr "URL hinzufügen" -#: builtin/remote.c:1526 +#: builtin/remote.c:1535 msgid "delete URLs" msgstr "URLs löschen" -#: builtin/remote.c:1533 +#: builtin/remote.c:1542 msgid "--add --delete doesn't make sense" msgstr "" "Die Optionen --add und --delete können nicht gemeinsam verwendet werden." -#: builtin/remote.c:1572 +#: builtin/remote.c:1581 #, c-format msgid "Invalid old URL pattern: %s" msgstr "ungültiges altes URL Format: %s" -#: builtin/remote.c:1580 +#: builtin/remote.c:1589 #, c-format msgid "No such URL found: %s" msgstr "Keine solche URL gefunden: %s" -#: builtin/remote.c:1582 +#: builtin/remote.c:1591 msgid "Will not delete all non-push URLs" msgstr "Werde keine URLs entfernen, die nicht für \"push\" bestimmt sind" -#: builtin/remote.c:1598 +#: builtin/remote.c:1607 msgid "be verbose; must be placed before a subcommand" msgstr "erweiterte Ausgaben; muss vor einem Unterbefehl angegeben werden" -#: builtin/remote.c:1629 +#: builtin/remote.c:1638 #, c-format msgid "Unknown subcommand: %s" msgstr "Unbekannter Unterbefehl: %s" @@ -13140,130 +13603,138 @@ msgstr "" "--no-write-bitmap-index oder deaktivieren Sie die pack.writebitmaps\n" "Konfiguration." -#: builtin/repack.c:170 +#: builtin/repack.c:180 msgid "pack everything in a single pack" msgstr "alles in eine einzige Pack-Datei packen" -#: builtin/repack.c:172 +#: builtin/repack.c:182 msgid "same as -a, and turn unreachable objects loose" msgstr "genau wie -a, unerreichbare Objekte werden aber nicht gelöscht" -#: builtin/repack.c:175 +#: builtin/repack.c:185 msgid "remove redundant packs, and run git-prune-packed" msgstr "redundante Pakete entfernen und \"git-prune-packed\" ausführen" -#: builtin/repack.c:177 +#: builtin/repack.c:187 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "--no-reuse-delta an git-pack-objects übergeben" -#: builtin/repack.c:179 +#: builtin/repack.c:189 msgid "pass --no-reuse-object to git-pack-objects" msgstr "--no-reuse-object an git-pack-objects übergeben" -#: builtin/repack.c:181 +#: builtin/repack.c:191 msgid "do not run git-update-server-info" msgstr "git-update-server-info nicht ausführen" -#: builtin/repack.c:184 +#: builtin/repack.c:194 msgid "pass --local to git-pack-objects" msgstr "--local an git-pack-objects übergeben" -#: builtin/repack.c:186 +#: builtin/repack.c:196 msgid "write bitmap index" msgstr "Bitmap-Index schreiben" -#: builtin/repack.c:187 +#: builtin/repack.c:197 msgid "approxidate" msgstr "Datumsangabe" -#: builtin/repack.c:188 +#: builtin/repack.c:198 msgid "with -A, do not loosen objects older than this" msgstr "mit -A, keine Objekte älter als dieses Datum löschen" -#: builtin/repack.c:190 +#: builtin/repack.c:200 msgid "with -a, repack unreachable objects" msgstr "mit -a, nicht erreichbare Objekte neu packen" -#: builtin/repack.c:192 +#: builtin/repack.c:202 msgid "size of the window used for delta compression" msgstr "Größe des Fensters für die Delta-Kompression" -#: builtin/repack.c:193 builtin/repack.c:199 +#: builtin/repack.c:203 builtin/repack.c:209 msgid "bytes" msgstr "Bytes" -#: builtin/repack.c:194 +#: builtin/repack.c:204 msgid "same as the above, but limit memory size instead of entries count" msgstr "" "gleiches wie oben, aber die Speichergröße anstatt der\n" "Anzahl der Einträge limitieren" -#: builtin/repack.c:196 +#: builtin/repack.c:206 msgid "limits the maximum delta depth" msgstr "die maximale Delta-Tiefe limitieren" -#: builtin/repack.c:198 +#: builtin/repack.c:208 msgid "limits the maximum number of threads" msgstr "maximale Anzahl von Threads limitieren" -#: builtin/repack.c:200 +#: builtin/repack.c:210 msgid "maximum size of each packfile" msgstr "maximale Größe für jede Paketdatei" -#: builtin/repack.c:202 +#: builtin/repack.c:212 msgid "repack objects in packs marked with .keep" msgstr "" "Objekte umpacken, die sich in mit .keep markierten Pack-Dateien befinden" -#: builtin/repack.c:212 +#: builtin/repack.c:214 +msgid "do not repack this pack" +msgstr "dieses Paket nicht neu packen" + +#: builtin/repack.c:224 msgid "cannot delete packs in a precious-objects repo" msgstr "kann Pack-Dateien in precious-objects Repository nicht löschen" -#: builtin/repack.c:216 +#: builtin/repack.c:228 msgid "--keep-unreachable and -A are incompatible" msgstr "--keep-unreachable und -A sind inkompatibel" -#: builtin/repack.c:410 builtin/worktree.c:148 +#: builtin/repack.c:425 builtin/worktree.c:139 #, c-format msgid "failed to remove '%s'" msgstr "Fehler beim Löschen von '%s'" -#: builtin/replace.c:20 +#: builtin/replace.c:22 msgid "git replace [-f] <object> <replacement>" msgstr "git replace [-f] <Objekt> <Ersetzung>" -#: builtin/replace.c:21 +#: builtin/replace.c:23 msgid "git replace [-f] --edit <object>" msgstr "git replace [-f] --edit <Objekt>" -#: builtin/replace.c:22 +#: builtin/replace.c:24 msgid "git replace [-f] --graft <commit> [<parent>...]" msgstr "git replace [-f] --graft <Commit> [<Eltern-Commit>...]" -#: builtin/replace.c:23 +#: builtin/replace.c:25 +msgid "git replace [-f] --convert-graft-file" +msgstr "git replace [-f] --convert-graft-file" + +#: builtin/replace.c:26 msgid "git replace -d <object>..." msgstr "git replace -d <Objekt>..." -#: builtin/replace.c:24 +#: builtin/replace.c:27 msgid "git replace [--format=<format>] [-l [<pattern>]]" msgstr "git replace [--format=<Format>] [-l [<Muster>]]" -#: builtin/replace.c:331 builtin/replace.c:369 builtin/replace.c:397 +#: builtin/replace.c:371 builtin/replace.c:415 builtin/replace.c:445 #, c-format msgid "Not a valid object name: '%s'" msgstr "Ungültiger Objekt-Name: '%s'" -#: builtin/replace.c:361 +#: builtin/replace.c:407 #, c-format msgid "bad mergetag in commit '%s'" msgstr "ungültiger Merge-Tag in Commit '%s'" -#: builtin/replace.c:363 +#: builtin/replace.c:409 #, c-format msgid "malformed mergetag in commit '%s'" msgstr "fehlerhafter Merge-Tag in Commit '%s'" -#: builtin/replace.c:374 +#: builtin/replace.c:421 #, c-format msgid "" "original commit '%s' contains mergetag '%s' that is discarded; use --edit " @@ -13272,45 +13743,58 @@ msgstr "" "Der ursprüngliche Commit '%s' enthält Merge-Tag '%s', der verworfen\n" "wird; benutzen Sie --edit anstatt --graft" -#: builtin/replace.c:407 +#: builtin/replace.c:460 #, c-format msgid "the original commit '%s' has a gpg signature." msgstr "Der ursprüngliche Commit '%s' hat eine GPG-Signatur." -#: builtin/replace.c:408 +#: builtin/replace.c:461 msgid "the signature will be removed in the replacement commit!" msgstr "Die Signatur wird in dem Ersetzungs-Commit entfernt!" -#: builtin/replace.c:414 +#: builtin/replace.c:471 #, c-format msgid "could not write replacement commit for: '%s'" msgstr "Konnte Ersetzungs-Commit für '%s' nicht schreiben" -#: builtin/replace.c:438 +#: builtin/replace.c:514 +#, c-format +msgid "" +"could not convert the following graft(s):\n" +"%s" +msgstr "" +"Konnte die folgenden künstlichen Vorgänger (\"grafts\") nicht konvertieren:\n" +"%s" + +#: builtin/replace.c:535 msgid "list replace refs" msgstr "ersetzende Referenzen auflisten" -#: builtin/replace.c:439 +#: builtin/replace.c:536 msgid "delete replace refs" msgstr "ersetzende Referenzen löschen" -#: builtin/replace.c:440 +#: builtin/replace.c:537 msgid "edit existing object" msgstr "existierendes Objekt bearbeiten" -#: builtin/replace.c:441 +#: builtin/replace.c:538 msgid "change a commit's parents" msgstr "Eltern-Commits eines Commits ändern" -#: builtin/replace.c:442 +#: builtin/replace.c:539 +msgid "convert existing graft file" +msgstr "existierende Datei des künstlichen Vorgängers (\"graft\") konvertieren" + +#: builtin/replace.c:540 msgid "replace the ref if it exists" msgstr "die Referenz ersetzen, wenn sie existiert" -#: builtin/replace.c:444 +#: builtin/replace.c:542 msgid "do not pretty-print contents for --edit" msgstr "keine ansprechende Anzeige des Objektinhaltes für --edit" -#: builtin/replace.c:445 +#: builtin/replace.c:543 msgid "use this format" msgstr "das angegebene Format benutzen" @@ -13452,7 +13936,8 @@ msgstr "Konnte neue Index-Datei nicht schreiben." #: builtin/rev-list.c:397 msgid "cannot combine --exclude-promisor-objects and --missing" -msgstr "--exclude-promisor-objects und --missing können nicht kombiniert werden." +msgstr "" +"--exclude-promisor-objects und --missing können nicht kombiniert werden." #: builtin/rev-list.c:455 msgid "object filtering requires --objects" @@ -13633,42 +14118,42 @@ msgid_plural "the following files have local modifications:" msgstr[0] "die folgende Datei hat lokale Änderungen:" msgstr[1] "die folgenden Dateien haben lokale Änderungen:" -#: builtin/rm.c:243 +#: builtin/rm.c:241 msgid "do not list removed files" msgstr "keine gelöschten Dateien auflisten" -#: builtin/rm.c:244 +#: builtin/rm.c:242 msgid "only remove from the index" msgstr "nur aus dem Index entfernen" -#: builtin/rm.c:245 +#: builtin/rm.c:243 msgid "override the up-to-date check" msgstr "die \"up-to-date\" Prüfung überschreiben" -#: builtin/rm.c:246 +#: builtin/rm.c:244 msgid "allow recursive removal" msgstr "rekursives Entfernen erlauben" -#: builtin/rm.c:248 +#: builtin/rm.c:246 msgid "exit with a zero status even if nothing matched" msgstr "mit Rückgabewert 0 beenden, wenn keine Übereinstimmung gefunden wurde" -#: builtin/rm.c:307 +#: builtin/rm.c:306 #, c-format msgid "not removing '%s' recursively without -r" msgstr "'%s' wird nicht ohne -r rekursiv entfernt" -#: builtin/rm.c:346 +#: builtin/rm.c:345 #, c-format msgid "git rm: unable to remove %s" msgstr "git rm: konnte %s nicht löschen" -#: builtin/rm.c:369 +#: builtin/rm.c:368 #, c-format msgid "could not remove '%s'" msgstr "Konnte '%s' nicht löschen" -#: builtin/send-pack.c:19 +#: builtin/send-pack.c:20 msgid "" "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-" "receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> " @@ -13681,50 +14166,70 @@ msgstr "" " --all und die explizite Angabe einer <Referenz> schließen sich gegenseitig " "aus." -#: builtin/send-pack.c:162 +#: builtin/send-pack.c:163 msgid "remote name" msgstr "Name des Remote-Repositories" -#: builtin/send-pack.c:176 +#: builtin/send-pack.c:177 msgid "use stateless RPC protocol" msgstr "zustandsloses RPC-Protokoll verwenden" -#: builtin/send-pack.c:177 +#: builtin/send-pack.c:178 msgid "read refs from stdin" msgstr "Referenzen von der Standard-Eingabe lesen" -#: builtin/send-pack.c:178 +#: builtin/send-pack.c:179 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>...]]" +msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]" +msgstr "git shortlog [<Optionen>] [<Commitbereich>] [[--] <Pfad>...]" + +#: builtin/shortlog.c:15 +msgid "git log --pretty=short | git shortlog [<options>]" +msgstr "git log --pretty=short | git shortlog [<Optionen>]" -#: builtin/shortlog.c:263 +#: builtin/shortlog.c:264 msgid "Group by committer rather than author" msgstr "über Commit-Ersteller anstatt Autor gruppieren" -#: builtin/shortlog.c:265 +#: builtin/shortlog.c:266 msgid "sort output according to the number of commits per author" msgstr "die Ausgabe entsprechend der Anzahl von Commits pro Autor sortieren" -#: builtin/shortlog.c:267 +#: builtin/shortlog.c:268 msgid "Suppress commit descriptions, only provides commit count" msgstr "Commit-Beschreibungen unterdrücken, nur Anzahl der Commits liefern" -#: builtin/shortlog.c:269 +#: builtin/shortlog.c:270 msgid "Show the email address of each author" msgstr "die E-Mail-Adresse von jedem Autor anzeigen" -#: builtin/shortlog.c:270 +#: builtin/shortlog.c:271 msgid "w[,i1[,i2]]" msgstr "w[,i1[,i2]]" -#: builtin/shortlog.c:271 +#: builtin/shortlog.c:272 msgid "Linewrap output" msgstr "Ausgabe mit Zeilenumbrüchen" +#: builtin/shortlog.c:298 +msgid "too many arguments given outside repository" +msgstr "zu viele Argumente außerhalb des Repositories angegeben" + #: builtin/show-branch.c:12 msgid "" "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" @@ -13928,39 +14433,39 @@ msgstr "" msgid "prepend comment character and space to each line" msgstr "Kommentarzeichen mit Leerzeichen an jede Zeile voranstellen" -#: builtin/submodule--helper.c:35 builtin/submodule--helper.c:1669 +#: builtin/submodule--helper.c:37 builtin/submodule--helper.c:1688 #, c-format msgid "No such ref: %s" msgstr "Referenz nicht gefunden: %s" -#: builtin/submodule--helper.c:42 builtin/submodule--helper.c:1678 +#: builtin/submodule--helper.c:44 builtin/submodule--helper.c:1697 #, c-format msgid "Expecting a full ref name, got %s" msgstr "Vollständiger Referenzname erwartet, %s erhalten" -#: builtin/submodule--helper.c:59 +#: builtin/submodule--helper.c:61 msgid "submodule--helper print-default-remote takes no arguments" msgstr "'submodule--helper print-default-remote' erwartet keine Argumente." -#: builtin/submodule--helper.c:96 +#: builtin/submodule--helper.c:98 #, c-format msgid "cannot strip one component off url '%s'" msgstr "Kann eine Komponente von URL '%s' nicht extrahieren" -#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1198 +#: builtin/submodule--helper.c:406 builtin/submodule--helper.c:1211 msgid "alternative anchor for relative paths" msgstr "Alternativer Anker für relative Pfade" -#: builtin/submodule--helper.c:409 +#: builtin/submodule--helper.c:411 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<Pfad>] [<Pfad>...]" -#: builtin/submodule--helper.c:460 builtin/submodule--helper.c:483 +#: builtin/submodule--helper.c:462 builtin/submodule--helper.c:485 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "Keine URL für Submodul-Pfad '%s' in .gitmodules gefunden" -#: builtin/submodule--helper.c:498 +#: builtin/submodule--helper.c:500 #, c-format msgid "" "could not lookup configuration '%s'. Assuming this repository is its own " @@ -13970,108 +14475,108 @@ msgstr "" "Repository\n" "sein eigenes verbindliches Upstream-Repository ist." -#: builtin/submodule--helper.c:509 +#: builtin/submodule--helper.c:511 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "" "Fehler beim Eintragen der URL für Submodul-Pfad '%s' in die Konfiguration." -#: builtin/submodule--helper.c:513 +#: builtin/submodule--helper.c:515 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "Submodul '%s' (%s) für Pfad '%s' in die Konfiguration eingetragen.\n" -#: builtin/submodule--helper.c:523 +#: builtin/submodule--helper.c:525 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" msgstr "Warnung: 'update'-Modus für Submodul '%s' vorgeschlagen\n" -#: builtin/submodule--helper.c:530 +#: builtin/submodule--helper.c:532 #, c-format msgid "Failed to register update mode for submodule path '%s'" msgstr "" "Fehler bei Änderung des Aktualisierungsmodus für Submodul-Pfad '%s' in der\n" "Konfiguration." -#: builtin/submodule--helper.c:552 +#: builtin/submodule--helper.c:554 msgid "Suppress output for initializing a submodule" msgstr "Ausgaben bei Initialisierung eines Submoduls unterdrücken" -#: builtin/submodule--helper.c:557 +#: builtin/submodule--helper.c:559 msgid "git submodule--helper init [<path>]" msgstr "git submodule--helper init [<Pfad>]" -#: builtin/submodule--helper.c:625 builtin/submodule--helper.c:747 +#: builtin/submodule--helper.c:631 builtin/submodule--helper.c:757 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "Keine Submodul-Zuordnung in .gitmodules für Pfad '%s' gefunden" -#: builtin/submodule--helper.c:660 +#: builtin/submodule--helper.c:670 #, c-format msgid "could not resolve HEAD ref inside the submodule '%s'" msgstr "Konnte HEAD-Referenz nicht innerhalb des Submodul-Pfads '%s' auflösen." -#: builtin/submodule--helper.c:687 builtin/submodule--helper.c:856 +#: builtin/submodule--helper.c:697 builtin/submodule--helper.c:866 #, c-format msgid "failed to recurse into submodule '%s'" msgstr "Fehler bei Rekursion in Submodul '%s'." -#: builtin/submodule--helper.c:711 builtin/submodule--helper.c:1021 +#: builtin/submodule--helper.c:721 builtin/submodule--helper.c:1031 msgid "Suppress submodule status output" msgstr "Ausgabe über Submodul-Status unterdrücken" -#: builtin/submodule--helper.c:712 +#: builtin/submodule--helper.c:722 msgid "" "Use commit stored in the index instead of the one stored in the submodule " "HEAD" msgstr "" "Benutze den Commit, der im Index gespeichert ist, statt den im Submodul HEAD" -#: builtin/submodule--helper.c:713 +#: builtin/submodule--helper.c:723 msgid "recurse into nested submodules" msgstr "Rekursion in verschachtelte Submodule durchführen" -#: builtin/submodule--helper.c:718 +#: builtin/submodule--helper.c:728 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" msgstr "git submodule status [--quiet] [--cached] [--recursive] [<Pfad>...]" -#: builtin/submodule--helper.c:742 +#: builtin/submodule--helper.c:752 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name <Pfad>" -#: builtin/submodule--helper.c:806 +#: builtin/submodule--helper.c:816 #, c-format msgid "Synchronizing submodule url for '%s'\n" msgstr "Synchronisiere Submodul-URL für '%s'\n" -#: builtin/submodule--helper.c:812 +#: builtin/submodule--helper.c:822 #, c-format msgid "failed to register url for submodule path '%s'" msgstr "Fehler beim Registrieren der URL für Submodul-Pfad '%s'." -#: builtin/submodule--helper.c:826 +#: builtin/submodule--helper.c:836 #, c-format msgid "failed to get the default remote for submodule '%s'" msgstr "Fehler beim Lesen des Standard-Remote-Repositories für Submodul '%s'." -#: builtin/submodule--helper.c:837 +#: builtin/submodule--helper.c:847 #, c-format msgid "failed to update remote for submodule '%s'" msgstr "Fehler beim Aktualisieren des Remote-Repositories für Submodul '%s'." -#: builtin/submodule--helper.c:885 +#: builtin/submodule--helper.c:895 msgid "Suppress output of synchronizing submodule url" msgstr "Ausgaben bei der Synchronisierung der Submodul-URLs unterdrücken" -#: builtin/submodule--helper.c:887 +#: builtin/submodule--helper.c:897 msgid "Recurse into nested submodules" msgstr "Rekursion in verschachtelte Submodule durchführen" -#: builtin/submodule--helper.c:892 +#: builtin/submodule--helper.c:902 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" msgstr "git submodule--helper sync [--quiet] [--recursive] [<Pfad>]" -#: builtin/submodule--helper.c:946 +#: builtin/submodule--helper.c:956 #, c-format msgid "" "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " @@ -14081,7 +14586,7 @@ msgstr "" "(benutzen Sie 'rm -rf', wenn Sie dieses wirklich mitsamt seiner Historie\n" "löschen möchten)" -#: builtin/submodule--helper.c:958 +#: builtin/submodule--helper.c:968 #, c-format msgid "" "Submodule work tree '%s' contains local modifications; use '-f' to discard " @@ -14090,81 +14595,84 @@ msgstr "" "Arbeitsverzeichnis von Submodul in '%s' enthält lokale Änderungen;\n" "verwenden Sie '-f', um diese zu verwerfen." -#: builtin/submodule--helper.c:966 +#: builtin/submodule--helper.c:976 #, c-format msgid "Cleared directory '%s'\n" msgstr "Verzeichnis '%s' bereinigt.\n" -#: builtin/submodule--helper.c:968 +#: builtin/submodule--helper.c:978 #, c-format msgid "Could not remove submodule work tree '%s'\n" msgstr "Konnte Arbeitsverzeichnis des Submoduls in '%s' nicht löschen.\n" -#: builtin/submodule--helper.c:977 +#: builtin/submodule--helper.c:987 #, c-format msgid "could not create empty submodule directory %s" msgstr "Konnte kein leeres Verzeichnis für Submodul in '%s' erstellen." -#: builtin/submodule--helper.c:993 +#: builtin/submodule--helper.c:1003 #, c-format msgid "Submodule '%s' (%s) unregistered for path '%s'\n" msgstr "Submodul '%s' (%s) für Pfad '%s' ausgetragen.\n" -#: builtin/submodule--helper.c:1022 +#: builtin/submodule--helper.c:1032 msgid "Remove submodule working trees even if they contain local changes" -msgstr "Arbeitsverzeichnisse von Submodulen löschen, auch wenn lokale Änderungen vorliegen" +msgstr "" +"Arbeitsverzeichnisse von Submodulen löschen, auch wenn lokale Änderungen " +"vorliegen" -#: builtin/submodule--helper.c:1023 +#: builtin/submodule--helper.c:1033 msgid "Unregister all submodules" msgstr "alle Submodule austragen" -#: builtin/submodule--helper.c:1028 +#: builtin/submodule--helper.c:1038 msgid "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" -msgstr "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<Pfad>...]]" +msgstr "" +"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<Pfad>...]]" -#: builtin/submodule--helper.c:1042 +#: builtin/submodule--helper.c:1052 msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "" "Verwenden Sie '--all', wenn Sie wirklich alle Submodule deinitialisieren\n" "möchten." -#: builtin/submodule--helper.c:1133 builtin/submodule--helper.c:1136 +#: builtin/submodule--helper.c:1145 builtin/submodule--helper.c:1148 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "Submodul '%s' kann Alternative nicht hinzufügen: %s" -#: builtin/submodule--helper.c:1172 +#: builtin/submodule--helper.c:1184 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "Wert '%s' für submodule.alternateErrorStrategy wird nicht erkannt" -#: builtin/submodule--helper.c:1179 +#: builtin/submodule--helper.c:1191 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "Wert '%s' für submodule.alternateLocation wird nicht erkannt." -#: builtin/submodule--helper.c:1201 +#: builtin/submodule--helper.c:1214 msgid "where the new submodule will be cloned to" msgstr "Pfad für neues Submodul" -#: builtin/submodule--helper.c:1204 +#: builtin/submodule--helper.c:1217 msgid "name of the new submodule" msgstr "Name des neuen Submoduls" -#: builtin/submodule--helper.c:1207 +#: builtin/submodule--helper.c:1220 msgid "url where to clone the submodule from" msgstr "URL von der das Submodul geklont wird" -#: builtin/submodule--helper.c:1213 +#: builtin/submodule--helper.c:1228 msgid "depth for shallow clones" msgstr "Tiefe des Klons mit unvollständiger Historie (shallow)" -#: builtin/submodule--helper.c:1216 builtin/submodule--helper.c:1587 +#: builtin/submodule--helper.c:1231 builtin/submodule--helper.c:1606 msgid "force cloning progress" msgstr "Fortschrittsanzeige beim Klonen erzwingen" -#: builtin/submodule--helper.c:1221 +#: builtin/submodule--helper.c:1236 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" @@ -14173,88 +14681,88 @@ msgstr "" "<Repository>] [--name <Name>] [--url <URL>] [--name <Name>] [--depth " "<Tiefe>] --url <URL> --path <Pfad>" -#: builtin/submodule--helper.c:1252 +#: builtin/submodule--helper.c:1267 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "Klonen von '%s' in Submodul-Pfad '%s' fehlgeschlagen" -#: builtin/submodule--helper.c:1267 +#: builtin/submodule--helper.c:1281 #, c-format msgid "could not get submodule directory for '%s'" msgstr "Konnte Submodul-Verzeichnis '%s' nicht finden." -#: builtin/submodule--helper.c:1332 +#: builtin/submodule--helper.c:1347 #, c-format msgid "Submodule path '%s' not initialized" msgstr "Submodul-Pfad '%s' nicht initialisiert" -#: builtin/submodule--helper.c:1336 +#: builtin/submodule--helper.c:1351 msgid "Maybe you want to use 'update --init'?" msgstr "Meinten Sie vielleicht 'update --init'?" -#: builtin/submodule--helper.c:1365 +#: builtin/submodule--helper.c:1380 #, c-format msgid "Skipping unmerged submodule %s" msgstr "Überspringe nicht zusammengeführtes Submodul %s" -#: builtin/submodule--helper.c:1394 +#: builtin/submodule--helper.c:1409 #, c-format msgid "Skipping submodule '%s'" msgstr "Überspringe Submodul '%s'" -#: builtin/submodule--helper.c:1527 +#: builtin/submodule--helper.c:1544 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "Fehler beim Klonen von '%s'. Weiterer Versuch geplant" -#: builtin/submodule--helper.c:1538 +#: builtin/submodule--helper.c:1555 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "Zweiter Versuch '%s' zu klonen fehlgeschlagen, breche ab." -#: builtin/submodule--helper.c:1568 builtin/submodule--helper.c:1788 +#: builtin/submodule--helper.c:1585 builtin/submodule--helper.c:1808 msgid "path into the working tree" msgstr "Pfad zum Arbeitsverzeichnis" -#: builtin/submodule--helper.c:1571 +#: builtin/submodule--helper.c:1588 msgid "path into the working tree, across nested submodule boundaries" msgstr "" "Pfad zum Arbeitsverzeichnis, über verschachtelte Submodul-Grenzen hinweg" -#: builtin/submodule--helper.c:1575 +#: builtin/submodule--helper.c:1592 msgid "rebase, merge, checkout or none" msgstr "rebase, merge, checkout oder none" -#: builtin/submodule--helper.c:1579 +#: builtin/submodule--helper.c:1598 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:1582 +#: builtin/submodule--helper.c:1601 msgid "parallel jobs" msgstr "Parallele Ausführungen" -#: builtin/submodule--helper.c:1584 +#: builtin/submodule--helper.c:1603 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:1585 +#: builtin/submodule--helper.c:1604 msgid "don't print cloning progress" msgstr "keine Fortschrittsanzeige beim Klonen" -#: builtin/submodule--helper.c:1592 +#: builtin/submodule--helper.c:1611 msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" msgstr "git submodule--helper update_clone [--prefix=<Pfad>] [<Pfad>...]" -#: builtin/submodule--helper.c:1605 +#: builtin/submodule--helper.c:1624 msgid "bad value for update parameter" msgstr "Fehlerhafter Wert für --update Parameter" -#: builtin/submodule--helper.c:1673 +#: builtin/submodule--helper.c:1692 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " @@ -14263,20 +14771,20 @@ 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:1789 +#: builtin/submodule--helper.c:1809 msgid "recurse into submodules" msgstr "Rekursion in Submodule durchführen" -#: builtin/submodule--helper.c:1795 +#: builtin/submodule--helper.c:1815 msgid "git submodule--helper embed-git-dir [<path>...]" msgstr "git submodule--helper embed-git-dir [<Pfad>...]" -#: builtin/submodule--helper.c:1857 +#: builtin/submodule--helper.c:1901 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s unterstützt kein --super-prefix" -#: builtin/submodule--helper.c:1863 +#: builtin/submodule--helper.c:1907 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "'%s' ist kein gültiger Unterbefehl von submodule--helper" @@ -14346,7 +14854,7 @@ msgstr "Tag '%s' nicht gefunden." msgid "Deleted tag '%s' (was %s)\n" msgstr "Tag '%s' gelöscht (war %s)\n" -#: builtin/tag.c:131 +#: builtin/tag.c:132 #, c-format msgid "" "\n" @@ -14359,7 +14867,7 @@ msgstr "" " %s\n" "ein. Zeilen, die mit '%c' beginnen, werden ignoriert.\n" -#: builtin/tag.c:135 +#: builtin/tag.c:136 #, c-format msgid "" "\n" @@ -14374,146 +14882,146 @@ msgstr "" "ein. Zeilen, die mit '%c' beginnen, werden behalten; Sie dürfen diese\n" "selbst entfernen wenn Sie möchten.\n" -#: builtin/tag.c:189 +#: builtin/tag.c:190 msgid "unable to sign the tag" msgstr "konnte Tag nicht signieren" -#: builtin/tag.c:191 +#: builtin/tag.c:192 msgid "unable to write tag file" msgstr "konnte Tag-Datei nicht schreiben" -#: builtin/tag.c:216 +#: builtin/tag.c:217 msgid "bad object type." msgstr "ungültiger Objekt-Typ" -#: builtin/tag.c:265 +#: builtin/tag.c:266 msgid "no tag message?" msgstr "keine Tag-Beschreibung?" -#: builtin/tag.c:272 +#: builtin/tag.c:273 #, c-format msgid "The tag message has been left in %s\n" msgstr "Die Tag-Beschreibung wurde gelassen in %s\n" -#: builtin/tag.c:381 +#: builtin/tag.c:382 msgid "list tag names" msgstr "Tagnamen auflisten" -#: builtin/tag.c:383 +#: builtin/tag.c:384 msgid "print <n> lines of each tag message" msgstr "<n> Zeilen jeder Tag-Beschreibung anzeigen" -#: builtin/tag.c:385 +#: builtin/tag.c:386 msgid "delete tags" msgstr "Tags löschen" -#: builtin/tag.c:386 +#: builtin/tag.c:387 msgid "verify tags" msgstr "Tags überprüfen" -#: builtin/tag.c:388 +#: builtin/tag.c:389 msgid "Tag creation options" msgstr "Optionen für Erstellung von Tags" -#: builtin/tag.c:390 +#: builtin/tag.c:391 msgid "annotated tag, needs a message" msgstr "annotiertes Tag, benötigt eine Beschreibung" -#: builtin/tag.c:392 +#: builtin/tag.c:393 msgid "tag message" msgstr "Tag-Beschreibung" -#: builtin/tag.c:394 +#: builtin/tag.c:395 msgid "force edit of tag message" msgstr "Bearbeitung der Tag-Beschreibung erzwingen" -#: builtin/tag.c:395 +#: builtin/tag.c:396 msgid "annotated and GPG-signed tag" msgstr "annotiertes und GPG-signiertes Tag" -#: builtin/tag.c:399 +#: builtin/tag.c:400 msgid "use another key to sign the tag" msgstr "einen anderen Schlüssel verwenden, um das Tag zu signieren" -#: builtin/tag.c:400 +#: builtin/tag.c:401 msgid "replace the tag if exists" msgstr "das Tag ersetzen, wenn es existiert" -#: builtin/tag.c:401 builtin/update-ref.c:368 +#: builtin/tag.c:402 builtin/update-ref.c:368 msgid "create a reflog" msgstr "Reflog erstellen" -#: builtin/tag.c:403 +#: builtin/tag.c:404 msgid "Tag listing options" msgstr "Optionen für Auflistung der Tags" -#: builtin/tag.c:404 +#: builtin/tag.c:405 msgid "show tag list in columns" msgstr "Liste der Tags in Spalten anzeigen" -#: builtin/tag.c:405 builtin/tag.c:407 +#: builtin/tag.c:406 builtin/tag.c:408 msgid "print only tags that contain the commit" msgstr "nur Tags ausgeben, die diesen Commit beinhalten" -#: builtin/tag.c:406 builtin/tag.c:408 +#: builtin/tag.c:407 builtin/tag.c:409 msgid "print only tags that don't contain the commit" msgstr "nur Tags ausgeben, die diesen Commit nicht enthalten" -#: builtin/tag.c:409 +#: builtin/tag.c:410 msgid "print only tags that are merged" msgstr "nur Tags ausgeben, die gemerged wurden" -#: builtin/tag.c:410 +#: builtin/tag.c:411 msgid "print only tags that are not merged" msgstr "nur Tags ausgeben, die nicht gemerged wurden" -#: builtin/tag.c:415 +#: builtin/tag.c:416 msgid "print only tags of the object" msgstr "nur Tags von dem Objekt ausgeben" -#: builtin/tag.c:459 +#: builtin/tag.c:460 msgid "--column and -n are incompatible" msgstr "--column und -n sind inkompatibel" -#: builtin/tag.c:481 +#: builtin/tag.c:482 msgid "-n option is only allowed in list mode" msgstr "Die Option -n ist nur im Listenmodus erlaubt." -#: builtin/tag.c:483 +#: builtin/tag.c:484 msgid "--contains option is only allowed in list mode" msgstr "Die Option --contains ist nur im Listenmodus erlaubt." -#: builtin/tag.c:485 +#: builtin/tag.c:486 msgid "--no-contains option is only allowed in list mode" msgstr "Die Option --no-contains ist nur im Listenmodus erlaubt." -#: builtin/tag.c:487 +#: builtin/tag.c:488 msgid "--points-at option is only allowed in list mode" msgstr "Die Option --points-at ist nur im Listenmodus erlaubt." -#: builtin/tag.c:489 +#: builtin/tag.c:490 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:500 +#: builtin/tag.c:501 msgid "only one -F or -m option is allowed." msgstr "nur eine -F oder -m Option ist erlaubt." -#: builtin/tag.c:519 +#: builtin/tag.c:520 msgid "too many params" msgstr "zu viele Parameter" -#: builtin/tag.c:525 +#: builtin/tag.c:526 #, c-format msgid "'%s' is not a valid tag name." msgstr "'%s' ist kein gültiger Tagname." -#: builtin/tag.c:530 +#: builtin/tag.c:531 #, c-format msgid "tag '%s' already exists" msgstr "Tag '%s' existiert bereits" -#: builtin/tag.c:561 +#: builtin/tag.c:562 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "Tag '%s' aktualisiert (war %s)\n" @@ -14591,151 +15099,151 @@ msgstr "" msgid " OK" msgstr " OK" -#: builtin/update-index.c:579 +#: builtin/update-index.c:589 msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [<Optionen>] [--] [<Datei>...]" -#: builtin/update-index.c:936 +#: builtin/update-index.c:946 msgid "continue refresh even when index needs update" msgstr "" "Aktualisierung fortsetzen, auch wenn der Index aktualisiert werden muss" -#: builtin/update-index.c:939 +#: builtin/update-index.c:949 msgid "refresh: ignore submodules" msgstr "Aktualisierung: ignoriert Submodule" -#: builtin/update-index.c:942 +#: builtin/update-index.c:952 msgid "do not ignore new files" msgstr "keine neuen Dateien ignorieren" -#: builtin/update-index.c:944 +#: builtin/update-index.c:954 msgid "let files replace directories and vice-versa" msgstr "Dateien Verzeichnisse ersetzen lassen, und umgedreht" -#: builtin/update-index.c:946 +#: builtin/update-index.c:956 msgid "notice files missing from worktree" msgstr "fehlende Dateien im Arbeitsverzeichnis beachten" -#: builtin/update-index.c:948 +#: builtin/update-index.c:958 msgid "refresh even if index contains unmerged entries" msgstr "" "aktualisieren, auch wenn der Index nicht zusammengeführte Einträge beinhaltet" -#: builtin/update-index.c:951 +#: builtin/update-index.c:961 msgid "refresh stat information" msgstr "Dateiinformationen aktualisieren" -#: builtin/update-index.c:955 +#: builtin/update-index.c:965 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "wie --refresh, ignoriert aber \"assume-unchanged\" Einstellung" -#: builtin/update-index.c:959 +#: builtin/update-index.c:969 msgid "<mode>,<object>,<path>" msgstr "<Modus>,<Objekt>,<Pfad>" -#: builtin/update-index.c:960 +#: builtin/update-index.c:970 msgid "add the specified entry to the index" msgstr "den angegebenen Eintrag zum Commit vormerken" -#: builtin/update-index.c:969 +#: builtin/update-index.c:979 msgid "mark files as \"not changing\"" msgstr "diese Datei immer als unverändert betrachten" -#: builtin/update-index.c:972 +#: builtin/update-index.c:982 msgid "clear assumed-unchanged bit" msgstr "\"assumed-unchanged\"-Bit löschen" -#: builtin/update-index.c:975 +#: builtin/update-index.c:985 msgid "mark files as \"index-only\"" msgstr "Dateien als \"index-only\" markieren" -#: builtin/update-index.c:978 +#: builtin/update-index.c:988 msgid "clear skip-worktree bit" msgstr "\"skip-worktree\"-Bit löschen" -#: builtin/update-index.c:981 +#: builtin/update-index.c:991 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:983 +#: builtin/update-index.c:993 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:985 +#: builtin/update-index.c:995 msgid "with --stdin: input lines are terminated by null bytes" msgstr "mit --stdin: eingegebene Zeilen sind durch NUL-Bytes abgeschlossen" -#: builtin/update-index.c:987 +#: builtin/update-index.c:997 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:991 +#: builtin/update-index.c:1001 msgid "add entries from standard input to the index" msgstr "Einträge von der Standard-Eingabe zum Commit vormerken" -#: builtin/update-index.c:995 +#: builtin/update-index.c:1005 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:999 +#: builtin/update-index.c:1009 msgid "only update entries that differ from HEAD" msgstr "nur Einträge aktualisieren, die unterschiedlich zu HEAD sind" -#: builtin/update-index.c:1003 +#: builtin/update-index.c:1013 msgid "ignore files missing from worktree" msgstr "fehlende Dateien im Arbeitsverzeichnis ignorieren" -#: builtin/update-index.c:1006 +#: builtin/update-index.c:1016 msgid "report actions to standard output" msgstr "die Aktionen in der Standard-Ausgabe ausgeben" -#: builtin/update-index.c:1008 +#: builtin/update-index.c:1018 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(für Fremdprogramme) keine gespeicherten, nicht aufgelöste Konflikte" -#: builtin/update-index.c:1012 +#: builtin/update-index.c:1022 msgid "write index in this format" msgstr "Index-Datei in diesem Format schreiben" -#: builtin/update-index.c:1014 +#: builtin/update-index.c:1024 msgid "enable or disable split index" msgstr "Splitting des Index aktivieren oder deaktivieren" -#: builtin/update-index.c:1016 +#: builtin/update-index.c:1026 msgid "enable/disable untracked cache" msgstr "Cache für unversionierte Dateien aktivieren oder deaktivieren" -#: builtin/update-index.c:1018 +#: builtin/update-index.c:1028 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:1020 +#: builtin/update-index.c:1030 msgid "enable untracked cache without testing the filesystem" msgstr "" "Cache für unversionierte Dateien ohne Prüfung des Dateisystems aktivieren" -#: builtin/update-index.c:1022 +#: builtin/update-index.c:1032 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:1024 +#: builtin/update-index.c:1034 msgid "enable or disable file system monitor" msgstr "Dateisystem-Monitor aktivieren oder deaktivieren" -#: builtin/update-index.c:1026 +#: builtin/update-index.c:1036 msgid "mark files as fsmonitor valid" msgstr "Dateien als \"fsmonitor valid\" markieren" -#: builtin/update-index.c:1029 +#: builtin/update-index.c:1039 msgid "clear fsmonitor valid bit" msgstr "\"fsmonitor valid\"-Bit löschen" -#: builtin/update-index.c:1127 +#: builtin/update-index.c:1138 msgid "" "core.splitIndex is set to false; remove or change it, if you really want to " "enable split index" @@ -14743,7 +15251,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:1136 +#: builtin/update-index.c:1147 msgid "" "core.splitIndex is set to true; remove or change it, if you really want to " "disable split index" @@ -14751,7 +15259,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:1147 +#: builtin/update-index.c:1158 msgid "" "core.untrackedCache is set to true; remove or change it, if you really want " "to disable the untracked cache" @@ -14759,11 +15267,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:1151 +#: builtin/update-index.c:1162 msgid "Untracked cache disabled" msgstr "Cache für unversionierte Dateien deaktiviert" -#: builtin/update-index.c:1159 +#: builtin/update-index.c:1170 msgid "" "core.untrackedCache is set to false; remove or change it, if you really want " "to enable the untracked cache" @@ -14772,23 +15280,23 @@ msgstr "" "dies,\n" "wenn sie wirklich den Cache für unversionierte Dateien aktivieren möchten." -#: builtin/update-index.c:1163 +#: builtin/update-index.c:1174 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "Cache für unversionierte Dateien für '%s' aktiviert" -#: builtin/update-index.c:1171 +#: builtin/update-index.c:1182 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:1175 +#: builtin/update-index.c:1186 msgid "fsmonitor enabled" msgstr "Dateisystem-Monitor aktiviert" -#: builtin/update-index.c:1178 +#: builtin/update-index.c:1189 msgid "" "core.fsmonitor is set; remove it if you really want to disable fsmonitor" msgstr "" @@ -14796,7 +15304,7 @@ msgstr "" "Monitor\n" "wirklich deaktivieren möchten." -#: builtin/update-index.c:1182 +#: builtin/update-index.c:1193 msgid "fsmonitor disabled" msgstr "Dateisystem-Monitor deaktiviert" @@ -14837,6 +15345,24 @@ msgstr "git update-server-info [--force]" msgid "update the info files from scratch" msgstr "die Informationsdateien von Grund auf aktualisieren" +#: builtin/upload-pack.c:11 +msgid "git upload-pack [<options>] <dir>" +msgstr "git upload-pack [<Optionen>] <Verzeichnis>" + +#: builtin/upload-pack.c:25 +msgid "exit immediately after initial ref advertisement" +msgstr "direkt nach der initialen Angabe der Commits beenden" + +#: builtin/upload-pack.c:27 +msgid "do not try <directory>/.git/ if <directory> is no Git directory" +msgstr "" +"kein Versuch in <Verzeichnis>/.git/ wenn <Verzeichnis> kein Git-Verzeichnis " +"ist" + +#: builtin/upload-pack.c:29 +msgid "interrupt transfer after <n> seconds of inactivity" +msgstr "Übertragung nach <n> Sekunden Inaktivität unterbrechen" + #: builtin/verify-commit.c:18 msgid "git verify-commit [-v | --verbose] <commit>..." msgstr "git verify-commit [-v | --verbose] <Commit>..." @@ -14897,22 +15423,22 @@ msgstr "git worktree remove [<Optionen>] <Arbeitsverzeichnis>" msgid "git worktree unlock <path>" msgstr "git worktree unlock <Pfad>" -#: builtin/worktree.c:60 +#: builtin/worktree.c:58 #, c-format msgid "Removing worktrees/%s: not a valid directory" msgstr "Lösche worktrees/%s: kein gültiges Verzeichnis" -#: builtin/worktree.c:66 +#: builtin/worktree.c:64 #, c-format msgid "Removing worktrees/%s: gitdir file does not exist" msgstr "Lösche worktrees/%s: gitdir-Datei existiert nicht" -#: builtin/worktree.c:71 builtin/worktree.c:80 +#: builtin/worktree.c:69 builtin/worktree.c:78 #, c-format msgid "Removing worktrees/%s: unable to read gitdir file (%s)" msgstr "Lösche worktrees/%s: konnte gitdir-Datei (%s) nicht lesen" -#: builtin/worktree.c:90 +#: builtin/worktree.c:88 #, c-format msgid "" "Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read " @@ -14921,183 +15447,198 @@ msgstr "" "Lösche worktrees/%s: read() zu kurz (%<PRIuMAX> Bytes erwartet, %<PRIuMAX> " "gelesen)" -#: builtin/worktree.c:98 +#: builtin/worktree.c:96 #, c-format msgid "Removing worktrees/%s: invalid gitdir file" msgstr "Lösche worktrees/%s: ungültige gitdir-Datei" -#: builtin/worktree.c:114 +#: builtin/worktree.c:105 #, c-format msgid "Removing worktrees/%s: gitdir file points to non-existent location" msgstr "Lösche worktrees/%s: gitdir-Datei verweist auf nicht existierenden Ort" -#: builtin/worktree.c:161 +#: builtin/worktree.c:152 msgid "report pruned working trees" msgstr "entfernte Arbeitsverzeichnisse ausgeben" -#: builtin/worktree.c:163 +#: builtin/worktree.c:154 msgid "expire working trees older than <time>" msgstr "Arbeitsverzeichnisse älter als <Zeit> verfallen lassen" -#: builtin/worktree.c:238 +#: builtin/worktree.c:229 #, c-format msgid "'%s' already exists" msgstr "'%s' existiert bereits" -#: builtin/worktree.c:269 +#: builtin/worktree.c:260 #, c-format msgid "could not create directory of '%s'" msgstr "Konnte Verzeichnis '%s' nicht erstellen." -#: builtin/worktree.c:308 +#: builtin/worktree.c:373 builtin/worktree.c:379 +#, c-format +msgid "Preparing worktree (new branch '%s')" +msgstr "Bereite Arbeitsverzeichnis vor (neuer Branch '%s')" + +#: builtin/worktree.c:375 +#, 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:384 +#, c-format +msgid "Preparing worktree (checking out '%s')" +msgstr "Bereite Arbeitsverzeichnis vor (checke '%s' aus)" + +#: builtin/worktree.c:390 #, c-format -msgid "Preparing %s (identifier %s)" -msgstr "Bereite %s vor (Identifikation %s)" +msgid "Preparing worktree (detached HEAD %s)" +msgstr "Bereite Arbeitsverzeichnis vor (losgelöster HEAD %s)" -#: builtin/worktree.c:385 +#: builtin/worktree.c:431 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:388 +#: builtin/worktree.c:434 msgid "create a new branch" msgstr "neuen Branch erstellen" -#: builtin/worktree.c:390 +#: builtin/worktree.c:436 msgid "create or reset a branch" msgstr "Branch erstellen oder umsetzen" -#: builtin/worktree.c:392 +#: builtin/worktree.c:438 msgid "populate the new working tree" msgstr "das neue Arbeitsverzeichnis auschecken" -#: builtin/worktree.c:393 +#: builtin/worktree.c:439 msgid "keep the new working tree locked" msgstr "das neue Arbeitsverzeichnis gesperrt lassen" -#: builtin/worktree.c:395 +#: builtin/worktree.c:441 msgid "set up tracking mode (see git-branch(1))" msgstr "Modus zum Folgen von Branches einstellen (siehe git-branch(1))" -#: builtin/worktree.c:398 +#: builtin/worktree.c:444 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:406 +#: builtin/worktree.c:452 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b, -B und --detach schließen sich gegenseitig aus" -#: builtin/worktree.c:471 +#: builtin/worktree.c:511 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:571 +#: builtin/worktree.c:611 msgid "reason for locking" msgstr "Sperrgrund" -#: builtin/worktree.c:583 builtin/worktree.c:616 builtin/worktree.c:670 -#: builtin/worktree.c:809 +#: builtin/worktree.c:623 builtin/worktree.c:656 builtin/worktree.c:710 +#: builtin/worktree.c:850 #, c-format msgid "'%s' is not a working tree" msgstr "'%s' ist kein Arbeitsverzeichnis" -#: builtin/worktree.c:585 builtin/worktree.c:618 +#: builtin/worktree.c:625 builtin/worktree.c:658 msgid "The main working tree cannot be locked or unlocked" msgstr "Das Hauptarbeitsverzeichnis kann nicht gesperrt oder entsperrt werden." -#: builtin/worktree.c:590 +#: builtin/worktree.c:630 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "'%s' ist bereits gesperrt, Grund: %s" -#: builtin/worktree.c:592 +#: builtin/worktree.c:632 #, c-format msgid "'%s' is already locked" msgstr "'%s' ist bereits gesperrt" -#: builtin/worktree.c:620 +#: builtin/worktree.c:660 #, c-format msgid "'%s' is not locked" msgstr "'%s' ist nicht gesperrt" -#: builtin/worktree.c:645 +#: builtin/worktree.c:685 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:672 builtin/worktree.c:811 +#: builtin/worktree.c:712 builtin/worktree.c:852 #, c-format msgid "'%s' is a main working tree" msgstr "'%s' ist ein Hauptarbeitsverzeichnis" -#: builtin/worktree.c:677 +#: builtin/worktree.c:717 #, c-format msgid "could not figure out destination name from '%s'" msgstr "Konnte Zielname aus '%s' nicht bestimmen." -#: builtin/worktree.c:683 +#: builtin/worktree.c:723 #, c-format msgid "target '%s' already exists" msgstr "Ziel '%s' existiert bereits." -#: builtin/worktree.c:690 +#: builtin/worktree.c:730 #, c-format msgid "cannot move a locked working tree, lock reason: %s" msgstr "Kann gesperrtes Arbeitsverzeichnis nicht verschieben, Sperrgrund: %s" -#: builtin/worktree.c:692 +#: builtin/worktree.c:732 msgid "cannot move a locked working tree" msgstr "Kann gesperrtes Arbeitsverzeichnis nicht verschieben." -#: builtin/worktree.c:695 +#: builtin/worktree.c:735 #, c-format msgid "validation failed, cannot move working tree: %s" msgstr "Validierung fehlgeschlagen, kann Arbeitszeichnis nicht verschieben: %s" -#: builtin/worktree.c:700 +#: builtin/worktree.c:740 #, c-format msgid "failed to move '%s' to '%s'" msgstr "Fehler beim Verschieben von '%s' nach '%s'" -#: builtin/worktree.c:748 +#: builtin/worktree.c:788 #, c-format msgid "failed to run 'git status' on '%s'" msgstr "Fehler beim Ausführen von 'git status' auf '%s'" -#: builtin/worktree.c:752 +#: builtin/worktree.c:792 #, 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:757 +#: builtin/worktree.c:797 #, 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:768 builtin/worktree.c:782 +#: builtin/worktree.c:808 builtin/worktree.c:822 #, c-format msgid "failed to delete '%s'" msgstr "Fehler beim Löschen von '%s'" -#: builtin/worktree.c:794 +#: builtin/worktree.c:834 msgid "force removing even if the worktree is dirty" msgstr "Löschen erzwingen, auch wenn das Arbeitsverzeichnis geändert wurde" -#: builtin/worktree.c:815 +#: builtin/worktree.c:856 #, c-format msgid "cannot remove a locked working tree, lock reason: %s" msgstr "Kann gesperrtes Arbeitsverzeichnis nicht löschen, Sperrgrund: %s" -#: builtin/worktree.c:817 +#: builtin/worktree.c:858 msgid "cannot remove a locked working tree" msgstr "Kann gesperrtes Arbeitsverzeichnis nicht löschen." -#: builtin/worktree.c:820 +#: builtin/worktree.c:861 #, c-format msgid "validation failed, cannot remove working tree: %s" msgstr "Validierung fehlgeschlagen, kann Arbeitsverzeichnis nicht löschen: %s" @@ -15118,28 +15659,6 @@ msgstr "das \"Tree\"-Objekt für ein Unterverzeichnis <Präfix> schreiben" msgid "only useful for debugging" msgstr "nur nützlich für Fehlersuche" -#: upload-pack.c:27 -msgid "git upload-pack [<options>] <dir>" -msgstr "git upload-pack [<Optionen>] <Verzeichnis>" - -#: upload-pack.c:1070 -msgid "quit after a single request/response exchange" -msgstr "nach einem einzigen Request/Response-Austausch beenden" - -#: upload-pack.c:1072 -msgid "exit immediately after initial ref advertisement" -msgstr "direkt nach der initialen Angabe der Commits beenden" - -#: upload-pack.c:1074 -msgid "do not try <directory>/.git/ if <directory> is no Git directory" -msgstr "" -"kein Versuch in <Verzeichnis>/.git/ wenn <Verzeichnis> kein Git-Verzeichnis " -"ist" - -#: upload-pack.c:1076 -msgid "interrupt transfer after <n> seconds of inactivity" -msgstr "Übertragung nach <n> Sekunden Inaktivität unterbrechen" - #: credential-cache--daemon.c:222 #, c-format msgid "" @@ -15160,21 +15679,22 @@ msgstr "" msgid "print debugging messages to stderr" msgstr "Meldungen zur Fehlersuche in Standard-Fehlerausgabe ausgeben" -#: git.c:8 +#: git.c:26 msgid "" "git [--version] [--help] [-C <path>] [-c <name>=<value>]\n" " [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n" -" [-p | --paginate | --no-pager] [--no-replace-objects] [--bare]\n" +" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--" +"bare]\n" " [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n" " <command> [<args>]" msgstr "" "git [--version] [--help] [-C <Pfad>] [-c <Name>=<Wert>]\n" " [--exec-path[=<Pfad>]] [--html-path] [--man-path] [--info-path]\n" -" [-p | --paginate | --no-pager] [--no-replace-objects] [--bare]\n" +" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--bare]\n" " [--git-dir=<Pfad>] [--work-tree=<Pfad>] [--namespace=<Name>]\n" " <Befehl> [<Argumente>]" -#: git.c:15 +#: git.c:33 msgid "" "'git help -a' and 'git help -g' list available subcommands and some\n" "concept guides. See 'git help <command>' or 'git help <concept>'\n" @@ -15185,67 +15705,67 @@ msgstr "" "oder 'git help <Konzept>', um mehr über einen spezifischen Befehl oder\n" "Konzept zu erfahren." -#: git.c:95 +#: git.c:113 #, c-format msgid "no directory given for --git-dir\n" msgstr "Kein Verzeichnis für --git-dir angegeben.\n" -#: git.c:109 +#: git.c:127 #, c-format msgid "no namespace given for --namespace\n" msgstr "Kein Namespace für --namespace angegeben.\n" -#: git.c:123 +#: git.c:141 #, c-format msgid "no directory given for --work-tree\n" msgstr "Kein Verzeichnis für --work-tree angegeben.\n" -#: git.c:137 +#: git.c:155 #, c-format msgid "no prefix given for --super-prefix\n" msgstr "Kein Präfix für --super-prefix angegeben.\n" -#: git.c:159 +#: git.c:177 #, c-format msgid "-c expects a configuration string\n" msgstr "-c erwartet einen Konfigurationsstring.\n" -#: git.c:197 +#: git.c:215 #, c-format msgid "no directory given for -C\n" msgstr "Kein Verzeichnis für -C angegeben.\n" -#: git.c:212 +#: git.c:233 #, c-format msgid "unknown option: %s\n" msgstr "Unbekannte Option: %s\n" -#: git.c:687 +#: git.c:698 #, 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:699 +#: git.c:710 #, c-format msgid "failed to run command '%s': %s\n" msgstr "Fehler beim Ausführen von Befehl '%s': %s\n" -#: http.c:342 +#: http.c:348 #, c-format msgid "negative value for http.postbuffer; defaulting to %d" msgstr "negativer Wert für http.postbuffer; benutze Standardwert %d" -#: http.c:363 +#: http.c:369 msgid "Delegation control is not supported with cURL < 7.22.0" msgstr "Kontrolle über Delegation wird mit cURL < 7.22.0 nicht unterstützt" -#: http.c:372 +#: http.c:378 msgid "Public key pinning not supported with cURL < 7.44.0" msgstr "" "Das Anheften des öffentlichen Schlüssels wird mit cURL < 7.44.0\n" "nicht unterstützt." -#: http.c:1857 +#: http.c:1854 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -15256,7 +15776,7 @@ msgstr "" " gefragt nach: %s\n" " umgeleitet: %s" -#: remote-curl.c:345 +#: remote-curl.c:401 #, c-format msgid "redirecting to %s" msgstr "Leite nach %s um" @@ -15391,15 +15911,15 @@ msgstr "Verfallsdatum" msgid "no-op (backward compatibility)" msgstr "Kein Effekt (Rückwärtskompatibilität)" -#: parse-options.h:250 +#: parse-options.h:251 msgid "be more verbose" msgstr "erweiterte Ausgaben" -#: parse-options.h:252 +#: parse-options.h:253 msgid "be more quiet" msgstr "weniger Ausgaben" -#: parse-options.h:258 +#: parse-options.h:259 msgid "use <n> digits to display SHA-1s" msgstr "benutze <n> Ziffern zur Anzeige von SHA-1s" @@ -15638,7 +16158,7 @@ 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-rebase.sh:60 +#: git-rebase.sh:61 msgid "" "Resolve all conflicts manually, mark them as resolved with\n" "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n" @@ -15654,43 +16174,43 @@ msgstr "" "Um abzubrechen und zurück zum Zustand vor \"git rebase\" zu gelangen,\n" "führen Sie \"git rebase --abort\" aus." -#: git-rebase.sh:163 git-rebase.sh:409 +#: git-rebase.sh:173 git-rebase.sh:442 #, sh-format msgid "Could not move back to $head_name" msgstr "Konnte nicht zu $head_name zurückgehen" -#: git-rebase.sh:174 +#: git-rebase.sh:184 msgid "Applied autostash." msgstr "Automatischen Stash angewendet." -#: git-rebase.sh:177 +#: git-rebase.sh:187 #, sh-format msgid "Cannot store $stash_sha1" msgstr "Kann $stash_sha1 nicht speichern." -#: git-rebase.sh:218 +#: git-rebase.sh:229 msgid "The pre-rebase hook refused to rebase." msgstr "Der \"pre-rebase hook\" hat den Rebase zurückgewiesen." -#: git-rebase.sh:223 +#: git-rebase.sh:234 msgid "It looks like 'git am' is in progress. Cannot rebase." msgstr "'git-am' scheint im Gange zu sein. Kann Rebase nicht durchführen." -#: git-rebase.sh:370 +#: git-rebase.sh:403 msgid "No rebase in progress?" msgstr "Kein Rebase im Gange?" -#: git-rebase.sh:381 +#: git-rebase.sh:414 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." -#: git-rebase.sh:388 +#: git-rebase.sh:421 msgid "Cannot read HEAD" msgstr "Kann HEAD nicht lesen" -#: git-rebase.sh:391 +#: git-rebase.sh:424 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -15698,7 +16218,7 @@ msgstr "" "Sie müssen alle Merge-Konflikte editieren und diese dann\n" "mittels \"git add\" als aufgelöst markieren" -#: git-rebase.sh:435 +#: git-rebase.sh:468 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" @@ -15719,77 +16239,81 @@ msgstr "" "und führen Sie diesen Befehl nochmal aus. Es wird angehalten, falls noch\n" "etwas Schützenswertes vorhanden ist." -#: git-rebase.sh:491 +#: git-rebase.sh:509 +msgid "error: cannot combine '--signoff' with '--preserve-merges'" +msgstr "Fehler: '--signoff' und '--preserve-merges' können nicht kombiniert werden." + +#: git-rebase.sh:537 #, sh-format msgid "invalid upstream '$upstream_name'" msgstr "Ungültiger Upstream-Branch '$upstream_name'." -#: git-rebase.sh:515 +#: git-rebase.sh:561 #, sh-format msgid "$onto_name: there are more than one merge bases" msgstr "$onto_name: es gibt mehr als eine Merge-Basis" -#: git-rebase.sh:518 git-rebase.sh:522 +#: git-rebase.sh:564 git-rebase.sh:568 #, sh-format msgid "$onto_name: there is no merge base" msgstr "$onto_name: es gibt keine Merge-Basis" -#: git-rebase.sh:527 +#: git-rebase.sh:573 #, sh-format msgid "Does not point to a valid commit: $onto_name" msgstr "$onto_name zeigt auf keinen gültigen Commit" -#: git-rebase.sh:553 +#: git-rebase.sh:599 #, sh-format msgid "fatal: no such branch/commit '$branch_name'" msgstr "fatal: Branch/Commit '$branch_name' nicht gefunden" -#: git-rebase.sh:586 +#: git-rebase.sh:632 msgid "Cannot autostash" msgstr "Kann automatischen Stash nicht erzeugen." -#: git-rebase.sh:591 +#: git-rebase.sh:637 #, sh-format msgid "Created autostash: $stash_abbrev" msgstr "Automatischen Stash erzeugt: $stash_abbrev" -#: git-rebase.sh:595 +#: git-rebase.sh:641 msgid "Please commit or stash them." msgstr "Bitte committen Sie die Änderungen oder benutzen Sie \"stash\"." -#: git-rebase.sh:618 +#: git-rebase.sh:664 #, sh-format msgid "HEAD is up to date." msgstr "HEAD ist aktuell." -#: git-rebase.sh:620 +#: git-rebase.sh:666 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "Aktueller Branch $branch_name ist auf dem neuesten Stand." -#: git-rebase.sh:628 +#: git-rebase.sh:674 #, sh-format msgid "HEAD is up to date, rebase forced." msgstr "HEAD ist aktuell, Rebase erzwungen." -#: git-rebase.sh:630 +#: git-rebase.sh:676 #, 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-rebase.sh:642 +#: git-rebase.sh:688 #, sh-format msgid "Changes from $mb to $onto:" msgstr "Änderungen von $mb zu $onto:" -#: git-rebase.sh:651 +#: git-rebase.sh:697 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-rebase.sh:661 +#: git-rebase.sh:707 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "$branch_name zu $onto_name vorgespult." @@ -15858,114 +16382,114 @@ msgstr "Kann den aktuellen Status nicht speichern" msgid "Saved working directory and index state $stash_msg" msgstr "Speicherte Arbeitsverzeichnis und Index-Status $stash_msg" -#: git-stash.sh:340 +#: git-stash.sh:342 msgid "Cannot remove worktree changes" msgstr "Kann Änderungen im Arbeitsverzeichnis nicht löschen" -#: git-stash.sh:488 +#: git-stash.sh:490 #, sh-format msgid "unknown option: $opt" msgstr "unbekannte Option: $opt" -#: git-stash.sh:501 +#: git-stash.sh:503 msgid "No stash entries found." msgstr "Keine Stash-Einträge gefunden." -#: git-stash.sh:508 +#: git-stash.sh:510 #, sh-format msgid "Too many revisions specified: $REV" msgstr "Zu viele Commits angegeben: $REV" -#: git-stash.sh:523 +#: git-stash.sh:525 #, sh-format msgid "$reference is not a valid reference" msgstr "$reference ist keine gültige Referenz" -#: git-stash.sh:551 +#: git-stash.sh:553 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "'$args' ist kein \"stash\"-artiger Commit" -#: git-stash.sh:562 +#: git-stash.sh:564 #, sh-format msgid "'$args' is not a stash reference" msgstr "'$args' ist keine \"stash\"-Referenz" -#: git-stash.sh:570 +#: git-stash.sh:572 msgid "unable to refresh index" msgstr "Konnte den Index nicht aktualisieren." -#: git-stash.sh:574 +#: git-stash.sh:576 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:582 +#: git-stash.sh:584 msgid "Conflicts in index. Try without --index." msgstr "Konflikte im Index. Versuchen Sie es ohne --index." -#: git-stash.sh:584 +#: git-stash.sh:586 msgid "Could not save index tree" msgstr "Konnte Index-Verzeichnis nicht speichern" -#: git-stash.sh:593 +#: git-stash.sh:595 msgid "Could not restore untracked files from stash entry" msgstr "" "Konnte unversionierte Dateien vom Stash-Eintrag nicht wiederherstellen." -#: git-stash.sh:618 +#: git-stash.sh:620 msgid "Cannot unstage modified files" msgstr "Kann geänderte Dateien nicht aus dem Index entfernen" -#: git-stash.sh:633 +#: git-stash.sh:635 msgid "Index was not unstashed." msgstr "Index wurde nicht aus dem Stash zurückgeladen." -#: git-stash.sh:647 +#: git-stash.sh:649 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:656 +#: git-stash.sh:658 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "${REV} ($s) gelöscht" -#: git-stash.sh:657 +#: git-stash.sh:659 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "${REV}: Konnte \"stash\"-Eintrag nicht löschen" -#: git-stash.sh:665 +#: git-stash.sh:667 msgid "No branch name specified" msgstr "Kein Branchname spezifiziert" -#: git-stash.sh:744 +#: git-stash.sh:746 msgid "(To restore them type \"git stash apply\")" msgstr "(Zur Wiederherstellung geben Sie \"git stash apply\" ein)" -#: git-submodule.sh:181 +#: git-submodule.sh:188 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:191 +#: git-submodule.sh:198 #, 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:210 +#: git-submodule.sh:217 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "'$sm_path' ist bereits zum Commit vorgemerkt" -#: git-submodule.sh:213 +#: git-submodule.sh:220 #, 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:219 +#: git-submodule.sh:226 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -15976,24 +16500,24 @@ msgstr "" "$sm_path\n" "Benutzen Sie -f wenn Sie diesen wirklich hinzufügen möchten." -#: git-submodule.sh:237 +#: git-submodule.sh:249 #, 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:239 +#: git-submodule.sh:251 #, 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:247 +#: git-submodule.sh:259 #, 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:249 +#: git-submodule.sh:261 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from\n" @@ -16011,47 +16535,47 @@ 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:255 +#: git-submodule.sh:267 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "Reaktiviere lokales Git-Verzeichnis für Submodul '$sm_name'." -#: git-submodule.sh:267 +#: git-submodule.sh:279 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "Kann Submodul '$sm_path' nicht auschecken" -#: git-submodule.sh:272 +#: git-submodule.sh:284 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "Hinzufügen von Submodul '$sm_path' fehlgeschlagen" -#: git-submodule.sh:281 +#: git-submodule.sh:293 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "Fehler beim Eintragen von Submodul '$sm_path' in die Konfiguration." -#: git-submodule.sh:342 +#: git-submodule.sh:354 #, sh-format msgid "Entering '$displaypath'" msgstr "Betrete '$displaypath'" -#: git-submodule.sh:362 +#: git-submodule.sh:374 #, sh-format msgid "Stopping at '$displaypath'; script returned non-zero status." msgstr "Stoppe bei '$displaypath'; Skript gab nicht-Null Status zurück." -#: git-submodule.sh:584 +#: git-submodule.sh:600 #, 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:594 +#: git-submodule.sh:610 #, 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:599 +#: git-submodule.sh:615 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " @@ -16060,12 +16584,12 @@ msgstr "" "Konnte aktuellen Commit von ${remote_name}/${branch} in Submodul-Pfad\n" "'$sm_path' nicht finden." -#: git-submodule.sh:617 +#: git-submodule.sh:633 #, sh-format msgid "Unable to fetch in submodule path '$displaypath'" msgstr "Konnte \"fetch\" in Submodul-Pfad '$displaypath' nicht ausführen" -#: git-submodule.sh:623 +#: git-submodule.sh:639 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " @@ -16074,74 +16598,74 @@ msgstr "" "\"fetch\" in Submodul-Pfad '$displaypath' ausgeführt, aber $sha1 nicht\n" "enthalten. Direktes Anfordern dieses Commits ist fehlgeschlagen." -#: git-submodule.sh:630 +#: git-submodule.sh:646 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "Konnte '$sha1' in Submodul-Pfad '$displaypath' nicht auschecken." -#: git-submodule.sh:631 +#: git-submodule.sh:647 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "Submodul-Pfad: '$displaypath': '$sha1' ausgecheckt" -#: git-submodule.sh:635 +#: git-submodule.sh:651 #, 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:636 +#: git-submodule.sh:652 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "Submodul-Pfad '$displaypath': Rebase auf '$sha1'" -#: git-submodule.sh:641 +#: git-submodule.sh:657 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "Merge von '$sha1' in Submodul-Pfad '$displaypath' fehlgeschlagen" -#: git-submodule.sh:642 +#: git-submodule.sh:658 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "Submodul-Pfad '$displaypath': zusammengeführt in '$sha1'" -#: git-submodule.sh:647 +#: git-submodule.sh:663 #, 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:648 +#: git-submodule.sh:664 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "Submodul-Pfad '$displaypath': '$command $sha1'" -#: git-submodule.sh:679 +#: git-submodule.sh:695 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "Fehler bei Rekursion in Submodul-Pfad '$displaypath'" -#: git-submodule.sh:775 +#: git-submodule.sh:791 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:827 +#: git-submodule.sh:843 #, sh-format msgid "unexpected mode $mod_dst" msgstr "unerwarteter Modus $mod_dst" -#: git-submodule.sh:847 +#: git-submodule.sh:863 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr " Warnung: $display_name beinhaltet nicht Commit $sha1_src" -#: git-submodule.sh:850 +#: git-submodule.sh:866 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr " Warnung: $display_name beinhaltet nicht Commit $sha1_dst" -#: git-submodule.sh:853 +#: git-submodule.sh:869 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr "" @@ -16152,39 +16676,52 @@ msgstr "" msgid "See git-${cmd}(1) for details." msgstr "Siehe git-${cmd}(1) für weitere Details." -#: git-rebase--interactive.sh:140 +#: git-rebase--interactive.sh:142 #, sh-format msgid "Rebasing ($new_count/$total)" msgstr "Führe Rebase aus ($new_count/$total)" -#: git-rebase--interactive.sh:156 +#: git-rebase--interactive.sh:158 msgid "" "\n" "Commands:\n" -"p, pick = use commit\n" -"r, reword = use commit, but edit the commit message\n" -"e, edit = use commit, but stop for amending\n" -"s, squash = use commit, but meld into previous commit\n" -"f, fixup = like \"squash\", but discard this commit's log message\n" -"x, exec = run command (the rest of the line) using shell\n" -"d, drop = remove commit\n" +"p, pick <commit> = use commit\n" +"r, reword <commit> = use commit, but edit the commit message\n" +"e, edit <commit> = use commit, but stop for amending\n" +"s, squash <commit> = use commit, but meld into previous commit\n" +"f, fixup <commit> = like \"squash\", but discard this commit's log message\n" +"x, exec <commit> = run command (the rest of the line) using shell\n" +"d, drop <commit> = remove commit\n" +"l, label <label> = label current HEAD with a name\n" +"t, reset <label> = reset HEAD to a label\n" +"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n" +". create a merge commit using the original merge commit's\n" +". message (or the oneline, if no original merge commit was\n" +". specified). Use -c <commit> to reword the commit message.\n" "\n" "These lines can be re-ordered; they are executed from top to bottom.\n" msgstr "" "\n" "Befehle:\n" -"p, pick = Commit verwenden\n" -"r, reword = Commit verwenden, aber Commit-Beschreibung bearbeiten\n" -"e, edit = Commit verwenden, aber zum Nachbessern anhalten\n" -"s, squash = Commit verwenden, aber mit vorherigem Commit vereinen\n" -"f, fixup = wie \"squash\", aber diese Commit-Beschreibung verwerfen\n" -"x, exec = Befehl (Rest der Zeile) mittels Shell ausführen\n" -"d, drop = Commit entfernen\n" +"p, pick <Commit> = Commit verwenden\n" +"r, reword <Commit> = Commit verwenden, aber Commit-Beschreibung bearbeiten\n" +"e, edit <Commit> = Commit verwenden, aber zum Nachbessern anhalten\n" +"s, squash <Commit> = Commit verwenden, aber mit vorherigem Commit vereinen\n" +"f, fixup <Commit> = wie \"squash\", aber diese Commit-Beschreibung verwerfen\n" +"x, exec <Commit> = Befehl (Rest der Zeile) mittels Shell ausführen\n" +"d, drop <Commit> = Commit entfernen\n" +"l, label <Label> = aktuellen HEAD mit Label versehen\n" +"t, reset <Label> = HEAD zu einem Label umsetzen\n" +"m, merge [-C <Commit> | -c <Commit>] <Label> [# <eineZeile>]\n" +". Merge-Commit mit der originalen Merge-Commit-Beschreibung erstellen\n" +". (oder die eine Zeile, wenn keine originale Merge-Commit-Beschreibung\n" +". spezifiziert ist). Benutzen Sie -c <Commit> zum Bearbeiten der\n" +". Commit-Beschreibung.\n" "\n" "Diese Zeilen können umsortiert werden; Sie werden von oben nach unten\n" "ausgeführt.\n" -#: git-rebase--interactive.sh:171 +#: git-rebase--interactive.sh:179 msgid "" "\n" "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" @@ -16193,7 +16730,7 @@ msgstr "" "Keine Zeile entfernen. Benutzen Sie 'drop', um explizit einen Commit zu\n" "entfernen.\n" -#: git-rebase--interactive.sh:175 +#: git-rebase--interactive.sh:183 msgid "" "\n" "If you remove a line here THAT COMMIT WILL BE LOST.\n" @@ -16201,7 +16738,7 @@ msgstr "" "\n" "Wenn Sie hier eine Zeile entfernen, wird DIESER COMMIT VERLOREN GEHEN.\n" -#: git-rebase--interactive.sh:213 +#: git-rebase--interactive.sh:221 #, sh-format msgid "" "You can amend the commit now, with\n" @@ -16220,83 +16757,83 @@ msgstr "" "\n" "\tgit rebase --continue" -#: git-rebase--interactive.sh:238 +#: git-rebase--interactive.sh:246 #, sh-format msgid "$sha1: not a commit that can be picked" msgstr "$sha1: kein Commit der gepickt werden kann" -#: git-rebase--interactive.sh:277 +#: git-rebase--interactive.sh:285 #, sh-format msgid "Invalid commit name: $sha1" msgstr "Ungültiger Commit-Name: $sha1" -#: git-rebase--interactive.sh:319 +#: git-rebase--interactive.sh:325 msgid "Cannot write current commit's replacement sha1" msgstr "Kann ersetzenden SHA-1 des aktuellen Commits nicht schreiben" -#: git-rebase--interactive.sh:371 +#: git-rebase--interactive.sh:376 #, sh-format msgid "Fast-forward to $sha1" msgstr "Spule vor zu $sha1" -#: git-rebase--interactive.sh:373 +#: git-rebase--interactive.sh:378 #, sh-format msgid "Cannot fast-forward to $sha1" msgstr "Kann nicht zu $sha1 vorspulen" -#: git-rebase--interactive.sh:382 +#: git-rebase--interactive.sh:387 #, sh-format msgid "Cannot move HEAD to $first_parent" msgstr "Kann HEAD nicht auf $first_parent setzen" -#: git-rebase--interactive.sh:387 +#: git-rebase--interactive.sh:392 #, sh-format msgid "Refusing to squash a merge: $sha1" msgstr "\"squash\" eines Merges ($sha1) zurückgewiesen." -#: git-rebase--interactive.sh:405 +#: git-rebase--interactive.sh:410 #, sh-format msgid "Error redoing merge $sha1" msgstr "Fehler beim Wiederholen des Merges von $sha1" -#: git-rebase--interactive.sh:414 +#: git-rebase--interactive.sh:419 #, sh-format msgid "Could not pick $sha1" msgstr "Konnte $sha1 nicht picken" -#: git-rebase--interactive.sh:423 +#: git-rebase--interactive.sh:428 #, sh-format msgid "This is the commit message #${n}:" msgstr "Das ist Commit-Beschreibung #${n}:" -#: git-rebase--interactive.sh:428 +#: git-rebase--interactive.sh:433 #, sh-format msgid "The commit message #${n} will be skipped:" msgstr "Commit-Beschreibung #${n} wird ausgelassen:" -#: git-rebase--interactive.sh:439 +#: git-rebase--interactive.sh:444 #, sh-format msgid "This is a combination of $count commit." msgid_plural "This is a combination of $count commits." msgstr[0] "Das ist eine Kombination aus $count Commit." msgstr[1] "Das ist eine Kombination aus $count Commits." -#: git-rebase--interactive.sh:448 +#: git-rebase--interactive.sh:453 #, sh-format msgid "Cannot write $fixup_msg" msgstr "Kann $fixup_msg nicht schreiben" -#: git-rebase--interactive.sh:451 +#: git-rebase--interactive.sh:456 msgid "This is a combination of 2 commits." msgstr "Das ist eine Kombination aus 2 Commits." -#: git-rebase--interactive.sh:492 git-rebase--interactive.sh:535 -#: git-rebase--interactive.sh:538 +#: git-rebase--interactive.sh:497 git-rebase--interactive.sh:540 +#: git-rebase--interactive.sh:543 #, sh-format msgid "Could not apply $sha1... $rest" msgstr "Konnte $sha1... ($rest) nicht anwenden" -#: git-rebase--interactive.sh:567 +#: git-rebase--interactive.sh:572 #, sh-format msgid "" "Could not amend commit after successfully picking $sha1... $rest\n" @@ -16313,31 +16850,31 @@ msgstr "" "sollten Sie das Problem beheben, bevor Sie die Commit-Beschreibung ändern " "können." -#: git-rebase--interactive.sh:582 +#: git-rebase--interactive.sh:587 #, sh-format msgid "Stopped at $sha1_abbrev... $rest" msgstr "Angehalten bei $sha1_abbrev... $rest" -#: git-rebase--interactive.sh:597 +#: git-rebase--interactive.sh:602 #, sh-format msgid "Cannot '$squash_style' without a previous commit" msgstr "Kann nicht '$squash_style' ohne vorherigen Commit" -#: git-rebase--interactive.sh:639 +#: git-rebase--interactive.sh:644 #, sh-format msgid "Executing: $rest" msgstr "Führe aus: $rest" -#: git-rebase--interactive.sh:647 +#: git-rebase--interactive.sh:652 #, sh-format msgid "Execution failed: $rest" msgstr "Ausführung fehlgeschlagen: $rest" -#: git-rebase--interactive.sh:649 +#: git-rebase--interactive.sh:654 msgid "and made changes to the index and/or the working tree" msgstr "Der Index und/oder das Arbeitsverzeichnis wurde geändert." -#: git-rebase--interactive.sh:651 +#: git-rebase--interactive.sh:656 msgid "" "You can fix the problem, and then run\n" "\n" @@ -16350,7 +16887,7 @@ msgstr "" "ausführen." #. TRANSLATORS: after these lines is a command to be issued by the user -#: git-rebase--interactive.sh:664 +#: git-rebase--interactive.sh:669 #, sh-format msgid "" "Execution succeeded: $rest\n" @@ -16366,29 +16903,29 @@ msgstr "" "\n" "\tgit rebase --continue" -#: git-rebase--interactive.sh:675 +#: git-rebase--interactive.sh:680 #, sh-format msgid "Unknown command: $command $sha1 $rest" msgstr "Unbekannter Befehl: $command $sha1 $rest" -#: git-rebase--interactive.sh:676 +#: git-rebase--interactive.sh:681 msgid "Please fix this using 'git rebase --edit-todo'." msgstr "Bitte beheben Sie das, indem Sie 'git rebase --edit-todo' ausführen." -#: git-rebase--interactive.sh:711 +#: git-rebase--interactive.sh:716 #, sh-format msgid "Successfully rebased and updated $head_name." msgstr "Erfolgreich Rebase ausgeführt und $head_name aktualisiert." -#: git-rebase--interactive.sh:735 +#: git-rebase--interactive.sh:740 msgid "could not detach HEAD" msgstr "Konnte HEAD nicht loslösen" -#: git-rebase--interactive.sh:771 +#: git-rebase--interactive.sh:778 msgid "Could not remove CHERRY_PICK_HEAD" msgstr "Konnte CHERRY_PICK_HEAD nicht löschen" -#: git-rebase--interactive.sh:776 +#: git-rebase--interactive.sh:783 #, sh-format msgid "" "You have staged changes in your working tree.\n" @@ -16420,13 +16957,13 @@ msgstr "" "\n" " git rebase --continue\n" -#: git-rebase--interactive.sh:793 +#: git-rebase--interactive.sh:800 msgid "Error trying to find the author identity to amend commit" msgstr "" "Fehler beim Versuch die Identität des Authors zum Verbessern des Commits zu\n" "finden" -#: git-rebase--interactive.sh:798 +#: git-rebase--interactive.sh:805 msgid "" "You have uncommitted changes in your working tree. Please commit them\n" "first and then run 'git rebase --continue' again." @@ -16436,11 +16973,11 @@ msgstr "" "erneut\n" "aus." -#: git-rebase--interactive.sh:803 git-rebase--interactive.sh:807 +#: git-rebase--interactive.sh:810 git-rebase--interactive.sh:814 msgid "Could not commit staged changes." msgstr "Konnte Änderungen aus der Staging-Area nicht committen." -#: git-rebase--interactive.sh:836 +#: git-rebase--interactive.sh:843 msgid "" "\n" "You are editing the todo file of an ongoing interactive rebase.\n" @@ -16454,57 +16991,59 @@ msgstr "" " git rebase --continue\n" "\n" -#: git-rebase--interactive.sh:844 git-rebase--interactive.sh:1008 +#: git-rebase--interactive.sh:851 git-rebase--interactive.sh:937 msgid "Could not execute editor" msgstr "Konnte Editor nicht ausführen." -#: git-rebase--interactive.sh:860 +#: git-rebase--interactive.sh:872 #, sh-format msgid "Could not checkout $switch_to" msgstr "Konnte $switch_to nicht auschecken." -#: git-rebase--interactive.sh:865 +#: git-rebase--interactive.sh:879 msgid "No HEAD?" msgstr "Kein HEAD?" -#: git-rebase--interactive.sh:866 +#: git-rebase--interactive.sh:880 #, sh-format msgid "Could not create temporary $state_dir" msgstr "Konnte temporäres Verzeichnis $state_dir nicht erstellen." -#: git-rebase--interactive.sh:869 +#: git-rebase--interactive.sh:883 msgid "Could not mark as interactive" msgstr "Konnte nicht als interaktiven Rebase markieren." -#: git-rebase--interactive.sh:879 git-rebase--interactive.sh:884 -msgid "Could not init rewritten commits" -msgstr "Konnte neu geschriebene Commits nicht initialisieren." - -#: git-rebase--interactive.sh:910 -msgid "Could not generate todo list" -msgstr "Konnte TODO-Liste nicht erzeugen." - -#: git-rebase--interactive.sh:986 +#: git-rebase--interactive.sh:915 #, sh-format msgid "Rebase $shortrevisions onto $shortonto ($todocount command)" msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" msgstr[0] "Rebase von $shortrevisions auf $shortonto ($todocount Kommando)" msgstr[1] "Rebase von $shortrevisions auf $shortonto ($todocount Kommandos)" -#: git-rebase--interactive.sh:991 +#: git-rebase--interactive.sh:920 msgid "" "\n" -"However, if you remove everything, the rebase will be aborted.\n" +"\tHowever, if you remove everything, the rebase will be aborted.\n" "\n" +"\t" msgstr "" "\n" -"Wenn Sie jedoch alles löschen, wird der Rebase abgebrochen.\n" +"\tWenn Sie jedoch alles löschen, wird der Rebase abgebrochen.\n" "\n" +"\t" -#: git-rebase--interactive.sh:998 +#: git-rebase--interactive.sh:927 msgid "Note that empty commits are commented out" msgstr "Leere Commits sind auskommentiert." +#: git-rebase--interactive.sh:980 +msgid "Could not generate todo list" +msgstr "Konnte TODO-Liste nicht erzeugen." + +#: git-rebase--interactive.sh:1001 git-rebase--interactive.sh:1006 +msgid "Could not init rewritten commits" +msgstr "Konnte neu geschriebene Commits nicht initialisieren." + #: git-sh-setup.sh:89 git-sh-setup.sh:94 #, sh-format msgid "usage: $dashless $USAGE" @@ -16596,68 +17135,68 @@ msgstr "zur Staging-Area hinzugefügt" msgid "unstaged" msgstr "aus Staging-Area entfernt" -#: git-add--interactive.perl:246 git-add--interactive.perl:271 +#: git-add--interactive.perl:253 git-add--interactive.perl:278 msgid "binary" msgstr "Binär" -#: git-add--interactive.perl:255 git-add--interactive.perl:309 +#: git-add--interactive.perl:262 git-add--interactive.perl:316 msgid "nothing" msgstr "Nichts" -#: git-add--interactive.perl:291 git-add--interactive.perl:306 +#: git-add--interactive.perl:298 git-add--interactive.perl:313 msgid "unchanged" msgstr "unverändert" -#: git-add--interactive.perl:602 +#: git-add--interactive.perl:609 #, perl-format msgid "added %d path\n" msgid_plural "added %d paths\n" msgstr[0] "%d Pfad hinzugefügt\n" msgstr[1] "%d Pfade hinzugefügt\n" -#: git-add--interactive.perl:605 +#: git-add--interactive.perl:612 #, perl-format msgid "updated %d path\n" msgid_plural "updated %d paths\n" msgstr[0] "%d Pfad aktualisiert\n" msgstr[1] "%d Pfade aktualisiert\n" -#: git-add--interactive.perl:608 +#: git-add--interactive.perl:615 #, perl-format msgid "reverted %d path\n" msgid_plural "reverted %d paths\n" msgstr[0] "%d Pfad wiederhergestellt\n" msgstr[1] "%d Pfade wiederhergestellt\n" -#: git-add--interactive.perl:611 +#: git-add--interactive.perl:618 #, perl-format msgid "touched %d path\n" msgid_plural "touched %d paths\n" msgstr[0] "%d Pfad angefasst\n" msgstr[1] "%d Pfade angefasst\n" -#: git-add--interactive.perl:620 +#: git-add--interactive.perl:627 msgid "Update" msgstr "Aktualisieren" -#: git-add--interactive.perl:632 +#: git-add--interactive.perl:639 msgid "Revert" msgstr "Revert" -#: git-add--interactive.perl:655 +#: git-add--interactive.perl:662 #, perl-format msgid "note: %s is untracked now.\n" msgstr "Hinweis: %s ist nun unversioniert.\n" -#: git-add--interactive.perl:666 +#: git-add--interactive.perl:673 msgid "Add untracked" msgstr "unversionierte Dateien hinzufügen" -#: git-add--interactive.perl:672 +#: git-add--interactive.perl:679 msgid "No untracked files.\n" msgstr "Keine unversionierten Dateien.\n" -#: git-add--interactive.perl:1026 +#: git-add--interactive.perl:1033 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for staging." @@ -16666,7 +17205,7 @@ msgstr "" "Block\n" "direkt als zum Hinzufügen zur Staging-Area markiert." -#: git-add--interactive.perl:1029 +#: git-add--interactive.perl:1036 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for stashing." @@ -16675,7 +17214,7 @@ msgstr "" "Block\n" "direkt als zum Hinzufügen zum Stash markiert." -#: git-add--interactive.perl:1032 +#: git-add--interactive.perl:1039 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for unstaging." @@ -16684,7 +17223,7 @@ msgstr "" "Block\n" "direkt als zum Entfernen aus der Staging-Area markiert." -#: git-add--interactive.perl:1035 git-add--interactive.perl:1044 +#: git-add--interactive.perl:1042 git-add--interactive.perl:1051 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for applying." @@ -16693,7 +17232,7 @@ msgstr "" "Block\n" "direkt als zum Anwenden markiert." -#: git-add--interactive.perl:1038 git-add--interactive.perl:1041 +#: git-add--interactive.perl:1045 git-add--interactive.perl:1048 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for discarding." @@ -16702,19 +17241,19 @@ msgstr "" "Block\n" "direkt als zum Verwerfen markiert." -#: git-add--interactive.perl:1078 +#: git-add--interactive.perl:1085 #, perl-format msgid "failed to open hunk edit file for writing: %s" msgstr "" "Fehler beim Öffnen von Editier-Datei eines Patch-Blocks zum Schreiben: %s" -#: git-add--interactive.perl:1079 +#: git-add--interactive.perl:1086 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" msgstr "" "Manueller Editiermodus für Patch-Blöcke -- siehe nach unten für eine\n" "Kurzanleitung.\n" -#: git-add--interactive.perl:1085 +#: git-add--interactive.perl:1092 #, perl-format msgid "" "---\n" @@ -16728,7 +17267,7 @@ msgstr "" "Zeilen, die mit %s beginnen, werden entfernt.\n" #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. -#: git-add--interactive.perl:1093 +#: git-add--interactive.perl:1100 msgid "" "If it does not apply cleanly, you will be given an opportunity to\n" "edit again. If all lines of the hunk are removed, then the edit is\n" @@ -16739,7 +17278,7 @@ msgstr "" "werden,\n" "wird die Bearbeitung abgebrochen und der Patch-Block bleibt unverändert.\n" -#: git-add--interactive.perl:1107 +#: git-add--interactive.perl:1114 #, perl-format msgid "failed to open hunk edit file for reading: %s" msgstr "Fehler beim Öffnen von Editier-Datei eines Patch-Blocks zum Lesen: %s" @@ -16750,14 +17289,14 @@ msgstr "Fehler beim Öffnen von Editier-Datei eines Patch-Blocks zum Lesen: %s" #. Consider translating (saying "no" discards!) as #. (saying "n" for "no" discards!) if the translation #. of the word "no" does not start with n. -#: git-add--interactive.perl:1206 +#: git-add--interactive.perl:1213 msgid "" "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " msgstr "" "Ihr bearbeiteter Patch-Block kann nicht angewendet werden.\n" "Erneut bearbeiten? (\"n\" verwirft Bearbeitung!) [y/n]?" -#: git-add--interactive.perl:1215 +#: git-add--interactive.perl:1222 msgid "" "y - stage this hunk\n" "n - do not stage this hunk\n" @@ -16773,7 +17312,7 @@ msgstr "" "d - diesen oder alle weiteren Patch-Blöcke in dieser Datei nicht zum Commit " "vormerken" -#: git-add--interactive.perl:1221 +#: git-add--interactive.perl:1228 msgid "" "y - stash this hunk\n" "n - do not stash this hunk\n" @@ -16787,7 +17326,7 @@ msgstr "" "a - diesen und alle weiteren Patch-Blöcke dieser Datei stashen\n" "d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht stashen" -#: git-add--interactive.perl:1227 +#: git-add--interactive.perl:1234 msgid "" "y - unstage this hunk\n" "n - do not unstage this hunk\n" @@ -16801,7 +17340,7 @@ msgstr "" "a - diesen und alle weiteren Patch-Blöcke dieser Datei unstashen\n" "d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht unstashen" -#: git-add--interactive.perl:1233 +#: git-add--interactive.perl:1240 msgid "" "y - apply this hunk to index\n" "n - do not apply this hunk to index\n" @@ -16818,7 +17357,7 @@ msgstr "" "d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht auf den Index " "anwenden" -#: git-add--interactive.perl:1239 +#: git-add--interactive.perl:1246 msgid "" "y - discard this hunk from worktree\n" "n - do not discard this hunk from worktree\n" @@ -16835,7 +17374,7 @@ msgstr "" "d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht im " "Arbeitsverzeichnis verwerfen" -#: git-add--interactive.perl:1245 +#: git-add--interactive.perl:1252 msgid "" "y - discard this hunk from index and worktree\n" "n - do not discard this hunk from index and worktree\n" @@ -16850,7 +17389,7 @@ msgstr "" "a - diesen und alle weiteren Patch-Blöcke in der Datei verwerfen\n" "d - diesen oder alle weiteren Patch-Blöcke in der Datei nicht verwerfen" -#: git-add--interactive.perl:1251 +#: git-add--interactive.perl:1258 msgid "" "y - apply this hunk to index and worktree\n" "n - do not apply this hunk to index and worktree\n" @@ -16864,7 +17403,7 @@ msgstr "" "a - diesen und alle weiteren Patch-Blöcke in der Datei anwenden\n" "d - diesen oder alle weiteren Patch-Blöcke in der Datei nicht anwenden" -#: git-add--interactive.perl:1266 +#: git-add--interactive.perl:1273 msgid "" "g - select a hunk to go to\n" "/ - search for a hunk matching the given regex\n" @@ -16888,212 +17427,218 @@ msgstr "" "e - aktuellen Patch-Block manuell editieren\n" "? - Hilfe anzeigen\n" -#: git-add--interactive.perl:1297 +#: git-add--interactive.perl:1304 msgid "The selected hunks do not apply to the index!\n" msgstr "" "Die ausgewählten Patch-Blöcke können nicht auf den Index angewendet werden!\n" -#: git-add--interactive.perl:1298 +#: git-add--interactive.perl:1305 msgid "Apply them to the worktree anyway? " msgstr "Trotzdem auf Arbeitsverzeichnis anwenden? " -#: git-add--interactive.perl:1301 +#: git-add--interactive.perl:1308 msgid "Nothing was applied.\n" msgstr "Nichts angewendet.\n" -#: git-add--interactive.perl:1312 +#: git-add--interactive.perl:1319 #, perl-format msgid "ignoring unmerged: %s\n" msgstr "ignoriere nicht zusammengeführte Datei: %s\n" -#: git-add--interactive.perl:1321 +#: git-add--interactive.perl:1328 msgid "Only binary files changed.\n" msgstr "Nur Binärdateien geändert.\n" -#: git-add--interactive.perl:1323 +#: git-add--interactive.perl:1330 msgid "No changes.\n" msgstr "Keine Änderungen.\n" -#: git-add--interactive.perl:1331 +#: git-add--interactive.perl:1338 msgid "Patch update" msgstr "Patch Aktualisierung" -#: git-add--interactive.perl:1383 +#: git-add--interactive.perl:1390 #, perl-format msgid "Stage mode change [y,n,q,a,d%s,?]? " msgstr "Modusänderung der Staging-Area hinzufügen [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1384 +#: git-add--interactive.perl:1391 #, perl-format msgid "Stage deletion [y,n,q,a,d%s,?]? " msgstr "Löschung der Staging-Area hinzufügen [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1385 +#: git-add--interactive.perl:1392 #, perl-format msgid "Stage this hunk [y,n,q,a,d%s,?]? " msgstr "Diesen Patch-Block der Staging-Area hinzufügen [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1388 +#: git-add--interactive.perl:1395 #, perl-format msgid "Stash mode change [y,n,q,a,d%s,?]? " msgstr "Modusänderung stashen [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1389 +#: git-add--interactive.perl:1396 #, perl-format msgid "Stash deletion [y,n,q,a,d%s,?]? " msgstr "Löschung stashen [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1390 +#: git-add--interactive.perl:1397 #, perl-format msgid "Stash this hunk [y,n,q,a,d%s,?]? " msgstr "Diesen Patch-Block stashen [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1393 +#: git-add--interactive.perl:1400 #, perl-format msgid "Unstage mode change [y,n,q,a,d%s,?]? " msgstr "Modusänderung aus der Staging-Area entfernen [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1394 +#: git-add--interactive.perl:1401 #, perl-format msgid "Unstage deletion [y,n,q,a,d%s,?]? " msgstr "Löschung aus der Staging-Area entfernen [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1395 +#: git-add--interactive.perl:1402 #, perl-format msgid "Unstage this hunk [y,n,q,a,d%s,?]? " msgstr "Diesen Patch-Block aus der Staging-Area entfernen [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1398 +#: git-add--interactive.perl:1405 #, perl-format msgid "Apply mode change to index [y,n,q,a,d%s,?]? " msgstr "Modusänderung auf Index anwenden [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1399 +#: git-add--interactive.perl:1406 #, perl-format msgid "Apply deletion to index [y,n,q,a,d%s,?]? " msgstr "Löschung auf Index anwenden [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1400 +#: git-add--interactive.perl:1407 #, perl-format msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " msgstr "Diesen Patch-Block auf Index anwenden [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1403 +#: git-add--interactive.perl:1410 #, perl-format msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " msgstr "Modusänderung im Arbeitsverzeichnis verwerfen [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1404 +#: git-add--interactive.perl:1411 #, perl-format msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " msgstr "Löschung im Arbeitsverzeichnis verwerfen [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1405 +#: git-add--interactive.perl:1412 #, perl-format msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " msgstr "Diesen Patch-Block im Arbeitsverzeichnis verwerfen [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1408 +#: git-add--interactive.perl:1415 #, perl-format msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " -msgstr "Modusänderung vom Index und Arbeitsverzeichnis verwerfen [y,n,q,a,d%s,?]? " +msgstr "" +"Modusänderung vom Index und Arbeitsverzeichnis verwerfen [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1409 +#: git-add--interactive.perl:1416 #, perl-format msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " msgstr "Löschung vom Index und Arbeitsverzeichnis verwerfen [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1410 +#: git-add--interactive.perl:1417 #, perl-format msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " -msgstr "Diesen Patch-Block vom Index und Arbeitsverzeichnis verwerfen [y,n,q,a,d%s,?]? " +msgstr "" +"Diesen Patch-Block vom Index und Arbeitsverzeichnis verwerfen [y,n,q,a,d" +"%s,?]? " -#: git-add--interactive.perl:1413 +#: git-add--interactive.perl:1420 #, perl-format msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " -msgstr "Modusänderung auf Index und Arbeitsverzeichnis anwenden [y,n,q,a,d%s,?]? " +msgstr "" +"Modusänderung auf Index und Arbeitsverzeichnis anwenden [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1414 +#: git-add--interactive.perl:1421 #, perl-format msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " msgstr "Löschung auf Index und Arbeitsverzeichnis anwenden [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1415 +#: git-add--interactive.perl:1422 #, perl-format msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " -msgstr "Diesen Patch-Block auf Index und Arbeitsverzeichnis anwenden [y,n,q,a,d%s,?]? " +msgstr "" +"Diesen Patch-Block auf Index und Arbeitsverzeichnis anwenden [y,n,q,a,d" +"%s,?]? " -#: git-add--interactive.perl:1515 +#: git-add--interactive.perl:1522 msgid "No other hunks to goto\n" msgstr "Keine anderen Patch-Blöcke verbleibend\n" -#: git-add--interactive.perl:1522 +#: git-add--interactive.perl:1529 msgid "go to which hunk (<ret> to see more)? " msgstr "zu welchem Patch-Block springen (<Enter> für mehr Informationen)? " -#: git-add--interactive.perl:1524 +#: git-add--interactive.perl:1531 msgid "go to which hunk? " msgstr "zu welchem Patch-Block springen? " -#: git-add--interactive.perl:1533 +#: git-add--interactive.perl:1540 #, perl-format msgid "Invalid number: '%s'\n" msgstr "Ungültige Nummer: '%s'\n" -#: git-add--interactive.perl:1538 +#: git-add--interactive.perl:1545 #, perl-format msgid "Sorry, only %d hunk available.\n" msgid_plural "Sorry, only %d hunks available.\n" msgstr[0] "Entschuldigung, nur %d Patch-Block verfügbar.\n" msgstr[1] "Entschuldigung, nur %d Patch-Blöcke verfügbar.\n" -#: git-add--interactive.perl:1564 +#: git-add--interactive.perl:1571 msgid "No other hunks to search\n" msgstr "Keine anderen Patch-Blöcke zum Durchsuchen\n" -#: git-add--interactive.perl:1568 +#: git-add--interactive.perl:1575 msgid "search for regex? " msgstr "Suche nach regulärem Ausdruck? " -#: git-add--interactive.perl:1581 +#: git-add--interactive.perl:1588 #, perl-format msgid "Malformed search regexp %s: %s\n" msgstr "Fehlerhafter regulärer Ausdruck für Suche %s: %s\n" -#: git-add--interactive.perl:1591 +#: git-add--interactive.perl:1598 msgid "No hunk matches the given pattern\n" msgstr "Kein Patch-Block entspricht dem angegebenen Muster\n" -#: git-add--interactive.perl:1603 git-add--interactive.perl:1625 +#: git-add--interactive.perl:1610 git-add--interactive.perl:1632 msgid "No previous hunk\n" msgstr "Kein vorheriger Patch-Block\n" -#: git-add--interactive.perl:1612 git-add--interactive.perl:1631 +#: git-add--interactive.perl:1619 git-add--interactive.perl:1638 msgid "No next hunk\n" msgstr "Kein folgender Patch-Block\n" -#: git-add--interactive.perl:1637 +#: git-add--interactive.perl:1644 msgid "Sorry, cannot split this hunk\n" msgstr "Entschuldigung, kann diesen Patch-Block nicht aufteilen.\n" -#: git-add--interactive.perl:1643 +#: git-add--interactive.perl:1650 #, perl-format msgid "Split into %d hunk.\n" msgid_plural "Split into %d hunks.\n" msgstr[0] "In %d Patch-Block aufgeteilt.\n" msgstr[1] "In %d Patch-Blöcke aufgeteilt.\n" -#: git-add--interactive.perl:1653 +#: git-add--interactive.perl:1660 msgid "Sorry, cannot edit this hunk\n" msgstr "Entschuldigung, kann diesen Patch-Block nicht bearbeiten.\n" -#: git-add--interactive.perl:1699 +#: git-add--interactive.perl:1706 msgid "Review diff" msgstr "Diff überprüfen" #. TRANSLATORS: please do not translate the command names #. 'status', 'update', 'revert', etc. -#: git-add--interactive.perl:1718 +#: git-add--interactive.perl:1725 msgid "" "status - show paths with changes\n" "update - add working tree state to the staged set of changes\n" @@ -17112,18 +17657,18 @@ msgstr "" "diff - Unterschiede zwischen HEAD und Index anzeigen\n" "add untracked - Inhalte von unversionierten Dateien zum Commit vormerken\n" -#: git-add--interactive.perl:1735 git-add--interactive.perl:1740 -#: git-add--interactive.perl:1743 git-add--interactive.perl:1750 -#: git-add--interactive.perl:1754 git-add--interactive.perl:1760 +#: git-add--interactive.perl:1742 git-add--interactive.perl:1747 +#: git-add--interactive.perl:1750 git-add--interactive.perl:1757 +#: git-add--interactive.perl:1761 git-add--interactive.perl:1767 msgid "missing --" msgstr "-- fehlt" -#: git-add--interactive.perl:1756 +#: git-add--interactive.perl:1763 #, perl-format msgid "unknown --patch mode: %s" msgstr "Unbekannter --patch Modus: %s" -#: git-add--interactive.perl:1762 git-add--interactive.perl:1768 +#: git-add--interactive.perl:1769 git-add--interactive.perl:1775 #, perl-format msgid "invalid argument %s, expecting --" msgstr "ungültiges Argument %s, erwarte --" @@ -17167,7 +17712,8 @@ msgid "" "`batch-size` and `relogin` must be specified together (via command-line or " "configuration option)\n" msgstr "" -"'batch-size' und 'relogin' müssen gemeinsam angegeben werden (über Kommandozeile\n" +"'batch-size' und 'relogin' müssen gemeinsam angegeben werden (über " +"Kommandozeile\n" "oder Konfigurationsoption)\n" #: git-send-email.perl:456 @@ -17347,7 +17893,7 @@ msgstr "" msgid "CA path \"%s\" does not exist" msgstr "CA Pfad \"%s\" existiert nicht" -#: git-send-email.perl:1395 +#: git-send-email.perl:1400 msgid "" " The Cc list above has been expanded by additional\n" " addresses found in the patch commit message. By default\n" @@ -17373,138 +17919,165 @@ msgstr "" " führen Sie 'git config --global sendemail.confirm auto' aus.\n" "\n" -#. TRANSLATORS: Make sure to include [y] [n] [q] [a] in your +#. 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:1410 -msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): " -msgstr "Diese E-Mail versenden? (Ja [y]|Nein [n]|Beenden [q]|Alle [a]): " +#: git-send-email.perl:1415 +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:1413 +#: git-send-email.perl:1418 msgid "Send this email reply required" msgstr "Zum Versenden dieser E-Mail ist eine Antwort erforderlich." -#: git-send-email.perl:1439 +#: git-send-email.perl:1446 msgid "The required SMTP server is not properly defined." msgstr "Der erforderliche SMTP-Server ist nicht korrekt definiert." -#: git-send-email.perl:1486 +#: git-send-email.perl:1493 #, perl-format msgid "Server does not support STARTTLS! %s" msgstr "Server unterstützt kein STARTTLS! %s" -#: git-send-email.perl:1491 git-send-email.perl:1495 +#: git-send-email.perl:1498 git-send-email.perl:1502 #, perl-format msgid "STARTTLS failed! %s" msgstr "STARTTLS fehlgeschlagen! %s" -#: git-send-email.perl:1505 +#: git-send-email.perl:1512 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:1523 +#: git-send-email.perl:1530 #, perl-format msgid "Failed to send %s\n" msgstr "Fehler beim Senden %s\n" -#: git-send-email.perl:1526 +#: git-send-email.perl:1533 #, perl-format msgid "Dry-Sent %s\n" msgstr "Probeversand %s\n" -#: git-send-email.perl:1526 +#: git-send-email.perl:1533 #, perl-format msgid "Sent %s\n" msgstr "%s gesendet\n" -#: git-send-email.perl:1528 +#: git-send-email.perl:1535 msgid "Dry-OK. Log says:\n" msgstr "Probeversand OK. Log enthält:\n" -#: git-send-email.perl:1528 +#: git-send-email.perl:1535 msgid "OK. Log says:\n" msgstr "OK. Log enthält:\n" -#: git-send-email.perl:1540 +#: git-send-email.perl:1547 msgid "Result: " msgstr "Ergebnis: " -#: git-send-email.perl:1543 +#: git-send-email.perl:1550 msgid "Result: OK\n" msgstr "Ergebnis: OK\n" -#: git-send-email.perl:1556 +#: git-send-email.perl:1568 #, perl-format msgid "can't open file %s" msgstr "Kann Datei %s nicht öffnen" -#: git-send-email.perl:1603 git-send-email.perl:1623 +#: git-send-email.perl:1615 git-send-email.perl:1635 #, 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:1609 +#: git-send-email.perl:1621 #, 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:1657 +#: git-send-email.perl:1674 #, 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:1682 +#: git-send-email.perl:1699 #, 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:1788 +#: git-send-email.perl:1817 #, perl-format msgid "(%s) Could not execute '%s'" msgstr "(%s) Konnte '%s' nicht ausführen" -#: git-send-email.perl:1795 +#: git-send-email.perl:1824 #, perl-format msgid "(%s) Adding %s: %s from: '%s'\n" msgstr "(%s) Füge %s: %s hinzu von: '%s'\n" -#: git-send-email.perl:1799 +#: git-send-email.perl:1828 #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "(%s) Fehler beim Schließen der Pipe nach '%s'" -#: git-send-email.perl:1826 +#: git-send-email.perl:1855 msgid "cannot send message as 7bit" msgstr "Kann Nachricht nicht als 7bit versenden." -#: git-send-email.perl:1834 +#: git-send-email.perl:1863 msgid "invalid transfer encoding" msgstr "Ungültiges Transfer-Encoding" -#: git-send-email.perl:1872 git-send-email.perl:1923 git-send-email.perl:1933 +#: git-send-email.perl:1901 git-send-email.perl:1952 git-send-email.perl:1962 #, perl-format msgid "unable to open %s: %s\n" msgstr "konnte %s nicht öffnen: %s\n" -#: git-send-email.perl:1875 +#: git-send-email.perl:1904 #, 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:1891 +#: git-send-email.perl:1920 #, 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:1895 +#: git-send-email.perl:1924 #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "Wollen Sie %s wirklich versenden? [y|N]: " +#~ msgid "Could not open '%s' for writing" +#~ msgstr "Konnte '%s' nicht zum Schreiben öffnen." + +#~ msgid "" +#~ "unexpected 1st line of squash message:\n" +#~ "\n" +#~ "\t%.*s" +#~ msgstr "" +#~ "unerwartete erste Zeile der Squash-Beschreibung:\n" +#~ "\n" +#~ "\t%.*s" + +#~ msgid "" +#~ "invalid 1st line of squash message:\n" +#~ "\n" +#~ "\t%.*s" +#~ msgstr "" +#~ "ungültige erste Zeile der Squash-Beschreibung:\n" +#~ "\n" +#~ "\t%.*s" + +#~ msgid "BUG: returned path string doesn't match cwd?" +#~ msgstr "FEHLER: zurückgegebene Zeichenkette für Pfad entspricht nicht cwd?" + +#~ msgid "Error in object" +#~ msgstr "Fehler in Objekt" + #~ msgid "git fetch-pack: expected ACK/NAK, got EOF" #~ msgstr "git fetch-pack: ACK/NAK erwartet, EOF bekommen" diff --git a/po/git.pot b/po/git.pot index d4c7f0bec6..87c58b0b5b 100644 --- a/po/git.pot +++ b/po/git.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2018-06-16 22:06+0800\n" +"POT-Creation-Date: 2018-08-21 08:28+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -18,59 +18,59 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: advice.c:92 +#: advice.c:97 #, c-format msgid "%shint: %.*s%s\n" msgstr "" -#: advice.c:137 +#: advice.c:150 msgid "Cherry-picking is not possible because you have unmerged files." msgstr "" -#: advice.c:139 +#: advice.c:152 msgid "Committing is not possible because you have unmerged files." msgstr "" -#: advice.c:141 +#: advice.c:154 msgid "Merging is not possible because you have unmerged files." msgstr "" -#: advice.c:143 +#: advice.c:156 msgid "Pulling is not possible because you have unmerged files." msgstr "" -#: advice.c:145 +#: advice.c:158 msgid "Reverting is not possible because you have unmerged files." msgstr "" -#: advice.c:147 +#: advice.c:160 #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "" -#: advice.c:155 +#: advice.c:168 msgid "" "Fix them up in the work tree, and then use 'git add/rm <file>'\n" "as appropriate to mark resolution and make a commit." msgstr "" -#: advice.c:163 +#: advice.c:176 msgid "Exiting because of an unresolved conflict." msgstr "" -#: advice.c:168 builtin/merge.c:1250 +#: advice.c:181 builtin/merge.c:1286 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "" -#: advice.c:170 +#: advice.c:183 msgid "Please, commit your changes before merging." msgstr "" -#: advice.c:171 +#: advice.c:184 msgid "Exiting because of unfinished merge." msgstr "" -#: advice.c:177 +#: advice.c:190 #, c-format msgid "" "Note: checking out '%s'.\n" @@ -86,92 +86,92 @@ msgid "" "\n" msgstr "" -#: apply.c:58 +#: apply.c:59 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "" -#: apply.c:74 +#: apply.c:75 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "" -#: apply.c:122 +#: apply.c:125 msgid "--reject and --3way cannot be used together." msgstr "" -#: apply.c:124 +#: apply.c:127 msgid "--cached and --3way cannot be used together." msgstr "" -#: apply.c:127 +#: apply.c:130 msgid "--3way outside a repository" msgstr "" -#: apply.c:138 +#: apply.c:141 msgid "--index outside a repository" msgstr "" -#: apply.c:141 +#: apply.c:144 msgid "--cached outside a repository" msgstr "" -#: apply.c:821 +#: apply.c:826 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "" -#: apply.c:830 +#: apply.c:835 #, c-format msgid "regexec returned %d for input: %s" msgstr "" -#: apply.c:904 +#: apply.c:909 #, c-format msgid "unable to find filename in patch at line %d" msgstr "" -#: apply.c:942 +#: apply.c:947 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "" -#: apply.c:948 +#: apply.c:953 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "" -#: apply.c:949 +#: apply.c:954 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "" -#: apply.c:954 +#: apply.c:959 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "" -#: apply.c:983 +#: apply.c:988 #, c-format msgid "invalid mode on line %d: %s" msgstr "" -#: apply.c:1301 +#: apply.c:1306 #, c-format msgid "inconsistent header lines %d and %d" msgstr "" -#: apply.c:1473 +#: apply.c:1478 #, c-format msgid "recount: unexpected line: %.*s" msgstr "" -#: apply.c:1542 +#: apply.c:1547 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "" -#: apply.c:1562 +#: apply.c:1567 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -182,638 +182,692 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: apply.c:1575 +#: apply.c:1580 #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "" -#: apply.c:1763 +#: apply.c:1768 msgid "new file depends on old contents" msgstr "" -#: apply.c:1765 +#: apply.c:1770 msgid "deleted file still has contents" msgstr "" -#: apply.c:1799 +#: apply.c:1804 #, c-format msgid "corrupt patch at line %d" msgstr "" -#: apply.c:1836 +#: apply.c:1841 #, c-format msgid "new file %s depends on old contents" msgstr "" -#: apply.c:1838 +#: apply.c:1843 #, c-format msgid "deleted file %s still has contents" msgstr "" -#: apply.c:1841 +#: apply.c:1846 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "" -#: apply.c:1988 +#: apply.c:1993 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "" -#: apply.c:2025 +#: apply.c:2030 #, c-format msgid "unrecognized binary patch at line %d" msgstr "" -#: apply.c:2185 +#: apply.c:2190 #, c-format msgid "patch with only garbage at line %d" msgstr "" -#: apply.c:2271 +#: apply.c:2276 #, c-format msgid "unable to read symlink %s" msgstr "" -#: apply.c:2275 +#: apply.c:2280 #, c-format msgid "unable to open or read %s" msgstr "" -#: apply.c:2934 +#: apply.c:2939 #, c-format msgid "invalid start of line: '%c'" msgstr "" -#: apply.c:3055 +#: apply.c:3060 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "" msgstr[1] "" -#: apply.c:3067 +#: apply.c:3072 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "" -#: apply.c:3073 +#: apply.c:3078 #, c-format msgid "" "while searching for:\n" "%.*s" msgstr "" -#: apply.c:3095 +#: apply.c:3100 #, c-format msgid "missing binary patch data for '%s'" msgstr "" -#: apply.c:3103 +#: apply.c:3108 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "" -#: apply.c:3149 +#: apply.c:3154 #, c-format msgid "cannot apply binary patch to '%s' without full index line" msgstr "" -#: apply.c:3159 +#: apply.c:3164 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." msgstr "" -#: apply.c:3167 +#: apply.c:3172 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "" -#: apply.c:3185 +#: apply.c:3190 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "" -#: apply.c:3198 +#: apply.c:3203 #, c-format msgid "binary patch does not apply to '%s'" msgstr "" -#: apply.c:3204 +#: apply.c:3209 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" -#: apply.c:3225 +#: apply.c:3230 #, c-format msgid "patch failed: %s:%ld" msgstr "" -#: apply.c:3347 +#: apply.c:3352 #, c-format msgid "cannot checkout %s" msgstr "" -#: apply.c:3396 apply.c:3407 apply.c:3453 setup.c:278 +#: apply.c:3404 apply.c:3415 apply.c:3461 setup.c:278 #, c-format msgid "failed to read %s" msgstr "" -#: apply.c:3404 +#: apply.c:3412 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "" -#: apply.c:3433 apply.c:3673 +#: apply.c:3441 apply.c:3681 #, c-format msgid "path %s has been renamed/deleted" msgstr "" -#: apply.c:3516 apply.c:3687 +#: apply.c:3524 apply.c:3696 #, c-format msgid "%s: does not exist in index" msgstr "" -#: apply.c:3525 apply.c:3695 +#: apply.c:3533 apply.c:3704 #, c-format msgid "%s: does not match index" msgstr "" -#: apply.c:3560 +#: apply.c:3568 msgid "repository lacks the necessary blob to fall back on 3-way merge." msgstr "" -#: apply.c:3563 +#: apply.c:3571 #, c-format msgid "Falling back to three-way merge...\n" msgstr "" -#: apply.c:3579 apply.c:3583 +#: apply.c:3587 apply.c:3591 #, c-format msgid "cannot read the current contents of '%s'" msgstr "" -#: apply.c:3595 +#: apply.c:3603 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "" -#: apply.c:3609 +#: apply.c:3617 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "" -#: apply.c:3614 +#: apply.c:3622 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "" -#: apply.c:3640 +#: apply.c:3648 msgid "removal patch leaves file contents" msgstr "" -#: apply.c:3712 +#: apply.c:3721 #, c-format msgid "%s: wrong type" msgstr "" -#: apply.c:3714 +#: apply.c:3723 #, c-format msgid "%s has type %o, expected %o" msgstr "" -#: apply.c:3864 apply.c:3866 +#: apply.c:3874 apply.c:3876 #, c-format msgid "invalid path '%s'" msgstr "" -#: apply.c:3922 +#: apply.c:3932 #, c-format msgid "%s: already exists in index" msgstr "" -#: apply.c:3925 +#: apply.c:3935 #, c-format msgid "%s: already exists in working directory" msgstr "" -#: apply.c:3945 +#: apply.c:3955 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "" -#: apply.c:3950 +#: apply.c:3960 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "" -#: apply.c:3970 +#: apply.c:3980 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "" -#: apply.c:3974 +#: apply.c:3984 #, c-format msgid "%s: patch does not apply" msgstr "" -#: apply.c:3989 +#: apply.c:3999 #, c-format msgid "Checking patch %s..." msgstr "" -#: apply.c:4080 +#: apply.c:4091 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "" -#: apply.c:4087 +#: apply.c:4098 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "" -#: apply.c:4090 +#: apply.c:4101 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "" -#: apply.c:4095 builtin/checkout.c:235 builtin/reset.c:140 +#: apply.c:4106 builtin/checkout.c:237 builtin/reset.c:140 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "" -#: apply.c:4099 +#: apply.c:4110 #, c-format msgid "could not add %s to temporary index" msgstr "" -#: apply.c:4109 +#: apply.c:4120 #, c-format msgid "could not write temporary index to %s" msgstr "" -#: apply.c:4247 +#: apply.c:4258 #, c-format msgid "unable to remove %s from index" msgstr "" -#: apply.c:4282 +#: apply.c:4292 #, c-format msgid "corrupt patch for submodule %s" msgstr "" -#: apply.c:4288 +#: apply.c:4298 #, c-format msgid "unable to stat newly created file '%s'" msgstr "" -#: apply.c:4296 +#: apply.c:4306 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" -#: apply.c:4302 apply.c:4446 +#: apply.c:4312 apply.c:4457 #, c-format msgid "unable to add cache entry for %s" msgstr "" -#: apply.c:4343 +#: apply.c:4355 #, c-format msgid "failed to write to '%s'" msgstr "" -#: apply.c:4347 +#: apply.c:4359 #, c-format msgid "closing file '%s'" msgstr "" -#: apply.c:4417 +#: apply.c:4429 #, c-format msgid "unable to write file '%s' mode %o" msgstr "" -#: apply.c:4515 +#: apply.c:4527 #, c-format msgid "Applied patch %s cleanly." msgstr "" -#: apply.c:4523 +#: apply.c:4535 msgid "internal error" msgstr "" -#: apply.c:4526 +#: apply.c:4538 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "" msgstr[1] "" -#: apply.c:4537 +#: apply.c:4549 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "" -#: apply.c:4545 builtin/fetch.c:786 builtin/fetch.c:1036 +#: apply.c:4557 builtin/fetch.c:780 builtin/fetch.c:1048 #, c-format msgid "cannot open %s" msgstr "" -#: apply.c:4559 +#: apply.c:4571 #, c-format msgid "Hunk #%d applied cleanly." msgstr "" -#: apply.c:4563 +#: apply.c:4575 #, c-format msgid "Rejected hunk #%d." msgstr "" -#: apply.c:4673 +#: apply.c:4685 #, c-format msgid "Skipped patch '%s'." msgstr "" -#: apply.c:4681 +#: apply.c:4693 msgid "unrecognized input" msgstr "" -#: apply.c:4700 +#: apply.c:4712 msgid "unable to read index file" msgstr "" -#: apply.c:4837 +#: apply.c:4849 #, c-format msgid "can't open patch '%s': %s" msgstr "" -#: apply.c:4864 +#: apply.c:4876 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "" msgstr[1] "" -#: apply.c:4870 apply.c:4885 +#: apply.c:4882 apply.c:4897 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "" msgstr[1] "" -#: apply.c:4878 +#: apply.c:4890 #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." msgstr[0] "" msgstr[1] "" -#: apply.c:4894 builtin/add.c:538 builtin/mv.c:300 builtin/rm.c:389 +#: apply.c:4906 builtin/add.c:539 builtin/mv.c:300 builtin/rm.c:389 msgid "Unable to write new index file" msgstr "" -#: apply.c:4921 apply.c:4924 builtin/am.c:2254 builtin/am.c:2257 -#: builtin/clone.c:120 builtin/fetch.c:126 builtin/pull.c:198 -#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1210 -#: builtin/submodule--helper.c:1213 builtin/submodule--helper.c:1584 -#: builtin/submodule--helper.c:1587 builtin/submodule--helper.c:1807 -#: git-add--interactive.perl:197 +#: apply.c:4933 apply.c:4936 builtin/am.c:2254 builtin/am.c:2257 +#: builtin/clone.c:121 builtin/fetch.c:115 builtin/merge.c:260 +#: builtin/pull.c:198 builtin/submodule--helper.c:406 +#: builtin/submodule--helper.c:1355 builtin/submodule--helper.c:1358 +#: builtin/submodule--helper.c:1729 builtin/submodule--helper.c:1732 +#: builtin/submodule--helper.c:1952 git-add--interactive.perl:197 msgid "path" msgstr "" -#: apply.c:4922 +#: apply.c:4934 msgid "don't apply changes matching the given path" msgstr "" -#: apply.c:4925 +#: apply.c:4937 msgid "apply changes matching the given path" msgstr "" -#: apply.c:4927 builtin/am.c:2263 +#: apply.c:4939 builtin/am.c:2263 msgid "num" msgstr "" -#: apply.c:4928 +#: apply.c:4940 msgid "remove <num> leading slashes from traditional diff paths" msgstr "" -#: apply.c:4931 +#: apply.c:4943 msgid "ignore additions made by the patch" msgstr "" -#: apply.c:4933 +#: apply.c:4945 msgid "instead of applying the patch, output diffstat for the input" msgstr "" -#: apply.c:4937 +#: apply.c:4949 msgid "show number of added and deleted lines in decimal notation" msgstr "" -#: apply.c:4939 +#: apply.c:4951 msgid "instead of applying the patch, output a summary for the input" msgstr "" -#: apply.c:4941 +#: apply.c:4953 msgid "instead of applying the patch, see if the patch is applicable" msgstr "" -#: apply.c:4943 +#: apply.c:4955 msgid "make sure the patch is applicable to the current index" msgstr "" -#: apply.c:4945 +#: apply.c:4957 +msgid "mark new files with `git add --intent-to-add`" +msgstr "" + +#: apply.c:4959 msgid "apply a patch without touching the working tree" msgstr "" -#: apply.c:4947 +#: apply.c:4961 msgid "accept a patch that touches outside the working area" msgstr "" -#: apply.c:4950 +#: apply.c:4964 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "" -#: apply.c:4952 +#: apply.c:4966 msgid "attempt three-way merge if a patch does not apply" msgstr "" -#: apply.c:4954 +#: apply.c:4968 msgid "build a temporary index based on embedded index information" msgstr "" -#: apply.c:4957 builtin/checkout-index.c:168 builtin/ls-files.c:515 +#: apply.c:4971 builtin/checkout-index.c:168 builtin/ls-files.c:516 msgid "paths are separated with NUL character" msgstr "" -#: apply.c:4959 +#: apply.c:4973 msgid "ensure at least <n> lines of context match" msgstr "" -#: apply.c:4960 builtin/am.c:2242 builtin/interpret-trailers.c:95 +#: apply.c:4974 builtin/am.c:2242 builtin/interpret-trailers.c:95 #: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99 -#: builtin/pack-objects.c:3177 +#: builtin/pack-objects.c:3205 msgid "action" msgstr "" -#: apply.c:4961 +#: apply.c:4975 msgid "detect new or modified lines that have whitespace errors" msgstr "" -#: apply.c:4964 apply.c:4967 +#: apply.c:4978 apply.c:4981 msgid "ignore changes in whitespace when finding context" msgstr "" -#: apply.c:4970 +#: apply.c:4984 msgid "apply the patch in reverse" msgstr "" -#: apply.c:4972 +#: apply.c:4986 msgid "don't expect at least one line of context" msgstr "" -#: apply.c:4974 +#: apply.c:4988 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "" -#: apply.c:4976 +#: apply.c:4990 msgid "allow overlapping hunks" msgstr "" -#: apply.c:4977 builtin/add.c:290 builtin/check-ignore.c:21 -#: builtin/commit.c:1301 builtin/count-objects.c:98 builtin/fsck.c:666 -#: builtin/log.c:1901 builtin/mv.c:122 builtin/read-tree.c:124 +#: apply.c:4991 builtin/add.c:290 builtin/check-ignore.c:21 +#: builtin/commit.c:1301 builtin/count-objects.c:98 builtin/fsck.c:671 +#: builtin/log.c:1914 builtin/mv.c:122 builtin/read-tree.c:124 msgid "be verbose" msgstr "" -#: apply.c:4979 +#: apply.c:4993 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" -#: apply.c:4982 +#: apply.c:4996 msgid "do not trust the line counts in the hunk headers" msgstr "" -#: apply.c:4984 builtin/am.c:2251 +#: apply.c:4998 builtin/am.c:2251 msgid "root" msgstr "" -#: apply.c:4985 +#: apply.c:4999 msgid "prepend <root> to all filenames" msgstr "" -#: archive.c:13 +#: archive.c:14 msgid "git archive [<options>] <tree-ish> [<path>...]" msgstr "" -#: archive.c:14 +#: archive.c:15 msgid "git archive --list" msgstr "" -#: archive.c:15 +#: archive.c:16 msgid "" "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]" msgstr "" -#: archive.c:16 +#: archive.c:17 msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "" -#: archive.c:351 builtin/add.c:176 builtin/add.c:514 builtin/rm.c:298 +#: archive.c:363 builtin/add.c:176 builtin/add.c:515 builtin/rm.c:298 #, c-format msgid "pathspec '%s' did not match any files" msgstr "" -#: archive.c:434 +#: archive.c:446 msgid "fmt" msgstr "" -#: archive.c:434 +#: archive.c:446 msgid "archive format" msgstr "" -#: archive.c:435 builtin/log.c:1462 +#: archive.c:447 builtin/log.c:1473 msgid "prefix" msgstr "" -#: archive.c:436 +#: archive.c:448 msgid "prepend prefix to each pathname in the archive" msgstr "" -#: archive.c:437 builtin/blame.c:813 builtin/blame.c:814 builtin/config.c:127 -#: builtin/fast-export.c:1007 builtin/fast-export.c:1009 builtin/grep.c:869 -#: builtin/hash-object.c:103 builtin/ls-files.c:551 builtin/ls-files.c:554 -#: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:119 +#: archive.c:449 builtin/blame.c:816 builtin/blame.c:817 builtin/config.c:126 +#: builtin/fast-export.c:1013 builtin/fast-export.c:1015 builtin/grep.c:873 +#: builtin/hash-object.c:104 builtin/ls-files.c:552 builtin/ls-files.c:555 +#: builtin/notes.c:407 builtin/notes.c:570 builtin/read-tree.c:119 #: parse-options.h:165 msgid "file" msgstr "" -#: archive.c:438 builtin/archive.c:89 +#: archive.c:450 builtin/archive.c:89 msgid "write the archive to this file" msgstr "" -#: archive.c:440 +#: archive.c:452 msgid "read .gitattributes in working directory" msgstr "" -#: archive.c:441 +#: archive.c:453 msgid "report archived files on stderr" msgstr "" -#: archive.c:442 +#: archive.c:454 msgid "store only" msgstr "" -#: archive.c:443 +#: archive.c:455 msgid "compress faster" msgstr "" -#: archive.c:451 +#: archive.c:463 msgid "compress better" msgstr "" -#: archive.c:454 +#: archive.c:466 msgid "list supported archive formats" msgstr "" -#: archive.c:456 builtin/archive.c:90 builtin/clone.c:110 builtin/clone.c:113 -#: builtin/submodule--helper.c:1222 builtin/submodule--helper.c:1593 +#: archive.c:468 builtin/archive.c:90 builtin/clone.c:111 builtin/clone.c:114 +#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1738 msgid "repo" msgstr "" -#: archive.c:457 builtin/archive.c:91 +#: archive.c:469 builtin/archive.c:91 msgid "retrieve the archive from remote repository <repo>" msgstr "" -#: archive.c:458 builtin/archive.c:92 builtin/notes.c:489 +#: archive.c:470 builtin/archive.c:92 builtin/difftool.c:714 +#: builtin/notes.c:491 msgid "command" msgstr "" -#: archive.c:459 builtin/archive.c:93 +#: archive.c:471 builtin/archive.c:93 msgid "path to the remote git-upload-archive command" msgstr "" -#: archive.c:466 +#: archive.c:478 msgid "Unexpected option --remote" msgstr "" -#: archive.c:468 +#: archive.c:480 msgid "Option --exec can only be used together with --remote" msgstr "" -#: archive.c:470 +#: archive.c:482 msgid "Unexpected option --output" msgstr "" -#: archive.c:492 +#: archive.c:504 #, c-format msgid "Unknown archive format '%s'" msgstr "" -#: archive.c:499 +#: archive.c:511 #, c-format msgid "Argument not supported for format '%s': -%d" msgstr "" +#: archive-tar.c:125 archive-zip.c:344 +#, c-format +msgid "cannot stream blob %s" +msgstr "" + +#: archive-tar.c:260 archive-zip.c:361 +#, c-format +msgid "unsupported file mode: 0%o (SHA1: %s)" +msgstr "" + +#: archive-tar.c:287 archive-zip.c:352 +#, c-format +msgid "cannot read %s" +msgstr "" + +#: archive-tar.c:458 +#, c-format +msgid "unable to start '%s' filter" +msgstr "" + +#: archive-tar.c:461 +msgid "unable to redirect descriptor" +msgstr "" + +#: archive-tar.c:468 +#, c-format +msgid "'%s' filter reported error" +msgstr "" + +#: archive-zip.c:313 +#, c-format +msgid "path is not valid UTF-8: %s" +msgstr "" + +#: archive-zip.c:317 +#, c-format +msgid "path too long (%d chars, SHA1: %s): %s" +msgstr "" + +#: archive-zip.c:470 builtin/pack-objects.c:216 builtin/pack-objects.c:219 +#, c-format +msgid "deflate error (%d)" +msgstr "" + +#: archive-zip.c:605 +#, c-format +msgid "timestamp too large for this system: %<PRIuMAX>" +msgstr "" + #: attr.c:218 #, c-format msgid "%.*s is not a valid attribute name" @@ -825,43 +879,43 @@ msgid "" "Use '\\!' for literal leading exclamation." msgstr "" -#: bisect.c:461 +#: bisect.c:467 #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "" -#: bisect.c:669 +#: bisect.c:675 #, c-format msgid "We cannot bisect more!\n" msgstr "" -#: bisect.c:723 +#: bisect.c:729 #, c-format msgid "Not a valid commit name %s" msgstr "" -#: bisect.c:747 +#: bisect.c:753 #, c-format msgid "" "The merge base %s is bad.\n" "This means the bug has been fixed between %s and [%s].\n" msgstr "" -#: bisect.c:752 +#: bisect.c:758 #, c-format msgid "" "The merge base %s is new.\n" "The property has changed between %s and [%s].\n" msgstr "" -#: bisect.c:757 +#: bisect.c:763 #, c-format msgid "" "The merge base %s is %s.\n" "This means the first '%s' commit is between %s and [%s].\n" msgstr "" -#: bisect.c:765 +#: bisect.c:771 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -869,7 +923,7 @@ msgid "" "Maybe you mistook %s and %s revs?\n" msgstr "" -#: bisect.c:778 +#: bisect.c:784 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -877,43 +931,43 @@ msgid "" "We continue anyway." msgstr "" -#: bisect.c:811 +#: bisect.c:817 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "" -#: bisect.c:851 +#: bisect.c:857 #, c-format msgid "a %s revision is needed" msgstr "" -#: bisect.c:870 builtin/notes.c:175 builtin/tag.c:236 +#: bisect.c:876 builtin/notes.c:177 builtin/tag.c:237 #, c-format msgid "could not create file '%s'" msgstr "" -#: bisect.c:921 +#: bisect.c:927 builtin/merge.c:137 #, c-format msgid "could not read file '%s'" msgstr "" -#: bisect.c:951 +#: bisect.c:957 msgid "reading bisect refs failed" msgstr "" -#: bisect.c:970 +#: bisect.c:976 #, c-format msgid "%s was both %s and %s\n" msgstr "" -#: bisect.c:978 +#: bisect.c:984 #, c-format msgid "" "No testable commit found.\n" "Maybe you started with bad path parameters?\n" msgstr "" -#: bisect.c:997 +#: bisect.c:1003 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -923,43 +977,44 @@ msgstr[1] "" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. -#: bisect.c:1003 +#: bisect.c:1009 #, 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] "" msgstr[1] "" -#: blame.c:1756 +#: blame.c:1786 msgid "--contents and --reverse do not blend well." msgstr "" -#: blame.c:1767 +#: blame.c:1800 msgid "cannot use --contents with final commit object name" msgstr "" -#: blame.c:1787 +#: blame.c:1821 msgid "--reverse and --first-parent together require specified latest commit" msgstr "" -#: blame.c:1796 bundle.c:160 ref-filter.c:2075 sequencer.c:1861 -#: sequencer.c:3632 builtin/commit.c:981 builtin/log.c:366 builtin/log.c:920 -#: builtin/log.c:1371 builtin/log.c:1702 builtin/log.c:1950 builtin/merge.c:372 +#: blame.c:1830 bundle.c:162 ref-filter.c:2154 sequencer.c:1874 +#: sequencer.c:3772 builtin/commit.c:994 builtin/log.c:372 builtin/log.c:926 +#: builtin/log.c:1381 builtin/log.c:1713 builtin/log.c:1963 builtin/merge.c:404 +#: builtin/pack-objects.c:3032 builtin/pack-objects.c:3047 #: builtin/shortlog.c:192 msgid "revision walk setup failed" msgstr "" -#: blame.c:1814 +#: blame.c:1848 msgid "" "--reverse --first-parent together require range along first-parent chain" msgstr "" -#: blame.c:1825 +#: blame.c:1859 #, c-format msgid "no such path %s in %s" msgstr "" -#: blame.c:1836 +#: blame.c:1870 #, c-format msgid "cannot read blob %s for path %s" msgstr "" @@ -1088,75 +1143,75 @@ msgstr "" msgid "HEAD of working tree %s is not updated" msgstr "" -#: bundle.c:34 +#: bundle.c:36 #, c-format msgid "'%s' does not look like a v2 bundle file" msgstr "" -#: bundle.c:62 +#: bundle.c:64 #, c-format msgid "unrecognized header: %s%s (%d)" msgstr "" -#: bundle.c:88 sequencer.c:2081 sequencer.c:2558 builtin/commit.c:755 +#: bundle.c:90 sequencer.c:2092 sequencer.c:2578 builtin/commit.c:768 #, c-format msgid "could not open '%s'" msgstr "" -#: bundle.c:139 +#: bundle.c:141 msgid "Repository lacks these prerequisite commits:" msgstr "" -#: bundle.c:190 +#: bundle.c:192 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" msgstr[0] "" msgstr[1] "" -#: bundle.c:197 +#: bundle.c:199 msgid "The bundle records a complete history." msgstr "" -#: bundle.c:199 +#: bundle.c:201 #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" msgstr[0] "" msgstr[1] "" -#: bundle.c:258 +#: bundle.c:260 msgid "Could not spawn pack-objects" msgstr "" -#: bundle.c:269 +#: bundle.c:271 msgid "pack-objects died" msgstr "" -#: bundle.c:311 +#: bundle.c:313 msgid "rev-list died" msgstr "" -#: bundle.c:360 +#: bundle.c:362 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "" -#: bundle.c:450 builtin/log.c:183 builtin/log.c:1607 builtin/shortlog.c:303 +#: bundle.c:453 builtin/log.c:187 builtin/log.c:1618 builtin/shortlog.c:304 #, c-format msgid "unrecognized argument: %s" msgstr "" -#: bundle.c:458 +#: bundle.c:461 msgid "Refusing to create empty bundle." msgstr "" -#: bundle.c:470 +#: bundle.c:473 #, c-format msgid "cannot create '%s'" msgstr "" -#: bundle.c:498 +#: bundle.c:501 msgid "index-pack died" msgstr "" @@ -1165,19 +1220,19 @@ msgstr "" msgid "invalid color value: %.*s" msgstr "" -#: commit.c:43 sequencer.c:2364 builtin/am.c:421 builtin/am.c:465 -#: builtin/am.c:1436 builtin/am.c:2072 builtin/replace.c:376 +#: commit.c:48 sequencer.c:2384 builtin/am.c:422 builtin/am.c:466 +#: builtin/am.c:1438 builtin/am.c:2072 builtin/replace.c:376 #: builtin/replace.c:448 #, c-format msgid "could not parse %s" msgstr "" -#: commit.c:45 +#: commit.c:50 #, c-format msgid "%s %s is not a commit!" msgstr "" -#: commit.c:182 +#: commit.c:191 msgid "" "Support for <GIT_DIR>/info/grafts is deprecated\n" "and will be removed in a future Git version.\n" @@ -1189,188 +1244,389 @@ msgid "" "\"git config advice.graftFileDeprecated false\"" msgstr "" -#: commit.c:1540 +#: commit.c:1629 msgid "" "Warning: commit message did not conform to UTF-8.\n" "You may want to amend it after fixing the message, or set the config\n" "variable i18n.commitencoding to the encoding your project uses.\n" msgstr "" -#: commit-graph.c:669 +#: commit-graph.c:83 +#, c-format +msgid "graph file %s is too small" +msgstr "" + +#: commit-graph.c:90 +#, c-format +msgid "graph signature %X does not match signature %X" +msgstr "" + +#: commit-graph.c:97 +#, c-format +msgid "graph version %X does not match version %X" +msgstr "" + +#: commit-graph.c:104 +#, c-format +msgid "hash version %X does not match version %X" +msgstr "" + +#: commit-graph.c:128 +#, c-format +msgid "improper chunk offset %08x%08x" +msgstr "" + +#: commit-graph.c:164 +#, c-format +msgid "chunk id %08x appears multiple times" +msgstr "" + +#: commit-graph.c:261 +#, c-format +msgid "could not find commit %s" +msgstr "" + +#: commit-graph.c:565 builtin/pack-objects.c:2571 +#, c-format +msgid "unable to get type of object %s" +msgstr "" + +#: commit-graph.c:730 +#, c-format +msgid "error adding pack %s" +msgstr "" + +#: commit-graph.c:732 +#, c-format +msgid "error opening index for %s" +msgstr "" + +#: commit-graph.c:773 #, c-format msgid "the commit graph format cannot write %d commits" msgstr "" -#: commit-graph.c:696 +#: commit-graph.c:800 msgid "too many commits to write graph" msgstr "" -#: commit-graph.c:707 builtin/init-db.c:516 builtin/init-db.c:521 +#: commit-graph.c:806 #, c-format -msgid "cannot mkdir %s" +msgid "unable to create leading directories of %s" +msgstr "" + +#: commit-graph.c:904 +msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "" #: compat/obstack.c:405 compat/obstack.c:407 msgid "memory exhausted" msgstr "" -#: config.c:187 +#: config.c:123 +#, c-format +msgid "" +"exceeded maximum include depth (%d) while including\n" +"\t%s\n" +"from\n" +"\t%s\n" +"Do you have circular includes?" +msgstr "" + +#: config.c:139 +#, c-format +msgid "could not expand include path '%s'" +msgstr "" + +#: config.c:150 +msgid "relative config includes must come from files" +msgstr "" + +#: config.c:190 msgid "relative config include conditionals must come from files" msgstr "" -#: config.c:788 +#: config.c:348 +#, c-format +msgid "key does not contain a section: %s" +msgstr "" + +#: config.c:354 +#, c-format +msgid "key does not contain variable name: %s" +msgstr "" + +#: config.c:378 sequencer.c:2206 +#, c-format +msgid "invalid key: %s" +msgstr "" + +#: config.c:384 +#, c-format +msgid "invalid key (newline): %s" +msgstr "" + +#: config.c:420 config.c:432 +#, c-format +msgid "bogus config parameter: %s" +msgstr "" + +#: config.c:467 +#, c-format +msgid "bogus format in %s" +msgstr "" + +#: config.c:793 #, c-format msgid "bad config line %d in blob %s" msgstr "" -#: config.c:792 +#: config.c:797 #, c-format msgid "bad config line %d in file %s" msgstr "" -#: config.c:796 +#: config.c:801 #, c-format msgid "bad config line %d in standard input" msgstr "" -#: config.c:800 +#: config.c:805 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "" -#: config.c:804 +#: config.c:809 #, c-format msgid "bad config line %d in command line %s" msgstr "" -#: config.c:808 +#: config.c:813 #, c-format msgid "bad config line %d in %s" msgstr "" -#: config.c:936 +#: config.c:952 msgid "out of range" msgstr "" -#: config.c:936 +#: config.c:952 msgid "invalid unit" msgstr "" -#: config.c:942 +#: config.c:958 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "" -#: config.c:947 +#: config.c:963 #, c-format msgid "bad numeric config value '%s' for '%s' in blob %s: %s" msgstr "" -#: config.c:950 +#: config.c:966 #, c-format msgid "bad numeric config value '%s' for '%s' in file %s: %s" msgstr "" -#: config.c:953 +#: config.c:969 #, c-format msgid "bad numeric config value '%s' for '%s' in standard input: %s" msgstr "" -#: config.c:956 +#: config.c:972 #, c-format msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" msgstr "" -#: config.c:959 +#: config.c:975 #, c-format msgid "bad numeric config value '%s' for '%s' in command line %s: %s" msgstr "" -#: config.c:962 +#: config.c:978 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "" -#: config.c:1057 +#: config.c:1073 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "" -#: config.c:1066 +#: config.c:1082 #, c-format msgid "'%s' for '%s' is not a valid timestamp" msgstr "" -#: config.c:1171 config.c:1182 +#: config.c:1173 +#, c-format +msgid "abbrev length out of range: %d" +msgstr "" + +#: config.c:1187 config.c:1198 #, c-format msgid "bad zlib compression level %d" msgstr "" -#: config.c:1307 +#: config.c:1290 +msgid "core.commentChar should only be one character" +msgstr "" + +#: config.c:1323 #, c-format msgid "invalid mode for object creation: %s" msgstr "" -#: config.c:1473 +#: config.c:1403 +#, c-format +msgid "malformed value for %s" +msgstr "" + +#: config.c:1429 +#, c-format +msgid "malformed value for %s: %s" +msgstr "" + +#: config.c:1430 +msgid "must be one of nothing, matching, simple, upstream or current" +msgstr "" + +#: config.c:1489 builtin/pack-objects.c:3282 #, c-format msgid "bad pack compression level %d" msgstr "" -#: config.c:1681 +#: config.c:1610 +#, c-format +msgid "unable to load config blob object '%s'" +msgstr "" + +#: config.c:1613 +#, c-format +msgid "reference '%s' does not point to a blob" +msgstr "" + +#: config.c:1630 +#, c-format +msgid "unable to resolve config blob '%s'" +msgstr "" + +#: config.c:1660 +#, c-format +msgid "failed to parse %s" +msgstr "" + +#: config.c:1700 msgid "unable to parse command-line config" msgstr "" -#: config.c:2013 +#: config.c:2032 msgid "unknown error occurred while reading the configuration files" msgstr "" -#: config.c:2200 +#: config.c:2202 #, c-format msgid "Invalid %s: '%s'" msgstr "" -#: config.c:2243 +#: config.c:2245 #, c-format msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" msgstr "" -#: config.c:2269 +#: config.c:2271 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "" -#: config.c:2294 +#: config.c:2296 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "" -#: config.c:2296 +#: config.c:2298 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "" -#: config.c:2402 +#: config.c:2379 +#, c-format +msgid "invalid section name '%s'" +msgstr "" + +#: config.c:2411 #, c-format msgid "%s has multiple values" msgstr "" -#: config.c:2766 config.c:3019 +#: config.c:2440 +#, c-format +msgid "failed to write new configuration file %s" +msgstr "" + +#: config.c:2691 config.c:3015 +#, c-format +msgid "could not lock config file %s" +msgstr "" + +#: config.c:2702 +#, c-format +msgid "opening %s" +msgstr "" + +#: config.c:2737 builtin/config.c:324 +#, c-format +msgid "invalid pattern: %s" +msgstr "" + +#: config.c:2762 +#, c-format +msgid "invalid config file %s" +msgstr "" + +#: config.c:2775 config.c:3028 #, c-format msgid "fstat on %s failed" msgstr "" -#: config.c:2905 +#: config.c:2786 +#, c-format +msgid "unable to mmap '%s'" +msgstr "" + +#: config.c:2795 config.c:3033 +#, c-format +msgid "chmod on %s failed" +msgstr "" + +#: config.c:2880 config.c:3130 +#, c-format +msgid "could not write config file %s" +msgstr "" + +#: config.c:2914 #, c-format msgid "could not set '%s' to '%s'" msgstr "" -#: config.c:2907 builtin/remote.c:779 +#: config.c:2916 builtin/remote.c:781 #, c-format msgid "could not unset '%s'" msgstr "" +#: config.c:3006 +#, c-format +msgid "invalid section name: %s" +msgstr "" + +#: config.c:3173 +#, c-format +msgid "missing value for '%s'" +msgstr "" + #: connect.c:61 -msgid "The remote end hung up upon initial contact" +msgid "the remote end hung up upon initial contact" msgstr "" #: connect.c:63 @@ -1381,84 +1637,283 @@ msgid "" "and the repository exists." msgstr "" -#: connected.c:66 builtin/fsck.c:201 builtin/prune.c:145 +#: connect.c:81 +#, c-format +msgid "server doesn't support '%s'" +msgstr "" + +#: connect.c:103 +#, c-format +msgid "server doesn't support feature '%s'" +msgstr "" + +#: connect.c:114 +msgid "expected flush after capabilities" +msgstr "" + +#: connect.c:233 +#, c-format +msgid "ignoring capabilities after first line '%s'" +msgstr "" + +#: connect.c:252 +msgid "protocol error: unexpected capabilities^{}" +msgstr "" + +#: connect.c:273 +#, c-format +msgid "protocol error: expected shallow sha-1, got '%s'" +msgstr "" + +#: connect.c:275 +msgid "repository on the other end cannot be shallow" +msgstr "" + +#: connect.c:310 fetch-pack.c:183 builtin/archive.c:63 +#, c-format +msgid "remote error: %s" +msgstr "" + +#: connect.c:316 +msgid "invalid packet" +msgstr "" + +#: connect.c:336 +#, c-format +msgid "protocol error: unexpected '%s'" +msgstr "" + +#: connect.c:444 +#, c-format +msgid "invalid ls-refs response: %s" +msgstr "" + +#: connect.c:448 +msgid "expected flush after ref listing" +msgstr "" + +#: connect.c:547 +#, c-format +msgid "protocol '%s' is not supported" +msgstr "" + +#: connect.c:598 +msgid "unable to set SO_KEEPALIVE on socket" +msgstr "" + +#: connect.c:638 connect.c:701 +#, c-format +msgid "Looking up %s ... " +msgstr "" + +#: connect.c:642 +#, c-format +msgid "unable to look up %s (port %s) (%s)" +msgstr "" + +#. TRANSLATORS: this is the end of "Looking up %s ... " +#: connect.c:646 connect.c:717 +#, c-format +msgid "" +"done.\n" +"Connecting to %s (port %s) ... " +msgstr "" + +#: connect.c:668 connect.c:745 +#, c-format +msgid "" +"unable to connect to %s:\n" +"%s" +msgstr "" + +#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... " +#: connect.c:674 connect.c:751 +msgid "done." +msgstr "" + +#: connect.c:705 +#, c-format +msgid "unable to look up %s (%s)" +msgstr "" + +#: connect.c:711 +#, c-format +msgid "unknown port %s" +msgstr "" + +#: connect.c:848 connect.c:1174 +#, c-format +msgid "strange hostname '%s' blocked" +msgstr "" + +#: connect.c:850 +#, c-format +msgid "strange port '%s' blocked" +msgstr "" + +#: connect.c:860 +#, c-format +msgid "cannot start proxy %s" +msgstr "" + +#: connect.c:927 +msgid "no path specified; see 'git help pull' for valid url syntax" +msgstr "" + +#: connect.c:1122 +msgid "ssh variant 'simple' does not support -4" +msgstr "" + +#: connect.c:1134 +msgid "ssh variant 'simple' does not support -6" +msgstr "" + +#: connect.c:1151 +msgid "ssh variant 'simple' does not support setting port" +msgstr "" + +#: connect.c:1262 +#, c-format +msgid "strange pathname '%s' blocked" +msgstr "" + +#: connect.c:1307 +msgid "unable to fork" +msgstr "" + +#: connected.c:68 builtin/fsck.c:203 builtin/prune.c:146 msgid "Checking connectivity" msgstr "" -#: connected.c:78 +#: connected.c:80 msgid "Could not run 'git rev-list'" msgstr "" -#: connected.c:98 +#: connected.c:100 msgid "failed write to rev-list" msgstr "" -#: connected.c:105 +#: connected.c:107 msgid "failed to close rev-list's stdin" msgstr "" -#: convert.c:206 +#: convert.c:194 +#, c-format +msgid "illegal crlf_action %d" +msgstr "" + +#: convert.c:207 #, c-format -msgid "CRLF would be replaced by LF in %s." +msgid "CRLF would be replaced by LF in %s" msgstr "" -#: convert.c:208 +#: convert.c:209 #, c-format msgid "" "CRLF will be replaced by LF in %s.\n" -"The file will have its original line endings in your working directory." +"The file will have its original line endings in your working directory" msgstr "" -#: convert.c:216 +#: convert.c:217 #, c-format msgid "LF would be replaced by CRLF in %s" msgstr "" -#: convert.c:218 +#: convert.c:219 #, c-format msgid "" "LF will be replaced by CRLF in %s.\n" -"The file will have its original line endings in your working directory." +"The file will have its original line endings in your working directory" msgstr "" -#: convert.c:279 +#: convert.c:280 #, c-format msgid "BOM is prohibited in '%s' if encoded as %s" msgstr "" -#: convert.c:286 +#: convert.c:287 #, c-format msgid "" "The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-" "tree-encoding." msgstr "" -#: convert.c:304 +#: convert.c:305 #, c-format msgid "BOM is required in '%s' if encoded as %s" msgstr "" -#: convert.c:306 +#: convert.c:307 #, c-format 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 "" -#: convert.c:424 +#: convert.c:425 convert.c:496 #, c-format msgid "failed to encode '%s' from %s to %s" msgstr "" -#: convert.c:467 +#: convert.c:468 #, c-format msgid "encoding '%s' from %s to %s and back is not the same" msgstr "" -#: convert.c:1225 +#: convert.c:674 +#, c-format +msgid "cannot fork to run external filter '%s'" +msgstr "" + +#: convert.c:694 +#, c-format +msgid "cannot feed the input to external filter '%s'" +msgstr "" + +#: convert.c:701 +#, c-format +msgid "external filter '%s' failed %d" +msgstr "" + +#: convert.c:736 convert.c:739 +#, c-format +msgid "read from external filter '%s' failed" +msgstr "" + +#: convert.c:742 convert.c:796 +#, c-format +msgid "external filter '%s' failed" +msgstr "" + +#: convert.c:844 +msgid "unexpected filter type" +msgstr "" + +#: convert.c:855 +msgid "path name too long for external filter" +msgstr "" + +#: convert.c:929 +#, c-format +msgid "" +"external filter '%s' is not available anymore although not all paths have " +"been filtered" +msgstr "" + +#: convert.c:1228 msgid "true/false are no valid working-tree-encodings" msgstr "" +#: convert.c:1402 convert.c:1436 +#, c-format +msgid "%s: clean filter '%s' failed" +msgstr "" + +#: convert.c:1480 +#, c-format +msgid "%s: smudge filter %s failed" +msgstr "" + #: date.c:116 msgid "in the future" msgstr "" @@ -1532,105 +1987,131 @@ msgstr[1] "" msgid "failed to read orderfile '%s'" msgstr "" -#: diffcore-rename.c:535 +#: diffcore-rename.c:536 msgid "Performing inexact rename detection" msgstr "" -#: diff.c:74 +#: diff.c:108 #, c-format msgid "option '%s' requires a value" msgstr "" -#: diff.c:152 +#: diff.c:158 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr "" -#: diff.c:157 +#: diff.c:163 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr "" -#: diff.c:281 +#: diff.c:291 msgid "" -"color moved setting must be one of 'no', 'default', 'zebra', 'dimmed_zebra', " -"'plain'" +"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', " +"'dimmed-zebra', 'plain'" msgstr "" -#: diff.c:341 +#: diff.c:316 +#, c-format +msgid "ignoring unknown color-moved-ws mode '%s'" +msgstr "" + +#: diff.c:323 +msgid "" +"color-moved-ws: allow-indentation-change cannot be combined with other white " +"space modes" +msgstr "" + +#: diff.c:394 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "" -#: diff.c:401 +#: diff.c:454 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" "%s" msgstr "" -#: diff.c:3823 +#: diff.c:4096 #, c-format msgid "external diff died, stopping at %s" msgstr "" -#: diff.c:4153 +#: diff.c:4427 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "" -#: diff.c:4156 +#: diff.c:4430 msgid "-G, -S and --find-object are mutually exclusive" msgstr "" -#: diff.c:4244 +#: diff.c:4508 msgid "--follow requires exactly one pathspec" msgstr "" -#: diff.c:4410 +#: diff.c:4674 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" "%s" msgstr "" -#: diff.c:4424 +#: diff.c:4688 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "" -#: diff.c:5500 +#: diff.c:5766 msgid "inexact rename detection was skipped due to too many files." msgstr "" -#: diff.c:5503 +#: diff.c:5769 msgid "only found copies from modified paths due to too many files." msgstr "" -#: diff.c:5506 +#: diff.c:5772 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." msgstr "" -#: dir.c:1867 +#: dir.c:569 +#, c-format +msgid "pathspec '%s' did not match any file(s) known to git" +msgstr "" + +#: dir.c:958 +#, c-format +msgid "cannot use %s as an exclude file" +msgstr "" + +#: dir.c:1873 #, c-format msgid "could not open directory '%s'" msgstr "" -#: dir.c:2109 +#: dir.c:2115 msgid "failed to get kernel name and information" msgstr "" -#: dir.c:2233 -msgid "Untracked cache is disabled on this system or location." +#: dir.c:2239 +msgid "untracked cache is disabled on this system or location" msgstr "" -#: dir.c:3075 dir.c:3080 +#: dir.c:3037 +#, c-format +msgid "index file corrupt in repo %s" +msgstr "" + +#: dir.c:3082 dir.c:3087 #, c-format msgid "could not create directories for %s" msgstr "" -#: dir.c:3109 +#: dir.c:3116 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "" @@ -1640,218 +2121,272 @@ msgstr "" msgid "hint: Waiting for your editor to close the file...%c" msgstr "" -#: entry.c:177 +#: entry.c:178 msgid "Filtering content" msgstr "" -#: entry.c:435 +#: entry.c:437 #, c-format msgid "could not stat file '%s'" msgstr "" +#: environment.c:150 +#, c-format +msgid "bad git namespace path \"%s\"" +msgstr "" + +#: environment.c:332 +#, c-format +msgid "could not set GIT_DIR to '%s'" +msgstr "" + +#: exec-cmd.c:361 +#, c-format +msgid "too many args to run %s" +msgstr "" + #: fetch-object.c:17 msgid "Remote with no URL" msgstr "" -#: fetch-pack.c:254 +#: fetch-pack.c:152 msgid "git fetch-pack: expected shallow list" msgstr "" -#: fetch-pack.c:266 +#: fetch-pack.c:164 msgid "git fetch-pack: expected ACK/NAK, got a flush packet" msgstr "" -#: fetch-pack.c:285 builtin/archive.c:63 -#, c-format -msgid "remote error: %s" -msgstr "" - -#: fetch-pack.c:286 +#: fetch-pack.c:184 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "" -#: fetch-pack.c:338 +#: fetch-pack.c:254 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "" -#: fetch-pack.c:429 fetch-pack.c:1310 +#: fetch-pack.c:342 fetch-pack.c:1257 #, c-format msgid "invalid shallow line: %s" msgstr "" -#: fetch-pack.c:435 fetch-pack.c:1316 +#: fetch-pack.c:348 fetch-pack.c:1263 #, c-format msgid "invalid unshallow line: %s" msgstr "" -#: fetch-pack.c:437 fetch-pack.c:1318 +#: fetch-pack.c:350 fetch-pack.c:1265 #, c-format msgid "object not found: %s" msgstr "" -#: fetch-pack.c:440 fetch-pack.c:1321 +#: fetch-pack.c:353 fetch-pack.c:1268 #, c-format msgid "error in object: %s" msgstr "" -#: fetch-pack.c:442 fetch-pack.c:1323 +#: fetch-pack.c:355 fetch-pack.c:1270 #, c-format msgid "no shallow found: %s" msgstr "" -#: fetch-pack.c:445 fetch-pack.c:1326 +#: fetch-pack.c:358 fetch-pack.c:1273 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "" -#: fetch-pack.c:486 +#: fetch-pack.c:399 #, c-format msgid "got %s %d %s" msgstr "" -#: fetch-pack.c:500 +#: fetch-pack.c:416 #, c-format msgid "invalid commit %s" msgstr "" -#: fetch-pack.c:533 +#: fetch-pack.c:447 msgid "giving up" msgstr "" -#: fetch-pack.c:543 progress.c:229 +#: fetch-pack.c:459 progress.c:229 msgid "done" msgstr "" -#: fetch-pack.c:555 +#: fetch-pack.c:471 #, c-format msgid "got %s (%d) %s" msgstr "" -#: fetch-pack.c:601 +#: fetch-pack.c:517 #, c-format msgid "Marking %s as complete" msgstr "" -#: fetch-pack.c:828 +#: fetch-pack.c:764 #, c-format msgid "already have %s (%s)" msgstr "" -#: fetch-pack.c:869 +#: fetch-pack.c:803 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "" -#: fetch-pack.c:877 +#: fetch-pack.c:811 msgid "protocol error: bad pack header" msgstr "" -#: fetch-pack.c:944 +#: fetch-pack.c:879 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "" -#: fetch-pack.c:960 +#: fetch-pack.c:895 #, c-format msgid "%s failed" msgstr "" -#: fetch-pack.c:962 +#: fetch-pack.c:897 msgid "error in sideband demultiplexer" msgstr "" -#: fetch-pack.c:989 +#: fetch-pack.c:926 msgid "Server does not support shallow clients" msgstr "" -#: fetch-pack.c:993 +#: fetch-pack.c:930 msgid "Server supports multi_ack_detailed" msgstr "" -#: fetch-pack.c:996 +#: fetch-pack.c:933 msgid "Server supports no-done" msgstr "" -#: fetch-pack.c:1002 +#: fetch-pack.c:939 msgid "Server supports multi_ack" msgstr "" -#: fetch-pack.c:1006 +#: fetch-pack.c:943 msgid "Server supports side-band-64k" msgstr "" -#: fetch-pack.c:1010 +#: fetch-pack.c:947 msgid "Server supports side-band" msgstr "" -#: fetch-pack.c:1014 +#: fetch-pack.c:951 msgid "Server supports allow-tip-sha1-in-want" msgstr "" -#: fetch-pack.c:1018 +#: fetch-pack.c:955 msgid "Server supports allow-reachable-sha1-in-want" msgstr "" -#: fetch-pack.c:1028 +#: fetch-pack.c:965 msgid "Server supports ofs-delta" msgstr "" -#: fetch-pack.c:1034 fetch-pack.c:1204 +#: fetch-pack.c:971 fetch-pack.c:1150 msgid "Server supports filter" msgstr "" -#: fetch-pack.c:1042 +#: fetch-pack.c:979 #, c-format msgid "Server version is %.*s" msgstr "" -#: fetch-pack.c:1048 +#: fetch-pack.c:985 msgid "Server does not support --shallow-since" msgstr "" -#: fetch-pack.c:1052 +#: fetch-pack.c:989 msgid "Server does not support --shallow-exclude" msgstr "" -#: fetch-pack.c:1054 +#: fetch-pack.c:991 msgid "Server does not support --deepen" msgstr "" -#: fetch-pack.c:1065 +#: fetch-pack.c:1004 msgid "no common commits" msgstr "" -#: fetch-pack.c:1077 fetch-pack.c:1414 +#: fetch-pack.c:1016 fetch-pack.c:1393 msgid "git fetch-pack: fetch failed." msgstr "" -#: fetch-pack.c:1199 +#: fetch-pack.c:1145 msgid "Server does not support shallow requests" msgstr "" -#: fetch-pack.c:1584 +#: fetch-pack.c:1191 +#, c-format +msgid "error reading section header '%s'" +msgstr "" + +#: fetch-pack.c:1197 +#, c-format +msgid "expected '%s', received '%s'" +msgstr "" + +#: fetch-pack.c:1236 +#, c-format +msgid "unexpected acknowledgment line: '%s'" +msgstr "" + +#: fetch-pack.c:1241 +#, c-format +msgid "error processing acks: %d" +msgstr "" + +#: fetch-pack.c:1278 +#, c-format +msgid "error processing shallow info: %d" +msgstr "" + +#: fetch-pack.c:1294 +#, c-format +msgid "expected wanted-ref, got '%s'" +msgstr "" + +#: fetch-pack.c:1304 +#, c-format +msgid "unexpected wanted-ref: '%s'" +msgstr "" + +#: fetch-pack.c:1308 +#, c-format +msgid "error processing wanted refs: %d" +msgstr "" + +#: fetch-pack.c:1603 msgid "no matching remote head" msgstr "" -#: fetch-pack.c:1610 +#: fetch-pack.c:1621 builtin/clone.c:664 +msgid "remote did not send all necessary objects" +msgstr "" + +#: fetch-pack.c:1647 #, c-format msgid "no such remote ref %s" msgstr "" -#: fetch-pack.c:1613 +#: fetch-pack.c:1650 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "" -#: gpg-interface.c:185 +#: gpg-interface.c:253 msgid "gpg failed to sign the data" msgstr "" -#: gpg-interface.c:210 +#: gpg-interface.c:279 msgid "could not create temporary file" msgstr "" -#: gpg-interface.c:213 +#: gpg-interface.c:282 #, c-format msgid "failed writing detached signature to '%s'" msgstr "" @@ -1861,18 +2396,18 @@ msgstr "" msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "" -#: grep.c:2020 +#: grep.c:2115 #, c-format msgid "'%s': unable to read %s" msgstr "" -#: grep.c:2037 setup.c:164 builtin/clone.c:409 builtin/diff.c:81 +#: grep.c:2132 setup.c:164 builtin/clone.c:410 builtin/diff.c:81 #: builtin/rm.c:134 #, c-format msgid "failed to stat '%s'" msgstr "" -#: grep.c:2048 +#: grep.c:2143 #, c-format msgid "'%s': short read" msgstr "" @@ -1951,38 +2486,38 @@ msgstr "" msgid "The common Git guides are:" msgstr "" -#: help.c:467 +#: help.c:552 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" "able to execute it. Maybe git-%s is broken?" msgstr "" -#: help.c:526 +#: help.c:611 msgid "Uh oh. Your system reports no Git commands at all." msgstr "" -#: help.c:548 +#: help.c:633 #, c-format msgid "WARNING: You called a Git command named '%s', which does not exist." msgstr "" -#: help.c:553 +#: help.c:638 #, c-format msgid "Continuing under the assumption that you meant '%s'." msgstr "" -#: help.c:558 +#: help.c:643 #, c-format msgid "Continuing in %0.1f seconds, assuming that you meant '%s'." msgstr "" -#: help.c:566 +#: help.c:651 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "" -#: help.c:570 +#: help.c:655 msgid "" "\n" "The most similar command is" @@ -1992,16 +2527,16 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: help.c:585 +#: help.c:670 msgid "git version [<options>]" msgstr "" -#: help.c:652 +#: help.c:738 #, c-format msgid "%s: %s - %s" msgstr "" -#: help.c:656 +#: help.c:742 msgid "" "\n" "Did you mean this?" @@ -2054,7 +2589,7 @@ msgstr "" msgid "name consists only of disallowed characters: %s" msgstr "" -#: ident.c:416 builtin/commit.c:587 +#: ident.c:416 builtin/commit.c:600 #, c-format msgid "invalid date format: %s" msgstr "" @@ -2084,117 +2619,117 @@ msgstr "" msgid "Unable to create '%s.lock': %s" msgstr "" -#: merge.c:71 +#: merge.c:40 msgid "failed to read the cache" msgstr "" -#: merge.c:136 builtin/am.c:1946 builtin/am.c:1980 builtin/checkout.c:378 -#: builtin/checkout.c:606 builtin/clone.c:761 +#: merge.c:105 builtin/am.c:1946 builtin/am.c:1980 builtin/checkout.c:380 +#: builtin/checkout.c:608 builtin/clone.c:763 msgid "unable to write new index file" msgstr "" -#: merge-recursive.c:298 +#: merge-recursive.c:303 msgid "(bad commit)\n" msgstr "" -#: merge-recursive.c:320 +#: merge-recursive.c:325 #, c-format msgid "add_cacheinfo failed for path '%s'; merge aborting." msgstr "" -#: merge-recursive.c:328 +#: merge-recursive.c:333 #, c-format msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." msgstr "" -#: merge-recursive.c:410 +#: merge-recursive.c:415 msgid "error building trees" msgstr "" -#: merge-recursive.c:881 +#: merge-recursive.c:886 #, c-format msgid "failed to create path '%s'%s" msgstr "" -#: merge-recursive.c:892 +#: merge-recursive.c:897 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "" -#: merge-recursive.c:906 merge-recursive.c:925 +#: merge-recursive.c:911 merge-recursive.c:930 msgid ": perhaps a D/F conflict?" msgstr "" -#: merge-recursive.c:915 +#: merge-recursive.c:920 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "" -#: merge-recursive.c:957 builtin/cat-file.c:37 +#: merge-recursive.c:962 builtin/cat-file.c:39 #, c-format msgid "cannot read object %s '%s'" msgstr "" -#: merge-recursive.c:959 +#: merge-recursive.c:964 #, c-format msgid "blob expected for %s '%s'" msgstr "" -#: merge-recursive.c:983 +#: merge-recursive.c:988 #, c-format msgid "failed to open '%s': %s" msgstr "" -#: merge-recursive.c:994 +#: merge-recursive.c:999 #, c-format msgid "failed to symlink '%s': %s" msgstr "" -#: merge-recursive.c:999 +#: merge-recursive.c:1004 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "" -#: merge-recursive.c:1186 +#: merge-recursive.c:1191 #, c-format msgid "Failed to merge submodule %s (not checked out)" msgstr "" -#: merge-recursive.c:1193 +#: merge-recursive.c:1198 #, c-format msgid "Failed to merge submodule %s (commits not present)" msgstr "" -#: merge-recursive.c:1200 +#: merge-recursive.c:1205 #, c-format msgid "Failed to merge submodule %s (commits don't follow merge-base)" msgstr "" -#: merge-recursive.c:1208 merge-recursive.c:1220 +#: merge-recursive.c:1213 merge-recursive.c:1225 #, c-format msgid "Fast-forwarding submodule %s to the following commit:" msgstr "" -#: merge-recursive.c:1211 merge-recursive.c:1223 +#: merge-recursive.c:1216 merge-recursive.c:1228 #, c-format msgid "Fast-forwarding submodule %s" msgstr "" -#: merge-recursive.c:1245 +#: merge-recursive.c:1250 #, c-format msgid "Failed to merge submodule %s (merge following commits not found)" msgstr "" -#: merge-recursive.c:1249 +#: merge-recursive.c:1254 #, c-format msgid "Failed to merge submodule %s (not fast-forward)" msgstr "" -#: merge-recursive.c:1250 +#: merge-recursive.c:1255 msgid "Found a possible merge resolution for the submodule:\n" msgstr "" -#: merge-recursive.c:1253 +#: merge-recursive.c:1258 #, c-format msgid "" "If this is correct simply add it to the index for example\n" @@ -2205,109 +2740,109 @@ msgid "" "which will accept this suggestion.\n" msgstr "" -#: merge-recursive.c:1262 +#: merge-recursive.c:1267 #, c-format msgid "Failed to merge submodule %s (multiple merges found)" msgstr "" -#: merge-recursive.c:1321 +#: merge-recursive.c:1326 msgid "Failed to execute internal merge" msgstr "" -#: merge-recursive.c:1326 +#: merge-recursive.c:1331 #, c-format msgid "Unable to add %s to database" msgstr "" -#: merge-recursive.c:1358 +#: merge-recursive.c:1363 #, c-format msgid "Auto-merging %s" msgstr "" -#: merge-recursive.c:1423 +#: merge-recursive.c:1434 #, c-format msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." msgstr "" -#: merge-recursive.c:1475 +#: merge-recursive.c:1501 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " "in tree." msgstr "" -#: merge-recursive.c:1480 +#: merge-recursive.c:1506 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " "left in tree." msgstr "" -#: merge-recursive.c:1487 +#: merge-recursive.c:1513 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " "in tree at %s." msgstr "" -#: merge-recursive.c:1492 +#: merge-recursive.c:1518 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " "left in tree at %s." msgstr "" -#: merge-recursive.c:1526 +#: merge-recursive.c:1552 msgid "rename" msgstr "" -#: merge-recursive.c:1526 +#: merge-recursive.c:1552 msgid "renamed" msgstr "" -#: merge-recursive.c:1580 merge-recursive.c:1736 merge-recursive.c:2368 -#: merge-recursive.c:3086 +#: merge-recursive.c:1606 merge-recursive.c:1762 merge-recursive.c:2394 +#: merge-recursive.c:3129 #, c-format msgid "Refusing to lose dirty file at %s" msgstr "" -#: merge-recursive.c:1594 +#: merge-recursive.c:1620 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "" -#: merge-recursive.c:1599 +#: merge-recursive.c:1625 #, c-format msgid "Refusing to lose untracked file at %s; adding as %s instead" msgstr "" -#: merge-recursive.c:1625 +#: merge-recursive.c:1651 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" "\"->\"%s\" in \"%s\"%s" msgstr "" -#: merge-recursive.c:1630 +#: merge-recursive.c:1656 msgid " (left unresolved)" msgstr "" -#: merge-recursive.c:1694 +#: merge-recursive.c:1720 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" -#: merge-recursive.c:1733 +#: merge-recursive.c:1759 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "" -#: merge-recursive.c:1745 +#: merge-recursive.c:1771 #, c-format msgid "Refusing to lose untracked file at %s, even though it's in the way." msgstr "" -#: merge-recursive.c:1951 +#: merge-recursive.c:1977 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to place %s because " @@ -2315,151 +2850,153 @@ msgid "" "getting a majority of the files." msgstr "" -#: merge-recursive.c:1983 +#: merge-recursive.c:2009 #, c-format msgid "" "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " "implicit directory rename(s) putting the following path(s) there: %s." msgstr "" -#: merge-recursive.c:1993 +#: merge-recursive.c:2019 #, c-format msgid "" "CONFLICT (implicit dir rename): Cannot map more than one path to %s; " "implicit directory renames tried to put these paths there: %s" msgstr "" -#: merge-recursive.c:2085 +#: merge-recursive.c:2111 #, c-format msgid "" "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" ">%s in %s" msgstr "" -#: merge-recursive.c:2330 +#: merge-recursive.c:2356 #, c-format msgid "" "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " "renamed." msgstr "" -#: merge-recursive.c:2736 +#: merge-recursive.c:2762 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" msgstr "" -#: merge-recursive.c:2751 +#: merge-recursive.c:2777 #, c-format msgid "Adding merged %s" msgstr "" -#: merge-recursive.c:2758 merge-recursive.c:3089 +#: merge-recursive.c:2784 merge-recursive.c:3132 #, c-format msgid "Adding as %s instead" msgstr "" -#: merge-recursive.c:2914 +#: merge-recursive.c:2941 #, c-format msgid "cannot read object %s" msgstr "" -#: merge-recursive.c:2917 +#: merge-recursive.c:2944 #, c-format msgid "object %s is not a blob" msgstr "" -#: merge-recursive.c:2986 +#: merge-recursive.c:3013 msgid "modify" msgstr "" -#: merge-recursive.c:2986 +#: merge-recursive.c:3013 msgid "modified" msgstr "" -#: merge-recursive.c:2997 +#: merge-recursive.c:3024 msgid "content" msgstr "" -#: merge-recursive.c:3004 +#: merge-recursive.c:3031 msgid "add/add" msgstr "" -#: merge-recursive.c:3046 +#: merge-recursive.c:3076 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "" -#: merge-recursive.c:3055 git-submodule.sh:895 +#: merge-recursive.c:3098 git-submodule.sh:865 msgid "submodule" msgstr "" -#: merge-recursive.c:3056 +#: merge-recursive.c:3099 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "" -#: merge-recursive.c:3178 +#: merge-recursive.c:3221 #, c-format msgid "Removing %s" msgstr "" -#: merge-recursive.c:3204 +#: merge-recursive.c:3247 msgid "file/directory" msgstr "" -#: merge-recursive.c:3210 +#: merge-recursive.c:3253 msgid "directory/file" msgstr "" -#: merge-recursive.c:3217 +#: merge-recursive.c:3260 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" -#: merge-recursive.c:3226 +#: merge-recursive.c:3269 #, c-format msgid "Adding %s" msgstr "" -#: merge-recursive.c:3267 +#: merge-recursive.c:3303 #, c-format -msgid "Dirty index: cannot merge (dirty: %s)" +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +" %s" msgstr "" -#: merge-recursive.c:3271 +#: merge-recursive.c:3314 msgid "Already up to date!" msgstr "" -#: merge-recursive.c:3280 +#: merge-recursive.c:3323 #, c-format msgid "merging of trees %s and %s failed" msgstr "" -#: merge-recursive.c:3379 +#: merge-recursive.c:3422 msgid "Merging:" msgstr "" -#: merge-recursive.c:3392 +#: merge-recursive.c:3435 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "" msgstr[1] "" -#: merge-recursive.c:3431 +#: merge-recursive.c:3474 msgid "merge returned no commit" msgstr "" -#: merge-recursive.c:3495 +#: merge-recursive.c:3540 #, c-format msgid "Could not parse object '%s'" msgstr "" -#: merge-recursive.c:3511 builtin/merge.c:659 builtin/merge.c:816 +#: merge-recursive.c:3556 builtin/merge.c:689 builtin/merge.c:846 msgid "Unable to write index." msgstr "" -#: notes-merge.c:272 +#: notes-merge.c:274 #, c-format msgid "" "You have not concluded your previous notes merge (%s exists).\n" @@ -2467,21 +3004,21 @@ msgid "" "commit/abort the previous merge before you start a new notes merge." msgstr "" -#: notes-merge.c:279 +#: notes-merge.c:281 #, c-format msgid "You have not concluded your notes merge (%s exists)." msgstr "" -#: notes-utils.c:43 +#: notes-utils.c:45 msgid "Cannot commit uninitialized/unreferenced notes tree" msgstr "" -#: notes-utils.c:102 +#: notes-utils.c:104 #, c-format msgid "Bad notes.rewriteMode value: '%s'" msgstr "" -#: notes-utils.c:112 +#: notes-utils.c:114 #, c-format msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" msgstr "" @@ -2490,35 +3027,55 @@ msgstr "" #. the environment variable, the second %s is #. its value. #. -#: notes-utils.c:142 +#: notes-utils.c:144 #, c-format msgid "Bad %s value: '%s'" msgstr "" -#: object.c:242 +#: object.c:54 +#, c-format +msgid "invalid object type \"%s\"" +msgstr "" + +#: object.c:173 +#, c-format +msgid "object %s is a %s, not a %s" +msgstr "" + +#: object.c:233 +#, c-format +msgid "object %s has unknown type id %d" +msgstr "" + +#: object.c:246 #, c-format msgid "unable to parse object: %s" msgstr "" +#: object.c:266 object.c:277 +#, c-format +msgid "sha1 mismatch %s" +msgstr "" + #: packfile.c:563 msgid "offset before end of packfile (broken .idx?)" msgstr "" -#: packfile.c:1742 +#: packfile.c:1745 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "" -#: packfile.c:1746 +#: packfile.c:1749 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "" -#: parse-options.c:621 +#: parse-options.c:672 msgid "..." msgstr "" -#: parse-options.c:640 +#: parse-options.c:691 #, c-format msgid "usage: %s" msgstr "" @@ -2526,17 +3083,17 @@ msgstr "" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c:646 +#: parse-options.c:697 #, c-format msgid " or: %s" msgstr "" -#: parse-options.c:649 +#: parse-options.c:700 #, c-format msgid " %s" msgstr "" -#: parse-options.c:688 +#: parse-options.c:739 msgid "-NUM" msgstr "" @@ -2626,245 +3183,407 @@ msgstr "" msgid "pathspec '%s' is beyond a symbolic link" msgstr "" +#: pkt-line.c:104 +msgid "flush packet write failed" +msgstr "" + +#: pkt-line.c:142 pkt-line.c:228 +msgid "protocol error: impossibly long line" +msgstr "" + +#: pkt-line.c:158 pkt-line.c:160 +msgid "packet write with format failed" +msgstr "" + +#: pkt-line.c:192 +msgid "packet write failed - data exceeds max packet size" +msgstr "" + +#: pkt-line.c:199 pkt-line.c:206 +msgid "packet write failed" +msgstr "" + +#: pkt-line.c:291 +msgid "read error" +msgstr "" + +#: pkt-line.c:299 +msgid "the remote end hung up unexpectedly" +msgstr "" + +#: pkt-line.c:327 +#, c-format +msgid "protocol error: bad line length character: %.4s" +msgstr "" + +#: pkt-line.c:337 pkt-line.c:342 +#, c-format +msgid "protocol error: bad line length %d" +msgstr "" + #: pretty.c:962 msgid "unable to parse --pretty format" msgstr "" -#: read-cache.c:1500 +#: range-diff.c:48 +msgid "could not start `log`" +msgstr "" + +#: range-diff.c:51 +msgid "could not read `log` output" +msgstr "" + +#: range-diff.c:66 sequencer.c:4540 +#, c-format +msgid "could not parse commit '%s'" +msgstr "" + +#: range-diff.c:196 +msgid "failed to generate diff" +msgstr "" + +#: range-diff.c:421 range-diff.c:423 +#, c-format +msgid "could not parse log for '%s'" +msgstr "" + +#: read-cache.c:1579 #, c-format msgid "" "index.version set, but the value is invalid.\n" "Using version %i" msgstr "" -#: read-cache.c:1510 +#: read-cache.c:1589 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" "Using version %i" msgstr "" -#: read-cache.c:2404 sequencer.c:4338 wrapper.c:658 builtin/merge.c:1048 +#: read-cache.c:2580 sequencer.c:4503 wrapper.c:658 builtin/merge.c:1083 #, c-format msgid "could not close '%s'" msgstr "" -#: read-cache.c:2477 sequencer.c:2102 sequencer.c:3234 +#: read-cache.c:2653 sequencer.c:2113 sequencer.c:3374 #, c-format msgid "could not stat '%s'" msgstr "" -#: read-cache.c:2490 +#: read-cache.c:2666 #, c-format msgid "unable to open git dir: %s" msgstr "" -#: read-cache.c:2502 +#: read-cache.c:2678 #, c-format msgid "unable to unlink: %s" msgstr "" -#: refs.c:732 sequencer.c:4334 sequencer.c:4393 wrapper.c:225 wrapper.c:395 -#: builtin/am.c:779 +#: refs.c:192 +#, c-format +msgid "%s does not point to a valid object!" +msgstr "" + +#: refs.c:579 +#, c-format +msgid "ignoring dangling symref %s" +msgstr "" + +#: refs.c:581 ref-filter.c:2067 +#, c-format +msgid "ignoring broken ref %s" +msgstr "" + +#: refs.c:685 +#, c-format +msgid "could not open '%s' for writing: %s" +msgstr "" + +#: refs.c:695 refs.c:746 +#, c-format +msgid "could not read ref '%s'" +msgstr "" + +#: refs.c:701 +#, c-format +msgid "ref '%s' already exists" +msgstr "" + +#: refs.c:706 +#, c-format +msgid "unexpected object ID when writing '%s'" +msgstr "" + +#: refs.c:714 sequencer.c:385 sequencer.c:2366 sequencer.c:2492 +#: sequencer.c:2506 sequencer.c:2733 sequencer.c:4501 sequencer.c:4564 +#: wrapper.c:656 +#, c-format +msgid "could not write to '%s'" +msgstr "" + +#: refs.c:741 sequencer.c:4499 sequencer.c:4558 wrapper.c:225 wrapper.c:395 +#: builtin/am.c:780 #, c-format msgid "could not open '%s' for writing" msgstr "" -#: refs.c:1880 +#: refs.c:748 +#, c-format +msgid "unexpected object ID when deleting '%s'" +msgstr "" + +#: refs.c:879 +#, c-format +msgid "log for ref %s has gap after %s" +msgstr "" + +#: refs.c:885 +#, c-format +msgid "log for ref %s unexpectedly ended on %s" +msgstr "" + +#: refs.c:943 +#, c-format +msgid "log for %s is empty" +msgstr "" + +#: refs.c:1035 +#, c-format +msgid "refusing to update ref with bad name '%s'" +msgstr "" + +#: refs.c:1111 +#, c-format +msgid "update_ref failed for ref '%s': %s" +msgstr "" + +#: refs.c:1853 +#, c-format +msgid "multiple updates for ref '%s' not allowed" +msgstr "" + +#: refs.c:1885 msgid "ref updates forbidden inside quarantine environment" msgstr "" +#: refs.c:1981 refs.c:2011 +#, c-format +msgid "'%s' exists; cannot create '%s'" +msgstr "" + +#: refs.c:1987 refs.c:2022 +#, c-format +msgid "cannot process '%s' and '%s' at the same time" +msgstr "" + #: refs/files-backend.c:1191 #, c-format msgid "could not remove reference %s" msgstr "" -#: refs/files-backend.c:1205 refs/packed-backend.c:1531 -#: refs/packed-backend.c:1541 +#: refs/files-backend.c:1205 refs/packed-backend.c:1532 +#: refs/packed-backend.c:1542 #, c-format msgid "could not delete reference %s: %s" msgstr "" -#: refs/files-backend.c:1208 refs/packed-backend.c:1544 +#: refs/files-backend.c:1208 refs/packed-backend.c:1545 #, c-format msgid "could not delete references: %s" msgstr "" -#: ref-filter.c:35 wt-status.c:1850 +#: refspec.c:137 +#, c-format +msgid "invalid refspec '%s'" +msgstr "" + +#: ref-filter.c:38 wt-status.c:1850 msgid "gone" msgstr "" -#: ref-filter.c:36 +#: ref-filter.c:39 #, c-format msgid "ahead %d" msgstr "" -#: ref-filter.c:37 +#: ref-filter.c:40 #, c-format msgid "behind %d" msgstr "" -#: ref-filter.c:38 +#: ref-filter.c:41 #, c-format msgid "ahead %d, behind %d" msgstr "" -#: ref-filter.c:121 +#: ref-filter.c:137 #, c-format msgid "expected format: %%(color:<color>)" msgstr "" -#: ref-filter.c:123 +#: ref-filter.c:139 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "" -#: ref-filter.c:145 +#: ref-filter.c:161 #, c-format msgid "Integer value expected refname:lstrip=%s" msgstr "" -#: ref-filter.c:149 +#: ref-filter.c:165 #, c-format msgid "Integer value expected refname:rstrip=%s" msgstr "" -#: ref-filter.c:151 +#: ref-filter.c:167 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "" -#: ref-filter.c:206 +#: ref-filter.c:222 +#, c-format +msgid "%%(objecttype) does not take arguments" +msgstr "" + +#: ref-filter.c:234 +#, c-format +msgid "%%(objectsize) does not take arguments" +msgstr "" + +#: ref-filter.c:246 #, c-format msgid "%%(body) does not take arguments" msgstr "" -#: ref-filter.c:215 +#: ref-filter.c:255 #, c-format msgid "%%(subject) does not take arguments" msgstr "" -#: ref-filter.c:235 +#: ref-filter.c:275 #, c-format msgid "unknown %%(trailers) argument: %s" msgstr "" -#: ref-filter.c:264 +#: ref-filter.c:304 #, c-format msgid "positive value expected contents:lines=%s" msgstr "" -#: ref-filter.c:266 +#: ref-filter.c:306 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "" -#: ref-filter.c:281 +#: ref-filter.c:321 #, c-format msgid "positive value expected objectname:short=%s" msgstr "" -#: ref-filter.c:285 +#: ref-filter.c:325 #, c-format msgid "unrecognized %%(objectname) argument: %s" msgstr "" -#: ref-filter.c:315 +#: ref-filter.c:355 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "" -#: ref-filter.c:327 +#: ref-filter.c:367 #, c-format msgid "unrecognized position:%s" msgstr "" -#: ref-filter.c:334 +#: ref-filter.c:374 #, c-format msgid "unrecognized width:%s" msgstr "" -#: ref-filter.c:343 +#: ref-filter.c:383 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "" -#: ref-filter.c:351 +#: ref-filter.c:391 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "" -#: ref-filter.c:369 +#: ref-filter.c:409 #, c-format msgid "unrecognized %%(if) argument: %s" msgstr "" -#: ref-filter.c:464 +#: ref-filter.c:505 #, c-format msgid "malformed field name: %.*s" msgstr "" -#: ref-filter.c:491 +#: ref-filter.c:532 #, c-format msgid "unknown field name: %.*s" msgstr "" -#: ref-filter.c:608 +#: ref-filter.c:656 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "" -#: ref-filter.c:671 +#: ref-filter.c:719 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "" -#: ref-filter.c:673 +#: ref-filter.c:721 #, c-format msgid "format: %%(then) atom used more than once" msgstr "" -#: ref-filter.c:675 +#: ref-filter.c:723 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "" -#: ref-filter.c:703 +#: ref-filter.c:751 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "" -#: ref-filter.c:705 +#: ref-filter.c:753 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "" -#: ref-filter.c:707 +#: ref-filter.c:755 #, c-format msgid "format: %%(else) atom used more than once" msgstr "" -#: ref-filter.c:722 +#: ref-filter.c:770 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "" -#: ref-filter.c:779 +#: ref-filter.c:827 #, c-format msgid "malformed format string %s" msgstr "" -#: ref-filter.c:1387 +#: ref-filter.c:1416 #, c-format msgid "(no branch, rebasing %s)" msgstr "" -#: ref-filter.c:1390 +#: ref-filter.c:1419 #, c-format msgid "(no branch, rebasing detached HEAD %s)" msgstr "" -#: ref-filter.c:1393 +#: ref-filter.c:1422 #, c-format msgid "(no branch, bisect started on %s)" msgstr "" @@ -2872,7 +3591,7 @@ msgstr "" #. TRANSLATORS: make sure this matches "HEAD #. detached at " in wt-status.c #. -#: ref-filter.c:1401 +#: ref-filter.c:1430 #, c-format msgid "(HEAD detached at %s)" msgstr "" @@ -2880,147 +3599,142 @@ msgstr "" #. TRANSLATORS: make sure this matches "HEAD #. detached from " in wt-status.c #. -#: ref-filter.c:1408 +#: ref-filter.c:1437 #, c-format msgid "(HEAD detached from %s)" msgstr "" -#: ref-filter.c:1412 +#: ref-filter.c:1441 msgid "(no branch)" msgstr "" -#: ref-filter.c:1442 +#: ref-filter.c:1475 ref-filter.c:1623 #, c-format msgid "missing object %s for %s" msgstr "" -#: ref-filter.c:1445 +#: ref-filter.c:1483 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "" -#: ref-filter.c:1902 +#: ref-filter.c:1980 #, c-format msgid "malformed object at '%s'" msgstr "" -#: ref-filter.c:1984 +#: ref-filter.c:2062 #, c-format msgid "ignoring ref with broken name %s" msgstr "" -#: ref-filter.c:1989 -#, c-format -msgid "ignoring broken ref %s" -msgstr "" - -#: ref-filter.c:2261 +#: ref-filter.c:2340 #, c-format msgid "format: %%(end) atom missing" msgstr "" -#: ref-filter.c:2365 +#: ref-filter.c:2444 #, c-format msgid "malformed object name %s" msgstr "" -#: remote.c:605 +#: remote.c:606 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "" -#: remote.c:609 +#: remote.c:610 #, c-format msgid "%s usually tracks %s, not %s" msgstr "" -#: remote.c:613 +#: remote.c:614 #, c-format msgid "%s tracks both %s and %s" msgstr "" -#: remote.c:621 +#: remote.c:622 msgid "Internal error" msgstr "" -#: remote.c:1534 remote.c:1635 +#: remote.c:1536 remote.c:1637 msgid "HEAD does not point to a branch" msgstr "" -#: remote.c:1543 +#: remote.c:1545 #, c-format msgid "no such branch: '%s'" msgstr "" -#: remote.c:1546 +#: remote.c:1548 #, c-format msgid "no upstream configured for branch '%s'" msgstr "" -#: remote.c:1552 +#: remote.c:1554 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "" -#: remote.c:1567 +#: remote.c:1569 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "" -#: remote.c:1579 +#: remote.c:1581 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "" -#: remote.c:1589 +#: remote.c:1591 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "" -#: remote.c:1602 +#: remote.c:1604 msgid "push has no destination (push.default is 'nothing')" msgstr "" -#: remote.c:1624 +#: remote.c:1626 msgid "cannot resolve 'simple' push to a single destination" msgstr "" -#: remote.c:1939 +#: remote.c:1951 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "" -#: remote.c:1943 +#: remote.c:1955 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr "" -#: remote.c:1946 +#: remote.c:1958 #, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "" -#: remote.c:1950 +#: remote.c:1962 #, c-format msgid "Your branch and '%s' refer to different commits.\n" msgstr "" -#: remote.c:1953 +#: remote.c:1965 #, c-format msgid " (use \"%s\" for details)\n" msgstr "" -#: remote.c:1957 +#: remote.c:1969 #, 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] "" msgstr[1] "" -#: remote.c:1963 +#: remote.c:1975 msgid " (use \"git push\" to publish your local commits)\n" msgstr "" -#: remote.c:1966 +#: remote.c:1978 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -3028,11 +3742,11 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: remote.c:1974 +#: remote.c:1986 msgid " (use \"git pull\" to update your local branch)\n" msgstr "" -#: remote.c:1977 +#: remote.c:1989 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -3043,20 +3757,35 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: remote.c:1987 +#: remote.c:1999 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr "" -#: revision.c:2289 +#: replace-object.c:20 +#, c-format +msgid "bad replace ref name: %s" +msgstr "" + +#: replace-object.c:29 +#, c-format +msgid "duplicate replace ref: %s" +msgstr "" + +#: replace-object.c:72 +#, c-format +msgid "replace depth too high for object %s" +msgstr "" + +#: revision.c:2305 msgid "your current branch appears to be broken" msgstr "" -#: revision.c:2292 +#: revision.c:2308 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "" -#: revision.c:2489 +#: revision.c:2505 msgid "--first-parent is incompatible with --bisect" msgstr "" @@ -3071,121 +3800,115 @@ msgid "" "You can disable this warning with `git config advice.ignoredHook false`." msgstr "" -#: send-pack.c:141 +#: send-pack.c:142 msgid "unexpected flush packet while reading remote unpack status" msgstr "" -#: send-pack.c:143 +#: send-pack.c:144 #, c-format msgid "unable to parse remote unpack status: %s" msgstr "" -#: send-pack.c:145 +#: send-pack.c:146 #, c-format msgid "remote unpack failed: %s" msgstr "" -#: send-pack.c:308 +#: send-pack.c:309 msgid "failed to sign the push certificate" msgstr "" -#: send-pack.c:421 +#: send-pack.c:422 msgid "the receiving end does not support --signed push" msgstr "" -#: send-pack.c:423 +#: send-pack.c:424 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" msgstr "" -#: send-pack.c:435 +#: send-pack.c:436 msgid "the receiving end does not support --atomic push" msgstr "" -#: send-pack.c:440 +#: send-pack.c:441 msgid "the receiving end does not support push options" msgstr "" -#: sequencer.c:175 +#: sequencer.c:177 #, c-format msgid "invalid commit message cleanup mode '%s'" msgstr "" -#: sequencer.c:275 +#: sequencer.c:278 #, c-format msgid "could not delete '%s'" msgstr "" -#: sequencer.c:301 +#: sequencer.c:304 msgid "revert" msgstr "" -#: sequencer.c:303 +#: sequencer.c:306 msgid "cherry-pick" msgstr "" -#: sequencer.c:305 +#: sequencer.c:308 msgid "rebase -i" msgstr "" -#: sequencer.c:307 +#: sequencer.c:310 #, c-format -msgid "Unknown action: %d" +msgid "unknown action: %d" msgstr "" -#: sequencer.c:364 +#: sequencer.c:367 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" msgstr "" -#: sequencer.c:367 +#: sequencer.c:370 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" "and commit the result with 'git commit'" msgstr "" -#: sequencer.c:380 sequencer.c:2468 +#: sequencer.c:383 sequencer.c:2488 #, c-format msgid "could not lock '%s'" msgstr "" -#: sequencer.c:382 sequencer.c:2346 sequencer.c:2472 sequencer.c:2486 -#: sequencer.c:2694 sequencer.c:4336 sequencer.c:4399 wrapper.c:656 -#, c-format -msgid "could not write to '%s'" -msgstr "" - -#: sequencer.c:387 +#: sequencer.c:390 #, c-format msgid "could not write eol to '%s'" msgstr "" -#: sequencer.c:392 sequencer.c:2351 sequencer.c:2474 sequencer.c:2488 -#: sequencer.c:2702 +#: sequencer.c:395 sequencer.c:2371 sequencer.c:2494 sequencer.c:2508 +#: sequencer.c:2741 #, c-format msgid "failed to finalize '%s'" msgstr "" -#: sequencer.c:415 sequencer.c:804 sequencer.c:1493 sequencer.c:2371 -#: sequencer.c:2684 sequencer.c:2788 builtin/am.c:259 builtin/commit.c:727 -#: builtin/merge.c:1046 +#: sequencer.c:418 sequencer.c:816 sequencer.c:1505 sequencer.c:2391 +#: sequencer.c:2723 sequencer.c:2827 builtin/am.c:260 builtin/commit.c:740 +#: builtin/merge.c:1081 #, c-format msgid "could not read '%s'" msgstr "" -#: sequencer.c:441 +#: sequencer.c:444 #, c-format msgid "your local changes would be overwritten by %s." msgstr "" -#: sequencer.c:445 +#: sequencer.c:448 msgid "commit your changes or stash them to proceed." msgstr "" -#: sequencer.c:474 +#: sequencer.c:477 #, c-format msgid "%s: fast-forward" msgstr "" @@ -3193,20 +3916,40 @@ msgstr "" #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase -i". #. -#: sequencer.c:563 +#: sequencer.c:566 #, c-format msgid "%s: Unable to write new index file" msgstr "" -#: sequencer.c:579 +#: sequencer.c:582 msgid "unable to update cache tree" msgstr "" -#: sequencer.c:592 +#: sequencer.c:595 msgid "could not resolve HEAD commit" msgstr "" -#: sequencer.c:749 +#: sequencer.c:723 +#, c-format +msgid "could not parse '%s' (looking for '%s'" +msgstr "" + +#: sequencer.c:731 +#, c-format +msgid "bad quoting on %s value in '%s'" +msgstr "" + +#: sequencer.c:740 +#, c-format +msgid "could not parse '%s' (looking for '%s')" +msgstr "" + +#: sequencer.c:747 +#, c-format +msgid "invalid date format '%s' in '%s'" +msgstr "" + +#: sequencer.c:761 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -3223,15 +3966,15 @@ msgid "" " git rebase --continue\n" msgstr "" -#: sequencer.c:818 +#: sequencer.c:830 msgid "writing root commit" msgstr "" -#: sequencer.c:1043 +#: sequencer.c:1055 msgid "'prepare-commit-msg' hook failed" msgstr "" -#: sequencer.c:1050 +#: sequencer.c:1062 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -3246,7 +3989,7 @@ msgid "" " git commit --amend --reset-author\n" msgstr "" -#: sequencer.c:1063 +#: sequencer.c:1075 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -3260,313 +4003,335 @@ msgid "" " git commit --amend --reset-author\n" msgstr "" -#: sequencer.c:1103 +#: sequencer.c:1115 msgid "couldn't look up newly created commit" msgstr "" -#: sequencer.c:1105 +#: sequencer.c:1117 msgid "could not parse newly created commit" msgstr "" -#: sequencer.c:1151 +#: sequencer.c:1163 msgid "unable to resolve HEAD after creating commit" msgstr "" -#: sequencer.c:1153 +#: sequencer.c:1165 msgid "detached HEAD" msgstr "" -#: sequencer.c:1157 +#: sequencer.c:1169 msgid " (root-commit)" msgstr "" -#: sequencer.c:1178 +#: sequencer.c:1190 msgid "could not parse HEAD" msgstr "" -#: sequencer.c:1180 +#: sequencer.c:1192 #, c-format msgid "HEAD %s is not a commit!" msgstr "" -#: sequencer.c:1184 builtin/commit.c:1528 +#: sequencer.c:1196 builtin/commit.c:1528 msgid "could not parse HEAD commit" msgstr "" -#: sequencer.c:1235 sequencer.c:1832 +#: sequencer.c:1247 sequencer.c:1845 msgid "unable to parse commit author" msgstr "" -#: sequencer.c:1245 builtin/am.c:1630 builtin/merge.c:645 +#: sequencer.c:1257 builtin/am.c:1632 builtin/merge.c:675 msgid "git write-tree failed to write a tree" msgstr "" -#: sequencer.c:1262 sequencer.c:1317 +#: sequencer.c:1274 sequencer.c:1329 #, c-format msgid "unable to read commit message from '%s'" msgstr "" -#: sequencer.c:1284 builtin/am.c:1650 builtin/commit.c:1631 builtin/merge.c:825 -#: builtin/merge.c:850 +#: sequencer.c:1296 builtin/am.c:1653 builtin/commit.c:1631 builtin/merge.c:855 +#: builtin/merge.c:880 msgid "failed to write commit object" msgstr "" -#: sequencer.c:1344 +#: sequencer.c:1356 #, c-format msgid "could not parse commit %s" msgstr "" -#: sequencer.c:1349 +#: sequencer.c:1361 #, c-format msgid "could not parse parent commit %s" msgstr "" -#: sequencer.c:1500 sequencer.c:1525 +#: sequencer.c:1457 sequencer.c:1565 +#, c-format +msgid "unknown command: %d" +msgstr "" + +#: sequencer.c:1512 sequencer.c:1537 #, c-format msgid "This is a combination of %d commits." msgstr "" -#: sequencer.c:1510 sequencer.c:4355 +#: sequencer.c:1522 sequencer.c:4520 msgid "need a HEAD to fixup" msgstr "" -#: sequencer.c:1512 sequencer.c:2729 +#: sequencer.c:1524 sequencer.c:2768 msgid "could not read HEAD" msgstr "" -#: sequencer.c:1514 +#: sequencer.c:1526 msgid "could not read HEAD's commit message" msgstr "" -#: sequencer.c:1520 +#: sequencer.c:1532 #, c-format msgid "cannot write '%s'" msgstr "" -#: sequencer.c:1527 git-rebase--interactive.sh:457 +#: sequencer.c:1539 git-rebase--preserve-merges.sh:441 msgid "This is the 1st commit message:" msgstr "" -#: sequencer.c:1535 +#: sequencer.c:1547 #, c-format msgid "could not read commit message of %s" msgstr "" -#: sequencer.c:1542 +#: sequencer.c:1554 #, c-format msgid "This is the commit message #%d:" msgstr "" -#: sequencer.c:1548 +#: sequencer.c:1560 #, c-format msgid "The commit message #%d will be skipped:" msgstr "" -#: sequencer.c:1553 -#, c-format -msgid "unknown command: %d" -msgstr "" - -#: sequencer.c:1631 +#: sequencer.c:1643 msgid "your index file is unmerged." msgstr "" -#: sequencer.c:1638 +#: sequencer.c:1650 msgid "cannot fixup root commit" msgstr "" -#: sequencer.c:1657 +#: sequencer.c:1669 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "" -#: sequencer.c:1665 +#: sequencer.c:1677 #, c-format msgid "commit %s does not have parent %d" msgstr "" -#: sequencer.c:1669 +#: sequencer.c:1681 #, c-format msgid "mainline was specified but commit %s is not a merge." msgstr "" -#: sequencer.c:1675 +#: sequencer.c:1687 #, c-format msgid "cannot get commit message for %s" msgstr "" #. TRANSLATORS: The first %s will be a "todo" command like #. "revert" or "pick", the second %s a SHA1. -#: sequencer.c:1694 +#: sequencer.c:1706 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "" -#: sequencer.c:1759 +#: sequencer.c:1771 #, c-format msgid "could not rename '%s' to '%s'" msgstr "" -#: sequencer.c:1813 +#: sequencer.c:1826 #, c-format msgid "could not revert %s... %s" msgstr "" -#: sequencer.c:1814 +#: sequencer.c:1827 #, c-format msgid "could not apply %s... %s" msgstr "" -#: sequencer.c:1864 -msgid "empty commit set passed" -msgstr "" - -#: sequencer.c:1874 +#: sequencer.c:1885 #, c-format msgid "git %s: failed to read the index" msgstr "" -#: sequencer.c:1881 +#: sequencer.c:1892 #, c-format msgid "git %s: failed to refresh the index" msgstr "" -#: sequencer.c:1961 +#: sequencer.c:1972 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "" -#: sequencer.c:1970 +#: sequencer.c:1981 #, c-format msgid "missing arguments for %s" msgstr "" -#: sequencer.c:2029 +#: sequencer.c:2040 #, c-format msgid "invalid line %d: %.*s" msgstr "" -#: sequencer.c:2037 +#: sequencer.c:2048 #, c-format msgid "cannot '%s' without a previous commit" msgstr "" -#: sequencer.c:2085 sequencer.c:4138 sequencer.c:4173 +#: sequencer.c:2096 sequencer.c:4277 sequencer.c:4333 #, c-format msgid "could not read '%s'." msgstr "" -#: sequencer.c:2108 +#: sequencer.c:2119 msgid "please fix this using 'git rebase --edit-todo'." msgstr "" -#: sequencer.c:2110 +#: sequencer.c:2121 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "" -#: sequencer.c:2115 +#: sequencer.c:2126 msgid "no commits parsed." msgstr "" -#: sequencer.c:2126 +#: sequencer.c:2137 msgid "cannot cherry-pick during a revert." msgstr "" -#: sequencer.c:2128 +#: sequencer.c:2139 msgid "cannot revert during a cherry-pick." msgstr "" -#: sequencer.c:2195 -#, c-format -msgid "invalid key: %s" -msgstr "" - -#: sequencer.c:2198 +#: sequencer.c:2209 #, c-format msgid "invalid value for %s: %s" msgstr "" -#: sequencer.c:2269 +#: sequencer.c:2285 msgid "unusable squash-onto" msgstr "" -#: sequencer.c:2285 +#: sequencer.c:2301 #, c-format msgid "malformed options sheet: '%s'" msgstr "" -#: sequencer.c:2323 +#: sequencer.c:2335 sequencer.c:3775 +msgid "empty commit set passed" +msgstr "" + +#: sequencer.c:2343 msgid "a cherry-pick or revert is already in progress" msgstr "" -#: sequencer.c:2324 +#: sequencer.c:2344 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "" -#: sequencer.c:2327 +#: sequencer.c:2347 #, c-format msgid "could not create sequencer directory '%s'" msgstr "" -#: sequencer.c:2341 +#: sequencer.c:2361 msgid "could not lock HEAD" msgstr "" -#: sequencer.c:2396 sequencer.c:3403 +#: sequencer.c:2416 sequencer.c:3543 msgid "no cherry-pick or revert in progress" msgstr "" -#: sequencer.c:2398 +#: sequencer.c:2418 msgid "cannot resolve HEAD" msgstr "" -#: sequencer.c:2400 sequencer.c:2435 +#: sequencer.c:2420 sequencer.c:2455 msgid "cannot abort from a branch yet to be born" msgstr "" -#: sequencer.c:2421 builtin/grep.c:720 +#: sequencer.c:2441 builtin/grep.c:721 #, c-format msgid "cannot open '%s'" msgstr "" -#: sequencer.c:2423 +#: sequencer.c:2443 #, c-format msgid "cannot read '%s': %s" msgstr "" -#: sequencer.c:2424 +#: sequencer.c:2444 msgid "unexpected end of file" msgstr "" -#: sequencer.c:2430 +#: sequencer.c:2450 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "" -#: sequencer.c:2441 +#: sequencer.c:2461 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "" -#: sequencer.c:2545 sequencer.c:3321 +#: sequencer.c:2565 sequencer.c:3461 #, c-format msgid "could not update %s" msgstr "" -#: sequencer.c:2583 sequencer.c:3301 +#: sequencer.c:2603 sequencer.c:3441 msgid "cannot read HEAD" msgstr "" -#: sequencer.c:2618 sequencer.c:2622 builtin/difftool.c:639 +#: sequencer.c:2618 +#, c-format +msgid "unable to copy '%s' to '%s'" +msgstr "" + +#: sequencer.c:2626 +#, c-format +msgid "" +"You can amend the commit now, with\n" +"\n" +" git commit --amend %s\n" +"\n" +"Once you are satisfied with your changes, run\n" +"\n" +" git rebase --continue\n" +msgstr "" + +#: sequencer.c:2636 +#, c-format +msgid "Could not apply %s... %.*s" +msgstr "" + +#: sequencer.c:2643 +#, c-format +msgid "Could not merge %.*s" +msgstr "" + +#: sequencer.c:2654 sequencer.c:2658 builtin/difftool.c:640 #, c-format msgid "could not copy '%s' to '%s'" msgstr "" -#: sequencer.c:2641 +#: sequencer.c:2680 sequencer.c:3095 msgid "could not read index" msgstr "" -#: sequencer.c:2646 +#: sequencer.c:2685 #, c-format msgid "" "execution failed: %s\n" @@ -3576,11 +4341,11 @@ msgid "" "\n" msgstr "" -#: sequencer.c:2652 +#: sequencer.c:2691 msgid "and made changes to the index and/or the working tree\n" msgstr "" -#: sequencer.c:2658 +#: sequencer.c:2697 #, c-format msgid "" "execution succeeded: %s\n" @@ -3591,62 +4356,81 @@ msgid "" "\n" msgstr "" -#: sequencer.c:2771 +#: sequencer.c:2758 +#, c-format +msgid "illegal label name: '%.*s'" +msgstr "" + +#: sequencer.c:2810 msgid "writing fake root commit" msgstr "" -#: sequencer.c:2776 +#: sequencer.c:2815 msgid "writing squash-onto" msgstr "" -#: sequencer.c:2811 +#: sequencer.c:2850 #, c-format msgid "failed to find tree of %s" msgstr "" -#: sequencer.c:2829 +#: sequencer.c:2868 msgid "could not write index" msgstr "" -#: sequencer.c:2861 +#: sequencer.c:2895 +#, c-format +msgid "could not resolve '%s'" +msgstr "" + +#: sequencer.c:2921 msgid "cannot merge without a current revision" msgstr "" -#: sequencer.c:2884 +#: sequencer.c:2943 #, c-format -msgid "could not resolve '%s'" +msgid "unable to parse '%.*s'" +msgstr "" + +#: sequencer.c:2952 +#, c-format +msgid "nothing to merge: '%.*s'" msgstr "" -#: sequencer.c:2906 +#: sequencer.c:2964 +msgid "octopus merge cannot be executed on top of a [new root]" +msgstr "" + +#: sequencer.c:2979 #, c-format msgid "could not get commit message of '%s'" msgstr "" -#: sequencer.c:2916 sequencer.c:2941 +#: sequencer.c:2989 sequencer.c:3015 #, c-format msgid "could not write '%s'" msgstr "" -#: sequencer.c:3005 +#: sequencer.c:3127 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "" -#: sequencer.c:3021 +#: sequencer.c:3143 msgid "merge: Unable to write new index file" msgstr "" -#: sequencer.c:3088 +#: sequencer.c:3211 #, c-format msgid "Applied autostash.\n" msgstr "" -#: sequencer.c:3100 +#: sequencer.c:3223 #, c-format msgid "cannot store %s" msgstr "" -#: sequencer.c:3103 git-rebase.sh:188 +#: sequencer.c:3226 git-rebase.sh:188 #, c-format msgid "" "Applying autostash resulted in conflicts.\n" @@ -3654,7 +4438,7 @@ msgid "" "You can run \"git stash pop\" or \"git stash drop\" at any time.\n" msgstr "" -#: sequencer.c:3134 +#: sequencer.c:3257 #, c-format msgid "" "Could not execute the todo command\n" @@ -3667,108 +4451,108 @@ msgid "" " git rebase --continue\n" msgstr "" -#: sequencer.c:3202 +#: sequencer.c:3325 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "" -#: sequencer.c:3264 +#: sequencer.c:3404 #, c-format msgid "unknown command %d" msgstr "" -#: sequencer.c:3309 +#: sequencer.c:3449 msgid "could not read orig-head" msgstr "" -#: sequencer.c:3314 sequencer.c:4352 +#: sequencer.c:3454 sequencer.c:4517 msgid "could not read 'onto'" msgstr "" -#: sequencer.c:3328 +#: sequencer.c:3468 #, c-format msgid "could not update HEAD to %s" msgstr "" -#: sequencer.c:3414 +#: sequencer.c:3554 msgid "cannot rebase: You have unstaged changes." msgstr "" -#: sequencer.c:3423 +#: sequencer.c:3563 msgid "cannot amend non-existing commit" msgstr "" -#: sequencer.c:3425 +#: sequencer.c:3565 #, c-format msgid "invalid file: '%s'" msgstr "" -#: sequencer.c:3427 +#: sequencer.c:3567 #, c-format msgid "invalid contents: '%s'" msgstr "" -#: sequencer.c:3430 +#: sequencer.c:3570 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" "first and then run 'git rebase --continue' again." msgstr "" -#: sequencer.c:3455 sequencer.c:3493 +#: sequencer.c:3595 sequencer.c:3633 #, c-format msgid "could not write file: '%s'" msgstr "" -#: sequencer.c:3508 +#: sequencer.c:3648 msgid "could not remove CHERRY_PICK_HEAD" msgstr "" -#: sequencer.c:3515 +#: sequencer.c:3655 msgid "could not commit staged changes." msgstr "" -#: sequencer.c:3612 +#: sequencer.c:3752 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "" -#: sequencer.c:3616 +#: sequencer.c:3756 #, c-format msgid "%s: bad revision" msgstr "" -#: sequencer.c:3649 +#: sequencer.c:3791 msgid "can't revert as initial commit" msgstr "" -#: sequencer.c:4098 +#: sequencer.c:4238 msgid "make_script: unhandled options" msgstr "" -#: sequencer.c:4101 +#: sequencer.c:4241 msgid "make_script: error preparing revisions" msgstr "" -#: sequencer.c:4142 sequencer.c:4177 +#: sequencer.c:4281 sequencer.c:4337 #, c-format msgid "unusable todo list: '%s'" msgstr "" -#: sequencer.c:4236 +#: sequencer.c:4396 #, c-format msgid "" "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." msgstr "" -#: sequencer.c:4302 +#: sequencer.c:4466 #, c-format msgid "" "Warning: some commits may have been dropped accidentally.\n" "Dropped commits (newer to older):\n" msgstr "" -#: sequencer.c:4309 +#: sequencer.c:4473 #, c-format msgid "" "To avoid this message, use \"drop\" to explicitly remove a commit.\n" @@ -3779,7 +4563,7 @@ msgid "" "\n" msgstr "" -#: sequencer.c:4321 +#: sequencer.c:4486 #, c-format msgid "" "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" @@ -3787,12 +4571,7 @@ msgid "" "Or you can abort the rebase with 'git rebase --abort'.\n" msgstr "" -#: sequencer.c:4375 -#, c-format -msgid "could not parse commit '%s'" -msgstr "" - -#: sequencer.c:4490 +#: sequencer.c:4660 msgid "the script was already rearranged." msgstr "" @@ -3940,6 +4719,38 @@ msgstr "" msgid "setsid failed" msgstr "" +#: sha1-file.c:381 +#, c-format +msgid "object directory %s does not exist; check .git/objects/info/alternates" +msgstr "" + +#: sha1-file.c:432 +#, c-format +msgid "unable to normalize alternate object path: %s" +msgstr "" + +#: sha1-file.c:503 +#, c-format +msgid "%s: ignoring alternate object stores, nesting too deep" +msgstr "" + +#: sha1-file.c:510 +#, c-format +msgid "unable to normalize object directory: %s" +msgstr "" + +#: sha1-file.c:565 +msgid "unable to fdopen alternates lockfile" +msgstr "" + +#: sha1-file.c:583 +msgid "unable to read alternates file" +msgstr "" + +#: sha1-file.c:590 +msgid "unable to move new alternates file into place" +msgstr "" + #: sha1-file.c:625 #, c-format msgid "path '%s' does not exist" @@ -3965,16 +4776,208 @@ msgstr "" msgid "reference repository '%s' is grafted" msgstr "" -#: sha1-name.c:442 +#: sha1-file.c:781 +#, c-format +msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" +msgstr "" + +#: sha1-file.c:806 +msgid "mmap failed" +msgstr "" + +#: sha1-file.c:973 +#, c-format +msgid "object file %s is empty" +msgstr "" + +#: sha1-file.c:1093 sha1-file.c:2206 +#, c-format +msgid "corrupt loose object '%s'" +msgstr "" + +#: sha1-file.c:1095 sha1-file.c:2210 +#, c-format +msgid "garbage at end of loose object '%s'" +msgstr "" + +#: sha1-file.c:1137 +msgid "invalid object type" +msgstr "" + +#: sha1-file.c:1219 +#, c-format +msgid "unable to unpack %s header with --allow-unknown-type" +msgstr "" + +#: sha1-file.c:1222 +#, c-format +msgid "unable to unpack %s header" +msgstr "" + +#: sha1-file.c:1228 +#, c-format +msgid "unable to parse %s header with --allow-unknown-type" +msgstr "" + +#: sha1-file.c:1231 +#, c-format +msgid "unable to parse %s header" +msgstr "" + +#: sha1-file.c:1422 +#, c-format +msgid "failed to read object %s" +msgstr "" + +#: sha1-file.c:1426 +#, c-format +msgid "replacement %s not found for %s" +msgstr "" + +#: sha1-file.c:1430 +#, c-format +msgid "loose object %s (stored in %s) is corrupt" +msgstr "" + +#: sha1-file.c:1434 +#, c-format +msgid "packed object %s (stored in %s) is corrupt" +msgstr "" + +#: sha1-file.c:1536 +#, c-format +msgid "unable to write sha1 filename %s" +msgstr "" + +#: sha1-file.c:1543 +#, c-format +msgid "unable to set permission to '%s'" +msgstr "" + +#: sha1-file.c:1550 +msgid "file write error" +msgstr "" + +#: sha1-file.c:1569 +msgid "error when closing sha1 file" +msgstr "" + +#: sha1-file.c:1635 +#, c-format +msgid "insufficient permission for adding an object to repository database %s" +msgstr "" + +#: sha1-file.c:1637 +msgid "unable to create temporary file" +msgstr "" + +#: sha1-file.c:1661 +msgid "unable to write sha1 file" +msgstr "" + +#: sha1-file.c:1667 +#, c-format +msgid "unable to deflate new object %s (%d)" +msgstr "" + +#: sha1-file.c:1671 +#, c-format +msgid "deflateEnd on object %s failed (%d)" +msgstr "" + +#: sha1-file.c:1675 +#, c-format +msgid "confused by unstable object source data for %s" +msgstr "" + +#: sha1-file.c:1685 builtin/pack-objects.c:899 +#, c-format +msgid "failed utime() on %s" +msgstr "" + +#: sha1-file.c:1760 +#, c-format +msgid "cannot read sha1_file for %s" +msgstr "" + +#: sha1-file.c:1805 +msgid "corrupt commit" +msgstr "" + +#: sha1-file.c:1813 +msgid "corrupt tag" +msgstr "" + +#: sha1-file.c:1906 +#, c-format +msgid "read error while indexing %s" +msgstr "" + +#: sha1-file.c:1909 +#, c-format +msgid "short read while indexing %s" +msgstr "" + +#: sha1-file.c:1980 sha1-file.c:1989 +#, c-format +msgid "%s: failed to insert into database" +msgstr "" + +#: sha1-file.c:1995 +#, c-format +msgid "%s: unsupported file type" +msgstr "" + +#: sha1-file.c:2019 +#, c-format +msgid "%s is not a valid object" +msgstr "" + +#: sha1-file.c:2021 +#, c-format +msgid "%s is not a valid '%s' object" +msgstr "" + +#: sha1-file.c:2048 builtin/index-pack.c:158 +#, c-format +msgid "unable to open %s" +msgstr "" + +#: sha1-file.c:2217 sha1-file.c:2269 +#, c-format +msgid "sha1 mismatch for %s (expected %s)" +msgstr "" + +#: sha1-file.c:2241 +#, c-format +msgid "unable to mmap %s" +msgstr "" + +#: sha1-file.c:2246 +#, c-format +msgid "unable to unpack header of %s" +msgstr "" + +#: sha1-file.c:2252 +#, c-format +msgid "unable to parse header of %s" +msgstr "" + +#: sha1-file.c:2263 +#, c-format +msgid "unable to unpack contents of %s" +msgstr "" + +#: sha1-name.c:444 #, c-format msgid "short SHA1 %s is ambiguous" msgstr "" -#: sha1-name.c:453 +#: sha1-name.c:455 msgid "The candidates are:" msgstr "" -#: sha1-name.c:695 +#: sha1-name.c:699 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" @@ -4020,53 +5023,63 @@ msgstr "" msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "" -#: submodule.c:837 +#: submodule.c:839 #, c-format msgid "submodule entry '%s' (%s) is a %s, not a commit" msgstr "" -#: submodule.c:1069 builtin/branch.c:651 builtin/submodule--helper.c:1743 +#: submodule.c:1071 builtin/branch.c:662 builtin/submodule--helper.c:1888 msgid "Failed to resolve HEAD as a valid ref." msgstr "" -#: submodule.c:1375 +#: submodule.c:1377 #, c-format msgid "'%s' not recognized as a git repository" msgstr "" -#: submodule.c:1513 +#: submodule.c:1515 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "" -#: submodule.c:1526 +#: submodule.c:1528 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "" -#: submodule.c:1619 +#: submodule.c:1543 +#, c-format +msgid "Could not unset core.worktree setting in submodule '%s'" +msgstr "" + +#: submodule.c:1633 #, c-format msgid "submodule '%s' has dirty index" msgstr "" -#: submodule.c:1718 +#: submodule.c:1685 +#, c-format +msgid "Submodule '%s' could not be updated." +msgstr "" + +#: submodule.c:1734 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" msgstr "" -#: submodule.c:1730 submodule.c:1786 +#: submodule.c:1746 submodule.c:1802 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "" -#: submodule.c:1734 builtin/submodule--helper.c:1261 -#: builtin/submodule--helper.c:1271 +#: submodule.c:1750 builtin/submodule--helper.c:1406 +#: builtin/submodule--helper.c:1416 #, c-format msgid "could not create directory '%s'" msgstr "" -#: submodule.c:1737 +#: submodule.c:1753 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -4074,30 +5087,30 @@ msgid "" "'%s'\n" msgstr "" -#: submodule.c:1821 +#: submodule.c:1837 #, c-format msgid "could not recurse into submodule '%s'" msgstr "" -#: submodule.c:1865 +#: submodule.c:1881 msgid "could not start ls-files in .." msgstr "" -#: submodule.c:1904 +#: submodule.c:1920 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "" -#: submodule-config.c:230 +#: submodule-config.c:231 #, c-format msgid "ignoring suspicious submodule name: %s" msgstr "" -#: submodule-config.c:294 +#: submodule-config.c:295 msgid "negative values not allowed for submodule.fetchjobs" msgstr "" -#: submodule-config.c:467 +#: submodule-config.c:468 #, c-format msgid "invalid value for %s" msgstr "" @@ -4113,7 +5126,7 @@ msgstr "" msgid "unknown value '%s' for key '%s'" msgstr "" -#: trailer.c:539 trailer.c:544 builtin/remote.c:293 +#: trailer.c:539 trailer.c:544 builtin/remote.c:294 #, c-format msgid "more than one %s" msgstr "" @@ -4132,7 +5145,7 @@ msgstr "" msgid "could not read from stdin" msgstr "" -#: trailer.c:1008 builtin/am.c:46 +#: trailer.c:1008 builtin/am.c:47 #, c-format msgid "could not stat %s" msgstr "" @@ -4161,23 +5174,46 @@ msgstr "" msgid "Would set upstream of '%s' to '%s' of '%s'\n" msgstr "" +#: transport.c:142 +#, c-format +msgid "could not read bundle '%s'" +msgstr "" + #: transport.c:208 #, c-format msgid "transport: invalid depth option '%s'" msgstr "" -#: transport.c:584 +#: transport.c:586 msgid "could not parse transport.color.* config" msgstr "" -#: transport.c:996 +#: transport.c:659 +msgid "support for protocol v2 not implemented yet" +msgstr "" + +#: transport.c:785 +#, c-format +msgid "unknown value for config '%s': %s" +msgstr "" + +#: transport.c:851 +#, c-format +msgid "transport '%s' not allowed" +msgstr "" + +#: transport.c:903 +msgid "git-over-rsync is no longer supported" +msgstr "" + +#: transport.c:998 #, c-format msgid "" "The following submodule paths contain changes that can\n" "not be found on any remote:\n" msgstr "" -#: transport.c:1000 +#: transport.c:1002 #, c-format msgid "" "\n" @@ -4193,123 +5229,294 @@ msgid "" "\n" msgstr "" -#: transport.c:1008 +#: transport.c:1010 msgid "Aborting." msgstr "" -#: transport-helper.c:1087 +#: transport.c:1148 +msgid "failed to push all needed submodules" +msgstr "" + +#: transport.c:1270 transport-helper.c:643 +msgid "operation not supported by protocol" +msgstr "" + +#: transport.c:1352 +#, c-format +msgid "invalid line while parsing alternate refs: %s" +msgstr "" + +#: transport-helper.c:51 transport-helper.c:80 +msgid "full write to remote helper failed" +msgstr "" + +#: transport-helper.c:132 +#, c-format +msgid "unable to find remote helper for '%s'" +msgstr "" + +#: transport-helper.c:148 transport-helper.c:557 +msgid "can't dup helper output fd" +msgstr "" + +#: transport-helper.c:199 #, c-format -msgid "Could not read ref %s" +msgid "" +"unknown mandatory capability %s; this remote helper probably needs newer " +"version of Git" +msgstr "" + +#: transport-helper.c:205 +msgid "this remote helper should implement refspec capability" +msgstr "" + +#: transport-helper.c:272 transport-helper.c:412 +#, c-format +msgid "%s unexpectedly said: '%s'" +msgstr "" + +#: transport-helper.c:401 +#, c-format +msgid "%s also locked %s" +msgstr "" + +#: transport-helper.c:479 +msgid "couldn't run fast-import" +msgstr "" + +#: transport-helper.c:502 +msgid "error while running fast-import" +msgstr "" + +#: transport-helper.c:531 transport-helper.c:1091 +#, c-format +msgid "could not read ref %s" +msgstr "" + +#: transport-helper.c:576 +#, c-format +msgid "unknown response to connect: %s" +msgstr "" + +#: transport-helper.c:598 +msgid "setting remote service path not supported by protocol" +msgstr "" + +#: transport-helper.c:600 +msgid "invalid remote service path" +msgstr "" + +#: transport-helper.c:646 +#, c-format +msgid "can't connect to subservice %s" +msgstr "" + +#: transport-helper.c:713 +#, c-format +msgid "expected ok/error, helper said '%s'" +msgstr "" + +#: transport-helper.c:766 +#, c-format +msgid "helper reported unexpected status of %s" +msgstr "" + +#: transport-helper.c:827 +#, c-format +msgid "helper %s does not support dry-run" +msgstr "" + +#: transport-helper.c:830 +#, c-format +msgid "helper %s does not support --signed" +msgstr "" + +#: transport-helper.c:833 +#, c-format +msgid "helper %s does not support --signed=if-asked" +msgstr "" + +#: transport-helper.c:840 +#, c-format +msgid "helper %s does not support 'push-option'" +msgstr "" + +#: transport-helper.c:932 +msgid "remote-helper doesn't support push; refspec needed" +msgstr "" + +#: transport-helper.c:937 +#, c-format +msgid "helper %s does not support 'force'" +msgstr "" + +#: transport-helper.c:984 +msgid "couldn't run fast-export" +msgstr "" + +#: transport-helper.c:989 +msgid "error while running fast-export" msgstr "" -#: tree-walk.c:31 +#: transport-helper.c:1014 +#, c-format +msgid "" +"No refs in common and none specified; doing nothing.\n" +"Perhaps you should specify a branch such as 'master'.\n" +msgstr "" + +#: transport-helper.c:1077 +#, c-format +msgid "malformed response in ref list: %s" +msgstr "" + +#: transport-helper.c:1230 +#, c-format +msgid "read(%s) failed" +msgstr "" + +#: transport-helper.c:1257 +#, c-format +msgid "write(%s) failed" +msgstr "" + +#: transport-helper.c:1306 +#, c-format +msgid "%s thread failed" +msgstr "" + +#: transport-helper.c:1310 +#, c-format +msgid "%s thread failed to join: %s" +msgstr "" + +#: transport-helper.c:1329 transport-helper.c:1333 +#, c-format +msgid "can't start thread for copying data: %s" +msgstr "" + +#: transport-helper.c:1370 +#, c-format +msgid "%s process failed to wait" +msgstr "" + +#: transport-helper.c:1374 +#, c-format +msgid "%s process failed" +msgstr "" + +#: transport-helper.c:1392 transport-helper.c:1401 +msgid "can't start thread for copying data" +msgstr "" + +#: tree-walk.c:33 msgid "too-short tree object" msgstr "" -#: tree-walk.c:37 +#: tree-walk.c:39 msgid "malformed mode in tree entry" msgstr "" -#: tree-walk.c:41 +#: tree-walk.c:43 msgid "empty filename in tree entry" msgstr "" -#: tree-walk.c:113 +#: tree-walk.c:115 msgid "too-short tree file" msgstr "" -#: unpack-trees.c:111 +#: unpack-trees.c:112 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" "%%sPlease commit your changes or stash them before you switch branches." msgstr "" -#: unpack-trees.c:113 +#: unpack-trees.c:114 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" "%%s" msgstr "" -#: unpack-trees.c:116 +#: unpack-trees.c:117 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" "%%sPlease commit your changes or stash them before you merge." msgstr "" -#: unpack-trees.c:118 +#: unpack-trees.c:119 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" "%%s" msgstr "" -#: unpack-trees.c:121 +#: unpack-trees.c:122 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" "%%sPlease commit your changes or stash them before you %s." msgstr "" -#: unpack-trees.c:123 +#: unpack-trees.c:124 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" "%%s" msgstr "" -#: unpack-trees.c:128 +#: unpack-trees.c:129 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" "%s" msgstr "" -#: unpack-trees.c:132 +#: unpack-trees.c:133 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" "%%sPlease move or remove them before you switch branches." msgstr "" -#: unpack-trees.c:134 +#: unpack-trees.c:135 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" "%%s" msgstr "" -#: unpack-trees.c:137 +#: unpack-trees.c:138 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" "%%sPlease move or remove them before you merge." msgstr "" -#: unpack-trees.c:139 +#: unpack-trees.c:140 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" "%%s" msgstr "" -#: unpack-trees.c:142 +#: unpack-trees.c:143 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" "%%sPlease move or remove them before you %s." msgstr "" -#: unpack-trees.c:144 +#: unpack-trees.c:145 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" "%%s" msgstr "" -#: unpack-trees.c:150 +#: unpack-trees.c:151 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -4317,7 +5524,7 @@ msgid "" "%%sPlease move or remove them before you switch branches." msgstr "" -#: unpack-trees.c:152 +#: unpack-trees.c:153 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -4325,47 +5532,47 @@ msgid "" "%%s" msgstr "" -#: unpack-trees.c:155 +#: unpack-trees.c:156 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" "%%sPlease move or remove them before you merge." msgstr "" -#: unpack-trees.c:157 +#: unpack-trees.c:158 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" "%%s" msgstr "" -#: unpack-trees.c:160 +#: unpack-trees.c:161 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" "%%sPlease move or remove them before you %s." msgstr "" -#: unpack-trees.c:162 +#: unpack-trees.c:163 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" "%%s" msgstr "" -#: unpack-trees.c:170 +#: unpack-trees.c:171 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "" -#: unpack-trees.c:173 +#: unpack-trees.c:174 #, c-format msgid "" "Cannot update sparse checkout: the following entries are not up to date:\n" "%s" msgstr "" -#: unpack-trees.c:175 +#: unpack-trees.c:176 #, c-format msgid "" "The following working tree files would be overwritten by sparse checkout " @@ -4373,7 +5580,7 @@ msgid "" "%s" msgstr "" -#: unpack-trees.c:177 +#: unpack-trees.c:178 #, c-format msgid "" "The following working tree files would be removed by sparse checkout " @@ -4381,19 +5588,19 @@ msgid "" "%s" msgstr "" -#: unpack-trees.c:179 +#: unpack-trees.c:180 #, c-format msgid "" "Cannot update submodule:\n" "%s" msgstr "" -#: unpack-trees.c:262 +#: unpack-trees.c:254 #, c-format msgid "Aborting\n" msgstr "" -#: unpack-trees.c:344 +#: unpack-trees.c:336 msgid "Checking out files" msgstr "" @@ -4461,8 +5668,8 @@ msgstr "" msgid "could not open '%s' for reading and writing" msgstr "" -#: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:770 -#: builtin/am.c:862 builtin/merge.c:1043 +#: wrapper.c:227 wrapper.c:397 builtin/am.c:321 builtin/am.c:771 +#: builtin/am.c:863 builtin/merge.c:1078 #, c-format msgid "could not open '%s' for reading" msgstr "" @@ -4927,21 +6134,21 @@ msgid "ahead " msgstr "" #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2366 +#: wt-status.c:2376 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "" -#: wt-status.c:2372 +#: wt-status.c:2382 msgid "additionally, your index contains uncommitted changes." msgstr "" -#: wt-status.c:2374 +#: wt-status.c:2384 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "" -#: compat/precompose_utf8.c:58 builtin/clone.c:442 +#: compat/precompose_utf8.c:58 builtin/clone.c:443 #, c-format msgid "failed to unlink '%s'" msgstr "" @@ -4955,7 +6162,7 @@ msgstr "" msgid "unexpected diff status %c" msgstr "" -#: builtin/add.c:88 builtin/commit.c:266 +#: builtin/add.c:88 builtin/commit.c:279 msgid "updating files failed" msgstr "" @@ -4968,7 +6175,7 @@ msgstr "" msgid "Unstaged changes after refreshing the index:" msgstr "" -#: builtin/add.c:233 builtin/rev-parse.c:892 +#: builtin/add.c:233 builtin/rev-parse.c:893 msgid "Could not read the index" msgstr "" @@ -5003,9 +6210,9 @@ msgstr "" msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" -#: builtin/add.c:289 builtin/clean.c:911 builtin/fetch.c:145 builtin/mv.c:123 -#: builtin/prune-packed.c:55 builtin/pull.c:212 builtin/push.c:557 -#: builtin/remote.c:1342 builtin/rm.c:240 builtin/send-pack.c:165 +#: builtin/add.c:289 builtin/clean.c:906 builtin/fetch.c:134 builtin/mv.c:123 +#: builtin/prune-packed.c:56 builtin/pull.c:212 builtin/push.c:557 +#: builtin/remote.c:1344 builtin/rm.c:240 builtin/send-pack.c:165 msgid "dry run" msgstr "" @@ -5013,7 +6220,7 @@ msgstr "" msgid "interactive picking" msgstr "" -#: builtin/add.c:293 builtin/checkout.c:1135 builtin/reset.c:302 +#: builtin/add.c:293 builtin/checkout.c:1144 builtin/reset.c:302 msgid "select hunks interactively" msgstr "" @@ -5057,19 +6264,15 @@ msgstr "" msgid "check if - even missing - files are ignored in dry run" msgstr "" -#: builtin/add.c:307 builtin/update-index.c:974 -msgid "(+/-)x" -msgstr "" - -#: builtin/add.c:307 builtin/update-index.c:975 +#: builtin/add.c:308 builtin/update-index.c:973 msgid "override the executable bit of the listed files" msgstr "" -#: builtin/add.c:309 +#: builtin/add.c:310 msgid "warn when adding an embedded repository" msgstr "" -#: builtin/add.c:324 +#: builtin/add.c:325 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -5087,176 +6290,176 @@ msgid "" "See \"git help submodule\" for more information." msgstr "" -#: builtin/add.c:352 +#: builtin/add.c:353 #, c-format msgid "adding embedded git repository: %s" msgstr "" -#: builtin/add.c:370 +#: builtin/add.c:371 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "" -#: builtin/add.c:378 +#: builtin/add.c:379 msgid "adding files failed" msgstr "" -#: builtin/add.c:416 +#: builtin/add.c:417 msgid "-A and -u are mutually incompatible" msgstr "" -#: builtin/add.c:423 +#: builtin/add.c:424 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "" -#: builtin/add.c:427 +#: builtin/add.c:428 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "" -#: builtin/add.c:442 +#: builtin/add.c:443 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "" -#: builtin/add.c:443 +#: builtin/add.c:444 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "" -#: builtin/add.c:448 builtin/check-ignore.c:177 builtin/checkout.c:280 -#: builtin/checkout.c:483 builtin/clean.c:958 builtin/commit.c:325 -#: builtin/diff-tree.c:114 builtin/mv.c:144 builtin/reset.c:241 -#: builtin/rm.c:270 builtin/submodule--helper.c:328 +#: builtin/add.c:449 builtin/check-ignore.c:177 builtin/checkout.c:282 +#: builtin/checkout.c:485 builtin/clean.c:953 builtin/commit.c:338 +#: builtin/diff-tree.c:115 builtin/grep.c:492 builtin/mv.c:144 +#: builtin/reset.c:241 builtin/rm.c:270 builtin/submodule--helper.c:329 msgid "index file corrupt" msgstr "" -#: builtin/am.c:414 +#: builtin/am.c:415 msgid "could not parse author script" msgstr "" -#: builtin/am.c:498 +#: builtin/am.c:499 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "" -#: builtin/am.c:539 +#: builtin/am.c:540 #, c-format msgid "Malformed input line: '%s'." msgstr "" -#: builtin/am.c:576 +#: builtin/am.c:577 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "" -#: builtin/am.c:602 +#: builtin/am.c:603 msgid "fseek failed" msgstr "" -#: builtin/am.c:790 +#: builtin/am.c:791 #, c-format msgid "could not parse patch '%s'" msgstr "" -#: builtin/am.c:855 +#: builtin/am.c:856 msgid "Only one StGIT patch series can be applied at once" msgstr "" -#: builtin/am.c:903 +#: builtin/am.c:904 msgid "invalid timestamp" msgstr "" -#: builtin/am.c:908 builtin/am.c:920 +#: builtin/am.c:909 builtin/am.c:921 msgid "invalid Date line" msgstr "" -#: builtin/am.c:915 +#: builtin/am.c:916 msgid "invalid timezone offset" msgstr "" -#: builtin/am.c:1008 +#: builtin/am.c:1009 msgid "Patch format detection failed." msgstr "" -#: builtin/am.c:1013 builtin/clone.c:407 +#: builtin/am.c:1014 builtin/clone.c:408 #, c-format msgid "failed to create directory '%s'" msgstr "" -#: builtin/am.c:1018 +#: builtin/am.c:1019 msgid "Failed to split patches." msgstr "" -#: builtin/am.c:1148 builtin/commit.c:351 +#: builtin/am.c:1149 builtin/commit.c:364 msgid "unable to write index file" msgstr "" -#: builtin/am.c:1162 +#: builtin/am.c:1163 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "" -#: builtin/am.c:1163 +#: builtin/am.c:1164 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "" -#: builtin/am.c:1164 +#: builtin/am.c:1165 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "" -#: builtin/am.c:1271 +#: builtin/am.c:1272 msgid "Patch is empty." msgstr "" -#: builtin/am.c:1337 +#: builtin/am.c:1338 #, c-format msgid "invalid ident line: %.*s" msgstr "" -#: builtin/am.c:1359 +#: builtin/am.c:1360 #, c-format msgid "unable to parse commit %s" msgstr "" -#: builtin/am.c:1554 +#: builtin/am.c:1556 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" -#: builtin/am.c:1556 +#: builtin/am.c:1558 msgid "Using index info to reconstruct a base tree..." msgstr "" -#: builtin/am.c:1575 +#: builtin/am.c:1577 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." msgstr "" -#: builtin/am.c:1581 +#: builtin/am.c:1583 msgid "Falling back to patching base and 3-way merge..." msgstr "" -#: builtin/am.c:1606 +#: builtin/am.c:1608 msgid "Failed to merge in the changes." msgstr "" -#: builtin/am.c:1637 +#: builtin/am.c:1640 msgid "applying to an empty history" msgstr "" -#: builtin/am.c:1683 builtin/am.c:1687 +#: builtin/am.c:1686 builtin/am.c:1690 #, c-format msgid "cannot resume: %s does not exist." msgstr "" -#: builtin/am.c:1703 +#: builtin/am.c:1706 msgid "cannot be interactive without stdin connected to a terminal." msgstr "" -#: builtin/am.c:1708 +#: builtin/am.c:1711 msgid "Commit Body is:" msgstr "" @@ -5264,25 +6467,25 @@ msgstr "" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1718 +#: builtin/am.c:1721 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "" -#: builtin/am.c:1768 +#: builtin/am.c:1771 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "" -#: builtin/am.c:1808 builtin/am.c:1879 +#: builtin/am.c:1811 builtin/am.c:1879 #, c-format msgid "Applying: %.*s" msgstr "" -#: builtin/am.c:1824 +#: builtin/am.c:1828 msgid "No changes -- Patch already applied." msgstr "" -#: builtin/am.c:1832 +#: builtin/am.c:1834 #, c-format msgid "Patch failed at %s %.*s" msgstr "" @@ -5347,8 +6550,8 @@ msgstr "" msgid "allow fall back on 3way merging if needed" msgstr "" -#: builtin/am.c:2222 builtin/init-db.c:484 builtin/prune-packed.c:57 -#: builtin/repack.c:192 +#: builtin/am.c:2222 builtin/init-db.c:485 builtin/prune-packed.c:58 +#: builtin/repack.c:299 msgid "be quiet" msgstr "" @@ -5390,17 +6593,17 @@ msgstr "" msgid "pass it through git-apply" msgstr "" -#: builtin/am.c:2260 builtin/commit.c:1332 builtin/fmt-merge-msg.c:665 -#: builtin/fmt-merge-msg.c:668 builtin/grep.c:853 builtin/merge.c:208 -#: builtin/pull.c:150 builtin/pull.c:208 builtin/repack.c:201 -#: builtin/repack.c:205 builtin/repack.c:207 builtin/show-branch.c:631 -#: builtin/show-ref.c:169 builtin/tag.c:383 parse-options.h:144 +#: builtin/am.c:2260 builtin/commit.c:1332 builtin/fmt-merge-msg.c:670 +#: builtin/fmt-merge-msg.c:673 builtin/grep.c:857 builtin/merge.c:237 +#: builtin/pull.c:150 builtin/pull.c:208 builtin/repack.c:308 +#: builtin/repack.c:312 builtin/repack.c:314 builtin/show-branch.c:650 +#: builtin/show-ref.c:170 builtin/tag.c:384 parse-options.h:144 #: parse-options.h:146 parse-options.h:258 msgid "n" msgstr "" -#: builtin/am.c:2266 builtin/branch.c:632 builtin/for-each-ref.c:38 -#: builtin/replace.c:543 builtin/tag.c:419 builtin/verify-tag.c:39 +#: builtin/am.c:2266 builtin/branch.c:643 builtin/for-each-ref.c:38 +#: builtin/replace.c:543 builtin/tag.c:420 builtin/verify-tag.c:39 msgid "format" msgstr "" @@ -5444,8 +6647,8 @@ msgstr "" msgid "use current timestamp for author date" msgstr "" -#: builtin/am.c:2298 builtin/commit.c:1468 builtin/merge.c:239 -#: builtin/pull.c:183 builtin/revert.c:112 builtin/tag.c:399 +#: builtin/am.c:2298 builtin/commit.c:1468 builtin/merge.c:271 +#: builtin/pull.c:183 builtin/revert.c:113 builtin/tag.c:400 msgid "key-id" msgstr "" @@ -5580,141 +6783,141 @@ msgstr "" msgid "--bisect-clean-state requires no arguments" msgstr "" -#: builtin/blame.c:29 +#: builtin/blame.c:31 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "" -#: builtin/blame.c:34 +#: builtin/blame.c:36 msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "" -#: builtin/blame.c:404 +#: builtin/blame.c:406 #, c-format msgid "expecting a color: %s" msgstr "" -#: builtin/blame.c:411 +#: builtin/blame.c:413 msgid "must end with a color" msgstr "" -#: builtin/blame.c:697 +#: builtin/blame.c:700 #, c-format msgid "invalid color '%s' in color.blame.repeatedLines" msgstr "" -#: builtin/blame.c:715 +#: builtin/blame.c:718 msgid "invalid value for blame.coloring" msgstr "" -#: builtin/blame.c:786 +#: builtin/blame.c:789 msgid "Show blame entries as we find them, incrementally" msgstr "" -#: builtin/blame.c:787 +#: builtin/blame.c:790 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "" -#: builtin/blame.c:788 +#: builtin/blame.c:791 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "" -#: builtin/blame.c:789 +#: builtin/blame.c:792 msgid "Show work cost statistics" msgstr "" -#: builtin/blame.c:790 +#: builtin/blame.c:793 msgid "Force progress reporting" msgstr "" -#: builtin/blame.c:791 +#: builtin/blame.c:794 msgid "Show output score for blame entries" msgstr "" -#: builtin/blame.c:792 +#: builtin/blame.c:795 msgid "Show original filename (Default: auto)" msgstr "" -#: builtin/blame.c:793 +#: builtin/blame.c:796 msgid "Show original linenumber (Default: off)" msgstr "" -#: builtin/blame.c:794 +#: builtin/blame.c:797 msgid "Show in a format designed for machine consumption" msgstr "" -#: builtin/blame.c:795 +#: builtin/blame.c:798 msgid "Show porcelain format with per-line commit information" msgstr "" -#: builtin/blame.c:796 +#: builtin/blame.c:799 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "" -#: builtin/blame.c:797 +#: builtin/blame.c:800 msgid "Show raw timestamp (Default: off)" msgstr "" -#: builtin/blame.c:798 +#: builtin/blame.c:801 msgid "Show long commit SHA1 (Default: off)" msgstr "" -#: builtin/blame.c:799 +#: builtin/blame.c:802 msgid "Suppress author name and timestamp (Default: off)" msgstr "" -#: builtin/blame.c:800 +#: builtin/blame.c:803 msgid "Show author email instead of name (Default: off)" msgstr "" -#: builtin/blame.c:801 +#: builtin/blame.c:804 msgid "Ignore whitespace differences" msgstr "" -#: builtin/blame.c:802 +#: builtin/blame.c:805 msgid "color redundant metadata from previous line differently" msgstr "" -#: builtin/blame.c:803 +#: builtin/blame.c:806 msgid "color lines by age" msgstr "" -#: builtin/blame.c:810 +#: builtin/blame.c:813 msgid "Use an experimental heuristic to improve diffs" msgstr "" -#: builtin/blame.c:812 +#: builtin/blame.c:815 msgid "Spend extra cycles to find better match" msgstr "" -#: builtin/blame.c:813 +#: builtin/blame.c:816 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "" -#: builtin/blame.c:814 +#: builtin/blame.c:817 msgid "Use <file>'s contents as the final image" msgstr "" -#: builtin/blame.c:815 builtin/blame.c:816 +#: builtin/blame.c:818 builtin/blame.c:819 msgid "score" msgstr "" -#: builtin/blame.c:815 +#: builtin/blame.c:818 msgid "Find line copies within and across files" msgstr "" -#: builtin/blame.c:816 +#: builtin/blame.c:819 msgid "Find line movements within and across files" msgstr "" -#: builtin/blame.c:817 +#: builtin/blame.c:820 msgid "n,m" msgstr "" -#: builtin/blame.c:817 +#: builtin/blame.c:820 msgid "Process only line range n,m, counting from 1" msgstr "" -#: builtin/blame.c:866 +#: builtin/blame.c:869 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "" @@ -5726,181 +6929,181 @@ msgstr "" #. your language may need more or fewer display #. columns. #. -#: builtin/blame.c:917 +#: builtin/blame.c:920 msgid "4 years, 11 months ago" msgstr "" -#: builtin/blame.c:1003 +#: builtin/blame.c:1007 #, c-format msgid "file %s has only %lu line" msgid_plural "file %s has only %lu lines" msgstr[0] "" msgstr[1] "" -#: builtin/blame.c:1049 +#: builtin/blame.c:1053 msgid "Blaming lines" msgstr "" -#: builtin/branch.c:27 +#: builtin/branch.c:28 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" msgstr "" -#: builtin/branch.c:28 +#: builtin/branch.c:29 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" msgstr "" -#: builtin/branch.c:29 +#: builtin/branch.c:30 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." msgstr "" -#: builtin/branch.c:30 +#: builtin/branch.c:31 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" msgstr "" -#: builtin/branch.c:31 +#: builtin/branch.c:32 msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>" msgstr "" -#: builtin/branch.c:32 +#: builtin/branch.c:33 msgid "git branch [<options>] [-r | -a] [--points-at]" msgstr "" -#: builtin/branch.c:33 +#: builtin/branch.c:34 msgid "git branch [<options>] [-r | -a] [--format]" msgstr "" -#: builtin/branch.c:146 +#: builtin/branch.c:143 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" " '%s', but not yet merged to HEAD." msgstr "" -#: builtin/branch.c:150 +#: builtin/branch.c:147 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" " '%s', even though it is merged to HEAD." msgstr "" -#: builtin/branch.c:164 +#: builtin/branch.c:161 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "" -#: builtin/branch.c:168 +#: builtin/branch.c:165 #, c-format msgid "" "The branch '%s' is not fully merged.\n" "If you are sure you want to delete it, run 'git branch -D %s'." msgstr "" -#: builtin/branch.c:181 +#: builtin/branch.c:178 msgid "Update of config-file failed" msgstr "" -#: builtin/branch.c:212 +#: builtin/branch.c:209 msgid "cannot use -a with -d" msgstr "" -#: builtin/branch.c:218 +#: builtin/branch.c:215 msgid "Couldn't look up commit object for HEAD" msgstr "" -#: builtin/branch.c:232 +#: builtin/branch.c:229 #, c-format msgid "Cannot delete branch '%s' checked out at '%s'" msgstr "" -#: builtin/branch.c:247 +#: builtin/branch.c:244 #, c-format msgid "remote-tracking branch '%s' not found." msgstr "" -#: builtin/branch.c:248 +#: builtin/branch.c:245 #, c-format msgid "branch '%s' not found." msgstr "" -#: builtin/branch.c:263 +#: builtin/branch.c:260 #, c-format msgid "Error deleting remote-tracking branch '%s'" msgstr "" -#: builtin/branch.c:264 +#: builtin/branch.c:261 #, c-format msgid "Error deleting branch '%s'" msgstr "" -#: builtin/branch.c:271 +#: builtin/branch.c:268 #, c-format msgid "Deleted remote-tracking branch %s (was %s).\n" msgstr "" -#: builtin/branch.c:272 +#: builtin/branch.c:269 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "" -#: builtin/branch.c:416 builtin/tag.c:58 +#: builtin/branch.c:413 builtin/tag.c:59 msgid "unable to parse format string" msgstr "" -#: builtin/branch.c:453 +#: builtin/branch.c:450 #, c-format msgid "Branch %s is being rebased at %s" msgstr "" -#: builtin/branch.c:457 +#: builtin/branch.c:454 #, c-format msgid "Branch %s is being bisected at %s" msgstr "" -#: builtin/branch.c:474 +#: builtin/branch.c:471 msgid "cannot copy the current branch while not on any." msgstr "" -#: builtin/branch.c:476 +#: builtin/branch.c:473 msgid "cannot rename the current branch while not on any." msgstr "" -#: builtin/branch.c:487 +#: builtin/branch.c:484 #, c-format msgid "Invalid branch name: '%s'" msgstr "" -#: builtin/branch.c:514 +#: builtin/branch.c:511 msgid "Branch rename failed" msgstr "" -#: builtin/branch.c:516 +#: builtin/branch.c:513 msgid "Branch copy failed" msgstr "" -#: builtin/branch.c:520 +#: builtin/branch.c:517 #, c-format msgid "Created a copy of a misnamed branch '%s'" msgstr "" -#: builtin/branch.c:523 +#: builtin/branch.c:520 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "" -#: builtin/branch.c:529 +#: builtin/branch.c:526 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "" -#: builtin/branch.c:538 +#: builtin/branch.c:535 msgid "Branch is renamed, but update of config-file failed" msgstr "" -#: builtin/branch.c:540 +#: builtin/branch.c:537 msgid "Branch is copied, but update of config-file failed" msgstr "" -#: builtin/branch.c:556 +#: builtin/branch.c:553 #, c-format msgid "" "Please edit the description for the branch\n" @@ -5908,219 +7111,223 @@ msgid "" "Lines starting with '%c' will be stripped.\n" msgstr "" -#: builtin/branch.c:589 +#: builtin/branch.c:594 msgid "Generic options" msgstr "" -#: builtin/branch.c:591 +#: builtin/branch.c:596 msgid "show hash and subject, give twice for upstream branch" msgstr "" -#: builtin/branch.c:592 +#: builtin/branch.c:597 msgid "suppress informational messages" msgstr "" -#: builtin/branch.c:593 +#: builtin/branch.c:598 msgid "set up tracking mode (see git-pull(1))" msgstr "" -#: builtin/branch.c:595 +#: builtin/branch.c:600 msgid "do not use" msgstr "" -#: builtin/branch.c:597 +#: builtin/branch.c:602 msgid "upstream" msgstr "" -#: builtin/branch.c:597 +#: builtin/branch.c:602 msgid "change the upstream info" msgstr "" -#: builtin/branch.c:598 +#: builtin/branch.c:603 msgid "Unset the upstream info" msgstr "" -#: builtin/branch.c:599 +#: builtin/branch.c:604 msgid "use colored output" msgstr "" -#: builtin/branch.c:600 +#: builtin/branch.c:605 msgid "act on remote-tracking branches" msgstr "" -#: builtin/branch.c:602 builtin/branch.c:604 +#: builtin/branch.c:607 builtin/branch.c:609 msgid "print only branches that contain the commit" msgstr "" -#: builtin/branch.c:603 builtin/branch.c:605 +#: builtin/branch.c:608 builtin/branch.c:610 msgid "print only branches that don't contain the commit" msgstr "" -#: builtin/branch.c:608 +#: builtin/branch.c:613 msgid "Specific git-branch actions:" msgstr "" -#: builtin/branch.c:609 +#: builtin/branch.c:614 msgid "list both remote-tracking and local branches" msgstr "" -#: builtin/branch.c:611 +#: builtin/branch.c:616 msgid "delete fully merged branch" msgstr "" -#: builtin/branch.c:612 +#: builtin/branch.c:617 msgid "delete branch (even if not merged)" msgstr "" -#: builtin/branch.c:613 +#: builtin/branch.c:618 msgid "move/rename a branch and its reflog" msgstr "" -#: builtin/branch.c:614 +#: builtin/branch.c:619 msgid "move/rename a branch, even if target exists" msgstr "" -#: builtin/branch.c:615 +#: builtin/branch.c:620 msgid "copy a branch and its reflog" msgstr "" -#: builtin/branch.c:616 +#: builtin/branch.c:621 msgid "copy a branch, even if target exists" msgstr "" -#: builtin/branch.c:617 +#: builtin/branch.c:622 msgid "list branch names" msgstr "" -#: builtin/branch.c:618 +#: builtin/branch.c:623 msgid "create the branch's reflog" msgstr "" -#: builtin/branch.c:620 +#: builtin/branch.c:626 +msgid "deprecated synonym for --create-reflog" +msgstr "" + +#: builtin/branch.c:631 msgid "edit the description for the branch" msgstr "" -#: builtin/branch.c:621 +#: builtin/branch.c:632 msgid "force creation, move/rename, deletion" msgstr "" -#: builtin/branch.c:622 +#: builtin/branch.c:633 msgid "print only branches that are merged" msgstr "" -#: builtin/branch.c:623 +#: builtin/branch.c:634 msgid "print only branches that are not merged" msgstr "" -#: builtin/branch.c:624 +#: builtin/branch.c:635 msgid "list branches in columns" msgstr "" -#: builtin/branch.c:625 builtin/for-each-ref.c:40 builtin/ls-remote.c:70 -#: builtin/tag.c:412 +#: builtin/branch.c:636 builtin/for-each-ref.c:40 builtin/ls-remote.c:70 +#: builtin/tag.c:413 msgid "key" msgstr "" -#: builtin/branch.c:626 builtin/for-each-ref.c:41 builtin/ls-remote.c:71 -#: builtin/tag.c:413 +#: builtin/branch.c:637 builtin/for-each-ref.c:41 builtin/ls-remote.c:71 +#: builtin/tag.c:414 msgid "field name to sort on" msgstr "" -#: builtin/branch.c:628 builtin/for-each-ref.c:43 builtin/notes.c:408 -#: builtin/notes.c:411 builtin/notes.c:571 builtin/notes.c:574 -#: builtin/tag.c:415 +#: builtin/branch.c:639 builtin/for-each-ref.c:43 builtin/notes.c:410 +#: builtin/notes.c:413 builtin/notes.c:573 builtin/notes.c:576 +#: builtin/tag.c:416 msgid "object" msgstr "" -#: builtin/branch.c:629 +#: builtin/branch.c:640 msgid "print only branches of the object" msgstr "" -#: builtin/branch.c:631 builtin/for-each-ref.c:49 builtin/tag.c:422 +#: builtin/branch.c:642 builtin/for-each-ref.c:49 builtin/tag.c:423 msgid "sorting and filtering are case insensitive" msgstr "" -#: builtin/branch.c:632 builtin/for-each-ref.c:38 builtin/tag.c:420 +#: builtin/branch.c:643 builtin/for-each-ref.c:38 builtin/tag.c:421 #: builtin/verify-tag.c:39 msgid "format to use for the output" msgstr "" -#: builtin/branch.c:655 builtin/clone.c:737 +#: builtin/branch.c:666 builtin/clone.c:739 msgid "HEAD not found below refs/heads!" msgstr "" -#: builtin/branch.c:678 +#: builtin/branch.c:689 msgid "--column and --verbose are incompatible" msgstr "" -#: builtin/branch.c:693 builtin/branch.c:745 builtin/branch.c:754 +#: builtin/branch.c:709 builtin/branch.c:761 builtin/branch.c:770 msgid "branch name required" msgstr "" -#: builtin/branch.c:721 +#: builtin/branch.c:737 msgid "Cannot give description to detached HEAD" msgstr "" -#: builtin/branch.c:726 +#: builtin/branch.c:742 msgid "cannot edit description of more than one branch" msgstr "" -#: builtin/branch.c:733 +#: builtin/branch.c:749 #, c-format msgid "No commit on branch '%s' yet." msgstr "" -#: builtin/branch.c:736 +#: builtin/branch.c:752 #, c-format msgid "No branch named '%s'." msgstr "" -#: builtin/branch.c:751 +#: builtin/branch.c:767 msgid "too many branches for a copy operation" msgstr "" -#: builtin/branch.c:760 +#: builtin/branch.c:776 msgid "too many arguments for a rename operation" msgstr "" -#: builtin/branch.c:765 +#: builtin/branch.c:781 msgid "too many arguments to set new upstream" msgstr "" -#: builtin/branch.c:769 +#: builtin/branch.c:785 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." msgstr "" -#: builtin/branch.c:772 builtin/branch.c:794 builtin/branch.c:810 +#: builtin/branch.c:788 builtin/branch.c:810 builtin/branch.c:826 #, c-format msgid "no such branch '%s'" msgstr "" -#: builtin/branch.c:776 +#: builtin/branch.c:792 #, c-format msgid "branch '%s' does not exist" msgstr "" -#: builtin/branch.c:788 +#: builtin/branch.c:804 msgid "too many arguments to unset upstream" msgstr "" -#: builtin/branch.c:792 +#: builtin/branch.c:808 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" -#: builtin/branch.c:798 +#: builtin/branch.c:814 #, c-format msgid "Branch '%s' has no upstream information" msgstr "" -#: builtin/branch.c:813 +#: builtin/branch.c:829 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "" -#: builtin/branch.c:816 +#: builtin/branch.c:832 msgid "" "the '--set-upstream' option is no longer supported. Please use '--track' or " "'--set-upstream-to' instead." @@ -6139,78 +7346,82 @@ msgstr "" msgid "Need a repository to unbundle." msgstr "" -#: builtin/cat-file.c:525 +#: builtin/cat-file.c:577 msgid "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <type> | --textconv | --filters) [--path=<path>] <object>" msgstr "" -#: builtin/cat-file.c:526 +#: builtin/cat-file.c:578 msgid "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" msgstr "" -#: builtin/cat-file.c:563 +#: builtin/cat-file.c:615 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "" -#: builtin/cat-file.c:564 +#: builtin/cat-file.c:616 msgid "show object type" msgstr "" -#: builtin/cat-file.c:565 +#: builtin/cat-file.c:617 msgid "show object size" msgstr "" -#: builtin/cat-file.c:567 +#: builtin/cat-file.c:619 msgid "exit with zero when there's no error" msgstr "" -#: builtin/cat-file.c:568 +#: builtin/cat-file.c:620 msgid "pretty-print object's content" msgstr "" -#: builtin/cat-file.c:570 +#: builtin/cat-file.c:622 msgid "for blob objects, run textconv on object's content" msgstr "" -#: builtin/cat-file.c:572 +#: builtin/cat-file.c:624 msgid "for blob objects, run filters on object's content" msgstr "" -#: builtin/cat-file.c:573 git-submodule.sh:894 +#: builtin/cat-file.c:625 git-submodule.sh:864 msgid "blob" msgstr "" -#: builtin/cat-file.c:574 +#: builtin/cat-file.c:626 msgid "use a specific path for --textconv/--filters" msgstr "" -#: builtin/cat-file.c:576 +#: builtin/cat-file.c:628 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "" -#: builtin/cat-file.c:577 +#: builtin/cat-file.c:629 msgid "buffer --batch output" msgstr "" -#: builtin/cat-file.c:579 +#: builtin/cat-file.c:631 msgid "show info and content of objects fed from the standard input" msgstr "" -#: builtin/cat-file.c:582 +#: builtin/cat-file.c:634 msgid "show info about objects fed from the standard input" msgstr "" -#: builtin/cat-file.c:585 +#: builtin/cat-file.c:637 msgid "follow in-tree symlinks (used with --batch or --batch-check)" msgstr "" -#: builtin/cat-file.c:587 +#: builtin/cat-file.c:639 msgid "show all objects with --batch or --batch-check" msgstr "" +#: builtin/cat-file.c:641 +msgid "do not order --batch-all-objects output" +msgstr "" + #: builtin/check-attr.c:12 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." msgstr "" @@ -6227,7 +7438,7 @@ msgstr "" msgid "use .gitattributes only from the index" msgstr "" -#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:100 +#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:101 msgid "read file names from stdin" msgstr "" @@ -6235,7 +7446,7 @@ msgstr "" msgid "terminate input and output records by a NUL character" msgstr "" -#: builtin/check-ignore.c:20 builtin/checkout.c:1113 builtin/gc.c:500 +#: builtin/check-ignore.c:20 builtin/checkout.c:1120 builtin/gc.c:503 msgid "suppress progress reporting" msgstr "" @@ -6325,8 +7536,8 @@ msgid "write the content to temporary files" msgstr "" #: builtin/checkout-index.c:173 builtin/column.c:31 -#: builtin/submodule--helper.c:1216 builtin/submodule--helper.c:1219 -#: builtin/submodule--helper.c:1227 builtin/submodule--helper.c:1591 +#: builtin/submodule--helper.c:1361 builtin/submodule--helper.c:1364 +#: builtin/submodule--helper.c:1372 builtin/submodule--helper.c:1736 #: builtin/worktree.c:610 msgid "string" msgstr "" @@ -6339,113 +7550,113 @@ msgstr "" msgid "copy out the files from named stage" msgstr "" -#: builtin/checkout.c:27 +#: builtin/checkout.c:29 msgid "git checkout [<options>] <branch>" msgstr "" -#: builtin/checkout.c:28 +#: builtin/checkout.c:30 msgid "git checkout [<options>] [<branch>] -- <file>..." msgstr "" -#: builtin/checkout.c:136 builtin/checkout.c:169 +#: builtin/checkout.c:138 builtin/checkout.c:171 #, c-format msgid "path '%s' does not have our version" msgstr "" -#: builtin/checkout.c:138 builtin/checkout.c:171 +#: builtin/checkout.c:140 builtin/checkout.c:173 #, c-format msgid "path '%s' does not have their version" msgstr "" -#: builtin/checkout.c:154 +#: builtin/checkout.c:156 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "" -#: builtin/checkout.c:198 +#: builtin/checkout.c:200 #, c-format msgid "path '%s' does not have necessary versions" msgstr "" -#: builtin/checkout.c:215 +#: builtin/checkout.c:217 #, c-format msgid "path '%s': cannot merge" msgstr "" -#: builtin/checkout.c:231 +#: builtin/checkout.c:233 #, c-format msgid "Unable to add merge result for '%s'" msgstr "" -#: builtin/checkout.c:253 builtin/checkout.c:256 builtin/checkout.c:259 -#: builtin/checkout.c:262 +#: builtin/checkout.c:255 builtin/checkout.c:258 builtin/checkout.c:261 +#: builtin/checkout.c:264 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "" -#: builtin/checkout.c:265 builtin/checkout.c:268 +#: builtin/checkout.c:267 builtin/checkout.c:270 #, c-format msgid "'%s' cannot be used with %s" msgstr "" -#: builtin/checkout.c:271 +#: builtin/checkout.c:273 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "" -#: builtin/checkout.c:340 builtin/checkout.c:347 +#: builtin/checkout.c:342 builtin/checkout.c:349 #, c-format msgid "path '%s' is unmerged" msgstr "" -#: builtin/checkout.c:506 +#: builtin/checkout.c:508 msgid "you need to resolve your current index first" msgstr "" -#: builtin/checkout.c:643 +#: builtin/checkout.c:645 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "" -#: builtin/checkout.c:684 +#: builtin/checkout.c:686 msgid "HEAD is now at" msgstr "" -#: builtin/checkout.c:688 builtin/clone.c:691 +#: builtin/checkout.c:690 builtin/clone.c:692 msgid "unable to update HEAD" msgstr "" -#: builtin/checkout.c:692 +#: builtin/checkout.c:694 #, c-format msgid "Reset branch '%s'\n" msgstr "" -#: builtin/checkout.c:695 +#: builtin/checkout.c:697 #, c-format msgid "Already on '%s'\n" msgstr "" -#: builtin/checkout.c:699 +#: builtin/checkout.c:701 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "" -#: builtin/checkout.c:701 builtin/checkout.c:1046 +#: builtin/checkout.c:703 builtin/checkout.c:1052 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "" -#: builtin/checkout.c:703 +#: builtin/checkout.c:705 #, c-format msgid "Switched to branch '%s'\n" msgstr "" -#: builtin/checkout.c:754 +#: builtin/checkout.c:756 #, c-format msgid " ... and %d more.\n" msgstr "" -#: builtin/checkout.c:760 +#: builtin/checkout.c:762 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -6460,7 +7671,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:779 +#: builtin/checkout.c:781 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -6477,196 +7688,213 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:811 +#: builtin/checkout.c:813 msgid "internal error in revision walk" msgstr "" -#: builtin/checkout.c:815 +#: builtin/checkout.c:817 msgid "Previous HEAD position was" msgstr "" -#: builtin/checkout.c:843 builtin/checkout.c:1041 +#: builtin/checkout.c:845 builtin/checkout.c:1047 msgid "You are on a branch yet to be born" msgstr "" -#: builtin/checkout.c:947 +#: builtin/checkout.c:952 #, c-format msgid "only one reference expected, %d given." msgstr "" -#: builtin/checkout.c:987 builtin/worktree.c:240 builtin/worktree.c:389 +#: builtin/checkout.c:993 builtin/worktree.c:240 builtin/worktree.c:389 #, c-format msgid "invalid reference: %s" msgstr "" -#: builtin/checkout.c:1016 +#: builtin/checkout.c:1022 #, c-format msgid "reference is not a tree: %s" msgstr "" -#: builtin/checkout.c:1055 +#: builtin/checkout.c:1061 msgid "paths cannot be used with switching branches" msgstr "" -#: builtin/checkout.c:1058 builtin/checkout.c:1062 +#: builtin/checkout.c:1064 builtin/checkout.c:1068 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "" -#: builtin/checkout.c:1066 builtin/checkout.c:1069 builtin/checkout.c:1074 -#: builtin/checkout.c:1077 +#: builtin/checkout.c:1072 builtin/checkout.c:1075 builtin/checkout.c:1080 +#: builtin/checkout.c:1083 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "" -#: builtin/checkout.c:1082 +#: builtin/checkout.c:1088 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "" -#: builtin/checkout.c:1114 builtin/checkout.c:1116 builtin/clone.c:118 -#: builtin/remote.c:167 builtin/remote.c:169 builtin/worktree.c:433 +#: builtin/checkout.c:1121 builtin/checkout.c:1123 builtin/clone.c:119 +#: builtin/remote.c:168 builtin/remote.c:170 builtin/worktree.c:433 #: builtin/worktree.c:435 msgid "branch" msgstr "" -#: builtin/checkout.c:1115 +#: builtin/checkout.c:1122 msgid "create and checkout a new branch" msgstr "" -#: builtin/checkout.c:1117 +#: builtin/checkout.c:1124 msgid "create/reset and checkout a branch" msgstr "" -#: builtin/checkout.c:1118 +#: builtin/checkout.c:1125 msgid "create reflog for new branch" msgstr "" -#: builtin/checkout.c:1119 builtin/worktree.c:437 +#: builtin/checkout.c:1126 builtin/worktree.c:437 msgid "detach HEAD at named commit" msgstr "" -#: builtin/checkout.c:1120 +#: builtin/checkout.c:1127 msgid "set upstream info for new branch" msgstr "" -#: builtin/checkout.c:1122 +#: builtin/checkout.c:1129 msgid "new-branch" msgstr "" -#: builtin/checkout.c:1122 +#: builtin/checkout.c:1129 msgid "new unparented branch" msgstr "" -#: builtin/checkout.c:1123 +#: builtin/checkout.c:1131 msgid "checkout our version for unmerged files" msgstr "" -#: builtin/checkout.c:1125 +#: builtin/checkout.c:1134 msgid "checkout their version for unmerged files" msgstr "" -#: builtin/checkout.c:1127 +#: builtin/checkout.c:1136 msgid "force checkout (throw away local modifications)" msgstr "" -#: builtin/checkout.c:1129 +#: builtin/checkout.c:1138 msgid "perform a 3-way merge with the new branch" msgstr "" -#: builtin/checkout.c:1131 builtin/merge.c:241 +#: builtin/checkout.c:1140 builtin/merge.c:273 msgid "update ignored files (default)" msgstr "" -#: builtin/checkout.c:1133 builtin/log.c:1499 parse-options.h:264 +#: builtin/checkout.c:1142 builtin/log.c:1510 parse-options.h:264 msgid "style" msgstr "" -#: builtin/checkout.c:1134 +#: builtin/checkout.c:1143 msgid "conflict style (merge or diff3)" msgstr "" -#: builtin/checkout.c:1137 +#: builtin/checkout.c:1146 msgid "do not limit pathspecs to sparse entries only" msgstr "" -#: builtin/checkout.c:1139 +#: builtin/checkout.c:1148 msgid "second guess 'git checkout <no-such-branch>'" msgstr "" -#: builtin/checkout.c:1141 +#: builtin/checkout.c:1150 msgid "do not check if another worktree is holding the given ref" msgstr "" -#: builtin/checkout.c:1145 builtin/clone.c:85 builtin/fetch.c:149 -#: builtin/merge.c:238 builtin/pull.c:128 builtin/push.c:572 +#: builtin/checkout.c:1154 builtin/clone.c:86 builtin/fetch.c:138 +#: builtin/merge.c:270 builtin/pull.c:128 builtin/push.c:572 #: builtin/send-pack.c:174 msgid "force progress reporting" msgstr "" -#: builtin/checkout.c:1175 +#: builtin/checkout.c:1184 msgid "-b, -B and --orphan are mutually exclusive" msgstr "" -#: builtin/checkout.c:1192 +#: builtin/checkout.c:1201 msgid "--track needs a branch name" msgstr "" -#: builtin/checkout.c:1197 -msgid "Missing branch name; try -b" +#: builtin/checkout.c:1206 +msgid "missing branch name; try -b" msgstr "" -#: builtin/checkout.c:1233 +#: builtin/checkout.c:1243 msgid "invalid path specification" msgstr "" -#: builtin/checkout.c:1240 +#: builtin/checkout.c:1250 #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "" -#: builtin/checkout.c:1244 +#: builtin/checkout.c:1254 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "" -#: builtin/checkout.c:1248 +#: builtin/checkout.c:1258 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." msgstr "" -#: builtin/clean.c:26 +#: builtin/checkout.c:1278 +#, c-format +msgid "" +"'%s' matched more than one remote tracking branch.\n" +"We found %d remotes with a reference that matched. So we fell back\n" +"on trying to resolve the argument as a path, but failed there too!\n" +"\n" +"If you meant to check out a remote tracking branch on, e.g. 'origin',\n" +"you can do so by fully qualifying the name with the --track option:\n" +"\n" +" git checkout --track origin/<name>\n" +"\n" +"If you'd like to always have checkouts of an ambiguous <name> prefer\n" +"one remote, e.g. the 'origin' remote, consider setting\n" +"checkout.defaultRemote=origin in your config." +msgstr "" + +#: builtin/clean.c:27 msgid "" "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." msgstr "" -#: builtin/clean.c:30 +#: builtin/clean.c:31 #, c-format msgid "Removing %s\n" msgstr "" -#: builtin/clean.c:31 +#: builtin/clean.c:32 #, c-format msgid "Would remove %s\n" msgstr "" -#: builtin/clean.c:32 +#: builtin/clean.c:33 #, c-format msgid "Skipping repository %s\n" msgstr "" -#: builtin/clean.c:33 +#: builtin/clean.c:34 #, c-format msgid "Would skip repository %s\n" msgstr "" -#: builtin/clean.c:34 +#: builtin/clean.c:35 #, c-format msgid "failed to remove %s" msgstr "" -#: builtin/clean.c:302 git-add--interactive.perl:579 +#: builtin/clean.c:297 git-add--interactive.perl:579 #, c-format msgid "" "Prompt help:\n" @@ -6675,7 +7903,7 @@ msgid "" " - (empty) select nothing\n" msgstr "" -#: builtin/clean.c:306 git-add--interactive.perl:588 +#: builtin/clean.c:301 git-add--interactive.perl:588 #, c-format msgid "" "Prompt help:\n" @@ -6688,38 +7916,38 @@ msgid "" " - (empty) finish selecting\n" msgstr "" -#: builtin/clean.c:522 git-add--interactive.perl:554 +#: builtin/clean.c:517 git-add--interactive.perl:554 #: git-add--interactive.perl:559 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "" -#: builtin/clean.c:664 +#: builtin/clean.c:659 #, c-format msgid "Input ignore patterns>> " msgstr "" -#: builtin/clean.c:701 +#: builtin/clean.c:696 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "" -#: builtin/clean.c:722 +#: builtin/clean.c:717 msgid "Select items to delete" msgstr "" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:763 +#: builtin/clean.c:758 #, c-format msgid "Remove %s [y/N]? " msgstr "" -#: builtin/clean.c:788 git-add--interactive.perl:1717 +#: builtin/clean.c:783 git-add--interactive.perl:1717 #, c-format msgid "Bye.\n" msgstr "" -#: builtin/clean.c:796 +#: builtin/clean.c:791 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -6730,390 +7958,386 @@ msgid "" "? - help for prompt selection" msgstr "" -#: builtin/clean.c:823 git-add--interactive.perl:1793 +#: builtin/clean.c:818 git-add--interactive.perl:1793 msgid "*** Commands ***" msgstr "" -#: builtin/clean.c:824 git-add--interactive.perl:1790 +#: builtin/clean.c:819 git-add--interactive.perl:1790 msgid "What now" msgstr "" -#: builtin/clean.c:832 +#: builtin/clean.c:827 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "" msgstr[1] "" -#: builtin/clean.c:848 +#: builtin/clean.c:843 msgid "No more files to clean, exiting." msgstr "" -#: builtin/clean.c:910 +#: builtin/clean.c:905 msgid "do not print names of files removed" msgstr "" -#: builtin/clean.c:912 +#: builtin/clean.c:907 msgid "force" msgstr "" -#: builtin/clean.c:913 +#: builtin/clean.c:908 msgid "interactive cleaning" msgstr "" -#: builtin/clean.c:915 +#: builtin/clean.c:910 msgid "remove whole directories" msgstr "" -#: builtin/clean.c:916 builtin/describe.c:533 builtin/describe.c:535 -#: builtin/grep.c:871 builtin/log.c:157 builtin/log.c:159 -#: builtin/ls-files.c:548 builtin/name-rev.c:397 builtin/name-rev.c:399 -#: builtin/show-ref.c:176 +#: builtin/clean.c:911 builtin/describe.c:545 builtin/describe.c:547 +#: builtin/grep.c:875 builtin/log.c:161 builtin/log.c:163 +#: builtin/ls-files.c:549 builtin/name-rev.c:415 builtin/name-rev.c:417 +#: builtin/show-ref.c:177 msgid "pattern" msgstr "" -#: builtin/clean.c:917 +#: builtin/clean.c:912 msgid "add <pattern> to ignore rules" msgstr "" -#: builtin/clean.c:918 +#: builtin/clean.c:913 msgid "remove ignored files, too" msgstr "" -#: builtin/clean.c:920 +#: builtin/clean.c:915 msgid "remove only ignored files" msgstr "" -#: builtin/clean.c:938 +#: builtin/clean.c:933 msgid "-x and -X cannot be used together" msgstr "" -#: builtin/clean.c:942 +#: builtin/clean.c:937 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" msgstr "" -#: builtin/clean.c:945 +#: builtin/clean.c:940 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" msgstr "" -#: builtin/clone.c:42 +#: builtin/clone.c:43 msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "" -#: builtin/clone.c:87 +#: builtin/clone.c:88 msgid "don't create a checkout" msgstr "" -#: builtin/clone.c:88 builtin/clone.c:90 builtin/init-db.c:479 +#: builtin/clone.c:89 builtin/clone.c:91 builtin/init-db.c:480 msgid "create a bare repository" msgstr "" -#: builtin/clone.c:92 +#: builtin/clone.c:93 msgid "create a mirror repository (implies bare)" msgstr "" -#: builtin/clone.c:94 +#: builtin/clone.c:95 msgid "to clone from a local repository" msgstr "" -#: builtin/clone.c:96 +#: builtin/clone.c:97 msgid "don't use local hardlinks, always copy" msgstr "" -#: builtin/clone.c:98 +#: builtin/clone.c:99 msgid "setup as shared repository" msgstr "" -#: builtin/clone.c:100 builtin/clone.c:104 +#: builtin/clone.c:101 builtin/clone.c:105 msgid "pathspec" msgstr "" -#: builtin/clone.c:100 builtin/clone.c:104 +#: builtin/clone.c:101 builtin/clone.c:105 msgid "initialize submodules in the clone" msgstr "" -#: builtin/clone.c:107 +#: builtin/clone.c:108 msgid "number of submodules cloned in parallel" msgstr "" -#: builtin/clone.c:108 builtin/init-db.c:476 +#: builtin/clone.c:109 builtin/init-db.c:477 msgid "template-directory" msgstr "" -#: builtin/clone.c:109 builtin/init-db.c:477 +#: builtin/clone.c:110 builtin/init-db.c:478 msgid "directory from which templates will be used" msgstr "" -#: builtin/clone.c:111 builtin/clone.c:113 builtin/submodule--helper.c:1223 -#: builtin/submodule--helper.c:1594 +#: builtin/clone.c:112 builtin/clone.c:114 builtin/submodule--helper.c:1368 +#: builtin/submodule--helper.c:1739 msgid "reference repository" msgstr "" -#: builtin/clone.c:115 builtin/submodule--helper.c:1225 -#: builtin/submodule--helper.c:1596 +#: builtin/clone.c:116 builtin/submodule--helper.c:1370 +#: builtin/submodule--helper.c:1741 msgid "use --reference only while cloning" msgstr "" -#: builtin/clone.c:116 builtin/column.c:27 builtin/merge-file.c:44 -#: builtin/pack-objects.c:3166 builtin/repack.c:213 +#: builtin/clone.c:117 builtin/column.c:27 builtin/merge-file.c:44 +#: builtin/pack-objects.c:3194 builtin/repack.c:320 msgid "name" msgstr "" -#: builtin/clone.c:117 +#: builtin/clone.c:118 msgid "use <name> instead of 'origin' to track upstream" msgstr "" -#: builtin/clone.c:119 +#: builtin/clone.c:120 msgid "checkout <branch> instead of the remote's HEAD" msgstr "" -#: builtin/clone.c:121 +#: builtin/clone.c:122 msgid "path to git-upload-pack on the remote" msgstr "" -#: builtin/clone.c:122 builtin/fetch.c:150 builtin/grep.c:813 +#: builtin/clone.c:123 builtin/fetch.c:139 builtin/grep.c:814 #: builtin/pull.c:216 msgid "depth" msgstr "" -#: builtin/clone.c:123 +#: builtin/clone.c:124 msgid "create a shallow clone of that depth" msgstr "" -#: builtin/clone.c:124 builtin/fetch.c:152 builtin/pack-objects.c:3157 +#: builtin/clone.c:125 builtin/fetch.c:141 builtin/pack-objects.c:3185 #: parse-options.h:154 msgid "time" msgstr "" -#: builtin/clone.c:125 +#: builtin/clone.c:126 msgid "create a shallow clone since a specific time" msgstr "" -#: builtin/clone.c:126 builtin/fetch.c:154 +#: builtin/clone.c:127 builtin/fetch.c:143 builtin/fetch.c:166 msgid "revision" msgstr "" -#: builtin/clone.c:127 builtin/fetch.c:155 +#: builtin/clone.c:128 builtin/fetch.c:144 msgid "deepen history of shallow clone, excluding rev" msgstr "" -#: builtin/clone.c:129 +#: builtin/clone.c:130 msgid "clone only one branch, HEAD or --branch" msgstr "" -#: builtin/clone.c:131 +#: builtin/clone.c:132 msgid "don't clone any tags, and make later fetches not to follow them" msgstr "" -#: builtin/clone.c:133 +#: builtin/clone.c:134 msgid "any cloned submodules will be shallow" msgstr "" -#: builtin/clone.c:134 builtin/init-db.c:485 +#: builtin/clone.c:135 builtin/init-db.c:486 msgid "gitdir" msgstr "" -#: builtin/clone.c:135 builtin/init-db.c:486 +#: builtin/clone.c:136 builtin/init-db.c:487 msgid "separate git dir from working tree" msgstr "" -#: builtin/clone.c:136 +#: builtin/clone.c:137 msgid "key=value" msgstr "" -#: builtin/clone.c:137 +#: builtin/clone.c:138 msgid "set config inside the new repository" msgstr "" -#: builtin/clone.c:138 builtin/fetch.c:173 builtin/pull.c:229 +#: builtin/clone.c:139 builtin/fetch.c:162 builtin/pull.c:229 #: builtin/push.c:583 msgid "use IPv4 addresses only" msgstr "" -#: builtin/clone.c:140 builtin/fetch.c:175 builtin/pull.c:232 +#: builtin/clone.c:141 builtin/fetch.c:164 builtin/pull.c:232 #: builtin/push.c:585 msgid "use IPv6 addresses only" msgstr "" -#: builtin/clone.c:278 +#: builtin/clone.c:279 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" msgstr "" -#: builtin/clone.c:331 +#: builtin/clone.c:332 #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "" -#: builtin/clone.c:403 +#: builtin/clone.c:404 #, c-format msgid "failed to open '%s'" msgstr "" -#: builtin/clone.c:411 +#: builtin/clone.c:412 #, c-format msgid "%s exists and is not a directory" msgstr "" -#: builtin/clone.c:425 +#: builtin/clone.c:426 #, c-format msgid "failed to stat %s\n" msgstr "" -#: builtin/clone.c:447 +#: builtin/clone.c:448 #, c-format msgid "failed to create link '%s'" msgstr "" -#: builtin/clone.c:451 +#: builtin/clone.c:452 #, c-format msgid "failed to copy file to '%s'" msgstr "" -#: builtin/clone.c:477 +#: builtin/clone.c:478 #, c-format msgid "done.\n" msgstr "" -#: builtin/clone.c:491 +#: builtin/clone.c:492 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" "and retry the checkout with 'git checkout -f HEAD'\n" msgstr "" -#: builtin/clone.c:568 +#: builtin/clone.c:569 #, c-format msgid "Could not find remote branch %s to clone." msgstr "" -#: builtin/clone.c:663 -msgid "remote did not send all necessary objects" -msgstr "" - -#: builtin/clone.c:679 +#: builtin/clone.c:680 #, c-format msgid "unable to update %s" msgstr "" -#: builtin/clone.c:728 +#: builtin/clone.c:730 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" -#: builtin/clone.c:758 +#: builtin/clone.c:760 msgid "unable to checkout working tree" msgstr "" -#: builtin/clone.c:803 +#: builtin/clone.c:805 msgid "unable to write parameters to config file" msgstr "" -#: builtin/clone.c:866 +#: builtin/clone.c:868 msgid "cannot repack to clean up" msgstr "" -#: builtin/clone.c:868 +#: builtin/clone.c:870 msgid "cannot unlink temporary alternates file" msgstr "" -#: builtin/clone.c:907 builtin/receive-pack.c:1947 +#: builtin/clone.c:910 builtin/receive-pack.c:1935 msgid "Too many arguments." msgstr "" -#: builtin/clone.c:911 +#: builtin/clone.c:914 msgid "You must specify a repository to clone." msgstr "" -#: builtin/clone.c:924 +#: builtin/clone.c:927 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "" -#: builtin/clone.c:927 +#: builtin/clone.c:930 msgid "--bare and --separate-git-dir are incompatible." msgstr "" -#: builtin/clone.c:940 +#: builtin/clone.c:943 #, c-format msgid "repository '%s' does not exist" msgstr "" -#: builtin/clone.c:946 builtin/fetch.c:1460 +#: builtin/clone.c:949 builtin/fetch.c:1512 #, c-format msgid "depth %s is not a positive number" msgstr "" -#: builtin/clone.c:956 +#: builtin/clone.c:959 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "" -#: builtin/clone.c:966 +#: builtin/clone.c:969 #, c-format msgid "working tree '%s' already exists." msgstr "" -#: builtin/clone.c:981 builtin/clone.c:1002 builtin/difftool.c:270 +#: builtin/clone.c:984 builtin/clone.c:1005 builtin/difftool.c:271 #: builtin/worktree.c:246 builtin/worktree.c:276 #, c-format msgid "could not create leading directories of '%s'" msgstr "" -#: builtin/clone.c:986 +#: builtin/clone.c:989 #, c-format msgid "could not create work tree dir '%s'" msgstr "" -#: builtin/clone.c:1006 +#: builtin/clone.c:1009 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "" -#: builtin/clone.c:1008 +#: builtin/clone.c:1011 #, c-format msgid "Cloning into '%s'...\n" msgstr "" -#: builtin/clone.c:1032 +#: builtin/clone.c:1035 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" msgstr "" -#: builtin/clone.c:1093 +#: builtin/clone.c:1096 msgid "--depth is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:1095 +#: builtin/clone.c:1098 msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:1097 +#: builtin/clone.c:1100 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:1099 +#: builtin/clone.c:1102 msgid "--filter is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:1102 +#: builtin/clone.c:1105 msgid "source repository is shallow, ignoring --local" msgstr "" -#: builtin/clone.c:1107 +#: builtin/clone.c:1110 msgid "--local is ignored" msgstr "" -#: builtin/clone.c:1169 builtin/clone.c:1177 +#: builtin/clone.c:1180 builtin/clone.c:1188 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "" -#: builtin/clone.c:1180 +#: builtin/clone.c:1191 msgid "You appear to have cloned an empty repository." msgstr "" @@ -7149,22 +8373,22 @@ msgstr "" msgid "--command must be the first argument" msgstr "" -#: builtin/commit.c:37 +#: builtin/commit.c:38 msgid "git commit [<options>] [--] <pathspec>..." msgstr "" -#: builtin/commit.c:42 +#: builtin/commit.c:43 msgid "git status [<options>] [--] <pathspec>..." msgstr "" -#: builtin/commit.c:47 +#: builtin/commit.c:48 msgid "" "You asked to amend the most recent commit, but doing so would make\n" "it empty. You can repeat your command with --allow-empty, or you can\n" "remove the commit entirely with \"git reset HEAD^\".\n" msgstr "" -#: builtin/commit.c:52 +#: builtin/commit.c:53 msgid "" "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" "If you wish to commit it anyway, use:\n" @@ -7173,11 +8397,11 @@ msgid "" "\n" msgstr "" -#: builtin/commit.c:59 +#: builtin/commit.c:60 msgid "Otherwise, please use 'git reset'\n" msgstr "" -#: builtin/commit.c:62 +#: builtin/commit.c:63 msgid "" "If you wish to skip this commit, use:\n" "\n" @@ -7187,98 +8411,98 @@ msgid "" "the remaining commits.\n" msgstr "" -#: builtin/commit.c:293 +#: builtin/commit.c:306 msgid "failed to unpack HEAD tree object" msgstr "" -#: builtin/commit.c:334 +#: builtin/commit.c:347 msgid "unable to create temporary index" msgstr "" -#: builtin/commit.c:340 +#: builtin/commit.c:353 msgid "interactive add failed" msgstr "" -#: builtin/commit.c:353 +#: builtin/commit.c:366 msgid "unable to update temporary index" msgstr "" -#: builtin/commit.c:355 +#: builtin/commit.c:368 msgid "Failed to update main cache tree" msgstr "" -#: builtin/commit.c:380 builtin/commit.c:403 builtin/commit.c:449 +#: builtin/commit.c:393 builtin/commit.c:416 builtin/commit.c:462 msgid "unable to write new_index file" msgstr "" -#: builtin/commit.c:432 +#: builtin/commit.c:445 msgid "cannot do a partial commit during a merge." msgstr "" -#: builtin/commit.c:434 +#: builtin/commit.c:447 msgid "cannot do a partial commit during a cherry-pick." msgstr "" -#: builtin/commit.c:442 +#: builtin/commit.c:455 msgid "cannot read the index" msgstr "" -#: builtin/commit.c:461 +#: builtin/commit.c:474 msgid "unable to write temporary index file" msgstr "" -#: builtin/commit.c:558 +#: builtin/commit.c:571 #, c-format msgid "commit '%s' lacks author header" msgstr "" -#: builtin/commit.c:560 +#: builtin/commit.c:573 #, c-format msgid "commit '%s' has malformed author line" msgstr "" -#: builtin/commit.c:579 +#: builtin/commit.c:592 msgid "malformed --author parameter" msgstr "" -#: builtin/commit.c:631 +#: builtin/commit.c:644 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" msgstr "" -#: builtin/commit.c:668 builtin/commit.c:701 builtin/commit.c:1029 +#: builtin/commit.c:681 builtin/commit.c:714 builtin/commit.c:1042 #, c-format msgid "could not lookup commit %s" msgstr "" -#: builtin/commit.c:680 builtin/shortlog.c:316 +#: builtin/commit.c:693 builtin/shortlog.c:317 #, c-format msgid "(reading log message from standard input)\n" msgstr "" -#: builtin/commit.c:682 +#: builtin/commit.c:695 msgid "could not read log from standard input" msgstr "" -#: builtin/commit.c:686 +#: builtin/commit.c:699 #, c-format msgid "could not read log file '%s'" msgstr "" -#: builtin/commit.c:715 builtin/commit.c:723 +#: builtin/commit.c:728 builtin/commit.c:736 msgid "could not read SQUASH_MSG" msgstr "" -#: builtin/commit.c:720 +#: builtin/commit.c:733 msgid "could not read MERGE_MSG" msgstr "" -#: builtin/commit.c:774 +#: builtin/commit.c:787 msgid "could not write commit template" msgstr "" -#: builtin/commit.c:792 +#: builtin/commit.c:805 #, c-format msgid "" "\n" @@ -7288,7 +8512,7 @@ msgid "" "and try again.\n" msgstr "" -#: builtin/commit.c:797 +#: builtin/commit.c:810 #, c-format msgid "" "\n" @@ -7298,14 +8522,14 @@ msgid "" "and try again.\n" msgstr "" -#: builtin/commit.c:810 +#: builtin/commit.c:823 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" "with '%c' will be ignored, and an empty message aborts the commit.\n" msgstr "" -#: builtin/commit.c:818 +#: builtin/commit.c:831 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -7313,99 +8537,99 @@ msgid "" "An empty message aborts the commit.\n" msgstr "" -#: builtin/commit.c:835 +#: builtin/commit.c:848 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "" -#: builtin/commit.c:843 +#: builtin/commit.c:856 #, c-format msgid "%sDate: %s" msgstr "" -#: builtin/commit.c:850 +#: builtin/commit.c:863 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "" -#: builtin/commit.c:867 +#: builtin/commit.c:880 msgid "Cannot read index" msgstr "" -#: builtin/commit.c:933 +#: builtin/commit.c:946 msgid "Error building trees" msgstr "" -#: builtin/commit.c:947 builtin/tag.c:257 +#: builtin/commit.c:960 builtin/tag.c:258 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "" -#: builtin/commit.c:991 +#: builtin/commit.c:1004 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "" -#: builtin/commit.c:1005 +#: builtin/commit.c:1018 #, c-format msgid "Invalid ignored mode '%s'" msgstr "" -#: builtin/commit.c:1019 builtin/commit.c:1269 +#: builtin/commit.c:1032 builtin/commit.c:1269 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "" -#: builtin/commit.c:1057 +#: builtin/commit.c:1070 msgid "--long and -z are incompatible" msgstr "" -#: builtin/commit.c:1090 +#: builtin/commit.c:1103 msgid "Using both --reset-author and --author does not make sense" msgstr "" -#: builtin/commit.c:1099 +#: builtin/commit.c:1112 msgid "You have nothing to amend." msgstr "" -#: builtin/commit.c:1102 +#: builtin/commit.c:1115 msgid "You are in the middle of a merge -- cannot amend." msgstr "" -#: builtin/commit.c:1104 +#: builtin/commit.c:1117 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "" -#: builtin/commit.c:1107 +#: builtin/commit.c:1120 msgid "Options --squash and --fixup cannot be used together" msgstr "" -#: builtin/commit.c:1117 +#: builtin/commit.c:1130 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "" -#: builtin/commit.c:1119 +#: builtin/commit.c:1132 msgid "Option -m cannot be combined with -c/-C/-F." msgstr "" -#: builtin/commit.c:1127 +#: builtin/commit.c:1140 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "" -#: builtin/commit.c:1144 +#: builtin/commit.c:1157 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" -#: builtin/commit.c:1146 +#: builtin/commit.c:1159 msgid "No paths with --include/--only does not make sense." msgstr "" -#: builtin/commit.c:1160 builtin/tag.c:543 +#: builtin/commit.c:1173 builtin/tag.c:544 #, c-format msgid "Invalid cleanup mode %s" msgstr "" -#: builtin/commit.c:1165 +#: builtin/commit.c:1178 msgid "Paths with -a does not make sense." msgstr "" @@ -7443,7 +8667,7 @@ msgid "terminate entries with NUL" msgstr "" #: builtin/commit.c:1319 builtin/commit.c:1323 builtin/commit.c:1494 -#: builtin/fast-export.c:1001 builtin/fast-export.c:1004 builtin/tag.c:397 +#: builtin/fast-export.c:1007 builtin/fast-export.c:1010 builtin/tag.c:398 msgid "mode" msgstr "" @@ -7495,7 +8719,7 @@ msgstr "" msgid "Commit message options" msgstr "" -#: builtin/commit.c:1454 builtin/tag.c:394 +#: builtin/commit.c:1454 builtin/merge.c:261 builtin/tag.c:395 msgid "read message from file" msgstr "" @@ -7507,7 +8731,7 @@ msgstr "" msgid "override author for commit" msgstr "" -#: builtin/commit.c:1456 builtin/gc.c:501 +#: builtin/commit.c:1456 builtin/gc.c:504 msgid "date" msgstr "" @@ -7515,8 +8739,8 @@ msgstr "" msgid "override date for commit" msgstr "" -#: builtin/commit.c:1457 builtin/merge.c:228 builtin/notes.c:402 -#: builtin/notes.c:565 builtin/tag.c:392 +#: builtin/commit.c:1457 builtin/merge.c:257 builtin/notes.c:404 +#: builtin/notes.c:567 builtin/tag.c:393 msgid "message" msgstr "" @@ -7549,8 +8773,8 @@ msgstr "" msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "" -#: builtin/commit.c:1463 builtin/log.c:1446 builtin/merge.c:242 -#: builtin/pull.c:154 builtin/revert.c:105 +#: builtin/commit.c:1463 builtin/log.c:1457 builtin/merge.c:274 +#: builtin/pull.c:154 builtin/revert.c:106 msgid "add Signed-off-by:" msgstr "" @@ -7566,7 +8790,7 @@ msgstr "" msgid "default" msgstr "" -#: builtin/commit.c:1466 builtin/tag.c:398 +#: builtin/commit.c:1466 builtin/tag.c:399 msgid "how to strip spaces and #comments from message" msgstr "" @@ -7574,8 +8798,8 @@ msgstr "" msgid "include status in commit message template" msgstr "" -#: builtin/commit.c:1469 builtin/merge.c:240 builtin/pull.c:184 -#: builtin/revert.c:113 +#: builtin/commit.c:1469 builtin/merge.c:272 builtin/pull.c:184 +#: builtin/revert.c:114 msgid "GPG sign commit" msgstr "" @@ -7653,49 +8877,58 @@ msgstr "" #: builtin/commit.c:1650 msgid "" -"Repository has been updated, but unable to write\n" +"repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" "not exceeded, and then \"git reset HEAD\" to recover." msgstr "" -#: builtin/commit-graph.c:9 +#: builtin/commit-graph.c:10 msgid "git commit-graph [--object-dir <objdir>]" msgstr "" -#: builtin/commit-graph.c:10 builtin/commit-graph.c:16 +#: builtin/commit-graph.c:11 builtin/commit-graph.c:23 msgid "git commit-graph read [--object-dir <objdir>]" msgstr "" -#: builtin/commit-graph.c:11 builtin/commit-graph.c:21 +#: builtin/commit-graph.c:12 builtin/commit-graph.c:18 +msgid "git commit-graph verify [--object-dir <objdir>]" +msgstr "" + +#: builtin/commit-graph.c:13 builtin/commit-graph.c:28 msgid "" -"git commit-graph write [--object-dir <objdir>] [--append] [--stdin-packs|--" -"stdin-commits]" +"git commit-graph write [--object-dir <objdir>] [--append] [--reachable|--" +"stdin-packs|--stdin-commits]" msgstr "" -#: builtin/commit-graph.c:39 builtin/commit-graph.c:92 -#: builtin/commit-graph.c:147 builtin/fetch.c:161 builtin/log.c:1466 +#: builtin/commit-graph.c:48 builtin/commit-graph.c:77 +#: builtin/commit-graph.c:131 builtin/commit-graph.c:184 builtin/fetch.c:150 +#: builtin/log.c:1477 msgid "dir" msgstr "" -#: builtin/commit-graph.c:40 builtin/commit-graph.c:93 -#: builtin/commit-graph.c:148 +#: builtin/commit-graph.c:49 builtin/commit-graph.c:78 +#: builtin/commit-graph.c:132 builtin/commit-graph.c:185 msgid "The object directory to store the graph" msgstr "" -#: builtin/commit-graph.c:95 +#: builtin/commit-graph.c:134 +msgid "start walk at all refs" +msgstr "" + +#: builtin/commit-graph.c:136 msgid "scan pack-indexes listed by stdin for commits" msgstr "" -#: builtin/commit-graph.c:97 +#: builtin/commit-graph.c:138 msgid "start walk at commits listed by stdin" msgstr "" -#: builtin/commit-graph.c:99 +#: builtin/commit-graph.c:140 msgid "include all commits already in the commit-graph file" msgstr "" -#: builtin/commit-graph.c:108 -msgid "cannot use both --stdin-commits and --stdin-packs" +#: builtin/commit-graph.c:149 +msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" msgstr "" #: builtin/config.c:10 @@ -7707,160 +8940,196 @@ msgstr "" msgid "unrecognized --type argument, %s" msgstr "" -#: builtin/config.c:123 +#: builtin/config.c:113 +msgid "only one type at a time" +msgstr "" + +#: builtin/config.c:122 msgid "Config file location" msgstr "" -#: builtin/config.c:124 +#: builtin/config.c:123 msgid "use global config file" msgstr "" -#: builtin/config.c:125 +#: builtin/config.c:124 msgid "use system config file" msgstr "" -#: builtin/config.c:126 +#: builtin/config.c:125 msgid "use repository config file" msgstr "" -#: builtin/config.c:127 +#: builtin/config.c:126 msgid "use given config file" msgstr "" -#: builtin/config.c:128 +#: builtin/config.c:127 msgid "blob-id" msgstr "" -#: builtin/config.c:128 +#: builtin/config.c:127 msgid "read config from given blob object" msgstr "" -#: builtin/config.c:129 +#: builtin/config.c:128 msgid "Action" msgstr "" -#: builtin/config.c:130 +#: builtin/config.c:129 msgid "get value: name [value-regex]" msgstr "" -#: builtin/config.c:131 +#: builtin/config.c:130 msgid "get all values: key [value-regex]" msgstr "" -#: builtin/config.c:132 +#: builtin/config.c:131 msgid "get values for regexp: name-regex [value-regex]" msgstr "" -#: builtin/config.c:133 +#: builtin/config.c:132 msgid "get value specific for the URL: section[.var] URL" msgstr "" -#: builtin/config.c:134 +#: builtin/config.c:133 msgid "replace all matching variables: name value [value_regex]" msgstr "" -#: builtin/config.c:135 +#: builtin/config.c:134 msgid "add a new variable: name value" msgstr "" -#: builtin/config.c:136 +#: builtin/config.c:135 msgid "remove a variable: name [value-regex]" msgstr "" -#: builtin/config.c:137 +#: builtin/config.c:136 msgid "remove all matches: name [value-regex]" msgstr "" -#: builtin/config.c:138 +#: builtin/config.c:137 msgid "rename section: old-name new-name" msgstr "" -#: builtin/config.c:139 +#: builtin/config.c:138 msgid "remove a section: name" msgstr "" -#: builtin/config.c:140 +#: builtin/config.c:139 msgid "list all" msgstr "" -#: builtin/config.c:141 +#: builtin/config.c:140 msgid "open an editor" msgstr "" -#: builtin/config.c:142 +#: builtin/config.c:141 msgid "find the color configured: slot [default]" msgstr "" -#: builtin/config.c:143 +#: builtin/config.c:142 msgid "find the color setting: slot [stdout-is-tty]" msgstr "" -#: builtin/config.c:144 +#: builtin/config.c:143 msgid "Type" msgstr "" -#: builtin/config.c:145 +#: builtin/config.c:144 msgid "value is given this type" msgstr "" -#: builtin/config.c:146 +#: builtin/config.c:145 msgid "value is \"true\" or \"false\"" msgstr "" -#: builtin/config.c:147 +#: builtin/config.c:146 msgid "value is decimal number" msgstr "" -#: builtin/config.c:148 +#: builtin/config.c:147 msgid "value is --bool or --int" msgstr "" -#: builtin/config.c:149 +#: builtin/config.c:148 msgid "value is a path (file or directory name)" msgstr "" -#: builtin/config.c:150 +#: builtin/config.c:149 msgid "value is an expiry date" msgstr "" -#: builtin/config.c:151 +#: builtin/config.c:150 msgid "Other" msgstr "" -#: builtin/config.c:152 +#: builtin/config.c:151 msgid "terminate values with NUL byte" msgstr "" -#: builtin/config.c:153 +#: builtin/config.c:152 msgid "show variable names only" msgstr "" -#: builtin/config.c:154 +#: builtin/config.c:153 msgid "respect include directives on lookup" msgstr "" -#: builtin/config.c:155 +#: builtin/config.c:154 msgid "show origin of config (file, standard input, blob, command line)" msgstr "" -#: builtin/config.c:156 +#: builtin/config.c:155 msgid "value" msgstr "" -#: builtin/config.c:156 +#: builtin/config.c:155 msgid "with --get, use default value when missing entry" msgstr "" -#: builtin/config.c:332 +#: builtin/config.c:168 +#, c-format +msgid "wrong number of arguments, should be %d" +msgstr "" + +#: builtin/config.c:170 +#, c-format +msgid "wrong number of arguments, should be from %d to %d" +msgstr "" + +#: builtin/config.c:304 +#, c-format +msgid "invalid key pattern: %s" +msgstr "" + +#: builtin/config.c:340 #, c-format msgid "failed to format default config value: %s" msgstr "" -#: builtin/config.c:431 +#: builtin/config.c:397 +#, c-format +msgid "cannot parse color '%s'" +msgstr "" + +#: builtin/config.c:439 msgid "unable to parse default color value" msgstr "" -#: builtin/config.c:575 +#: builtin/config.c:492 builtin/config.c:724 +msgid "not in a git directory" +msgstr "" + +#: builtin/config.c:495 +msgid "writing to stdin is not supported" +msgstr "" + +#: builtin/config.c:498 +msgid "writing config blobs is not supported" +msgstr "" + +#: builtin/config.c:583 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -7870,26 +9139,78 @@ msgid "" "#\temail = %s\n" msgstr "" -#: builtin/config.c:603 +#: builtin/config.c:606 +msgid "only one config file at a time" +msgstr "" + +#: builtin/config.c:611 msgid "--local can only be used inside a git repository" msgstr "" -#: builtin/config.c:606 +#: builtin/config.c:614 msgid "--blob can only be used inside a git repository" msgstr "" -#: builtin/config.c:735 +#: builtin/config.c:633 +msgid "$HOME not set" +msgstr "" + +#: builtin/config.c:670 +msgid "--get-color and variable type are incoherent" +msgstr "" + +#: builtin/config.c:675 +msgid "only one action at a time" +msgstr "" + +#: builtin/config.c:688 +msgid "--name-only is only applicable to --list or --get-regexp" +msgstr "" + +#: builtin/config.c:694 +msgid "" +"--show-origin is only applicable to --get, --get-all, --get-regexp, and --" +"list" +msgstr "" + +#: builtin/config.c:700 +msgid "--default is only applicable to --get" +msgstr "" + +#: builtin/config.c:713 +#, c-format +msgid "unable to read config file '%s'" +msgstr "" + +#: builtin/config.c:716 +msgid "error processing config file(s)" +msgstr "" + +#: builtin/config.c:726 +msgid "editing stdin is not supported" +msgstr "" + +#: builtin/config.c:728 +msgid "editing blobs is not supported" +msgstr "" + +#: builtin/config.c:742 #, c-format msgid "cannot create configuration file %s" msgstr "" -#: builtin/config.c:748 +#: builtin/config.c:755 #, c-format msgid "" "cannot overwrite multiple values with a single value\n" " Use a regexp, --add or --replace-all to change %s." msgstr "" +#: builtin/config.c:829 builtin/config.c:840 +#, c-format +msgid "no such section: %s" +msgstr "" + #: builtin/count-objects.c:90 msgid "git count-objects [-v] [-H | --human-readable]" msgstr "" @@ -7898,166 +9219,166 @@ msgstr "" msgid "print sizes in human readable format" msgstr "" -#: builtin/describe.c:22 +#: builtin/describe.c:26 msgid "git describe [<options>] [<commit-ish>...]" msgstr "" -#: builtin/describe.c:23 +#: builtin/describe.c:27 msgid "git describe [<options>] --dirty" msgstr "" -#: builtin/describe.c:57 +#: builtin/describe.c:62 msgid "head" msgstr "" -#: builtin/describe.c:57 +#: builtin/describe.c:62 msgid "lightweight" msgstr "" -#: builtin/describe.c:57 +#: builtin/describe.c:62 msgid "annotated" msgstr "" -#: builtin/describe.c:267 +#: builtin/describe.c:272 #, c-format msgid "annotated tag %s not available" msgstr "" -#: builtin/describe.c:271 +#: builtin/describe.c:276 #, c-format msgid "annotated tag %s has no embedded name" msgstr "" -#: builtin/describe.c:273 +#: builtin/describe.c:278 #, c-format msgid "tag '%s' is really '%s' here" msgstr "" -#: builtin/describe.c:317 +#: builtin/describe.c:322 #, c-format msgid "no tag exactly matches '%s'" msgstr "" -#: builtin/describe.c:319 +#: builtin/describe.c:324 #, c-format msgid "No exact match on refs or tags, searching to describe\n" msgstr "" -#: builtin/describe.c:366 +#: builtin/describe.c:378 #, c-format msgid "finished search at %s\n" msgstr "" -#: builtin/describe.c:392 +#: builtin/describe.c:404 #, c-format msgid "" "No annotated tags can describe '%s'.\n" "However, there were unannotated tags: try --tags." msgstr "" -#: builtin/describe.c:396 +#: builtin/describe.c:408 #, c-format msgid "" "No tags can describe '%s'.\n" "Try --always, or create some tags." msgstr "" -#: builtin/describe.c:426 +#: builtin/describe.c:438 #, c-format msgid "traversed %lu commits\n" msgstr "" -#: builtin/describe.c:429 +#: builtin/describe.c:441 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" "gave up search at %s\n" msgstr "" -#: builtin/describe.c:497 +#: builtin/describe.c:509 #, c-format msgid "describe %s\n" msgstr "" -#: builtin/describe.c:500 builtin/log.c:502 +#: builtin/describe.c:512 builtin/log.c:508 #, c-format msgid "Not a valid object name %s" msgstr "" -#: builtin/describe.c:508 +#: builtin/describe.c:520 #, c-format msgid "%s is neither a commit nor blob" msgstr "" -#: builtin/describe.c:522 +#: builtin/describe.c:534 msgid "find the tag that comes after the commit" msgstr "" -#: builtin/describe.c:523 +#: builtin/describe.c:535 msgid "debug search strategy on stderr" msgstr "" -#: builtin/describe.c:524 +#: builtin/describe.c:536 msgid "use any ref" msgstr "" -#: builtin/describe.c:525 +#: builtin/describe.c:537 msgid "use any tag, even unannotated" msgstr "" -#: builtin/describe.c:526 +#: builtin/describe.c:538 msgid "always use long format" msgstr "" -#: builtin/describe.c:527 +#: builtin/describe.c:539 msgid "only follow first parent" msgstr "" -#: builtin/describe.c:530 +#: builtin/describe.c:542 msgid "only output exact matches" msgstr "" -#: builtin/describe.c:532 +#: builtin/describe.c:544 msgid "consider <n> most recent tags (default: 10)" msgstr "" -#: builtin/describe.c:534 +#: builtin/describe.c:546 msgid "only consider tags matching <pattern>" msgstr "" -#: builtin/describe.c:536 +#: builtin/describe.c:548 msgid "do not consider tags matching <pattern>" msgstr "" -#: builtin/describe.c:538 builtin/name-rev.c:406 +#: builtin/describe.c:550 builtin/name-rev.c:424 msgid "show abbreviated commit object as fallback" msgstr "" -#: builtin/describe.c:539 builtin/describe.c:542 +#: builtin/describe.c:551 builtin/describe.c:554 msgid "mark" msgstr "" -#: builtin/describe.c:540 +#: builtin/describe.c:552 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "" -#: builtin/describe.c:543 +#: builtin/describe.c:555 msgid "append <mark> on broken working tree (default: \"-broken\")" msgstr "" -#: builtin/describe.c:561 +#: builtin/describe.c:573 msgid "--long is incompatible with --abbrev=0" msgstr "" -#: builtin/describe.c:590 +#: builtin/describe.c:602 msgid "No names found, cannot describe anything." msgstr "" -#: builtin/describe.c:640 +#: builtin/describe.c:652 msgid "--dirty is incompatible with commit-ishes" msgstr "" -#: builtin/describe.c:642 +#: builtin/describe.c:654 msgid "--broken is incompatible with commit-ishes" msgstr "" @@ -8071,481 +9392,481 @@ msgstr "" msgid "invalid option: %s" msgstr "" -#: builtin/diff.c:356 +#: builtin/diff.c:363 msgid "Not a git repository" msgstr "" -#: builtin/diff.c:399 +#: builtin/diff.c:407 #, c-format msgid "invalid object '%s' given." msgstr "" -#: builtin/diff.c:408 +#: builtin/diff.c:416 #, c-format msgid "more than two blobs given: '%s'" msgstr "" -#: builtin/diff.c:413 +#: builtin/diff.c:421 #, c-format msgid "unhandled object '%s' given." msgstr "" -#: builtin/difftool.c:29 +#: builtin/difftool.c:30 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" msgstr "" -#: builtin/difftool.c:259 +#: builtin/difftool.c:260 #, c-format msgid "failed: %d" msgstr "" -#: builtin/difftool.c:301 +#: builtin/difftool.c:302 #, c-format msgid "could not read symlink %s" msgstr "" -#: builtin/difftool.c:303 +#: builtin/difftool.c:304 #, c-format msgid "could not read symlink file %s" msgstr "" -#: builtin/difftool.c:311 +#: builtin/difftool.c:312 #, c-format msgid "could not read object %s for symlink %s" msgstr "" -#: builtin/difftool.c:412 +#: builtin/difftool.c:413 msgid "" "combined diff formats('-c' and '--cc') are not supported in\n" "directory diff mode('-d' and '--dir-diff')." msgstr "" -#: builtin/difftool.c:632 +#: builtin/difftool.c:633 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "" -#: builtin/difftool.c:634 +#: builtin/difftool.c:635 msgid "working tree file has been left." msgstr "" -#: builtin/difftool.c:645 +#: builtin/difftool.c:646 #, c-format msgid "temporary files exist in '%s'." msgstr "" -#: builtin/difftool.c:646 +#: builtin/difftool.c:647 msgid "you may want to cleanup or recover these." msgstr "" -#: builtin/difftool.c:695 +#: builtin/difftool.c:696 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "" -#: builtin/difftool.c:697 +#: builtin/difftool.c:698 msgid "perform a full-directory diff" msgstr "" -#: builtin/difftool.c:699 +#: builtin/difftool.c:700 msgid "do not prompt before launching a diff tool" msgstr "" -#: builtin/difftool.c:704 +#: builtin/difftool.c:705 msgid "use symlinks in dir-diff mode" msgstr "" -#: builtin/difftool.c:705 -msgid "<tool>" +#: builtin/difftool.c:706 +msgid "tool" msgstr "" -#: builtin/difftool.c:706 +#: builtin/difftool.c:707 msgid "use the specified diff tool" msgstr "" -#: builtin/difftool.c:708 +#: builtin/difftool.c:709 msgid "print a list of diff tools that may be used with `--tool`" msgstr "" -#: builtin/difftool.c:711 +#: builtin/difftool.c:712 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " "code" msgstr "" -#: builtin/difftool.c:713 -msgid "<command>" -msgstr "" - -#: builtin/difftool.c:714 +#: builtin/difftool.c:715 msgid "specify a custom command for viewing diffs" msgstr "" -#: builtin/difftool.c:738 +#: builtin/difftool.c:739 msgid "no <tool> given for --tool=<tool>" msgstr "" -#: builtin/difftool.c:745 +#: builtin/difftool.c:746 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "" -#: builtin/fast-export.c:27 +#: builtin/fast-export.c:29 msgid "git fast-export [rev-list-opts]" msgstr "" -#: builtin/fast-export.c:1000 +#: builtin/fast-export.c:1006 msgid "show progress after <n> objects" msgstr "" -#: builtin/fast-export.c:1002 +#: builtin/fast-export.c:1008 msgid "select handling of signed tags" msgstr "" -#: builtin/fast-export.c:1005 +#: builtin/fast-export.c:1011 msgid "select handling of tags that tag filtered objects" msgstr "" -#: builtin/fast-export.c:1008 +#: builtin/fast-export.c:1014 msgid "Dump marks to this file" msgstr "" -#: builtin/fast-export.c:1010 +#: builtin/fast-export.c:1016 msgid "Import marks from this file" msgstr "" -#: builtin/fast-export.c:1012 +#: builtin/fast-export.c:1018 msgid "Fake a tagger when tags lack one" msgstr "" -#: builtin/fast-export.c:1014 +#: builtin/fast-export.c:1020 msgid "Output full tree for each commit" msgstr "" -#: builtin/fast-export.c:1016 +#: builtin/fast-export.c:1022 msgid "Use the done feature to terminate the stream" msgstr "" -#: builtin/fast-export.c:1017 +#: builtin/fast-export.c:1023 msgid "Skip output of blob data" msgstr "" -#: builtin/fast-export.c:1018 +#: builtin/fast-export.c:1024 msgid "refspec" msgstr "" -#: builtin/fast-export.c:1019 +#: builtin/fast-export.c:1025 msgid "Apply refspec to exported refs" msgstr "" -#: builtin/fast-export.c:1020 +#: builtin/fast-export.c:1026 msgid "anonymize output" msgstr "" -#: builtin/fetch.c:26 +#: builtin/fetch.c:27 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "" -#: builtin/fetch.c:27 +#: builtin/fetch.c:28 msgid "git fetch [<options>] <group>" msgstr "" -#: builtin/fetch.c:28 +#: builtin/fetch.c:29 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "" -#: builtin/fetch.c:29 +#: builtin/fetch.c:30 msgid "git fetch --all [<options>]" msgstr "" -#: builtin/fetch.c:123 builtin/pull.c:193 +#: builtin/fetch.c:112 builtin/pull.c:193 msgid "fetch from all remotes" msgstr "" -#: builtin/fetch.c:125 builtin/pull.c:196 +#: builtin/fetch.c:114 builtin/pull.c:196 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "" -#: builtin/fetch.c:127 builtin/pull.c:199 +#: builtin/fetch.c:116 builtin/pull.c:199 msgid "path to upload pack on remote end" msgstr "" -#: builtin/fetch.c:128 builtin/pull.c:201 +#: builtin/fetch.c:117 builtin/pull.c:201 msgid "force overwrite of local branch" msgstr "" -#: builtin/fetch.c:130 +#: builtin/fetch.c:119 msgid "fetch from multiple remotes" msgstr "" -#: builtin/fetch.c:132 builtin/pull.c:203 +#: builtin/fetch.c:121 builtin/pull.c:203 msgid "fetch all tags and associated objects" msgstr "" -#: builtin/fetch.c:134 +#: builtin/fetch.c:123 msgid "do not fetch all tags (--no-tags)" msgstr "" -#: builtin/fetch.c:136 +#: builtin/fetch.c:125 msgid "number of submodules fetched in parallel" msgstr "" -#: builtin/fetch.c:138 builtin/pull.c:206 +#: builtin/fetch.c:127 builtin/pull.c:206 msgid "prune remote-tracking branches no longer on remote" msgstr "" -#: builtin/fetch.c:140 +#: builtin/fetch.c:129 msgid "prune local tags no longer on remote and clobber changed tags" msgstr "" -#: builtin/fetch.c:141 builtin/fetch.c:164 builtin/pull.c:131 +#: builtin/fetch.c:130 builtin/fetch.c:153 builtin/pull.c:131 msgid "on-demand" msgstr "" -#: builtin/fetch.c:142 +#: builtin/fetch.c:131 msgid "control recursive fetching of submodules" msgstr "" -#: builtin/fetch.c:146 builtin/pull.c:214 +#: builtin/fetch.c:135 builtin/pull.c:214 msgid "keep downloaded pack" msgstr "" -#: builtin/fetch.c:148 +#: builtin/fetch.c:137 msgid "allow updating of HEAD ref" msgstr "" -#: builtin/fetch.c:151 builtin/fetch.c:157 builtin/pull.c:217 +#: builtin/fetch.c:140 builtin/fetch.c:146 builtin/pull.c:217 msgid "deepen history of shallow clone" msgstr "" -#: builtin/fetch.c:153 +#: builtin/fetch.c:142 msgid "deepen history of shallow repository based on time" msgstr "" -#: builtin/fetch.c:159 builtin/pull.c:220 +#: builtin/fetch.c:148 builtin/pull.c:220 msgid "convert to a complete repository" msgstr "" -#: builtin/fetch.c:162 +#: builtin/fetch.c:151 msgid "prepend this to submodule path output" msgstr "" -#: builtin/fetch.c:165 +#: builtin/fetch.c:154 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" msgstr "" -#: builtin/fetch.c:169 builtin/pull.c:223 +#: builtin/fetch.c:158 builtin/pull.c:223 msgid "accept refs that update .git/shallow" msgstr "" -#: builtin/fetch.c:170 builtin/pull.c:225 +#: builtin/fetch.c:159 builtin/pull.c:225 msgid "refmap" msgstr "" -#: builtin/fetch.c:171 builtin/pull.c:226 +#: builtin/fetch.c:160 builtin/pull.c:226 msgid "specify fetch refmap" msgstr "" -#: builtin/fetch.c:172 builtin/ls-remote.c:77 builtin/push.c:582 +#: builtin/fetch.c:161 builtin/ls-remote.c:77 builtin/push.c:582 #: builtin/send-pack.c:172 msgid "server-specific" msgstr "" -#: builtin/fetch.c:172 builtin/ls-remote.c:77 builtin/push.c:582 +#: builtin/fetch.c:161 builtin/ls-remote.c:77 builtin/push.c:582 #: builtin/send-pack.c:173 msgid "option to transmit" msgstr "" -#: builtin/fetch.c:442 +#: builtin/fetch.c:167 +msgid "report that we have only objects reachable from this object" +msgstr "" + +#: builtin/fetch.c:418 msgid "Couldn't find remote ref HEAD" msgstr "" -#: builtin/fetch.c:560 +#: builtin/fetch.c:552 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "" -#: builtin/fetch.c:653 +#: builtin/fetch.c:645 #, c-format msgid "object %s not found" msgstr "" -#: builtin/fetch.c:657 +#: builtin/fetch.c:649 msgid "[up to date]" msgstr "" -#: builtin/fetch.c:670 builtin/fetch.c:750 +#: builtin/fetch.c:662 builtin/fetch.c:744 msgid "[rejected]" msgstr "" -#: builtin/fetch.c:671 +#: builtin/fetch.c:663 msgid "can't fetch in current branch" msgstr "" -#: builtin/fetch.c:680 +#: builtin/fetch.c:672 msgid "[tag update]" msgstr "" -#: builtin/fetch.c:681 builtin/fetch.c:714 builtin/fetch.c:730 -#: builtin/fetch.c:745 +#: builtin/fetch.c:673 builtin/fetch.c:708 builtin/fetch.c:724 +#: builtin/fetch.c:739 msgid "unable to update local ref" msgstr "" -#: builtin/fetch.c:700 +#: builtin/fetch.c:694 msgid "[new tag]" msgstr "" -#: builtin/fetch.c:703 +#: builtin/fetch.c:697 msgid "[new branch]" msgstr "" -#: builtin/fetch.c:706 +#: builtin/fetch.c:700 msgid "[new ref]" msgstr "" -#: builtin/fetch.c:745 +#: builtin/fetch.c:739 msgid "forced update" msgstr "" -#: builtin/fetch.c:750 +#: builtin/fetch.c:744 msgid "non-fast-forward" msgstr "" -#: builtin/fetch.c:795 +#: builtin/fetch.c:790 #, c-format msgid "%s did not send all necessary objects\n" msgstr "" -#: builtin/fetch.c:815 +#: builtin/fetch.c:811 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "" -#: builtin/fetch.c:903 builtin/fetch.c:999 +#: builtin/fetch.c:900 builtin/fetch.c:1011 #, c-format msgid "From %.*s\n" msgstr "" -#: builtin/fetch.c:914 +#: builtin/fetch.c:911 #, c-format msgid "" "some local refs could not be updated; try running\n" " 'git remote prune %s' to remove any old, conflicting branches" msgstr "" -#: builtin/fetch.c:969 +#: builtin/fetch.c:981 #, c-format msgid " (%s will become dangling)" msgstr "" -#: builtin/fetch.c:970 +#: builtin/fetch.c:982 #, c-format msgid " (%s has become dangling)" msgstr "" -#: builtin/fetch.c:1002 +#: builtin/fetch.c:1014 msgid "[deleted]" msgstr "" -#: builtin/fetch.c:1003 builtin/remote.c:1033 +#: builtin/fetch.c:1015 builtin/remote.c:1035 msgid "(none)" msgstr "" -#: builtin/fetch.c:1026 +#: builtin/fetch.c:1038 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "" -#: builtin/fetch.c:1045 +#: builtin/fetch.c:1057 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "" -#: builtin/fetch.c:1048 +#: builtin/fetch.c:1060 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "" -#: builtin/fetch.c:1287 +#: builtin/fetch.c:1339 #, c-format msgid "Fetching %s\n" msgstr "" -#: builtin/fetch.c:1289 builtin/remote.c:98 +#: builtin/fetch.c:1341 builtin/remote.c:99 #, c-format msgid "Could not fetch %s" msgstr "" -#: builtin/fetch.c:1335 builtin/fetch.c:1503 +#: builtin/fetch.c:1387 builtin/fetch.c:1555 msgid "" "--filter can only be used with the remote configured in core.partialClone" msgstr "" -#: builtin/fetch.c:1358 +#: builtin/fetch.c:1410 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." msgstr "" -#: builtin/fetch.c:1395 +#: builtin/fetch.c:1447 msgid "You need to specify a tag name." msgstr "" -#: builtin/fetch.c:1444 +#: builtin/fetch.c:1496 msgid "Negative depth in --deepen is not supported" msgstr "" -#: builtin/fetch.c:1446 +#: builtin/fetch.c:1498 msgid "--deepen and --depth are mutually exclusive" msgstr "" -#: builtin/fetch.c:1451 +#: builtin/fetch.c:1503 msgid "--depth and --unshallow cannot be used together" msgstr "" -#: builtin/fetch.c:1453 +#: builtin/fetch.c:1505 msgid "--unshallow on a complete repository does not make sense" msgstr "" -#: builtin/fetch.c:1469 +#: builtin/fetch.c:1521 msgid "fetch --all does not take a repository argument" msgstr "" -#: builtin/fetch.c:1471 +#: builtin/fetch.c:1523 msgid "fetch --all does not make sense with refspecs" msgstr "" -#: builtin/fetch.c:1480 +#: builtin/fetch.c:1532 #, c-format msgid "No such remote or remote group: %s" msgstr "" -#: builtin/fetch.c:1487 +#: builtin/fetch.c:1539 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "" -#: builtin/fmt-merge-msg.c:15 +#: builtin/fmt-merge-msg.c:17 msgid "" "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" msgstr "" -#: builtin/fmt-merge-msg.c:666 +#: builtin/fmt-merge-msg.c:671 msgid "populate log with at most <n> entries from shortlog" msgstr "" -#: builtin/fmt-merge-msg.c:669 +#: builtin/fmt-merge-msg.c:674 msgid "alias for --log (deprecated)" msgstr "" -#: builtin/fmt-merge-msg.c:672 +#: builtin/fmt-merge-msg.c:677 msgid "text" msgstr "" -#: builtin/fmt-merge-msg.c:673 +#: builtin/fmt-merge-msg.c:678 msgid "use <text> as start of message" msgstr "" -#: builtin/fmt-merge-msg.c:674 +#: builtin/fmt-merge-msg.c:679 msgid "file to read from" msgstr "" @@ -8585,7 +9906,7 @@ msgstr "" msgid "show only <n> matched refs" msgstr "" -#: builtin/for-each-ref.c:39 builtin/tag.c:421 +#: builtin/for-each-ref.c:39 builtin/tag.c:422 msgid "respect format colors" msgstr "" @@ -8609,81 +9930,81 @@ msgstr "" msgid "print only refs which don't contain the commit" msgstr "" -#: builtin/fsck.c:569 +#: builtin/fsck.c:574 msgid "Checking object directories" msgstr "" -#: builtin/fsck.c:661 +#: builtin/fsck.c:666 msgid "git fsck [<options>] [<object>...]" msgstr "" -#: builtin/fsck.c:667 +#: builtin/fsck.c:672 msgid "show unreachable objects" msgstr "" -#: builtin/fsck.c:668 +#: builtin/fsck.c:673 msgid "show dangling objects" msgstr "" -#: builtin/fsck.c:669 +#: builtin/fsck.c:674 msgid "report tags" msgstr "" -#: builtin/fsck.c:670 +#: builtin/fsck.c:675 msgid "report root nodes" msgstr "" -#: builtin/fsck.c:671 +#: builtin/fsck.c:676 msgid "make index objects head nodes" msgstr "" -#: builtin/fsck.c:672 +#: builtin/fsck.c:677 msgid "make reflogs head nodes (default)" msgstr "" -#: builtin/fsck.c:673 +#: builtin/fsck.c:678 msgid "also consider packs and alternate objects" msgstr "" -#: builtin/fsck.c:674 +#: builtin/fsck.c:679 msgid "check only connectivity" msgstr "" -#: builtin/fsck.c:675 +#: builtin/fsck.c:680 msgid "enable more strict checking" msgstr "" -#: builtin/fsck.c:677 +#: builtin/fsck.c:682 msgid "write dangling objects in .git/lost-found" msgstr "" -#: builtin/fsck.c:678 builtin/prune.c:109 +#: builtin/fsck.c:683 builtin/prune.c:110 msgid "show progress" msgstr "" -#: builtin/fsck.c:679 +#: builtin/fsck.c:684 msgid "show verbose names for reachable objects" msgstr "" -#: builtin/fsck.c:745 +#: builtin/fsck.c:750 msgid "Checking objects" msgstr "" -#: builtin/gc.c:33 +#: builtin/gc.c:34 msgid "git gc [<options>]" msgstr "" -#: builtin/gc.c:88 +#: builtin/gc.c:90 #, c-format msgid "Failed to fstat %s: %s" msgstr "" -#: builtin/gc.c:452 +#: builtin/gc.c:455 #, c-format msgid "Can't stat %s" msgstr "" -#: builtin/gc.c:461 +#: builtin/gc.c:464 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -8693,58 +10014,58 @@ msgid "" "%s" msgstr "" -#: builtin/gc.c:502 +#: builtin/gc.c:505 msgid "prune unreferenced objects" msgstr "" -#: builtin/gc.c:504 +#: builtin/gc.c:507 msgid "be more thorough (increased runtime)" msgstr "" -#: builtin/gc.c:505 +#: builtin/gc.c:508 msgid "enable auto-gc mode" msgstr "" -#: builtin/gc.c:508 +#: builtin/gc.c:511 msgid "force running gc even if there may be another gc running" msgstr "" -#: builtin/gc.c:511 +#: builtin/gc.c:514 msgid "repack all other packs except the largest pack" msgstr "" -#: builtin/gc.c:528 +#: builtin/gc.c:531 #, c-format msgid "failed to parse gc.logexpiry value %s" msgstr "" -#: builtin/gc.c:539 +#: builtin/gc.c:542 #, c-format msgid "failed to parse prune expiry value %s" msgstr "" -#: builtin/gc.c:559 +#: builtin/gc.c:562 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "" -#: builtin/gc.c:561 +#: builtin/gc.c:564 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "" -#: builtin/gc.c:562 +#: builtin/gc.c:565 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "" -#: builtin/gc.c:598 +#: builtin/gc.c:601 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" msgstr "" -#: builtin/gc.c:645 +#: builtin/gc.c:652 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" @@ -8767,7 +10088,8 @@ msgstr "" #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c:293 builtin/index-pack.c:1535 builtin/index-pack.c:1727 +#: builtin/grep.c:293 builtin/index-pack.c:1536 builtin/index-pack.c:1728 +#: builtin/pack-objects.c:2639 #, c-format msgid "no threads support, ignoring %s" msgstr "" @@ -8782,363 +10104,374 @@ msgstr "" msgid "unable to grep from object of type %s" msgstr "" -#: builtin/grep.c:703 +#: builtin/grep.c:704 #, c-format msgid "switch `%c' expects a numerical value" msgstr "" -#: builtin/grep.c:790 +#: builtin/grep.c:791 msgid "search in index instead of in the work tree" msgstr "" -#: builtin/grep.c:792 +#: builtin/grep.c:793 msgid "find in contents not managed by git" msgstr "" -#: builtin/grep.c:794 +#: builtin/grep.c:795 msgid "search in both tracked and untracked files" msgstr "" -#: builtin/grep.c:796 +#: builtin/grep.c:797 msgid "ignore files specified via '.gitignore'" msgstr "" -#: builtin/grep.c:798 +#: builtin/grep.c:799 msgid "recursively search in each submodule" msgstr "" -#: builtin/grep.c:801 +#: builtin/grep.c:802 msgid "show non-matching lines" msgstr "" -#: builtin/grep.c:803 +#: builtin/grep.c:804 msgid "case insensitive matching" msgstr "" -#: builtin/grep.c:805 +#: builtin/grep.c:806 msgid "match patterns only at word boundaries" msgstr "" -#: builtin/grep.c:807 +#: builtin/grep.c:808 msgid "process binary files as text" msgstr "" -#: builtin/grep.c:809 +#: builtin/grep.c:810 msgid "don't match patterns in binary files" msgstr "" -#: builtin/grep.c:812 +#: builtin/grep.c:813 msgid "process binary files with textconv filters" msgstr "" -#: builtin/grep.c:814 +#: builtin/grep.c:815 msgid "descend at most <depth> levels" msgstr "" -#: builtin/grep.c:818 +#: builtin/grep.c:819 msgid "use extended POSIX regular expressions" msgstr "" -#: builtin/grep.c:821 +#: builtin/grep.c:822 msgid "use basic POSIX regular expressions (default)" msgstr "" -#: builtin/grep.c:824 +#: builtin/grep.c:825 msgid "interpret patterns as fixed strings" msgstr "" -#: builtin/grep.c:827 +#: builtin/grep.c:828 msgid "use Perl-compatible regular expressions" msgstr "" -#: builtin/grep.c:830 +#: builtin/grep.c:831 msgid "show line numbers" msgstr "" -#: builtin/grep.c:831 +#: builtin/grep.c:832 +msgid "show column number of first match" +msgstr "" + +#: builtin/grep.c:833 msgid "don't show filenames" msgstr "" -#: builtin/grep.c:832 +#: builtin/grep.c:834 msgid "show filenames" msgstr "" -#: builtin/grep.c:834 +#: builtin/grep.c:836 msgid "show filenames relative to top directory" msgstr "" -#: builtin/grep.c:836 +#: builtin/grep.c:838 msgid "show only filenames instead of matching lines" msgstr "" -#: builtin/grep.c:838 +#: builtin/grep.c:840 msgid "synonym for --files-with-matches" msgstr "" -#: builtin/grep.c:841 +#: builtin/grep.c:843 msgid "show only the names of files without match" msgstr "" -#: builtin/grep.c:843 +#: builtin/grep.c:845 msgid "print NUL after filenames" msgstr "" -#: builtin/grep.c:846 +#: builtin/grep.c:848 +msgid "show only matching parts of a line" +msgstr "" + +#: builtin/grep.c:850 msgid "show the number of matches instead of matching lines" msgstr "" -#: builtin/grep.c:847 +#: builtin/grep.c:851 msgid "highlight matches" msgstr "" -#: builtin/grep.c:849 +#: builtin/grep.c:853 msgid "print empty line between matches from different files" msgstr "" -#: builtin/grep.c:851 +#: builtin/grep.c:855 msgid "show filename only once above matches from same file" msgstr "" -#: builtin/grep.c:854 +#: builtin/grep.c:858 msgid "show <n> context lines before and after matches" msgstr "" -#: builtin/grep.c:857 +#: builtin/grep.c:861 msgid "show <n> context lines before matches" msgstr "" -#: builtin/grep.c:859 +#: builtin/grep.c:863 msgid "show <n> context lines after matches" msgstr "" -#: builtin/grep.c:861 +#: builtin/grep.c:865 msgid "use <n> worker threads" msgstr "" -#: builtin/grep.c:862 +#: builtin/grep.c:866 msgid "shortcut for -C NUM" msgstr "" -#: builtin/grep.c:865 +#: builtin/grep.c:869 msgid "show a line with the function name before matches" msgstr "" -#: builtin/grep.c:867 +#: builtin/grep.c:871 msgid "show the surrounding function" msgstr "" -#: builtin/grep.c:870 +#: builtin/grep.c:874 msgid "read patterns from file" msgstr "" -#: builtin/grep.c:872 +#: builtin/grep.c:876 msgid "match <pattern>" msgstr "" -#: builtin/grep.c:874 +#: builtin/grep.c:878 msgid "combine patterns specified with -e" msgstr "" -#: builtin/grep.c:886 +#: builtin/grep.c:890 msgid "indicate hit with exit status without output" msgstr "" -#: builtin/grep.c:888 +#: builtin/grep.c:892 msgid "show only matches from files that match all patterns" msgstr "" -#: builtin/grep.c:890 +#: builtin/grep.c:894 msgid "show parse tree for grep expression" msgstr "" -#: builtin/grep.c:894 +#: builtin/grep.c:898 msgid "pager" msgstr "" -#: builtin/grep.c:894 +#: builtin/grep.c:898 msgid "show matching files in the pager" msgstr "" -#: builtin/grep.c:898 +#: builtin/grep.c:902 msgid "allow calling of grep(1) (ignored by this build)" msgstr "" -#: builtin/grep.c:962 -msgid "no pattern given." +#: builtin/grep.c:966 +msgid "no pattern given" msgstr "" -#: builtin/grep.c:994 +#: builtin/grep.c:1002 msgid "--no-index or --untracked cannot be used with revs" msgstr "" -#: builtin/grep.c:1001 +#: builtin/grep.c:1009 #, c-format msgid "unable to resolve revision: %s" msgstr "" -#: builtin/grep.c:1036 builtin/index-pack.c:1531 +#: builtin/grep.c:1044 builtin/index-pack.c:1532 builtin/pack-objects.c:2635 #, c-format msgid "invalid number of threads specified (%d)" msgstr "" -#: builtin/grep.c:1041 +#: builtin/grep.c:1049 builtin/pack-objects.c:3289 msgid "no threads support, ignoring --threads" msgstr "" -#: builtin/grep.c:1065 +#: builtin/grep.c:1073 msgid "--open-files-in-pager only works on the worktree" msgstr "" -#: builtin/grep.c:1088 -msgid "option not supported with --recurse-submodules." +#: builtin/grep.c:1096 +msgid "option not supported with --recurse-submodules" msgstr "" -#: builtin/grep.c:1094 -msgid "--cached or --untracked cannot be used with --no-index." +#: builtin/grep.c:1102 +msgid "--cached or --untracked cannot be used with --no-index" msgstr "" -#: builtin/grep.c:1100 -msgid "--[no-]exclude-standard cannot be used for tracked contents." +#: builtin/grep.c:1108 +msgid "--[no-]exclude-standard cannot be used for tracked contents" msgstr "" -#: builtin/grep.c:1108 -msgid "both --cached and trees are given." +#: builtin/grep.c:1116 +msgid "both --cached and trees are given" msgstr "" -#: builtin/hash-object.c:83 +#: builtin/hash-object.c:84 msgid "" "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " "[--] <file>..." msgstr "" -#: builtin/hash-object.c:84 +#: builtin/hash-object.c:85 msgid "git hash-object --stdin-paths" msgstr "" -#: builtin/hash-object.c:96 +#: builtin/hash-object.c:97 msgid "type" msgstr "" -#: builtin/hash-object.c:96 +#: builtin/hash-object.c:97 msgid "object type" msgstr "" -#: builtin/hash-object.c:97 +#: builtin/hash-object.c:98 msgid "write the object into the object database" msgstr "" -#: builtin/hash-object.c:99 +#: builtin/hash-object.c:100 msgid "read the object from stdin" msgstr "" -#: builtin/hash-object.c:101 +#: builtin/hash-object.c:102 msgid "store file as is without filters" msgstr "" -#: builtin/hash-object.c:102 +#: builtin/hash-object.c:103 msgid "" "just hash any random garbage to create corrupt objects for debugging Git" msgstr "" -#: builtin/hash-object.c:103 +#: builtin/hash-object.c:104 msgid "process file as it were from this path" msgstr "" -#: builtin/help.c:45 +#: builtin/help.c:46 msgid "print all available commands" msgstr "" -#: builtin/help.c:46 +#: builtin/help.c:47 msgid "exclude guides" msgstr "" -#: builtin/help.c:47 +#: builtin/help.c:48 msgid "print list of useful guides" msgstr "" -#: builtin/help.c:48 +#: builtin/help.c:49 +msgid "print all configuration variable names" +msgstr "" + +#: builtin/help.c:51 msgid "show man page" msgstr "" -#: builtin/help.c:49 +#: builtin/help.c:52 msgid "show manual in web browser" msgstr "" -#: builtin/help.c:51 +#: builtin/help.c:54 msgid "show info page" msgstr "" -#: builtin/help.c:53 +#: builtin/help.c:56 msgid "print command description" msgstr "" -#: builtin/help.c:58 +#: builtin/help.c:61 msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" msgstr "" -#: builtin/help.c:70 +#: builtin/help.c:73 #, c-format msgid "unrecognized help format '%s'" msgstr "" -#: builtin/help.c:97 +#: builtin/help.c:100 msgid "Failed to start emacsclient." msgstr "" -#: builtin/help.c:110 +#: builtin/help.c:113 msgid "Failed to parse emacsclient version." msgstr "" -#: builtin/help.c:118 +#: builtin/help.c:121 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "" -#: builtin/help.c:136 builtin/help.c:158 builtin/help.c:168 builtin/help.c:176 +#: builtin/help.c:139 builtin/help.c:161 builtin/help.c:171 builtin/help.c:179 #, c-format msgid "failed to exec '%s'" msgstr "" -#: builtin/help.c:214 +#: builtin/help.c:217 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" "Please consider using 'man.<tool>.cmd' instead." msgstr "" -#: builtin/help.c:226 +#: builtin/help.c:229 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" "Please consider using 'man.<tool>.path' instead." msgstr "" -#: builtin/help.c:343 +#: builtin/help.c:346 #, c-format msgid "'%s': unknown man viewer." msgstr "" -#: builtin/help.c:360 +#: builtin/help.c:363 msgid "no man viewer handled the request" msgstr "" -#: builtin/help.c:368 +#: builtin/help.c:371 msgid "no info viewer handled the request" msgstr "" -#: builtin/help.c:415 +#: builtin/help.c:418 #, c-format msgid "'%s' is aliased to '%s'" msgstr "" -#: builtin/help.c:442 builtin/help.c:459 +#: builtin/help.c:445 builtin/help.c:475 #, c-format msgid "usage: %s%s" msgstr "" -#: builtin/index-pack.c:158 -#, c-format -msgid "unable to open %s" +#: builtin/help.c:459 +msgid "'git help config' for more information" msgstr "" #: builtin/index-pack.c:208 @@ -9175,11 +10508,11 @@ msgstr "" msgid "used more bytes than were available" msgstr "" -#: builtin/index-pack.c:303 +#: builtin/index-pack.c:303 builtin/pack-objects.c:590 msgid "pack too large for current definition of off_t" msgstr "" -#: builtin/index-pack.c:306 builtin/unpack-objects.c:93 +#: builtin/index-pack.c:306 builtin/unpack-objects.c:94 msgid "pack exceeds maximum allowed size" msgstr "" @@ -9246,8 +10579,8 @@ msgstr "" msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "" -#: builtin/index-pack.c:754 builtin/pack-objects.c:198 -#: builtin/pack-objects.c:292 +#: builtin/index-pack.c:754 builtin/pack-objects.c:143 +#: builtin/pack-objects.c:203 builtin/pack-objects.c:297 #, c-format msgid "unable to read %s" msgstr "" @@ -9267,169 +10600,169 @@ msgstr "" msgid "invalid blob object %s" msgstr "" -#: builtin/index-pack.c:842 builtin/index-pack.c:860 +#: builtin/index-pack.c:842 builtin/index-pack.c:861 msgid "fsck error in packed object" msgstr "" -#: builtin/index-pack.c:857 +#: builtin/index-pack.c:858 #, c-format msgid "invalid %s" msgstr "" -#: builtin/index-pack.c:862 +#: builtin/index-pack.c:863 #, c-format msgid "Not all child objects of %s are reachable" msgstr "" -#: builtin/index-pack.c:934 builtin/index-pack.c:965 +#: builtin/index-pack.c:935 builtin/index-pack.c:966 msgid "failed to apply delta" msgstr "" -#: builtin/index-pack.c:1135 +#: builtin/index-pack.c:1136 msgid "Receiving objects" msgstr "" -#: builtin/index-pack.c:1135 +#: builtin/index-pack.c:1136 msgid "Indexing objects" msgstr "" -#: builtin/index-pack.c:1169 +#: builtin/index-pack.c:1170 msgid "pack is corrupted (SHA1 mismatch)" msgstr "" -#: builtin/index-pack.c:1174 +#: builtin/index-pack.c:1175 msgid "cannot fstat packfile" msgstr "" -#: builtin/index-pack.c:1177 +#: builtin/index-pack.c:1178 msgid "pack has junk at the end" msgstr "" -#: builtin/index-pack.c:1189 +#: builtin/index-pack.c:1190 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "" -#: builtin/index-pack.c:1212 +#: builtin/index-pack.c:1213 msgid "Resolving deltas" msgstr "" -#: builtin/index-pack.c:1223 +#: builtin/index-pack.c:1224 builtin/pack-objects.c:2410 #, c-format msgid "unable to create thread: %s" msgstr "" -#: builtin/index-pack.c:1265 +#: builtin/index-pack.c:1266 msgid "confusion beyond insanity" msgstr "" -#: builtin/index-pack.c:1271 +#: builtin/index-pack.c:1272 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1283 +#: builtin/index-pack.c:1284 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "" -#: builtin/index-pack.c:1287 +#: builtin/index-pack.c:1288 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1311 +#: builtin/index-pack.c:1312 #, c-format msgid "unable to deflate appended object (%d)" msgstr "" -#: builtin/index-pack.c:1388 +#: builtin/index-pack.c:1389 #, c-format msgid "local object %s is corrupt" msgstr "" -#: builtin/index-pack.c:1402 +#: builtin/index-pack.c:1403 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "" -#: builtin/index-pack.c:1427 +#: builtin/index-pack.c:1428 #, c-format msgid "cannot write %s file '%s'" msgstr "" -#: builtin/index-pack.c:1435 +#: builtin/index-pack.c:1436 #, c-format msgid "cannot close written %s file '%s'" msgstr "" -#: builtin/index-pack.c:1459 +#: builtin/index-pack.c:1460 msgid "error while closing pack file" msgstr "" -#: builtin/index-pack.c:1473 +#: builtin/index-pack.c:1474 msgid "cannot store pack file" msgstr "" -#: builtin/index-pack.c:1481 +#: builtin/index-pack.c:1482 msgid "cannot store index file" msgstr "" -#: builtin/index-pack.c:1525 +#: builtin/index-pack.c:1526 builtin/pack-objects.c:2648 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "" -#: builtin/index-pack.c:1594 +#: builtin/index-pack.c:1595 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "" -#: builtin/index-pack.c:1596 +#: builtin/index-pack.c:1597 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "" -#: builtin/index-pack.c:1644 +#: builtin/index-pack.c:1645 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1651 +#: builtin/index-pack.c:1652 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1688 +#: builtin/index-pack.c:1689 msgid "Cannot come back to cwd" msgstr "" -#: builtin/index-pack.c:1739 builtin/index-pack.c:1742 -#: builtin/index-pack.c:1758 builtin/index-pack.c:1762 +#: builtin/index-pack.c:1740 builtin/index-pack.c:1743 +#: builtin/index-pack.c:1759 builtin/index-pack.c:1763 #, c-format msgid "bad %s" msgstr "" -#: builtin/index-pack.c:1778 +#: builtin/index-pack.c:1779 msgid "--fix-thin cannot be used without --stdin" msgstr "" -#: builtin/index-pack.c:1780 +#: builtin/index-pack.c:1781 msgid "--stdin requires a git repository" msgstr "" -#: builtin/index-pack.c:1786 +#: builtin/index-pack.c:1787 msgid "--verify with no packfile name given" msgstr "" -#: builtin/index-pack.c:1836 builtin/unpack-objects.c:578 +#: builtin/index-pack.c:1837 builtin/unpack-objects.c:580 msgid "fsck error in pack objects" msgstr "" @@ -9448,98 +10781,103 @@ msgstr "" msgid "cannot opendir '%s'" msgstr "" -#: builtin/init-db.c:77 +#: builtin/init-db.c:78 #, c-format msgid "cannot readlink '%s'" msgstr "" -#: builtin/init-db.c:79 +#: builtin/init-db.c:80 #, c-format msgid "cannot symlink '%s' '%s'" msgstr "" -#: builtin/init-db.c:85 +#: builtin/init-db.c:86 #, c-format msgid "cannot copy '%s' to '%s'" msgstr "" -#: builtin/init-db.c:89 +#: builtin/init-db.c:90 #, c-format msgid "ignoring template %s" msgstr "" -#: builtin/init-db.c:120 +#: builtin/init-db.c:121 #, c-format msgid "templates not found in %s" msgstr "" -#: builtin/init-db.c:135 +#: builtin/init-db.c:136 #, c-format msgid "not copying templates from '%s': %s" msgstr "" -#: builtin/init-db.c:328 +#: builtin/init-db.c:329 #, c-format msgid "unable to handle file type %d" msgstr "" -#: builtin/init-db.c:331 +#: builtin/init-db.c:332 #, c-format msgid "unable to move %s to %s" msgstr "" -#: builtin/init-db.c:348 builtin/init-db.c:351 +#: builtin/init-db.c:349 builtin/init-db.c:352 #, c-format msgid "%s already exists" msgstr "" -#: builtin/init-db.c:404 +#: builtin/init-db.c:405 #, c-format msgid "Reinitialized existing shared Git repository in %s%s\n" msgstr "" -#: builtin/init-db.c:405 +#: builtin/init-db.c:406 #, c-format msgid "Reinitialized existing Git repository in %s%s\n" msgstr "" -#: builtin/init-db.c:409 +#: builtin/init-db.c:410 #, c-format msgid "Initialized empty shared Git repository in %s%s\n" msgstr "" -#: builtin/init-db.c:410 +#: builtin/init-db.c:411 #, c-format msgid "Initialized empty Git repository in %s%s\n" msgstr "" -#: builtin/init-db.c:458 +#: builtin/init-db.c:459 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" msgstr "" -#: builtin/init-db.c:481 +#: builtin/init-db.c:482 msgid "permissions" msgstr "" -#: builtin/init-db.c:482 +#: builtin/init-db.c:483 msgid "specify that the git repository is to be shared amongst several users" msgstr "" -#: builtin/init-db.c:525 +#: builtin/init-db.c:517 builtin/init-db.c:522 +#, c-format +msgid "cannot mkdir %s" +msgstr "" + +#: builtin/init-db.c:526 #, c-format msgid "cannot chdir to %s" msgstr "" -#: builtin/init-db.c:546 +#: builtin/init-db.c:547 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" "dir=<directory>)" msgstr "" -#: builtin/init-db.c:574 +#: builtin/init-db.c:575 #, c-format msgid "Cannot access work tree '%s'" msgstr "" @@ -9602,452 +10940,452 @@ msgstr "" msgid "no input file given for in-place editing" msgstr "" -#: builtin/log.c:48 +#: builtin/log.c:51 msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "" -#: builtin/log.c:49 +#: builtin/log.c:52 msgid "git show [<options>] <object>..." msgstr "" -#: builtin/log.c:93 +#: builtin/log.c:96 #, c-format msgid "invalid --decorate option: %s" msgstr "" -#: builtin/log.c:153 +#: builtin/log.c:157 msgid "suppress diff output" msgstr "" -#: builtin/log.c:154 +#: builtin/log.c:158 msgid "show source" msgstr "" -#: builtin/log.c:155 +#: builtin/log.c:159 msgid "Use mail map file" msgstr "" -#: builtin/log.c:157 +#: builtin/log.c:161 msgid "only decorate refs that match <pattern>" msgstr "" -#: builtin/log.c:159 +#: builtin/log.c:163 msgid "do not decorate refs that match <pattern>" msgstr "" -#: builtin/log.c:160 +#: builtin/log.c:164 msgid "decorate options" msgstr "" -#: builtin/log.c:163 +#: builtin/log.c:167 msgid "Process line range n,m in file, counting from 1" msgstr "" -#: builtin/log.c:259 +#: builtin/log.c:265 #, c-format msgid "Final output: %d %s\n" msgstr "" -#: builtin/log.c:510 +#: builtin/log.c:516 #, c-format msgid "git show %s: bad file" msgstr "" -#: builtin/log.c:525 builtin/log.c:619 +#: builtin/log.c:531 builtin/log.c:625 #, c-format msgid "Could not read object %s" msgstr "" -#: builtin/log.c:643 +#: builtin/log.c:649 #, c-format msgid "Unknown type: %d" msgstr "" -#: builtin/log.c:764 +#: builtin/log.c:770 msgid "format.headers without value" msgstr "" -#: builtin/log.c:865 +#: builtin/log.c:871 msgid "name of output directory is too long" msgstr "" -#: builtin/log.c:881 +#: builtin/log.c:887 #, c-format msgid "Cannot open patch file %s" msgstr "" -#: builtin/log.c:898 +#: builtin/log.c:904 msgid "Need exactly one range." msgstr "" -#: builtin/log.c:908 +#: builtin/log.c:914 msgid "Not a range." msgstr "" -#: builtin/log.c:1014 +#: builtin/log.c:1020 msgid "Cover letter needs email format" msgstr "" -#: builtin/log.c:1095 +#: builtin/log.c:1101 #, c-format msgid "insane in-reply-to: %s" msgstr "" -#: builtin/log.c:1122 +#: builtin/log.c:1128 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "" -#: builtin/log.c:1172 +#: builtin/log.c:1178 msgid "Two output directories?" msgstr "" -#: builtin/log.c:1279 builtin/log.c:1932 builtin/log.c:1934 builtin/log.c:1946 +#: builtin/log.c:1285 builtin/log.c:1945 builtin/log.c:1947 builtin/log.c:1959 #, c-format msgid "Unknown commit %s" msgstr "" -#: builtin/log.c:1289 builtin/notes.c:887 builtin/tag.c:523 +#: builtin/log.c:1295 builtin/notes.c:889 builtin/tag.c:524 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "" -#: builtin/log.c:1294 +#: builtin/log.c:1300 msgid "Could not find exact merge base." msgstr "" -#: builtin/log.c:1298 +#: builtin/log.c:1304 msgid "" "Failed to get upstream, if you want to record base commit automatically,\n" "please use git branch --set-upstream-to to track a remote branch.\n" "Or you could specify base commit by --base=<base-commit-id> manually." msgstr "" -#: builtin/log.c:1318 +#: builtin/log.c:1324 msgid "Failed to find exact merge base" msgstr "" -#: builtin/log.c:1329 +#: builtin/log.c:1335 msgid "base commit should be the ancestor of revision list" msgstr "" -#: builtin/log.c:1333 +#: builtin/log.c:1339 msgid "base commit shouldn't be in revision list" msgstr "" -#: builtin/log.c:1382 +#: builtin/log.c:1392 msgid "cannot get patch id" msgstr "" -#: builtin/log.c:1441 +#: builtin/log.c:1452 msgid "use [PATCH n/m] even with a single patch" msgstr "" -#: builtin/log.c:1444 +#: builtin/log.c:1455 msgid "use [PATCH] even with multiple patches" msgstr "" -#: builtin/log.c:1448 +#: builtin/log.c:1459 msgid "print patches to standard out" msgstr "" -#: builtin/log.c:1450 +#: builtin/log.c:1461 msgid "generate a cover letter" msgstr "" -#: builtin/log.c:1452 +#: builtin/log.c:1463 msgid "use simple number sequence for output file names" msgstr "" -#: builtin/log.c:1453 +#: builtin/log.c:1464 msgid "sfx" msgstr "" -#: builtin/log.c:1454 +#: builtin/log.c:1465 msgid "use <sfx> instead of '.patch'" msgstr "" -#: builtin/log.c:1456 +#: builtin/log.c:1467 msgid "start numbering patches at <n> instead of 1" msgstr "" -#: builtin/log.c:1458 +#: builtin/log.c:1469 msgid "mark the series as Nth re-roll" msgstr "" -#: builtin/log.c:1460 +#: builtin/log.c:1471 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "" -#: builtin/log.c:1463 +#: builtin/log.c:1474 msgid "Use [<prefix>] instead of [PATCH]" msgstr "" -#: builtin/log.c:1466 +#: builtin/log.c:1477 msgid "store resulting files in <dir>" msgstr "" -#: builtin/log.c:1469 +#: builtin/log.c:1480 msgid "don't strip/add [PATCH]" msgstr "" -#: builtin/log.c:1472 +#: builtin/log.c:1483 msgid "don't output binary diffs" msgstr "" -#: builtin/log.c:1474 +#: builtin/log.c:1485 msgid "output all-zero hash in From header" msgstr "" -#: builtin/log.c:1476 +#: builtin/log.c:1487 msgid "don't include a patch matching a commit upstream" msgstr "" -#: builtin/log.c:1478 +#: builtin/log.c:1489 msgid "show patch format instead of default (patch + stat)" msgstr "" -#: builtin/log.c:1480 +#: builtin/log.c:1491 msgid "Messaging" msgstr "" -#: builtin/log.c:1481 +#: builtin/log.c:1492 msgid "header" msgstr "" -#: builtin/log.c:1482 +#: builtin/log.c:1493 msgid "add email header" msgstr "" -#: builtin/log.c:1483 builtin/log.c:1485 +#: builtin/log.c:1494 builtin/log.c:1496 msgid "email" msgstr "" -#: builtin/log.c:1483 +#: builtin/log.c:1494 msgid "add To: header" msgstr "" -#: builtin/log.c:1485 +#: builtin/log.c:1496 msgid "add Cc: header" msgstr "" -#: builtin/log.c:1487 +#: builtin/log.c:1498 msgid "ident" msgstr "" -#: builtin/log.c:1488 +#: builtin/log.c:1499 msgid "set From address to <ident> (or committer ident if absent)" msgstr "" -#: builtin/log.c:1490 +#: builtin/log.c:1501 msgid "message-id" msgstr "" -#: builtin/log.c:1491 +#: builtin/log.c:1502 msgid "make first mail a reply to <message-id>" msgstr "" -#: builtin/log.c:1492 builtin/log.c:1495 +#: builtin/log.c:1503 builtin/log.c:1506 msgid "boundary" msgstr "" -#: builtin/log.c:1493 +#: builtin/log.c:1504 msgid "attach the patch" msgstr "" -#: builtin/log.c:1496 +#: builtin/log.c:1507 msgid "inline the patch" msgstr "" -#: builtin/log.c:1500 +#: builtin/log.c:1511 msgid "enable message threading, styles: shallow, deep" msgstr "" -#: builtin/log.c:1502 +#: builtin/log.c:1513 msgid "signature" msgstr "" -#: builtin/log.c:1503 +#: builtin/log.c:1514 msgid "add a signature" msgstr "" -#: builtin/log.c:1504 +#: builtin/log.c:1515 msgid "base-commit" msgstr "" -#: builtin/log.c:1505 +#: builtin/log.c:1516 msgid "add prerequisite tree info to the patch series" msgstr "" -#: builtin/log.c:1507 +#: builtin/log.c:1518 msgid "add a signature from a file" msgstr "" -#: builtin/log.c:1508 +#: builtin/log.c:1519 msgid "don't print the patch filenames" msgstr "" -#: builtin/log.c:1510 +#: builtin/log.c:1521 msgid "show progress while generating patches" msgstr "" -#: builtin/log.c:1585 +#: builtin/log.c:1596 #, c-format msgid "invalid ident line: %s" msgstr "" -#: builtin/log.c:1600 -msgid "-n and -k are mutually exclusive." +#: builtin/log.c:1611 +msgid "-n and -k are mutually exclusive" msgstr "" -#: builtin/log.c:1602 -msgid "--subject-prefix/--rfc and -k are mutually exclusive." +#: builtin/log.c:1613 +msgid "--subject-prefix/--rfc and -k are mutually exclusive" msgstr "" -#: builtin/log.c:1610 +#: builtin/log.c:1621 msgid "--name-only does not make sense" msgstr "" -#: builtin/log.c:1612 +#: builtin/log.c:1623 msgid "--name-status does not make sense" msgstr "" -#: builtin/log.c:1614 +#: builtin/log.c:1625 msgid "--check does not make sense" msgstr "" -#: builtin/log.c:1646 +#: builtin/log.c:1657 msgid "standard output, or directory, which one?" msgstr "" -#: builtin/log.c:1648 +#: builtin/log.c:1659 #, c-format msgid "Could not create directory '%s'" msgstr "" -#: builtin/log.c:1741 +#: builtin/log.c:1752 #, c-format msgid "unable to read signature file '%s'" msgstr "" -#: builtin/log.c:1773 +#: builtin/log.c:1785 msgid "Generating patches" msgstr "" -#: builtin/log.c:1817 +#: builtin/log.c:1829 msgid "Failed to create output files" msgstr "" -#: builtin/log.c:1867 +#: builtin/log.c:1880 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "" -#: builtin/log.c:1921 +#: builtin/log.c:1934 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" msgstr "" -#: builtin/ls-files.c:468 +#: builtin/ls-files.c:469 msgid "git ls-files [<options>] [<file>...]" msgstr "" -#: builtin/ls-files.c:517 +#: builtin/ls-files.c:518 msgid "identify the file status with tags" msgstr "" -#: builtin/ls-files.c:519 +#: builtin/ls-files.c:520 msgid "use lowercase letters for 'assume unchanged' files" msgstr "" -#: builtin/ls-files.c:521 +#: builtin/ls-files.c:522 msgid "use lowercase letters for 'fsmonitor clean' files" msgstr "" -#: builtin/ls-files.c:523 +#: builtin/ls-files.c:524 msgid "show cached files in the output (default)" msgstr "" -#: builtin/ls-files.c:525 +#: builtin/ls-files.c:526 msgid "show deleted files in the output" msgstr "" -#: builtin/ls-files.c:527 +#: builtin/ls-files.c:528 msgid "show modified files in the output" msgstr "" -#: builtin/ls-files.c:529 +#: builtin/ls-files.c:530 msgid "show other files in the output" msgstr "" -#: builtin/ls-files.c:531 +#: builtin/ls-files.c:532 msgid "show ignored files in the output" msgstr "" -#: builtin/ls-files.c:534 +#: builtin/ls-files.c:535 msgid "show staged contents' object name in the output" msgstr "" -#: builtin/ls-files.c:536 +#: builtin/ls-files.c:537 msgid "show files on the filesystem that need to be removed" msgstr "" -#: builtin/ls-files.c:538 +#: builtin/ls-files.c:539 msgid "show 'other' directories' names only" msgstr "" -#: builtin/ls-files.c:540 +#: builtin/ls-files.c:541 msgid "show line endings of files" msgstr "" -#: builtin/ls-files.c:542 +#: builtin/ls-files.c:543 msgid "don't show empty directories" msgstr "" -#: builtin/ls-files.c:545 +#: builtin/ls-files.c:546 msgid "show unmerged files in the output" msgstr "" -#: builtin/ls-files.c:547 +#: builtin/ls-files.c:548 msgid "show resolve-undo information" msgstr "" -#: builtin/ls-files.c:549 +#: builtin/ls-files.c:550 msgid "skip files matching pattern" msgstr "" -#: builtin/ls-files.c:552 +#: builtin/ls-files.c:553 msgid "exclude patterns are read from <file>" msgstr "" -#: builtin/ls-files.c:555 +#: builtin/ls-files.c:556 msgid "read additional per-directory exclude patterns in <file>" msgstr "" -#: builtin/ls-files.c:557 +#: builtin/ls-files.c:558 msgid "add the standard git exclusions" msgstr "" -#: builtin/ls-files.c:560 +#: builtin/ls-files.c:561 msgid "make the output relative to the project top directory" msgstr "" -#: builtin/ls-files.c:563 +#: builtin/ls-files.c:564 msgid "recurse through submodules" msgstr "" -#: builtin/ls-files.c:565 +#: builtin/ls-files.c:566 msgid "if any <file> is not in the index, treat this as an error" msgstr "" -#: builtin/ls-files.c:566 +#: builtin/ls-files.c:567 msgid "tree-ish" msgstr "" -#: builtin/ls-files.c:567 +#: builtin/ls-files.c:568 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "" -#: builtin/ls-files.c:569 +#: builtin/ls-files.c:570 msgid "show debugging data" msgstr "" @@ -10094,39 +11432,39 @@ msgstr "" msgid "show underlying ref in addition to the object pointed by it" msgstr "" -#: builtin/ls-tree.c:29 +#: builtin/ls-tree.c:30 msgid "git ls-tree [<options>] <tree-ish> [<path>...]" msgstr "" -#: builtin/ls-tree.c:127 +#: builtin/ls-tree.c:128 msgid "only show trees" msgstr "" -#: builtin/ls-tree.c:129 +#: builtin/ls-tree.c:130 msgid "recurse into subtrees" msgstr "" -#: builtin/ls-tree.c:131 +#: builtin/ls-tree.c:132 msgid "show trees when recursing" msgstr "" -#: builtin/ls-tree.c:134 +#: builtin/ls-tree.c:135 msgid "terminate entries with NUL byte" msgstr "" -#: builtin/ls-tree.c:135 +#: builtin/ls-tree.c:136 msgid "include object size" msgstr "" -#: builtin/ls-tree.c:137 builtin/ls-tree.c:139 +#: builtin/ls-tree.c:138 builtin/ls-tree.c:140 msgid "list only filenames" msgstr "" -#: builtin/ls-tree.c:142 +#: builtin/ls-tree.c:143 msgid "use full path names" msgstr "" -#: builtin/ls-tree.c:144 +#: builtin/ls-tree.c:145 msgid "list entire tree; not just current directory (implies --full-name)" msgstr "" @@ -10151,164 +11489,164 @@ msgstr "" msgid "switch `m' requires a value" msgstr "" -#: builtin/merge.c:147 +#: builtin/merge.c:176 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "" -#: builtin/merge.c:148 +#: builtin/merge.c:177 #, c-format msgid "Available strategies are:" msgstr "" -#: builtin/merge.c:153 +#: builtin/merge.c:182 #, c-format msgid "Available custom strategies are:" msgstr "" -#: builtin/merge.c:203 builtin/pull.c:142 +#: builtin/merge.c:232 builtin/pull.c:142 msgid "do not show a diffstat at the end of the merge" msgstr "" -#: builtin/merge.c:206 builtin/pull.c:145 +#: builtin/merge.c:235 builtin/pull.c:145 msgid "show a diffstat at the end of the merge" msgstr "" -#: builtin/merge.c:207 builtin/pull.c:148 +#: builtin/merge.c:236 builtin/pull.c:148 msgid "(synonym to --stat)" msgstr "" -#: builtin/merge.c:209 builtin/pull.c:151 +#: builtin/merge.c:238 builtin/pull.c:151 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" -#: builtin/merge.c:212 builtin/pull.c:157 +#: builtin/merge.c:241 builtin/pull.c:157 msgid "create a single commit instead of doing a merge" msgstr "" -#: builtin/merge.c:214 builtin/pull.c:160 +#: builtin/merge.c:243 builtin/pull.c:160 msgid "perform a commit if the merge succeeds (default)" msgstr "" -#: builtin/merge.c:216 builtin/pull.c:163 +#: builtin/merge.c:245 builtin/pull.c:163 msgid "edit message before committing" msgstr "" -#: builtin/merge.c:217 +#: builtin/merge.c:246 msgid "allow fast-forward (default)" msgstr "" -#: builtin/merge.c:219 builtin/pull.c:169 +#: builtin/merge.c:248 builtin/pull.c:169 msgid "abort if fast-forward is not possible" msgstr "" -#: builtin/merge.c:223 builtin/pull.c:172 +#: builtin/merge.c:252 builtin/pull.c:172 msgid "verify that the named commit has a valid GPG signature" msgstr "" -#: builtin/merge.c:224 builtin/notes.c:777 builtin/pull.c:176 -#: builtin/revert.c:109 +#: builtin/merge.c:253 builtin/notes.c:779 builtin/pull.c:176 +#: builtin/revert.c:110 msgid "strategy" msgstr "" -#: builtin/merge.c:225 builtin/pull.c:177 +#: builtin/merge.c:254 builtin/pull.c:177 msgid "merge strategy to use" msgstr "" -#: builtin/merge.c:226 builtin/pull.c:180 +#: builtin/merge.c:255 builtin/pull.c:180 msgid "option=value" msgstr "" -#: builtin/merge.c:227 builtin/pull.c:181 +#: builtin/merge.c:256 builtin/pull.c:181 msgid "option for selected merge strategy" msgstr "" -#: builtin/merge.c:229 +#: builtin/merge.c:258 msgid "merge commit message (for a non-fast-forward merge)" msgstr "" -#: builtin/merge.c:233 +#: builtin/merge.c:265 msgid "abort the current in-progress merge" msgstr "" -#: builtin/merge.c:235 +#: builtin/merge.c:267 msgid "continue the current in-progress merge" msgstr "" -#: builtin/merge.c:237 builtin/pull.c:188 +#: builtin/merge.c:269 builtin/pull.c:188 msgid "allow merging unrelated histories" msgstr "" -#: builtin/merge.c:243 +#: builtin/merge.c:275 msgid "verify commit-msg hook" msgstr "" -#: builtin/merge.c:268 +#: builtin/merge.c:300 msgid "could not run stash." msgstr "" -#: builtin/merge.c:273 +#: builtin/merge.c:305 msgid "stash failed" msgstr "" -#: builtin/merge.c:278 +#: builtin/merge.c:310 #, c-format msgid "not a valid object: %s" msgstr "" -#: builtin/merge.c:300 builtin/merge.c:317 +#: builtin/merge.c:332 builtin/merge.c:349 msgid "read-tree failed" msgstr "" -#: builtin/merge.c:347 +#: builtin/merge.c:379 msgid " (nothing to squash)" msgstr "" -#: builtin/merge.c:358 +#: builtin/merge.c:390 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "" -#: builtin/merge.c:408 +#: builtin/merge.c:440 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "" -#: builtin/merge.c:458 +#: builtin/merge.c:491 #, c-format msgid "'%s' does not point to a commit" msgstr "" -#: builtin/merge.c:548 +#: builtin/merge.c:578 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "" -#: builtin/merge.c:669 +#: builtin/merge.c:699 msgid "Not handling anything other than two heads merge." msgstr "" -#: builtin/merge.c:683 +#: builtin/merge.c:713 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "" -#: builtin/merge.c:698 +#: builtin/merge.c:728 #, c-format msgid "unable to write %s" msgstr "" -#: builtin/merge.c:749 +#: builtin/merge.c:779 #, c-format msgid "Could not read from '%s'" msgstr "" -#: builtin/merge.c:758 +#: builtin/merge.c:788 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" -#: builtin/merge.c:764 +#: builtin/merge.c:794 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -10318,226 +11656,226 @@ msgid "" "the commit.\n" msgstr "" -#: builtin/merge.c:800 +#: builtin/merge.c:830 msgid "Empty commit message." msgstr "" -#: builtin/merge.c:819 +#: builtin/merge.c:849 #, c-format msgid "Wonderful.\n" msgstr "" -#: builtin/merge.c:872 +#: builtin/merge.c:902 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" -#: builtin/merge.c:911 +#: builtin/merge.c:941 msgid "No current branch." msgstr "" -#: builtin/merge.c:913 +#: builtin/merge.c:943 msgid "No remote for the current branch." msgstr "" -#: builtin/merge.c:915 +#: builtin/merge.c:945 msgid "No default upstream defined for the current branch." msgstr "" -#: builtin/merge.c:920 +#: builtin/merge.c:950 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "" -#: builtin/merge.c:973 +#: builtin/merge.c:1007 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "" -#: builtin/merge.c:1075 +#: builtin/merge.c:1110 #, c-format msgid "not something we can merge in %s: %s" msgstr "" -#: builtin/merge.c:1109 +#: builtin/merge.c:1144 msgid "not something we can merge" msgstr "" -#: builtin/merge.c:1211 +#: builtin/merge.c:1247 msgid "--abort expects no arguments" msgstr "" -#: builtin/merge.c:1215 +#: builtin/merge.c:1251 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "" -#: builtin/merge.c:1227 +#: builtin/merge.c:1263 msgid "--continue expects no arguments" msgstr "" -#: builtin/merge.c:1231 +#: builtin/merge.c:1267 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "" -#: builtin/merge.c:1247 +#: builtin/merge.c:1283 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." msgstr "" -#: builtin/merge.c:1254 +#: builtin/merge.c:1290 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." msgstr "" -#: builtin/merge.c:1257 +#: builtin/merge.c:1293 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "" -#: builtin/merge.c:1266 +#: builtin/merge.c:1302 msgid "You cannot combine --squash with --no-ff." msgstr "" -#: builtin/merge.c:1274 +#: builtin/merge.c:1310 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" -#: builtin/merge.c:1291 +#: builtin/merge.c:1327 msgid "Squash commit into empty head not supported yet" msgstr "" -#: builtin/merge.c:1293 +#: builtin/merge.c:1329 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "" -#: builtin/merge.c:1298 +#: builtin/merge.c:1334 #, c-format msgid "%s - not something we can merge" msgstr "" -#: builtin/merge.c:1300 +#: builtin/merge.c:1336 msgid "Can merge only exactly one commit into empty head" msgstr "" -#: builtin/merge.c:1334 +#: builtin/merge.c:1370 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "" -#: builtin/merge.c:1337 +#: builtin/merge.c:1373 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "" -#: builtin/merge.c:1340 +#: builtin/merge.c:1376 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "" -#: builtin/merge.c:1343 +#: builtin/merge.c:1379 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "" -#: builtin/merge.c:1402 +#: builtin/merge.c:1438 msgid "refusing to merge unrelated histories" msgstr "" -#: builtin/merge.c:1411 +#: builtin/merge.c:1447 msgid "Already up to date." msgstr "" -#: builtin/merge.c:1421 +#: builtin/merge.c:1457 #, c-format msgid "Updating %s..%s\n" msgstr "" -#: builtin/merge.c:1462 +#: builtin/merge.c:1498 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "" -#: builtin/merge.c:1469 +#: builtin/merge.c:1505 #, c-format msgid "Nope.\n" msgstr "" -#: builtin/merge.c:1494 +#: builtin/merge.c:1530 msgid "Already up to date. Yeeah!" msgstr "" -#: builtin/merge.c:1500 +#: builtin/merge.c:1536 msgid "Not possible to fast-forward, aborting." msgstr "" -#: builtin/merge.c:1523 builtin/merge.c:1602 +#: builtin/merge.c:1559 builtin/merge.c:1638 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "" -#: builtin/merge.c:1527 +#: builtin/merge.c:1563 #, c-format msgid "Trying merge strategy %s...\n" msgstr "" -#: builtin/merge.c:1593 +#: builtin/merge.c:1629 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "" -#: builtin/merge.c:1595 +#: builtin/merge.c:1631 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "" -#: builtin/merge.c:1604 +#: builtin/merge.c:1640 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "" -#: builtin/merge.c:1616 +#: builtin/merge.c:1652 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" -#: builtin/merge-base.c:30 +#: builtin/merge-base.c:31 msgid "git merge-base [-a | --all] <commit> <commit>..." msgstr "" -#: builtin/merge-base.c:31 +#: builtin/merge-base.c:32 msgid "git merge-base [-a | --all] --octopus <commit>..." msgstr "" -#: builtin/merge-base.c:32 +#: builtin/merge-base.c:33 msgid "git merge-base --independent <commit>..." msgstr "" -#: builtin/merge-base.c:33 +#: builtin/merge-base.c:34 msgid "git merge-base --is-ancestor <commit> <commit>" msgstr "" -#: builtin/merge-base.c:34 +#: builtin/merge-base.c:35 msgid "git merge-base --fork-point <ref> [<commit>]" msgstr "" -#: builtin/merge-base.c:220 +#: builtin/merge-base.c:221 msgid "output all common ancestors" msgstr "" -#: builtin/merge-base.c:222 +#: builtin/merge-base.c:223 msgid "find ancestors for a single n-way merge" msgstr "" -#: builtin/merge-base.c:224 +#: builtin/merge-base.c:225 msgid "list revs not reachable from others" msgstr "" -#: builtin/merge-base.c:226 +#: builtin/merge-base.c:227 msgid "is the first one ancestor of the other?" msgstr "" -#: builtin/merge-base.c:228 +#: builtin/merge-base.c:229 msgid "find where <commit> forked from reflog of <ref>" msgstr "" @@ -10610,19 +11948,19 @@ msgstr "" msgid "Merging %s with %s\n" msgstr "" -#: builtin/mktree.c:65 +#: builtin/mktree.c:66 msgid "git mktree [-z] [--missing] [--batch]" msgstr "" -#: builtin/mktree.c:153 +#: builtin/mktree.c:154 msgid "input is NUL terminated" msgstr "" -#: builtin/mktree.c:154 builtin/write-tree.c:25 +#: builtin/mktree.c:155 builtin/write-tree.c:25 msgid "allow missing objects" msgstr "" -#: builtin/mktree.c:155 +#: builtin/mktree.c:156 msgid "allow creation of more than one tree" msgstr "" @@ -10635,7 +11973,7 @@ msgstr "" msgid "Directory %s is in index and no submodule?" msgstr "" -#: builtin/mv.c:84 builtin/rm.c:288 +#: builtin/mv.c:84 msgid "Please stage your changes to .gitmodules or stash them to proceed" msgstr "" @@ -10713,224 +12051,224 @@ msgstr "" msgid "Renaming %s to %s\n" msgstr "" -#: builtin/mv.c:276 builtin/remote.c:715 builtin/repack.c:409 +#: builtin/mv.c:276 builtin/remote.c:716 builtin/repack.c:494 #, c-format msgid "renaming '%s' failed" msgstr "" -#: builtin/name-rev.c:338 +#: builtin/name-rev.c:355 msgid "git name-rev [<options>] <commit>..." msgstr "" -#: builtin/name-rev.c:339 +#: builtin/name-rev.c:356 msgid "git name-rev [<options>] --all" msgstr "" -#: builtin/name-rev.c:340 +#: builtin/name-rev.c:357 msgid "git name-rev [<options>] --stdin" msgstr "" -#: builtin/name-rev.c:395 +#: builtin/name-rev.c:413 msgid "print only names (no SHA-1)" msgstr "" -#: builtin/name-rev.c:396 +#: builtin/name-rev.c:414 msgid "only use tags to name the commits" msgstr "" -#: builtin/name-rev.c:398 +#: builtin/name-rev.c:416 msgid "only use refs matching <pattern>" msgstr "" -#: builtin/name-rev.c:400 +#: builtin/name-rev.c:418 msgid "ignore refs matching <pattern>" msgstr "" -#: builtin/name-rev.c:402 +#: builtin/name-rev.c:420 msgid "list all commits reachable from all refs" msgstr "" -#: builtin/name-rev.c:403 +#: builtin/name-rev.c:421 msgid "read from stdin" msgstr "" -#: builtin/name-rev.c:404 +#: builtin/name-rev.c:422 msgid "allow to print `undefined` names (default)" msgstr "" -#: builtin/name-rev.c:410 +#: builtin/name-rev.c:428 msgid "dereference tags in the input (internal use)" msgstr "" -#: builtin/notes.c:26 +#: builtin/notes.c:28 msgid "git notes [--ref <notes-ref>] [list [<object>]]" msgstr "" -#: builtin/notes.c:27 +#: builtin/notes.c:29 msgid "" "git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> " "| (-c | -C) <object>] [<object>]" msgstr "" -#: builtin/notes.c:28 +#: builtin/notes.c:30 msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>" msgstr "" -#: builtin/notes.c:29 +#: builtin/notes.c:31 msgid "" "git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | " "(-c | -C) <object>] [<object>]" msgstr "" -#: builtin/notes.c:30 +#: builtin/notes.c:32 msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]" msgstr "" -#: builtin/notes.c:31 +#: builtin/notes.c:33 msgid "git notes [--ref <notes-ref>] show [<object>]" msgstr "" -#: builtin/notes.c:32 +#: builtin/notes.c:34 msgid "" "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>" msgstr "" -#: builtin/notes.c:33 +#: builtin/notes.c:35 msgid "git notes merge --commit [-v | -q]" msgstr "" -#: builtin/notes.c:34 +#: builtin/notes.c:36 msgid "git notes merge --abort [-v | -q]" msgstr "" -#: builtin/notes.c:35 +#: builtin/notes.c:37 msgid "git notes [--ref <notes-ref>] remove [<object>...]" msgstr "" -#: builtin/notes.c:36 +#: builtin/notes.c:38 msgid "git notes [--ref <notes-ref>] prune [-n] [-v]" msgstr "" -#: builtin/notes.c:37 +#: builtin/notes.c:39 msgid "git notes [--ref <notes-ref>] get-ref" msgstr "" -#: builtin/notes.c:42 +#: builtin/notes.c:44 msgid "git notes [list [<object>]]" msgstr "" -#: builtin/notes.c:47 +#: builtin/notes.c:49 msgid "git notes add [<options>] [<object>]" msgstr "" -#: builtin/notes.c:52 +#: builtin/notes.c:54 msgid "git notes copy [<options>] <from-object> <to-object>" msgstr "" -#: builtin/notes.c:53 +#: builtin/notes.c:55 msgid "git notes copy --stdin [<from-object> <to-object>]..." msgstr "" -#: builtin/notes.c:58 +#: builtin/notes.c:60 msgid "git notes append [<options>] [<object>]" msgstr "" -#: builtin/notes.c:63 +#: builtin/notes.c:65 msgid "git notes edit [<object>]" msgstr "" -#: builtin/notes.c:68 +#: builtin/notes.c:70 msgid "git notes show [<object>]" msgstr "" -#: builtin/notes.c:73 +#: builtin/notes.c:75 msgid "git notes merge [<options>] <notes-ref>" msgstr "" -#: builtin/notes.c:74 +#: builtin/notes.c:76 msgid "git notes merge --commit [<options>]" msgstr "" -#: builtin/notes.c:75 +#: builtin/notes.c:77 msgid "git notes merge --abort [<options>]" msgstr "" -#: builtin/notes.c:80 +#: builtin/notes.c:82 msgid "git notes remove [<object>]" msgstr "" -#: builtin/notes.c:85 +#: builtin/notes.c:87 msgid "git notes prune [<options>]" msgstr "" -#: builtin/notes.c:90 +#: builtin/notes.c:92 msgid "git notes get-ref" msgstr "" -#: builtin/notes.c:95 +#: builtin/notes.c:97 msgid "Write/edit the notes for the following object:" msgstr "" -#: builtin/notes.c:148 +#: builtin/notes.c:150 #, c-format msgid "unable to start 'show' for object '%s'" msgstr "" -#: builtin/notes.c:152 +#: builtin/notes.c:154 msgid "could not read 'show' output" msgstr "" -#: builtin/notes.c:160 +#: builtin/notes.c:162 #, c-format msgid "failed to finish 'show' for object '%s'" msgstr "" -#: builtin/notes.c:195 +#: builtin/notes.c:197 msgid "please supply the note contents using either -m or -F option" msgstr "" -#: builtin/notes.c:204 +#: builtin/notes.c:206 msgid "unable to write note object" msgstr "" -#: builtin/notes.c:206 +#: builtin/notes.c:208 #, c-format msgid "the note contents have been left in %s" msgstr "" -#: builtin/notes.c:234 builtin/tag.c:507 +#: builtin/notes.c:236 builtin/tag.c:508 #, c-format msgid "cannot read '%s'" msgstr "" -#: builtin/notes.c:236 builtin/tag.c:510 +#: builtin/notes.c:238 builtin/tag.c:511 #, c-format msgid "could not open or read '%s'" msgstr "" -#: builtin/notes.c:255 builtin/notes.c:306 builtin/notes.c:308 -#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:517 -#: builtin/notes.c:522 builtin/notes.c:600 builtin/notes.c:662 +#: builtin/notes.c:257 builtin/notes.c:308 builtin/notes.c:310 +#: builtin/notes.c:378 builtin/notes.c:433 builtin/notes.c:519 +#: builtin/notes.c:524 builtin/notes.c:602 builtin/notes.c:664 #, c-format msgid "failed to resolve '%s' as a valid ref." msgstr "" -#: builtin/notes.c:258 +#: builtin/notes.c:260 #, c-format msgid "failed to read object '%s'." msgstr "" -#: builtin/notes.c:262 +#: builtin/notes.c:264 #, c-format msgid "cannot read note data from non-blob object '%s'." msgstr "" -#: builtin/notes.c:302 +#: builtin/notes.c:304 #, c-format msgid "malformed input line: '%s'." msgstr "" -#: builtin/notes.c:317 +#: builtin/notes.c:319 #, c-format msgid "failed to copy notes from '%s' to '%s'" msgstr "" @@ -10938,185 +12276,185 @@ msgstr "" #. TRANSLATORS: the first %s will be replaced by a git #. notes command: 'add', 'merge', 'remove', etc. #. -#: builtin/notes.c:349 +#: builtin/notes.c:351 #, c-format msgid "refusing to %s notes in %s (outside of refs/notes/)" msgstr "" -#: builtin/notes.c:369 builtin/notes.c:424 builtin/notes.c:500 -#: builtin/notes.c:512 builtin/notes.c:588 builtin/notes.c:655 -#: builtin/notes.c:805 builtin/notes.c:952 builtin/notes.c:973 +#: builtin/notes.c:371 builtin/notes.c:426 builtin/notes.c:502 +#: builtin/notes.c:514 builtin/notes.c:590 builtin/notes.c:657 +#: builtin/notes.c:807 builtin/notes.c:954 builtin/notes.c:975 msgid "too many parameters" msgstr "" -#: builtin/notes.c:382 builtin/notes.c:668 +#: builtin/notes.c:384 builtin/notes.c:670 #, c-format msgid "no note found for object %s." msgstr "" -#: builtin/notes.c:403 builtin/notes.c:566 +#: builtin/notes.c:405 builtin/notes.c:568 msgid "note contents as a string" msgstr "" -#: builtin/notes.c:406 builtin/notes.c:569 +#: builtin/notes.c:408 builtin/notes.c:571 msgid "note contents in a file" msgstr "" -#: builtin/notes.c:409 builtin/notes.c:572 +#: builtin/notes.c:411 builtin/notes.c:574 msgid "reuse and edit specified note object" msgstr "" -#: builtin/notes.c:412 builtin/notes.c:575 +#: builtin/notes.c:414 builtin/notes.c:577 msgid "reuse specified note object" msgstr "" -#: builtin/notes.c:415 builtin/notes.c:578 +#: builtin/notes.c:417 builtin/notes.c:580 msgid "allow storing empty note" msgstr "" -#: builtin/notes.c:416 builtin/notes.c:487 +#: builtin/notes.c:418 builtin/notes.c:489 msgid "replace existing notes" msgstr "" -#: builtin/notes.c:441 +#: builtin/notes.c:443 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "" -#: builtin/notes.c:456 builtin/notes.c:535 +#: builtin/notes.c:458 builtin/notes.c:537 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "" -#: builtin/notes.c:467 builtin/notes.c:627 builtin/notes.c:892 +#: builtin/notes.c:469 builtin/notes.c:629 builtin/notes.c:894 #, c-format msgid "Removing note for object %s\n" msgstr "" -#: builtin/notes.c:488 +#: builtin/notes.c:490 msgid "read objects from stdin" msgstr "" -#: builtin/notes.c:490 +#: builtin/notes.c:492 msgid "load rewriting config for <command> (implies --stdin)" msgstr "" -#: builtin/notes.c:508 +#: builtin/notes.c:510 msgid "too few parameters" msgstr "" -#: builtin/notes.c:529 +#: builtin/notes.c:531 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "" -#: builtin/notes.c:541 +#: builtin/notes.c:543 #, c-format msgid "missing notes on source object %s. Cannot copy." msgstr "" -#: builtin/notes.c:593 +#: builtin/notes.c:595 #, c-format msgid "" "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" "Please use 'git notes add -f -m/-F/-c/-C' instead.\n" msgstr "" -#: builtin/notes.c:688 +#: builtin/notes.c:690 msgid "failed to delete ref NOTES_MERGE_PARTIAL" msgstr "" -#: builtin/notes.c:690 +#: builtin/notes.c:692 msgid "failed to delete ref NOTES_MERGE_REF" msgstr "" -#: builtin/notes.c:692 +#: builtin/notes.c:694 msgid "failed to remove 'git notes merge' worktree" msgstr "" -#: builtin/notes.c:712 +#: builtin/notes.c:714 msgid "failed to read ref NOTES_MERGE_PARTIAL" msgstr "" -#: builtin/notes.c:714 +#: builtin/notes.c:716 msgid "could not find commit from NOTES_MERGE_PARTIAL." msgstr "" -#: builtin/notes.c:716 +#: builtin/notes.c:718 msgid "could not parse commit from NOTES_MERGE_PARTIAL." msgstr "" -#: builtin/notes.c:729 +#: builtin/notes.c:731 msgid "failed to resolve NOTES_MERGE_REF" msgstr "" -#: builtin/notes.c:732 +#: builtin/notes.c:734 msgid "failed to finalize notes merge" msgstr "" -#: builtin/notes.c:758 +#: builtin/notes.c:760 #, c-format msgid "unknown notes merge strategy %s" msgstr "" -#: builtin/notes.c:774 +#: builtin/notes.c:776 msgid "General options" msgstr "" -#: builtin/notes.c:776 +#: builtin/notes.c:778 msgid "Merge options" msgstr "" -#: builtin/notes.c:778 +#: builtin/notes.c:780 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" msgstr "" -#: builtin/notes.c:780 +#: builtin/notes.c:782 msgid "Committing unmerged notes" msgstr "" -#: builtin/notes.c:782 +#: builtin/notes.c:784 msgid "finalize notes merge by committing unmerged notes" msgstr "" -#: builtin/notes.c:784 +#: builtin/notes.c:786 msgid "Aborting notes merge resolution" msgstr "" -#: builtin/notes.c:786 +#: builtin/notes.c:788 msgid "abort notes merge" msgstr "" -#: builtin/notes.c:797 +#: builtin/notes.c:799 msgid "cannot mix --commit, --abort or -s/--strategy" msgstr "" -#: builtin/notes.c:802 +#: builtin/notes.c:804 msgid "must specify a notes ref to merge" msgstr "" -#: builtin/notes.c:826 +#: builtin/notes.c:828 #, c-format msgid "unknown -s/--strategy: %s" msgstr "" -#: builtin/notes.c:863 +#: builtin/notes.c:865 #, c-format msgid "a notes merge into %s is already in-progress at %s" msgstr "" -#: builtin/notes.c:866 +#: builtin/notes.c:868 #, c-format msgid "failed to store link to current notes ref (%s)" msgstr "" -#: builtin/notes.c:868 +#: builtin/notes.c:870 #, c-format msgid "" "Automatic notes merge failed. Fix conflicts in %s and commit the result with " @@ -11124,36 +12462,36 @@ msgid "" "abort'.\n" msgstr "" -#: builtin/notes.c:890 +#: builtin/notes.c:892 #, c-format msgid "Object %s has no note\n" msgstr "" -#: builtin/notes.c:902 +#: builtin/notes.c:904 msgid "attempt to remove non-existent note is not an error" msgstr "" -#: builtin/notes.c:905 +#: builtin/notes.c:907 msgid "read object names from the standard input" msgstr "" -#: builtin/notes.c:943 builtin/prune.c:107 builtin/worktree.c:151 +#: builtin/notes.c:945 builtin/prune.c:108 builtin/worktree.c:151 msgid "do not remove, show only" msgstr "" -#: builtin/notes.c:944 +#: builtin/notes.c:946 msgid "report pruned notes" msgstr "" -#: builtin/notes.c:986 +#: builtin/notes.c:988 msgid "notes-ref" msgstr "" -#: builtin/notes.c:987 +#: builtin/notes.c:989 msgid "use notes from <notes-ref>" msgstr "" -#: builtin/notes.c:1022 +#: builtin/notes.c:1024 #, c-format msgid "unknown subcommand: %s" msgstr "" @@ -11168,217 +12506,365 @@ msgid "" "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" msgstr "" -#: builtin/pack-objects.c:211 builtin/pack-objects.c:214 +#: builtin/pack-objects.c:414 #, c-format -msgid "deflate error (%d)" +msgid "bad packed object CRC for %s" +msgstr "" + +#: builtin/pack-objects.c:425 +#, c-format +msgid "corrupt packed object for %s" +msgstr "" + +#: builtin/pack-objects.c:556 +#, c-format +msgid "recursive delta detected for object %s" msgstr "" -#: builtin/pack-objects.c:810 +#: builtin/pack-objects.c:756 +#, c-format +msgid "ordered %u objects, expected %<PRIu32>" +msgstr "" + +#: builtin/pack-objects.c:769 +#, c-format +msgid "packfile is invalid: %s" +msgstr "" + +#: builtin/pack-objects.c:773 +#, c-format +msgid "unable to open packfile for reuse: %s" +msgstr "" + +#: builtin/pack-objects.c:777 +msgid "unable to seek in reused packfile" +msgstr "" + +#: builtin/pack-objects.c:788 +msgid "unable to read from reused packfile" +msgstr "" + +#: builtin/pack-objects.c:816 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "" -#: builtin/pack-objects.c:823 +#: builtin/pack-objects.c:829 msgid "Writing objects" msgstr "" -#: builtin/pack-objects.c:1106 +#: builtin/pack-objects.c:891 builtin/update-index.c:88 +#, c-format +msgid "failed to stat %s" +msgstr "" + +#: builtin/pack-objects.c:944 +#, c-format +msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" +msgstr "" + +#: builtin/pack-objects.c:1112 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" -#: builtin/pack-objects.c:1765 +#: builtin/pack-objects.c:1489 +#, c-format +msgid "delta base offset overflow in pack for %s" +msgstr "" + +#: builtin/pack-objects.c:1498 +#, c-format +msgid "delta base offset out of bound for %s" +msgstr "" + +#: builtin/pack-objects.c:1771 msgid "Counting objects" msgstr "" -#: builtin/pack-objects.c:1895 +#: builtin/pack-objects.c:1913 #, c-format msgid "unable to get size of %s" msgstr "" -#: builtin/pack-objects.c:1910 +#: builtin/pack-objects.c:1928 #, c-format msgid "unable to parse object header of %s" msgstr "" -#: builtin/pack-objects.c:2564 +#: builtin/pack-objects.c:1995 builtin/pack-objects.c:2011 +#: builtin/pack-objects.c:2021 +#, c-format +msgid "object %s cannot be read" +msgstr "" + +#: builtin/pack-objects.c:1998 builtin/pack-objects.c:2025 +#, c-format +msgid "object %s inconsistent object length (%lu vs %lu)" +msgstr "" + +#: builtin/pack-objects.c:2035 +msgid "suboptimal pack - out of memory" +msgstr "" + +#: builtin/pack-objects.c:2369 +#, c-format +msgid "Delta compression using up to %d threads" +msgstr "" + +#: builtin/pack-objects.c:2505 +#, c-format +msgid "unable to pack objects reachable from tag %s" +msgstr "" + +#: builtin/pack-objects.c:2589 msgid "Compressing objects" msgstr "" -#: builtin/pack-objects.c:2735 +#: builtin/pack-objects.c:2595 +msgid "inconsistency with delta count" +msgstr "" + +#: builtin/pack-objects.c:2674 +#, c-format +msgid "" +"expected edge object ID, got garbage:\n" +" %s" +msgstr "" + +#: builtin/pack-objects.c:2680 +#, c-format +msgid "" +"expected object ID, got garbage:\n" +" %s" +msgstr "" + +#: builtin/pack-objects.c:2760 msgid "invalid value for --missing" msgstr "" -#: builtin/pack-objects.c:3067 +#: builtin/pack-objects.c:2819 builtin/pack-objects.c:2927 +msgid "cannot open pack index" +msgstr "" + +#: builtin/pack-objects.c:2850 +#, c-format +msgid "loose object at %s could not be examined" +msgstr "" + +#: builtin/pack-objects.c:2935 +msgid "unable to force loose object" +msgstr "" + +#: builtin/pack-objects.c:3022 +#, c-format +msgid "not a rev '%s'" +msgstr "" + +#: builtin/pack-objects.c:3025 +#, c-format +msgid "bad revision '%s'" +msgstr "" + +#: builtin/pack-objects.c:3045 +msgid "unable to add recent objects" +msgstr "" + +#: builtin/pack-objects.c:3095 #, c-format msgid "unsupported index version %s" msgstr "" -#: builtin/pack-objects.c:3071 +#: builtin/pack-objects.c:3099 #, c-format msgid "bad index version '%s'" msgstr "" -#: builtin/pack-objects.c:3102 +#: builtin/pack-objects.c:3130 msgid "do not show progress meter" msgstr "" -#: builtin/pack-objects.c:3104 +#: builtin/pack-objects.c:3132 msgid "show progress meter" msgstr "" -#: builtin/pack-objects.c:3106 +#: builtin/pack-objects.c:3134 msgid "show progress meter during object writing phase" msgstr "" -#: builtin/pack-objects.c:3109 +#: builtin/pack-objects.c:3137 msgid "similar to --all-progress when progress meter is shown" msgstr "" -#: builtin/pack-objects.c:3110 -msgid "version[,offset]" +#: builtin/pack-objects.c:3138 +msgid "<version>[,<offset>]" msgstr "" -#: builtin/pack-objects.c:3111 +#: builtin/pack-objects.c:3139 msgid "write the pack index file in the specified idx format version" msgstr "" -#: builtin/pack-objects.c:3114 +#: builtin/pack-objects.c:3142 msgid "maximum size of each output pack file" msgstr "" -#: builtin/pack-objects.c:3116 +#: builtin/pack-objects.c:3144 msgid "ignore borrowed objects from alternate object store" msgstr "" -#: builtin/pack-objects.c:3118 +#: builtin/pack-objects.c:3146 msgid "ignore packed objects" msgstr "" -#: builtin/pack-objects.c:3120 +#: builtin/pack-objects.c:3148 msgid "limit pack window by objects" msgstr "" -#: builtin/pack-objects.c:3122 +#: builtin/pack-objects.c:3150 msgid "limit pack window by memory in addition to object limit" msgstr "" -#: builtin/pack-objects.c:3124 +#: builtin/pack-objects.c:3152 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "" -#: builtin/pack-objects.c:3126 +#: builtin/pack-objects.c:3154 msgid "reuse existing deltas" msgstr "" -#: builtin/pack-objects.c:3128 +#: builtin/pack-objects.c:3156 msgid "reuse existing objects" msgstr "" -#: builtin/pack-objects.c:3130 +#: builtin/pack-objects.c:3158 msgid "use OFS_DELTA objects" msgstr "" -#: builtin/pack-objects.c:3132 +#: builtin/pack-objects.c:3160 msgid "use threads when searching for best delta matches" msgstr "" -#: builtin/pack-objects.c:3134 +#: builtin/pack-objects.c:3162 msgid "do not create an empty pack output" msgstr "" -#: builtin/pack-objects.c:3136 +#: builtin/pack-objects.c:3164 msgid "read revision arguments from standard input" msgstr "" -#: builtin/pack-objects.c:3138 +#: builtin/pack-objects.c:3166 msgid "limit the objects to those that are not yet packed" msgstr "" -#: builtin/pack-objects.c:3141 +#: builtin/pack-objects.c:3169 msgid "include objects reachable from any reference" msgstr "" -#: builtin/pack-objects.c:3144 +#: builtin/pack-objects.c:3172 msgid "include objects referred by reflog entries" msgstr "" -#: builtin/pack-objects.c:3147 +#: builtin/pack-objects.c:3175 msgid "include objects referred to by the index" msgstr "" -#: builtin/pack-objects.c:3150 +#: builtin/pack-objects.c:3178 msgid "output pack to stdout" msgstr "" -#: builtin/pack-objects.c:3152 +#: builtin/pack-objects.c:3180 msgid "include tag objects that refer to objects to be packed" msgstr "" -#: builtin/pack-objects.c:3154 +#: builtin/pack-objects.c:3182 msgid "keep unreachable objects" msgstr "" -#: builtin/pack-objects.c:3156 +#: builtin/pack-objects.c:3184 msgid "pack loose unreachable objects" msgstr "" -#: builtin/pack-objects.c:3158 +#: builtin/pack-objects.c:3186 msgid "unpack unreachable objects newer than <time>" msgstr "" -#: builtin/pack-objects.c:3161 +#: builtin/pack-objects.c:3189 msgid "create thin packs" msgstr "" -#: builtin/pack-objects.c:3163 +#: builtin/pack-objects.c:3191 msgid "create packs suitable for shallow fetches" msgstr "" -#: builtin/pack-objects.c:3165 +#: builtin/pack-objects.c:3193 msgid "ignore packs that have companion .keep file" msgstr "" -#: builtin/pack-objects.c:3167 +#: builtin/pack-objects.c:3195 msgid "ignore this pack" msgstr "" -#: builtin/pack-objects.c:3169 +#: builtin/pack-objects.c:3197 msgid "pack compression level" msgstr "" -#: builtin/pack-objects.c:3171 +#: builtin/pack-objects.c:3199 msgid "do not hide commits by grafts" msgstr "" -#: builtin/pack-objects.c:3173 +#: builtin/pack-objects.c:3201 msgid "use a bitmap index if available to speed up counting objects" msgstr "" -#: builtin/pack-objects.c:3175 +#: builtin/pack-objects.c:3203 msgid "write a bitmap index together with the pack index" msgstr "" -#: builtin/pack-objects.c:3178 +#: builtin/pack-objects.c:3206 msgid "handling for missing objects" msgstr "" -#: builtin/pack-objects.c:3181 +#: builtin/pack-objects.c:3209 msgid "do not pack objects in promisor packfiles" msgstr "" -#: builtin/pack-objects.c:3205 +#: builtin/pack-objects.c:3233 #, c-format msgid "delta chain depth %d is too deep, forcing %d" msgstr "" -#: builtin/pack-objects.c:3210 +#: builtin/pack-objects.c:3238 #, c-format msgid "pack.deltaCacheLimit is too high, forcing %d" msgstr "" -#: builtin/pack-objects.c:3338 +#: builtin/pack-objects.c:3294 +msgid "--max-pack-size cannot be used to build a pack for transfer" +msgstr "" + +#: builtin/pack-objects.c:3296 +msgid "minimum pack size limit is 1 MiB" +msgstr "" + +#: builtin/pack-objects.c:3301 +msgid "--thin cannot be used to build an indexable pack" +msgstr "" + +#: builtin/pack-objects.c:3304 +msgid "--keep-unreachable and --unpack-unreachable are incompatible" +msgstr "" + +#: builtin/pack-objects.c:3310 +msgid "cannot use --filter without --stdout" +msgstr "" + +#: builtin/pack-objects.c:3366 msgid "Enumerating objects" msgstr "" +#: builtin/pack-objects.c:3385 +#, c-format +msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)" +msgstr "" + #: builtin/pack-refs.c:7 msgid "git pack-refs [<options>]" msgstr "" @@ -11391,31 +12877,31 @@ msgstr "" msgid "prune loose refs (default)" msgstr "" -#: builtin/prune-packed.c:8 +#: builtin/prune-packed.c:9 msgid "git prune-packed [-n | --dry-run] [-q | --quiet]" msgstr "" -#: builtin/prune-packed.c:41 +#: builtin/prune-packed.c:42 msgid "Removing duplicate objects" msgstr "" -#: builtin/prune.c:11 +#: builtin/prune.c:12 msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]" msgstr "" -#: builtin/prune.c:108 +#: builtin/prune.c:109 msgid "report pruned objects" msgstr "" -#: builtin/prune.c:111 +#: builtin/prune.c:112 msgid "expire objects older than <time>" msgstr "" -#: builtin/prune.c:113 +#: builtin/prune.c:114 msgid "limit traversal to objects outside promisor packfiles" msgstr "" -#: builtin/prune.c:127 +#: builtin/prune.c:128 msgid "cannot prune in a precious-objects repo" msgstr "" @@ -11440,7 +12926,7 @@ msgstr "" msgid "incorporate changes by rebasing rather than merging" msgstr "" -#: builtin/pull.c:166 builtin/rebase--helper.c:23 builtin/revert.c:121 +#: builtin/pull.c:166 builtin/rebase--helper.c:23 builtin/revert.c:122 msgid "allow fast-forward" msgstr "" @@ -11507,7 +12993,7 @@ msgstr "" msgid "<remote>" msgstr "" -#: builtin/pull.c:438 builtin/pull.c:453 builtin/pull.c:458 git-rebase.sh:523 +#: builtin/pull.c:438 builtin/pull.c:453 builtin/pull.c:458 git-rebase.sh:576 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "" @@ -11528,27 +13014,27 @@ msgid "" "from the remote, but no such ref was fetched." msgstr "" -#: builtin/pull.c:826 +#: builtin/pull.c:829 msgid "ignoring --verify-signatures for rebase" msgstr "" -#: builtin/pull.c:874 +#: builtin/pull.c:877 msgid "--[no-]autostash option is only valid with --rebase." msgstr "" -#: builtin/pull.c:882 +#: builtin/pull.c:885 msgid "Updating an unborn branch with changes added to the index." msgstr "" -#: builtin/pull.c:885 +#: builtin/pull.c:888 msgid "pull with rebase" msgstr "" -#: builtin/pull.c:886 +#: builtin/pull.c:889 msgid "please commit or stash them." msgstr "" -#: builtin/pull.c:911 +#: builtin/pull.c:914 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -11556,7 +13042,7 @@ msgid "" "commit %s." msgstr "" -#: builtin/pull.c:916 +#: builtin/pull.c:919 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -11567,15 +13053,15 @@ msgid "" "to recover." msgstr "" -#: builtin/pull.c:931 +#: builtin/pull.c:934 msgid "Cannot merge multiple branches into empty head." msgstr "" -#: builtin/pull.c:935 +#: builtin/pull.c:938 msgid "Cannot rebase onto multiple branches." msgstr "" -#: builtin/pull.c:942 +#: builtin/pull.c:945 msgid "cannot rebase with locally recorded submodule modifications" msgstr "" @@ -11738,7 +13224,7 @@ msgid "force updates" msgstr "" #: builtin/push.c:561 builtin/send-pack.c:181 -msgid "refname>:<expect" +msgid "<refname>:<expect>" msgstr "" #: builtin/push.c:562 builtin/send-pack.c:182 @@ -11814,6 +13300,39 @@ msgstr "" msgid "push options must not have new line characters" msgstr "" +#: builtin/range-diff.c:8 +msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>" +msgstr "" + +#: builtin/range-diff.c:9 +msgid "git range-diff [<options>] <old-tip>...<new-tip>" +msgstr "" + +#: builtin/range-diff.c:10 +msgid "git range-diff [<options>] <base> <old-tip> <new-tip>" +msgstr "" + +#: builtin/range-diff.c:26 +msgid "Percentage by which creation is weighted" +msgstr "" + +#: builtin/range-diff.c:28 +msgid "color both diff and diff-between-diffs" +msgstr "" + +#: builtin/range-diff.c:75 builtin/range-diff.c:79 +#, c-format +msgid "no .. in range: '%s'" +msgstr "" + +#: builtin/range-diff.c:89 +msgid "single arg format must be symmetric range" +msgstr "" + +#: builtin/range-diff.c:104 +msgid "need two commit ranges" +msgstr "" + #: builtin/read-tree.c:40 msgid "" "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) " @@ -11893,7 +13412,7 @@ msgstr "" msgid "keep empty commits" msgstr "" -#: builtin/rebase--helper.c:26 builtin/revert.c:123 +#: builtin/rebase--helper.c:26 builtin/revert.c:124 msgid "allow commits with empty messages" msgstr "" @@ -11945,11 +13464,11 @@ msgstr "" msgid "--[no-]rebase-cousins has no effect without --rebase-merges" msgstr "" -#: builtin/receive-pack.c:31 +#: builtin/receive-pack.c:32 msgid "git receive-pack <git-dir>" msgstr "" -#: builtin/receive-pack.c:842 +#: builtin/receive-pack.c:830 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" @@ -11966,7 +13485,7 @@ msgid "" "'receive.denyCurrentBranch' configuration variable to 'refuse'." msgstr "" -#: builtin/receive-pack.c:862 +#: builtin/receive-pack.c:850 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" @@ -11978,189 +13497,189 @@ msgid "" "To squelch this message, you can set it to 'refuse'." msgstr "" -#: builtin/receive-pack.c:1935 +#: builtin/receive-pack.c:1923 msgid "quiet" msgstr "" -#: builtin/receive-pack.c:1949 +#: builtin/receive-pack.c:1937 msgid "You must specify a directory." msgstr "" -#: builtin/reflog.c:532 builtin/reflog.c:537 +#: builtin/reflog.c:536 builtin/reflog.c:541 #, c-format msgid "'%s' is not a valid timestamp" msgstr "" -#: builtin/remote.c:14 +#: builtin/remote.c:15 msgid "git remote [-v | --verbose]" msgstr "" -#: builtin/remote.c:15 +#: builtin/remote.c:16 msgid "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <name> <url>" msgstr "" -#: builtin/remote.c:16 builtin/remote.c:36 +#: builtin/remote.c:17 builtin/remote.c:37 msgid "git remote rename <old> <new>" msgstr "" -#: builtin/remote.c:17 builtin/remote.c:41 +#: builtin/remote.c:18 builtin/remote.c:42 msgid "git remote remove <name>" msgstr "" -#: builtin/remote.c:18 builtin/remote.c:46 +#: builtin/remote.c:19 builtin/remote.c:47 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" msgstr "" -#: builtin/remote.c:19 +#: builtin/remote.c:20 msgid "git remote [-v | --verbose] show [-n] <name>" msgstr "" -#: builtin/remote.c:20 +#: builtin/remote.c:21 msgid "git remote prune [-n | --dry-run] <name>" msgstr "" -#: builtin/remote.c:21 +#: builtin/remote.c:22 msgid "" "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" msgstr "" -#: builtin/remote.c:22 +#: builtin/remote.c:23 msgid "git remote set-branches [--add] <name> <branch>..." msgstr "" -#: builtin/remote.c:23 builtin/remote.c:72 +#: builtin/remote.c:24 builtin/remote.c:73 msgid "git remote get-url [--push] [--all] <name>" msgstr "" -#: builtin/remote.c:24 builtin/remote.c:77 +#: builtin/remote.c:25 builtin/remote.c:78 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" msgstr "" -#: builtin/remote.c:25 builtin/remote.c:78 +#: builtin/remote.c:26 builtin/remote.c:79 msgid "git remote set-url --add <name> <newurl>" msgstr "" -#: builtin/remote.c:26 builtin/remote.c:79 +#: builtin/remote.c:27 builtin/remote.c:80 msgid "git remote set-url --delete <name> <url>" msgstr "" -#: builtin/remote.c:31 +#: builtin/remote.c:32 msgid "git remote add [<options>] <name> <url>" msgstr "" -#: builtin/remote.c:51 +#: builtin/remote.c:52 msgid "git remote set-branches <name> <branch>..." msgstr "" -#: builtin/remote.c:52 +#: builtin/remote.c:53 msgid "git remote set-branches --add <name> <branch>..." msgstr "" -#: builtin/remote.c:57 +#: builtin/remote.c:58 msgid "git remote show [<options>] <name>" msgstr "" -#: builtin/remote.c:62 +#: builtin/remote.c:63 msgid "git remote prune [<options>] <name>" msgstr "" -#: builtin/remote.c:67 +#: builtin/remote.c:68 msgid "git remote update [<options>] [<group> | <remote>]..." msgstr "" -#: builtin/remote.c:96 +#: builtin/remote.c:97 #, c-format msgid "Updating %s" msgstr "" -#: builtin/remote.c:128 +#: builtin/remote.c:129 msgid "" "--mirror is dangerous and deprecated; please\n" "\t use --mirror=fetch or --mirror=push instead" msgstr "" -#: builtin/remote.c:145 +#: builtin/remote.c:146 #, c-format msgid "unknown mirror argument: %s" msgstr "" -#: builtin/remote.c:161 +#: builtin/remote.c:162 msgid "fetch the remote branches" msgstr "" -#: builtin/remote.c:163 +#: builtin/remote.c:164 msgid "import all tags and associated objects when fetching" msgstr "" -#: builtin/remote.c:166 +#: builtin/remote.c:167 msgid "or do not fetch any tag at all (--no-tags)" msgstr "" -#: builtin/remote.c:168 +#: builtin/remote.c:169 msgid "branch(es) to track" msgstr "" -#: builtin/remote.c:169 +#: builtin/remote.c:170 msgid "master branch" msgstr "" -#: builtin/remote.c:170 +#: builtin/remote.c:171 msgid "push|fetch" msgstr "" -#: builtin/remote.c:171 +#: builtin/remote.c:172 msgid "set up remote as a mirror to push to or fetch from" msgstr "" -#: builtin/remote.c:183 +#: builtin/remote.c:184 msgid "specifying a master branch makes no sense with --mirror" msgstr "" -#: builtin/remote.c:185 +#: builtin/remote.c:186 msgid "specifying branches to track makes sense only with fetch mirrors" msgstr "" -#: builtin/remote.c:192 builtin/remote.c:634 +#: builtin/remote.c:193 builtin/remote.c:635 #, c-format msgid "remote %s already exists." msgstr "" -#: builtin/remote.c:196 builtin/remote.c:638 +#: builtin/remote.c:197 builtin/remote.c:639 #, c-format msgid "'%s' is not a valid remote name" msgstr "" -#: builtin/remote.c:236 +#: builtin/remote.c:237 #, c-format msgid "Could not setup master '%s'" msgstr "" -#: builtin/remote.c:342 +#: builtin/remote.c:343 #, c-format msgid "Could not get fetch map for refspec %s" msgstr "" -#: builtin/remote.c:441 builtin/remote.c:449 +#: builtin/remote.c:442 builtin/remote.c:450 msgid "(matching)" msgstr "" -#: builtin/remote.c:453 +#: builtin/remote.c:454 msgid "(delete)" msgstr "" -#: builtin/remote.c:627 builtin/remote.c:762 builtin/remote.c:861 +#: builtin/remote.c:628 builtin/remote.c:764 builtin/remote.c:863 #, c-format msgid "No such remote: %s" msgstr "" -#: builtin/remote.c:644 +#: builtin/remote.c:645 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "" -#: builtin/remote.c:664 +#: builtin/remote.c:665 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -12168,17 +13687,17 @@ msgid "" "\tPlease update the configuration manually if necessary." msgstr "" -#: builtin/remote.c:700 +#: builtin/remote.c:701 #, c-format msgid "deleting '%s' failed" msgstr "" -#: builtin/remote.c:734 +#: builtin/remote.c:735 #, c-format msgid "creating '%s' failed" msgstr "" -#: builtin/remote.c:799 +#: builtin/remote.c:801 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -12188,118 +13707,118 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/remote.c:813 +#: builtin/remote.c:815 #, c-format msgid "Could not remove config section '%s'" msgstr "" -#: builtin/remote.c:914 +#: builtin/remote.c:916 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr "" -#: builtin/remote.c:917 +#: builtin/remote.c:919 msgid " tracked" msgstr "" -#: builtin/remote.c:919 +#: builtin/remote.c:921 msgid " stale (use 'git remote prune' to remove)" msgstr "" -#: builtin/remote.c:921 +#: builtin/remote.c:923 msgid " ???" msgstr "" -#: builtin/remote.c:962 +#: builtin/remote.c:964 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "" -#: builtin/remote.c:971 +#: builtin/remote.c:973 #, c-format msgid "rebases interactively onto remote %s" msgstr "" -#: builtin/remote.c:973 +#: builtin/remote.c:975 #, c-format msgid "rebases interactively (with merges) onto remote %s" msgstr "" -#: builtin/remote.c:976 +#: builtin/remote.c:978 #, c-format msgid "rebases onto remote %s" msgstr "" -#: builtin/remote.c:980 +#: builtin/remote.c:982 #, c-format msgid " merges with remote %s" msgstr "" -#: builtin/remote.c:983 +#: builtin/remote.c:985 #, c-format msgid "merges with remote %s" msgstr "" -#: builtin/remote.c:986 +#: builtin/remote.c:988 #, c-format msgid "%-*s and with remote %s\n" msgstr "" -#: builtin/remote.c:1029 +#: builtin/remote.c:1031 msgid "create" msgstr "" -#: builtin/remote.c:1032 +#: builtin/remote.c:1034 msgid "delete" msgstr "" -#: builtin/remote.c:1036 +#: builtin/remote.c:1038 msgid "up to date" msgstr "" -#: builtin/remote.c:1039 +#: builtin/remote.c:1041 msgid "fast-forwardable" msgstr "" -#: builtin/remote.c:1042 +#: builtin/remote.c:1044 msgid "local out of date" msgstr "" -#: builtin/remote.c:1049 +#: builtin/remote.c:1051 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr "" -#: builtin/remote.c:1052 +#: builtin/remote.c:1054 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr "" -#: builtin/remote.c:1056 +#: builtin/remote.c:1058 #, c-format msgid " %-*s forces to %s" msgstr "" -#: builtin/remote.c:1059 +#: builtin/remote.c:1061 #, c-format msgid " %-*s pushes to %s" msgstr "" -#: builtin/remote.c:1127 +#: builtin/remote.c:1129 msgid "do not query remotes" msgstr "" -#: builtin/remote.c:1154 +#: builtin/remote.c:1156 #, c-format msgid "* remote %s" msgstr "" -#: builtin/remote.c:1155 +#: builtin/remote.c:1157 #, c-format msgid " Fetch URL: %s" msgstr "" -#: builtin/remote.c:1156 builtin/remote.c:1172 builtin/remote.c:1311 +#: builtin/remote.c:1158 builtin/remote.c:1174 builtin/remote.c:1313 msgid "(no URL)" msgstr "" @@ -12307,283 +13826,283 @@ msgstr "" #. with the one in " Fetch URL: %s" #. translation. #. -#: builtin/remote.c:1170 builtin/remote.c:1172 +#: builtin/remote.c:1172 builtin/remote.c:1174 #, c-format msgid " Push URL: %s" msgstr "" -#: builtin/remote.c:1174 builtin/remote.c:1176 builtin/remote.c:1178 +#: builtin/remote.c:1176 builtin/remote.c:1178 builtin/remote.c:1180 #, c-format msgid " HEAD branch: %s" msgstr "" -#: builtin/remote.c:1174 +#: builtin/remote.c:1176 msgid "(not queried)" msgstr "" -#: builtin/remote.c:1176 +#: builtin/remote.c:1178 msgid "(unknown)" msgstr "" -#: builtin/remote.c:1180 +#: builtin/remote.c:1182 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" msgstr "" -#: builtin/remote.c:1192 +#: builtin/remote.c:1194 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] "" msgstr[1] "" -#: builtin/remote.c:1195 builtin/remote.c:1221 +#: builtin/remote.c:1197 builtin/remote.c:1223 msgid " (status not queried)" msgstr "" -#: builtin/remote.c:1204 +#: builtin/remote.c:1206 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] "" msgstr[1] "" -#: builtin/remote.c:1212 +#: builtin/remote.c:1214 msgid " Local refs will be mirrored by 'git push'" msgstr "" -#: builtin/remote.c:1218 +#: builtin/remote.c:1220 #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" msgstr[0] "" msgstr[1] "" -#: builtin/remote.c:1239 +#: builtin/remote.c:1241 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "" -#: builtin/remote.c:1241 +#: builtin/remote.c:1243 msgid "delete refs/remotes/<name>/HEAD" msgstr "" -#: builtin/remote.c:1256 +#: builtin/remote.c:1258 msgid "Cannot determine remote HEAD" msgstr "" -#: builtin/remote.c:1258 +#: builtin/remote.c:1260 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "" -#: builtin/remote.c:1268 +#: builtin/remote.c:1270 #, c-format msgid "Could not delete %s" msgstr "" -#: builtin/remote.c:1276 +#: builtin/remote.c:1278 #, c-format msgid "Not a valid ref: %s" msgstr "" -#: builtin/remote.c:1278 +#: builtin/remote.c:1280 #, c-format msgid "Could not setup %s" msgstr "" -#: builtin/remote.c:1296 +#: builtin/remote.c:1298 #, c-format msgid " %s will become dangling!" msgstr "" -#: builtin/remote.c:1297 +#: builtin/remote.c:1299 #, c-format msgid " %s has become dangling!" msgstr "" -#: builtin/remote.c:1307 +#: builtin/remote.c:1309 #, c-format msgid "Pruning %s" msgstr "" -#: builtin/remote.c:1308 +#: builtin/remote.c:1310 #, c-format msgid "URL: %s" msgstr "" -#: builtin/remote.c:1324 +#: builtin/remote.c:1326 #, c-format msgid " * [would prune] %s" msgstr "" -#: builtin/remote.c:1327 +#: builtin/remote.c:1329 #, c-format msgid " * [pruned] %s" msgstr "" -#: builtin/remote.c:1372 +#: builtin/remote.c:1374 msgid "prune remotes after fetching" msgstr "" -#: builtin/remote.c:1435 builtin/remote.c:1489 builtin/remote.c:1557 +#: builtin/remote.c:1437 builtin/remote.c:1491 builtin/remote.c:1559 #, c-format msgid "No such remote '%s'" msgstr "" -#: builtin/remote.c:1451 +#: builtin/remote.c:1453 msgid "add branch" msgstr "" -#: builtin/remote.c:1458 +#: builtin/remote.c:1460 msgid "no remote specified" msgstr "" -#: builtin/remote.c:1475 +#: builtin/remote.c:1477 msgid "query push URLs rather than fetch URLs" msgstr "" -#: builtin/remote.c:1477 +#: builtin/remote.c:1479 msgid "return all URLs" msgstr "" -#: builtin/remote.c:1505 +#: builtin/remote.c:1507 #, c-format msgid "no URLs configured for remote '%s'" msgstr "" -#: builtin/remote.c:1531 +#: builtin/remote.c:1533 msgid "manipulate push URLs" msgstr "" -#: builtin/remote.c:1533 +#: builtin/remote.c:1535 msgid "add URL" msgstr "" -#: builtin/remote.c:1535 +#: builtin/remote.c:1537 msgid "delete URLs" msgstr "" -#: builtin/remote.c:1542 +#: builtin/remote.c:1544 msgid "--add --delete doesn't make sense" msgstr "" -#: builtin/remote.c:1581 +#: builtin/remote.c:1583 #, c-format msgid "Invalid old URL pattern: %s" msgstr "" -#: builtin/remote.c:1589 +#: builtin/remote.c:1591 #, c-format msgid "No such URL found: %s" msgstr "" -#: builtin/remote.c:1591 +#: builtin/remote.c:1593 msgid "Will not delete all non-push URLs" msgstr "" -#: builtin/remote.c:1607 +#: builtin/remote.c:1609 msgid "be verbose; must be placed before a subcommand" msgstr "" -#: builtin/remote.c:1638 +#: builtin/remote.c:1640 #, c-format msgid "Unknown subcommand: %s" msgstr "" -#: builtin/repack.c:18 +#: builtin/repack.c:20 msgid "git repack [<options>]" msgstr "" -#: builtin/repack.c:23 +#: builtin/repack.c:25 msgid "" "Incremental repacks are incompatible with bitmap indexes. Use\n" "--no-write-bitmap-index or disable the pack.writebitmaps configuration." msgstr "" -#: builtin/repack.c:180 +#: builtin/repack.c:287 msgid "pack everything in a single pack" msgstr "" -#: builtin/repack.c:182 +#: builtin/repack.c:289 msgid "same as -a, and turn unreachable objects loose" msgstr "" -#: builtin/repack.c:185 +#: builtin/repack.c:292 msgid "remove redundant packs, and run git-prune-packed" msgstr "" -#: builtin/repack.c:187 +#: builtin/repack.c:294 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "" -#: builtin/repack.c:189 +#: builtin/repack.c:296 msgid "pass --no-reuse-object to git-pack-objects" msgstr "" -#: builtin/repack.c:191 +#: builtin/repack.c:298 msgid "do not run git-update-server-info" msgstr "" -#: builtin/repack.c:194 +#: builtin/repack.c:301 msgid "pass --local to git-pack-objects" msgstr "" -#: builtin/repack.c:196 +#: builtin/repack.c:303 msgid "write bitmap index" msgstr "" -#: builtin/repack.c:197 +#: builtin/repack.c:304 msgid "approxidate" msgstr "" -#: builtin/repack.c:198 +#: builtin/repack.c:305 msgid "with -A, do not loosen objects older than this" msgstr "" -#: builtin/repack.c:200 +#: builtin/repack.c:307 msgid "with -a, repack unreachable objects" msgstr "" -#: builtin/repack.c:202 +#: builtin/repack.c:309 msgid "size of the window used for delta compression" msgstr "" -#: builtin/repack.c:203 builtin/repack.c:209 +#: builtin/repack.c:310 builtin/repack.c:316 msgid "bytes" msgstr "" -#: builtin/repack.c:204 +#: builtin/repack.c:311 msgid "same as the above, but limit memory size instead of entries count" msgstr "" -#: builtin/repack.c:206 +#: builtin/repack.c:313 msgid "limits the maximum delta depth" msgstr "" -#: builtin/repack.c:208 +#: builtin/repack.c:315 msgid "limits the maximum number of threads" msgstr "" -#: builtin/repack.c:210 +#: builtin/repack.c:317 msgid "maximum size of each packfile" msgstr "" -#: builtin/repack.c:212 +#: builtin/repack.c:319 msgid "repack objects in packs marked with .keep" msgstr "" -#: builtin/repack.c:214 +#: builtin/repack.c:321 msgid "do not repack this pack" msgstr "" -#: builtin/repack.c:224 +#: builtin/repack.c:331 msgid "cannot delete packs in a precious-objects repo" msgstr "" -#: builtin/repack.c:228 +#: builtin/repack.c:335 msgid "--keep-unreachable and -A are incompatible" msgstr "" -#: builtin/repack.c:425 builtin/worktree.c:139 +#: builtin/repack.c:510 builtin/worktree.c:139 #, c-format msgid "failed to remove '%s'" msgstr "" @@ -12612,9 +14131,103 @@ msgstr "" msgid "git replace [--format=<format>] [-l [<pattern>]]" msgstr "" -#: builtin/replace.c:371 builtin/replace.c:415 builtin/replace.c:445 +#: builtin/replace.c:57 builtin/replace.c:203 builtin/replace.c:206 +#, c-format +msgid "failed to resolve '%s' as a valid ref" +msgstr "" + +#: builtin/replace.c:86 +#, c-format +msgid "" +"invalid replace format '%s'\n" +"valid formats are 'short', 'medium' and 'long'" +msgstr "" + +#: builtin/replace.c:121 +#, c-format +msgid "replace ref '%s' not found" +msgstr "" + +#: builtin/replace.c:137 +#, c-format +msgid "Deleted replace ref '%s'" +msgstr "" + +#: builtin/replace.c:149 +#, c-format +msgid "'%s' is not a valid ref name" +msgstr "" + +#: builtin/replace.c:154 #, c-format -msgid "Not a valid object name: '%s'" +msgid "replace ref '%s' already exists" +msgstr "" + +#: builtin/replace.c:174 +#, 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 "" + +#: builtin/replace.c:225 +#, c-format +msgid "unable to open %s for writing" +msgstr "" + +#: builtin/replace.c:238 +msgid "cat-file reported failure" +msgstr "" + +#: builtin/replace.c:254 +#, c-format +msgid "unable to open %s for reading" +msgstr "" + +#: builtin/replace.c:268 +msgid "unable to spawn mktree" +msgstr "" + +#: builtin/replace.c:272 +msgid "unable to read from mktree" +msgstr "" + +#: builtin/replace.c:281 +msgid "mktree reported failure" +msgstr "" + +#: builtin/replace.c:285 +msgid "mktree did not return an object name" +msgstr "" + +#: builtin/replace.c:294 +#, c-format +msgid "unable to fstat %s" +msgstr "" + +#: builtin/replace.c:299 +msgid "unable to write object to database" +msgstr "" + +#: builtin/replace.c:318 builtin/replace.c:371 builtin/replace.c:415 +#: builtin/replace.c:445 +#, c-format +msgid "not a valid object name: '%s'" +msgstr "" + +#: builtin/replace.c:322 +#, c-format +msgid "unable to get object type for %s" +msgstr "" + +#: builtin/replace.c:338 +msgid "editing object file failed" +msgstr "" + +#: builtin/replace.c:347 +#, c-format +msgid "new object is the same as the old one: '%s'" msgstr "" #: builtin/replace.c:407 @@ -12636,7 +14249,7 @@ msgstr "" #: builtin/replace.c:460 #, c-format -msgid "the original commit '%s' has a gpg signature." +msgid "the original commit '%s' has a gpg signature" msgstr "" #: builtin/replace.c:461 @@ -12648,6 +14261,16 @@ msgstr "" msgid "could not write replacement commit for: '%s'" msgstr "" +#: builtin/replace.c:479 +#, c-format +msgid "graft for '%s' unnecessary" +msgstr "" + +#: builtin/replace.c:482 +#, c-format +msgid "new commit is the same as the old one: '%s'" +msgstr "" + #: builtin/replace.c:514 #, c-format msgid "" @@ -12687,6 +14310,42 @@ msgstr "" msgid "use this format" msgstr "" +#: builtin/replace.c:556 +msgid "--format cannot be used when not listing" +msgstr "" + +#: builtin/replace.c:564 +msgid "-f only makes sense when writing a replacement" +msgstr "" + +#: builtin/replace.c:568 +msgid "--raw only makes sense with --edit" +msgstr "" + +#: builtin/replace.c:574 +msgid "-d needs at least one argument" +msgstr "" + +#: builtin/replace.c:580 +msgid "bad number of arguments" +msgstr "" + +#: builtin/replace.c:586 +msgid "-e needs exactly one argument" +msgstr "" + +#: builtin/replace.c:592 +msgid "-g needs at least one argument" +msgstr "" + +#: builtin/replace.c:598 +msgid "--convert-graft-file takes no argument" +msgstr "" + +#: builtin/replace.c:604 +msgid "only one pattern can be given with -l" +msgstr "" + #: builtin/rerere.c:13 msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]" msgstr "" @@ -12820,24 +14479,24 @@ msgstr "" msgid "Could not write new index file." msgstr "" -#: builtin/rev-list.c:397 +#: builtin/rev-list.c:399 msgid "cannot combine --exclude-promisor-objects and --missing" msgstr "" -#: builtin/rev-list.c:455 +#: builtin/rev-list.c:457 msgid "object filtering requires --objects" msgstr "" -#: builtin/rev-list.c:458 +#: builtin/rev-list.c:460 #, c-format msgid "invalid sparse value '%s'" msgstr "" -#: builtin/rev-list.c:499 +#: builtin/rev-list.c:501 msgid "rev-list does not support display of notes" msgstr "" -#: builtin/rev-list.c:502 +#: builtin/rev-list.c:504 msgid "cannot combine --use-bitmap-index with object filtering" msgstr "" @@ -12866,84 +14525,84 @@ msgid "" "Run \"git rev-parse --parseopt -h\" for more information on the first usage." msgstr "" -#: builtin/revert.c:23 +#: builtin/revert.c:24 msgid "git revert [<options>] <commit-ish>..." msgstr "" -#: builtin/revert.c:24 +#: builtin/revert.c:25 msgid "git revert <subcommand>" msgstr "" -#: builtin/revert.c:29 +#: builtin/revert.c:30 msgid "git cherry-pick [<options>] <commit-ish>..." msgstr "" -#: builtin/revert.c:30 +#: builtin/revert.c:31 msgid "git cherry-pick <subcommand>" msgstr "" -#: builtin/revert.c:90 +#: builtin/revert.c:91 #, c-format msgid "%s: %s cannot be used with %s" msgstr "" -#: builtin/revert.c:99 +#: builtin/revert.c:100 msgid "end revert or cherry-pick sequence" msgstr "" -#: builtin/revert.c:100 +#: builtin/revert.c:101 msgid "resume revert or cherry-pick sequence" msgstr "" -#: builtin/revert.c:101 +#: builtin/revert.c:102 msgid "cancel revert or cherry-pick sequence" msgstr "" -#: builtin/revert.c:102 +#: builtin/revert.c:103 msgid "don't automatically commit" msgstr "" -#: builtin/revert.c:103 +#: builtin/revert.c:104 msgid "edit the commit message" msgstr "" -#: builtin/revert.c:106 +#: builtin/revert.c:107 msgid "parent-number" msgstr "" -#: builtin/revert.c:107 +#: builtin/revert.c:108 msgid "select mainline parent" msgstr "" -#: builtin/revert.c:109 +#: builtin/revert.c:110 msgid "merge strategy" msgstr "" -#: builtin/revert.c:110 +#: builtin/revert.c:111 msgid "option" msgstr "" -#: builtin/revert.c:111 +#: builtin/revert.c:112 msgid "option for merge strategy" msgstr "" -#: builtin/revert.c:120 +#: builtin/revert.c:121 msgid "append commit name" msgstr "" -#: builtin/revert.c:122 +#: builtin/revert.c:123 msgid "preserve initially empty commits" msgstr "" -#: builtin/revert.c:124 +#: builtin/revert.c:125 msgid "keep redundant, empty commits" msgstr "" -#: builtin/revert.c:214 +#: builtin/revert.c:219 msgid "revert failed" msgstr "" -#: builtin/revert.c:227 +#: builtin/revert.c:232 msgid "cherry-pick failed" msgstr "" @@ -13005,6 +14664,10 @@ msgstr "" msgid "exit with a zero status even if nothing matched" msgstr "" +#: builtin/rm.c:288 +msgid "please stage your changes to .gitmodules or stash them to proceed" +msgstr "" + #: builtin/rm.c:306 #, c-format msgid "not removing '%s' recursively without -r" @@ -13081,18 +14744,18 @@ msgid "Show the email address of each author" msgstr "" #: builtin/shortlog.c:271 -msgid "w[,i1[,i2]]" +msgid "<w>[,<i1>[,<i2>]]" msgstr "" #: builtin/shortlog.c:272 msgid "Linewrap output" msgstr "" -#: builtin/shortlog.c:298 +#: builtin/shortlog.c:299 msgid "too many arguments given outside repository" msgstr "" -#: builtin/show-branch.c:12 +#: builtin/show-branch.c:13 msgid "" "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" "\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n" @@ -13100,167 +14763,167 @@ msgid "" "\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]" msgstr "" -#: builtin/show-branch.c:16 +#: builtin/show-branch.c:17 msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" msgstr "" -#: builtin/show-branch.c:376 +#: 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] "" -#: builtin/show-branch.c:530 +#: builtin/show-branch.c:549 #, c-format msgid "no matching refs with %s" msgstr "" -#: builtin/show-branch.c:626 +#: builtin/show-branch.c:645 msgid "show remote-tracking and local branches" msgstr "" -#: builtin/show-branch.c:628 +#: builtin/show-branch.c:647 msgid "show remote-tracking branches" msgstr "" -#: builtin/show-branch.c:630 +#: builtin/show-branch.c:649 msgid "color '*!+-' corresponding to the branch" msgstr "" -#: builtin/show-branch.c:632 +#: builtin/show-branch.c:651 msgid "show <n> more commits after the common ancestor" msgstr "" -#: builtin/show-branch.c:634 +#: builtin/show-branch.c:653 msgid "synonym to more=-1" msgstr "" -#: builtin/show-branch.c:635 +#: builtin/show-branch.c:654 msgid "suppress naming strings" msgstr "" -#: builtin/show-branch.c:637 +#: builtin/show-branch.c:656 msgid "include the current branch" msgstr "" -#: builtin/show-branch.c:639 +#: builtin/show-branch.c:658 msgid "name commits with their object names" msgstr "" -#: builtin/show-branch.c:641 +#: builtin/show-branch.c:660 msgid "show possible merge bases" msgstr "" -#: builtin/show-branch.c:643 +#: builtin/show-branch.c:662 msgid "show refs unreachable from any other ref" msgstr "" -#: builtin/show-branch.c:645 +#: builtin/show-branch.c:664 msgid "show commits in topological order" msgstr "" -#: builtin/show-branch.c:648 +#: builtin/show-branch.c:667 msgid "show only commits not on the first branch" msgstr "" -#: builtin/show-branch.c:650 +#: builtin/show-branch.c:669 msgid "show merges reachable from only one tip" msgstr "" -#: builtin/show-branch.c:652 +#: builtin/show-branch.c:671 msgid "topologically sort, maintaining date order where possible" msgstr "" -#: builtin/show-branch.c:655 +#: builtin/show-branch.c:674 msgid "<n>[,<base>]" msgstr "" -#: builtin/show-branch.c:656 +#: builtin/show-branch.c:675 msgid "show <n> most recent ref-log entries starting at base" msgstr "" -#: builtin/show-branch.c:690 +#: builtin/show-branch.c:711 msgid "" "--reflog is incompatible with --all, --remotes, --independent or --merge-base" msgstr "" -#: builtin/show-branch.c:714 +#: builtin/show-branch.c:735 msgid "no branches given, and HEAD is not valid" msgstr "" -#: builtin/show-branch.c:717 +#: builtin/show-branch.c:738 msgid "--reflog option needs one branch name" msgstr "" -#: builtin/show-branch.c:720 +#: builtin/show-branch.c:741 #, c-format msgid "only %d entry can be shown at one time." msgid_plural "only %d entries can be shown at one time." msgstr[0] "" msgstr[1] "" -#: builtin/show-branch.c:724 +#: builtin/show-branch.c:745 #, c-format msgid "no such ref %s" msgstr "" -#: builtin/show-branch.c:808 +#: builtin/show-branch.c:829 #, c-format msgid "cannot handle more than %d rev." msgid_plural "cannot handle more than %d revs." msgstr[0] "" msgstr[1] "" -#: builtin/show-branch.c:812 +#: builtin/show-branch.c:833 #, c-format msgid "'%s' is not a valid ref." msgstr "" -#: builtin/show-branch.c:815 +#: builtin/show-branch.c:836 #, c-format msgid "cannot find commit %s (%s)" msgstr "" -#: builtin/show-ref.c:10 +#: builtin/show-ref.c:11 msgid "" "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]" msgstr "" -#: builtin/show-ref.c:11 +#: builtin/show-ref.c:12 msgid "git show-ref --exclude-existing[=<pattern>]" msgstr "" -#: builtin/show-ref.c:159 +#: builtin/show-ref.c:160 msgid "only show tags (can be combined with heads)" msgstr "" -#: builtin/show-ref.c:160 +#: builtin/show-ref.c:161 msgid "only show heads (can be combined with tags)" msgstr "" -#: builtin/show-ref.c:161 +#: builtin/show-ref.c:162 msgid "stricter reference checking, requires exact ref path" msgstr "" -#: builtin/show-ref.c:164 builtin/show-ref.c:166 +#: builtin/show-ref.c:165 builtin/show-ref.c:167 msgid "show the HEAD reference, even if it would be filtered out" msgstr "" -#: builtin/show-ref.c:168 +#: builtin/show-ref.c:169 msgid "dereference tags into object IDs" msgstr "" -#: builtin/show-ref.c:170 +#: builtin/show-ref.c:171 msgid "only show SHA1 hash using <n> digits" msgstr "" -#: builtin/show-ref.c:174 +#: builtin/show-ref.c:175 msgid "do not print results to stdout (useful with --verify)" msgstr "" -#: builtin/show-ref.c:176 +#: builtin/show-ref.c:177 msgid "show refs from stdin that aren't in local repository" msgstr "" @@ -13280,12 +14943,12 @@ msgstr "" msgid "prepend comment character and space to each line" msgstr "" -#: builtin/submodule--helper.c:37 builtin/submodule--helper.c:1688 +#: builtin/submodule--helper.c:37 builtin/submodule--helper.c:1833 #, c-format msgid "No such ref: %s" msgstr "" -#: builtin/submodule--helper.c:44 builtin/submodule--helper.c:1697 +#: builtin/submodule--helper.c:44 builtin/submodule--helper.c:1842 #, c-format msgid "Expecting a full ref name, got %s" msgstr "" @@ -13294,316 +14957,345 @@ msgstr "" msgid "submodule--helper print-default-remote takes no arguments" msgstr "" -#: builtin/submodule--helper.c:98 +#: builtin/submodule--helper.c:99 #, c-format msgid "cannot strip one component off url '%s'" msgstr "" -#: builtin/submodule--helper.c:406 builtin/submodule--helper.c:1211 +#: builtin/submodule--helper.c:407 builtin/submodule--helper.c:1356 msgid "alternative anchor for relative paths" msgstr "" -#: builtin/submodule--helper.c:411 +#: builtin/submodule--helper.c:412 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "" -#: builtin/submodule--helper.c:462 builtin/submodule--helper.c:485 +#: builtin/submodule--helper.c:469 builtin/submodule--helper.c:606 +#: builtin/submodule--helper.c:629 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "" -#: builtin/submodule--helper.c:500 +#: builtin/submodule--helper.c:521 +#, c-format +msgid "Entering '%s'\n" +msgstr "" + +#: builtin/submodule--helper.c:524 +#, c-format +msgid "" +"run_command returned non-zero status for %s\n" +"." +msgstr "" + +#: builtin/submodule--helper.c:545 +#, c-format +msgid "" +"run_command returned non-zero status whilerecursing in the nested submodules " +"of %s\n" +"." +msgstr "" + +#: builtin/submodule--helper.c:561 +msgid "Suppress output of entering each submodule command" +msgstr "" + +#: builtin/submodule--helper.c:563 builtin/submodule--helper.c:1040 +msgid "Recurse into nested submodules" +msgstr "" + +#: builtin/submodule--helper.c:568 +msgid "git submodule--helper foreach [--quiet] [--recursive] <command>" +msgstr "" + +#: builtin/submodule--helper.c:644 #, c-format msgid "" "could not lookup configuration '%s'. Assuming this repository is its own " "authoritative upstream." msgstr "" -#: builtin/submodule--helper.c:511 +#: builtin/submodule--helper.c:655 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "" -#: builtin/submodule--helper.c:515 +#: builtin/submodule--helper.c:659 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "" -#: builtin/submodule--helper.c:525 +#: builtin/submodule--helper.c:669 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" msgstr "" -#: builtin/submodule--helper.c:532 +#: builtin/submodule--helper.c:676 #, c-format msgid "Failed to register update mode for submodule path '%s'" msgstr "" -#: builtin/submodule--helper.c:554 +#: builtin/submodule--helper.c:698 msgid "Suppress output for initializing a submodule" msgstr "" -#: builtin/submodule--helper.c:559 +#: builtin/submodule--helper.c:703 msgid "git submodule--helper init [<path>]" msgstr "" -#: builtin/submodule--helper.c:631 builtin/submodule--helper.c:757 +#: builtin/submodule--helper.c:775 builtin/submodule--helper.c:901 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "" -#: builtin/submodule--helper.c:670 +#: builtin/submodule--helper.c:814 #, c-format msgid "could not resolve HEAD ref inside the submodule '%s'" msgstr "" -#: builtin/submodule--helper.c:697 builtin/submodule--helper.c:866 +#: builtin/submodule--helper.c:841 builtin/submodule--helper.c:1010 #, c-format msgid "failed to recurse into submodule '%s'" msgstr "" -#: builtin/submodule--helper.c:721 builtin/submodule--helper.c:1031 +#: builtin/submodule--helper.c:865 builtin/submodule--helper.c:1176 msgid "Suppress submodule status output" msgstr "" -#: builtin/submodule--helper.c:722 +#: builtin/submodule--helper.c:866 msgid "" "Use commit stored in the index instead of the one stored in the submodule " "HEAD" msgstr "" -#: builtin/submodule--helper.c:723 +#: builtin/submodule--helper.c:867 msgid "recurse into nested submodules" msgstr "" -#: builtin/submodule--helper.c:728 +#: builtin/submodule--helper.c:872 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" msgstr "" -#: builtin/submodule--helper.c:752 +#: builtin/submodule--helper.c:896 msgid "git submodule--helper name <path>" msgstr "" -#: builtin/submodule--helper.c:816 +#: builtin/submodule--helper.c:960 #, c-format msgid "Synchronizing submodule url for '%s'\n" msgstr "" -#: builtin/submodule--helper.c:822 +#: builtin/submodule--helper.c:966 #, c-format msgid "failed to register url for submodule path '%s'" msgstr "" -#: builtin/submodule--helper.c:836 +#: builtin/submodule--helper.c:980 #, c-format msgid "failed to get the default remote for submodule '%s'" msgstr "" -#: builtin/submodule--helper.c:847 +#: builtin/submodule--helper.c:991 #, c-format msgid "failed to update remote for submodule '%s'" msgstr "" -#: builtin/submodule--helper.c:895 +#: builtin/submodule--helper.c:1038 msgid "Suppress output of synchronizing submodule url" msgstr "" -#: builtin/submodule--helper.c:897 -msgid "Recurse into nested submodules" -msgstr "" - -#: builtin/submodule--helper.c:902 +#: builtin/submodule--helper.c:1045 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" msgstr "" -#: builtin/submodule--helper.c:956 +#: builtin/submodule--helper.c:1099 #, c-format msgid "" "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " "really want to remove it including all of its history)" msgstr "" -#: builtin/submodule--helper.c:968 +#: builtin/submodule--helper.c:1111 #, c-format msgid "" "Submodule work tree '%s' contains local modifications; use '-f' to discard " "them" msgstr "" -#: builtin/submodule--helper.c:976 +#: builtin/submodule--helper.c:1119 #, c-format msgid "Cleared directory '%s'\n" msgstr "" -#: builtin/submodule--helper.c:978 +#: builtin/submodule--helper.c:1121 #, c-format msgid "Could not remove submodule work tree '%s'\n" msgstr "" -#: builtin/submodule--helper.c:987 +#: builtin/submodule--helper.c:1132 #, c-format msgid "could not create empty submodule directory %s" msgstr "" -#: builtin/submodule--helper.c:1003 +#: builtin/submodule--helper.c:1148 #, c-format msgid "Submodule '%s' (%s) unregistered for path '%s'\n" msgstr "" -#: builtin/submodule--helper.c:1032 +#: builtin/submodule--helper.c:1177 msgid "Remove submodule working trees even if they contain local changes" msgstr "" -#: builtin/submodule--helper.c:1033 +#: builtin/submodule--helper.c:1178 msgid "Unregister all submodules" msgstr "" -#: builtin/submodule--helper.c:1038 +#: builtin/submodule--helper.c:1183 msgid "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" msgstr "" -#: builtin/submodule--helper.c:1052 +#: builtin/submodule--helper.c:1197 msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "" -#: builtin/submodule--helper.c:1145 builtin/submodule--helper.c:1148 +#: builtin/submodule--helper.c:1290 builtin/submodule--helper.c:1293 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "" -#: builtin/submodule--helper.c:1184 +#: builtin/submodule--helper.c:1329 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "" -#: builtin/submodule--helper.c:1191 +#: builtin/submodule--helper.c:1336 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "" -#: builtin/submodule--helper.c:1214 +#: builtin/submodule--helper.c:1359 msgid "where the new submodule will be cloned to" msgstr "" -#: builtin/submodule--helper.c:1217 +#: builtin/submodule--helper.c:1362 msgid "name of the new submodule" msgstr "" -#: builtin/submodule--helper.c:1220 +#: builtin/submodule--helper.c:1365 msgid "url where to clone the submodule from" msgstr "" -#: builtin/submodule--helper.c:1228 +#: builtin/submodule--helper.c:1373 msgid "depth for shallow clones" msgstr "" -#: builtin/submodule--helper.c:1231 builtin/submodule--helper.c:1606 +#: builtin/submodule--helper.c:1376 builtin/submodule--helper.c:1751 msgid "force cloning progress" msgstr "" -#: builtin/submodule--helper.c:1236 +#: builtin/submodule--helper.c:1381 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" msgstr "" -#: builtin/submodule--helper.c:1267 +#: builtin/submodule--helper.c:1412 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "" -#: builtin/submodule--helper.c:1281 +#: builtin/submodule--helper.c:1426 #, c-format msgid "could not get submodule directory for '%s'" msgstr "" -#: builtin/submodule--helper.c:1347 +#: builtin/submodule--helper.c:1492 #, c-format msgid "Submodule path '%s' not initialized" msgstr "" -#: builtin/submodule--helper.c:1351 +#: builtin/submodule--helper.c:1496 msgid "Maybe you want to use 'update --init'?" msgstr "" -#: builtin/submodule--helper.c:1380 +#: builtin/submodule--helper.c:1525 #, c-format msgid "Skipping unmerged submodule %s" msgstr "" -#: builtin/submodule--helper.c:1409 +#: builtin/submodule--helper.c:1554 #, c-format msgid "Skipping submodule '%s'" msgstr "" -#: builtin/submodule--helper.c:1544 +#: builtin/submodule--helper.c:1689 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "" -#: builtin/submodule--helper.c:1555 +#: builtin/submodule--helper.c:1700 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "" -#: builtin/submodule--helper.c:1585 builtin/submodule--helper.c:1808 +#: builtin/submodule--helper.c:1730 builtin/submodule--helper.c:1953 msgid "path into the working tree" msgstr "" -#: builtin/submodule--helper.c:1588 +#: builtin/submodule--helper.c:1733 msgid "path into the working tree, across nested submodule boundaries" msgstr "" -#: builtin/submodule--helper.c:1592 +#: builtin/submodule--helper.c:1737 msgid "rebase, merge, checkout or none" msgstr "" -#: builtin/submodule--helper.c:1598 +#: builtin/submodule--helper.c:1743 msgid "Create a shallow clone truncated to the specified number of revisions" msgstr "" -#: builtin/submodule--helper.c:1601 +#: builtin/submodule--helper.c:1746 msgid "parallel jobs" msgstr "" -#: builtin/submodule--helper.c:1603 +#: builtin/submodule--helper.c:1748 msgid "whether the initial clone should follow the shallow recommendation" msgstr "" -#: builtin/submodule--helper.c:1604 +#: builtin/submodule--helper.c:1749 msgid "don't print cloning progress" msgstr "" -#: builtin/submodule--helper.c:1611 +#: builtin/submodule--helper.c:1756 msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" msgstr "" -#: builtin/submodule--helper.c:1624 +#: builtin/submodule--helper.c:1769 msgid "bad value for update parameter" msgstr "" -#: builtin/submodule--helper.c:1692 +#: builtin/submodule--helper.c:1837 #, 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:1809 +#: builtin/submodule--helper.c:1954 msgid "recurse into submodules" msgstr "" -#: builtin/submodule--helper.c:1815 +#: builtin/submodule--helper.c:1960 msgid "git submodule--helper embed-git-dir [<path>...]" msgstr "" -#: builtin/submodule--helper.c:1901 +#: builtin/submodule--helper.c:2071 #, c-format msgid "%s doesn't support --super-prefix" msgstr "" -#: builtin/submodule--helper.c:1907 +#: builtin/submodule--helper.c:2077 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "" @@ -13628,46 +15320,46 @@ msgstr "" msgid "shorten ref output" msgstr "" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363 msgid "reason" msgstr "" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363 msgid "reason of the update" msgstr "" -#: builtin/tag.c:24 +#: builtin/tag.c:25 msgid "" "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> " "[<head>]" msgstr "" -#: builtin/tag.c:25 +#: builtin/tag.c:26 msgid "git tag -d <tagname>..." msgstr "" -#: builtin/tag.c:26 +#: builtin/tag.c:27 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:28 +#: builtin/tag.c:29 msgid "git tag -v [--format=<format>] <tagname>..." msgstr "" -#: builtin/tag.c:86 +#: builtin/tag.c:87 #, c-format msgid "tag '%s' not found." msgstr "" -#: builtin/tag.c:102 +#: builtin/tag.c:103 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "" -#: builtin/tag.c:132 +#: builtin/tag.c:133 #, c-format msgid "" "\n" @@ -13676,7 +15368,7 @@ msgid "" "Lines starting with '%c' will be ignored.\n" msgstr "" -#: builtin/tag.c:136 +#: builtin/tag.c:137 #, c-format msgid "" "\n" @@ -13686,151 +15378,151 @@ msgid "" "want to.\n" msgstr "" -#: builtin/tag.c:190 +#: builtin/tag.c:191 msgid "unable to sign the tag" msgstr "" -#: builtin/tag.c:192 +#: builtin/tag.c:193 msgid "unable to write tag file" msgstr "" -#: builtin/tag.c:217 +#: builtin/tag.c:218 msgid "bad object type." msgstr "" -#: builtin/tag.c:266 +#: builtin/tag.c:267 msgid "no tag message?" msgstr "" -#: builtin/tag.c:273 +#: builtin/tag.c:274 #, c-format msgid "The tag message has been left in %s\n" msgstr "" -#: builtin/tag.c:382 +#: builtin/tag.c:383 msgid "list tag names" msgstr "" -#: builtin/tag.c:384 +#: builtin/tag.c:385 msgid "print <n> lines of each tag message" msgstr "" -#: builtin/tag.c:386 +#: builtin/tag.c:387 msgid "delete tags" msgstr "" -#: builtin/tag.c:387 +#: builtin/tag.c:388 msgid "verify tags" msgstr "" -#: builtin/tag.c:389 +#: builtin/tag.c:390 msgid "Tag creation options" msgstr "" -#: builtin/tag.c:391 +#: builtin/tag.c:392 msgid "annotated tag, needs a message" msgstr "" -#: builtin/tag.c:393 +#: builtin/tag.c:394 msgid "tag message" msgstr "" -#: builtin/tag.c:395 +#: builtin/tag.c:396 msgid "force edit of tag message" msgstr "" -#: builtin/tag.c:396 +#: builtin/tag.c:397 msgid "annotated and GPG-signed tag" msgstr "" -#: builtin/tag.c:400 +#: builtin/tag.c:401 msgid "use another key to sign the tag" msgstr "" -#: builtin/tag.c:401 +#: builtin/tag.c:402 msgid "replace the tag if exists" msgstr "" -#: builtin/tag.c:402 builtin/update-ref.c:368 +#: builtin/tag.c:403 builtin/update-ref.c:369 msgid "create a reflog" msgstr "" -#: builtin/tag.c:404 +#: builtin/tag.c:405 msgid "Tag listing options" msgstr "" -#: builtin/tag.c:405 +#: builtin/tag.c:406 msgid "show tag list in columns" msgstr "" -#: builtin/tag.c:406 builtin/tag.c:408 +#: builtin/tag.c:407 builtin/tag.c:409 msgid "print only tags that contain the commit" msgstr "" -#: builtin/tag.c:407 builtin/tag.c:409 +#: builtin/tag.c:408 builtin/tag.c:410 msgid "print only tags that don't contain the commit" msgstr "" -#: builtin/tag.c:410 +#: builtin/tag.c:411 msgid "print only tags that are merged" msgstr "" -#: builtin/tag.c:411 +#: builtin/tag.c:412 msgid "print only tags that are not merged" msgstr "" -#: builtin/tag.c:416 +#: builtin/tag.c:417 msgid "print only tags of the object" msgstr "" -#: builtin/tag.c:460 +#: builtin/tag.c:461 msgid "--column and -n are incompatible" msgstr "" -#: builtin/tag.c:482 +#: builtin/tag.c:483 msgid "-n option is only allowed in list mode" msgstr "" -#: builtin/tag.c:484 +#: builtin/tag.c:485 msgid "--contains option is only allowed in list mode" msgstr "" -#: builtin/tag.c:486 +#: builtin/tag.c:487 msgid "--no-contains option is only allowed in list mode" msgstr "" -#: builtin/tag.c:488 +#: builtin/tag.c:489 msgid "--points-at option is only allowed in list mode" msgstr "" -#: builtin/tag.c:490 +#: builtin/tag.c:491 msgid "--merged and --no-merged options are only allowed in list mode" msgstr "" -#: builtin/tag.c:501 +#: builtin/tag.c:502 msgid "only one -F or -m option is allowed." msgstr "" -#: builtin/tag.c:520 +#: builtin/tag.c:521 msgid "too many params" msgstr "" -#: builtin/tag.c:526 +#: builtin/tag.c:527 #, c-format msgid "'%s' is not a valid tag name." msgstr "" -#: builtin/tag.c:531 +#: builtin/tag.c:532 #, c-format msgid "tag '%s' already exists" msgstr "" -#: builtin/tag.c:562 +#: builtin/tag.c:563 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "" -#: builtin/unpack-objects.c:498 +#: builtin/unpack-objects.c:500 msgid "Unpacking objects" msgstr "" @@ -13839,11 +15531,6 @@ msgstr "" msgid "failed to create directory %s" msgstr "" -#: builtin/update-index.c:88 -#, c-format -msgid "failed to stat %s" -msgstr "" - #: builtin/update-index.c:98 #, c-format msgid "failed to create file %s" @@ -13892,189 +15579,189 @@ msgstr "" msgid " OK" msgstr "" -#: builtin/update-index.c:589 +#: builtin/update-index.c:588 msgid "git update-index [<options>] [--] [<file>...]" msgstr "" -#: builtin/update-index.c:946 +#: builtin/update-index.c:944 msgid "continue refresh even when index needs update" msgstr "" -#: builtin/update-index.c:949 +#: builtin/update-index.c:947 msgid "refresh: ignore submodules" msgstr "" -#: builtin/update-index.c:952 +#: builtin/update-index.c:950 msgid "do not ignore new files" msgstr "" -#: builtin/update-index.c:954 +#: builtin/update-index.c:952 msgid "let files replace directories and vice-versa" msgstr "" -#: builtin/update-index.c:956 +#: builtin/update-index.c:954 msgid "notice files missing from worktree" msgstr "" -#: builtin/update-index.c:958 +#: builtin/update-index.c:956 msgid "refresh even if index contains unmerged entries" msgstr "" -#: builtin/update-index.c:961 +#: builtin/update-index.c:959 msgid "refresh stat information" msgstr "" -#: builtin/update-index.c:965 +#: builtin/update-index.c:963 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "" -#: builtin/update-index.c:969 +#: builtin/update-index.c:967 msgid "<mode>,<object>,<path>" msgstr "" -#: builtin/update-index.c:970 +#: builtin/update-index.c:968 msgid "add the specified entry to the index" msgstr "" -#: builtin/update-index.c:979 +#: builtin/update-index.c:977 msgid "mark files as \"not changing\"" msgstr "" -#: builtin/update-index.c:982 +#: builtin/update-index.c:980 msgid "clear assumed-unchanged bit" msgstr "" -#: builtin/update-index.c:985 +#: builtin/update-index.c:983 msgid "mark files as \"index-only\"" msgstr "" -#: builtin/update-index.c:988 +#: builtin/update-index.c:986 msgid "clear skip-worktree bit" msgstr "" -#: builtin/update-index.c:991 +#: builtin/update-index.c:989 msgid "add to index only; do not add content to object database" msgstr "" -#: builtin/update-index.c:993 +#: builtin/update-index.c:991 msgid "remove named paths even if present in worktree" msgstr "" -#: builtin/update-index.c:995 +#: builtin/update-index.c:993 msgid "with --stdin: input lines are terminated by null bytes" msgstr "" -#: builtin/update-index.c:997 +#: builtin/update-index.c:995 msgid "read list of paths to be updated from standard input" msgstr "" -#: builtin/update-index.c:1001 +#: builtin/update-index.c:999 msgid "add entries from standard input to the index" msgstr "" -#: builtin/update-index.c:1005 +#: builtin/update-index.c:1003 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "" -#: builtin/update-index.c:1009 +#: builtin/update-index.c:1007 msgid "only update entries that differ from HEAD" msgstr "" -#: builtin/update-index.c:1013 +#: builtin/update-index.c:1011 msgid "ignore files missing from worktree" msgstr "" -#: builtin/update-index.c:1016 +#: builtin/update-index.c:1014 msgid "report actions to standard output" msgstr "" -#: builtin/update-index.c:1018 +#: builtin/update-index.c:1016 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "" -#: builtin/update-index.c:1022 +#: builtin/update-index.c:1020 msgid "write index in this format" msgstr "" -#: builtin/update-index.c:1024 +#: builtin/update-index.c:1022 msgid "enable or disable split index" msgstr "" -#: builtin/update-index.c:1026 +#: builtin/update-index.c:1024 msgid "enable/disable untracked cache" msgstr "" -#: builtin/update-index.c:1028 +#: builtin/update-index.c:1026 msgid "test if the filesystem supports untracked cache" msgstr "" -#: builtin/update-index.c:1030 +#: builtin/update-index.c:1028 msgid "enable untracked cache without testing the filesystem" msgstr "" -#: builtin/update-index.c:1032 +#: builtin/update-index.c:1030 msgid "write out the index even if is not flagged as changed" msgstr "" -#: builtin/update-index.c:1034 +#: builtin/update-index.c:1032 msgid "enable or disable file system monitor" msgstr "" -#: builtin/update-index.c:1036 +#: builtin/update-index.c:1034 msgid "mark files as fsmonitor valid" msgstr "" -#: builtin/update-index.c:1039 +#: builtin/update-index.c:1037 msgid "clear fsmonitor valid bit" msgstr "" -#: builtin/update-index.c:1138 +#: builtin/update-index.c:1136 msgid "" "core.splitIndex is set to false; remove or change it, if you really want to " "enable split index" msgstr "" -#: builtin/update-index.c:1147 +#: builtin/update-index.c:1145 msgid "" "core.splitIndex is set to true; remove or change it, if you really want to " "disable split index" msgstr "" -#: builtin/update-index.c:1158 +#: builtin/update-index.c:1156 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:1162 +#: builtin/update-index.c:1160 msgid "Untracked cache disabled" msgstr "" -#: builtin/update-index.c:1170 +#: builtin/update-index.c:1168 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:1174 +#: builtin/update-index.c:1172 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "" -#: builtin/update-index.c:1182 +#: builtin/update-index.c:1180 msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor" msgstr "" -#: builtin/update-index.c:1186 +#: builtin/update-index.c:1184 msgid "fsmonitor enabled" msgstr "" -#: builtin/update-index.c:1189 +#: builtin/update-index.c:1187 msgid "" "core.fsmonitor is set; remove it if you really want to disable fsmonitor" msgstr "" -#: builtin/update-index.c:1193 +#: builtin/update-index.c:1191 msgid "fsmonitor disabled" msgstr "" @@ -14090,19 +15777,19 @@ msgstr "" msgid "git update-ref [<options>] --stdin [-z]" msgstr "" -#: builtin/update-ref.c:363 +#: builtin/update-ref.c:364 msgid "delete the reference" msgstr "" -#: builtin/update-ref.c:365 +#: builtin/update-ref.c:366 msgid "update <refname> not the one it points to" msgstr "" -#: builtin/update-ref.c:366 +#: builtin/update-ref.c:367 msgid "stdin has NUL-terminated arguments" msgstr "" -#: builtin/update-ref.c:367 +#: builtin/update-ref.c:368 msgid "read updates from stdin" msgstr "" @@ -14130,15 +15817,15 @@ msgstr "" msgid "interrupt transfer after <n> seconds of inactivity" msgstr "" -#: builtin/verify-commit.c:18 +#: builtin/verify-commit.c:20 msgid "git verify-commit [-v | --verbose] <commit>..." msgstr "" -#: builtin/verify-commit.c:73 +#: builtin/verify-commit.c:76 msgid "print commit contents" msgstr "" -#: builtin/verify-commit.c:74 builtin/verify-tag.c:38 +#: builtin/verify-commit.c:77 builtin/verify-tag.c:38 msgid "print raw gpg status output" msgstr "" @@ -14413,7 +16100,7 @@ msgstr "" msgid "write tree object for a subdirectory <prefix>" msgstr "" -#: builtin/write-tree.c:31 +#: builtin/write-tree.c:30 msgid "only useful for debugging" msgstr "" @@ -14482,12 +16169,12 @@ msgstr "" msgid "unknown option: %s\n" msgstr "" -#: git.c:765 +#: git.c:770 #, c-format msgid "expansion of alias '%s' failed; '%s' is not a git command\n" msgstr "" -#: git.c:777 +#: git.c:782 #, c-format msgid "failed to run command '%s': %s\n" msgstr "" @@ -14923,254 +16610,258 @@ msgid "Applies a quilt patchset onto the current branch" msgstr "" #: command-list.h:144 -msgid "Reads tree information into the index" +msgid "Compare two commit ranges (e.g. two versions of a branch)" msgstr "" #: command-list.h:145 -msgid "Reapply commits on top of another base tip" +msgid "Reads tree information into the index" msgstr "" #: command-list.h:146 -msgid "Receive what is pushed into the repository" +msgid "Reapply commits on top of another base tip" msgstr "" #: command-list.h:147 -msgid "Manage reflog information" +msgid "Receive what is pushed into the repository" msgstr "" #: command-list.h:148 -msgid "Manage set of tracked repositories" +msgid "Manage reflog information" msgstr "" #: command-list.h:149 -msgid "Pack unpacked objects in a repository" +msgid "Manage set of tracked repositories" msgstr "" #: command-list.h:150 -msgid "Create, list, delete refs to replace objects" +msgid "Pack unpacked objects in a repository" msgstr "" #: command-list.h:151 -msgid "Generates a summary of pending changes" +msgid "Create, list, delete refs to replace objects" msgstr "" #: command-list.h:152 -msgid "Reuse recorded resolution of conflicted merges" +msgid "Generates a summary of pending changes" msgstr "" #: command-list.h:153 -msgid "Reset current HEAD to the specified state" +msgid "Reuse recorded resolution of conflicted merges" msgstr "" #: command-list.h:154 -msgid "Revert some existing commits" +msgid "Reset current HEAD to the specified state" msgstr "" #: command-list.h:155 -msgid "Lists commit objects in reverse chronological order" +msgid "Revert some existing commits" msgstr "" #: command-list.h:156 -msgid "Pick out and massage parameters" +msgid "Lists commit objects in reverse chronological order" msgstr "" #: command-list.h:157 -msgid "Remove files from the working tree and from the index" +msgid "Pick out and massage parameters" msgstr "" #: command-list.h:158 -msgid "Send a collection of patches as emails" +msgid "Remove files from the working tree and from the index" msgstr "" #: command-list.h:159 -msgid "Push objects over Git protocol to another repository" +msgid "Send a collection of patches as emails" msgstr "" #: command-list.h:160 -msgid "Restricted login shell for Git-only SSH access" +msgid "Push objects over Git protocol to another repository" msgstr "" #: command-list.h:161 -msgid "Summarize 'git log' output" +msgid "Restricted login shell for Git-only SSH access" msgstr "" #: command-list.h:162 -msgid "Show various types of objects" +msgid "Summarize 'git log' output" msgstr "" #: command-list.h:163 -msgid "Show branches and their commits" +msgid "Show various types of objects" msgstr "" #: command-list.h:164 -msgid "Show packed archive index" +msgid "Show branches and their commits" msgstr "" #: command-list.h:165 -msgid "List references in a local repository" +msgid "Show packed archive index" msgstr "" #: command-list.h:166 -msgid "Git's i18n setup code for shell scripts" +msgid "List references in a local repository" msgstr "" #: command-list.h:167 -msgid "Common Git shell script setup code" +msgid "Git's i18n setup code for shell scripts" msgstr "" #: command-list.h:168 -msgid "Stash the changes in a dirty working directory away" +msgid "Common Git shell script setup code" msgstr "" #: command-list.h:169 -msgid "Add file contents to the staging area" +msgid "Stash the changes in a dirty working directory away" msgstr "" #: command-list.h:170 -msgid "Show the working tree status" +msgid "Add file contents to the staging area" msgstr "" #: command-list.h:171 -msgid "Remove unnecessary whitespace" +msgid "Show the working tree status" msgstr "" #: command-list.h:172 -msgid "Initialize, update or inspect submodules" +msgid "Remove unnecessary whitespace" msgstr "" #: command-list.h:173 -msgid "Bidirectional operation between a Subversion repository and Git" +msgid "Initialize, update or inspect submodules" msgstr "" #: command-list.h:174 -msgid "Read, modify and delete symbolic refs" +msgid "Bidirectional operation between a Subversion repository and Git" msgstr "" #: command-list.h:175 -msgid "Create, list, delete or verify a tag object signed with GPG" +msgid "Read, modify and delete symbolic refs" msgstr "" #: command-list.h:176 -msgid "Creates a temporary file with a blob's contents" +msgid "Create, list, delete or verify a tag object signed with GPG" msgstr "" #: command-list.h:177 -msgid "Unpack objects from a packed archive" +msgid "Creates a temporary file with a blob's contents" msgstr "" #: command-list.h:178 -msgid "Register file contents in the working tree to the index" +msgid "Unpack objects from a packed archive" msgstr "" #: command-list.h:179 -msgid "Update the object name stored in a ref safely" +msgid "Register file contents in the working tree to the index" msgstr "" #: command-list.h:180 -msgid "Update auxiliary info file to help dumb servers" +msgid "Update the object name stored in a ref safely" msgstr "" #: command-list.h:181 -msgid "Send archive back to git-archive" +msgid "Update auxiliary info file to help dumb servers" msgstr "" #: command-list.h:182 -msgid "Send objects packed back to git-fetch-pack" +msgid "Send archive back to git-archive" msgstr "" #: command-list.h:183 -msgid "Show a Git logical variable" +msgid "Send objects packed back to git-fetch-pack" msgstr "" #: command-list.h:184 -msgid "Check the GPG signature of commits" +msgid "Show a Git logical variable" msgstr "" #: command-list.h:185 -msgid "Validate packed Git archive files" +msgid "Check the GPG signature of commits" msgstr "" #: command-list.h:186 -msgid "Check the GPG signature of tags" +msgid "Validate packed Git archive files" msgstr "" #: command-list.h:187 -msgid "Git web interface (web frontend to Git repositories)" +msgid "Check the GPG signature of tags" msgstr "" #: command-list.h:188 -msgid "Show logs with difference each commit introduces" +msgid "Git web interface (web frontend to Git repositories)" msgstr "" #: command-list.h:189 -msgid "Manage multiple working trees" +msgid "Show logs with difference each commit introduces" msgstr "" #: command-list.h:190 -msgid "Create a tree object from the current index" +msgid "Manage multiple working trees" msgstr "" #: command-list.h:191 -msgid "Defining attributes per path" +msgid "Create a tree object from the current index" msgstr "" #: command-list.h:192 -msgid "Git command-line interface and conventions" +msgid "Defining attributes per path" msgstr "" #: command-list.h:193 -msgid "A Git core tutorial for developers" +msgid "Git command-line interface and conventions" msgstr "" #: command-list.h:194 -msgid "Git for CVS users" +msgid "A Git core tutorial for developers" msgstr "" #: command-list.h:195 -msgid "Tweaking diff output" +msgid "Git for CVS users" msgstr "" #: command-list.h:196 -msgid "A useful minimum set of commands for Everyday Git" +msgid "Tweaking diff output" msgstr "" #: command-list.h:197 -msgid "A Git Glossary" +msgid "A useful minimum set of commands for Everyday Git" msgstr "" #: command-list.h:198 -msgid "Hooks used by Git" +msgid "A Git Glossary" msgstr "" #: command-list.h:199 -msgid "Specifies intentionally untracked files to ignore" +msgid "Hooks used by Git" msgstr "" #: command-list.h:200 -msgid "Defining submodule properties" +msgid "Specifies intentionally untracked files to ignore" msgstr "" #: command-list.h:201 -msgid "Git namespaces" +msgid "Defining submodule properties" msgstr "" #: command-list.h:202 -msgid "Git Repository Layout" +msgid "Git namespaces" msgstr "" #: command-list.h:203 -msgid "Specifying revisions and ranges for Git" +msgid "Git Repository Layout" msgstr "" #: command-list.h:204 -msgid "A tutorial introduction to Git: part two" +msgid "Specifying revisions and ranges for Git" msgstr "" #: command-list.h:205 -msgid "A tutorial introduction to Git" +msgid "A tutorial introduction to Git: part two" msgstr "" #: command-list.h:206 +msgid "A tutorial introduction to Git" +msgstr "" + +#: command-list.h:207 msgid "An overview of recommended workflows with Git" msgstr "" @@ -15392,7 +17083,7 @@ msgid "" "abort\"." msgstr "" -#: git-rebase.sh:173 git-rebase.sh:442 +#: git-rebase.sh:173 git-rebase.sh:454 #, sh-format msgid "Could not move back to $head_name" msgstr "" @@ -15406,33 +17097,33 @@ msgstr "" msgid "Cannot store $stash_sha1" msgstr "" -#: git-rebase.sh:229 +#: git-rebase.sh:236 msgid "The pre-rebase hook refused to rebase." msgstr "" -#: git-rebase.sh:234 +#: git-rebase.sh:241 msgid "It looks like 'git am' is in progress. Cannot rebase." msgstr "" -#: git-rebase.sh:403 +#: git-rebase.sh:415 msgid "No rebase in progress?" msgstr "" -#: git-rebase.sh:414 +#: git-rebase.sh:426 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "" -#: git-rebase.sh:421 +#: git-rebase.sh:433 msgid "Cannot read HEAD" msgstr "" -#: git-rebase.sh:424 +#: git-rebase.sh:436 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" msgstr "" -#: git-rebase.sh:468 +#: git-rebase.sh:480 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" @@ -15445,78 +17136,90 @@ msgid "" "valuable there." msgstr "" -#: git-rebase.sh:509 +#: git-rebase.sh:545 msgid "error: cannot combine '--signoff' with '--preserve-merges'" msgstr "" -#: git-rebase.sh:537 +#: git-rebase.sh:556 +msgid "error: cannot combine '--preserve_merges' with '--rebase-merges'" +msgstr "" + +#: git-rebase.sh:562 +msgid "error: cannot combine '--rebase_merges' with '--strategy-option'" +msgstr "" + +#: git-rebase.sh:564 +msgid "error: cannot combine '--rebase_merges' with '--strategy'" +msgstr "" + +#: git-rebase.sh:590 #, sh-format msgid "invalid upstream '$upstream_name'" msgstr "" -#: git-rebase.sh:561 +#: git-rebase.sh:614 #, sh-format msgid "$onto_name: there are more than one merge bases" msgstr "" -#: git-rebase.sh:564 git-rebase.sh:568 +#: git-rebase.sh:617 git-rebase.sh:621 #, sh-format msgid "$onto_name: there is no merge base" msgstr "" -#: git-rebase.sh:573 +#: git-rebase.sh:626 #, sh-format msgid "Does not point to a valid commit: $onto_name" msgstr "" -#: git-rebase.sh:599 +#: git-rebase.sh:652 #, sh-format msgid "fatal: no such branch/commit '$branch_name'" msgstr "" -#: git-rebase.sh:632 +#: git-rebase.sh:685 msgid "Cannot autostash" msgstr "" -#: git-rebase.sh:637 +#: git-rebase.sh:690 #, sh-format msgid "Created autostash: $stash_abbrev" msgstr "" -#: git-rebase.sh:641 +#: git-rebase.sh:694 msgid "Please commit or stash them." msgstr "" -#: git-rebase.sh:664 +#: git-rebase.sh:717 #, sh-format msgid "HEAD is up to date." msgstr "" -#: git-rebase.sh:666 +#: git-rebase.sh:719 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "" -#: git-rebase.sh:674 +#: git-rebase.sh:727 #, sh-format msgid "HEAD is up to date, rebase forced." msgstr "" -#: git-rebase.sh:676 +#: git-rebase.sh:729 #, sh-format msgid "Current branch $branch_name is up to date, rebase forced." msgstr "" -#: git-rebase.sh:688 +#: git-rebase.sh:741 #, sh-format msgid "Changes from $mb to $onto:" msgstr "" -#: git-rebase.sh:697 +#: git-rebase.sh:750 msgid "First, rewinding head to replay your work on top of it..." msgstr "" -#: git-rebase.sh:707 +#: git-rebase.sh:760 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "" @@ -15740,110 +17443,100 @@ msgstr "" msgid "Failed to register submodule '$sm_path'" msgstr "" -#: git-submodule.sh:354 -#, sh-format -msgid "Entering '$displaypath'" -msgstr "" - -#: git-submodule.sh:374 -#, sh-format -msgid "Stopping at '$displaypath'; script returned non-zero status." -msgstr "" - -#: git-submodule.sh:600 +#: git-submodule.sh:565 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:610 +#: git-submodule.sh:575 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:615 +#: git-submodule.sh:580 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " "'$sm_path'" msgstr "" -#: git-submodule.sh:633 +#: git-submodule.sh:603 #, sh-format msgid "Unable to fetch in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:639 +#: git-submodule.sh:609 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " "Direct fetching of that commit failed." msgstr "" -#: git-submodule.sh:646 +#: git-submodule.sh:616 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:647 +#: git-submodule.sh:617 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "" -#: git-submodule.sh:651 +#: git-submodule.sh:621 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:652 +#: git-submodule.sh:622 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "" -#: git-submodule.sh:657 +#: git-submodule.sh:627 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:658 +#: git-submodule.sh:628 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "" -#: git-submodule.sh:663 +#: git-submodule.sh:633 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:664 +#: git-submodule.sh:634 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "" -#: git-submodule.sh:695 +#: git-submodule.sh:665 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "" -#: git-submodule.sh:791 +#: git-submodule.sh:761 msgid "The --cached option cannot be used with the --files option" msgstr "" -#: git-submodule.sh:843 +#: git-submodule.sh:813 #, sh-format msgid "unexpected mode $mod_dst" msgstr "" -#: git-submodule.sh:863 +#: git-submodule.sh:833 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr "" -#: git-submodule.sh:866 +#: git-submodule.sh:836 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr "" -#: git-submodule.sh:869 +#: git-submodule.sh:839 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr "" @@ -15853,12 +17546,7 @@ msgstr "" msgid "See git-${cmd}(1) for details." msgstr "" -#: git-rebase--interactive.sh:142 -#, sh-format -msgid "Rebasing ($new_count/$total)" -msgstr "" - -#: git-rebase--interactive.sh:158 +#: git-rebase--interactive.sh:43 msgid "" "\n" "Commands:\n" @@ -15879,19 +17567,104 @@ msgid "" "These lines can be re-ordered; they are executed from top to bottom.\n" msgstr "" -#: git-rebase--interactive.sh:179 +#: git-rebase--interactive.sh:64 git-rebase--preserve-merges.sh:173 msgid "" "\n" "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" msgstr "" -#: git-rebase--interactive.sh:183 +#: git-rebase--interactive.sh:68 git-rebase--preserve-merges.sh:177 msgid "" "\n" "If you remove a line here THAT COMMIT WILL BE LOST.\n" msgstr "" -#: git-rebase--interactive.sh:221 +#: git-rebase--interactive.sh:108 git-rebase--preserve-merges.sh:724 +msgid "could not detach HEAD" +msgstr "" + +#: git-rebase--interactive.sh:147 git-rebase--preserve-merges.sh:816 +msgid "" +"\n" +"You are editing the todo file of an ongoing interactive rebase.\n" +"To continue rebase after editing, run:\n" +" git rebase --continue\n" +"\n" +msgstr "" + +#: git-rebase--interactive.sh:155 git-rebase--interactive.sh:241 +#: git-rebase--preserve-merges.sh:824 git-rebase--preserve-merges.sh:910 +msgid "Could not execute editor" +msgstr "" + +#: git-rebase--interactive.sh:176 git-rebase--preserve-merges.sh:845 +#, sh-format +msgid "Could not checkout $switch_to" +msgstr "" + +#: git-rebase--interactive.sh:183 git-rebase--preserve-merges.sh:852 +msgid "No HEAD?" +msgstr "" + +#: git-rebase--interactive.sh:184 git-rebase--preserve-merges.sh:853 +#, sh-format +msgid "Could not create temporary $state_dir" +msgstr "" + +#: git-rebase--interactive.sh:187 git-rebase--preserve-merges.sh:856 +msgid "Could not mark as interactive" +msgstr "" + +#: git-rebase--interactive.sh:219 git-rebase--preserve-merges.sh:888 +#, sh-format +msgid "Rebase $shortrevisions onto $shortonto ($todocount command)" +msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" +msgstr[0] "" +msgstr[1] "" + +#: git-rebase--interactive.sh:224 +msgid "" +"\n" +"\tHowever, if you remove everything, the rebase will be aborted.\n" +"\n" +"\t" +msgstr "" + +#: git-rebase--interactive.sh:231 git-rebase--preserve-merges.sh:900 +msgid "Note that empty commits are commented out" +msgstr "" + +#: git-rebase--interactive.sh:280 +msgid "Could not generate todo list" +msgstr "" + +#: git-rebase--preserve-merges.sh:136 +#, sh-format +msgid "Rebasing ($new_count/$total)" +msgstr "" + +#: git-rebase--preserve-merges.sh:152 +msgid "" +"\n" +"Commands:\n" +"p, pick <commit> = use commit\n" +"r, reword <commit> = use commit, but edit the commit message\n" +"e, edit <commit> = use commit, but stop for amending\n" +"s, squash <commit> = use commit, but meld into previous commit\n" +"f, fixup <commit> = like \"squash\", but discard this commit's log message\n" +"x, exec <commit> = run command (the rest of the line) using shell\n" +"d, drop <commit> = remove commit\n" +"l, label <label> = label current HEAD with a name\n" +"t, reset <label> = reset HEAD to a label\n" +"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n" +". create a merge commit using the original merge commit's\n" +". message (or the oneline, if no original merge commit was\n" +". specified). Use -c <commit> to reword the commit message.\n" +"\n" +"These lines can be re-ordered; they are executed from top to bottom.\n" +msgstr "" + +#: git-rebase--preserve-merges.sh:215 #, sh-format msgid "" "You can amend the commit now, with\n" @@ -15903,83 +17676,83 @@ msgid "" "\tgit rebase --continue" msgstr "" -#: git-rebase--interactive.sh:246 +#: git-rebase--preserve-merges.sh:240 #, sh-format msgid "$sha1: not a commit that can be picked" msgstr "" -#: git-rebase--interactive.sh:285 +#: git-rebase--preserve-merges.sh:279 #, sh-format msgid "Invalid commit name: $sha1" msgstr "" -#: git-rebase--interactive.sh:325 +#: git-rebase--preserve-merges.sh:309 msgid "Cannot write current commit's replacement sha1" msgstr "" -#: git-rebase--interactive.sh:376 +#: git-rebase--preserve-merges.sh:360 #, sh-format msgid "Fast-forward to $sha1" msgstr "" -#: git-rebase--interactive.sh:378 +#: git-rebase--preserve-merges.sh:362 #, sh-format msgid "Cannot fast-forward to $sha1" msgstr "" -#: git-rebase--interactive.sh:387 +#: git-rebase--preserve-merges.sh:371 #, sh-format msgid "Cannot move HEAD to $first_parent" msgstr "" -#: git-rebase--interactive.sh:392 +#: git-rebase--preserve-merges.sh:376 #, sh-format msgid "Refusing to squash a merge: $sha1" msgstr "" -#: git-rebase--interactive.sh:410 +#: git-rebase--preserve-merges.sh:394 #, sh-format msgid "Error redoing merge $sha1" msgstr "" -#: git-rebase--interactive.sh:419 +#: git-rebase--preserve-merges.sh:403 #, sh-format msgid "Could not pick $sha1" msgstr "" -#: git-rebase--interactive.sh:428 +#: git-rebase--preserve-merges.sh:412 #, sh-format msgid "This is the commit message #${n}:" msgstr "" -#: git-rebase--interactive.sh:433 +#: git-rebase--preserve-merges.sh:417 #, sh-format msgid "The commit message #${n} will be skipped:" msgstr "" -#: git-rebase--interactive.sh:444 +#: git-rebase--preserve-merges.sh:428 #, sh-format msgid "This is a combination of $count commit." msgid_plural "This is a combination of $count commits." msgstr[0] "" msgstr[1] "" -#: git-rebase--interactive.sh:453 +#: git-rebase--preserve-merges.sh:437 #, sh-format msgid "Cannot write $fixup_msg" msgstr "" -#: git-rebase--interactive.sh:456 +#: git-rebase--preserve-merges.sh:440 msgid "This is a combination of 2 commits." msgstr "" -#: git-rebase--interactive.sh:497 git-rebase--interactive.sh:540 -#: git-rebase--interactive.sh:543 +#: git-rebase--preserve-merges.sh:481 git-rebase--preserve-merges.sh:524 +#: git-rebase--preserve-merges.sh:527 #, sh-format msgid "Could not apply $sha1... $rest" msgstr "" -#: git-rebase--interactive.sh:572 +#: git-rebase--preserve-merges.sh:556 #, sh-format msgid "" "Could not amend commit after successfully picking $sha1... $rest\n" @@ -15989,31 +17762,31 @@ msgid "" "you are able to reword the commit." msgstr "" -#: git-rebase--interactive.sh:587 +#: git-rebase--preserve-merges.sh:571 #, sh-format msgid "Stopped at $sha1_abbrev... $rest" msgstr "" -#: git-rebase--interactive.sh:602 +#: git-rebase--preserve-merges.sh:586 #, sh-format msgid "Cannot '$squash_style' without a previous commit" msgstr "" -#: git-rebase--interactive.sh:644 +#: git-rebase--preserve-merges.sh:628 #, sh-format msgid "Executing: $rest" msgstr "" -#: git-rebase--interactive.sh:652 +#: git-rebase--preserve-merges.sh:636 #, sh-format msgid "Execution failed: $rest" msgstr "" -#: git-rebase--interactive.sh:654 +#: git-rebase--preserve-merges.sh:638 msgid "and made changes to the index and/or the working tree" msgstr "" -#: git-rebase--interactive.sh:656 +#: git-rebase--preserve-merges.sh:640 msgid "" "You can fix the problem, and then run\n" "\n" @@ -16021,7 +17794,7 @@ msgid "" msgstr "" #. TRANSLATORS: after these lines is a command to be issued by the user -#: git-rebase--interactive.sh:669 +#: git-rebase--preserve-merges.sh:653 #, sh-format msgid "" "Execution succeeded: $rest\n" @@ -16031,29 +17804,25 @@ msgid "" "\tgit rebase --continue" msgstr "" -#: git-rebase--interactive.sh:680 +#: git-rebase--preserve-merges.sh:664 #, sh-format msgid "Unknown command: $command $sha1 $rest" msgstr "" -#: git-rebase--interactive.sh:681 +#: git-rebase--preserve-merges.sh:665 msgid "Please fix this using 'git rebase --edit-todo'." msgstr "" -#: git-rebase--interactive.sh:716 +#: git-rebase--preserve-merges.sh:700 #, sh-format msgid "Successfully rebased and updated $head_name." msgstr "" -#: git-rebase--interactive.sh:740 -msgid "could not detach HEAD" -msgstr "" - -#: git-rebase--interactive.sh:778 +#: git-rebase--preserve-merges.sh:757 msgid "Could not remove CHERRY_PICK_HEAD" msgstr "" -#: git-rebase--interactive.sh:783 +#: git-rebase--preserve-merges.sh:762 #, sh-format msgid "" "You have staged changes in your working tree.\n" @@ -16071,75 +17840,28 @@ msgid "" " git rebase --continue\n" msgstr "" -#: git-rebase--interactive.sh:800 +#: git-rebase--preserve-merges.sh:779 msgid "Error trying to find the author identity to amend commit" msgstr "" -#: git-rebase--interactive.sh:805 +#: git-rebase--preserve-merges.sh:784 msgid "" "You have uncommitted changes in your working tree. Please commit them\n" "first and then run 'git rebase --continue' again." msgstr "" -#: git-rebase--interactive.sh:810 git-rebase--interactive.sh:814 +#: git-rebase--preserve-merges.sh:789 git-rebase--preserve-merges.sh:793 msgid "Could not commit staged changes." msgstr "" -#: git-rebase--interactive.sh:843 -msgid "" -"\n" -"You are editing the todo file of an ongoing interactive rebase.\n" -"To continue rebase after editing, run:\n" -" git rebase --continue\n" -"\n" -msgstr "" - -#: git-rebase--interactive.sh:851 git-rebase--interactive.sh:937 -msgid "Could not execute editor" -msgstr "" - -#: git-rebase--interactive.sh:872 -#, sh-format -msgid "Could not checkout $switch_to" -msgstr "" - -#: git-rebase--interactive.sh:879 -msgid "No HEAD?" -msgstr "" - -#: git-rebase--interactive.sh:880 -#, sh-format -msgid "Could not create temporary $state_dir" -msgstr "" - -#: git-rebase--interactive.sh:883 -msgid "Could not mark as interactive" -msgstr "" - -#: git-rebase--interactive.sh:915 -#, sh-format -msgid "Rebase $shortrevisions onto $shortonto ($todocount command)" -msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" -msgstr[0] "" -msgstr[1] "" - -#: git-rebase--interactive.sh:920 +#: git-rebase--preserve-merges.sh:893 msgid "" "\n" -"\tHowever, if you remove everything, the rebase will be aborted.\n" +"However, if you remove everything, the rebase will be aborted.\n" "\n" -"\t" -msgstr "" - -#: git-rebase--interactive.sh:927 -msgid "Note that empty commits are commented out" -msgstr "" - -#: git-rebase--interactive.sh:980 -msgid "Could not generate todo list" msgstr "" -#: git-rebase--interactive.sh:1001 git-rebase--interactive.sh:1006 +#: git-rebase--preserve-merges.sh:942 git-rebase--preserve-merges.sh:947 msgid "Could not init rewritten commits" msgstr "" @@ -16877,106 +18599,106 @@ msgstr "" msgid "STARTTLS failed! %s" msgstr "" -#: git-send-email.perl:1512 +#: git-send-email.perl:1511 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." msgstr "" -#: git-send-email.perl:1530 +#: git-send-email.perl:1529 #, perl-format msgid "Failed to send %s\n" msgstr "" -#: git-send-email.perl:1533 +#: git-send-email.perl:1532 #, perl-format msgid "Dry-Sent %s\n" msgstr "" -#: git-send-email.perl:1533 +#: git-send-email.perl:1532 #, perl-format msgid "Sent %s\n" msgstr "" -#: git-send-email.perl:1535 +#: git-send-email.perl:1534 msgid "Dry-OK. Log says:\n" msgstr "" -#: git-send-email.perl:1535 +#: git-send-email.perl:1534 msgid "OK. Log says:\n" msgstr "" -#: git-send-email.perl:1547 +#: git-send-email.perl:1546 msgid "Result: " msgstr "" -#: git-send-email.perl:1550 +#: git-send-email.perl:1549 msgid "Result: OK\n" msgstr "" -#: git-send-email.perl:1568 +#: git-send-email.perl:1567 #, perl-format msgid "can't open file %s" msgstr "" -#: git-send-email.perl:1615 git-send-email.perl:1635 +#: git-send-email.perl:1614 git-send-email.perl:1634 #, perl-format msgid "(mbox) Adding cc: %s from line '%s'\n" msgstr "" -#: git-send-email.perl:1621 +#: git-send-email.perl:1620 #, perl-format msgid "(mbox) Adding to: %s from line '%s'\n" msgstr "" -#: git-send-email.perl:1674 +#: git-send-email.perl:1673 #, perl-format msgid "(non-mbox) Adding cc: %s from line '%s'\n" msgstr "" -#: git-send-email.perl:1699 +#: git-send-email.perl:1698 #, perl-format msgid "(body) Adding cc: %s from line '%s'\n" msgstr "" -#: git-send-email.perl:1817 +#: git-send-email.perl:1809 #, perl-format msgid "(%s) Could not execute '%s'" msgstr "" -#: git-send-email.perl:1824 +#: git-send-email.perl:1816 #, perl-format msgid "(%s) Adding %s: %s from: '%s'\n" msgstr "" -#: git-send-email.perl:1828 +#: git-send-email.perl:1820 #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "" -#: git-send-email.perl:1855 +#: git-send-email.perl:1850 msgid "cannot send message as 7bit" msgstr "" -#: git-send-email.perl:1863 +#: git-send-email.perl:1858 msgid "invalid transfer encoding" msgstr "" -#: git-send-email.perl:1901 git-send-email.perl:1952 git-send-email.perl:1962 +#: git-send-email.perl:1899 git-send-email.perl:1951 git-send-email.perl:1961 #, perl-format msgid "unable to open %s: %s\n" msgstr "" -#: git-send-email.perl:1904 +#: git-send-email.perl:1902 #, perl-format msgid "%s: patch contains a line longer than 998 characters" msgstr "" -#: git-send-email.perl:1920 +#: git-send-email.perl:1919 #, perl-format msgid "Skipping %s with backup suffix '%s'.\n" msgstr "" #. TRANSLATORS: please keep "[y|N]" as is. -#: git-send-email.perl:1924 +#: git-send-email.perl:1923 #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "" @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: Git Russian Localization Project\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2018-01-07 07:50+0800\n" -"PO-Revision-Date: 2018-01-09 10:56+0000\n" +"POT-Creation-Date: 2018-08-21 08:28+0800\n" +"PO-Revision-Date: 2018-08-28 15:57+0000\n" "Last-Translator: Dimitriy Ryazantcev <DJm00n@mail.ru>\n" "Language-Team: Russian (http://www.transifex.com/djm00n/git-po-ru/language/ru/)\n" "MIME-Version: 1.0\n" @@ -20,59 +20,59 @@ msgstr "" "Language: ru\n" "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n" -#: advice.c:62 +#: advice.c:97 #, c-format -msgid "hint: %.*s\n" -msgstr "подсказка: %.*s\n" +msgid "%shint: %.*s%s\n" +msgstr "%sподсказка: %.*s%s\n" -#: advice.c:90 +#: advice.c:150 msgid "Cherry-picking is not possible because you have unmerged files." msgstr "Невозможно выполнить копирование коммита в текущую ветку, так как у вас имеются не слитые файлы." -#: advice.c:92 +#: advice.c:152 msgid "Committing is not possible because you have unmerged files." msgstr "Невозможно закоммитить, так как у вас имеются не слитые файлы." -#: advice.c:94 +#: advice.c:154 msgid "Merging is not possible because you have unmerged files." msgstr "Невозможно выполнить слияние, так как у вас имеются не слитые файлы." -#: advice.c:96 +#: advice.c:156 msgid "Pulling is not possible because you have unmerged files." msgstr "Невозможно выполнить получение, так как у вас имеются не слитые файлы." -#: advice.c:98 +#: advice.c:158 msgid "Reverting is not possible because you have unmerged files." msgstr "Невозможно обратить изменения, так как у вас имеются не слитые файлы." -#: advice.c:100 +#: advice.c:160 #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "Невозможно выполнить %s, так как у вас имеются не слитые файлы." -#: advice.c:108 +#: advice.c:168 msgid "" "Fix them up in the work tree, and then use 'git add/rm <file>'\n" "as appropriate to mark resolution and make a commit." msgstr "Исправьте их в рабочем каталоге, затем запустите «git add/rm <файл>»,\nчтобы пометить исправление и сделайте коммит." -#: advice.c:116 +#: advice.c:176 msgid "Exiting because of an unresolved conflict." msgstr "Выход из-за неразрешенного конфликта." -#: advice.c:121 builtin/merge.c:1213 +#: advice.c:181 builtin/merge.c:1286 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Вы не завершили слияние (присутствует файл MERGE_HEAD)." -#: advice.c:123 +#: advice.c:183 msgid "Please, commit your changes before merging." msgstr "Перед слиянием, выполните коммит ваших изменений." -#: advice.c:124 +#: advice.c:184 msgid "Exiting because of unfinished merge." msgstr "Выход из-за незавершенного слияния." -#: advice.c:130 +#: advice.c:190 #, c-format msgid "" "Note: checking out '%s'.\n" @@ -88,92 +88,92 @@ msgid "" "\n" msgstr "Примечание: переход на «%s».\n\nВы сейчас в состоянии «отделённого HEAD». Вы можете осмотреться, сделать\nэкспериментальные изменения и закоммитить их, также вы можете отменить\nизменения любых коммитов в этом состоянии не затрагивая любые ветки и\nне переходя на них.\n\nЕсли вы хотите создать новую ветку и сохранить свои коммиты, то вы\nможете сделать это (сейчас или позже) вызвав команду checkout снова,\nно с параметром -b. Например:\n\n git checkout -b <имя-новой-ветки>\n\n" -#: apply.c:58 +#: apply.c:59 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "неопознанная опция для пробелов «%s»" -#: apply.c:74 +#: apply.c:75 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "неопознанная опция для игнорирования пробелов «%s»" -#: apply.c:122 +#: apply.c:125 msgid "--reject and --3way cannot be used together." msgstr "--reject и --3way нельзя использовать одновременно." -#: apply.c:124 +#: apply.c:127 msgid "--cached and --3way cannot be used together." msgstr "--cached и --3way нельзя использовать одновременно." -#: apply.c:127 +#: apply.c:130 msgid "--3way outside a repository" msgstr "--3way вне репозитория" -#: apply.c:138 +#: apply.c:141 msgid "--index outside a repository" msgstr "--index вне репозитория" -#: apply.c:141 +#: apply.c:144 msgid "--cached outside a repository" msgstr "--cached вне репозитория" -#: apply.c:821 +#: apply.c:826 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "Не удалось подготовить регулярное выражение для метки времени %s" -#: apply.c:830 +#: apply.c:835 #, c-format msgid "regexec returned %d for input: %s" msgstr "regexec возвратил %d для ввода: %s" -#: apply.c:904 +#: apply.c:909 #, c-format msgid "unable to find filename in patch at line %d" msgstr "не удалось найти имя файла в строке патча %d" -#: apply.c:942 +#: apply.c:947 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "git apply: плохой git-diff — ожидалось /dev/null, получено %s на строке %d" -#: apply.c:948 +#: apply.c:953 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "git apply: плохой git-diff — не согласующееся новое имя файла на строке %d" -#: apply.c:949 +#: apply.c:954 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "git apply: плохой git-diff — не согласующееся старое имя файла на строке %d" -#: apply.c:954 +#: apply.c:959 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "git apply: плохой git-diff — ожидалось /dev/null на строке %d" -#: apply.c:983 +#: apply.c:988 #, c-format msgid "invalid mode on line %d: %s" msgstr "недопустимый режим %d: %s" -#: apply.c:1301 +#: apply.c:1306 #, c-format msgid "inconsistent header lines %d and %d" msgstr "противоречивые строки заголовка %d и %d" -#: apply.c:1473 +#: apply.c:1478 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recount: не ожидаемая строка: %.*s" -#: apply.c:1542 +#: apply.c:1547 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "фрагмент изменений без заголовка на строке %d: %.*s" -#: apply.c:1562 +#: apply.c:1567 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname" @@ -186,70 +186,70 @@ msgstr[1] "заголовок git diff не нашел информацию об msgstr[2] "заголовок git diff не нашел информацию об имени файла при удалении %d ведущих компонент пути к файлу (строка %d)" msgstr[3] "заголовок git diff не нашел информацию об имени файла при удалении %d ведущих компонент пути к файлу (строка %d)" -#: apply.c:1575 +#: apply.c:1580 #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "заголовок git diff не содержит информации об имени файла (строка %d)" -#: apply.c:1763 +#: apply.c:1768 msgid "new file depends on old contents" msgstr "новый файл зависит от старого содержимого" -#: apply.c:1765 +#: apply.c:1770 msgid "deleted file still has contents" msgstr "удаленный файл все еще имеет содержимое" -#: apply.c:1799 +#: apply.c:1804 #, c-format msgid "corrupt patch at line %d" msgstr "патч поврежден на строке %d" -#: apply.c:1836 +#: apply.c:1841 #, c-format msgid "new file %s depends on old contents" msgstr "новый файл %s зависит от старого содержимого" -#: apply.c:1838 +#: apply.c:1843 #, c-format msgid "deleted file %s still has contents" msgstr "удаленный файл %s все еще имеет содержимое" -#: apply.c:1841 +#: apply.c:1846 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** предупреждение: файл %s становится пустым, но не удаляется" -#: apply.c:1988 +#: apply.c:1993 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "поврежденный двоичный патч на строке %d: %.*s" -#: apply.c:2025 +#: apply.c:2030 #, c-format msgid "unrecognized binary patch at line %d" msgstr "неопознанный двоичный патч на строке %d" -#: apply.c:2185 +#: apply.c:2190 #, c-format msgid "patch with only garbage at line %d" msgstr "патч с мусором на строке %d" -#: apply.c:2271 +#: apply.c:2276 #, c-format msgid "unable to read symlink %s" msgstr "не удалось прочитать символьную ссылку %s" -#: apply.c:2275 +#: apply.c:2280 #, c-format msgid "unable to open or read %s" msgstr "не удалось открыть или прочесть %s" -#: apply.c:2934 +#: apply.c:2939 #, c-format msgid "invalid start of line: '%c'" msgstr "неправильное начало строки: «%c»" -#: apply.c:3055 +#: apply.c:3060 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." @@ -258,257 +258,257 @@ msgstr[1] "Часть #%d успешно применена на %d (со сдв msgstr[2] "Часть #%d успешно применена на %d (со сдвигом в %d строк)." msgstr[3] "Часть #%d успешно применена на %d (со сдвигом в %d строк)." -#: apply.c:3067 +#: apply.c:3072 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "Контекст сужен до (%ld/%ld), чтобы применить фрагмент на %d строке" -#: apply.c:3073 +#: apply.c:3078 #, c-format msgid "" "while searching for:\n" "%.*s" msgstr "при поиске:\n%.*s" -#: apply.c:3095 +#: apply.c:3100 #, c-format msgid "missing binary patch data for '%s'" msgstr "пропущены данные двоичного патча для «%s»" -#: apply.c:3103 +#: apply.c:3108 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "невозможно выполнить reverse-apply для двоичного патча, без обращения изменений блока «%s»" -#: apply.c:3149 +#: apply.c:3154 #, c-format msgid "cannot apply binary patch to '%s' without full index line" msgstr "невозможно применить двоичный патч «%s» без строки с указанной полной версией индекса" -#: apply.c:3159 +#: apply.c:3164 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." msgstr "патч применятся к файлу «%s» (%s), но его текущее содержимое не соотвествует ожидаемому." -#: apply.c:3167 +#: apply.c:3172 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "патч применяется к пустому файлу «%s», но файл не пустой" -#: apply.c:3185 +#: apply.c:3190 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "не удалось прочитать необходимую посылку %s для «%s»" -#: apply.c:3198 +#: apply.c:3203 #, c-format msgid "binary patch does not apply to '%s'" msgstr "не удалось применить двоичный патч к «%s»" -#: apply.c:3204 +#: apply.c:3209 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "после применения двоичного патча для «%s» был получен неправильный результат (ожидалось %s, получено %s)" -#: apply.c:3225 +#: apply.c:3230 #, c-format msgid "patch failed: %s:%ld" msgstr "ошибка применения изменений: %s:%ld" -#: apply.c:3347 +#: apply.c:3352 #, c-format msgid "cannot checkout %s" msgstr "не удалось переключить состояние на %s" -#: apply.c:3396 apply.c:3407 apply.c:3453 setup.c:277 +#: apply.c:3404 apply.c:3415 apply.c:3461 setup.c:278 #, c-format msgid "failed to read %s" msgstr "не удалось прочитать %s" -#: apply.c:3404 +#: apply.c:3412 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "чтение из «%s» за символической ссылкой" -#: apply.c:3433 apply.c:3673 +#: apply.c:3441 apply.c:3681 #, c-format msgid "path %s has been renamed/deleted" msgstr "путь %s был переименован/удален" -#: apply.c:3516 apply.c:3687 +#: apply.c:3524 apply.c:3696 #, c-format msgid "%s: does not exist in index" msgstr "%s: нет в индексе" -#: apply.c:3525 apply.c:3695 +#: apply.c:3533 apply.c:3704 #, c-format msgid "%s: does not match index" msgstr "%s: не совпадает с индексом" -#: apply.c:3560 +#: apply.c:3568 msgid "repository lacks the necessary blob to fall back on 3-way merge." msgstr "в репозитории отсутствует необходимый двоичный объект для отката к трёхходовому слиянию." -#: apply.c:3563 +#: apply.c:3571 #, c-format msgid "Falling back to three-way merge...\n" msgstr "Откат к трёхходовому слиянию…\n" -#: apply.c:3579 apply.c:3583 +#: apply.c:3587 apply.c:3591 #, c-format msgid "cannot read the current contents of '%s'" msgstr "не удалось прочитать текущее содержимое «%s»" -#: apply.c:3595 +#: apply.c:3603 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "Не удалось откатиться к трёхходовому слиянию…\n" -#: apply.c:3609 +#: apply.c:3617 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "Патч применен к «%s» с конфликтами.\n" -#: apply.c:3614 +#: apply.c:3622 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "Патч применен к «%s» без ошибок.\n" -#: apply.c:3640 +#: apply.c:3648 msgid "removal patch leaves file contents" msgstr "патч удаления не удалил содержимое файла" -#: apply.c:3712 +#: apply.c:3721 #, c-format msgid "%s: wrong type" msgstr "%s: неправильный тип" -#: apply.c:3714 +#: apply.c:3723 #, c-format msgid "%s has type %o, expected %o" msgstr "%s имеет тип %o, а ожидался %o" -#: apply.c:3864 apply.c:3866 +#: apply.c:3874 apply.c:3876 #, c-format msgid "invalid path '%s'" msgstr "неправильный путь «%s»" -#: apply.c:3922 +#: apply.c:3932 #, c-format msgid "%s: already exists in index" msgstr "%s: уже содержится в индексе" -#: apply.c:3925 +#: apply.c:3935 #, c-format msgid "%s: already exists in working directory" msgstr "%s: уже содержится в рабочем каталоге" -#: apply.c:3945 +#: apply.c:3955 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "новый режим доступа (%o) для %s не соответствует старому режиму доступа (%o)" -#: apply.c:3950 +#: apply.c:3960 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "новый режим доступа (%o) для %s не соответствует старому режиму доступа (%o) для %s" -#: apply.c:3970 +#: apply.c:3980 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "затронутый файл «%s» находится за символической ссылкой" -#: apply.c:3974 +#: apply.c:3984 #, c-format msgid "%s: patch does not apply" msgstr "%s: не удалось применить патч" -#: apply.c:3989 +#: apply.c:3999 #, c-format msgid "Checking patch %s..." msgstr "Проверка патча %s…" -#: apply.c:4080 +#: apply.c:4091 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "информация об sha1 отсутствует или бесполезна для подмодуля %s" -#: apply.c:4087 +#: apply.c:4098 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "изменен режим для %s, который не находится в текущем HEAD" -#: apply.c:4090 +#: apply.c:4101 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "информация об sha1 отсутствует или бесполезна (%s)." -#: apply.c:4095 builtin/checkout.c:236 builtin/reset.c:148 +#: apply.c:4106 builtin/checkout.c:237 builtin/reset.c:140 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "сбой make_cache_entry для пути «%s»" -#: apply.c:4099 +#: apply.c:4110 #, c-format msgid "could not add %s to temporary index" msgstr "не удалось добавить %s во временный индекс" -#: apply.c:4109 +#: apply.c:4120 #, c-format msgid "could not write temporary index to %s" msgstr "не удалось записать временный индкекс в %s" -#: apply.c:4247 +#: apply.c:4258 #, c-format msgid "unable to remove %s from index" msgstr "не удалось удалить %s из индекса" -#: apply.c:4282 +#: apply.c:4292 #, c-format msgid "corrupt patch for submodule %s" msgstr "поврежденный патч для подмодуля %s" -#: apply.c:4288 +#: apply.c:4298 #, c-format msgid "unable to stat newly created file '%s'" msgstr "не удалось выполнить stat для созданного файла «%s»" -#: apply.c:4296 +#: apply.c:4306 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "не удалось создать вспомогательный файл для созданного файла %s" -#: apply.c:4302 apply.c:4446 +#: apply.c:4312 apply.c:4457 #, c-format msgid "unable to add cache entry for %s" msgstr "не удалось создать запись в кэше для %s" -#: apply.c:4343 +#: apply.c:4355 #, c-format msgid "failed to write to '%s'" msgstr "не удалось записать в «%s»" -#: apply.c:4347 +#: apply.c:4359 #, c-format msgid "closing file '%s'" msgstr "закрытие файла «%s»" -#: apply.c:4417 +#: apply.c:4429 #, c-format msgid "unable to write file '%s' mode %o" msgstr "не удалось записать файл «%s» с режимом доступа %o" -#: apply.c:4515 +#: apply.c:4527 #, c-format msgid "Applied patch %s cleanly." msgstr "Патч %s применен без ошибок." -#: apply.c:4523 +#: apply.c:4535 msgid "internal error" msgstr "внутренняя ошибка" -#: apply.c:4526 +#: apply.c:4538 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." @@ -517,45 +517,45 @@ msgstr[1] "Применение патча %%s с %d отказами…" msgstr[2] "Применение патча %%s с %d отказами…" msgstr[3] "Применение патча %%s с %d отказами…" -#: apply.c:4537 +#: apply.c:4549 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "усечение имени .rej файла до %.*s.rej" -#: apply.c:4545 builtin/fetch.c:761 builtin/fetch.c:1011 +#: apply.c:4557 builtin/fetch.c:780 builtin/fetch.c:1048 #, c-format msgid "cannot open %s" msgstr "не удалось открыть %s" -#: apply.c:4559 +#: apply.c:4571 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Блок №%d применен без ошибок." -#: apply.c:4563 +#: apply.c:4575 #, c-format msgid "Rejected hunk #%d." msgstr "Блок №%d отклонен." -#: apply.c:4673 +#: apply.c:4685 #, c-format msgid "Skipped patch '%s'." msgstr "Патч «%s» пропущен." -#: apply.c:4681 +#: apply.c:4693 msgid "unrecognized input" msgstr "не распознанный ввод" -#: apply.c:4700 +#: apply.c:4712 msgid "unable to read index file" msgstr "не удалось прочитать файл индекса" -#: apply.c:4837 +#: apply.c:4849 #, c-format msgid "can't open patch '%s': %s" msgstr "не удалось открыть патч «%s»: %s" -#: apply.c:4864 +#: apply.c:4876 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" @@ -564,7 +564,7 @@ msgstr[1] "пропущено %d ошибки в пробельных симво msgstr[2] "пропущено %d ошибок в пробельных символах" msgstr[3] "пропущено %d ошибок в пробельных символах" -#: apply.c:4870 apply.c:4885 +#: apply.c:4882 apply.c:4897 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -573,7 +573,7 @@ msgstr[1] "%d строки добавили ошибки в пробельных msgstr[2] "%d строк добавили ошибки в пробельных символах." msgstr[3] "%d строк добавили ошибки в пробельных символах." -#: apply.c:4878 +#: apply.c:4890 #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." @@ -582,253 +582,307 @@ msgstr[1] "%d строки добавлено после исправления msgstr[2] "%d строк добавлено после исправления ошибок в пробелах." msgstr[3] "%d строки добавлено после исправления ошибок в пробелах." -#: apply.c:4894 builtin/add.c:539 builtin/mv.c:298 builtin/rm.c:390 +#: apply.c:4906 builtin/add.c:539 builtin/mv.c:300 builtin/rm.c:389 msgid "Unable to write new index file" msgstr "Не удалось записать новый файл индекса" -#: apply.c:4921 apply.c:4924 builtin/am.c:2220 builtin/am.c:2223 -#: builtin/clone.c:116 builtin/fetch.c:116 builtin/pull.c:193 -#: builtin/submodule--helper.c:369 builtin/submodule--helper.c:860 -#: builtin/submodule--helper.c:863 builtin/submodule--helper.c:1230 -#: builtin/submodule--helper.c:1233 builtin/submodule--helper.c:1450 -#: git-add--interactive.perl:197 +#: apply.c:4933 apply.c:4936 builtin/am.c:2254 builtin/am.c:2257 +#: builtin/clone.c:121 builtin/fetch.c:115 builtin/merge.c:260 +#: builtin/pull.c:198 builtin/submodule--helper.c:406 +#: builtin/submodule--helper.c:1355 builtin/submodule--helper.c:1358 +#: builtin/submodule--helper.c:1729 builtin/submodule--helper.c:1732 +#: builtin/submodule--helper.c:1952 git-add--interactive.perl:197 msgid "path" msgstr "путь" -#: apply.c:4922 +#: apply.c:4934 msgid "don't apply changes matching the given path" msgstr "не применять изменения по указанному пути" -#: apply.c:4925 +#: apply.c:4937 msgid "apply changes matching the given path" msgstr "применять изменения по указанному пути" -#: apply.c:4927 builtin/am.c:2229 +#: apply.c:4939 builtin/am.c:2263 msgid "num" msgstr "количество" -#: apply.c:4928 +#: apply.c:4940 msgid "remove <num> leading slashes from traditional diff paths" msgstr "удалить <количество> ведущих косых черт из традиционных путей списка изменений" -#: apply.c:4931 +#: apply.c:4943 msgid "ignore additions made by the patch" msgstr "игнорировать добавления, сделанные этим патчем" -#: apply.c:4933 +#: apply.c:4945 msgid "instead of applying the patch, output diffstat for the input" msgstr "вместо применения патча вывести статистику добавлений и удалений для ввода" -#: apply.c:4937 +#: apply.c:4949 msgid "show number of added and deleted lines in decimal notation" msgstr "показать количество добавленных и удаленных строк в десятичном представлении" -#: apply.c:4939 +#: apply.c:4951 msgid "instead of applying the patch, output a summary for the input" msgstr "вместо применения патча вывести статистику изменений для ввода" -#: apply.c:4941 +#: apply.c:4953 msgid "instead of applying the patch, see if the patch is applicable" msgstr "вместо применения патча проверить подходит ли он" -#: apply.c:4943 +#: apply.c:4955 msgid "make sure the patch is applicable to the current index" msgstr "проверить, что патч применяется к текущему индексу" -#: apply.c:4945 +#: apply.c:4957 +msgid "mark new files with `git add --intent-to-add`" +msgstr "" + +#: apply.c:4959 msgid "apply a patch without touching the working tree" msgstr "применить патч, не изменяя рабочий каталог" -#: apply.c:4947 +#: apply.c:4961 msgid "accept a patch that touches outside the working area" msgstr "принять патч, который затрагивает файлы за рабочим каталогом" -#: apply.c:4949 +#: apply.c:4964 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "а также применить патч (используйте с --stat/--summary/--check)" -#: apply.c:4951 +#: apply.c:4966 msgid "attempt three-way merge if a patch does not apply" msgstr "попытаться сделать трехходовое слияние, если патч не применяется" -#: apply.c:4953 +#: apply.c:4968 msgid "build a temporary index based on embedded index information" msgstr "построить временный индекс, основанный на встроенной информации об индексе" -#: apply.c:4956 builtin/checkout-index.c:168 builtin/ls-files.c:515 +#: apply.c:4971 builtin/checkout-index.c:168 builtin/ls-files.c:516 msgid "paths are separated with NUL character" msgstr "пути, отделённые НУЛЕВЫМ символом" -#: apply.c:4958 +#: apply.c:4973 msgid "ensure at least <n> lines of context match" msgstr "удостовериться, что по крайней мере <n> строк контекста совпадают" -#: apply.c:4959 builtin/am.c:2208 builtin/interpret-trailers.c:95 +#: apply.c:4974 builtin/am.c:2242 builtin/interpret-trailers.c:95 #: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99 -#: builtin/pack-objects.c:3009 +#: builtin/pack-objects.c:3205 msgid "action" msgstr "действие" -#: apply.c:4960 +#: apply.c:4975 msgid "detect new or modified lines that have whitespace errors" msgstr "определять новые или модифицированные строки, у которых есть ошибки в пробельных символах" -#: apply.c:4963 apply.c:4966 +#: apply.c:4978 apply.c:4981 msgid "ignore changes in whitespace when finding context" msgstr "игнорировать изменения в пробельных символах при поиске контекста" -#: apply.c:4969 +#: apply.c:4984 msgid "apply the patch in reverse" msgstr "применить патч с обращением изменений" -#: apply.c:4971 +#: apply.c:4986 msgid "don't expect at least one line of context" msgstr "не ожидать как минимум одной строки контекста" -#: apply.c:4973 +#: apply.c:4988 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "оставить отклоненные блоки изменений в соответствующих *.rej файлах" -#: apply.c:4975 +#: apply.c:4990 msgid "allow overlapping hunks" msgstr "разрешить перекрывающиеся блоки изменений" -#: apply.c:4976 builtin/add.c:292 builtin/check-ignore.c:21 -#: builtin/commit.c:1361 builtin/count-objects.c:96 builtin/fsck.c:640 -#: builtin/log.c:1896 builtin/mv.c:123 builtin/read-tree.c:125 +#: apply.c:4991 builtin/add.c:290 builtin/check-ignore.c:21 +#: builtin/commit.c:1301 builtin/count-objects.c:98 builtin/fsck.c:671 +#: builtin/log.c:1914 builtin/mv.c:122 builtin/read-tree.c:124 msgid "be verbose" msgstr "быть многословнее" -#: apply.c:4978 +#: apply.c:4993 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "разрешить некорректно определенные пропущенные пустые строки в конце файла" -#: apply.c:4981 +#: apply.c:4996 msgid "do not trust the line counts in the hunk headers" msgstr "не доверять количеству строк из заголовка блока изменений" -#: apply.c:4983 builtin/am.c:2217 +#: apply.c:4998 builtin/am.c:2251 msgid "root" msgstr "корень" -#: apply.c:4984 +#: apply.c:4999 msgid "prepend <root> to all filenames" msgstr "добавить <корень> спереди ко всем именам файлов" -#: archive.c:13 +#: archive.c:14 msgid "git archive [<options>] <tree-ish> [<path>...]" msgstr "git archive [<опции>] <указатель-дерева> [<путь>…]" -#: archive.c:14 +#: archive.c:15 msgid "git archive --list" msgstr "git archive --list" -#: archive.c:15 +#: archive.c:16 msgid "" "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> " "[<path>...]" msgstr "git archive --remote <репозиторий> [--exec <команда>] [<опции>] <указатель-дерева> [<путь>…]" -#: archive.c:16 +#: archive.c:17 msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <репозиторий> [--exec <команда>] --list" -#: archive.c:351 builtin/add.c:176 builtin/add.c:515 builtin/rm.c:299 +#: archive.c:363 builtin/add.c:176 builtin/add.c:515 builtin/rm.c:298 #, c-format msgid "pathspec '%s' did not match any files" msgstr "спецификатор пути «%s» не соответствует ни одному файлу" -#: archive.c:436 +#: archive.c:446 msgid "fmt" msgstr "формат" -#: archive.c:436 +#: archive.c:446 msgid "archive format" msgstr "формат архива" -#: archive.c:437 builtin/log.c:1459 +#: archive.c:447 builtin/log.c:1473 msgid "prefix" msgstr "префикс" -#: archive.c:438 +#: archive.c:448 msgid "prepend prefix to each pathname in the archive" msgstr "добавлять префикс перед каждым путем файла в архиве" -#: archive.c:439 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:62 -#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:861 -#: builtin/hash-object.c:102 builtin/ls-files.c:551 builtin/ls-files.c:554 -#: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:120 -#: parse-options.h:153 +#: archive.c:449 builtin/blame.c:816 builtin/blame.c:817 builtin/config.c:126 +#: builtin/fast-export.c:1013 builtin/fast-export.c:1015 builtin/grep.c:873 +#: builtin/hash-object.c:104 builtin/ls-files.c:552 builtin/ls-files.c:555 +#: builtin/notes.c:407 builtin/notes.c:570 builtin/read-tree.c:119 +#: parse-options.h:165 msgid "file" msgstr "файл" -#: archive.c:440 builtin/archive.c:89 +#: archive.c:450 builtin/archive.c:89 msgid "write the archive to this file" msgstr "запись архива в этот файл" -#: archive.c:442 +#: archive.c:452 msgid "read .gitattributes in working directory" msgstr "читать .gitattributes в рабочем каталоге" -#: archive.c:443 +#: archive.c:453 msgid "report archived files on stderr" msgstr "отчет об архивированных файлах в stderr" -#: archive.c:444 +#: archive.c:454 msgid "store only" msgstr "только хранение" -#: archive.c:445 +#: archive.c:455 msgid "compress faster" msgstr "сжимать быстрее" -#: archive.c:453 +#: archive.c:463 msgid "compress better" msgstr "сжимать лучше" -#: archive.c:456 +#: archive.c:466 msgid "list supported archive formats" msgstr "перечислить поддерживаемые форматы архивов" -#: archive.c:458 builtin/archive.c:90 builtin/clone.c:106 builtin/clone.c:109 -#: builtin/submodule--helper.c:872 builtin/submodule--helper.c:1239 +#: archive.c:468 builtin/archive.c:90 builtin/clone.c:111 builtin/clone.c:114 +#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1738 msgid "repo" msgstr "репозиторий" -#: archive.c:459 builtin/archive.c:91 +#: archive.c:469 builtin/archive.c:91 msgid "retrieve the archive from remote repository <repo>" msgstr "получить архив из внешнего <репозитория>" -#: archive.c:460 builtin/archive.c:92 builtin/notes.c:489 +#: archive.c:470 builtin/archive.c:92 builtin/difftool.c:714 +#: builtin/notes.c:491 msgid "command" msgstr "команда" -#: archive.c:461 builtin/archive.c:93 +#: archive.c:471 builtin/archive.c:93 msgid "path to the remote git-upload-archive command" msgstr "путь к команде git-upload-archive на машине с внешним репозиторием" -#: archive.c:468 +#: archive.c:478 msgid "Unexpected option --remote" msgstr "Неожиданная опция --remote" -#: archive.c:470 +#: archive.c:480 msgid "Option --exec can only be used together with --remote" msgstr "Опция --exec может использоваться только вместе с --remote" -#: archive.c:472 +#: archive.c:482 msgid "Unexpected option --output" msgstr "Неожиданная опция --output" -#: archive.c:494 +#: archive.c:504 #, c-format msgid "Unknown archive format '%s'" msgstr "Неизвестный формат архива «%s»" -#: archive.c:501 +#: archive.c:511 #, c-format msgid "Argument not supported for format '%s': -%d" msgstr "Аргумент не поддерживается для формата «%s»: -%d" +#: archive-tar.c:125 archive-zip.c:344 +#, c-format +msgid "cannot stream blob %s" +msgstr "не удалось создать поток двоичного объекта %s" + +#: archive-tar.c:260 archive-zip.c:361 +#, c-format +msgid "unsupported file mode: 0%o (SHA1: %s)" +msgstr "неподдерживаемый режим доступа к файлу: 0%o (SHA1: %s)" + +#: archive-tar.c:287 archive-zip.c:352 +#, c-format +msgid "cannot read %s" +msgstr "не удалось прочитать %s" + +#: archive-tar.c:458 +#, c-format +msgid "unable to start '%s' filter" +msgstr "не удалось запустить фильтр «%s»" + +#: archive-tar.c:461 +msgid "unable to redirect descriptor" +msgstr "не удалось перенаправить дескриптор" + +#: archive-tar.c:468 +#, c-format +msgid "'%s' filter reported error" +msgstr "фильтр «%s» сообщил об ошибке" + +#: archive-zip.c:313 +#, c-format +msgid "path is not valid UTF-8: %s" +msgstr "путь не является действительным UTF-8: %s" + +#: archive-zip.c:317 +#, c-format +msgid "path too long (%d chars, SHA1: %s): %s" +msgstr "путь слишком длинный (%d символов, SHA1: %s): %s" + +#: archive-zip.c:470 builtin/pack-objects.c:216 builtin/pack-objects.c:219 +#, c-format +msgid "deflate error (%d)" +msgstr "ошибка сжатия (%d)" + +#: archive-zip.c:605 +#, c-format +msgid "timestamp too large for this system: %<PRIuMAX>" +msgstr "отметка времени слишком большая для этой системы: %<PRIuMAX>" + #: attr.c:218 #, c-format msgid "%.*s is not a valid attribute name" @@ -840,43 +894,43 @@ msgid "" "Use '\\!' for literal leading exclamation." msgstr "Отрицающие шаблоны в атрибутах git игнорируются.\nИспользуйте «\\!» для буквального использования символа в значении «восклицательный знак»." -#: bisect.c:458 +#: bisect.c:467 #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "Плохое содержимое файла «%s»: %s" -#: bisect.c:666 +#: bisect.c:675 #, c-format msgid "We cannot bisect more!\n" msgstr "Невозможно продолжить бинарный поиск!\n" -#: bisect.c:720 +#: bisect.c:729 #, c-format msgid "Not a valid commit name %s" msgstr "Недопустимое имя коммита %s" -#: bisect.c:744 +#: bisect.c:753 #, c-format msgid "" "The merge base %s is bad.\n" "This means the bug has been fixed between %s and [%s].\n" msgstr "База слияния %s является плохим коммитом.\nЭто значит, что ошибка была исправлена где-то между %s и [%s].\n" -#: bisect.c:749 +#: bisect.c:758 #, c-format msgid "" "The merge base %s is new.\n" "The property has changed between %s and [%s].\n" msgstr "База слияния %s является новой.\nСвойство было изменено где-то между %s и [%s].\n" -#: bisect.c:754 +#: bisect.c:763 #, c-format msgid "" "The merge base %s is %s.\n" "This means the first '%s' commit is between %s and [%s].\n" msgstr "База слияния %s является %s.\nЭто значит, что «%s» коммит находится где-то между %s и [%s].\n" -#: bisect.c:762 +#: bisect.c:771 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -884,7 +938,7 @@ msgid "" "Maybe you mistook %s and %s revs?\n" msgstr "Несколько %s коммитов не являются предками %s коммита.\nВ этом случае git bisect не может работать правильно.\nВозможно, вы перепутали редакции %s и %s местами?\n" -#: bisect.c:775 +#: bisect.c:784 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -892,43 +946,43 @@ msgid "" "We continue anyway." msgstr "База слияния между %s и [%s] должно быть пропущена.\nПоэтому мы не можем быть уверены, что первый %s коммит находится между %s и %s.\nНо все же продолжаем поиск." -#: bisect.c:810 +#: bisect.c:817 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "Бинарный поиск: база слияния должна быть проверена\n" -#: bisect.c:862 +#: bisect.c:857 #, c-format msgid "a %s revision is needed" msgstr "нужно указать %s редакцию" -#: bisect.c:879 builtin/notes.c:175 builtin/tag.c:234 +#: bisect.c:876 builtin/notes.c:177 builtin/tag.c:237 #, c-format msgid "could not create file '%s'" msgstr "не удалось создать файл «%s»" -#: bisect.c:930 +#: bisect.c:927 builtin/merge.c:137 #, c-format msgid "could not read file '%s'" msgstr "не удалось прочитать файл «%s»" -#: bisect.c:960 +#: bisect.c:957 msgid "reading bisect refs failed" msgstr "сбой при чтении ссылок двоичного поиска" -#: bisect.c:979 +#: bisect.c:976 #, c-format msgid "%s was both %s and %s\n" msgstr "%s была одновременно и %s и %s\n" -#: bisect.c:987 +#: bisect.c:984 #, c-format msgid "" "No testable commit found.\n" "Maybe you started with bad path parameters?\n" msgstr "Тестируемый коммит не найден.\nВозможно, вы начали поиск с указанием неправильного параметра пути?\n" -#: bisect.c:1006 +#: bisect.c:1003 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -939,7 +993,7 @@ msgstr[3] "(примерно %d шагов)" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. -#: bisect.c:1012 +#: bisect.c:1009 #, 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" @@ -948,41 +1002,42 @@ msgstr[1] "Бинарный поиск: %d редакции осталось п msgstr[2] "Бинарный поиск: %d редакций осталось проверить после этой %s\n" msgstr[3] "Бинарный поиск: %d редакций осталось проверить после этой %s\n" -#: blame.c:1757 +#: blame.c:1786 msgid "--contents and --reverse do not blend well." msgstr "--contents и --reverse не очень сочетаются." -#: blame.c:1768 +#: blame.c:1800 msgid "cannot use --contents with final commit object name" msgstr "нельзя использовать --contents с указанием финального имени объекта" -#: blame.c:1788 +#: blame.c:1821 msgid "--reverse and --first-parent together require specified latest commit" msgstr "при --reverse и --first-parent вместе нужно указывать конкретный последний коммит" -#: blame.c:1797 bundle.c:169 ref-filter.c:1981 sequencer.c:1177 -#: sequencer.c:2370 builtin/commit.c:1066 builtin/log.c:364 builtin/log.c:918 -#: builtin/log.c:1368 builtin/log.c:1697 builtin/log.c:1945 -#: builtin/merge.c:369 builtin/shortlog.c:191 +#: blame.c:1830 bundle.c:162 ref-filter.c:2154 sequencer.c:1874 +#: sequencer.c:3772 builtin/commit.c:994 builtin/log.c:372 builtin/log.c:926 +#: builtin/log.c:1381 builtin/log.c:1713 builtin/log.c:1963 +#: builtin/merge.c:404 builtin/pack-objects.c:3032 builtin/pack-objects.c:3047 +#: builtin/shortlog.c:192 msgid "revision walk setup failed" msgstr "сбой инициализации прохода по редакциям" -#: blame.c:1815 +#: blame.c:1848 msgid "" "--reverse --first-parent together require range along first-parent chain" msgstr "при указании --reverse и --first-parent вместе, требуется также указать диапазон по цепочке первого родителя" -#: blame.c:1826 +#: blame.c:1859 #, c-format msgid "no such path %s in %s" msgstr "нет такого пути %s в %s" -#: blame.c:1837 +#: blame.c:1870 #, c-format msgid "cannot read blob %s for path %s" msgstr "невозможно прочитать объект %s для пути %s" -#: branch.c:53 +#: branch.c:54 #, c-format msgid "" "\n" @@ -991,86 +1046,86 @@ msgid "" "\"git branch --set-upstream-to=%s%s%s\"." msgstr "\nПосле исправления причины ошибки,\nвы можете исправить информацию об отслеживаемой\nвнешней ветке, с помощью команды\n«git branch --set-upstream-to=%s%s%s»." -#: branch.c:67 +#: branch.c:68 #, c-format msgid "Not setting branch %s as its own upstream." msgstr "Не устанавливаю ветку %s, так так она принадлежит вышестоящему репозиторию." -#: branch.c:93 +#: branch.c:94 #, c-format msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing." msgstr "Ветка «%s» отслеживает внешнюю ветку «%s» из «%s» перемещением." -#: branch.c:94 +#: branch.c:95 #, c-format msgid "Branch '%s' set up to track remote branch '%s' from '%s'." msgstr "Ветка «%s» отслеживает внешнюю ветку «%s» из «%s»." -#: branch.c:98 +#: branch.c:99 #, c-format msgid "Branch '%s' set up to track local branch '%s' by rebasing." msgstr "Ветка «%s» отслеживает локальную ветку «%s» перемещением." -#: branch.c:99 +#: branch.c:100 #, c-format msgid "Branch '%s' set up to track local branch '%s'." msgstr "Ветка «%s» отслеживает локальную ветку «%s»." -#: branch.c:104 +#: branch.c:105 #, c-format msgid "Branch '%s' set up to track remote ref '%s' by rebasing." msgstr "Ветка «%s» отслеживает внешнюю ссылку «%s» перемещением." -#: branch.c:105 +#: branch.c:106 #, c-format msgid "Branch '%s' set up to track remote ref '%s'." msgstr "Ветка «%s» отслеживает внешнюю ссылку «%s»." -#: branch.c:109 +#: branch.c:110 #, c-format msgid "Branch '%s' set up to track local ref '%s' by rebasing." msgstr "Ветка «%s» отслеживает локальную ссылку «%s» перемещением." -#: branch.c:110 +#: branch.c:111 #, c-format msgid "Branch '%s' set up to track local ref '%s'." msgstr "Ветка «%s» отслеживает локальную ссылку «%s»." -#: branch.c:119 +#: branch.c:120 msgid "Unable to write upstream branch configuration" msgstr "Не удалось записать настройки вышестоящей ветки" -#: branch.c:156 +#: branch.c:157 #, c-format msgid "Not tracking: ambiguous information for ref %s" msgstr "Не отслеживается: неоднозначная информация для ссылки %s" -#: branch.c:189 +#: branch.c:190 #, c-format msgid "'%s' is not a valid branch name." msgstr "«%s» не является действительным именем ветки." -#: branch.c:208 +#: branch.c:209 #, c-format msgid "A branch named '%s' already exists." msgstr "Ветка с именем «%s» уже существует." -#: branch.c:213 +#: branch.c:214 msgid "Cannot force update the current branch." msgstr "Не удалось принудительно обновить текущую ветку." -#: branch.c:233 +#: branch.c:234 #, c-format msgid "" "Cannot setup tracking information; starting point '%s' is not a branch." msgstr "Не удалось настроить информацию отслеживания; стартовая точка «%s» не является веткой." -#: branch.c:235 +#: branch.c:236 #, c-format msgid "the requested upstream branch '%s' does not exist" msgstr "запрошенная ветка вышестоящего репозитория «%s» не существует" -#: branch.c:237 +#: branch.c:238 msgid "" "\n" "If you are planning on basing your work on an upstream\n" @@ -1082,52 +1137,51 @@ msgid "" "\"git push -u\" to set the upstream config as you push." msgstr "\nЕсли вы планируете основывать свою работу на вышестоящей ветке, которая уже существует во внешнем репозитории, вам может потребоваться запустить «git fetch» для ее получения.\n\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»." -#: branch.c:359 +#: branch.c:360 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "«%s» уже находится на «%s»" -#: branch.c:382 +#: branch.c:383 #, c-format msgid "HEAD of working tree %s is not updated" msgstr "HEAD рабочего каталога %s не обновлён" -#: bundle.c:34 +#: bundle.c:36 #, c-format msgid "'%s' does not look like a v2 bundle file" msgstr "«%s» не похож на файл пакета версии 2" -#: bundle.c:62 +#: bundle.c:64 #, c-format msgid "unrecognized header: %s%s (%d)" msgstr "неопознанный заголовок: %s%s (%d)" -#: bundle.c:88 sequencer.c:1360 sequencer.c:1807 sequencer.c:2637 -#: sequencer.c:2663 sequencer.c:2754 sequencer.c:2856 builtin/commit.c:782 +#: bundle.c:90 sequencer.c:2092 sequencer.c:2578 builtin/commit.c:768 #, c-format msgid "could not open '%s'" msgstr "не удалось открыть «%s»" -#: bundle.c:140 +#: bundle.c:141 msgid "Repository lacks these prerequisite commits:" msgstr "В репозитории отсутствуют необходимые коммиты:" -#: bundle.c:193 +#: bundle.c:192 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" @@ -1136,11 +1190,11 @@ msgstr[1] "Пакет содержит эти %d ссылки:" msgstr[2] "Пакет содержит эти %d ссылок:" msgstr[3] "Пакет содержит эти %d ссылок:" -#: bundle.c:200 +#: bundle.c:199 msgid "The bundle records a complete history." msgstr "Пакет содержит полную историю." -#: bundle.c:202 +#: bundle.c:201 #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" @@ -1149,24 +1203,24 @@ msgstr[1] "Пакет требует эти %d ссылки:" msgstr[2] "Пакет требует эти %d ссылок:" msgstr[3] "Пакет требует эти %d ссылок:" -#: bundle.c:261 +#: bundle.c:260 msgid "Could not spawn pack-objects" msgstr "Не удалось создать объекты пакета" -#: bundle.c:272 +#: bundle.c:271 msgid "pack-objects died" msgstr "критическая ошибка pack-objects" -#: bundle.c:314 +#: bundle.c:313 msgid "rev-list died" msgstr "критическая ошибка rev-list" -#: bundle.c:363 +#: bundle.c:362 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "ссылка «%s» исключена в соответствии с опциями rev-list" -#: bundle.c:453 builtin/log.c:181 builtin/log.c:1604 builtin/shortlog.c:296 +#: bundle.c:453 builtin/log.c:187 builtin/log.c:1618 builtin/shortlog.c:304 #, c-format msgid "unrecognized argument: %s" msgstr "неопознанный аргумент: %s" @@ -1184,193 +1238,421 @@ msgstr "не удалось создать «%s»" msgid "index-pack died" msgstr "критическая ошибка index-pack" -#: color.c:301 +#: color.c:296 #, c-format msgid "invalid color value: %.*s" msgstr "недопустимое значение цвета: %.*s" -#: commit.c:41 sequencer.c:1614 builtin/am.c:421 builtin/am.c:465 -#: builtin/am.c:1434 builtin/am.c:2069 +#: commit.c:48 sequencer.c:2384 builtin/am.c:422 builtin/am.c:466 +#: builtin/am.c:1438 builtin/am.c:2072 builtin/replace.c:376 +#: builtin/replace.c:448 #, c-format msgid "could not parse %s" msgstr "не удалось разобрать %s" -#: commit.c:43 +#: commit.c:50 #, c-format msgid "%s %s is not a commit!" msgstr "%s %s не является коммитом!" -#: commit.c:1524 +#: commit.c:191 +msgid "" +"Support for <GIT_DIR>/info/grafts is deprecated\n" +"and will be removed in a future Git version.\n" +"\n" +"Please use \"git replace --convert-graft-file\"\n" +"to convert the grafts into replace refs.\n" +"\n" +"Turn this message off by running\n" +"\"git config advice.graftFileDeprecated false\"" +msgstr "Поддержка <GIT_DIR>/info/grafts устарела и будет удалена в следующих версиях Git.\n\nИспользуйте «git replace --convert-graft-file» для конвертации сращений (grafts) на ссылки замены.\n\nЧтобы скрыть это сообщение запустите «git config advice.graftFileDeprecated false»" + +#: commit.c:1629 msgid "" "Warning: commit message did not conform to UTF-8.\n" "You may want to amend it after fixing the message, or set the config\n" "variable i18n.commitencoding to the encoding your project uses.\n" msgstr "Предупреждение: сообщение коммита не соответствует UTF-8.\nВозможно, вы захотите исправить его после исправления сообщения\nили настроить опцию i18n.commitencoding и указать кодировку\nсообщений, которую использует ваш проект.\n" +#: commit-graph.c:83 +#, c-format +msgid "graph file %s is too small" +msgstr "" + +#: commit-graph.c:90 +#, c-format +msgid "graph signature %X does not match signature %X" +msgstr "" + +#: commit-graph.c:97 +#, c-format +msgid "graph version %X does not match version %X" +msgstr "" + +#: commit-graph.c:104 +#, c-format +msgid "hash version %X does not match version %X" +msgstr "" + +#: commit-graph.c:128 +#, c-format +msgid "improper chunk offset %08x%08x" +msgstr "" + +#: commit-graph.c:164 +#, c-format +msgid "chunk id %08x appears multiple times" +msgstr "" + +#: commit-graph.c:261 +#, c-format +msgid "could not find commit %s" +msgstr "" + +#: commit-graph.c:565 builtin/pack-objects.c:2571 +#, c-format +msgid "unable to get type of object %s" +msgstr "" + +#: commit-graph.c:730 +#, c-format +msgid "error adding pack %s" +msgstr "" + +#: commit-graph.c:732 +#, c-format +msgid "error opening index for %s" +msgstr "" + +#: commit-graph.c:773 +#, c-format +msgid "the commit graph format cannot write %d commits" +msgstr "программе форматирования графа коммитов не удалось записать %d коммитов" + +#: commit-graph.c:800 +msgid "too many commits to write graph" +msgstr "слишком много коммитов для записи графа" + +#: commit-graph.c:806 +#, c-format +msgid "unable to create leading directories of %s" +msgstr "не удалось создать родительские каталоги для %s" + +#: commit-graph.c:904 +msgid "the commit-graph file has incorrect checksum and is likely corrupt" +msgstr "" + #: compat/obstack.c:405 compat/obstack.c:407 msgid "memory exhausted" msgstr "память исчерпана" -#: config.c:186 +#: config.c:123 +#, c-format +msgid "" +"exceeded maximum include depth (%d) while including\n" +"\t%s\n" +"from\n" +"\t%s\n" +"Do you have circular includes?" +msgstr "" + +#: config.c:139 +#, c-format +msgid "could not expand include path '%s'" +msgstr "не удалось раскрыть путь включения «%s»" + +#: config.c:150 +msgid "relative config includes must come from files" +msgstr "относительные включения конфигурации должны исходить из файлов" + +#: config.c:190 msgid "relative config include conditionals must come from files" msgstr "относительные условные включения конфигурации должны исходить из файлов" -#: config.c:720 +#: config.c:348 +#, c-format +msgid "key does not contain a section: %s" +msgstr "" + +#: config.c:354 +#, c-format +msgid "key does not contain variable name: %s" +msgstr "" + +#: config.c:378 sequencer.c:2206 +#, c-format +msgid "invalid key: %s" +msgstr "недействительный ключ: %s" + +#: config.c:384 +#, c-format +msgid "invalid key (newline): %s" +msgstr "" + +#: config.c:420 config.c:432 +#, c-format +msgid "bogus config parameter: %s" +msgstr "" + +#: config.c:467 +#, c-format +msgid "bogus format in %s" +msgstr "" + +#: config.c:793 #, c-format msgid "bad config line %d in blob %s" msgstr "ошибка в %d строке двоичного объекта %s" -#: config.c:724 +#: config.c:797 #, c-format msgid "bad config line %d in file %s" msgstr "ошибка в %d строке файла %s" -#: config.c:728 +#: config.c:801 #, c-format msgid "bad config line %d in standard input" msgstr "ошибка в %d строке стандартного ввода" -#: config.c:732 +#: config.c:805 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "ошибка в %d строке двоичного объекта подмодуля %s" -#: config.c:736 +#: config.c:809 #, c-format msgid "bad config line %d in command line %s" msgstr "ошибка в %d строке коммандной строки %s" -#: config.c:740 +#: config.c:813 #, c-format msgid "bad config line %d in %s" msgstr "ошибка в %d строке в %s" -#: config.c:868 +#: config.c:952 msgid "out of range" msgstr "вне диапазона" -#: config.c:868 +#: config.c:952 msgid "invalid unit" msgstr "неправильное число" -#: config.c:874 +#: config.c:958 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "неправильное числовое значение «%s» для «%s»: %s" -#: config.c:879 +#: config.c:963 #, c-format msgid "bad numeric config value '%s' for '%s' in blob %s: %s" msgstr "неправильное числовое значение «%s» для «%s» в двоичном объекте %s: %s" -#: config.c:882 +#: config.c:966 #, c-format msgid "bad numeric config value '%s' for '%s' in file %s: %s" msgstr "неправильное числовое значение «%s» для «%s» в файле %s: %s" -#: config.c:885 +#: config.c:969 #, c-format msgid "bad numeric config value '%s' for '%s' in standard input: %s" msgstr "неправильное числовое значение «%s» для «%s» на стандартном вводе: %s" -#: config.c:888 +#: config.c:972 #, c-format msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" msgstr "неправильное числовое значение «%s» для «%s» в двоичном объекте подмодуля %s: %s" -#: config.c:891 +#: config.c:975 #, c-format msgid "bad numeric config value '%s' for '%s' in command line %s: %s" msgstr "неправильное числовое значение «%s» для «%s» на коммандной строке %s: %s" -#: config.c:894 +#: config.c:978 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "неправильное числовое значение «%s» для «%s» в %s: %s" -#: config.c:989 +#: config.c:1073 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "сбой разворачивания пути каталога пользователя: «%s»" -#: config.c:998 +#: config.c:1082 #, c-format msgid "'%s' for '%s' is not a valid timestamp" msgstr "«%s» для «%s» не является допустимой меткой даты/времени" -#: config.c:1094 config.c:1105 +#: config.c:1173 +#, c-format +msgid "abbrev length out of range: %d" +msgstr "" + +#: config.c:1187 config.c:1198 #, c-format msgid "bad zlib compression level %d" msgstr "неправильный уровень сжатия zlib %d" -#: config.c:1222 +#: config.c:1290 +msgid "core.commentChar should only be one character" +msgstr "" + +#: config.c:1323 #, c-format msgid "invalid mode for object creation: %s" msgstr "недопустимый режим создания объекта: %s" -#: config.c:1378 +#: config.c:1403 +#, c-format +msgid "malformed value for %s" +msgstr "" + +#: config.c:1429 +#, c-format +msgid "malformed value for %s: %s" +msgstr "" + +#: config.c:1430 +msgid "must be one of nothing, matching, simple, upstream or current" +msgstr "" + +#: config.c:1489 builtin/pack-objects.c:3282 #, c-format msgid "bad pack compression level %d" msgstr "неправильный уровень сжатия пакета %d" -#: config.c:1574 +#: config.c:1610 +#, c-format +msgid "unable to load config blob object '%s'" +msgstr "" + +#: config.c:1613 +#, c-format +msgid "reference '%s' does not point to a blob" +msgstr "" + +#: config.c:1630 +#, c-format +msgid "unable to resolve config blob '%s'" +msgstr "" + +#: config.c:1660 +#, c-format +msgid "failed to parse %s" +msgstr "" + +#: config.c:1700 msgid "unable to parse command-line config" msgstr "не удалось разобрать конфигурацию из командной строки" -#: config.c:1906 +#: config.c:2032 msgid "unknown error occurred while reading the configuration files" msgstr "произошла неизвестная ошибка при чтении файлов конфигурации" -#: config.c:2093 +#: config.c:2202 #, c-format msgid "Invalid %s: '%s'" msgstr "Недействительный %s: «%s»" -#: config.c:2136 +#: config.c:2245 #, c-format msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" msgstr "неизвестное значение «%s» для core.untrackedCache; использую стандартное значение «keep»" -#: config.c:2162 +#: config.c:2271 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "значение «%d» для splitIndex.maxPercentChange должно быть от 0 до 100" -#: config.c:2187 +#: config.c:2296 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "не удалось разобрать «%s» в конфигурации из командной строки" -#: config.c:2189 +#: config.c:2298 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "неправильная переменная конфигурации «%s» в файле «%s» на строке %d" -#: config.c:2248 +#: config.c:2379 +#, c-format +msgid "invalid section name '%s'" +msgstr "" + +#: config.c:2411 #, c-format msgid "%s has multiple values" msgstr "%s имеет несколько значений" -#: config.c:2591 config.c:2808 +#: config.c:2440 +#, c-format +msgid "failed to write new configuration file %s" +msgstr "" + +#: config.c:2691 config.c:3015 +#, c-format +msgid "could not lock config file %s" +msgstr "" + +#: config.c:2702 +#, c-format +msgid "opening %s" +msgstr "" + +#: config.c:2737 builtin/config.c:324 +#, c-format +msgid "invalid pattern: %s" +msgstr "" + +#: config.c:2762 +#, c-format +msgid "invalid config file %s" +msgstr "" + +#: config.c:2775 config.c:3028 #, c-format msgid "fstat on %s failed" msgstr "сбой при выполнении fstat на файле %s" -#: config.c:2698 +#: config.c:2786 +#, c-format +msgid "unable to mmap '%s'" +msgstr "" + +#: config.c:2795 config.c:3033 +#, c-format +msgid "chmod on %s failed" +msgstr "" + +#: config.c:2880 config.c:3130 +#, c-format +msgid "could not write config file %s" +msgstr "" + +#: config.c:2914 #, c-format msgid "could not set '%s' to '%s'" msgstr "не удалось установить «%s» в «%s»" -#: config.c:2700 builtin/remote.c:776 +#: config.c:2916 builtin/remote.c:781 #, c-format msgid "could not unset '%s'" msgstr "не удалось сбросить значение для «%s»" -#: connect.c:52 -msgid "The remote end hung up upon initial contact" -msgstr "Внешний сервер отсоединился до начала сеанса связи" +#: config.c:3006 +#, c-format +msgid "invalid section name: %s" +msgstr "" -#: connect.c:54 +#: config.c:3173 +#, c-format +msgid "missing value for '%s'" +msgstr "" + +#: connect.c:61 +msgid "the remote end hung up upon initial contact" +msgstr "" + +#: connect.c:63 msgid "" "Could not read from remote repository.\n" "\n" @@ -1378,45 +1660,282 @@ msgid "" "and the repository exists." msgstr "Не удалось прочитать из внешнего репозитория.\n\nУдостоверьтесь, что у вас есть необходимые права доступа\nи репозиторий существует." -#: connected.c:64 builtin/fsck.c:183 builtin/prune.c:141 +#: connect.c:81 +#, c-format +msgid "server doesn't support '%s'" +msgstr "" + +#: connect.c:103 +#, c-format +msgid "server doesn't support feature '%s'" +msgstr "" + +#: connect.c:114 +msgid "expected flush after capabilities" +msgstr "" + +#: connect.c:233 +#, c-format +msgid "ignoring capabilities after first line '%s'" +msgstr "" + +#: connect.c:252 +msgid "protocol error: unexpected capabilities^{}" +msgstr "" + +#: connect.c:273 +#, c-format +msgid "protocol error: expected shallow sha-1, got '%s'" +msgstr "" + +#: connect.c:275 +msgid "repository on the other end cannot be shallow" +msgstr "" + +#: connect.c:310 fetch-pack.c:183 builtin/archive.c:63 +#, c-format +msgid "remote error: %s" +msgstr "ошибка внешнего репозитория: %s" + +#: connect.c:316 +msgid "invalid packet" +msgstr "" + +#: connect.c:336 +#, c-format +msgid "protocol error: unexpected '%s'" +msgstr "" + +#: connect.c:444 +#, c-format +msgid "invalid ls-refs response: %s" +msgstr "" + +#: connect.c:448 +msgid "expected flush after ref listing" +msgstr "" + +#: connect.c:547 +#, c-format +msgid "protocol '%s' is not supported" +msgstr "" + +#: connect.c:598 +msgid "unable to set SO_KEEPALIVE on socket" +msgstr "" + +#: connect.c:638 connect.c:701 +#, c-format +msgid "Looking up %s ... " +msgstr "" + +#: connect.c:642 +#, c-format +msgid "unable to look up %s (port %s) (%s)" +msgstr "" + +#. TRANSLATORS: this is the end of "Looking up %s ... " +#: connect.c:646 connect.c:717 +#, c-format +msgid "" +"done.\n" +"Connecting to %s (port %s) ... " +msgstr "" + +#: connect.c:668 connect.c:745 +#, c-format +msgid "" +"unable to connect to %s:\n" +"%s" +msgstr "" + +#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... " +#: connect.c:674 connect.c:751 +msgid "done." +msgstr "" + +#: connect.c:705 +#, c-format +msgid "unable to look up %s (%s)" +msgstr "" + +#: connect.c:711 +#, c-format +msgid "unknown port %s" +msgstr "" + +#: connect.c:848 connect.c:1174 +#, c-format +msgid "strange hostname '%s' blocked" +msgstr "" + +#: connect.c:850 +#, c-format +msgid "strange port '%s' blocked" +msgstr "" + +#: connect.c:860 +#, c-format +msgid "cannot start proxy %s" +msgstr "" + +#: connect.c:927 +msgid "no path specified; see 'git help pull' for valid url syntax" +msgstr "" + +#: connect.c:1122 +msgid "ssh variant 'simple' does not support -4" +msgstr "" + +#: connect.c:1134 +msgid "ssh variant 'simple' does not support -6" +msgstr "" + +#: connect.c:1151 +msgid "ssh variant 'simple' does not support setting port" +msgstr "" + +#: connect.c:1262 +#, c-format +msgid "strange pathname '%s' blocked" +msgstr "" + +#: connect.c:1307 +msgid "unable to fork" +msgstr "" + +#: connected.c:68 builtin/fsck.c:203 builtin/prune.c:146 msgid "Checking connectivity" msgstr "Проверка соединения" -#: connected.c:76 +#: connected.c:80 msgid "Could not run 'git rev-list'" msgstr "Не удалось запустить «git rev-list»" -#: connected.c:96 +#: connected.c:100 msgid "failed write to rev-list" msgstr "сбой записи в rev-list" -#: connected.c:103 +#: connected.c:107 msgid "failed to close rev-list's stdin" msgstr "сбой закрытия стандартного ввода у rev-list" -#: convert.c:205 +#: convert.c:194 +#, c-format +msgid "illegal crlf_action %d" +msgstr "" + +#: convert.c:207 +#, c-format +msgid "CRLF would be replaced by LF in %s" +msgstr "" + +#: convert.c:209 #, c-format msgid "" "CRLF will be replaced by LF in %s.\n" -"The file will have its original line endings in your working directory." -msgstr "CRLF будет заменен на LF в %s.\nФайл будет иметь свои оригинальные концы строк в вашей рабочей копии." +"The file will have its original line endings in your working directory" +msgstr "" -#: convert.c:209 +#: convert.c:217 #, c-format -msgid "CRLF would be replaced by LF in %s." -msgstr "CRLF будет заменен на LF в %s." +msgid "LF would be replaced by CRLF in %s" +msgstr "LF будет заменен на CRLF в %s" -#: convert.c:215 +#: convert.c:219 #, c-format msgid "" "LF will be replaced by CRLF in %s.\n" -"The file will have its original line endings in your working directory." -msgstr "LF будет заменен на CRLF в %s.\nФайл будет иметь свои оригинальные концы строк в вашей рабочей копии." +"The file will have its original line endings in your working directory" +msgstr "" -#: convert.c:219 +#: convert.c:280 #, c-format -msgid "LF would be replaced by CRLF in %s" -msgstr "LF будет заменен на CRLF в %s" +msgid "BOM is prohibited in '%s' if encoded as %s" +msgstr "BOM запрещен в «%s», если кодируется как %s" + +#: convert.c:287 +#, c-format +msgid "" +"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as " +"working-tree-encoding." +msgstr "Файл «%s» содержит маркер последовательности байтов (BOM). Используйте UTF-%s как кодировку рабочего каталога." + +#: convert.c:305 +#, c-format +msgid "BOM is required in '%s' if encoded as %s" +msgstr "BOM требуется в «%s», если кодируется как %s" + +#: convert.c:307 +#, c-format +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 "Файл «%s» не содержит маркер последовательности байтов (BOM). Используйте UTF-%sBE или UTF-%sLE (в зависимости от порядка байтов) как кодировку рабочего каталога." + +#: convert.c:425 convert.c:496 +#, c-format +msgid "failed to encode '%s' from %s to %s" +msgstr "не удалось перекодировать «%s» из %s в %s" + +#: convert.c:468 +#, c-format +msgid "encoding '%s' from %s to %s and back is not the same" +msgstr "перекодирование «%s» из %s в %s и обратно не одно и то же" + +#: convert.c:674 +#, c-format +msgid "cannot fork to run external filter '%s'" +msgstr "" + +#: convert.c:694 +#, c-format +msgid "cannot feed the input to external filter '%s'" +msgstr "" + +#: convert.c:701 +#, c-format +msgid "external filter '%s' failed %d" +msgstr "" + +#: convert.c:736 convert.c:739 +#, c-format +msgid "read from external filter '%s' failed" +msgstr "" + +#: convert.c:742 convert.c:796 +#, c-format +msgid "external filter '%s' failed" +msgstr "" + +#: convert.c:844 +msgid "unexpected filter type" +msgstr "" + +#: convert.c:855 +msgid "path name too long for external filter" +msgstr "" + +#: convert.c:929 +#, c-format +msgid "" +"external filter '%s' is not available anymore although not all paths have " +"been filtered" +msgstr "" + +#: convert.c:1228 +msgid "true/false are no valid working-tree-encodings" +msgstr "true/false не является допустимым значением для working-tree-encoding" + +#: convert.c:1402 convert.c:1436 +#, c-format +msgid "%s: clean filter '%s' failed" +msgstr "" + +#: convert.c:1480 +#, c-format +msgid "%s: smudge filter %s failed" +msgstr "" #: date.c:116 msgid "in the future" @@ -1509,96 +2028,131 @@ msgstr[3] "%<PRIuMAX> года назад" msgid "failed to read orderfile '%s'" msgstr "сбой чтения orderfile «%s»" -#: diffcore-rename.c:535 +#: diffcore-rename.c:536 msgid "Performing inexact rename detection" msgstr "Выполняется неточное определение переименования" -#: diff.c:74 +#: diff.c:108 #, c-format msgid "option '%s' requires a value" msgstr "параметр «%s» требует указания значения" -#: diff.c:152 +#: diff.c:158 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr " Сбой разбора величины среза (cut-off) у dirstat «%s»\n" -#: diff.c:157 +#: diff.c:163 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr "Неизвестный параметр dirstat: «%s»\n" -#: diff.c:281 +#: diff.c:291 msgid "" -"color moved setting must be one of 'no', 'default', 'zebra', 'dimmed_zebra'," -" 'plain'" -msgstr "значение настройки цвета для перемещённых строк должно быть одно из «no» «default», «zebra», «dimmed_zebra», «plain»" +"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', " +"'dimmed-zebra', 'plain'" +msgstr "" -#: diff.c:341 +#: diff.c:316 +#, c-format +msgid "ignoring unknown color-moved-ws mode '%s'" +msgstr "" + +#: diff.c:323 +msgid "" +"color-moved-ws: allow-indentation-change cannot be combined with other white" +" space modes" +msgstr "" + +#: diff.c:394 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "Неизвестное значения для переменной «diff.submodule»: «%s»" -#: diff.c:401 +#: diff.c:454 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" "%s" msgstr "Найдены ошибки в переменной «diff.dirstat»:\n%s" -#: diff.c:3799 +#: diff.c:4096 #, c-format msgid "external diff died, stopping at %s" msgstr "критическая ошибка при внешнем сравнении, останов на %s" -#: diff.c:4127 +#: diff.c:4427 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-only, --name-status, --check и -s нельзя использовать одновременно" -#: diff.c:4215 +#: diff.c:4430 +msgid "-G, -S and --find-object are mutually exclusive" +msgstr "-G, -S и --find-object нельзя использовать одновременно" + +#: diff.c:4508 msgid "--follow requires exactly one pathspec" msgstr "--follow требует ровно одного спецификатора пути" -#: diff.c:4381 +#: diff.c:4674 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" "%s" msgstr "Сбой разбора параметра опции --dirstat/-X :\n%s" -#: diff.c:4395 +#: diff.c:4688 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "Сбой разбора параметра опции --submodule: «%s»" -#: diff.c:5446 +#: diff.c:5766 msgid "inexact rename detection was skipped due to too many files." msgstr "неточное определение переименования было пропущено из-за слишком большого количества файлов." -#: diff.c:5449 +#: diff.c:5769 msgid "only found copies from modified paths due to too many files." msgstr "найдены только копии из измененных путей из-за слишком большого количества файлов." -#: diff.c:5452 +#: diff.c:5772 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." msgstr "возможно вы захотите установить переменную %s в как минимум значение %d и повторить вызов команды." -#: dir.c:2100 +#: dir.c:569 +#, c-format +msgid "pathspec '%s' did not match any file(s) known to git" +msgstr "" + +#: dir.c:958 +#, c-format +msgid "cannot use %s as an exclude file" +msgstr "" + +#: dir.c:1873 +#, c-format +msgid "could not open directory '%s'" +msgstr "не удалось открыть каталог «%s»" + +#: dir.c:2115 msgid "failed to get kernel name and information" msgstr "не удалось получить имя ядра и информацию" -#: dir.c:2219 -msgid "Untracked cache is disabled on this system or location." -msgstr "Кэш неотслеживаемых файлов отключен на этой системе или в этом месте." +#: dir.c:2239 +msgid "untracked cache is disabled on this system or location" +msgstr "" -#: dir.c:3002 dir.c:3007 +#: dir.c:3037 +#, c-format +msgid "index file corrupt in repo %s" +msgstr "" + +#: dir.c:3082 dir.c:3087 #, c-format msgid "could not create directories for %s" msgstr "не удалось создать каталоги для %s" -#: dir.c:3032 +#: dir.c:3116 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "не удалось переместить каталог git с «%s» в «%s»" @@ -1608,105 +2162,119 @@ msgstr "не удалось переместить каталог git с «%s» msgid "hint: Waiting for your editor to close the file...%c" msgstr "подсказка: Ожидание, пока вы закроете редактор с файлом…%c" -#: entry.c:177 +#: entry.c:178 msgid "Filtering content" msgstr "Фильтруется содержимое" -#: entry.c:435 +#: entry.c:437 #, c-format msgid "could not stat file '%s'" msgstr "не удалось выполнить stat для файла «%s»" -#: fetch-pack.c:252 -msgid "git fetch-pack: expected shallow list" -msgstr "git fetch-pack: ожидается передача списка для получение части" +#: environment.c:150 +#, c-format +msgid "bad git namespace path \"%s\"" +msgstr "" -#: fetch-pack.c:264 -msgid "git fetch-pack: expected ACK/NAK, got EOF" -msgstr "git fetch-pack: ожидается ACK/NAK, а получено EOF" +#: environment.c:332 +#, c-format +msgid "could not set GIT_DIR to '%s'" +msgstr "" -#: fetch-pack.c:283 builtin/archive.c:63 +#: exec-cmd.c:361 #, c-format -msgid "remote error: %s" -msgstr "ошибка внешнего репозитория: %s" +msgid "too many args to run %s" +msgstr "" + +#: fetch-object.c:17 +msgid "Remote with no URL" +msgstr "Внешний репозиторий без URL" + +#: fetch-pack.c:152 +msgid "git fetch-pack: expected shallow list" +msgstr "git fetch-pack: ожидается передача списка для получение части" -#: fetch-pack.c:284 +#: fetch-pack.c:164 +msgid "git fetch-pack: expected ACK/NAK, got a flush packet" +msgstr "git fetch-pack: ожидается ACK/NAK, а получен пустой пакет" + +#: fetch-pack.c:184 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "git fetch-pack: ожидается ACK/NAK, а получено «%s»" -#: fetch-pack.c:336 +#: fetch-pack.c:254 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc требует multi_ack_detailed" -#: fetch-pack.c:422 +#: fetch-pack.c:342 fetch-pack.c:1257 #, c-format msgid "invalid shallow line: %s" msgstr "неправильная строка частичного получения: %s" -#: fetch-pack.c:428 +#: fetch-pack.c:348 fetch-pack.c:1263 #, c-format msgid "invalid unshallow line: %s" msgstr "неправильная строка полного получения: %s" -#: fetch-pack.c:430 +#: fetch-pack.c:350 fetch-pack.c:1265 #, c-format msgid "object not found: %s" msgstr "объект не найден: %s" -#: fetch-pack.c:433 +#: fetch-pack.c:353 fetch-pack.c:1268 #, c-format msgid "error in object: %s" msgstr "ошибка в объекте: %s" -#: fetch-pack.c:435 +#: fetch-pack.c:355 fetch-pack.c:1270 #, c-format msgid "no shallow found: %s" msgstr "частичный клон не найден: %s" -#: fetch-pack.c:438 +#: fetch-pack.c:358 fetch-pack.c:1273 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "ожидалось shallow/unshallow, а получено %s" -#: fetch-pack.c:477 +#: fetch-pack.c:399 #, c-format msgid "got %s %d %s" msgstr "получено %s %d %s" -#: fetch-pack.c:491 +#: fetch-pack.c:416 #, c-format msgid "invalid commit %s" msgstr "недопустимый коммит %s" -#: fetch-pack.c:524 +#: fetch-pack.c:447 msgid "giving up" msgstr "останавливаю дальнейшие попытки" -#: fetch-pack.c:534 progress.c:229 +#: fetch-pack.c:459 progress.c:229 msgid "done" msgstr "готово" -#: fetch-pack.c:546 +#: fetch-pack.c:471 #, c-format msgid "got %s (%d) %s" msgstr "получено %s (%d) %s" -#: fetch-pack.c:592 +#: fetch-pack.c:517 #, c-format msgid "Marking %s as complete" msgstr "Помечаю %s как завершенный" -#: fetch-pack.c:777 +#: fetch-pack.c:764 #, c-format msgid "already have %s (%s)" msgstr "уже есть %s (%s)" -#: fetch-pack.c:815 +#: fetch-pack.c:803 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-pack: не удалось запустить программу разбора данных" -#: fetch-pack.c:823 +#: fetch-pack.c:811 msgid "protocol error: bad pack header" msgstr "ошибка протокола: неправильный заголовок потока" @@ -1724,90 +2292,142 @@ msgstr "%s завершен с ошибкой" msgid "error in sideband demultiplexer" msgstr "произошла ошибка в программе разбора данных" -#: fetch-pack.c:924 +#: fetch-pack.c:926 msgid "Server does not support shallow clients" msgstr "Сервер не поддерживает клиентов с частичным клонированием" -#: fetch-pack.c:928 +#: fetch-pack.c:930 msgid "Server supports multi_ack_detailed" msgstr "Сервер поддерживает multi_ack_detailed" -#: fetch-pack.c:931 +#: fetch-pack.c:933 msgid "Server supports no-done" msgstr "Сервер поддерживает no-done" -#: fetch-pack.c:937 +#: fetch-pack.c:939 msgid "Server supports multi_ack" msgstr "Сервер поддерживает multi_ack" -#: fetch-pack.c:941 +#: fetch-pack.c:943 msgid "Server supports side-band-64k" msgstr "Сервер поддерживает side-band-64k" -#: fetch-pack.c:945 +#: fetch-pack.c:947 msgid "Server supports side-band" msgstr "Сервер поддерживает side-band" -#: fetch-pack.c:949 +#: fetch-pack.c:951 msgid "Server supports allow-tip-sha1-in-want" msgstr "Сервер поддерживает allow-tip-sha1-in-want" -#: fetch-pack.c:953 +#: fetch-pack.c:955 msgid "Server supports allow-reachable-sha1-in-want" msgstr "Сервер поддерживает allow-reachable-sha1-in-want" -#: fetch-pack.c:963 +#: fetch-pack.c:965 msgid "Server supports ofs-delta" msgstr "Сервер поддерживает ofs-delta" -#: fetch-pack.c:970 +#: fetch-pack.c:971 fetch-pack.c:1150 +msgid "Server supports filter" +msgstr "Сервер поддерживает фильтрацию" + +#: fetch-pack.c:979 #, c-format msgid "Server version is %.*s" msgstr "Версия сервера %.*s" -#: fetch-pack.c:976 +#: fetch-pack.c:985 msgid "Server does not support --shallow-since" msgstr "Сервер не поддерживает --shallow-since" -#: fetch-pack.c:980 +#: fetch-pack.c:989 msgid "Server does not support --shallow-exclude" msgstr "Сервер не поддерживает --shallow-exclude" -#: fetch-pack.c:982 +#: fetch-pack.c:991 msgid "Server does not support --deepen" msgstr "Сервер не поддерживает --deepen" -#: fetch-pack.c:993 +#: fetch-pack.c:1004 msgid "no common commits" msgstr "не общих коммитов" -#: fetch-pack.c:1005 +#: fetch-pack.c:1016 fetch-pack.c:1393 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack: ошибка при получении данных." -#: fetch-pack.c:1167 +#: fetch-pack.c:1145 +msgid "Server does not support shallow requests" +msgstr "Сервер не поддерживает частичные запросы" + +#: fetch-pack.c:1191 +#, c-format +msgid "error reading section header '%s'" +msgstr "" + +#: fetch-pack.c:1197 +#, c-format +msgid "expected '%s', received '%s'" +msgstr "" + +#: fetch-pack.c:1236 +#, c-format +msgid "unexpected acknowledgment line: '%s'" +msgstr "" + +#: fetch-pack.c:1241 +#, c-format +msgid "error processing acks: %d" +msgstr "" + +#: fetch-pack.c:1278 +#, c-format +msgid "error processing shallow info: %d" +msgstr "" + +#: fetch-pack.c:1294 +#, c-format +msgid "expected wanted-ref, got '%s'" +msgstr "" + +#: fetch-pack.c:1304 +#, c-format +msgid "unexpected wanted-ref: '%s'" +msgstr "" + +#: fetch-pack.c:1308 +#, c-format +msgid "error processing wanted refs: %d" +msgstr "" + +#: fetch-pack.c:1603 msgid "no matching remote head" msgstr "нет соотвествующего внешнего указателя на ветку" -#: fetch-pack.c:1189 +#: fetch-pack.c:1621 builtin/clone.c:664 +msgid "remote did not send all necessary objects" +msgstr "внешний репозиторий прислал не все необходимые объекты" + +#: fetch-pack.c:1647 #, c-format msgid "no such remote ref %s" msgstr "нет такой внешней ссылки %s" -#: fetch-pack.c:1192 +#: fetch-pack.c:1650 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "Сервер не поддерживает запрос необъявленного объекта %s" -#: gpg-interface.c:181 +#: gpg-interface.c:253 msgid "gpg failed to sign the data" msgstr "gpg не удалось подписать данные" -#: gpg-interface.c:211 +#: gpg-interface.c:279 msgid "could not create temporary file" msgstr "не удалось создать временный файл" -#: gpg-interface.c:214 +#: gpg-interface.c:282 #, c-format msgid "failed writing detached signature to '%s'" msgstr "сбой записи отсоединенной подписи в «%s»" @@ -1817,66 +2437,128 @@ msgstr "сбой записи отсоединенной подписи в «%s msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "игнорирую недопустимый цвет «%.*s» в log.graphColors" -#: grep.c:2017 +#: grep.c:2115 #, c-format msgid "'%s': unable to read %s" msgstr "«%s»: не удалось прочесть %s" -#: grep.c:2034 builtin/clone.c:404 builtin/diff.c:81 builtin/rm.c:134 +#: grep.c:2132 setup.c:164 builtin/clone.c:410 builtin/diff.c:81 +#: builtin/rm.c:134 #, c-format msgid "failed to stat '%s'" msgstr "не удалось выполнить stat «%s»" -#: grep.c:2045 +#: grep.c:2143 #, c-format msgid "'%s': short read" msgstr "«%s»: слишком мало данных прочитано" -#: help.c:179 +#: help.c:23 +msgid "start a working area (see also: git help tutorial)" +msgstr "создание рабочей области (смотрите также: git help tutorial)" + +#: help.c:24 +msgid "work on the current change (see also: git help everyday)" +msgstr "работа с текущими изменениями (смотрите также: git help everyday)" + +#: help.c:25 +msgid "examine the history and state (see also: git help revisions)" +msgstr "просмотр истории и текущего состояния (смотрите также: git help revisions)" + +#: help.c:26 +msgid "grow, mark and tweak your common history" +msgstr "выращивание, отметка и настройка вашей общей истории" + +#: help.c:27 +msgid "collaborate (see also: git help workflows)" +msgstr "совместная работа (смотрите также: git help workflows)" + +#: help.c:31 +msgid "Main Porcelain Commands" +msgstr "Основные машиночитаемые команды" + +#: help.c:32 +msgid "Ancillary Commands / Manipulators" +msgstr "Вспомогательные команды / Манипуляторы" + +#: help.c:33 +msgid "Ancillary Commands / Interrogators" +msgstr "Вспомогательные команды / Запросчики" + +#: help.c:34 +msgid "Interacting with Others" +msgstr "Взаимодействие с другими" + +#: help.c:35 +msgid "Low-level Commands / Manipulators" +msgstr "Низкоуровневые команды / Манипуляторы" + +#: help.c:36 +msgid "Low-level Commands / Interrogators" +msgstr "Низкоуровневые команды / Запросчики" + +#: help.c:37 +msgid "Low-level Commands / Synching Repositories" +msgstr "Низкоуровневые команды / Синхронизация репозиториев" + +#: help.c:38 +msgid "Low-level Commands / Internal Helpers" +msgstr "Низкоуровневые команды / Внутренние вспомогательные" + +#: help.c:293 #, c-format msgid "available git commands in '%s'" msgstr "доступные команды git в «%s»" -#: help.c:186 +#: help.c:300 msgid "git commands available from elsewhere on your $PATH" msgstr "команды git, доступные в других местах вашего $PATH" -#: help.c:217 +#: help.c:309 msgid "These are common Git commands used in various situations:" msgstr "Стандартные команды Git используемые в различных ситуациях:" -#: help.c:281 +#: help.c:358 git.c:90 +#, c-format +msgid "unsupported command listing type '%s'" +msgstr "неподдерживаемый тип списка команд «%s»" + +#: help.c:405 +msgid "The common Git guides are:" +msgstr "Основные руководства Git:" + +#: help.c:552 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" "able to execute it. Maybe git-%s is broken?" msgstr "«%s» похоже на команду git, но нам не удалось ее запустить. Возможно, git-%s не работает?" -#: help.c:336 +#: help.c:611 msgid "Uh oh. Your system reports no Git commands at all." msgstr "Ой-ёй! Ваша система не сообщает ни о каких командах Git вообще." -#: help.c:358 +#: help.c:633 #, c-format msgid "WARNING: You called a Git command named '%s', which does not exist." msgstr "Внимание: Вы запустили не существующую команду Git «%s»." -#: help.c:363 +#: help.c:638 #, c-format msgid "Continuing under the assumption that you meant '%s'." msgstr "Продолжаю, предполагая, что вы имели в виду «%s»." -#: help.c:368 +#: help.c:643 #, c-format msgid "Continuing in %0.1f seconds, assuming that you meant '%s'." msgstr "Продолжу через %0.1f секунд, предполагая, что вы имели в виду «%s»." -#: help.c:376 +#: help.c:651 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "git: «%s» не является командой git. Смотрите «git --help»." -#: help.c:380 +#: help.c:655 msgid "" "\n" "The most similar command is" @@ -1888,16 +2570,16 @@ msgstr[1] "\nСамые похожие команды:" msgstr[2] "\nСамые похожие команды:" msgstr[3] "\nСамые похожие команды:" -#: help.c:395 +#: help.c:670 msgid "git version [<options>]" msgstr "git version [<options>]" -#: help.c:462 +#: help.c:738 #, c-format msgid "%s: %s - %s" msgstr "%s: %s — %s" -#: help.c:466 +#: help.c:742 msgid "" "\n" "Did you mean this?" @@ -1952,19 +2634,18 @@ msgstr "пустое имя идентификатора (для <%s>) не ра msgid "name consists only of disallowed characters: %s" msgstr "имя состоит только из неразрешенных симоволов: %s" -#: ident.c:416 builtin/commit.c:616 +#: ident.c:416 builtin/commit.c:600 #, c-format msgid "invalid date format: %s" msgstr "неправильный формат даты: %s" -#: list-objects-filter-options.c:30 -msgid "multiple object filter types cannot be combined" -msgstr "невозможно использовать фильтр по нескольким типам объектов" +#: list-objects-filter-options.c:36 +msgid "multiple filter-specs cannot be combined" +msgstr "невозможно объединять фильтрацию с помощью нескольких спецификаций" -#: list-objects-filter-options.c:41 list-objects-filter-options.c:68 -#, c-format -msgid "invalid filter-spec expression '%s'" -msgstr "недопустимое выражение спецификатора фильтра «%s»" +#: list-objects-filter-options.c:126 +msgid "cannot change partial clone promisor remote" +msgstr "нельзя изменить внешний репозиторий при частичном клонировании" #: lockfile.c:151 #, c-format @@ -1983,246 +2664,365 @@ msgstr "Не удалось создать «%s.lock»: %s.\n\nПохоже, ч msgid "Unable to create '%s.lock': %s" msgstr "Не удалось создать «%s.lock»: %s" -#: merge.c:74 +#: merge.c:40 msgid "failed to read the cache" msgstr "сбой чтения кэша" -#: merge.c:128 builtin/am.c:1943 builtin/am.c:1977 builtin/checkout.c:379 -#: builtin/checkout.c:600 builtin/clone.c:754 +#: merge.c:105 builtin/am.c:1946 builtin/am.c:1980 builtin/checkout.c:380 +#: builtin/checkout.c:608 builtin/clone.c:763 msgid "unable to write new index file" msgstr "не удалось записать новый файл индекса" -#: merge-recursive.c:235 +#: merge-recursive.c:303 msgid "(bad commit)\n" msgstr "(плохой коммит)\n" -#: merge-recursive.c:257 merge-recursive.c:265 +#: merge-recursive.c:325 +#, c-format +msgid "add_cacheinfo failed for path '%s'; merge aborting." +msgstr "сбой add_cacheinfo для пути «%s»; отмена слияния." + +#: merge-recursive.c:333 #, c-format -msgid "addinfo_cache failed for path '%s'" -msgstr "сбой addinfo_cache для пути «%s»" +msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." +msgstr "сбой обновления add_cacheinfo для пути «%s»; отмена слияния." -#: merge-recursive.c:329 +#: merge-recursive.c:415 msgid "error building trees" msgstr "ошибка при построении деревьев" -#: merge-recursive.c:752 +#: merge-recursive.c:886 #, c-format msgid "failed to create path '%s'%s" msgstr "не удалось создать путь «%s»%s" -#: merge-recursive.c:763 +#: merge-recursive.c:897 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "Удаление %s, чтобы освободить место для подкаталогов\n" -#: merge-recursive.c:777 merge-recursive.c:796 +#: merge-recursive.c:911 merge-recursive.c:930 msgid ": perhaps a D/F conflict?" msgstr ": возможно, конфликт каталогов/файлов?" -#: merge-recursive.c:786 +#: merge-recursive.c:920 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "отказ потери неотслеживаемого файла в «%s»" -#: merge-recursive.c:828 builtin/cat-file.c:37 +#: merge-recursive.c:962 builtin/cat-file.c:39 #, c-format msgid "cannot read object %s '%s'" msgstr "невозможно прочитать объект %s «%s»" -#: merge-recursive.c:830 +#: merge-recursive.c:964 #, c-format msgid "blob expected for %s '%s'" msgstr "ожидается двоичный объект для %s «%s»" -#: merge-recursive.c:854 +#: merge-recursive.c:988 #, c-format msgid "failed to open '%s': %s" msgstr "не удалось открыть «%s»: %s" -#: merge-recursive.c:865 +#: merge-recursive.c:999 #, c-format msgid "failed to symlink '%s': %s" msgstr "не удалось создать символьную ссылку «%s»: %s" -#: merge-recursive.c:870 +#: merge-recursive.c:1004 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "не понятно, что делать с %06o %s «%s»" -#: merge-recursive.c:1010 +#: merge-recursive.c:1191 +#, c-format +msgid "Failed to merge submodule %s (not checked out)" +msgstr "Не удалось слить подмодуль %s (состояние не забрано)" + +#: merge-recursive.c:1198 +#, c-format +msgid "Failed to merge submodule %s (commits not present)" +msgstr "Не удалось слить подмодуль %s (нет коммитов)" + +#: merge-recursive.c:1205 +#, c-format +msgid "Failed to merge submodule %s (commits don't follow merge-base)" +msgstr "Не удалось слить подмодуль %s (у коммитов другая база слияния)" + +#: merge-recursive.c:1213 merge-recursive.c:1225 +#, c-format +msgid "Fast-forwarding submodule %s to the following commit:" +msgstr "Перемотка вперед подмодуля %s до указанного коммита:" + +#: merge-recursive.c:1216 merge-recursive.c:1228 +#, c-format +msgid "Fast-forwarding submodule %s" +msgstr "Перемотка вперед подмодуля %s" + +#: merge-recursive.c:1250 +#, c-format +msgid "Failed to merge submodule %s (merge following commits not found)" +msgstr "Не удалось слить подмодуль %s (нет указанных коммитов для слияния)" + +#: merge-recursive.c:1254 +#, c-format +msgid "Failed to merge submodule %s (not fast-forward)" +msgstr "Не удалось слить подмодуль %s (нельзя сделать перемотку вперед)" + +#: merge-recursive.c:1255 +msgid "Found a possible merge resolution for the submodule:\n" +msgstr "Найдено возможное разрешение слиятия для подмодуля:\n" + +#: merge-recursive.c:1258 +#, c-format +msgid "" +"If this is correct simply add it to the index for example\n" +"by using:\n" +"\n" +" git update-index --cacheinfo 160000 %s \"%s\"\n" +"\n" +"which will accept this suggestion.\n" +msgstr "Если оно верное, то просто добавьте его в индекс, например так:\n\n git update-index --cacheinfo 160000 %s \"%s\"\n\nтем самым принимая это предположение.\n" + +#: merge-recursive.c:1267 +#, c-format +msgid "Failed to merge submodule %s (multiple merges found)" +msgstr "Не удалось слить подмодуль %s (найдено несколько слияний)" + +#: merge-recursive.c:1326 msgid "Failed to execute internal merge" msgstr "Не удалось запустить внутреннее слияние" -#: merge-recursive.c:1014 +#: merge-recursive.c:1331 #, c-format msgid "Unable to add %s to database" msgstr "Не удалось добавить %s в базу данных" -#: merge-recursive.c:1117 +#: merge-recursive.c:1363 +#, c-format +msgid "Auto-merging %s" +msgstr "Автослияние %s" + +#: merge-recursive.c:1434 +#, c-format +msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." +msgstr "Ошибка: Отказ потери неотслеживаемого файла %s; запись в %s взамен." + +#: merge-recursive.c:1501 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " "in tree." msgstr "КОНФЛИКТ (%s/удаление): %s удалено в %s и %s в %s. Версия %s из %s оставлена в дереве." -#: merge-recursive.c:1122 +#: merge-recursive.c:1506 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " "left in tree." msgstr "КОНФЛИКТ (%s/удаление): %s удалено в %s и от %s до %s в %s. Версия %s из %s оставлена в дереве." -#: merge-recursive.c:1129 +#: merge-recursive.c:1513 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " "in tree at %s." msgstr "КОНФЛИКТ (%s/удаление): %s удалено в %s и %s в %s. Версия %s из %s оставлена в дереве на %s." -#: merge-recursive.c:1134 +#: merge-recursive.c:1518 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " "left in tree at %s." msgstr "КОНФЛИКТ (%s/удаление): %s удалено в %s и от %s до %s в %s. Версия %s из %s оставлена в дереве на %s." -#: merge-recursive.c:1168 +#: merge-recursive.c:1552 msgid "rename" msgstr "переименование" -#: merge-recursive.c:1168 +#: merge-recursive.c:1552 msgid "renamed" msgstr "переименовано" -#: merge-recursive.c:1225 +#: merge-recursive.c:1606 merge-recursive.c:1762 merge-recursive.c:2394 +#: merge-recursive.c:3129 +#, c-format +msgid "Refusing to lose dirty file at %s" +msgstr "Отказ потери измененного файла %s" + +#: merge-recursive.c:1620 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s — это каталог в %s, добавляем как %s вместо этого" -#: merge-recursive.c:1250 +#: merge-recursive.c:1625 +#, c-format +msgid "Refusing to lose untracked file at %s; adding as %s instead" +msgstr "Отказ потери неотслеживаемого файла %s; добавление как %s взамен." + +#: merge-recursive.c:1651 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename " "\"%s\"->\"%s\" in \"%s\"%s" msgstr "КОНФЛИКТ (переименование/переименование): Переименование «%s»→«%s» в ветке «%s» и переименование «%s»→«%s» в ветке «%s»%s" -#: merge-recursive.c:1255 +#: merge-recursive.c:1656 msgid " (left unresolved)" msgstr " (оставлено неразрешенным)" -#: merge-recursive.c:1317 +#: merge-recursive.c:1720 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "КОНФЛИКТ (переименование/переименование): Переименование «%s»→«%s» в ветке «%s» и переименование «%s»→«%s» в ветке «%s»" -#: merge-recursive.c:1350 +#: merge-recursive.c:1759 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "Переименовываю %s в %s и %s в %s вместо этого" -#: merge-recursive.c:1553 +#: merge-recursive.c:1771 +#, c-format +msgid "Refusing to lose untracked file at %s, even though it's in the way." +msgstr "Отказ потери неотслеживаемого файла %s, даже с учетом его наличия." + +#: merge-recursive.c:1977 +#, c-format +msgid "" +"CONFLICT (directory rename split): Unclear where to place %s because " +"directory %s was renamed to multiple other directories, with no destination " +"getting a majority of the files." +msgstr "" + +#: merge-recursive.c:2009 +#, c-format +msgid "" +"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " +"implicit directory rename(s) putting the following path(s) there: %s." +msgstr "" + +#: merge-recursive.c:2019 +#, c-format +msgid "" +"CONFLICT (implicit dir rename): Cannot map more than one path to %s; " +"implicit directory renames tried to put these paths there: %s" +msgstr "" + +#: merge-recursive.c:2111 +#, c-format +msgid "" +"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory " +"%s->%s in %s" +msgstr "" + +#: merge-recursive.c:2356 +#, c-format +msgid "" +"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " +"renamed." +msgstr "" + +#: merge-recursive.c:2762 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" msgstr "КОНФЛИКТ (переименование/добавление): Переименование «%s»→«%s» в ветке «%s» и добавление «%s» в ветке «%s»" -#: merge-recursive.c:1568 +#: merge-recursive.c:2777 #, c-format msgid "Adding merged %s" msgstr "Добавление слитого %s" -#: merge-recursive.c:1575 merge-recursive.c:1805 +#: merge-recursive.c:2784 merge-recursive.c:3132 #, c-format msgid "Adding as %s instead" msgstr "Добавление вместо этого как %s" -#: merge-recursive.c:1632 +#: merge-recursive.c:2941 #, c-format msgid "cannot read object %s" msgstr "невозможно прочитать объект «%s»" -#: merge-recursive.c:1635 +#: merge-recursive.c:2944 #, c-format msgid "object %s is not a blob" msgstr "объект %s не является двоичным объектом" -#: merge-recursive.c:1704 +#: merge-recursive.c:3013 msgid "modify" msgstr "изменение" -#: merge-recursive.c:1704 +#: merge-recursive.c:3013 msgid "modified" msgstr "изменено" -#: merge-recursive.c:1714 +#: merge-recursive.c:3024 msgid "content" msgstr "содержимое" -#: merge-recursive.c:1721 +#: merge-recursive.c:3031 msgid "add/add" msgstr "добавление/добавление" -#: merge-recursive.c:1757 +#: merge-recursive.c:3076 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "Пропуск %s (слиты одинаковые изменения как существующие)" -#: merge-recursive.c:1771 -#, c-format -msgid "Auto-merging %s" -msgstr "Автослияние %s" - -#: merge-recursive.c:1775 git-submodule.sh:932 +#: merge-recursive.c:3098 git-submodule.sh:865 msgid "submodule" msgstr "подмодуль" -#: merge-recursive.c:1776 +#: merge-recursive.c:3099 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "КОНФЛИКТ (%s): Конфликт слияния в %s" -#: merge-recursive.c:1870 +#: merge-recursive.c:3221 #, c-format msgid "Removing %s" msgstr "Удаление %s" -#: merge-recursive.c:1896 +#: merge-recursive.c:3247 msgid "file/directory" msgstr "файл/каталог" -#: merge-recursive.c:1902 +#: merge-recursive.c:3253 msgid "directory/file" msgstr "каталог/файл" -#: merge-recursive.c:1909 +#: merge-recursive.c:3260 #, c-format msgid "" "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "КОНФЛИКТ (%s): Уже существует каталог с именем «%s» в «%s». Добавление «%s» как «%s»" -#: merge-recursive.c:1918 +#: merge-recursive.c:3269 #, c-format msgid "Adding %s" msgstr "Добавление %s" -#: merge-recursive.c:1958 +#: merge-recursive.c:3303 #, c-format -msgid "Dirty index: cannot merge (dirty: %s)" -msgstr "Индекс не пустой: не могу слить (в индексе: %s)" +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +" %s" +msgstr "" -#: merge-recursive.c:1962 +#: merge-recursive.c:3314 msgid "Already up to date!" msgstr "Уже обновлено!" -#: merge-recursive.c:1971 +#: merge-recursive.c:3323 #, c-format msgid "merging of trees %s and %s failed" msgstr "сбой слияния деревьев «%s» и «%s»" -#: merge-recursive.c:2068 +#: merge-recursive.c:3422 msgid "Merging:" msgstr "Слияние:" -#: merge-recursive.c:2081 +#: merge-recursive.c:3435 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" @@ -2231,41 +3031,41 @@ msgstr[1] "найдено %u общих предка:" msgstr[2] "найдено %u общих предков:" msgstr[3] "найдено %u общих предков:" -#: merge-recursive.c:2120 +#: merge-recursive.c:3474 msgid "merge returned no commit" msgstr "слияние не вернуло коммит" -#: merge-recursive.c:2183 +#: merge-recursive.c:3540 #, c-format msgid "Could not parse object '%s'" msgstr "Не удалось разобрать объект «%s»" -#: merge-recursive.c:2197 builtin/merge.c:656 builtin/merge.c:815 +#: merge-recursive.c:3556 builtin/merge.c:689 builtin/merge.c:846 msgid "Unable to write index." msgstr "Не удается записать индекс." -#: notes-merge.c:272 +#: notes-merge.c:274 #, c-format msgid "" "You have not concluded your previous notes merge (%s exists).\n" "Please, use 'git notes merge --commit' or 'git notes merge --abort' to commit/abort the previous merge before you start a new notes merge." msgstr "Вы не закончили предыдущее слияние заметок (%s существует).\nЗапустите «git notes merge --commit» или «git notes merge --abort» для коммита или отмены предыдущего слияния и запуска нового слияния заметок." -#: notes-merge.c:279 +#: notes-merge.c:281 #, c-format msgid "You have not concluded your notes merge (%s exists)." msgstr "Вы не закончили предыдущее слияние заметок (%s существует)." -#: notes-utils.c:42 +#: notes-utils.c:45 msgid "Cannot commit uninitialized/unreferenced notes tree" msgstr "Нельзя закоммитить неинициализированное или не имеющее ссылок дерево заметок" -#: notes-utils.c:101 +#: notes-utils.c:104 #, c-format msgid "Bad notes.rewriteMode value: '%s'" msgstr "Неправильное значение notes.rewriteMode: «%s»" -#: notes-utils.c:111 +#: notes-utils.c:114 #, c-format msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" msgstr "Отказ в перезаписи заметок в %s (за пределами refs/notes/)" @@ -2273,61 +3073,86 @@ msgstr "Отказ в перезаписи заметок в %s (за преде #. TRANSLATORS: The first %s is the name of #. the environment variable, the second %s is #. its value. -#: notes-utils.c:141 +#: notes-utils.c:144 #, c-format msgid "Bad %s value: '%s'" msgstr "Неправильное значение переменной %s: «%s»" -#: object.c:239 +#: object.c:54 +#, c-format +msgid "invalid object type \"%s\"" +msgstr "" + +#: object.c:173 +#, c-format +msgid "object %s is a %s, not a %s" +msgstr "" + +#: object.c:233 +#, c-format +msgid "object %s has unknown type id %d" +msgstr "" + +#: object.c:246 #, c-format msgid "unable to parse object: %s" msgstr "не удалось разобрать объект: %s" -#: packfile.c:556 +#: object.c:266 object.c:277 +#, c-format +msgid "sha1 mismatch %s" +msgstr "" + +#: packfile.c:563 msgid "offset before end of packfile (broken .idx?)" msgstr "сдвиг до конца файла пакета (возможно, повреждён файл .idx?)" -#: packfile.c:1683 +#: packfile.c:1745 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "сдвиг до начала индекса пакета для %s (повреждён индекс?)" -#: packfile.c:1687 +#: packfile.c:1749 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "сдвиг за пределами индекса пакета для %s (обрезан индекс?)" -#: parse-options.c:573 +#: parse-options.c:672 msgid "..." msgstr "…" -#: parse-options.c:592 +#: parse-options.c:691 #, c-format msgid "usage: %s" msgstr "использование: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. -#: parse-options.c:598 +#: parse-options.c:697 #, c-format msgid " or: %s" msgstr " или: %s" -#: parse-options.c:601 +#: parse-options.c:700 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:640 +#: parse-options.c:739 msgid "-NUM" msgstr "-КОЛИЧЕСТВО" -#: parse-options-cb.c:108 +#: parse-options-cb.c:44 +#, c-format +msgid "malformed expiration date '%s'" +msgstr "" + +#: parse-options-cb.c:112 #, c-format msgid "malformed object name '%s'" msgstr "Неправильное имя объекта «%s»" -#: path.c:891 +#: path.c:892 #, c-format msgid "Could not make %s writable by group" msgstr "Не удалось предоставить доступ к %s на запись" @@ -2403,372 +3228,545 @@ msgstr "%s: магические слова в спецификаторе пут msgid "pathspec '%s' is beyond a symbolic link" msgstr "спецификатор пути «%s» находится за символической ссылкой" +#: pkt-line.c:104 +msgid "flush packet write failed" +msgstr "" + +#: pkt-line.c:142 pkt-line.c:228 +msgid "protocol error: impossibly long line" +msgstr "" + +#: pkt-line.c:158 pkt-line.c:160 +msgid "packet write with format failed" +msgstr "" + +#: pkt-line.c:192 +msgid "packet write failed - data exceeds max packet size" +msgstr "" + +#: pkt-line.c:199 pkt-line.c:206 +msgid "packet write failed" +msgstr "" + +#: pkt-line.c:291 +msgid "read error" +msgstr "" + +#: pkt-line.c:299 +msgid "the remote end hung up unexpectedly" +msgstr "" + +#: pkt-line.c:327 +#, c-format +msgid "protocol error: bad line length character: %.4s" +msgstr "" + +#: pkt-line.c:337 pkt-line.c:342 +#, c-format +msgid "protocol error: bad line length %d" +msgstr "" + #: pretty.c:962 msgid "unable to parse --pretty format" msgstr "не удалось разобрать формат для --pretty" -#: read-cache.c:1472 +#: range-diff.c:48 +msgid "could not start `log`" +msgstr "" + +#: range-diff.c:51 +msgid "could not read `log` output" +msgstr "" + +#: range-diff.c:66 sequencer.c:4540 +#, c-format +msgid "could not parse commit '%s'" +msgstr "не удалось разобрать коммит «%s»" + +#: range-diff.c:196 +msgid "failed to generate diff" +msgstr "" + +#: range-diff.c:421 range-diff.c:423 +#, c-format +msgid "could not parse log for '%s'" +msgstr "" + +#: read-cache.c:1579 #, c-format msgid "" "index.version set, but the value is invalid.\n" "Using version %i" msgstr "index.version указан, но значение недействительное.\nИспользую версию %i" -#: read-cache.c:1482 +#: read-cache.c:1589 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" "Using version %i" msgstr "GIT_INDEX_VERSION указан, но значение недействительное.\nИспользую версию %i" -#: read-cache.c:2370 sequencer.c:2731 wrapper.c:658 builtin/merge.c:1048 +#: read-cache.c:2580 sequencer.c:4503 wrapper.c:658 builtin/merge.c:1083 #, c-format msgid "could not close '%s'" msgstr "не удалось закрыть «%s»" -#: read-cache.c:2442 sequencer.c:1369 sequencer.c:2096 +#: read-cache.c:2653 sequencer.c:2113 sequencer.c:3374 #, c-format msgid "could not stat '%s'" msgstr "не удалось выполнить stat для «%s»" -#: read-cache.c:2455 +#: read-cache.c:2666 #, c-format msgid "unable to open git dir: %s" msgstr "не удалось открыть каталог git: %s" -#: read-cache.c:2467 +#: read-cache.c:2678 #, c-format msgid "unable to unlink: %s" msgstr "не удалось отсоединить: %s" +#: refs.c:192 +#, c-format +msgid "%s does not point to a valid object!" +msgstr "" + +#: refs.c:579 +#, c-format +msgid "ignoring dangling symref %s" +msgstr "" + +#: refs.c:581 ref-filter.c:2067 +#, c-format +msgid "ignoring broken ref %s" +msgstr "игнорирую неправильную ссылку %s" + +#: refs.c:685 +#, c-format +msgid "could not open '%s' for writing: %s" +msgstr "не удалось открыть «%s» для записи: %s" + +#: refs.c:695 refs.c:746 +#, c-format +msgid "could not read ref '%s'" +msgstr "" + +#: refs.c:701 +#, c-format +msgid "ref '%s' already exists" +msgstr "" + #: refs.c:706 #, c-format -msgid "Could not open '%s' for writing" -msgstr "Не удалось открыть «%s» для записи" +msgid "unexpected object ID when writing '%s'" +msgstr "" + +#: refs.c:714 sequencer.c:385 sequencer.c:2366 sequencer.c:2492 +#: sequencer.c:2506 sequencer.c:2733 sequencer.c:4501 sequencer.c:4564 +#: wrapper.c:656 +#, c-format +msgid "could not write to '%s'" +msgstr "не удалось записать в «%s»" + +#: refs.c:741 sequencer.c:4499 sequencer.c:4558 wrapper.c:225 wrapper.c:395 +#: builtin/am.c:780 +#, c-format +msgid "could not open '%s' for writing" +msgstr "не удалось открыть «%s» для записи" + +#: refs.c:748 +#, c-format +msgid "unexpected object ID when deleting '%s'" +msgstr "" -#: refs.c:1850 +#: refs.c:879 +#, c-format +msgid "log for ref %s has gap after %s" +msgstr "" + +#: refs.c:885 +#, c-format +msgid "log for ref %s unexpectedly ended on %s" +msgstr "" + +#: refs.c:943 +#, c-format +msgid "log for %s is empty" +msgstr "" + +#: refs.c:1035 +#, c-format +msgid "refusing to update ref with bad name '%s'" +msgstr "" + +#: refs.c:1111 +#, c-format +msgid "update_ref failed for ref '%s': %s" +msgstr "" + +#: refs.c:1853 +#, c-format +msgid "multiple updates for ref '%s' not allowed" +msgstr "" + +#: refs.c:1885 msgid "ref updates forbidden inside quarantine environment" msgstr "обновление ссылок запрещено в изолированном окружении" -#: refs/files-backend.c:1189 +#: refs.c:1981 refs.c:2011 +#, c-format +msgid "'%s' exists; cannot create '%s'" +msgstr "" + +#: refs.c:1987 refs.c:2022 +#, c-format +msgid "cannot process '%s' and '%s' at the same time" +msgstr "" + +#: refs/files-backend.c:1191 #, c-format msgid "could not remove reference %s" msgstr "не удалось удалить ссылки %s" -#: refs/files-backend.c:1203 refs/packed-backend.c:1524 -#: refs/packed-backend.c:1534 +#: refs/files-backend.c:1205 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:1206 refs/packed-backend.c:1537 +#: refs/files-backend.c:1208 refs/packed-backend.c:1545 #, c-format msgid "could not delete references: %s" msgstr "не удалось удалить ссылки: %s" -#: ref-filter.c:35 wt-status.c:1816 +#: refspec.c:137 +#, c-format +msgid "invalid refspec '%s'" +msgstr "" + +#: ref-filter.c:38 wt-status.c:1850 msgid "gone" msgstr "исчез" -#: ref-filter.c:36 +#: ref-filter.c:39 #, c-format msgid "ahead %d" msgstr "впереди %d" -#: ref-filter.c:37 +#: ref-filter.c:40 #, c-format msgid "behind %d" msgstr "позади %d" -#: ref-filter.c:38 +#: ref-filter.c:41 #, c-format msgid "ahead %d, behind %d" msgstr "впереди %d, позади %d" -#: ref-filter.c:107 +#: ref-filter.c:137 #, c-format msgid "expected format: %%(color:<color>)" msgstr "ожидаемый формат: %%(color:<color>)" -#: ref-filter.c:109 +#: ref-filter.c:139 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "неопознанный цвет: %%(color:%s)" -#: ref-filter.c:129 +#: ref-filter.c:161 #, c-format msgid "Integer value expected refname:lstrip=%s" msgstr "Ожидается целочисленное значение refname:lstrip=%s" -#: ref-filter.c:133 +#: ref-filter.c:165 #, c-format msgid "Integer value expected refname:rstrip=%s" msgstr "Ожидается целочисленное значение refname:rstrip=%s" -#: ref-filter.c:135 +#: ref-filter.c:167 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "неопознанный аргумент %%(%s): %s" -#: ref-filter.c:184 +#: ref-filter.c:222 +#, c-format +msgid "%%(objecttype) does not take arguments" +msgstr "" + +#: ref-filter.c:234 +#, c-format +msgid "%%(objectsize) does not take arguments" +msgstr "" + +#: ref-filter.c:246 #, c-format msgid "%%(body) does not take arguments" msgstr "параметр %%(body) не принимает аргументы" -#: ref-filter.c:191 +#: ref-filter.c:255 #, c-format msgid "%%(subject) does not take arguments" msgstr "параметр %%(subject) не принимает аргументы" -#: ref-filter.c:209 +#: ref-filter.c:275 #, c-format msgid "unknown %%(trailers) argument: %s" msgstr "неизвестный аргумент для %%(trailers): %s" -#: ref-filter.c:232 +#: ref-filter.c:304 #, c-format msgid "positive value expected contents:lines=%s" msgstr "положительное значение ожидает contents:lines=%s" -#: ref-filter.c:234 +#: ref-filter.c:306 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "неопознанный аргумент %%(contents): %s" -#: ref-filter.c:247 +#: ref-filter.c:321 #, c-format msgid "positive value expected objectname:short=%s" msgstr "ожидается положительное значение objectname:short=%s" -#: ref-filter.c:251 +#: ref-filter.c:325 #, c-format msgid "unrecognized %%(objectname) argument: %s" msgstr "неопознанный аргумент %%(objectname): %s" -#: ref-filter.c:278 +#: ref-filter.c:355 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "ожидаемый формат: %%(align:<width>,<position>)" -#: ref-filter.c:290 +#: ref-filter.c:367 #, c-format msgid "unrecognized position:%s" msgstr "неопознанная позиция:%s" -#: ref-filter.c:294 +#: ref-filter.c:374 #, c-format msgid "unrecognized width:%s" msgstr "неопознанная ширина:%s" -#: ref-filter.c:300 +#: ref-filter.c:383 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "неопознанный аргумент %%(align): %s" -#: ref-filter.c:304 +#: ref-filter.c:391 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "ожидается положительная ширина с указанием частицы %%(align)" -#: ref-filter.c:319 +#: ref-filter.c:409 #, c-format msgid "unrecognized %%(if) argument: %s" msgstr "неопознанный аргумент %%(if): %s" -#: ref-filter.c:409 +#: ref-filter.c:505 #, c-format msgid "malformed field name: %.*s" msgstr "неправильное имя поля: %.*s" -#: ref-filter.c:435 +#: ref-filter.c:532 #, c-format msgid "unknown field name: %.*s" msgstr "неизвестное имя поля: %.*s" -#: ref-filter.c:547 +#: ref-filter.c:656 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "формат: частица %%(if) использована без частицы %%(then)" -#: ref-filter.c:607 +#: ref-filter.c:719 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "формат: частица %%(then) использована без частицы %%(if)" -#: ref-filter.c:609 +#: ref-filter.c:721 #, c-format msgid "format: %%(then) atom used more than once" msgstr "формат: частица %%(then) использована более одного раза" -#: ref-filter.c:611 +#: ref-filter.c:723 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "формат: частица %%(then) использована после %%(else)" -#: ref-filter.c:637 +#: ref-filter.c:751 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "формат: частица %%(else) использована без частицы %%(if)" -#: ref-filter.c:639 +#: ref-filter.c:753 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "формат: частица %%(else) использована без частицы %%(then)" -#: ref-filter.c:641 +#: ref-filter.c:755 #, c-format msgid "format: %%(else) atom used more than once" msgstr "формат: частица %%(else) использована более одного раза" -#: ref-filter.c:654 +#: ref-filter.c:770 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "формат: частица %%(end) использована без соответствующей частицы" -#: ref-filter.c:709 +#: ref-filter.c:827 #, c-format msgid "malformed format string %s" msgstr "неправильная строка формата %s" -#: ref-filter.c:1313 +#: ref-filter.c:1416 #, c-format msgid "(no branch, rebasing %s)" msgstr "(нет ветки, перемещение %s)" -#: ref-filter.c:1316 +#: ref-filter.c:1419 +#, c-format +msgid "(no branch, rebasing detached HEAD %s)" +msgstr "(нет ветки перемещение отделённого HEAD %s)" + +#: ref-filter.c:1422 #, c-format msgid "(no branch, bisect started on %s)" msgstr "(нет ветки, двоичный поиск начат на %s)" #. TRANSLATORS: make sure this matches "HEAD #. detached at " in wt-status.c -#: ref-filter.c:1324 +#: ref-filter.c:1430 #, c-format msgid "(HEAD detached at %s)" msgstr "(HEAD отделён на %s)" #. TRANSLATORS: make sure this matches "HEAD #. detached from " in wt-status.c -#: ref-filter.c:1331 +#: ref-filter.c:1437 #, c-format msgid "(HEAD detached from %s)" msgstr "(HEAD отделён начиная с %s)" -#: ref-filter.c:1335 +#: ref-filter.c:1441 msgid "(no branch)" msgstr "(нет ветки)" -#: ref-filter.c:1488 ref-filter.c:1519 +#: ref-filter.c:1475 ref-filter.c:1623 #, c-format msgid "missing object %s for %s" msgstr "не найден объект %s для %s" -#: ref-filter.c:1491 ref-filter.c:1522 +#: ref-filter.c:1483 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "сбой при выполнении parse_object_buffer на %s для %s" -#: ref-filter.c:1822 +#: ref-filter.c:1980 #, c-format msgid "malformed object at '%s'" msgstr "Повреждённый объект «%s»" -#: ref-filter.c:1889 +#: ref-filter.c:2062 #, c-format msgid "ignoring ref with broken name %s" msgstr "игнорирую ссылку с неправильным именем %s" -#: ref-filter.c:1894 -#, c-format -msgid "ignoring broken ref %s" -msgstr "игнорирую неправильную ссылку %s" - -#: ref-filter.c:2156 +#: ref-filter.c:2340 #, c-format msgid "format: %%(end) atom missing" msgstr "format: пропущена частица %%(end)" -#: ref-filter.c:2250 +#: ref-filter.c:2444 #, c-format msgid "malformed object name %s" msgstr "неправильное имя объекта %s" -#: remote.c:780 +#: remote.c:606 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "Нельзя извлечь одновременно %s и %s в %s" -#: remote.c:784 +#: remote.c:610 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s обычно отслеживает %s, а не %s" -#: remote.c:788 +#: remote.c:614 #, c-format msgid "%s tracks both %s and %s" msgstr "%s отслеживает и %s и %s" -#: remote.c:796 +#: remote.c:622 msgid "Internal error" msgstr "Внутренняя ошибка" -#: remote.c:1711 remote.c:1813 +#: remote.c:1536 remote.c:1637 msgid "HEAD does not point to a branch" msgstr "HEAD не указывает на ветку" -#: remote.c:1720 +#: remote.c:1545 #, c-format msgid "no such branch: '%s'" msgstr "нет такой ветки: «%s»" -#: remote.c:1723 +#: remote.c:1548 #, c-format msgid "no upstream configured for branch '%s'" msgstr "вышестоящая ветка не настроена для ветки «%s»" -#: remote.c:1729 +#: remote.c:1554 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "вышестоящая ветка «%s» не сохранена как отслеживаемая ветка" -#: remote.c:1744 +#: remote.c:1569 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "назначение для отправки «%s» на внешнем сервере «%s» не имеет локальной отслеживаемой ветки" -#: remote.c:1756 +#: remote.c:1581 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "ветка «%s» не имеет внешнего сервера для отправки" -#: remote.c:1767 +#: remote.c:1591 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "спецификаторы пути для отправки «%s» не включают в себя «%s»" -#: remote.c:1780 +#: remote.c:1604 msgid "push has no destination (push.default is 'nothing')" msgstr "отправка не имеет точки назначения (push.default выставлен в «nothing»)" -#: remote.c:1802 +#: remote.c:1626 msgid "cannot resolve 'simple' push to a single destination" msgstr "не удалось выполнить «simple» отправку в единственную точку назначения" -#: remote.c:2106 +#: remote.c:1951 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "Ваша ветка базируется на «%s», но вышестоящий репозиторий исчез.\n" -#: remote.c:2110 +#: remote.c:1955 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr "(для исправления запустите «git branch --unset-upstream»)\n" -#: remote.c:2113 +#: remote.c:1958 #, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "Ваша ветка обновлена в соответствии с «%s».\n" -#: remote.c:2117 +#: remote.c:1962 +#, c-format +msgid "Your branch and '%s' refer to different commits.\n" +msgstr "Ваша ветка и «%s» указывают на разные коммиты.\n" + +#: remote.c:1965 +#, c-format +msgid " (use \"%s\" for details)\n" +msgstr " (используйте «%s» для просмотра описания)\n" + +#: remote.c:1969 #, 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" @@ -2777,11 +3775,11 @@ msgstr[1] "Ваша ветка опережает «%s» на %d коммита. msgstr[2] "Ваша ветка опережает «%s» на %d коммитов.\n" msgstr[3] "Ваша ветка опережает «%s» на %d коммитов.\n" -#: remote.c:2123 +#: remote.c:1975 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (используйте «git push», чтобы опубликовать ваши локальные коммиты)\n" -#: remote.c:2126 +#: remote.c:1978 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -2791,11 +3789,11 @@ msgstr[1] "Ваша ветка отстает от «%s» на %d коммита msgstr[2] "Ваша ветка отстает от «%s» на %d коммитов и может быть перемотана вперед.\n" msgstr[3] "Ваша ветка отстает от «%s» на %d коммитов и может быть перемотана вперед.\n" -#: remote.c:2134 +#: remote.c:1986 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (используйте «git pull», чтобы обновить вашу локальную ветку)\n" -#: remote.c:2137 +#: remote.c:1989 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -2808,153 +3806,198 @@ msgstr[1] "Ваша ветка и «%s» разделились\nи теперь msgstr[2] "Ваша ветка и «%s» разделились\nи теперь имеют %d и %d разных коммитов в каждой соответственно.\n" msgstr[3] "Ваша ветка и «%s» разделились\nи теперь имеют %d и %d разных коммитов в каждой соответственно.\n" -#: remote.c:2147 +#: remote.c:1999 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr " (используйте «git pull», чтобы слить внешнюю ветку в вашу)\n" -#: revision.c:2268 +#: replace-object.c:20 +#, c-format +msgid "bad replace ref name: %s" +msgstr "" + +#: replace-object.c:29 +#, c-format +msgid "duplicate replace ref: %s" +msgstr "" + +#: replace-object.c:72 +#, c-format +msgid "replace depth too high for object %s" +msgstr "" + +#: revision.c:2305 msgid "your current branch appears to be broken" msgstr "похоже, ваша текущая ветка повреждена" -#: revision.c:2271 +#: revision.c:2308 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "ваша текущая ветка «%s» еще не содержит ни одного коммита" -#: revision.c:2465 +#: revision.c:2505 msgid "--first-parent is incompatible with --bisect" msgstr "опцию --first-parent нельзя использовать одновременно с --bisect" -#: run-command.c:645 +#: run-command.c:728 msgid "open /dev/null failed" msgstr "сбой открытия /dev/null" -#: run-command.c:1188 +#: run-command.c:1271 #, c-format msgid "" "The '%s' hook was ignored because it's not set as executable.\n" "You can disable this warning with `git config advice.ignoredHook false`." msgstr "Перехватчик «%s» был проигнорирован, так как он не установлен как исполняемый.\nВы можете отключить это предупреждение с помощью команды «git config advice.ignoredHook false»." -#: send-pack.c:141 +#: send-pack.c:142 +msgid "unexpected flush packet while reading remote unpack status" +msgstr "неожиданный пустой пакет при чтении статуса внешней распаковки" + +#: send-pack.c:144 #, c-format msgid "unable to parse remote unpack status: %s" msgstr "не удалось разобрать статус внешней распаковки: %s" -#: send-pack.c:143 +#: send-pack.c:146 #, c-format msgid "remote unpack failed: %s" msgstr "сбой при внешней распаковке %s" -#: send-pack.c:306 +#: send-pack.c:309 msgid "failed to sign the push certificate" msgstr "сбой подписания сертификата отправки" -#: send-pack.c:419 +#: send-pack.c:422 msgid "the receiving end does not support --signed push" msgstr "принимающая сторона не поддерживает отправку с опцией --signed" -#: send-pack.c:421 +#: send-pack.c:424 msgid "" "not sending a push certificate since the receiving end does not support " "--signed push" msgstr "не отправляем сертификат для отправки, так как принимающая сторона не поддерживает отправку с опцией --signed" -#: send-pack.c:433 +#: send-pack.c:436 msgid "the receiving end does not support --atomic push" msgstr "принимающая сторона не поддерживает отправку с опцией --atomic" -#: send-pack.c:438 +#: send-pack.c:441 msgid "the receiving end does not support push options" msgstr "принимающая сторона не поддерживает отправку с опциями" -#: sequencer.c:218 +#: sequencer.c:177 +#, c-format +msgid "invalid commit message cleanup mode '%s'" +msgstr "неправильный режим очистки сообщения коммита «%s»" + +#: sequencer.c:278 +#, c-format +msgid "could not delete '%s'" +msgstr "не удалось удалить «%s»" + +#: sequencer.c:304 msgid "revert" msgstr "обратить изменения" -#: sequencer.c:220 +#: sequencer.c:306 msgid "cherry-pick" msgstr "копировать коммит" -#: sequencer.c:222 +#: sequencer.c:308 msgid "rebase -i" msgstr "rebase -i" -#: sequencer.c:224 +#: sequencer.c:310 #, c-format -msgid "Unknown action: %d" -msgstr "Неизвестное действие: %d" +msgid "unknown action: %d" +msgstr "" -#: sequencer.c:281 +#: sequencer.c:367 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" msgstr "после разрешения конфликтов, пометьте исправленные пути\nс помощью «git add <пути>» или «git rm <пути>»" -#: sequencer.c:284 +#: sequencer.c:370 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" "and commit the result with 'git commit'" msgstr "после разрешения конфликтов, пометьте исправленные пути\nс помощью «git add <пути>» или «git rm <пути>»\nи сделайте коммит с помощью «git commit»" -#: sequencer.c:297 sequencer.c:1718 +#: sequencer.c:383 sequencer.c:2488 #, c-format msgid "could not lock '%s'" msgstr "не удалось заблокировать «%s»" -#: sequencer.c:300 sequencer.c:1595 sequencer.c:1723 sequencer.c:1737 -#: sequencer.c:2729 sequencer.c:2800 wrapper.c:656 -#, c-format -msgid "could not write to '%s'" -msgstr "не удалось записать в «%s»" - -#: sequencer.c:304 +#: sequencer.c:390 #, c-format msgid "could not write eol to '%s'" msgstr "не удалось записать eol в «%s»" -#: sequencer.c:308 sequencer.c:1600 sequencer.c:1725 +#: sequencer.c:395 sequencer.c:2371 sequencer.c:2494 sequencer.c:2508 +#: sequencer.c:2741 #, c-format -msgid "failed to finalize '%s'." -msgstr "не удалось завершить «%s»." +msgid "failed to finalize '%s'" +msgstr "не удалось завершить «%s»" -#: sequencer.c:332 sequencer.c:829 sequencer.c:1621 builtin/am.c:259 -#: builtin/commit.c:754 builtin/merge.c:1046 +#: sequencer.c:418 sequencer.c:816 sequencer.c:1505 sequencer.c:2391 +#: sequencer.c:2723 sequencer.c:2827 builtin/am.c:260 builtin/commit.c:740 +#: builtin/merge.c:1081 #, c-format msgid "could not read '%s'" msgstr "не удалось прочитать «%s»" -#: sequencer.c:358 +#: sequencer.c:444 #, c-format msgid "your local changes would be overwritten by %s." msgstr "ваши локальные изменения будут перезаписаны %s." -#: sequencer.c:362 +#: sequencer.c:448 msgid "commit your changes or stash them to proceed." msgstr "для продолжения закоммитьте ваши изменения или спрячьте их." -#: sequencer.c:391 +#: sequencer.c:477 #, c-format msgid "%s: fast-forward" msgstr "%s: перемотка вперед" #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase -i". -#: sequencer.c:477 +#: sequencer.c:566 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: Не удалось записать файл индекса" -#: sequencer.c:496 +#: sequencer.c:582 +msgid "unable to update cache tree" +msgstr "не удалось обновить дерево кэша" + +#: sequencer.c:595 msgid "could not resolve HEAD commit" msgstr "не удалось распознать HEAD коммит" -#: sequencer.c:516 -msgid "unable to update cache tree" -msgstr "не удалось обновить дерево кэша" +#: sequencer.c:723 +#, c-format +msgid "could not parse '%s' (looking for '%s'" +msgstr "" + +#: sequencer.c:731 +#, c-format +msgid "bad quoting on %s value in '%s'" +msgstr "" + +#: sequencer.c:740 +#, c-format +msgid "could not parse '%s' (looking for '%s')" +msgstr "" + +#: sequencer.c:747 +#, c-format +msgid "invalid date format '%s' in '%s'" +msgstr "" -#: sequencer.c:600 +#: sequencer.c:761 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -2971,266 +4014,372 @@ msgid "" " git rebase --continue\n" msgstr "у вас имеются проиндексированные изменения в рабочем каталоге. Если эти изменения должны быть объеденены с предыдущим коммитом, то запустите:\n\n git commit --amend %s\n\nЕсли же они должны быть помещены в новый коммит, то запустите:\n\n git commit %s\n\nВ любом случае, после того как вы закончите, продолжить перемещение можно выполнив:\n\n git rebase --continue\n" -#: sequencer.c:702 +#: sequencer.c:830 +msgid "writing root commit" +msgstr "запись коневого коммита" + +#: sequencer.c:1055 +msgid "'prepare-commit-msg' hook failed" +msgstr "ошибка при вызове перехватчика «prepare-commit-msg»" + +#: sequencer.c:1062 +msgid "" +"Your name and email address were configured automatically based\n" +"on your username and hostname. Please check that they are accurate.\n" +"You can suppress this message by setting them explicitly. Run the\n" +"following command and follow the instructions in your editor to edit\n" +"your configuration file:\n" +"\n" +" git config --global --edit\n" +"\n" +"After doing this, you may fix the identity used for this commit with:\n" +"\n" +" git commit --amend --reset-author\n" +msgstr "Ваше имя или электронная почта настроены автоматически на основании вашего\nимени пользователя и имени машины. Пожалуйста, проверьте, что они \nопределены правильно.\nВы можете отключить это уведомление установив их напрямую. Запустите следующую\nкоманду и следуйте инструкциям вашего текстового редактора, для\nредактирования вашего файла конфигурации:\n\n git config --global --edit\n\nПосле этого, изменить авторство этой коммита можно будет с помощью команды:\n\n git commit --amend --reset-author\n" + +#: sequencer.c:1075 +msgid "" +"Your name and email address were configured automatically based\n" +"on your username and hostname. Please check that they are accurate.\n" +"You can suppress this message by setting them explicitly:\n" +"\n" +" git config --global user.name \"Your Name\"\n" +" git config --global user.email you@example.com\n" +"\n" +"After doing this, you may fix the identity used for this commit with:\n" +"\n" +" git commit --amend --reset-author\n" +msgstr "Ваше имя или электронная почта настроены автоматически на основании вашего\nимени пользователя и имени машины. Пожалуйста, проверьте, что они \nопределены правильно.\nВы можете отключить это уведомление установив их напрямую:\n\n git config --global user.name \"Ваше Имя\"\n git config --global user.email you@example.com\n\nПосле этого, изменить авторство этой коммита можно будет с помощью команды:\n\n git commit --amend --reset-author\n" + +#: sequencer.c:1115 +msgid "couldn't look up newly created commit" +msgstr "нельзя запросить новосозданный коммит" + +#: sequencer.c:1117 +msgid "could not parse newly created commit" +msgstr "нельзя разобрать новосозданный коммит" + +#: sequencer.c:1163 +msgid "unable to resolve HEAD after creating commit" +msgstr "не удалось найти HEAD после создания коммита" + +#: sequencer.c:1165 +msgid "detached HEAD" +msgstr "отделённый HEAD" + +#: sequencer.c:1169 +msgid " (root-commit)" +msgstr " (корневой коммит)" + +#: sequencer.c:1190 +msgid "could not parse HEAD" +msgstr "не удалось разобрать HEAD" + +#: sequencer.c:1192 +#, c-format +msgid "HEAD %s is not a commit!" +msgstr "HEAD %s не является коммитом!" + +#: sequencer.c:1196 builtin/commit.c:1528 +msgid "could not parse HEAD commit" +msgstr "не удалось разобрать HEAD коммит" + +#: sequencer.c:1247 sequencer.c:1845 +msgid "unable to parse commit author" +msgstr "не удалось разобрать автора коммита" + +#: sequencer.c:1257 builtin/am.c:1632 builtin/merge.c:675 +msgid "git write-tree failed to write a tree" +msgstr "git write-tree не удалось записать дерево" + +#: sequencer.c:1274 sequencer.c:1329 +#, c-format +msgid "unable to read commit message from '%s'" +msgstr "не удалось прочитать сообщение коммита из «%s»" + +#: sequencer.c:1296 builtin/am.c:1653 builtin/commit.c:1631 +#: builtin/merge.c:855 builtin/merge.c:880 +msgid "failed to write commit object" +msgstr "сбой записи объекта коммита" + +#: sequencer.c:1356 #, c-format msgid "could not parse commit %s" msgstr "не удалось разобрать коммит %s" -#: sequencer.c:707 +#: sequencer.c:1361 #, c-format msgid "could not parse parent commit %s" msgstr "не удалось разобрать родительский коммит %s" -#: sequencer.c:836 +#: sequencer.c:1457 sequencer.c:1565 #, c-format -msgid "" -"unexpected 1st line of squash message:\n" -"\n" -"\t%.*s" -msgstr "неожиданная первая строка сообщения уплотнения:\n\n\t%.*s" - -#: sequencer.c:842 -#, c-format -msgid "" -"invalid 1st line of squash message:\n" -"\n" -"\t%.*s" -msgstr "недопустимая первая строка сообщения уплотнения:\n\n\t%.*s" +msgid "unknown command: %d" +msgstr "неизвестная команда: %d" -#: sequencer.c:848 sequencer.c:873 +#: sequencer.c:1512 sequencer.c:1537 #, c-format msgid "This is a combination of %d commits." msgstr "Это объединение %d коммитов." -#: sequencer.c:857 sequencer.c:2748 +#: sequencer.c:1522 sequencer.c:4520 msgid "need a HEAD to fixup" msgstr "нужен HEAD для исправления" -#: sequencer.c:859 +#: sequencer.c:1524 sequencer.c:2768 msgid "could not read HEAD" msgstr "не удалось прочитать HEAD" -#: sequencer.c:861 +#: sequencer.c:1526 msgid "could not read HEAD's commit message" msgstr "не удалось прочитать сообщение коммита текущего HEAD" -#: sequencer.c:867 +#: sequencer.c:1532 #, c-format msgid "cannot write '%s'" msgstr "не удалось записать «%s»" -#: sequencer.c:876 git-rebase--interactive.sh:446 +#: sequencer.c:1539 git-rebase--preserve-merges.sh:441 msgid "This is the 1st commit message:" msgstr "Это 1-е сообщение коммита:" -#: sequencer.c:884 +#: sequencer.c:1547 #, c-format msgid "could not read commit message of %s" msgstr "не удалось прочитать сообщение коммита для %s" -#: sequencer.c:891 +#: sequencer.c:1554 #, c-format msgid "This is the commit message #%d:" msgstr "Это сообщение коммита номер #%d:" -#: sequencer.c:896 +#: sequencer.c:1560 #, c-format msgid "The commit message #%d will be skipped:" msgstr "Сообщение коммита номер #%d будет пропущено:" -#: sequencer.c:901 -#, c-format -msgid "unknown command: %d" -msgstr "неизвестная команда: %d" - -#: sequencer.c:967 +#: sequencer.c:1643 msgid "your index file is unmerged." msgstr "ваш индекс не слит." -#: sequencer.c:986 +#: sequencer.c:1650 +msgid "cannot fixup root commit" +msgstr "нельзя исправить корневой коммит" + +#: sequencer.c:1669 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "коммит %s — это коммит-слияние, но опция -m не указана." -#: sequencer.c:994 +#: sequencer.c:1677 #, c-format msgid "commit %s does not have parent %d" msgstr "у коммита %s нет предка %d" -#: sequencer.c:998 +#: sequencer.c:1681 #, c-format msgid "mainline was specified but commit %s is not a merge." msgstr "основная ветка указана, но коммит %s не является слиянием." -#: sequencer.c:1004 +#: sequencer.c:1687 #, 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:1023 +#: sequencer.c:1706 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: не удалось разобрать родительский коммит для %s" -#: sequencer.c:1086 sequencer.c:1867 +#: sequencer.c:1771 #, c-format msgid "could not rename '%s' to '%s'" msgstr "не удалось переименовать «%s» в «%s»" -#: sequencer.c:1137 +#: sequencer.c:1826 #, c-format msgid "could not revert %s... %s" msgstr "не удалось обратить изменения коммита %s… %s" -#: sequencer.c:1138 +#: sequencer.c:1827 #, c-format msgid "could not apply %s... %s" msgstr "не удалось применить коммит %s… %s" -#: sequencer.c:1180 -msgid "empty commit set passed" -msgstr "передан пустой набор коммитов" - -#: sequencer.c:1190 +#: sequencer.c:1885 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: сбой чтения индекса" -#: sequencer.c:1196 +#: sequencer.c:1892 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: сбой обновления индекса" -#: sequencer.c:1270 +#: sequencer.c:1972 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "параметр %s не принимает аргументы: «%s»" -#: sequencer.c:1279 +#: sequencer.c:1981 #, c-format msgid "missing arguments for %s" msgstr "пропущены аргументы для %s" -#: sequencer.c:1322 +#: sequencer.c:2040 #, c-format msgid "invalid line %d: %.*s" msgstr "неправильная строка %d: %.*s" -#: sequencer.c:1330 +#: sequencer.c:2048 #, c-format msgid "cannot '%s' without a previous commit" msgstr "нельзя выполнить «%s» без указания предыдущего коммита" -#: sequencer.c:1363 sequencer.c:2525 sequencer.c:2560 sequencer.c:2642 -#: sequencer.c:2668 sequencer.c:2758 sequencer.c:2859 +#: sequencer.c:2096 sequencer.c:4277 sequencer.c:4333 #, c-format msgid "could not read '%s'." msgstr "не удалось прочитать «%s»." -#: sequencer.c:1375 +#: sequencer.c:2119 msgid "please fix this using 'git rebase --edit-todo'." msgstr "пожалуйста исправьте это с помощью «git rebase --edit-todo»." -#: sequencer.c:1377 +#: sequencer.c:2121 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "непригодная для использования карта с инструкциями: «%s»" -#: sequencer.c:1382 +#: sequencer.c:2126 msgid "no commits parsed." msgstr "коммиты не разобраны." -#: sequencer.c:1393 +#: sequencer.c:2137 msgid "cannot cherry-pick during a revert." msgstr "нельзя скопировать коммит во время процесса обращения коммита." -#: sequencer.c:1395 +#: sequencer.c:2139 msgid "cannot revert during a cherry-pick." msgstr "нельзя обратить изменения коммита во время копирования коммита." -#: sequencer.c:1462 -#, c-format -msgid "invalid key: %s" -msgstr "недействительный ключ: %s" - -#: sequencer.c:1465 +#: sequencer.c:2209 #, c-format msgid "invalid value for %s: %s" msgstr "неправильное значение %s: %s" -#: sequencer.c:1531 +#: sequencer.c:2285 +msgid "unusable squash-onto" +msgstr "непригодный для использования уплотнить-над" + +#: sequencer.c:2301 #, c-format msgid "malformed options sheet: '%s'" msgstr "испорченная карта с опциями: «%s»" -#: sequencer.c:1569 +#: sequencer.c:2335 sequencer.c:3775 +msgid "empty commit set passed" +msgstr "передан пустой набор коммитов" + +#: sequencer.c:2343 msgid "a cherry-pick or revert is already in progress" msgstr "копирование или обращение изменений коммита уже выполняются" -#: sequencer.c:1570 +#: sequencer.c:2344 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "попробуйте «git cherry-pick (--continue | --quit | --abort)»" -#: sequencer.c:1573 +#: sequencer.c:2347 #, c-format msgid "could not create sequencer directory '%s'" msgstr "не удалось создать каталог для указателя следования коммитов «%s»" -#: sequencer.c:1588 +#: sequencer.c:2361 msgid "could not lock HEAD" msgstr "не удалось заблокировать HEAD" -#: sequencer.c:1646 sequencer.c:2230 +#: sequencer.c:2416 sequencer.c:3543 msgid "no cherry-pick or revert in progress" msgstr "копирование или обращение изменений коммита уже выполняются" -#: sequencer.c:1648 +#: sequencer.c:2418 msgid "cannot resolve HEAD" msgstr "не удалось определить HEAD" -#: sequencer.c:1650 sequencer.c:1685 +#: sequencer.c:2420 sequencer.c:2455 msgid "cannot abort from a branch yet to be born" msgstr "нельзя отменить изменения с ветки, которая еще не создана" -#: sequencer.c:1671 builtin/grep.c:713 +#: sequencer.c:2441 builtin/grep.c:721 #, c-format msgid "cannot open '%s'" msgstr "не удалось открыть «%s»" -#: sequencer.c:1673 +#: sequencer.c:2443 #, c-format msgid "cannot read '%s': %s" msgstr "не удалось прочитать «%s»: %s" -#: sequencer.c:1674 +#: sequencer.c:2444 msgid "unexpected end of file" msgstr "неожиданный конец файла" -#: sequencer.c:1680 +#: sequencer.c:2450 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "сохраненный файл с HEAD перед копированием коммита «%s» поврежден" -#: sequencer.c:1691 +#: sequencer.c:2461 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "Похоже, что вы переместили HEAD. Перемотка не выполняется, проверьте свой указатель HEAD!" -#: sequencer.c:1832 sequencer.c:2128 +#: sequencer.c:2565 sequencer.c:3461 +#, c-format +msgid "could not update %s" +msgstr "не удалось обновить %s" + +#: sequencer.c:2603 sequencer.c:3441 msgid "cannot read HEAD" msgstr "не удалось прочитать HEAD" -#: sequencer.c:1872 builtin/difftool.c:639 +#: sequencer.c:2618 +#, c-format +msgid "unable to copy '%s' to '%s'" +msgstr "" + +#: sequencer.c:2626 +#, c-format +msgid "" +"You can amend the commit now, with\n" +"\n" +" git commit --amend %s\n" +"\n" +"Once you are satisfied with your changes, run\n" +"\n" +" git rebase --continue\n" +msgstr "" + +#: sequencer.c:2636 +#, c-format +msgid "Could not apply %s... %.*s" +msgstr "" + +#: sequencer.c:2643 +#, c-format +msgid "Could not merge %.*s" +msgstr "" + +#: sequencer.c:2654 sequencer.c:2658 builtin/difftool.c:640 #, c-format msgid "could not copy '%s' to '%s'" msgstr "не удалось скопировать «%s» в «%s»" -#: sequencer.c:1891 +#: sequencer.c:2680 sequencer.c:3095 msgid "could not read index" msgstr "не удалось прочитать индекс" -#: sequencer.c:1896 +#: sequencer.c:2685 #, c-format msgid "" "execution failed: %s\n" @@ -3240,11 +4389,11 @@ msgid "" "\n" msgstr "ошибка выполнения: %s\n%sВы можете исправить ошибку, а затем запустить\n\n git rebase --continue\n\n" -#: sequencer.c:1902 +#: sequencer.c:2691 msgid "and made changes to the index and/or the working tree\n" msgstr "и были сделаны изменения в индексе и/или в рабочем каталоге\n" -#: sequencer.c:1908 +#: sequencer.c:2697 #, c-format msgid "" "execution succeeded: %s\n" @@ -3255,17 +4404,81 @@ msgid "" "\n" msgstr "успешное выполнение: %s\nно остались изменения в индексе и/или в рабочем каталоге\nСделайте коммит или спрячьте ваши изменения, а затем выполните\n\n git rebase --continue\n\n" -#: sequencer.c:1967 +#: sequencer.c:2758 +#, c-format +msgid "illegal label name: '%.*s'" +msgstr "" + +#: sequencer.c:2810 +msgid "writing fake root commit" +msgstr "запись поддельного корневого коммита" + +#: sequencer.c:2815 +msgid "writing squash-onto" +msgstr "запить уплотнить-над" + +#: sequencer.c:2850 +#, c-format +msgid "failed to find tree of %s" +msgstr "не удалось найти дерево для %s" + +#: sequencer.c:2868 +msgid "could not write index" +msgstr "не удалось записать индекс" + +#: sequencer.c:2895 +#, c-format +msgid "could not resolve '%s'" +msgstr "не удалось распознать «%s»" + +#: sequencer.c:2921 +msgid "cannot merge without a current revision" +msgstr "нельзя слить без текущей редакции" + +#: sequencer.c:2943 +#, c-format +msgid "unable to parse '%.*s'" +msgstr "" + +#: sequencer.c:2952 +#, c-format +msgid "nothing to merge: '%.*s'" +msgstr "" + +#: sequencer.c:2964 +msgid "octopus merge cannot be executed on top of a [new root]" +msgstr "" + +#: sequencer.c:2979 +#, c-format +msgid "could not get commit message of '%s'" +msgstr "не удалось получить сообщение коммита для «%s»" + +#: sequencer.c:2989 sequencer.c:3015 +#, c-format +msgid "could not write '%s'" +msgstr "не удалось записать «%s»" + +#: sequencer.c:3127 +#, c-format +msgid "could not even attempt to merge '%.*s'" +msgstr "не удалось даже попытаться слить «%.*s»" + +#: sequencer.c:3143 +msgid "merge: Unable to write new index file" +msgstr "слияние: Не удалось записать файл индекса" + +#: sequencer.c:3211 #, c-format msgid "Applied autostash.\n" msgstr "Применены автоматически спрятанные изменения.\n" -#: sequencer.c:1979 +#: sequencer.c:3223 #, c-format msgid "cannot store %s" msgstr "не удалось сохранить %s" -#: sequencer.c:1982 git-rebase.sh:175 +#: sequencer.c:3226 git-rebase.sh:188 #, c-format msgid "" "Applying autostash resulted in conflicts.\n" @@ -3273,108 +4486,121 @@ msgid "" "You can run \"git stash pop\" or \"git stash drop\" at any time.\n" msgstr "Применение автоматически спрятанных изменений вызвало конфликты.\nВаши изменения спрятаны и в безопасности.\nВы можете выполнить «git stash pop» или «git stash drop» в любой момент.\n" -#: sequencer.c:2064 +#: sequencer.c:3257 +#, c-format +msgid "" +"Could not execute the todo command\n" +"\n" +" %.*s\n" +"It has been rescheduled; To edit the command before continuing, please\n" +"edit the todo list first:\n" +"\n" +" git rebase --edit-todo\n" +" git rebase --continue\n" +msgstr "" + +#: sequencer.c:3325 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "Остановлено на %s … %.*s\n" -#: sequencer.c:2106 +#: sequencer.c:3404 #, c-format msgid "unknown command %d" msgstr "неизвестная команда %d" -#: sequencer.c:2136 +#: sequencer.c:3449 msgid "could not read orig-head" msgstr "не удалось прочитать orig-head" -#: sequencer.c:2141 sequencer.c:2745 +#: sequencer.c:3454 sequencer.c:4517 msgid "could not read 'onto'" msgstr "не удалось прочитать «onto»" -#: sequencer.c:2148 -#, c-format -msgid "could not update %s" -msgstr "не удалось обновить %s" - -#: sequencer.c:2155 +#: sequencer.c:3468 #, c-format msgid "could not update HEAD to %s" msgstr "не удалось обновить HEAD на %s" -#: sequencer.c:2239 +#: sequencer.c:3554 msgid "cannot rebase: You have unstaged changes." msgstr "не удалось выполнить перемещение коммитов: У вас есть непроиндексированные изменения." -#: sequencer.c:2244 -msgid "could not remove CHERRY_PICK_HEAD" -msgstr "не удалось удалить CHERRY_PICK_HEAD" - -#: sequencer.c:2253 +#: sequencer.c:3563 msgid "cannot amend non-existing commit" msgstr "не удалось исправить несуществующий коммит" -#: sequencer.c:2255 +#: sequencer.c:3565 #, c-format msgid "invalid file: '%s'" msgstr "недопустимый файл: «%s»" -#: sequencer.c:2257 +#: sequencer.c:3567 #, c-format msgid "invalid contents: '%s'" msgstr "недопустимое содержимое: «%s»" -#: sequencer.c:2260 +#: sequencer.c:3570 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" "first and then run 'git rebase --continue' again." msgstr "\nУ вас имеются незакоммиченные изменения в рабочем каталоге. Сделайте коммит, а затем запустите «git rebase --continue» снова." -#: sequencer.c:2270 +#: sequencer.c:3595 sequencer.c:3633 +#, c-format +msgid "could not write file: '%s'" +msgstr "" + +#: sequencer.c:3648 +msgid "could not remove CHERRY_PICK_HEAD" +msgstr "не удалось удалить CHERRY_PICK_HEAD" + +#: sequencer.c:3655 msgid "could not commit staged changes." msgstr "не удалось закоммитить проиндексированные изменения." -#: sequencer.c:2350 +#: sequencer.c:3752 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: не удалось скопировать коммит %s" -#: sequencer.c:2354 +#: sequencer.c:3756 #, c-format msgid "%s: bad revision" msgstr "%s: плохая редакция" -#: sequencer.c:2387 +#: sequencer.c:3791 msgid "can't revert as initial commit" msgstr "нельзя возвратить изначальный коммит" -#: sequencer.c:2492 +#: sequencer.c:4238 msgid "make_script: unhandled options" msgstr "make_script: не обработанные опции" -#: sequencer.c:2495 +#: sequencer.c:4241 msgid "make_script: error preparing revisions" msgstr "make_script: ошибка при обновлении редакций" -#: sequencer.c:2529 sequencer.c:2564 +#: sequencer.c:4281 sequencer.c:4337 #, c-format msgid "unusable todo list: '%s'" msgstr "непригодный для использования список дел: «%s»" -#: sequencer.c:2615 +#: sequencer.c:4396 #, c-format msgid "" "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." msgstr "нераспознанная настройка %s для опции rebase.missingCommitsCheck. Игнорирую." -#: sequencer.c:2695 +#: sequencer.c:4466 #, c-format msgid "" "Warning: some commits may have been dropped accidentally.\n" "Dropped commits (newer to older):\n" msgstr "Внимание: некоторые коммиты могли быть отброшены по ошибке.\nОтброшенные коммиты (от новых к старым):\n" -#: sequencer.c:2702 +#: sequencer.c:4473 #, c-format msgid "" "To avoid this message, use \"drop\" to explicitly remove a commit.\n" @@ -3384,36 +4610,30 @@ msgid "" "\n" msgstr "Для избежания этого сообщения, используйте «drop» чтобы явно удалить коммит.\n\nИспользуйте опцию «git config rebase.missingCommitsCheck» для изменения количества предупреждений.\nВозможные значения: ignore, warn, error.\n\n" -#: sequencer.c:2714 +#: sequencer.c:4486 #, c-format msgid "" "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'.\n" "Or you can abort the rebase with 'git rebase --abort'.\n" msgstr "Вы можете исправить это с помощью «git rebase --edit-todo», а потом запустив «git rebase --continue».\nИли вы можете прервать процесс перемещения, выполнив «git rebase --abort»\n" -#: sequencer.c:2727 sequencer.c:2794 wrapper.c:225 wrapper.c:395 -#: builtin/am.c:779 -#, c-format -msgid "could not open '%s' for writing" -msgstr "не удалось открыть «%s» для записи" - -#: sequencer.c:2775 -#, c-format -msgid "could not parse commit '%s'" -msgstr "не удалось разобрать коммит «%s»" - -#: sequencer.c:2897 +#: sequencer.c:4660 msgid "the script was already rearranged." msgstr "сценарий уже был перестроен." -#: setup.c:171 +#: setup.c:123 +#, c-format +msgid "'%s' is outside repository" +msgstr "«%s» вне репозитория" + +#: setup.c:172 #, c-format msgid "" "%s: no such path in the working tree.\n" "Use 'git <command> -- <path>...' to specify paths that do not exist locally." msgstr "%s: нет такого пути в рабочем каталоге.\nИспользуйте «git <команда> -- <путь>…» для указания путей, которые не существуют локально." -#: setup.c:184 +#: setup.c:185 #, c-format msgid "" "ambiguous argument '%s': unknown revision or path not in the working tree.\n" @@ -3421,7 +4641,12 @@ msgid "" "'git <command> [<revision>...] -- [<file>...]'" msgstr "неоднозначный аргумент «%s»: неизвестная редакция или не путь в рабочем каталоге.\nИспользуйте «--» для отделения путей от редакций, вот так:\n«git <команда> [<редакция>…] -- [<файл>…]»" -#: setup.c:252 +#: setup.c:234 +#, c-format +msgid "option '%s' must come before non-option arguments" +msgstr "" + +#: setup.c:253 #, c-format msgid "" "ambiguous argument '%s': both revision and filename\n" @@ -3429,82 +4654,376 @@ msgid "" "'git <command> [<revision>...] -- [<file>...]'" msgstr "неоднозначный аргумент «%s»: является одновременно и редакцией и именем файла.\nИспользуйте «--» для отделения путей от редакций, вот так:\n«git <команда> [<редакция>…] -- [<файл>…]»" -#: setup.c:501 +#: setup.c:389 +msgid "unable to set up work tree using invalid config" +msgstr "" + +#: setup.c:393 +msgid "this operation must be run in a work tree" +msgstr "" + +#: setup.c:503 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "Ожидаемая версия git репозитория <= %d, а обнаружена %d" -#: setup.c:509 +#: setup.c:511 msgid "unknown repository extensions found:" msgstr "обнаружены неизвестные расширения репозитория:" -#: setup.c:811 +#: setup.c:530 #, c-format -msgid "Not a git repository (or any of the parent directories): %s" -msgstr "Не найден git репозитоий (или один из его каталогов): %s" +msgid "error opening '%s'" +msgstr "ошибка открытия «%s»" -#: setup.c:813 builtin/index-pack.c:1653 -msgid "Cannot come back to cwd" -msgstr "Не удалось вернуться в текущий рабочий каталог" +#: setup.c:532 +#, c-format +msgid "too large to be a .git file: '%s'" +msgstr "файл слишком большой как для .git файла: «%s»" + +#: setup.c:534 +#, c-format +msgid "error reading %s" +msgstr "ошибка чтения %s" -#: setup.c:1052 +#: setup.c:536 +#, c-format +msgid "invalid gitfile format: %s" +msgstr "неправильный формат файла gitfile: %s" + +#: setup.c:538 +#, c-format +msgid "no path in gitfile: %s" +msgstr "нет пути в gitfile: %s" + +#: setup.c:540 +#, c-format +msgid "not a git repository: %s" +msgstr "не является репозиторием git: %s" + +#: setup.c:639 +#, c-format +msgid "'$%s' too big" +msgstr "«$%s» слишком большой" + +#: setup.c:653 +#, c-format +msgid "not a git repository: '%s'" +msgstr "не является репозиторием git: «%s»" + +#: setup.c:682 setup.c:684 setup.c:715 +#, c-format +msgid "cannot chdir to '%s'" +msgstr "не удалось выполнить chdir в «%s»" + +#: setup.c:687 setup.c:743 setup.c:753 setup.c:792 setup.c:800 setup.c:815 +msgid "cannot come back to cwd" +msgstr "не удалось вернуться в cwd" + +#: setup.c:813 +#, c-format +msgid "not a git repository (or any of the parent directories): %s" +msgstr "не найден git репозиторий (или один из родительских каталогов): %s" + +#: setup.c:824 +#, c-format +msgid "failed to stat '%*s%s%s'" +msgstr "не удалось выполнить stat для «%*s%s%s»" + +#: setup.c:1054 msgid "Unable to read current working directory" msgstr "Не удалось прочитать текущий рабочий каталог" -#: setup.c:1064 setup.c:1070 +#: setup.c:1066 setup.c:1072 #, c-format -msgid "Cannot change to '%s'" -msgstr "Не удалось изменить на «%s»" +msgid "cannot change to '%s'" +msgstr "не удалось изменить на «%s»" -#: setup.c:1083 +#: setup.c:1085 #, c-format msgid "" -"Not a git repository (or any parent up to mount point %s)\n" +"not a git repository (or any parent up to mount point %s)\n" "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)." -msgstr "Не найден git репозитоий (или один из его каталогов вплоть до точки монтирования %s)\nОстанавливаю поиск на границе файловой системы (так как GIT_DISCOVERY_ACROSS_FILESYSTEM не установлен)." +msgstr "не найден git репозиторий (или один из его каталогов вплоть до точки монтирования %s)\nОстанавливаю поиск на границе файловой системы (так как GIT_DISCOVERY_ACROSS_FILESYSTEM не установлен)." -#: setup.c:1167 +#: setup.c:1168 #, c-format msgid "" -"Problem with core.sharedRepository filemode value (0%.3o).\n" +"problem with core.sharedRepository filemode value (0%.3o).\n" "The owner of files must always have read and write permissions." -msgstr "Проблема со значением режима доступа к файлу core.sharedRepository (0%.3o).\nВладелец файлов должен всегда иметь права на чтение и на запись." +msgstr "" + +#: setup.c:1211 +msgid "open /dev/null or dup failed" +msgstr "сбой открытия /dev/null или дублирования дескриптора" + +#: setup.c:1226 +msgid "fork failed" +msgstr "сбой при выполнении fork" + +#: setup.c:1231 +msgid "setsid failed" +msgstr "сбой при выполнении setsid" + +#: sha1-file.c:381 +#, c-format +msgid "object directory %s does not exist; check .git/objects/info/alternates" +msgstr "" + +#: sha1-file.c:432 +#, c-format +msgid "unable to normalize alternate object path: %s" +msgstr "" -#: sha1_file.c:598 +#: sha1-file.c:503 +#, c-format +msgid "%s: ignoring alternate object stores, nesting too deep" +msgstr "" + +#: sha1-file.c:510 +#, c-format +msgid "unable to normalize object directory: %s" +msgstr "" + +#: sha1-file.c:565 +msgid "unable to fdopen alternates lockfile" +msgstr "" + +#: sha1-file.c:583 +msgid "unable to read alternates file" +msgstr "" + +#: sha1-file.c:590 +msgid "unable to move new alternates file into place" +msgstr "" + +#: sha1-file.c:625 #, c-format msgid "path '%s' does not exist" msgstr "путь «%s» не существует" -#: sha1_file.c:624 +#: sha1-file.c:651 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "ссылаемый репозиторий «%s» как связанное состояние, пока не поддерживается." -#: sha1_file.c:630 +#: sha1-file.c:657 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "ссылаемый репозиторий «%s» не является локальным." -#: sha1_file.c:636 +#: sha1-file.c:663 #, c-format msgid "reference repository '%s' is shallow" msgstr "ссылаемый репозиторий «%s» является частичным" -#: sha1_file.c:644 +#: sha1-file.c:671 #, c-format msgid "reference repository '%s' is grafted" msgstr "ссылаемый репозиторий «%s» является сращенным" -#: sha1_name.c:422 +#: sha1-file.c:781 +#, c-format +msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" +msgstr "" + +#: sha1-file.c:806 +msgid "mmap failed" +msgstr "" + +#: sha1-file.c:973 +#, c-format +msgid "object file %s is empty" +msgstr "" + +#: sha1-file.c:1093 sha1-file.c:2206 +#, c-format +msgid "corrupt loose object '%s'" +msgstr "" + +#: sha1-file.c:1095 sha1-file.c:2210 +#, c-format +msgid "garbage at end of loose object '%s'" +msgstr "" + +#: sha1-file.c:1137 +msgid "invalid object type" +msgstr "" + +#: sha1-file.c:1219 +#, c-format +msgid "unable to unpack %s header with --allow-unknown-type" +msgstr "" + +#: sha1-file.c:1222 +#, c-format +msgid "unable to unpack %s header" +msgstr "" + +#: sha1-file.c:1228 +#, c-format +msgid "unable to parse %s header with --allow-unknown-type" +msgstr "" + +#: sha1-file.c:1231 +#, c-format +msgid "unable to parse %s header" +msgstr "" + +#: sha1-file.c:1422 +#, c-format +msgid "failed to read object %s" +msgstr "" + +#: sha1-file.c:1426 +#, c-format +msgid "replacement %s not found for %s" +msgstr "" + +#: sha1-file.c:1430 +#, c-format +msgid "loose object %s (stored in %s) is corrupt" +msgstr "" + +#: sha1-file.c:1434 +#, c-format +msgid "packed object %s (stored in %s) is corrupt" +msgstr "" + +#: sha1-file.c:1536 +#, c-format +msgid "unable to write sha1 filename %s" +msgstr "" + +#: sha1-file.c:1543 +#, c-format +msgid "unable to set permission to '%s'" +msgstr "" + +#: sha1-file.c:1550 +msgid "file write error" +msgstr "" + +#: sha1-file.c:1569 +msgid "error when closing sha1 file" +msgstr "" + +#: sha1-file.c:1635 +#, c-format +msgid "insufficient permission for adding an object to repository database %s" +msgstr "" + +#: sha1-file.c:1637 +msgid "unable to create temporary file" +msgstr "" + +#: sha1-file.c:1661 +msgid "unable to write sha1 file" +msgstr "" + +#: sha1-file.c:1667 +#, c-format +msgid "unable to deflate new object %s (%d)" +msgstr "" + +#: sha1-file.c:1671 +#, c-format +msgid "deflateEnd on object %s failed (%d)" +msgstr "" + +#: sha1-file.c:1675 +#, c-format +msgid "confused by unstable object source data for %s" +msgstr "" + +#: sha1-file.c:1685 builtin/pack-objects.c:899 +#, c-format +msgid "failed utime() on %s" +msgstr "" + +#: sha1-file.c:1760 +#, c-format +msgid "cannot read sha1_file for %s" +msgstr "" + +#: sha1-file.c:1805 +msgid "corrupt commit" +msgstr "" + +#: sha1-file.c:1813 +msgid "corrupt tag" +msgstr "" + +#: sha1-file.c:1906 +#, c-format +msgid "read error while indexing %s" +msgstr "" + +#: sha1-file.c:1909 +#, c-format +msgid "short read while indexing %s" +msgstr "" + +#: sha1-file.c:1980 sha1-file.c:1989 +#, c-format +msgid "%s: failed to insert into database" +msgstr "" + +#: sha1-file.c:1995 +#, c-format +msgid "%s: unsupported file type" +msgstr "" + +#: sha1-file.c:2019 +#, c-format +msgid "%s is not a valid object" +msgstr "" + +#: sha1-file.c:2021 +#, c-format +msgid "%s is not a valid '%s' object" +msgstr "%s не является действительным объектом «%s»" + +#: sha1-file.c:2048 builtin/index-pack.c:158 +#, c-format +msgid "unable to open %s" +msgstr "не удалось открыть %s" + +#: sha1-file.c:2217 sha1-file.c:2269 +#, c-format +msgid "sha1 mismatch for %s (expected %s)" +msgstr "" + +#: sha1-file.c:2241 +#, c-format +msgid "unable to mmap %s" +msgstr "" + +#: sha1-file.c:2246 +#, c-format +msgid "unable to unpack header of %s" +msgstr "" + +#: sha1-file.c:2252 +#, c-format +msgid "unable to parse header of %s" +msgstr "" + +#: sha1-file.c:2263 +#, c-format +msgid "unable to unpack contents of %s" +msgstr "" + +#: sha1-name.c:444 #, c-format msgid "short SHA1 %s is ambiguous" msgstr "сокращённый SHA1 идентификатор %s неоднозначен" -#: sha1_name.c:433 +#: sha1-name.c:455 msgid "The candidates are:" msgstr "Возможно, вы имели в виду:" -#: sha1_name.c:693 +#: sha1-name.c:699 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" @@ -3517,86 +5036,96 @@ msgid "" "running \"git config advice.objectNameWarning false\"" msgstr "Обычно Git не создает ссылки, оканчивающиеся на 40 шестнадцатеричных\nсимволов, потому, что они будут игнорироваться, когда вы просто\nукажете это 40-символьное шестнадцатеричное число. Такие ссылки\nмогли быть созданы по ошибке. Например, с помощью:\n\n git checkout -b $br $(git rev-parse …)\n\n, если «$br» оказался пустым, то ссылка с 40-символьным\nшестнадцатеричным числом будет создана. Пожалуйста, просмотрите эти\nссылки и, возможно, удалите их. Вы можете отключить это сообщение\nзапустив «git config advice.objectNameWarning false»" -#: submodule.c:96 submodule.c:130 +#: submodule.c:97 submodule.c:131 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "Не удалось изменить не слитый .gitmodules, сначала разрешите конфликты" -#: submodule.c:100 submodule.c:134 +#: submodule.c:101 submodule.c:135 #, c-format msgid "Could not find section in .gitmodules where path=%s" msgstr "Не удалось найти раздел в .gitmodules, где путь равен %s" -#: submodule.c:108 +#: submodule.c:109 #, c-format msgid "Could not update .gitmodules entry %s" msgstr " Не удалось обновить .gitmodules запись %s" -#: submodule.c:141 +#: submodule.c:142 #, c-format msgid "Could not remove .gitmodules entry for %s" msgstr "Не удалось удалить запись в .gitmodules для %s" -#: submodule.c:152 +#: submodule.c:153 msgid "staging updated .gitmodules failed" msgstr "сбой индексирования обновленного .gitmodules" -#: submodule.c:312 +#: submodule.c:315 #, c-format msgid "in unpopulated submodule '%s'" msgstr "в пустом подмодуле «%s»" -#: submodule.c:343 +#: submodule.c:346 #, c-format msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "Спецификатор пути «%s» в подмодуле «%.*s»" -#: submodule.c:833 +#: submodule.c:839 #, c-format msgid "submodule entry '%s' (%s) is a %s, not a commit" msgstr "запись подмодуля «%s» (%s) является %s, а не является коммитом" -#: submodule.c:1065 builtin/branch.c:648 builtin/submodule--helper.c:1387 +#: submodule.c:1071 builtin/branch.c:662 builtin/submodule--helper.c:1888 msgid "Failed to resolve HEAD as a valid ref." msgstr "Не удалось определить HEAD как действительную ссылку." -#: submodule.c:1370 +#: submodule.c:1377 #, c-format msgid "'%s' not recognized as a git repository" msgstr "«%s» не распознан как репозиторий git" -#: submodule.c:1508 +#: submodule.c:1515 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "не удалось запустить «git status» в подмодуле «%s»" -#: submodule.c:1521 +#: submodule.c:1528 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "не удалось запустить «git status» в подмодуле «%s»" -#: submodule.c:1614 +#: submodule.c:1543 +#, c-format +msgid "Could not unset core.worktree setting in submodule '%s'" +msgstr "" + +#: submodule.c:1633 #, c-format msgid "submodule '%s' has dirty index" msgstr "подмодуль «%s» имеет изменённый индекс" -#: submodule.c:1876 +#: submodule.c:1685 +#, c-format +msgid "Submodule '%s' could not be updated." +msgstr "" + +#: submodule.c:1734 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" msgstr "relocate_gitdir для подмодуля «%s» с указанием более одного рабочего дерева не поддерживается" -#: submodule.c:1888 submodule.c:1944 +#: submodule.c:1746 submodule.c:1802 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "не удалось запросить имя подмодуля «%s»" -#: submodule.c:1892 builtin/submodule--helper.c:909 -#: builtin/submodule--helper.c:919 +#: submodule.c:1750 builtin/submodule--helper.c:1406 +#: builtin/submodule--helper.c:1416 #, c-format msgid "could not create directory '%s'" msgstr "не удалось создать каталог «%s»" -#: submodule.c:1895 +#: submodule.c:1753 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -3604,29 +5133,30 @@ msgid "" "'%s'\n" msgstr "Перемещение каталога git для «%s%s» из\n«%s» в\n«%s»\n" -#: submodule.c:1979 +#: submodule.c:1837 #, c-format msgid "could not recurse into submodule '%s'" msgstr "не удалось рекурсивно зайти в подмодуль «%s»" -#: submodule.c:2023 +#: submodule.c:1881 msgid "could not start ls-files in .." msgstr "не удалось выполнить stat ls-files в .." -#: submodule.c:2043 -msgid "BUG: returned path string doesn't match cwd?" -msgstr "ОШИБКА: возвращенная строка не соответсвует cwd?" - -#: submodule.c:2062 +#: submodule.c:1920 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree вернул неожиданный код %d" -#: submodule-config.c:263 +#: submodule-config.c:231 +#, c-format +msgid "ignoring suspicious submodule name: %s" +msgstr "игнорирую подозрительный подмодуль с именем: %s" + +#: submodule-config.c:295 msgid "negative values not allowed for submodule.fetchjobs" msgstr "нельзя использовать отрицательные значения для submodule.fetchjobs" -#: submodule-config.c:436 +#: submodule-config.c:468 #, c-format msgid "invalid value for %s" msgstr "неправильное значение %s" @@ -3642,7 +5172,7 @@ msgstr "сбой при запуске команды завершителя «% msgid "unknown value '%s' for key '%s'" msgstr "неизвестное значение «%s» для ключа «%s»" -#: trailer.c:539 trailer.c:544 builtin/remote.c:290 +#: trailer.c:539 trailer.c:544 builtin/remote.c:294 #, c-format msgid "more than one %s" msgstr "больше одного %s" @@ -3661,7 +5191,7 @@ msgstr "не удалось прочитать входной файл «%s»" msgid "could not read from stdin" msgstr "не удалось прочитать из стандартного ввода" -#: trailer.c:1008 builtin/am.c:46 +#: trailer.c:1008 builtin/am.c:47 #, c-format msgid "could not stat %s" msgstr "не удалось выполнить stat для %s" @@ -3685,24 +5215,51 @@ msgstr "не удалось создать временный файл" msgid "could not rename temporary file to %s" msgstr "не удалось переименовать временный файл в %s" -#: transport.c:63 +#: transport.c:116 #, c-format msgid "Would set upstream of '%s' to '%s' of '%s'\n" msgstr "Будет установлен вышестоящий репозиторий для «%s» на «%s» с «%s»\n" -#: transport.c:152 +#: transport.c:142 +#, c-format +msgid "could not read bundle '%s'" +msgstr "" + +#: transport.c:208 #, c-format msgid "transport: invalid depth option '%s'" msgstr "транспорт: неправильный параметр глубины «%s»" -#: transport.c:904 +#: transport.c:586 +msgid "could not parse transport.color.* config" +msgstr "не удалось разобрать опцию transport.color.*" + +#: transport.c:659 +msgid "support for protocol v2 not implemented yet" +msgstr "" + +#: transport.c:785 +#, c-format +msgid "unknown value for config '%s': %s" +msgstr "" + +#: transport.c:851 +#, c-format +msgid "transport '%s' not allowed" +msgstr "" + +#: transport.c:903 +msgid "git-over-rsync is no longer supported" +msgstr "" + +#: transport.c:998 #, c-format msgid "" "The following submodule paths contain changes that can\n" "not be found on any remote:\n" msgstr "Подмодули по указанным путям содержат изменения, которые не найдены ни на одном из внешних репозиториев:\n" -#: transport.c:908 +#: transport.c:1002 #, c-format msgid "" "\n" @@ -3718,203 +5275,374 @@ msgid "" "\n" msgstr "\nПопробуйте выполнить\n\n\tgit push --recurse-submodules=on-demand\n\nили перейти в каталог с помощью команды cd и выполнить\n\n\tgit push\n\nдля их отправки на внешний репозиторий.\n" -#: transport.c:916 +#: transport.c:1010 msgid "Aborting." msgstr "Прерываю." -#: transport-helper.c:1074 +#: transport.c:1148 +msgid "failed to push all needed submodules" +msgstr "" + +#: transport.c:1270 transport-helper.c:643 +msgid "operation not supported by protocol" +msgstr "" + +#: transport.c:1352 +#, c-format +msgid "invalid line while parsing alternate refs: %s" +msgstr "" + +#: transport-helper.c:51 transport-helper.c:80 +msgid "full write to remote helper failed" +msgstr "" + +#: transport-helper.c:132 #, c-format -msgid "Could not read ref %s" -msgstr "Не удалось прочитать ссылку %s" +msgid "unable to find remote helper for '%s'" +msgstr "" + +#: transport-helper.c:148 transport-helper.c:557 +msgid "can't dup helper output fd" +msgstr "" + +#: transport-helper.c:199 +#, c-format +msgid "" +"unknown mandatory capability %s; this remote helper probably needs newer " +"version of Git" +msgstr "" + +#: transport-helper.c:205 +msgid "this remote helper should implement refspec capability" +msgstr "" + +#: transport-helper.c:272 transport-helper.c:412 +#, c-format +msgid "%s unexpectedly said: '%s'" +msgstr "" + +#: transport-helper.c:401 +#, c-format +msgid "%s also locked %s" +msgstr "" + +#: transport-helper.c:479 +msgid "couldn't run fast-import" +msgstr "" + +#: transport-helper.c:502 +msgid "error while running fast-import" +msgstr "" + +#: transport-helper.c:531 transport-helper.c:1091 +#, c-format +msgid "could not read ref %s" +msgstr "" + +#: transport-helper.c:576 +#, c-format +msgid "unknown response to connect: %s" +msgstr "" + +#: transport-helper.c:598 +msgid "setting remote service path not supported by protocol" +msgstr "" + +#: transport-helper.c:600 +msgid "invalid remote service path" +msgstr "" + +#: transport-helper.c:646 +#, c-format +msgid "can't connect to subservice %s" +msgstr "" + +#: transport-helper.c:713 +#, c-format +msgid "expected ok/error, helper said '%s'" +msgstr "" + +#: transport-helper.c:766 +#, c-format +msgid "helper reported unexpected status of %s" +msgstr "" + +#: transport-helper.c:827 +#, c-format +msgid "helper %s does not support dry-run" +msgstr "" + +#: transport-helper.c:830 +#, c-format +msgid "helper %s does not support --signed" +msgstr "" -#: tree-walk.c:31 +#: transport-helper.c:833 +#, c-format +msgid "helper %s does not support --signed=if-asked" +msgstr "" + +#: transport-helper.c:840 +#, c-format +msgid "helper %s does not support 'push-option'" +msgstr "" + +#: transport-helper.c:932 +msgid "remote-helper doesn't support push; refspec needed" +msgstr "" + +#: transport-helper.c:937 +#, c-format +msgid "helper %s does not support 'force'" +msgstr "" + +#: transport-helper.c:984 +msgid "couldn't run fast-export" +msgstr "" + +#: transport-helper.c:989 +msgid "error while running fast-export" +msgstr "" + +#: transport-helper.c:1014 +#, c-format +msgid "" +"No refs in common and none specified; doing nothing.\n" +"Perhaps you should specify a branch such as 'master'.\n" +msgstr "" + +#: transport-helper.c:1077 +#, c-format +msgid "malformed response in ref list: %s" +msgstr "" + +#: transport-helper.c:1230 +#, c-format +msgid "read(%s) failed" +msgstr "" + +#: transport-helper.c:1257 +#, c-format +msgid "write(%s) failed" +msgstr "" + +#: transport-helper.c:1306 +#, c-format +msgid "%s thread failed" +msgstr "" + +#: transport-helper.c:1310 +#, c-format +msgid "%s thread failed to join: %s" +msgstr "" + +#: transport-helper.c:1329 transport-helper.c:1333 +#, c-format +msgid "can't start thread for copying data: %s" +msgstr "" + +#: transport-helper.c:1370 +#, c-format +msgid "%s process failed to wait" +msgstr "" + +#: transport-helper.c:1374 +#, c-format +msgid "%s process failed" +msgstr "" + +#: transport-helper.c:1392 transport-helper.c:1401 +msgid "can't start thread for copying data" +msgstr "" + +#: tree-walk.c:33 msgid "too-short tree object" msgstr "слишком короткий объект дерева" -#: tree-walk.c:37 +#: tree-walk.c:39 msgid "malformed mode in tree entry" msgstr "неправильный режим в записи дерева" -#: tree-walk.c:41 +#: tree-walk.c:43 msgid "empty filename in tree entry" msgstr "пустое имя файла в записи дерева" -#: tree-walk.c:114 +#: tree-walk.c:115 msgid "too-short tree file" msgstr "слишком короткий файл дерева" -#: unpack-trees.c:107 +#: unpack-trees.c:112 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" "%%sPlease commit your changes or stash them before you switch branches." msgstr "Ваши локальные изменения в указанных файлах будут перезаписаны при переключении на состояние:\n%%sСделайте коммит или спрячьте ваши изменения перед переключением веток." -#: unpack-trees.c:109 +#: unpack-trees.c:114 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" "%%s" msgstr "Ваши локальные изменения в указанных файлах будут перезаписаны при переключении на состояние:\n%%s" -#: unpack-trees.c:112 +#: unpack-trees.c:117 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" "%%sPlease commit your changes or stash them before you merge." msgstr "Ваши локальные изменения в указанных файлах будут перезаписаны при слиянии:\n%%sСделайте коммит или спрячьте ваши изменения перед слиянием веток." -#: unpack-trees.c:114 +#: unpack-trees.c:119 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" "%%s" msgstr "Ваши локальные изменения в указанных файлах будут перезаписаны при слиянии:\n%%s" -#: unpack-trees.c:117 +#: unpack-trees.c:122 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" "%%sPlease commit your changes or stash them before you %s." msgstr "Ваши локальные изменения в указанных файлах будут перезаписаны при %s:\n%%sСделайте коммит или спрячьте ваши изменения перед %s." -#: unpack-trees.c:119 +#: unpack-trees.c:124 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" "%%s" msgstr "Ваши локальные изменения в указанных файлах будут перезаписаны при %s:\n%%s" -#: unpack-trees.c:124 +#: unpack-trees.c:129 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" "%s" msgstr "Обновление указанных каталогов приведет к потере неотслеживаемых файлов в них:\n%s" -#: unpack-trees.c:128 +#: unpack-trees.c:133 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" "%%sPlease move or remove them before you switch branches." msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут удалены при переключении на состояние:\n%%sПереместите эти файлы или удалите их перед переключением веток." -#: unpack-trees.c:130 +#: unpack-trees.c:135 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" "%%s" msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут удалены при переключении на состояние:\n%%s" -#: unpack-trees.c:133 +#: unpack-trees.c:138 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" "%%sPlease move or remove them before you merge." msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут удалены при слиянии:\n%%sПереместите эти файлы или удалите их перед переключением веток." -#: unpack-trees.c:135 +#: unpack-trees.c:140 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" "%%s" msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут удалены при слиянии:\n%%s" -#: unpack-trees.c:138 +#: unpack-trees.c:143 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" "%%sPlease move or remove them before you %s." msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут удалены при %s:\n%%sПереместите эти файлы или удалите их перед %s." -#: unpack-trees.c:140 +#: unpack-trees.c:145 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" "%%s" msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут удалены при %s:\n%%s" -#: unpack-trees.c:145 +#: unpack-trees.c:151 #, c-format msgid "" "The following untracked working tree files would be overwritten by checkout:\n" "%%sPlease move or remove them before you switch branches." msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут перезаписаны при переключении на состояние:\n%%sПереместите эти файлы или удалите их перед переключением веток." -#: unpack-trees.c:147 +#: unpack-trees.c:153 #, c-format msgid "" "The following untracked working tree files would be overwritten by checkout:\n" "%%s" msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут перезаписаны при переключении на состояние:\n%%s" -#: unpack-trees.c:150 +#: unpack-trees.c:156 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" "%%sPlease move or remove them before you merge." msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут перезаписаны при слиянии:\n%%sПереместите эти файлы или удалите их перед переключением веток." -#: unpack-trees.c:152 +#: unpack-trees.c:158 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" "%%s" msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут перезаписаны при слиянии:\n%%s" -#: unpack-trees.c:155 +#: unpack-trees.c:161 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" "%%sPlease move or remove them before you %s." msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут перезаписаны при %s:\n%%sПереместите эти файлы или удалите их перед %s." -#: unpack-trees.c:157 +#: unpack-trees.c:163 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" "%%s" msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут перезаписаны при %s:\n%%s" -#: unpack-trees.c:164 +#: unpack-trees.c:171 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "Запись «%s» частично совпадает с «%s». Не удалось назначить соответствие." -#: unpack-trees.c:167 +#: unpack-trees.c:174 #, c-format msgid "" "Cannot update sparse checkout: the following entries are not up to date:\n" "%s" msgstr "Не удалось обновить частичное состояние: следующие элементы не последней версии:\n%s" -#: unpack-trees.c:169 +#: unpack-trees.c:176 #, c-format msgid "" "The following working tree files would be overwritten by sparse checkout update:\n" "%s" msgstr "Указанные файлы из рабочего каталога будут перезаписаны при обновлении частичного состояния:\n%s" -#: unpack-trees.c:171 +#: unpack-trees.c:178 #, c-format msgid "" "The following working tree files would be removed by sparse checkout update:\n" "%s" msgstr "Указанные файлы из рабочего каталога будут удалены при обновлении частичного состояния:\n%s" -#: unpack-trees.c:173 +#: unpack-trees.c:180 #, c-format msgid "" "Cannot update submodule:\n" "%s" msgstr "Не удолось обновить подмодуль:\n%s" -#: unpack-trees.c:250 +#: unpack-trees.c:254 #, c-format msgid "Aborting\n" msgstr "Прерываю\n" -#: unpack-trees.c:332 +#: unpack-trees.c:336 msgid "Checking out files" msgstr "Распаковка файлов" @@ -3947,18 +5675,43 @@ msgstr "неправильный номер порта" msgid "invalid '..' path segment" msgstr "неправильная часть пути «..»" -#: worktree.c:245 +#: worktree.c:245 builtin/am.c:2147 #, c-format msgid "failed to read '%s'" msgstr "не удалось прочитать «%s»" +#: worktree.c:291 +#, c-format +msgid "'%s' at main working tree is not the repository directory" +msgstr "" + +#: worktree.c:302 +#, c-format +msgid "'%s' file does not contain absolute path to the working tree location" +msgstr "" + +#: worktree.c:314 +#, c-format +msgid "'%s' does not exist" +msgstr "«%s» не существует" + +#: worktree.c:320 +#, c-format +msgid "'%s' is not a .git file, error code %d" +msgstr "" + +#: worktree.c:328 +#, c-format +msgid "'%s' does not point back to '%s'" +msgstr "" + #: wrapper.c:223 wrapper.c:393 #, c-format msgid "could not open '%s' for reading and writing" msgstr "не удалось открыть «%s» для чтения и записи" -#: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:770 -#: builtin/am.c:862 builtin/merge.c:1043 +#: wrapper.c:227 wrapper.c:397 builtin/am.c:321 builtin/am.c:771 +#: builtin/am.c:863 builtin/merge.c:1078 #, c-format msgid "could not open '%s' for reading" msgstr "не удалось открыть «%s» для чтения" @@ -3972,135 +5725,135 @@ msgstr "«%s» недоступно" msgid "unable to get current working directory" msgstr "не удалось получить текущий рабочий каталог" -#: wt-status.c:150 +#: wt-status.c:154 msgid "Unmerged paths:" msgstr "Не слитые пути:" -#: wt-status.c:177 wt-status.c:204 +#: wt-status.c:181 wt-status.c:208 #, c-format msgid " (use \"git reset %s <file>...\" to unstage)" msgstr " (используйте «git reset %s <файл>…», чтобы убрать из индекса)" -#: wt-status.c:179 wt-status.c:206 +#: wt-status.c:183 wt-status.c:210 msgid " (use \"git rm --cached <file>...\" to unstage)" msgstr " (используйте «git rm --cached <файл>…», чтобы убрать из индекса)" -#: wt-status.c:183 +#: wt-status.c:187 msgid " (use \"git add <file>...\" to mark resolution)" msgstr " (используйте «git add <файл>…», чтобы пометить разрешение конфликта)" -#: wt-status.c:185 wt-status.c:189 +#: wt-status.c:189 wt-status.c:193 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr " (используйте «git add/rm <файл>…», чтобы пометить выбранное разрешение конфликта)" -#: wt-status.c:187 +#: wt-status.c:191 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (используйте «git rm <файл>…», чтобы пометить разрешение конфликта)" -#: wt-status.c:198 wt-status.c:984 +#: wt-status.c:202 wt-status.c:1015 msgid "Changes to be committed:" msgstr "Изменения, которые будут включены в коммит:" -#: wt-status.c:216 wt-status.c:993 +#: wt-status.c:220 wt-status.c:1024 msgid "Changes not staged for commit:" msgstr "Изменения, которые не в индексе для коммита:" -#: wt-status.c:220 +#: wt-status.c:224 msgid " (use \"git add <file>...\" to update what will be committed)" msgstr " (используйте «git add <файл>…», чтобы добавить файл в индекс)" -#: wt-status.c:222 +#: wt-status.c:226 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr " (используйте «git add/rm <файл>…», чтобы добавить или удалить файл из индекса)" -#: wt-status.c:223 +#: wt-status.c:227 msgid "" " (use \"git checkout -- <file>...\" to discard changes in working " "directory)" msgstr " (используйте «git checkout -- <файл>…», чтобы отменить изменения\n в рабочем каталоге)" -#: wt-status.c:225 +#: wt-status.c:229 msgid " (commit or discard the untracked or modified content in submodules)" msgstr " (сделайте коммит или отмените изменения в неотслеживаемом или измененном содержимом в подмодулях)" -#: wt-status.c:237 +#: wt-status.c:241 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr " (используйте «git %s <файл>…», чтобы добавить в то, что будет включено в коммит)" -#: wt-status.c:252 +#: wt-status.c:256 msgid "both deleted:" msgstr "оба удалены:" -#: wt-status.c:254 +#: wt-status.c:258 msgid "added by us:" msgstr "добавлено нами:" -#: wt-status.c:256 +#: wt-status.c:260 msgid "deleted by them:" msgstr "удалено ими:" -#: wt-status.c:258 +#: wt-status.c:262 msgid "added by them:" msgstr "добавлено ими:" -#: wt-status.c:260 +#: wt-status.c:264 msgid "deleted by us:" msgstr "удалено нами:" -#: wt-status.c:262 +#: wt-status.c:266 msgid "both added:" msgstr "оба добавлены:" -#: wt-status.c:264 +#: wt-status.c:268 msgid "both modified:" msgstr "оба изменены:" -#: wt-status.c:274 +#: wt-status.c:278 msgid "new file:" msgstr "новый файл:" -#: wt-status.c:276 +#: wt-status.c:280 msgid "copied:" msgstr "скопировано:" -#: wt-status.c:278 +#: wt-status.c:282 msgid "deleted:" msgstr "удалено:" -#: wt-status.c:280 +#: wt-status.c:284 msgid "modified:" msgstr "изменено:" -#: wt-status.c:282 +#: wt-status.c:286 msgid "renamed:" msgstr "переименовано:" -#: wt-status.c:284 +#: wt-status.c:288 msgid "typechange:" msgstr "изменен тип:" -#: wt-status.c:286 +#: wt-status.c:290 msgid "unknown:" msgstr "неизвестно:" -#: wt-status.c:288 +#: wt-status.c:292 msgid "unmerged:" msgstr "не слитые:" -#: wt-status.c:370 +#: wt-status.c:372 msgid "new commits, " msgstr "новые коммиты, " -#: wt-status.c:372 +#: wt-status.c:374 msgid "modified content, " msgstr "изменено содержимое, " -#: wt-status.c:374 +#: wt-status.c:376 msgid "untracked content, " msgstr "неотслеживаемое содержимое, " -#: wt-status.c:824 +#: wt-status.c:853 #, c-format msgid "Your stash currently has %d entry" msgid_plural "Your stash currently has %d entries" @@ -4109,69 +5862,69 @@ msgstr[1] "У вас сейчас спрятаны %d записи" msgstr[2] "У вас сейчас спрятано %d записей" msgstr[3] "У вас сейчас спрятаны %d записи" -#: wt-status.c:856 +#: wt-status.c:885 msgid "Submodules changed but not updated:" msgstr "Измененные, но не обновленные подмодули:" -#: wt-status.c:858 +#: wt-status.c:887 msgid "Submodule changes to be committed:" msgstr "Изменения в подмодулях, которые будут закоммичены:" -#: wt-status.c:940 +#: wt-status.c:969 msgid "" "Do not modify or remove the line above.\n" "Everything below it will be ignored." msgstr "Не изменяйте или удаляйте строку выше этой.\nВсё, что ниже — будет проигнорировано." -#: wt-status.c:1053 +#: wt-status.c:1084 msgid "You have unmerged paths." msgstr "У вас есть не слитые пути." -#: wt-status.c:1056 +#: wt-status.c:1087 msgid " (fix conflicts and run \"git commit\")" msgstr " (разрешите конфликты, затем запустите «git commit»)" -#: wt-status.c:1058 +#: wt-status.c:1089 msgid " (use \"git merge --abort\" to abort the merge)" msgstr " (используйте «git merge --abort», чтобы остановить операцию слияния)" -#: wt-status.c:1063 +#: wt-status.c:1094 msgid "All conflicts fixed but you are still merging." msgstr "Все конфликты исправлены, но вы все еще в процессе слияния." -#: wt-status.c:1066 +#: wt-status.c:1097 msgid " (use \"git commit\" to conclude merge)" msgstr " (используйте «git commit», чтобы завершить слияние)" -#: wt-status.c:1076 +#: wt-status.c:1107 msgid "You are in the middle of an am session." msgstr "Вы в процессе сессии am." -#: wt-status.c:1079 +#: wt-status.c:1110 msgid "The current patch is empty." msgstr "Текущий патч пустой." -#: wt-status.c:1083 +#: wt-status.c:1114 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (разрешите конфликты, затем запустите «git am --continue»)" -#: wt-status.c:1085 +#: wt-status.c:1116 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (используйте «git am --skip», чтобы пропустить этот патч)" -#: wt-status.c:1087 +#: wt-status.c:1118 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (используйте «git am --abort», чтобы восстановить оригинальную ветку)" -#: wt-status.c:1219 +#: wt-status.c:1250 msgid "git-rebase-todo is missing." msgstr "git-rebase-todo отсутствует." -#: wt-status.c:1221 +#: wt-status.c:1252 msgid "No commands done." msgstr "Команды не выполнены." -#: wt-status.c:1224 +#: wt-status.c:1255 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" @@ -4180,16 +5933,16 @@ msgstr[1] "Последняя команда выполнена (%d команд msgstr[2] "Последняя команда выполнена (%d команд выполнено):" msgstr[3] "Последняя команда выполнена (%d команд выполнено):" -#: wt-status.c:1235 +#: wt-status.c:1266 #, c-format msgid " (see more in file %s)" msgstr " (смотрите дополнительно в файле %s)" -#: wt-status.c:1240 +#: wt-status.c:1271 msgid "No commands remaining." msgstr "Команд больше не осталось." -#: wt-status.c:1243 +#: wt-status.c:1274 #, c-format msgid "Next command to do (%d remaining command):" msgid_plural "Next commands to do (%d remaining commands):" @@ -4198,154 +5951,154 @@ msgstr[1] "Следующая команда для выполнения (%d к msgstr[2] "Следующая команда для выполнения (%d команд осталось):" msgstr[3] "Следующая команда для выполнения (%d команд осталось):" -#: wt-status.c:1251 +#: wt-status.c:1282 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr " (используйте «git rebase --edit-todo», чтобы просмотреть и изменить)" -#: wt-status.c:1264 +#: wt-status.c:1295 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "Вы сейчас перемещаете ветку «%s» над «%s»." -#: wt-status.c:1269 +#: wt-status.c:1300 msgid "You are currently rebasing." msgstr "Вы сейчас перемещаете ветку." -#: wt-status.c:1283 +#: wt-status.c:1314 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (разрешите конфликты, затем запустите «git rebase --continue»)" -#: wt-status.c:1285 +#: wt-status.c:1316 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (используйте «git rebase --skip», чтобы пропустить этот патч)" -#: wt-status.c:1287 +#: wt-status.c:1318 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " (используйте «git rebase --abort», чтобы перейти на оригинальную ветку)" -#: wt-status.c:1293 +#: wt-status.c:1324 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (все конфликты разрешены: запустите «git rebase --continue»)" -#: wt-status.c:1297 +#: wt-status.c:1328 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "Вы сейчас разделяете коммит при перемещении ветки «%s» над «%s»." -#: wt-status.c:1302 +#: wt-status.c:1333 msgid "You are currently splitting a commit during a rebase." msgstr "Вы сейчас разделяете коммит при перемещении ветки." -#: wt-status.c:1305 +#: wt-status.c:1336 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "(Как только ваш рабочий каталог будет чистый, запустите «git rebase --continue»)" -#: wt-status.c:1309 +#: wt-status.c:1340 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "Вы сейчас редактируете коммит при перемещении ветки «%s» над «%s»." -#: wt-status.c:1314 +#: wt-status.c:1345 msgid "You are currently editing a commit during a rebase." msgstr "Вы сейчас редактируете коммит при перемещении ветки." -#: wt-status.c:1317 +#: wt-status.c:1348 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " (используйте «git commit --amend», чтобы исправить текущий коммит)" -#: wt-status.c:1319 +#: wt-status.c:1350 msgid " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr " (используйте «git rebase --continue», когда будете довольны изменениями)" -#: wt-status.c:1329 +#: wt-status.c:1360 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "Вы копируете коммит %s." -#: wt-status.c:1334 +#: wt-status.c:1365 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (разрешите конфликты, затем запустите «git cherry-pick --continue»)" -#: wt-status.c:1337 +#: wt-status.c:1368 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr " (все конфликты разрешены: запустите «git cherry-pick --continue»)" -#: wt-status.c:1339 +#: wt-status.c:1370 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr " (используйте «git cherry-pick --abort», чтобы отменить копирования коммита)" -#: wt-status.c:1348 +#: wt-status.c:1379 #, c-format msgid "You are currently reverting commit %s." msgstr "Вы сейчас обращаете изменения коммита %s." -#: wt-status.c:1353 +#: wt-status.c:1384 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (разрешите конфликты, затем запустите «git revert --continue»)" -#: wt-status.c:1356 +#: wt-status.c:1387 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (все конфликты разрешены: запустите «git revert --continue»)" -#: wt-status.c:1358 +#: wt-status.c:1389 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " (используйте «git revert --abort», чтобы отменить операцию обращения изменений коммита)" -#: wt-status.c:1369 +#: wt-status.c:1400 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "Вы сейчас в процессе двоичного поиска, начатого с ветки «%s»." -#: wt-status.c:1373 +#: wt-status.c:1404 msgid "You are currently bisecting." msgstr "Вы сейчас в процессе двоичного поиска." -#: wt-status.c:1376 +#: wt-status.c:1407 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " (используйте «git bisect reset», чтобы вернуться на исходную ветку)" -#: wt-status.c:1573 +#: wt-status.c:1604 msgid "On branch " msgstr "На ветке " -#: wt-status.c:1579 +#: wt-status.c:1610 msgid "interactive rebase in progress; onto " msgstr "интерактивное перемещение в процессе; над " -#: wt-status.c:1581 +#: wt-status.c:1612 msgid "rebase in progress; onto " msgstr "перемещение в процессе; над " -#: wt-status.c:1586 +#: wt-status.c:1617 msgid "HEAD detached at " msgstr "HEAD отделён на " -#: wt-status.c:1588 +#: wt-status.c:1619 msgid "HEAD detached from " msgstr "HEAD отделён начиная с " -#: wt-status.c:1591 +#: wt-status.c:1622 msgid "Not currently on any branch." msgstr "Сейчас ни на одной из веток" -#: wt-status.c:1611 +#: wt-status.c:1642 msgid "Initial commit" msgstr "Начальный коммит" -#: wt-status.c:1612 +#: wt-status.c:1643 msgid "No commits yet" msgstr "Еще нет коммитов" -#: wt-status.c:1626 +#: wt-status.c:1657 msgid "Untracked files" msgstr "Неотслеживаемые файлы" -#: wt-status.c:1628 +#: wt-status.c:1659 msgid "Ignored files" msgstr "Игнорируемые файлы" -#: wt-status.c:1632 +#: wt-status.c:1663 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -4353,93 +6106,97 @@ msgid "" "new files yourself (see 'git help status')." msgstr "%.2f секунды занял вывод списка неотслеживаемых файлов. «status -uno» возможно может ускорить это, но будьте внимательны, и не забудьте добавить новые файлы вручную (смотрите «git help status» для подробностей)." -#: wt-status.c:1638 +#: wt-status.c:1669 #, c-format msgid "Untracked files not listed%s" msgstr "Неотслеживаемые файлы не показаны%s" -#: wt-status.c:1640 +#: wt-status.c:1671 msgid " (use -u option to show untracked files)" msgstr "(используйте опцию «-u», чтобы показать неотслеживаемые файлы)" -#: wt-status.c:1646 +#: wt-status.c:1677 msgid "No changes" msgstr "Нет изменений" -#: wt-status.c:1651 +#: wt-status.c:1682 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "нет изменений добавленных для коммита\n(используйте «git add» и/или «git commit -a»)\n" -#: wt-status.c:1654 +#: wt-status.c:1685 #, c-format msgid "no changes added to commit\n" msgstr "нет изменений добавленных для коммита\n" -#: wt-status.c:1657 +#: wt-status.c:1688 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " "track)\n" msgstr "ничего не добавлено в коммит, но есть неотслеживаемые файлы (используйте «git add», чтобы отслеживать их)\n" -#: wt-status.c:1660 +#: wt-status.c:1691 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "ничего не добавлено в коммит, но есть неотслеживаемые файлы\n" -#: wt-status.c:1663 +#: wt-status.c:1694 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "нечего коммитить (создайте/скопируйте файлы, затем запустите «git add», чтобы отслеживать их)\n" -#: wt-status.c:1666 wt-status.c:1671 +#: wt-status.c:1697 wt-status.c:1702 #, c-format msgid "nothing to commit\n" msgstr "нечего коммитить\n" -#: wt-status.c:1669 +#: wt-status.c:1700 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "нечего коммитить (используйте опцию «-u», чтобы показать неотслеживаемые файлы)\n" -#: wt-status.c:1673 +#: wt-status.c:1704 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "нечего коммитить, нет изменений в рабочем каталоге\n" -#: wt-status.c:1785 +#: wt-status.c:1817 msgid "No commits yet on " msgstr "Еще нет коммитов в" -#: wt-status.c:1789 +#: wt-status.c:1821 msgid "HEAD (no branch)" msgstr "HEAD (нет ветки)" -#: wt-status.c:1818 wt-status.c:1826 +#: wt-status.c:1852 +msgid "different" +msgstr "отличается" + +#: wt-status.c:1854 wt-status.c:1862 msgid "behind " msgstr "позади" -#: wt-status.c:1821 wt-status.c:1824 +#: wt-status.c:1857 wt-status.c:1860 msgid "ahead " msgstr "впереди " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2318 +#: wt-status.c:2376 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "не удалось выполнить %s: У вас есть непроиндексированные изменения." -#: wt-status.c:2324 +#: wt-status.c:2382 msgid "additionally, your index contains uncommitted changes." msgstr "к тому же, в вашем индексе есть незакоммиченные изменения." -#: wt-status.c:2326 +#: wt-status.c:2384 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "не удалось выполнить %s: В вашем индексе есть незакоммиченные изменения." -#: compat/precompose_utf8.c:58 builtin/clone.c:437 +#: compat/precompose_utf8.c:58 builtin/clone.c:443 #, c-format msgid "failed to unlink '%s'" msgstr "сбой отсоединения «%s»" @@ -4453,7 +6210,7 @@ msgstr "git add [<опции>] [--] <спецификатор-пути>…" msgid "unexpected diff status %c" msgstr "неожиданный статус различий %c" -#: builtin/add.c:88 builtin/commit.c:291 +#: builtin/add.c:88 builtin/commit.c:279 msgid "updating files failed" msgstr "сбой при обновлении файлов" @@ -4466,7 +6223,7 @@ msgstr "удалить «%s»\n" msgid "Unstaged changes after refreshing the index:" msgstr "Непроиндексированные изменения после обновления индекса:" -#: builtin/add.c:233 builtin/rev-parse.c:888 +#: builtin/add.c:233 builtin/rev-parse.c:893 msgid "Could not read the index" msgstr "Не удалось прочитать индекс" @@ -4497,77 +6254,73 @@ msgstr "Пустой патч. Операция прервана." msgid "Could not apply '%s'" msgstr "Не удалось применить «%s»" -#: builtin/add.c:271 +#: builtin/add.c:269 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "Следующие пути игнорируются одним из ваших файлов .gitignore:\n" -#: builtin/add.c:291 builtin/clean.c:911 builtin/fetch.c:133 builtin/mv.c:124 -#: builtin/prune-packed.c:55 builtin/pull.c:207 builtin/push.c:541 -#: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164 +#: builtin/add.c:289 builtin/clean.c:906 builtin/fetch.c:134 builtin/mv.c:123 +#: builtin/prune-packed.c:56 builtin/pull.c:212 builtin/push.c:557 +#: builtin/remote.c:1344 builtin/rm.c:240 builtin/send-pack.c:165 msgid "dry run" msgstr "пробный запуск" -#: builtin/add.c:294 +#: builtin/add.c:292 msgid "interactive picking" msgstr "интерактивный выбор" -#: builtin/add.c:295 builtin/checkout.c:1137 builtin/reset.c:310 +#: builtin/add.c:293 builtin/checkout.c:1144 builtin/reset.c:302 msgid "select hunks interactively" msgstr "интерактивный выбор блоков" -#: builtin/add.c:296 +#: builtin/add.c:294 msgid "edit current diff and apply" msgstr "отредактировать текущий файл различий и применить его" -#: builtin/add.c:297 +#: builtin/add.c:295 msgid "allow adding otherwise ignored files" msgstr "разрешить добавление игнорируемых иначе файлов" -#: builtin/add.c:298 +#: builtin/add.c:296 msgid "update tracked files" msgstr "обновить отслеживаемые файлы" -#: builtin/add.c:299 +#: builtin/add.c:297 msgid "renormalize EOL of tracked files (implies -u)" msgstr "перенормализировать концы строк (EOL) отслеживаемых файлов (подразумевает -u)" -#: builtin/add.c:300 +#: builtin/add.c:298 msgid "record only the fact that the path will be added later" msgstr "записать только факт, что путь будет добавлен позже" -#: builtin/add.c:301 +#: builtin/add.c:299 msgid "add changes from all tracked and untracked files" msgstr "добавить изменения из всех отслеживаемых и неотслеживаемых файлов" -#: builtin/add.c:304 +#: builtin/add.c:302 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "игнорировать пути удаленные из рабочего каталога (тоже, что и --no-all)" -#: builtin/add.c:306 +#: builtin/add.c:304 msgid "don't add, only refresh the index" msgstr "не добавлять, только обновить индекс" -#: builtin/add.c:307 +#: builtin/add.c:305 msgid "just skip files which cannot be added because of errors" msgstr "пропускать файлы, которые не могут быть добавлены из-за ошибок" -#: builtin/add.c:308 +#: builtin/add.c:306 msgid "check if - even missing - files are ignored in dry run" msgstr "удостовериться, что даже недостающие файлы будут проигнорированы при пробном запуске" -#: builtin/add.c:309 builtin/update-index.c:964 -msgid "(+/-)x" -msgstr "(+/-)x" - -#: builtin/add.c:309 builtin/update-index.c:965 +#: builtin/add.c:308 builtin/update-index.c:973 msgid "override the executable bit of the listed files" msgstr "переопределить бит выполнения на указанных файлах" -#: builtin/add.c:311 +#: builtin/add.c:310 msgid "warn when adding an embedded repository" msgstr "предупреждать при добавлении встроенного git репозитория" -#: builtin/add.c:326 +#: builtin/add.c:325 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -4585,17 +6338,17 @@ msgid "" "See \"git help submodule\" for more information." msgstr "Вы добавили другой репозиторий git внутри текущего репозитория\nКлоны внешнего репозитория не будут содержать внутренний\nрепозиторий и не будут знать как его получить.\nЕсли вы хотели добавить подмодуль, то запустите:\n\n\tgit submodule add <url> %s\n\nЕсли бы добавили этот путь по ошибке, то вы можете удалить его\nиз индекса с помощью:\n\n\tgit rm --cached %s\n\nДля дополнительной информации смотрите «git help submodule»." -#: builtin/add.c:354 +#: builtin/add.c:353 #, c-format msgid "adding embedded git repository: %s" msgstr "добавление встроенного git репозитория: %s" -#: builtin/add.c:372 +#: builtin/add.c:371 #, c-format 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 "ошибка при добавлении файлов" @@ -4622,362 +6375,360 @@ msgstr "Ничего не указано, ничего не добавлено.\ msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Возможно, вы имели в виду «git add .»?\n" -#: builtin/add.c:449 builtin/check-ignore.c:176 builtin/checkout.c:281 -#: builtin/checkout.c:484 builtin/clean.c:958 builtin/commit.c:350 -#: builtin/diff-tree.c:114 builtin/mv.c:143 builtin/reset.c:249 -#: builtin/rm.c:271 builtin/submodule--helper.c:311 +#: builtin/add.c:449 builtin/check-ignore.c:177 builtin/checkout.c:282 +#: builtin/checkout.c:485 builtin/clean.c:953 builtin/commit.c:338 +#: builtin/diff-tree.c:115 builtin/grep.c:492 builtin/mv.c:144 +#: builtin/reset.c:241 builtin/rm.c:270 builtin/submodule--helper.c:329 msgid "index file corrupt" msgstr "файл индекса поврежден" -#: builtin/am.c:414 +#: builtin/am.c:415 msgid "could not parse author script" msgstr "не удалось разобрать сценарий авторства" -#: builtin/am.c:498 +#: builtin/am.c:499 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "«%s» был удален перехватчиком applypatch-msg" -#: builtin/am.c:539 +#: builtin/am.c:540 #, c-format msgid "Malformed input line: '%s'." msgstr "Неправильная строка ввода: «%s»." -#: builtin/am.c:576 +#: builtin/am.c:577 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "Не удалось скопировать заметку из «%s» в «%s»" -#: builtin/am.c:602 +#: builtin/am.c:603 msgid "fseek failed" msgstr "сбой при выполнении fseek" -#: builtin/am.c:790 +#: builtin/am.c:791 #, c-format msgid "could not parse patch '%s'" msgstr "не удалось разобрать патч «%s»" -#: builtin/am.c:855 +#: builtin/am.c:856 msgid "Only one StGIT patch series can be applied at once" msgstr "Только серия патчей StGIT может быть применена за раз" -#: builtin/am.c:903 +#: builtin/am.c:904 msgid "invalid timestamp" msgstr "недопустимая метка даты/времени" -#: builtin/am.c:908 builtin/am.c:920 +#: builtin/am.c:909 builtin/am.c:921 msgid "invalid Date line" msgstr "недопустимая строка даты" -#: builtin/am.c:915 +#: builtin/am.c:916 msgid "invalid timezone offset" msgstr "недопустимое смещение часового пояса" -#: builtin/am.c:1008 +#: builtin/am.c:1009 msgid "Patch format detection failed." msgstr "Сбой определения формата патча." -#: builtin/am.c:1013 builtin/clone.c:402 +#: builtin/am.c:1014 builtin/clone.c:408 #, c-format msgid "failed to create directory '%s'" msgstr "не удалось создать каталог «%s»" -#: builtin/am.c:1017 +#: builtin/am.c:1019 msgid "Failed to split patches." msgstr "Не удалось разделить патчи на части." -#: builtin/am.c:1146 builtin/commit.c:376 +#: builtin/am.c:1149 builtin/commit.c:364 msgid "unable to write index file" msgstr "не удалось записать индекс" -#: builtin/am.c:1160 +#: builtin/am.c:1163 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "Когда вы устраните эту проблему, запустите «%s --continue»." -#: builtin/am.c:1161 +#: builtin/am.c:1164 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "Если вы хотите пропустить этот патч, то запустите «%s --skip»." -#: builtin/am.c:1162 +#: builtin/am.c:1165 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "Чтобы вернуться на предыдущую ветку и остановить применение изменений, запустите «%s --abort»." -#: builtin/am.c:1269 +#: builtin/am.c:1272 msgid "Patch is empty." msgstr "Патч пустой." -#: builtin/am.c:1335 +#: builtin/am.c:1338 #, c-format msgid "invalid ident line: %.*s" msgstr "неправильная строка идентификации: %.*s" -#: builtin/am.c:1357 +#: builtin/am.c:1360 #, c-format msgid "unable to parse commit %s" msgstr "не удалось разобрать коммит %s" -#: builtin/am.c:1550 +#: builtin/am.c:1556 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "В репозитории отсутствуют двоичные объекты, необходимые для отката к трехходовому слиянию." -#: builtin/am.c:1552 +#: builtin/am.c:1558 msgid "Using index info to reconstruct a base tree..." msgstr "Использую индекс для реконструкции базового дерева…" -#: builtin/am.c:1571 +#: builtin/am.c:1577 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." msgstr "Вы вручную изменяли патч?\nОн не накладывается без ошибок на двоичные объекты, записанные в его заголовке." -#: builtin/am.c:1577 +#: builtin/am.c:1583 msgid "Falling back to patching base and 3-way merge..." msgstr "Откат к применению изменений к базовому коммиту с помощью трехходового слияния…" -#: builtin/am.c:1602 +#: builtin/am.c:1608 msgid "Failed to merge in the changes." msgstr "Не удалось слить изменения." -#: builtin/am.c:1626 builtin/merge.c:642 -msgid "git write-tree failed to write a tree" -msgstr "git write-tree не удалось записать дерево" - -#: builtin/am.c:1633 +#: builtin/am.c:1640 msgid "applying to an empty history" msgstr "применение к пустой истории" -#: builtin/am.c:1646 builtin/commit.c:1798 builtin/merge.c:825 -#: builtin/merge.c:850 -msgid "failed to write commit object" -msgstr "сбой записи объекта коммита" - -#: builtin/am.c:1679 builtin/am.c:1683 +#: builtin/am.c:1686 builtin/am.c:1690 #, c-format msgid "cannot resume: %s does not exist." msgstr "нельзя продолжнить: %s не существует " -#: builtin/am.c:1699 +#: builtin/am.c:1706 msgid "cannot be interactive without stdin connected to a terminal." msgstr "не удалось использовать интерактивное поведение, без stdin подключенного к терминалу." -#: builtin/am.c:1704 +#: builtin/am.c:1711 msgid "Commit Body is:" msgstr "Тело коммита:" #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] #. in your translation. The program will only accept English #. input at this point. -#: builtin/am.c:1714 +#: builtin/am.c:1721 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "Применить? [y] - да/[n] - нет/[e] - редактировать/[v] - просмотреть патч/[a] - применить всё: " -#: builtin/am.c:1764 +#: builtin/am.c:1771 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Индекс не пустой: нельзя применять патчи (в индексе: %s)" -#: builtin/am.c:1804 builtin/am.c:1876 +#: builtin/am.c:1811 builtin/am.c:1879 #, c-format msgid "Applying: %.*s" msgstr "Применение: %.*s" -#: builtin/am.c:1820 +#: builtin/am.c:1828 msgid "No changes -- Patch already applied." msgstr "Нет изменений — Патч уже применен." -#: builtin/am.c:1828 +#: builtin/am.c:1834 #, c-format msgid "Patch failed at %s %.*s" msgstr "Ошибка применения изменений на %s %.*s" -#: builtin/am.c:1834 -#, c-format -msgid "The copy of the patch that failed is found in: %s" -msgstr "Копию изменений, которые не удалось применить, вы можете найти в: %s" +#: builtin/am.c:1838 +msgid "Use 'git am --show-current-patch' to see the failed patch" +msgstr "" -#: builtin/am.c:1879 +#: builtin/am.c:1882 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" "already introduced the same changes; you might want to skip this patch." msgstr "Нет изменений — возможно, вы забыли вызвать «git add»?\nЕсли ничего не осталось для индексации, то, скорее всего, что-то другое уже сделало те же изменения; возможно, вам следует пропустить этот патч." -#: builtin/am.c:1886 +#: builtin/am.c:1889 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as such.\n" "You might run `git rm` on a file to accept \"deleted by them\" for it." msgstr "У вас есть не слитые пути в индексе.\nВы должны выполнить «git add» для каждого файла с разрешенными конфликтами, чтобы пометить их таковыми.\nВы можете запустить «git rm» с именем файла, чтобы пометить его как «удалено ими»." -#: builtin/am.c:1993 builtin/am.c:1997 builtin/am.c:2009 builtin/reset.c:332 -#: builtin/reset.c:340 +#: builtin/am.c:1996 builtin/am.c:2000 builtin/am.c:2012 builtin/reset.c:324 +#: builtin/reset.c:332 #, c-format msgid "Could not parse object '%s'." msgstr "Не удалось разобрать объект «%s»." -#: builtin/am.c:2045 +#: builtin/am.c:2048 msgid "failed to clean index" msgstr "не удалось очистить индекс" -#: builtin/am.c:2080 +#: builtin/am.c:2083 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" msgstr "Похоже, что вы переместили HEAD с момента последней ошибки выполнения «am».\nПеремотка на ORIG_HEAD не выполняется" -#: builtin/am.c:2143 +#: builtin/am.c:2174 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Неправильное значение для --patch-format: %s" -#: builtin/am.c:2176 +#: builtin/am.c:2210 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<опции>] [(<mbox> | <Maildir>)…]" -#: builtin/am.c:2177 +#: builtin/am.c:2211 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<опции>] (--continue | --skip | --abort)" -#: builtin/am.c:2183 +#: builtin/am.c:2217 msgid "run interactively" msgstr "запустить в интерактивном режиме" -#: builtin/am.c:2185 +#: builtin/am.c:2219 msgid "historical option -- no-op" msgstr "историческая опция — ничего не делает" -#: builtin/am.c:2187 +#: builtin/am.c:2221 msgid "allow fall back on 3way merging if needed" msgstr "разрешить откатиться к трехходовому слиянию, если нужно" -#: builtin/am.c:2188 builtin/init-db.c:484 builtin/prune-packed.c:57 -#: builtin/repack.c:180 +#: builtin/am.c:2222 builtin/init-db.c:485 builtin/prune-packed.c:58 +#: builtin/repack.c:299 msgid "be quiet" msgstr "тихий режим" -#: builtin/am.c:2190 +#: builtin/am.c:2224 msgid "add a Signed-off-by line to the commit message" msgstr "добавить строку Signed-off-by к сообщению коммита" -#: builtin/am.c:2193 +#: builtin/am.c:2227 msgid "recode into utf8 (default)" msgstr "перекодировать в utf8 (по умолчанию)" -#: builtin/am.c:2195 +#: builtin/am.c:2229 msgid "pass -k flag to git-mailinfo" msgstr "передать флаг -k в git-mailinfo" -#: builtin/am.c:2197 +#: builtin/am.c:2231 msgid "pass -b flag to git-mailinfo" msgstr "передать флаг -b в git-mailinfo" -#: builtin/am.c:2199 +#: builtin/am.c:2233 msgid "pass -m flag to git-mailinfo" msgstr "передать флаг -m в git-mailinfo" -#: builtin/am.c:2201 +#: builtin/am.c:2235 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "передать флаг --keep-cr в git-mailsplit для формата mbox" -#: builtin/am.c:2204 +#: builtin/am.c:2238 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "не передавать --keep-cr флаг в git-mailsplit вне зависимости от am.keepcr" -#: builtin/am.c:2207 +#: builtin/am.c:2241 msgid "strip everything before a scissors line" msgstr "обрезать все до строки обрезки" -#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218 -#: builtin/am.c:2221 builtin/am.c:2224 builtin/am.c:2227 builtin/am.c:2230 -#: builtin/am.c:2236 +#: builtin/am.c:2243 builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 +#: builtin/am.c:2255 builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 +#: builtin/am.c:2270 msgid "pass it through git-apply" msgstr "передать его в git-apply" -#: builtin/am.c:2226 builtin/fmt-merge-msg.c:665 builtin/fmt-merge-msg.c:668 -#: builtin/grep.c:845 builtin/merge.c:205 builtin/pull.c:145 -#: builtin/pull.c:203 builtin/repack.c:189 builtin/repack.c:193 -#: builtin/repack.c:195 builtin/show-branch.c:631 builtin/show-ref.c:169 -#: builtin/tag.c:377 parse-options.h:132 parse-options.h:134 -#: parse-options.h:245 +#: builtin/am.c:2260 builtin/commit.c:1332 builtin/fmt-merge-msg.c:670 +#: builtin/fmt-merge-msg.c:673 builtin/grep.c:857 builtin/merge.c:237 +#: builtin/pull.c:150 builtin/pull.c:208 builtin/repack.c:308 +#: builtin/repack.c:312 builtin/repack.c:314 builtin/show-branch.c:650 +#: builtin/show-ref.c:170 builtin/tag.c:384 parse-options.h:144 +#: parse-options.h:146 parse-options.h:258 msgid "n" msgstr "n" -#: builtin/am.c:2232 builtin/branch.c:629 builtin/for-each-ref.c:38 -#: builtin/replace.c:444 builtin/tag.c:412 builtin/verify-tag.c:39 +#: builtin/am.c:2266 builtin/branch.c:643 builtin/for-each-ref.c:38 +#: builtin/replace.c:543 builtin/tag.c:420 builtin/verify-tag.c:39 msgid "format" msgstr "формат" -#: builtin/am.c:2233 +#: builtin/am.c:2267 msgid "format the patch(es) are in" msgstr "формат, в котором находятся патчи" -#: builtin/am.c:2239 +#: builtin/am.c:2273 msgid "override error message when patch failure occurs" msgstr "переопределить сообщение об ошибке, если не удалось наложить изменения" -#: builtin/am.c:2241 +#: builtin/am.c:2275 msgid "continue applying patches after resolving a conflict" msgstr "продолжить применение изменений после разрешения конфиликта" -#: builtin/am.c:2244 +#: builtin/am.c:2278 msgid "synonyms for --continue" msgstr "синоним для --continue" -#: builtin/am.c:2247 +#: builtin/am.c:2281 msgid "skip the current patch" msgstr "пропустить текущий патч" -#: builtin/am.c:2250 +#: builtin/am.c:2284 msgid "restore the original branch and abort the patching operation." msgstr "восстановить оригинальную ветку и отменить операцию применения изменений." -#: builtin/am.c:2254 +#: builtin/am.c:2287 +msgid "abort the patching operation but keep HEAD where it is." +msgstr "" + +#: builtin/am.c:2290 +msgid "show the patch being applied." +msgstr "" + +#: builtin/am.c:2294 msgid "lie about committer date" msgstr "соврать о дате коммитера" -#: builtin/am.c:2256 +#: builtin/am.c:2296 msgid "use current timestamp for author date" msgstr "использовать текущее время как время авторства" -#: builtin/am.c:2258 builtin/commit.c:1636 builtin/merge.c:236 -#: builtin/pull.c:178 builtin/revert.c:112 builtin/tag.c:392 +#: builtin/am.c:2298 builtin/commit.c:1468 builtin/merge.c:271 +#: builtin/pull.c:183 builtin/revert.c:113 builtin/tag.c:400 msgid "key-id" msgstr "key-id" -#: builtin/am.c:2259 +#: builtin/am.c:2299 msgid "GPG-sign commits" msgstr "подписать коммиты с помощью GPG" -#: builtin/am.c:2262 +#: builtin/am.c:2302 msgid "(internal use for git-rebase)" msgstr "(внутреннее использование для git-rebase)" -#: builtin/am.c:2280 +#: builtin/am.c:2320 msgid "" "The -b/--binary option has been a no-op for long time, and\n" "it will be removed. Please do not use it anymore." msgstr "Опция -b/--binary уже долгое время ничего не делает и будет удалена с следующих версиях Git. Пожалуйста, не используйте ее." -#: builtin/am.c:2287 +#: builtin/am.c:2327 msgid "failed to read the index" msgstr "сбой чтения индекса" -#: builtin/am.c:2302 +#: builtin/am.c:2342 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "предыдущий каталог перемещения %s еще существует, но передан mbox." -#: builtin/am.c:2326 +#: builtin/am.c:2366 #, c-format msgid "" "Stray %s directory found.\n" "Use \"git am --abort\" to remove it." msgstr "Найден забытый каталог %s.\nИспользуйте «git am --abort», чтобы удалить его." -#: builtin/am.c:2332 +#: builtin/am.c:2372 msgid "Resolve operation not in progress, we are not resuming." msgstr "Операция разрешения конфликтов не в процессе выполнения, не продолжаем." @@ -4999,8 +6750,8 @@ msgid "git archive: Remote with no URL" msgstr "git archive: внешний репозиторий без URL" #: builtin/archive.c:58 -msgid "git archive: expected ACK/NAK, got EOF" -msgstr "git archive: ожидался ACK/NAK, а получен EOF" +msgid "git archive: expected ACK/NAK, got a flush packet" +msgstr "git archive: ожидается ACK/NAK, получен пакет сброса буфера" #: builtin/archive.c:61 #, c-format @@ -5078,115 +6829,141 @@ msgstr "--write-terms требует указания двух параметр msgid "--bisect-clean-state requires no arguments" msgstr "--bisect-clean-state не требует указания параметров" -#: builtin/blame.c:27 +#: builtin/blame.c:31 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "git blame [<опции>] [<опции-редакции>] [<редакция>] [--] <файл>" -#: builtin/blame.c:32 +#: builtin/blame.c:36 msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "<опции-rev-list> документированы в git-rev-list(1)" -#: builtin/blame.c:668 +#: builtin/blame.c:406 +#, c-format +msgid "expecting a color: %s" +msgstr "ожидается цвет: %s" + +#: builtin/blame.c:413 +msgid "must end with a color" +msgstr "должно заканчиваться на цвет" + +#: builtin/blame.c:700 +#, c-format +msgid "invalid color '%s' in color.blame.repeatedLines" +msgstr "" + +#: builtin/blame.c:718 +msgid "invalid value for blame.coloring" +msgstr "" + +#: builtin/blame.c:789 msgid "Show blame entries as we find them, incrementally" msgstr "Показать записи авторства постепенно, в процессе нахождения" -#: builtin/blame.c:669 +#: builtin/blame.c:790 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "Не показывать SHA-1 для коммитов, не входящих в границы запроса (По умолчанию: отключено)" -#: builtin/blame.c:670 +#: builtin/blame.c:791 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "Не воспринимать корневые коммиты как граничные (По умолчанию: отключено)" -#: builtin/blame.c:671 +#: builtin/blame.c:792 msgid "Show work cost statistics" msgstr "Показать статистику расходов на выполнение запроса" -#: builtin/blame.c:672 +#: builtin/blame.c:793 msgid "Force progress reporting" msgstr "Принудительно выводить прогресс выполнения" -#: builtin/blame.c:673 +#: builtin/blame.c:794 msgid "Show output score for blame entries" msgstr "Показать оценку для записей авторства" -#: builtin/blame.c:674 +#: builtin/blame.c:795 msgid "Show original filename (Default: auto)" msgstr "Показать оригинальное имя файла (По умолчанию: автоматически)" -#: builtin/blame.c:675 +#: builtin/blame.c:796 msgid "Show original linenumber (Default: off)" msgstr "Показать оригинальные номера строк (По умолчанию: отключено)" -#: builtin/blame.c:676 +#: builtin/blame.c:797 msgid "Show in a format designed for machine consumption" msgstr "Показать в формате для программного разбора" -#: builtin/blame.c:677 +#: builtin/blame.c:798 msgid "Show porcelain format with per-line commit information" msgstr "Показать в машиночитаемом формате, с построчной информацией о коммите" -#: builtin/blame.c:678 +#: builtin/blame.c:799 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "Использовать такой же формат вывода, как и git-annotate (По умолчанию: отключено)" -#: builtin/blame.c:679 +#: builtin/blame.c:800 msgid "Show raw timestamp (Default: off)" msgstr "Показать необработанные временные метки (По умолчанию: отключено)" -#: builtin/blame.c:680 +#: builtin/blame.c:801 msgid "Show long commit SHA1 (Default: off)" msgstr "Показать длинный SHA1 идентификатор коммита (По умолчанию: отключено)" -#: builtin/blame.c:681 +#: builtin/blame.c:802 msgid "Suppress author name and timestamp (Default: off)" msgstr "Не показывать имя автора и временные метки (По умолчанию: отключено)" -#: builtin/blame.c:682 +#: builtin/blame.c:803 msgid "Show author email instead of name (Default: off)" msgstr "Показать почту автора вместо имени (По умолчанию: отключено)" -#: builtin/blame.c:683 +#: builtin/blame.c:804 msgid "Ignore whitespace differences" msgstr "Игнорировать различия в пробелах" -#: builtin/blame.c:690 +#: builtin/blame.c:805 +msgid "color redundant metadata from previous line differently" +msgstr "" + +#: builtin/blame.c:806 +msgid "color lines by age" +msgstr "" + +#: builtin/blame.c:813 msgid "Use an experimental heuristic to improve diffs" msgstr "Использовать эксперементальную эвристику, чтобы улучшить файлы различий" -#: builtin/blame.c:692 +#: builtin/blame.c:815 msgid "Spend extra cycles to find better match" msgstr "Потратить больше времени, для нахождения лучших совпадений" -#: builtin/blame.c:693 +#: builtin/blame.c:816 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "Использовать редакции из <файла> вместо вызова git-rev-list" -#: builtin/blame.c:694 +#: builtin/blame.c:817 msgid "Use <file>'s contents as the final image" msgstr "Использовать содержимое <файла> как финальный снимок" -#: builtin/blame.c:695 builtin/blame.c:696 +#: builtin/blame.c:818 builtin/blame.c:819 msgid "score" msgstr "мин-длина" -#: builtin/blame.c:695 +#: builtin/blame.c:818 msgid "Find line copies within and across files" msgstr "Найти копирование строк в пределах и между файлами" -#: builtin/blame.c:696 +#: builtin/blame.c:819 msgid "Find line movements within and across files" msgstr "Найти перемещения строк в пределах и между файлами" -#: builtin/blame.c:697 +#: builtin/blame.c:820 msgid "n,m" msgstr "начало,конец" -#: builtin/blame.c:697 +#: builtin/blame.c:820 msgid "Process only line range n,m, counting from 1" msgstr "Обработать только строки в диапазоне начало,конец, начиная с 1" -#: builtin/blame.c:744 +#: builtin/blame.c:869 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "--progress нельзя использовать одновременно с --incremental или машиночитаемым (porcelain) форматом" @@ -5197,11 +6974,11 @@ msgstr "--progress нельзя использовать одновременн #. among various forms of relative timestamps, but #. your language may need more or fewer display #. columns. -#: builtin/blame.c:795 +#: builtin/blame.c:920 msgid "4 years, 11 months ago" msgstr "4 года и 11 месяцев назад" -#: builtin/blame.c:882 +#: builtin/blame.c:1007 #, c-format msgid "file %s has only %lu line" msgid_plural "file %s has only %lu lines" @@ -5210,112 +6987,112 @@ msgstr[1] "файл %s содержит только %lu строки" msgstr[2] "файл %s содержит только %lu строк" msgstr[3] "файл %s содержит только %lu строки" -#: builtin/blame.c:928 +#: builtin/blame.c:1053 msgid "Blaming lines" msgstr "Просмотр авторов строк" -#: builtin/branch.c:27 +#: builtin/branch.c:28 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" msgstr "git branch [<опции>] [-r | -a] [--merged | --no-merged]" -#: builtin/branch.c:28 +#: builtin/branch.c:29 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" msgstr "git branch [<опции>] [-l] [-f] <имя-ветки> [<точка-начала>]" -#: builtin/branch.c:29 +#: builtin/branch.c:30 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." msgstr "git branch [<опции>] [-r] (-d | -D) <имя-ветки>…" -#: builtin/branch.c:30 +#: builtin/branch.c:31 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" msgstr "git branch [<опции>] (-m | -M) [<старая-ветка>] <новая-ветка>" -#: builtin/branch.c:31 +#: builtin/branch.c:32 msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>" msgstr "git branch [<опции>] (-c | -C) [<старая-ветка>] <новая-ветка>" -#: builtin/branch.c:32 +#: builtin/branch.c:33 msgid "git branch [<options>] [-r | -a] [--points-at]" msgstr "git branch [<опции>] [-r | -a] [--points-at]" -#: builtin/branch.c:33 +#: builtin/branch.c:34 msgid "git branch [<options>] [-r | -a] [--format]" msgstr "git branch [<опции>] [-r | -a] [--format]" -#: builtin/branch.c:146 +#: builtin/branch.c:143 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" " '%s', but not yet merged to HEAD." msgstr "удаление ветки «%s», которая была слита с\n «%s», но не слита с HEAD." -#: builtin/branch.c:150 +#: builtin/branch.c:147 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" " '%s', even though it is merged to HEAD." msgstr "не удаление ветки «%s», которая еще не слита с\n «%s», хотя уже слита с HEAD." -#: builtin/branch.c:164 +#: builtin/branch.c:161 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "Не удалось найти объект коммита для «%s»" -#: builtin/branch.c:168 +#: builtin/branch.c:165 #, c-format msgid "" "The branch '%s' is not fully merged.\n" "If you are sure you want to delete it, run 'git branch -D %s'." msgstr "Ветка «%s» не слита полностью.\nЕсли вы уверены, что хотите ее удалить, запустите «git branch -D %s»." -#: builtin/branch.c:181 +#: builtin/branch.c:178 msgid "Update of config-file failed" msgstr "Не удалось обновить файл конфигурации" -#: builtin/branch.c:212 +#: builtin/branch.c:209 msgid "cannot use -a with -d" msgstr "нельзя использовать одновременно ключи -a и -d" -#: builtin/branch.c:218 +#: builtin/branch.c:215 msgid "Couldn't look up commit object for HEAD" msgstr "Не удалось найти объект коммита для HEAD" -#: builtin/branch.c:232 +#: builtin/branch.c:229 #, c-format msgid "Cannot delete branch '%s' checked out at '%s'" msgstr "Нельзя удалить ветку «%s» т.к. она активна на «%s»" -#: builtin/branch.c:247 +#: builtin/branch.c:244 #, c-format msgid "remote-tracking branch '%s' not found." msgstr "внешняя отслеживаемая ветка «%s» не найдена." -#: builtin/branch.c:248 +#: builtin/branch.c:245 #, c-format msgid "branch '%s' not found." msgstr "ветка «%s» не найдена." -#: builtin/branch.c:263 +#: builtin/branch.c:260 #, c-format msgid "Error deleting remote-tracking branch '%s'" msgstr "Ошибка удаления внешней отслеживаемой ветки «%s»" -#: builtin/branch.c:264 +#: builtin/branch.c:261 #, c-format msgid "Error deleting branch '%s'" msgstr "Ошибка удаления ветки «%s»" -#: builtin/branch.c:271 +#: builtin/branch.c:268 #, c-format msgid "Deleted remote-tracking branch %s (was %s).\n" msgstr "Внешняя отслеживаемая ветка %s удалена (была %s).\n" -#: builtin/branch.c:272 +#: builtin/branch.c:269 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "Ветка %s удалена (была %s).\n" -#: builtin/branch.c:417 builtin/tag.c:58 +#: builtin/branch.c:413 builtin/tag.c:59 msgid "unable to parse format string" msgstr "не удалось разобрать строку формата" @@ -5381,217 +7158,223 @@ msgid "" "Lines starting with '%c' will be stripped.\n" msgstr "Измените описание для ветки:\n %s\nСтроки, начинающиеся с «%c» будут вырезаны.\n" -#: builtin/branch.c:586 +#: builtin/branch.c:594 msgid "Generic options" msgstr "Общие параметры" -#: builtin/branch.c:588 +#: builtin/branch.c:596 msgid "show hash and subject, give twice for upstream branch" msgstr "показывать хэш-сумму и тему, укажите дважды для вышестоящей ветки" -#: builtin/branch.c:589 +#: builtin/branch.c:597 msgid "suppress informational messages" msgstr "не выводить информационные сообщения" -#: builtin/branch.c:590 +#: builtin/branch.c:598 msgid "set up tracking mode (see git-pull(1))" msgstr "установить режим отслеживания вышестоящей ветки (см. git-pull(1))" -#: builtin/branch.c:592 +#: builtin/branch.c:600 msgid "do not use" msgstr "не используйте" -#: builtin/branch.c:594 +#: builtin/branch.c:602 msgid "upstream" msgstr "вышестоящая" -#: builtin/branch.c:594 +#: builtin/branch.c:602 msgid "change the upstream info" msgstr "изменить информацию о вышестоящей ветке" -#: builtin/branch.c:595 +#: builtin/branch.c:603 msgid "Unset the upstream info" msgstr "Убрать информацию о вышестоящей ветке" -#: builtin/branch.c:596 +#: builtin/branch.c:604 msgid "use colored output" msgstr "использовать цветной вывод" -#: builtin/branch.c:597 +#: builtin/branch.c:605 msgid "act on remote-tracking branches" msgstr "выполнить действия на отслеживаемых внешних ветках" -#: builtin/branch.c:599 builtin/branch.c:601 +#: builtin/branch.c:607 builtin/branch.c:609 msgid "print only branches that contain the commit" msgstr "вывод только веток, которые содержат коммит" -#: builtin/branch.c:600 builtin/branch.c:602 +#: builtin/branch.c:608 builtin/branch.c:610 msgid "print only branches that don't contain the commit" msgstr "вывод только веток, которые не содержат коммит" -#: builtin/branch.c:605 +#: builtin/branch.c:613 msgid "Specific git-branch actions:" msgstr "Специфичные для git-branch действия:" -#: builtin/branch.c:606 +#: builtin/branch.c:614 msgid "list both remote-tracking and local branches" msgstr "показать список и отслеживаемых и локальных веток" -#: builtin/branch.c:608 +#: builtin/branch.c:616 msgid "delete fully merged branch" msgstr "удалить полностью слитую ветку" -#: builtin/branch.c:609 +#: builtin/branch.c:617 msgid "delete branch (even if not merged)" msgstr "удалить ветку (даже никуда не слитую)" -#: builtin/branch.c:610 +#: builtin/branch.c:618 msgid "move/rename a branch and its reflog" msgstr "переместить/переименовать ветки и ее журнал ссылок" -#: builtin/branch.c:611 +#: builtin/branch.c:619 msgid "move/rename a branch, even if target exists" msgstr "переместить/переименовать ветку, даже если целевое имя уже существует" -#: builtin/branch.c:612 +#: builtin/branch.c:620 msgid "copy a branch and its reflog" msgstr "скопировать ветку и её журнал ссылок" -#: builtin/branch.c:613 +#: builtin/branch.c:621 msgid "copy a branch, even if target exists" msgstr "скопировать ветку, даже если целевое имя уже существует" -#: builtin/branch.c:614 +#: builtin/branch.c:622 msgid "list branch names" msgstr "показать список имен веток" -#: builtin/branch.c:615 +#: builtin/branch.c:623 msgid "create the branch's reflog" msgstr "создать журнал ссылок ветки" -#: builtin/branch.c:617 +#: builtin/branch.c:626 +msgid "deprecated synonym for --create-reflog" +msgstr "" + +#: builtin/branch.c:631 msgid "edit the description for the branch" msgstr "изменить описание ветки" -#: builtin/branch.c:618 +#: builtin/branch.c:632 msgid "force creation, move/rename, deletion" msgstr "принудительное создание, перемещение или удаление ветки" -#: builtin/branch.c:619 +#: builtin/branch.c:633 msgid "print only branches that are merged" msgstr "вывод только слитых веток" -#: builtin/branch.c:620 +#: builtin/branch.c:634 msgid "print only branches that are not merged" msgstr "вывод только не слитых веток" -#: builtin/branch.c:621 +#: builtin/branch.c:635 msgid "list branches in columns" msgstr "показать список веток по столбцам" -#: builtin/branch.c:622 builtin/for-each-ref.c:40 builtin/tag.c:405 +#: builtin/branch.c:636 builtin/for-each-ref.c:40 builtin/ls-remote.c:70 +#: builtin/tag.c:413 msgid "key" msgstr "ключ" -#: builtin/branch.c:623 builtin/for-each-ref.c:41 builtin/tag.c:406 +#: builtin/branch.c:637 builtin/for-each-ref.c:41 builtin/ls-remote.c:71 +#: builtin/tag.c:414 msgid "field name to sort on" msgstr "имя поля, по которому выполнить сортировку" -#: builtin/branch.c:625 builtin/for-each-ref.c:43 builtin/notes.c:408 -#: builtin/notes.c:411 builtin/notes.c:571 builtin/notes.c:574 -#: builtin/tag.c:408 +#: builtin/branch.c:639 builtin/for-each-ref.c:43 builtin/notes.c:410 +#: builtin/notes.c:413 builtin/notes.c:573 builtin/notes.c:576 +#: builtin/tag.c:416 msgid "object" msgstr "объект" -#: builtin/branch.c:626 +#: builtin/branch.c:640 msgid "print only branches of the object" msgstr "вывод только веток, определенного объекта" -#: builtin/branch.c:628 builtin/for-each-ref.c:49 builtin/tag.c:415 +#: builtin/branch.c:642 builtin/for-each-ref.c:49 builtin/tag.c:423 msgid "sorting and filtering are case insensitive" msgstr "сортировка и фильтрация не зависят от регистра" -#: builtin/branch.c:629 builtin/for-each-ref.c:38 builtin/tag.c:413 +#: builtin/branch.c:643 builtin/for-each-ref.c:38 builtin/tag.c:421 #: builtin/verify-tag.c:39 msgid "format to use for the output" msgstr "использовать формат для вывода" -#: builtin/branch.c:652 builtin/clone.c:730 +#: builtin/branch.c:666 builtin/clone.c:739 msgid "HEAD not found below refs/heads!" msgstr "HEAD не найден в refs/heads!" -#: builtin/branch.c:675 +#: builtin/branch.c:689 msgid "--column and --verbose are incompatible" msgstr "--column и --verbose нельзя использовать одновременно" -#: builtin/branch.c:690 builtin/branch.c:742 builtin/branch.c:751 +#: builtin/branch.c:709 builtin/branch.c:761 builtin/branch.c:770 msgid "branch name required" msgstr "требуется имя ветки" -#: builtin/branch.c:718 +#: builtin/branch.c:737 msgid "Cannot give description to detached HEAD" msgstr "Нельзя дать описание отделённому HEAD" -#: builtin/branch.c:723 +#: builtin/branch.c:742 msgid "cannot edit description of more than one branch" msgstr "нельзя изменить описание более одной ветки за раз" -#: builtin/branch.c:730 +#: builtin/branch.c:749 #, c-format msgid "No commit on branch '%s' yet." msgstr "Еще нет коммита на ветке «%s»." -#: builtin/branch.c:733 +#: builtin/branch.c:752 #, c-format msgid "No branch named '%s'." msgstr "Нет ветки с именем «%s»." -#: builtin/branch.c:748 +#: builtin/branch.c:767 msgid "too many branches for a copy operation" msgstr "слишком много веток для операции копирования" -#: builtin/branch.c:757 +#: builtin/branch.c:776 msgid "too many arguments for a rename operation" msgstr "слишком много аргументов для операции переименования" -#: builtin/branch.c:762 +#: builtin/branch.c:781 msgid "too many arguments to set new upstream" msgstr "слишком много аргументов для указания новой вышестоящей ветки" -#: builtin/branch.c:766 +#: builtin/branch.c:785 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." msgstr "невозможно установить вышестоящий репозиторий для HEAD на %s, так как он не указывает ни на одну ветку." -#: builtin/branch.c:769 builtin/branch.c:791 builtin/branch.c:807 +#: builtin/branch.c:788 builtin/branch.c:810 builtin/branch.c:826 #, c-format msgid "no such branch '%s'" msgstr "нет такой ветки «%s»" -#: builtin/branch.c:773 +#: builtin/branch.c:792 #, c-format msgid "branch '%s' does not exist" msgstr "ветка «%s» не существует" -#: builtin/branch.c:785 +#: builtin/branch.c:804 msgid "too many arguments to unset upstream" msgstr "слишком много аргументов для сброса указания вышестоящей ветки" -#: builtin/branch.c:789 +#: builtin/branch.c:808 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "невозможно убрать вышестоящий репозиторий для HEAD, так как он не указывает ни на одну ветку." -#: builtin/branch.c:795 +#: builtin/branch.c:814 #, c-format msgid "Branch '%s' has no upstream information" msgstr "Ветка «%s» не имеет информации о вышестоящей ветке" -#: builtin/branch.c:810 +#: builtin/branch.c:829 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "параметры -a и -r для «git branch» не имеют смысла с указанием имени ветки" -#: builtin/branch.c:813 +#: builtin/branch.c:832 msgid "" "the '--set-upstream' option is no longer supported. Please use '--track' or " "'--set-upstream-to' instead." @@ -5610,78 +7393,82 @@ msgstr "Требуется репозиторий для создания пак msgid "Need a repository to unbundle." msgstr "Требуется репозиторий для распаковки." -#: builtin/cat-file.c:521 +#: builtin/cat-file.c:577 msgid "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | " "-p | <type> | --textconv | --filters) [--path=<path>] <object>" msgstr "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -p | <тип> | --textconv | --filters) [--path=<путь>] <объект>" -#: builtin/cat-file.c:522 +#: builtin/cat-file.c:578 msgid "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | " "--filters]" msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --filters]" -#: builtin/cat-file.c:559 +#: builtin/cat-file.c:615 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<тип> может быть одним из: blob, tree, commit, tag" -#: builtin/cat-file.c:560 +#: builtin/cat-file.c:616 msgid "show object type" msgstr "показать тип объекта" -#: builtin/cat-file.c:561 +#: builtin/cat-file.c:617 msgid "show object size" msgstr "показать размер объекта" -#: builtin/cat-file.c:563 +#: builtin/cat-file.c:619 msgid "exit with zero when there's no error" msgstr "выйти с нулевым кодом возврата, если нет ошибки" -#: builtin/cat-file.c:564 +#: builtin/cat-file.c:620 msgid "pretty-print object's content" msgstr "структурированный вывод содержимого объекта" -#: builtin/cat-file.c:566 +#: builtin/cat-file.c:622 msgid "for blob objects, run textconv on object's content" msgstr "запустить texconv на содержимом двоичных объектов " -#: builtin/cat-file.c:568 +#: builtin/cat-file.c:624 msgid "for blob objects, run filters on object's content" msgstr "запуск фильтров на содержимом двоичных объектов " -#: builtin/cat-file.c:569 git-submodule.sh:931 +#: builtin/cat-file.c:625 git-submodule.sh:864 msgid "blob" msgstr "двоичный объект" -#: builtin/cat-file.c:570 +#: builtin/cat-file.c:626 msgid "use a specific path for --textconv/--filters" msgstr "использовать определенный путь для --textconv/--filters" -#: builtin/cat-file.c:572 +#: builtin/cat-file.c:628 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "разрешить -s и -t работать с повреждёнными объектами" -#: builtin/cat-file.c:573 +#: builtin/cat-file.c:629 msgid "buffer --batch output" msgstr "буфферировать вывод --batch" -#: builtin/cat-file.c:575 +#: builtin/cat-file.c:631 msgid "show info and content of objects fed from the standard input" msgstr "показать информацию и содержимое объектов, переданных из стандартного ввода" -#: builtin/cat-file.c:578 +#: builtin/cat-file.c:634 msgid "show info about objects fed from the standard input" msgstr "показать информацию об объектах, переданных из стандартного ввода" -#: builtin/cat-file.c:581 +#: builtin/cat-file.c:637 msgid "follow in-tree symlinks (used with --batch or --batch-check)" msgstr "переходить по символьным ссылкам внутри дерева (используется с опциями --batch и --batch-check)" -#: builtin/cat-file.c:583 +#: builtin/cat-file.c:639 msgid "show all objects with --batch or --batch-check" msgstr "показать все объекты с опциями --batch или --batch-check" +#: builtin/cat-file.c:641 +msgid "do not order --batch-all-objects output" +msgstr "" + #: builtin/check-attr.c:12 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." msgstr "git check-attr [-a | --all | <атрибут>…] [--] <путь>…" @@ -5698,7 +7485,7 @@ msgstr "вывести все атрибуты установленные для msgid "use .gitattributes only from the index" msgstr "использовать только .gitattributes из индекса" -#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:99 +#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:101 msgid "read file names from stdin" msgstr "прочитать имена файлов из стандартного ввода" @@ -5706,7 +7493,7 @@ msgstr "прочитать имена файлов из стандартного msgid "terminate input and output records by a NUL character" msgstr "окончание ввода и вывода записей по НУЛЕВОМУ символу" -#: builtin/check-ignore.c:20 builtin/checkout.c:1118 builtin/gc.c:358 +#: builtin/check-ignore.c:20 builtin/checkout.c:1120 builtin/gc.c:503 msgid "suppress progress reporting" msgstr "не выводить прогресс выполнения" @@ -5718,27 +7505,27 @@ msgstr "показать не совпадающие введенные пути msgid "ignore index when checking" msgstr "игнорировать индекс при проверке" -#: builtin/check-ignore.c:158 +#: builtin/check-ignore.c:159 msgid "cannot specify pathnames with --stdin" msgstr "нельзя указывать пути вместе с параметром --stdin" -#: builtin/check-ignore.c:161 +#: builtin/check-ignore.c:162 msgid "-z only makes sense with --stdin" msgstr "-z имеет смысл только вместе с параметром --stdin" -#: builtin/check-ignore.c:163 +#: builtin/check-ignore.c:164 msgid "no path specified" msgstr "не указан путь" -#: builtin/check-ignore.c:167 +#: builtin/check-ignore.c:168 msgid "--quiet is only valid with a single pathname" msgstr "--quiet можно использовать только при указании одного пути" -#: builtin/check-ignore.c:169 +#: builtin/check-ignore.c:170 msgid "cannot have both --quiet and --verbose" msgstr "нельзя использовать одновременно --quiet и --verbose" -#: builtin/check-ignore.c:172 +#: builtin/check-ignore.c:173 msgid "--non-matching is only valid with --verbose" msgstr "--non-matching можно использовать только вместе с --verbose" @@ -5796,9 +7583,9 @@ msgid "write the content to temporary files" msgstr "записать содержимое во временные файлы" #: builtin/checkout-index.c:173 builtin/column.c:31 -#: builtin/submodule--helper.c:866 builtin/submodule--helper.c:869 -#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1237 -#: builtin/worktree.c:552 +#: builtin/submodule--helper.c:1361 builtin/submodule--helper.c:1364 +#: builtin/submodule--helper.c:1372 builtin/submodule--helper.c:1736 +#: builtin/worktree.c:610 msgid "string" msgstr "строка" @@ -5810,113 +7597,113 @@ msgstr "добавить спереди <строку> при создании msgid "copy out the files from named stage" msgstr "копировать файлы из указанного индекса" -#: builtin/checkout.c:27 +#: builtin/checkout.c:29 msgid "git checkout [<options>] <branch>" msgstr "git checkout [<опции>] <ветка>" -#: builtin/checkout.c:28 +#: builtin/checkout.c:30 msgid "git checkout [<options>] [<branch>] -- <file>..." msgstr "git checkout [<опции>] [<ветка>] -- <файл>…" -#: builtin/checkout.c:136 builtin/checkout.c:169 +#: builtin/checkout.c:138 builtin/checkout.c:171 #, c-format msgid "path '%s' does not have our version" msgstr "путь «%s» не имеет нашей версии" -#: builtin/checkout.c:138 builtin/checkout.c:171 +#: builtin/checkout.c:140 builtin/checkout.c:173 #, c-format msgid "path '%s' does not have their version" msgstr "путь «%s» не имеет их версии" -#: builtin/checkout.c:154 +#: builtin/checkout.c:156 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "путь «%s» не имеет всех необходимых версий" -#: builtin/checkout.c:198 +#: builtin/checkout.c:200 #, c-format msgid "path '%s' does not have necessary versions" msgstr "путь «%s» не имеет необходимых версий" -#: builtin/checkout.c:215 +#: builtin/checkout.c:217 #, c-format msgid "path '%s': cannot merge" msgstr "путь «%s»: не удалось слить" -#: builtin/checkout.c:232 +#: builtin/checkout.c:233 #, c-format msgid "Unable to add merge result for '%s'" msgstr "Не удалось добавить результат слияния «%s»" -#: builtin/checkout.c:254 builtin/checkout.c:257 builtin/checkout.c:260 -#: builtin/checkout.c:263 +#: builtin/checkout.c:255 builtin/checkout.c:258 builtin/checkout.c:261 +#: builtin/checkout.c:264 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "«%s» нельзя использовать при обновлении путей" -#: builtin/checkout.c:266 builtin/checkout.c:269 +#: builtin/checkout.c:267 builtin/checkout.c:270 #, c-format msgid "'%s' cannot be used with %s" msgstr "«%s» нельзя использовать одновременно с %s" -#: builtin/checkout.c:272 +#: builtin/checkout.c:273 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "Нельзя обновлять пути и переключаться на ветку «%s» одновременно." -#: builtin/checkout.c:341 builtin/checkout.c:348 +#: builtin/checkout.c:342 builtin/checkout.c:349 #, c-format msgid "path '%s' is unmerged" msgstr "путь «%s» не слит" -#: builtin/checkout.c:506 +#: builtin/checkout.c:508 msgid "you need to resolve your current index first" msgstr "сначала нужно разрешить конфликты в вашем текущем индексе" -#: builtin/checkout.c:637 +#: builtin/checkout.c:645 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "Не удалось создать журнал ссылок для «%s»: %s\n" -#: builtin/checkout.c:678 +#: builtin/checkout.c:686 msgid "HEAD is now at" msgstr "HEAD сейчас на" -#: builtin/checkout.c:682 builtin/clone.c:684 +#: builtin/checkout.c:690 builtin/clone.c:692 msgid "unable to update HEAD" msgstr "не удалось обновить HEAD" -#: builtin/checkout.c:686 +#: builtin/checkout.c:694 #, c-format msgid "Reset branch '%s'\n" msgstr "Сброс ветки «%s»\n" -#: builtin/checkout.c:689 +#: builtin/checkout.c:697 #, c-format msgid "Already on '%s'\n" msgstr "Уже на «%s»\n" -#: builtin/checkout.c:693 +#: builtin/checkout.c:701 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Переключение и сброс ветки «%s»\n" -#: builtin/checkout.c:695 builtin/checkout.c:1051 +#: builtin/checkout.c:703 builtin/checkout.c:1052 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Переключено на новую ветку «%s»\n" -#: builtin/checkout.c:697 +#: builtin/checkout.c:705 #, c-format msgid "Switched to branch '%s'\n" msgstr "Переключено на ветку «%s»\n" -#: builtin/checkout.c:748 +#: builtin/checkout.c:756 #, c-format msgid " ... and %d more.\n" msgstr " … и еще %d.\n" -#: builtin/checkout.c:754 +#: builtin/checkout.c:762 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -5933,7 +7720,7 @@ msgstr[1] "Предупреждение: вы оставляете позади msgstr[2] "Предупреждение: вы оставляете позади %d коммитов не соединенные ни с одной из ваших веток:\n\n%s\n" msgstr[3] "Предупреждение: вы оставляете позади %d коммитов не соединенные ни с одной из ваших веток:\n\n%s\n" -#: builtin/checkout.c:773 +#: builtin/checkout.c:781 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -5952,15 +7739,15 @@ msgstr[1] "Если вы хотите сохранить их с помощью msgstr[2] "Если вы хотите сохранить их с помощью создания новой ветки, то сейчас самое время\nсделать это с помощью:\n\n git branch <имя-новой-ветки> %s\n" msgstr[3] "Если вы хотите сохранить их с помощью создания новой ветки, то сейчас самое время\nсделать это с помощью:\n\n git branch <имя-новой-ветки> %s\n" -#: builtin/checkout.c:814 +#: builtin/checkout.c:813 msgid "internal error in revision walk" msgstr "внутренняя ошибка при хождении по редакциям" -#: builtin/checkout.c:818 +#: builtin/checkout.c:817 msgid "Previous HEAD position was" msgstr "Предыдущая позиция HEAD была" -#: builtin/checkout.c:848 builtin/checkout.c:1046 +#: builtin/checkout.c:845 builtin/checkout.c:1047 msgid "You are on a branch yet to be born" msgstr "Вы находитесь на еще не созданной ветке" @@ -5969,179 +7756,196 @@ msgstr "Вы находитесь на еще не созданной ветке msgid "only one reference expected, %d given." msgstr "ожидается только одна ссылка, а передано %d." -#: builtin/checkout.c:992 builtin/worktree.c:247 +#: builtin/checkout.c:993 builtin/worktree.c:240 builtin/worktree.c:389 #, c-format msgid "invalid reference: %s" msgstr "неправильная ссылка: %s" -#: builtin/checkout.c:1021 +#: builtin/checkout.c:1022 #, c-format msgid "reference is not a tree: %s" msgstr "в дереве нет такой ссылки: %s" -#: builtin/checkout.c:1060 +#: builtin/checkout.c:1061 msgid "paths cannot be used with switching branches" msgstr "нельзя использовать пути при переключении веток" -#: builtin/checkout.c:1063 builtin/checkout.c:1067 +#: builtin/checkout.c:1064 builtin/checkout.c:1068 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "нельзя использовать «%s» при переключении веток" -#: builtin/checkout.c:1071 builtin/checkout.c:1074 builtin/checkout.c:1079 -#: builtin/checkout.c:1082 +#: builtin/checkout.c:1072 builtin/checkout.c:1075 builtin/checkout.c:1080 +#: builtin/checkout.c:1083 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "«%s» нельзя использовать одновременно с «%s»" -#: builtin/checkout.c:1087 +#: builtin/checkout.c:1088 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "Нельзя переключить ветку на не коммит «%s»" -#: builtin/checkout.c:1119 builtin/checkout.c:1121 builtin/clone.c:114 -#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:369 -#: builtin/worktree.c:371 +#: builtin/checkout.c:1121 builtin/checkout.c:1123 builtin/clone.c:119 +#: builtin/remote.c:168 builtin/remote.c:170 builtin/worktree.c:433 +#: builtin/worktree.c:435 msgid "branch" msgstr "ветка" -#: builtin/checkout.c:1120 +#: builtin/checkout.c:1122 msgid "create and checkout a new branch" msgstr "создать и переключиться на новую ветку" -#: builtin/checkout.c:1122 +#: builtin/checkout.c:1124 msgid "create/reset and checkout a branch" msgstr "создать/сбросить и перключиться на новую ветку" -#: builtin/checkout.c:1123 +#: builtin/checkout.c:1125 msgid "create reflog for new branch" msgstr "создать журнал ссылок для новой ветки" -#: builtin/checkout.c:1124 builtin/worktree.c:373 +#: builtin/checkout.c:1126 builtin/worktree.c:437 msgid "detach HEAD at named commit" msgstr "отсоединить HEAD на указанном коммите" -#: builtin/checkout.c:1125 +#: builtin/checkout.c:1127 msgid "set upstream info for new branch" msgstr "установить информацию о вышестоящей ветке для новой ветки" -#: builtin/checkout.c:1127 +#: builtin/checkout.c:1129 msgid "new-branch" msgstr "новая-ветка" -#: builtin/checkout.c:1127 +#: builtin/checkout.c:1129 msgid "new unparented branch" msgstr "новая ветка без родителей" -#: builtin/checkout.c:1128 +#: builtin/checkout.c:1131 msgid "checkout our version for unmerged files" msgstr "переключиться на нашу версию для не слитых файлов" -#: builtin/checkout.c:1130 +#: builtin/checkout.c:1134 msgid "checkout their version for unmerged files" msgstr "переключиться на их версию для не слитых файлов" -#: builtin/checkout.c:1132 +#: builtin/checkout.c:1136 msgid "force checkout (throw away local modifications)" msgstr "принудительное переключение на состояние (отбрасывает все локальные изменения)" -#: builtin/checkout.c:1133 +#: builtin/checkout.c:1138 msgid "perform a 3-way merge with the new branch" msgstr "выполнить трехходовое слияние с новой веткой" -#: builtin/checkout.c:1134 builtin/merge.c:238 +#: builtin/checkout.c:1140 builtin/merge.c:273 msgid "update ignored files (default)" msgstr "обновить игнорируемые файлы (по умолчанию)" -#: builtin/checkout.c:1135 builtin/log.c:1496 parse-options.h:251 +#: builtin/checkout.c:1142 builtin/log.c:1510 parse-options.h:264 msgid "style" msgstr "стиль" -#: builtin/checkout.c:1136 +#: builtin/checkout.c:1143 msgid "conflict style (merge or diff3)" msgstr "стиль конфликтов слияния (merge или diff3)" -#: builtin/checkout.c:1139 +#: builtin/checkout.c:1146 msgid "do not limit pathspecs to sparse entries only" msgstr "не ограничивать спецификаторы пути только частичными записями" -#: builtin/checkout.c:1141 +#: builtin/checkout.c:1148 msgid "second guess 'git checkout <no-such-branch>'" msgstr "пересмотр «git checkout <нет-такой-ветки>»" -#: builtin/checkout.c:1143 +#: builtin/checkout.c:1150 msgid "do not check if another worktree is holding the given ref" msgstr "не проверять, что другое дерево уже содержит указанную ссылку" -#: builtin/checkout.c:1147 builtin/clone.c:81 builtin/fetch.c:137 -#: builtin/merge.c:235 builtin/pull.c:123 builtin/push.c:556 -#: builtin/send-pack.c:173 +#: builtin/checkout.c:1154 builtin/clone.c:86 builtin/fetch.c:138 +#: builtin/merge.c:270 builtin/pull.c:128 builtin/push.c:572 +#: builtin/send-pack.c:174 msgid "force progress reporting" msgstr "принудительно выводить прогресс" -#: builtin/checkout.c:1177 +#: builtin/checkout.c:1184 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-b, -B и --orphan нельзя использовать одновременно" -#: builtin/checkout.c:1194 +#: builtin/checkout.c:1201 msgid "--track needs a branch name" msgstr "--track требует имя ветки" -#: builtin/checkout.c:1199 -msgid "Missing branch name; try -b" -msgstr "Пропущено имя ветки; попробуйте -b" +#: builtin/checkout.c:1206 +msgid "missing branch name; try -b" +msgstr "пропущено имя ветки; попробуйте -b" -#: builtin/checkout.c:1235 +#: builtin/checkout.c:1243 msgid "invalid path specification" msgstr "недопустимый спецификатор пути" -#: builtin/checkout.c:1242 +#: builtin/checkout.c:1250 #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "«%s» не является коммитом, поэтому невозможно создать из него ветку «%s»" -#: builtin/checkout.c:1246 +#: builtin/checkout.c:1254 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: --detach не принимает путь «%s» как аргумент" -#: builtin/checkout.c:1250 +#: builtin/checkout.c:1258 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." msgstr "git checkout: --ours/--theirs, --force and --merge нельзя использовать одновременно при применении состояния индекса." -#: builtin/clean.c:26 +#: builtin/checkout.c:1278 +#, c-format +msgid "" +"'%s' matched more than one remote tracking branch.\n" +"We found %d remotes with a reference that matched. So we fell back\n" +"on trying to resolve the argument as a path, but failed there too!\n" +"\n" +"If you meant to check out a remote tracking branch on, e.g. 'origin',\n" +"you can do so by fully qualifying the name with the --track option:\n" +"\n" +" git checkout --track origin/<name>\n" +"\n" +"If you'd like to always have checkouts of an ambiguous <name> prefer\n" +"one remote, e.g. the 'origin' remote, consider setting\n" +"checkout.defaultRemote=origin in your config." +msgstr "" + +#: builtin/clean.c:27 msgid "" "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." msgstr "git clean [-d] [-f] [-i] [-n] [-q] [-e <шаблон>] [-x | -X] [--] <пути>…" -#: builtin/clean.c:30 +#: builtin/clean.c:31 #, c-format msgid "Removing %s\n" msgstr "Удаление %s\n" -#: builtin/clean.c:31 +#: builtin/clean.c:32 #, c-format msgid "Would remove %s\n" msgstr "Будет удалено %s\n" -#: builtin/clean.c:32 +#: builtin/clean.c:33 #, c-format msgid "Skipping repository %s\n" msgstr "Пропуск репозитория %s\n" -#: builtin/clean.c:33 +#: builtin/clean.c:34 #, c-format msgid "Would skip repository %s\n" msgstr "Будет пропущен репозиторий %s\n" -#: builtin/clean.c:34 +#: builtin/clean.c:35 #, c-format msgid "failed to remove %s" msgstr "сбой удаления %s" -#: builtin/clean.c:302 git-add--interactive.perl:572 +#: builtin/clean.c:297 git-add--interactive.perl:579 #, c-format msgid "" "Prompt help:\n" @@ -6150,7 +7954,7 @@ msgid "" " - (empty) select nothing\n" msgstr "Справка по выделению:\n1 - выбрать указанный элемент\nfoo - выбрать элемент с указанным префиксом\n - (пусто) не выбирать ничего\n" -#: builtin/clean.c:306 git-add--interactive.perl:581 +#: builtin/clean.c:301 git-add--interactive.perl:588 #, c-format msgid "" "Prompt help:\n" @@ -6163,38 +7967,38 @@ msgid "" " - (empty) finish selecting\n" msgstr "Справка по выделению:\n1 - выбрать один элемент\n3-5 - выбрать диапазон элементов\n2-3,6-9 - выбрать несколько диапазонов\nfoo - выбрать элемент с указанным префиксом\n-… - убрать выделение с указанных элементов\n* - выбрать все элементы\n - (пусто) завершить выделение\n" -#: builtin/clean.c:522 git-add--interactive.perl:547 -#: git-add--interactive.perl:552 +#: builtin/clean.c:517 git-add--interactive.perl:554 +#: git-add--interactive.perl:559 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "Хм (%s)?\n" -#: builtin/clean.c:664 +#: builtin/clean.c:659 #, c-format msgid "Input ignore patterns>> " msgstr "Шаблоны игнорирования ввода>> " -#: builtin/clean.c:701 +#: builtin/clean.c:696 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "ПРЕДУПРЕЖДЕНИЕ: Не удалось найти элементы соответствующие: %s" -#: builtin/clean.c:722 +#: builtin/clean.c:717 msgid "Select items to delete" msgstr "Укажите элементы для удаления" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:763 +#: builtin/clean.c:758 #, c-format msgid "Remove %s [y/N]? " msgstr "Удалить %s [y - да/N - нет]? " -#: builtin/clean.c:788 git-add--interactive.perl:1616 +#: builtin/clean.c:783 git-add--interactive.perl:1717 #, c-format msgid "Bye.\n" msgstr "До свидания.\n" -#: builtin/clean.c:796 +#: builtin/clean.c:791 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -6205,15 +8009,15 @@ msgid "" "? - help for prompt selection" msgstr "clean - начать очистку\nfilter by pattern - исключить удаление элементов\nselect by numbers - исключить удаление элементов по номерам\nask each - запрашивать подтверждение на удаление каждого элемента (как «rm -i»)\nquit - прекратить очистку\nhelp - этот экран\n? - справка по выделению" -#: builtin/clean.c:823 git-add--interactive.perl:1692 +#: builtin/clean.c:818 git-add--interactive.perl:1793 msgid "*** Commands ***" msgstr "*** Команды ***" -#: builtin/clean.c:824 git-add--interactive.perl:1689 +#: builtin/clean.c:819 git-add--interactive.perl:1790 msgid "What now" msgstr "Что теперь" -#: builtin/clean.c:832 +#: builtin/clean.c:827 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "Удалить следующие элементы:" @@ -6221,370 +8025,372 @@ msgstr[1] "Удалить следующие элементы:" msgstr[2] "Удалить следующие элементы:" msgstr[3] "Удалить следующие элементы:" -#: builtin/clean.c:848 +#: builtin/clean.c:843 msgid "No more files to clean, exiting." msgstr "Больше нет файлов для очистки, выходим." -#: builtin/clean.c:910 +#: builtin/clean.c:905 msgid "do not print names of files removed" msgstr "не выводить имена удаляемых файлов" -#: builtin/clean.c:912 +#: builtin/clean.c:907 msgid "force" msgstr "принудительно" -#: builtin/clean.c:913 +#: builtin/clean.c:908 msgid "interactive cleaning" msgstr "интерактивная очистка" -#: builtin/clean.c:915 +#: builtin/clean.c:910 msgid "remove whole directories" msgstr "удалить каталоги полностью" -#: builtin/clean.c:916 builtin/describe.c:530 builtin/describe.c:532 -#: builtin/grep.c:863 builtin/log.c:155 builtin/log.c:157 -#: builtin/ls-files.c:548 builtin/name-rev.c:397 builtin/name-rev.c:399 -#: builtin/show-ref.c:176 +#: builtin/clean.c:911 builtin/describe.c:545 builtin/describe.c:547 +#: builtin/grep.c:875 builtin/log.c:161 builtin/log.c:163 +#: builtin/ls-files.c:549 builtin/name-rev.c:415 builtin/name-rev.c:417 +#: builtin/show-ref.c:177 msgid "pattern" msgstr "шаблон" -#: builtin/clean.c:917 +#: builtin/clean.c:912 msgid "add <pattern> to ignore rules" msgstr "добавить <шаблон> в правила игнорирования" -#: builtin/clean.c:918 +#: builtin/clean.c:913 msgid "remove ignored files, too" msgstr "также удалить игнорируемые файлы" -#: builtin/clean.c:920 +#: builtin/clean.c:915 msgid "remove only ignored files" msgstr "удалить только игнорируемые файлы" -#: builtin/clean.c:938 +#: builtin/clean.c:933 msgid "-x and -X cannot be used together" msgstr "нельзя использовать одновременно -x и -X" -#: builtin/clean.c:942 +#: builtin/clean.c:937 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to" " clean" msgstr "clean.requireForce установлен как true и ни одна из опций -i, -n или -f не указана; отказ очистки" -#: builtin/clean.c:945 +#: builtin/clean.c:940 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" msgstr "clean.requireForce установлен по умолчанию как true и ни одна из опций -i, -n или -f не указана; отказ очистки" -#: builtin/clone.c:39 +#: builtin/clone.c:43 msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<опции>] [--] <репозиторий> [<каталог>]" -#: builtin/clone.c:83 +#: builtin/clone.c:88 msgid "don't create a checkout" msgstr "не переключать рабочую копию на HEAD" -#: builtin/clone.c:84 builtin/clone.c:86 builtin/init-db.c:479 +#: builtin/clone.c:89 builtin/clone.c:91 builtin/init-db.c:480 msgid "create a bare repository" msgstr "создать голый репозиторий" -#: builtin/clone.c:88 +#: builtin/clone.c:93 msgid "create a mirror repository (implies bare)" msgstr "создать зеркало репозитория (включает в себя и параметр bare)" -#: builtin/clone.c:90 +#: builtin/clone.c:95 msgid "to clone from a local repository" msgstr "для клонирования из локального репозитория" -#: builtin/clone.c:92 +#: builtin/clone.c:97 msgid "don't use local hardlinks, always copy" msgstr "не использовать жесткие ссылки, всегда копировать файлы" -#: builtin/clone.c:94 +#: builtin/clone.c:99 msgid "setup as shared repository" msgstr "настроить как общедоступный репозиторий" -#: builtin/clone.c:96 builtin/clone.c:100 +#: builtin/clone.c:101 builtin/clone.c:105 msgid "pathspec" msgstr "спецификатор-пути" -#: builtin/clone.c:96 builtin/clone.c:100 +#: builtin/clone.c:101 builtin/clone.c:105 msgid "initialize submodules in the clone" msgstr "инициализировать подмодули в клоне" -#: builtin/clone.c:103 +#: builtin/clone.c:108 msgid "number of submodules cloned in parallel" msgstr "количество подмодулей, которые будут клонированы парралельно" -#: builtin/clone.c:104 builtin/init-db.c:476 +#: builtin/clone.c:109 builtin/init-db.c:477 msgid "template-directory" msgstr "каталог-шаблонов" -#: builtin/clone.c:105 builtin/init-db.c:477 +#: builtin/clone.c:110 builtin/init-db.c:478 msgid "directory from which templates will be used" msgstr "каталог, шаблоны из которого будут использованы" -#: builtin/clone.c:107 builtin/clone.c:109 builtin/submodule--helper.c:873 -#: builtin/submodule--helper.c:1240 +#: builtin/clone.c:112 builtin/clone.c:114 builtin/submodule--helper.c:1368 +#: builtin/submodule--helper.c:1739 msgid "reference repository" msgstr "ссылаемый репозиторий" -#: builtin/clone.c:111 +#: builtin/clone.c:116 builtin/submodule--helper.c:1370 +#: builtin/submodule--helper.c:1741 msgid "use --reference only while cloning" msgstr "используйте --reference только при клонировании" -#: builtin/clone.c:112 builtin/column.c:27 builtin/merge-file.c:44 +#: builtin/clone.c:117 builtin/column.c:27 builtin/merge-file.c:44 +#: builtin/pack-objects.c:3194 builtin/repack.c:320 msgid "name" msgstr "имя" -#: builtin/clone.c:113 +#: builtin/clone.c:118 msgid "use <name> instead of 'origin' to track upstream" msgstr "использовать <имя> вместо «origin» для отслеживания вышестоящего репозитория" -#: builtin/clone.c:115 +#: builtin/clone.c:120 msgid "checkout <branch> instead of the remote's HEAD" msgstr "переключиться на <ветку>, вместо HEAD внешнего репозитория" -#: builtin/clone.c:117 +#: builtin/clone.c:122 msgid "path to git-upload-pack on the remote" msgstr "путь к git-upload-pack на внешнем репозитории" -#: builtin/clone.c:118 builtin/fetch.c:138 builtin/grep.c:806 -#: builtin/pull.c:211 +#: builtin/clone.c:123 builtin/fetch.c:139 builtin/grep.c:814 +#: builtin/pull.c:216 msgid "depth" msgstr "глубина" -#: builtin/clone.c:119 +#: builtin/clone.c:124 msgid "create a shallow clone of that depth" msgstr "сделать частичный клон указанной глубины" -#: builtin/clone.c:120 builtin/fetch.c:140 builtin/pack-objects.c:2991 -#: parse-options.h:142 +#: builtin/clone.c:125 builtin/fetch.c:141 builtin/pack-objects.c:3185 +#: parse-options.h:154 msgid "time" msgstr "время" -#: builtin/clone.c:121 +#: builtin/clone.c:126 msgid "create a shallow clone since a specific time" msgstr "сделать частичный клон до определенного времени" -#: builtin/clone.c:122 builtin/fetch.c:142 +#: builtin/clone.c:127 builtin/fetch.c:143 builtin/fetch.c:166 msgid "revision" msgstr "редакция" -#: builtin/clone.c:123 builtin/fetch.c:143 +#: builtin/clone.c:128 builtin/fetch.c:144 msgid "deepen history of shallow clone, excluding rev" msgstr "углубить историю частичного клона исключая редакцию" -#: builtin/clone.c:125 +#: builtin/clone.c:130 msgid "clone only one branch, HEAD or --branch" msgstr "клонировать только одну ветку, HEAD или --branch" -#: builtin/clone.c:127 +#: builtin/clone.c:132 msgid "don't clone any tags, and make later fetches not to follow them" msgstr "не клонировать метки, а также настроить, чтобы не клонировались и в дальнейшем" -#: builtin/clone.c:129 +#: builtin/clone.c:134 msgid "any cloned submodules will be shallow" msgstr "все склонированные подмодули будут частичными клонами" -#: builtin/clone.c:130 builtin/init-db.c:485 +#: builtin/clone.c:135 builtin/init-db.c:486 msgid "gitdir" msgstr "каталог-git" -#: builtin/clone.c:131 builtin/init-db.c:486 +#: builtin/clone.c:136 builtin/init-db.c:487 msgid "separate git dir from working tree" msgstr "разместить каталог git отдельно от рабочей копии" -#: builtin/clone.c:132 +#: builtin/clone.c:137 msgid "key=value" msgstr "ключ=значение" -#: builtin/clone.c:133 +#: builtin/clone.c:138 msgid "set config inside the new repository" msgstr "установить параметры внутри нового репозитория" -#: builtin/clone.c:134 builtin/fetch.c:160 builtin/pull.c:224 -#: builtin/push.c:567 +#: builtin/clone.c:139 builtin/fetch.c:162 builtin/pull.c:229 +#: builtin/push.c:583 msgid "use IPv4 addresses only" msgstr "использовать только IPv4 адреса" -#: builtin/clone.c:136 builtin/fetch.c:162 builtin/pull.c:227 -#: builtin/push.c:569 +#: builtin/clone.c:141 builtin/fetch.c:164 builtin/pull.c:232 +#: builtin/push.c:585 msgid "use IPv6 addresses only" msgstr "использовать только IPv6 адреса" -#: builtin/clone.c:273 +#: builtin/clone.c:279 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" msgstr "Имя каталога не может быть угадано.\nУкажите имя каталога с помощью параметра командной строки" -#: builtin/clone.c:326 +#: builtin/clone.c:332 #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "информация: Не удалось добавить альтернативу для «%s»: %s\n" -#: builtin/clone.c:398 +#: builtin/clone.c:404 #, c-format msgid "failed to open '%s'" msgstr "не удалось открыть «%s»" -#: builtin/clone.c:406 +#: builtin/clone.c:412 #, c-format msgid "%s exists and is not a directory" msgstr "%s уже существует и не является каталогом" -#: builtin/clone.c:420 +#: builtin/clone.c:426 #, c-format msgid "failed to stat %s\n" msgstr "не удалось выполнить stat %s\n" -#: builtin/clone.c:442 +#: builtin/clone.c:448 #, c-format msgid "failed to create link '%s'" msgstr "не удалось создать ссылку «%s»" -#: builtin/clone.c:446 +#: builtin/clone.c:452 #, c-format msgid "failed to copy file to '%s'" msgstr "не удалось копировать файл в «%s»" -#: builtin/clone.c:472 +#: builtin/clone.c:478 #, c-format msgid "done.\n" msgstr "готово.\n" -#: builtin/clone.c:484 +#: builtin/clone.c:492 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" "and retry the checkout with 'git checkout -f HEAD'\n" msgstr "Клонирование прошло успешно, но во время переключения состояния произошла ошибка.\nС помощь команды «git status» вы можете просмотреть, какие файлы были обновлены,\nа с помощью «git checkout -f HEAD» можно повторить попытку переключения на ветку \n" -#: builtin/clone.c:561 +#: builtin/clone.c:569 #, c-format msgid "Could not find remote branch %s to clone." msgstr "Не удалось найти внешнюю ветку %s для клонирования." -#: builtin/clone.c:656 -msgid "remote did not send all necessary objects" -msgstr "внешний репозиторий прислал не все необходимые объекты" - -#: builtin/clone.c:672 +#: builtin/clone.c:680 #, c-format msgid "unable to update %s" msgstr "не удалось обновить %s" -#: builtin/clone.c:721 +#: builtin/clone.c:730 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "внешний HEAD ссылается на несуществующую ссылку, нельзя переключиться на такую версию.\n" -#: builtin/clone.c:751 +#: builtin/clone.c:760 msgid "unable to checkout working tree" msgstr "не удалось переключиться на версию в рабочем каталоге" -#: builtin/clone.c:796 +#: builtin/clone.c:805 msgid "unable to write parameters to config file" msgstr "не удалось записать параметры в файл конфигурации" -#: builtin/clone.c:859 +#: builtin/clone.c:868 msgid "cannot repack to clean up" msgstr "не удалось выполнить перепаковку для очистки" -#: builtin/clone.c:861 +#: builtin/clone.c:870 msgid "cannot unlink temporary alternates file" msgstr "не удалось отсоединить временные альтернативные файлы" -#: builtin/clone.c:894 builtin/receive-pack.c:1945 +#: builtin/clone.c:910 builtin/receive-pack.c:1935 msgid "Too many arguments." msgstr "Слишком много аргументов." -#: builtin/clone.c:898 +#: builtin/clone.c:914 msgid "You must specify a repository to clone." msgstr "Вы должны указать репозиторий для клонирования." -#: builtin/clone.c:911 +#: builtin/clone.c:927 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "--bare и --origin %s нельзя использовать одновременно." -#: builtin/clone.c:914 +#: builtin/clone.c:930 msgid "--bare and --separate-git-dir are incompatible." msgstr "--bare и --separate-git-dir нельзя использовать одновременно." -#: builtin/clone.c:927 +#: builtin/clone.c:943 #, c-format msgid "repository '%s' does not exist" msgstr "репозиторий «%s» не существует" -#: builtin/clone.c:933 builtin/fetch.c:1358 +#: builtin/clone.c:949 builtin/fetch.c:1512 #, c-format msgid "depth %s is not a positive number" msgstr "глубина %s не является положительным числом" -#: builtin/clone.c:943 +#: builtin/clone.c:959 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "целевой путь «%s» уже существует и не является пустым каталогом." -#: builtin/clone.c:953 +#: builtin/clone.c:969 #, c-format msgid "working tree '%s' already exists." msgstr "рабочий каталог «%s» уже существует." -#: builtin/clone.c:968 builtin/clone.c:979 builtin/difftool.c:270 -#: builtin/worktree.c:253 builtin/worktree.c:283 +#: builtin/clone.c:984 builtin/clone.c:1005 builtin/difftool.c:271 +#: builtin/worktree.c:246 builtin/worktree.c:276 #, c-format msgid "could not create leading directories of '%s'" msgstr "не удалось создать родительские каталоги для «%s»" -#: builtin/clone.c:971 +#: builtin/clone.c:989 #, c-format msgid "could not create work tree dir '%s'" msgstr "не удалось создать рабочий каталог «%s»" -#: builtin/clone.c:983 +#: builtin/clone.c:1009 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Клонирование в голый репозиторий «%s»…\n" -#: builtin/clone.c:985 +#: builtin/clone.c:1011 #, c-format msgid "Cloning into '%s'...\n" msgstr "Клонирование в «%s»…\n" -#: builtin/clone.c:1009 +#: builtin/clone.c:1035 msgid "" "clone --recursive is not compatible with both --reference and --reference-" "if-able" msgstr "клонирование с параметром --recursive нельзя использовать одновременно ни с --reference, ни с --reference-if-able" -#: builtin/clone.c:1071 +#: builtin/clone.c:1096 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth игнорируется на локальных клонах; вместо этого используйте file://." -#: builtin/clone.c:1073 +#: builtin/clone.c:1098 msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "--shallow-since игнорируется на локальных клонах; используйте file:// вместо этого." -#: builtin/clone.c:1075 +#: builtin/clone.c:1100 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "--shallow-exclude игнорируется на локальных клонах; используйте file:// вместо этого." -#: builtin/clone.c:1078 +#: builtin/clone.c:1102 +msgid "--filter is ignored in local clones; use file:// instead." +msgstr "" + +#: builtin/clone.c:1105 msgid "source repository is shallow, ignoring --local" msgstr "исходный репозиторий является частичным, --local игнорируется" -#: builtin/clone.c:1083 +#: builtin/clone.c:1110 msgid "--local is ignored" msgstr "--local игнорируется" -#: builtin/clone.c:1139 builtin/clone.c:1147 +#: builtin/clone.c:1180 builtin/clone.c:1188 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Внешняя ветка %s не найдена в вышестоящем репозитории %s" -#: builtin/clone.c:1150 +#: builtin/clone.c:1191 msgid "You appear to have cloned an empty repository." msgstr "Похоже, что вы клонировали пустой репозиторий." @@ -6616,55 +8422,26 @@ msgstr "Расстояние отступа справа" msgid "Padding space between columns" msgstr "Расстояние отступа между колонками" -#: builtin/column.c:52 +#: builtin/column.c:51 msgid "--command must be the first argument" msgstr "параметр --command должен быть первым" -#: builtin/commit.c:39 +#: builtin/commit.c:38 msgid "git commit [<options>] [--] <pathspec>..." msgstr "git commit [<опции>] [--] <спецификатор-пути>…" -#: builtin/commit.c:44 +#: builtin/commit.c:43 msgid "git status [<options>] [--] <pathspec>..." msgstr "git status [<опции>] [--] <спецификатор-пути>…" -#: builtin/commit.c:49 -msgid "" -"Your name and email address were configured automatically based\n" -"on your username and hostname. Please check that they are accurate.\n" -"You can suppress this message by setting them explicitly. Run the\n" -"following command and follow the instructions in your editor to edit\n" -"your configuration file:\n" -"\n" -" git config --global --edit\n" -"\n" -"After doing this, you may fix the identity used for this commit with:\n" -"\n" -" git commit --amend --reset-author\n" -msgstr "Ваше имя или электронная почта настроены автоматически на основании вашего\nимени пользователя и имени машины. Пожалуйста, проверьте, что они \nопределены правильно.\nВы можете отключить это уведомление установив их напрямую. Запустите следующую\nкоманду и следуйте инструкциям вашего текстового редактора, для\nредактирования вашего файла конфигурации:\n\n git config --global --edit\n\nПосле этого, изменить авторство этой коммита можно будет с помощью команды:\n\n git commit --amend --reset-author\n" - -#: builtin/commit.c:62 -msgid "" -"Your name and email address were configured automatically based\n" -"on your username and hostname. Please check that they are accurate.\n" -"You can suppress this message by setting them explicitly:\n" -"\n" -" git config --global user.name \"Your Name\"\n" -" git config --global user.email you@example.com\n" -"\n" -"After doing this, you may fix the identity used for this commit with:\n" -"\n" -" git commit --amend --reset-author\n" -msgstr "Ваше имя или электронная почта настроены автоматически на основании вашего\nимени пользователя и имени машины. Пожалуйста, проверьте, что они \nопределены правильно.\nВы можете отключить это уведомление установив их напрямую:\n\n git config --global user.name \"Ваше Имя\"\n git config --global user.email you@example.com\n\nПосле этого, изменить авторство этой коммита можно будет с помощью команды:\n\n git commit --amend --reset-author\n" - -#: builtin/commit.c:74 +#: builtin/commit.c:48 msgid "" "You asked to amend the most recent commit, but doing so would make\n" "it empty. You can repeat your command with --allow-empty, or you can\n" "remove the commit entirely with \"git reset HEAD^\".\n" msgstr "Вы попросили исправить последний коммит, но делая это вы сделаете\nпустой коммит. Вы можете повторить эту команду с опцией --allow-empty\nили вы можете удалить коммит полностью с помощью команды \n«git reset HEAD^».\n" -#: builtin/commit.c:79 +#: builtin/commit.c:53 msgid "" "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" "If you wish to commit it anyway, use:\n" @@ -6673,11 +8450,11 @@ msgid "" "\n" msgstr "Копируемый коммит теперь пуст, возможно после разрешения конфликтов.\nЕсли вы все равно хотите сделать пустой коммит, используйте:\n\n git commit --allow-empty\n\n" -#: builtin/commit.c:86 +#: builtin/commit.c:60 msgid "Otherwise, please use 'git reset'\n" msgstr "В противном случае, используйте «git reset»\n" -#: builtin/commit.c:89 +#: builtin/commit.c:63 msgid "" "If you wish to skip this commit, use:\n" "\n" @@ -6687,98 +8464,98 @@ msgid "" "the remaining commits.\n" msgstr "Если вы хотите пропустит этот коммит, используйте команду:\n\n git reset\n\nПосле этого «git cherry-pick --continue» продолжит копирование оставшихся коммитов.\n" -#: builtin/commit.c:318 +#: builtin/commit.c:306 msgid "failed to unpack HEAD tree object" msgstr "сбой распаковки объекта дерева HEAD" -#: builtin/commit.c:359 +#: builtin/commit.c:347 msgid "unable to create temporary index" msgstr "не удалось создать временный индекс" -#: builtin/commit.c:365 +#: builtin/commit.c:353 msgid "interactive add failed" msgstr "сбой интерактивного добавления" -#: builtin/commit.c:378 +#: builtin/commit.c:366 msgid "unable to update temporary index" msgstr "не удалось обновить временный индекс" -#: builtin/commit.c:380 +#: builtin/commit.c:368 msgid "Failed to update main cache tree" msgstr "Сбой при обновлении основного кэша дерева" -#: builtin/commit.c:405 builtin/commit.c:429 builtin/commit.c:478 +#: builtin/commit.c:393 builtin/commit.c:416 builtin/commit.c:462 msgid "unable to write new_index file" msgstr "не удалось записать файл new_index" -#: builtin/commit.c:461 +#: builtin/commit.c:445 msgid "cannot do a partial commit during a merge." msgstr "нельзя создать частичный коммит во время слияния." -#: builtin/commit.c:463 +#: builtin/commit.c:447 msgid "cannot do a partial commit during a cherry-pick." msgstr "нельзя создать частичный коммит во время копирования коммита." -#: builtin/commit.c:471 +#: builtin/commit.c:455 msgid "cannot read the index" msgstr "не удалось прочитать индекс" -#: builtin/commit.c:490 +#: builtin/commit.c:474 msgid "unable to write temporary index file" msgstr "не удалось записать временный файл индекса" -#: builtin/commit.c:587 +#: builtin/commit.c:571 #, c-format msgid "commit '%s' lacks author header" msgstr "у коммита «%s» отсутствует автор в заголовке" -#: builtin/commit.c:589 +#: builtin/commit.c:573 #, c-format msgid "commit '%s' has malformed author line" msgstr "у коммита «%s» строка автора в неправильном формате" -#: builtin/commit.c:608 +#: builtin/commit.c:592 msgid "malformed --author parameter" msgstr "параметр --author в неправильном формате" -#: builtin/commit.c:660 +#: builtin/commit.c:644 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" msgstr "нельзя выбрать символ комментария, который\nне используется в текущем сообщении коммита" -#: builtin/commit.c:697 builtin/commit.c:730 builtin/commit.c:1114 +#: builtin/commit.c:681 builtin/commit.c:714 builtin/commit.c:1042 #, c-format msgid "could not lookup commit %s" msgstr "не удалось запросить коммит %s" -#: builtin/commit.c:709 builtin/shortlog.c:309 +#: builtin/commit.c:693 builtin/shortlog.c:317 #, c-format msgid "(reading log message from standard input)\n" msgstr "(чтение файла журнала из стандартного ввода)\n" -#: builtin/commit.c:711 +#: builtin/commit.c:695 msgid "could not read log from standard input" msgstr "не удалось прочитать файл журнала из стандартного ввода" -#: builtin/commit.c:715 +#: builtin/commit.c:699 #, c-format msgid "could not read log file '%s'" msgstr "не удалось прочитать файл журнала «%s»" -#: builtin/commit.c:742 builtin/commit.c:750 +#: builtin/commit.c:728 builtin/commit.c:736 msgid "could not read SQUASH_MSG" msgstr "не удалось прочитать SQUASH_MSG" -#: builtin/commit.c:747 +#: builtin/commit.c:733 msgid "could not read MERGE_MSG" msgstr "не удалось прочитать MERGE_MSG" -#: builtin/commit.c:801 +#: builtin/commit.c:787 msgid "could not write commit template" msgstr "не удалось записать шаблон описания коммита" -#: builtin/commit.c:819 +#: builtin/commit.c:805 #, c-format msgid "" "\n" @@ -6788,7 +8565,7 @@ msgid "" "and try again.\n" msgstr "\nПохоже, что вы пытаетесь закоммитить слияние.\nЕсли это ошибка, пожалуйста удалите файл\n\t%s\nи попробуйте снова.\n" -#: builtin/commit.c:824 +#: builtin/commit.c:810 #, c-format msgid "" "\n" @@ -6798,14 +8575,14 @@ msgid "" "and try again.\n" msgstr "\nПохоже, что вы пытаетесь закоммитить при копировании коммита.\nЕсли это не так, то удалите файл\n\t%s\nи попробуйте снова.\n" -#: builtin/commit.c:837 +#: builtin/commit.c:823 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" "with '%c' will be ignored, and an empty message aborts the commit.\n" msgstr "Пожалуйста, введите сообщение коммита для ваших изменений. Строки,\nначинающиеся с «%c» будут проигнорированы, а пустое сообщение\nотменяет процесс коммита.\n" -#: builtin/commit.c:844 +#: builtin/commit.c:831 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -6813,504 +8590,599 @@ msgid "" "An empty message aborts the commit.\n" msgstr "Пожалуйста, введите сообщение коммита для ваших изменений. Строки,\nначинающиеся с «%c» будут оставлены; вы можете удалить их вручную,\nесли хотите. Пустое сообщение отменяет процесс коммита.\n" -#: builtin/commit.c:861 +#: builtin/commit.c:848 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sАвтор: %.*s <%.*s>" -#: builtin/commit.c:869 +#: builtin/commit.c:856 #, c-format msgid "%sDate: %s" msgstr "%sДата: %s" -#: builtin/commit.c:876 +#: builtin/commit.c:863 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sКоммитер: %.*s <%.*s>" -#: builtin/commit.c:893 +#: builtin/commit.c:880 msgid "Cannot read index" msgstr "Не удалось прочитать индекс" -#: builtin/commit.c:959 +#: builtin/commit.c:946 msgid "Error building trees" msgstr "Ошибка при построении деревьев" -#: builtin/commit.c:973 builtin/tag.c:252 +#: builtin/commit.c:960 builtin/tag.c:258 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Пожалуйста, укажите сообщение, при указании опций -m или -F.\n" -#: builtin/commit.c:1076 +#: builtin/commit.c:1004 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "--author «%s» не в формате «Имя <почта>» и не совпадает с существующим автором" -#: builtin/commit.c:1090 +#: builtin/commit.c:1018 #, c-format msgid "Invalid ignored mode '%s'" msgstr "Недопустимый режим показа игнорируемых файлов «%s»" -#: builtin/commit.c:1104 builtin/commit.c:1349 +#: builtin/commit.c:1032 builtin/commit.c:1269 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Неправильный режим неотслеживаемых файлов «%s»" -#: builtin/commit.c:1142 +#: builtin/commit.c:1070 msgid "--long and -z are incompatible" msgstr "--long и -z нельзя использовать одновременно" -#: builtin/commit.c:1172 +#: builtin/commit.c:1103 msgid "Using both --reset-author and --author does not make sense" msgstr "Указание одновременно опций --reset-author и --author не имеет смысла" -#: builtin/commit.c:1181 +#: builtin/commit.c:1112 msgid "You have nothing to amend." msgstr "Нечего исправлять." -#: builtin/commit.c:1184 +#: builtin/commit.c:1115 msgid "You are in the middle of a merge -- cannot amend." msgstr "Вы в процессе слияния — сейчас нельзя исправлять." -#: builtin/commit.c:1186 +#: builtin/commit.c:1117 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "Вы в процессе копирования коммита — сейчас нельзя исправлять." -#: builtin/commit.c:1189 +#: builtin/commit.c:1120 msgid "Options --squash and --fixup cannot be used together" msgstr "Опции --squash и --fixup не могут использоваться одновременно" -#: builtin/commit.c:1199 +#: builtin/commit.c:1130 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "Может использоваться только одна из опций -c/-C/-F/--fixup." -#: builtin/commit.c:1201 -msgid "Option -m cannot be combined with -c/-C/-F/--fixup." -msgstr "Опция -m не может использоваться с -c/-C/-F/--fixup." +#: builtin/commit.c:1132 +msgid "Option -m cannot be combined with -c/-C/-F." +msgstr "" -#: builtin/commit.c:1209 +#: builtin/commit.c:1140 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author может использоваться только одновременно с опциями -C, -c или --amend." -#: builtin/commit.c:1226 +#: builtin/commit.c:1157 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "Может использоваться только одна из опций --include/--only/--all/--interactive/--patch." -#: builtin/commit.c:1228 +#: builtin/commit.c:1159 msgid "No paths with --include/--only does not make sense." msgstr "Указание путей каталогов с опциями --include/--only не имеет смысла." -#: builtin/commit.c:1240 builtin/tag.c:535 +#: builtin/commit.c:1173 builtin/tag.c:544 #, c-format msgid "Invalid cleanup mode %s" msgstr "Неправильное значение режима очистки %s" -#: builtin/commit.c:1245 +#: builtin/commit.c:1178 msgid "Paths with -a does not make sense." msgstr "С опцией -a указание пути не имеет смысла." -#: builtin/commit.c:1363 builtin/commit.c:1648 +#: builtin/commit.c:1303 builtin/commit.c:1480 msgid "show status concisely" msgstr "кратко показать статус" -#: builtin/commit.c:1365 builtin/commit.c:1650 +#: builtin/commit.c:1305 builtin/commit.c:1482 msgid "show branch information" msgstr "показать информацию о версии" -#: builtin/commit.c:1367 +#: builtin/commit.c:1307 msgid "show stash information" msgstr "показать информацию о спрятанном" -#: builtin/commit.c:1369 +#: builtin/commit.c:1309 builtin/commit.c:1484 +msgid "compute full ahead/behind values" +msgstr "" + +#: builtin/commit.c:1311 msgid "version" msgstr "версия" -#: builtin/commit.c:1369 builtin/commit.c:1652 builtin/push.c:542 -#: builtin/worktree.c:523 +#: builtin/commit.c:1311 builtin/commit.c:1486 builtin/push.c:558 +#: builtin/worktree.c:581 msgid "machine-readable output" msgstr "машиночитаемый вывод" -#: builtin/commit.c:1372 builtin/commit.c:1654 +#: builtin/commit.c:1314 builtin/commit.c:1488 msgid "show status in long format (default)" msgstr "показать статус в длинном формате (по умолчанию)" -#: builtin/commit.c:1375 builtin/commit.c:1657 +#: builtin/commit.c:1317 builtin/commit.c:1491 msgid "terminate entries with NUL" msgstr "завершать записи НУЛЕВЫМ байтом" -#: builtin/commit.c:1377 builtin/commit.c:1381 builtin/commit.c:1660 -#: builtin/fast-export.c:999 builtin/fast-export.c:1002 builtin/tag.c:390 +#: builtin/commit.c:1319 builtin/commit.c:1323 builtin/commit.c:1494 +#: builtin/fast-export.c:1007 builtin/fast-export.c:1010 builtin/tag.c:398 msgid "mode" msgstr "режим" -#: builtin/commit.c:1378 builtin/commit.c:1660 +#: builtin/commit.c:1320 builtin/commit.c:1494 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "показать неотслеживаемые файлы, опциональные режимы: all (все), normal (как обычно), no (нет). (По умолчанию: all)" -#: builtin/commit.c:1382 +#: builtin/commit.c:1324 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" msgstr "показывать игнорируемые файлы, с опциональным режимом: traditional (традиционный), matching (только совпадающие), no (не показывать). (По умолчанию: traditional)" -#: builtin/commit.c:1384 parse-options.h:155 +#: builtin/commit.c:1326 parse-options.h:167 msgid "when" msgstr "когда" -#: builtin/commit.c:1385 +#: builtin/commit.c:1327 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "игнорировать изменения в подмодулях, опционально когда: all (всегда), dirty (измененные), untracked (неотслеживаемые). (По умолчанию: all)" -#: builtin/commit.c:1387 +#: builtin/commit.c:1329 msgid "list untracked files in columns" msgstr "показать неотслеживаемые файлы по столбцам" -#: builtin/commit.c:1406 -msgid "Unsupported combination of ignored and untracked-files arguments" -msgstr "Неподдерживаемая комбинация аргументов отображения игнорируемых и неотслеживаемых файлов" - -#: builtin/commit.c:1469 -msgid "couldn't look up newly created commit" -msgstr "нельзя запросить новосозданный коммит" - -#: builtin/commit.c:1471 -msgid "could not parse newly created commit" -msgstr "нельзя разобрать новосозданный коммит" +#: builtin/commit.c:1330 +msgid "do not detect renames" +msgstr "не определять переименования" -#: builtin/commit.c:1516 -msgid "unable to resolve HEAD after creating commit" -msgstr "не удалось найти HEAD после создания коммита" +#: builtin/commit.c:1332 +msgid "detect renames, optionally set similarity index" +msgstr "определять переименования, опционально устанавливать рейтинг сходства" -#: builtin/commit.c:1518 -msgid "detached HEAD" -msgstr "отделённый HEAD" - -#: builtin/commit.c:1521 -msgid " (root-commit)" -msgstr " (корневой коммит)" +#: builtin/commit.c:1352 +msgid "Unsupported combination of ignored and untracked-files arguments" +msgstr "Неподдерживаемая комбинация аргументов отображения игнорируемых и неотслеживаемых файлов" -#: builtin/commit.c:1618 +#: builtin/commit.c:1450 msgid "suppress summary after successful commit" msgstr "не выводить сводку после успешного коммита" -#: builtin/commit.c:1619 +#: builtin/commit.c:1451 msgid "show diff in commit message template" msgstr "добавить список изменений в шаблон сообщения коммита" -#: builtin/commit.c:1621 +#: builtin/commit.c:1453 msgid "Commit message options" msgstr "Опции сообщения коммита" -#: builtin/commit.c:1622 builtin/tag.c:388 +#: builtin/commit.c:1454 builtin/merge.c:261 builtin/tag.c:395 msgid "read message from file" msgstr "прочитать сообщение из файла" -#: builtin/commit.c:1623 +#: builtin/commit.c:1455 msgid "author" msgstr "автор" -#: builtin/commit.c:1623 +#: builtin/commit.c:1455 msgid "override author for commit" msgstr "подменить автора коммита" -#: builtin/commit.c:1624 builtin/gc.c:359 +#: builtin/commit.c:1456 builtin/gc.c:504 msgid "date" msgstr "дата" -#: builtin/commit.c:1624 +#: builtin/commit.c:1456 msgid "override date for commit" msgstr "подменить дату коммита" -#: builtin/commit.c:1625 builtin/merge.c:225 builtin/notes.c:402 -#: builtin/notes.c:565 builtin/tag.c:386 +#: builtin/commit.c:1457 builtin/merge.c:257 builtin/notes.c:404 +#: builtin/notes.c:567 builtin/tag.c:393 msgid "message" msgstr "сообщение" -#: builtin/commit.c:1625 +#: builtin/commit.c:1457 msgid "commit message" msgstr "сообщение коммита" -#: builtin/commit.c:1626 builtin/commit.c:1627 builtin/commit.c:1628 -#: builtin/commit.c:1629 parse-options.h:257 ref-filter.h:92 +#: builtin/commit.c:1458 builtin/commit.c:1459 builtin/commit.c:1460 +#: builtin/commit.c:1461 parse-options.h:270 ref-filter.h:92 msgid "commit" msgstr "коммит" -#: builtin/commit.c:1626 +#: builtin/commit.c:1458 msgid "reuse and edit message from specified commit" msgstr "использовать и отредактировать сообщение от указанного коммита" -#: builtin/commit.c:1627 +#: builtin/commit.c:1459 msgid "reuse message from specified commit" msgstr "использовать сообщение указанного коммита" -#: builtin/commit.c:1628 +#: builtin/commit.c:1460 msgid "use autosquash formatted message to fixup specified commit" msgstr "использовать форматированное сообщение автоуплотнения для исправления указанного коммита" -#: builtin/commit.c:1629 +#: builtin/commit.c:1461 msgid "use autosquash formatted message to squash specified commit" msgstr "использовать форматированное сообщение автоуплотнения для уплотнения указанного коммита" -#: builtin/commit.c:1630 +#: builtin/commit.c:1462 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "коммит теперь за моим авторством (используется с -C/-c/--amend)" -#: builtin/commit.c:1631 builtin/log.c:1443 builtin/merge.c:239 -#: builtin/pull.c:149 builtin/revert.c:105 +#: builtin/commit.c:1463 builtin/log.c:1457 builtin/merge.c:274 +#: builtin/pull.c:154 builtin/revert.c:106 msgid "add Signed-off-by:" msgstr "добавить Signed-off-by:" -#: builtin/commit.c:1632 +#: builtin/commit.c:1464 msgid "use specified template file" msgstr "использовать указанный файл шаблона" -#: builtin/commit.c:1633 +#: builtin/commit.c:1465 msgid "force edit of commit" msgstr "принудительно редактировать коммит" -#: builtin/commit.c:1634 +#: builtin/commit.c:1466 msgid "default" msgstr "по-умолчанию" -#: builtin/commit.c:1634 builtin/tag.c:391 +#: builtin/commit.c:1466 builtin/tag.c:399 msgid "how to strip spaces and #comments from message" msgstr "как удалять пробелы и #комментарии из сообщения коммита" -#: builtin/commit.c:1635 +#: builtin/commit.c:1467 msgid "include status in commit message template" msgstr "включить статус файлов в шаблон сообщения коммита" -#: builtin/commit.c:1637 builtin/merge.c:237 builtin/pull.c:179 -#: builtin/revert.c:113 +#: builtin/commit.c:1469 builtin/merge.c:272 builtin/pull.c:184 +#: builtin/revert.c:114 msgid "GPG sign commit" msgstr "подписать коммит с помощью GPG" -#: builtin/commit.c:1640 +#: builtin/commit.c:1472 msgid "Commit contents options" msgstr "Опции содержимого коммита" -#: builtin/commit.c:1641 +#: builtin/commit.c:1473 msgid "commit all changed files" msgstr "закоммитить все измененные файлы" -#: builtin/commit.c:1642 +#: builtin/commit.c:1474 msgid "add specified files to index for commit" msgstr "добавить указанные файлы в индекс для коммита" -#: builtin/commit.c:1643 +#: builtin/commit.c:1475 msgid "interactively add files" msgstr "интерактивное добавление файлов" -#: builtin/commit.c:1644 +#: builtin/commit.c:1476 msgid "interactively add changes" msgstr "интерактивное добавление изменений" -#: builtin/commit.c:1645 +#: builtin/commit.c:1477 msgid "commit only specified files" msgstr "закоммитить только указанные файлы" -#: builtin/commit.c:1646 +#: builtin/commit.c:1478 msgid "bypass pre-commit and commit-msg hooks" msgstr "пропустить перехватчик pre-commit и commit-msg" -#: builtin/commit.c:1647 +#: builtin/commit.c:1479 msgid "show what would be committed" msgstr "показать, что будет закоммичено" -#: builtin/commit.c:1658 +#: builtin/commit.c:1492 msgid "amend previous commit" msgstr "исправить предыдущий коммит" -#: builtin/commit.c:1659 +#: builtin/commit.c:1493 msgid "bypass post-rewrite hook" msgstr "пропустить перехватчик post-rewrite" -#: builtin/commit.c:1664 +#: builtin/commit.c:1498 msgid "ok to record an empty change" msgstr "разрешить запись пустого коммита" -#: builtin/commit.c:1666 +#: builtin/commit.c:1500 msgid "ok to record a change with an empty message" msgstr "разрешить запись изменений с пустым сообщением" -#: builtin/commit.c:1696 -msgid "could not parse HEAD commit" -msgstr "не удалось разобрать HEAD коммит" - -#: builtin/commit.c:1741 +#: builtin/commit.c:1573 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Файл MERGE_HEAD поврежден (%s)" -#: builtin/commit.c:1748 +#: builtin/commit.c:1580 msgid "could not read MERGE_MODE" msgstr "не удалось прочитать MERGE_MODE" -#: builtin/commit.c:1767 +#: builtin/commit.c:1599 #, c-format msgid "could not read commit message: %s" msgstr "не удалось открыть сообщение коммита: %s" -#: builtin/commit.c:1778 +#: builtin/commit.c:1610 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Отмена коммита из-за пустого сообщения коммита.\n" -#: builtin/commit.c:1783 +#: builtin/commit.c:1615 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "Отмена коммита; вы не изменили сообщение.\n" -#: builtin/commit.c:1831 +#: builtin/commit.c:1650 msgid "" -"Repository has been updated, but unable to write\n" +"repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" "not exceeded, and then \"git reset HEAD\" to recover." -msgstr "Репозиторий был обновлен, но не удалось записать файл new_index. Удостоверьтесь, что на диске есть свободное место и квота не исчерпана, а после этого запустите «git reset HEAD» для восстановления." +msgstr "репозиторий был обновлен, но не удалось записать файл new_index. Удостоверьтесь, что на диске есть свободное место и квота не исчерпана, а после этого запустите «git reset HEAD» для восстановления." + +#: builtin/commit-graph.c:10 +msgid "git commit-graph [--object-dir <objdir>]" +msgstr "git commit-graph [--object-dir <каталог-объектов>]" + +#: builtin/commit-graph.c:11 builtin/commit-graph.c:23 +msgid "git commit-graph read [--object-dir <objdir>]" +msgstr "git commit-graph read [--object-dir <каталог-объектов>]" + +#: builtin/commit-graph.c:12 builtin/commit-graph.c:18 +msgid "git commit-graph verify [--object-dir <objdir>]" +msgstr "git commit-graph verify [--object-dir <каталог-объектов>]" + +#: builtin/commit-graph.c:13 builtin/commit-graph.c:28 +msgid "" +"git commit-graph write [--object-dir <objdir>] [--append] [--reachable" +"|--stdin-packs|--stdin-commits]" +msgstr "git commit-graph write [--object-dir <каталог-объектов>] [--append] [--reachable|--stdin-packs|--stdin-commits]" + +#: builtin/commit-graph.c:48 builtin/commit-graph.c:77 +#: builtin/commit-graph.c:131 builtin/commit-graph.c:184 builtin/fetch.c:150 +#: builtin/log.c:1477 +msgid "dir" +msgstr "каталог" + +#: builtin/commit-graph.c:49 builtin/commit-graph.c:78 +#: builtin/commit-graph.c:132 builtin/commit-graph.c:185 +msgid "The object directory to store the graph" +msgstr "" + +#: builtin/commit-graph.c:134 +msgid "start walk at all refs" +msgstr "" + +#: builtin/commit-graph.c:136 +msgid "scan pack-indexes listed by stdin for commits" +msgstr "" + +#: builtin/commit-graph.c:138 +msgid "start walk at commits listed by stdin" +msgstr "" + +#: builtin/commit-graph.c:140 +msgid "include all commits already in the commit-graph file" +msgstr "" + +#: builtin/commit-graph.c:149 +msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" +msgstr "" #: builtin/config.c:10 msgid "git config [<options>]" msgstr "git config [<опции>]" -#: builtin/config.c:58 +#: builtin/config.c:101 +#, c-format +msgid "unrecognized --type argument, %s" +msgstr "" + +#: builtin/config.c:113 +msgid "only one type at a time" +msgstr "" + +#: builtin/config.c:122 msgid "Config file location" msgstr "Размещение файла конфигурации" -#: builtin/config.c:59 +#: builtin/config.c:123 msgid "use global config file" msgstr "использовать глобальный файл конфигурации" -#: builtin/config.c:60 +#: builtin/config.c:124 msgid "use system config file" msgstr "использовать системный файл конфигурации" -#: builtin/config.c:61 +#: builtin/config.c:125 msgid "use repository config file" msgstr "использовать файл конфигурации репозитория" -#: builtin/config.c:62 +#: builtin/config.c:126 msgid "use given config file" msgstr "использовать указанный файл конфигурации" -#: builtin/config.c:63 +#: builtin/config.c:127 msgid "blob-id" msgstr "идент-двоичн-объекта" -#: builtin/config.c:63 +#: builtin/config.c:127 msgid "read config from given blob object" msgstr "прочитать настройки из указанного двоичного объекта" -#: builtin/config.c:64 +#: builtin/config.c:128 msgid "Action" msgstr "Действие" -#: builtin/config.c:65 +#: builtin/config.c:129 msgid "get value: name [value-regex]" msgstr "получить значение: имя [шаблон-значений]" -#: builtin/config.c:66 +#: builtin/config.c:130 msgid "get all values: key [value-regex]" msgstr "получить все значения: ключ [шаблон-значений]" -#: builtin/config.c:67 +#: builtin/config.c:131 msgid "get values for regexp: name-regex [value-regex]" msgstr "получить значения по шаблону: шаблон-имен [шаблон-значений]" -#: builtin/config.c:68 +#: builtin/config.c:132 msgid "get value specific for the URL: section[.var] URL" msgstr "получить значение, специфичное для URL: раздел[.переменная] URL" -#: builtin/config.c:69 +#: builtin/config.c:133 msgid "replace all matching variables: name value [value_regex]" msgstr "заменить все соответствующие переменные: имя значение [шаблон-значений]" -#: builtin/config.c:70 +#: builtin/config.c:134 msgid "add a new variable: name value" msgstr "добавить новую переменную: имя значение" -#: builtin/config.c:71 +#: builtin/config.c:135 msgid "remove a variable: name [value-regex]" msgstr "удалить переменную: имя [шаблон-значений]" -#: builtin/config.c:72 +#: builtin/config.c:136 msgid "remove all matches: name [value-regex]" msgstr "удалить все совпадающие: имя [шаблон-значений]" -#: builtin/config.c:73 +#: builtin/config.c:137 msgid "rename section: old-name new-name" msgstr "переименовать раздел: старое-имя новое-имя" -#: builtin/config.c:74 +#: builtin/config.c:138 msgid "remove a section: name" msgstr "удалить раздел: имя" -#: builtin/config.c:75 +#: builtin/config.c:139 msgid "list all" msgstr "показать весь список" -#: builtin/config.c:76 +#: builtin/config.c:140 msgid "open an editor" msgstr "открыть в редакторе" -#: builtin/config.c:77 +#: builtin/config.c:141 msgid "find the color configured: slot [default]" msgstr "найти настроенный цвет: раздел [по-умолчанию]" -#: builtin/config.c:78 +#: builtin/config.c:142 msgid "find the color setting: slot [stdout-is-tty]" msgstr "проверить, существует ли настроенный цвет: раздел [stdout-есть-tty]" -#: builtin/config.c:79 +#: builtin/config.c:143 msgid "Type" msgstr "Тип" -#: builtin/config.c:80 +#: builtin/config.c:144 +msgid "value is given this type" +msgstr "" + +#: builtin/config.c:145 msgid "value is \"true\" or \"false\"" msgstr "значение — это «true» (правда) или «false» (ложь)" -#: builtin/config.c:81 +#: builtin/config.c:146 msgid "value is decimal number" msgstr "значение — это десятичное число" -#: builtin/config.c:82 +#: builtin/config.c:147 msgid "value is --bool or --int" msgstr "значение — это --bool или --int" -#: builtin/config.c:83 +#: builtin/config.c:148 msgid "value is a path (file or directory name)" msgstr "значение — это путь (к файлу или каталогу)" -#: builtin/config.c:84 +#: builtin/config.c:149 msgid "value is an expiry date" msgstr "значение - это дата окончания срока действия" -#: builtin/config.c:85 +#: builtin/config.c:150 msgid "Other" msgstr "Другое" -#: builtin/config.c:86 +#: builtin/config.c:151 msgid "terminate values with NUL byte" msgstr "завершать значения НУЛЕВЫМ байтом" -#: builtin/config.c:87 +#: builtin/config.c:152 msgid "show variable names only" msgstr "показывать только имена переменных" -#: builtin/config.c:88 +#: builtin/config.c:153 msgid "respect include directives on lookup" msgstr "учитывать директивы include (включения файлов) при запросе" -#: builtin/config.c:89 +#: builtin/config.c:154 msgid "show origin of config (file, standard input, blob, command line)" msgstr "показать источник настройки (файл, стандартный ввод, двоичный объект, командная строка)" -#: builtin/config.c:335 +#: builtin/config.c:155 +msgid "value" +msgstr "" + +#: builtin/config.c:155 +msgid "with --get, use default value when missing entry" +msgstr "" + +#: builtin/config.c:168 +#, c-format +msgid "wrong number of arguments, should be %d" +msgstr "" + +#: builtin/config.c:170 +#, c-format +msgid "wrong number of arguments, should be from %d to %d" +msgstr "" + +#: builtin/config.c:304 +#, c-format +msgid "invalid key pattern: %s" +msgstr "" + +#: builtin/config.c:340 +#, c-format +msgid "failed to format default config value: %s" +msgstr "" + +#: builtin/config.c:397 +#, c-format +msgid "cannot parse color '%s'" +msgstr "" + +#: builtin/config.c:439 msgid "unable to parse default color value" msgstr "не удалось разобрать значение цвета по умолчанию" -#: builtin/config.c:479 +#: builtin/config.c:492 builtin/config.c:724 +msgid "not in a git directory" +msgstr "" + +#: builtin/config.c:495 +msgid "writing to stdin is not supported" +msgstr "" + +#: builtin/config.c:498 +msgid "writing config blobs is not supported" +msgstr "" + +#: builtin/config.c:583 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -7320,190 +9192,246 @@ msgid "" "#\temail = %s\n" msgstr "# Это файл конфигурации пользователя Git.\n[user]\n# Пожалуйста, адаптируйте и раскомментируйте следующие строки:\n#\tuser = %s\n#\temail = %s\n" -#: builtin/config.c:507 +#: builtin/config.c:606 +msgid "only one config file at a time" +msgstr "" + +#: builtin/config.c:611 msgid "--local can only be used inside a git repository" msgstr "--local можно использовать только внутри git репозитория" -#: builtin/config.c:632 +#: builtin/config.c:614 +msgid "--blob can only be used inside a git repository" +msgstr "" + +#: builtin/config.c:633 +msgid "$HOME not set" +msgstr "" + +#: builtin/config.c:670 +msgid "--get-color and variable type are incoherent" +msgstr "" + +#: builtin/config.c:675 +msgid "only one action at a time" +msgstr "" + +#: builtin/config.c:688 +msgid "--name-only is only applicable to --list or --get-regexp" +msgstr "" + +#: builtin/config.c:694 +msgid "" +"--show-origin is only applicable to --get, --get-all, --get-regexp, and " +"--list" +msgstr "" + +#: builtin/config.c:700 +msgid "--default is only applicable to --get" +msgstr "" + +#: builtin/config.c:713 +#, c-format +msgid "unable to read config file '%s'" +msgstr "" + +#: builtin/config.c:716 +msgid "error processing config file(s)" +msgstr "" + +#: builtin/config.c:726 +msgid "editing stdin is not supported" +msgstr "" + +#: builtin/config.c:728 +msgid "editing blobs is not supported" +msgstr "" + +#: builtin/config.c:742 #, c-format msgid "cannot create configuration file %s" msgstr "не удалось создать файл конфигурации %s" -#: builtin/config.c:645 +#: builtin/config.c:755 #, c-format msgid "" "cannot overwrite multiple values with a single value\n" " Use a regexp, --add or --replace-all to change %s." msgstr "нельзя перезаписать несколько значений одним\n Используйте регулярные выражения, параметры --add или --replace-all, чтобы изменить %s." -#: builtin/count-objects.c:88 +#: builtin/config.c:829 builtin/config.c:840 +#, c-format +msgid "no such section: %s" +msgstr "" + +#: builtin/count-objects.c:90 msgid "git count-objects [-v] [-H | --human-readable]" msgstr "git count-objects [-v] [-H | --human-readable]" -#: builtin/count-objects.c:98 +#: builtin/count-objects.c:100 msgid "print sizes in human readable format" msgstr "вывод размеров в удобочитаемом для человека виде" -#: builtin/describe.c:22 +#: builtin/describe.c:26 msgid "git describe [<options>] [<commit-ish>...]" msgstr "git describe [<опции>] [<указатель-коммита>…]" -#: builtin/describe.c:23 +#: builtin/describe.c:27 msgid "git describe [<options>] --dirty" msgstr "git describe [<опции>] --dirty" -#: builtin/describe.c:57 +#: builtin/describe.c:62 msgid "head" msgstr "указатель на ветку" -#: builtin/describe.c:57 +#: builtin/describe.c:62 msgid "lightweight" msgstr "легковесный" -#: builtin/describe.c:57 +#: builtin/describe.c:62 msgid "annotated" msgstr "аннотированный" -#: builtin/describe.c:267 +#: builtin/describe.c:272 #, c-format msgid "annotated tag %s not available" msgstr "аннотированная метка %s не доступна" -#: builtin/describe.c:271 +#: builtin/describe.c:276 #, c-format msgid "annotated tag %s has no embedded name" msgstr "аннотированная метка %s не содержит встроенного названия" -#: builtin/describe.c:273 +#: builtin/describe.c:278 #, c-format msgid "tag '%s' is really '%s' here" msgstr "метка «%s» уже здесь «%s»" -#: builtin/describe.c:314 +#: builtin/describe.c:322 #, c-format msgid "no tag exactly matches '%s'" msgstr "нет меток, точно соответствующих «%s»" -#: builtin/describe.c:316 +#: builtin/describe.c:324 #, c-format msgid "No exact match on refs or tags, searching to describe\n" msgstr "Нет точных совпадений по ссылкам или тегам, ищу описания\n" -#: builtin/describe.c:363 +#: builtin/describe.c:378 #, c-format msgid "finished search at %s\n" msgstr "поиск окончен на %s\n" -#: builtin/describe.c:389 +#: builtin/describe.c:404 #, c-format msgid "" "No annotated tags can describe '%s'.\n" "However, there were unannotated tags: try --tags." msgstr "Нет аннотированных меток, которые могут описать «%s».\nНо имеются неаннотированные метки: попробуйте добавить параметр --tags." -#: builtin/describe.c:393 +#: builtin/describe.c:408 #, c-format msgid "" "No tags can describe '%s'.\n" "Try --always, or create some tags." msgstr "Нет меток, которые могут описать «%s….\nПопробуйте добавить параметр --always или создать какие-нибудь метки." -#: builtin/describe.c:423 +#: builtin/describe.c:438 #, c-format msgid "traversed %lu commits\n" msgstr "посещено %lu коммитов\n" -#: builtin/describe.c:426 +#: builtin/describe.c:441 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" "gave up search at %s\n" msgstr "более %i меток найдено; показано последние %i\nостановлен поиск после %s\n" -#: builtin/describe.c:494 +#: builtin/describe.c:509 #, c-format msgid "describe %s\n" msgstr "описать %s\n" -#: builtin/describe.c:497 builtin/log.c:500 +#: builtin/describe.c:512 builtin/log.c:508 #, c-format msgid "Not a valid object name %s" msgstr "Недопустимое имя объекта %s" -#: builtin/describe.c:505 +#: builtin/describe.c:520 #, c-format msgid "%s is neither a commit nor blob" msgstr "%s не является коммитом или двоичным объектом" -#: builtin/describe.c:519 +#: builtin/describe.c:534 msgid "find the tag that comes after the commit" msgstr "поиск метки, которая идет после коммита" -#: builtin/describe.c:520 +#: builtin/describe.c:535 msgid "debug search strategy on stderr" msgstr "вывод отладочной информации стратегии поиска на стандартный вывод" -#: builtin/describe.c:521 +#: builtin/describe.c:536 msgid "use any ref" msgstr "использовать любую ссылку" -#: builtin/describe.c:522 +#: builtin/describe.c:537 msgid "use any tag, even unannotated" msgstr "использовать любую метку, даже неаннотированную" -#: builtin/describe.c:523 +#: builtin/describe.c:538 msgid "always use long format" msgstr "всегда использовать длинный формат вывода" -#: builtin/describe.c:524 +#: builtin/describe.c:539 msgid "only follow first parent" msgstr "следовать только за первым родителем" -#: builtin/describe.c:527 +#: builtin/describe.c:542 msgid "only output exact matches" msgstr "выводить только точные совпадения" -#: builtin/describe.c:529 +#: builtin/describe.c:544 msgid "consider <n> most recent tags (default: 10)" msgstr "рассматривать последние <n> меток (по умолчанию: 10)" -#: builtin/describe.c:531 +#: builtin/describe.c:546 msgid "only consider tags matching <pattern>" msgstr "рассматривать только метки по <шаблону>" -#: builtin/describe.c:533 +#: builtin/describe.c:548 msgid "do not consider tags matching <pattern>" msgstr "не учитывать метки, которые соответствуют <шаблону>" -#: builtin/describe.c:535 builtin/name-rev.c:406 +#: builtin/describe.c:550 builtin/name-rev.c:424 msgid "show abbreviated commit object as fallback" msgstr "если не найдено, показать сокращенный номер редакции коммита" -#: builtin/describe.c:536 builtin/describe.c:539 +#: builtin/describe.c:551 builtin/describe.c:554 msgid "mark" msgstr "пометка" -#: builtin/describe.c:537 +#: builtin/describe.c:552 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "добавить <пометку> при измененном рабочем каталоге (по умолчанию: «-dirty»)" -#: builtin/describe.c:540 +#: builtin/describe.c:555 msgid "append <mark> on broken working tree (default: \"-broken\")" msgstr "добавить <пометку> на повреждённое рабочее дерево (по умолчанию: «-broken»)" -#: builtin/describe.c:558 +#: builtin/describe.c:573 msgid "--long is incompatible with --abbrev=0" msgstr "--long несовместимо с --abbrev=0" -#: builtin/describe.c:587 +#: builtin/describe.c:602 msgid "No names found, cannot describe anything." msgstr "Имена не найдены, не могу ничего описать." -#: builtin/describe.c:637 +#: builtin/describe.c:652 msgid "--dirty is incompatible with commit-ishes" msgstr "--dirty несовместимо с указанием указателей коммитов" -#: builtin/describe.c:639 +#: builtin/describe.c:654 msgid "--broken is incompatible with commit-ishes" msgstr "--broken несовместимо с указанием указателей коммитов" @@ -7517,82 +9445,82 @@ msgstr "«%s»: не является обычным файлом или сим msgid "invalid option: %s" msgstr "неправильный параметр: %s" -#: builtin/diff.c:356 +#: builtin/diff.c:363 msgid "Not a git repository" -msgstr "Не найден git репозитоий" +msgstr "Не найден git репозиторий" -#: builtin/diff.c:399 +#: builtin/diff.c:407 #, c-format msgid "invalid object '%s' given." msgstr "передан неправильный объект «%s»." -#: builtin/diff.c:408 +#: builtin/diff.c:416 #, c-format msgid "more than two blobs given: '%s'" msgstr "передано больше двух двоичных объектов: «%s»" -#: builtin/diff.c:413 +#: builtin/diff.c:421 #, c-format msgid "unhandled object '%s' given." msgstr "передан необработанный объект «%s»." -#: builtin/difftool.c:29 +#: builtin/difftool.c:30 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" msgstr "git difftool [<опции>] [<коммит> [<коммит>]] [--] [<путь>…]" -#: builtin/difftool.c:259 +#: builtin/difftool.c:260 #, c-format msgid "failed: %d" msgstr "сбой: %d" -#: builtin/difftool.c:301 +#: builtin/difftool.c:302 #, c-format msgid "could not read symlink %s" msgstr "не удалось прочитать символьную ссылку %s" -#: builtin/difftool.c:303 +#: builtin/difftool.c:304 #, c-format msgid "could not read symlink file %s" msgstr "не удалось прочитать файл символьной ссылки %s" -#: builtin/difftool.c:311 +#: builtin/difftool.c:312 #, c-format msgid "could not read object %s for symlink %s" msgstr "не удалось прочитать объект %s для символьной ссылки %s" -#: builtin/difftool.c:412 +#: builtin/difftool.c:413 msgid "" "combined diff formats('-c' and '--cc') are not supported in\n" "directory diff mode('-d' and '--dir-diff')." msgstr "комбинированные форматы различий файлов(«-c» и «--cc») не поддерживаются в режиме сравнения каталогов(«-d» и «--dir-diff»)." -#: builtin/difftool.c:632 +#: builtin/difftool.c:633 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "оба файла изменены: «%s» и «%s»." -#: builtin/difftool.c:634 +#: builtin/difftool.c:635 msgid "working tree file has been left." msgstr "рабочий каталог был покинут." -#: builtin/difftool.c:645 +#: builtin/difftool.c:646 #, c-format msgid "temporary files exist in '%s'." msgstr "временные файлы уже находятся в «%s»." -#: builtin/difftool.c:646 +#: builtin/difftool.c:647 msgid "you may want to cleanup or recover these." msgstr "возможно вы хотите их удалить или восстановить." -#: builtin/difftool.c:695 +#: builtin/difftool.c:696 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "использовать «diff.guitool» вместо «diff.tool»" -#: builtin/difftool.c:697 +#: builtin/difftool.c:698 msgid "perform a full-directory diff" msgstr "выполнить пофайловое сравнение всего каталога" -#: builtin/difftool.c:699 +#: builtin/difftool.c:700 msgid "do not prompt before launching a diff tool" msgstr "не спрашивать перед запуском утилиты сравнения" @@ -7601,8 +9529,8 @@ msgid "use symlinks in dir-diff mode" msgstr "использовать символьные ссылки в режиме сравнения каталога" #: builtin/difftool.c:706 -msgid "<tool>" -msgstr "<утилита>" +msgid "tool" +msgstr "" #: builtin/difftool.c:707 msgid "use the specified diff tool" @@ -7618,10 +9546,6 @@ msgid "" " code" msgstr "выходить из «git-difftool», если вызванная утилита сравнения вернула не нулевой код возврата" -#: builtin/difftool.c:714 -msgid "<command>" -msgstr "<команда>" - #: builtin/difftool.c:715 msgid "specify a custom command for viewing diffs" msgstr "использовать особую команду для просмотра различий" @@ -7634,349 +9558,368 @@ msgstr "не передана <утилита> для --tool=<утилита>" msgid "no <cmd> given for --extcmd=<cmd>" msgstr "не передана <команда> для --extcmd=<команда>" -#: builtin/fast-export.c:26 +#: builtin/fast-export.c:29 msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [опции-rev-list]" -#: builtin/fast-export.c:998 +#: builtin/fast-export.c:1006 msgid "show progress after <n> objects" msgstr "показать прогресс после <n> объектов" -#: builtin/fast-export.c:1000 +#: builtin/fast-export.c:1008 msgid "select handling of signed tags" msgstr "выбор обработки подписанных меток" -#: builtin/fast-export.c:1003 +#: builtin/fast-export.c:1011 msgid "select handling of tags that tag filtered objects" msgstr "выбор обработки меток, которыми помечены отфильтрованные объекты" -#: builtin/fast-export.c:1006 +#: builtin/fast-export.c:1014 msgid "Dump marks to this file" msgstr "Записать пометки в этот файл" -#: builtin/fast-export.c:1008 +#: builtin/fast-export.c:1016 msgid "Import marks from this file" msgstr "Импортировать пометки из этого файла" -#: builtin/fast-export.c:1010 +#: builtin/fast-export.c:1018 msgid "Fake a tagger when tags lack one" msgstr "Подделать автора метки, если у метки он отсутствует" -#: builtin/fast-export.c:1012 +#: builtin/fast-export.c:1020 msgid "Output full tree for each commit" msgstr "Вывести полное дерево для каждого коммита" -#: builtin/fast-export.c:1014 +#: builtin/fast-export.c:1022 msgid "Use the done feature to terminate the stream" msgstr "Использовать пометку завершения в конце потока" -#: builtin/fast-export.c:1015 +#: builtin/fast-export.c:1023 msgid "Skip output of blob data" msgstr "Пропустить вывод данных двоичных объектов" -#: builtin/fast-export.c:1016 +#: builtin/fast-export.c:1024 msgid "refspec" msgstr "спецификатор ссылки" -#: builtin/fast-export.c:1017 +#: builtin/fast-export.c:1025 msgid "Apply refspec to exported refs" msgstr "Применить спецификатор ссылки к экспортируемым ссылкам" -#: builtin/fast-export.c:1018 +#: builtin/fast-export.c:1026 msgid "anonymize output" msgstr "сделать вывод анонимным" -#: builtin/fetch.c:24 +#: builtin/fetch.c:27 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [<опции>] [<репозиторий> [<спецификатор-ссылки>…]]" -#: builtin/fetch.c:25 +#: builtin/fetch.c:28 msgid "git fetch [<options>] <group>" msgstr "git fetch [<опции>] <группа>" -#: builtin/fetch.c:26 +#: builtin/fetch.c:29 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [<опции>] [(<репозиторий> | <группа>)…]" -#: builtin/fetch.c:27 +#: builtin/fetch.c:30 msgid "git fetch --all [<options>]" msgstr "git fetch --all [<опции>]" -#: builtin/fetch.c:113 builtin/pull.c:188 +#: builtin/fetch.c:112 builtin/pull.c:193 msgid "fetch from all remotes" msgstr "извлечь со всех внешних репозиториев" -#: builtin/fetch.c:115 builtin/pull.c:191 +#: builtin/fetch.c:114 builtin/pull.c:196 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "дописать к .git/FETCH_HEAD вместо перезаписи" -#: builtin/fetch.c:117 builtin/pull.c:194 +#: builtin/fetch.c:116 builtin/pull.c:199 msgid "path to upload pack on remote end" msgstr "путь к программе упаковки пакета на машине с внешним репозиторием" -#: builtin/fetch.c:118 builtin/pull.c:196 +#: builtin/fetch.c:117 builtin/pull.c:201 msgid "force overwrite of local branch" msgstr "принудительная перезапись локальной ветки" -#: builtin/fetch.c:120 +#: builtin/fetch.c:119 msgid "fetch from multiple remotes" msgstr "извлечь с нескольких внешних репозиториев" -#: builtin/fetch.c:122 builtin/pull.c:198 +#: builtin/fetch.c:121 builtin/pull.c:203 msgid "fetch all tags and associated objects" msgstr "извлечь все метки и связанные объекты" -#: builtin/fetch.c:124 +#: builtin/fetch.c:123 msgid "do not fetch all tags (--no-tags)" msgstr "не извлекать все метки (--no-tags)" -#: builtin/fetch.c:126 +#: builtin/fetch.c:125 msgid "number of submodules fetched in parallel" msgstr "количество подмодулей, которые будут скачаны парралельно" -#: builtin/fetch.c:128 builtin/pull.c:201 +#: builtin/fetch.c:127 builtin/pull.c:206 msgid "prune remote-tracking branches no longer on remote" msgstr "почистить отслеживаемые внешние ветки, которых уже нет на внешнем репозитории" -#: builtin/fetch.c:129 builtin/fetch.c:152 builtin/pull.c:126 +#: builtin/fetch.c:129 +msgid "prune local tags no longer on remote and clobber changed tags" +msgstr "" + +#: builtin/fetch.c:130 builtin/fetch.c:153 builtin/pull.c:131 msgid "on-demand" msgstr "по требованию" -#: builtin/fetch.c:130 +#: builtin/fetch.c:131 msgid "control recursive fetching of submodules" msgstr "управление рекурсивным извлечением подмодулей" -#: builtin/fetch.c:134 builtin/pull.c:209 +#: builtin/fetch.c:135 builtin/pull.c:214 msgid "keep downloaded pack" msgstr "оставить загруженный пакет данных" -#: builtin/fetch.c:136 +#: builtin/fetch.c:137 msgid "allow updating of HEAD ref" msgstr "разрешить обновление ссылки HEAD" -#: builtin/fetch.c:139 builtin/fetch.c:145 builtin/pull.c:212 +#: builtin/fetch.c:140 builtin/fetch.c:146 builtin/pull.c:217 msgid "deepen history of shallow clone" msgstr "улугубить историю частичного клона" -#: builtin/fetch.c:141 +#: builtin/fetch.c:142 msgid "deepen history of shallow repository based on time" msgstr "углубить историю частичного клона основываясь на времени" -#: builtin/fetch.c:147 builtin/pull.c:215 +#: builtin/fetch.c:148 builtin/pull.c:220 msgid "convert to a complete repository" msgstr "преобразовать в полный репозиторий" -#: builtin/fetch.c:149 builtin/log.c:1463 -msgid "dir" -msgstr "каталог" - -#: builtin/fetch.c:150 +#: builtin/fetch.c:151 msgid "prepend this to submodule path output" msgstr "присоединять это спереди к выводу путей подмодуля" -#: builtin/fetch.c:153 +#: builtin/fetch.c:154 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" msgstr "настроить по умолчанию рекурсивное извлечение подмодулей (более низкий приоритет, чем файлы конфигурации)" -#: builtin/fetch.c:157 builtin/pull.c:218 +#: builtin/fetch.c:158 builtin/pull.c:223 msgid "accept refs that update .git/shallow" msgstr "принимать ссылки, которые обновляют .git/shallow" -#: builtin/fetch.c:158 builtin/pull.c:220 +#: builtin/fetch.c:159 builtin/pull.c:225 msgid "refmap" msgstr "соответствие-ссылок" -#: builtin/fetch.c:159 builtin/pull.c:221 +#: builtin/fetch.c:160 builtin/pull.c:226 msgid "specify fetch refmap" msgstr "указать соответствие ссылок при извлечении" -#: builtin/fetch.c:417 +#: builtin/fetch.c:161 builtin/ls-remote.c:77 builtin/push.c:582 +#: builtin/send-pack.c:172 +msgid "server-specific" +msgstr "зависит-от-сервера" + +#: builtin/fetch.c:161 builtin/ls-remote.c:77 builtin/push.c:582 +#: builtin/send-pack.c:173 +msgid "option to transmit" +msgstr "передаваемые опции" + +#: builtin/fetch.c:167 +msgid "report that we have only objects reachable from this object" +msgstr "" + +#: builtin/fetch.c:418 msgid "Couldn't find remote ref HEAD" msgstr "Не удалось найти ссылку HEAD на внешнем репозитории" -#: builtin/fetch.c:535 +#: builtin/fetch.c:552 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "опция fetch.output содержит неправильное значение для %s" -#: builtin/fetch.c:628 +#: builtin/fetch.c:645 #, c-format msgid "object %s not found" msgstr "объект %s не найден" -#: builtin/fetch.c:632 +#: builtin/fetch.c:649 msgid "[up to date]" msgstr "[актуально]" -#: builtin/fetch.c:645 builtin/fetch.c:725 +#: builtin/fetch.c:662 builtin/fetch.c:744 msgid "[rejected]" msgstr "[отклонено]" -#: builtin/fetch.c:646 +#: builtin/fetch.c:663 msgid "can't fetch in current branch" msgstr "нельзя извлечь текущую ветку" -#: builtin/fetch.c:655 +#: builtin/fetch.c:672 msgid "[tag update]" msgstr "[обновление метки]" -#: builtin/fetch.c:656 builtin/fetch.c:689 builtin/fetch.c:705 -#: builtin/fetch.c:720 +#: builtin/fetch.c:673 builtin/fetch.c:708 builtin/fetch.c:724 +#: builtin/fetch.c:739 msgid "unable to update local ref" msgstr "не удалось обновить локальную ссылку" -#: builtin/fetch.c:675 +#: builtin/fetch.c:694 msgid "[new tag]" msgstr "[новая метка]" -#: builtin/fetch.c:678 +#: builtin/fetch.c:697 msgid "[new branch]" msgstr "[новая ветка]" -#: builtin/fetch.c:681 +#: builtin/fetch.c:700 msgid "[new ref]" msgstr "[новая ссылка]" -#: builtin/fetch.c:720 +#: builtin/fetch.c:739 msgid "forced update" msgstr "принудительное обновление" -#: builtin/fetch.c:725 +#: builtin/fetch.c:744 msgid "non-fast-forward" msgstr "без перемотки вперед" -#: builtin/fetch.c:770 +#: builtin/fetch.c:790 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s не отправил все необходимые объекты\n" -#: builtin/fetch.c:790 +#: builtin/fetch.c:811 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "%s отклонено из-за того, что частичные корни не разрешено обновлять" -#: builtin/fetch.c:878 builtin/fetch.c:974 +#: builtin/fetch.c:900 builtin/fetch.c:1011 #, c-format msgid "From %.*s\n" msgstr "Из %.*s\n" -#: builtin/fetch.c:889 +#: builtin/fetch.c:911 #, c-format msgid "" "some local refs could not be updated; try running\n" " 'git remote prune %s' to remove any old, conflicting branches" msgstr "не удалось обновить некоторые локальные ссылки; попробуйте запустить «git remote prune %s», чтобы почистить старые, конфликтующие ветки" -#: builtin/fetch.c:944 +#: builtin/fetch.c:981 #, c-format msgid " (%s will become dangling)" msgstr " (%s будет висящей веткой)" -#: builtin/fetch.c:945 +#: builtin/fetch.c:982 #, c-format msgid " (%s has become dangling)" msgstr " (%s стала висящей веткой)" -#: builtin/fetch.c:977 +#: builtin/fetch.c:1014 msgid "[deleted]" msgstr "[удалено]" -#: builtin/fetch.c:978 builtin/remote.c:1024 +#: builtin/fetch.c:1015 builtin/remote.c:1035 msgid "(none)" msgstr "(нет)" -#: builtin/fetch.c:1001 +#: builtin/fetch.c:1038 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "Отказ получения в текущую ветку %s не голого репозитория" -#: builtin/fetch.c:1020 +#: builtin/fetch.c:1057 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "Неправильное значение «%2$s» для параметра «%1$s» для %3$s" -#: builtin/fetch.c:1023 +#: builtin/fetch.c:1060 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "Параметр «%s» игнорируется для %s\n" -#: builtin/fetch.c:1256 +#: builtin/fetch.c:1339 #, c-format msgid "Fetching %s\n" msgstr "Извлечение из %s\n" -#: builtin/fetch.c:1258 builtin/remote.c:97 +#: builtin/fetch.c:1341 builtin/remote.c:99 #, c-format msgid "Could not fetch %s" msgstr "Не удалось извлечь %s" -#: builtin/fetch.c:1276 +#: builtin/fetch.c:1387 builtin/fetch.c:1555 +msgid "" +"--filter can only be used with the remote configured in core.partialClone" +msgstr "" + +#: builtin/fetch.c:1410 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." msgstr "Не указан внешний репозиторий. Укажите URL или имя внешнего репозитория из которого должны извлекаться новые редакции." -#: builtin/fetch.c:1299 +#: builtin/fetch.c:1447 msgid "You need to specify a tag name." msgstr "Вам нужно указать имя метки." -#: builtin/fetch.c:1342 +#: builtin/fetch.c:1496 msgid "Negative depth in --deepen is not supported" msgstr "Отрицательная грубина для --deepen не поддерживается" -#: builtin/fetch.c:1344 +#: builtin/fetch.c:1498 msgid "--deepen and --depth are mutually exclusive" msgstr "--deepen и --depth нельзя использовать одновременно" -#: builtin/fetch.c:1349 +#: builtin/fetch.c:1503 msgid "--depth and --unshallow cannot be used together" msgstr "нельзя использовать одновременно --depth и --unshallow" -#: builtin/fetch.c:1351 +#: builtin/fetch.c:1505 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow не имеет смысла на полном репозитории" -#: builtin/fetch.c:1364 +#: builtin/fetch.c:1521 msgid "fetch --all does not take a repository argument" msgstr "fetch --all не принимает имя репозитория как аргумент" -#: builtin/fetch.c:1366 +#: builtin/fetch.c:1523 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all не имеет смысла при указании спецификаторов ссылок" -#: builtin/fetch.c:1377 +#: builtin/fetch.c:1532 #, c-format msgid "No such remote or remote group: %s" msgstr "Нет такого внешнего репозитория или группы: %s" -#: builtin/fetch.c:1385 +#: builtin/fetch.c:1539 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Получение группы и указание спецификаций ссылок не имеет смысла" -#: builtin/fmt-merge-msg.c:15 +#: builtin/fmt-merge-msg.c:17 msgid "" "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" msgstr "git fmt-merge-msg [-m <сообщение>] [--log[=<n>] | --no-log] [--file <файл>]" -#: builtin/fmt-merge-msg.c:666 +#: builtin/fmt-merge-msg.c:671 msgid "populate log with at most <n> entries from shortlog" msgstr "отправить в журнал <n> записей из короткого журнала" -#: builtin/fmt-merge-msg.c:669 +#: builtin/fmt-merge-msg.c:674 msgid "alias for --log (deprecated)" msgstr "сокращение для --log (устаревшее)" -#: builtin/fmt-merge-msg.c:672 +#: builtin/fmt-merge-msg.c:677 msgid "text" msgstr "текст" -#: builtin/fmt-merge-msg.c:673 +#: builtin/fmt-merge-msg.c:678 msgid "use <text> as start of message" msgstr "использовать <текст> как начальное сообщение" -#: builtin/fmt-merge-msg.c:674 +#: builtin/fmt-merge-msg.c:679 msgid "file to read from" msgstr "файл для чтения" @@ -8016,7 +9959,7 @@ msgstr "выводить указатели места заполнения в msgid "show only <n> matched refs" msgstr "показать только <n> совпадающих ссылок" -#: builtin/for-each-ref.c:39 builtin/tag.c:414 +#: builtin/for-each-ref.c:39 builtin/tag.c:422 msgid "respect format colors" msgstr "использовать цвета из формата" @@ -8040,81 +9983,81 @@ msgstr "вывод только ссылок, которые содержат к msgid "print only refs which don't contain the commit" msgstr "вывод только ссылок, которые не содержат коммит" -#: builtin/fsck.c:543 +#: builtin/fsck.c:574 msgid "Checking object directories" msgstr "Проверка каталогов объектов" -#: builtin/fsck.c:635 +#: builtin/fsck.c:666 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<опции>] [<объект>…]" -#: builtin/fsck.c:641 +#: builtin/fsck.c:672 msgid "show unreachable objects" msgstr "показать недоступные объекты" -#: builtin/fsck.c:642 +#: builtin/fsck.c:673 msgid "show dangling objects" msgstr "показать объекты, на которые нет ссылок" -#: builtin/fsck.c:643 +#: builtin/fsck.c:674 msgid "report tags" msgstr "вывести отчет по меткам" -#: builtin/fsck.c:644 +#: builtin/fsck.c:675 msgid "report root nodes" msgstr "вывести отчет по корневым узлам" -#: builtin/fsck.c:645 +#: builtin/fsck.c:676 msgid "make index objects head nodes" msgstr "воспринимать объекты в индексе как корневые узлы" -#: builtin/fsck.c:646 +#: builtin/fsck.c:677 msgid "make reflogs head nodes (default)" msgstr "создать корневые узлы журналов ссылок (по умолчанию)" -#: builtin/fsck.c:647 +#: builtin/fsck.c:678 msgid "also consider packs and alternate objects" msgstr "также проверять пакеты и альтернативные объекты" -#: builtin/fsck.c:648 +#: builtin/fsck.c:679 msgid "check only connectivity" msgstr "только проверить соединение" -#: builtin/fsck.c:649 +#: builtin/fsck.c:680 msgid "enable more strict checking" msgstr "использовать более строгую проверку" -#: builtin/fsck.c:651 +#: builtin/fsck.c:682 msgid "write dangling objects in .git/lost-found" msgstr "записать объекты на которые нет ссылок в .git/lost-found" -#: builtin/fsck.c:652 builtin/prune.c:107 +#: builtin/fsck.c:683 builtin/prune.c:110 msgid "show progress" msgstr "показать прогресс выполнения" -#: builtin/fsck.c:653 +#: builtin/fsck.c:684 msgid "show verbose names for reachable objects" msgstr "показать подробные имена для недоступных объектов" -#: builtin/fsck.c:714 +#: builtin/fsck.c:750 msgid "Checking objects" msgstr "Проверка объектов" -#: builtin/gc.c:27 +#: builtin/gc.c:34 msgid "git gc [<options>]" msgstr "git gc [<опции>]" -#: builtin/gc.c:80 +#: builtin/gc.c:90 #, c-format msgid "Failed to fstat %s: %s" msgstr "Не удалось выполнить fstat %s: %s" -#: builtin/gc.c:312 +#: builtin/gc.c:455 #, c-format msgid "Can't stat %s" msgstr "Не удалось выполнить stat для %s" -#: builtin/gc.c:321 +#: builtin/gc.c:464 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -8124,55 +10067,64 @@ msgid "" "%s" msgstr "Последний запуск gc сообщил следующее. Пожалуйста, исправьте ошибку и удалите %s.\nАвтоматическая очистка репозитория не будет производиться, пока этот файл не удалён.\n\n%s" -#: builtin/gc.c:360 +#: builtin/gc.c:505 msgid "prune unreferenced objects" msgstr "почистить объекты, на которые нет ссылок" -#: builtin/gc.c:362 +#: builtin/gc.c:507 msgid "be more thorough (increased runtime)" msgstr "проверять более внимательно (занимает больше времени)" -#: builtin/gc.c:363 +#: builtin/gc.c:508 msgid "enable auto-gc mode" msgstr "включить режим auto-gc" -#: builtin/gc.c:364 +#: builtin/gc.c:511 msgid "force running gc even if there may be another gc running" msgstr "принудительно запустить gc, даже есть другая копия gc уже запущена" -#: builtin/gc.c:381 +#: builtin/gc.c:514 +msgid "repack all other packs except the largest pack" +msgstr "" + +#: builtin/gc.c:531 #, c-format -msgid "Failed to parse gc.logexpiry value %s" -msgstr "Не удалось разобрать значение %s для gc.logexpiry" +msgid "failed to parse gc.logexpiry value %s" +msgstr "" -#: builtin/gc.c:409 +#: builtin/gc.c:542 +#, c-format +msgid "failed to parse prune expiry value %s" +msgstr "" + +#: builtin/gc.c:562 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "Автоматическая упаковка репозитория в фоне, для оптимальной производительности.\n" -#: builtin/gc.c:411 +#: builtin/gc.c:564 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "Автоматическая упаковка репозитория, для оптимальной производительности.\n" -#: builtin/gc.c:412 +#: builtin/gc.c:565 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "Смотрите «git help gc» руководства по ручной очистке.\n" -#: builtin/gc.c:437 +#: builtin/gc.c:601 #, 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:481 +#: builtin/gc.c:652 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove " "them." msgstr "Имеется слишком много объектов, на которые нет ссылок; запустите «git prune» для их удаления." -#: builtin/grep.c:27 +#: builtin/grep.c:28 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "git grep [<опции>] [-e] <шаблон> [<редакция>…] [[--] <путь>…]" @@ -8189,428 +10141,408 @@ msgstr "указано недопустимое количество поток #. TRANSLATORS: %s is the configuration #. variable for tweaking threads, currently #. grep.threads -#: builtin/grep.c:293 builtin/index-pack.c:1495 builtin/index-pack.c:1688 +#: builtin/grep.c:293 builtin/index-pack.c:1536 builtin/index-pack.c:1728 +#: builtin/pack-objects.c:2639 #, c-format msgid "no threads support, ignoring %s" msgstr "нет поддержки потоков, игнорирование %s" -#: builtin/grep.c:453 builtin/grep.c:573 builtin/grep.c:615 +#: builtin/grep.c:461 builtin/grep.c:582 builtin/grep.c:623 #, c-format msgid "unable to read tree (%s)" msgstr "не удалось прочитать дерево (%s)" -#: builtin/grep.c:630 +#: builtin/grep.c:638 #, c-format msgid "unable to grep from object of type %s" msgstr "не удалось выполнить grep из объекта типа %s" -#: builtin/grep.c:696 +#: builtin/grep.c:704 #, c-format msgid "switch `%c' expects a numerical value" msgstr "параметр «%c» ожидает числовое значение" -#: builtin/grep.c:783 +#: builtin/grep.c:791 msgid "search in index instead of in the work tree" msgstr "искать в индексе, а не в рабочем каталоге" -#: builtin/grep.c:785 +#: builtin/grep.c:793 msgid "find in contents not managed by git" msgstr "искать в содержимом не управляемым git" -#: builtin/grep.c:787 +#: builtin/grep.c:795 msgid "search in both tracked and untracked files" msgstr "искать и в отслеживаемых, и в неотслеживаемых файлах" -#: builtin/grep.c:789 +#: builtin/grep.c:797 msgid "ignore files specified via '.gitignore'" msgstr "игнорировать файлы указанные в «.gitignore»" -#: builtin/grep.c:791 +#: builtin/grep.c:799 msgid "recursively search in each submodule" msgstr "рекурсивный поиск по всем подмодулям" -#: builtin/grep.c:794 +#: builtin/grep.c:802 msgid "show non-matching lines" msgstr "искать в несовпадающих строках" -#: builtin/grep.c:796 +#: builtin/grep.c:804 msgid "case insensitive matching" msgstr "без учета регистра" -#: builtin/grep.c:798 +#: builtin/grep.c:806 msgid "match patterns only at word boundaries" msgstr "искать совпадения шаблона только на границах слов" -#: builtin/grep.c:800 +#: builtin/grep.c:808 msgid "process binary files as text" msgstr "обработка двоичных файлов как текста" -#: builtin/grep.c:802 +#: builtin/grep.c:810 msgid "don't match patterns in binary files" msgstr "не искать совпадения шаблона в двоичных файлах" -#: builtin/grep.c:805 +#: builtin/grep.c:813 msgid "process binary files with textconv filters" msgstr "обрабатываться двоичные файлы с помощью фильтров textconv" -#: builtin/grep.c:807 +#: builtin/grep.c:815 msgid "descend at most <depth> levels" msgstr "на глубине максиму <глубина> уровней" -#: builtin/grep.c:811 +#: builtin/grep.c:819 msgid "use extended POSIX regular expressions" msgstr "использовать расширенные регулярные выражения POSIX" -#: builtin/grep.c:814 +#: builtin/grep.c:822 msgid "use basic POSIX regular expressions (default)" msgstr "использовать базовые регулярные выражения POSIX (по умолчанию)" -#: builtin/grep.c:817 +#: builtin/grep.c:825 msgid "interpret patterns as fixed strings" msgstr "интерпретировать шаблоны как фиксированные строки" -#: builtin/grep.c:820 +#: builtin/grep.c:828 msgid "use Perl-compatible regular expressions" msgstr "использовать Perl-совместимые регулярные выражения" -#: builtin/grep.c:823 +#: builtin/grep.c:831 msgid "show line numbers" msgstr "вывести номера строк" -#: builtin/grep.c:824 +#: builtin/grep.c:832 +msgid "show column number of first match" +msgstr "" + +#: builtin/grep.c:833 msgid "don't show filenames" msgstr "не выводить имена файлов" -#: builtin/grep.c:825 +#: builtin/grep.c:834 msgid "show filenames" msgstr "выводить имена файлов" -#: builtin/grep.c:827 +#: builtin/grep.c:836 msgid "show filenames relative to top directory" msgstr "выводить имена файлов относительно каталога репозитория" -#: builtin/grep.c:829 +#: builtin/grep.c:838 msgid "show only filenames instead of matching lines" msgstr "выводить только имена файлов, а не совпадающие строки" -#: builtin/grep.c:831 +#: builtin/grep.c:840 msgid "synonym for --files-with-matches" msgstr "синоним для --files-with-matches" -#: builtin/grep.c:834 +#: builtin/grep.c:843 msgid "show only the names of files without match" msgstr "выводить только несовпадающие имена файлов" -#: builtin/grep.c:836 +#: builtin/grep.c:845 msgid "print NUL after filenames" msgstr "выводить двоичный НОЛЬ после списка имен файлов" -#: builtin/grep.c:838 +#: builtin/grep.c:848 +msgid "show only matching parts of a line" +msgstr "" + +#: builtin/grep.c:850 msgid "show the number of matches instead of matching lines" msgstr "выводить количество совпадений, а не совпадающие строки" -#: builtin/grep.c:839 +#: builtin/grep.c:851 msgid "highlight matches" msgstr "подсвечивать совпадения" -#: builtin/grep.c:841 +#: builtin/grep.c:853 msgid "print empty line between matches from different files" msgstr "выводить пустую строку после совпадений из разных файлов" -#: builtin/grep.c:843 +#: builtin/grep.c:855 msgid "show filename only once above matches from same file" msgstr "выводить имя файла только раз на несколько совпадений в одном файле" -#: builtin/grep.c:846 +#: builtin/grep.c:858 msgid "show <n> context lines before and after matches" msgstr "показать <n> строк контекста перед и после совпадения" -#: builtin/grep.c:849 +#: builtin/grep.c:861 msgid "show <n> context lines before matches" msgstr "показать <n> строк контекста перед совпадением" -#: builtin/grep.c:851 +#: builtin/grep.c:863 msgid "show <n> context lines after matches" msgstr "показать <n> строк контекста после совпадения" -#: builtin/grep.c:853 +#: builtin/grep.c:865 msgid "use <n> worker threads" msgstr "использовать <кол> рабочих потоков" -#: builtin/grep.c:854 +#: builtin/grep.c:866 msgid "shortcut for -C NUM" msgstr "тоже, что и -C КОЛИЧЕСТВО" -#: builtin/grep.c:857 +#: builtin/grep.c:869 msgid "show a line with the function name before matches" msgstr "показать строку с именем функции перед совпадением" -#: builtin/grep.c:859 +#: builtin/grep.c:871 msgid "show the surrounding function" msgstr "показать окружающую функцию" -#: builtin/grep.c:862 +#: builtin/grep.c:874 msgid "read patterns from file" msgstr "прочитать шаблоны из файла" -#: builtin/grep.c:864 +#: builtin/grep.c:876 msgid "match <pattern>" msgstr "поиск соответствий с <шаблоном>" -#: builtin/grep.c:866 +#: builtin/grep.c:878 msgid "combine patterns specified with -e" msgstr "объединить шаблоны указанные с помощью -e" -#: builtin/grep.c:878 +#: builtin/grep.c:890 msgid "indicate hit with exit status without output" msgstr "ничего не выводить, указать на совпадение с помощью кода выхода" -#: builtin/grep.c:880 +#: builtin/grep.c:892 msgid "show only matches from files that match all patterns" msgstr "показать только совпадения из файлов в которых совпадают все шаблоны" -#: builtin/grep.c:882 +#: builtin/grep.c:894 msgid "show parse tree for grep expression" msgstr "показать дерево разбора для выражения поиска" -#: builtin/grep.c:886 +#: builtin/grep.c:898 msgid "pager" msgstr "пейджер" -#: builtin/grep.c:886 +#: builtin/grep.c:898 msgid "show matching files in the pager" msgstr "показать совпадающие файлы с помощью программы-пейджера" -#: builtin/grep.c:889 +#: builtin/grep.c:902 msgid "allow calling of grep(1) (ignored by this build)" msgstr "разрешить вызов grep(1) (игнорируется в этой сборке)" -#: builtin/grep.c:952 -msgid "no pattern given." -msgstr "не задан шаблон." +#: builtin/grep.c:966 +msgid "no pattern given" +msgstr "" -#: builtin/grep.c:984 +#: builtin/grep.c:1002 msgid "--no-index or --untracked cannot be used with revs" msgstr "--no-index или --untracked нельзя использовать одновременно с указанием ревизии" -#: builtin/grep.c:991 +#: builtin/grep.c:1009 #, c-format msgid "unable to resolve revision: %s" msgstr "не удалось определить редакцию: %s" -#: builtin/grep.c:1026 builtin/index-pack.c:1491 +#: builtin/grep.c:1044 builtin/index-pack.c:1532 builtin/pack-objects.c:2635 #, c-format msgid "invalid number of threads specified (%d)" msgstr "указано неправильное количество потоков (%d)" -#: builtin/grep.c:1031 +#: builtin/grep.c:1049 builtin/pack-objects.c:3289 msgid "no threads support, ignoring --threads" msgstr "нет поддержки потоков, игнорирование --threads" -#: builtin/grep.c:1055 +#: builtin/grep.c:1073 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager работает только в рабочем каталоге" -#: builtin/grep.c:1078 -msgid "option not supported with --recurse-submodules." -msgstr "опция не поддерживается одновременно с --recurse-submodules." +#: builtin/grep.c:1096 +msgid "option not supported with --recurse-submodules" +msgstr "" -#: builtin/grep.c:1084 -msgid "--cached or --untracked cannot be used with --no-index." -msgstr "--cached или --untracked нельзя использовать одновременно с --no-index." +#: builtin/grep.c:1102 +msgid "--cached or --untracked cannot be used with --no-index" +msgstr "" -#: builtin/grep.c:1090 -msgid "--[no-]exclude-standard cannot be used for tracked contents." -msgstr "--[no-]exclude-standard не может использоваться для отслеживаемого содержимого." +#: builtin/grep.c:1108 +msgid "--[no-]exclude-standard cannot be used for tracked contents" +msgstr "" -#: builtin/grep.c:1098 -msgid "both --cached and trees are given." -msgstr "указано одновременно --cached и дерево." +#: builtin/grep.c:1116 +msgid "both --cached and trees are given" +msgstr "" -#: builtin/hash-object.c:82 +#: builtin/hash-object.c:84 msgid "" "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " "[--] <file>..." msgstr "git hash-object [-t <тип>] [-w] [--path=<файл> | --no-filters] [--stdin] [--] <файл>…" -#: builtin/hash-object.c:83 +#: builtin/hash-object.c:85 msgid "git hash-object --stdin-paths" msgstr "git hash-object --stdin-paths" -#: builtin/hash-object.c:95 +#: builtin/hash-object.c:97 msgid "type" msgstr "тип" -#: builtin/hash-object.c:95 +#: builtin/hash-object.c:97 msgid "object type" msgstr "тип объекта" -#: builtin/hash-object.c:96 +#: builtin/hash-object.c:98 msgid "write the object into the object database" msgstr "запись объекта в базу данных объектов" -#: builtin/hash-object.c:98 +#: builtin/hash-object.c:100 msgid "read the object from stdin" msgstr "прочитать объект из стандартного ввода" -#: builtin/hash-object.c:100 +#: builtin/hash-object.c:102 msgid "store file as is without filters" msgstr "сохранить файл без использования фильтров" -#: builtin/hash-object.c:101 +#: builtin/hash-object.c:103 msgid "" "just hash any random garbage to create corrupt objects for debugging Git" msgstr "хэшировать любой мусор и создавать поврежденные объекты для отладки Git" -#: builtin/hash-object.c:102 +#: builtin/hash-object.c:104 msgid "process file as it were from this path" msgstr "обработать файл так, будто он находится по указанному пути" -#: builtin/help.c:43 +#: builtin/help.c:46 msgid "print all available commands" msgstr "вывести список всех доступных команд" -#: builtin/help.c:44 +#: builtin/help.c:47 msgid "exclude guides" msgstr "исключить руководства" -#: builtin/help.c:45 +#: builtin/help.c:48 msgid "print list of useful guides" msgstr "вывести список полезных руководств" -#: builtin/help.c:46 +#: builtin/help.c:49 +msgid "print all configuration variable names" +msgstr "" + +#: builtin/help.c:51 msgid "show man page" msgstr "открыть руководство в формате man" -#: builtin/help.c:47 +#: builtin/help.c:52 msgid "show manual in web browser" msgstr "открыть руководство в веб-браузере" -#: builtin/help.c:49 +#: builtin/help.c:54 msgid "show info page" msgstr "открыть руководство в формате info" -#: builtin/help.c:55 +#: builtin/help.c:56 +msgid "print command description" +msgstr "" + +#: builtin/help.c:61 msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" msgstr "git help [--all] [--guides] [--man | --web | --info] [<команда>]" -#: builtin/help.c:67 +#: builtin/help.c:73 #, c-format msgid "unrecognized help format '%s'" msgstr "неопознанный формат руководства «%s»" -#: builtin/help.c:94 +#: builtin/help.c:100 msgid "Failed to start emacsclient." msgstr "Сбой при запуске emacsclient." -#: builtin/help.c:107 +#: builtin/help.c:113 msgid "Failed to parse emacsclient version." msgstr "Сбой при определении версии emacsclient." -#: builtin/help.c:115 +#: builtin/help.c:121 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "версия emacsclient «%d» слишком старая (< 22)." -#: builtin/help.c:133 builtin/help.c:155 builtin/help.c:165 builtin/help.c:173 +#: builtin/help.c:139 builtin/help.c:161 builtin/help.c:171 builtin/help.c:179 #, c-format msgid "failed to exec '%s'" msgstr "сбой при запуске «%s»" -#: builtin/help.c:211 +#: builtin/help.c:217 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" "Please consider using 'man.<tool>.cmd' instead." msgstr "«%s»: путь для неподдерживаемой программы просмотра man.\nВместо этого используйте «man.<программа>.cmd»." -#: builtin/help.c:223 +#: builtin/help.c:229 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" "Please consider using 'man.<tool>.path' instead." msgstr "«%s»: команда для неподдерживаемой программы просмотра man.\nВместо этого используйте «man.<программа>.path»." -#: builtin/help.c:340 +#: builtin/help.c:346 #, c-format msgid "'%s': unknown man viewer." msgstr "«%s»: неизвестная программа просмотра man." -#: builtin/help.c:357 +#: builtin/help.c:363 msgid "no man viewer handled the request" msgstr "программа просмотра man не обработала запрос" -#: builtin/help.c:365 +#: builtin/help.c:371 msgid "no info viewer handled the request" msgstr "программа просмотра info не обработала запрос" -#: builtin/help.c:407 -msgid "Defining attributes per path" -msgstr "Определение атрибутов для путей файлов или каталогов" - -#: builtin/help.c:408 -msgid "Everyday Git With 20 Commands Or So" -msgstr "Повседневный Git с 20 командами или около того" - -#: builtin/help.c:409 -msgid "A Git glossary" -msgstr "Глоссарий Git" - -#: builtin/help.c:410 -msgid "Specifies intentionally untracked files to ignore" -msgstr "Указание специально игнорируемых файлов" - -#: builtin/help.c:411 -msgid "Defining submodule properties" -msgstr "Определение свойств подмодулей" - -#: builtin/help.c:412 -msgid "Specifying revisions and ranges for Git" -msgstr "Указание редакций и диапазонов для Git" - -#: builtin/help.c:413 -msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" -msgstr "Учебное введение в Git (для версии 1.5.1 или новее)" - -#: builtin/help.c:414 -msgid "An overview of recommended workflows with Git" -msgstr "Обзор рекомендуемых последовательностей выполняемых действий с Git" - -#: builtin/help.c:426 -msgid "The common Git guides are:\n" -msgstr "Основные руководства Git:\n" - -#: builtin/help.c:444 +#: builtin/help.c:418 #, c-format msgid "'%s' is aliased to '%s'" msgstr "«%s» — это сокращение для «%s»" -#: builtin/help.c:466 builtin/help.c:483 +#: builtin/help.c:445 builtin/help.c:475 #, c-format msgid "usage: %s%s" msgstr "использование: %s%s" -#: builtin/index-pack.c:156 -#, c-format -msgid "unable to open %s" -msgstr "не удалось открыть %s" +#: builtin/help.c:459 +msgid "'git help config' for more information" +msgstr "" -#: builtin/index-pack.c:206 +#: builtin/index-pack.c:208 #, c-format msgid "object type mismatch at %s" msgstr "несоответствие типа объекта на %s" -#: builtin/index-pack.c:226 +#: builtin/index-pack.c:228 #, c-format msgid "did not receive expected object %s" msgstr "ожидаемый объект не получен на %s" -#: builtin/index-pack.c:229 +#: builtin/index-pack.c:231 #, c-format msgid "object %s: expected type %s, found %s" msgstr "объект %s: ожидаемый тип %s, получен %s" -#: builtin/index-pack.c:271 +#: builtin/index-pack.c:273 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" @@ -8619,73 +10551,73 @@ msgstr[1] "не удалось заполнить %d байта" msgstr[2] "не удалось заполнить %d байтов" msgstr[3] "не удалось заполнить %d байтов" -#: builtin/index-pack.c:281 +#: builtin/index-pack.c:283 msgid "early EOF" msgstr "неожиданный конец файла" -#: builtin/index-pack.c:282 +#: builtin/index-pack.c:284 msgid "read error on input" msgstr "ошибка чтения ввода" -#: builtin/index-pack.c:294 +#: builtin/index-pack.c:296 msgid "used more bytes than were available" msgstr "использовано больше байт, чем было доступно" -#: builtin/index-pack.c:301 +#: builtin/index-pack.c:303 builtin/pack-objects.c:590 msgid "pack too large for current definition of off_t" msgstr "пакет слишком большой для текущего определения off_t" -#: builtin/index-pack.c:304 builtin/unpack-objects.c:93 +#: builtin/index-pack.c:306 builtin/unpack-objects.c:94 msgid "pack exceeds maximum allowed size" msgstr "размер пакета превышает максимальный допустимый" -#: builtin/index-pack.c:319 +#: builtin/index-pack.c:321 #, c-format msgid "unable to create '%s'" msgstr "не удалось создать «%s»" -#: builtin/index-pack.c:325 +#: builtin/index-pack.c:327 #, c-format msgid "cannot open packfile '%s'" msgstr "не удалось открыть файл пакета «%s»" -#: builtin/index-pack.c:339 +#: builtin/index-pack.c:341 msgid "pack signature mismatch" msgstr "несоответствие подписи пакета" -#: builtin/index-pack.c:341 +#: builtin/index-pack.c:343 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "версия пакета %<PRIu32> не поддерживается" -#: builtin/index-pack.c:359 +#: builtin/index-pack.c:361 #, c-format msgid "pack has bad object at offset %<PRIuMAX>: %s" msgstr "пакет содержит плохой объект по смещению %<PRIuMAX>: %s" -#: builtin/index-pack.c:480 +#: builtin/index-pack.c:482 #, c-format msgid "inflate returned %d" msgstr "программа сжатия вернула %d" -#: builtin/index-pack.c:529 +#: builtin/index-pack.c:531 msgid "offset value overflow for delta base object" msgstr "переполнение значения смещения у базового объекта дельты" -#: builtin/index-pack.c:537 +#: builtin/index-pack.c:539 msgid "delta base offset is out of bound" msgstr "смещение базовой дельты вышло за допустимые пределы" -#: builtin/index-pack.c:545 +#: builtin/index-pack.c:547 #, c-format msgid "unknown object type %d" msgstr "неизвестный тип объекта %d" -#: builtin/index-pack.c:576 +#: builtin/index-pack.c:578 msgid "cannot pread pack file" msgstr "не удалось выполнить pread для файла пакета" -#: builtin/index-pack.c:578 +#: builtin/index-pack.c:580 #, c-format msgid "premature end of pack file, %<PRIuMAX> byte missing" msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing" @@ -8694,93 +10626,93 @@ msgstr[1] "преждевременное окончание файла паке msgstr[2] "преждевременное окончание файла пакета, %<PRIuMAX> байтов отсутствует" msgstr[3] "преждевременное окончание файла пакета, %<PRIuMAX> байтов отсутствует" -#: builtin/index-pack.c:604 +#: builtin/index-pack.c:606 msgid "serious inflate inconsistency" msgstr "серьезное несоответствие при распаковке" -#: builtin/index-pack.c:749 builtin/index-pack.c:755 builtin/index-pack.c:778 -#: builtin/index-pack.c:817 builtin/index-pack.c:826 +#: builtin/index-pack.c:751 builtin/index-pack.c:757 builtin/index-pack.c:780 +#: builtin/index-pack.c:819 builtin/index-pack.c:828 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "НАЙДЕНА КОЛЛИЗИЯ SHA1 С %s !" -#: builtin/index-pack.c:752 builtin/pack-objects.c:179 -#: builtin/pack-objects.c:273 +#: builtin/index-pack.c:754 builtin/pack-objects.c:143 +#: builtin/pack-objects.c:203 builtin/pack-objects.c:297 #, c-format msgid "unable to read %s" msgstr "не удалось прочитать %s" -#: builtin/index-pack.c:815 +#: builtin/index-pack.c:817 #, c-format msgid "cannot read existing object info %s" msgstr "не удалось прочитать информацию существующего объекта %s" -#: builtin/index-pack.c:823 +#: builtin/index-pack.c:825 #, c-format msgid "cannot read existing object %s" msgstr "не удалось прочитать существующий объект %s" -#: builtin/index-pack.c:837 +#: builtin/index-pack.c:839 #, c-format msgid "invalid blob object %s" msgstr "неправильный файл двоичного объекта %s" -#: builtin/index-pack.c:852 +#: builtin/index-pack.c:842 builtin/index-pack.c:861 +msgid "fsck error in packed object" +msgstr "" + +#: builtin/index-pack.c:858 #, c-format msgid "invalid %s" msgstr "неправильный %s" -#: builtin/index-pack.c:855 -msgid "Error in object" -msgstr "Ошибка в объекте" - -#: builtin/index-pack.c:857 +#: builtin/index-pack.c:863 #, c-format msgid "Not all child objects of %s are reachable" msgstr "Не все дочерние объекты %s достижимы" -#: builtin/index-pack.c:929 builtin/index-pack.c:960 +#: builtin/index-pack.c:935 builtin/index-pack.c:966 msgid "failed to apply delta" msgstr "сбой при применении дельты" -#: builtin/index-pack.c:1131 +#: builtin/index-pack.c:1136 msgid "Receiving objects" msgstr "Получение объектов" -#: builtin/index-pack.c:1131 +#: builtin/index-pack.c:1136 msgid "Indexing objects" msgstr "Индексирование объектов" -#: builtin/index-pack.c:1165 +#: builtin/index-pack.c:1170 msgid "pack is corrupted (SHA1 mismatch)" msgstr "пакет поврежден (несоответствие SHA1)" -#: builtin/index-pack.c:1170 +#: builtin/index-pack.c:1175 msgid "cannot fstat packfile" msgstr "не удалось выполнить fstat для файла пакета" -#: builtin/index-pack.c:1173 +#: builtin/index-pack.c:1178 msgid "pack has junk at the end" msgstr "файл пакета содержит мусор в конце" -#: builtin/index-pack.c:1185 +#: builtin/index-pack.c:1190 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "безумная путаница в parse_pack_objects()" -#: builtin/index-pack.c:1208 +#: builtin/index-pack.c:1213 msgid "Resolving deltas" msgstr "Определение изменений" -#: builtin/index-pack.c:1219 +#: builtin/index-pack.c:1224 builtin/pack-objects.c:2410 #, c-format msgid "unable to create thread: %s" msgstr "не удалось создать поток: %s" -#: builtin/index-pack.c:1261 +#: builtin/index-pack.c:1266 msgid "confusion beyond insanity" msgstr "безумная путаница" -#: builtin/index-pack.c:1267 +#: builtin/index-pack.c:1272 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" @@ -8789,12 +10721,12 @@ msgstr[1] "завершено с %d локальными объектами" msgstr[2] "завершено с %d локальными объектами" msgstr[3] "завершено с %d локальными объектами" -#: builtin/index-pack.c:1279 +#: builtin/index-pack.c:1284 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "Неожиданная контрольная сумма в конце %s (диск поврежден?)" -#: builtin/index-pack.c:1283 +#: builtin/index-pack.c:1288 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" @@ -8803,54 +10735,59 @@ msgstr[1] "пакет содержит %d неразрешенные дельт msgstr[2] "пакет содержит %d неразрешенных дельт" msgstr[3] "пакет содержит %d неразрешенных дельт" -#: builtin/index-pack.c:1307 +#: builtin/index-pack.c:1312 #, c-format msgid "unable to deflate appended object (%d)" msgstr "нельзя сжать присоединенный объект (%d)" -#: builtin/index-pack.c:1383 +#: builtin/index-pack.c:1389 #, c-format msgid "local object %s is corrupt" msgstr "локальный объект %s поврежден" -#: builtin/index-pack.c:1409 -msgid "error while closing pack file" -msgstr "ошибка при закрытии файла пакета" +#: builtin/index-pack.c:1403 +#, c-format +msgid "packfile name '%s' does not end with '.pack'" +msgstr "имя пакета «%s» не оканчивается на «.pack»" -#: builtin/index-pack.c:1421 +#: builtin/index-pack.c:1428 #, c-format -msgid "cannot write keep file '%s'" -msgstr "не удалось записать файл удержания «%s»" +msgid "cannot write %s file '%s'" +msgstr "" -#: builtin/index-pack.c:1429 +#: builtin/index-pack.c:1436 #, c-format -msgid "cannot close written keep file '%s'" -msgstr "не удалось закрыть записанный файл удержания «%s»" +msgid "cannot close written %s file '%s'" +msgstr "" + +#: builtin/index-pack.c:1460 +msgid "error while closing pack file" +msgstr "ошибка при закрытии файла пакета" -#: builtin/index-pack.c:1439 +#: builtin/index-pack.c:1474 msgid "cannot store pack file" msgstr "не удалось сохранить файл пакета" -#: builtin/index-pack.c:1447 +#: builtin/index-pack.c:1482 msgid "cannot store index file" msgstr "не удалось сохранить файл индекса" -#: builtin/index-pack.c:1485 +#: builtin/index-pack.c:1526 builtin/pack-objects.c:2648 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "плохой pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1553 +#: builtin/index-pack.c:1595 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Не удалось открыть существующий файл пакета «%s»" -#: builtin/index-pack.c:1555 +#: builtin/index-pack.c:1597 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "Не удалось открыть существующий файл индекса для «%s»" -#: builtin/index-pack.c:1603 +#: builtin/index-pack.c:1645 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" @@ -8859,7 +10796,7 @@ msgstr[1] "не дельты: %d объекта" msgstr[2] "не дельты: %d объектов" msgstr[3] "не дельты: %d объектов" -#: builtin/index-pack.c:1610 +#: builtin/index-pack.c:1652 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" @@ -8868,29 +10805,32 @@ msgstr[1] "длина цепочки = %d: %lu объекта" msgstr[2] "длина цепочки = %d: %lu объектов" msgstr[3] "длина цепочки = %d: %lu объектов" -#: builtin/index-pack.c:1623 -#, c-format -msgid "packfile name '%s' does not end with '.pack'" -msgstr "имя пакета «%s» не оканчивается на «.pack»" +#: builtin/index-pack.c:1689 +msgid "Cannot come back to cwd" +msgstr "Не удалось вернуться в текущий рабочий каталог" -#: builtin/index-pack.c:1700 builtin/index-pack.c:1703 -#: builtin/index-pack.c:1719 builtin/index-pack.c:1723 +#: builtin/index-pack.c:1740 builtin/index-pack.c:1743 +#: builtin/index-pack.c:1759 builtin/index-pack.c:1763 #, c-format msgid "bad %s" msgstr "плохой %s" -#: builtin/index-pack.c:1739 +#: builtin/index-pack.c:1779 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin нельзя использовать без --stdin" -#: builtin/index-pack.c:1741 +#: builtin/index-pack.c:1781 msgid "--stdin requires a git repository" msgstr "опция --stdin требует наличия репозитория git" -#: builtin/index-pack.c:1749 +#: builtin/index-pack.c:1787 msgid "--verify with no packfile name given" msgstr "--verify без указания имени файла пакета" +#: builtin/index-pack.c:1837 builtin/unpack-objects.c:580 +msgid "fsck error in pack objects" +msgstr "" + #: builtin/init-db.c:55 #, c-format msgid "cannot stat '%s'" @@ -8906,103 +10846,103 @@ msgstr "не удалось выполнить stat для шаблона «%s» msgid "cannot opendir '%s'" msgstr "не удалось выполнить opendir для «%s»" -#: builtin/init-db.c:77 +#: builtin/init-db.c:78 #, c-format msgid "cannot readlink '%s'" msgstr "не удалось выполнить readlink для «%s»" -#: builtin/init-db.c:79 +#: builtin/init-db.c:80 #, c-format msgid "cannot symlink '%s' '%s'" msgstr "не удалось создать символьную ссылку «%s» на «%s»" -#: builtin/init-db.c:85 +#: builtin/init-db.c:86 #, c-format msgid "cannot copy '%s' to '%s'" msgstr "не удалось скопировать файл «%s» в «%s»" -#: builtin/init-db.c:89 +#: builtin/init-db.c:90 #, c-format msgid "ignoring template %s" msgstr "игнорирование шаблона %s" -#: builtin/init-db.c:120 +#: builtin/init-db.c:121 #, c-format -msgid "templates not found %s" -msgstr "шаблоны не найдены %s" +msgid "templates not found in %s" +msgstr "" -#: builtin/init-db.c:135 +#: builtin/init-db.c:136 #, c-format msgid "not copying templates from '%s': %s" msgstr "не копирую шаблоны из «%s»: %s" -#: builtin/init-db.c:328 +#: builtin/init-db.c:329 #, c-format msgid "unable to handle file type %d" msgstr "не удается обработать файл типа %d" -#: builtin/init-db.c:331 +#: builtin/init-db.c:332 #, c-format msgid "unable to move %s to %s" msgstr "не удается переместить файл %s в %s" -#: builtin/init-db.c:348 builtin/init-db.c:351 +#: builtin/init-db.c:349 builtin/init-db.c:352 #, c-format msgid "%s already exists" msgstr "%s уже существует" -#: builtin/init-db.c:404 +#: builtin/init-db.c:405 #, c-format msgid "Reinitialized existing shared Git repository in %s%s\n" msgstr "Переинициализирован существующий общий репозиторий Git в %s%s\n" -#: builtin/init-db.c:405 +#: builtin/init-db.c:406 #, c-format msgid "Reinitialized existing Git repository in %s%s\n" msgstr "Переинициализирован существующий репозиторий Git в %s%s\n" -#: builtin/init-db.c:409 +#: builtin/init-db.c:410 #, c-format msgid "Initialized empty shared Git repository in %s%s\n" msgstr "Инициализирован пустой общий репозиторий Git в %s%s\n" -#: builtin/init-db.c:410 +#: builtin/init-db.c:411 #, c-format msgid "Initialized empty Git repository in %s%s\n" msgstr "Инициализирован пустой репозиторий Git в %s%s\n" -#: builtin/init-db.c:458 +#: builtin/init-db.c:459 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] " "[--shared[=<permissions>]] [<directory>]" msgstr "git init [-q | --quiet] [--bare] [--template=<каталог-шаблонов>] [--shared[=<права-доступа>]] [<каталог>]" -#: builtin/init-db.c:481 +#: builtin/init-db.c:482 msgid "permissions" msgstr "права-доступа" -#: builtin/init-db.c:482 +#: builtin/init-db.c:483 msgid "specify that the git repository is to be shared amongst several users" msgstr "укажите, если репозиторий git будет использоваться несколькими пользователями" -#: builtin/init-db.c:516 builtin/init-db.c:521 +#: builtin/init-db.c:517 builtin/init-db.c:522 #, c-format msgid "cannot mkdir %s" msgstr "не удалось выполнить mkdir %s" -#: builtin/init-db.c:525 +#: builtin/init-db.c:526 #, c-format msgid "cannot chdir to %s" msgstr "не удалось выполнить chdir в %s" -#: builtin/init-db.c:546 +#: builtin/init-db.c:547 #, 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:574 +#: builtin/init-db.c:575 #, c-format msgid "Cannot access work tree '%s'" msgstr "Не удалось получить доступ к рабочему каталогу «%s»" @@ -9065,532 +11005,532 @@ msgstr "--trailer одновременно с --only-input не имеет см msgid "no input file given for in-place editing" msgstr "ничего не передано, для редактирования файлов на месте" -#: builtin/log.c:46 +#: builtin/log.c:51 msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "git log [<опции>] [<диапазон-редакций>] [[--] <путь>…]" -#: builtin/log.c:47 +#: builtin/log.c:52 msgid "git show [<options>] <object>..." msgstr "git show [<опции>] <объект>…" -#: builtin/log.c:91 +#: builtin/log.c:96 #, c-format msgid "invalid --decorate option: %s" msgstr "неправильный параметр для --decorate: %s" -#: builtin/log.c:151 +#: builtin/log.c:157 msgid "suppress diff output" msgstr "не выводить различия" -#: builtin/log.c:152 +#: builtin/log.c:158 msgid "show source" msgstr "показать источник" -#: builtin/log.c:153 +#: builtin/log.c:159 msgid "Use mail map file" msgstr "Использовать файл соответствия почтовых адресов" -#: builtin/log.c:155 +#: builtin/log.c:161 msgid "only decorate refs that match <pattern>" msgstr "декорировать только ссылки соответствующие <шаблону>" -#: builtin/log.c:157 +#: builtin/log.c:163 msgid "do not decorate refs that match <pattern>" msgstr "не декорировать ссылки соответствующие <шаблону>" -#: builtin/log.c:158 +#: builtin/log.c:164 msgid "decorate options" msgstr "опции формата вывода ссылок" -#: builtin/log.c:161 +#: builtin/log.c:167 msgid "Process line range n,m in file, counting from 1" msgstr "Обработать диапазон строк n,m из файла, начиная с 1" -#: builtin/log.c:257 +#: builtin/log.c:265 #, c-format msgid "Final output: %d %s\n" msgstr "Финальный вывод: %d %s\n" -#: builtin/log.c:508 +#: builtin/log.c:516 #, c-format msgid "git show %s: bad file" msgstr "git show %s: плохой файл" -#: builtin/log.c:523 builtin/log.c:617 +#: builtin/log.c:531 builtin/log.c:625 #, c-format msgid "Could not read object %s" msgstr "Не удалось прочитать объект %s" -#: builtin/log.c:641 +#: builtin/log.c:649 #, c-format msgid "Unknown type: %d" msgstr "Неизвестный тип объекта: %d" -#: builtin/log.c:762 +#: builtin/log.c:770 msgid "format.headers without value" msgstr "в format.headers не указано значение" -#: builtin/log.c:863 +#: builtin/log.c:871 msgid "name of output directory is too long" msgstr "слишком длинное имя выходного каталога" -#: builtin/log.c:879 +#: builtin/log.c:887 #, c-format msgid "Cannot open patch file %s" msgstr "Ну удалось открыть файл изменений %s" -#: builtin/log.c:896 +#: builtin/log.c:904 msgid "Need exactly one range." msgstr "Нужен только один диапазон." -#: builtin/log.c:906 +#: builtin/log.c:914 msgid "Not a range." msgstr "Не является диапазоном." -#: builtin/log.c:1012 +#: builtin/log.c:1020 msgid "Cover letter needs email format" msgstr "Сопроводительное письмо должно быть в формате электронной почты" -#: builtin/log.c:1092 +#: builtin/log.c:1101 #, c-format msgid "insane in-reply-to: %s" msgstr "ошибка в поле in-reply-to: %s" -#: builtin/log.c:1119 +#: builtin/log.c:1128 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<опции>] [<начиная-с> | <диапазон-редакций>]" -#: builtin/log.c:1169 +#: builtin/log.c:1178 msgid "Two output directories?" msgstr "Два выходных каталога?" -#: builtin/log.c:1276 builtin/log.c:1927 builtin/log.c:1929 builtin/log.c:1941 +#: builtin/log.c:1285 builtin/log.c:1945 builtin/log.c:1947 builtin/log.c:1959 #, c-format msgid "Unknown commit %s" msgstr "Неизвестный коммит %s" -#: builtin/log.c:1286 builtin/notes.c:887 builtin/tag.c:516 +#: builtin/log.c:1295 builtin/notes.c:889 builtin/tag.c:524 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "Не удалось разрешить «%s» как ссылку." -#: builtin/log.c:1291 +#: builtin/log.c:1300 msgid "Could not find exact merge base." msgstr "Не удалось найти точную базу слияния." -#: builtin/log.c:1295 +#: builtin/log.c:1304 msgid "" "Failed to get upstream, if you want to record base commit automatically,\n" "please use git branch --set-upstream-to to track a remote branch.\n" "Or you could specify base commit by --base=<base-commit-id> manually." msgstr "Не удалось получить вышестоящую ветку. Если вы хотите записать базовый коммит автомитически, то используйте git branch --set-upstream-to для отслеживания внешней ветки.\nИли же вы можете указать базовый коммит указанием --base=<идентификатор-базового-коммита> вручную." -#: builtin/log.c:1315 +#: builtin/log.c:1324 msgid "Failed to find exact merge base" msgstr "Не удалось найти точную базу слияния" -#: builtin/log.c:1326 +#: builtin/log.c:1335 msgid "base commit should be the ancestor of revision list" msgstr "базовый коммит должен быть предком списка редакций" -#: builtin/log.c:1330 +#: builtin/log.c:1339 msgid "base commit shouldn't be in revision list" msgstr "базовый коммит не должен быть в списке редакций" -#: builtin/log.c:1379 +#: builtin/log.c:1392 msgid "cannot get patch id" msgstr "не удалось получить идентификатор патча" -#: builtin/log.c:1438 +#: builtin/log.c:1452 msgid "use [PATCH n/m] even with a single patch" msgstr "выводить [PATCH n/m] даже когда один патч" -#: builtin/log.c:1441 +#: builtin/log.c:1455 msgid "use [PATCH] even with multiple patches" msgstr "выводить [PATCH] даже когда несколько патчей" -#: builtin/log.c:1445 +#: builtin/log.c:1459 msgid "print patches to standard out" msgstr "выводить патчи на стандартный вывод" -#: builtin/log.c:1447 +#: builtin/log.c:1461 msgid "generate a cover letter" msgstr "создать сопроводительное письмо" -#: builtin/log.c:1449 +#: builtin/log.c:1463 msgid "use simple number sequence for output file names" msgstr "использовать простую последовательность чисел для имен выходных файлов" -#: builtin/log.c:1450 +#: builtin/log.c:1464 msgid "sfx" msgstr "суффикс" -#: builtin/log.c:1451 +#: builtin/log.c:1465 msgid "use <sfx> instead of '.patch'" msgstr "использовать суффикс <суффикс> вместо «.patch»" -#: builtin/log.c:1453 +#: builtin/log.c:1467 msgid "start numbering patches at <n> instead of 1" msgstr "начать нумерацию патчей с <n>, а не с 1" -#: builtin/log.c:1455 +#: builtin/log.c:1469 msgid "mark the series as Nth re-roll" msgstr "пометить серию как энную попытку" -#: builtin/log.c:1457 +#: builtin/log.c:1471 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "Использовать [RFC PATCH] вместо [PATCH]" -#: builtin/log.c:1460 +#: builtin/log.c:1474 msgid "Use [<prefix>] instead of [PATCH]" msgstr "Использовать [<префикс>] вместо [PATCH]" -#: builtin/log.c:1463 +#: builtin/log.c:1477 msgid "store resulting files in <dir>" msgstr "сохранить результирующие файлы в <каталог>" -#: builtin/log.c:1466 +#: builtin/log.c:1480 msgid "don't strip/add [PATCH]" msgstr "не обрезать/добавлять [PATCH]" -#: builtin/log.c:1469 +#: builtin/log.c:1483 msgid "don't output binary diffs" msgstr "не выводить двоичные различия" -#: builtin/log.c:1471 +#: builtin/log.c:1485 msgid "output all-zero hash in From header" msgstr "выводить нулевую хэш-сумму в заголовке From" -#: builtin/log.c:1473 +#: builtin/log.c:1487 msgid "don't include a patch matching a commit upstream" msgstr "не включать патч, если коммит уже есть в вышестоящей ветке" -#: builtin/log.c:1475 +#: builtin/log.c:1489 msgid "show patch format instead of default (patch + stat)" msgstr "выводить в формате патча, а не в стандартном (патч + статистика)" -#: builtin/log.c:1477 +#: builtin/log.c:1491 msgid "Messaging" msgstr "Передача сообщений" -#: builtin/log.c:1478 +#: builtin/log.c:1492 msgid "header" msgstr "заголовок" -#: builtin/log.c:1479 +#: builtin/log.c:1493 msgid "add email header" msgstr "добавить заголовок сообщения" -#: builtin/log.c:1480 builtin/log.c:1482 +#: builtin/log.c:1494 builtin/log.c:1496 msgid "email" msgstr "почта" -#: builtin/log.c:1480 +#: builtin/log.c:1494 msgid "add To: header" msgstr "добавить заголовок To:" -#: builtin/log.c:1482 +#: builtin/log.c:1496 msgid "add Cc: header" msgstr "добавить заголовок Cc:" -#: builtin/log.c:1484 +#: builtin/log.c:1498 msgid "ident" msgstr "идентификатор" -#: builtin/log.c:1485 +#: builtin/log.c:1499 msgid "set From address to <ident> (or committer ident if absent)" msgstr "установить адрес отправителя на <идентификатор> (или на идентификатор коммитера, если отсутствует)" -#: builtin/log.c:1487 +#: builtin/log.c:1501 msgid "message-id" msgstr "идентификатор-сообщения" -#: builtin/log.c:1488 +#: builtin/log.c:1502 msgid "make first mail a reply to <message-id>" msgstr "сделать первое письмо ответом на <идентификатор-сообщения>" -#: builtin/log.c:1489 builtin/log.c:1492 +#: builtin/log.c:1503 builtin/log.c:1506 msgid "boundary" msgstr "вложение" -#: builtin/log.c:1490 +#: builtin/log.c:1504 msgid "attach the patch" msgstr "приложить патч" -#: builtin/log.c:1493 +#: builtin/log.c:1507 msgid "inline the patch" msgstr "включить патч в текст письма" -#: builtin/log.c:1497 +#: builtin/log.c:1511 msgid "enable message threading, styles: shallow, deep" msgstr "включить в письмах иерархичность, стили: shallow (частичную), deep (глубокую)" -#: builtin/log.c:1499 +#: builtin/log.c:1513 msgid "signature" msgstr "подпись" -#: builtin/log.c:1500 +#: builtin/log.c:1514 msgid "add a signature" msgstr "добавить подпись" -#: builtin/log.c:1501 +#: builtin/log.c:1515 msgid "base-commit" msgstr "базовый коммит" -#: builtin/log.c:1502 +#: builtin/log.c:1516 msgid "add prerequisite tree info to the patch series" msgstr "добавить информацию о требовании дерева к серии патчей" -#: builtin/log.c:1504 +#: builtin/log.c:1518 msgid "add a signature from a file" msgstr "добавить подпись из файла" -#: builtin/log.c:1505 +#: builtin/log.c:1519 msgid "don't print the patch filenames" msgstr "не выводить имена файлов патчей" -#: builtin/log.c:1507 +#: builtin/log.c:1521 msgid "show progress while generating patches" msgstr "показать прогресс выполнения во создания патчей" -#: builtin/log.c:1582 +#: builtin/log.c:1596 #, c-format msgid "invalid ident line: %s" msgstr "неправильная строка идентификации: %s" -#: builtin/log.c:1597 -msgid "-n and -k are mutually exclusive." -msgstr "-n и -k нельзя использовать одновременно" +#: builtin/log.c:1611 +msgid "-n and -k are mutually exclusive" +msgstr "" -#: builtin/log.c:1599 -msgid "--subject-prefix/--rfc and -k are mutually exclusive." -msgstr "--subject-prefix/--rfc и -k нельзя использовать одновременно." +#: builtin/log.c:1613 +msgid "--subject-prefix/--rfc and -k are mutually exclusive" +msgstr "" -#: builtin/log.c:1607 +#: builtin/log.c:1621 msgid "--name-only does not make sense" msgstr "--name-only не имеет смысла" -#: builtin/log.c:1609 +#: builtin/log.c:1623 msgid "--name-status does not make sense" msgstr "--name-status не имеет смысла" -#: builtin/log.c:1611 +#: builtin/log.c:1625 msgid "--check does not make sense" msgstr "--check не имеет смысла" -#: builtin/log.c:1641 +#: builtin/log.c:1657 msgid "standard output, or directory, which one?" msgstr "стандартный вывод или каталог?" -#: builtin/log.c:1643 +#: builtin/log.c:1659 #, c-format msgid "Could not create directory '%s'" msgstr "Не удалось создать каталог «%s»" -#: builtin/log.c:1736 +#: builtin/log.c:1752 #, c-format msgid "unable to read signature file '%s'" msgstr "не удалось прочитать файл подписи «%s»" -#: builtin/log.c:1768 +#: builtin/log.c:1785 msgid "Generating patches" msgstr "Создание патчей" -#: builtin/log.c:1812 +#: builtin/log.c:1829 msgid "Failed to create output files" msgstr "Сбой при создании выходных файлов" -#: builtin/log.c:1862 +#: builtin/log.c:1880 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<вышестоящая-ветка> [<голова> [<ограничение>]]]" -#: builtin/log.c:1916 +#: builtin/log.c:1934 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> " "manually.\n" msgstr "Не удалось найти отслеживаемую внешнюю ветку, укажите <вышестоящую-ветку> вручную.\n" -#: builtin/ls-files.c:468 +#: builtin/ls-files.c:469 msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<опции>] [<файл>…]" -#: builtin/ls-files.c:517 +#: builtin/ls-files.c:518 msgid "identify the file status with tags" msgstr "выводить имена файлов с метками" -#: builtin/ls-files.c:519 +#: builtin/ls-files.c:520 msgid "use lowercase letters for 'assume unchanged' files" msgstr "использовать символы в нижнем регистре для «предположительно без изменений» файлов" -#: builtin/ls-files.c:521 +#: builtin/ls-files.c:522 msgid "use lowercase letters for 'fsmonitor clean' files" msgstr "использовать символы нижнего регистра для файлов «fsmonitor clean»" -#: builtin/ls-files.c:523 +#: builtin/ls-files.c:524 msgid "show cached files in the output (default)" msgstr "показывать кэшированные файлы при выводе (по умолчанию)" -#: builtin/ls-files.c:525 +#: builtin/ls-files.c:526 msgid "show deleted files in the output" msgstr "показывать удаленные файлы при выводе" -#: builtin/ls-files.c:527 +#: builtin/ls-files.c:528 msgid "show modified files in the output" msgstr "показывать измененные файлы при выводе" -#: builtin/ls-files.c:529 +#: builtin/ls-files.c:530 msgid "show other files in the output" msgstr "показывать другие файлы при выводе" -#: builtin/ls-files.c:531 +#: builtin/ls-files.c:532 msgid "show ignored files in the output" msgstr "показывать игнорируемые файлы при выводе" -#: builtin/ls-files.c:534 +#: builtin/ls-files.c:535 msgid "show staged contents' object name in the output" msgstr "показывать имя индексированного объекта на выводе" -#: builtin/ls-files.c:536 +#: builtin/ls-files.c:537 msgid "show files on the filesystem that need to be removed" msgstr "показывать файлы в файловой системе, которые должны быть удалены" -#: builtin/ls-files.c:538 +#: builtin/ls-files.c:539 msgid "show 'other' directories' names only" msgstr "показывать только имена у «других» каталогов" -#: builtin/ls-files.c:540 +#: builtin/ls-files.c:541 msgid "show line endings of files" msgstr "показать концы строк файлов" -#: builtin/ls-files.c:542 +#: builtin/ls-files.c:543 msgid "don't show empty directories" msgstr "не показывать пустые каталоги" -#: builtin/ls-files.c:545 +#: builtin/ls-files.c:546 msgid "show unmerged files in the output" msgstr "показывать не слитые файлы на выводе" -#: builtin/ls-files.c:547 +#: builtin/ls-files.c:548 msgid "show resolve-undo information" msgstr "показывать информации о разрешении конфликтов и отмене" -#: builtin/ls-files.c:549 +#: builtin/ls-files.c:550 msgid "skip files matching pattern" msgstr "пропустить файлы, соответствующие шаблону" -#: builtin/ls-files.c:552 +#: builtin/ls-files.c:553 msgid "exclude patterns are read from <file>" msgstr "прочитать шаблоны исключения из <файл>" -#: builtin/ls-files.c:555 +#: builtin/ls-files.c:556 msgid "read additional per-directory exclude patterns in <file>" msgstr "прочитать дополнительные покаталожные шаблоны исключения из <файл>" -#: builtin/ls-files.c:557 +#: builtin/ls-files.c:558 msgid "add the standard git exclusions" msgstr "добавить стандартные исключения git" -#: builtin/ls-files.c:560 +#: builtin/ls-files.c:561 msgid "make the output relative to the project top directory" msgstr "выводить пути относительно корневого каталога проекта" -#: builtin/ls-files.c:563 +#: builtin/ls-files.c:564 msgid "recurse through submodules" msgstr "рекурсивно по подмодулям" -#: builtin/ls-files.c:565 +#: builtin/ls-files.c:566 msgid "if any <file> is not in the index, treat this as an error" msgstr "если какой-либо <файл> не в индексе, считать это ошибкой" -#: builtin/ls-files.c:566 +#: builtin/ls-files.c:567 msgid "tree-ish" msgstr "указатель-дерева" -#: builtin/ls-files.c:567 +#: builtin/ls-files.c:568 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "притвориться, что пути удалены, т.к. <указатель-дерева> еще существует" -#: builtin/ls-files.c:569 +#: builtin/ls-files.c:570 msgid "show debugging data" msgstr "показать отладочную информацию" -#: builtin/ls-remote.c:7 +#: builtin/ls-remote.c:9 msgid "" "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" " [-q | --quiet] [--exit-code] [--get-url]\n" " [--symref] [<repository> [<refs>...]]" msgstr "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<запуск>]\n [-q | --quiet] [--exit-code] [--get-url]\n [--symref] [<репозиторий> [<ссылки>…]]" -#: builtin/ls-remote.c:52 +#: builtin/ls-remote.c:59 msgid "do not print remote URL" msgstr "не выводить URL внешних репозиториев" -#: builtin/ls-remote.c:53 builtin/ls-remote.c:55 +#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 msgid "exec" msgstr "запуск" -#: builtin/ls-remote.c:54 builtin/ls-remote.c:56 +#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 msgid "path of git-upload-pack on the remote host" msgstr "путь к git-upload-pack на внешнем сервере" -#: builtin/ls-remote.c:58 +#: builtin/ls-remote.c:65 msgid "limit to tags" msgstr "ограничить вывод метками" -#: builtin/ls-remote.c:59 +#: builtin/ls-remote.c:66 msgid "limit to heads" msgstr "ограничить вывод указателями на ветки" -#: builtin/ls-remote.c:60 +#: builtin/ls-remote.c:67 msgid "do not show peeled tags" msgstr "не показывать удалённые метки" -#: builtin/ls-remote.c:62 +#: builtin/ls-remote.c:69 msgid "take url.<base>.insteadOf into account" msgstr "учитывать url.<база>.insteadOf" -#: builtin/ls-remote.c:64 +#: builtin/ls-remote.c:73 msgid "exit with exit code 2 if no matching refs are found" msgstr "выходить с кодом 2, если соответствующие ссылки не найдены" -#: builtin/ls-remote.c:66 +#: builtin/ls-remote.c:76 msgid "show underlying ref in addition to the object pointed by it" msgstr "показать также внутреннюю ссылку в дополнение к объекту, на который она указывает" -#: builtin/ls-tree.c:29 +#: builtin/ls-tree.c:30 msgid "git ls-tree [<options>] <tree-ish> [<path>...]" msgstr "git ls-tree [<опции>] <указатель-дерева> [<путь>…]" -#: builtin/ls-tree.c:127 +#: builtin/ls-tree.c:128 msgid "only show trees" msgstr "выводить только деревья" -#: builtin/ls-tree.c:129 +#: builtin/ls-tree.c:130 msgid "recurse into subtrees" msgstr "проходить рекурсивно в поддеревья" -#: builtin/ls-tree.c:131 +#: builtin/ls-tree.c:132 msgid "show trees when recursing" msgstr "выводить деревья при рекурсивном проходе" -#: builtin/ls-tree.c:134 +#: builtin/ls-tree.c:135 msgid "terminate entries with NUL byte" msgstr "разделять записи с помощью НУЛЕВОГО байта" -#: builtin/ls-tree.c:135 +#: builtin/ls-tree.c:136 msgid "include object size" msgstr "включить размер объекта" -#: builtin/ls-tree.c:137 builtin/ls-tree.c:139 +#: builtin/ls-tree.c:138 builtin/ls-tree.c:140 msgid "list only filenames" msgstr "выводить только имена файлов" -#: builtin/ls-tree.c:142 +#: builtin/ls-tree.c:143 msgid "use full path names" msgstr "использовать полные пути" -#: builtin/ls-tree.c:144 +#: builtin/ls-tree.c:145 msgid "list entire tree; not just current directory (implies --full-name)" msgstr "вывести полное дерево; не только текущий каталог (включает в себя --full-name)" @@ -9599,180 +11539,180 @@ msgstr "вывести полное дерево; не только текущи msgid "empty mbox: '%s'" msgstr "пустой mbox: «%s»" -#: builtin/merge.c:48 +#: builtin/merge.c:51 msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<опции>] [<коммит>…]" -#: builtin/merge.c:49 +#: builtin/merge.c:52 msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:50 +#: builtin/merge.c:53 msgid "git merge --continue" msgstr "git merge --continue" -#: builtin/merge.c:107 +#: builtin/merge.c:110 msgid "switch `m' requires a value" msgstr "при указании параметра «m» требуется указать значение" -#: builtin/merge.c:144 +#: builtin/merge.c:176 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "Не удалось найти стратегию слияния «%s».\n" -#: builtin/merge.c:145 +#: builtin/merge.c:177 #, c-format msgid "Available strategies are:" msgstr "Доступные стратегии:" -#: builtin/merge.c:150 +#: builtin/merge.c:182 #, c-format msgid "Available custom strategies are:" msgstr "Доступные пользовательские стратегии:" -#: builtin/merge.c:200 builtin/pull.c:137 +#: builtin/merge.c:232 builtin/pull.c:142 msgid "do not show a diffstat at the end of the merge" msgstr "не выводить статистику изменений после окончания слияния" -#: builtin/merge.c:203 builtin/pull.c:140 +#: builtin/merge.c:235 builtin/pull.c:145 msgid "show a diffstat at the end of the merge" msgstr "вывести статистику изменений после окончания слияния" -#: builtin/merge.c:204 builtin/pull.c:143 +#: builtin/merge.c:236 builtin/pull.c:148 msgid "(synonym to --stat)" msgstr "(синоним для --stat)" -#: builtin/merge.c:206 builtin/pull.c:146 +#: builtin/merge.c:238 builtin/pull.c:151 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "добавить (максимум <n>) записей из короткого журнала в сообщение коммита у слияния" -#: builtin/merge.c:209 builtin/pull.c:152 +#: builtin/merge.c:241 builtin/pull.c:157 msgid "create a single commit instead of doing a merge" msgstr "создать один коммит, вместо выполнения слияния" -#: builtin/merge.c:211 builtin/pull.c:155 +#: builtin/merge.c:243 builtin/pull.c:160 msgid "perform a commit if the merge succeeds (default)" msgstr "сделать коммит, если слияние прошло успешно (по умолчанию)" -#: builtin/merge.c:213 builtin/pull.c:158 +#: builtin/merge.c:245 builtin/pull.c:163 msgid "edit message before committing" msgstr "отредактировать сообщение перед выполнением коммита" -#: builtin/merge.c:214 +#: builtin/merge.c:246 msgid "allow fast-forward (default)" msgstr "разрешить перемотку вперед (по умолчанию)" -#: builtin/merge.c:216 builtin/pull.c:164 +#: builtin/merge.c:248 builtin/pull.c:169 msgid "abort if fast-forward is not possible" msgstr "отменить выполнение слияния, если перемотка вперед невозможна" -#: builtin/merge.c:220 builtin/pull.c:167 +#: builtin/merge.c:252 builtin/pull.c:172 msgid "verify that the named commit has a valid GPG signature" msgstr "проверить, что указанный коммит имеет верную электронную подпись GPG" -#: builtin/merge.c:221 builtin/notes.c:777 builtin/pull.c:171 -#: builtin/revert.c:109 +#: builtin/merge.c:253 builtin/notes.c:779 builtin/pull.c:176 +#: builtin/revert.c:110 msgid "strategy" msgstr "стратегия" -#: builtin/merge.c:222 builtin/pull.c:172 +#: builtin/merge.c:254 builtin/pull.c:177 msgid "merge strategy to use" msgstr "используемая стратегия слияния" -#: builtin/merge.c:223 builtin/pull.c:175 +#: builtin/merge.c:255 builtin/pull.c:180 msgid "option=value" msgstr "опция=значение" -#: builtin/merge.c:224 builtin/pull.c:176 +#: builtin/merge.c:256 builtin/pull.c:181 msgid "option for selected merge strategy" msgstr "опции для выбранной стратегии слияния" -#: builtin/merge.c:226 +#: builtin/merge.c:258 msgid "merge commit message (for a non-fast-forward merge)" msgstr "сообщение коммита для слияния (для слияния без перемотки вперед)" -#: builtin/merge.c:230 +#: builtin/merge.c:265 msgid "abort the current in-progress merge" msgstr "отменить выполнение происходящего слияния" -#: builtin/merge.c:232 +#: builtin/merge.c:267 msgid "continue the current in-progress merge" msgstr "продолжить выполнение происходящего слияния" -#: builtin/merge.c:234 builtin/pull.c:183 +#: builtin/merge.c:269 builtin/pull.c:188 msgid "allow merging unrelated histories" msgstr "разрешить слияние несвязанных историй изменений" -#: builtin/merge.c:240 +#: builtin/merge.c:275 msgid "verify commit-msg hook" msgstr "проверить перехватчик commit-msg" -#: builtin/merge.c:265 +#: builtin/merge.c:300 msgid "could not run stash." msgstr "не удалось выполнить stash." -#: builtin/merge.c:270 +#: builtin/merge.c:305 msgid "stash failed" msgstr "сбой при выполнении stash" -#: builtin/merge.c:275 +#: builtin/merge.c:310 #, c-format msgid "not a valid object: %s" msgstr "неправильный объект: %s" -#: builtin/merge.c:297 builtin/merge.c:314 +#: builtin/merge.c:332 builtin/merge.c:349 msgid "read-tree failed" msgstr "сбой при выполнении read-tree" -#: builtin/merge.c:344 +#: builtin/merge.c:379 msgid " (nothing to squash)" msgstr " (нечего уплотнять)" -#: builtin/merge.c:355 +#: builtin/merge.c:390 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Уплотнение коммита — не обновляя HEAD\n" -#: builtin/merge.c:405 +#: builtin/merge.c:440 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "Нет сообщения слияния — не обновляем HEAD\n" -#: builtin/merge.c:455 +#: builtin/merge.c:491 #, c-format msgid "'%s' does not point to a commit" msgstr "«%s» не указывает на коммит" -#: builtin/merge.c:545 +#: builtin/merge.c:578 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Неправильная строка branch.%s.mergeoptions: %s" -#: builtin/merge.c:667 +#: builtin/merge.c:699 msgid "Not handling anything other than two heads merge." msgstr "Не обрабатываю ничего, кроме слияния двух указателей на ветки." -#: builtin/merge.c:681 +#: builtin/merge.c:713 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Неизвестный параметр merge-recursive: -X%s" -#: builtin/merge.c:696 +#: builtin/merge.c:728 #, c-format msgid "unable to write %s" msgstr "не удалось записать %s" -#: builtin/merge.c:748 +#: builtin/merge.c:779 #, c-format msgid "Could not read from '%s'" msgstr "Не удалось прочесть из «%s»" -#: builtin/merge.c:757 +#: builtin/merge.c:788 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "Не выполняю коммит слияния; используйте «git commit» для завершения слияния.\n" -#: builtin/merge.c:763 +#: builtin/merge.c:794 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -9782,226 +11722,226 @@ msgid "" "the commit.\n" msgstr "Пожалуйста, введите сообщение коммита, для объяснения, зачем нужно\nэто слияние, особенно, если это слияние обновленной вышестоящей\nветки в тематическую ветку.\n\nСтроки, начинающиеся с «%c» будут проигнорированы, а пустое\nсообщение отменяет процесс коммита.\n" -#: builtin/merge.c:799 +#: builtin/merge.c:830 msgid "Empty commit message." msgstr "Пустое сообщение коммита." -#: builtin/merge.c:819 +#: builtin/merge.c:849 #, c-format msgid "Wonderful.\n" msgstr "Прекрасно.\n" -#: builtin/merge.c:872 +#: builtin/merge.c:902 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "Не удалось провести автоматическое слияние; исправьте конфликты и сделайте коммит результата.\n" -#: builtin/merge.c:911 +#: builtin/merge.c:941 msgid "No current branch." msgstr "Нет текущей ветки." -#: builtin/merge.c:913 +#: builtin/merge.c:943 msgid "No remote for the current branch." msgstr "У текущей ветки нет внешнего репозитория." -#: builtin/merge.c:915 +#: builtin/merge.c:945 msgid "No default upstream defined for the current branch." msgstr "Для текущей ветки не указана вышестоящая ветка по умолчанию." -#: builtin/merge.c:920 +#: builtin/merge.c:950 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "Не указана внешняя отслеживаемая ветка для %s на %s" -#: builtin/merge.c:973 +#: builtin/merge.c:1007 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Плохое значение «%s» в переменной окружения «%s»" -#: builtin/merge.c:1075 +#: builtin/merge.c:1110 #, c-format msgid "not something we can merge in %s: %s" msgstr "не является тем, что можно слить в %s: %s" -#: builtin/merge.c:1109 +#: builtin/merge.c:1144 msgid "not something we can merge" msgstr "не является тем, что можно слить" -#: builtin/merge.c:1174 +#: builtin/merge.c:1247 msgid "--abort expects no arguments" msgstr "опция --abort не принимает аргументы" -#: builtin/merge.c:1178 +#: builtin/merge.c:1251 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "Нет слияния, которое можно отменить (отсутствует файл MERGE_HEAD)." -#: builtin/merge.c:1190 +#: builtin/merge.c:1263 msgid "--continue expects no arguments" msgstr "опция --continue не принимает аргументы" -#: builtin/merge.c:1194 +#: builtin/merge.c:1267 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "Сейчас не происходит слияние (отсутствует файл MERGE_HEAD)." -#: builtin/merge.c:1210 +#: builtin/merge.c:1283 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." msgstr "Вы не завершили слияние (присутствует файл MERGE_HEAD).\nВыполните коммит ваших изменений, перед слиянием." -#: builtin/merge.c:1217 +#: builtin/merge.c:1290 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." msgstr "Вы не завершили копирование коммита (присутствует файл CHERRY_PICK_HEAD).\nПожалуйста, закоммитьте ваши изменения, перед слиянием." -#: builtin/merge.c:1220 +#: builtin/merge.c:1293 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "Вы не завершили копирование коммита (присутствует файл CHERRY_PICK_HEAD)." -#: builtin/merge.c:1229 +#: builtin/merge.c:1302 msgid "You cannot combine --squash with --no-ff." msgstr "Нельзя использовать одновременно --squash и --no-ff." -#: builtin/merge.c:1237 +#: builtin/merge.c:1310 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "Коммит не указан и параметр merge.defaultToUpstream не установлен." -#: builtin/merge.c:1254 +#: builtin/merge.c:1327 msgid "Squash commit into empty head not supported yet" msgstr "Уплотнение коммита в пустую ветку еще не поддерживается" -#: builtin/merge.c:1256 +#: builtin/merge.c:1329 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "Коммит, не являющийся перемоткой вперед, нет смысла делать в пустую ветку." -#: builtin/merge.c:1261 +#: builtin/merge.c:1334 #, c-format msgid "%s - not something we can merge" msgstr "%s не является тем, что можно слить" -#: builtin/merge.c:1263 +#: builtin/merge.c:1336 msgid "Can merge only exactly one commit into empty head" msgstr "Можно только один коммит в пустую ветку." -#: builtin/merge.c:1297 +#: builtin/merge.c:1370 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "Коммит %s содержит не доверенную GPG подпись, предположительно от %s." -#: builtin/merge.c:1300 +#: builtin/merge.c:1373 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "Коммит %s содержит плохую GPG подпись, предположительно от %s." -#: builtin/merge.c:1303 +#: builtin/merge.c:1376 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "Коммит %s не содержит GPG подпись." -#: builtin/merge.c:1306 +#: builtin/merge.c:1379 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "Коммит %s содержит действительную GPG подпись, от %s.\n" -#: builtin/merge.c:1368 +#: builtin/merge.c:1438 msgid "refusing to merge unrelated histories" msgstr "отказ слияния несвязанных историй изменений" -#: builtin/merge.c:1377 +#: builtin/merge.c:1447 msgid "Already up to date." msgstr "Уже обновлено." -#: builtin/merge.c:1387 +#: builtin/merge.c:1457 #, c-format msgid "Updating %s..%s\n" msgstr "Обновление %s..%s\n" -#: builtin/merge.c:1428 +#: builtin/merge.c:1498 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Попытка тривиального слияния в индексе…\n" -#: builtin/merge.c:1435 +#: builtin/merge.c:1505 #, c-format msgid "Nope.\n" msgstr "Не вышло.\n" -#: builtin/merge.c:1460 +#: builtin/merge.c:1530 msgid "Already up to date. Yeeah!" msgstr "Уже обновлено. Круто!" -#: builtin/merge.c:1466 +#: builtin/merge.c:1536 msgid "Not possible to fast-forward, aborting." msgstr "Перемотка вперед невозможна, отмена." -#: builtin/merge.c:1489 builtin/merge.c:1568 +#: builtin/merge.c:1559 builtin/merge.c:1638 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Перемотка дерева к исходному состоянию…\n" -#: builtin/merge.c:1493 +#: builtin/merge.c:1563 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Попытка слияния с помощью стратегии %s…\n" -#: builtin/merge.c:1559 +#: builtin/merge.c:1629 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Ни одна стратегия слияния не обработала слияние.\n" -#: builtin/merge.c:1561 +#: builtin/merge.c:1631 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Сбой при слиянии с помощью стратегии %s.\n" -#: builtin/merge.c:1570 +#: builtin/merge.c:1640 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "Использую %s для подготовки ручного разрешения конфликтов.\n" -#: builtin/merge.c:1582 +#: builtin/merge.c:1652 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "Автоматическое слияние прошло успешно; как и запрашивали, остановлено перед выполнением коммита\n" -#: builtin/merge-base.c:30 +#: builtin/merge-base.c:31 msgid "git merge-base [-a | --all] <commit> <commit>..." msgstr "git merge-base [-a | --all] <коммит> <коммит>…" -#: builtin/merge-base.c:31 +#: builtin/merge-base.c:32 msgid "git merge-base [-a | --all] --octopus <commit>..." msgstr "git merge-base [-a | --all] --octopus <коммит>…" -#: builtin/merge-base.c:32 +#: builtin/merge-base.c:33 msgid "git merge-base --independent <commit>..." msgstr "git merge-base --independent <коммит>…" -#: builtin/merge-base.c:33 +#: builtin/merge-base.c:34 msgid "git merge-base --is-ancestor <commit> <commit>" msgstr "git merge-base --is-ancestor <коммит> <коммит>" -#: builtin/merge-base.c:34 +#: builtin/merge-base.c:35 msgid "git merge-base --fork-point <ref> [<commit>]" msgstr "git merge-base --fork-point <ссылка> [<коммит>]" -#: builtin/merge-base.c:220 +#: builtin/merge-base.c:221 msgid "output all common ancestors" msgstr "вывести всех общих предков" -#: builtin/merge-base.c:222 +#: builtin/merge-base.c:223 msgid "find ancestors for a single n-way merge" msgstr "вывести предков для одного многоходового слияния" -#: builtin/merge-base.c:224 +#: builtin/merge-base.c:225 msgid "list revs not reachable from others" msgstr "вывести список редаций, которые не достижимы из друг друга" -#: builtin/merge-base.c:226 +#: builtin/merge-base.c:227 msgid "is the first one ancestor of the other?" msgstr "является первым предком второго указанного коммита?" -#: builtin/merge-base.c:228 +#: builtin/merge-base.c:229 msgid "find where <commit> forked from reflog of <ref>" msgstr "найти журнале ссылок <ссылка> где именно <коммит> разветвился" @@ -10076,19 +12016,19 @@ msgstr "не удалось распознать ссылку «%s»" msgid "Merging %s with %s\n" msgstr "Слияние %s и %s\n" -#: builtin/mktree.c:65 +#: builtin/mktree.c:66 msgid "git mktree [-z] [--missing] [--batch]" msgstr "git mktree [-z] [--missing] [--batch]" -#: builtin/mktree.c:153 +#: builtin/mktree.c:154 msgid "input is NUL terminated" msgstr "ввод отделённый НУЛЕВЫМИ символами" -#: builtin/mktree.c:154 builtin/write-tree.c:25 +#: builtin/mktree.c:155 builtin/write-tree.c:25 msgid "allow missing objects" msgstr "допустить отсутствие объектов" -#: builtin/mktree.c:155 +#: builtin/mktree.c:156 msgid "allow creation of more than one tree" msgstr "допустить создание более одного дерева" @@ -10096,21 +12036,21 @@ msgstr "допустить создание более одного дерева msgid "git mv [<options>] <source>... <destination>" msgstr "git mv [<опции>] <источник>… <назначение>" -#: builtin/mv.c:83 +#: builtin/mv.c:82 #, c-format msgid "Directory %s is in index and no submodule?" msgstr "Каталог %s в индексе и не является подмодулем?" -#: builtin/mv.c:85 builtin/rm.c:289 +#: builtin/mv.c:84 msgid "Please stage your changes to .gitmodules or stash them to proceed" msgstr "Чтобы продолжить, проиндексируйте или спрячьте ваши изменения в файле .gitmodules" -#: builtin/mv.c:103 +#: builtin/mv.c:102 #, c-format msgid "%.*s is in index" msgstr "%.*s в индесе" -#: builtin/mv.c:125 +#: builtin/mv.c:124 msgid "force move/rename even if target exists" msgstr "принудительно перемещать/переименовать, даже если цель существует" @@ -10118,470 +12058,470 @@ msgstr "принудительно перемещать/переименоват msgid "skip move/rename errors" msgstr "пропускать ошибки при перемещении/переименовании" -#: builtin/mv.c:167 +#: builtin/mv.c:168 #, c-format msgid "destination '%s' is not a directory" msgstr "целевой путь «%s» не является каталогом" -#: builtin/mv.c:178 +#: builtin/mv.c:179 #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "Проверка переименования из «%s» в «%s»\n" -#: builtin/mv.c:182 +#: builtin/mv.c:183 msgid "bad source" msgstr "плохой источник" -#: builtin/mv.c:185 +#: builtin/mv.c:186 msgid "can not move directory into itself" msgstr "нельзя переместить каталог в самого себя" -#: builtin/mv.c:188 +#: builtin/mv.c:189 msgid "cannot move directory over file" msgstr "нельзя переместить каталог в файл" -#: builtin/mv.c:197 +#: builtin/mv.c:198 msgid "source directory is empty" msgstr "исходный каталог пуст" -#: builtin/mv.c:222 +#: builtin/mv.c:223 msgid "not under version control" msgstr "не под версионным контролем" -#: builtin/mv.c:225 +#: builtin/mv.c:226 msgid "destination exists" msgstr "целевой путь уже существует" -#: builtin/mv.c:233 +#: builtin/mv.c:234 #, c-format msgid "overwriting '%s'" msgstr "перезапись «%s»" -#: builtin/mv.c:236 +#: builtin/mv.c:237 msgid "Cannot overwrite" msgstr "Не удалось перезаписать" -#: builtin/mv.c:239 +#: builtin/mv.c:240 msgid "multiple sources for the same target" msgstr "несколько источников для одного целевого пути" -#: builtin/mv.c:241 +#: builtin/mv.c:242 msgid "destination directory does not exist" msgstr "целевой каталог не существует" -#: builtin/mv.c:248 +#: builtin/mv.c:249 #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s, откуда=%s, куда=%s" -#: builtin/mv.c:269 +#: builtin/mv.c:270 #, c-format msgid "Renaming %s to %s\n" msgstr "Переименование %s в %s\n" -#: builtin/mv.c:275 builtin/remote.c:712 builtin/repack.c:390 +#: builtin/mv.c:276 builtin/remote.c:716 builtin/repack.c:494 #, c-format msgid "renaming '%s' failed" msgstr "сбой при переименовании «%s»" -#: builtin/name-rev.c:338 +#: builtin/name-rev.c:355 msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [<опции>] <коммит>…" -#: builtin/name-rev.c:339 +#: builtin/name-rev.c:356 msgid "git name-rev [<options>] --all" msgstr "git name-rev [<опции>] --all" -#: builtin/name-rev.c:340 +#: builtin/name-rev.c:357 msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [<опции>] --stdin" -#: builtin/name-rev.c:395 +#: builtin/name-rev.c:413 msgid "print only names (no SHA-1)" msgstr "выводить только имена (без SHA-1)" -#: builtin/name-rev.c:396 +#: builtin/name-rev.c:414 msgid "only use tags to name the commits" msgstr "использовать только метки для именования коммитов" -#: builtin/name-rev.c:398 +#: builtin/name-rev.c:416 msgid "only use refs matching <pattern>" msgstr "использовать только ссылки, соответствующие <шаблону> " -#: builtin/name-rev.c:400 +#: builtin/name-rev.c:418 msgid "ignore refs matching <pattern>" msgstr "игнорировать ссылки, соответствующие <шаблону>" -#: builtin/name-rev.c:402 +#: builtin/name-rev.c:420 msgid "list all commits reachable from all refs" msgstr "вывести список всех коммитов, достижимых со всех ссылок" -#: builtin/name-rev.c:403 +#: builtin/name-rev.c:421 msgid "read from stdin" msgstr "прочитать из стандартного ввода" -#: builtin/name-rev.c:404 +#: builtin/name-rev.c:422 msgid "allow to print `undefined` names (default)" msgstr "разрешить вывод «undefined», если не найдено (по умолчанию)" -#: builtin/name-rev.c:410 +#: builtin/name-rev.c:428 msgid "dereference tags in the input (internal use)" msgstr "разыменовывать введенные метки (для внутреннего использования)" -#: builtin/notes.c:26 +#: builtin/notes.c:28 msgid "git notes [--ref <notes-ref>] [list [<object>]]" msgstr "git notes [--ref <ссылка-на-заметку>] [list [<объект>]]" -#: builtin/notes.c:27 +#: 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 <ссылка-на-заметку>] add [-f] [--allow-empty] [-m <сообщение> | -F <файл> | (-c | -C) <объект>] [<объект>]" -#: builtin/notes.c:28 +#: builtin/notes.c:30 msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>" msgstr "git notes [--ref <ссылка-на-заметку>] copy [-f] <из-объекта> <в-объект>" -#: builtin/notes.c:29 +#: 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 <ссылка-на-заметку>] append [--allow-empty] [-m <сообщение> | -F <файл> | (-c | -C) <объект>] [<объект>]" -#: builtin/notes.c:30 +#: builtin/notes.c:32 msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]" msgstr "git notes [--ref <ссылка-на-заметку>] edit [--allow-empty] [<объект>]" -#: builtin/notes.c:31 +#: builtin/notes.c:33 msgid "git notes [--ref <notes-ref>] show [<object>]" msgstr "git notes [--ref <ссылка-на-заметку>] show [<объект>]" -#: builtin/notes.c:32 +#: builtin/notes.c:34 msgid "" "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>" msgstr "git notes [--ref <ссылка-на-заметку>] merge [-v | -q] [-s <стратегия>] <ссылка-на-заметку>" -#: builtin/notes.c:33 +#: builtin/notes.c:35 msgid "git notes merge --commit [-v | -q]" msgstr "git notes merge --commit [-v | -q]" -#: builtin/notes.c:34 +#: builtin/notes.c:36 msgid "git notes merge --abort [-v | -q]" msgstr "git notes merge --abort [-v | -q]" -#: builtin/notes.c:35 +#: builtin/notes.c:37 msgid "git notes [--ref <notes-ref>] remove [<object>...]" msgstr "git notes [--ref <ссылка-на-заметку>] remove [<объект>…]" -#: builtin/notes.c:36 +#: builtin/notes.c:38 msgid "git notes [--ref <notes-ref>] prune [-n] [-v]" msgstr "git notes [--ref <имя-заметки>] prune [-n] [-v]" -#: builtin/notes.c:37 +#: builtin/notes.c:39 msgid "git notes [--ref <notes-ref>] get-ref" msgstr "git notes [--ref <ссылка-на-заметку>] get-ref" -#: builtin/notes.c:42 +#: builtin/notes.c:44 msgid "git notes [list [<object>]]" msgstr "git notes [list [<объект>]]" -#: builtin/notes.c:47 +#: builtin/notes.c:49 msgid "git notes add [<options>] [<object>]" msgstr "git notes add [<опции>] [<объект>]" -#: builtin/notes.c:52 +#: builtin/notes.c:54 msgid "git notes copy [<options>] <from-object> <to-object>" msgstr "git notes copy [<опции>] <из-объекта> <в-объект>" -#: builtin/notes.c:53 +#: builtin/notes.c:55 msgid "git notes copy --stdin [<from-object> <to-object>]..." msgstr "git notes copy --stdin [<из-объекта> <в-объект>]…" -#: builtin/notes.c:58 +#: builtin/notes.c:60 msgid "git notes append [<options>] [<object>]" msgstr "git notes append [<опции>] [<объект>]" -#: builtin/notes.c:63 +#: builtin/notes.c:65 msgid "git notes edit [<object>]" msgstr "git notes edit [<объект>]" -#: builtin/notes.c:68 +#: builtin/notes.c:70 msgid "git notes show [<object>]" msgstr "git notes show [<объект>]" -#: builtin/notes.c:73 +#: builtin/notes.c:75 msgid "git notes merge [<options>] <notes-ref>" msgstr "git notes merge [<опции>] <ссылка-на-заметку>" -#: builtin/notes.c:74 +#: builtin/notes.c:76 msgid "git notes merge --commit [<options>]" msgstr "git notes merge --commit [<опции>]" -#: builtin/notes.c:75 +#: builtin/notes.c:77 msgid "git notes merge --abort [<options>]" msgstr "git notes merge --abort [<опции>]" -#: builtin/notes.c:80 +#: builtin/notes.c:82 msgid "git notes remove [<object>]" msgstr "git notes remove [<опции>]" -#: builtin/notes.c:85 +#: builtin/notes.c:87 msgid "git notes prune [<options>]" msgstr "git notes prune [<опции>]" -#: builtin/notes.c:90 +#: builtin/notes.c:92 msgid "git notes get-ref" msgstr "git notes get-ref" -#: builtin/notes.c:95 +#: builtin/notes.c:97 msgid "Write/edit the notes for the following object:" msgstr "Записать/изменить заметки для следующего объекта:" -#: builtin/notes.c:148 +#: builtin/notes.c:150 #, c-format msgid "unable to start 'show' for object '%s'" msgstr "не удалось запустить «show» для объекта «%s»" -#: builtin/notes.c:152 +#: builtin/notes.c:154 msgid "could not read 'show' output" msgstr "не удалось прочитать вывод «show»" -#: builtin/notes.c:160 +#: builtin/notes.c:162 #, c-format msgid "failed to finish 'show' for object '%s'" msgstr "не удалось завершить «show» для объекта «%s»" -#: builtin/notes.c:195 +#: builtin/notes.c:197 msgid "please supply the note contents using either -m or -F option" msgstr "пожалуйста, укажите содержимое заметки, используя опцию -m или -F" -#: builtin/notes.c:204 +#: builtin/notes.c:206 msgid "unable to write note object" msgstr "не удалось записать объект заметки" -#: builtin/notes.c:206 +#: builtin/notes.c:208 #, c-format msgid "the note contents have been left in %s" msgstr "содержимое заметки осталось в %s" -#: builtin/notes.c:234 builtin/tag.c:500 +#: builtin/notes.c:236 builtin/tag.c:508 #, c-format msgid "cannot read '%s'" msgstr "не удалось прочитать «%s»" -#: builtin/notes.c:236 builtin/tag.c:503 +#: builtin/notes.c:238 builtin/tag.c:511 #, c-format msgid "could not open or read '%s'" msgstr "не удалось открыть или прочитать «%s»" -#: builtin/notes.c:255 builtin/notes.c:306 builtin/notes.c:308 -#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:517 -#: builtin/notes.c:522 builtin/notes.c:600 builtin/notes.c:662 +#: builtin/notes.c:257 builtin/notes.c:308 builtin/notes.c:310 +#: builtin/notes.c:378 builtin/notes.c:433 builtin/notes.c:519 +#: builtin/notes.c:524 builtin/notes.c:602 builtin/notes.c:664 #, c-format msgid "failed to resolve '%s' as a valid ref." msgstr "не удалось разрешить «%s» как ссылку." -#: builtin/notes.c:258 +#: builtin/notes.c:260 #, c-format msgid "failed to read object '%s'." msgstr "не удалось прочитать объект «%s»." -#: builtin/notes.c:262 +#: builtin/notes.c:264 #, c-format msgid "cannot read note data from non-blob object '%s'." msgstr "не удалось прочитать данные заметки из недвоичного объекта «%s»." -#: builtin/notes.c:302 +#: builtin/notes.c:304 #, c-format msgid "malformed input line: '%s'." msgstr "неправильная введенная строка: «%s»." -#: builtin/notes.c:317 +#: builtin/notes.c:319 #, c-format msgid "failed to copy notes from '%s' to '%s'" msgstr "не удалось скопировать заметку из «%s» в «%s»" #. TRANSLATORS: the first %s will be replaced by a git #. notes command: 'add', 'merge', 'remove', etc. -#: builtin/notes.c:349 +#: builtin/notes.c:351 #, c-format msgid "refusing to %s notes in %s (outside of refs/notes/)" msgstr "отказ в перезаписи %s заметок в %s (за пределами refs/notes/)" -#: builtin/notes.c:369 builtin/notes.c:424 builtin/notes.c:500 -#: builtin/notes.c:512 builtin/notes.c:588 builtin/notes.c:655 -#: builtin/notes.c:805 builtin/notes.c:952 builtin/notes.c:973 +#: builtin/notes.c:371 builtin/notes.c:426 builtin/notes.c:502 +#: builtin/notes.c:514 builtin/notes.c:590 builtin/notes.c:657 +#: builtin/notes.c:807 builtin/notes.c:954 builtin/notes.c:975 msgid "too many parameters" msgstr "передано слишком много параметров" -#: builtin/notes.c:382 builtin/notes.c:668 +#: builtin/notes.c:384 builtin/notes.c:670 #, c-format msgid "no note found for object %s." msgstr "не найдена заметка для объекта %s." -#: builtin/notes.c:403 builtin/notes.c:566 +#: builtin/notes.c:405 builtin/notes.c:568 msgid "note contents as a string" msgstr "текстовое содержимое заметки" -#: builtin/notes.c:406 builtin/notes.c:569 +#: builtin/notes.c:408 builtin/notes.c:571 msgid "note contents in a file" msgstr "содержимое заметки в файле" -#: builtin/notes.c:409 builtin/notes.c:572 +#: builtin/notes.c:411 builtin/notes.c:574 msgid "reuse and edit specified note object" msgstr "использовать и отредактировать указанный объект заметки" -#: builtin/notes.c:412 builtin/notes.c:575 +#: builtin/notes.c:414 builtin/notes.c:577 msgid "reuse specified note object" msgstr "использовать указанный объект заметки" -#: builtin/notes.c:415 builtin/notes.c:578 +#: builtin/notes.c:417 builtin/notes.c:580 msgid "allow storing empty note" msgstr "разрешить сохранение пустой заметки" -#: builtin/notes.c:416 builtin/notes.c:487 +#: builtin/notes.c:418 builtin/notes.c:489 msgid "replace existing notes" msgstr "заменить существующие заметки" -#: builtin/notes.c:441 +#: builtin/notes.c:443 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "Не удалось добавить заметку. Найдена существующая заметка у объекта %s. Используйте параметр «-f» для перезаписи существующих заметок." -#: builtin/notes.c:456 builtin/notes.c:535 +#: builtin/notes.c:458 builtin/notes.c:537 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "Перезапись существующих заметок у объекта %s\n" -#: builtin/notes.c:467 builtin/notes.c:627 builtin/notes.c:892 +#: builtin/notes.c:469 builtin/notes.c:629 builtin/notes.c:894 #, c-format msgid "Removing note for object %s\n" msgstr "Удаление заметки у объекта %s\n" -#: builtin/notes.c:488 +#: builtin/notes.c:490 msgid "read objects from stdin" msgstr "прочитать объекты из стандартного ввода" -#: builtin/notes.c:490 +#: builtin/notes.c:492 msgid "load rewriting config for <command> (implies --stdin)" msgstr "загрузить настройки перезаписи для команды <команда> (включает в себя --stdin)" -#: builtin/notes.c:508 +#: builtin/notes.c:510 msgid "too few parameters" msgstr "передано слишком мало параметров" -#: builtin/notes.c:529 +#: builtin/notes.c:531 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite" " existing notes" msgstr "Не удалось скопировать заметку. Найдена существующая заметка у объекта %s. Используйте параметр «-f» для перезаписи существующих заметок." -#: builtin/notes.c:541 +#: builtin/notes.c:543 #, c-format msgid "missing notes on source object %s. Cannot copy." msgstr "нет заметок у исходного объекта %s. Нельзя скопировать." -#: builtin/notes.c:593 +#: builtin/notes.c:595 #, c-format msgid "" "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" "Please use 'git notes add -f -m/-F/-c/-C' instead.\n" msgstr "Опции -m/-F/-c/-C для подкоманды «edit» устарели.\nИспользуйте вместо них «git notes add -f -m/-F/-c/-C».\n" -#: builtin/notes.c:688 +#: builtin/notes.c:690 msgid "failed to delete ref NOTES_MERGE_PARTIAL" msgstr "не удалось удалить ссылку NOTES_MERGE_PARTIAL" -#: builtin/notes.c:690 +#: builtin/notes.c:692 msgid "failed to delete ref NOTES_MERGE_REF" msgstr "не удалось удалить ссылку NOTES_MERGE_REF" -#: builtin/notes.c:692 +#: builtin/notes.c:694 msgid "failed to remove 'git notes merge' worktree" msgstr "не удалось удалить рабочий каталог «git notes merge»" -#: builtin/notes.c:712 +#: builtin/notes.c:714 msgid "failed to read ref NOTES_MERGE_PARTIAL" msgstr "не удалось прочитать ссылку NOTES_MERGE_PARTIAL" -#: builtin/notes.c:714 +#: builtin/notes.c:716 msgid "could not find commit from NOTES_MERGE_PARTIAL." msgstr "не удалось найти коммит из NOTES_MERGE_PARTIAL." -#: builtin/notes.c:716 +#: builtin/notes.c:718 msgid "could not parse commit from NOTES_MERGE_PARTIAL." msgstr "не удалось разобрать коммит из NOTES_MERGE_PARTIAL." -#: builtin/notes.c:729 +#: builtin/notes.c:731 msgid "failed to resolve NOTES_MERGE_REF" msgstr "не удалось разрешить NOTES_MERGE_REF" -#: builtin/notes.c:732 +#: builtin/notes.c:734 msgid "failed to finalize notes merge" msgstr "не удалось завершить слиние заметок" -#: builtin/notes.c:758 +#: builtin/notes.c:760 #, c-format msgid "unknown notes merge strategy %s" msgstr "неизвестная стратегия слияния заметок %s" -#: builtin/notes.c:774 +#: builtin/notes.c:776 msgid "General options" msgstr "Общие опции" -#: builtin/notes.c:776 +#: builtin/notes.c:778 msgid "Merge options" msgstr "Опции слияния" -#: builtin/notes.c:778 +#: builtin/notes.c:780 msgid "" "resolve notes conflicts using the given strategy " "(manual/ours/theirs/union/cat_sort_uniq)" msgstr "разрешить конфликты заметок с помощью указанной стратегии (manual/ours/theirs/union/cat_sort_uniq)" -#: builtin/notes.c:780 +#: builtin/notes.c:782 msgid "Committing unmerged notes" msgstr "Коммит не слитых заметок" -#: builtin/notes.c:782 +#: builtin/notes.c:784 msgid "finalize notes merge by committing unmerged notes" msgstr "завершить слияние заметок коммитом не слитых заметок" -#: builtin/notes.c:784 +#: builtin/notes.c:786 msgid "Aborting notes merge resolution" msgstr "Отмена разрешения слияния заметок" -#: builtin/notes.c:786 +#: builtin/notes.c:788 msgid "abort notes merge" msgstr "отменить слияние заметок" -#: builtin/notes.c:797 +#: builtin/notes.c:799 msgid "cannot mix --commit, --abort or -s/--strategy" msgstr "нельзя использовать одновременно --commit, --abort и -s/--strategy" -#: builtin/notes.c:802 +#: builtin/notes.c:804 msgid "must specify a notes ref to merge" msgstr "вы должны указать ссылку заметки для слияния" -#: builtin/notes.c:826 +#: builtin/notes.c:828 #, c-format msgid "unknown -s/--strategy: %s" msgstr "неизвестный параметр для -s/--strategy: %s" -#: builtin/notes.c:863 +#: builtin/notes.c:865 #, c-format msgid "a notes merge into %s is already in-progress at %s" msgstr "слияние заметок в %s уже выполняется на %s" -#: builtin/notes.c:866 +#: builtin/notes.c:868 #, c-format msgid "failed to store link to current notes ref (%s)" msgstr "не удалось сохранить адрес текущей ссылки на заметку (%s)" -#: builtin/notes.c:868 +#: builtin/notes.c:870 #, c-format msgid "" "Automatic notes merge failed. Fix conflicts in %s and commit the result with" @@ -10589,325 +12529,509 @@ msgid "" "--abort'.\n" msgstr "Не удалось автоматически слить заметки. Исправьте конфликты в %s и закоммитьте результат с помощью «git notes merge --commit», или прервите процесс слияния с помощью «git notes merge --abort».\n" -#: builtin/notes.c:890 +#: builtin/notes.c:892 #, c-format msgid "Object %s has no note\n" msgstr "У объекта %s нет заметки\n" -#: builtin/notes.c:902 +#: builtin/notes.c:904 msgid "attempt to remove non-existent note is not an error" msgstr "попытка удаления несуществующей заметки не является ошибкой" -#: builtin/notes.c:905 +#: builtin/notes.c:907 msgid "read object names from the standard input" msgstr "прочитать имена объектов из стандартного ввода" -#: builtin/notes.c:943 builtin/prune.c:105 builtin/worktree.c:158 +#: builtin/notes.c:945 builtin/prune.c:108 builtin/worktree.c:151 msgid "do not remove, show only" msgstr "не удалять, только показать список" -#: builtin/notes.c:944 +#: builtin/notes.c:946 msgid "report pruned notes" msgstr "вывести список удаленных заметок" -#: builtin/notes.c:986 +#: builtin/notes.c:988 msgid "notes-ref" msgstr "ссылка-на-заметку" -#: builtin/notes.c:987 +#: builtin/notes.c:989 msgid "use notes from <notes-ref>" msgstr "использовать заметку из <ссылка-на-заметку>" -#: builtin/notes.c:1022 +#: builtin/notes.c:1024 #, c-format msgid "unknown subcommand: %s" msgstr "неизвестная подкоманда: %s" -#: builtin/pack-objects.c:33 +#: builtin/pack-objects.c:48 msgid "" "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" msgstr "git pack-objects --stdout [<опции>…] [< <список-ссылок> | < <список-объектов>]" -#: builtin/pack-objects.c:34 +#: builtin/pack-objects.c:49 msgid "" "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" msgstr "git pack-objects [<опции>…] <имя-базы> [< <список-ссылок> | < <список-объектов>]" -#: builtin/pack-objects.c:192 builtin/pack-objects.c:195 +#: builtin/pack-objects.c:414 #, c-format -msgid "deflate error (%d)" -msgstr "ошибка сжатия (%d)" +msgid "bad packed object CRC for %s" +msgstr "" + +#: builtin/pack-objects.c:425 +#, c-format +msgid "corrupt packed object for %s" +msgstr "" + +#: builtin/pack-objects.c:556 +#, c-format +msgid "recursive delta detected for object %s" +msgstr "" + +#: builtin/pack-objects.c:756 +#, c-format +msgid "ordered %u objects, expected %<PRIu32>" +msgstr "" + +#: builtin/pack-objects.c:769 +#, c-format +msgid "packfile is invalid: %s" +msgstr "" + +#: builtin/pack-objects.c:773 +#, c-format +msgid "unable to open packfile for reuse: %s" +msgstr "" + +#: builtin/pack-objects.c:777 +msgid "unable to seek in reused packfile" +msgstr "" #: builtin/pack-objects.c:788 +msgid "unable to read from reused packfile" +msgstr "" + +#: builtin/pack-objects.c:816 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "отключение записи битовых карт, так как карты были разбиты на части из-за pack.packSizeLimit" -#: builtin/pack-objects.c:801 +#: builtin/pack-objects.c:829 msgid "Writing objects" msgstr "Запись объектов" -#: builtin/pack-objects.c:1081 +#: builtin/pack-objects.c:891 builtin/update-index.c:88 +#, c-format +msgid "failed to stat %s" +msgstr "не удалось выполнить stat %s" + +#: builtin/pack-objects.c:944 +#, c-format +msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" +msgstr "" + +#: builtin/pack-objects.c:1112 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "отключение записи битовых карт, так как некоторые объекты не были упакованы" -#: builtin/pack-objects.c:2451 +#: builtin/pack-objects.c:1489 +#, c-format +msgid "delta base offset overflow in pack for %s" +msgstr "" + +#: builtin/pack-objects.c:1498 +#, c-format +msgid "delta base offset out of bound for %s" +msgstr "" + +#: builtin/pack-objects.c:1771 +msgid "Counting objects" +msgstr "Подсчет объектов" + +#: builtin/pack-objects.c:1913 +#, c-format +msgid "unable to get size of %s" +msgstr "не удалось получить размер %s" + +#: builtin/pack-objects.c:1928 +#, c-format +msgid "unable to parse object header of %s" +msgstr "не удалось разобрать заголовок объекта %s" + +#: builtin/pack-objects.c:1995 builtin/pack-objects.c:2011 +#: builtin/pack-objects.c:2021 +#, c-format +msgid "object %s cannot be read" +msgstr "" + +#: builtin/pack-objects.c:1998 builtin/pack-objects.c:2025 +#, c-format +msgid "object %s inconsistent object length (%lu vs %lu)" +msgstr "" + +#: builtin/pack-objects.c:2035 +msgid "suboptimal pack - out of memory" +msgstr "" + +#: builtin/pack-objects.c:2369 +#, c-format +msgid "Delta compression using up to %d threads" +msgstr "При сжатии изменений используется до %d потоков" + +#: builtin/pack-objects.c:2505 +#, c-format +msgid "unable to pack objects reachable from tag %s" +msgstr "" + +#: builtin/pack-objects.c:2589 msgid "Compressing objects" msgstr "Сжатие объектов" -#: builtin/pack-objects.c:2599 +#: builtin/pack-objects.c:2595 +msgid "inconsistency with delta count" +msgstr "" + +#: builtin/pack-objects.c:2674 +#, c-format +msgid "" +"expected edge object ID, got garbage:\n" +" %s" +msgstr "" + +#: builtin/pack-objects.c:2680 +#, c-format +msgid "" +"expected object ID, got garbage:\n" +" %s" +msgstr "" + +#: builtin/pack-objects.c:2760 msgid "invalid value for --missing" msgstr "недопустимое значение для --missing" -#: builtin/pack-objects.c:2902 +#: builtin/pack-objects.c:2819 builtin/pack-objects.c:2927 +msgid "cannot open pack index" +msgstr "" + +#: builtin/pack-objects.c:2850 +#, c-format +msgid "loose object at %s could not be examined" +msgstr "" + +#: builtin/pack-objects.c:2935 +msgid "unable to force loose object" +msgstr "" + +#: builtin/pack-objects.c:3022 +#, c-format +msgid "not a rev '%s'" +msgstr "" + +#: builtin/pack-objects.c:3025 +#, c-format +msgid "bad revision '%s'" +msgstr "" + +#: builtin/pack-objects.c:3045 +msgid "unable to add recent objects" +msgstr "" + +#: builtin/pack-objects.c:3095 #, c-format msgid "unsupported index version %s" msgstr "неподдерживаемая версия индекса %s" -#: builtin/pack-objects.c:2906 +#: builtin/pack-objects.c:3099 #, c-format msgid "bad index version '%s'" msgstr "плохая версия индекса «%s»" -#: builtin/pack-objects.c:2936 +#: builtin/pack-objects.c:3130 msgid "do not show progress meter" msgstr "не выводить прогресс выполнения" -#: builtin/pack-objects.c:2938 +#: builtin/pack-objects.c:3132 msgid "show progress meter" msgstr "показать прогресс выполнения" -#: builtin/pack-objects.c:2940 +#: builtin/pack-objects.c:3134 msgid "show progress meter during object writing phase" msgstr "показать прогресс выполнения во время записи объектов" -#: builtin/pack-objects.c:2943 +#: builtin/pack-objects.c:3137 msgid "similar to --all-progress when progress meter is shown" msgstr "похоже на --all-progress при включенном прогрессе выполнения" -#: builtin/pack-objects.c:2944 -msgid "version[,offset]" -msgstr "версия[,смещение]" +#: builtin/pack-objects.c:3138 +msgid "<version>[,<offset>]" +msgstr "" -#: builtin/pack-objects.c:2945 +#: builtin/pack-objects.c:3139 msgid "write the pack index file in the specified idx format version" msgstr "записать файл индекса пакета в указанной версии формата" -#: builtin/pack-objects.c:2948 +#: builtin/pack-objects.c:3142 msgid "maximum size of each output pack file" msgstr "максимальный размер каждого выходного файла пакета" -#: builtin/pack-objects.c:2950 +#: builtin/pack-objects.c:3144 msgid "ignore borrowed objects from alternate object store" msgstr "игнорировать чужие объекты, взятые из альтернативного хранилища объектов" -#: builtin/pack-objects.c:2952 +#: builtin/pack-objects.c:3146 msgid "ignore packed objects" msgstr "игнорировать упакованные объекты" -#: builtin/pack-objects.c:2954 +#: builtin/pack-objects.c:3148 msgid "limit pack window by objects" msgstr "ограничить окно пакета по количеству объектов" -#: builtin/pack-objects.c:2956 +#: builtin/pack-objects.c:3150 msgid "limit pack window by memory in addition to object limit" msgstr "дополнительно к количеству объектов ограничить окно пакета по памяти" -#: builtin/pack-objects.c:2958 +#: builtin/pack-objects.c:3152 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "максимальная разрешенная длина цепочки дельт в результирующем пакете" -#: builtin/pack-objects.c:2960 +#: builtin/pack-objects.c:3154 msgid "reuse existing deltas" msgstr "использовать повторно существующие дельты" -#: builtin/pack-objects.c:2962 +#: builtin/pack-objects.c:3156 msgid "reuse existing objects" msgstr "использовать повторно существующие объекты" -#: builtin/pack-objects.c:2964 +#: builtin/pack-objects.c:3158 msgid "use OFS_DELTA objects" msgstr "использовать объекты OFS_DELTA" -#: builtin/pack-objects.c:2966 +#: builtin/pack-objects.c:3160 msgid "use threads when searching for best delta matches" msgstr "использовать многопоточность при поиске лучших совпадений дельт" -#: builtin/pack-objects.c:2968 +#: builtin/pack-objects.c:3162 msgid "do not create an empty pack output" msgstr "не создавать пустые выходные пакеты" -#: builtin/pack-objects.c:2970 +#: builtin/pack-objects.c:3164 msgid "read revision arguments from standard input" msgstr "прочитать аргументы редакций из стандартного ввода" -#: builtin/pack-objects.c:2972 +#: builtin/pack-objects.c:3166 msgid "limit the objects to those that are not yet packed" msgstr "ограничиться объектами, которые еще не упакованы" -#: builtin/pack-objects.c:2975 +#: builtin/pack-objects.c:3169 msgid "include objects reachable from any reference" msgstr "включить объекты, которые достижимы по любой из ссылок" -#: builtin/pack-objects.c:2978 +#: builtin/pack-objects.c:3172 msgid "include objects referred by reflog entries" msgstr "включить объекты, на которые ссылаются записи журнала ссылок" -#: builtin/pack-objects.c:2981 +#: builtin/pack-objects.c:3175 msgid "include objects referred to by the index" msgstr "включить объекты, на которые ссылается индекс" -#: builtin/pack-objects.c:2984 +#: builtin/pack-objects.c:3178 msgid "output pack to stdout" msgstr "вывести пакет на стандартный вывод" -#: builtin/pack-objects.c:2986 +#: builtin/pack-objects.c:3180 msgid "include tag objects that refer to objects to be packed" msgstr "включить объекты меток, которые ссылаются на упаковываемые объекты" -#: builtin/pack-objects.c:2988 +#: builtin/pack-objects.c:3182 msgid "keep unreachable objects" msgstr "сохранять ссылки на недоступные объекты" -#: builtin/pack-objects.c:2990 +#: builtin/pack-objects.c:3184 msgid "pack loose unreachable objects" msgstr "паковать недостижимые объекты" -#: builtin/pack-objects.c:2992 +#: builtin/pack-objects.c:3186 msgid "unpack unreachable objects newer than <time>" msgstr "распаковать недоступные объекты, которые новее, чем <время>" -#: builtin/pack-objects.c:2995 +#: builtin/pack-objects.c:3189 msgid "create thin packs" msgstr "создавать тонкие пакеты" -#: builtin/pack-objects.c:2997 +#: builtin/pack-objects.c:3191 msgid "create packs suitable for shallow fetches" msgstr "создавать пакеты, подходящие для частичных извлечений" -#: builtin/pack-objects.c:2999 +#: builtin/pack-objects.c:3193 msgid "ignore packs that have companion .keep file" msgstr "игнорировать пакеты, рядом с которыми лежит .keep файл" -#: builtin/pack-objects.c:3001 +#: builtin/pack-objects.c:3195 +msgid "ignore this pack" +msgstr "игнорировать этот пакет" + +#: builtin/pack-objects.c:3197 msgid "pack compression level" msgstr "уровень сжатия пакета" -#: builtin/pack-objects.c:3003 +#: builtin/pack-objects.c:3199 msgid "do not hide commits by grafts" msgstr "не скрывать коммиты сращениями" -#: builtin/pack-objects.c:3005 +#: builtin/pack-objects.c:3201 msgid "use a bitmap index if available to speed up counting objects" msgstr "по возможности использовать индекс в битовых картах, для ускорения подсчета объектов" -#: builtin/pack-objects.c:3007 +#: builtin/pack-objects.c:3203 msgid "write a bitmap index together with the pack index" msgstr "запись индекса в битовых картах вместе с индексом пакета" -#: builtin/pack-objects.c:3010 +#: builtin/pack-objects.c:3206 msgid "handling for missing objects" msgstr "обработка отсутствующих объектов" -#: builtin/pack-objects.c:3144 -msgid "Counting objects" -msgstr "Подсчет объектов" +#: builtin/pack-objects.c:3209 +msgid "do not pack objects in promisor packfiles" +msgstr "не упаковывать объекты в promisor файлы пакетов" + +#: builtin/pack-objects.c:3233 +#, c-format +msgid "delta chain depth %d is too deep, forcing %d" +msgstr "глубина цепочки различий %d слишком большая, использую принудительно %d" + +#: builtin/pack-objects.c:3238 +#, c-format +msgid "pack.deltaCacheLimit is too high, forcing %d" +msgstr "лисит pack.deltaCacheLimit слишком высокий, использую принудительно %d" + +#: builtin/pack-objects.c:3294 +msgid "--max-pack-size cannot be used to build a pack for transfer" +msgstr "" + +#: builtin/pack-objects.c:3296 +msgid "minimum pack size limit is 1 MiB" +msgstr "" + +#: builtin/pack-objects.c:3301 +msgid "--thin cannot be used to build an indexable pack" +msgstr "" + +#: builtin/pack-objects.c:3304 +msgid "--keep-unreachable and --unpack-unreachable are incompatible" +msgstr "" + +#: builtin/pack-objects.c:3310 +msgid "cannot use --filter without --stdout" +msgstr "" + +#: builtin/pack-objects.c:3366 +msgid "Enumerating objects" +msgstr "Перечисление объектов" + +#: builtin/pack-objects.c:3385 +#, c-format +msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)" +msgstr "Всего %<PRIu32> (изменения %<PRIu32>), повторно использовано %<PRIu32> (изменения %<PRIu32>)" -#: builtin/pack-refs.c:6 +#: builtin/pack-refs.c:7 msgid "git pack-refs [<options>]" msgstr "git pack-refs [<опции>]" -#: builtin/pack-refs.c:14 +#: builtin/pack-refs.c:15 msgid "pack everything" msgstr "паковать всё" -#: builtin/pack-refs.c:15 +#: builtin/pack-refs.c:16 msgid "prune loose refs (default)" msgstr "почистить слабые ссылки (по умолчанию)" -#: builtin/prune-packed.c:8 +#: builtin/prune-packed.c:9 msgid "git prune-packed [-n | --dry-run] [-q | --quiet]" msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]" -#: builtin/prune-packed.c:41 +#: builtin/prune-packed.c:42 msgid "Removing duplicate objects" msgstr "Удаление дублирующихся объектов" -#: builtin/prune.c:11 +#: builtin/prune.c:12 msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--progress] [--expire <время>] [--] [<ветка>…]" -#: builtin/prune.c:106 +#: builtin/prune.c:109 msgid "report pruned objects" msgstr "вывести список удаленных объектов" -#: builtin/prune.c:109 +#: builtin/prune.c:112 msgid "expire objects older than <time>" msgstr "удалить объекты старее чем <дата-окончания>" -#: builtin/prune.c:123 +#: builtin/prune.c:114 +msgid "limit traversal to objects outside promisor packfiles" +msgstr "ограничить обход объектами вне promisor файлов пакетов" + +#: builtin/prune.c:128 msgid "cannot prune in a precious-objects repo" msgstr "нельзя почистить неиспользуемые объекты в precious-objects репозитории" -#: builtin/pull.c:54 builtin/pull.c:56 +#: builtin/pull.c:59 builtin/pull.c:61 #, c-format msgid "Invalid value for %s: %s" msgstr "Неправильное значение %s: %s" -#: builtin/pull.c:76 +#: builtin/pull.c:81 msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "git pull [<опции>] [<репозиторий> [<спецификатор-ссылки>…]]" -#: builtin/pull.c:127 +#: builtin/pull.c:132 msgid "control for recursive fetching of submodules" msgstr "управление рекурсивным извлечением подмодулей" -#: builtin/pull.c:131 +#: builtin/pull.c:136 msgid "Options related to merging" msgstr "Опции, связанные со слиянием" -#: builtin/pull.c:134 +#: builtin/pull.c:139 msgid "incorporate changes by rebasing rather than merging" msgstr "забрать изменения с помощью перемещения, а не слияния" -#: builtin/pull.c:161 builtin/rebase--helper.c:23 builtin/revert.c:121 +#: builtin/pull.c:166 builtin/rebase--helper.c:23 builtin/revert.c:122 msgid "allow fast-forward" msgstr "разрешить перемотку вперед" -#: builtin/pull.c:170 +#: builtin/pull.c:175 msgid "automatically stash/stash pop before and after rebase" msgstr "автоматически выполнять stash/stash pop до и после перемещения" -#: builtin/pull.c:186 +#: builtin/pull.c:191 msgid "Options related to fetching" msgstr "Опции, связанные с извлечением изменений" -#: builtin/pull.c:204 +#: builtin/pull.c:209 msgid "number of submodules pulled in parallel" msgstr "количество подмодулей, которые будут получены парралельно" -#: builtin/pull.c:299 +#: builtin/pull.c:304 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "Неправильное значение для pull.ff: %s" -#: builtin/pull.c:415 +#: builtin/pull.c:420 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." msgstr "Нет претендентов для перемещения среди ссылок, которые вы только что получили." -#: builtin/pull.c:417 +#: builtin/pull.c:422 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "Нет претендентов для слияния среди ссылок, которые вы только что получили." -#: builtin/pull.c:418 +#: builtin/pull.c:423 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." msgstr "Обычно это означает, что вы передали спецификацию ссылки с помощью шаблона и этот шаблон ни с чем не совпал на внешнем репозитории." -#: builtin/pull.c:421 +#: builtin/pull.c:426 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -10915,69 +13039,69 @@ msgid "" "for your current branch, you must specify a branch on the command line." msgstr "Вы попросили получить изменения со внешнего репозитория «%s», но не указали ветку. Так как это не репозиторий по умолчанию для вашей текущей ветки, вы должны указать ветку в командной строке." -#: builtin/pull.c:426 git-parse-remote.sh:73 +#: builtin/pull.c:431 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "Вы сейчас ни на одной из веток." -#: builtin/pull.c:428 builtin/pull.c:443 git-parse-remote.sh:79 +#: builtin/pull.c:433 builtin/pull.c:448 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." msgstr "Пожалуйста, укажите на какую ветку вы хотите переместить изменения." -#: builtin/pull.c:430 builtin/pull.c:445 git-parse-remote.sh:82 +#: builtin/pull.c:435 builtin/pull.c:450 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." msgstr "Пожалуйста, укажите с какой веткой вы хотите слить изменения." -#: builtin/pull.c:431 builtin/pull.c:446 +#: builtin/pull.c:436 builtin/pull.c:451 msgid "See git-pull(1) for details." msgstr "Для дополнительной информации, смотрите git-pull(1)." -#: builtin/pull.c:433 builtin/pull.c:439 builtin/pull.c:448 +#: builtin/pull.c:438 builtin/pull.c:444 builtin/pull.c:453 #: git-parse-remote.sh:64 msgid "<remote>" msgstr "<внешний-репозиторий>" -#: builtin/pull.c:433 builtin/pull.c:448 builtin/pull.c:453 git-rebase.sh:466 +#: builtin/pull.c:438 builtin/pull.c:453 builtin/pull.c:458 git-rebase.sh:576 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "<ветка>" -#: builtin/pull.c:441 git-parse-remote.sh:75 +#: builtin/pull.c:446 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "У текущей ветки нет информации об отслеживании." -#: builtin/pull.c:450 git-parse-remote.sh:95 +#: builtin/pull.c:455 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:455 +#: builtin/pull.c:460 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" "from the remote, but no such ref was fetched." msgstr "Ваша конфигурация указывает, что нужно слить изменения со ссылкой\n«%s» из внешнего репозитория, но такая ссылка не была получена." -#: builtin/pull.c:817 +#: builtin/pull.c:829 msgid "ignoring --verify-signatures for rebase" msgstr "игнорирование --verify-signatures при перемещении" -#: builtin/pull.c:865 +#: builtin/pull.c:877 msgid "--[no-]autostash option is only valid with --rebase." msgstr "--[no-]autostash можно использовать только вместе с --rebase." -#: builtin/pull.c:873 +#: builtin/pull.c:885 msgid "Updating an unborn branch with changes added to the index." msgstr "Обновление еще не начавшейся ветки с изменениями, добавленными в индекс." -#: builtin/pull.c:876 +#: builtin/pull.c:888 msgid "pull with rebase" msgstr "получение с перемещением" -#: builtin/pull.c:877 +#: builtin/pull.c:889 msgid "please commit or stash them." msgstr "сделайте коммит или спрячьте их." -#: builtin/pull.c:902 +#: builtin/pull.c:914 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -10985,7 +13109,7 @@ msgid "" "commit %s." msgstr "извлечение обновило указатель на вашу текущую ветку.\nперемотка вашего рабочего каталога\nс коммита %s." -#: builtin/pull.c:907 +#: builtin/pull.c:919 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -10996,37 +13120,37 @@ msgid "" "to recover." msgstr "Не удалось перемотать вперёд изменения в вашем рабочем каталоге.\nПосле того, как вы убедитесь, что вы сохранили всё необходимое из вывода\n$ git diff %s\n, запустите\n$ git reset --hard\nдля восстановления исходного состояния." -#: builtin/pull.c:922 +#: builtin/pull.c:934 msgid "Cannot merge multiple branches into empty head." msgstr "Нельзя слить несколько веток в пустой указатель на ветку." -#: builtin/pull.c:926 +#: builtin/pull.c:938 msgid "Cannot rebase onto multiple branches." msgstr "Невозможно переместить над несколькими ветками." -#: builtin/pull.c:933 +#: builtin/pull.c:945 msgid "cannot rebase with locally recorded submodule modifications" msgstr "невозможно выполнить перемещение с записанными локальными изменениями в подмодулях" -#: builtin/push.c:17 +#: builtin/push.c:19 msgid "git push [<options>] [<repository> [<refspec>...]]" msgstr "git push [<опции>] [<репозиторий> [<спецификатор-ссылки>…]]" -#: builtin/push.c:92 +#: builtin/push.c:111 msgid "tag shorthand without <tag>" msgstr "указано сокращение tag, но не указана сама <метка>" -#: builtin/push.c:102 +#: builtin/push.c:121 msgid "--delete only accepts plain target ref names" msgstr "опция --delete принимает только простые целевые имена ссылок" -#: builtin/push.c:146 +#: builtin/push.c:165 msgid "" "\n" "To choose either option permanently, see push.default in 'git help config'." msgstr "\nЧтобы выбрать любую из опций на постоянной основе, смотрите push.default в «git help config»." -#: builtin/push.c:149 +#: builtin/push.c:168 #, c-format msgid "" "The upstream branch of your current branch does not match\n" @@ -11041,7 +13165,7 @@ msgid "" "%s" msgstr "Имя вышестоящей ветки и вашей текущей ветки различаются. Чтобы отправить изменения в вышестоящую ветку на внешнем репозитории, используйте:\n\n git push %s HEAD:%s\n\nЧтобы отправить изменения в ветку с таким же именем на внешнем репозитории, используйте:\n\n git push %s %s\n%s" -#: builtin/push.c:164 +#: builtin/push.c:183 #, c-format msgid "" "You are not currently on a branch.\n" @@ -11051,7 +13175,7 @@ msgid "" " git push %s HEAD:<name-of-remote-branch>\n" msgstr "Вы сейчас не находитесь ни на одной из веток.\nЧтобы отправить историю, ведущую к текущему (отделённый HEAD) состоянию, используйте\n\n git push %s HEAD:<имя-внешней-ветки>\n" -#: builtin/push.c:178 +#: builtin/push.c:197 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -11060,13 +13184,13 @@ msgid "" " git push --set-upstream %s %s\n" msgstr "Текущая ветка %s не имеет вышестоящей ветки.\nЧтобы отправить текущую ветку и установить внешнюю ветку как вышестоящую для этой ветки, используйте\n\n git push --set-upstream %s %s\n" -#: builtin/push.c:186 +#: builtin/push.c:205 #, c-format msgid "" "The current branch %s has multiple upstream branches, refusing to push." msgstr "Ваша текущая ветка %s имеет несколько вышестоящих веток, отказ в отправке изменений." -#: builtin/push.c:189 +#: builtin/push.c:208 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -11074,11 +13198,11 @@ msgid "" "to update which remote branch." msgstr "Вы сейчас отправляете изменения на внешний репозиторий «%s», который не является вышестоящим для вашей текущей ветки «%s», без указания того, что отправлять и в какую внешнюю ветку." -#: builtin/push.c:248 +#: builtin/push.c:267 msgid "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "Вы не указали спецификацию ссылки для отправки, а push.default указан как «nothing»." -#: builtin/push.c:255 +#: builtin/push.c:274 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -11086,7 +13210,7 @@ msgid "" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "Обновления были отклонены, так как верхушка вашей текущей ветки\nпозади ее внешней части. Заберите и слейте внешние изменения \n(например, с помощью «git pull …») перед повторной попыткой отправки\nизменений.\nДля дополнительной информации, смотрите «Note about fast-forwards»\nв «git push --help»." -#: builtin/push.c:261 +#: builtin/push.c:280 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. Check out this branch and integrate the remote changes\n" @@ -11094,7 +13218,7 @@ msgid "" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "Обновления были отклонены, так как верхушка отправляемой ветки\nпозади ее внешней части. Переключитесь на ветку и заберите внешние\nизменения (например, с помощью «git pull …») перед повторной\nпопыткой отправки изменений.\nДля дополнительной информации, смотрите «Note about fast-forwards»\nв «git push --help»." -#: builtin/push.c:267 +#: builtin/push.c:286 msgid "" "Updates were rejected because the remote contains work that you do\n" "not have locally. This is usually caused by another repository pushing\n" @@ -11103,33 +13227,33 @@ msgid "" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "Обновления были отклонены, так как внешний репозиторий содержит\nизменения, которых у вас нет в вашем локальном репозитории.\nОбычно, это связанно с тем, что кто-то уже отправил изменения в \nто же место. Перед повторной отправкой ваших изменений, вам нужно\nзабрать и слить изменения из внешнего репозитория себе\n(например, с помощью «git pull …»).\nДля дополнительной информации, смотрите «Note about fast-forwards»\nв «git push --help»." -#: builtin/push.c:274 +#: builtin/push.c:293 msgid "Updates were rejected because the tag already exists in the remote." msgstr "Обновления были отклонены, так как метка уже существует во внешнем репозитории." -#: builtin/push.c:277 +#: builtin/push.c:296 msgid "" "You cannot update a remote ref that points at a non-commit object,\n" "or update a remote ref to make it point at a non-commit object,\n" "without using the '--force' option.\n" msgstr "Вы не можете обновить внешнюю ссылку, которая указывает на объект, не являющийся коммитом или обновить внешнюю ссылку так, чтобы она указывала на объект, не являющийся коммитом, без указания опции «--force».\n" -#: builtin/push.c:337 +#: builtin/push.c:357 #, c-format msgid "Pushing to %s\n" msgstr "Отправка в %s\n" -#: builtin/push.c:341 +#: builtin/push.c:361 #, c-format msgid "failed to push some refs to '%s'" msgstr "не удалось отправить некоторые ссылки в «%s»" -#: builtin/push.c:372 +#: builtin/push.c:395 #, c-format msgid "bad repository '%s'" msgstr "плохой репозитория «%s»" -#: builtin/push.c:373 +#: builtin/push.c:396 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote repository using\n" @@ -11141,115 +13265,140 @@ msgid "" " git push <name>\n" msgstr "Не настроена точка назначения для отправки.\nЛибо укажите URL с помощью командной строки, либо настройте внешний репозиторий с помощью\n\n git remote add <имя> <адрес>\n\nа затем отправьте изменения с помощью имени внешнего репозитория\n\n git push <имя>\n" -#: builtin/push.c:391 -msgid "--all and --tags are incompatible" -msgstr "--all и --tags нельзя использовать одновременно" - -#: builtin/push.c:392 -msgid "--all can't be combined with refspecs" -msgstr "--all нельзя использовать вместе со спецификаторами ссылок" - -#: builtin/push.c:397 -msgid "--mirror and --tags are incompatible" -msgstr "--mirror и --tags нельзя использовать одновременно" - -#: builtin/push.c:398 -msgid "--mirror can't be combined with refspecs" -msgstr "--mirror нельзя использовать вместе со спецификаторами ссылок" - -#: builtin/push.c:403 -msgid "--all and --mirror are incompatible" -msgstr "--all и --mirror нельзя использовать одновременно" - -#: builtin/push.c:535 +#: builtin/push.c:551 msgid "repository" msgstr "репозиторий" -#: builtin/push.c:536 builtin/send-pack.c:163 +#: builtin/push.c:552 builtin/send-pack.c:164 msgid "push all refs" msgstr "отправить все ссылки" -#: builtin/push.c:537 builtin/send-pack.c:165 +#: builtin/push.c:553 builtin/send-pack.c:166 msgid "mirror all refs" msgstr "сделать зеркало всех ссылок" -#: builtin/push.c:539 +#: builtin/push.c:555 msgid "delete refs" msgstr "удалить ссылки" -#: builtin/push.c:540 +#: builtin/push.c:556 msgid "push tags (can't be used with --all or --mirror)" msgstr "отправить метки (нельзя использовать вместе с --all или --mirror)" -#: builtin/push.c:543 builtin/send-pack.c:166 +#: builtin/push.c:559 builtin/send-pack.c:167 msgid "force updates" msgstr "принудительное обновление" -#: builtin/push.c:545 builtin/send-pack.c:180 -msgid "refname>:<expect" -msgstr "имя-ссылки>:<ожидается" +#: builtin/push.c:561 builtin/send-pack.c:181 +msgid "<refname>:<expect>" +msgstr "" -#: builtin/push.c:546 builtin/send-pack.c:181 +#: builtin/push.c:562 builtin/send-pack.c:182 msgid "require old value of ref to be at this value" msgstr "требовать, чтобы старое значение ссылки было ожидаемым" -#: builtin/push.c:549 +#: builtin/push.c:565 msgid "control recursive pushing of submodules" msgstr "управление рекурсивной отправкой подмодулей" -#: builtin/push.c:551 builtin/send-pack.c:174 +#: builtin/push.c:567 builtin/send-pack.c:175 msgid "use thin pack" msgstr "использовать тонкие пакеты" -#: builtin/push.c:552 builtin/push.c:553 builtin/send-pack.c:160 -#: builtin/send-pack.c:161 +#: builtin/push.c:568 builtin/push.c:569 builtin/send-pack.c:161 +#: builtin/send-pack.c:162 msgid "receive pack program" msgstr "путь к программе упаковки на сервере" -#: builtin/push.c:554 +#: builtin/push.c:570 msgid "set upstream for git pull/status" msgstr "установить вышестоящую ветку для git pull/status" -#: builtin/push.c:557 +#: builtin/push.c:573 msgid "prune locally removed refs" msgstr "почистить локально удаленные ссылки" -#: builtin/push.c:559 +#: builtin/push.c:575 msgid "bypass pre-push hook" msgstr "пропустить перехватчик pre-push" -#: builtin/push.c:560 +#: builtin/push.c:576 msgid "push missing but relevant tags" msgstr "отправить пропущенные, но нужные метки" -#: builtin/push.c:563 builtin/send-pack.c:168 +#: builtin/push.c:579 builtin/send-pack.c:169 msgid "GPG sign the push" msgstr "подписать отправку с помощью GPG" -#: builtin/push.c:565 builtin/send-pack.c:175 +#: builtin/push.c:581 builtin/send-pack.c:176 msgid "request atomic transaction on remote side" msgstr "запросить выполнение атомарной транзакции на внешней стороне" -#: builtin/push.c:566 builtin/send-pack.c:171 -msgid "server-specific" -msgstr "зависит-от-сервера" - -#: builtin/push.c:566 builtin/send-pack.c:172 -msgid "option to transmit" -msgstr "передаваемые опции" - -#: builtin/push.c:583 +#: builtin/push.c:599 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete несовместимо с --all, --mirror и --tags" -#: builtin/push.c:585 +#: builtin/push.c:601 msgid "--delete doesn't make sense without any refs" msgstr "--delete не имеет смысла без указания ссылок" #: builtin/push.c:604 +msgid "--all and --tags are incompatible" +msgstr "--all и --tags нельзя использовать одновременно" + +#: builtin/push.c:606 +msgid "--all can't be combined with refspecs" +msgstr "--all нельзя использовать вместе со спецификаторами ссылок" + +#: builtin/push.c:610 +msgid "--mirror and --tags are incompatible" +msgstr "--mirror и --tags нельзя использовать одновременно" + +#: builtin/push.c:612 +msgid "--mirror can't be combined with refspecs" +msgstr "--mirror нельзя использовать вместе со спецификаторами ссылок" + +#: builtin/push.c:615 +msgid "--all and --mirror are incompatible" +msgstr "--all и --mirror нельзя использовать одновременно" + +#: builtin/push.c:634 msgid "push options must not have new line characters" msgstr "опции для отправки не должны содержать символы перевода строк" +#: builtin/range-diff.c:8 +msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>" +msgstr "" + +#: builtin/range-diff.c:9 +msgid "git range-diff [<options>] <old-tip>...<new-tip>" +msgstr "" + +#: builtin/range-diff.c:10 +msgid "git range-diff [<options>] <base> <old-tip> <new-tip>" +msgstr "" + +#: builtin/range-diff.c:26 +msgid "Percentage by which creation is weighted" +msgstr "" + +#: builtin/range-diff.c:28 +msgid "color both diff and diff-between-diffs" +msgstr "" + +#: builtin/range-diff.c:75 builtin/range-diff.c:79 +#, c-format +msgid "no .. in range: '%s'" +msgstr "" + +#: builtin/range-diff.c:89 +msgid "single arg format must be symmetric range" +msgstr "" + +#: builtin/range-diff.c:104 +msgid "need two commit ranges" +msgstr "" + #: builtin/read-tree.c:40 msgid "" "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>)" @@ -11257,67 +13406,67 @@ msgid "" "[--index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])" msgstr "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<префикс>) [-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--index-output=<файл>] (--empty | <указатель-дерева-1> [<указатель-дерева-2> [<указатель-дерева-3>]])" -#: builtin/read-tree.c:121 +#: builtin/read-tree.c:120 msgid "write resulting index to <file>" msgstr "записать результирующий индекс в <файл>" -#: builtin/read-tree.c:124 +#: builtin/read-tree.c:123 msgid "only empty the index" msgstr "просто очистить индекс" -#: builtin/read-tree.c:126 +#: builtin/read-tree.c:125 msgid "Merging" msgstr "Слияние" -#: builtin/read-tree.c:128 +#: builtin/read-tree.c:127 msgid "perform a merge in addition to a read" msgstr "выполнить слияние в дополнение к чтению" -#: builtin/read-tree.c:130 +#: builtin/read-tree.c:129 msgid "3-way merge if no file level merging required" msgstr "трехходовое слияние, если не требуется слияние на уровне файлов" -#: builtin/read-tree.c:132 +#: builtin/read-tree.c:131 msgid "3-way merge in presence of adds and removes" msgstr "трехходовое слияние в случае присутствия добавлений или удалений файлов" -#: builtin/read-tree.c:134 +#: builtin/read-tree.c:133 msgid "same as -m, but discard unmerged entries" msgstr "тоже, что и -m, но отменяет изменения не слитых записей" -#: builtin/read-tree.c:135 +#: builtin/read-tree.c:134 msgid "<subdirectory>/" msgstr "<подкаталог>/" -#: builtin/read-tree.c:136 +#: builtin/read-tree.c:135 msgid "read the tree into the index under <subdirectory>/" msgstr "прочитать дерево в индекс в <подкаталог>/" -#: builtin/read-tree.c:139 +#: builtin/read-tree.c:138 msgid "update working tree with merge result" msgstr "обновить рабочий каталог результатом слияния" -#: builtin/read-tree.c:141 +#: builtin/read-tree.c:140 msgid "gitignore" msgstr "gitignore" -#: builtin/read-tree.c:142 +#: builtin/read-tree.c:141 msgid "allow explicitly ignored files to be overwritten" msgstr "разрешить перезапись явно игнорируемых файлов" -#: builtin/read-tree.c:145 +#: builtin/read-tree.c:144 msgid "don't check the working tree after merging" msgstr "не проверять рабочий каталог после слияния" -#: builtin/read-tree.c:146 +#: builtin/read-tree.c:145 msgid "don't update the index or the work tree" msgstr "не обновлять индекс или рабочий каталог" -#: builtin/read-tree.c:148 +#: builtin/read-tree.c:147 msgid "skip applying sparse checkout filter" msgstr "пропустить применение фильтра частичного переключения на состояние" -#: builtin/read-tree.c:150 +#: builtin/read-tree.c:149 msgid "debug unpack-trees" msgstr "отладка unpack-trees" @@ -11329,47 +13478,63 @@ msgstr "git rebase--helper [<опции>]" msgid "keep empty commits" msgstr "оставить пустые коммиты" -#: builtin/rebase--helper.c:25 +#: builtin/rebase--helper.c:26 builtin/revert.c:124 +msgid "allow commits with empty messages" +msgstr "разрешить коммиты с пустыми сообщениями" + +#: builtin/rebase--helper.c:27 +msgid "rebase merge commits" +msgstr "" + +#: builtin/rebase--helper.c:29 +msgid "keep original branch points of cousins" +msgstr "" + +#: builtin/rebase--helper.c:30 msgid "continue rebase" msgstr "продолжить перемещение" -#: builtin/rebase--helper.c:27 +#: builtin/rebase--helper.c:32 msgid "abort rebase" msgstr "остановить перемещение" -#: builtin/rebase--helper.c:30 +#: builtin/rebase--helper.c:35 msgid "make rebase script" msgstr "создать сценарий перемещения" -#: builtin/rebase--helper.c:32 +#: builtin/rebase--helper.c:37 msgid "shorten commit ids in the todo list" msgstr "вывести короткие идентификаторы коммитов в списке действий" -#: builtin/rebase--helper.c:34 +#: builtin/rebase--helper.c:39 msgid "expand commit ids in the todo list" msgstr "вывести полные идентификаторы коммитов в списке действий" -#: builtin/rebase--helper.c:36 +#: builtin/rebase--helper.c:41 msgid "check the todo list" msgstr "проверить список дел" -#: builtin/rebase--helper.c:38 +#: builtin/rebase--helper.c:43 msgid "skip unnecessary picks" msgstr "пропустить ненужные команды pick" -#: builtin/rebase--helper.c:40 +#: builtin/rebase--helper.c:45 msgid "rearrange fixup/squash lines" msgstr "переставить строки fixup/squash" -#: builtin/rebase--helper.c:42 +#: builtin/rebase--helper.c:47 msgid "insert exec commands in todo list" msgstr "вставить команды исполнения коммитов в списке действий" -#: builtin/receive-pack.c:30 +#: builtin/rebase--helper.c:68 +msgid "--[no-]rebase-cousins has no effect without --rebase-merges" +msgstr "--[no-]rebase-cousins не имеет смысла без указания --rebase-merges" + +#: builtin/receive-pack.c:32 msgid "git receive-pack <git-dir>" msgstr "git receive-pack <каталог-git>" -#: builtin/receive-pack.c:840 +#: builtin/receive-pack.c:830 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" @@ -11386,7 +13551,7 @@ msgid "" "'receive.denyCurrentBranch' configuration variable to 'refuse'." msgstr "По умолчанию, обновлять текущую ветку в репозитории с рабочей\nкопией (не голом) запрещено, так как это сделает состояние индекса\nи рабочего каталога противоречивым, и вам прийдется выполнить\n«git reset --hard», чтобы состояние рабочего каталога снова\nсоответствовало HEAD.\n\nВы можете установить значение опции «receive.denyCurrentBranch»\nв «ignore» или «warn» во внешнем репозитории, чтобы разрешить\nотправку в его текущую ветку; но это не рекомендуется, если только\nвы не намерены обновить его рабочий каталог способом подобным\nвышеописанному.\n\nЧтобы пропустить это сообщение и все равно оставить поведение\nпо умолчанию, установите значение опции «receive.denyCurrentBranch»\nв «refuse»." -#: builtin/receive-pack.c:860 +#: builtin/receive-pack.c:850 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" @@ -11398,189 +13563,189 @@ msgid "" "To squelch this message, you can set it to 'refuse'." msgstr "По умолчанию, удаление текущей ветки запрещено, так как последующий\n«git clone» не сможет получить никаких файлов, что приведет к путанице.\n\nВы можете установить значение опции «receive.denyDeleteCurrent»\nв «warn» или «ignore», во внешнем репозитории, чтобы разрешить\nудаление текущей ветки с или без предупреждающего сообщения.\n\nЧтобы пропустить это сообщение, вы можете установить значение опции\nв «refuse»." -#: builtin/receive-pack.c:1933 +#: builtin/receive-pack.c:1923 msgid "quiet" msgstr "тихий режим" -#: builtin/receive-pack.c:1947 +#: builtin/receive-pack.c:1937 msgid "You must specify a directory." msgstr "Вы должны указать каталог." -#: builtin/reflog.c:531 builtin/reflog.c:536 +#: builtin/reflog.c:536 builtin/reflog.c:541 #, c-format msgid "'%s' is not a valid timestamp" msgstr "«%s» не является допустимой меткой даты/времени" -#: builtin/remote.c:13 +#: builtin/remote.c:15 msgid "git remote [-v | --verbose]" msgstr "git remote [-v | --verbose]" -#: builtin/remote.c:14 +#: builtin/remote.c:16 msgid "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] " "[--mirror=<fetch|push>] <name> <url>" msgstr "git remote add [-t <ветка>] [-m <мастер-ветка>] [-f] [--tags | --no-tags] [--mirror=<fetch|push>] <имя> <адрес>" -#: builtin/remote.c:15 builtin/remote.c:35 +#: builtin/remote.c:17 builtin/remote.c:37 msgid "git remote rename <old> <new>" msgstr "git remote rename <старое-название> <новое-название>" -#: builtin/remote.c:16 builtin/remote.c:40 +#: builtin/remote.c:18 builtin/remote.c:42 msgid "git remote remove <name>" msgstr "git remote remove <имя>" -#: builtin/remote.c:17 builtin/remote.c:45 +#: builtin/remote.c:19 builtin/remote.c:47 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" msgstr "git remote set-head <имя> (-a | --auto | -d | --delete | <ветка>)" -#: builtin/remote.c:18 +#: builtin/remote.c:20 msgid "git remote [-v | --verbose] show [-n] <name>" msgstr "git remote [-v | --verbose] show [-n] <имя>" -#: builtin/remote.c:19 +#: builtin/remote.c:21 msgid "git remote prune [-n | --dry-run] <name>" msgstr "git remote prune [-n | --dry-run] <имя>" -#: builtin/remote.c:20 +#: builtin/remote.c:22 msgid "" "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" msgstr "git remote [-v | --verbose] update [-p | --prune] [(<группа> | <имя-внешнего-репозитория>)…]" -#: builtin/remote.c:21 +#: builtin/remote.c:23 msgid "git remote set-branches [--add] <name> <branch>..." msgstr "git remote set-branches [--add] <имя> <ветка>…" -#: builtin/remote.c:22 builtin/remote.c:71 +#: builtin/remote.c:24 builtin/remote.c:73 msgid "git remote get-url [--push] [--all] <name>" msgstr "git remote get-url [--push] [--all] <имя>" -#: builtin/remote.c:23 builtin/remote.c:76 +#: builtin/remote.c:25 builtin/remote.c:78 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" msgstr "git remote set-url [--push] <имя> <новый-url> [<старый-url>]" -#: builtin/remote.c:24 builtin/remote.c:77 +#: builtin/remote.c:26 builtin/remote.c:79 msgid "git remote set-url --add <name> <newurl>" msgstr "git remote set-url --add <имя> <новый-url>" -#: builtin/remote.c:25 builtin/remote.c:78 +#: builtin/remote.c:27 builtin/remote.c:80 msgid "git remote set-url --delete <name> <url>" msgstr "git remote set-url --delete <имя> <url>" -#: builtin/remote.c:30 +#: builtin/remote.c:32 msgid "git remote add [<options>] <name> <url>" msgstr "git remote add [<опции>] <имя> <url>" -#: builtin/remote.c:50 +#: builtin/remote.c:52 msgid "git remote set-branches <name> <branch>..." msgstr "git remote set-branches <имя> <ветка>…" -#: builtin/remote.c:51 +#: builtin/remote.c:53 msgid "git remote set-branches --add <name> <branch>..." msgstr "git remote set-branches --add <имя> <ветка>…" -#: builtin/remote.c:56 +#: builtin/remote.c:58 msgid "git remote show [<options>] <name>" msgstr "git remote show [<опции>] <имя>" -#: builtin/remote.c:61 +#: builtin/remote.c:63 msgid "git remote prune [<options>] <name>" msgstr "git remote prune [<опции>] <имя>" -#: builtin/remote.c:66 +#: builtin/remote.c:68 msgid "git remote update [<options>] [<group> | <remote>]..." msgstr "git remote update [<опции>] [<группа> | <имя-внешнего-репозитория>]…" -#: builtin/remote.c:95 +#: builtin/remote.c:97 #, c-format msgid "Updating %s" msgstr "Обновление %s" -#: builtin/remote.c:127 +#: builtin/remote.c:129 msgid "" "--mirror is dangerous and deprecated; please\n" "\t use --mirror=fetch or --mirror=push instead" msgstr "ключ --mirror небезопасен и не рекомендуется к использованию;\nиспользуйте вместо него --mirror=fetch или --mirror=push" -#: builtin/remote.c:144 +#: builtin/remote.c:146 #, c-format msgid "unknown mirror argument: %s" msgstr "неизвестный аргумент для mirror: %s" -#: builtin/remote.c:160 +#: builtin/remote.c:162 msgid "fetch the remote branches" msgstr "извлечь внешние ветки" -#: builtin/remote.c:162 +#: builtin/remote.c:164 msgid "import all tags and associated objects when fetching" msgstr "импортировать все метки и ассоциированные объекты при извлечении" -#: builtin/remote.c:165 +#: builtin/remote.c:167 msgid "or do not fetch any tag at all (--no-tags)" msgstr "или не извлекать метки вообще (--no-tags)" -#: builtin/remote.c:167 +#: builtin/remote.c:169 msgid "branch(es) to track" msgstr "отслеживаемые ветки" -#: builtin/remote.c:168 +#: builtin/remote.c:170 msgid "master branch" msgstr "мастер ветка" -#: builtin/remote.c:169 +#: builtin/remote.c:171 msgid "push|fetch" msgstr "push|fetch" -#: builtin/remote.c:170 +#: builtin/remote.c:172 msgid "set up remote as a mirror to push to or fetch from" msgstr "настроить внешний репозиторий как зеркало для отправки или извлечения изменений" -#: builtin/remote.c:182 +#: builtin/remote.c:184 msgid "specifying a master branch makes no sense with --mirror" msgstr "указание мастер ветки не имеет смысла с параметром --mirror" -#: builtin/remote.c:184 +#: builtin/remote.c:186 msgid "specifying branches to track makes sense only with fetch mirrors" msgstr "указание отслеживаемых веток имеет смысл только при зеркальном извлечении" -#: builtin/remote.c:191 builtin/remote.c:631 +#: builtin/remote.c:193 builtin/remote.c:635 #, c-format msgid "remote %s already exists." msgstr "внешний репозиторий %s уже существует" -#: builtin/remote.c:195 builtin/remote.c:635 +#: builtin/remote.c:197 builtin/remote.c:639 #, c-format msgid "'%s' is not a valid remote name" msgstr "«%s» не является допустимым именем внешнего репозитория." -#: builtin/remote.c:235 +#: builtin/remote.c:237 #, c-format msgid "Could not setup master '%s'" msgstr "Не удалось настроить мастер ветку «%s»" -#: builtin/remote.c:337 +#: builtin/remote.c:343 #, c-format msgid "Could not get fetch map for refspec %s" msgstr "Не удалось извлечь карту для спецификатора ссылки %s" -#: builtin/remote.c:438 builtin/remote.c:446 +#: builtin/remote.c:442 builtin/remote.c:450 msgid "(matching)" msgstr "(соответствующая)" -#: builtin/remote.c:450 +#: builtin/remote.c:454 msgid "(delete)" msgstr "(удаленная)" -#: builtin/remote.c:624 builtin/remote.c:759 builtin/remote.c:858 +#: builtin/remote.c:628 builtin/remote.c:764 builtin/remote.c:863 #, c-format msgid "No such remote: %s" msgstr "Нет такого внешнего репозитория: %s" -#: builtin/remote.c:641 +#: builtin/remote.c:645 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "Не удалось переименовать секцию конфигурации с «%s» на «%s»" -#: builtin/remote.c:661 +#: builtin/remote.c:665 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -11588,17 +13753,17 @@ msgid "" "\tPlease update the configuration manually if necessary." msgstr "Не обновляю нестандартную спецификатор ссылки для извлечения\n\t%s\n\tПожалуйста, если требуется, обновите конфигурацию вручную." -#: builtin/remote.c:697 +#: builtin/remote.c:701 #, c-format msgid "deleting '%s' failed" msgstr "не удалось удалить «%s»" -#: builtin/remote.c:731 +#: builtin/remote.c:735 #, c-format msgid "creating '%s' failed" msgstr "не удалось создать «%s»" -#: builtin/remote.c:796 +#: builtin/remote.c:801 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -11610,143 +13775,148 @@ msgstr[1] "Примечание: Некоторые ветки вне иерар msgstr[2] "Примечание: Некоторые ветки вне иерархии refs/remotes/ не будут удалены;\nчтобы удалить их, используйте:" msgstr[3] "Примечание: Некоторые ветки вне иерархии refs/remotes/ не будут удалены;\nчтобы удалить их, используйте:" -#: builtin/remote.c:810 +#: builtin/remote.c:815 #, c-format msgid "Could not remove config section '%s'" msgstr "Не удалось удалить секцию файла конфигурации «%s»" -#: builtin/remote.c:911 +#: builtin/remote.c:916 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " новая (следующее извлечение сохранит ее в remotes/%s)" -#: builtin/remote.c:914 +#: builtin/remote.c:919 msgid " tracked" msgstr " отслеживается" -#: builtin/remote.c:916 +#: builtin/remote.c:921 msgid " stale (use 'git remote prune' to remove)" msgstr " недействительна (используйте «git remote prune», чтобы удалить)" -#: builtin/remote.c:918 +#: builtin/remote.c:923 msgid " ???" msgstr " ???" -#: builtin/remote.c:959 +#: builtin/remote.c:964 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "неправильный параметр конфигурации branch.%s.merge; невозможно переместить более чем над 1 веткой" -#: builtin/remote.c:967 +#: builtin/remote.c:973 #, c-format msgid "rebases interactively onto remote %s" msgstr "перемещается интерактивно над внешней веткой %s" -#: builtin/remote.c:968 +#: builtin/remote.c:975 +#, c-format +msgid "rebases interactively (with merges) onto remote %s" +msgstr "" + +#: builtin/remote.c:978 #, c-format msgid "rebases onto remote %s" msgstr "перемещается над внешней веткой %s" -#: builtin/remote.c:971 +#: builtin/remote.c:982 #, c-format msgid " merges with remote %s" msgstr " будет слита с внешней веткой %s" -#: builtin/remote.c:974 +#: builtin/remote.c:985 #, c-format msgid "merges with remote %s" msgstr "будет слита с внешней веткой %s" -#: builtin/remote.c:977 +#: builtin/remote.c:988 #, c-format msgid "%-*s and with remote %s\n" msgstr "%-*s и с внешней веткой %s\n" -#: builtin/remote.c:1020 +#: builtin/remote.c:1031 msgid "create" msgstr "создана" -#: builtin/remote.c:1023 +#: builtin/remote.c:1034 msgid "delete" msgstr "удалена" -#: builtin/remote.c:1027 +#: builtin/remote.c:1038 msgid "up to date" msgstr "уже актуальна" -#: builtin/remote.c:1030 +#: builtin/remote.c:1041 msgid "fast-forwardable" msgstr "возможна перемотка вперед" -#: builtin/remote.c:1033 +#: builtin/remote.c:1044 msgid "local out of date" msgstr "локальная ветка устарела" -#: builtin/remote.c:1040 +#: builtin/remote.c:1051 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s будет принудительно отправлена в %-*s (%s)" -#: builtin/remote.c:1043 +#: builtin/remote.c:1054 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s будет отправлена в %-*s (%s)" -#: builtin/remote.c:1047 +#: builtin/remote.c:1058 #, c-format msgid " %-*s forces to %s" msgstr " %-*s будет принудительно отправлена в %s" -#: builtin/remote.c:1050 +#: builtin/remote.c:1061 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s будет отправлена в %s" -#: builtin/remote.c:1118 +#: builtin/remote.c:1129 msgid "do not query remotes" msgstr "не опрашивать внешние репозитории" -#: builtin/remote.c:1145 +#: builtin/remote.c:1156 #, c-format msgid "* remote %s" msgstr "* внешний репозиторий %s" -#: builtin/remote.c:1146 +#: builtin/remote.c:1157 #, c-format msgid " Fetch URL: %s" msgstr " URL для извлечения: %s" -#: builtin/remote.c:1147 builtin/remote.c:1163 builtin/remote.c:1302 +#: builtin/remote.c:1158 builtin/remote.c:1174 builtin/remote.c:1313 msgid "(no URL)" msgstr "(нет URL)" #. TRANSLATORS: the colon ':' should align #. with the one in " Fetch URL: %s" #. translation. -#: builtin/remote.c:1161 builtin/remote.c:1163 +#: builtin/remote.c:1172 builtin/remote.c:1174 #, c-format msgid " Push URL: %s" msgstr " URL для отправки: %s" -#: builtin/remote.c:1165 builtin/remote.c:1167 builtin/remote.c:1169 +#: builtin/remote.c:1176 builtin/remote.c:1178 builtin/remote.c:1180 #, c-format msgid " HEAD branch: %s" msgstr " HEAD ветка: %s" -#: builtin/remote.c:1165 +#: builtin/remote.c:1176 msgid "(not queried)" msgstr "(не запрашивался)" -#: builtin/remote.c:1167 +#: builtin/remote.c:1178 msgid "(unknown)" msgstr "(неизвестно)" -#: builtin/remote.c:1171 +#: builtin/remote.c:1182 #, c-format msgid " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" msgstr " HEAD ветка (HEAD внешнего репозитория неоднозначный, может быть одним из):\n" -#: builtin/remote.c:1183 +#: builtin/remote.c:1194 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" @@ -11755,11 +13925,11 @@ msgstr[1] " Внешние ветки:%s" msgstr[2] " Внешние ветки:%s" msgstr[3] " Внешние ветки:%s" -#: builtin/remote.c:1186 builtin/remote.c:1212 +#: builtin/remote.c:1197 builtin/remote.c:1223 msgid " (status not queried)" msgstr " (статус не запрашивался)" -#: builtin/remote.c:1195 +#: builtin/remote.c:1206 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] " Локальная ветка, настроенная для «git pull»:" @@ -11767,11 +13937,11 @@ msgstr[1] " Локальные ветки, настроенные для «git msgstr[2] " Локальные ветки, настроенные для «git pull»:" msgstr[3] " Локальные ветки, настроенные для «git pull»:" -#: builtin/remote.c:1203 +#: builtin/remote.c:1214 msgid " Local refs will be mirrored by 'git push'" msgstr " Локальные ссылки, зеркалируемые с помощью «git push»" -#: builtin/remote.c:1209 +#: builtin/remote.c:1220 #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" @@ -11780,315 +13950,474 @@ msgstr[1] " Локальные ссылки, настроенные для «gi msgstr[2] " Локальные ссылки, настроенные для «git push»%s:" msgstr[3] " Локальные ссылки, настроенные для «git push»%s:" -#: builtin/remote.c:1230 +#: builtin/remote.c:1241 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "установить refs/remotes/<имя>/HEAD в зависимости от внешнего репозитория" -#: builtin/remote.c:1232 +#: builtin/remote.c:1243 msgid "delete refs/remotes/<name>/HEAD" msgstr "удалить refs/remotes/<имя>/HEAD" -#: builtin/remote.c:1247 +#: builtin/remote.c:1258 msgid "Cannot determine remote HEAD" msgstr "Не удалось определить внешний HEAD" -#: builtin/remote.c:1249 +#: builtin/remote.c:1260 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "Несколько внешних HEAD веток. Укажите явно одну из них:" -#: builtin/remote.c:1259 +#: builtin/remote.c:1270 #, c-format msgid "Could not delete %s" msgstr "Не удалось удалить %s" -#: builtin/remote.c:1267 +#: builtin/remote.c:1278 #, c-format msgid "Not a valid ref: %s" msgstr "Недопустимая ссылка: %s" -#: builtin/remote.c:1269 +#: builtin/remote.c:1280 #, c-format msgid "Could not setup %s" msgstr "Не удалось настроить %s" -#: builtin/remote.c:1287 +#: builtin/remote.c:1298 #, c-format msgid " %s will become dangling!" msgstr " %s будет висящей веткой!" -#: builtin/remote.c:1288 +#: builtin/remote.c:1299 #, c-format msgid " %s has become dangling!" msgstr " %s стала висящей веткой!" -#: builtin/remote.c:1298 +#: builtin/remote.c:1309 #, c-format msgid "Pruning %s" msgstr "Очистка %s" -#: builtin/remote.c:1299 +#: builtin/remote.c:1310 #, c-format msgid "URL: %s" msgstr "URL: %s" -#: builtin/remote.c:1315 +#: builtin/remote.c:1326 #, c-format msgid " * [would prune] %s" msgstr " * [будет удалена] %s" -#: builtin/remote.c:1318 +#: builtin/remote.c:1329 #, c-format msgid " * [pruned] %s" msgstr " * [удалена] %s" -#: builtin/remote.c:1363 +#: builtin/remote.c:1374 msgid "prune remotes after fetching" msgstr "почистить внешние репозитории после извлечения" -#: builtin/remote.c:1426 builtin/remote.c:1480 builtin/remote.c:1548 +#: builtin/remote.c:1437 builtin/remote.c:1491 builtin/remote.c:1559 #, c-format msgid "No such remote '%s'" msgstr "Нет такого внешнего репозитория «%s»" -#: builtin/remote.c:1442 +#: builtin/remote.c:1453 msgid "add branch" msgstr "добавить ветку" -#: builtin/remote.c:1449 +#: builtin/remote.c:1460 msgid "no remote specified" msgstr "не указан внешний репозиторий" -#: builtin/remote.c:1466 +#: builtin/remote.c:1477 msgid "query push URLs rather than fetch URLs" msgstr "запросить URL отправки, вместо URL извлечения" -#: builtin/remote.c:1468 +#: builtin/remote.c:1479 msgid "return all URLs" msgstr "вернуть все URL" -#: builtin/remote.c:1496 +#: builtin/remote.c:1507 #, c-format msgid "no URLs configured for remote '%s'" msgstr "URL не настроены для внешнего репозитория «%s»" -#: builtin/remote.c:1522 +#: builtin/remote.c:1533 msgid "manipulate push URLs" msgstr "управление URL отправки" -#: builtin/remote.c:1524 +#: builtin/remote.c:1535 msgid "add URL" msgstr "добавить URL" -#: builtin/remote.c:1526 +#: builtin/remote.c:1537 msgid "delete URLs" msgstr "удалить URL" -#: builtin/remote.c:1533 +#: builtin/remote.c:1544 msgid "--add --delete doesn't make sense" msgstr "--add нельзя использовать одновременно с --delete" -#: builtin/remote.c:1572 +#: builtin/remote.c:1583 #, c-format msgid "Invalid old URL pattern: %s" msgstr "Неправильный шаблон старого URL: %s" -#: builtin/remote.c:1580 +#: builtin/remote.c:1591 #, c-format msgid "No such URL found: %s" msgstr "Не найдены совпадения URL: %s" -#: builtin/remote.c:1582 +#: builtin/remote.c:1593 msgid "Will not delete all non-push URLs" msgstr "Нельзя удалить все URL не-отправки" -#: builtin/remote.c:1598 +#: builtin/remote.c:1609 msgid "be verbose; must be placed before a subcommand" msgstr "быть многословнее; должно стоять перед подкомандой" -#: builtin/remote.c:1629 +#: builtin/remote.c:1640 #, c-format msgid "Unknown subcommand: %s" msgstr "Неизвестная подкоманда: %s" -#: builtin/repack.c:18 +#: builtin/repack.c:20 msgid "git repack [<options>]" msgstr "git repack [<опции>]" -#: builtin/repack.c:23 +#: builtin/repack.c:25 msgid "" "Incremental repacks are incompatible with bitmap indexes. Use\n" "--no-write-bitmap-index or disable the pack.writebitmaps configuration." msgstr "Инкрементальные перепаковки не совместимы с индексами в битовых картах. Используйте опцию --no-write-bitmap-index или отключите параметр конфигурации pack.writebitmaps." -#: builtin/repack.c:168 +#: builtin/repack.c:287 msgid "pack everything in a single pack" msgstr "упаковать всё в один пакет" -#: builtin/repack.c:170 +#: builtin/repack.c:289 msgid "same as -a, and turn unreachable objects loose" msgstr "тоже, что и -a, но дополнительно отбросить недостижимые объекты" -#: builtin/repack.c:173 +#: builtin/repack.c:292 msgid "remove redundant packs, and run git-prune-packed" msgstr "удалите лишние пакеты и запустите git-prune-packed" -#: builtin/repack.c:175 +#: builtin/repack.c:294 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "передать опцию --no-reuse-delta в git-pack-objects" -#: builtin/repack.c:177 +#: builtin/repack.c:296 msgid "pass --no-reuse-object to git-pack-objects" msgstr "передать опцию --no-reuse-object в git-pack-objects" -#: builtin/repack.c:179 +#: builtin/repack.c:298 msgid "do not run git-update-server-info" msgstr "не запускать git-update-server-info" -#: builtin/repack.c:182 +#: builtin/repack.c:301 msgid "pass --local to git-pack-objects" msgstr "передать опцию --local в git-pack-objects" -#: builtin/repack.c:184 +#: builtin/repack.c:303 msgid "write bitmap index" msgstr "запись индекса в битовых картах" -#: builtin/repack.c:185 +#: builtin/repack.c:304 msgid "approxidate" msgstr "примерная-дата" -#: builtin/repack.c:186 +#: builtin/repack.c:305 msgid "with -A, do not loosen objects older than this" msgstr "с опцией -A, не отбрасывать объекты старее, чем указано" -#: builtin/repack.c:188 +#: builtin/repack.c:307 msgid "with -a, repack unreachable objects" msgstr "с параметром -a, перепаковать недоступные объекты" -#: builtin/repack.c:190 +#: builtin/repack.c:309 msgid "size of the window used for delta compression" msgstr "размер окна, используемый для компрессии дельт" -#: builtin/repack.c:191 builtin/repack.c:197 +#: builtin/repack.c:310 builtin/repack.c:316 msgid "bytes" msgstr "количество-байт" -#: builtin/repack.c:192 +#: builtin/repack.c:311 msgid "same as the above, but limit memory size instead of entries count" msgstr "тоже, что и выше, но ограничить размер памяти, а не количество записей" -#: builtin/repack.c:194 +#: builtin/repack.c:313 msgid "limits the maximum delta depth" msgstr "ограничение на максимальную глубину дельт" -#: builtin/repack.c:196 +#: builtin/repack.c:315 msgid "limits the maximum number of threads" msgstr "ограничение на максимальное количество потоков" -#: builtin/repack.c:198 +#: builtin/repack.c:317 msgid "maximum size of each packfile" msgstr "максимальный размер каждого из файлов пакета" -#: builtin/repack.c:200 +#: builtin/repack.c:319 msgid "repack objects in packs marked with .keep" msgstr "переупаковать объекты в пакеты, помеченные файлом .keep" -#: builtin/repack.c:210 +#: builtin/repack.c:321 +msgid "do not repack this pack" +msgstr "" + +#: builtin/repack.c:331 msgid "cannot delete packs in a precious-objects repo" msgstr "нельзя удалять пакеты в precious-objects репозитории" -#: builtin/repack.c:214 +#: builtin/repack.c:335 msgid "--keep-unreachable and -A are incompatible" msgstr "--keep-unreachable и -A нельзя использовать одновременно" -#: builtin/repack.c:406 builtin/worktree.c:146 +#: builtin/repack.c:510 builtin/worktree.c:139 #, c-format msgid "failed to remove '%s'" msgstr "сбой удаления «%s»" -#: builtin/replace.c:20 +#: builtin/replace.c:22 msgid "git replace [-f] <object> <replacement>" msgstr "git replace [-f] <объект> <замена>" -#: builtin/replace.c:21 +#: builtin/replace.c:23 msgid "git replace [-f] --edit <object>" msgstr "git replace [-f] --edit <объект>" -#: builtin/replace.c:22 +#: builtin/replace.c:24 msgid "git replace [-f] --graft <commit> [<parent>...]" msgstr "git replace [-f] --graft <коммит> [<родитель>…]" -#: builtin/replace.c:23 +#: builtin/replace.c:25 +msgid "git replace [-f] --convert-graft-file" +msgstr "" + +#: builtin/replace.c:26 msgid "git replace -d <object>..." msgstr "git replace -d <объект>…" -#: builtin/replace.c:24 +#: builtin/replace.c:27 msgid "git replace [--format=<format>] [-l [<pattern>]]" msgstr "git replace [--format=<формат>] [-l [<шаблон>]]" -#: builtin/replace.c:331 builtin/replace.c:369 builtin/replace.c:397 +#: builtin/replace.c:57 builtin/replace.c:203 builtin/replace.c:206 #, c-format -msgid "Not a valid object name: '%s'" -msgstr "Недопустимое имя объекта: «%s»" +msgid "failed to resolve '%s' as a valid ref" +msgstr "" -#: builtin/replace.c:361 +#: builtin/replace.c:86 +#, c-format +msgid "" +"invalid replace format '%s'\n" +"valid formats are 'short', 'medium' and 'long'" +msgstr "" + +#: builtin/replace.c:121 +#, c-format +msgid "replace ref '%s' not found" +msgstr "" + +#: builtin/replace.c:137 +#, c-format +msgid "Deleted replace ref '%s'" +msgstr "" + +#: builtin/replace.c:149 +#, c-format +msgid "'%s' is not a valid ref name" +msgstr "" + +#: builtin/replace.c:154 +#, c-format +msgid "replace ref '%s' already exists" +msgstr "" + +#: builtin/replace.c:174 +#, 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 "" + +#: builtin/replace.c:225 +#, c-format +msgid "unable to open %s for writing" +msgstr "" + +#: builtin/replace.c:238 +msgid "cat-file reported failure" +msgstr "" + +#: builtin/replace.c:254 +#, c-format +msgid "unable to open %s for reading" +msgstr "" + +#: builtin/replace.c:268 +msgid "unable to spawn mktree" +msgstr "" + +#: builtin/replace.c:272 +msgid "unable to read from mktree" +msgstr "" + +#: builtin/replace.c:281 +msgid "mktree reported failure" +msgstr "" + +#: builtin/replace.c:285 +msgid "mktree did not return an object name" +msgstr "" + +#: builtin/replace.c:294 +#, c-format +msgid "unable to fstat %s" +msgstr "" + +#: builtin/replace.c:299 +msgid "unable to write object to database" +msgstr "" + +#: builtin/replace.c:318 builtin/replace.c:371 builtin/replace.c:415 +#: builtin/replace.c:445 +#, c-format +msgid "not a valid object name: '%s'" +msgstr "" + +#: builtin/replace.c:322 +#, c-format +msgid "unable to get object type for %s" +msgstr "" + +#: builtin/replace.c:338 +msgid "editing object file failed" +msgstr "" + +#: builtin/replace.c:347 +#, c-format +msgid "new object is the same as the old one: '%s'" +msgstr "" + +#: builtin/replace.c:407 #, c-format msgid "bad mergetag in commit '%s'" msgstr "плохая метка слияния в коммите «%s»" -#: builtin/replace.c:363 +#: builtin/replace.c:409 #, c-format msgid "malformed mergetag in commit '%s'" msgstr "повреждённая метка слияния в коммите «%s»" -#: builtin/replace.c:374 +#: builtin/replace.c:421 #, 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:407 +#: builtin/replace.c:460 #, c-format -msgid "the original commit '%s' has a gpg signature." -msgstr "оригинальный коммит «%s» содержит подпись gpg." +msgid "the original commit '%s' has a gpg signature" +msgstr "" -#: builtin/replace.c:408 +#: builtin/replace.c:461 msgid "the signature will be removed in the replacement commit!" msgstr "подпись будет удалена в замененном коммите!" -#: builtin/replace.c:414 +#: builtin/replace.c:471 #, c-format msgid "could not write replacement commit for: '%s'" msgstr "не удалось записать замену для коммита: «%s»" -#: builtin/replace.c:438 +#: builtin/replace.c:479 +#, c-format +msgid "graft for '%s' unnecessary" +msgstr "" + +#: builtin/replace.c:482 +#, c-format +msgid "new commit is the same as the old one: '%s'" +msgstr "" + +#: builtin/replace.c:514 +#, c-format +msgid "" +"could not convert the following graft(s):\n" +"%s" +msgstr "" + +#: builtin/replace.c:535 msgid "list replace refs" msgstr "вывести список заменяемых ссылок" -#: builtin/replace.c:439 +#: builtin/replace.c:536 msgid "delete replace refs" msgstr "удаление заменяемых ссылок" -#: builtin/replace.c:440 +#: builtin/replace.c:537 msgid "edit existing object" msgstr "изменение существующего объекта" -#: builtin/replace.c:441 +#: builtin/replace.c:538 msgid "change a commit's parents" msgstr "изменение родителя коммита" -#: builtin/replace.c:442 +#: builtin/replace.c:539 +msgid "convert existing graft file" +msgstr "" + +#: builtin/replace.c:540 msgid "replace the ref if it exists" msgstr "замена ссылки, если она существует" -#: builtin/replace.c:443 +#: builtin/replace.c:542 msgid "do not pretty-print contents for --edit" msgstr "не делать структурированный вывод содержимого для --edit" -#: builtin/replace.c:444 +#: builtin/replace.c:543 msgid "use this format" msgstr "использовать этот формат" +#: builtin/replace.c:556 +msgid "--format cannot be used when not listing" +msgstr "" + +#: builtin/replace.c:564 +msgid "-f only makes sense when writing a replacement" +msgstr "" + +#: builtin/replace.c:568 +msgid "--raw only makes sense with --edit" +msgstr "" + +#: builtin/replace.c:574 +msgid "-d needs at least one argument" +msgstr "" + +#: builtin/replace.c:580 +msgid "bad number of arguments" +msgstr "" + +#: builtin/replace.c:586 +msgid "-e needs exactly one argument" +msgstr "" + +#: builtin/replace.c:592 +msgid "-g needs at least one argument" +msgstr "" + +#: builtin/replace.c:598 +msgid "--convert-graft-file takes no argument" +msgstr "" + +#: builtin/replace.c:604 +msgid "only one pattern can be given with -l" +msgstr "" + #: builtin/rerere.c:13 msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]" msgstr "git rerere [clear | forget <путь>… | status | remaining | diff | gc]" @@ -12143,119 +14472,123 @@ msgstr "Не удалось найти дерево у HEAD." msgid "Failed to find tree of %s." msgstr "Не удалось найти дерево у %s." -#: builtin/reset.c:113 +#: builtin/reset.c:111 #, c-format msgid "HEAD is now at %s" msgstr "HEAD сейчас на %s" -#: builtin/reset.c:197 +#: builtin/reset.c:189 #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "Нельзя выполнить сброс в режиме «%s» во время слияния." -#: builtin/reset.c:297 +#: builtin/reset.c:289 msgid "be quiet, only report errors" msgstr "тихий режим, выводить только ошибки" -#: builtin/reset.c:299 +#: builtin/reset.c:291 msgid "reset HEAD and index" msgstr "сбросить HEAD и индекс" -#: builtin/reset.c:300 +#: builtin/reset.c:292 msgid "reset only HEAD" msgstr "сбросить только HEAD" -#: builtin/reset.c:302 builtin/reset.c:304 +#: builtin/reset.c:294 builtin/reset.c:296 msgid "reset HEAD, index and working tree" msgstr "сбросить HEAD, индекс и рабочий каталог" -#: builtin/reset.c:306 +#: builtin/reset.c:298 msgid "reset HEAD but keep local changes" msgstr "сбросить HEAD, но оставить локальные изменения" -#: builtin/reset.c:312 +#: builtin/reset.c:304 msgid "record only the fact that removed paths will be added later" msgstr "записать только факт того, что удаленные пути будут добавлены позже" -#: builtin/reset.c:329 +#: builtin/reset.c:321 #, c-format msgid "Failed to resolve '%s' as a valid revision." msgstr "Не удалось распознать «%s» как действительную редакцию." -#: builtin/reset.c:337 +#: builtin/reset.c:329 #, c-format msgid "Failed to resolve '%s' as a valid tree." msgstr "Не удалось распознать «%s» как действительное дерево." -#: builtin/reset.c:346 +#: builtin/reset.c:338 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "--patch нельзя использовать одновременно с --{hard,mixed,soft}" -#: builtin/reset.c:355 +#: builtin/reset.c:347 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "использование опции --mixed с путями устарело; используйте «git reset -- <пути>» instead." -#: builtin/reset.c:357 +#: builtin/reset.c:349 #, c-format msgid "Cannot do %s reset with paths." msgstr "Нельзя выполнить сброс в режиме «%s» вместе с указанием пути." -#: builtin/reset.c:367 +#: builtin/reset.c:359 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "сброс «%s» разрешен только с голым репозиторием" -#: builtin/reset.c:371 +#: builtin/reset.c:363 msgid "-N can only be used with --mixed" msgstr "-N можно использовать вместе с --mixed" -#: builtin/reset.c:388 +#: builtin/reset.c:380 msgid "Unstaged changes after reset:" msgstr "Непроиндексированные изменения после сброса:" -#: builtin/reset.c:394 +#: builtin/reset.c:386 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "Не удалось сбросить файл индекса на редакцию «%s»." -#: builtin/reset.c:398 +#: builtin/reset.c:390 msgid "Could not write new index file." msgstr "Не удалось записать новый файл индекса." #: builtin/rev-list.c:399 +msgid "cannot combine --exclude-promisor-objects and --missing" +msgstr "" + +#: builtin/rev-list.c:457 msgid "object filtering requires --objects" msgstr "фильтрация объектов требует указания параметра --objects" -#: builtin/rev-list.c:402 +#: builtin/rev-list.c:460 #, c-format msgid "invalid sparse value '%s'" msgstr "недопустимое частичное значение «%s»" -#: builtin/rev-list.c:442 +#: builtin/rev-list.c:501 msgid "rev-list does not support display of notes" msgstr "rev-list не поддерживает отображение заметок" -#: builtin/rev-list.c:445 +#: builtin/rev-list.c:504 msgid "cannot combine --use-bitmap-index with object filtering" msgstr "нельзя использовать --use-bitmap-index одновременно с фильтрацией объектов" -#: builtin/rev-parse.c:402 +#: builtin/rev-parse.c:406 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" msgstr "git rev-parse --parseopt [<опции>] -- [<аргументы>…]" -#: builtin/rev-parse.c:407 +#: builtin/rev-parse.c:411 msgid "keep the `--` passed as an arg" msgstr "передавать далее «--» как аргумент" -#: builtin/rev-parse.c:409 +#: builtin/rev-parse.c:413 msgid "stop parsing after the first non-option argument" msgstr "остановить разбор после первого аргумента не являющегося опцией" -#: builtin/rev-parse.c:412 +#: builtin/rev-parse.c:416 msgid "output in stuck long form" msgstr "выводить аргументы в длинном формате" -#: builtin/rev-parse.c:545 +#: builtin/rev-parse.c:549 msgid "" "git rev-parse --parseopt [<options>] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" @@ -12264,88 +14597,84 @@ msgid "" "Run \"git rev-parse --parseopt -h\" for more information on the first usage." msgstr "git rev-parse --parseopt [<опции>] -- [<аргументы>…]\n or: git rev-parse --sq-quote [<аргумент>…]\n or: git rev-parse [<опции>] [<аргумент>…]\n\nЗапустите команду «git rev-parse --parseopt -h» для получения подробной информации о первом использовании." -#: builtin/revert.c:23 +#: builtin/revert.c:24 msgid "git revert [<options>] <commit-ish>..." msgstr "git revert [<опции>] <указатель-коммита>…" -#: builtin/revert.c:24 +#: builtin/revert.c:25 msgid "git revert <subcommand>" msgstr "git revert <подкоманда>" -#: builtin/revert.c:29 +#: builtin/revert.c:30 msgid "git cherry-pick [<options>] <commit-ish>..." msgstr "git cherry-pick [<опции>] <указатель-коммита>…" -#: builtin/revert.c:30 +#: builtin/revert.c:31 msgid "git cherry-pick <subcommand>" msgstr "git cherry-pick <подкоманда>" -#: builtin/revert.c:90 +#: builtin/revert.c:91 #, c-format msgid "%s: %s cannot be used with %s" msgstr "%s: %s нельзя использовать одновременно с %s" -#: builtin/revert.c:99 +#: builtin/revert.c:100 msgid "end revert or cherry-pick sequence" msgstr "конец последовательности копирования или обращения изменений коммитов" -#: builtin/revert.c:100 +#: builtin/revert.c:101 msgid "resume revert or cherry-pick sequence" msgstr "продолжить последовательность копирования или обращения изменений коммитов" -#: builtin/revert.c:101 +#: builtin/revert.c:102 msgid "cancel revert or cherry-pick sequence" msgstr "отмена последовательности копирования или обращения изменений коммитов" -#: builtin/revert.c:102 +#: builtin/revert.c:103 msgid "don't automatically commit" msgstr "не коммитить автоматически" -#: builtin/revert.c:103 +#: builtin/revert.c:104 msgid "edit the commit message" msgstr "изменить сообщение коммита" -#: builtin/revert.c:106 +#: builtin/revert.c:107 msgid "parent-number" msgstr "номер-родителя" -#: builtin/revert.c:107 +#: builtin/revert.c:108 msgid "select mainline parent" msgstr "выбор основного родителя" -#: builtin/revert.c:109 +#: builtin/revert.c:110 msgid "merge strategy" msgstr "стратегия слияния" -#: builtin/revert.c:110 +#: builtin/revert.c:111 msgid "option" msgstr "опция" -#: builtin/revert.c:111 +#: builtin/revert.c:112 msgid "option for merge strategy" msgstr "опция для стратегии слияния" -#: builtin/revert.c:120 +#: builtin/revert.c:121 msgid "append commit name" msgstr "добавить имя коммита" -#: builtin/revert.c:122 +#: builtin/revert.c:123 msgid "preserve initially empty commits" msgstr "сохранить изначально пустые коммиты" -#: builtin/revert.c:123 -msgid "allow commits with empty messages" -msgstr "разрешить коммиты с пустыми сообщениями" - -#: builtin/revert.c:124 +#: builtin/revert.c:125 msgid "keep redundant, empty commits" msgstr "оставить избыточные, пустые коммиты" -#: builtin/revert.c:214 +#: builtin/revert.c:219 msgid "revert failed" msgstr "сбой обращения изменений коммита" -#: builtin/revert.c:227 +#: builtin/revert.c:232 msgid "cherry-pick failed" msgstr "сбой при копировании коммита" @@ -12393,92 +14722,116 @@ msgstr[1] "следующие файлы содержат локальные и msgstr[2] "следующие файлы содержат локальные изменения:" msgstr[3] "следующие файлы содержат локальные изменения:" -#: builtin/rm.c:243 +#: builtin/rm.c:241 msgid "do not list removed files" msgstr "не выводить список удаленных файлов" -#: builtin/rm.c:244 +#: builtin/rm.c:242 msgid "only remove from the index" msgstr "удалить только из индекса" -#: builtin/rm.c:245 +#: builtin/rm.c:243 msgid "override the up-to-date check" msgstr "пропустить проверку актуальности" -#: builtin/rm.c:246 +#: builtin/rm.c:244 msgid "allow recursive removal" msgstr "разрешить рекурсивное удаление" -#: builtin/rm.c:248 +#: builtin/rm.c:246 msgid "exit with a zero status even if nothing matched" msgstr "выход с нулевым кодом возврата, даже если ничего не найдено" -#: builtin/rm.c:307 +#: builtin/rm.c:288 +msgid "please stage your changes to .gitmodules or stash them to proceed" +msgstr "" + +#: builtin/rm.c:306 #, c-format msgid "not removing '%s' recursively without -r" msgstr "не удаляю рекурсивно «%s» без указания опции -r" -#: builtin/rm.c:346 +#: builtin/rm.c:345 #, c-format msgid "git rm: unable to remove %s" msgstr "git rm: не удалось удалить %s" -#: builtin/rm.c:369 +#: builtin/rm.c:368 #, c-format msgid "could not remove '%s'" msgstr "не удалось удалить «%s»" -#: builtin/send-pack.c:19 +#: builtin/send-pack.c:20 msgid "" "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> [<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] [<сервер>:]<каталог> [<ссылка>…]\n --all и явный спецификатор <ссылки> взаимно исключающие." -#: builtin/send-pack.c:162 +#: builtin/send-pack.c:163 msgid "remote name" msgstr "имя внешнего репозитория" -#: builtin/send-pack.c:176 +#: builtin/send-pack.c:177 msgid "use stateless RPC protocol" msgstr "протокол без сохранения состояния для RPC" -#: builtin/send-pack.c:177 +#: builtin/send-pack.c:178 msgid "read refs from stdin" msgstr "прочитать ссылки из стандартного ввода" -#: builtin/send-pack.c:178 +#: builtin/send-pack.c:179 msgid "print status from remote helper" msgstr "вывести статус от скрипта внешнего сервера" +#: 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 [<опции>] [<диапазон-редакций>] [[--] [<путь>…]]" +msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]" +msgstr "git shortlog [<опции>] [<диапазон-редакций>] [[--] <путь>…]" -#: builtin/shortlog.c:263 +#: builtin/shortlog.c:15 +msgid "git log --pretty=short | git shortlog [<options>]" +msgstr "git log --pretty=short | git shortlog [<опции>]" + +#: builtin/shortlog.c:264 msgid "Group by committer rather than author" msgstr "Группировать по коммитеру, а не по автору" -#: builtin/shortlog.c:265 +#: builtin/shortlog.c:266 msgid "sort output according to the number of commits per author" msgstr "отсортировать вывод по количеству коммитов у автора" -#: builtin/shortlog.c:267 +#: builtin/shortlog.c:268 msgid "Suppress commit descriptions, only provides commit count" msgstr "Не выводить описания коммитов, а только их количество" -#: builtin/shortlog.c:269 +#: builtin/shortlog.c:270 msgid "Show the email address of each author" msgstr "Показать почту каждого из авторов" -#: builtin/shortlog.c:270 -msgid "w[,i1[,i2]]" -msgstr "w[,i1[,i2]]" - #: builtin/shortlog.c:271 +msgid "<w>[,<i1>[,<i2>]]" +msgstr "<w>[,<i1>[,<i2>]]" + +#: builtin/shortlog.c:272 msgid "Linewrap output" msgstr "Перенос строк на выводе" -#: builtin/show-branch.c:12 +#: builtin/shortlog.c:299 +msgid "too many arguments given outside repository" +msgstr "" + +#: builtin/show-branch.c:13 msgid "" "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" "\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n" @@ -12486,11 +14839,11 @@ msgid "" "\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[=<когда>] | --no-color] [--sparse]\n\t\t[--more=<n> | --list | --independent | --merge-base]\n\t\t[--no-name | --sha1-name] [--topics] [(<редакция> | <шаблон>)…]" -#: builtin/show-branch.c:16 +#: builtin/show-branch.c:17 msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" msgstr "git show-branch (-g | --reflog)[=<n>[,<база>]] [--list] [<ссылка>]" -#: builtin/show-branch.c:376 +#: 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" @@ -12499,90 +14852,90 @@ msgstr[1] "игнорирование %s; невозможно обработа msgstr[2] "игнорирование %s; невозможно обработать больше %d ссылок" msgstr[3] "игнорирование %s; невозможно обработать больше %d ссылки" -#: builtin/show-branch.c:530 +#: builtin/show-branch.c:549 #, c-format msgid "no matching refs with %s" msgstr "нет совпадающих записей с %s" -#: builtin/show-branch.c:626 +#: builtin/show-branch.c:645 msgid "show remote-tracking and local branches" msgstr "показать список и отслеживаемых внешних и локальных веток" -#: builtin/show-branch.c:628 +#: builtin/show-branch.c:647 msgid "show remote-tracking branches" msgstr "показать список отслеживаемых внешних веток" -#: builtin/show-branch.c:630 +#: builtin/show-branch.c:649 msgid "color '*!+-' corresponding to the branch" msgstr "окрашивать «*!+-» в соответствии с веткой" -#: builtin/show-branch.c:632 +#: builtin/show-branch.c:651 msgid "show <n> more commits after the common ancestor" msgstr "показать <n> коммитов после общего предка" -#: builtin/show-branch.c:634 +#: builtin/show-branch.c:653 msgid "synonym to more=-1" msgstr "синоним для more=-1" -#: builtin/show-branch.c:635 +#: builtin/show-branch.c:654 msgid "suppress naming strings" msgstr "не выводить именованные строки" -#: builtin/show-branch.c:637 +#: builtin/show-branch.c:656 msgid "include the current branch" msgstr "включить в вывод текущую ветку" -#: builtin/show-branch.c:639 +#: builtin/show-branch.c:658 msgid "name commits with their object names" msgstr "именовать коммиты их именами объектов" -#: builtin/show-branch.c:641 +#: builtin/show-branch.c:660 msgid "show possible merge bases" msgstr "вывести возможные базы слияния" -#: builtin/show-branch.c:643 +#: builtin/show-branch.c:662 msgid "show refs unreachable from any other ref" msgstr "вывести ссылки, недоступные из любых других ссылок" -#: builtin/show-branch.c:645 +#: builtin/show-branch.c:664 msgid "show commits in topological order" msgstr "вывести коммиты в топологическом порядке" -#: builtin/show-branch.c:648 +#: builtin/show-branch.c:667 msgid "show only commits not on the first branch" msgstr "вывести только коммиты, отсутствующие в первой ветке" -#: builtin/show-branch.c:650 +#: builtin/show-branch.c:669 msgid "show merges reachable from only one tip" msgstr "вывести слияния, достижимые только из одной из верхушек" -#: builtin/show-branch.c:652 +#: builtin/show-branch.c:671 msgid "topologically sort, maintaining date order where possible" msgstr "топологическая сортировка, с сохранением порядка дат, если возможно" -#: builtin/show-branch.c:655 +#: builtin/show-branch.c:674 msgid "<n>[,<base>]" msgstr "<n>[,<база>]" -#: builtin/show-branch.c:656 +#: builtin/show-branch.c:675 msgid "show <n> most recent ref-log entries starting at base" msgstr "показать <n> последних записей в журнале ссылок, начиная с базы" -#: builtin/show-branch.c:690 +#: builtin/show-branch.c:711 msgid "" "--reflog is incompatible with --all, --remotes, --independent or --merge-" "base" msgstr "--reflog несовместимо с --all, --remotes, --independent и --merge-base" -#: builtin/show-branch.c:714 +#: builtin/show-branch.c:735 msgid "no branches given, and HEAD is not valid" msgstr "не указаны ветки и HEAD не действительный" -#: builtin/show-branch.c:717 +#: builtin/show-branch.c:738 msgid "--reflog option needs one branch name" msgstr "параметр --reflog требует указания имени одной ветки" -#: builtin/show-branch.c:720 +#: builtin/show-branch.c:741 #, c-format msgid "only %d entry can be shown at one time." msgid_plural "only %d entries can be shown at one time." @@ -12591,12 +14944,12 @@ msgstr[1] "только %d записи могут быть показаны о msgstr[2] "только %d записей могут быть показаны одновременно." msgstr[3] "только %d записи могут быть показаны одновременно." -#: builtin/show-branch.c:724 +#: builtin/show-branch.c:745 #, c-format msgid "no such ref %s" msgstr "нет такой ссылки %s" -#: builtin/show-branch.c:808 +#: builtin/show-branch.c:829 #, c-format msgid "cannot handle more than %d rev." msgid_plural "cannot handle more than %d revs." @@ -12605,55 +14958,55 @@ msgstr[1] "невозможно обработать больше %d редак msgstr[2] "невозможно обработать больше %d редакций." msgstr[3] "невозможно обработать больше %d редакции." -#: builtin/show-branch.c:812 +#: builtin/show-branch.c:833 #, c-format msgid "'%s' is not a valid ref." msgstr "«%s» не является допустимой ссылкой на коммит." -#: builtin/show-branch.c:815 +#: builtin/show-branch.c:836 #, c-format msgid "cannot find commit %s (%s)" msgstr "не удалось найти коммит %s (%s)" -#: builtin/show-ref.c:10 +#: builtin/show-ref.c:11 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] [--] [<шаблон>…]" -#: builtin/show-ref.c:11 +#: builtin/show-ref.c:12 msgid "git show-ref --exclude-existing[=<pattern>]" msgstr "git show-ref --exclude-existing[=<шаблон>]" -#: builtin/show-ref.c:159 +#: builtin/show-ref.c:160 msgid "only show tags (can be combined with heads)" msgstr "вывести только метки (можно использовать одновременно с --heads)" -#: builtin/show-ref.c:160 +#: builtin/show-ref.c:161 msgid "only show heads (can be combined with tags)" msgstr "вывести только головы (можно использовать одновременно с --tags)" -#: builtin/show-ref.c:161 +#: builtin/show-ref.c:162 msgid "stricter reference checking, requires exact ref path" msgstr "более строгая проверка ссылок, требует точный путь ссылки" -#: builtin/show-ref.c:164 builtin/show-ref.c:166 +#: builtin/show-ref.c:165 builtin/show-ref.c:167 msgid "show the HEAD reference, even if it would be filtered out" msgstr "вывести ссылку HEAD, даже если она будет отфильтрована" -#: builtin/show-ref.c:168 +#: builtin/show-ref.c:169 msgid "dereference tags into object IDs" msgstr "разыменовать метки в идентификаторы объектов" -#: builtin/show-ref.c:170 +#: builtin/show-ref.c:171 msgid "only show SHA1 hash using <n> digits" msgstr "использовать <n> цифр для вывода SHA-1" -#: builtin/show-ref.c:174 +#: builtin/show-ref.c:175 msgid "do not print results to stdout (useful with --verify)" msgstr "не печатать результат на стандартный вывод (полезно с опцией «--verify»)" -#: builtin/show-ref.c:176 +#: builtin/show-ref.c:177 msgid "show refs from stdin that aren't in local repository" msgstr "вывести ссылки со стандартного ввода, которых нет в локальном репозитории" @@ -12673,243 +15026,358 @@ msgstr "пропустить и удалить все строки, начина msgid "prepend comment character and space to each line" msgstr "добавить перед каждой строкой символ комметария и пробел" -#: builtin/submodule--helper.c:34 builtin/submodule--helper.c:1332 +#: builtin/submodule--helper.c:37 builtin/submodule--helper.c:1833 #, c-format msgid "No such ref: %s" msgstr "Нет такой ссылки: %s" -#: builtin/submodule--helper.c:41 builtin/submodule--helper.c:1341 +#: builtin/submodule--helper.c:44 builtin/submodule--helper.c:1842 #, c-format msgid "Expecting a full ref name, got %s" msgstr "Ожидалось полное имя ссылки, а получено %s" -#: builtin/submodule--helper.c:81 +#: builtin/submodule--helper.c:61 +msgid "submodule--helper print-default-remote takes no arguments" +msgstr "" + +#: builtin/submodule--helper.c:99 #, c-format msgid "cannot strip one component off url '%s'" msgstr "не удалось обрезать один компонент url «%s»" -#: builtin/submodule--helper.c:370 builtin/submodule--helper.c:861 +#: builtin/submodule--helper.c:407 builtin/submodule--helper.c:1356 msgid "alternative anchor for relative paths" msgstr "альтернативный символ для относительных путей" -#: builtin/submodule--helper.c:375 +#: builtin/submodule--helper.c:412 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<путь>] [<путь>…]" -#: builtin/submodule--helper.c:426 builtin/submodule--helper.c:449 +#: builtin/submodule--helper.c:469 builtin/submodule--helper.c:606 +#: builtin/submodule--helper.c:629 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "URL для подмодуля по пути «%s» не найден в .gitmodules" -#: builtin/submodule--helper.c:464 +#: builtin/submodule--helper.c:521 +#, c-format +msgid "Entering '%s'\n" +msgstr "" + +#: builtin/submodule--helper.c:524 +#, c-format +msgid "" +"run_command returned non-zero status for %s\n" +"." +msgstr "" + +#: builtin/submodule--helper.c:545 +#, c-format +msgid "" +"run_command returned non-zero status whilerecursing in the nested submodules of %s\n" +"." +msgstr "" + +#: builtin/submodule--helper.c:561 +msgid "Suppress output of entering each submodule command" +msgstr "" + +#: builtin/submodule--helper.c:563 builtin/submodule--helper.c:1040 +msgid "Recurse into nested submodules" +msgstr "" + +#: builtin/submodule--helper.c:568 +msgid "git submodule--helper foreach [--quiet] [--recursive] <command>" +msgstr "git submodule--helper foreach [--quiet] [--recursive] <команда>" + +#: builtin/submodule--helper.c:644 #, c-format msgid "" "could not lookup configuration '%s'. Assuming this repository is its own " "authoritative upstream." msgstr "не удалось запросить конфигурацию «%s». Предполагаю, что этот репозиторий имеет свой собственный вышестоящий репозиторий." -#: builtin/submodule--helper.c:475 +#: builtin/submodule--helper.c:655 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "Сбой регистрации адреса для пути подмодуля «%s»" -#: builtin/submodule--helper.c:479 +#: builtin/submodule--helper.c:659 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "Подмодуль «%s» (%s) зарегистрирован по пути «%s»\n" -#: builtin/submodule--helper.c:489 +#: builtin/submodule--helper.c:669 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" msgstr "внимание: предполагаемый режим обновления для подмодуля «%s»\n" -#: builtin/submodule--helper.c:496 +#: builtin/submodule--helper.c:676 #, c-format msgid "Failed to register update mode for submodule path '%s'" msgstr "Сбой регистрации режима обновления для пути подмодуля «%s»" -#: builtin/submodule--helper.c:518 +#: builtin/submodule--helper.c:698 msgid "Suppress output for initializing a submodule" msgstr "Не выводить информацию о инициализации подмодуля" -#: builtin/submodule--helper.c:523 +#: builtin/submodule--helper.c:703 msgid "git submodule--helper init [<path>]" msgstr "git submodule--helper init [<путь>]" -#: builtin/submodule--helper.c:591 builtin/submodule--helper.c:713 +#: builtin/submodule--helper.c:775 builtin/submodule--helper.c:901 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "не найдено соответствие подмодулей в .gitmodules для пути «%s»" -#: builtin/submodule--helper.c:626 +#: builtin/submodule--helper.c:814 #, c-format msgid "could not resolve HEAD ref inside the submodule '%s'" msgstr "не удалось найти HEAD ссылку внутри подмодуля «%s»" -#: builtin/submodule--helper.c:653 +#: builtin/submodule--helper.c:841 builtin/submodule--helper.c:1010 #, c-format msgid "failed to recurse into submodule '%s'" msgstr "не удалось перейти вглубь подмодуля «%s»" -#: builtin/submodule--helper.c:677 +#: builtin/submodule--helper.c:865 builtin/submodule--helper.c:1176 msgid "Suppress submodule status output" msgstr "Не выводить статус подмодуля" -#: builtin/submodule--helper.c:678 +#: builtin/submodule--helper.c:866 msgid "" "Use commit stored in the index instead of the one stored in the submodule " "HEAD" msgstr "Использовать коммит хранящийся в индексе вместо коммита хранящегося в HEAD подмодуля" -#: builtin/submodule--helper.c:679 +#: builtin/submodule--helper.c:867 msgid "recurse into nested submodules" msgstr "проходить вглубь вложенных подмодулей" -#: builtin/submodule--helper.c:684 +#: builtin/submodule--helper.c:872 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" msgstr "git submodule status [--quiet] [--cached] [--recursive] [<путь>…]" -#: builtin/submodule--helper.c:708 +#: builtin/submodule--helper.c:896 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name <путь>" -#: builtin/submodule--helper.c:796 builtin/submodule--helper.c:799 +#: builtin/submodule--helper.c:960 +#, c-format +msgid "Synchronizing submodule url for '%s'\n" +msgstr "" + +#: builtin/submodule--helper.c:966 +#, c-format +msgid "failed to register url for submodule path '%s'" +msgstr "" + +#: builtin/submodule--helper.c:980 +#, c-format +msgid "failed to get the default remote for submodule '%s'" +msgstr "" + +#: builtin/submodule--helper.c:991 +#, c-format +msgid "failed to update remote for submodule '%s'" +msgstr "" + +#: builtin/submodule--helper.c:1038 +msgid "Suppress output of synchronizing submodule url" +msgstr "" + +#: builtin/submodule--helper.c:1045 +msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" +msgstr "git submodule--helper sync [--quiet] [--recursive] [<путь>]" + +#: builtin/submodule--helper.c:1099 +#, c-format +msgid "" +"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " +"really want to remove it including all of its history)" +msgstr "" + +#: builtin/submodule--helper.c:1111 +#, c-format +msgid "" +"Submodule work tree '%s' contains local modifications; use '-f' to discard " +"them" +msgstr "" + +#: builtin/submodule--helper.c:1119 +#, c-format +msgid "Cleared directory '%s'\n" +msgstr "" + +#: builtin/submodule--helper.c:1121 +#, c-format +msgid "Could not remove submodule work tree '%s'\n" +msgstr "" + +#: builtin/submodule--helper.c:1132 +#, c-format +msgid "could not create empty submodule directory %s" +msgstr "" + +#: builtin/submodule--helper.c:1148 +#, c-format +msgid "Submodule '%s' (%s) unregistered for path '%s'\n" +msgstr "" + +#: builtin/submodule--helper.c:1177 +msgid "Remove submodule working trees even if they contain local changes" +msgstr "" + +#: builtin/submodule--helper.c:1178 +msgid "Unregister all submodules" +msgstr "" + +#: builtin/submodule--helper.c:1183 +msgid "" +"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" +msgstr "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<путь>…]]" + +#: builtin/submodule--helper.c:1197 +msgid "Use '--all' if you really want to deinitialize all submodules" +msgstr "Используйте «--all», если вы действительно хотите деинициализировать все подмодули" + +#: builtin/submodule--helper.c:1290 builtin/submodule--helper.c:1293 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "подмодулю «%s» не удалось добавить альтернативу: %s" -#: builtin/submodule--helper.c:835 +#: builtin/submodule--helper.c:1329 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "Значение «%s» для параметра submodule.alternateErrorStrategy не рапознано" -#: builtin/submodule--helper.c:842 +#: builtin/submodule--helper.c:1336 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "Значение «%s» для параметра submodule.alternateLocation не рапознано" -#: builtin/submodule--helper.c:864 +#: builtin/submodule--helper.c:1359 msgid "where the new submodule will be cloned to" msgstr "куда должен быть склонирован новый подмодуль" -#: builtin/submodule--helper.c:867 +#: builtin/submodule--helper.c:1362 msgid "name of the new submodule" msgstr "имя нового подмодуля" -#: builtin/submodule--helper.c:870 +#: builtin/submodule--helper.c:1365 msgid "url where to clone the submodule from" msgstr "url откуда должен был склонирован новый подмодуль" -#: builtin/submodule--helper.c:876 +#: builtin/submodule--helper.c:1373 msgid "depth for shallow clones" msgstr "глубина для частичного клона" -#: builtin/submodule--helper.c:879 builtin/submodule--helper.c:1250 +#: builtin/submodule--helper.c:1376 builtin/submodule--helper.c:1751 msgid "force cloning progress" msgstr "принудительно выводить прогресс клонирования" -#: builtin/submodule--helper.c:884 +#: builtin/submodule--helper.c:1381 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" msgstr "git submodule--helper clone [--prefix=<путь>] [--quiet] [--reference <репозиторий>] [--name <имя>] [--depth <глубина>] --url <url> --path <путь>" -#: builtin/submodule--helper.c:915 +#: builtin/submodule--helper.c:1412 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "не удалось клонировать «%s» в подмодуль по пути «%s»" -#: builtin/submodule--helper.c:930 +#: builtin/submodule--helper.c:1426 #, c-format msgid "could not get submodule directory for '%s'" msgstr "не удалось получить каталог для подмодуля «%s»" -#: builtin/submodule--helper.c:995 +#: builtin/submodule--helper.c:1492 #, c-format msgid "Submodule path '%s' not initialized" msgstr "Подмодуль по пути «%s» не инициализирован" -#: builtin/submodule--helper.c:999 +#: builtin/submodule--helper.c:1496 msgid "Maybe you want to use 'update --init'?" msgstr "Возможно, вы хотели использовать «update --init»?" -#: builtin/submodule--helper.c:1028 +#: builtin/submodule--helper.c:1525 #, c-format msgid "Skipping unmerged submodule %s" msgstr "Пропуск не слитого подмодуля %s" -#: builtin/submodule--helper.c:1057 +#: builtin/submodule--helper.c:1554 #, c-format msgid "Skipping submodule '%s'" msgstr "Пропуск подмодуля «%s»" -#: builtin/submodule--helper.c:1190 +#: builtin/submodule--helper.c:1689 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "Не удалось клонировать «%s». Запланирована повторная попытка" -#: builtin/submodule--helper.c:1201 +#: builtin/submodule--helper.c:1700 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "Не удалось клонировать «%s» со второй попытки, отмена" -#: builtin/submodule--helper.c:1231 builtin/submodule--helper.c:1451 +#: builtin/submodule--helper.c:1730 builtin/submodule--helper.c:1953 msgid "path into the working tree" msgstr "путь в рабочем каталоге" -#: builtin/submodule--helper.c:1234 +#: builtin/submodule--helper.c:1733 msgid "path into the working tree, across nested submodule boundaries" msgstr "путь в рабочем каталоге, в пределах границ подмодуля" -#: builtin/submodule--helper.c:1238 +#: builtin/submodule--helper.c:1737 msgid "rebase, merge, checkout or none" msgstr "rebase, merge, checkout или none" -#: builtin/submodule--helper.c:1242 +#: builtin/submodule--helper.c:1743 msgid "Create a shallow clone truncated to the specified number of revisions" msgstr "Создать частичный клон, ограниченный указанным количеством редакций" -#: builtin/submodule--helper.c:1245 +#: builtin/submodule--helper.c:1746 msgid "parallel jobs" msgstr "параллельные задачи" -#: builtin/submodule--helper.c:1247 +#: builtin/submodule--helper.c:1748 msgid "whether the initial clone should follow the shallow recommendation" msgstr "должен ли изначальный процесс клонирования следовать рекомендации о частичности" -#: builtin/submodule--helper.c:1248 +#: builtin/submodule--helper.c:1749 msgid "don't print cloning progress" msgstr "вы выводить прогресс клонирования" -#: builtin/submodule--helper.c:1255 +#: builtin/submodule--helper.c:1756 msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" msgstr "git submodule--helper update_clone [--prefix=<путь>] [<путь>…]" -#: builtin/submodule--helper.c:1268 +#: builtin/submodule--helper.c:1769 msgid "bad value for update parameter" msgstr "плохое значение для параметра update" -#: builtin/submodule--helper.c:1336 +#: builtin/submodule--helper.c:1837 #, 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:1452 +#: builtin/submodule--helper.c:1954 msgid "recurse into submodules" msgstr "рекурсивно по подмодулям" -#: builtin/submodule--helper.c:1458 +#: builtin/submodule--helper.c:1960 msgid "git submodule--helper embed-git-dir [<path>...]" msgstr "git submodule--helper embed-git-dir [<путь>…]" -#: builtin/submodule--helper.c:1517 +#: builtin/submodule--helper.c:2071 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s не поддерживает параметр --super-prefix" -#: builtin/submodule--helper.c:1523 +#: builtin/submodule--helper.c:2077 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "«%s» не является подкомандой submodule--helper" @@ -12934,45 +15402,45 @@ msgstr "удалить символьные ссылки" msgid "shorten ref output" msgstr "укороченный вывод ссылок" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363 msgid "reason" msgstr "причина" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363 msgid "reason of the update" msgstr "причина обновления" -#: builtin/tag.c:24 +#: builtin/tag.c:25 msgid "" "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> " "[<head>]" msgstr "git tag [-a | -s | -u <идентификатор-ключа>] [-f] [-m <сообщение> | -F <файл>] <имя-метки> [<редакция>]" -#: builtin/tag.c:25 +#: builtin/tag.c:26 msgid "git tag -d <tagname>..." msgstr "git tag -d <имя-метки>…" -#: builtin/tag.c:26 +#: builtin/tag.c:27 msgid "" "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--points-at <object>]\n" "\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]" msgstr "git tag -l [-n[<количество>]] [--contains <коммит>] [--no-contains <коммит>] [--points-at <объект>]\n\t\t[--format=<формат>] [--[no-]merged [<коммит>]] [<шаблон>…]" -#: builtin/tag.c:28 +#: builtin/tag.c:29 msgid "git tag -v [--format=<format>] <tagname>..." msgstr "git tag -v [--format=<формат>] <имя-метки>…" -#: builtin/tag.c:86 +#: builtin/tag.c:87 #, c-format msgid "tag '%s' not found." msgstr "метка «%s» не найдена." -#: builtin/tag.c:102 +#: builtin/tag.c:103 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "Метка «%s» удалена (была %s)\n" -#: builtin/tag.c:131 +#: builtin/tag.c:133 #, c-format msgid "" "\n" @@ -12981,7 +15449,7 @@ msgid "" "Lines starting with '%c' will be ignored.\n" msgstr "\nВведите сообщение для метки:\n %s\nСтроки, начинающиеся с «%c» будут проигнорированы.\n" -#: builtin/tag.c:135 +#: builtin/tag.c:137 #, c-format msgid "" "\n" @@ -12990,147 +15458,151 @@ msgid "" "Lines starting with '%c' will be kept; you may remove them yourself if you want to.\n" msgstr "\nВведите сообщение для метки:\n %s\nСтроки, начинающиеся с «%c» будут оставлены; вы можете удалить их вручную, если хотите.\n" -#: builtin/tag.c:189 +#: builtin/tag.c:191 msgid "unable to sign the tag" msgstr "не удалось подписать метку" -#: builtin/tag.c:191 +#: builtin/tag.c:193 msgid "unable to write tag file" msgstr "не удалось записать файл метки" -#: builtin/tag.c:215 +#: builtin/tag.c:218 msgid "bad object type." msgstr "неправильный тип объекта" -#: builtin/tag.c:261 +#: builtin/tag.c:267 msgid "no tag message?" msgstr "нет описания метки?" -#: builtin/tag.c:268 +#: builtin/tag.c:274 #, c-format msgid "The tag message has been left in %s\n" msgstr "Сообщение метки было оставлено в %s\n" -#: builtin/tag.c:376 +#: builtin/tag.c:383 msgid "list tag names" msgstr "список названий меток" -#: builtin/tag.c:378 +#: builtin/tag.c:385 msgid "print <n> lines of each tag message" msgstr "печатать <n> строк описания от каждой метки" -#: builtin/tag.c:380 +#: builtin/tag.c:387 msgid "delete tags" msgstr "удалить метки" -#: builtin/tag.c:381 +#: builtin/tag.c:388 msgid "verify tags" msgstr "проверить метки" -#: builtin/tag.c:383 +#: builtin/tag.c:390 msgid "Tag creation options" msgstr "Настройки создания метки" -#: builtin/tag.c:385 +#: builtin/tag.c:392 msgid "annotated tag, needs a message" msgstr "для аннотированной метки нужно сообщение" -#: builtin/tag.c:387 +#: builtin/tag.c:394 msgid "tag message" msgstr "описание метки" -#: builtin/tag.c:389 +#: builtin/tag.c:396 +msgid "force edit of tag message" +msgstr "" + +#: builtin/tag.c:397 msgid "annotated and GPG-signed tag" msgstr "аннотированная и подписанная с помощью GPG метка" -#: builtin/tag.c:393 +#: builtin/tag.c:401 msgid "use another key to sign the tag" msgstr "использовать другой ключ для подписания метки" -#: builtin/tag.c:394 +#: builtin/tag.c:402 msgid "replace the tag if exists" msgstr "замена метки, если она существует" -#: builtin/tag.c:395 builtin/update-ref.c:368 +#: builtin/tag.c:403 builtin/update-ref.c:369 msgid "create a reflog" msgstr "создать журнал ссылок" -#: builtin/tag.c:397 +#: builtin/tag.c:405 msgid "Tag listing options" msgstr "Настройки вывода списка меток" -#: builtin/tag.c:398 +#: builtin/tag.c:406 msgid "show tag list in columns" msgstr "показать список меток по столбцам" -#: builtin/tag.c:399 builtin/tag.c:401 +#: builtin/tag.c:407 builtin/tag.c:409 msgid "print only tags that contain the commit" msgstr "вывод только меток, которые содержат коммит" -#: builtin/tag.c:400 builtin/tag.c:402 +#: builtin/tag.c:408 builtin/tag.c:410 msgid "print only tags that don't contain the commit" msgstr "вывод только меток, которые не содержат коммит" -#: builtin/tag.c:403 +#: builtin/tag.c:411 msgid "print only tags that are merged" msgstr "вывод только слитых меток" -#: builtin/tag.c:404 +#: builtin/tag.c:412 msgid "print only tags that are not merged" msgstr "вывод только не слитых меток" -#: builtin/tag.c:409 +#: builtin/tag.c:417 msgid "print only tags of the object" msgstr "вывод только меток, определенного объекта" -#: builtin/tag.c:453 +#: builtin/tag.c:461 msgid "--column and -n are incompatible" msgstr "--column и -n нельзя использовать одновременно" -#: builtin/tag.c:475 +#: builtin/tag.c:483 msgid "-n option is only allowed in list mode" msgstr "опцию -n можно использовать только в режиме списка" -#: builtin/tag.c:477 +#: builtin/tag.c:485 msgid "--contains option is only allowed in list mode" msgstr "опцию --contains можно использовать только в режиме списка" -#: builtin/tag.c:479 +#: builtin/tag.c:487 msgid "--no-contains option is only allowed in list mode" msgstr "опцию --no-contains можно использовать только в режиме списка" -#: builtin/tag.c:481 +#: builtin/tag.c:489 msgid "--points-at option is only allowed in list mode" msgstr "опцию --points-at можно использовать только в режиме списка" -#: builtin/tag.c:483 +#: builtin/tag.c:491 msgid "--merged and --no-merged options are only allowed in list mode" msgstr "опции --merged и --no-merged можно использовать только в режиме списка" -#: builtin/tag.c:494 +#: builtin/tag.c:502 msgid "only one -F or -m option is allowed." msgstr "-F и -m нельзя использовать одновременно." -#: builtin/tag.c:513 +#: builtin/tag.c:521 msgid "too many params" msgstr "передано слишком много параметров" -#: builtin/tag.c:519 +#: builtin/tag.c:527 #, c-format msgid "'%s' is not a valid tag name." msgstr "«%s» не является допустимым именем метки." -#: builtin/tag.c:524 +#: builtin/tag.c:532 #, c-format msgid "tag '%s' already exists" msgstr "метка «%s» уже существует" -#: builtin/tag.c:554 +#: builtin/tag.c:563 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "Метка «%s» обновлена (была %s)\n" -#: builtin/unpack-objects.c:494 +#: builtin/unpack-objects.c:500 msgid "Unpacking objects" msgstr "Распаковка объектов" @@ -13139,11 +15611,6 @@ msgstr "Распаковка объектов" msgid "failed to create directory %s" msgstr "не удалось создать каталог %s" -#: builtin/update-index.c:88 -#, c-format -msgid "failed to stat %s" -msgstr "не удалось выполнить stat %s" - #: builtin/update-index.c:98 #, c-format msgid "failed to create file %s" @@ -13192,189 +15659,189 @@ msgstr "информация статистики каталога не изме msgid " OK" msgstr " OK" -#: builtin/update-index.c:579 +#: builtin/update-index.c:588 msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [<опции>] [--] [<файл>…]" -#: builtin/update-index.c:936 +#: builtin/update-index.c:944 msgid "continue refresh even when index needs update" msgstr "продолжить обновление, даже если индекс требует обновления" -#: builtin/update-index.c:939 +#: builtin/update-index.c:947 msgid "refresh: ignore submodules" msgstr "обновление: игнорировать подмодули" -#: builtin/update-index.c:942 +#: builtin/update-index.c:950 msgid "do not ignore new files" msgstr "не игнорировать новые файлы" -#: builtin/update-index.c:944 +#: builtin/update-index.c:952 msgid "let files replace directories and vice-versa" msgstr "разрешить файлам заменять каталоги и наоборот" -#: builtin/update-index.c:946 +#: builtin/update-index.c:954 msgid "notice files missing from worktree" msgstr "замечать файлы отсутствующие в рабочем каталоге" -#: builtin/update-index.c:948 +#: builtin/update-index.c:956 msgid "refresh even if index contains unmerged entries" msgstr "обновить, даже если в индексе имеются не слитые записи" -#: builtin/update-index.c:951 +#: builtin/update-index.c:959 msgid "refresh stat information" msgstr "обновить информацию о статусе файлов" -#: builtin/update-index.c:955 +#: builtin/update-index.c:963 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "как --refresh, но игнорировать настройку assume-unchanged" -#: builtin/update-index.c:959 +#: builtin/update-index.c:967 msgid "<mode>,<object>,<path>" msgstr "<режим доступа>,<объект>,<путь>" -#: builtin/update-index.c:960 +#: builtin/update-index.c:968 msgid "add the specified entry to the index" msgstr "добавить указанную запись в индекс" -#: builtin/update-index.c:969 +#: builtin/update-index.c:977 msgid "mark files as \"not changing\"" msgstr "пометить файлы как «не измененные»" -#: builtin/update-index.c:972 +#: builtin/update-index.c:980 msgid "clear assumed-unchanged bit" msgstr "убрать пометку assumed-unchanged" -#: builtin/update-index.c:975 +#: builtin/update-index.c:983 msgid "mark files as \"index-only\"" msgstr "пометить файлы как «только в индексе»" -#: builtin/update-index.c:978 +#: builtin/update-index.c:986 msgid "clear skip-worktree bit" msgstr "убрать пометку skip-worktree" -#: builtin/update-index.c:981 +#: builtin/update-index.c:989 msgid "add to index only; do not add content to object database" msgstr "только добавить в индекс; не добавлять содержимое в базу данных объектов" -#: builtin/update-index.c:983 +#: builtin/update-index.c:991 msgid "remove named paths even if present in worktree" msgstr "удалить указанные пути, даже если они существуют в рабочем каталоге" -#: builtin/update-index.c:985 +#: builtin/update-index.c:993 msgid "with --stdin: input lines are terminated by null bytes" msgstr "с опцией --stdin: строки на вводе отделяются НУЛЕВЫМ байтом" -#: builtin/update-index.c:987 +#: builtin/update-index.c:995 msgid "read list of paths to be updated from standard input" msgstr "прочитать список обновляемых путей из стандартного ввода" -#: builtin/update-index.c:991 +#: builtin/update-index.c:999 msgid "add entries from standard input to the index" msgstr "добавить записи из стандартного ввода в индекс" -#: builtin/update-index.c:995 +#: builtin/update-index.c:1003 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "заново заполнить индекс #2 и #3 для указанных путей" -#: builtin/update-index.c:999 +#: builtin/update-index.c:1007 msgid "only update entries that differ from HEAD" msgstr "обновить только записи, которые отличаются от HEAD" -#: builtin/update-index.c:1003 +#: builtin/update-index.c:1011 msgid "ignore files missing from worktree" msgstr "игнорировать файлы, отсутствующие в рабочем каталоге" -#: builtin/update-index.c:1006 +#: builtin/update-index.c:1014 msgid "report actions to standard output" msgstr "вывести выполняемые действия на стандартный вывод" -#: builtin/update-index.c:1008 +#: builtin/update-index.c:1016 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(для машинной обработки) забыть сохраненные неразрешенные конфликты" -#: builtin/update-index.c:1012 +#: builtin/update-index.c:1020 msgid "write index in this format" msgstr "записать индекс в указанном формате" -#: builtin/update-index.c:1014 +#: builtin/update-index.c:1022 msgid "enable or disable split index" msgstr "разрешить или запретить раздельный индекс" -#: builtin/update-index.c:1016 +#: builtin/update-index.c:1024 msgid "enable/disable untracked cache" msgstr "включить/отключить кэш неотслеживаемых файлов" -#: builtin/update-index.c:1018 +#: builtin/update-index.c:1026 msgid "test if the filesystem supports untracked cache" msgstr "проверить, что файловая система поддерживает кэш неотслеживаемых файлов" -#: builtin/update-index.c:1020 +#: builtin/update-index.c:1028 msgid "enable untracked cache without testing the filesystem" msgstr "включить кэш неотслеживаемых файлов без проверки файловой системы" -#: builtin/update-index.c:1022 +#: builtin/update-index.c:1030 msgid "write out the index even if is not flagged as changed" msgstr "записать индекс, даже если он не помечен как измененный" -#: builtin/update-index.c:1024 +#: builtin/update-index.c:1032 msgid "enable or disable file system monitor" msgstr "включить или выключить мониторинг файловой системы" -#: builtin/update-index.c:1026 +#: builtin/update-index.c:1034 msgid "mark files as fsmonitor valid" msgstr "пометить файл как действительный в мониторе файловой системы" -#: builtin/update-index.c:1029 +#: builtin/update-index.c:1037 msgid "clear fsmonitor valid bit" msgstr "снять пометку действительности мониторе файловой системы" -#: builtin/update-index.c:1127 +#: builtin/update-index.c:1136 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:1136 +#: builtin/update-index.c:1145 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:1147 +#: builtin/update-index.c:1156 msgid "" "core.untrackedCache is set to true; remove or change it, if you really want " "to disable the untracked cache" msgstr "параметр core.untrackedCache установлен true; удалите или измените его, если вы действительно хотите удалить кэш неотслеживаемых файлов" -#: builtin/update-index.c:1151 +#: builtin/update-index.c:1160 msgid "Untracked cache disabled" msgstr "Кэш неотслеживаемых файлов отключен" -#: builtin/update-index.c:1159 +#: builtin/update-index.c:1168 msgid "" "core.untrackedCache is set to false; remove or change it, if you really want" " to enable the untracked cache" msgstr "параметр core.untrackedCache установлен false; удалите или измените его, если вы действительно хотите включить кэш неотслеживаемых файлов" -#: builtin/update-index.c:1163 +#: builtin/update-index.c:1172 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "Кэш неотслеживаемых файлов включен для «%s»" -#: builtin/update-index.c:1171 +#: builtin/update-index.c:1180 msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor" msgstr "параметр core.fsmonitor не установлен; установите его если вы действительно хотите включить мониторинг файловой системы" -#: builtin/update-index.c:1175 +#: builtin/update-index.c:1184 msgid "fsmonitor enabled" msgstr "мониторинг файловой системы включён" -#: builtin/update-index.c:1178 +#: builtin/update-index.c:1187 msgid "" "core.fsmonitor is set; remove it if you really want to disable fsmonitor" msgstr "параметр core.fsmonitor установлен; удалите его если вы действительно хотите выключить мониторинг файловой системы" -#: builtin/update-index.c:1182 +#: builtin/update-index.c:1191 msgid "fsmonitor disabled" msgstr "мониторинг файловой системы выключён" @@ -13390,19 +15857,19 @@ msgstr "git update-ref [<опции>] <имя-ссылки> <новое-зн msgid "git update-ref [<options>] --stdin [-z]" msgstr "git update-ref [<опции>] --stdin [-z]" -#: builtin/update-ref.c:363 +#: builtin/update-ref.c:364 msgid "delete the reference" msgstr "удалить ссылку" -#: builtin/update-ref.c:365 +#: builtin/update-ref.c:366 msgid "update <refname> not the one it points to" msgstr "обновить <имя-ссылки> а не то, на что она указывает" -#: builtin/update-ref.c:366 +#: builtin/update-ref.c:367 msgid "stdin has NUL-terminated arguments" msgstr "ввод отделённый НУЛЕВЫМИ символами" -#: builtin/update-ref.c:367 +#: builtin/update-ref.c:368 msgid "read updates from stdin" msgstr "прочитать обновления из стандартного ввода" @@ -13414,15 +15881,31 @@ msgstr "git update-server-info [--force]" msgid "update the info files from scratch" msgstr "обновить информацию о серверах с нуля" -#: builtin/verify-commit.c:18 +#: builtin/upload-pack.c:11 +msgid "git upload-pack [<options>] <dir>" +msgstr "git upload-pack [<опции>] <каталог>" + +#: builtin/upload-pack.c:25 +msgid "exit immediately after initial ref advertisement" +msgstr "выходить сразу после начального объявления списка ссылок" + +#: builtin/upload-pack.c:27 +msgid "do not try <directory>/.git/ if <directory> is no Git directory" +msgstr "не проверять <каталог>/.git/ если <каталог> не является каталогом Git" + +#: builtin/upload-pack.c:29 +msgid "interrupt transfer after <n> seconds of inactivity" +msgstr "прервать передачу после <кол> секунд простоя" + +#: builtin/verify-commit.c:20 msgid "git verify-commit [-v | --verbose] <commit>..." msgstr "git verify-commit [-v | --verbose] <коммит>…" -#: builtin/verify-commit.c:73 +#: builtin/verify-commit.c:76 msgid "print commit contents" msgstr "вывести содержимое коммита" -#: builtin/verify-commit.c:74 builtin/verify-tag.c:38 +#: builtin/verify-commit.c:77 builtin/verify-tag.c:38 msgid "print raw gpg status output" msgstr "выводить сырой вывод статуса от gpg" @@ -13447,8 +15930,8 @@ msgid "print tag contents" msgstr "вывести содержимое метки" #: builtin/worktree.c:17 -msgid "git worktree add [<options>] <path> [<branch>]" -msgstr "git worktree add [<опции>] <путь> [<ветка>]" +msgid "git worktree add [<options>] <path> [<commit-ish>]" +msgstr "git worktree add [<опции>] <путь> [<указатель-коммита>]" #: builtin/worktree.c:18 msgid "git worktree list [<options>]" @@ -13459,10 +15942,18 @@ msgid "git worktree lock [<options>] <path>" msgstr "git worktree lock [<опции>] <путь>" #: builtin/worktree.c:20 +msgid "git worktree move <worktree> <new-path>" +msgstr "git worktree move <рабочий-каталог> <новый-путь>" + +#: builtin/worktree.c:21 msgid "git worktree prune [<options>]" msgstr "git worktree prune [<опции>]" -#: builtin/worktree.c:21 +#: builtin/worktree.c:22 +msgid "git worktree remove [<options>] <worktree>" +msgstr "git worktree remove [<опции>] <рабочий-каталог>" + +#: builtin/worktree.c:23 msgid "git worktree unlock <path>" msgstr "git worktree unlock <путь>" @@ -13493,98 +15984,190 @@ msgstr "Удаление рабочего каталога/%s: прочитан msgid "Removing worktrees/%s: invalid gitdir file" msgstr "Удаление рабочих каталогов/%s: недействительный файл gitdir" -#: builtin/worktree.c:112 +#: builtin/worktree.c:105 #, c-format msgid "Removing worktrees/%s: gitdir file points to non-existent location" msgstr "Удаление рабочих каталогов/%s: gitdir указывает на несуществующее расположение" -#: builtin/worktree.c:159 +#: builtin/worktree.c:152 msgid "report pruned working trees" msgstr "вывести список удаленных рабочих каталогов" -#: builtin/worktree.c:161 +#: builtin/worktree.c:154 msgid "expire working trees older than <time>" msgstr "удалить рабочие каталоги старее чем <дата-окончания>" -#: builtin/worktree.c:236 +#: builtin/worktree.c:229 #, c-format msgid "'%s' already exists" msgstr "«%s» уже существует" -#: builtin/worktree.c:267 +#: builtin/worktree.c:260 #, c-format msgid "could not create directory of '%s'" msgstr "не удалось создать каталог «%s»" -#: builtin/worktree.c:306 +#: builtin/worktree.c:373 builtin/worktree.c:379 #, c-format -msgid "Preparing %s (identifier %s)" -msgstr "Подготовка %s (идентификатор %s)" +msgid "Preparing worktree (new branch '%s')" +msgstr "" -#: builtin/worktree.c:368 +#: builtin/worktree.c:375 +#, c-format +msgid "Preparing worktree (resetting branch '%s'; was at %s)" +msgstr "" + +#: builtin/worktree.c:384 +#, c-format +msgid "Preparing worktree (checking out '%s')" +msgstr "" + +#: builtin/worktree.c:390 +#, c-format +msgid "Preparing worktree (detached HEAD %s)" +msgstr "" + +#: builtin/worktree.c:431 msgid "checkout <branch> even if already checked out in other worktree" msgstr "переключиться на <ветка> даже если она уже активна в другом рабочесм каталоге" -#: builtin/worktree.c:370 +#: builtin/worktree.c:434 msgid "create a new branch" msgstr "создать новую ветку" -#: builtin/worktree.c:372 +#: builtin/worktree.c:436 msgid "create or reset a branch" msgstr "создать или перейти на ветку" -#: builtin/worktree.c:374 +#: builtin/worktree.c:438 msgid "populate the new working tree" msgstr "наполнить новый рабочий каталог" -#: builtin/worktree.c:375 +#: builtin/worktree.c:439 msgid "keep the new working tree locked" msgstr "держать рабочий каталог заблокированным" -#: builtin/worktree.c:377 +#: builtin/worktree.c:441 msgid "set up tracking mode (see git-branch(1))" msgstr "настроить режим отслеживания ветки (смотрите git-branch(1))" -#: builtin/worktree.c:380 +#: builtin/worktree.c:444 msgid "try to match the new branch name with a remote-tracking branch" msgstr "пытаться найти соответствие имени новой ветки с именем внешней ветки" -#: builtin/worktree.c:388 +#: builtin/worktree.c:452 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b, -B и --detach нельзя использовать одновременно" -#: builtin/worktree.c:453 +#: builtin/worktree.c:511 msgid "--[no-]track can only be used if a new branch is created" msgstr "--[no-]track можно использовать только когда вы создаёте новую ветку" -#: builtin/worktree.c:553 +#: builtin/worktree.c:611 msgid "reason for locking" msgstr "причина блокировки" -#: builtin/worktree.c:565 builtin/worktree.c:598 +#: builtin/worktree.c:623 builtin/worktree.c:656 builtin/worktree.c:710 +#: builtin/worktree.c:850 #, c-format msgid "'%s' is not a working tree" msgstr "«%s» не является рабочим каталогом" -#: builtin/worktree.c:567 builtin/worktree.c:600 +#: builtin/worktree.c:625 builtin/worktree.c:658 msgid "The main working tree cannot be locked or unlocked" msgstr "Главный рабочий каталог не может быть заблокирован или разблокирован" -#: builtin/worktree.c:572 +#: builtin/worktree.c:630 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "«%s» уже заблокирован, причина: %s" -#: builtin/worktree.c:574 +#: builtin/worktree.c:632 #, c-format msgid "'%s' is already locked" msgstr "«%s» уже заблокирован" -#: builtin/worktree.c:602 +#: builtin/worktree.c:660 #, c-format msgid "'%s' is not locked" msgstr "«%s» не заблокирован" +#: builtin/worktree.c:685 +msgid "working trees containing submodules cannot be moved or removed" +msgstr "" + +#: builtin/worktree.c:712 builtin/worktree.c:852 +#, c-format +msgid "'%s' is a main working tree" +msgstr "" + +#: builtin/worktree.c:717 +#, c-format +msgid "could not figure out destination name from '%s'" +msgstr "" + +#: builtin/worktree.c:723 +#, c-format +msgid "target '%s' already exists" +msgstr "" + +#: builtin/worktree.c:730 +#, c-format +msgid "cannot move a locked working tree, lock reason: %s" +msgstr "" + +#: builtin/worktree.c:732 +msgid "cannot move a locked working tree" +msgstr "" + +#: builtin/worktree.c:735 +#, c-format +msgid "validation failed, cannot move working tree: %s" +msgstr "" + +#: builtin/worktree.c:740 +#, c-format +msgid "failed to move '%s' to '%s'" +msgstr "" + +#: builtin/worktree.c:788 +#, c-format +msgid "failed to run 'git status' on '%s'" +msgstr "" + +#: builtin/worktree.c:792 +#, c-format +msgid "'%s' is dirty, use --force to delete it" +msgstr "" + +#: builtin/worktree.c:797 +#, c-format +msgid "failed to run 'git status' on '%s', code %d" +msgstr "" + +#: builtin/worktree.c:808 builtin/worktree.c:822 +#, c-format +msgid "failed to delete '%s'" +msgstr "не удалось удалить «%s»" + +#: builtin/worktree.c:834 +msgid "force removing even if the worktree is dirty" +msgstr "" + +#: builtin/worktree.c:856 +#, c-format +msgid "cannot remove a locked working tree, lock reason: %s" +msgstr "" + +#: builtin/worktree.c:858 +msgid "cannot remove a locked working tree" +msgstr "" + +#: builtin/worktree.c:861 +#, c-format +msgid "validation failed, cannot remove working tree: %s" +msgstr "" + #: builtin/write-tree.c:14 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" msgstr "git write-tree [--missing-ok] [--prefix=<префикс>/]" @@ -13597,30 +16180,10 @@ msgstr "<префикс>/" msgid "write tree object for a subdirectory <prefix>" msgstr "вывести объект дерева для подкаталога с <префикс>" -#: builtin/write-tree.c:31 +#: builtin/write-tree.c:30 msgid "only useful for debugging" msgstr "используется только при отладке" -#: upload-pack.c:24 -msgid "git upload-pack [<options>] <dir>" -msgstr "git upload-pack [<опции>] <каталог>" - -#: upload-pack.c:1041 -msgid "quit after a single request/response exchange" -msgstr "выход после обмена одним запросом/ответом" - -#: upload-pack.c:1043 -msgid "exit immediately after initial ref advertisement" -msgstr "выходить сразу после начального объявления списка ссылок" - -#: upload-pack.c:1045 -msgid "do not try <directory>/.git/ if <directory> is no Git directory" -msgstr "не проверять <каталог>/.git/ если <каталог> не является каталогом Git" - -#: upload-pack.c:1047 -msgid "interrupt transfer after <n> seconds of inactivity" -msgstr "прервать передачу после <кол> секунд простоя" - #: credential-cache--daemon.c:222 #, c-format msgid "" @@ -13634,27 +16197,81 @@ msgstr "Права доступа к вашему каталогу сокето msgid "print debugging messages to stderr" msgstr "вывод отладочных сообщений на stderr" -#: git.c:15 +#: git.c:27 +msgid "" +"git [--version] [--help] [-C <path>] [-c <name>=<value>]\n" +" [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n" +" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--bare]\n" +" [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n" +" <command> [<args>]" +msgstr "git [--version] [--help] [-C <путь>] [-c <имя>=<значение>]\n [--exec-path[=<путь>]] [--html-path] [--man-path] [--info-path]\n [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--bare]\n [--git-dir=<путь>] [--work-tree=<путь>] [--namespace=<имя>]\n <команда> [<аргументы>]" + +#: git.c:34 msgid "" "'git help -a' and 'git help -g' list available subcommands and some\n" "concept guides. See 'git help <command>' or 'git help <concept>'\n" "to read about a specific subcommand or concept." msgstr "«git help -а» и «git help -g» выводит список доступных подкоманд и\nнекоторые руководства по темам. Запустите «git help <команда>» или\n«git help <термин>», чтобы прочесть о конкретных подкоманде или теме." -#: http.c:339 +#: git.c:173 +#, c-format +msgid "no directory given for --git-dir\n" +msgstr "" + +#: git.c:187 +#, c-format +msgid "no namespace given for --namespace\n" +msgstr "" + +#: git.c:201 +#, c-format +msgid "no directory given for --work-tree\n" +msgstr "" + +#: git.c:215 +#, c-format +msgid "no prefix given for --super-prefix\n" +msgstr "" + +#: git.c:237 +#, c-format +msgid "-c expects a configuration string\n" +msgstr "" + +#: git.c:275 +#, c-format +msgid "no directory given for -C\n" +msgstr "" + +#: git.c:300 +#, c-format +msgid "unknown option: %s\n" +msgstr "" + +#: git.c:770 +#, c-format +msgid "expansion of alias '%s' failed; '%s' is not a git command\n" +msgstr "" + +#: git.c:782 +#, c-format +msgid "failed to run command '%s': %s\n" +msgstr "" + +#: http.c:348 #, c-format msgid "negative value for http.postbuffer; defaulting to %d" msgstr "отрицательное значение http.postbuffer; использую стандартное значение %d" -#: http.c:360 +#: http.c:369 msgid "Delegation control is not supported with cURL < 7.22.0" msgstr "Делегация проверки полномочий не поддерживается с cURL < 7.22.0" -#: http.c:369 +#: http.c:378 msgid "Public key pinning not supported with cURL < 7.44.0" msgstr "Public key pinning не поддерживается с cURL < 7.44.0" -#: http.c:1791 +#: http.c:1854 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -13662,142 +16279,670 @@ msgid "" " redirect: %s" msgstr "не удалось обновить базовый url из переадресации:\n запрошено: %s\n переадресовано: %s" -#: remote-curl.c:324 +#: remote-curl.c:401 #, c-format msgid "redirecting to %s" msgstr "переадресация на %s" -#: list-objects-filter-options.h:54 +#: list-objects-filter-options.h:59 msgid "args" msgstr "аргументы" -#: list-objects-filter-options.h:55 +#: list-objects-filter-options.h:60 msgid "object filtering" msgstr "фильтрация объектов" -#: common-cmds.h:9 -msgid "start a working area (see also: git help tutorial)" -msgstr "создание рабочей области (смотрите также: git help tutorial)" +#: parse-options.h:157 +msgid "expiry-date" +msgstr "дата-окончания" -#: common-cmds.h:10 -msgid "work on the current change (see also: git help everyday)" -msgstr "работа с текущими изменениями (смотрите также: git help everyday)" +#: parse-options.h:172 +msgid "no-op (backward compatibility)" +msgstr "ничего не делает (оставлено для обратной совместимости)" -#: common-cmds.h:11 -msgid "examine the history and state (see also: git help revisions)" -msgstr "просмотр истории и текущего состояния (смотрите также: git help revisions)" +#: parse-options.h:251 +msgid "be more verbose" +msgstr "быть многословнее" -#: common-cmds.h:12 -msgid "grow, mark and tweak your common history" -msgstr "выращивание, отметка и настройка вашей общей истории" +#: parse-options.h:253 +msgid "be more quiet" +msgstr "тихий режим" -#: common-cmds.h:13 -msgid "collaborate (see also: git help workflows)" -msgstr "совместная работа (смотрите также: git help workflows)" +#: parse-options.h:259 +msgid "use <n> digits to display SHA-1s" +msgstr "использовать <n> цифр для вывода SHA-1" -#: common-cmds.h:17 +#: command-list.h:50 msgid "Add file contents to the index" msgstr "Добавление содержимого файла в индекс" -#: common-cmds.h:18 +#: command-list.h:51 +msgid "Apply a series of patches from a mailbox" +msgstr "Применить серию патчей из почтового сообщения" + +#: command-list.h:52 +msgid "Annotate file lines with commit information" +msgstr "Аннотировать строки файла информацией о коммитах" + +#: command-list.h:53 +msgid "Apply a patch to files and/or to the index" +msgstr "Применить патч к файлам и/или индексу" + +#: command-list.h:54 +msgid "Import an Arch repository into Git" +msgstr "Импортировать репозиторий Arch в Git" + +#: command-list.h:55 +msgid "Create an archive of files from a named tree" +msgstr "Сделать архив файлов из указанного дерева" + +#: command-list.h:56 msgid "Use binary search to find the commit that introduced a bug" msgstr "Выполнить двоичный поиск изменения, которое вносит ошибку" -#: common-cmds.h:19 +#: command-list.h:57 +msgid "Show what revision and author last modified each line of a file" +msgstr "" + +#: command-list.h:58 msgid "List, create, or delete branches" msgstr "Вывод списка веток, их создание или удаление" -#: common-cmds.h:20 +#: command-list.h:59 +msgid "Move objects and refs by archive" +msgstr "" + +#: command-list.h:60 +msgid "Provide content or type and size information for repository objects" +msgstr "" + +#: command-list.h:61 +msgid "Display gitattributes information" +msgstr "" + +#: command-list.h:62 +msgid "Debug gitignore / exclude files" +msgstr "" + +#: command-list.h:63 +msgid "Show canonical names and email addresses of contacts" +msgstr "" + +#: command-list.h:64 msgid "Switch branches or restore working tree files" msgstr "Переключение веток или восстановление файлов в рабочем каталоге" -#: common-cmds.h:21 +#: command-list.h:65 +msgid "Copy files from the index to the working tree" +msgstr "" + +#: command-list.h:66 +msgid "Ensures that a reference name is well formed" +msgstr "" + +#: command-list.h:67 +msgid "Find commits yet to be applied to upstream" +msgstr "" + +#: command-list.h:68 +msgid "Apply the changes introduced by some existing commits" +msgstr "" + +#: command-list.h:69 +msgid "Graphical alternative to git-commit" +msgstr "" + +#: command-list.h:70 +msgid "Remove untracked files from the working tree" +msgstr "" + +#: command-list.h:71 msgid "Clone a repository into a new directory" msgstr "Клонирование репозитория в новый каталог" -#: common-cmds.h:22 +#: command-list.h:72 +msgid "Display data in columns" +msgstr "" + +#: command-list.h:73 msgid "Record changes to the repository" msgstr "Запись изменений в репозиторий" -#: common-cmds.h:23 +#: command-list.h:74 +msgid "Write and verify Git commit graph files" +msgstr "" + +#: command-list.h:75 +msgid "Create a new commit object" +msgstr "" + +#: command-list.h:76 +msgid "Get and set repository or global options" +msgstr "" + +#: command-list.h:77 +msgid "Count unpacked number of objects and their disk consumption" +msgstr "" + +#: command-list.h:78 +msgid "Retrieve and store user credentials" +msgstr "" + +#: command-list.h:79 +msgid "Helper to temporarily store passwords in memory" +msgstr "" + +#: command-list.h:80 +msgid "Helper to store credentials on disk" +msgstr "" + +#: command-list.h:81 +msgid "Export a single commit to a CVS checkout" +msgstr "" + +#: command-list.h:82 +msgid "Salvage your data out of another SCM people love to hate" +msgstr "" + +#: command-list.h:83 +msgid "A CVS server emulator for Git" +msgstr "" + +#: command-list.h:84 +msgid "A really simple server for Git repositories" +msgstr "" + +#: command-list.h:85 +msgid "Give an object a human readable name based on an available ref" +msgstr "" + +#: command-list.h:86 msgid "Show changes between commits, commit and working tree, etc" msgstr "Вывод разницы между коммитами, коммитом и рабочим каталогом и т.д." -#: common-cmds.h:24 +#: command-list.h:87 +msgid "Compares files in the working tree and the index" +msgstr "" + +#: command-list.h:88 +msgid "Compare a tree to the working tree or index" +msgstr "" + +#: command-list.h:89 +msgid "Compares the content and mode of blobs found via two tree objects" +msgstr "" + +#: command-list.h:90 +msgid "Show changes using common diff tools" +msgstr "" + +#: command-list.h:91 +msgid "Git data exporter" +msgstr "" + +#: command-list.h:92 +msgid "Backend for fast Git data importers" +msgstr "" + +#: command-list.h:93 msgid "Download objects and refs from another repository" msgstr "Загрузка объектов и ссылок из другого репозитория" -#: common-cmds.h:25 +#: command-list.h:94 +msgid "Receive missing objects from another repository" +msgstr "" + +#: command-list.h:95 +msgid "Rewrite branches" +msgstr "" + +#: command-list.h:96 +msgid "Produce a merge commit message" +msgstr "" + +#: command-list.h:97 +msgid "Output information on each ref" +msgstr "" + +#: command-list.h:98 +msgid "Prepare patches for e-mail submission" +msgstr "" + +#: command-list.h:99 +msgid "Verifies the connectivity and validity of the objects in the database" +msgstr "" + +#: command-list.h:100 +msgid "Cleanup unnecessary files and optimize the local repository" +msgstr "" + +#: command-list.h:101 +msgid "Extract commit ID from an archive created using git-archive" +msgstr "" + +#: command-list.h:102 msgid "Print lines matching a pattern" msgstr "Вывод строк, соответствующих шаблону" -#: common-cmds.h:26 +#: command-list.h:103 +msgid "A portable graphical interface to Git" +msgstr "" + +#: command-list.h:104 +msgid "Compute object ID and optionally creates a blob from a file" +msgstr "" + +#: command-list.h:105 +msgid "Display help information about Git" +msgstr "" + +#: command-list.h:106 +msgid "Server side implementation of Git over HTTP" +msgstr "" + +#: command-list.h:107 +msgid "Download from a remote Git repository via HTTP" +msgstr "" + +#: command-list.h:108 +msgid "Push objects over HTTP/DAV to another repository" +msgstr "" + +#: command-list.h:109 +msgid "Send a collection of patches from stdin to an IMAP folder" +msgstr "" + +#: command-list.h:110 +msgid "Build pack index file for an existing packed archive" +msgstr "" + +#: command-list.h:111 msgid "Create an empty Git repository or reinitialize an existing one" msgstr "Создание пустого репозитория Git или переинициализация существующего" -#: common-cmds.h:27 +#: command-list.h:112 +msgid "Instantly browse your working repository in gitweb" +msgstr "" + +#: command-list.h:113 +msgid "add or parse structured information in commit messages" +msgstr "" + +#: command-list.h:114 +msgid "The Git repository browser" +msgstr "" + +#: command-list.h:115 msgid "Show commit logs" msgstr "Вывод истории коммитов" -#: common-cmds.h:28 +#: command-list.h:116 +msgid "Show information about files in the index and the working tree" +msgstr "" + +#: command-list.h:117 +msgid "List references in a remote repository" +msgstr "" + +#: command-list.h:118 +msgid "List the contents of a tree object" +msgstr "" + +#: command-list.h:119 +msgid "Extracts patch and authorship from a single e-mail message" +msgstr "" + +#: command-list.h:120 +msgid "Simple UNIX mbox splitter program" +msgstr "" + +#: command-list.h:121 msgid "Join two or more development histories together" msgstr "Объединение одной или нескольких историй разработки вместе" -#: common-cmds.h:29 +#: command-list.h:122 +msgid "Find as good common ancestors as possible for a merge" +msgstr "" + +#: command-list.h:123 +msgid "Run a three-way file merge" +msgstr "" + +#: command-list.h:124 +msgid "Run a merge for files needing merging" +msgstr "" + +#: command-list.h:125 +msgid "The standard helper program to use with git-merge-index" +msgstr "" + +#: command-list.h:126 +msgid "Run merge conflict resolution tools to resolve merge conflicts" +msgstr "" + +#: command-list.h:127 +msgid "Show three-way merge without touching index" +msgstr "" + +#: command-list.h:128 +msgid "Creates a tag object" +msgstr "" + +#: command-list.h:129 +msgid "Build a tree-object from ls-tree formatted text" +msgstr "" + +#: command-list.h:130 msgid "Move or rename a file, a directory, or a symlink" msgstr "Перемещение или переименование файла, каталога или символьной ссылки" -#: common-cmds.h:30 +#: command-list.h:131 +msgid "Find symbolic names for given revs" +msgstr "" + +#: command-list.h:132 +msgid "Add or inspect object notes" +msgstr "" + +#: command-list.h:133 +msgid "Import from and submit to Perforce repositories" +msgstr "" + +#: command-list.h:134 +msgid "Create a packed archive of objects" +msgstr "" + +#: command-list.h:135 +msgid "Find redundant pack files" +msgstr "" + +#: command-list.h:136 +msgid "Pack heads and tags for efficient repository access" +msgstr "" + +#: command-list.h:137 +msgid "Routines to help parsing remote repository access parameters" +msgstr "" + +#: command-list.h:138 +msgid "Compute unique ID for a patch" +msgstr "" + +#: command-list.h:139 +msgid "Prune all unreachable objects from the object database" +msgstr "" + +#: command-list.h:140 +msgid "Remove extra objects that are already in pack files" +msgstr "" + +#: command-list.h:141 msgid "Fetch from and integrate with another repository or a local branch" msgstr "Извлечение изменений и объединение с другим репозиторием или локальной веткой" -#: common-cmds.h:31 +#: command-list.h:142 msgid "Update remote refs along with associated objects" msgstr "Обновление внешних ссылок и связанных объектов" -#: common-cmds.h:32 +#: command-list.h:143 +msgid "Applies a quilt patchset onto the current branch" +msgstr "" + +#: command-list.h:144 +msgid "Compare two commit ranges (e.g. two versions of a branch)" +msgstr "" + +#: command-list.h:145 +msgid "Reads tree information into the index" +msgstr "" + +#: command-list.h:146 msgid "Reapply commits on top of another base tip" msgstr "Повторно применить коммиты над верхушкой другой ветки" -#: common-cmds.h:33 +#: command-list.h:147 +msgid "Receive what is pushed into the repository" +msgstr "" + +#: command-list.h:148 +msgid "Manage reflog information" +msgstr "" + +#: command-list.h:149 +msgid "Manage set of tracked repositories" +msgstr "" + +#: command-list.h:150 +msgid "Pack unpacked objects in a repository" +msgstr "" + +#: command-list.h:151 +msgid "Create, list, delete refs to replace objects" +msgstr "" + +#: command-list.h:152 +msgid "Generates a summary of pending changes" +msgstr "" + +#: command-list.h:153 +msgid "Reuse recorded resolution of conflicted merges" +msgstr "" + +#: command-list.h:154 msgid "Reset current HEAD to the specified state" msgstr "Сброс текущего состояния HEAD на указанное состояние" -#: common-cmds.h:34 +#: command-list.h:155 +msgid "Revert some existing commits" +msgstr "" + +#: command-list.h:156 +msgid "Lists commit objects in reverse chronological order" +msgstr "" + +#: command-list.h:157 +msgid "Pick out and massage parameters" +msgstr "" + +#: command-list.h:158 msgid "Remove files from the working tree and from the index" msgstr "Удаление файлов из рабочего каталога и индекса" -#: common-cmds.h:35 +#: command-list.h:159 +msgid "Send a collection of patches as emails" +msgstr "" + +#: command-list.h:160 +msgid "Push objects over Git protocol to another repository" +msgstr "" + +#: command-list.h:161 +msgid "Restricted login shell for Git-only SSH access" +msgstr "" + +#: command-list.h:162 +msgid "Summarize 'git log' output" +msgstr "" + +#: command-list.h:163 msgid "Show various types of objects" msgstr "Вывод различных типов объектов" -#: common-cmds.h:36 +#: command-list.h:164 +msgid "Show branches and their commits" +msgstr "" + +#: command-list.h:165 +msgid "Show packed archive index" +msgstr "" + +#: command-list.h:166 +msgid "List references in a local repository" +msgstr "" + +#: command-list.h:167 +msgid "Git's i18n setup code for shell scripts" +msgstr "" + +#: command-list.h:168 +msgid "Common Git shell script setup code" +msgstr "" + +#: command-list.h:169 +msgid "Stash the changes in a dirty working directory away" +msgstr "" + +#: command-list.h:170 +msgid "Add file contents to the staging area" +msgstr "" + +#: command-list.h:171 msgid "Show the working tree status" msgstr "Вывод состояния рабочего каталога" -#: common-cmds.h:37 +#: command-list.h:172 +msgid "Remove unnecessary whitespace" +msgstr "" + +#: command-list.h:173 +msgid "Initialize, update or inspect submodules" +msgstr "" + +#: command-list.h:174 +msgid "Bidirectional operation between a Subversion repository and Git" +msgstr "" + +#: command-list.h:175 +msgid "Read, modify and delete symbolic refs" +msgstr "" + +#: command-list.h:176 msgid "Create, list, delete or verify a tag object signed with GPG" msgstr "Создание метки, вывод списка, удаление или проверка метки, подписанной с помощью GPG" -#: parse-options.h:145 -msgid "expiry-date" -msgstr "дата-окончания" +#: command-list.h:177 +msgid "Creates a temporary file with a blob's contents" +msgstr "" -#: parse-options.h:160 -msgid "no-op (backward compatibility)" -msgstr "ничего не делает (оставлено для обратной совместимости)" +#: command-list.h:178 +msgid "Unpack objects from a packed archive" +msgstr "" -#: parse-options.h:238 -msgid "be more verbose" -msgstr "быть многословнее" +#: command-list.h:179 +msgid "Register file contents in the working tree to the index" +msgstr "" -#: parse-options.h:240 -msgid "be more quiet" -msgstr "тихий режим" +#: command-list.h:180 +msgid "Update the object name stored in a ref safely" +msgstr "" -#: parse-options.h:246 -msgid "use <n> digits to display SHA-1s" -msgstr "использовать <n> цифр для вывода SHA-1" +#: command-list.h:181 +msgid "Update auxiliary info file to help dumb servers" +msgstr "" + +#: command-list.h:182 +msgid "Send archive back to git-archive" +msgstr "" + +#: command-list.h:183 +msgid "Send objects packed back to git-fetch-pack" +msgstr "" + +#: command-list.h:184 +msgid "Show a Git logical variable" +msgstr "" + +#: command-list.h:185 +msgid "Check the GPG signature of commits" +msgstr "" + +#: command-list.h:186 +msgid "Validate packed Git archive files" +msgstr "" + +#: command-list.h:187 +msgid "Check the GPG signature of tags" +msgstr "" + +#: command-list.h:188 +msgid "Git web interface (web frontend to Git repositories)" +msgstr "" + +#: command-list.h:189 +msgid "Show logs with difference each commit introduces" +msgstr "" + +#: command-list.h:190 +msgid "Manage multiple working trees" +msgstr "" + +#: command-list.h:191 +msgid "Create a tree object from the current index" +msgstr "" + +#: command-list.h:192 +msgid "Defining attributes per path" +msgstr "Определение атрибутов для путей файлов или каталогов" + +#: command-list.h:193 +msgid "Git command-line interface and conventions" +msgstr "" + +#: command-list.h:194 +msgid "A Git core tutorial for developers" +msgstr "" + +#: command-list.h:195 +msgid "Git for CVS users" +msgstr "" + +#: command-list.h:196 +msgid "Tweaking diff output" +msgstr "" + +#: command-list.h:197 +msgid "A useful minimum set of commands for Everyday Git" +msgstr "" + +#: command-list.h:198 +msgid "A Git Glossary" +msgstr "" + +#: command-list.h:199 +msgid "Hooks used by Git" +msgstr "" + +#: command-list.h:200 +msgid "Specifies intentionally untracked files to ignore" +msgstr "Указание специально игнорируемых файлов" + +#: command-list.h:201 +msgid "Defining submodule properties" +msgstr "Определение свойств подмодулей" + +#: command-list.h:202 +msgid "Git namespaces" +msgstr "" + +#: command-list.h:203 +msgid "Git Repository Layout" +msgstr "" + +#: command-list.h:204 +msgid "Specifying revisions and ranges for Git" +msgstr "Указание редакций и диапазонов для Git" + +#: command-list.h:205 +msgid "A tutorial introduction to Git: part two" +msgstr "" + +#: command-list.h:206 +msgid "A tutorial introduction to Git" +msgstr "" + +#: command-list.h:207 +msgid "An overview of recommended workflows with Git" +msgstr "Обзор рекомендуемых последовательностей выполняемых действий с Git" #: rerere.h:40 msgid "update the index with reused conflict resolution if possible" @@ -14008,7 +17153,7 @@ msgstr "Попытка простого слияния с $pretty_name" msgid "Simple merge did not work, trying automatic merge." msgstr "Простое слияние не удалось, попытка автоматического слияния." -#: git-rebase.sh:58 +#: git-rebase.sh:61 msgid "" "Resolve all conflicts manually, mark them as resolved with\n" "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n" @@ -14016,47 +17161,47 @@ msgid "" "To abort and get back to the state before \"git rebase\", run \"git rebase --abort\"." msgstr "Разрешите все конфликты вручную, пометьте их разрешёнными с помощью «git add/rm <конфликтующие-файлы>», а затем запустите «git rebase --continue».\nЕсли вы хотите пропустить этот коммит, то запустите «git rebase --skip».\nЧтобы вернуться на состояние до «git rebase», запустите «git rebase --abort»." -#: git-rebase.sh:160 git-rebase.sh:402 +#: git-rebase.sh:173 git-rebase.sh:454 #, sh-format msgid "Could not move back to $head_name" msgstr "Не удалось перейти назад на $head_name" -#: git-rebase.sh:171 +#: git-rebase.sh:184 msgid "Applied autostash." msgstr "Применены автоматически спрятанные изменения." -#: git-rebase.sh:174 +#: git-rebase.sh:187 #, sh-format msgid "Cannot store $stash_sha1" msgstr "Не удалось сохранить $stash_sha1" -#: git-rebase.sh:214 +#: git-rebase.sh:236 msgid "The pre-rebase hook refused to rebase." msgstr "Перехватчик pre-rebase отказал в перемещении." -#: git-rebase.sh:219 +#: git-rebase.sh:241 msgid "It looks like 'git am' is in progress. Cannot rebase." msgstr "Похоже, что выполняется «git am». Невозможно выполнить перемещение." -#: git-rebase.sh:363 +#: git-rebase.sh:415 msgid "No rebase in progress?" msgstr "Нет перемещения в процессе?" -#: git-rebase.sh:374 +#: git-rebase.sh:426 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "Действие --edit-todo может использоваться только при интерактивном перемещении." -#: git-rebase.sh:381 +#: git-rebase.sh:433 msgid "Cannot read HEAD" msgstr "Не удалось прочитать HEAD" -#: git-rebase.sh:384 +#: git-rebase.sh:436 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" msgstr "Вы должны отредактировать все\nконфликты слияния, а потом пометить\nих как разрешенные с помощью git add" -#: git-rebase.sh:424 +#: git-rebase.sh:480 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" @@ -14069,74 +17214,90 @@ msgid "" "valuable there." msgstr "Похоже, каталог $state_dir_base уже существует и я предполагаю, что вы в процессе другого перемещения. Если это так, попробуйте\n\t$cmd_live_rebase\nЕсли нет\n\t$cmd_clear_stale_rebase\nи запустите меня снова. Я останавливаюсь, чтобы вы не потеряли что-то важное." -#: git-rebase.sh:480 +#: git-rebase.sh:545 +msgid "error: cannot combine '--signoff' with '--preserve-merges'" +msgstr "" + +#: git-rebase.sh:556 +msgid "error: cannot combine '--preserve_merges' with '--rebase-merges'" +msgstr "" + +#: git-rebase.sh:562 +msgid "error: cannot combine '--rebase_merges' with '--strategy-option'" +msgstr "" + +#: git-rebase.sh:564 +msgid "error: cannot combine '--rebase_merges' with '--strategy'" +msgstr "" + +#: git-rebase.sh:590 #, sh-format msgid "invalid upstream '$upstream_name'" msgstr "недействительная вышестоящая ветка «$upstream_name»" -#: git-rebase.sh:504 +#: git-rebase.sh:614 #, sh-format msgid "$onto_name: there are more than one merge bases" msgstr "$onto_name: имеется больше одной базы слияния" -#: git-rebase.sh:507 git-rebase.sh:511 +#: git-rebase.sh:617 git-rebase.sh:621 #, sh-format msgid "$onto_name: there is no merge base" msgstr "$onto_name: нет базы слияния" -#: git-rebase.sh:516 +#: git-rebase.sh:626 #, sh-format msgid "Does not point to a valid commit: $onto_name" msgstr "Не указывает на действительный коммит: $onto_name" -#: git-rebase.sh:542 +#: git-rebase.sh:652 #, sh-format msgid "fatal: no such branch/commit '$branch_name'" msgstr "критическая ошибка: нет такой ветки/коммита «$branch_name»" -#: git-rebase.sh:575 +#: git-rebase.sh:685 msgid "Cannot autostash" msgstr "Не удалось автоматически спрятать изменения" -#: git-rebase.sh:580 +#: git-rebase.sh:690 #, sh-format msgid "Created autostash: $stash_abbrev" msgstr "Изменения автоматически спрятаны: $stash_abbrev" -#: git-rebase.sh:584 +#: git-rebase.sh:694 msgid "Please commit or stash them." msgstr "Сделайте коммит или спрячьте их." -#: git-rebase.sh:607 +#: git-rebase.sh:717 #, sh-format msgid "HEAD is up to date." msgstr "HEAD уже в актуальном состоянии." -#: git-rebase.sh:609 +#: git-rebase.sh:719 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "Текущая ветка $branch_name уже в актуальном состоянии." -#: git-rebase.sh:617 +#: git-rebase.sh:727 #, sh-format msgid "HEAD is up to date, rebase forced." msgstr "HEAD уже в актуальном состоянии, принудительное перемещение." -#: git-rebase.sh:619 +#: git-rebase.sh:729 #, sh-format msgid "Current branch $branch_name is up to date, rebase forced." msgstr "Текущая ветка $branch_name уже в актуальном состоянии, принудительное перемещение." -#: git-rebase.sh:631 +#: git-rebase.sh:741 #, sh-format msgid "Changes from $mb to $onto:" msgstr "Изменения от $mb до $onto:" -#: git-rebase.sh:640 +#: git-rebase.sh:750 msgid "First, rewinding head to replay your work on top of it..." msgstr "Сначала перематываем указатель текущего коммита, чтобы применить ваши изменения поверх него…" -#: git-rebase.sh:650 +#: git-rebase.sh:760 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "Перемотана вперед $branch_name до $onto_name." @@ -14204,109 +17365,109 @@ msgstr "Не удалось сохранить текущий статус" msgid "Saved working directory and index state $stash_msg" msgstr "Рабочий каталог и состояние индекса сохранены $stash_msg" -#: git-stash.sh:341 +#: git-stash.sh:342 msgid "Cannot remove worktree changes" msgstr "Не удалось удалить изменения рабочего каталога" -#: git-stash.sh:489 +#: git-stash.sh:490 #, sh-format msgid "unknown option: $opt" msgstr "неизвестная опция: $opt" -#: git-stash.sh:502 +#: git-stash.sh:503 msgid "No stash entries found." msgstr "Не найдены спрятанные изменения." -#: git-stash.sh:509 +#: git-stash.sh:510 #, sh-format msgid "Too many revisions specified: $REV" msgstr "Передано слишком много редакций: $REV" -#: git-stash.sh:524 +#: git-stash.sh:525 #, sh-format msgid "$reference is not a valid reference" msgstr "$reference не является действительной ссылкой" -#: git-stash.sh:552 +#: git-stash.sh:553 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "«$args» не похоже на коммит со спрятанными изменениями" -#: git-stash.sh:563 +#: git-stash.sh:564 #, sh-format msgid "'$args' is not a stash reference" msgstr "«$args» не является ссылкой на спрятанные изменения" -#: git-stash.sh:571 +#: git-stash.sh:572 msgid "unable to refresh index" msgstr "не удалось обновить индекс" -#: git-stash.sh:575 +#: git-stash.sh:576 msgid "Cannot apply a stash in the middle of a merge" msgstr "Нельзя применить спрятанные изменения во время выполнения слияния" -#: git-stash.sh:583 +#: git-stash.sh:584 msgid "Conflicts in index. Try without --index." msgstr "Конфликты в индексе. Попробуйте без --index." -#: git-stash.sh:585 +#: git-stash.sh:586 msgid "Could not save index tree" msgstr "Не удалось сохранить дерево индекса" -#: git-stash.sh:594 +#: git-stash.sh:595 msgid "Could not restore untracked files from stash entry" msgstr "Невозможно восстановить неотслеживаемые файлы из спрятанных изменений" -#: git-stash.sh:619 +#: git-stash.sh:620 msgid "Cannot unstage modified files" msgstr "Невозможно убрать из индекса измененные файлы" -#: git-stash.sh:634 +#: git-stash.sh:635 msgid "Index was not unstashed." msgstr "Индекс не был извлечён из спрятанных изменений." -#: git-stash.sh:648 +#: git-stash.sh:649 msgid "The stash entry is kept in case you need it again." msgstr "Спрятанные изменения сохранены, на случай если они снова вам понадобятся." -#: git-stash.sh:657 +#: git-stash.sh:658 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "Отброшено ${REV} ($s)" -#: git-stash.sh:658 +#: git-stash.sh:659 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "${REV}: Не удалось отбросить запись из спрятанных изменений" -#: git-stash.sh:666 +#: git-stash.sh:667 msgid "No branch name specified" msgstr "Не указано имя ветки" -#: git-stash.sh:745 +#: git-stash.sh:746 msgid "(To restore them type \"git stash apply\")" msgstr "(Чтобы восстановить их, наберите «git stash apply»)" -#: git-submodule.sh:181 +#: git-submodule.sh:188 msgid "Relative path can only be used from the toplevel of the working tree" msgstr "Относительный путь можно использовать только находясь на вершине рабочего каталога" -#: git-submodule.sh:191 +#: git-submodule.sh:198 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "URL репозитория: «$repo» должен быть абсолютным или начинаться с ./|../" -#: git-submodule.sh:210 +#: git-submodule.sh:217 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "«$sm_path» уже содержится в индексе" -#: git-submodule.sh:213 +#: git-submodule.sh:220 #, sh-format msgid "'$sm_path' already exists in the index and is not a submodule" msgstr "«$sm_path» уже содержится в индексе и не является подмодулем" -#: git-submodule.sh:219 +#: git-submodule.sh:226 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -14314,22 +17475,22 @@ msgid "" "Use -f if you really want to add it." msgstr "Следующие пути игнорируются одним из ваших файлов .gitignore:\n$sm_path\nИспользуйте опцию -f, если вы действительно хотите его добавить." -#: git-submodule.sh:237 +#: git-submodule.sh:249 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "Добавляю существующий репозиторий из «$sm_path» в индекс" -#: git-submodule.sh:239 +#: git-submodule.sh:251 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "«$sm_path» уже существует и не является действительным репозиторием git" -#: git-submodule.sh:247 +#: git-submodule.sh:259 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "Каталог git для «$sm_name» найден локально на внешних репозиториях:" -#: git-submodule.sh:249 +#: git-submodule.sh:261 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from\n" @@ -14338,221 +17499,250 @@ msgid "" "or you are unsure what this means choose another name with the '--name' option." msgstr "Если вы хотите повторно использовать локальный каталог git вместо повторного клонирования из\n $realrepo\nто используйте параметр «--force». Если же локальный каталог git не является нужным репозиторием или если вы не уверены, что это значит, то укажите другое имя для подмодуля с помощью параметра «--name»." -#: git-submodule.sh:255 +#: git-submodule.sh:267 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "Восстановление локального каталога git для подмодуля «$sm_name»." -#: git-submodule.sh:267 +#: git-submodule.sh:279 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "Не удалось переключиться на состояние у подмодуля «$sm_path»" -#: git-submodule.sh:272 +#: git-submodule.sh:284 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "Сбой добавления подмодуля «$sm_path»" -#: git-submodule.sh:281 +#: git-submodule.sh:293 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "Не удалось зарегистрировать подмодуль «$sm_path»" -#: git-submodule.sh:342 -#, sh-format -msgid "Entering '$displaypath'" -msgstr "Заходим в «$displaypath»" - -#: git-submodule.sh:362 -#, sh-format -msgid "Stopping at '$displaypath'; script returned non-zero status." -msgstr "Останавливаемся на «$displaypath»; сценарий вернул не нулевой код возврата." - -#: git-submodule.sh:433 -#, sh-format -msgid "pathspec and --all are incompatible" -msgstr "спецификатор пути и --all нельзя использовать одновременно" - -#: git-submodule.sh:438 -#, sh-format -msgid "Use '--all' if you really want to deinitialize all submodules" -msgstr "Используйте «--all», если вы действительно хотите деинициализировать все подмодули" - -#: git-submodule.sh:458 -#, sh-format -msgid "" -"Submodule work tree '$displaypath' contains a .git directory\n" -"(use 'rm -rf' if you really want to remove it including all of its history)" -msgstr "Рабочий каталог подмодуля «$displaypath» уже содержит каталог .git\n(используйте «rm -rf», если вы действительно хотите удалить его со всей историей изменений)" - -#: git-submodule.sh:466 -#, sh-format -msgid "" -"Submodule work tree '$displaypath' contains local modifications; use '-f' to" -" discard them" -msgstr "Рабочий каталог подмодуля «$displaypath» содержит локальные изменения; используйте «-f», чтобы отменить их" - -#: git-submodule.sh:469 -#, sh-format -msgid "Cleared directory '$displaypath'" -msgstr "Очищен каталог «$displaypath»" - -#: git-submodule.sh:470 -#, sh-format -msgid "Could not remove submodule work tree '$displaypath'" -msgstr "Не удалось удалить рабочий каталог подмодуля «$displaypath»" - -#: git-submodule.sh:473 -#, sh-format -msgid "Could not create empty submodule directory '$displaypath'" -msgstr "Не удалось создать пустой каталог подмодуля «$displaypath»" - -#: git-submodule.sh:482 -#, sh-format -msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" -msgstr "Подмодуль «$name» ($url) был снят с регистрации по пути «$displaypath»" - -#: git-submodule.sh:637 +#: git-submodule.sh:565 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "Не удалось найти текущую редакцию для подмодуля по пути «$displaypath»" -#: git-submodule.sh:647 +#: git-submodule.sh:575 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "Не удалось выполнить извлечение для подмодуля по пути «$sm_path»" -#: git-submodule.sh:652 +#: git-submodule.sh:580 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " "'$sm_path'" msgstr "Не удалось найти текущую редакцию ${remote_name}/${branch} для подмодуля по пути «$sm_path»" -#: git-submodule.sh:670 +#: git-submodule.sh:603 #, sh-format msgid "Unable to fetch in submodule path '$displaypath'" msgstr "Не удалось выполнить извлечение для подмодуля по пути «$displaypath»" -#: git-submodule.sh:676 +#: git-submodule.sh:609 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " "Direct fetching of that commit failed." msgstr "Получен по пути подмодуля «$displaypath», но не содержит $sha1. Сбой при прямом получении коммита." -#: git-submodule.sh:683 +#: git-submodule.sh:616 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "Не удалось переключиться на состояние «$sha1» для подмодуля по пути «$displaypath»" -#: git-submodule.sh:684 +#: git-submodule.sh:617 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "Подмодуль по пути «$displaypath»: забрано состояние «$sha1»" -#: git-submodule.sh:688 +#: git-submodule.sh:621 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "Не удалось переместить «$sha1» для подмодуля по пути «$displaypath»" -#: git-submodule.sh:689 +#: git-submodule.sh:622 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "Подмодуль по пути «$displaypath»: перемещен над «$sha1»" -#: git-submodule.sh:694 +#: git-submodule.sh:627 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "Не удалось выполнить слияние с «$sha1» для подмодуля по пути «$displaypath»" -#: git-submodule.sh:695 +#: git-submodule.sh:628 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "Подмодуль по пути «$displaypath»: слито с «$sha1»" -#: git-submodule.sh:700 +#: git-submodule.sh:633 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "Сбой выполнения «$command $sha1» для подмодуля по пути «$displaypath»" -#: git-submodule.sh:701 +#: git-submodule.sh:634 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "Подмодуль по пути «$displaypath»: «$command $sha1»" -#: git-submodule.sh:732 +#: git-submodule.sh:665 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "Не удалось выполнить рекурсивно для подмодуля по пути «$displaypath»" -#: git-submodule.sh:828 +#: git-submodule.sh:761 msgid "The --cached option cannot be used with the --files option" msgstr "Опцию --cached нельзя использовать одновременно с опцией --files" -#: git-submodule.sh:880 +#: git-submodule.sh:813 #, sh-format msgid "unexpected mode $mod_dst" msgstr "неизвестный режим $mod_dst" -#: git-submodule.sh:900 +#: git-submodule.sh:833 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr " Предупреждение: $display_name не содержит коммит $sha1_src" -#: git-submodule.sh:903 +#: git-submodule.sh:836 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr " Предупреждение: $display_name не содержит коммит $sha1_dst" -#: git-submodule.sh:906 +#: git-submodule.sh:839 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr " Предупреждение: $display_name не содержит коммиты $sha1_src и $sha1_dst" -#: git-submodule.sh:1077 -#, sh-format -msgid "Synchronizing submodule url for '$displaypath'" -msgstr "Синхронизация url для подмодуля «$displaypath»" - #: git-parse-remote.sh:89 #, sh-format msgid "See git-${cmd}(1) for details." msgstr "Для дополнительной информации, смотрите git-${cmd}(1)." -#: git-rebase--interactive.sh:140 -#, sh-format -msgid "Rebasing ($new_count/$total)" -msgstr "Перемещение ($new_count/$total)" - -#: git-rebase--interactive.sh:156 +#: git-rebase--interactive.sh:43 msgid "" "\n" "Commands:\n" -"p, pick = use commit\n" -"r, reword = use commit, but edit the commit message\n" -"e, edit = use commit, but stop for amending\n" -"s, squash = use commit, but meld into previous commit\n" -"f, fixup = like \"squash\", but discard this commit's log message\n" -"x, exec = run command (the rest of the line) using shell\n" -"d, drop = remove commit\n" +"p, pick <commit> = use commit\n" +"r, reword <commit> = use commit, but edit the commit message\n" +"e, edit <commit> = use commit, but stop for amending\n" +"s, squash <commit> = use commit, but meld into previous commit\n" +"f, fixup <commit> = like \"squash\", but discard this commit's log message\n" +"x, exec <command> = run command (the rest of the line) using shell\n" +"d, drop <commit> = remove commit\n" +"l, label <label> = label current HEAD with a name\n" +"t, reset <label> = reset HEAD to a label\n" +"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n" +". create a merge commit using the original merge commit's\n" +". message (or the oneline, if no original merge commit was\n" +". specified). Use -c <commit> to reword the commit message.\n" "\n" "These lines can be re-ordered; they are executed from top to bottom.\n" -msgstr "\nКоманды:\np, pick = использовать коммит\nr, reword = использовать коммит, но изменить сообщение коммита\ne, edit = использовать коммит, но остановиться для внесения правок\ns, squash = использовать коммит, но объединить его с предыдущим коммитом\nf, fixup = как «squash», но отбросить сообщение этого коммита\nx, exec = выполнить команду (остаток строки) с помощью командной оболочки\nd, drop = удалить коммит\n\nЭти строки могут быть перемещены; выполняются по очереди сверху вниз.\n" +msgstr "" -#: git-rebase--interactive.sh:171 +#: git-rebase--interactive.sh:64 git-rebase--preserve-merges.sh:173 msgid "" "\n" "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" msgstr "\nНе удаляйте строки. Используйте «drop», чтобы явно удалить коммит.\n" -#: git-rebase--interactive.sh:175 +#: git-rebase--interactive.sh:68 git-rebase--preserve-merges.sh:177 msgid "" "\n" "If you remove a line here THAT COMMIT WILL BE LOST.\n" msgstr "\nЕсли вы удалите строку здесь, то УКАЗАННЫЙ КОММИТ БУДЕТ УТЕРЯН.\n" -#: git-rebase--interactive.sh:211 +#: git-rebase--interactive.sh:108 git-rebase--preserve-merges.sh:724 +msgid "could not detach HEAD" +msgstr "не удалось отделить HEAD" + +#: git-rebase--interactive.sh:147 git-rebase--preserve-merges.sh:816 +msgid "" +"\n" +"You are editing the todo file of an ongoing interactive rebase.\n" +"To continue rebase after editing, run:\n" +" git rebase --continue\n" +"\n" +msgstr "\nВы сейчас редактируете файл со списком дел для интерактивного перемещения.\nДля продолжения перемещения, после редактирования файла запустите:\n git rebase --continue\n\n" + +#: git-rebase--interactive.sh:155 git-rebase--interactive.sh:241 +#: git-rebase--preserve-merges.sh:824 git-rebase--preserve-merges.sh:910 +msgid "Could not execute editor" +msgstr "Не удалось запустить редактор" + +#: git-rebase--interactive.sh:176 git-rebase--preserve-merges.sh:845 +#, sh-format +msgid "Could not checkout $switch_to" +msgstr "Не удалось перейти на версию $switch_to" + +#: git-rebase--interactive.sh:183 git-rebase--preserve-merges.sh:852 +msgid "No HEAD?" +msgstr "Нет указателя HEAD?" + +#: git-rebase--interactive.sh:184 git-rebase--preserve-merges.sh:853 +#, sh-format +msgid "Could not create temporary $state_dir" +msgstr "Не удалось создать временный каталог $state_dir" + +#: git-rebase--interactive.sh:187 git-rebase--preserve-merges.sh:856 +msgid "Could not mark as interactive" +msgstr "Не удалось пометить как интерактивный" + +#: git-rebase--interactive.sh:219 git-rebase--preserve-merges.sh:888 +#, sh-format +msgid "Rebase $shortrevisions onto $shortonto ($todocount command)" +msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" +msgstr[0] "Перемещение $shortrevisions над $shortonto ($todocount команда)" +msgstr[1] "Перемещение $shortrevisions над $shortonto ($todocount команды)" +msgstr[2] "Перемещение $shortrevisions над $shortonto ($todocount команд)" +msgstr[3] "Перемещение $shortrevisions над $shortonto ($todocount команд)" + +#: git-rebase--interactive.sh:224 +msgid "" +"\n" +"\tHowever, if you remove everything, the rebase will be aborted.\n" +"\n" +"\t" +msgstr "" + +#: git-rebase--interactive.sh:231 git-rebase--preserve-merges.sh:900 +msgid "Note that empty commits are commented out" +msgstr "Заметьте, что пустые коммиты закомментированны" + +#: git-rebase--interactive.sh:280 +msgid "Could not generate todo list" +msgstr "Не удалось сгенерировать список дел" + +#: git-rebase--preserve-merges.sh:136 +#, sh-format +msgid "Rebasing ($new_count/$total)" +msgstr "Перемещение ($new_count/$total)" + +#: git-rebase--preserve-merges.sh:152 +msgid "" +"\n" +"Commands:\n" +"p, pick <commit> = use commit\n" +"r, reword <commit> = use commit, but edit the commit message\n" +"e, edit <commit> = use commit, but stop for amending\n" +"s, squash <commit> = use commit, but meld into previous commit\n" +"f, fixup <commit> = like \"squash\", but discard this commit's log message\n" +"x, exec <commit> = run command (the rest of the line) using shell\n" +"d, drop <commit> = remove commit\n" +"l, label <label> = label current HEAD with a name\n" +"t, reset <label> = reset HEAD to a label\n" +"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n" +". create a merge commit using the original merge commit's\n" +". message (or the oneline, if no original merge commit was\n" +". specified). Use -c <commit> to reword the commit message.\n" +"\n" +"These lines can be re-ordered; they are executed from top to bottom.\n" +msgstr "" + +#: git-rebase--preserve-merges.sh:215 #, sh-format msgid "" "You can amend the commit now, with\n" @@ -14564,61 +17754,61 @@ msgid "" "\tgit rebase --continue" msgstr "Теперь вы можете исправить коммит с помощью\n\n\tgit commit --amend $gpg_sign_opt_quoted\n\nКак только вы будете довольны результатом, запустите\n\n\tgit rebase --continue" -#: git-rebase--interactive.sh:236 +#: git-rebase--preserve-merges.sh:240 #, sh-format msgid "$sha1: not a commit that can be picked" msgstr "$sha1: не является коммитом, который можно взять" -#: git-rebase--interactive.sh:275 +#: git-rebase--preserve-merges.sh:279 #, sh-format msgid "Invalid commit name: $sha1" msgstr "Недопустимое имя коммита: $sha1" -#: git-rebase--interactive.sh:317 +#: git-rebase--preserve-merges.sh:309 msgid "Cannot write current commit's replacement sha1" msgstr "Не удалось записать замену sha1 текущего коммита" -#: git-rebase--interactive.sh:369 +#: git-rebase--preserve-merges.sh:360 #, sh-format msgid "Fast-forward to $sha1" msgstr "Перемотка вперед до $sha1" -#: git-rebase--interactive.sh:371 +#: git-rebase--preserve-merges.sh:362 #, sh-format msgid "Cannot fast-forward to $sha1" msgstr "Не удалось перемотать вперед до $sha1" -#: git-rebase--interactive.sh:380 +#: git-rebase--preserve-merges.sh:371 #, sh-format msgid "Cannot move HEAD to $first_parent" msgstr "Не удалось переместить HEAD на $first_parent" -#: git-rebase--interactive.sh:385 +#: git-rebase--preserve-merges.sh:376 #, sh-format msgid "Refusing to squash a merge: $sha1" msgstr "Нельзя уплотнить слияние: $sha1" -#: git-rebase--interactive.sh:400 +#: git-rebase--preserve-merges.sh:394 #, sh-format msgid "Error redoing merge $sha1" msgstr "Ошибка при повторении слияния $sha1" -#: git-rebase--interactive.sh:408 +#: git-rebase--preserve-merges.sh:403 #, sh-format msgid "Could not pick $sha1" msgstr "Не удалось взять $sha1" -#: git-rebase--interactive.sh:417 +#: git-rebase--preserve-merges.sh:412 #, sh-format msgid "This is the commit message #${n}:" msgstr "Это сообщение коммита номер #${n}:" -#: git-rebase--interactive.sh:422 +#: git-rebase--preserve-merges.sh:417 #, sh-format msgid "The commit message #${n} will be skipped:" msgstr "Сообщение коммита номер #${n} будет пропущено:" -#: git-rebase--interactive.sh:433 +#: git-rebase--preserve-merges.sh:428 #, sh-format msgid "This is a combination of $count commit." msgid_plural "This is a combination of $count commits." @@ -14627,22 +17817,22 @@ msgstr[1] "Это объединение $count коммитов" msgstr[2] "Это объединение $count коммитов" msgstr[3] "Это объединение $count коммитов" -#: git-rebase--interactive.sh:442 +#: git-rebase--preserve-merges.sh:437 #, sh-format msgid "Cannot write $fixup_msg" msgstr "Не удалось записать $fixup_msg" -#: git-rebase--interactive.sh:445 +#: git-rebase--preserve-merges.sh:440 msgid "This is a combination of 2 commits." msgstr "Это объединение 2 коммитов" -#: git-rebase--interactive.sh:486 git-rebase--interactive.sh:529 -#: git-rebase--interactive.sh:532 +#: git-rebase--preserve-merges.sh:481 git-rebase--preserve-merges.sh:524 +#: git-rebase--preserve-merges.sh:527 #, sh-format msgid "Could not apply $sha1... $rest" msgstr "Не удалось применить $sha1… $rest" -#: git-rebase--interactive.sh:560 +#: git-rebase--preserve-merges.sh:556 #, sh-format msgid "" "Could not amend commit after successfully picking $sha1... $rest\n" @@ -14651,31 +17841,31 @@ msgid "" "you are able to reword the commit." msgstr "Не удолось исправить коммит после успешного перехода на $sha1… $rest\nЭто произошло, скорее всего, из-за пустого сообщения коммита или из-за перехватчика перед коммитом. Если же это произошло из-за перехватчика перед коммитом, то вам нужно решить с ним проблему и повторить попытку снова." -#: git-rebase--interactive.sh:575 +#: git-rebase--preserve-merges.sh:571 #, sh-format msgid "Stopped at $sha1_abbrev... $rest" msgstr "Остановлено на $sha1_abbrev… $rest" -#: git-rebase--interactive.sh:590 +#: git-rebase--preserve-merges.sh:586 #, sh-format msgid "Cannot '$squash_style' without a previous commit" msgstr "Нельзя сделать «$squash_style» без указания предыдущего коммита" -#: git-rebase--interactive.sh:632 +#: git-rebase--preserve-merges.sh:628 #, sh-format msgid "Executing: $rest" msgstr "Выполнение: $rest" -#: git-rebase--interactive.sh:640 +#: git-rebase--preserve-merges.sh:636 #, sh-format msgid "Execution failed: $rest" msgstr "Не удалось выполнить: $rest" -#: git-rebase--interactive.sh:642 +#: git-rebase--preserve-merges.sh:638 msgid "and made changes to the index and/or the working tree" msgstr "и были сделаны изменения в индексе и/или в рабочем каталоге" -#: git-rebase--interactive.sh:644 +#: git-rebase--preserve-merges.sh:640 msgid "" "You can fix the problem, and then run\n" "\n" @@ -14683,7 +17873,7 @@ msgid "" msgstr "Вы можете исправить ошибку, а затем запустить\n\n\tgit rebase --continue" #. TRANSLATORS: after these lines is a command to be issued by the user -#: git-rebase--interactive.sh:657 +#: git-rebase--preserve-merges.sh:653 #, sh-format msgid "" "Execution succeeded: $rest\n" @@ -14693,29 +17883,25 @@ msgid "" "\tgit rebase --continue" msgstr "Успешное выполнение: $rest\nно остались изменения в индексе и/или в рабочем каталоге\nСделайте коммит или спрячьте ваши изменения, а затем выполните\n\n\tgit rebase --continue" -#: git-rebase--interactive.sh:668 +#: git-rebase--preserve-merges.sh:664 #, sh-format msgid "Unknown command: $command $sha1 $rest" msgstr "Неопознанная команда: $command $sha1 $rest" -#: git-rebase--interactive.sh:669 +#: git-rebase--preserve-merges.sh:665 msgid "Please fix this using 'git rebase --edit-todo'." msgstr "Пожалуйста исправьте это с помощью «git rebase --edit-todo»." -#: git-rebase--interactive.sh:704 +#: git-rebase--preserve-merges.sh:700 #, sh-format msgid "Successfully rebased and updated $head_name." msgstr "Успешно перемещён и обновлён $head_name." -#: git-rebase--interactive.sh:728 -msgid "could not detach HEAD" -msgstr "не удалось отделить HEAD" - -#: git-rebase--interactive.sh:763 +#: git-rebase--preserve-merges.sh:757 msgid "Could not remove CHERRY_PICK_HEAD" msgstr "Не удалось удалить CHERRY_PICK_HEAD" -#: git-rebase--interactive.sh:768 +#: git-rebase--preserve-merges.sh:762 #, sh-format msgid "" "You have staged changes in your working tree.\n" @@ -14733,78 +17919,30 @@ msgid "" " git rebase --continue\n" msgstr "У вас имеются проиндексированные изменения в рабочем каталоге.\nЕсли эти изменения должны быть объеденены с предыдущим коммитом, то запустите:\n\n git commit --amend $gpg_sign_opt_quoted\n\nЕсли же они должны быть помещены в новый коммит, то запустите:\n\n git commit $gpg_sign_opt_quoted\n\nВ любом случае, после того как вы закончите, продолжить перемещение можно выполнив:\n\n git rebase --continue\n" -#: git-rebase--interactive.sh:785 +#: git-rebase--preserve-merges.sh:779 msgid "Error trying to find the author identity to amend commit" msgstr "Произошла ошибка при поиске автора для исправления коммита" -#: git-rebase--interactive.sh:790 +#: git-rebase--preserve-merges.sh:784 msgid "" "You have uncommitted changes in your working tree. Please commit them\n" "first and then run 'git rebase --continue' again." msgstr "У вас имеются незакоммиченные изменения в рабочем каталоге. Сделайте коммит, а затем запустите «git rebase --continue» снова." -#: git-rebase--interactive.sh:795 git-rebase--interactive.sh:799 +#: git-rebase--preserve-merges.sh:789 git-rebase--preserve-merges.sh:793 msgid "Could not commit staged changes." msgstr "Не удалось закоммитить проиндексированные изменения." -#: git-rebase--interactive.sh:827 -msgid "" -"\n" -"You are editing the todo file of an ongoing interactive rebase.\n" -"To continue rebase after editing, run:\n" -" git rebase --continue\n" -"\n" -msgstr "\nВы сейчас редактируете файл со списком дел для интерактивного перемещения.\nДля продолжения перемещения, после редактирования файла запустите:\n git rebase --continue\n\n" - -#: git-rebase--interactive.sh:835 git-rebase--interactive.sh:995 -msgid "Could not execute editor" -msgstr "Не удалось запустить редактор" - -#: git-rebase--interactive.sh:848 -#, sh-format -msgid "Could not checkout $switch_to" -msgstr "Не удалось перейти на версию $switch_to" - -#: git-rebase--interactive.sh:853 -msgid "No HEAD?" -msgstr "Нет указателя HEAD?" - -#: git-rebase--interactive.sh:854 -#, sh-format -msgid "Could not create temporary $state_dir" -msgstr "Не удалось создать временный каталог $state_dir" - -#: git-rebase--interactive.sh:856 -msgid "Could not mark as interactive" -msgstr "Не удалось пометить как интерактивный" - -#: git-rebase--interactive.sh:866 git-rebase--interactive.sh:871 -msgid "Could not init rewritten commits" -msgstr "Не удалось инициализировать перезаписанные коммиты" - -#: git-rebase--interactive.sh:897 -msgid "Could not generate todo list" -msgstr "Не удалось сгенерировать список дел" - -#: git-rebase--interactive.sh:973 -#, sh-format -msgid "Rebase $shortrevisions onto $shortonto ($todocount command)" -msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" -msgstr[0] "Перемещение $shortrevisions над $shortonto ($todocount команда)" -msgstr[1] "Перемещение $shortrevisions над $shortonto ($todocount команды)" -msgstr[2] "Перемещение $shortrevisions над $shortonto ($todocount команд)" -msgstr[3] "Перемещение $shortrevisions над $shortonto ($todocount команд)" - -#: git-rebase--interactive.sh:978 +#: git-rebase--preserve-merges.sh:893 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" "\n" msgstr "\nНо если вы удалите все, то процесс перемещения будет будет прерван.\n\n" -#: git-rebase--interactive.sh:985 -msgid "Note that empty commits are commented out" -msgstr "Заметьте, что пустые коммиты закомментированны" +#: git-rebase--preserve-merges.sh:942 git-rebase--preserve-merges.sh:947 +msgid "Could not init rewritten commits" +msgstr "Не удалось инициализировать перезаписанные коммиты" #: git-sh-setup.sh:89 git-sh-setup.sh:94 #, sh-format @@ -14877,19 +18015,19 @@ msgstr "в индексе" msgid "unstaged" msgstr "не в индексе" -#: git-add--interactive.perl:246 git-add--interactive.perl:271 +#: git-add--interactive.perl:253 git-add--interactive.perl:278 msgid "binary" msgstr "двоичный" -#: git-add--interactive.perl:255 git-add--interactive.perl:309 +#: git-add--interactive.perl:262 git-add--interactive.perl:316 msgid "nothing" msgstr "ничего" -#: git-add--interactive.perl:291 git-add--interactive.perl:306 +#: git-add--interactive.perl:298 git-add--interactive.perl:313 msgid "unchanged" msgstr "нет изменений" -#: git-add--interactive.perl:602 +#: git-add--interactive.perl:609 #, perl-format msgid "added %d path\n" msgid_plural "added %d paths\n" @@ -14898,7 +18036,7 @@ msgstr[1] "добавлено %d пути\n" msgstr[2] "добавлено %d путей\n" msgstr[3] "добавлено %d пути\n" -#: git-add--interactive.perl:605 +#: git-add--interactive.perl:612 #, perl-format msgid "updated %d path\n" msgid_plural "updated %d paths\n" @@ -14907,7 +18045,7 @@ msgstr[1] "обновлено %d пути\n" msgstr[2] "обновлено %d путей\n" msgstr[3] "обновлено %d пути\n" -#: git-add--interactive.perl:608 +#: git-add--interactive.perl:615 #, perl-format msgid "reverted %d path\n" msgid_plural "reverted %d paths\n" @@ -14916,7 +18054,7 @@ msgstr[1] "обращены изменения %d путей\n" msgstr[2] "обращены изменения %d путей\n" msgstr[3] "обращены изменения %d путей\n" -#: git-add--interactive.perl:611 +#: git-add--interactive.perl:618 #, perl-format msgid "touched %d path\n" msgid_plural "touched %d paths\n" @@ -14925,67 +18063,67 @@ msgstr[1] "тронуты %d пути\n" msgstr[2] "тронуты %d путей\n" msgstr[3] "тронуты %d пути\n" -#: git-add--interactive.perl:620 +#: git-add--interactive.perl:627 msgid "Update" msgstr "Обновить" -#: git-add--interactive.perl:632 +#: git-add--interactive.perl:639 msgid "Revert" msgstr "Обратить изменения" -#: git-add--interactive.perl:655 +#: git-add--interactive.perl:662 #, perl-format msgid "note: %s is untracked now.\n" msgstr "примечание: %s теперь неотслеживаемый.\n" -#: git-add--interactive.perl:666 +#: git-add--interactive.perl:673 msgid "Add untracked" msgstr "Добавить неотслеживаемый" -#: git-add--interactive.perl:672 +#: git-add--interactive.perl:679 msgid "No untracked files.\n" msgstr "Нет неотслеживаемых файлов.\n" -#: git-add--interactive.perl:985 +#: git-add--interactive.perl:1033 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for staging." msgstr "Если патч применяется без ошибок, то изменённый блок будет сразу помечен для индексирования." -#: git-add--interactive.perl:988 +#: git-add--interactive.perl:1036 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for stashing." msgstr "Если патч применяется без ошибок, то изменённый блок будет сразу помечен для прятанья." -#: git-add--interactive.perl:991 +#: git-add--interactive.perl:1039 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for unstaging." msgstr "Если патч применяется без ошибок, то изменённый блок будет сразу помечен для убирания из индекса." -#: git-add--interactive.perl:994 git-add--interactive.perl:1003 +#: git-add--interactive.perl:1042 git-add--interactive.perl:1051 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for applying." msgstr "Если патч применяется без ошибок, то изменённый блок будет сразу помечен для применения." -#: git-add--interactive.perl:997 git-add--interactive.perl:1000 +#: git-add--interactive.perl:1045 git-add--interactive.perl:1048 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for discarding." msgstr "Если патч применяется без ошибок, то изменённый блок будет сразу помечен для отмены изменений." -#: git-add--interactive.perl:1013 +#: git-add--interactive.perl:1085 #, perl-format msgid "failed to open hunk edit file for writing: %s" msgstr "не удалось открыть файл редактирования блока изменений для записи: %s" -#: git-add--interactive.perl:1014 +#: git-add--interactive.perl:1086 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" msgstr "Ручной режим редактирования блока изменений — смотрите ниже для небольшого руководства.\n" -#: git-add--interactive.perl:1020 +#: git-add--interactive.perl:1092 #, perl-format msgid "" "---\n" @@ -14995,14 +18133,14 @@ msgid "" msgstr "---\nЧтобы удалить «%s» строки, сделайте их ' ' строками (контекст).\nЧтобы удалить «%s» строки, удалите их.\nСтроки, начинающиеся с %s будут удалены.\n" #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. -#: git-add--interactive.perl:1028 +#: git-add--interactive.perl:1100 msgid "" "If it does not apply cleanly, you will be given an opportunity to\n" "edit again. If all lines of the hunk are removed, then the edit is\n" "aborted and the hunk is left unchanged.\n" msgstr "Если патч не применяется без ошибок, вам будет дана\nвозможность изменить его снова. Если все строки блока\nизменений удалены, то редактирование будет отменено\nи блок останется без изменений.\n" -#: git-add--interactive.perl:1042 +#: git-add--interactive.perl:1114 #, perl-format msgid "failed to open hunk edit file for reading: %s" msgstr "не удалось открыть файл редактирования блока изменений для чтения: %s" @@ -15013,13 +18151,13 @@ msgstr "не удалось открыть файл редактирования #. Consider translating (saying "no" discards!) as #. (saying "n" for "no" discards!) if the translation #. of the word "no" does not start with n. -#: git-add--interactive.perl:1134 +#: git-add--interactive.perl:1213 msgid "" "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]?" " " msgstr "Изменённый вами блок не применяется. Редактировать снова (ответ «y» означает «нет»!) [y/n]? " -#: git-add--interactive.perl:1143 +#: git-add--interactive.perl:1222 msgid "" "y - stage this hunk\n" "n - do not stage this hunk\n" @@ -15028,7 +18166,7 @@ msgid "" "d - do not stage this hunk or any of the later hunks in the file" msgstr "y - проиндексировать блок изменений\nn - не индексировать этот блок изменений\nq - выход; не индексировать этот и последующие блоки\na - проиндексировать этот и все последующие блоки файла\nd - не индексировать этот и последующие блоки файла" -#: git-add--interactive.perl:1149 +#: git-add--interactive.perl:1228 msgid "" "y - stash this hunk\n" "n - do not stash this hunk\n" @@ -15037,7 +18175,7 @@ msgid "" "d - do not stash this hunk or any of the later hunks in the file" msgstr "y - спрятать изменения блока\nq - выход; не прятать изменения этого и последующих блоков\na - спрятать этот и все последующие блоки файла\nd - не прятать этот и последующие блоки файла" -#: git-add--interactive.perl:1155 +#: git-add--interactive.perl:1234 msgid "" "y - unstage this hunk\n" "n - do not unstage this hunk\n" @@ -15046,7 +18184,7 @@ msgid "" "d - do not unstage this hunk or any of the later hunks in the file" msgstr "y - убрать из индекса этот блок изменений\nn - не убирать из индекса этот блок изменений\nq - выход; не убирать из индекса этот и последующие блоки\na - убрать из индекса этот и все последующие блоки файла\nd - не убирать из индекса этот и последующие блоки файла" -#: git-add--interactive.perl:1161 +#: git-add--interactive.perl:1240 msgid "" "y - apply this hunk to index\n" "n - do not apply this hunk to index\n" @@ -15055,7 +18193,7 @@ msgid "" "d - do not apply this hunk or any of the later hunks in the file" msgstr "y - применить блок изменений к индексу\nn - не применять этот блок изменений к индексу\nq - выход; не применять этот и последующие блоки\na - применить этот блок и все последующие блоки файла\nd - не применять этот и последующие блоки файла" -#: git-add--interactive.perl:1167 +#: git-add--interactive.perl:1246 msgid "" "y - discard this hunk from worktree\n" "n - do not discard this hunk from worktree\n" @@ -15064,7 +18202,7 @@ msgid "" "d - do not discard this hunk or any of the later hunks in the file" msgstr "y - отменить изменения этого блока в рабочем каталоге\nn - не отменять изменения этого блока в рабочем каталоге\nq - выход; не отменять изменения этого блока и всех последующих\na - отменить изменения этого и всех последующих блоков файла\nd - не отменять изменения этого и всех последующих блоков файла" -#: git-add--interactive.perl:1173 +#: git-add--interactive.perl:1252 msgid "" "y - discard this hunk from index and worktree\n" "n - do not discard this hunk from index and worktree\n" @@ -15073,7 +18211,7 @@ msgid "" "d - do not discard this hunk or any of the later hunks in the file" msgstr "y - отменить изменения этого блока в индексе и рабочем каталоге\nn - не отменять изменения этого блока в индексе и рабочем каталоге\nq - выход; не отменять изменения этого блока и всех последующих\na - отменить изменения этого и всех последующих блоков файла\nd - не отменять изменения этого и всех последующих блоков файла" -#: git-add--interactive.perl:1179 +#: git-add--interactive.perl:1258 msgid "" "y - apply this hunk to index and worktree\n" "n - do not apply this hunk to index and worktree\n" @@ -15082,7 +18220,7 @@ msgid "" "d - do not apply this hunk or any of the later hunks in the file" msgstr "y - применить блок изменений к индексу и рабочему каталогу\nn - не применять этот блок изменений к индексу и рабочему каталогу\nq - выход; не применять этот и последующие блоки\na - применить этот блок и все последующие блоки файла\nd - не применять этот и последующие блоки файла" -#: git-add--interactive.perl:1188 +#: git-add--interactive.perl:1273 msgid "" "g - select a hunk to go to\n" "/ - search for a hunk matching the given regex\n" @@ -15095,154 +18233,158 @@ msgid "" "? - print help\n" msgstr "g - выбрать блок изменений на который нужно перейти\n/ - поиск блока изменений с помощью регулярного выражения\nj - не принимать решение по этому блоку, перейти на следующий без решения\nJ - не принимать решение по этому блоку, перейти на следующий\nk - не принимать решение по этому блоку, перейти на предыдущий без решения\nK - не принимать решение по этому блоку, перейти на предыдущий\ns - разделить текущий блок на блоки меньшего размера\ne - вручную отредактировать текущий блок\n? - вывести справку\n" -#: git-add--interactive.perl:1219 +#: git-add--interactive.perl:1304 msgid "The selected hunks do not apply to the index!\n" msgstr "Выбранные блоки не применяются без ошибок к индексу!\n" -#: git-add--interactive.perl:1220 +#: git-add--interactive.perl:1305 msgid "Apply them to the worktree anyway? " msgstr "Все равно применить их к рабочему каталогу?" -#: git-add--interactive.perl:1223 +#: git-add--interactive.perl:1308 msgid "Nothing was applied.\n" msgstr "Ничего не применено.\n" -#: git-add--interactive.perl:1234 +#: git-add--interactive.perl:1319 #, perl-format msgid "ignoring unmerged: %s\n" msgstr "игнорирую не слитое: %s\n" -#: git-add--interactive.perl:1243 +#: git-add--interactive.perl:1328 msgid "Only binary files changed.\n" msgstr "Только изменения двоичных файлов.\n" -#: git-add--interactive.perl:1245 +#: git-add--interactive.perl:1330 msgid "No changes.\n" msgstr "Нет изменений.\n" -#: git-add--interactive.perl:1253 +#: git-add--interactive.perl:1338 msgid "Patch update" msgstr "Обновление патча" -#: git-add--interactive.perl:1305 +#: git-add--interactive.perl:1390 #, perl-format -msgid "Stage mode change [y,n,q,a,d,/%s,?]? " -msgstr "Проиндексировать изменение режима доступа [y,n,q,a,d,/%s,?]? " +msgid "Stage mode change [y,n,q,a,d%s,?]? " +msgstr "Проиндексировать изменение режима доступа [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1306 +#: git-add--interactive.perl:1391 #, perl-format -msgid "Stage deletion [y,n,q,a,d,/%s,?]? " -msgstr "Проиндексировать удаление [y,n,q,a,d,/%s,?]? " +msgid "Stage deletion [y,n,q,a,d%s,?]? " +msgstr "Проиндексировать удаление [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1307 +#: git-add--interactive.perl:1392 #, perl-format -msgid "Stage this hunk [y,n,q,a,d,/%s,?]? " -msgstr "Проиндексировать этот блок изменений [y,n,q,a,d,/%s,?]? " +msgid "Stage this hunk [y,n,q,a,d%s,?]? " +msgstr "Проиндексировать этот блок изменений [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1310 +#: git-add--interactive.perl:1395 #, perl-format -msgid "Stash mode change [y,n,q,a,d,/%s,?]? " -msgstr "Спрятать изменение режима доступа [y,n,q,a,d,/%s,?]? " +msgid "Stash mode change [y,n,q,a,d%s,?]? " +msgstr "Спрятать изменение режима доступа [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1311 +#: git-add--interactive.perl:1396 #, perl-format -msgid "Stash deletion [y,n,q,a,d,/%s,?]? " -msgstr "Спрятать удаление файла [y,n,q,a,d,/%s,?]? " +msgid "Stash deletion [y,n,q,a,d%s,?]? " +msgstr "Спрятать удаление файла [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1312 +#: git-add--interactive.perl:1397 #, perl-format -msgid "Stash this hunk [y,n,q,a,d,/%s,?]? " -msgstr "Спрятать этот блок изменений [y,n,q,a,d,/%s,?]? " +msgid "Stash this hunk [y,n,q,a,d%s,?]? " +msgstr "Спрятать этот блок изменений [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1315 +#: git-add--interactive.perl:1400 #, perl-format -msgid "Unstage mode change [y,n,q,a,d,/%s,?]? " -msgstr "Убрать изменения режима доступа из индекса [y,n,q,a,d,/%s,?]? " +msgid "Unstage mode change [y,n,q,a,d%s,?]? " +msgstr "Убрать изменения режима доступа из индекса [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1316 +#: git-add--interactive.perl:1401 #, perl-format -msgid "Unstage deletion [y,n,q,a,d,/%s,?]? " -msgstr "Убрать удаление из индекса [y,n,q,a,d,/%s,?]? " +msgid "Unstage deletion [y,n,q,a,d%s,?]? " +msgstr "Убрать удаление из индекса [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1317 +#: git-add--interactive.perl:1402 #, perl-format -msgid "Unstage this hunk [y,n,q,a,d,/%s,?]? " -msgstr "Убрать из индекса этот блок измений [y,n,q,a,d,/%s,?]? " +msgid "Unstage this hunk [y,n,q,a,d%s,?]? " +msgstr "Убрать из индекса этот блок измений [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1320 +#: git-add--interactive.perl:1405 #, perl-format -msgid "Apply mode change to index [y,n,q,a,d,/%s,?]? " -msgstr "Применить изменение режима доступа к индексу [y,n,q,a,d,/%s,?]? " +msgid "Apply mode change to index [y,n,q,a,d%s,?]? " +msgstr "Применить изменение режима доступа к индексу [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1321 +#: git-add--interactive.perl:1406 #, perl-format -msgid "Apply deletion to index [y,n,q,a,d,/%s,?]? " -msgstr "Применить удаление к индексу [y,n,q,a,d,/%s,?]? " +msgid "Apply deletion to index [y,n,q,a,d%s,?]? " +msgstr "Применить удаление к индексу [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1322 +#: git-add--interactive.perl:1407 #, perl-format -msgid "Apply this hunk to index [y,n,q,a,d,/%s,?]? " -msgstr "Применить этот блок к индексу [y,n,q,a,d,/%s,?]? " +msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " +msgstr "Применить этот блок к индексу [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1325 +#: git-add--interactive.perl:1410 #, perl-format -msgid "Discard mode change from worktree [y,n,q,a,d,/%s,?]? " -msgstr "Отменить изменения режима доступа в рабочем каталоге [y,n,q,a,d,/%s,?]? " +msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " +msgstr "Отменить изменения режима доступа в рабочем каталоге [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1326 +#: git-add--interactive.perl:1411 #, perl-format -msgid "Discard deletion from worktree [y,n,q,a,d,/%s,?]? " -msgstr "Отменить удаление в рабочем каталоге [y,n,q,a,d,/%s,?]? " +msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " +msgstr "Отменить удаление в рабочем каталоге [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1327 +#: git-add--interactive.perl:1412 #, perl-format -msgid "Discard this hunk from worktree [y,n,q,a,d,/%s,?]? " -msgstr "Отменить изменения этого блока в рабочем каталоге [y,n,q,a,d,/%s,?]? " +msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " +msgstr "Отменить изменения этого блока в рабочем каталоге [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1330 +#: git-add--interactive.perl:1415 #, perl-format -msgid "Discard mode change from index and worktree [y,n,q,a,d,/%s,?]? " -msgstr "Отменить изменения режима доступа в индексе и рабочем каталоге [y,n,q,a,d,/%s,?]? " +msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " +msgstr "Отменить изменения режима доступа в индексе и рабочем каталоге [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1331 +#: git-add--interactive.perl:1416 #, perl-format -msgid "Discard deletion from index and worktree [y,n,q,a,d,/%s,?]? " -msgstr "Отменить удаление в индексе и рабочем каталоге [y,n,q,a,d,/%s,?]? " +msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " +msgstr "Отменить удаление в индексе и рабочем каталоге [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1332 +#: git-add--interactive.perl:1417 #, perl-format -msgid "Discard this hunk from index and worktree [y,n,q,a,d,/%s,?]? " -msgstr "Отменить изменения этого блока в индексе и рабочем каталоге [y,n,q,a,d,/%s,?]? " +msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " +msgstr "Отменить изменения этого блока в индексе и рабочем каталоге [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1335 +#: git-add--interactive.perl:1420 #, perl-format -msgid "Apply mode change to index and worktree [y,n,q,a,d,/%s,?]? " -msgstr "Применить изменения режима доступа к индексу и рабочему каталогу [y,n,q,a,d,/%s,?]? " +msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " +msgstr "Применить изменения режима доступа к индексу и рабочему каталогу [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1336 +#: git-add--interactive.perl:1421 #, perl-format -msgid "Apply deletion to index and worktree [y,n,q,a,d,/%s,?]? " -msgstr "Применить удаление к индексу и рабочему каталогу [y,n,q,a,d,/%s,?]? " +msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " +msgstr "Применить удаление к индексу и рабочему каталогу [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1337 +#: git-add--interactive.perl:1422 #, perl-format -msgid "Apply this hunk to index and worktree [y,n,q,a,d,/%s,?]? " -msgstr "Применить изменения этого блока к индексу и рабочему каталогу [y,n,q,a,d,/%s,?]? " +msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " +msgstr "Применить изменения этого блока к индексу и рабочему каталогу [y,n,q,a,d%s,?]? " + +#: git-add--interactive.perl:1522 +msgid "No other hunks to goto\n" +msgstr "" -#: git-add--interactive.perl:1440 +#: git-add--interactive.perl:1529 msgid "go to which hunk (<ret> to see more)? " msgstr "на какой блок перейти (нажмите <ввод> чтобы увидеть еще)? " -#: git-add--interactive.perl:1442 +#: git-add--interactive.perl:1531 msgid "go to which hunk? " msgstr "на какой блок перейти? " -#: git-add--interactive.perl:1451 +#: git-add--interactive.perl:1540 #, perl-format msgid "Invalid number: '%s'\n" msgstr "Неверный номер: «%s»\n" -#: git-add--interactive.perl:1456 +#: git-add--interactive.perl:1545 #, perl-format msgid "Sorry, only %d hunk available.\n" msgid_plural "Sorry, only %d hunks available.\n" @@ -15251,28 +18393,36 @@ msgstr[1] "Простите, но только %d блока изменений msgstr[2] "Простите, но только %d блоков изменений доступно.\n" msgstr[3] "Простите, но только %d блока изменений доступно.\n" -#: git-add--interactive.perl:1482 +#: git-add--interactive.perl:1571 +msgid "No other hunks to search\n" +msgstr "" + +#: git-add--interactive.perl:1575 msgid "search for regex? " msgstr "искать с помощью регулярного выражения? " -#: git-add--interactive.perl:1495 +#: git-add--interactive.perl:1588 #, perl-format msgid "Malformed search regexp %s: %s\n" msgstr "Регулярное выражение для поиска в неверном формате %s: %s\n" -#: git-add--interactive.perl:1505 +#: git-add--interactive.perl:1598 msgid "No hunk matches the given pattern\n" msgstr "Не найдены блоки, которые соответствуют указанному шаблону\n" -#: git-add--interactive.perl:1517 git-add--interactive.perl:1539 +#: git-add--interactive.perl:1610 git-add--interactive.perl:1632 msgid "No previous hunk\n" msgstr "Нет предыдущего блока\n" -#: git-add--interactive.perl:1526 git-add--interactive.perl:1545 +#: git-add--interactive.perl:1619 git-add--interactive.perl:1638 msgid "No next hunk\n" msgstr "Не следующего блока\n" -#: git-add--interactive.perl:1553 +#: git-add--interactive.perl:1644 +msgid "Sorry, cannot split this hunk\n" +msgstr "" + +#: git-add--interactive.perl:1650 #, perl-format msgid "Split into %d hunk.\n" msgid_plural "Split into %d hunks.\n" @@ -15281,13 +18431,17 @@ msgstr[1] "Разбито на %d блока изменений.\n" msgstr[2] "Разбито на %d блоков изменений.\n" msgstr[3] "Разбито на %d блока изменений.\n" -#: git-add--interactive.perl:1605 +#: git-add--interactive.perl:1660 +msgid "Sorry, cannot edit this hunk\n" +msgstr "" + +#: git-add--interactive.perl:1706 msgid "Review diff" msgstr "Просмотреть изменения" #. TRANSLATORS: please do not translate the command names #. 'status', 'update', 'revert', etc. -#: git-add--interactive.perl:1624 +#: git-add--interactive.perl:1725 msgid "" "status - show paths with changes\n" "update - add working tree state to the staged set of changes\n" @@ -15297,83 +18451,89 @@ msgid "" "add untracked - add contents of untracked files to the staged set of changes\n" msgstr "status - показать пути с изменениями\nupdate - добавить состояние рабочего каталога индекс\nrevert - вернуть проиндексированный набор изменений к HEAD версии\npatch - выбрать и выборочно обновить блоки\ndiff - просмотреть различия между HEAD и индексом\nadd untracked - добавить содержимое неотслеживаемых файлов в индекс\n" -#: git-add--interactive.perl:1641 git-add--interactive.perl:1646 -#: git-add--interactive.perl:1649 git-add--interactive.perl:1656 -#: git-add--interactive.perl:1660 git-add--interactive.perl:1666 +#: git-add--interactive.perl:1742 git-add--interactive.perl:1747 +#: git-add--interactive.perl:1750 git-add--interactive.perl:1757 +#: git-add--interactive.perl:1761 git-add--interactive.perl:1767 msgid "missing --" msgstr "отсутствует --" -#: git-add--interactive.perl:1662 +#: git-add--interactive.perl:1763 #, perl-format msgid "unknown --patch mode: %s" msgstr "неизвестный режим для --patch: %s" -#: git-add--interactive.perl:1668 git-add--interactive.perl:1674 +#: git-add--interactive.perl:1769 git-add--interactive.perl:1775 #, perl-format msgid "invalid argument %s, expecting --" msgstr "недопустимый аргумент %s, ожидается --" -#: git-send-email.perl:126 +#: git-send-email.perl:130 msgid "local zone differs from GMT by a non-minute interval\n" msgstr "локальный часовой пояс отличается от GMT на не минутный интервал\n" -#: git-send-email.perl:133 git-send-email.perl:139 +#: git-send-email.perl:137 git-send-email.perl:143 msgid "local time offset greater than or equal to 24 hours\n" msgstr "локальный сдвиг времени больше или равен 24 часа\n" -#: git-send-email.perl:207 git-send-email.perl:213 +#: git-send-email.perl:211 git-send-email.perl:217 msgid "the editor exited uncleanly, aborting everything" msgstr "редактор был завершен с ошибкой, отменяю всё" -#: git-send-email.perl:290 +#: git-send-email.perl:294 #, perl-format msgid "'%s' contains an intermediate version of the email you were composing.\n" msgstr "«%s» содержит промежуточную версию письма, которое вы готовите.\n" -#: git-send-email.perl:295 +#: git-send-email.perl:299 #, perl-format msgid "'%s.final' contains the composed email.\n" msgstr "«%s.final» содержит подготовленное письмо.\n" -#: git-send-email.perl:313 +#: git-send-email.perl:317 msgid "--dump-aliases incompatible with other options\n" msgstr "--dump-aliases не совместимо с другими опциями\n" -#: git-send-email.perl:378 git-send-email.perl:629 +#: git-send-email.perl:383 git-send-email.perl:638 msgid "Cannot run git format-patch from outside a repository\n" msgstr "Нельзя запускать git format-patch вне репозитория\n" -#: git-send-email.perl:447 +#: git-send-email.perl:386 +msgid "" +"`batch-size` and `relogin` must be specified together (via command-line or " +"configuration option)\n" +msgstr "" + +#: git-send-email.perl:456 #, perl-format msgid "Unknown --suppress-cc field: '%s'\n" msgstr "Неизвестное поле --suppress-cc: «%s»\n" -#: git-send-email.perl:476 +#: git-send-email.perl:485 #, perl-format msgid "Unknown --confirm setting: '%s'\n" msgstr "Неизвестный параметр --confirm: «%s»\n" -#: git-send-email.perl:504 +#: git-send-email.perl:513 #, perl-format msgid "warning: sendmail alias with quotes is not supported: %s\n" msgstr "предупреждение: сокращение для sendmail с кавычками не поддерживается: %s\n" -#: git-send-email.perl:506 +#: git-send-email.perl:515 #, perl-format msgid "warning: `:include:` not supported: %s\n" msgstr "предупреждение: «:include:» не поддерживается: %s\n" -#: git-send-email.perl:508 +#: git-send-email.perl:517 #, perl-format msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" msgstr "предупреждение: перенаправление «/file» или «|pipe» не поддерживается: %s\n" -#: git-send-email.perl:513 +#: git-send-email.perl:522 #, perl-format msgid "warning: sendmail line is not recognized: %s\n" msgstr "предупреждение: строка sendmail не распознана: %s\n" -#: git-send-email.perl:595 +#: git-send-email.perl:604 #, perl-format msgid "" "File '%s' exists but it could also be the range of commits\n" @@ -15383,36 +18543,36 @@ msgid "" " * Giving --format-patch option if you mean a range.\n" msgstr "Файл «%s» существует, но это также может быть и\nдиапазоном коммитов для которых нужно сделать патчи. \nУстраните неоднозначность…\n\n * Указав \"./%s\" если вы имеете в виду имя файла; или\n * Передав опцию --format-patch если вы имеете в виду диапазон коммитов.\n" -#: git-send-email.perl:616 +#: git-send-email.perl:625 #, perl-format msgid "Failed to opendir %s: %s" msgstr "Не удалось выполнить opendir %s: %s" -#: git-send-email.perl:640 +#: git-send-email.perl:649 #, perl-format msgid "" "fatal: %s: %s\n" "warning: no patches were sent\n" msgstr "критическая ошибка: %s: %s\nпредупреждение: патчи не были отправлены\n" -#: git-send-email.perl:651 +#: git-send-email.perl:660 msgid "" "\n" "No patch files specified!\n" "\n" msgstr "\nФайл с патчем не указан!\n\n" -#: git-send-email.perl:664 +#: git-send-email.perl:673 #, perl-format msgid "No subject line in %s?" msgstr "Нет строки с темой в %s?" -#: git-send-email.perl:674 +#: git-send-email.perl:683 #, perl-format msgid "Failed to open for writing %s: %s" msgstr "Не удалось открыть для записи %s: %s" -#: git-send-email.perl:684 +#: git-send-email.perl:694 msgid "" "Lines beginning in \"GIT:\" will be removed.\n" "Consider including an overall diffstat or table of contents\n" @@ -15421,41 +18581,37 @@ msgid "" "Clear the body content if you don't wish to send a summary.\n" msgstr "Строки, начинающиеся с «GIT:» будут удалены.\nВозможно будет полезно включить статистику добавлений\nи удалений или таблицу содержимого в патч, который вы пишете.\n\nОчистите содержимое, если вы не хотите отправлять письмо с краткой информацией.\n" -#: git-send-email.perl:707 -#, perl-format -msgid "Failed to open %s.final: %s" -msgstr "Не удалось открыть %s.final: %s" - -#: git-send-email.perl:710 +#: git-send-email.perl:718 #, perl-format msgid "Failed to open %s: %s" msgstr "Не удалось открыть %s: %s" -#: git-send-email.perl:745 -msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n" -msgstr "Поля To/Cc/Bcc пока еще не обрабатываются и будут проигнорированы\n" +#: git-send-email.perl:735 +#, perl-format +msgid "Failed to open %s.final: %s" +msgstr "Не удалось открыть %s.final: %s" -#: git-send-email.perl:754 +#: git-send-email.perl:778 msgid "Summary email is empty, skipping it\n" msgstr "Письмо с краткой информацией пустое, попускаю его\n" #. TRANSLATORS: please keep [y/N] as is. -#: git-send-email.perl:786 +#: git-send-email.perl:813 #, perl-format msgid "Are you sure you want to use <%s> [y/N]? " msgstr "Вы уверены, что хотите использовать <%s> [y/N]? " -#: git-send-email.perl:815 +#: git-send-email.perl:868 msgid "" "The following files are 8bit, but do not declare a Content-Transfer-" "Encoding.\n" msgstr "Следующие файлы 8 битные, но не содержат Content-Transfer-Encoding.\n" -#: git-send-email.perl:820 +#: git-send-email.perl:873 msgid "Which 8bit encoding should I declare [UTF-8]? " msgstr "Какую 8 битную кодировку нужно указать [UTF-8]? " -#: git-send-email.perl:828 +#: git-send-email.perl:881 #, perl-format msgid "" "Refusing to send because the patch\n" @@ -15463,20 +18619,20 @@ msgid "" "has the template subject '*** SUBJECT HERE ***'. Pass --force if you really want to send.\n" msgstr "Отказываюсь отправить, т.к. патч\n\t%s\nсодержит шаблонный заголовок «*** SUBJECT HERE ***». Укажите параметр --force, если вы действительно хотите отправить его.\n" -#: git-send-email.perl:847 +#: git-send-email.perl:900 msgid "To whom should the emails be sent (if anyone)?" msgstr "Кому должны быть отправлены письма (если нужно)?" -#: git-send-email.perl:865 +#: git-send-email.perl:918 #, perl-format msgid "fatal: alias '%s' expands to itself\n" msgstr "критическая ошибка: сокращение «%s» раскрывается само в себя\n" -#: git-send-email.perl:877 +#: git-send-email.perl:930 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:929 git-send-email.perl:937 +#: git-send-email.perl:988 git-send-email.perl:996 #, perl-format msgid "error: unable to extract a valid address from: %s\n" msgstr "ошибка: не удалось выделить действительный адрес из: %s\n" @@ -15484,16 +18640,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:941 +#: git-send-email.perl:1000 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " msgstr "Что нужно сделать с этим адресом? ([q] - выход|[d] - отбросить|[e] - редактировать): " -#: git-send-email.perl:1262 +#: git-send-email.perl:1317 #, perl-format msgid "CA path \"%s\" does not exist" msgstr "путь CA «%s» не существует" -#: git-send-email.perl:1337 +#: git-send-email.perl:1400 msgid "" " The Cc list above has been expanded by additional\n" " addresses found in the patch commit message. By default\n" @@ -15505,133 +18661,133 @@ msgid "" " To retain the current behavior, but squelch this message,\n" " run 'git config --global sendemail.confirm auto'.\n" "\n" -msgstr " Список Cc (получателей копии письма) был расширен дополнительными\n адресами, найденными в сообщении коммита патча. По умолчанию\n send-email переспашивает перед отправкой, когда она происходит.\n Это поведение может быть изменено параметром файла конфигурации\n sendemail.confirm.\n\n Для дополнительной информации, запустите «git send-email --help».\n Чтобы оставить текущее поведение, но скрыть это сообщение,\n запустите «git config --global sendemail.confirm auto».\n\n" +msgstr " Список Cc (получателей копии письма) был расширен дополнительными\n адресами, найденными в сообщении коммита патча. По умолчанию\n send-email переспрашивает перед отправкой, когда она происходит.\n Это поведение может быть изменено параметром файла конфигурации\n sendemail.confirm.\n\n Для дополнительной информации, запустите «git send-email --help».\n Чтобы оставить текущее поведение, но скрыть это сообщение,\n запустите «git config --global sendemail.confirm auto».\n\n" -#. TRANSLATORS: Make sure to include [y] [n] [q] [a] in your +#. 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:1352 -msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): " -msgstr "Отправить это письмо? ([y] - да|[n] - нет|[q] - выход|[a] - все): " +#: git-send-email.perl:1415 +msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): " +msgstr "Отправить это письмо? ([y] - да|[n] - нет|[e] - изменить|[q] - выход|[a] - все): " -#: git-send-email.perl:1355 +#: git-send-email.perl:1418 msgid "Send this email reply required" msgstr "Отправка этого ответа на письмо обязательна" -#: git-send-email.perl:1381 +#: git-send-email.perl:1446 msgid "The required SMTP server is not properly defined." msgstr "Требуемый SMTP сервер не был правильно объявлен." -#: git-send-email.perl:1428 +#: git-send-email.perl:1493 #, perl-format msgid "Server does not support STARTTLS! %s" msgstr "Сервер не поддерживает STARTTLS! %s" -#: git-send-email.perl:1433 git-send-email.perl:1437 +#: git-send-email.perl:1498 git-send-email.perl:1502 #, perl-format msgid "STARTTLS failed! %s" msgstr "Ошибка STARTTLS! %s" -#: git-send-email.perl:1447 +#: git-send-email.perl:1511 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." msgstr "Не удалось инициализировать SMTP. Проверьте ваши настройки и попробуйте запустить в параметром --smtp-debug." -#: git-send-email.perl:1465 +#: git-send-email.perl:1529 #, perl-format msgid "Failed to send %s\n" msgstr "Не удалось отправить %s\n" -#: git-send-email.perl:1468 +#: git-send-email.perl:1532 #, perl-format msgid "Dry-Sent %s\n" msgstr "Имитация отправки %s\n" -#: git-send-email.perl:1468 +#: git-send-email.perl:1532 #, perl-format msgid "Sent %s\n" msgstr "Отправлено %s\n" -#: git-send-email.perl:1470 +#: git-send-email.perl:1534 msgid "Dry-OK. Log says:\n" msgstr "Имитация OK. Журнал содержит:\n" -#: git-send-email.perl:1470 +#: git-send-email.perl:1534 msgid "OK. Log says:\n" msgstr "OK. Журнал содержит:\n" -#: git-send-email.perl:1482 +#: git-send-email.perl:1546 msgid "Result: " msgstr "Результат: " -#: git-send-email.perl:1485 +#: git-send-email.perl:1549 msgid "Result: OK\n" msgstr "Результат: OK\n" -#: git-send-email.perl:1498 +#: git-send-email.perl:1567 #, perl-format msgid "can't open file %s" msgstr "не удалось открыть файл %s" -#: git-send-email.perl:1545 git-send-email.perl:1565 +#: git-send-email.perl:1614 git-send-email.perl:1634 #, perl-format msgid "(mbox) Adding cc: %s from line '%s'\n" msgstr "(mbox) Добавление cc: %s со строки «%s»\n" -#: git-send-email.perl:1551 +#: git-send-email.perl:1620 #, perl-format msgid "(mbox) Adding to: %s from line '%s'\n" msgstr "(mbox) Добавление to: %s со строки «%s»\n" -#: git-send-email.perl:1599 +#: git-send-email.perl:1673 #, perl-format msgid "(non-mbox) Adding cc: %s from line '%s'\n" msgstr "(non-mbox) Добавление cc: %s со строки «%s»\n" -#: git-send-email.perl:1624 +#: git-send-email.perl:1698 #, perl-format msgid "(body) Adding cc: %s from line '%s'\n" msgstr "(body) Добавление cc: %s со строки «%s»\n" -#: git-send-email.perl:1730 +#: git-send-email.perl:1809 #, perl-format msgid "(%s) Could not execute '%s'" msgstr "(%s) Не удалось выполнить «%s»" -#: git-send-email.perl:1737 +#: git-send-email.perl:1816 #, perl-format msgid "(%s) Adding %s: %s from: '%s'\n" msgstr "(%s) Добавление %s: %s из: «%s»\n" -#: git-send-email.perl:1741 +#: git-send-email.perl:1820 #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "(%s) не удалось закрыть поток к «%s»" -#: git-send-email.perl:1768 +#: git-send-email.perl:1850 msgid "cannot send message as 7bit" msgstr "не удалось отправить сообщение в 7 битной кодировке" -#: git-send-email.perl:1776 +#: git-send-email.perl:1858 msgid "invalid transfer encoding" msgstr "недопустимая кодировка передачи" -#: git-send-email.perl:1814 git-send-email.perl:1865 git-send-email.perl:1875 +#: git-send-email.perl:1899 git-send-email.perl:1951 git-send-email.perl:1961 #, perl-format msgid "unable to open %s: %s\n" msgstr "не удалось открыть %s: %s\n" -#: git-send-email.perl:1817 +#: git-send-email.perl:1902 #, perl-format msgid "%s: patch contains a line longer than 998 characters" msgstr "%s: патч содержит строку длиннее чем 998 символов" -#: git-send-email.perl:1833 +#: git-send-email.perl:1919 #, 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:1837 +#: git-send-email.perl:1923 #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "Вы действительно хотите отправить %s? [y - да|N - нет]: " @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: git 2.18.0\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2018-06-08 09:03+0800\n" -"PO-Revision-Date: 2018-06-08 22:53+0100\n" +"POT-Creation-Date: 2018-06-16 22:06+0800\n" +"PO-Revision-Date: 2018-06-26 13:28+0100\n" "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n" "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" "Language: sv\n" @@ -1278,7 +1278,7 @@ msgstr "" "Slå av detta meddelande genom att skriva\n" "\"git config advice.graftFileDeprecated false\"" -#: commit.c:1537 +#: commit.c:1540 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" @@ -2335,8 +2335,8 @@ msgstr "Snabbspolar undermodulen %s till följande incheckning:" #: merge-recursive.c:1211 merge-recursive.c:1223 #, c-format -msgid "Fast-forwarding submodule %s to %s" -msgstr "Snabbspolar undermodulen %s till %s" +msgid "Fast-forwarding submodule %s" +msgstr "Snabbspolar undermodulen %s" #: merge-recursive.c:1245 #, c-format @@ -9383,7 +9383,7 @@ msgstr "felaktigt antal trådar angivet (%d) för %s" #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c:293 builtin/index-pack.c:1531 builtin/index-pack.c:1723 +#: builtin/grep.c:293 builtin/index-pack.c:1535 builtin/index-pack.c:1727 #, c-format msgid "no threads support, ignoring %s" msgstr "trådstöd saknas, ignorerar %s" @@ -9592,7 +9592,7 @@ msgstr "--no-index och --untracked kan inte användas med revisioner" msgid "unable to resolve revision: %s" msgstr "kan inte slå upp revision: %s" -#: builtin/grep.c:1036 builtin/index-pack.c:1527 +#: builtin/grep.c:1036 builtin/index-pack.c:1531 #, c-format msgid "invalid number of threads specified (%d)" msgstr "felaktigt antal trådar angivet (%d)" @@ -10001,58 +10001,58 @@ msgstr "kan inte spara paketfil" msgid "cannot store index file" msgstr "kan inte spara indexfil" -#: builtin/index-pack.c:1521 +#: builtin/index-pack.c:1525 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "felaktig pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1590 +#: builtin/index-pack.c:1594 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Kan inte öppna befintlig paketfil \"%s\"" -#: builtin/index-pack.c:1592 +#: builtin/index-pack.c:1596 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "Kan inte öppna befintlig paket-idx-fil för \"%s\"" -#: builtin/index-pack.c:1640 +#: builtin/index-pack.c:1644 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "icke-delta: %d objekt" msgstr[1] "icke-delta: %d objekt" -#: builtin/index-pack.c:1647 +#: builtin/index-pack.c:1651 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "kedjelängd = %d: %lu objekt" msgstr[1] "kedjelängd = %d: %lu objekt" -#: builtin/index-pack.c:1684 +#: builtin/index-pack.c:1688 msgid "Cannot come back to cwd" msgstr "Kan inte gå tillbaka till arbetskatalogen (cwd)" -#: builtin/index-pack.c:1735 builtin/index-pack.c:1738 -#: builtin/index-pack.c:1754 builtin/index-pack.c:1758 +#: builtin/index-pack.c:1739 builtin/index-pack.c:1742 +#: builtin/index-pack.c:1758 builtin/index-pack.c:1762 #, c-format msgid "bad %s" msgstr "felaktig %s" -#: builtin/index-pack.c:1774 +#: builtin/index-pack.c:1778 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin kan inte användas med --stdin" -#: builtin/index-pack.c:1776 +#: builtin/index-pack.c:1780 msgid "--stdin requires a git repository" msgstr "--stdin kräver ett git-arkiv" -#: builtin/index-pack.c:1782 +#: builtin/index-pack.c:1786 msgid "--verify with no packfile name given" msgstr "--verify angavs utan paketfilnamn" -#: builtin/index-pack.c:1832 builtin/unpack-objects.c:578 +#: builtin/index-pack.c:1836 builtin/unpack-objects.c:578 msgid "fsck error in pack objects" msgstr "fsck-fel i packat objekt" diff --git a/po/zh_CN.po b/po/zh_CN.po index 239a54a7e3..665ee48a50 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -139,7 +139,7 @@ msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" "POT-Creation-Date: 2018-06-16 22:06+0800\n" -"PO-Revision-Date: 2018-06-18 00:28+0800\n" +"PO-Revision-Date: 2018-07-02 10:22+0800\n" "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n" "Language-Team: GitHub <https://github.com/jiangxin/git/>\n" "Language: zh_CN\n" @@ -2324,12 +2324,12 @@ msgstr "（坏提交）\n" #: merge-recursive.c:320 #, c-format msgid "add_cacheinfo failed for path '%s'; merge aborting." -msgstr "addinfo_cache 对路径 '%s' 执行失败，合并终止。" +msgstr "add_cacheinfo 对路径 '%s' 执行失败，合并终止。" #: merge-recursive.c:328 #, c-format msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." -msgstr "addinfo_cache 无法刷新路径 '%s'，合并终止。" +msgstr "add_cacheinfo 无法刷新路径 '%s'，合并终止。" #: merge-recursive.c:410 msgid "error building trees" @@ -2541,12 +2541,12 @@ msgstr "" #: merge-recursive.c:1733 #, c-format msgid "Renaming %s to %s and %s to %s instead" -msgstr "而是重命名 %s 至 %s，以及 %s 至 %s" +msgstr "代之以重命名 %s 至 %s，以及 %s 至 %s" #: merge-recursive.c:1745 #, c-format msgid "Refusing to lose untracked file at %s, even though it's in the way." -msgstr "拒绝丢失未跟踪文件 '%s'，即使它妨碍了。" +msgstr "拒绝在 '%s' 处失去未跟踪文件，即使它存在于重命名中。" #: merge-recursive.c:1951 #, c-format @@ -2554,9 +2554,7 @@ msgid "" "CONFLICT (directory rename split): Unclear where to place %s because " "directory %s was renamed to multiple other directories, with no destination " "getting a majority of the files." -msgstr "" -"冲突（分割的目录重命名）：不清楚 %s 应该放在哪里，因为目录 %s 被重命名到多个" -"其它目录，没有一个目录包含主要的文件。" +msgstr "冲突（分割的目录重命名）：不清楚 %s 应该放在哪里，因为目录 %s 被重命名到多个其它目录，没有目录包含大部分文件。" #: merge-recursive.c:1983 #, c-format @@ -9321,7 +9319,7 @@ msgstr "无法解析 gc.logexpiry 的值 %s" #: builtin/gc.c:539 #, c-format msgid "failed to parse prune expiry value %s" -msgstr "无法解析 gc.logexpiry 的值 %s" +msgstr "无法解析清除期限值 %s" #: builtin/gc.c:559 #, c-format |