diff --git a/po/ca.po b/po/ca.po index 4b164f2991..6d64d7259a 100644 --- a/po/ca.po +++ b/po/ca.po @@ -3,14 +3,16 @@ # Alex Henrie , 2014-2016. # Jordi Mas i Hernàndez , 2016-2023 # -# Terminologia i criteris utilitzats +# Terminologia # # Anglès | Català # -----------------+--------------------------------- # ahead | davant per # amend | esmenar +# branch | branca # broken | malmès # bundle | farcell +# check out | agafar # chunk | fragment # cover letter | carta de presentació # cruft | superflu @@ -64,12 +66,16 @@ # # Vegeu també https://git.github.io/htmldocs/gitglossary.html # +# Criteris +# - Mantingueu en anglès les referències a seccions de la documentació, ja que no està traduïda. +# - Usem la convenció valenciana per a «per / per a», que inclou l'ús de «per a» davant d'infintiu +# msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List \n" -"POT-Creation-Date: 2023-05-20 14:03+0200\n" -"PO-Revision-Date: 2023-05-26 19:00-0600\n" +"POT-Creation-Date: 2023-08-16 18:22+0200\n" +"PO-Revision-Date: 2023-08-16 19:00-0600\n" "Last-Translator: Jordi Mas i Hernàndez \n" "Language-Team: Catalan\n" "Language: ca\n" @@ -584,6 +590,7 @@ msgstr "«git apply --cached» ha fallat" #. Consider translating (saying "no" discards!) as #. (saying "n" for "no" discards!) if the translation #. of the word "no" does not start with n. +#. msgid "" "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " msgstr "" @@ -698,9 +705,8 @@ msgstr "Baixar no és possible perquè teniu fitxers sense fusionar." msgid "Reverting is not possible because you have unmerged files." msgstr "Revertir no és possible perquè teniu fitxers sense fusionar." -#, c-format -msgid "It is not possible to %s because you have unmerged files." -msgstr "No és possible %s perquè teniu fitxers sense fusionar." +msgid "Rebasing is not possible because you have unmerged files." +msgstr "Fer «rebase» no és possible perquè teniu fitxers sense fusionar." msgid "" "Fix them up in the work tree, and then use 'git add/rm '\n" @@ -845,6 +851,12 @@ msgstr "les opcions «%s» i «%s» no es poden usar juntes" msgid "'%s' outside a repository" msgstr "«%s» fora d'un repositori" +msgid "failed to read patch" +msgstr "s'ha produït un error en llegir el pedaç" + +msgid "patch too large" +msgstr "el pedaç és massa gran" + #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "No es pot preparar l'expressió regular de marca de temps %s" @@ -1387,7 +1399,7 @@ msgstr "no es pot llegir «%s»" #, c-format msgid "pathspec '%s' matches files outside the current directory" msgstr "" -"l'específicació de camí «%s» coincideix amb fitxers fora del directori actual" +"l'especificació de camí «%s» coincideix amb fitxers fora del directori actual" #, c-format msgid "pathspec '%s' did not match any files" @@ -1630,6 +1642,7 @@ msgstr[1] "(aproximadament %d passos)" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. +#. #, 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" @@ -1715,17 +1728,20 @@ msgstr "no s'està seguint: informació ambigua per a la referència «%s»" #. TRANSLATORS: This is a line listing a remote with duplicate #. refspecs in the advice message below. For RTL languages you'll #. probably want to swap the "%s" and leading " " space around. +#. #. #-#-#-#-# object-name.c.po #-#-#-#-# #. TRANSLATORS: This is line item of ambiguous object output #. from describe_ambiguous_object() above. For RTL languages #. you'll probably want to swap the "%s" and leading " " space #. around. +#. #, c-format msgid " %s\n" msgstr " %s\n" #. TRANSLATORS: The second argument is a \n-delimited list of #. duplicate refspecs, composed above. +#. #, c-format msgid "" "There are multiple remotes whose fetch refspecs map to the remote\n" @@ -1755,8 +1771,10 @@ msgid "a branch named '%s' already exists" msgstr "ja existeix una branca amb nom «%s»" #, c-format -msgid "cannot force update the branch '%s' checked out at '%s'" -msgstr "no es pot forçar l'actualització de la branca «%s», agafada a «%s»" +msgid "cannot force update the branch '%s' used by worktree at '%s'" +msgstr "" +"no es pot forçar l'actualització de la branca «%s» utilitzada per l'arbre de " +"treball a «%s»" #, c-format msgid "cannot set up tracking information; starting point '%s' is not a branch" @@ -1827,17 +1845,6 @@ msgstr "git add [] [--] ..." msgid "cannot chmod %cx '%s'" msgstr "no es pot fer chmod %cx «%s»" -#, c-format -msgid "unexpected diff status %c" -msgstr "estat de diff inesperat %c" - -msgid "updating files failed" -msgstr "s'ha produït un error en actualitzar els fitxers" - -#, c-format -msgid "remove '%s'\n" -msgstr "elimina «%s»\n" - msgid "Unstaged changes after refreshing the index:" msgstr "Canvis «unstaged» després d'actualitzar l'índex:" @@ -2139,6 +2146,7 @@ msgstr "El cos de la comissió és:" #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] #. in your translation. The program will only accept English #. input at this point. +#. #, c-format msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "" @@ -2266,10 +2274,6 @@ msgstr "passa l'indicador -m a git-mailinfo" msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "passa l'indicador --keep-cr a git-mailsplit per al format mbox" -msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" -msgstr "" -"no passis l'indicador --keep-cr a git-mailsplit independentment d'am.keepcr" - msgid "strip everything before a scissors line" msgstr "elimina tot abans d'una línia de tisores" @@ -2487,6 +2491,7 @@ msgstr "bisecant amb només una comissió %s" #. TRANSLATORS: Make sure to include [Y] and [n] in your #. translation. The program will only accept English input #. at this point. +#. msgid "Are you sure [Y/n]? " msgstr "N'esteu segur [Y/n]? " @@ -2564,6 +2569,7 @@ msgstr "Cal començar per «git bisect start»\n" #. TRANSLATORS: Make sure to include [Y] and [n] in your #. translation. The program will only accept English input #. at this point. +#. msgid "Do you want me to do it for you [Y/n]? " msgstr "Voleu que ho faci per vostè [Y/n]? " @@ -2784,6 +2790,7 @@ msgstr "" #. among various forms of relative timestamps, but #. your language may need more or fewer display #. columns. +#. msgid "4 years, 11 months ago" msgstr "fa 4 anys i 11 mesos" @@ -3322,12 +3329,12 @@ msgid "" "git cat-file (--batch | --batch-check | --batch-command) [--batch-all-" "objects]\n" " [--buffer] [--follow-symlinks] [--unordered]\n" -" [--textconv | --filters] [-z]" +" [--textconv | --filters] [-Z]" msgstr "" "git cat-file (--batch | --batch-check | --batch-command) [--batch-all-" "objects]\n" " [--buffer] [--follow-symlinks] [--unordered]\n" -" [--textconv | --filters] [-z]" +" [--textconv | --filters] [-Z]" msgid "" "git cat-file (--textconv | --filters)\n" @@ -3374,6 +3381,9 @@ msgstr "com a --batch, però no emetis " msgid "stdin is NUL-terminated" msgstr "l'entrada és acabada amb NUL" +msgid "stdin and stdout is NUL-terminated" +msgstr "stdin i stdout estan terminats amb NUL" + msgid "read commands from stdin" msgstr "llegeix les ordres de stdin" @@ -4237,12 +4247,6 @@ msgstr "específic al servidor" msgid "option to transmit" msgstr "opció a transmetre" -msgid "use IPv4 addresses only" -msgstr "usa només adreces IPv4" - -msgid "use IPv6 addresses only" -msgstr "usa només adreces IPv6" - msgid "apply partial clone filters to submodules" msgstr "aplica els filtres de clonatge parcial als submòduls" @@ -4684,6 +4688,9 @@ msgstr "" " git cherry-pick --skip\n" "\n" +msgid "updating files failed" +msgstr "s'ha produït un error en actualitzar els fitxers" + msgid "failed to unpack HEAD tree object" msgstr "s'ha produït un error en desempaquetar l'objecte d'arbre HEAD" @@ -4743,8 +4750,8 @@ msgstr "" "no sigui usat en el missatge de comissió actual" #, c-format -msgid "could not lookup commit %s" -msgstr "no s'ha pogut cercar la comissió %s" +msgid "could not lookup commit '%s'" +msgstr "no s'ha pogut cercar la comissió «%s»" #, c-format msgid "(reading log message from standard input)\n" @@ -5006,6 +5013,7 @@ msgstr "reusa el missatge de la comissió especificada" #. TRANSLATORS: Leave "[(amend|reword):]" as-is, #. and only translate . +#. msgid "[(amend|reword):]commit" msgstr "[(amend|reword):]commit" @@ -5183,7 +5191,7 @@ msgid "remove a section: name" msgstr "elimina una secció: nom" msgid "list all" -msgstr "llista tots" +msgstr "llista'ls tots" msgid "use string equality when comparing values to 'value-pattern'" msgstr "" @@ -5462,7 +5470,7 @@ msgid "" "However, there were unannotated tags: try --tags." msgstr "" "Cap etiqueta anotada pot descriure «%s».\n" -"No obstant, hi havia etiquetes no anotades: proveu --tags." +"No obstant això, hi havia etiquetes no anotades: proveu --tags." #, c-format msgid "" @@ -6813,6 +6821,7 @@ msgstr "s'ha especificat un nombre de fils no vàlid (%d) per a %s" #. TRANSLATORS: %s is the configuration #. variable for tweaking threads, currently #. grep.threads +#. #, c-format msgid "no threads support, ignoring %s" msgstr "no s'admeten fils, s'ignorarà %s" @@ -7380,77 +7389,6 @@ msgstr "s'ha donat --verify sense nom de fitxer de paquet" msgid "fsck error in pack objects" msgstr "error fsck als objectes del paquet" -#, c-format -msgid "cannot stat template '%s'" -msgstr "no es pot fer stat en la plantilla «%s»" - -#, c-format -msgid "cannot opendir '%s'" -msgstr "no es pot fer opendir en el directori «%s»" - -#, c-format -msgid "cannot readlink '%s'" -msgstr "no es pot fer readlink en «%s»" - -#, c-format -msgid "cannot symlink '%s' '%s'" -msgstr "no es pot fer symlink en «%s» «%s»" - -#, c-format -msgid "cannot copy '%s' to '%s'" -msgstr "no es pot copiar «%s» a «%s»" - -#, c-format -msgid "ignoring template %s" -msgstr "s'està ignorant la plantilla %s" - -#, c-format -msgid "templates not found in %s" -msgstr "plantilles no trobades a %s" - -#, c-format -msgid "not copying templates from '%s': %s" -msgstr "no s'estan copiant plantilles de «%s»: %s" - -#, c-format -msgid "invalid initial branch name: '%s'" -msgstr "nom de branca inicial no vàlid: «%s»" - -#, c-format -msgid "unable to handle file type %d" -msgstr "no s'ha pogut gestionar el tipus de fitxer %d" - -#, c-format -msgid "unable to move %s to %s" -msgstr "no s'ha pogut moure %s a %s" - -msgid "attempt to reinitialize repository with different hash" -msgstr "s'ha intentat reinicialitzar el repositori amb un resum diferent" - -#, c-format -msgid "%s already exists" -msgstr "%s ja existeix" - -#, c-format -msgid "re-init: ignored --initial-branch=%s" -msgstr "reinicialització: s'ha ignorat --initial-branch=%s" - -#, c-format -msgid "Reinitialized existing shared Git repository in %s%s\n" -msgstr "S'ha reinicialitzat el repositori compartit existent del Git en %s%s\n" - -#, c-format -msgid "Reinitialized existing Git repository in %s%s\n" -msgstr "S'ha reinicialitzat el repositori existent del Git en %s%s\n" - -#, c-format -msgid "Initialized empty shared Git repository in %s%s\n" -msgstr "S'ha inicialitzat un repositori compartit buit del Git en %s%s\n" - -#, c-format -msgid "Initialized empty Git repository in %s%s\n" -msgstr "S'ha inicialitzat un repositori buit del Git en %s%s\n" - msgid "" "git init [-q | --quiet] [--bare] [--template=]\n" " [--separate-git-dir ] [--object-format=]\n" @@ -7890,6 +7828,10 @@ msgstr "" "No s'ha pogut trobar una branca remota seguida. Especifiqueu " "manualment.\n" +#, c-format +msgid "could not get object info about '%s'" +msgstr "no s'ha pogut obtenir la informació sobre l'objecte «%s»" + #, c-format msgid "bad ls-files format: element '%s' does not start with '('" msgstr "format incorrecte del ls-files: l'element «%s» no comença amb «(»" @@ -8034,10 +7976,6 @@ msgstr "mostra la referència subjacent a més de l'objecte que assenyali" msgid "git ls-tree [] [...]" msgstr "git ls-tree [] [...]" -#, c-format -msgid "could not get object info about '%s'" -msgstr "no s'ha pogut obtenir la informació sobre l'objecte «%s»" - #, c-format msgid "bad ls-tree format: element '%s' does not start with '('" msgstr "format incorrecte del ls-tree: l'element '%s' no comença amb «(»" @@ -8773,22 +8711,26 @@ msgid "git notes [--ref ] [list []]" msgstr "git notes [--ref ] [llista []]" msgid "" -"git notes [--ref ] add [-f] [--allow-empty] [-m | -F " -"| (-c | -C) ] []" +"git notes [--ref ] add [-f] [--allow-empty] [--[no-]separator|--" +"separator=] [--[no-]stripspace] [-m | -F | (-c " +"| -C) ] []" msgstr "" -"git notes [--ref ] add [-f] [--allow-empty] [-m " -" | -F | (-c | -C) ] []" +"git notes [--ref ] add [-f] [--allow-empty] [--[no-]separator|--" +"separator=] [--[no-]stripspace] [-m | -F | (-c " +"| -C) ] []" msgid "git notes [--ref ] copy [-f] " msgstr "" "git notes [--ref ] copy [-f] " msgid "" -"git notes [--ref ] append [--allow-empty] [-m | -F | " -"(-c | -C) ] []" +"git notes [--ref ] append [--allow-empty] [--[no-]separator|--" +"separator=] [--[no-]stripspace] [-m | -F | (-c " +"| -C) ] []" msgstr "" -"git notes [--ref ] append [--allow-empty] [-m " -" | -F | (-c | -C) ] []" +"git notes [--ref ] append [--allow-empty] [--[no-]separator|--" +"separator=] [--[no-]stripspace] [-m | -F | (-c " +"| -C) ] []" msgid "git notes [--ref ] edit [--allow-empty] []" msgstr "" @@ -8895,6 +8837,7 @@ msgstr "s'ha produït un error en copiar les notes de «%s» a «%s»" #. TRANSLATORS: the first %s will be replaced by a git #. notes command: 'add', 'merge', 'remove', etc. +#. #, c-format msgid "refusing to %s notes in %s (outside of refs/notes/)" msgstr "s'està refusant %s les notes en %s (fora de refs/notes/)" @@ -8921,6 +8864,15 @@ msgstr "permet l'emmagatzematge d'una nota buida" msgid "replace existing notes" msgstr "reemplaça les notes existents" +msgid "" +msgstr "" + +msgid "insert between paragraphs" +msgstr "insereix entre paràgrafs" + +msgid "remove unnecessary whitespace" +msgstr "elimina l'espai en blanc innecessari" + #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -9487,8 +9439,11 @@ msgstr "" msgid "refusing to run without --i-still-use-this" msgstr "es rebutja a executar sense --i-still-use-this" -msgid "git pack-refs [--all] [--no-prune]" -msgstr "git pack-refs [--all] [--no-prune]" +msgid "" +"git pack-refs [--all] [--no-prune] [--include ] [--exclude " +"]" +msgstr "" +"git pack-refs [--all] [--no-prune] [--include ] [--exclude ]" msgid "pack everything" msgstr "empaqueta-ho tot" @@ -9496,6 +9451,12 @@ msgstr "empaqueta-ho tot" msgid "prune loose refs (default)" msgstr "poda les referències soltes (per defecte)" +msgid "references to include" +msgstr "referències a incloure" + +msgid "references to exclude" +msgstr "referències a excloure" + msgid "git patch-id [--stable | --unstable | --verbatim]" msgstr "git patch-id [--stable | --unstable | --verbatim]" @@ -9554,6 +9515,12 @@ msgstr "força la sobreescriptura de la branca local" msgid "number of submodules pulled in parallel" msgstr "nombre de submòduls baixats en paral·lel" +msgid "use IPv4 addresses only" +msgstr "usa només adreces IPv4" + +msgid "use IPv6 addresses only" +msgstr "usa només adreces IPv6" + msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." @@ -9821,43 +9788,39 @@ msgstr "" msgid "" "Updates were rejected because the tip of your current branch is behind\n" -"its remote counterpart. Integrate the remote changes (e.g.\n" -"'git pull ...') before pushing again.\n" +"its remote counterpart. If you want to integrate the remote changes,\n" +"use 'git pull' before pushing again.\n" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" -"S'han rebutjat les actualitzacions perquè el punt de la vostra branca\n" -"actual està darrere de la seva branca remota corresponent. Integreu\n" -"els canvis remots (per exemple, «git pull ...») abans de pujar de nou.\n" -"Vegeu la «Nota sobre avanços ràpids» a «git push --help» per a més " -"informació." +"S'han rebutjat les actualitzacions perquè la punta de la branca actual\n" +"està darrere de la seva contrapart remota. Si voleu integrar els canvis,\n" +"remots useu «git pull» abans de tornar a pujar.\n" +"Vegeu «Note about fast-forwards» a «git push --help» per a més detalls." 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" -"(e.g. 'git pull ...') before pushing again.\n" +"counterpart. If you want to integrate the remote changes, use 'git pull'\n" +"before pushing again.\n" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" -"S'han rebutjat les actualitzacions perquè un punt de branca pujada\n" -"està darrere de la seva branca remota corresponent. Agafeu aquesta\n" -"branca i integreu els canvis remots (per exemple, «git pull ...»)\n" -"abans de pujar de nou.\n" -"Vegeu la «Nota sobre avanços ràpids» a «git push --help» per a més " -"informació." +"Les actualitzacions s'han rebutjat perquè la branca pujada està darrere\n" +"de la seva contrapart remota. Si voleu integrar els canvis remots,\n" +"utilitzeu «git pull» abans de tornar a pujar.\n" +"Vegeu «Note about fast-forwards» a «git push --help» per a més detalls." 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" -"to the same ref. You may want to first integrate the remote changes\n" -"(e.g., 'git pull ...') before pushing again.\n" +"Updates were rejected because the remote contains work that you do not\n" +"have locally. This is usually caused by another repository pushing to\n" +"the same ref. If you want to integrate the remote changes, use\n" +"'git pull' before pushing again.\n" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" -"S'han rebutjat les actualitzacions perquè el remot conté canvis\n" -"que no teniu localment. Això acostuma a ser causat per un altre repositori\n" -"que ha pujat a la mateixa referència. Pot ser que primer vulgueu\n" -"integrar els canvis remots (per exemple, «git pull ...») abans de\n" -"pujar de nou.\n" -"Vegeu la «Nota sobre avanços ràpids» a «git push --help» per a més " -"informació." +"Les actualitzacions s'han rebutjat perquè el remot conté canvis que no " +"teniu\n" +"localment. Això sol ser causat per un altre repositori que a pujat a\n" +"la mateixa referència. Si voleu integrar els canvis remots, utilitzeu\n" +"«git pull» abans de tornar a pujar.\n" +"Vegeu «Note about fast-forwards» a «git push --help» per a més detalls." msgid "Updates were rejected because the tag already exists in the remote." msgstr "" @@ -9874,15 +9837,15 @@ msgstr "" "«--force».\n" msgid "" -"Updates were rejected because the tip of the remote-tracking\n" -"branch has been updated since the last checkout. You may want\n" -"to integrate those changes locally (e.g., 'git pull ...')\n" -"before forcing an update.\n" +"Updates were rejected because the tip of the remote-tracking branch has\n" +"been updated since the last checkout. If you want to integrate the\n" +"remote changes, use 'git pull' before pushing again.\n" +"See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" -"S'han rebutjat les actualitzacions perquè el punt actual de la vostra\n" -"branca està darrere de la seva branca remota corresponent. Integreu\n" -"els canvis localment (per exemple, «git pull ...») abans de forçar\n" -"una pujada.\n" +"Les actualitzacions s'han rebutjat perquè la branca de seguiment remot\n" +"s'ha actualitzat des de l'última baixada. Si voleu integrar els\n" +"canvis remots, utilitzeu «git pull» abans de tornar a pujar.\n" +"Vegeu «Note about fast-forwards» a «git push --help» per a més detalls." #, c-format msgid "Pushing to %s\n" @@ -10742,11 +10705,12 @@ msgstr "argument de «mirror» desconegut: %s" msgid "fetch the remote branches" msgstr "obtén les branques remotes" -msgid "import all tags and associated objects when fetching" -msgstr "en obtenir, importa totes les etiquetes i tots els objectes" - -msgid "or do not fetch any tag at all (--no-tags)" -msgstr "o no obtinguis cap etiqueta (--no-tags)" +msgid "" +"import all tags and associated objects when fetching\n" +"or do not fetch any tag at all (--no-tags)" +msgstr "" +"importa totes les etiquetes i objectes associats en obtenir\n" +"o no obtingueu cap etiqueta (--no-tags)" msgid "branch(es) to track" msgstr "branques a seguir" @@ -10949,6 +10913,7 @@ msgstr "(sense URL)" #. TRANSLATORS: the colon ':' should align #. with the one in " Fetch URL: %s" #. translation. +#. #, c-format msgid " Push URL: %s" msgstr " URL de pujada: %s" @@ -12706,6 +12671,10 @@ msgstr "S'està ometent el submòdul no fusionat %s" msgid "Skipping submodule '%s'" msgstr "S'està ometent el submòdul «%s»" +#, c-format +msgid "cannot clone submodule '%s' without a URL" +msgstr "no es pot clonar el submòdul «%s» sense un URL" + #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "S'ha produït un error en clonar «%s». S'ha programat un reintent" @@ -13460,10 +13429,10 @@ msgstr "imprimeix els continguts de l'etiqueta" msgid "" "git worktree add [-f] [--detach] [--checkout] [--lock [--reason ]]\n" -" [-b ] []" +" [--orphan] [(-b | -B) ] []" msgstr "" -"git worktree add [-f] [--detach] [--checkout] [--lock [--reason ]]\n" -" [-b ] []" +"git worktree add [-f] [--detach] [--checkout] [--lock [--reason ]]\n" +" [--orphan] [(-b | -B) ] []" msgid "git worktree list [-v | --porcelain [-z]]" msgstr "git worktree list [-v | --porcelain [-z]]" @@ -13486,6 +13455,37 @@ msgstr "git worktree repair [...]" msgid "git worktree unlock " msgstr "git worktree unlock " +msgid "No possible source branch, inferring '--orphan'" +msgstr "No hi ha cap branca d'origen possible, inferint «--orphan»" + +#, c-format +msgid "" +"If you meant to create a worktree containing a new orphan branch\n" +"(branch with no commits) for this repository, you can do so\n" +"using the --orphan flag:\n" +"\n" +" git worktree add --orphan -b %s %s\n" +msgstr "" +"Si voleu crear un arbre de treball que contingui una branca orfe nova\n" +"(branca sense comissions) per a aquest repositori, podeu fer-ho\n" +"utilitzant l'argument --orphan:\n" +"\n" +" git worktree add --orphan -b %s %s\n" + +#, c-format +msgid "" +"If you meant to create a worktree containing a new orphan branch\n" +"(branch with no commits) for this repository, you can do so\n" +"using the --orphan flag:\n" +"\n" +" git worktree add --orphan %s\n" +msgstr "" +"Si voleu crear un arbre de treball que contingui una branca orfe nova\n" +"(branca sense comissions) per a aquest repositori, podeu fer-ho\n" +"utilitzant l'argument --orphan:\n" +"\n" +" git worktree add --orphan %s\n" + #, c-format msgid "Removing %s/%s: %s" msgstr "S'està eliminant %s/%s: %s" @@ -13557,10 +13557,35 @@ msgstr "" msgid "Preparing worktree (checking out '%s')" msgstr "S'està preparant l'arbre de treball (s'està agafant «%s»)" +#, c-format +msgid "unreachable: invalid reference: %s" +msgstr "no accessible: referència no vàlida: %s" + #, c-format msgid "Preparing worktree (detached HEAD %s)" msgstr "S'està preparant l'arbre de treball (HEAD %s separat)" +#, c-format +msgid "" +"HEAD points to an invalid (or orphaned) reference.\n" +"HEAD path: '%s'\n" +"HEAD contents: '%s'" +msgstr "" +"HEAD apunta a una referència no vàlida (o òrfena).\n" +"Camí HEAD: «%s»\n" +"Contingut HEAD: «%s»" + +msgid "" +"No local or remote refs exist despite at least one remote\n" +"present, stopping; use 'add -f' to overide or fetch a remote first" +msgstr "" +"No hi ha referències locals o remotes malgrat que hi existeix almenys un\n" +"remot, aturat; useu «add -f» per a forcar-ho o obtenir primer un remot" + +#, c-format +msgid "'%s' and '%s' cannot be used together" +msgstr "les opcions «%s» i «%s» no es poden usar juntes" + msgid "checkout even if already checked out in other worktree" msgstr "agafa encara que sigui agafada en altre arbre de treball" @@ -13570,6 +13595,9 @@ msgstr "crea una branca nova" msgid "create or reset a branch" msgstr "crea o restableix una branca" +msgid "create unborn/orphaned branch" +msgstr "crea una branca no nascuda/òrfena" + msgid "populate the new working tree" msgstr "emplena l'arbre de treball nou" @@ -13591,6 +13619,13 @@ msgstr "" msgid "options '%s', '%s', and '%s' cannot be used together" msgstr "les opcions «%s», «%s», i «%s» no es poden usar juntes" +#, c-format +msgid "options '%s', and '%s' cannot be used together" +msgstr "les opcions «%s» i «%s» no es poden usar juntes" + +msgid "" +msgstr "" + msgid "added with --lock" msgstr "afegit amb --lock" @@ -13822,6 +13857,14 @@ msgid_plural "The bundle requires these % refs:" msgstr[0] "El farcell requereix aquesta referència:" msgstr[1] "El farcell requereix aquestes % referències:" +#, c-format +msgid "The bundle uses this hash algorithm: %s" +msgstr "El farcell utilitza aquest algoritme de resum: %s" + +#, c-format +msgid "The bundle uses this filter: %s" +msgstr "El farcell utilitza aquest filtre: %s" + msgid "unable to dup bundle descriptor" msgstr "no s'ha pogut duplicar el descriptor del farcell" @@ -14055,8 +14098,9 @@ msgstr "Imprimeix les línies coincidents amb un patró" msgid "A portable graphical interface to Git" msgstr "Una interfície gràfica portable per al Git" -msgid "Compute object ID and optionally creates a blob from a file" -msgstr "Calcula l'ID de l'objecte i opcionalment crea un blob des del fitxer" +msgid "Compute object ID and optionally create an object from a file" +msgstr "" +"Calcula l'ID de l'objecte i opcionalment crea un objecte des del fitxer" msgid "Display help information about Git" msgstr "Mostra informació d'ajuda del Git" @@ -14474,6 +14518,10 @@ msgstr "el fragment del graf de comissions no té grafs de base" msgid "commit-graph chain does not match" msgstr "la cadena del graf de comissions no coincideix" +#, c-format +msgid "commit count in base graph too high: %" +msgstr "el nombre de comissions en el graf base és massa alt: %" + #, c-format msgid "invalid commit-graph chain: line '%s' not a hash" msgstr "" @@ -14569,6 +14617,14 @@ msgid "failed to rename temporary commit-graph file" msgstr "" "no s'ha pogut canviar el nom del fitxer temporal del graf de comissions" +#, c-format +msgid "cannot merge graphs with %, % commits" +msgstr "no es poden fusionar els gràfics amb %, %entregues" + +#, c-format +msgid "cannot merge graph %s, too many commits: %" +msgstr "no es pot fusionar el graf %s, hi ha massa comissions: %" + msgid "Scanning merged commits" msgstr "S'estan escanejant les comissions fusionades" @@ -14603,9 +14659,6 @@ msgid "failed to parse commit %s from commit-graph" msgstr "" "s'ha produït un error en analitzar la comissió %s del graf de comissions" -msgid "Verifying commits in commit graph" -msgstr "S'estan verificant les comissions al graf de comissions" - #, c-format msgid "failed to parse commit %s from object database for commit-graph" msgstr "" @@ -14657,6 +14710,9 @@ msgstr "" "la data d'enviament per a la comissió %s en el graf de comissions és " "% != %" +msgid "Verifying commits in commit graph" +msgstr "S'estan verificant les comissions al graf de comissions" + #, c-format msgid "%s %s is not a commit!" msgstr "%s %s no és una comissió!" @@ -14835,7 +14891,7 @@ msgid "Invalid back reference" msgstr "Referència anterior no vàlida" msgid "Unmatched [ or [^" -msgstr "[ or [^ no emparellat" +msgstr "[ o [^ no emparellat" msgid "Unmatched ( or \\(" msgstr "( o \\( no emparellat" @@ -15613,6 +15669,12 @@ msgstr "no s'ha trobat una base de fusió" msgid "multiple merge bases found" msgstr "s'han trobat múltiples bases de fusió" +msgid "cannot compare stdin to a directory" +msgstr "no es pot comparar stdin amb un directori" + +msgid "cannot compare a named pipe to a directory" +msgstr "no es pot comparar una canonada amb nom amb un directori" + msgid "git diff --no-index [] " msgstr "git diff --no-index [] " @@ -15673,6 +15735,13 @@ msgstr "" msgid "external diff died, stopping at %s" msgstr "el diff external s'ha mort, s'està aturant a %s" +msgid "--follow requires exactly one pathspec" +msgstr "--follow requereix exactament una especificació de camí" + +#, c-format +msgid "pathspec magic not supported by --follow: %s" +msgstr "el «pathspec» màgic no està suportat per --follow: %s" + #, c-format msgid "options '%s', '%s', '%s', and '%s' cannot be used together" msgstr "les opcions «%s», «%s», «%s», i «%s» no es poden usar juntes" @@ -15687,9 +15756,6 @@ msgid "" msgstr "" "les opcions «%s» i «%s» no es poden usar juntes, useu «%s» amb «%s» i «%s»" -msgid "--follow requires exactly one pathspec" -msgstr "--follow requereix exactament una especificació de camí" - #, c-format msgid "invalid --stat value: %s" msgstr "valor --stat no vàlid: %s" @@ -16371,12 +16437,14 @@ msgstr "s'ha produït un error en processar els acks: %d" #. TRANSLATORS: The parameter will be 'ready', a protocol #. keyword. +#. #, c-format msgid "expected packfile to be sent after '%s'" msgstr "s'esperava que el fitxer de paquet s'enviés després de «%s»" #. TRANSLATORS: The parameter will be 'ready', a protocol #. keyword. +#. #, c-format msgid "expected no other sections to be sent after no '%s'" msgstr "no s'esperava que cap altra secció s'enviés després de «%s»" @@ -16971,7 +17039,7 @@ msgid "" msgstr "" "No s'ha pogut crear «%s.lock»: %s.\n" "\n" -"Sembla que un altre procés de git s'està executant en aquest\n" +"Sembla que un altre procés git s'està executant en aquest\n" "repositori, per exemple, un editor obert per «git commit». \n" "Assegureu-vos que tots els processos s'hagin acabat i\n" "llavors proveu de nou. Si encara falla, pot ser un procés git\n" @@ -17194,6 +17262,7 @@ msgstr "" #. name, and the second argument is the abbreviated id of the #. commit that needs to be merged. For example: #. - go to submodule (mysubmodule), and either merge commit abc1234" +#. #, c-format msgid "" " - go to submodule (%s), and either merge commit %s\n" @@ -17228,6 +17297,7 @@ msgstr "" #. TRANSLATORS: The %s arguments are: 1) tree hash of a merge #. base, and 2-3) the trees for the two trees we're merging. +#. #, c-format msgid "collecting merge info failed for trees %s, %s, %s" msgstr "" @@ -17701,6 +17771,7 @@ msgstr "S'està refusant reescriure les notes en %s (fora de refs/notes/)" #. TRANSLATORS: The first %s is the name of #. the environment variable, the second %s is #. its value. +#. #, c-format msgid "Bad %s value: '%s'" msgstr "Valor erroni de %s: «%s»" @@ -17919,6 +17990,7 @@ msgstr "no s'han pogut desempaquetar els continguts de %s" #. TRANSLATORS: This is a line of ambiguous object #. output shown when we cannot look up or parse the #. object in question. E.g. "deadbeef [bad object]". +#. #, c-format msgid "%s [bad object]" msgstr "%s [objecte incorrecte]" @@ -17927,6 +17999,7 @@ msgstr "%s [objecte incorrecte]" #. object output. E.g.: #. * #. "deadbeef commit 2021-01-01 - Some Commit Message" +#. #, c-format msgid "%s commit %s - %s" msgstr "%s comissió %s - %s" @@ -17941,6 +18014,7 @@ msgstr "%s comissió %s - %s" #. * #. The third argument is the "tag" string #. from object.c. +#. #, c-format msgid "%s tag %s - %s" msgstr "%s etiqueta %s - %s" @@ -17950,18 +18024,21 @@ msgstr "%s etiqueta %s - %s" #. the tag itself. E.g.: #. * #. "deadbeef [bad tag, could not parse it]" +#. #, c-format msgid "%s [bad tag, could not parse it]" msgstr "%s [etiqueta malmesa, no s'ha pogut analitzar]" #. TRANSLATORS: This is a line of ambiguous #. object output. E.g. "deadbeef tree". +#. #, c-format msgid "%s tree" msgstr "arbre %s" #. TRANSLATORS: This is a line of ambiguous #. object output. E.g. "deadbeef blob". +#. #, c-format msgid "%s blob" msgstr "blob %s" @@ -17973,6 +18050,7 @@ msgstr "l'id d'objecte curt %s és ambigu" #. TRANSLATORS: The argument is the list of ambiguous #. objects composed in show_ambiguous_object(). See #. its "TRANSLATORS" comments for details. +#. #, c-format msgid "" "The candidates are:\n" @@ -18364,6 +18442,7 @@ msgstr "ús: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. +#. #, c-format msgid " or: %s" msgstr " o: %s" @@ -18386,6 +18465,7 @@ msgstr " o: %s" #. function. The "%s" is a line in the (hopefully already #. translated) N_() usage string, which contained embedded #. newlines before we split it up. +#. #, c-format msgid "%*s%s" msgstr "%*s%s" @@ -18605,6 +18685,13 @@ msgstr "s'ha produït un error en generar el diff" msgid "could not parse log for '%s'" msgstr "no s'ha pogut llegir el fitxer de registre per a «%s»" +#, c-format +msgid "invalid extra cruft tip: '%s'" +msgstr "punta extra extra no vàlida: «%s»" + +msgid "unable to enumerate additional recent objects" +msgstr "no s'han pogut enumerar els objectes recents addicionals" + #, c-format msgid "will not add file alias '%s' ('%s' already exists in index)" msgstr "no s'afegirà l'àlies «%s»: («%s» ja existeix en l'índex)" @@ -18756,6 +18843,14 @@ msgstr "no s'han pogut corregir els bits de permisos en «%s»" msgid "%s: cannot drop to stage #0" msgstr "%s: no es pot baixar fins al «stage» #0" +#, c-format +msgid "unexpected diff status %c" +msgstr "estat de diff inesperat %c" + +#, c-format +msgid "remove '%s'\n" +msgstr "elimina «%s»\n" + msgid "" "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" "continue'.\n" @@ -18872,7 +18967,7 @@ msgid "" "\n" msgstr "" "\n" -"No obstant, si elimineu tot, s'avortarà el «rebase».\n" +"No obstant això, si elimineu tot, s'avortarà el «rebase».\n" "\n" #, c-format @@ -18959,6 +19054,22 @@ msgstr "argument %%(trailers) desconegut: %s" msgid "positive value expected contents:lines=%s" msgstr "valor positiu esperat conté:lines=%s" +#, c-format +msgid "argument expected for %s" +msgstr "s'esperava un argument per a %s" + +#, c-format +msgid "positive value expected %s=%s" +msgstr "valor positiu esperat %s=%s" + +#, c-format +msgid "cannot fully parse %s=%s" +msgstr "no es pot analitzar completament %s=%s" + +#, c-format +msgid "value expected %s=" +msgstr "s'esperava un valor %s=" + #, c-format msgid "positive value expected '%s' in %%(%s)" msgstr "valor positiu esperat «%s» a %%(%s)" @@ -19034,6 +19145,9 @@ msgstr "aquesta ordre rebutja l'àtom %%(%.*s)" msgid "--format=%.*s cannot be used with --python, --shell, --tcl" msgstr "no es pot usar --format=%.*s amb --python, --shell, --tcl" +msgid "failed to run 'describe'" +msgstr "no s'ha pogut executar «describe»" + #, c-format msgid "(no branch, rebasing %s)" msgstr "(sense branca, s'està fent «rebase» %s)" @@ -19095,6 +19209,9 @@ msgstr "clau" msgid "field name to sort on" msgstr "nom del camp en el qual ordenar" +msgid "exclude refs which match pattern" +msgstr "exclou refs que coincideixin amb el patró" + #, c-format msgid "not a reflog: %s" msgstr "no és un registre de referència: %s" @@ -19371,6 +19488,7 @@ msgstr "" #. TRANSLATORS: "matches '%s'%" is the part of "git push #. :" push, and "being pushed ('%s')" is #. the . +#. #, c-format msgid "" "The destination you provided is not a full refname (i.e.,\n" @@ -19547,8 +19665,10 @@ msgstr[1] "" "La vostra branca i «%s» han divergit,\n" "i tenen %d i %d comissions distintes cada una, respectivament.\n" -msgid " (use \"git pull\" to merge the remote branch into yours)\n" -msgstr " (useu «git pull» per a fusionar la branca remota amb la vostra)\n" +msgid "" +" (use \"git pull\" if you want to integrate the remote branch with yours)\n" +msgstr "" +" (utilitzeu «git pull» si voleu integrar la branca remota amb la vostra)\n" #, c-format msgid "cannot parse expected object name '%s'" @@ -19660,6 +19780,10 @@ msgstr "no s'ha pogut obtenir la comissió per a l'argument d'ancestry-path %s" msgid "--unpacked= no longer supported" msgstr "--unpacked= ja no s'admet" +#, c-format +msgid "invalid option '%s' in --stdin mode" +msgstr "opció no vàlida: «%s» en mode --stdin" + msgid "your current branch appears to be broken" msgstr "la vostra branca actual sembla malmesa" @@ -19975,6 +20099,7 @@ msgstr "cometeu els vostres canvis o feu un «stash» per a procedir." #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase". +#. #, c-format msgid "%s: Unable to write new index file" msgstr "%s: No s'ha pogut escriure un fitxer d'índex nou" @@ -20817,6 +20942,77 @@ msgstr "el «fork» ha fallat" msgid "setsid failed" msgstr "«setsid» ha fallat" +#, c-format +msgid "cannot stat template '%s'" +msgstr "no es pot fer stat en la plantilla «%s»" + +#, c-format +msgid "cannot opendir '%s'" +msgstr "no es pot fer opendir en el directori «%s»" + +#, c-format +msgid "cannot readlink '%s'" +msgstr "no es pot fer readlink en «%s»" + +#, c-format +msgid "cannot symlink '%s' '%s'" +msgstr "no es pot fer symlink en «%s» «%s»" + +#, c-format +msgid "cannot copy '%s' to '%s'" +msgstr "no es pot copiar «%s» a «%s»" + +#, c-format +msgid "ignoring template %s" +msgstr "s'està ignorant la plantilla %s" + +#, c-format +msgid "templates not found in %s" +msgstr "plantilles no trobades a %s" + +#, c-format +msgid "not copying templates from '%s': %s" +msgstr "no s'estan copiant plantilles de «%s»: %s" + +#, c-format +msgid "invalid initial branch name: '%s'" +msgstr "nom de branca inicial no vàlid: «%s»" + +#, c-format +msgid "unable to handle file type %d" +msgstr "no s'ha pogut gestionar el tipus de fitxer %d" + +#, c-format +msgid "unable to move %s to %s" +msgstr "no s'ha pogut moure %s a %s" + +msgid "attempt to reinitialize repository with different hash" +msgstr "s'ha intentat reinicialitzar el repositori amb un resum diferent" + +#, c-format +msgid "%s already exists" +msgstr "%s ja existeix" + +#, c-format +msgid "re-init: ignored --initial-branch=%s" +msgstr "reinicialització: s'ha ignorat --initial-branch=%s" + +#, c-format +msgid "Reinitialized existing shared Git repository in %s%s\n" +msgstr "S'ha reinicialitzat el repositori compartit existent del Git en %s%s\n" + +#, c-format +msgid "Reinitialized existing Git repository in %s%s\n" +msgstr "S'ha reinicialitzat el repositori existent del Git en %s%s\n" + +#, c-format +msgid "Initialized empty shared Git repository in %s%s\n" +msgstr "S'ha inicialitzat un repositori compartit buit del Git en %s%s\n" + +#, c-format +msgid "Initialized empty Git repository in %s%s\n" +msgstr "S'ha inicialitzat un repositori buit del Git en %s%s\n" + #, c-format msgid "index entry is a directory, but not sparse (%08x)" msgstr "l'entrada d'índex és un directori, però no dispers (%08x)" diff --git a/po/de.po b/po/de.po index 2ef0dc7a72..f7e49ce4a5 100644 --- a/po/de.po +++ b/po/de.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List \n" -"POT-Creation-Date: 2023-05-22 17:14+0200\n" -"PO-Revision-Date: 2023-05-22 17:16+0200\n" +"POT-Creation-Date: 2023-08-17 16:53+0200\n" +"PO-Revision-Date: 2023-08-17 16:55+0200\n" "Last-Translator: Ralf Thielow \n" "Language-Team: German\n" "Language: de\n" @@ -17,7 +17,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n!=1);\n" -"X-Generator: Poedit 3.3.1\n" +"X-Generator: Poedit 3.3.2\n" #, c-format msgid "Huh (%s)?" @@ -664,9 +664,9 @@ msgid "Reverting is not possible because you have unmerged files." msgstr "" "Reverten ist nicht möglich, weil Sie nicht zusammengeführte Dateien haben." -#, 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." +msgid "Rebasing is not possible because you have unmerged files." +msgstr "" +"Rebase ist nicht möglich, weil Sie nicht zusammengeführte Dateien haben." msgid "" "Fix them up in the work tree, and then use 'git add/rm '\n" @@ -816,6 +816,12 @@ msgstr "die Optionen '%s' und '%s' können nicht gemeinsam verwendet werden" msgid "'%s' outside a repository" msgstr "'%s' außerhalb eines Repositories" +msgid "failed to read patch" +msgstr "Patch konnte nicht gelesen werden" + +msgid "patch too large" +msgstr "Patch zu groß" + #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "Kann regulären Ausdruck für Zeitstempel %s nicht verarbeiten" @@ -1692,12 +1698,10 @@ msgstr "" msgid "not tracking: ambiguous information for ref '%s'" msgstr "kein Tracking: mehrdeutige Informationen für Referenz '%s'" -#. #-#-#-#-# branch.c.po #-#-#-#-# #. TRANSLATORS: This is a line listing a remote with duplicate #. refspecs in the advice message below. For RTL languages you'll #. probably want to swap the "%s" and leading " " space around. #. -#. #-#-#-#-# object-name.c.po #-#-#-#-# #. TRANSLATORS: This is line item of ambiguous object output #. from describe_ambiguous_object() above. For RTL languages #. you'll probably want to swap the "%s" and leading " " space @@ -1740,9 +1744,10 @@ msgid "a branch named '%s' already exists" msgstr "Branch '%s' existiert bereits" #, c-format -msgid "cannot force update the branch '%s' checked out at '%s'" +msgid "cannot force update the branch '%s' used by worktree at '%s'" msgstr "" -"kann Aktualisierung des Branches '%s' nicht erzwingen, ausgecheckt in '%s'" +"Aktualisierung des vom Arbeitsverzeichnis '%2$s' verwendete Branch '%1$s' " +"kann nicht erzwungen werden" #, c-format msgid "cannot set up tracking information; starting point '%s' is not a branch" @@ -1812,17 +1817,6 @@ msgstr "git add [] [--] ..." msgid "cannot chmod %cx '%s'" msgstr "kann chmod %cx '%s' nicht ausführen" -#, c-format -msgid "unexpected diff status %c" -msgstr "unerwarteter Differenz-Status %c" - -msgid "updating files failed" -msgstr "Aktualisierung der Dateien fehlgeschlagen" - -#, c-format -msgid "remove '%s'\n" -msgstr "lösche '%s'\n" - msgid "Unstaged changes after refreshing the index:" msgstr "" "Nicht zum Commit vorgemerkte Änderungen nach Aktualisierung der Staging-Area:" @@ -2270,9 +2264,6 @@ msgstr "-m an git-mailinfo übergeben" msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "--keep-cr an git-mailsplit für mbox-Format übergeben" -msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" -msgstr "kein --keep-cr an git-mailsplit übergeben, unabhängig von am.keepcr" - msgid "strip everything before a scissors line" msgstr "alles vor einer Scheren-Zeile entfernen" @@ -3333,12 +3324,12 @@ msgid "" "git cat-file (--batch | --batch-check | --batch-command) [--batch-all-" "objects]\n" " [--buffer] [--follow-symlinks] [--unordered]\n" -" [--textconv | --filters] [-z]" +" [--textconv | --filters] [-Z]" msgstr "" "git cat-file (--batch | --batch-check | --batch-command) [--batch-all-" "objects]\n" " [--buffer] [--follow-symlinks] [--unordered]\n" -" [--textconv | --filters] [-z]" +" [--textconv | --filters] [-Z]" msgid "" "git cat-file (--textconv | --filters)\n" @@ -3385,6 +3376,9 @@ msgstr "wie --batch, aber keine Ausgabe von " msgid "stdin is NUL-terminated" msgstr "stdin endet mit NUL" +msgid "stdin and stdout is NUL-terminated" +msgstr "stdin und stdout sind NUL-beendet" + msgid "read commands from stdin" msgstr "Befehle von der Standard-Eingabe lesen" @@ -4269,12 +4263,6 @@ msgstr "serverspezifisch" msgid "option to transmit" msgstr "Option übertragen" -msgid "use IPv4 addresses only" -msgstr "nur IPv4-Adressen benutzen" - -msgid "use IPv6 addresses only" -msgstr "nur IPv6-Adressen benutzen" - msgid "apply partial clone filters to submodules" msgstr "partielle Klonfilter auf Submodule anwenden" @@ -4738,6 +4726,9 @@ msgstr "" " git cherry-pick --skip\n" "\n" +msgid "updating files failed" +msgstr "Aktualisierung der Dateien fehlgeschlagen" + msgid "failed to unpack HEAD tree object" msgstr "Fehler beim Entpacken des Tree-Objektes von HEAD." @@ -4798,8 +4789,8 @@ msgstr "" "der aktuellen Commit-Beschreibung verwendet wird." #, c-format -msgid "could not lookup commit %s" -msgstr "Konnte Commit %s nicht nachschlagen" +msgid "could not lookup commit '%s'" +msgstr "konnte Commit '%s' nicht nachschlagen" #, c-format msgid "(reading log message from standard input)\n" @@ -6889,7 +6880,6 @@ msgstr "grep: Fehler beim Erzeugen eines Thread: %s" msgid "invalid number of threads specified (%d) for %s" msgstr "ungültige Anzahl von Threads (%d) für %s angegeben" -#. #-#-#-#-# grep.c.po #-#-#-#-# #. TRANSLATORS: %s is the configuration #. variable for tweaking threads, currently #. grep.threads @@ -7464,77 +7454,6 @@ msgstr "--verify wurde ohne Namen der Paketdatei angegeben" msgid "fsck error in pack objects" msgstr "fsck Fehler beim Packen von Objekten" -#, c-format -msgid "cannot stat template '%s'" -msgstr "kann Vorlage '%s' nicht lesen" - -#, c-format -msgid "cannot opendir '%s'" -msgstr "kann Verzeichnis '%s' nicht öffnen" - -#, c-format -msgid "cannot readlink '%s'" -msgstr "kann Verweis '%s' nicht lesen" - -#, c-format -msgid "cannot symlink '%s' '%s'" -msgstr "kann symbolische Verknüpfung '%s' auf '%s' nicht erstellen" - -#, c-format -msgid "cannot copy '%s' to '%s'" -msgstr "kann '%s' nicht nach '%s' kopieren" - -#, c-format -msgid "ignoring template %s" -msgstr "ignoriere Vorlage %s" - -#, c-format -msgid "templates not found in %s" -msgstr "Keine Vorlagen in %s gefunden." - -#, c-format -msgid "not copying templates from '%s': %s" -msgstr "kopiere keine Vorlagen von '%s': %s" - -#, c-format -msgid "invalid initial branch name: '%s'" -msgstr "ungültiger initialer Branchname: '%s'" - -#, c-format -msgid "unable to handle file type %d" -msgstr "kann nicht mit Dateityp %d umgehen" - -#, c-format -msgid "unable to move %s to %s" -msgstr "Konnte %s nicht nach %s verschieben" - -msgid "attempt to reinitialize repository with different hash" -msgstr "Versuch, das Repository mit einem anderen Hash zu reinitialisieren" - -#, c-format -msgid "%s already exists" -msgstr "%s existiert bereits" - -#, c-format -msgid "re-init: ignored --initial-branch=%s" -msgstr "Neu-Initialisierung: --initial-branch=%s ignoriert" - -#, c-format -msgid "Reinitialized existing shared Git repository in %s%s\n" -msgstr "Bestehendes verteiltes Git-Repository in %s%s neuinitialisiert\n" - -#, c-format -msgid "Reinitialized existing Git repository in %s%s\n" -msgstr "Bestehendes Git-Repository in %s%s neuinitialisiert\n" - -#, c-format -msgid "Initialized empty shared Git repository in %s%s\n" -msgstr "Leeres verteiltes Git-Repository in %s%s initialisiert\n" - -#, c-format -msgid "Initialized empty Git repository in %s%s\n" -msgstr "Leeres Git-Repository in %s%s initialisiert\n" - msgid "" "git init [-q | --quiet] [--bare] [--template=]\n" " [--separate-git-dir ] [--object-format=]\n" @@ -7973,6 +7892,10 @@ msgstr "" "Konnte gefolgten Remote-Branch nicht finden, bitte geben Sie " "manuell an.\n" +#, c-format +msgid "could not get object info about '%s'" +msgstr "konnte Objekt-Informationen über '%s' nicht bestimmen" + #, c-format msgid "bad ls-files format: element '%s' does not start with '('" msgstr "ungültiges ls-files-Format: Element '%s' fängt nicht mit '(' an" @@ -8122,10 +8045,6 @@ msgstr "zusätzlich zum Objekt die darauf verweisenden Referenzen anzeigen" msgid "git ls-tree [] [...]" msgstr "git ls-tree [] [...]" -#, c-format -msgid "could not get object info about '%s'" -msgstr "konnte Objekt-Informationen über '%s' nicht bestimmen" - #, c-format msgid "bad ls-tree format: element '%s' does not start with '('" msgstr "ungültiges ls-tree-Format: Element '%s' fängt nicht mit '(' an" @@ -8871,22 +8790,26 @@ msgid "git notes [--ref ] [list []]" msgstr "git notes [--ref ] [list []]" msgid "" -"git notes [--ref ] add [-f] [--allow-empty] [-m | -F " -"| (-c | -C) ] []" +"git notes [--ref ] add [-f] [--allow-empty] [--[no-]separator|--" +"separator=] [--[no-]stripspace] [-m | -F | (-c " +"| -C) ] []" msgstr "" -"git notes [--ref ] add [-f] [--allow-empty] [-m " -" | -F | (-c | -C) ] []" +"git notes [--ref ] add [-f] [--allow-empty] [--" +"[no-]separator|--separator=] [--[no-]stripspace] [-m " +" | -F | (-c | -C) ] []" msgid "git notes [--ref ] copy [-f] " msgstr "" "git notes [--ref ] copy [-f] " msgid "" -"git notes [--ref ] append [--allow-empty] [-m | -F | " -"(-c | -C) ] []" +"git notes [--ref ] append [--allow-empty] [--[no-]separator|--" +"separator=] [--[no-]stripspace] [-m | -F | (-c " +"| -C) ] []" msgstr "" -"git notes [--ref ] append [--allow-empty] [-m " -"| -F | (-c | -C) ] []" +"git notes [--ref ] append [--allow-empty] [--" +"[no-]separator|--separator=] [--[no-]stripspace] [-m " +" | -F | (-c | -C) ] []" msgid "git notes [--ref ] edit [--allow-empty] []" msgstr "git notes [--ref ] edit [--allow-empty] []" @@ -9021,6 +8944,15 @@ msgstr "Speichern leerer Notiz erlauben" msgid "replace existing notes" msgstr "existierende Notizen ersetzen" +msgid "" +msgstr "" + +msgid "insert between paragraphs" +msgstr " zwischen Absätzen einfügen" + +msgid "remove unnecessary whitespace" +msgstr "unnötigen Whitespace entfernen" + #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -9595,8 +9527,11 @@ msgstr "" msgid "refusing to run without --i-still-use-this" msgstr "Ausführung ohne --i-still-use-this verweigert" -msgid "git pack-refs [--all] [--no-prune]" -msgstr "git pack-refs [--all] [--no-prune]" +msgid "" +"git pack-refs [--all] [--no-prune] [--include ] [--exclude " +"]" +msgstr "" +"git pack-refs [--all] [--no-prune] [--include ] [--exclude ]" msgid "pack everything" msgstr "alles packen" @@ -9604,6 +9539,12 @@ msgstr "alles packen" msgid "prune loose refs (default)" msgstr "lose Referenzen entfernen (Standard)" +msgid "references to include" +msgstr "einzubeziehende Referenzen" + +msgid "references to exclude" +msgstr "Referenzen zum Ausschluss" + msgid "git patch-id [--stable | --unstable | --verbatim]" msgstr "git patch-id [--stable | --unstable | --verbatim]" @@ -9663,6 +9604,12 @@ msgstr "das Überschreiben von lokalen Branches erzwingen" msgid "number of submodules pulled in parallel" msgstr "Anzahl der parallel mit 'pull' zu verarbeitenden Submodule" +msgid "use IPv4 addresses only" +msgstr "nur IPv4-Adressen benutzen" + +msgid "use IPv6 addresses only" +msgstr "nur IPv6-Adressen benutzen" + msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." @@ -9938,35 +9885,37 @@ msgstr "" msgid "" "Updates were rejected because the tip of your current branch is behind\n" -"its remote counterpart. Integrate the remote changes (e.g.\n" -"'git pull ...') before pushing again.\n" +"its remote counterpart. If you want to integrate the remote changes,\n" +"use 'git pull' before pushing again.\n" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" "Aktualisierungen wurden zurückgewiesen, weil die Spitze Ihres aktuellen\n" -"Branches hinter seinem externen Gegenstück zurückgefallen ist. Führen Sie\n" -"die externen Änderungen zusammen (z. B. 'git pull ...') bevor Sie \"push\"\n" -"erneut ausführen.\n" -"Siehe auch die Sektion 'Note about fast-forwards' in 'git push --help'\n" -"für weitere Details." +"Branches hinter seinem externen Gegenstück zurückgefallen ist. Wenn Sie\n" +"die externen Änderungen integrieren wollen, verwenden Sie 'git pull' bevor\n" +"Sie erneut push ausführen.\n" +"Siehe auch die Sektion 'Note about fast-forwards' in 'git push --help' für " +"weitere\n" +"Informationen." 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" -"(e.g. 'git pull ...') before pushing again.\n" +"counterpart. If you want to integrate the remote changes, use 'git pull'\n" +"before pushing again.\n" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" "Aktualisierungen wurden zurückgewiesen, weil die Spitze eines versendeten\n" -"Branches hinter seinem externen Gegenstück zurückgefallen ist. Checken Sie\n" -"diesen Branch aus und führen Sie die externen Änderungen zusammen\n" -"(z. B. 'git pull ...') bevor Sie erneut \"push\" ausführen.\n" -"Siehe auch die Sektion 'Note about fast-forwards' in 'git push --help'\n" -"für weitere Details." +"Branches hinter seinem externen Gegenstück zurückgefallen ist. Wenn Sie die\n" +"externen Änderungen integrieren wollen, verwenden Sie 'git pull'\n" +"bevor Sie erneut push ausführen.\n" +"Siehe auch die Sektion 'Note about fast-forwards' in 'git push --help' für " +"weitere\n" +"Informationen." 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" -"to the same ref. You may want to first integrate the remote changes\n" -"(e.g., 'git pull ...') before pushing again.\n" +"Updates were rejected because the remote contains work that you do not\n" +"have locally. This is usually caused by another repository pushing to\n" +"the same ref. If you want to integrate the remote changes, use\n" +"'git pull' before pushing again.\n" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" "Aktualisierungen wurden zurückgewiesen, weil das Remote-Repository Commits " @@ -9974,11 +9923,12 @@ msgstr "" "die lokal nicht vorhanden sind. Das wird üblicherweise durch einen \"push\" " "von\n" "Commits auf dieselbe Referenz von einem anderen Repository aus verursacht.\n" -"Vielleicht müssen Sie die externen Änderungen zusammenführen (z. B. 'git " -"pull ...')\n" -"bevor Sie erneut \"push\" ausführen.\n" -"Siehe auch die Sektion 'Note about fast-forwards' in 'git push --help'\n" -"für weitere Details." +"Wenn Sie die externen Änderungen integrieren wollen, verwenden Sie 'git " +"pull'\n" +"bevor Sie erneut push ausführen.\n" +"Siehe auch die Sektion 'Note about fast-forwards' in 'git push --help' für " +"weitere\n" +"Informationen." msgid "Updates were rejected because the tag already exists in the remote." msgstr "" @@ -9995,15 +9945,21 @@ msgstr "" "die Option '--force' zu verwenden.\n" msgid "" -"Updates were rejected because the tip of the remote-tracking\n" -"branch has been updated since the last checkout. You may want\n" -"to integrate those changes locally (e.g., 'git pull ...')\n" -"before forcing an update.\n" +"Updates were rejected because the tip of the remote-tracking branch has\n" +"been updated since the last checkout. If you want to integrate the\n" +"remote changes, use 'git pull' before pushing again.\n" +"See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" -"Aktualisierungen wurden zurückgewiesen, weil die Spitze des Remote-\n" -"Tracking-Branches seit dem letzen Checkout aktualisiert wurde. Sie möchten\n" -"diese Änderungen vielleicht lokal integrieren (z. B. 'git pull ...') bevor\n" -"Sie die Änderungen erzwingen.\n" +"Aktualisierungen wurden zurückgewiesen, weil die Spitze des Remote-" +"Tracking-\n" +"Branches seit dem letzten Auschecken aktualisiert wurde. Wenn Sie die " +"externen\n" +"Änderungen integrieren wollen, verwenden Sie 'git pull' bevor Sie erneut " +"push\n" +"ausführen.\n" +"Siehe auch die Sektion 'Note about fast-forwards' in 'git push --help' für " +"weitere\n" +"Informationen." #, c-format msgid "Pushing to %s\n" @@ -10886,11 +10842,12 @@ msgstr "unbekanntes Argument für Option mirror: %s" msgid "fetch the remote branches" msgstr "die Remote-Branches anfordern" -msgid "import all tags and associated objects when fetching" -msgstr "alle Tags und verbundene Objekte beim Anfordern importieren" - -msgid "or do not fetch any tag at all (--no-tags)" -msgstr "oder fordere gar keine Tags an (--no-tags)" +msgid "" +"import all tags and associated objects when fetching\n" +"or do not fetch any tag at all (--no-tags)" +msgstr "" +"alle Tags und zugehörigen Objekte beim Abruf importieren\n" +"oder überhaupt keine Tags abrufen (--no-tags)" msgid "branch(es) to track" msgstr "Branch(es) zur Übernahme" @@ -12875,6 +12832,10 @@ msgstr "Überspringe nicht zusammengeführtes Submodul %s" msgid "Skipping submodule '%s'" msgstr "Überspringe Submodul '%s'" +#, c-format +msgid "cannot clone submodule '%s' without a URL" +msgstr "kann Submodul '%s' nicht ohne URL klonen" + #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "Fehler beim Klonen von '%s'. Weiterer Versuch geplant" @@ -13649,11 +13610,12 @@ msgstr "Tag-Inhalte ausgeben" msgid "" "git worktree add [-f] [--detach] [--checkout] [--lock [--reason ]]\n" -" [-b ] []" +" [--orphan] [(-b | -B) ] []" msgstr "" "git worktree add [-f] [--detach] [--checkout] [--lock [--reason " "]]\n" -" [-b ] []" +" [--orphan] [(-b | -B) ] []" msgid "git worktree list [-v | --porcelain [-z]]" msgstr "git worktree list [-v | --porcelain [-z]]" @@ -13676,6 +13638,41 @@ msgstr "git worktree repair [...]" msgid "git worktree unlock " msgstr "git worktree unlock " +msgid "No possible source branch, inferring '--orphan'" +msgstr "Kein möglicher Quell-Branch, der auf '--orphan' schließen lässt" + +#, c-format +msgid "" +"If you meant to create a worktree containing a new orphan branch\n" +"(branch with no commits) for this repository, you can do so\n" +"using the --orphan flag:\n" +"\n" +" git worktree add --orphan -b %s %s\n" +msgstr "" +"Wenn Sie ein Arbeitsverzeichnis erstellen möchten, um einen neuen verwaisten " +"Branch\n" +"(Branch ohne Commits) für dieses Repository zu erstellen, können Sie dies " +"mit\n" +"der Option --orphan tun:\n" +"\n" +" git worktree add --orphan -b %s %s\n" + +#, c-format +msgid "" +"If you meant to create a worktree containing a new orphan branch\n" +"(branch with no commits) for this repository, you can do so\n" +"using the --orphan flag:\n" +"\n" +" git worktree add --orphan %s\n" +msgstr "" +"Wenn Sie ein Arbeitsverzeichnis erstellen möchten, um einen neuen verwaisten " +"Branch\n" +"(Branch ohne Commits) für dieses Repository zu erstellen, können Sie dies " +"mit\n" +"der Option --orphan tun:\n" +"\n" +" git worktree add --orphan %s\n" + #, c-format msgid "Removing %s/%s: %s" msgstr "Entferne %s/%s: %s" @@ -13746,10 +13743,38 @@ msgstr "Bereite Arbeitsverzeichnis vor (setze Branch '%s' um; war bei %s)" msgid "Preparing worktree (checking out '%s')" msgstr "Bereite Arbeitsverzeichnis vor (checke '%s' aus)" +#, c-format +msgid "unreachable: invalid reference: %s" +msgstr "unerreichbar: ungültige Referenz: %s" + #, c-format msgid "Preparing worktree (detached HEAD %s)" msgstr "Bereite Arbeitsverzeichnis vor (losgelöster HEAD %s)" +#, c-format +msgid "" +"HEAD points to an invalid (or orphaned) reference.\n" +"HEAD path: '%s'\n" +"HEAD contents: '%s'" +msgstr "" +"HEAD zeigt auf eine ungültige (oder verwaiste) Referenz.\n" +"HEAD-Pfad: '%s'\n" +"HEAD Inhalte: '%s'" + +msgid "" +"No local or remote refs exist despite at least one remote\n" +"present, stopping; use 'add -f' to overide or fetch a remote first" +msgstr "" +"Es gibt keine lokalen oder entfernten Referenzen, obwohl mindestens ein " +"Remote-Repository\n" +"vorhanden ist. Angehalten. Verwenden Sie 'add -f', um eine entfernte " +"Referenz zu überschreiben\n" +"oder rufen Sie diese zuerst ab" + +#, c-format +msgid "'%s' and '%s' cannot be used together" +msgstr "'%s' und '%s' können nicht zusammen verwendet werden" + msgid "checkout even if already checked out in other worktree" msgstr "" " auschecken, auch wenn dieser bereits in einem anderen " @@ -13761,6 +13786,9 @@ msgstr "neuen Branch erstellen" msgid "create or reset a branch" msgstr "Branch erstellen oder umsetzen" +msgid "create unborn/orphaned branch" +msgstr "ungeborenen/verwaisten Branch erstellen" + msgid "populate the new working tree" msgstr "das neue Arbeitsverzeichnis auschecken" @@ -13783,6 +13811,13 @@ msgid "options '%s', '%s', and '%s' cannot be used together" msgstr "" "die Optionen '%s', '%s' und '%s' können nicht gemeinsam verwendet werden" +#, c-format +msgid "options '%s', and '%s' cannot be used together" +msgstr "die Optionen '%s' und '%s' können nicht gemeinsam verwendet werden" + +msgid "" +msgstr "" + msgid "added with --lock" msgstr "mit --lock hinzugefügt" @@ -14022,6 +14057,14 @@ msgid_plural "The bundle requires these % refs:" msgstr[0] "Das Paket benötigt diese Referenz:" msgstr[1] "Das Paket benötigt diese % Referenzen:" +#, c-format +msgid "The bundle uses this hash algorithm: %s" +msgstr "Das Paket verwendet diesen Hash-Algorithmus: %s" + +#, c-format +msgid "The bundle uses this filter: %s" +msgstr "Das Paket verwendet diesen Filter: %s" + msgid "unable to dup bundle descriptor" msgstr "konnte dup für Descriptor des Pakets nicht ausführen" @@ -14261,9 +14304,10 @@ msgstr "Zeilen darstellen, die einem Muster entsprechen" msgid "A portable graphical interface to Git" msgstr "eine portable grafische Schnittstelle zu Git" -msgid "Compute object ID and optionally creates a blob from a file" +msgid "Compute object ID and optionally create an object from a file" msgstr "" -"von einer Datei die Objekt-ID berechnen und optional ein Blob erstellen" +"Berechnung der Objekt-ID und optionales Erstellen eines Objekts aus einer " +"Datei" msgid "Display help information about Git" msgstr "Hilfsinformationen über Git anzeigen" @@ -14687,6 +14731,10 @@ msgstr "Commit-Graph hat keinen Basis-Graph-Chunk" msgid "commit-graph chain does not match" msgstr "Commit-Graph Verkettung stimmt nicht überein" +#, c-format +msgid "commit count in base graph too high: %" +msgstr "Anzahl der Commits im Basisgraph zu hoch: %" + #, c-format msgid "invalid commit-graph chain: line '%s' not a hash" msgstr "Ungültige Commit-Graph Verkettung: Zeile '%s' ist kein Hash" @@ -14770,6 +14818,17 @@ msgstr "konnte Basis-Commit-Graph-Datei nicht umbenennen" msgid "failed to rename temporary commit-graph file" msgstr "konnte temporäre Commit-Graph-Datei nicht umbenennen" +#, c-format +msgid "cannot merge graphs with %, % commits" +msgstr "" +"Graphen mit %, % Commits können nicht zusammengeführt " +"werden" + +#, c-format +msgid "cannot merge graph %s, too many commits: %" +msgstr "" +"Graph %s kann nicht zusammengeführt werden, zu viele Commits: %" + msgid "Scanning merged commits" msgstr "Durchsuche zusammengeführte Commits" @@ -14801,9 +14860,6 @@ msgstr "Commit-Graph hat fehlerhaften Fanout-Wert: fanout[%d] = %u != %u" msgid "failed to parse commit %s from commit-graph" msgstr "konnte Commit %s von Commit-Graph nicht parsen" -msgid "Verifying commits in commit graph" -msgstr "Commit in Commit-Graph überprüfen" - #, c-format msgid "failed to parse commit %s from object database for commit-graph" msgstr "" @@ -14849,6 +14905,9 @@ msgid "commit date for commit %s in commit-graph is % != %" msgstr "" "Commit-Datum für Commit %s in Commit-Graph ist % != %" +msgid "Verifying commits in commit graph" +msgstr "Commit in Commit-Graph überprüfen" + #, c-format msgid "%s %s is not a commit!" msgstr "%s %s ist kein Commit!" @@ -15816,6 +15875,12 @@ msgstr "keine Merge-Basis gefunden" msgid "multiple merge bases found" msgstr "mehrere Merge-Basen gefunden" +msgid "cannot compare stdin to a directory" +msgstr "kann stdin nicht mit einem Verzeichnis vergleichen" + +msgid "cannot compare a named pipe to a directory" +msgstr "kann eine benannte Pipe nicht mit einem Verzeichnis vergleichen" + msgid "git diff --no-index [] " msgstr "git diff --no-index [] " @@ -15873,6 +15938,13 @@ msgstr "" msgid "external diff died, stopping at %s" msgstr "externes Diff-Programm unerwartet beendet, angehalten bei %s" +msgid "--follow requires exactly one pathspec" +msgstr "--follow erfordert genau eine Pfadspezifikation" + +#, c-format +msgid "pathspec magic not supported by --follow: %s" +msgstr "Magie von Pfadspezifikationen wird von --follow nicht unterstützt: %s" + #, c-format msgid "options '%s', '%s', '%s', and '%s' cannot be used together" msgstr "" @@ -15892,9 +15964,6 @@ msgstr "" "die Optionen '%s' und '%s' können nicht gemeinsam verwendet werden, nutzen " "Sie '%s' mit '%s' und '%s'" -msgid "--follow requires exactly one pathspec" -msgstr "--follow erfordert genau eine Pfadspezifikation" - #, c-format msgid "invalid --stat value: %s" msgstr "Ungültiger --stat Wert: %s" @@ -17404,7 +17473,7 @@ msgstr "" #. conflict in a submodule. The first argument is the submodule #. name, and the second argument is the abbreviated id of the #. commit that needs to be merged. For example: -#. - go to submodule (mysubmodule), and either merge commit abc1234" +#. - go to submodule (mysubmodule), and either merge commit abc1234" #. #, c-format msgid "" @@ -18145,7 +18214,7 @@ msgstr "%s [ungültiges Objekt]" #. TRANSLATORS: This is a line of ambiguous commit #. object output. E.g.: #. * -#. "deadbeef commit 2021-01-01 - Some Commit Message" +#. "deadbeef commit 2021-01-01 - Some Commit Message" #. #, c-format msgid "%s commit %s - %s" @@ -18154,7 +18223,7 @@ msgstr "%s Commit %s - %s" #. TRANSLATORS: This is a line of ambiguous #. tag object output. E.g.: #. * -#. "deadbeef tag 2022-01-01 - Some Tag Message" +#. "deadbeef tag 2022-01-01 - Some Tag Message" #. * #. The second argument is the YYYY-MM-DD found #. in the tag. @@ -18170,7 +18239,7 @@ msgstr "%s Tag %s - %s" #. tag object output where we couldn't parse #. the tag itself. E.g.: #. * -#. "deadbeef [bad tag, could not parse it]" +#. "deadbeef [bad tag, could not parse it]" #. #, c-format msgid "%s [bad tag, could not parse it]" @@ -18827,6 +18896,13 @@ msgstr "Fehler beim Generieren des Diffs." msgid "could not parse log for '%s'" msgstr "Konnte Log für '%s' nicht parsen." +#, c-format +msgid "invalid extra cruft tip: '%s'" +msgstr "ungültiger zusätzlicher Schrotthinweis: '%s'" + +msgid "unable to enumerate additional recent objects" +msgstr "zusätzliche neue Objekte konnten nicht aufgezählt werden" + #, c-format msgid "will not add file alias '%s' ('%s' already exists in index)" msgstr "" @@ -18980,6 +19056,14 @@ msgstr "Konnte Zugriffsberechtigung auf '%s' nicht setzen." msgid "%s: cannot drop to stage #0" msgstr "%s: Kann nicht auf Stufe #0 wechseln." +#, c-format +msgid "unexpected diff status %c" +msgstr "unerwarteter Differenz-Status %c" + +#, c-format +msgid "remove '%s'\n" +msgstr "lösche '%s'\n" + msgid "" "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" "continue'.\n" @@ -19180,6 +19264,22 @@ msgstr "unbekanntes %%(trailers) Argument: %s" msgid "positive value expected contents:lines=%s" msgstr "Positiver Wert erwartet contents:lines=%s" +#, c-format +msgid "argument expected for %s" +msgstr "Argument erwartet für %s" + +#, c-format +msgid "positive value expected %s=%s" +msgstr "positiver Wert erwartet %s=%s" + +#, c-format +msgid "cannot fully parse %s=%s" +msgstr "kann %s=%s nicht vollständig parsen" + +#, c-format +msgid "value expected %s=" +msgstr "Wert erwartet %s=" + #, c-format msgid "positive value expected '%s' in %%(%s)" msgstr "positiver Wert erwartet '%s' in %%(%s)" @@ -19254,6 +19354,9 @@ msgstr "dieser Befehl lehnt Atom ab %%(%.*s)" msgid "--format=%.*s cannot be used with --python, --shell, --tcl" msgstr "--format=%.*s kann nicht mit --python, --shell, --tcl verwendet werden" +msgid "failed to run 'describe'" +msgstr "'describe' konnte nicht ausgeführt werden" + #, c-format msgid "(no branch, rebasing %s)" msgstr "(kein Branch, Rebase von %s)" @@ -19315,6 +19418,9 @@ msgstr "Schüssel" msgid "field name to sort on" msgstr "sortiere nach diesem Feld" +msgid "exclude refs which match pattern" +msgstr "Ausschluss von Referenzen, die dem Muster entsprechen" + #, c-format msgid "not a reflog: %s" msgstr "Kein Reflog: %s" @@ -19772,10 +19878,11 @@ msgstr[1] "" "Ihr Branch und '%s' sind divergiert,\n" "und haben jeweils %d und %d unterschiedliche Commits.\n" -msgid " (use \"git pull\" to merge the remote branch into yours)\n" +msgid "" +" (use \"git pull\" if you want to integrate the remote branch with yours)\n" msgstr "" -" (benutzen Sie \"git pull\", um Ihren Branch mit dem Remote-Branch " -"zusammenzuführen)\n" +" (verwenden Sie \"git pull\", wenn Sie den Remote-Branch in Ihren " +"integrieren wollen)\n" #, c-format msgid "cannot parse expected object name '%s'" @@ -19887,6 +19994,10 @@ msgstr "konnte kein Commit für das Argument ancestry-path %s erhalten" msgid "--unpacked= no longer supported" msgstr "--unpacked= wird nicht länger unterstützt" +#, c-format +msgid "invalid option '%s' in --stdin mode" +msgstr "ungültige Option '%s' im Modus --stdin" + msgid "your current branch appears to be broken" msgstr "Ihr aktueller Branch scheint fehlerhaft zu sein." @@ -21056,6 +21167,77 @@ msgstr "fork fehlgeschlagen" msgid "setsid failed" msgstr "setsid fehlgeschlagen" +#, c-format +msgid "cannot stat template '%s'" +msgstr "kann Vorlage '%s' nicht lesen" + +#, c-format +msgid "cannot opendir '%s'" +msgstr "kann Verzeichnis '%s' nicht öffnen" + +#, c-format +msgid "cannot readlink '%s'" +msgstr "kann Verweis '%s' nicht lesen" + +#, c-format +msgid "cannot symlink '%s' '%s'" +msgstr "kann symbolische Verknüpfung '%s' auf '%s' nicht erstellen" + +#, c-format +msgid "cannot copy '%s' to '%s'" +msgstr "kann '%s' nicht nach '%s' kopieren" + +#, c-format +msgid "ignoring template %s" +msgstr "ignoriere Vorlage %s" + +#, c-format +msgid "templates not found in %s" +msgstr "Keine Vorlagen in %s gefunden." + +#, c-format +msgid "not copying templates from '%s': %s" +msgstr "kopiere keine Vorlagen von '%s': %s" + +#, c-format +msgid "invalid initial branch name: '%s'" +msgstr "ungültiger initialer Branchname: '%s'" + +#, c-format +msgid "unable to handle file type %d" +msgstr "kann nicht mit Dateityp %d umgehen" + +#, c-format +msgid "unable to move %s to %s" +msgstr "Konnte %s nicht nach %s verschieben" + +msgid "attempt to reinitialize repository with different hash" +msgstr "Versuch, das Repository mit einem anderen Hash zu reinitialisieren" + +#, c-format +msgid "%s already exists" +msgstr "%s existiert bereits" + +#, c-format +msgid "re-init: ignored --initial-branch=%s" +msgstr "Neu-Initialisierung: --initial-branch=%s ignoriert" + +#, c-format +msgid "Reinitialized existing shared Git repository in %s%s\n" +msgstr "Bestehendes verteiltes Git-Repository in %s%s neuinitialisiert\n" + +#, c-format +msgid "Reinitialized existing Git repository in %s%s\n" +msgstr "Bestehendes Git-Repository in %s%s neuinitialisiert\n" + +#, c-format +msgid "Initialized empty shared Git repository in %s%s\n" +msgstr "Leeres verteiltes Git-Repository in %s%s initialisiert\n" + +#, c-format +msgid "Initialized empty Git repository in %s%s\n" +msgstr "Leeres Git-Repository in %s%s initialisiert\n" + #, c-format msgid "index entry is a directory, but not sparse (%08x)" msgstr "Index-Eintrag ist ein Verzeichnis, aber nicht partiell (%08x)" diff --git a/po/fr.po b/po/fr.po index db6efc0250..68a4d45fd8 100644 --- a/po/fr.po +++ b/po/fr.po @@ -78,8 +78,8 @@ msgid "" msgstr "" "Project-Id-Version: git\n" "Report-Msgid-Bugs-To: Git Mailing List \n" -"POT-Creation-Date: 2023-05-20 12:25+0200\n" -"PO-Revision-Date: 2023-05-18 18:50+0200\n" +"POT-Creation-Date: 2023-08-16 11:48+0200\n" +"PO-Revision-Date: 2023-08-16 11:49+0200\n" "Last-Translator: Cédric Malard \n" "Language-Team: Jean-Noël Avila \n" "Language: fr\n" @@ -716,9 +716,8 @@ msgstr "Impossible de tirer car vous avez des fichiers non fusionnés." msgid "Reverting is not possible because you have unmerged files." msgstr "Impossible d'annuler car vous avez des fichiers non fusionnés." -#, c-format -msgid "It is not possible to %s because you have unmerged files." -msgstr "%s n'est pas possible car vous avez des fichiers non fusionnés." +msgid "Rebasing is not possible because you have unmerged files." +msgstr "Impossible de rebaser, car vous avez des fichiers non fusionnés." msgid "" "Fix them up in the work tree, and then use 'git add/rm '\n" @@ -868,6 +867,12 @@ msgstr "les options '%s' et '%s' ne peuvent pas être utilisées ensemble" msgid "'%s' outside a repository" msgstr "'%s' hors d'un dépôt" +msgid "failed to read patch" +msgstr "impossible de lire la rustine" + +msgid "patch too large" +msgstr "la rustine est trop grosse" + #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "Impossible de préparer la regexp d'horodatage %s" @@ -1787,9 +1792,10 @@ msgid "a branch named '%s' already exists" msgstr "Une branche nommée '%s' existe déjà" #, c-format -msgid "cannot force update the branch '%s' checked out at '%s'" +msgid "cannot force update the branch '%s' used by worktree at '%s'" msgstr "" -"impossible de forcer la mise à jour de la branche '%s' extraite dans '%s'" +"impossible de forcer la mise à jour de la branche '%s' utilisée par l'arbre-" +"de-travail dans '%s'" #, c-format msgid "cannot set up tracking information; starting point '%s' is not a branch" @@ -1859,17 +1865,6 @@ msgstr "git add [] [--] ..." msgid "cannot chmod %cx '%s'" msgstr "impossible de chmod %cx '%s'" -#, c-format -msgid "unexpected diff status %c" -msgstr "état de diff inattendu %c" - -msgid "updating files failed" -msgstr "échec de la mise à jour des fichiers" - -#, c-format -msgid "remove '%s'\n" -msgstr "suppression de '%s'\n" - msgid "Unstaged changes after refreshing the index:" msgstr "Modifications non indexées après rafraîchissement de l'index :" @@ -2305,10 +2300,6 @@ msgstr "passer l'option -m à git-mailinfo" msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "passer l'option --keep-cr à git-mailsplit fpour le format mbox" -msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" -msgstr "" -"ne pas passer l'option --keep-cr à git-mailsplit indépendamment de am.keepcr" - msgid "strip everything before a scissors line" msgstr "retirer tout le contenu avant la ligne des ciseaux" @@ -3370,12 +3361,12 @@ msgid "" "git cat-file (--batch | --batch-check | --batch-command) [--batch-all-" "objects]\n" " [--buffer] [--follow-symlinks] [--unordered]\n" -" [--textconv | --filters] [-z]" +" [--textconv | --filters] [-Z]" msgstr "" "git cat-file (--batch | --batch-check | --batch-command) [--batch-all-" "objects]\n" " [--buffer] [--follow-symlinks] [--unordered]\n" -" [--textconv | --filters] [-z]" +" [--textconv | --filters] [-Z]" msgid "" "git cat-file (--textconv | --filters)\n" @@ -3420,6 +3411,9 @@ msgstr "comme --batch, mais ne pas émettre " msgid "stdin is NUL-terminated" msgstr "l'entrée se termine par NUL" +msgid "stdin and stdout is NUL-terminated" +msgstr "l'entrée et la sortie standard se terminent par NUL" + msgid "read commands from stdin" msgstr "lire les commandes depuis l'entrée standard" @@ -4296,12 +4290,6 @@ msgstr "spécifique au serveur" msgid "option to transmit" msgstr "option à transmettre" -msgid "use IPv4 addresses only" -msgstr "n'utiliser que des adresses IPv4" - -msgid "use IPv6 addresses only" -msgstr "n'utiliser que des adresses IPv6" - msgid "apply partial clone filters to submodules" msgstr "appliquer les filtres de clone partiel aux sous-modules" @@ -4753,6 +4741,9 @@ msgstr "" " git cherry-pick --skip\n" "\n" +msgid "updating files failed" +msgstr "échec de la mise à jour des fichiers" + msgid "failed to unpack HEAD tree object" msgstr "échec du dépaquetage de l'objet arbre HEAD" @@ -4812,8 +4803,8 @@ msgstr "" "qui n'est pas utilisé dans le message de validation actuel" #, c-format -msgid "could not lookup commit %s" -msgstr "impossible de rechercher le commit %s" +msgid "could not lookup commit '%s'" +msgstr "impossible de rechercher le commit '%s'" #, c-format msgid "(reading log message from standard input)\n" @@ -7461,77 +7452,6 @@ msgstr "--verify sans nom de fichier paquet donné" msgid "fsck error in pack objects" msgstr "erreur de fsck dans les objets paquets" -#, c-format -msgid "cannot stat template '%s'" -msgstr "impossible de faire un stat du modèle '%s'" - -#, c-format -msgid "cannot opendir '%s'" -msgstr "impossible d'ouvrir le répertoire '%s'" - -#, c-format -msgid "cannot readlink '%s'" -msgstr "impossible de lire le lien '%s'" - -#, c-format -msgid "cannot symlink '%s' '%s'" -msgstr "impossible de créer un lien symbolique de '%s' '%s'" - -#, c-format -msgid "cannot copy '%s' to '%s'" -msgstr "impossible de copier '%s' vers '%s'" - -#, c-format -msgid "ignoring template %s" -msgstr "modèle %s ignoré" - -#, c-format -msgid "templates not found in %s" -msgstr "modèles non trouvés dans %s" - -#, c-format -msgid "not copying templates from '%s': %s" -msgstr "pas de copie des modèles depuis '%s' : %s" - -#, c-format -msgid "invalid initial branch name: '%s'" -msgstr "nom de branche initiale invalide : '%s'" - -#, c-format -msgid "unable to handle file type %d" -msgstr "impossible de traiter le fichier de type %d" - -#, c-format -msgid "unable to move %s to %s" -msgstr "impossible de déplacer %s vers %s" - -msgid "attempt to reinitialize repository with different hash" -msgstr "essai de réinitialisation du dépôt avec une empreinte différente" - -#, c-format -msgid "%s already exists" -msgstr "%s existe déjà" - -#, c-format -msgid "re-init: ignored --initial-branch=%s" -msgstr "re-initialisation : --initial-branch=%s ignoré" - -#, c-format -msgid "Reinitialized existing shared Git repository in %s%s\n" -msgstr "Dépôt Git existant partagé réinitialisé dans %s%s\n" - -#, c-format -msgid "Reinitialized existing Git repository in %s%s\n" -msgstr "Dépôt Git existant réinitialisé dans %s%s\n" - -#, c-format -msgid "Initialized empty shared Git repository in %s%s\n" -msgstr "Dépôt Git vide partagé initialisé dans %s%s\n" - -#, c-format -msgid "Initialized empty Git repository in %s%s\n" -msgstr "Dépôt Git vide initialisé dans %s%s\n" - msgid "" "git init [-q | --quiet] [--bare] [--template=]\n" " [--separate-git-dir ] [--object-format=]\n" @@ -7979,6 +7899,10 @@ msgstr "" "Impossible de trouver une branche distante suivie, merci de spécifier " " manuellement.\n" +#, c-format +msgid "could not get object info about '%s'" +msgstr "impossible d'obtenir l'information d'objet pour '%s'" + #, c-format msgid "bad ls-files format: element '%s' does not start with '('" msgstr "mauvais format ls-files : l'élément '%s' ne commence pas par '('" @@ -8126,10 +8050,6 @@ msgstr "afficher la réf sous-jacente en plus de l'objet pointé par elle" msgid "git ls-tree [] [...]" msgstr "git ls-tree [] [...]" -#, c-format -msgid "could not get object info about '%s'" -msgstr "impossible d'obtenir l'information d'objet pour '%s'" - #, c-format msgid "bad ls-tree format: element '%s' does not start with '('" msgstr "mauvais format ls-tree : l'élément '%s' ne commence pas par '('" @@ -8872,22 +8792,26 @@ msgid "git notes [--ref ] [list []]" msgstr "git notes [--ref ] [list []]" msgid "" -"git notes [--ref ] add [-f] [--allow-empty] [-m | -F " -"| (-c | -C) ] []" +"git notes [--ref ] add [-f] [--allow-empty] [--[no-]separator|--" +"separator=] [--[no-]stripspace] [-m | -F | (-c " +"| -C) ] []" msgstr "" -"git notes [--ref ] add [-f] [--allow-empty] [-m " -"| -F | (-c | -C) ] []" +"git notes [--ref ] add [-f] [--allow-empty] [--" +"[no-]separator|--separator=] [--[no-]stripspace] [-m " +" | -F | (-c | -C) ] []" msgid "git notes [--ref ] copy [-f] " msgstr "" "git notes [--ref ] copy [-f] " msgid "" -"git notes [--ref ] append [--allow-empty] [-m | -F | " -"(-c | -C) ] []" +"git notes [--ref ] append [--allow-empty] [--[no-]separator|--" +"separator=] [--[no-]stripspace] [-m | -F | (-c " +"| -C) ] []" msgstr "" -"git notes [--ref ] append [--allow-empty] [-m | -" -"F | (-c | -C) ] []" +"git notes [--ref ] append [--allow-empty] [--" +"[no-]separator|--separator=] [--[no-]stripspace]-m " +" | -F | (-c | -C) ] []" msgid "git notes [--ref ] edit [--allow-empty] []" msgstr "git notes [--ref ] edit [--allow-empty] []" @@ -9019,6 +8943,15 @@ msgstr "permettre de stocker une note vide" msgid "replace existing notes" msgstr "remplacer les notes existantes" +msgid "" +msgstr "" + +msgid "insert between paragraphs" +msgstr "insérer entre les paragraphes" + +msgid "remove unnecessary whitespace" +msgstr "retirer les espaces inutiles" + #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -9584,8 +9517,11 @@ msgstr "" msgid "refusing to run without --i-still-use-this" msgstr "refus de lancer sans --i-still-use-this" -msgid "git pack-refs [--all] [--no-prune]" -msgstr "git pack-refs [--all] [--no-prune]" +msgid "" +"git pack-refs [--all] [--no-prune] [--include ] [--exclude " +"]" +msgstr "" +"git pack-refs [--all] [--no-prune] [--include ] [--exclude ]" msgid "pack everything" msgstr "empaqueter tout" @@ -9593,6 +9529,12 @@ msgstr "empaqueter tout" msgid "prune loose refs (default)" msgstr "élaguer les références perdues (défaut)" +msgid "references to include" +msgstr "références à inclure" + +msgid "references to exclude" +msgstr "références à exclure" + msgid "git patch-id [--stable | --unstable | --verbatim]" msgstr "git patch-id [--stable | --unstable | --verbatim]" @@ -9650,6 +9592,12 @@ msgstr "forcer l'écrasement de la branche locale" msgid "number of submodules pulled in parallel" msgstr "nombre de sous-modules tirés en parallèle" +msgid "use IPv4 addresses only" +msgstr "n'utiliser que des adresses IPv4" + +msgid "use IPv6 addresses only" +msgstr "n'utiliser que des adresses IPv6" + msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." @@ -9920,46 +9868,43 @@ msgstr "" msgid "" "Updates were rejected because the tip of your current branch is behind\n" -"its remote counterpart. Integrate the remote changes (e.g.\n" -"'git pull ...') before pushing again.\n" +"its remote counterpart. If you want to integrate the remote changes,\n" +"use 'git pull' before pushing again.\n" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" -"Les mises à jour ont été rejetées car la pointe de la branche courante est " +"Les mises à jour ont été rejetées car le sommet de la branche actuelle est " "derrière\n" -"son homologue distant. Intégrez les changements distants (par exemple 'git " -"pull ...')\n" -"avant de pousser à nouveau.\n" +"son homologue distant. Si vous souhaitez intégrer les changements distants,\n" +"utilisez 'git pull' avant de pousser à nouveau.\n" "Voir la 'Note à propos des avances rapides' dans 'git push --help' pour plus " "d'information." 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" -"(e.g. 'git pull ...') before pushing again.\n" +"counterpart. If you want to integrate the remote changes, use 'git pull'\n" +"before pushing again.\n" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" -"Les mises à jour ont été rejetées car la pointe de la branche courante est " +"Les mises à jour ont été rejetées, car le sommet d'une branche poussée est " "derrière\n" -"son homologue distant. Extrayez cette branche et intégrez les changements " -"distants\n" -"(par exemple 'git pull ...') avant de pousser à nouveau.\n" +"son homologue distant. Si vous souhaitez intégrer les changements distants,\n" +"\"utilisez 'git pull' avant de pousser à nouveau.\n" "Voir la 'Note à propos des avances rapides' dans 'git push --help' pour plus " "d'information." 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" -"to the same ref. You may want to first integrate the remote changes\n" -"(e.g., 'git pull ...') before pushing again.\n" +"Updates were rejected because the remote contains work that you do not\n" +"have locally. This is usually caused by another repository pushing to\n" +"the same ref. If you want to integrate the remote changes, use\n" +"'git pull' before pushing again.\n" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" -"Les mises à jour ont été rejetées car la branche distante contient du " -"travail que\n" -"vous n'avez pas en local. Ceci est généralement causé par un autre dépôt " -"poussé\n" -"vers la même référence. Vous pourriez intégrer d'abord les changements " -"distants\n" -"(par exemple 'git pull ...') avant de pousser à nouveau.\n" +"Les mises à jour ont été rejetées car le distant contient du travail que " +"vous\n" +"n'avez pas localement. La cause probable est que quelqu'un a déjà poussé sur " +"la même réf.\n" +"depuis un autre dépôt. Si vous souhaitez intégrer les changements distants,\n" +"\"utilisez 'git pull' avant de pousser à nouveau.\n" "Voir la 'Note à propos des avances rapides' dans 'git push --help' pour plus " "d'information." @@ -9980,15 +9925,18 @@ msgstr "" "vers un objet qui n'est pas un commit, sans utiliser l'option '--force'.\n" msgid "" -"Updates were rejected because the tip of the remote-tracking\n" -"branch has been updated since the last checkout. You may want\n" -"to integrate those changes locally (e.g., 'git pull ...')\n" -"before forcing an update.\n" +"Updates were rejected because the tip of the remote-tracking branch has\n" +"been updated since the last checkout. If you want to integrate the\n" +"remote changes, use 'git pull' before pushing again.\n" +"See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" -"Les mises à jour ont été rejetées, car la pointe de la branche\n" -"de suivi a été mise à jour depuis la dernière extraction. Intégrez\n" -"ces changements localement (par exemple 'git pull ...') avant de\n" -"forcer à nouveau une mise à jour.\n" +"Les mises à jour ont été rejetées, car le sommet de la branche de suivi à " +"distance a\n" +"été mis à jour depuis la dernière extraction. Si vous souhaitez intégrer les " +"changements distants,\n" +"\"utilisez 'git pull' avant de pousser à nouveau.\n" +"Voir la 'Note à propos des avances rapides' dans 'git push --help' pour plus " +"d'information." #, c-format msgid "Pushing to %s\n" @@ -10860,12 +10808,13 @@ msgstr "argument miroir inconnu : %s" msgid "fetch the remote branches" msgstr "rapatrier les branches distantes" -msgid "import all tags and associated objects when fetching" +msgid "" +"import all tags and associated objects when fetching\n" +"or do not fetch any tag at all (--no-tags)" msgstr "" -"importer toutes les étiquettes et les objets associés lors du rapatriement" - -msgid "or do not fetch any tag at all (--no-tags)" -msgstr "ou ne rapatrier aucune étiquette (--no-tags)" +"importer toutes les étiquettes et les objets associés lors de la " +"récupération\n" +"ou ne récupérer aucune étiquette (--no-tags)" msgid "branch(es) to track" msgstr "branche(s) à suivre" @@ -12848,6 +12797,10 @@ msgstr "Sous-module non fusionné %s non traité" msgid "Skipping submodule '%s'" msgstr "Sous-module '%s' non traité" +#, c-format +msgid "cannot clone submodule '%s' without a URL" +msgstr "impossible de cloner le sous-module '%s' sans une URL" + #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "Impossible de cloner '%s'. Réessai prévu" @@ -13611,10 +13564,11 @@ msgstr "afficher le contenu de l'étiquette" msgid "" "git worktree add [-f] [--detach] [--checkout] [--lock [--reason ]]\n" -" [-b ] []" +" [--orphan] [(-b | -B) ] []" msgstr "" "git worktree add [-f] [--detach] [--checkout] [--lock [--reason ]]\n" -" [-b ] []" +" [--orphan] [(-b | -B) ] []" msgid "git worktree list [-v | --porcelain [-z]]" msgstr "git worktree list [-v | --porcelain [-z]]" @@ -13637,6 +13591,37 @@ msgstr "git worktree repair [...]" msgid "git worktree unlock " msgstr "git worktree unlock " +msgid "No possible source branch, inferring '--orphan'" +msgstr "Aucune branche source possible, activation de '--orphan'" + +#, c-format +msgid "" +"If you meant to create a worktree containing a new orphan branch\n" +"(branch with no commits) for this repository, you can do so\n" +"using the --orphan flag:\n" +"\n" +" git worktree add --orphan -b %s %s\n" +msgstr "" +"Si vous vouliez créer un arbre-de-travail contenant une nouvelle branche\n" +"orpheline (une branche sans commit) pour ce dépôt, vous pouvez le faire\n" +"en utilisant le drapeau --orphan :\n" +"\n" +" git worktree add --orphan -b %s %s\n" + +#, c-format +msgid "" +"If you meant to create a worktree containing a new orphan branch\n" +"(branch with no commits) for this repository, you can do so\n" +"using the --orphan flag:\n" +"\n" +" git worktree add --orphan %s\n" +msgstr "" +"Si vous vouliez créer un arbre-de-travail contenant une nouvelle branche\n" +"orpheline (une branche sans commit) pour ce dépôt, vous pouvez le faire\n" +"en utilisant le drapeau --orphan :\n" +"\n" +" git worktree add --orphan %s\n" + #, c-format msgid "Removing %s/%s: %s" msgstr "Suppression de %s/%s : %s" @@ -13708,10 +13693,36 @@ msgstr "" msgid "Preparing worktree (checking out '%s')" msgstr "Préparation de l'arbre de travail (extraction de '%s')" +#, c-format +msgid "unreachable: invalid reference: %s" +msgstr "non joignable : référence invalide : %s" + #, c-format msgid "Preparing worktree (detached HEAD %s)" msgstr "Préparation de l'arbre de travail (HEAD détachée %s)" +#, c-format +msgid "" +"HEAD points to an invalid (or orphaned) reference.\n" +"HEAD path: '%s'\n" +"HEAD contents: '%s'" +msgstr "" +"HEAD pointe sur une référence invalide (ou orpheline).\n" +"chemin de HEAD '%s'\n" +"contenu de HEAD : '%s'" + +msgid "" +"No local or remote refs exist despite at least one remote\n" +"present, stopping; use 'add -f' to overide or fetch a remote first" +msgstr "" +"Aucune réf locale ou distant n'existe malgré la présence d'au moins un " +"distant,\n" +"on arrête ; utilisez 'add -f' pour passe outre ou récupérer le distant avant" + +#, c-format +msgid "'%s' and '%s' cannot be used together" +msgstr "'%s' et '%s' ne peuvent pas être utilisées ensemble" + msgid "checkout even if already checked out in other worktree" msgstr "" "extraire la même si elle est déjà extraite dans une autre copie de " @@ -13723,6 +13734,9 @@ msgstr "créer une nouvelle branche" msgid "create or reset a branch" msgstr "créer ou réinitialiser une branche" +msgid "create unborn/orphaned branch" +msgstr "créer une branche non née/orpheline" + msgid "populate the new working tree" msgstr "remplissage de la nouvelle copie de travail" @@ -13742,6 +13756,13 @@ msgstr "essayer de nommer la nouvelle branche comme la branche amont" msgid "options '%s', '%s', and '%s' cannot be used together" msgstr "les options '%s', '%s' et '%s' ne peuvent pas être utilisées ensemble" +#, c-format +msgid "options '%s', and '%s' cannot be used together" +msgstr "les options '%s' et '%s' ne peuvent pas être utilisées ensemble" + +msgid "" +msgstr "" + msgid "added with --lock" msgstr "ajouté avec --lock" @@ -13979,6 +14000,14 @@ msgid_plural "The bundle requires these % refs:" msgstr[0] "Le colis exige cette référence :" msgstr[1] "Le colis exige ces % références :" +#, c-format +msgid "The bundle uses this hash algorithm: %s" +msgstr "algorithme d'empreinte du colis : %s" + +#, c-format +msgid "The bundle uses this filter: %s" +msgstr "Le colis utilise ce filtre : %s" + msgid "unable to dup bundle descriptor" msgstr "impossible de dupliquer le descripteur de liasse" @@ -14214,9 +14243,9 @@ msgstr "Afficher les lignes correspondant à un motif" msgid "A portable graphical interface to Git" msgstr "Une interface graphique portable pour Git" -msgid "Compute object ID and optionally creates a blob from a file" +msgid "Compute object ID and optionally create an object from a file" msgstr "" -"Calculer l'ID d'objet et créer optionnellement un blob depuis un fichier" +"Calculer l'ID d'objet et créer optionnellement un objet depuis un fichier" msgid "Display help information about Git" msgstr "Afficher l'information d'aide à propos de Git" @@ -14638,6 +14667,10 @@ msgstr "le graphe de commit n'a pas de section de graphes de base" msgid "commit-graph chain does not match" msgstr "la chaîne de graphe de commit ne correspond pas" +#, c-format +msgid "commit count in base graph too high: %" +msgstr "nombre de commits dans le graphe de base trop haut : %" + #, c-format msgid "invalid commit-graph chain: line '%s' not a hash" msgstr "" @@ -14729,6 +14762,15 @@ msgstr "échec du renommage du fichier de graphe de commits" msgid "failed to rename temporary commit-graph file" msgstr "impossible de renommer le fichier temporaire de graphe de commits" +#, c-format +msgid "cannot merge graphs with %, % commits" +msgstr "" +"impossible de fusionner des graphes avec %, % commits" + +#, c-format +msgid "cannot merge graph %s, too many commits: %" +msgstr "impossible de fusionner le graphe %s, trop de commits : %" + msgid "Scanning merged commits" msgstr "Analyse des commits de fusion" @@ -14761,9 +14803,6 @@ msgstr "" msgid "failed to parse commit %s from commit-graph" msgstr "échec de l'analyse le commit %s depuis le graphe de commits" -msgid "Verifying commits in commit graph" -msgstr "Verification des commits dans le graphe de commits" - #, c-format msgid "failed to parse commit %s from object database for commit-graph" msgstr "" @@ -14816,6 +14855,9 @@ msgstr "" "la date de validation pour le commit %s dans le graphe de commit est " "% != %" +msgid "Verifying commits in commit graph" +msgstr "Verification des commits dans le graphe de commits" + #, c-format msgid "%s %s is not a commit!" msgstr "%s %s n'est pas un commit !" @@ -15784,6 +15826,12 @@ msgstr "aucune base de fusion trouvée" msgid "multiple merge bases found" msgstr "bases multiples de fusion trouvées" +msgid "cannot compare stdin to a directory" +msgstr "impossible de comparer stdin à un répertoire" + +msgid "cannot compare a named pipe to a directory" +msgstr "impossible de réparer un tuyau nommé à un répertoire" + msgid "git diff --no-index [] " msgstr "git diff --no-index [] " @@ -15843,6 +15891,14 @@ msgstr "" msgid "external diff died, stopping at %s" msgstr "l'application de diff externe a disparu, arrêt à %s" +msgid "--follow requires exactly one pathspec" +msgstr "--follow a besoin d'une spécification de chemin unique" + +#, c-format +msgid "pathspec magic not supported by --follow: %s" +msgstr "" +"le spécificateur magique de chemin n'est pas pris en charge par --follow : %s" + #, c-format msgid "options '%s', '%s', '%s', and '%s' cannot be used together" msgstr "" @@ -15861,9 +15917,6 @@ msgstr "" "les options '%s' et '%s' ne peuvent pas être utilisées ensemble, utilisez " "'%s' avec '%s' et '%s'" -msgid "--follow requires exactly one pathspec" -msgstr "--follow a besoin d'une spécification de chemin unique" - #, c-format msgid "invalid --stat value: %s" msgstr "valeur invalide de --stat : %s" @@ -18794,6 +18847,13 @@ msgstr "échec de la génération de diff" msgid "could not parse log for '%s'" msgstr "impossible d'analyser le journal pour '%s'" +#, c-format +msgid "invalid extra cruft tip: '%s'" +msgstr "sommet supplémentaire dégénéré invalide : '%s'" + +msgid "unable to enumerate additional recent objects" +msgstr "impossible d'énumérer les objets récents additionnels" + #, c-format msgid "will not add file alias '%s' ('%s' already exists in index)" msgstr "pas d'ajout d'alias de fichier '%s'(« %s » existe déjà dans l'index)" @@ -18946,6 +19006,14 @@ msgstr "impossible de régler les bits de droit de '%s'" msgid "%s: cannot drop to stage #0" msgstr "%s : impossible de revenir à l'étape 0" +#, c-format +msgid "unexpected diff status %c" +msgstr "état de diff inattendu %c" + +#, c-format +msgid "remove '%s'\n" +msgstr "suppression de '%s'\n" + msgid "" "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" "continue'.\n" @@ -19148,6 +19216,22 @@ msgstr "argument %%(trailers) inconnu : %s" msgid "positive value expected contents:lines=%s" msgstr "valeur positive attendue contents:lines=%s" +#, c-format +msgid "argument expected for %s" +msgstr "argument attendu pour %s" + +#, c-format +msgid "positive value expected %s=%s" +msgstr "valeur positive attendue %s=%s" + +#, c-format +msgid "cannot fully parse %s=%s" +msgstr "impossible d'analyser complètement %s=%s" + +#, c-format +msgid "value expected %s=" +msgstr "valeur attendue %s=" + #, c-format msgid "positive value expected '%s' in %%(%s)" msgstr "valeur positive attendue '%s' dans %%(%s)" @@ -19222,6 +19306,9 @@ msgstr "cette commande rejette l'atome %%(%.*s)" msgid "--format=%.*s cannot be used with --python, --shell, --tcl" msgstr "--format=%.*s ne peut pas être utilisé avec --python, --shell, --tcl" +msgid "failed to run 'describe'" +msgstr "échec pour lancer 'describe'" + #, c-format msgid "(no branch, rebasing %s)" msgstr "(aucune branche, rebasage de %s)" @@ -19283,6 +19370,9 @@ msgstr "clé" msgid "field name to sort on" msgstr "nom du champ servant à trier" +msgid "exclude refs which match pattern" +msgstr "exclure les références correspondant à " + #, c-format msgid "not a reflog: %s" msgstr "'%s' n'est pas un journal de références" @@ -19736,9 +19826,10 @@ msgstr[1] "" "Votre branche et '%s' ont divergé,\n" "et ont %d et %d commits différents chacune respectivement.\n" -msgid " (use \"git pull\" to merge the remote branch into yours)\n" +msgid "" +" (use \"git pull\" if you want to integrate the remote branch with yours)\n" msgstr "" -" (utilisez \"git pull\" pour fusionner la branche distante dans la vôtre)\n" +" (utilisez \"git pull\" pour intégrer la branche distante avec la vôtre)\n" #, c-format msgid "cannot parse expected object name '%s'" @@ -19851,6 +19942,10 @@ msgstr "" msgid "--unpacked= no longer supported" msgstr "--unpacked= n'est plus géré" +#, c-format +msgid "invalid option '%s' in --stdin mode" +msgstr "option invalide '%s' en mode --stdin" + msgid "your current branch appears to be broken" msgstr "votre branche actuelle semble cassée" @@ -21013,6 +21108,77 @@ msgstr "échec de la bifurcation" msgid "setsid failed" msgstr "échec du setsid" +#, c-format +msgid "cannot stat template '%s'" +msgstr "impossible de faire un stat du modèle '%s'" + +#, c-format +msgid "cannot opendir '%s'" +msgstr "impossible d'ouvrir le répertoire '%s'" + +#, c-format +msgid "cannot readlink '%s'" +msgstr "impossible de lire le lien '%s'" + +#, c-format +msgid "cannot symlink '%s' '%s'" +msgstr "impossible de créer un lien symbolique de '%s' '%s'" + +#, c-format +msgid "cannot copy '%s' to '%s'" +msgstr "impossible de copier '%s' vers '%s'" + +#, c-format +msgid "ignoring template %s" +msgstr "modèle %s ignoré" + +#, c-format +msgid "templates not found in %s" +msgstr "modèles non trouvés dans %s" + +#, c-format +msgid "not copying templates from '%s': %s" +msgstr "pas de copie des modèles depuis '%s' : %s" + +#, c-format +msgid "invalid initial branch name: '%s'" +msgstr "nom de branche initiale invalide : '%s'" + +#, c-format +msgid "unable to handle file type %d" +msgstr "impossible de traiter le fichier de type %d" + +#, c-format +msgid "unable to move %s to %s" +msgstr "impossible de déplacer %s vers %s" + +msgid "attempt to reinitialize repository with different hash" +msgstr "essai de réinitialisation du dépôt avec une empreinte différente" + +#, c-format +msgid "%s already exists" +msgstr "%s existe déjà" + +#, c-format +msgid "re-init: ignored --initial-branch=%s" +msgstr "re-initialisation : --initial-branch=%s ignoré" + +#, c-format +msgid "Reinitialized existing shared Git repository in %s%s\n" +msgstr "Dépôt Git existant partagé réinitialisé dans %s%s\n" + +#, c-format +msgid "Reinitialized existing Git repository in %s%s\n" +msgstr "Dépôt Git existant réinitialisé dans %s%s\n" + +#, c-format +msgid "Initialized empty shared Git repository in %s%s\n" +msgstr "Dépôt Git vide partagé initialisé dans %s%s\n" + +#, c-format +msgid "Initialized empty Git repository in %s%s\n" +msgstr "Dépôt Git vide initialisé dans %s%s\n" + #, c-format msgid "index entry is a directory, but not sparse (%08x)" msgstr "l'entrée d'index est un répertoire, mais pas clairsemé (%08x)" @@ -22870,6 +23036,29 @@ msgstr "%s sauté avec un suffix de sauvegarde '%s'.\n" msgid "Do you really want to send %s? [y|N]: " msgstr "Souhaitez-vous réellement envoyer %s ?[y|N] : " +#, c-format +#~ msgid "It is not possible to %s because you have unmerged files." +#~ msgstr "%s n'est pas possible car vous avez des fichiers non fusionnés." + +#~ msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" +#~ msgstr "" +#~ "ne pas passer l'option --keep-cr à git-mailsplit indépendamment de am." +#~ "keepcr" + +#~ msgid "" +#~ "Updates were rejected because the tip of the remote-tracking\n" +#~ "branch has been updated since the last checkout. You may want\n" +#~ "to integrate those changes locally (e.g., 'git pull ...')\n" +#~ "before forcing an update.\n" +#~ msgstr "" +#~ "Les mises à jour ont été rejetées, car la pointe de la branche\n" +#~ "de suivi a été mise à jour depuis la dernière extraction. Intégrez\n" +#~ "ces changements localement (par exemple 'git pull ...') avant de\n" +#~ "forcer à nouveau une mise à jour.\n" + +#~ msgid "or do not fetch any tag at all (--no-tags)" +#~ msgstr "ou ne rapatrier aucune étiquette (--no-tags)" + #~ msgid "current working directory is untracked" #~ msgstr "l'arbre de travail actuel est non-suivi" diff --git a/po/id.po b/po/id.po index ccd38422c7..e20e18e893 100644 --- a/po/id.po +++ b/po/id.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List \n" -"POT-Creation-Date: 2023-05-19 19:57+0000\n" -"PO-Revision-Date: 2023-05-22 15:24+0700\n" +"POT-Creation-Date: 2023-08-06 17:06+0700\n" +"PO-Revision-Date: 2023-08-06 17:06+0700\n" "Last-Translator: Bagas Sanjaya \n" "Language-Team: Indonesian\n" "Language: id\n" @@ -941,6 +941,14 @@ msgstr "Opsi '%s' dan '%s' tidak dapat digunakan bersamaan" msgid "'%s' outside a repository" msgstr "'%s' di luar repositori" +#: apply.c +msgid "failed to read patch" +msgstr "gagal membaca tambalan" + +#: apply.c +msgid "patch too large" +msgstr "tambalan terlalu besar" + #: apply.c #, c-format msgid "Cannot prepare timestamp regexp %s" @@ -2062,8 +2070,10 @@ msgstr "sebuah cabang bernama '%s' sudah ada" #: branch.c #, c-format -msgid "cannot force update the branch '%s' checked out at '%s'" -msgstr "tidak dapat memperbarui paksa cabang '%s' yang ter-check out pada '%s'" +msgid "cannot force update the branch '%s' used by worktree at '%s'" +msgstr "" +"tidak dapat memperbarui paksa cabang '%s' yang yang digunakan oleh pohon " +"kerja pada '%s'" #: branch.c #, c-format @@ -2145,20 +2155,6 @@ msgstr "git add [] [--] ..." msgid "cannot chmod %cx '%s'" msgstr "tidak dapat chmod %cx '%s'" -#: builtin/add.c -#, c-format -msgid "unexpected diff status %c" -msgstr "status diff tak diharapkan %c" - -#: builtin/add.c builtin/commit.c -msgid "updating files failed" -msgstr "gagal memperbarui berkas" - -#: builtin/add.c -#, c-format -msgid "remove '%s'\n" -msgstr "hapus '%s'\n" - #: builtin/add.c msgid "Unstaged changes after refreshing the index:" msgstr "Perubahan tak tergelar setelah menyegarkan indeks:" @@ -2704,11 +2700,6 @@ msgstr "lewatkan opsi -m ke git-mailinfo" msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "lewatkan opsi --keep-cr ke git-mailsplit untuk format mbox" -#: builtin/am.c -msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" -msgstr "" -"jangan lewatkan opsi --keep-cr ke git-mailsplit tak bergantung pada am.keepcr" - #: builtin/am.c msgid "strip everything before a scissors line" msgstr "copot semuanya sebelum garis gunting" @@ -4022,7 +4013,7 @@ msgid "" "git cat-file (--batch | --batch-check | --batch-command) [--batch-all-" "objects]\n" " [--buffer] [--follow-symlinks] [--unordered]\n" -" [--textconv | --filters] [-z]" +" [--textconv | --filters] [-Z]" msgstr "" "git cat-file (--batch | --batch-check | --batch-command) [--batch-all-" "objects]\n" @@ -4086,6 +4077,10 @@ msgstr "seperti --batch, tapi jangan keluarkan " msgid "stdin is NUL-terminated" msgstr "stdin diakhiri dengan NUL" +#: builtin/cat-file.c +msgid "stdin and stdout is NUL-terminated" +msgstr "stdin dan stdout diakhiri dengan NUL" + #: builtin/cat-file.c msgid "read commands from stdin" msgstr "baca perintah dari masukan standar" @@ -4624,8 +4619,8 @@ msgid "" "Consider \"git merge --quit\" or \"git worktree add\"." msgstr "" "tidak dapat mengganti cabang saat penggabungan\n" -"Pertimbangkan untuk menggunakan \"git merge --quit\" atau \"git worktree add" -"\"." +"Pertimbangkan untuk menggunakan \"git merge --quit\" atau \"git worktree " +"add\"." #: builtin/checkout.c msgid "" @@ -4641,8 +4636,8 @@ msgid "" "Consider \"git rebase --quit\" or \"git worktree add\"." msgstr "" "tidak dapat mengganti cabang saat pendasaran ulang\n" -"Pertimbangkan untuk menggunakan \"git rebase --quit\" atau \"git worktree add" -"\"." +"Pertimbangkan untuk menggunakan \"git rebase --quit\" atau \"git worktree " +"add\"." #: builtin/checkout.c msgid "" @@ -4659,8 +4654,8 @@ msgid "" "Consider \"git revert --quit\" or \"git worktree add\"." msgstr "" "tidak dapat mengganti cabang saat pembalikan\n" -"Pertimbangkan untuk menggunakan \"git revert --quit\" atau \"git worktree add" -"\"." +"Pertimbangkan untuk menggunakan \"git revert --quit\" atau \"git worktree " +"add\"." #: builtin/checkout.c msgid "you are switching branch while bisecting" @@ -4999,7 +4994,8 @@ msgid "remove whole directories" msgstr "hapus keseluruhan direktori" #: builtin/clean.c builtin/describe.c builtin/grep.c builtin/log.c -#: builtin/ls-files.c builtin/name-rev.c builtin/show-ref.c +#: builtin/ls-files.c builtin/name-rev.c builtin/pack-refs.c builtin/show-ref.c +#: ref-filter.h msgid "pattern" msgstr "pola" @@ -5171,14 +5167,6 @@ msgstr "spesifik ke server" msgid "option to transmit" msgstr "opsi untuk transmisi" -#: builtin/clone.c builtin/fetch.c builtin/pull.c builtin/push.c -msgid "use IPv4 addresses only" -msgstr "gunakan hanya alamat IPv4" - -#: builtin/clone.c builtin/fetch.c builtin/pull.c builtin/push.c -msgid "use IPv6 addresses only" -msgstr "gunakan hanya alamat IPv6" - #: builtin/clone.c msgid "apply partial clone filters to submodules" msgstr "terapkan saringan kloning parsial ke submodul" @@ -5726,6 +5714,10 @@ msgstr "" " git cherry-pick --skip\n" "\n" +#: builtin/commit.c read-cache.c +msgid "updating files failed" +msgstr "gagal memperbarui berkas" + #: builtin/commit.c msgid "failed to unpack HEAD tree object" msgstr "gagal membuka objek pohon HEAD" @@ -5803,8 +5795,8 @@ msgstr "" #: builtin/commit.c builtin/merge-tree.c #, c-format -msgid "could not lookup commit %s" -msgstr "tidak dapat mencari komit %s" +msgid "could not lookup commit '%s'" +msgstr "tidak dapat mencari komit '%s'" #: builtin/commit.c builtin/shortlog.c #, c-format @@ -8065,7 +8057,7 @@ msgstr "Gagal men-fstat %s: %s" msgid "failed to parse '%s' value '%s'" msgstr "gagal menguraikan nilai '%s' '%s'" -#: builtin/gc.c builtin/init-db.c +#: builtin/gc.c setup.c #, c-format msgid "cannot stat '%s'" msgstr "tidak dapat men-stat '%s'" @@ -9089,7 +9081,7 @@ msgstr "tidak dapat kembali ke direktori kerja saat ini" msgid "bad %s" msgstr "%s jelek" -#: builtin/index-pack.c builtin/init-db.c +#: builtin/index-pack.c builtin/init-db.c setup.c #, c-format msgid "unknown hash algorithm '%s'" msgstr "algoritma hash tak dikenal '%s'" @@ -9106,95 +9098,6 @@ msgstr "--verify tanpa nama berkas paket diberikan" msgid "fsck error in pack objects" msgstr "kesalahan fsck dalam objek paket" -#: builtin/init-db.c -#, c-format -msgid "cannot stat template '%s'" -msgstr "tidak dapat men-stat templat '%s'" - -#: builtin/init-db.c -#, c-format -msgid "cannot opendir '%s'" -msgstr "tidak dapat membuka direktori '%s'" - -#: builtin/init-db.c -#, c-format -msgid "cannot readlink '%s'" -msgstr "tidak dapat membaca tautan '%s'" - -#: builtin/init-db.c -#, c-format -msgid "cannot symlink '%s' '%s'" -msgstr "tidak dapat menautkan simbolik '%s' '%s'" - -#: builtin/init-db.c -#, c-format -msgid "cannot copy '%s' to '%s'" -msgstr "tidak dapat menyalin '%s' ke '%s'" - -#: builtin/init-db.c -#, c-format -msgid "ignoring template %s" -msgstr "mengabaikan templat %s" - -#: builtin/init-db.c -#, c-format -msgid "templates not found in %s" -msgstr "templat tidak ditemukan di %s" - -#: builtin/init-db.c -#, c-format -msgid "not copying templates from '%s': %s" -msgstr "tidak menyalin templat dari '%s': %s" - -#: builtin/init-db.c -#, c-format -msgid "invalid initial branch name: '%s'" -msgstr "nama cabang asal salah: '%s'" - -#: builtin/init-db.c -#, c-format -msgid "unable to handle file type %d" -msgstr "tidak dapat menangani tipe berkas %d" - -#: builtin/init-db.c -#, c-format -msgid "unable to move %s to %s" -msgstr "tidak dapat memindahkan %s ke %s" - -#: builtin/init-db.c -msgid "attempt to reinitialize repository with different hash" -msgstr "mencoba menginisialisasi ulang repositori dengan hash yang berbeda" - -#: builtin/init-db.c -#, c-format -msgid "%s already exists" -msgstr "%s sudah ada" - -#: builtin/init-db.c -#, c-format -msgid "re-init: ignored --initial-branch=%s" -msgstr "re-init: --initial-branch=%s diabaikan" - -#: builtin/init-db.c -#, c-format -msgid "Reinitialized existing shared Git repository in %s%s\n" -msgstr "Repositori berbagi Git yang sudah ada diinisialisasi ulang di %s%s\n" - -#: builtin/init-db.c -#, c-format -msgid "Reinitialized existing Git repository in %s%s\n" -msgstr "Repositori Git diinisialisasi ulang di %s%s\n" - -#: builtin/init-db.c -#, c-format -msgid "Initialized empty shared Git repository in %s%s\n" -msgstr "Repositori berbagi Git kosong diinisialisasi di %s%s\n" - -#: builtin/init-db.c -#, c-format -msgid "Initialized empty Git repository in %s%s\n" -msgstr "Repositori Git kosong dinisialisasi di %s%s\n" - #: builtin/init-db.c msgid "" "git init [-q | --quiet] [--bare] [--template=]\n" @@ -9755,6 +9658,11 @@ msgstr "" "Tidak dapat menemukan cabang remote terlacak, mohon sebutkan \n" "secara manual.\n" +#: builtin/ls-files.c builtin/ls-tree.c +#, c-format +msgid "could not get object info about '%s'" +msgstr "tidak dapat mendapatkan info objek tentang '%s'" + #: builtin/ls-files.c #, c-format msgid "bad ls-files format: element '%s' does not start with '('" @@ -9942,11 +9850,6 @@ msgstr "perlihatkan referensi pokok selain objek yang ditunjuk olehnya" msgid "git ls-tree [] [...]" msgstr "git ls-tree [] [...]" -#: builtin/ls-tree.c -#, c-format -msgid "could not get object info about '%s'" -msgstr "tidak dapat mendapatkan info objek tentang '%s'" - #: builtin/ls-tree.c #, c-format msgid "bad ls-tree format: element '%s' does not start with '('" @@ -10884,11 +10787,13 @@ msgstr "git notes [--ref ] [list []]" #: builtin/notes.c msgid "" -"git notes [--ref ] add [-f] [--allow-empty] [-m | -F " -"| (-c | -C) ] []" +"git notes [--ref ] add [-f] [--allow-empty] [--[no-]separator|--" +"separator=] [--[no-]stripspace] [-m | -F | (-c " +"| -C) ] []" msgstr "" -"git notes [--ref ] add [-f] [--allow-empty] [-m | (-c | -C) ] []" +"git notes [--ref ] add [-f] [--allow-empty] [--" +"[no-]separator|--separator=] [--[no-]stripspace] [-m " +" | (-c | -C) ] []" #: builtin/notes.c msgid "git notes [--ref ] copy [-f] " @@ -10897,11 +10802,13 @@ msgstr "" #: builtin/notes.c msgid "" -"git notes [--ref ] append [--allow-empty] [-m | -F | " -"(-c | -C) ] []" +"git notes [--ref ] append [--allow-empty] [--[no-]separator|--" +"separator=] [--[no-]stripspace] [-m | -F | (-c " +"| -C) ] []" msgstr "" -"git notes [--ref ] append [--alow-empty] [-m | -F " -" | (-c | -C) ] []" +"git notes [--ref ] append [--alow-empty] [--" +"[no]separator|--separator=] [--[no-]stripspace] [-m " +" | -F | (-c | -C) ] []" #: builtin/notes.c msgid "git notes [--ref ] edit [--allow-empty] []" @@ -11071,6 +10978,18 @@ msgstr "perbolehkan menyimpan catatan kosong" msgid "replace existing notes" msgstr "timpa catatan yang sudah ada" +#: builtin/notes.c +msgid "" +msgstr "" + +#: builtin/notes.c +msgid "insert between paragraphs" +msgstr "masukkan di antara paragraf" + +#: builtin/notes.c +msgid "remove unnecessary whitespace" +msgstr "hapus spasi yang tidak diperlukan" + #: builtin/notes.c #, c-format msgid "" @@ -11771,8 +11690,11 @@ msgid "refusing to run without --i-still-use-this" msgstr "menolak menjalankan tanpa --i-still-use-this" #: builtin/pack-refs.c -msgid "git pack-refs [--all] [--no-prune]" -msgstr "git pack-refs [--all] [--no-prune]" +msgid "" +"git pack-refs [--all] [--no-prune] [--include ] [--exclude " +"]" +msgstr "" +"git pack-refs [--all] [--no-prune] [--include ] [--exclude ]" #: builtin/pack-refs.c msgid "pack everything" @@ -11782,6 +11704,14 @@ msgstr "pak semuanya" msgid "prune loose refs (default)" msgstr "pangkas referensi longgar (asali)" +#: builtin/pack-refs.c +msgid "references to include" +msgstr "referensi untuk ditambahkan" + +#: builtin/pack-refs.c +msgid "references to exclude" +msgstr "referensi untuk dikecualikan" + #: builtin/patch-id.c msgid "git patch-id [--stable | --unstable | --verbatim]" msgstr "git patch-id [--stable | --unstable | --verbatim]" @@ -11858,6 +11788,14 @@ msgstr "paksa timpa cabang lokal" msgid "number of submodules pulled in parallel" msgstr "nomor submodul ditarik dalam paralel" +#: builtin/pull.c parse-options.h +msgid "use IPv4 addresses only" +msgstr "gunakan hanya alamat IPv4" + +#: builtin/pull.c parse-options.h +msgid "use IPv6 addresses only" +msgstr "gunakan hanya alamat IPv6" + #: builtin/pull.c msgid "" "There is no candidate for rebasing against among the refs that you just " @@ -12163,39 +12101,39 @@ msgstr "" #: builtin/push.c msgid "" "Updates were rejected because the tip of your current branch is behind\n" -"its remote counterpart. Integrate the remote changes (e.g.\n" -"'git pull ...') before pushing again.\n" +"its remote counterpart. If you want to integrate the remote changes,\n" +"use 'git pull' before pushing again.\n" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" "Pembaruan ditolak karena ujung dari cabang Anda saat ini di belakang\n" -"pasangan remotenya. Integrasikan perubahan remote (seperti\n" -"'git pull') sebelum dorong lagi.\n" +"pasangan remotenya. Jika Anda ingin mengintegrasikan perubahan remote,\n" +"lakukan 'git pull' sebelum mendorong lagi.\n" "Lihat 'Note about fast-forwards' di 'git push --help' untuk selengkapnya." #: builtin/push.c 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" -"(e.g. 'git pull ...') before pushing again.\n" +"counterpart. If you want to integrate the remote changes, use 'git pull'\n" +"before pushing again.\n" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" "Pembaruan ditolak karena ujung dari cabang yang didorong di belakang\n" -"pasangan remotenya. Check out cabang itu dan integrasikan perubahan\n" -"remote (seperti 'git pull') sebelum dorong lagi.\n" +"pasangan remotenya. Jika anda ingin mengintegrasikan perubahan\n" +"remote, lakukan 'git pull' sebelum mendorong lagi.\n" "Lihat 'Note about fast-forwards' di 'git push --help' untuk selengkapnya." #: builtin/push.c 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" -"to the same ref. You may want to first integrate the remote changes\n" -"(e.g., 'git pull ...') before pushing again.\n" +"Updates were rejected because the remote contains work that you do not\n" +"have locally. This is usually caused by another repository pushing to\n" +"the same ref. If you want to integrate the remote changes, use\n" +"'git pull' before pushing again.\n" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" -"Pembaruan ditolak karena remote berisi kerja yang Anda tidak punya\n" +"Pembaruan ditolak karena remote berisi karya yang Anda tidak punya\n" "di lokal. Ini biasanya disebabkan repositori yang lain dorong ke\n" -"referensi yang sama. Mungkin Anda ingin integrasikan terlebih dahulu\n" -"perubahan remote (seperti 'git pull') sebelum dorong lagi.\n" +"referensi yang sama. Jika Anda ingin mengintegrasikan perubahan remote\n" +"lakukan 'git pull' sebelum mendorong lagi.\n" "Lihat 'Note about fast-forwards' di 'git push --help' untuk selengkapnya." #: builtin/push.c @@ -12214,15 +12152,15 @@ msgstr "" #: builtin/push.c msgid "" -"Updates were rejected because the tip of the remote-tracking\n" -"branch has been updated since the last checkout. You may want\n" -"to integrate those changes locally (e.g., 'git pull ...')\n" -"before forcing an update.\n" +"Updates were rejected because the tip of the remote-tracking branch has\n" +"been updated since the last checkout. If you want to integrate the\n" +"remote changes, use 'git pull' before pushing again.\n" +"See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" -"Pembaruan ditolak karena ujung dari cabang pelacak remote\n" -"sudah diperbarui sejak checkout terakhir. Mungkin Anda ingin\n" -"integrasikan perubahan tersebut ke lokal (seperti 'git pull...')\n" -"sebelum memaksa pembaruan.\n" +"Pembaruan ditolak karena ujung dari cabang Anda saat ini sudah diperbarui\n" +"sejak checkout terakhir. Jika Anda ingin mengintegrasikan perubahan remote,\n" +"lakukan 'git pull' sebelum mendorong lagi.\n" +"Lihat 'Note about fast-forwards' di 'git push --help' untuk selengkapnya." #: builtin/push.c #, c-format @@ -12614,8 +12552,8 @@ msgstr "opsi apply dan opsi merge tidak dapat digunakan bersamaan" #: builtin/rebase.c #, c-format msgid "" -"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask" -"\"." +"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and " +"\"ask\"." msgstr "" "tipe kosong tak dikenali '%s'; nilai yang valid adalah \"drop\", \"keep\", " "dan \"ask\"." @@ -13282,12 +13220,12 @@ msgid "fetch the remote branches" msgstr "ambil cabang remote" #: builtin/remote.c -msgid "import all tags and associated objects when fetching" -msgstr "impor semua tag dan objek yang terkait ketika mengambil" - -#: builtin/remote.c -msgid "or do not fetch any tag at all (--no-tags)" -msgstr "atau jangan mengambil tag apapun (--no-tags)" +msgid "" +"import all tags and associated objects when fetching\n" +"or do not fetch any tag at all (--no-tags)" +msgstr "" +"impor semua tag dan objek yang terkait ketika mengambil atau jangan\n" +"mengambil tag apapun (--no-tags)" #: builtin/remote.c msgid "branch(es) to track" @@ -15719,6 +15657,11 @@ msgstr "Melewati submodul tak tergabung %s" msgid "Skipping submodule '%s'" msgstr "Melewati submodul '%s'" +#: builtin/submodule--helper.c +#, c-format +msgid "cannot clone submodule '%s' without a URL" +msgstr "tidak dapat mengkloning submodul '%s' tanpa URL" + #: builtin/submodule--helper.c #, c-format msgid "Failed to clone '%s'. Retry scheduled" @@ -16651,10 +16594,10 @@ msgstr "cetak isi tag" #: builtin/worktree.c msgid "" "git worktree add [-f] [--detach] [--checkout] [--lock [--reason ]]\n" -" [-b ] []" +" [--orphan] [(-b | -B) ] []" msgstr "" "git worktree add [-f] [--detach] [--checkout] [--lock [--reason ]]\n" -" [-b ] []" +" [--orphan] [(-b | -B) ] []" #: builtin/worktree.c msgid "git worktree list [-v | --porcelain [-z]]" @@ -16684,6 +16627,38 @@ msgstr "git worktree repair [...]" msgid "git worktree unlock " msgstr "git worktree unlock " +#: builtin/worktree.c +msgid "No possible source branch, inferring '--orphan'" +msgstr "Tidak ada cabang sumber yang mungkin, menyimpulkan '--orphan'" + +#: builtin/worktree.c +#, c-format +msgid "" +"If you meant to create a worktree containing a new orphan branch\n" +"(branch with no commits) for this repository, you can do so\n" +"using the --orphan flag:\n" +"\n" +" git worktree add --orphan -b %s %s\n" +msgstr "" +"Jika maksud Anda ingin membuat pohon kerja berisi sebuah cabang yatim baru\n" +"(cabang tanpa komit) untuk repositori ini, Anda dapat melakukannya dengan\n" +"opsi --orphan:\n" +" git worktree add --orphan -b %s %s\n" + +#: builtin/worktree.c +#, c-format +msgid "" +"If you meant to create a worktree containing a new orphan branch\n" +"(branch with no commits) for this repository, you can do so\n" +"using the --orphan flag:\n" +"\n" +" git worktree add --orphan %s\n" +msgstr "" +"Jika maksud Anda ingin membuat pohon kerja berisi sebuah cabang yatim baru\n" +"(cabang tanpa komit) untuk repositori ini, Anda dapat melakukannya dengan\n" +"opsi --orphan:\n" +" git worktree add --orphan %s\n" + #: builtin/worktree.c #, c-format msgid "Removing %s/%s: %s" @@ -16767,11 +16742,42 @@ msgstr "" msgid "Preparing worktree (checking out '%s')" msgstr "Menyiapkan pohon kerja (men-checkout '%s')" +#: builtin/worktree.c +#, c-format +msgid "unreachable: invalid reference: %s" +msgstr "tidak dapat dicapat: referensi tidak valid: %s" + #: builtin/worktree.c #, c-format msgid "Preparing worktree (detached HEAD %s)" msgstr "Menyiapkan pohon kerja (HEAD terpisah %s)" +#: builtin/worktree.c +#, c-format +msgid "" +"HEAD points to an invalid (or orphaned) reference.\n" +"HEAD path: '%s'\n" +"HEAD contents: '%s'" +msgstr "" +"HEAD menunjuk pada referensi tidak valid (atau yatim).\n" +"Jalur HEAD: '%s'\n" +"Isi HEAD: '%s'" + +#: builtin/worktree.c +msgid "" +"No local or remote refs exist despite at least one remote\n" +"present, stopping; use 'add -f' to overide or fetch a remote first" +msgstr "" +"Tidak ada referensi lokal atau remote yang ada meskipun salah satu remote\n" +"ada, berhenti. Gunakan 'add -f' untuk menimpa atau mengambil remote " +"terlebih\n" +"dahulu" + +#: builtin/worktree.c +#, c-format +msgid "'%s' and '%s' cannot be used together" +msgstr "'%s' dan '%s' tidak dapat digunakan bersamaan" + #: builtin/worktree.c msgid "checkout even if already checked out in other worktree" msgstr "" @@ -16785,6 +16791,10 @@ msgstr "buat sebuah cabang baru" msgid "create or reset a branch" msgstr "buat atau setel ulang sebuah cabang" +#: builtin/worktree.c +msgid "create unborn/orphaned branch" +msgstr "buat cabang belum lahir/yatim" + #: builtin/worktree.c msgid "populate the new working tree" msgstr "isikan pohon kerja baru" @@ -16810,6 +16820,15 @@ msgstr "coba cocokkan nama cabang baru dengan sebuah cabang pelacakan remote" msgid "options '%s', '%s', and '%s' cannot be used together" msgstr "Opsi '%s', '%s', dan '%s' tidak dapat digunakan bersamaan" +#: builtin/worktree.c +#, c-format +msgid "options '%s', and '%s' cannot be used together" +msgstr "Opsi '%s', dan '%s' tidak dapat digunakan bersamaan" + +#: builtin/worktree.c +msgid "" +msgstr "" + #: builtin/worktree.c msgid "added with --lock" msgstr "tambahkan dengan --lock" @@ -17095,6 +17114,16 @@ msgid_plural "The bundle requires these % refs:" msgstr[0] "Bundel membutuhkan referensi ini:" msgstr[1] "Bundel membutuhkan % referensi berikut:" +#: bundle.c +#, c-format +msgid "The bundle uses this hash algorithm: %s" +msgstr "Bundel menggunakan algoritma hash ini: %s" + +#: bundle.c +#, c-format +msgid "The bundle uses this filter: %s" +msgstr "Bundel menggunakan penyaring ini: %s" + #: bundle.c msgid "unable to dup bundle descriptor" msgstr "tidak dapat men-dup pendeskripsi bundel" @@ -17398,8 +17427,8 @@ msgid "A portable graphical interface to Git" msgstr "Sebuah antarmuka grafis Git portabel" #: command-list.h -msgid "Compute object ID and optionally creates a blob from a file" -msgstr "Hitung ID objek dan buat blob dari berkas (opsional)" +msgid "Compute object ID and optionally create an object from a file" +msgstr "Hitung ID objek dan buat objeck dari berkas (opsional)" #: command-list.h msgid "Display help information about Git" @@ -17941,6 +17970,11 @@ msgstr "grafik komit tidak punya bingkah grafik dasar" msgid "commit-graph chain does not match" msgstr "rantai grafik komit tidak cocok" +#: commit-graph.c +#, c-format +msgid "commit count in base graph too high: %" +msgstr "jumlah komit pada grafik dasar terlalu tinggi: %" + #: commit-graph.c #, c-format msgid "invalid commit-graph chain: line '%s' not a hash" @@ -18048,6 +18082,16 @@ msgstr "gagal menamai ulang berkas grafik komit dasar" msgid "failed to rename temporary commit-graph file" msgstr "gagal menamai ulang berkas grafik komit sementara" +#: commit-graph.c +#, c-format +msgid "cannot merge graphs with %, % commits" +msgstr "tidak dapat menggabungkan grafik dengan %, % komit" + +#: commit-graph.c +#, c-format +msgid "cannot merge graph %s, too many commits: %" +msgstr "tidak dapat menggabungkan grafik %s, terlalu banyak komit: %" + #: commit-graph.c msgid "Scanning merged commits" msgstr "Memindai komit tergabung" @@ -18083,10 +18127,6 @@ msgstr "grafik komit punya nilai kipas keluar salah: fanout[%d] = %u != %u" msgid "failed to parse commit %s from commit-graph" msgstr "gagal menguraikan komit %s dari grafik komit" -#: commit-graph.c -msgid "Verifying commits in commit graph" -msgstr "Memverifikasi komit di dalam grafik komit" - #: commit-graph.c #, c-format msgid "failed to parse commit %s from object database for commit-graph" @@ -18140,6 +18180,10 @@ msgstr "" "tanggal komit untuk komit %s di dalam grafik komit yaitu % != " "%" +#: commit-graph.c +msgid "Verifying commits in commit graph" +msgstr "Memverifikasi komit di dalam grafik komit" + #: commit.c #, c-format msgid "%s %s is not a commit!" @@ -19313,6 +19357,14 @@ msgstr "dasar penggabungan tidak ditemukan" msgid "multiple merge bases found" msgstr "banyak dasar penggabungan ditemukan" +#: diff-no-index.c +msgid "cannot compare stdin to a directory" +msgstr "tidak dapat membandingkan masukan standar dan sebuah direktori" + +#: diff-no-index.c +msgid "cannot compare a named pipe to a directory" +msgstr "tidak dapat membandingkan pipa bernama dan sebuah direktori" + #: diff-no-index.c msgid "git diff --no-index [] " msgstr "git diff --no-index [] " @@ -19380,6 +19432,15 @@ msgstr "" msgid "external diff died, stopping at %s" msgstr "diff eksternal mati, berhenti pada %s" +#: diff.c +msgid "--follow requires exactly one pathspec" +msgstr "--follow butuh tepatnya satu spek jalur" + +#: diff.c +#, c-format +msgid "pathspec magic not supported by --follow: %s" +msgstr "spek jalur ajaib tidak didukung oleh --follow: %s" + #: diff.c parse-options.c #, c-format msgid "options '%s', '%s', '%s', and '%s' cannot be used together" @@ -19399,10 +19460,6 @@ msgstr "" "opsi '%s' dan '%s' tidak dapat digunakan bersamaan, gunakan '%s' dengan '%s' " "dan '%s'" -#: diff.c -msgid "--follow requires exactly one pathspec" -msgstr "--follow butuh tepatnya satu spek jalur" - #: diff.c #, c-format msgid "invalid --stat value: %s" @@ -21468,8 +21525,8 @@ msgstr "" #: merge-recursive.c #, c-format msgid "" -"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" -"\"->\"%s\" in \"%s\"%s" +"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename " +"\"%s\"->\"%s\" in \"%s\"%s" msgstr "" "KONFLIK (penamaan ulang/penamaan ulang): Penamaan ulang \"%s\"->\"%s\" di " "dalam cabang \"%s\" penamaan ulang \"%s\"->\"%s\" di \"%s\"%s" @@ -22947,6 +23004,15 @@ msgstr "gagal membuat diff" msgid "could not parse log for '%s'" msgstr "tidak dapat menguraikan log untuk '%s'" +#: reachable.c +#, c-format +msgid "invalid extra cruft tip: '%s'" +msgstr "ujung sampah tambahan tidak valid: '%s'" + +#: reachable.c +msgid "unable to enumerate additional recent objects" +msgstr "tidak dapat menghitung objeck terkini tambahan" + #: read-cache.c #, c-format msgid "will not add file alias '%s' ('%s' already exists in index)" @@ -23137,6 +23203,16 @@ msgstr "tidak dapat memperbaiki bit perizinan pada '%s'" msgid "%s: cannot drop to stage #0" msgstr "%s: tidak dapat menurunkan ke tahap #0" +#: read-cache.c +#, c-format +msgid "unexpected diff status %c" +msgstr "status diff tak diharapkan %c" + +#: read-cache.c +#, c-format +msgid "remove '%s'\n" +msgstr "hapus '%s'\n" + #: rebase-interactive.c msgid "" "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" @@ -23358,6 +23434,26 @@ msgstr "argumen %%(trailers) tidak dikenal: %s" msgid "positive value expected contents:lines=%s" msgstr "nilai positif diharapkan contents:lines=%s" +#: ref-filter.c +#, c-format +msgid "argument expected for %s" +msgstr "argumen diharapkan untuk %s" + +#: ref-filter.c +#, c-format +msgid "positive value expected %s=%s" +msgstr "nilai positif %s=%s diharapkan" + +#: ref-filter.c +#, c-format +msgid "cannot fully parse %s=%s" +msgstr "tidak dapat menguraikan penuh %s=%s" + +#: ref-filter.c +#, c-format +msgid "value expected %s=" +msgstr "nilai %s= diharapkan" + #: ref-filter.c #, c-format msgid "positive value expected '%s' in %%(%s)" @@ -23450,6 +23546,10 @@ msgstr "perintah ini menolak atom %%(%.*s)" msgid "--format=%.*s cannot be used with --python, --shell, --tcl" msgstr "--format=%.*s tidak dapat digunakan dengan --python, --shell, --tcl" +#: ref-filter.c +msgid "failed to run 'describe'" +msgstr "gagal menjalankan 'describe'" + #: ref-filter.c #, c-format msgid "(no branch, rebasing %s)" @@ -23527,6 +23627,10 @@ msgstr "kunci" msgid "field name to sort on" msgstr "nama bidang untuk diurutkan" +#: ref-filter.h +msgid "exclude refs which match pattern" +msgstr "hanya gunakan referensi yang cocok dengan pola" + #: reflog.c #, c-format msgid "not a reflog: %s" @@ -24067,8 +24171,11 @@ msgstr[1] "" "dan masing-masing punya %d dan %d komit berbeda.\n" #: remote.c -msgid " (use \"git pull\" to merge the remote branch into yours)\n" -msgstr " (gunakan \"git pull\" untuk gabungkan cabang remote ke milik Anda)\n" +msgid "" +" (use \"git pull\" if you want to integrate the remote branch with yours)\n" +msgstr "" +" (gunakan \"git pull\" jika Anda ingin mengintegrasikan cabang remote pada\n" +" milik Anda)\n" #: remote.c #, c-format @@ -24210,6 +24317,11 @@ msgstr "tidak dapat mendapatkan komit untuk argumen jalur leluhur '%s'" msgid "--unpacked= no longer supported" msgstr "--unpacked= tidak didukung lagi" +#: revision.c +#, c-format +msgid "invalid option '%s' in --stdin mode" +msgstr "opsi tidak valid: '%s' di mode --stdin" + #: revision.c msgid "your current branch appears to be broken" msgstr "sepertinya cabang Anda saat ini rusak" @@ -25618,6 +25730,95 @@ msgstr "penggarpuan gagal" msgid "setsid failed" msgstr "setsid gagal" +#: setup.c +#, c-format +msgid "cannot stat template '%s'" +msgstr "tidak dapat men-stat templat '%s'" + +#: setup.c +#, c-format +msgid "cannot opendir '%s'" +msgstr "tidak dapat membuka direktori '%s'" + +#: setup.c +#, c-format +msgid "cannot readlink '%s'" +msgstr "tidak dapat membaca tautan '%s'" + +#: setup.c +#, c-format +msgid "cannot symlink '%s' '%s'" +msgstr "tidak dapat menautkan simbolik '%s' '%s'" + +#: setup.c +#, c-format +msgid "cannot copy '%s' to '%s'" +msgstr "tidak dapat menyalin '%s' ke '%s'" + +#: setup.c +#, c-format +msgid "ignoring template %s" +msgstr "mengabaikan templat %s" + +#: setup.c +#, c-format +msgid "templates not found in %s" +msgstr "templat tidak ditemukan di %s" + +#: setup.c +#, c-format +msgid "not copying templates from '%s': %s" +msgstr "tidak menyalin templat dari '%s': %s" + +#: setup.c +#, c-format +msgid "invalid initial branch name: '%s'" +msgstr "nama cabang asal salah: '%s'" + +#: setup.c +#, c-format +msgid "unable to handle file type %d" +msgstr "tidak dapat menangani tipe berkas %d" + +#: setup.c +#, c-format +msgid "unable to move %s to %s" +msgstr "tidak dapat memindahkan %s ke %s" + +#: setup.c +msgid "attempt to reinitialize repository with different hash" +msgstr "mencoba menginisialisasi ulang repositori dengan hash yang berbeda" + +#: setup.c +#, c-format +msgid "%s already exists" +msgstr "%s sudah ada" + +#: setup.c +#, c-format +msgid "re-init: ignored --initial-branch=%s" +msgstr "re-init: --initial-branch=%s diabaikan" + +#: setup.c +#, c-format +msgid "Reinitialized existing shared Git repository in %s%s\n" +msgstr "Repositori berbagi Git yang sudah ada diinisialisasi ulang di %s%s\n" + +#: setup.c +#, c-format +msgid "Reinitialized existing Git repository in %s%s\n" +msgstr "Repositori Git diinisialisasi ulang di %s%s\n" + +#: setup.c +#, c-format +msgid "Initialized empty shared Git repository in %s%s\n" +msgstr "Repositori berbagi Git kosong diinisialisasi di %s%s\n" + +#: setup.c +#, c-format +msgid "Initialized empty Git repository in %s%s\n" +msgstr "Repositori Git kosong dinisialisasi di %s%s\n" + #: sparse-index.c #, c-format msgid "index entry is a directory, but not sparse (%08x)" @@ -27845,3 +28046,22 @@ msgstr "Melewati %s dengan akhiran cadangan '%s'.\n" #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "Anda benar-benar ingin mengirim %s? [y|N]: " + +#~ msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" +#~ msgstr "" +#~ "jangan lewatkan opsi --keep-cr ke git-mailsplit tak bergantung pada am." +#~ "keepcr" + +#~ msgid "" +#~ "Updates were rejected because the tip of the remote-tracking\n" +#~ "branch has been updated since the last checkout. You may want\n" +#~ "to integrate those changes locally (e.g., 'git pull ...')\n" +#~ "before forcing an update.\n" +#~ msgstr "" +#~ "Pembaruan ditolak karena ujung dari cabang pelacak remote\n" +#~ "sudah diperbarui sejak checkout terakhir. Mungkin Anda ingin\n" +#~ "integrasikan perubahan tersebut ke lokal (seperti 'git pull...')\n" +#~ "sebelum memaksa pembaruan.\n" + +#~ msgid "or do not fetch any tag at all (--no-tags)" +#~ msgstr "atau jangan mengambil tag apapun (--no-tags)" diff --git a/po/ru.po b/po/ru.po index 803208c4d5..3e56eb546e 100644 --- a/po/ru.po +++ b/po/ru.po @@ -4,28 +4,28 @@ # # Translators: # Alexander Golubev , 2020 -# Dimitriy Ryazantcev , 2014-2022 +# Dimitriy Ryazantcev , 2014-2023 # insolor, 2014 # insolor, 2014 # Sergey Alyoshin , 2020-2021 # Sergey Kuznetsov , 2021-2022 -# Чук Таблицоменделеев , 2019 +# Чук Таблицоменделеев (Aurum79) , 2019 msgid "" msgstr "" "Project-Id-Version: Git Russian Localization Project\n" "Report-Msgid-Bugs-To: Git Mailing List \n" -"POT-Creation-Date: 2022-06-26 20:30+0800\n" +"POT-Creation-Date: 2023-06-30 12:55+0300\n" "PO-Revision-Date: 2014-02-18 23:30+0000\n" -"Last-Translator: Dimitriy Ryazantcev , 2014-2022\n" -"Language-Team: Russian (http://www.transifex.com/djm00n/git-po-ru/language/" +"Last-Translator: Dimitriy Ryazantcev , 2014-2023\n" +"Language-Team: Russian (http://app.transifex.com/djm00n/git-po-ru/language/" "ru/)\n" -"Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\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" +"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" #, c-format msgid "Huh (%s)?" @@ -53,7 +53,7 @@ msgstr " не удалось проиндексировать «%s»" msgid "could not write index" msgstr "не удалось записать индекс" -#, c-format, perl-format +#, c-format msgid "updated %d path\n" msgid_plural "updated %d paths\n" msgstr[0] "обновлён %d путь\n" @@ -61,7 +61,7 @@ msgstr[1] "обновлено %d пути\n" msgstr[2] "обновлено %d путей\n" msgstr[3] "обновлено %d пути\n" -#, c-format, perl-format +#, c-format msgid "note: %s is untracked now.\n" msgstr "примечание: %s теперь неотслеживаемый.\n" @@ -75,7 +75,7 @@ msgstr "Обратить изменения" msgid "Could not parse HEAD^{tree}" msgstr "Не удалось разобрать HEAD^{tree}" -#, c-format, perl-format +#, c-format msgid "reverted %d path\n" msgid_plural "reverted %d paths\n" msgstr[0] "обращены изменения %d пути\n" @@ -90,7 +90,7 @@ msgstr "Нет неотслеживаемых файлов.\n" msgid "Add untracked" msgstr "Добавить неотслеживаемый" -#, c-format, perl-format +#, c-format msgid "added %d path\n" msgid_plural "added %d paths\n" msgstr[0] "добавлен %d путь\n" @@ -188,19 +188,19 @@ msgstr "не удалось обновить индекс" msgid "Bye.\n" msgstr "До свидания.\n" -#, c-format, perl-format +#, c-format msgid "Stage mode change [y,n,q,a,d%s,?]? " msgstr "Проиндексировать изменение режима доступа [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Stage deletion [y,n,q,a,d%s,?]? " msgstr "Проиндексировать удаление [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Stage addition [y,n,q,a,d%s,?]? " msgstr "Добавить к индексу [y,n,q,a,d%s,?]?" -#, c-format, perl-format +#, c-format msgid "Stage this hunk [y,n,q,a,d%s,?]? " msgstr "Индексировать этот блок [y,n,q,a,d%s,?]? " @@ -224,19 +224,19 @@ msgstr "" "a - индексировать этот и остальные блоки файла\n" "d - пропустить этот и остальные блоки файла\n" -#, c-format, perl-format +#, c-format msgid "Stash mode change [y,n,q,a,d%s,?]? " msgstr "Спрятать изменение режима доступа [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Stash deletion [y,n,q,a,d%s,?]? " msgstr "Спрятать удаление файла [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Stash addition [y,n,q,a,d%s,?]? " msgstr "Добавить к спрятанному [y,n,q,a,d%s,?]?" -#, c-format, perl-format +#, c-format msgid "Stash this hunk [y,n,q,a,d%s,?]? " msgstr "Спрятать этот блок [y,n,q,a,d%s,?]? " @@ -259,19 +259,19 @@ msgstr "" "a - спрятать этот и остальные блоки файла\n" "d - пропустить этот и остальные блоки файла\n" -#, c-format, perl-format +#, c-format msgid "Unstage mode change [y,n,q,a,d%s,?]? " msgstr "Убрать изменения режима доступа из индекса [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Unstage deletion [y,n,q,a,d%s,?]? " msgstr "Убрать удаление из индекса [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Unstage addition [y,n,q,a,d%s,?]? " msgstr "Убрать из индекса [y,n,q,a,d%s,?]?" -#, c-format, perl-format +#, c-format msgid "Unstage this hunk [y,n,q,a,d%s,?]? " msgstr "Убрать из индекса этот блок [y,n,q,a,d%s,?]? " @@ -289,25 +289,25 @@ msgid "" "a - unstage this hunk and all later hunks in the file\n" "d - do not unstage this hunk or any of the later hunks in the file\n" msgstr "" -"y - убрать из индекса этот блок\n" +"y - убрать этот блок из индекса\n" "n - пропустить этот блок\n" "q - выход; пропустить этот и все последующие блоки\n" "a - убрать из индекса этот и остальные блоки файла\n" "d - пропустить этот и остальные блоки файла\n" -#, c-format, perl-format +#, c-format msgid "Apply mode change to index [y,n,q,a,d%s,?]? " msgstr "Применить изменение режима доступа к индексу [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Apply deletion to index [y,n,q,a,d%s,?]? " msgstr "Применить удаление к индексу [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Apply addition to index [y,n,q,a,d%s,?]? " msgstr "Применить добавление к индексу [y,n,q,a,d%s,?]?" -#, c-format, perl-format +#, c-format msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " msgstr "Принять этот блок в индекс [y,n,q,a,d%s,?]? " @@ -331,21 +331,21 @@ msgstr "" "a - принять этот и остальные блоки файла\n" "d - пропустить этот и остальные блоки файла\n" -#, c-format, perl-format +#, c-format msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " msgstr "Отменить изменения режима доступа в рабочем каталоге [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " msgstr "Отменить удаление в рабочем каталоге [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Discard addition from worktree [y,n,q,a,d%s,?]? " msgstr "Отменить добавления из рабочего каталога [y,n,q,a,d%s,?]?" -#, c-format, perl-format +#, c-format msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " -msgstr "Отбросить этот блок из рабочего дерева [y,n,q,a,d%s,?]?" +msgstr "Отбросить этот блок из рабочего каталога [y,n,q,a,d%s,?]?" msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " @@ -360,29 +360,29 @@ msgid "" "a - discard this hunk and all later hunks in the file\n" "d - do not discard this hunk or any of the later hunks in the file\n" msgstr "" -"y - отбросить этот блок из рабочего дерева\n" +"y - отбросить этот блок из рабочего каталога\n" "n - пропустить этот блок\n" "q - выход; пропустить этот и все последующие блоки\n" "a - отбросить этот и остальные блоки файла\n" "d - пропустить этот и остальные блоки файла\n" -#, c-format, perl-format +#, c-format msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " msgstr "" -"Отменить изменения режима доступа в индексе и рабочем каталоге [y,n,q,a,d" -"%s,?]? " +"Отменить изменения режима доступа в индексе и рабочем каталоге [y,n,q,a," +"d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " msgstr "Отменить удаление в индексе и рабочем каталоге [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? " msgstr "Отменить добавление в индекс и рабочий каталог [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " -msgstr "Отбросить этот блок из индекса рабочего дерева [y,n,q,a,d%s,?]? " +msgstr "Отбросить этот блок из индекса рабочего каталога [y,n,q,a,d%s,?]? " msgid "" "y - discard this hunk from index and worktree\n" @@ -391,27 +391,27 @@ msgid "" "a - discard this hunk and all later hunks in the file\n" "d - do not discard this hunk or any of the later hunks in the file\n" msgstr "" -"y - отбросить этот блок из рабочего дерева\n" +"y - отбросить этот блок из рабочего каталога\n" "n - пропустить этот блок\n" "q - выход; пропустить этот и все последующие блоки\n" "a - отбросить этот и остальные блоки файла\n" "d - пропустить этот и остальные блоки файла\n" -#, c-format, perl-format +#, c-format msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " msgstr "" -"Применить изменения режима доступа к индексу и рабочему каталогу [y,n,q,a,d" -"%s,?]? " +"Применить изменения режима доступа к индексу и рабочему каталогу [y,n,q,a," +"d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " msgstr "Применить удаление к индексу и рабочему каталогу [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? " msgstr "Применить добавление к индексу и рабочему каталогу [y,n,q,a,d%s,?]? " -#, c-format, perl-format +#, c-format msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " msgstr "Принять этот блок в индекс и рабочий каталог [y,n,q,a,d%s,?]? " @@ -422,12 +422,28 @@ msgid "" "a - apply this hunk and all later hunks in the file\n" "d - do not apply this hunk or any of the later hunks in the file\n" msgstr "" -"y - принять этот блок в индекс и рабочее дерево\n" +"y - принять этот блок в индекс и рабочий каталог\n" "n - пропустить этот блок\n" "q - выход; пропустить этот и все последующие блоки\n" "a - принять этот и остальные блоки файла\n" "d - пропустить этот и остальные блоки файла\n" +#, c-format +msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? " +msgstr "" + +#, c-format +msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " +msgstr "" + +#, c-format +msgid "Apply addition to worktree [y,n,q,a,d%s,?]? " +msgstr "" + +#, c-format +msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? " +msgstr "Принять этот блок в рабочий каталог [y,n,q,a,d%s,?]? " + msgid "" "y - apply this hunk to worktree\n" "n - do not apply this hunk to worktree\n" @@ -435,7 +451,7 @@ msgid "" "a - apply this hunk and all later hunks in the file\n" "d - do not apply this hunk or any of the later hunks in the file\n" msgstr "" -"y - принять этот блок в рабочее дерево\n" +"y - принять этот блок в рабочий каталог\n" "n - пропустить этот блок\n" "q - выход; пропустить этот и все последующие блоки\n" "a - принять этот и остальные блоки файла\n" @@ -445,10 +461,6 @@ msgstr "" msgid "could not parse hunk header '%.*s'" msgstr "не удалось разобрать заголовок блока изменений «%.*s»" -#, c-format -msgid "could not parse colored hunk header '%.*s'" -msgstr "не удалось разобрать цветной заголовок блока изменений «%.*s»" - msgid "could not parse diff" msgstr "не удалось разобрать список изменений (diff)" @@ -457,15 +469,18 @@ msgstr "не удалось разобрать цветной список из #, c-format msgid "failed to run '%s'" -msgstr "" +msgstr "не удалось запустить «%s»" msgid "mismatched output from interactive.diffFilter" -msgstr "" +msgstr "несовпадение вывода из interactive.diffFilter" msgid "" "Your filter must maintain a one-to-one correspondence\n" "between its input and output lines." msgstr "" +"Ваш фильтр должен поддерживать соответствие\n" +"один-к-одному между его входными и выходными\n" +"строками." #, c-format msgid "" @@ -504,8 +519,6 @@ msgstr "" "Чтобы убрать «%c»-строки, удалите их.\n" "Строки, начинающиеся с %cбудут удалены.\n" -#. #-#-#-#-# git-add--interactive.perl.po #-#-#-#-# -#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. 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" @@ -517,25 +530,16 @@ msgstr "" "и блок останется без изменений.\n" msgid "could not parse hunk header" -msgstr "" +msgstr "не удалось разобрать заголовок блока изменений" msgid "'git apply --cached' failed" -msgstr "" +msgstr "сбой при выполнении «git apply --cached»" -#. #-#-#-#-# add-patch.c.po #-#-#-#-# #. TRANSLATORS: do not translate [y/n] #. The program will only accept that input at this point. #. Consider translating (saying "no" discards!) as #. (saying "n" for "no" discards!) if the translation #. of the word "no" does not start with n. -#. -#. #-#-#-#-# git-add--interactive.perl.po #-#-#-#-# -#. TRANSLATORS: do not translate [y/n] -#. The program will only accept that input -#. at this point. -#. Consider translating (saying "no" discards!) as -#. (saying "n" for "no" discards!) if the translation -#. of the word "no" does not start with n. msgid "" "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " msgstr "" @@ -543,7 +547,7 @@ msgstr "" "«нет»!) [y/n]? " msgid "The selected hunks do not apply to the index!" -msgstr "" +msgstr "Выбранные блоки не применяются без ошибок к индексу!" msgid "Apply them to the worktree anyway? " msgstr "Все равно применить их к рабочему каталогу? " @@ -562,15 +566,24 @@ msgid "" "e - manually edit the current hunk\n" "? - print help\n" msgstr "" +"j - не принимать решение по этому блоку, перейти на следующий нерешенный\n" +"J - не принимать решение по этому блоку, перейти на следующий\n" +"k - не принимать решение по этому блоку, перейти на предыдущий нерешенный\n" +"K - не принимать решение по этому блоку, перейти на предыдущий\n" +"g - выбрать блок изменений на который нужно перейти\n" +"/ - поиск блока изменений с помощью регулярного выражения\n" +"s - разделить текущий блок на блоки меньшего размера\n" +"e - вручную отредактировать текущий блок\n" +"? - вывести справку\n" msgid "No previous hunk" -msgstr "" +msgstr "Нет предыдущего блока" msgid "No next hunk" -msgstr "" +msgstr "Не следующего блока" msgid "No other hunks to goto" -msgstr "" +msgstr "Нет других блоков для перехода" msgid "go to which hunk ( to see more)? " msgstr "на какой блок перейти (нажмите <ввод> чтобы увидеть еще)? " @@ -580,41 +593,41 @@ msgstr "на какой блок перейти? " #, c-format msgid "Invalid number: '%s'" -msgstr "" +msgstr "Недопустимый номер: «%s»" #, c-format msgid "Sorry, only %d hunk available." msgid_plural "Sorry, only %d hunks available." -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" +msgstr[0] "Простите, но только %d блок изменений доступнен." +msgstr[1] "Простите, но только %d блока изменений доступно." +msgstr[2] "Простите, но только %d блоков изменений доступно." +msgstr[3] "Простите, но только %d блока изменений доступно." msgid "No other hunks to search" -msgstr "" +msgstr "Нет других блоков для поиска" msgid "search for regex? " msgstr "искать с помощью регулярного выражения? " #, c-format msgid "Malformed search regexp %s: %s" -msgstr "" +msgstr "Регулярное выражение для поиска в неправильном формате %s: %s" msgid "No hunk matches the given pattern" -msgstr "" +msgstr "Не найдены блоки, которые соответствуют указанному шаблону" msgid "Sorry, cannot split this hunk" msgstr "" #, c-format msgid "Split into %d hunks." -msgstr "" +msgstr "Разбито на %d блока изменений." msgid "Sorry, cannot edit this hunk" msgstr "" msgid "'git apply' failed" -msgstr "" +msgstr "сбой при выполнении «git apply»" #, c-format msgid "" @@ -666,6 +679,16 @@ msgstr "Перед слиянием, выполните коммит ваших msgid "Exiting because of unfinished merge." msgstr "Выход из-за незавершенного слияния." +msgid "" +"Diverging branches can't be fast-forwarded, you need to either:\n" +"\n" +"\tgit merge --no-ff\n" +"\n" +"or:\n" +"\n" +"\tgit rebase\n" +msgstr "" + msgid "Not possible to fast-forward, aborting." msgstr "Быстрая перемотка невозможна, отменяем." @@ -724,19 +747,35 @@ msgstr "" "advice.detachedHead в значение false\n" "\n" +#, c-format +msgid "" +"The following paths have been moved outside the\n" +"sparse-checkout definition but are not sparse due to local\n" +"modifications.\n" +msgstr "" + +msgid "" +"To correct the sparsity of these paths, do the following:\n" +"* Use \"git add --sparse \" to update the index\n" +"* Use \"git sparse-checkout reapply\" to apply the sparsity rules" +msgstr "" + msgid "cmdline ends with \\" msgstr "командная строка заканчивается символом \\" msgid "unclosed quote" msgstr "пропущена закрывающая кавычка" +msgid "too many arguments" +msgstr "" + #, c-format msgid "unrecognized whitespace option '%s'" -msgstr "неопознанная опция для пробелов «%s»" +msgstr "неопознанный параметр для пробелов «%s»" #, c-format msgid "unrecognized whitespace ignore option '%s'" -msgstr "неопознанная опция для игнорирования пробелов «%s»" +msgstr "неопознанный параметр для игнорирования пробелов «%s»" #, c-format msgid "options '%s' and '%s' cannot be used together" @@ -1100,6 +1139,10 @@ msgstr "усечение имени .rej файла до %.*s.rej" msgid "cannot open %s" msgstr "не удалось открыть %s" +#, c-format +msgid "cannot unlink '%s'" +msgstr "" + #, c-format msgid "Hunk #%d applied cleanly." msgstr "Блок №%d применен без ошибок." @@ -1255,6 +1298,10 @@ msgstr "не удалось создать поток двоичного объ msgid "unsupported file mode: 0%o (SHA1: %s)" msgstr "неподдерживаемый режим доступа к файлу: 0%o (SHA1: %s)" +#, c-format +msgid "deflate error (%d)" +msgstr "ошибка сжатия (%d)" + #, c-format msgid "unable to start '%s' filter" msgstr "не удалось запустить фильтр «%s»" @@ -1274,10 +1321,6 @@ msgstr "путь не является действительным UTF-8: %s" msgid "path too long (%d chars, SHA1: %s): %s" msgstr "путь слишком длинный (%d символов, SHA1: %s): %s" -#, c-format -msgid "deflate error (%d)" -msgstr "ошибка сжатия (%d)" - #, c-format msgid "timestamp too large for this system: %" msgstr "отметка времени слишком большая для этой системы: %" @@ -1297,6 +1340,10 @@ msgstr "git archive --remote <репозиторий> [--exec <команда>] msgid "cannot read '%s'" msgstr "не удалось прочитать «%s»" +#, c-format +msgid "pathspec '%s' matches files outside the current directory" +msgstr "" + #, c-format msgid "pathspec '%s' did not match any files" msgstr "спецификатор пути «%s» не соответствует ни одному файлу" @@ -1313,9 +1360,6 @@ msgstr "недопустимое имя объекта: %s" msgid "not a tree object: %s" msgstr "недействительный объект дерева: %s" -msgid "current working directory is untracked" -msgstr "текущий рабочий каталог не отслеживается" - #, c-format msgid "File not found: %s" msgstr "" @@ -1366,6 +1410,12 @@ msgstr "читать .gitattributes в рабочем каталоге" msgid "report archived files on stderr" msgstr "отчет об архивированных файлах в stderr" +msgid "time" +msgstr "время" + +msgid "set modification time of archive entries" +msgstr "" + msgid "set compression level" msgstr "" @@ -1406,6 +1456,13 @@ msgstr "Аргумент не поддерживается для формата msgid "%.*s is not a valid attribute name" msgstr "%.*s не является допустимым именем атрибута" +msgid "unable to add additional attribute" +msgstr "" + +#, c-format +msgid "ignoring overly long attributes line %d" +msgstr "" + #, c-format msgid "%s not allowed: %s:%d" msgstr "%s не разрешено: %s:%d" @@ -1418,6 +1475,21 @@ msgstr "" "Используйте «\\!» для буквального использования символа в значении " "«восклицательный знак»." +#, c-format +msgid "cannot fstat gitattributes file '%s'" +msgstr "" + +#, c-format +msgid "ignoring overly large gitattributes file '%s'" +msgstr "" + +#, c-format +msgid "ignoring overly large gitattributes blob '%s'" +msgstr "" + +msgid "bad --attr-source or GIT_ATTR_SOURCE" +msgstr "" + #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "Плохое содержимое файла «%s»: %s" @@ -1514,7 +1586,6 @@ msgstr[3] "(примерно %d шагов)" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. -#. #, 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" @@ -1526,9 +1597,6 @@ msgstr[3] "Бинарный поиск: %d редакций осталось п msgid "--contents and --reverse do not blend well." msgstr "--contents и --reverse не очень сочетаются." -msgid "cannot use --contents with final commit object name" -msgstr "нельзя использовать --contents с указанием финального имени объекта" - msgid "--reverse and --first-parent together require specified latest commit" msgstr "" "при --reverse и --first-parent вместе нужно указывать конкретный последний " @@ -1597,20 +1665,17 @@ msgstr "" #. TRANSLATORS: This is a line listing a remote with duplicate #. refspecs in the advice message below. For RTL languages you'll #. probably want to swap the "%s" and leading " " space around. -#. #. #-#-#-#-# object-name.c.po #-#-#-#-# #. TRANSLATORS: This is line item of ambiguous object output #. from describe_ambiguous_object() above. For RTL languages #. you'll probably want to swap the "%s" and leading " " space #. around. -#. #, c-format msgid " %s\n" msgstr "" #. TRANSLATORS: The second argument is a \n-delimited list of #. duplicate refspecs, composed above. -#. #, c-format msgid "" "There are multiple remotes whose fetch refspecs map to the remote\n" @@ -1680,8 +1745,8 @@ msgstr "" #, c-format msgid "" -"You may try updating the submodules using 'git checkout %s && git submodule " -"update --init'" +"You may try updating the submodules using 'git checkout --no-recurse-" +"submodules %s && git submodule update --init'" msgstr "" #, c-format @@ -1692,10 +1757,6 @@ msgstr "" msgid "'%s' is already checked out at '%s'" msgstr "«%s» уже находится на «%s»" -#, c-format -msgid "HEAD of working tree %s is not updated" -msgstr "HEAD рабочего каталога %s не обновлён" - msgid "git add [] [--] ..." msgstr "git add [<опции>] [--] <спецификатор-пути>..." @@ -1717,6 +1778,11 @@ msgstr "удалить «%s»\n" msgid "Unstaged changes after refreshing the index:" msgstr "Непроиндексированные изменения после обновления индекса:" +msgid "" +"the add.interactive.useBuiltin setting has been removed!\n" +"See its entry in 'git help config' for details." +msgstr "" + msgid "Could not read the index" msgstr "Не удалось прочитать индекс" @@ -2006,7 +2072,6 @@ 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. -#. #, c-format msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "" @@ -2103,6 +2168,9 @@ msgstr "git am [<опции>] (--continue | --skip | --abort)" msgid "run interactively" msgstr "запустить в интерактивном режиме" +msgid "bypass pre-applypatch and applypatch-msg hooks" +msgstr "" + msgid "historical option -- no-op" msgstr "историческая опция — ничего не делает" @@ -2245,31 +2313,24 @@ msgstr "git archive: ошибка протокола" msgid "git archive: expected a flush" msgstr "git archive: ожидался сброс буфера" -msgid "git bisect--helper --bisect-reset []" -msgstr "" - msgid "" -"git bisect--helper --bisect-start [--term-{new,bad}= --term-{old,good}" -"=] [--no-checkout] [--first-parent] [ [...]] [--] " -"[...]" -msgstr "" -"git bisect--helper --bisect-start [--term-{new,bad}=<термин> --term-{old," -"good}=<термин>] [--no-checkout] [--first-parent] [<плохая-редация> [<хорошая-" -"редация>...]] [--] [<пути>...]" - -msgid "git bisect--helper --bisect-state (bad|new) []" +"git bisect start [--term-{new,bad}= --term-{old,good}=] [--no-" +"checkout] [--first-parent] [ [...]] [--] [...]" msgstr "" -msgid "git bisect--helper --bisect-state (good|old) [...]" +msgid "git bisect (good|bad) [...]" msgstr "" -msgid "git bisect--helper --bisect-replay " +msgid "git bisect skip [(|)...]" msgstr "" -msgid "git bisect--helper --bisect-skip [(|)...]" +msgid "git bisect reset []" msgstr "" -msgid "git bisect--helper --bisect-run ..." +msgid "git bisect replay " +msgstr "" + +msgid "git bisect run ..." msgstr "" #, c-format @@ -2348,7 +2409,6 @@ msgstr "" #. TRANSLATORS: Make sure to include [Y] and [n] in your #. translation. The program will only accept English input #. at this point. -#. msgid "Are you sure [Y/n]? " msgstr "Вы уверены [Y - да/n - нет]? " @@ -2406,9 +2466,6 @@ msgstr "" msgid "checking out '%s' failed. Try 'git bisect start '." msgstr "" -msgid "won't bisect on cg-seek'ed tree" -msgstr "нельзя выполнить двоичный поиск на дереве после cg-seek" - msgid "bad HEAD - strange symbolic ref" msgstr "" @@ -2422,7 +2479,6 @@ msgstr "" #. TRANSLATORS: Make sure to include [Y] and [n] in your #. translation. The program will only accept English input #. at this point. -#. msgid "Do you want me to do it for you [Y/n]? " msgstr "Вы уверены, что хотите, чтобы я сделал это [Y] - да/[n] - нет? " @@ -2460,7 +2516,7 @@ msgid "bisect run failed: no command provided." msgstr "сбой при выполнении двоичного поиска: не передана команда." #, c-format -msgid "unable to verify '%s' on good revision" +msgid "unable to verify %s on good revision" msgstr "" #, c-format @@ -2468,7 +2524,7 @@ msgid "bogus exit code %d for good revision" msgstr "" #, c-format -msgid "bisect run failed: exit code %d from '%s' is < 0 or >= 128" +msgid "bisect run failed: exit code %d from %s is < 0 or >= 128" msgstr "" #, c-format @@ -2478,74 +2534,48 @@ msgstr "" msgid "bisect run cannot continue any more" msgstr "bisect run больше не может продолжать" -#, c-format msgid "bisect run success" msgstr "bisect run выполнен успешно" -#, c-format msgid "bisect found first bad commit" msgstr "" #, c-format -msgid "" -"bisect run failed: 'git bisect--helper --bisect-state %s' exited with error " -"code %d" +msgid "bisect run failed: 'git bisect %s' exited with error code %d" msgstr "" -msgid "reset the bisection state" +#, c-format +msgid "'%s' requires either no argument or a commit" msgstr "" -msgid "check whether bad or good terms exist" +#, c-format +msgid "'%s' requires 0 or 1 argument" msgstr "" -msgid "print out the bisect terms" -msgstr "" - -msgid "start the bisect session" -msgstr "" - -msgid "find the next bisection commit" -msgstr "" - -msgid "mark the state of ref (or refs)" -msgstr "" - -msgid "list the bisection steps so far" -msgstr "" - -msgid "replay the bisection process from the given file" -msgstr "" - -msgid "skip some commits for checkout" -msgstr "" - -msgid "visualize the bisection" -msgstr "" - -msgid "use ... to automatically bisect" -msgstr "" - -msgid "no log for BISECT_WRITE" -msgstr "" - -msgid "--bisect-reset requires either no argument or a commit" -msgstr "" - -msgid "--bisect-terms requires 0 or 1 argument" -msgstr "" - -msgid "--bisect-next requires 0 arguments" -msgstr "" - -msgid "--bisect-log requires 0 arguments" +#, c-format +msgid "'%s' requires 0 arguments" msgstr "" msgid "no logfile given" msgstr "" +#, c-format +msgid "'%s' failed: no command provided." +msgstr "" + +msgid "need a command" +msgstr "" + +#, c-format +msgid "unknown command: '%s'" +msgstr "" + msgid "git blame [] [] [] [--] " msgstr "git blame [<опции>] [<опции-редакции>] [<редакция>] [--] <файл>" +msgid "git annotate [] [] [] [--] " +msgstr "" + msgid " are documented in git-rev-list(1)" msgstr "<опции-rev-list> документированы в git-rev-list(1)" @@ -2659,7 +2689,6 @@ msgstr "" #. among various forms of relative timestamps, but #. your language may need more or fewer display #. columns. -#. msgid "4 years, 11 months ago" msgstr "4 года и 11 месяцев назад" @@ -2734,9 +2763,6 @@ msgstr "Не удалось обновить файл конфигурации" msgid "cannot use -a with -d" msgstr "нельзя использовать одновременно ключи -a и -d" -msgid "Couldn't look up commit object for HEAD" -msgstr "Не удалось найти объект коммита для HEAD" - #, c-format msgid "Cannot delete branch '%s' checked out at '%s'" msgstr "Нельзя удалить ветку «%s» т.к. она активна на «%s»" @@ -2745,6 +2771,12 @@ msgstr "Нельзя удалить ветку «%s» т.к. она активн msgid "remote-tracking branch '%s' not found." msgstr "внешняя отслеживаемая ветка «%s» не найдена." +#, c-format +msgid "" +"branch '%s' not found.\n" +"Did you forget --remote?" +msgstr "" + #, c-format msgid "branch '%s' not found." msgstr "ветка «%s» не найдена." @@ -2775,20 +2807,22 @@ msgstr "Производится перемещение ветки %s на %s" msgid "Branch %s is being bisected at %s" msgstr "Производится двоичный поиск в ветке %s на %s" -msgid "cannot copy the current branch while not on any." -msgstr "" -"невозможно скопировать текущую ветку, если вы не находитесь ни на одной из " -"веток." - -msgid "cannot rename the current branch while not on any." -msgstr "" -"невозможно переименовать текущую ветку, если вы не находитесь ни на одной из " -"них." +#, c-format +msgid "HEAD of working tree %s is not updated" +msgstr "HEAD рабочего каталога %s не обновлён" #, c-format msgid "Invalid branch name: '%s'" msgstr "Недействительное имя ветки: «%s»" +#, c-format +msgid "No commit on branch '%s' yet." +msgstr "Еще нет коммита на ветке «%s»." + +#, c-format +msgid "No branch named '%s'." +msgstr "Нет ветки с именем «%s»." + msgid "Branch rename failed" msgstr "Сбой переименования ветки" @@ -2877,6 +2911,9 @@ msgstr "переместить/переименовать ветки и ее ж msgid "move/rename a branch, even if target exists" msgstr "переместить/переименовать ветку, даже если целевое имя уже существует" +msgid "do not output a newline after empty formatted refs" +msgstr "" + msgid "copy a branch and its reflog" msgstr "скопировать ветку и её журнал ссылок" @@ -2945,13 +2982,15 @@ msgstr "Нельзя дать описание отсоединённому ук msgid "cannot edit description of more than one branch" msgstr "нельзя изменить описание более одной ветки за раз" -#, c-format -msgid "No commit on branch '%s' yet." -msgstr "Еще нет коммита на ветке «%s»." +msgid "cannot copy the current branch while not on any." +msgstr "" +"невозможно скопировать текущую ветку, если вы не находитесь ни на одной из " +"веток." -#, c-format -msgid "No branch named '%s'." -msgstr "Нет ветки с именем «%s»." +msgid "cannot rename the current branch while not on any." +msgstr "" +"невозможно переименовать текущую ветку, если вы не находитесь ни на одной из " +"них." msgid "too many branches for a copy operation" msgstr "слишком много веток для операции копирования" @@ -3017,7 +3056,9 @@ msgstr "" msgid "not run from a git repository - no hooks to show\n" msgstr "" -msgid "git bugreport [-o|--output-directory ] [-s|--suffix ]" +msgid "" +"git bugreport [(-o | --output-directory) ] [(-s | --suffix) ]\n" +" [--diagnose[=]]" msgstr "" msgid "" @@ -3038,16 +3079,27 @@ msgid "" "You can delete any lines you don't wish to share.\n" msgstr "" -msgid "specify a destination for the bugreport file" +msgid "mode" +msgstr "режим" + +msgid "" +"create an additional zip archive of detailed diagnostics (default 'stats')" msgstr "" -msgid "specify a strftime format suffix for the filename" +msgid "specify a destination for the bugreport file(s)" +msgstr "" + +msgid "specify a strftime format suffix for the filename(s)" msgstr "" #, c-format msgid "could not create leading directories for '%s'" msgstr "" +#, c-format +msgid "unable to create diagnostics archive %s" +msgstr "" + msgid "System Info" msgstr "" @@ -3062,16 +3114,21 @@ msgstr "" msgid "Created new report at '%s'.\n" msgstr "" -msgid "git bundle create [] " +msgid "" +"git bundle create [-q | --quiet | --progress]\n" +" [--version=] " msgstr "" -msgid "git bundle verify [] " +msgid "git bundle verify [-q | --quiet] " msgstr "" msgid "git bundle list-heads [...]" msgstr "" -msgid "git bundle unbundle [...]" +msgid "git bundle unbundle [--progress] [...]" +msgstr "" + +msgid "need a argument" msgstr "" msgid "do not show progress meter" @@ -3080,11 +3137,11 @@ msgstr "не выводить прогресс выполнения" msgid "show progress meter" msgstr "показать прогресс выполнения" -msgid "show progress meter during object writing phase" -msgstr "показать прогресс выполнения во время записи объектов" +msgid "historical; same as --progress" +msgstr "" -msgid "similar to --all-progress when progress meter is shown" -msgstr "похоже на --all-progress при включенном прогрессе выполнения" +msgid "historical; does nothing" +msgstr "" msgid "specify bundle format version" msgstr "" @@ -3105,10 +3162,6 @@ msgstr "Требуется репозиторий для распаковки." msgid "Unbundling objects" msgstr "" -#, c-format -msgid "Unknown subcommand: %s" -msgstr "Неизвестная подкоманда: %s" - #, c-format msgid "cannot read object %s '%s'" msgstr "невозможно прочитать объект %s «%s»" @@ -3131,10 +3184,6 @@ msgstr "" msgid "%s takes no arguments" msgstr "" -#, c-format -msgid "unknown command: '%s'" -msgstr "" - msgid "only one batch option may be specified" msgstr "" @@ -3151,7 +3200,7 @@ msgid "" "git cat-file (--batch | --batch-check | --batch-command) [--batch-all-" "objects]\n" " [--buffer] [--follow-symlinks] [--unordered]\n" -" [--textconv | --filters]" +" [--textconv | --filters] [-z]" msgstr "" msgid "" @@ -3180,6 +3229,9 @@ msgstr "показать размер объекта" msgid "allow -s and -t to work with broken/corrupt objects" msgstr "разрешить -s и -t работать с повреждёнными объектами" +msgid "use mail map file" +msgstr "" + msgid "Batch objects requested on stdin (or --batch-all-objects)" msgstr "" @@ -3189,6 +3241,9 @@ msgstr "" msgid "like --batch, but don't emit " msgstr "" +msgid "stdin is NUL-terminated" +msgstr "" + msgid "read commands from stdin" msgstr "" @@ -3250,18 +3305,18 @@ msgstr "" msgid " required with '-%c'" msgstr "" -msgid "too many arguments" -msgstr "" - #, c-format msgid "only two arguments allowed in mode, not %d" msgstr "" -msgid "git check-attr [-a | --all | ...] [--] ..." -msgstr "git check-attr [-a | --all | <атрибут>...] [--] <путь>..." +msgid "" +"git check-attr [--source ] [-a | --all | ...] [--] " +"..." +msgstr "" -msgid "git check-attr --stdin [-z] [-a | --all | ...]" -msgstr "git check-attr --stdin [-z] [-a | --all | <атрибут>...]" +msgid "" +"git check-attr --stdin [-z] [--source ] [-a | --all | ...]" +msgstr "" msgid "report all attributes set on file" msgstr "вывести все атрибуты установленные для файла" @@ -3275,6 +3330,12 @@ msgstr "прочитать имена файлов из стандартного msgid "terminate input and output records by a NUL character" msgstr "окончание ввода и вывода записей по НУЛЕВОМУ символу" +msgid "" +msgstr "" + +msgid "which tree-ish to check attributes at" +msgstr "" + msgid "suppress progress reporting" msgstr "не выводить прогресс выполнения" @@ -3787,9 +3848,9 @@ msgid "use overlay mode" msgstr "" msgid "" -"git clean [-d] [-f] [-i] [-n] [-q] [-e ] [-x | -X] [--] ..." +"git clean [-d] [-f] [-i] [-n] [-q] [-e ] [-x | -X] [--] " +"[...]" msgstr "" -"git clean [-d] [-f] [-i] [-n] [-q] [-e <шаблон>] [-x | -X] [--] <пути>..." #, c-format msgid "Removing %s\n" @@ -3853,7 +3914,7 @@ msgstr "" "* - выбрать все элементы\n" " - (пусто) завершить выделение\n" -#, c-format, perl-format +#, c-format msgid "Huh (%s)?\n" msgstr "Хм (%s)?\n" @@ -4006,9 +4067,6 @@ msgstr "глубина" msgid "create a shallow clone of that depth" msgstr "сделать частичный клон указанной глубины" -msgid "time" -msgstr "время" - msgid "create a shallow clone since a specific time" msgstr "сделать частичный клон до определенного времени" @@ -4062,6 +4120,12 @@ msgstr "" msgid "initialize sparse-checkout file to include only files at root" msgstr "" +msgid "uri" +msgstr "" + +msgid "a URI for downloading bundles before fetching from origin remote" +msgstr "" + #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "информация: Не удалось добавить альтернативу для «%s»: %s\n" @@ -4074,10 +4138,18 @@ msgstr "не удалось выполнить stat «%s»" msgid "%s exists and is not a directory" msgstr "%s уже существует и не является каталогом" +#, c-format +msgid "'%s' is a symlink, refusing to clone with --local" +msgstr "" + #, c-format msgid "failed to start iterator over '%s'" msgstr "" +#, c-format +msgid "symlink '%s' exists, refusing to clone with --local" +msgstr "" + #, c-format msgid "failed to unlink '%s'" msgstr "сбой отсоединения «%s»" @@ -4124,10 +4196,8 @@ msgstr "не удалось обновить %s" msgid "failed to initialize sparse-checkout" msgstr "" -msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" +msgid "remote HEAD refers to nonexistent ref, unable to checkout" msgstr "" -"внешний HEAD ссылается на несуществующую ссылку, нельзя переключиться на " -"такое состояние.\n" msgid "unable to checkout working tree" msgstr "не удалось переключиться на версию в рабочем каталоге" @@ -4147,8 +4217,9 @@ msgstr "Слишком много аргументов." msgid "You must specify a repository to clone." msgstr "Вы должны указать репозиторий для клонирования." -#, c-format -msgid "options '%s' and '%s %s' cannot be used together" +msgid "" +"--bundle-uri is incompatible with --depth, --shallow-since, and --shallow-" +"exclude" msgstr "" #, c-format @@ -4227,6 +4298,16 @@ msgstr "--local игнорируется" msgid "cannot clone from filtered bundle" msgstr "" +msgid "failed to initialize the repo, skipping bundle URI" +msgstr "" + +#, c-format +msgid "failed to fetch objects from bundle URI '%s'" +msgstr "" + +msgid "failed to fetch advertised bundles" +msgstr "" + msgid "remote transport reported error" msgstr "" @@ -4262,13 +4343,16 @@ msgid "--command must be the first argument" msgstr "параметр --command должен быть первым" msgid "" -"git commit-graph verify [--object-dir ] [--shallow] [--[no-]progress]" +"git commit-graph verify [--object-dir ] [--shallow] [--[no-]progress]" msgstr "" msgid "" -"git commit-graph write [--object-dir ] [--append] [--" -"split[=]] [--reachable|--stdin-packs|--stdin-commits] [--changed-" -"paths] [--[no-]max-new-filters ] [--[no-]progress] " +"git commit-graph write [--object-dir ] [--append]\n" +" [--split[=]] [--reachable | --stdin-packs | " +"--stdin-commits]\n" +" [--changed-paths] [--[no-]max-new-filters ] [--" +"[no-]progress]\n" +" " msgstr "" msgid "dir" @@ -4337,13 +4421,12 @@ msgstr "" msgid "Collecting commits from input" msgstr "" -#, c-format -msgid "unrecognized subcommand: %s" +msgid "git commit-tree [(-p )...]" msgstr "" msgid "" -"git commit-tree [(-p )...] [-S[]] [(-m )...] [(-F " -")...] " +"git commit-tree [(-p )...] [-S[]] [(-m )...]\n" +" [(-F )...] " msgstr "" #, c-format @@ -4386,11 +4469,20 @@ msgstr "необходимо указать одно дерево" msgid "git commit-tree: failed to read" msgstr "git commit-tree: сбой при чтении" -msgid "git commit [] [--] ..." -msgstr "git commit [<опции>] [--] <спецификатор-пути>..." +msgid "" +"git commit [-a | --interactive | --patch] [-s] [-v] [-u] [--amend]\n" +" [--dry-run] [(-c | -C | --squash) | --fixup [(amend|" +"reword):])]\n" +" [-F | -m ] [--reset-author] [--allow-empty]\n" +" [--allow-empty-message] [--no-verify] [-e] [--author=]\n" +" [--date=] [--cleanup=] [--[no-]status]\n" +" [-i | -o] [--pathspec-from-file= [--pathspec-file-nul]]\n" +" [(--trailer [(=|:)])...] [-S[]]\n" +" [--] [...]" +msgstr "" -msgid "git status [] [--] ..." -msgstr "git status [<опции>] [--] <спецификатор-пути>..." +msgid "git status [] [--] [...]" +msgstr "" msgid "" "You asked to amend the most recent commit, but doing so would make\n" @@ -4672,9 +4764,6 @@ msgstr "показать статус в длинном формате (по у msgid "terminate entries with NUL" msgstr "завершать записи НУЛЕВЫМ байтом" -msgid "mode" -msgstr "режим" - msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" "показать неотслеживаемые файлы, опциональные режимы: all (все), normal (как " @@ -4747,7 +4836,6 @@ msgstr "использовать сообщение указанного ком #. TRANSLATORS: Leave "[(amend|reword):]" as-is, #. and only translate . -#. msgid "[(amend|reword):]commit" msgstr "" @@ -5136,11 +5224,16 @@ msgstr "" msgid "unable to get credential storage lock in %d ms" msgstr "" -msgid "git describe [] [...]" -msgstr "git describe [<опции>] [<указатель-коммита>...]" +msgid "" +"git describe [--all] [--tags] [--contains] [--abbrev=] [...]" +msgstr "" -msgid "git describe [] --dirty" -msgstr "git describe [<опции>] --dirty" +msgid "" +"git describe [--all] [--tags] [--contains] [--abbrev=] --dirty[=]" +msgstr "" + +msgid "git describe " +msgstr "" msgid "head" msgstr "указатель на ветку" @@ -5262,6 +5355,20 @@ msgstr "Имена не найдены, не могу ничего описат msgid "option '%s' and commit-ishes cannot be used together" msgstr "" +msgid "" +"git diagnose [(-o | --output-directory) ] [(-s | --suffix) ]\n" +" [--mode=]" +msgstr "" + +msgid "specify a destination for the diagnostics archive" +msgstr "" + +msgid "specify a strftime format suffix for the filename" +msgstr "" + +msgid "specify the content of the diagnostic archive" +msgstr "" + msgid "--merge-base only works with two commits" msgstr "" @@ -5269,6 +5376,9 @@ msgstr "" msgid "'%s': not a regular file or symlink" msgstr "«%s»: не является обычным файлом или символьной ссылкой" +msgid "no merge given, only parents." +msgstr "" + #, c-format msgid "invalid option: %s" msgstr "неправильный параметр: %s" @@ -5380,25 +5490,6 @@ msgstr "не передана <утилита> для --tool=<утилита>" msgid "no given for --extcmd=" msgstr "не передана <команда> для --extcmd=<команда>" -msgid "git env--helper --type=[bool|ulong] " -msgstr "" - -msgid "default for git_env_*(...) to fall back on" -msgstr "" - -msgid "be quiet only use git_env_*() value as exit code" -msgstr "" - -#, c-format -msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`" -msgstr "" - -#, c-format -msgid "" -"option `--default' expects an unsigned long value with `--type=ulong`, not `" -"%s`" -msgstr "" - msgid "git fast-export []" msgstr "" @@ -5507,6 +5598,161 @@ msgstr "git fetch --all [<опции>]" msgid "fetch.parallel cannot be negative" msgstr "" +msgid "couldn't find remote ref HEAD" +msgstr "" + +#, c-format +msgid "From %.*s\n" +msgstr "Из %.*s\n" + +#, c-format +msgid "object %s not found" +msgstr "объект %s не найден" + +msgid "[up to date]" +msgstr "[актуально]" + +msgid "[rejected]" +msgstr "[отклонено]" + +msgid "can't fetch into checked-out branch" +msgstr "" + +msgid "[tag update]" +msgstr "[обновление метки]" + +msgid "unable to update local ref" +msgstr "не удалось обновить локальную ссылку" + +msgid "would clobber existing tag" +msgstr "" + +msgid "[new tag]" +msgstr "[новая метка]" + +msgid "[new branch]" +msgstr "[новая ветка]" + +msgid "[new ref]" +msgstr "[новая ссылка]" + +msgid "forced update" +msgstr "принудительное обновление" + +msgid "non-fast-forward" +msgstr "без быстрой перемотки" + +#, c-format +msgid "cannot open '%s'" +msgstr "не удалось открыть «%s»" + +msgid "" +"fetch normally indicates which branches had a forced update,\n" +"but that check has been disabled; to re-enable, use '--show-forced-updates'\n" +"flag or run 'git config fetch.showForcedUpdates true'" +msgstr "" + +#, c-format +msgid "" +"it took %.2f seconds to check forced updates; you can use\n" +"'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates " +"false'\n" +"to avoid this check\n" +msgstr "" + +#, c-format +msgid "%s did not send all necessary objects\n" +msgstr "%s не отправил все необходимые объекты\n" + +#, c-format +msgid "rejected %s because shallow roots are not allowed to be updated" +msgstr "" + +#, 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», чтобы почистить старые, конфликтующие ветки" + +#, c-format +msgid " (%s will become dangling)" +msgstr " (%s будет висящей веткой)" + +#, c-format +msgid " (%s has become dangling)" +msgstr " (%s стала висящей веткой)" + +msgid "[deleted]" +msgstr "[удалено]" + +msgid "(none)" +msgstr "(нет)" + +#, c-format +msgid "refusing to fetch into branch '%s' checked out at '%s'" +msgstr "" + +#, c-format +msgid "option \"%s\" value \"%s\" is not valid for %s" +msgstr "" + +#, c-format +msgid "option \"%s\" is ignored for %s\n" +msgstr "" + +#, c-format +msgid "%s is not a valid object" +msgstr "" + +#, c-format +msgid "the object %s does not exist" +msgstr "" + +msgid "multiple branches detected, incompatible with --set-upstream" +msgstr "" + +#, c-format +msgid "" +"could not set upstream of HEAD to '%s' from '%s' when it does not point to " +"any branch." +msgstr "" + +msgid "not setting upstream for a remote remote-tracking branch" +msgstr "" + +msgid "not setting upstream for a remote tag" +msgstr "" + +msgid "unknown branch type" +msgstr "" + +msgid "" +"no source branch found;\n" +"you need to specify exactly one branch with the --set-upstream option" +msgstr "" + +#, c-format +msgid "Fetching %s\n" +msgstr "Извлечение из %s\n" + +#, c-format +msgid "could not fetch %s" +msgstr "" + +#, c-format +msgid "could not fetch '%s' (exit code: %d)\n" +msgstr "" + +msgid "" +"no remote repository specified; please specify either a URL or a\n" +"remote name from which new revisions should be fetched" +msgstr "" + +msgid "you need to specify a tag name" +msgstr "" + msgid "fetch from all remotes" msgstr "извлечь со всех внешних репозиториев" @@ -5611,164 +5857,6 @@ msgstr "" msgid "accept refspecs from stdin" msgstr "" -msgid "couldn't find remote ref HEAD" -msgstr "" - -#, c-format -msgid "object %s not found" -msgstr "объект %s не найден" - -msgid "[up to date]" -msgstr "[актуально]" - -msgid "[rejected]" -msgstr "[отклонено]" - -msgid "can't fetch in current branch" -msgstr "нельзя извлечь текущую ветку" - -msgid "checked out in another worktree" -msgstr "" - -msgid "[tag update]" -msgstr "[обновление метки]" - -msgid "unable to update local ref" -msgstr "не удалось обновить локальную ссылку" - -msgid "would clobber existing tag" -msgstr "" - -msgid "[new tag]" -msgstr "[новая метка]" - -msgid "[new branch]" -msgstr "[новая ветка]" - -msgid "[new ref]" -msgstr "[новая ссылка]" - -msgid "forced update" -msgstr "принудительное обновление" - -msgid "non-fast-forward" -msgstr "без быстрой перемотки" - -#, c-format -msgid "cannot open '%s'" -msgstr "не удалось открыть «%s»" - -msgid "" -"fetch normally indicates which branches had a forced update,\n" -"but that check has been disabled; to re-enable, use '--show-forced-updates'\n" -"flag or run 'git config fetch.showForcedUpdates true'" -msgstr "" - -#, c-format -msgid "" -"it took %.2f seconds to check forced updates; you can use\n" -"'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates " -"false'\n" -"to avoid this check\n" -msgstr "" - -#, c-format -msgid "%s did not send all necessary objects\n" -msgstr "%s не отправил все необходимые объекты\n" - -#, c-format -msgid "rejected %s because shallow roots are not allowed to be updated" -msgstr "" - -#, c-format -msgid "From %.*s\n" -msgstr "Из %.*s\n" - -#, 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», чтобы почистить старые, конфликтующие ветки" - -#, c-format -msgid " (%s will become dangling)" -msgstr " (%s будет висящей веткой)" - -#, c-format -msgid " (%s has become dangling)" -msgstr " (%s стала висящей веткой)" - -msgid "[deleted]" -msgstr "[удалено]" - -msgid "(none)" -msgstr "(нет)" - -#, c-format -msgid "refusing to fetch into branch '%s' checked out at '%s'" -msgstr "" - -#, c-format -msgid "option \"%s\" value \"%s\" is not valid for %s" -msgstr "" - -#, c-format -msgid "option \"%s\" is ignored for %s\n" -msgstr "" - -#, c-format -msgid "%s is not a valid object" -msgstr "" - -#, c-format -msgid "the object %s does not exist" -msgstr "" - -msgid "multiple branches detected, incompatible with --set-upstream" -msgstr "" - -#, c-format -msgid "" -"could not set upstream of HEAD to '%s' from '%s' when it does not point to " -"any branch." -msgstr "" - -msgid "not setting upstream for a remote remote-tracking branch" -msgstr "" - -msgid "not setting upstream for a remote tag" -msgstr "" - -msgid "unknown branch type" -msgstr "" - -msgid "" -"no source branch found;\n" -"you need to specify exactly one branch with the --set-upstream option" -msgstr "" - -#, c-format -msgid "Fetching %s\n" -msgstr "Извлечение из %s\n" - -#, c-format -msgid "could not fetch %s" -msgstr "" - -#, c-format -msgid "could not fetch '%s' (exit code: %d)\n" -msgstr "" - -msgid "" -"no remote repository specified; please specify either a URL or a\n" -"remote name from which new revisions should be fetched" -msgstr "" - -msgid "you need to specify a tag name" -msgstr "" - msgid "--negotiate-only needs one or more --negotiation-tip=*" msgstr "" @@ -5778,6 +5866,10 @@ msgstr "" msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow не имеет смысла на полном репозитории" +#, c-format +msgid "failed to fetch bundles from '%s'" +msgstr "" + msgid "fetch --all does not take a repository argument" msgstr "fetch --all не принимает имя репозитория как аргумент" @@ -5878,7 +5970,13 @@ msgstr "вывод только ссылок, которые содержат к msgid "print only refs which don't contain the commit" msgstr "вывод только ссылок, которые не содержат коммит" -msgid "git for-each-repo --config= " +msgid "read reference patterns from stdin" +msgstr "" + +msgid "unknown arguments supplied with --stdin" +msgstr "" + +msgid "git for-each-repo --config= [--] " msgstr "" msgid "config" @@ -5890,6 +5988,10 @@ msgstr "" msgid "missing --config=" msgstr "" +#, c-format +msgid "got bad config --config=%s" +msgstr "" + msgid "unknown" msgstr "" @@ -6034,18 +6136,35 @@ msgstr "%s: отсоединённый указатель HEAD ни на что msgid "notice: %s points to an unborn branch (%s)" msgstr "" -msgid "Checking cache tree" +#, c-format +msgid "Checking cache tree of %s" msgstr "" #, c-format -msgid "%s: invalid sha1 pointer in cache-tree" +msgid "%s: invalid sha1 pointer in cache-tree of %s" msgstr "" msgid "non-tree in cache-tree" msgstr "" -msgid "git fsck [] [...]" -msgstr "git fsck [<опции>] [<объект>...]" +#, c-format +msgid "%s: invalid sha1 pointer in resolve-undo of %s" +msgstr "" + +#, c-format +msgid "unable to load rev-index for pack '%s'" +msgstr "" + +#, c-format +msgid "invalid rev-index for pack '%s'" +msgstr "" + +msgid "" +"git fsck [--tags] [--root] [--unreachable] [--cache] [--no-reflogs]\n" +" [--[no-]full] [--strict] [--verbose] [--lost-found]\n" +" [--[no-]dangling] [--[no-]progress] [--connectivity-only]\n" +" [--[no-]name-objects] [...]" +msgstr "" msgid "show unreachable objects" msgstr "показать недоступные объекты" @@ -6100,12 +6219,6 @@ msgstr "" msgid "git fsmonitor--daemon run []" msgstr "" -msgid "git fsmonitor--daemon stop" -msgstr "" - -msgid "git fsmonitor--daemon status" -msgstr "" - #, c-format msgid "value of '%s' out of range: %d" msgstr "" @@ -6342,7 +6455,19 @@ msgstr "" msgid "use at most one of --auto and --schedule=" msgstr "" -msgid "failed to run 'git config'" +#, c-format +msgid "unable to add '%s' value of '%s'" +msgstr "" + +msgid "return success even if repository was not registered" +msgstr "" + +#, c-format +msgid "unable to unset '%s' value of '%s'" +msgstr "" + +#, c-format +msgid "repository '%s' is not registered" msgstr "" #, c-format @@ -6369,10 +6494,13 @@ msgstr "" msgid "failed to run 'crontab -l'; your system might not support 'cron'" msgstr "" -msgid "failed to run 'crontab'; your system might not support 'cron'" +msgid "failed to create crontab temporary file" msgstr "" -msgid "failed to open stdin of 'crontab'" +msgid "failed to open temporary file" +msgstr "" + +msgid "failed to run 'crontab'; your system might not support 'cron'" msgstr "" msgid "'crontab' died" @@ -6421,10 +6549,6 @@ msgstr "" msgid "git maintenance []" msgstr "" -#, c-format -msgid "invalid subcommand: %s" -msgstr "" - msgid "git grep [] [-e] [...] [[--] ...]" msgstr "git grep [<опции>] [-e] <шаблон> [<редакция>...] [[--] <путь>...]" @@ -6440,7 +6564,6 @@ msgstr "указано недопустимое количество поток #. TRANSLATORS: %s is the configuration #. variable for tweaking threads, currently #. grep.threads -#. #, c-format msgid "no threads support, ignoring %s" msgstr "нет поддержки потоков, игнорирование %s" @@ -6595,6 +6718,9 @@ msgstr "показать совпадающие файлы с помощью п msgid "allow calling of grep(1) (ignored by this build)" msgstr "разрешить вызов grep(1) (игнорируется в этой сборке)" +msgid "maximum number of results per file" +msgstr "" + msgid "no pattern given" msgstr "" @@ -6630,11 +6756,12 @@ msgid "both --cached and trees are given" msgstr "" msgid "" -"git hash-object [-t ] [-w] [--path= | --no-filters] [--stdin] " -"[--] ..." +"git hash-object [-t ] [-w] [--path= | --no-filters]\n" +" [--stdin [--literally]] [--] ..." +msgstr "" + +msgid "git hash-object [-t ] [-w] --stdin-paths [--no-filters]" msgstr "" -"git hash-object [-t <тип>] [-w] [--path=<файл> | --no-filters] [--stdin] " -"[--] <файл>..." msgid "object type" msgstr "тип объекта" @@ -6683,10 +6810,16 @@ msgstr "" msgid "print list of useful guides" msgstr "вывести список полезных руководств" +msgid "print list of user-facing repository, command and file interfaces" +msgstr "" + +msgid "print list of file formats, protocols and other developer interfaces" +msgstr "" + msgid "print all configuration variable names" msgstr "" -msgid "git help [[-i|--info] [-m|--man] [-w|--web]] []" +msgid "git help [[-i|--info] [-m|--man] [-w|--web]] [|]" msgstr "" #, c-format @@ -6756,12 +6889,17 @@ msgstr "использование: %s%s" msgid "'git help config' for more information" msgstr "" -msgid "git hook run [--ignore-missing] [-- ]" +msgid "" +"git hook run [--ignore-missing] [--to-stdin=] [-- ]" msgstr "" msgid "silently ignore missing requested " msgstr "" +msgid "file to read into hooks' stdin" +msgstr "" + #, c-format msgid "object type mismatch at %s" msgstr "несоответствие типа объекта на %s" @@ -7065,11 +7203,11 @@ msgid "Initialized empty Git repository in %s%s\n" msgstr "Инициализирован пустой репозиторий Git в %s%s\n" msgid "" -"git init [-q | --quiet] [--bare] [--template=] [--" -"shared[=]] []" +"git init [-q | --quiet] [--bare] [--template=]\n" +" [--separate-git-dir ] [--object-format=]\n" +" [-b | --initial-branch=]\n" +" [--shared[=]] []" msgstr "" -"git init [-q | --quiet] [--bare] [--template=<каталог-шаблонов>] [--" -"shared[=<права-доступа>]] [<каталог>]" msgid "permissions" msgstr "права-доступа" @@ -7111,11 +7249,10 @@ msgid "--separate-git-dir incompatible with bare repository" msgstr "" msgid "" -"git interpret-trailers [--in-place] [--trim-empty] [(--trailer " -"[(=|:)])...] [...]" +"git interpret-trailers [--in-place] [--trim-empty]\n" +" [(--trailer [(=|:)])...]\n" +" [--parse] [...]" msgstr "" -"git interpret-trailers [--in-place] [--trim-empty] [(--trailer " -"<ключ>[(=|:)<значение>])...] [<файл>...]" msgid "edit files in place" msgstr "редактировать файлы на месте" @@ -7172,7 +7309,7 @@ msgstr "не выводить список изменений" msgid "show source" msgstr "показать источник" -msgid "use mail map file" +msgid "clear all previously-defined decoration filters" msgstr "" msgid "only decorate refs that match " @@ -7422,6 +7559,9 @@ msgstr "" msgid "percentage by which creation is weighted" msgstr "" +msgid "show in-body From: even if identical to the e-mail header" +msgstr "" + #, c-format msgid "invalid ident line: %s" msgstr "неправильная строка идентификации: %s" @@ -7482,6 +7622,18 @@ msgstr "" "Не удалось найти отслеживаемую внешнюю ветку, укажите <вышестоящую-ветку> " "вручную.\n" +#, c-format +msgid "bad ls-files format: element '%s' does not start with '('" +msgstr "" + +#, c-format +msgid "bad ls-files format: element '%s' does not end in ')'" +msgstr "" + +#, c-format +msgid "bad ls-files format: %%%.*s" +msgstr "" + msgid "git ls-files [] [...]" msgstr "git ls-files [<опции>] [<файл>...]" @@ -7568,10 +7720,15 @@ msgstr "" msgid "show sparse directories in the presence of a sparse index" msgstr "" +msgid "" +"--format cannot be used with -s, -o, -k, -t, --resolve-undo, --deduplicate, " +"--eol" +msgstr "" + msgid "" "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=]\n" -" [-q | --quiet] [--exit-code] [--get-url]\n" -" [--symref] [ [...]]" +" [-q | --quiet] [--exit-code] [--get-url] [--sort=]\n" +" [--symref] [ [...]]" msgstr "" msgid "do not print remote URL" @@ -7704,12 +7861,12 @@ msgstr "git merge-base [-a | --all] <коммит> <коммит>..." msgid "git merge-base [-a | --all] --octopus ..." msgstr "git merge-base [-a | --all] --octopus <коммит>..." -msgid "git merge-base --independent ..." -msgstr "git merge-base --independent <коммит>..." - msgid "git merge-base --is-ancestor " msgstr "git merge-base --is-ancestor <коммит> <коммит>" +msgid "git merge-base --independent ..." +msgstr "git merge-base --independent <коммит>..." + msgid "git merge-base --fork-point []" msgstr "git merge-base --fork-point <ссылка> [<коммит>]" @@ -7789,6 +7946,56 @@ msgstr "не удалось распознать ссылку «%s»" msgid "Merging %s with %s\n" msgstr "Слияние %s и %s\n" +msgid "not something we can merge" +msgstr "не является тем, что можно слить" + +msgid "refusing to merge unrelated histories" +msgstr "отказ слияния несвязанных историй изменений" + +msgid "failure to merge" +msgstr "" + +msgid "git merge-tree [--write-tree] [] " +msgstr "" + +msgid "git merge-tree [--trivial-merge] " +msgstr "" + +msgid "do a real merge instead of a trivial merge" +msgstr "" + +msgid "do a trivial merge only" +msgstr "" + +msgid "also show informational/conflict messages" +msgstr "" + +msgid "list filenames without modes/oids/stages" +msgstr "" + +msgid "allow merging unrelated histories" +msgstr "разрешить слияние несвязанных историй изменений" + +msgid "perform multiple merges, one per line of input" +msgstr "" + +msgid "specify a merge-base for the merge" +msgstr "" + +msgid "--trivial-merge is incompatible with all other options" +msgstr "" + +msgid "--merge-base is incompatible with --stdin" +msgstr "" + +#, c-format +msgid "malformed input line: '%s'." +msgstr "неправильная введенная строка: «%s»." + +#, c-format +msgid "merging cannot continue; got unclean result of %d" +msgstr "" + msgid "git merge [] [...]" msgstr "git merge [<опции>] [<коммит>...]" @@ -7870,9 +8077,6 @@ msgstr "" msgid "continue the current in-progress merge" msgstr "продолжить выполнение происходящего слияния" -msgid "allow merging unrelated histories" -msgstr "разрешить слияние несвязанных историй изменений" - msgid "bypass pre-merge-commit and commit-msg hooks" msgstr "" @@ -7994,9 +8198,6 @@ msgstr "не удалось закрыть «%s»" msgid "not something we can merge in %s: %s" msgstr "не является тем, что можно слить в %s: %s" -msgid "not something we can merge" -msgstr "не является тем, что можно слить" - msgid "--abort expects no arguments" msgstr "опция --abort не принимает аргументы" @@ -8046,13 +8247,16 @@ msgstr "%s не является тем, что можно слить" msgid "Can merge only exactly one commit into empty head" msgstr "Можно только один коммит в пустую ветку." -msgid "refusing to merge unrelated histories" -msgstr "отказ слияния несвязанных историй изменений" - #, c-format msgid "Updating %s..%s\n" msgstr "Обновление %s..%s\n" +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +" %s" +msgstr "" + #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Попытка тривиального слияния в индексе...\n" @@ -8087,6 +8291,10 @@ msgstr "" "Автоматическое слияние прошло успешно; как и запрашивали, остановлено перед " "выполнением коммита\n" +#, c-format +msgid "When finished, apply stashed changes with `git stash pop`\n" +msgstr "" + #, c-format msgid "warning: tag input does not pass fsck: %s" msgstr "" @@ -8201,6 +8409,9 @@ msgstr "Проверка переименования из «%s» в «%s»\n" msgid "bad source" msgstr "плохой источник" +msgid "destination exists" +msgstr "целевой путь уже существует" + msgid "can not move directory into itself" msgstr "нельзя переместить каталог в самого себя" @@ -8216,9 +8427,6 @@ msgstr "не под версионным контролем" msgid "conflicted" msgstr "" -msgid "destination exists" -msgstr "целевой путь уже существует" - #, c-format msgid "overwriting '%s'" msgstr "перезапись «%s»" @@ -8232,6 +8440,9 @@ msgstr "несколько источников для одного целево msgid "destination directory does not exist" msgstr "целевой каталог не существует" +msgid "destination exists in the index" +msgstr "" + #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s, откуда=%s, куда=%s" @@ -8398,17 +8609,12 @@ msgstr "не удалось прочитать объект «%s»." msgid "cannot read note data from non-blob object '%s'." msgstr "не удалось прочитать данные заметки из недвоичного объекта «%s»." -#, c-format -msgid "malformed input line: '%s'." -msgstr "неправильная введенная строка: «%s»." - #, 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. -#. #, c-format msgid "refusing to %s notes in %s (outside of refs/notes/)" msgstr "отказ в перезаписи %s заметок в %s (за пределами refs/notes/)" @@ -8590,20 +8796,15 @@ msgid "use notes from " msgstr "использовать заметку из <ссылка-на-заметку>" #, c-format -msgid "unknown subcommand: %s" -msgstr "неизвестная подкоманда: %s" +msgid "unknown subcommand: `%s'" +msgstr "" + +msgid "git pack-objects --stdout [] [< | < ]" +msgstr "" msgid "" -"git pack-objects --stdout [...] [< | < ]" +"git pack-objects [] [< | < ]" msgstr "" -"git pack-objects --stdout [<опции>...] [< <список-ссылок> | < <список-" -"объектов>]" - -msgid "" -"git pack-objects [...] [< | < ]" -msgstr "" -"git pack-objects [<опции>...] <имя-базы> [< <список-ссылок> | < <список-" -"объектов>]" #, c-format msgid "" @@ -8782,6 +8983,12 @@ msgstr "неподдерживаемая версия индекса %s" msgid "bad index version '%s'" msgstr "плохая версия индекса «%s»" +msgid "show progress meter during object writing phase" +msgstr "показать прогресс выполнения во время записи объектов" + +msgid "similar to --all-progress when progress meter is shown" +msgstr "похоже на --all-progress при включенном прогрессе выполнения" + msgid "[,]" msgstr "" @@ -8967,8 +9174,11 @@ msgid "" "to . Thanks.\n" msgstr "" -msgid "git pack-refs []" -msgstr "git pack-refs [<опции>]" +msgid "refusing to run without --i-still-use-this" +msgstr "" + +msgid "git pack-refs [--all] [--no-prune]" +msgstr "" msgid "pack everything" msgstr "паковать всё" @@ -8976,6 +9186,18 @@ msgstr "паковать всё" msgid "prune loose refs (default)" msgstr "почистить слабые ссылки (по умолчанию)" +msgid "git patch-id [--stable | --unstable | --verbatim]" +msgstr "" + +msgid "use the unstable patch-id algorithm" +msgstr "" + +msgid "use the stable patch-id algorithm" +msgstr "" + +msgid "don't strip whitespace from the patch" +msgstr "" + msgid "git prune [-n] [-v] [--progress] [--expire