From 8524bf7cc1719b035977a5de795dc68583be8a6d Mon Sep 17 00:00:00 2001 From: Jordi Mas Date: Tue, 10 Apr 2018 22:22:42 +0200 Subject: [PATCH 01/19] l10n: Update Catalan translation Signed-off-by: Jordi Mas --- po/ca.po | 1777 ++++++++++++++++++++++++++++++++---------------------- 1 file changed, 1067 insertions(+), 710 deletions(-) diff --git a/po/ca.po b/po/ca.po index 6bba189a0b..495a626064 100644 --- a/po/ca.po +++ b/po/ca.po @@ -48,7 +48,7 @@ msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List \n" "POT-Creation-Date: 2018-03-16 07:29+0800\n" -"PO-Revision-Date: 2018-03-18 15:48+0100\n" +"PO-Revision-Date: 2018-03-29 15:32+0200\n" "Last-Translator: Jordi Mas \n" "Language-Team: Catalan\n" "Language: ca\n" @@ -189,17 +189,22 @@ msgstr "no s'ha pogut trobar el nom de fitxer en el pedaç a la línia %d" #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "" -"git apply: git-diff incorrecte - s'esperava /dev/null, s'ha rebut %s en la línia %d" +"git apply: git-diff incorrecte - s'esperava /dev/null, s'ha rebut %s en la " +"línia %d" #: apply.c:948 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" -msgstr "git apply: git-diff incorrecte - nom de fitxer nou inconsistent en la línia %d" +msgstr "" +"git apply: git-diff incorrecte - nom de fitxer nou inconsistent en la línia " +"%d" #: apply.c:949 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" -msgstr "git apply: git-diff incorrecte - nom de fitxer antic inconsistent en la línia %d" +msgstr "" +"git apply: git-diff incorrecte - nom de fitxer antic inconsistent en la " +"línia %d" #: apply.c:954 #, c-format @@ -229,22 +234,23 @@ msgstr "fragment de pedaç sense capçalera a la línia %d: %.*s" #: apply.c:1562 #, c-format msgid "" -"git diff header lacks filename information when removing %d leading pathname component " -"(line %d)" +"git diff header lacks filename information when removing %d leading pathname " +"component (line %d)" msgid_plural "" -"git diff header lacks filename information when removing %d leading pathname components " -"(line %d)" +"git diff header lacks filename information when removing %d leading pathname " +"components (line %d)" msgstr[0] "" -"a la capçalera de git diff li manca informació de nom de fitxer en eliminar %d component " -"de nom de camí inicial (línia %d)" +"a la capçalera de git diff li manca informació de nom de fitxer en eliminar " +"%d component de nom de camí inicial (línia %d)" msgstr[1] "" -"a la capçalera de git diff li manca informació de nom de fitxer en eliminar %d " -"components de nom de camí inicial (línia %d)" +"a la capçalera de git diff li manca informació de nom de fitxer en eliminar " +"%d components de nom de camí inicial (línia %d)" #: apply.c:1575 #, c-format msgid "git diff header lacks filename information (line %d)" -msgstr "a la capçalera de git diff li manca informació de nom de fitxer (línia %d)" +msgstr "" +"a la capçalera de git diff li manca informació de nom de fitxer (línia %d)" #: apply.c:1763 msgid "new file depends on old contents" @@ -338,12 +344,16 @@ msgstr "no es pot aplicar al revés un pedaç binari sense el tros revés a «%s #: apply.c:3149 #, c-format msgid "cannot apply binary patch to '%s' without full index line" -msgstr "no es pot aplicar un pedaç binari a «%s» sense la línia d'índex completa" +msgstr "" +"no es pot aplicar un pedaç binari a «%s» sense la línia d'índex completa" #: apply.c:3159 #, c-format -msgid "the patch applies to '%s' (%s), which does not match the current contents." -msgstr "el pedaç s'aplica a «%s» (%s), el qual no coincideix amb els continguts actuals." +msgid "" +"the patch applies to '%s' (%s), which does not match the current contents." +msgstr "" +"el pedaç s'aplica a «%s» (%s), el qual no coincideix amb els continguts " +"actuals." #: apply.c:3167 #, c-format @@ -363,7 +373,9 @@ msgstr "el pedaç binari no s'aplica a «%s»" #: apply.c:3204 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" -msgstr "el pedaç binari a «%s» crea un resultat incorrecte (s'esperava %s, s'ha rebut %s)" +msgstr "" +"el pedaç binari a «%s» crea un resultat incorrecte (s'esperava %s, s'ha " +"rebut %s)" #: apply.c:3225 #, c-format @@ -402,7 +414,8 @@ msgstr "%s: no coincideix amb l'índex" #: apply.c:3560 msgid "repository lacks the necessary blob to fall back on 3-way merge." -msgstr "al dipòsit li manca el blob necessari per a retrocedir a una fusió de 3 vies." +msgstr "" +"al dipòsit li manca el blob necessari per a retrocedir a una fusió de 3 vies." #: apply.c:3563 #, c-format @@ -491,7 +504,7 @@ msgstr "falta la informació sha1 o és inútil per al submòdul %s" #: apply.c:4087 #, c-format msgid "mode change for %s, which is not in current HEAD" -msgstr "canvi de mode per a %s, el qual no està en el HEAD actual" +msgstr "canvi de mode per a %s, el qual no està en la HEAD actual" #: apply.c:4090 #, c-format @@ -531,7 +544,9 @@ msgstr "no s'ha pogut fer stat al fitxer novament creat «%s»" #: apply.c:4296 #, c-format msgid "unable to create backing store for newly created file %s" -msgstr "no s'ha pogut crear un magatzem de recolzament per al fitxer novament creat %s" +msgstr "" +"no s'ha pogut crear un magatzem de recolzament per al fitxer novament creat " +"%s" #: apply.c:4302 apply.c:4446 #, c-format @@ -625,18 +640,21 @@ msgstr[1] "%d línies afegeixen errors d'espai en blanc." #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." -msgstr[0] "S'ha aplicat %d línia després d'arreglar els errors d'espai en blanc." -msgstr[1] "S'han aplicat %d línies després d'arreglar els errors d'espai en blanc." +msgstr[0] "" +"S'ha aplicat %d línia després d'arreglar els errors d'espai en blanc." +msgstr[1] "" +"S'han aplicat %d línies després d'arreglar els errors d'espai en blanc." #: apply.c:4894 builtin/add.c:539 builtin/mv.c:298 builtin/rm.c:390 msgid "Unable to write new index file" msgstr "No s'ha pogut escriure un fitxer d'índex nou" -#: apply.c:4921 apply.c:4924 builtin/am.c:2254 builtin/am.c:2257 builtin/clone.c:118 -#: builtin/fetch.c:127 builtin/pull.c:193 builtin/submodule--helper.c:403 -#: builtin/submodule--helper.c:1197 builtin/submodule--helper.c:1200 -#: builtin/submodule--helper.c:1567 builtin/submodule--helper.c:1570 -#: builtin/submodule--helper.c:1787 git-add--interactive.perl:197 +#: apply.c:4921 apply.c:4924 builtin/am.c:2254 builtin/am.c:2257 +#: builtin/clone.c:118 builtin/fetch.c:127 builtin/pull.c:193 +#: builtin/submodule--helper.c:403 builtin/submodule--helper.c:1197 +#: builtin/submodule--helper.c:1200 builtin/submodule--helper.c:1567 +#: builtin/submodule--helper.c:1570 builtin/submodule--helper.c:1787 +#: git-add--interactive.perl:197 msgid "path" msgstr "camí" @@ -654,7 +672,9 @@ msgstr "número" #: apply.c:4928 msgid "remove leading slashes from traditional diff paths" -msgstr "elimina barres obliqües inicials dels camins de diferència tradicionals" +msgstr "" +"elimina barres obliqües inicials dels camins de diferència " +"tradicionals" #: apply.c:4931 msgid "ignore additions made by the patch" @@ -662,7 +682,8 @@ msgstr "ignora afegiments fets pel pedaç" #: apply.c:4933 msgid "instead of applying the patch, output diffstat for the input" -msgstr "en lloc d'aplicar el pedaç, emet les estadístiques de diferència de l'entrada" +msgstr "" +"en lloc d'aplicar el pedaç, emet les estadístiques de diferència de l'entrada" #: apply.c:4937 msgid "show number of added and deleted lines in decimal notation" @@ -716,7 +737,8 @@ msgstr "acció" #: apply.c:4961 msgid "detect new or modified lines that have whitespace errors" -msgstr "detecta les línies noves o modificades que tinguin errors d'espai en blanc" +msgstr "" +"detecta les línies noves o modificades que tinguin errors d'espai en blanc" #: apply.c:4964 apply.c:4967 msgid "ignore changes in whitespace when finding context" @@ -738,9 +760,9 @@ msgstr "deixa els trossos rebutjats en fitxers *.rej corresponents" msgid "allow overlapping hunks" msgstr "permet trossos encavalcants" -#: apply.c:4977 builtin/add.c:292 builtin/check-ignore.c:21 builtin/commit.c:1276 -#: builtin/count-objects.c:96 builtin/fsck.c:665 builtin/log.c:1901 builtin/mv.c:123 -#: builtin/read-tree.c:125 +#: apply.c:4977 builtin/add.c:292 builtin/check-ignore.c:21 +#: builtin/commit.c:1276 builtin/count-objects.c:96 builtin/fsck.c:665 +#: builtin/log.c:1901 builtin/mv.c:123 builtin/read-tree.c:125 msgid "be verbose" msgstr "sigues detallat" @@ -769,8 +791,11 @@ msgid "git archive --list" msgstr "git archive --list" #: archive.c:15 -msgid "git archive --remote [--exec ] [] [...]" -msgstr "git archive --remote [--exec ] [] [...]" +msgid "" +"git archive --remote [--exec ] [] [...]" +msgstr "" +"git archive --remote [--exec ] [] " +"[...]" #: archive.c:16 msgid "git archive --remote [--exec ] --list" @@ -800,7 +825,8 @@ msgstr "anteposa el prefix a cada nom de camí en l'arxiu" #: archive.c:439 builtin/blame.c:702 builtin/blame.c:703 builtin/config.c:62 #: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:869 #: builtin/hash-object.c:103 builtin/ls-files.c:551 builtin/ls-files.c:554 -#: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:120 parse-options.h:165 +#: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:120 +#: parse-options.h:165 msgid "file" msgstr "fitxer" @@ -945,7 +971,8 @@ msgid "" "We continue anyway." msgstr "" "s'ha d'ometre la base de fusió entre %s i [%s].\n" -"Llavors, no podem estar segurs que la primera comissió %s sigui entre %s i %s.\n" +"Llavors, no podem estar segurs que la primera comissió %s sigui entre %s i " +"%s.\n" "Continuem de totes maneres." #: bisect.c:810 @@ -1013,17 +1040,23 @@ msgstr "no es pot usar --contents amb el nom d'objecte de la comissió final" #: blame.c:1789 msgid "--reverse and --first-parent together require specified latest commit" -msgstr "--reverse i --first-parent-together requereixen una última comissió especificada" +msgstr "" +"--reverse i --first-parent-together requereixen una última comissió " +"especificada" -#: blame.c:1798 bundle.c:160 ref-filter.c:1978 sequencer.c:1699 sequencer.c:2901 -#: builtin/commit.c:976 builtin/log.c:366 builtin/log.c:920 builtin/log.c:1371 -#: builtin/log.c:1702 builtin/log.c:1950 builtin/merge.c:370 builtin/shortlog.c:191 +#: blame.c:1798 bundle.c:160 ref-filter.c:1978 sequencer.c:1699 +#: sequencer.c:2901 builtin/commit.c:976 builtin/log.c:366 builtin/log.c:920 +#: builtin/log.c:1371 builtin/log.c:1702 builtin/log.c:1950 builtin/merge.c:370 +#: builtin/shortlog.c:191 msgid "revision walk setup failed" msgstr "la configuració del passeig per revisions ha fallat" #: blame.c:1816 -msgid "--reverse --first-parent together require range along first-parent chain" -msgstr "--reverse --first-parent junts requereixen un rang de la cadena de mares primeres" +msgid "" +"--reverse --first-parent together require range along first-parent chain" +msgstr "" +"--reverse --first-parent junts requereixen un rang de la cadena de mares " +"primeres" #: blame.c:1827 #, c-format @@ -1057,17 +1090,21 @@ msgstr "No s'està establint la branca %s com a la seva pròpia font." #, c-format msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing." msgstr "" -"La branca «%s» està configurada per a seguir la branca remota «%s» de «%s» fent «rebase»." +"La branca «%s» està configurada per a seguir la branca remota «%s» de «%s» " +"fent «rebase»." #: branch.c:94 #, c-format msgid "Branch '%s' set up to track remote branch '%s' from '%s'." -msgstr "La branca «%s» està configurada per a seguir la branca remota «%s» de «%s»." +msgstr "" +"La branca «%s» està configurada per a seguir la branca remota «%s» de «%s»." #: branch.c:98 #, c-format msgid "Branch '%s' set up to track local branch '%s' by rebasing." -msgstr "La branca «%s» està configurada per a seguir la branca local «%s» fent «rebase»." +msgstr "" +"La branca «%s» està configurada per a seguir la branca local «%s» fent " +"«rebase»." #: branch.c:99 #, c-format @@ -1078,18 +1115,21 @@ msgstr "La branca «%s» està configurada per a seguir la branca local «%s»." #, c-format msgid "Branch '%s' set up to track remote ref '%s' by rebasing." msgstr "" -"La branca «%s» està configurada per a seguir la referència remota «%s» fent «rebase»." +"La branca «%s» està configurada per a seguir la referència remota «%s» fent " +"«rebase»." #: branch.c:105 #, c-format msgid "Branch '%s' set up to track remote ref '%s'." -msgstr "La branca «%s» està configurada per a seguir la referència remota «%s»." +msgstr "" +"La branca «%s» està configurada per a seguir la referència remota «%s»." #: branch.c:109 #, c-format msgid "Branch '%s' set up to track local ref '%s' by rebasing." msgstr "" -"La branca «%s» està configurada per a seguir la referència local «%s» fent «rebase»." +"La branca «%s» està configurada per a seguir la referència local «%s» fent " +"«rebase»." #: branch.c:110 #, c-format @@ -1123,7 +1163,8 @@ msgstr "No es pot actualitzar la branca actual a la força." #, c-format msgid "Cannot setup tracking information; starting point '%s' is not a branch." msgstr "" -"No es pot configurar la informació de seguiment; el punt inicial «%s» no és una branca." +"No es pot configurar la informació de seguiment; el punt inicial «%s» no és " +"una branca." #: branch.c:235 #, c-format @@ -1253,8 +1294,8 @@ msgstr "L'index-pack s'ha mort" msgid "invalid color value: %.*s" msgstr "valor de color no vàlid: %.*s" -#: commit.c:41 sequencer.c:2141 builtin/am.c:421 builtin/am.c:465 builtin/am.c:1436 -#: builtin/am.c:2072 +#: commit.c:41 sequencer.c:2141 builtin/am.c:421 builtin/am.c:465 +#: builtin/am.c:1436 builtin/am.c:2072 #, c-format msgid "could not parse %s" msgstr "no s'ha pogut analitzar %s" @@ -1281,7 +1322,8 @@ msgstr "memòria esgotada" #: config.c:186 msgid "relative config include conditionals must come from files" -msgstr "els condicionals d'inclusió de configuració relatius han de venir de fitxers" +msgstr "" +"els condicionals d'inclusió de configuració relatius han de venir de fitxers" #: config.c:720 #, c-format @@ -1339,17 +1381,22 @@ msgstr "valor de configuració numèric «%s» erroni per «%s» en el fitxer %s #: config.c:885 #, c-format msgid "bad numeric config value '%s' for '%s' in standard input: %s" -msgstr "valor de configuració numèric «%s» erroni per «%s» en l'entrada estàndard: %s" +msgstr "" +"valor de configuració numèric «%s» erroni per «%s» en l'entrada estàndard: %s" #: config.c:888 #, c-format msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" -msgstr "valor de configuració numèric «%s» erroni' per «%s» en el blob de submòdul %s: %s" +msgstr "" +"valor de configuració numèric «%s» erroni' per «%s» en el blob de submòdul " +"%s: %s" #: config.c:891 #, c-format msgid "bad numeric config value '%s' for '%s' in command line %s: %s" -msgstr "valor de configuració numèric «%s» erroni per «%s» en la línia d'ordres %s: %s" +msgstr "" +"valor de configuració numèric «%s» erroni per «%s» en la línia d'ordres %s: " +"%s" #: config.c:894 #, c-format @@ -1398,7 +1445,8 @@ msgstr "%s no vàlid: «%s»" #, c-format msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" msgstr "" -"valor «%s» a core.untrackedCache desconegut; utilitzant el valor per defecte «keep»" +"valor «%s» a core.untrackedCache desconegut; utilitzant el valor per defecte " +"«keep»" #: config.c:2170 #, c-format @@ -1479,8 +1527,8 @@ msgid "" "The file will have its original line endings in your working directory." msgstr "" "LF reemplaçarà CRLF en %s.\n" -"El fitxer tindrà els seus terminadors de línia originals en el vostre directori de " -"treball." +"El fitxer tindrà els seus terminadors de línia originals en el vostre " +"directori de treball." #: convert.c:215 #, c-format @@ -1494,8 +1542,8 @@ msgid "" "The file will have its original line endings in your working directory." msgstr "" "CRLF reemplaçarà LF en %s.\n" -"El fitxer tindrà els seus terminadors de línia originals en el vostre directori de " -"treball." +"El fitxer tindrà els seus terminadors de línia originals en el vostre " +"directori de treball." #: date.c:116 msgid "in the future" @@ -1582,7 +1630,9 @@ msgstr "l'opció «%s» requereix un valor" #: diff.c:152 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" -msgstr " S'ha produït un error en analitzar el percentatge limitant de dirstat «%s»\n" +msgstr "" +" S'ha produït un error en analitzar el percentatge limitant de dirstat " +"«%s»\n" #: diff.c:157 #, c-format @@ -1591,15 +1641,17 @@ msgstr " Paràmetre de dirstat desconegut «%s»\n" #: diff.c:281 msgid "" -"color moved setting must be one of 'no', 'default', 'zebra', 'dimmed_zebra', 'plain'" +"color moved setting must be one of 'no', 'default', 'zebra', 'dimmed_zebra', " +"'plain'" msgstr "" -"el paràmetre de color en moviment ha de ser «no», «default», «zebra», «dimmed_zebra» o " -"«plain»" +"el paràmetre de color en moviment ha de ser «no», «default», «zebra», " +"«dimmed_zebra» o «plain»" #: diff.c:341 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" -msgstr "Valor desconegut de la variable de configuració de 'diff.submodule': «%s»" +msgstr "" +"Valor desconegut de la variable de configuració de 'diff.submodule': «%s»" #: diff.c:401 #, c-format @@ -1639,7 +1691,8 @@ msgstr "" #: diff.c:4417 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" -msgstr "S'ha produït un error en analitzar el paràmetre d'opció de --submodule: «%s»" +msgstr "" +"S'ha produït un error en analitzar el paràmetre d'opció de --submodule: «%s»" #: diff.c:5493 msgid "inexact rename detection was skipped due to too many files." @@ -1647,13 +1700,16 @@ msgstr "s'ha omès la detecció de canvi de nom a causa de massa fitxers." #: diff.c:5496 msgid "only found copies from modified paths due to too many files." -msgstr "només s'han trobat còpies des de camins modificats a causa de massa fitxers." +msgstr "" +"només s'han trobat còpies des de camins modificats a causa de massa fitxers." #: diff.c:5499 #, c-format -msgid "you may want to set your %s variable to at least %d and retry the command." +msgid "" +"you may want to set your %s variable to at least %d and retry the command." msgstr "" -"potser voleu establir la vostra variable %s a almenys %d i tornar a intentar l'ordre." +"potser voleu establir la vostra variable %s a almenys %d i tornar a intentar " +"l'ordre." #: dir.c:1866 #, c-format @@ -1666,7 +1722,8 @@ msgstr "s'ha produït un error en obtenir el nombre i la informació del nucli" #: dir.c:2232 msgid "Untracked cache is disabled on this system or location." -msgstr "La memòria cau no seguida està inhabilitada en aquest sistema o ubicació." +msgstr "" +"La memòria cau no seguida està inhabilitada en aquest sistema o ubicació." #: dir.c:3024 dir.c:3029 #, c-format @@ -1905,7 +1962,8 @@ msgstr "ignora el color no vàlid «%.*s» en log.graphColors" msgid "'%s': unable to read %s" msgstr "«%s»: no s'ha pogut llegir %s" -#: grep.c:2039 setup.c:163 builtin/clone.c:407 builtin/diff.c:81 builtin/rm.c:134 +#: grep.c:2039 setup.c:163 builtin/clone.c:407 builtin/diff.c:81 +#: builtin/rm.c:134 #, c-format msgid "failed to stat '%s'" msgstr "s'ha produït un error en fer stat a «%s»" @@ -1926,7 +1984,8 @@ msgstr "ordres de git disponibles d'altres llocs en el vostre $PATH" #: help.c:217 msgid "These are common Git commands used in various situations:" -msgstr "Aquestes són ordres del Git habitualment usades en diverses situacions:" +msgstr "" +"Aquestes són ordres del Git habitualment usades en diverses situacions:" #: help.c:281 #, c-format @@ -1944,7 +2003,8 @@ msgstr "Ai. El vostre sistema no informa de cap ordre de Git." #: help.c:358 #, c-format msgid "WARNING: You called a Git command named '%s', which does not exist." -msgstr "ADVERTÈNCIA: Heu invocat una ordre de Git amb nom «%s», la qual no existeix." +msgstr "" +"ADVERTÈNCIA: Heu invocat una ordre de Git amb nom «%s», la qual no existeix." #: help.c:363 #, c-format @@ -1954,7 +2014,8 @@ msgstr "El procés continuarà, pressuposant que volíeu dir «%s»." #: help.c:368 #, c-format msgid "Continuing in %0.1f seconds, assuming that you meant '%s'." -msgstr "El procés continuarà en %0.1f segons, pressuposant que volíeu dir «%s»." +msgstr "" +"El procés continuarà en %0.1f segons, pressuposant que volíeu dir «%s»." #: help.c:376 #, c-format @@ -2026,17 +2087,20 @@ msgstr "" #: ident.c:366 msgid "no email was given and auto-detection is disabled" msgstr "" -"no s'ha proporcionat cap adreça electrònica i la detecció automàtica està inhabilitada" +"no s'ha proporcionat cap adreça electrònica i la detecció automàtica està " +"inhabilitada" #: ident.c:371 #, c-format msgid "unable to auto-detect email address (got '%s')" msgstr "" -"no s'ha pogut detectar automàticament una adreça electrònica vàlida (s'ha rebut «%s»)" +"no s'ha pogut detectar automàticament una adreça electrònica vàlida (s'ha " +"rebut «%s»)" #: ident.c:381 msgid "no name was given and auto-detection is disabled" -msgstr "no s'ha proporcionat cap nom i la detecció automàtica està inhabilitada" +msgstr "" +"no s'ha proporcionat cap nom i la detecció automàtica està inhabilitada" #: ident.c:387 #, c-format @@ -2168,35 +2232,39 @@ msgstr "No s'ha pogut afegir %s a la base de dades" #: merge-recursive.c:1146 #, c-format -msgid "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left in tree." +msgid "" +"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " +"in tree." msgstr "" -"CONFLICTE: (%s/supressió): %s suprimit en %s i %s en %s. La versió %s de %s s'ha deixat " -"en l'arbre." +"CONFLICTE: (%s/supressió): %s suprimit en %s i %s en %s. La versió %s de %s " +"s'ha deixat en l'arbre." #: merge-recursive.c:1151 #, c-format msgid "" -"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s left in tree." +"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " +"left in tree." msgstr "" -"CONFLICTE: (%s/supressió): %s suprimit en %s i %s a %s en %s. La versió %s de %s s'ha " -"deixat en l'arbre." +"CONFLICTE: (%s/supressió): %s suprimit en %s i %s a %s en %s. La versió %s " +"de %s s'ha deixat en l'arbre." #: merge-recursive.c:1158 #, c-format msgid "" -"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left in tree at %s." +"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " +"in tree at %s." msgstr "" -"CONFLICTE: (%s/supressió): %s suprimit en %s i %s en %s. La versió %s de %s s'ha deixat " -"en l'arbre a %s." +"CONFLICTE: (%s/supressió): %s suprimit en %s i %s en %s. La versió %s de %s " +"s'ha deixat en l'arbre a %s." #: merge-recursive.c:1163 #, c-format msgid "" -"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s left in tree " -"at %s." +"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " +"left in tree at %s." msgstr "" -"CONFLICTE: (%s/supressió): %s suprimit en %s i %s a %s en %s. La versió %s de %s s'ha " -"deixat en l'arbre a %s." +"CONFLICTE: (%s/supressió): %s suprimit en %s i %s a %s en %s. La versió %s " +"de %s s'ha deixat en l'arbre a %s." #: merge-recursive.c:1197 msgid "rename" @@ -2214,11 +2282,11 @@ msgstr "%s és un directori en %s; s'està afegint com a %s en lloc d'això" #: merge-recursive.c:1279 #, 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 "" -"CONFLICTE (canvi de nom/canvi de nom): Canvi de nom \"%s\"->\"%s\" en la branca \"%s\" " -"canvi de nom \"%s\"->\"%s\" en \"%s\"%s" +"CONFLICTE (canvi de nom/canvi de nom): Canvi de nom \"%s\"->\"%s\" en la " +"branca \"%s\" canvi de nom \"%s\"->\"%s\" en \"%s\"%s" #: merge-recursive.c:1284 msgid " (left unresolved)" @@ -2228,8 +2296,8 @@ msgstr " (deixat sense resolució)" #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" -"CONFLICTE (canvi de nom/canvi de nom): Canvi de nom %s->%s en %s. Canvi de nom %s->%s en " -"%s" +"CONFLICTE (canvi de nom/canvi de nom): Canvi de nom %s->%s en %s. Canvi de " +"nom %s->%s en %s" #: merge-recursive.c:1379 #, c-format @@ -2239,7 +2307,9 @@ msgstr "S'està canviant el nom de %s a %s i %s a %s en lloc d'això" #: merge-recursive.c:1582 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" -msgstr "CONFLICTE (canvi de nom/afegiment): Canvi de nom %s->%s en %s. %s afegit en %s" +msgstr "" +"CONFLICTE (canvi de nom/afegiment): Canvi de nom %s->%s en %s. %s afegit en " +"%s" #: merge-recursive.c:1597 #, c-format @@ -2312,7 +2382,9 @@ msgstr "directori/fitxer" #: merge-recursive.c:1938 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" -msgstr "CONFLICTE (%s): Hi ha un directori amb nom %s en %s. S'està afegint %s com a %s" +msgstr "" +"CONFLICTE (%s): Hi ha un directori amb nom %s en %s. S'està afegint %s com a " +"%s" #: merge-recursive.c:1947 #, c-format @@ -2361,12 +2433,12 @@ msgstr "No s'ha pogut escriure l'índex." #, c-format msgid "" "You have not concluded your previous notes merge (%s exists).\n" -"Please, use 'git notes merge --commit' or 'git notes merge --abort' to commit/abort the " -"previous merge before you start a new notes merge." +"Please, use 'git notes merge --commit' or 'git notes merge --abort' to " +"commit/abort the previous merge before you start a new notes merge." msgstr "" "No heu acabat la vostra fusió de notes prèvia (%s existeix).\n" -"Useu «git notes merge --commit» o «git notes merge --abort» per a cometre/avortar la " -"fusió prèvia abans de començar una fusió de notes nova." +"Useu «git notes merge --commit» o «git notes merge --abort» per a cometre/" +"avortar la fusió prèvia abans de començar una fusió de notes nova." #: notes-merge.c:279 #, c-format @@ -2408,12 +2480,14 @@ msgstr "desplaçament abans de la fi del fitxer de paquet (.idx trencat?)" #: packfile.c:1694 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" -msgstr "desplaçament abans d'inici d'índex de paquet per a %s (índex corromput?)" +msgstr "" +"desplaçament abans d'inici d'índex de paquet per a %s (índex corromput?)" #: packfile.c:1698 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" -msgstr "desplaçament més enllà de la fi d'índex de paquet per a %s (índex truncat?)" +msgstr "" +"desplaçament més enllà de la fi d'índex de paquet per a %s (índex truncat?)" #: parse-options.c:619 msgid "..." @@ -2454,8 +2528,8 @@ msgstr "No s'ha pogut fer %s escrivible pel grup" #: pathspec.c:129 msgid "Escape character '\\' not allowed as last character in attr value" msgstr "" -"El caràcter d'escapament '\\' no està permès com a últim caràcter en un valor d'un " -"atribut" +"El caràcter d'escapament '\\' no està permès com a últim caràcter en un " +"valor d'un atribut" #: pathspec.c:147 msgid "Only one 'attr:' specification is allowed." @@ -2472,14 +2546,17 @@ msgstr "nom d'atribut no vàlid %s" #: pathspec.c:258 msgid "global 'glob' and 'noglob' pathspec settings are incompatible" -msgstr "els paràmetres d'especificació de camí 'glob' i 'noglob' globals són incompatibles" +msgstr "" +"els paràmetres d'especificació de camí 'glob' i 'noglob' globals són " +"incompatibles" #: pathspec.c:265 msgid "" -"global 'literal' pathspec setting is incompatible with all other global pathspec settings" +"global 'literal' pathspec setting is incompatible with all other global " +"pathspec settings" msgstr "" -"el paràmetre d'especificació de camí 'literal' global és incompatible amb tots els " -"altres paràmetres d'especificació de camí globals" +"el paràmetre d'especificació de camí 'literal' global és incompatible amb " +"tots els altres paràmetres d'especificació de camí globals" #: pathspec.c:305 msgid "invalid parameter for pathspec magic 'prefix'" @@ -2518,7 +2595,8 @@ msgstr "«%s» (mnemònic: '%c')" #: pathspec.c:525 #, c-format msgid "%s: pathspec magic not supported by this command: %s" -msgstr "%s: aquesta ordre no està admesa amb la màgia d'especificació de camí: %s" +msgstr "" +"%s: aquesta ordre no està admesa amb la màgia d'especificació de camí: %s" #: pathspec.c:592 #, c-format @@ -2581,7 +2659,8 @@ msgstr "no està permès actualitzar les referències en un entorn de quarantena msgid "could not remove reference %s" msgstr "no s'ha pogut eliminar la referència %s" -#: refs/files-backend.c:1203 refs/packed-backend.c:1528 refs/packed-backend.c:1538 +#: refs/files-backend.c:1203 refs/packed-backend.c:1528 +#: refs/packed-backend.c:1538 #, c-format msgid "could not delete reference %s: %s" msgstr "no s'ha pogut suprimir la referència %s: %s" @@ -2861,7 +2940,8 @@ msgstr "la branca font «%s» no s'emmagatzema com a branca amb seguiment remot" #: remote.c:1759 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" -msgstr "el destí de pujada «%s» en el remot «%s» no té cap branca amb seguiment remot" +msgstr "" +"el destí de pujada «%s» en el remot «%s» no té cap branca amb seguiment remot" #: remote.c:1771 #, c-format @@ -2919,11 +2999,14 @@ msgstr " (useu \"git push\" per a publicar les vostres comissions locals)\n" #: remote.c:2159 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" -msgid_plural "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n" +msgid_plural "" +"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n" msgstr[0] "" -"La vostra branca està darrere de «%s» per %d comissió, i pot avançar-se ràpidament.\n" +"La vostra branca està darrere de «%s» per %d comissió, i pot avançar-se " +"ràpidament.\n" msgstr[1] "" -"La vostra branca està darrere de «%s» per %d comissions, i pot avançar-se ràpidament.\n" +"La vostra branca està darrere de «%s» per %d comissions, i pot avançar-se " +"ràpidament.\n" #: remote.c:2167 msgid " (use \"git pull\" to update your local branch)\n" @@ -2974,7 +3057,9 @@ msgstr "" #: send-pack.c:141 msgid "unexpected flush packet while reading remote unpack status" -msgstr "paquet de neteja no esperat quan estava llegint l'estat del desempaquetament remot" +msgstr "" +"paquet de neteja no esperat quan estava llegint l'estat del desempaquetament " +"remot" #: send-pack.c:143 #, c-format @@ -2996,10 +3081,11 @@ msgstr "el destí receptor no admet pujar --signed" #: send-pack.c:423 msgid "" -"not sending a push certificate since the receiving end does not support --signed push" +"not sending a push certificate since the receiving end does not support --" +"signed push" msgstr "" -"no s'està enviant una certificació de pujada perquè el destí receptor no admet pujar --" -"signed" +"no s'està enviant una certificació de pujada perquè el destí receptor no " +"admet pujar --signed" #: send-pack.c:435 msgid "the receiving end does not support --atomic push" @@ -3054,8 +3140,8 @@ msgstr "" msgid "could not lock '%s'" msgstr "no s'ha pogut bloquejar «%s»" -#: sequencer.c:349 sequencer.c:2124 sequencer.c:2250 sequencer.c:2264 sequencer.c:3246 -#: sequencer.c:3310 wrapper.c:656 +#: sequencer.c:349 sequencer.c:2124 sequencer.c:2250 sequencer.c:2264 +#: sequencer.c:3246 sequencer.c:3310 wrapper.c:656 #, c-format msgid "could not write to '%s'" msgstr "no s'ha pogut escriure a «%s»" @@ -3070,8 +3156,8 @@ msgstr "no s'ha pogut escriure el terminador de línia a «%s»" msgid "failed to finalize '%s'" msgstr "s'ha produït un error en finalitzar «%s»" -#: sequencer.c:379 sequencer.c:1340 sequencer.c:2148 builtin/am.c:259 builtin/commit.c:722 -#: builtin/merge.c:1047 +#: sequencer.c:379 sequencer.c:1340 sequencer.c:2148 builtin/am.c:259 +#: builtin/commit.c:722 builtin/merge.c:1047 #, c-format msgid "could not read '%s'" msgstr "no s'ha pogut llegir «%s»" @@ -3123,7 +3209,8 @@ msgid "" " git rebase --continue\n" msgstr "" "teniu canvis «staged» en el vostre arbre de treball\n" -"Si aquests canvis estan pensats per fer «squash» a la comissió prèvia, executeu:\n" +"Si aquests canvis estan pensats per fer «squash» a la comissió prèvia, " +"executeu:\n" "\n" " git commit --amend %s\n" "\n" @@ -3338,7 +3425,8 @@ msgstr "la comissió %s no té pare %d" #: sequencer.c:1510 #, c-format msgid "mainline was specified but commit %s is not a merge." -msgstr "s'ha especificat la línia principal però la comissió %s no és una fusió." +msgstr "" +"s'ha especificat la línia principal però la comissió %s no és una fusió." #: sequencer.c:1516 #, c-format @@ -3656,8 +3744,11 @@ msgstr "llista per a fer inestable: «%s»" #: sequencer.c:3146 #, c-format -msgid "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." -msgstr "No s'ha reconegut el paràmetre %s per rebase.missingCommitsCheck. S'està ignorant." +msgid "" +"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." +msgstr "" +"No s'ha reconegut el paràmetre %s per rebase.missingCommitsCheck. S'està " +"ignorant." #: sequencer.c:3212 #, c-format @@ -3665,7 +3756,8 @@ msgid "" "Warning: some commits may have been dropped accidentally.\n" "Dropped commits (newer to older):\n" msgstr "" -"Advertència: pot ser que algunes comissions s'hagin descartat accidentalment.\n" +"Advertència: pot ser que algunes comissions s'hagin descartat " +"accidentalment.\n" "Les comissions descartades (més nova a més vella):\n" #: sequencer.c:3219 @@ -3673,24 +3765,30 @@ msgstr "" msgid "" "To avoid this message, use \"drop\" to explicitly remove a commit.\n" "\n" -"Use 'git config rebase.missingCommitsCheck' to change the level of warnings.\n" +"Use 'git config rebase.missingCommitsCheck' to change the level of " +"warnings.\n" "The possible behaviours are: ignore, warn, error.\n" "\n" msgstr "" -"Per a evitar aquest missatge, useu \"drop\" per a eliminar explícitament una comissió.\n" +"Per a evitar aquest missatge, useu \"drop\" per a eliminar explícitament una " +"comissió.\n" "\n" -"Useu 'git config rebase.missingCommitsCheck' per a canviar el nivell d'advertències.\n" +"Useu 'git config rebase.missingCommitsCheck' per a canviar el nivell " +"d'advertències.\n" "Els comportaments possibles són: ignore, warn, error.\n" #: sequencer.c:3231 #, c-format msgid "" -"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'.\n" +"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" +"continue'.\n" "Or you can abort the rebase with 'git rebase --abort'.\n" msgstr "" -"Podeu arreglar això amb 'git rebase --edit-todo' i després 'git rebase --continue'.\n" +"Podeu arreglar això amb 'git rebase --edit-todo' i després 'git rebase --" +"continue'.\n" -#: sequencer.c:3244 sequencer.c:3304 wrapper.c:225 wrapper.c:395 builtin/am.c:779 +#: sequencer.c:3244 sequencer.c:3304 wrapper.c:225 wrapper.c:395 +#: builtin/am.c:779 #, c-format msgid "could not open '%s' for writing" msgstr "no s'ha pogut obrir «%s» per a escriptura" @@ -3716,7 +3814,8 @@ msgid "" "Use 'git -- ...' to specify paths that do not exist locally." msgstr "" "%s: no hi ha tal camí en l'arbre de treball.\n" -"Useu 'git -- ...' per a especificar camins que no existeixin localment." +"Useu 'git -- ...' per a especificar camins que no existeixin " +"localment." #: setup.c:184 #, c-format @@ -3747,7 +3846,8 @@ msgstr "" #: setup.c:388 msgid "unable to set up work tree using invalid config" -msgstr "no s'ha configurar un arbre de treball utilitzant una configuració no vàlida" +msgstr "" +"no s'ha configurar un arbre de treball utilitzant una configuració no vàlida" #: setup.c:395 msgid "this operation must be run in a work tree" @@ -3837,8 +3937,8 @@ msgid "" "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)." msgstr "" "no un dipòsit de git (ni cap pare fins al punt de muntatge %s)\n" -"S'atura a la frontera de sistema de fitxers (GIT_DISCOVERY_ACROSS_FILESYSTEM no està " -"establert)." +"S'atura a la frontera de sistema de fitxers (GIT_DISCOVERY_ACROSS_FILESYSTEM " +"no està establert)." #: setup.c:1172 #, c-format @@ -3846,8 +3946,10 @@ msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" "The owner of files must always have read and write permissions." msgstr "" -"hi ha un problema amb el valor de mode de fitxer core.sharedRepository (0%.3o).\n" -"El propietari dels fitxers sempre ha de tenir permisos de lectura i escriptura." +"hi ha un problema amb el valor de mode de fitxer core.sharedRepository " +"(0%.3o).\n" +"El propietari dels fitxers sempre ha de tenir permisos de lectura i " +"escriptura." #: setup.c:1215 msgid "open /dev/null or dup failed" @@ -3869,7 +3971,8 @@ msgstr "el camí «%s» no existeix" #: sha1_file.c:618 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." -msgstr "Encara no se suporta el dipòsit de referència «%s» com a agafament enllaçat." +msgstr "" +"Encara no se suporta el dipòsit de referència «%s» com a agafament enllaçat." #: sha1_file.c:624 #, c-format @@ -3922,7 +4025,8 @@ msgstr "" #: submodule.c:96 submodule.c:130 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" -"No es pot canviar un .gitmodules no fusionat, primer resoleu els conflictes de fusió" +"No es pot canviar un .gitmodules no fusionat, primer resoleu els conflictes " +"de fusió" #: submodule.c:100 submodule.c:134 #, c-format @@ -3984,15 +4088,19 @@ msgstr "el submòdul «%s» té l'índex brut" #: submodule.c:1878 #, c-format -msgid "relocate_gitdir for submodule '%s' with more than one worktree not supported" -msgstr "no està admès relocate_gitdir per al submòdul «%s» amb més d'un arbre de treball" +msgid "" +"relocate_gitdir for submodule '%s' with more than one worktree not supported" +msgstr "" +"no està admès relocate_gitdir per al submòdul «%s» amb més d'un arbre de " +"treball" #: submodule.c:1890 submodule.c:1946 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "no s'ha trobat el nom pel submòdul «%s»" -#: submodule.c:1894 builtin/submodule--helper.c:1246 builtin/submodule--helper.c:1256 +#: submodule.c:1894 builtin/submodule--helper.c:1246 +#: builtin/submodule--helper.c:1256 #, c-format msgid "could not create directory '%s'" msgstr "no s'ha pogut crear el directori «%s»" @@ -4040,7 +4148,8 @@ msgstr "valor no vàlid per a %s" msgid "running trailer command '%s' failed" msgstr "l'execució de l'ordre de remolc «%s» ha fallat" -#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553 trailer.c:557 +#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553 +#: trailer.c:557 #, c-format msgid "unknown value '%s' for key '%s'" msgstr "valor desconegut «%s» per a la clau «%s»" @@ -4164,7 +4273,8 @@ msgid "" "Your local changes to the following files would be overwritten by checkout:\n" "%%sPlease commit your changes or stash them before you switch branches." msgstr "" -"Els vostres canvis locals als fitxers següents se sobreescriurien per agafar:\n" +"Els vostres canvis locals als fitxers següents se sobreescriurien per " +"agafar:\n" "%%sCometeu els vostres canvis o feu «stash» abans de canviar de branca." #: unpack-trees.c:110 @@ -4173,7 +4283,8 @@ msgid "" "Your local changes to the following files would be overwritten by checkout:\n" "%%s" msgstr "" -"Els vostres canvis locals als fitxers següents se sobreescriurien per agafar:\n" +"Els vostres canvis locals als fitxers següents se sobreescriurien per " +"agafar:\n" "%%s" #: unpack-trees.c:113 @@ -4182,7 +4293,8 @@ msgid "" "Your local changes to the following files would be overwritten by merge:\n" "%%sPlease commit your changes or stash them before you merge." msgstr "" -"Els vostres canvis locals als fitxers següents se sobreescriurien per fusionar:\n" +"Els vostres canvis locals als fitxers següents se sobreescriurien per " +"fusionar:\n" "%%sCometeu els vostres canvis o feu «stash» abans de fusionar." #: unpack-trees.c:115 @@ -4191,7 +4303,8 @@ msgid "" "Your local changes to the following files would be overwritten by merge:\n" "%%s" msgstr "" -"Els vostres canvis locals als fitxers següents se sobreescriurien per fusionar:\n" +"Els vostres canvis locals als fitxers següents se sobreescriurien per " +"fusionar:\n" "%%s" #: unpack-trees.c:118 @@ -4227,7 +4340,8 @@ msgid "" "The following untracked working tree files would be removed by checkout:\n" "%%sPlease move or remove them before you switch branches." msgstr "" -"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per agafar:\n" +"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per " +"agafar:\n" "%%sMoveu-los o elimineu-los abans de canviar de branca." #: unpack-trees.c:131 @@ -4236,7 +4350,8 @@ msgid "" "The following untracked working tree files would be removed by checkout:\n" "%%s" msgstr "" -"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per agafar:\n" +"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per " +"agafar:\n" "%%s" #: unpack-trees.c:134 @@ -4245,7 +4360,8 @@ msgid "" "The following untracked working tree files would be removed by merge:\n" "%%sPlease move or remove them before you merge." msgstr "" -"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per fusionar:\n" +"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per " +"fusionar:\n" "%%sMoveu-los o elimineu-los abans de fusionar." #: unpack-trees.c:136 @@ -4254,7 +4370,8 @@ msgid "" "The following untracked working tree files would be removed by merge:\n" "%%s" msgstr "" -"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per fusionar:\n" +"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per " +"fusionar:\n" "%%s" #: unpack-trees.c:139 @@ -4278,19 +4395,23 @@ msgstr "" #: unpack-trees.c:146 #, c-format msgid "" -"The following untracked working tree files would be overwritten by checkout:\n" +"The following untracked working tree files would be overwritten by " +"checkout:\n" "%%sPlease move or remove them before you switch branches." msgstr "" -"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per agafar:\n" +"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per " +"agafar:\n" "%%sMoveu-los o elimineu-los abans de canviar de branca." #: unpack-trees.c:148 #, c-format msgid "" -"The following untracked working tree files would be overwritten by checkout:\n" +"The following untracked working tree files would be overwritten by " +"checkout:\n" "%%s" msgstr "" -"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per agafar:\n" +"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per " +"agafar:\n" "%%s" #: unpack-trees.c:151 @@ -4299,7 +4420,8 @@ msgid "" "The following untracked working tree files would be overwritten by merge:\n" "%%sPlease move or remove them before you merge." msgstr "" -"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per fusionar:\n" +"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per " +"fusionar:\n" "%%sMoveu-los o elimineu-los abans de fusionar." #: unpack-trees.c:153 @@ -4308,7 +4430,8 @@ msgid "" "The following untracked working tree files would be overwritten by merge:\n" "%%s" msgstr "" -"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per fusionar:\n" +"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per " +"fusionar:\n" "%%s" #: unpack-trees.c:156 @@ -4317,7 +4440,8 @@ msgid "" "The following untracked working tree files would be overwritten by %s:\n" "%%sPlease move or remove them before you %s." msgstr "" -"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per %s:\n" +"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per " +"%s:\n" "%%sMoveu-los o elimineu-los abans de %s." #: unpack-trees.c:158 @@ -4326,7 +4450,8 @@ msgid "" "The following untracked working tree files would be overwritten by %s:\n" "%%s" msgstr "" -"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per %s:\n" +"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per " +"%s:\n" "%%s" #: unpack-trees.c:165 @@ -4340,27 +4465,30 @@ msgid "" "Cannot update sparse checkout: the following entries are not up to date:\n" "%s" msgstr "" -"No es pot actualitzar l'agafament parcial: les entrades següents no estan al dia:\n" +"No es pot actualitzar l'agafament parcial: les entrades següents no estan al " +"dia:\n" "%s" #: unpack-trees.c:170 #, c-format msgid "" -"The following working tree files would be overwritten by sparse checkout update:\n" +"The following working tree files would be overwritten by sparse checkout " +"update:\n" "%s" msgstr "" -"Els fitxers següents en l'arbre de treball se sobreescriurien per actualitzar " -"l'agafament parcial:\n" +"Els fitxers següents en l'arbre de treball se sobreescriurien per " +"actualitzar l'agafament parcial:\n" "%s" #: unpack-trees.c:172 #, c-format msgid "" -"The following working tree files would be removed by sparse checkout update:\n" +"The following working tree files would be removed by sparse checkout " +"update:\n" "%s" msgstr "" -"Els fitxers següents en l'arbre de treball s'eliminarien per actualitzar l'agafament " -"parcial:\n" +"Els fitxers següents en l'arbre de treball s'eliminarien per actualitzar " +"l'agafament parcial:\n" "%s" #: unpack-trees.c:174 @@ -4445,8 +4573,8 @@ msgstr "«%s» no assenyala de tornada a «%s»" msgid "could not open '%s' for reading and writing" msgstr "no s'ha pogut obrir «%s» per a lectura i escriptura" -#: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:770 builtin/am.c:862 -#: builtin/merge.c:1044 +#: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:770 +#: builtin/am.c:862 builtin/merge.c:1044 #, c-format msgid "could not open '%s' for reading" msgstr "no s'ha pogut obrir «%s» per a lectura" @@ -4479,7 +4607,9 @@ msgstr " (useu \"git add ...\" per a senyalar resolució)" #: wt-status.c:186 wt-status.c:190 msgid " (use \"git add/rm ...\" as appropriate to mark resolution)" -msgstr " (useu \"git add/rm ...\" segons sigui apropiat per a senyalar resolució)" +msgstr "" +" (useu \"git add/rm ...\" segons sigui apropiat per a senyalar " +"resolució)" #: wt-status.c:188 msgid " (use \"git rm ...\" to mark resolution)" @@ -4502,19 +4632,22 @@ msgid " (use \"git add/rm ...\" to update what will be committed)" msgstr " (useu \"git add/rm ...\" per a actualitzar què es cometrà)" #: wt-status.c:224 -msgid " (use \"git checkout -- ...\" to discard changes in working directory)" +msgid "" +" (use \"git checkout -- ...\" to discard changes in working directory)" msgstr "" -" (useu \"git checkout -- ...\" per a descartar els canvis en el directori de " -"treball)" +" (useu \"git checkout -- ...\" per a descartar els canvis en el " +"directori de treball)" #: wt-status.c:226 msgid " (commit or discard the untracked or modified content in submodules)" -msgstr " (cometeu o descarteu el contingut modificat o no seguit en els submòduls)" +msgstr "" +" (cometeu o descarteu el contingut modificat o no seguit en els submòduls)" #: wt-status.c:238 #, c-format msgid " (use \"git %s ...\" to include in what will be committed)" -msgstr " (useu \"git %s ...\" per a incloure-ho en el qual es cometrà)" +msgstr "" +" (useu \"git %s ...\" per a incloure-ho en el qual es cometrà)" #: wt-status.c:253 msgid "both deleted:" @@ -4697,7 +4830,8 @@ msgstr "Actualment esteu fent «rebase»." #: wt-status.c:1306 msgid " (fix conflicts and then run \"git rebase --continue\")" -msgstr " (arregleu els conflictes i després executeu \"git rebase --continue\")" +msgstr "" +" (arregleu els conflictes i després executeu \"git rebase --continue\")" #: wt-status.c:1308 msgid " (use \"git rebase --skip\" to skip this patch)" @@ -4709,13 +4843,16 @@ msgstr " (useu \"git rebase --abort\" per a agafar la branca original)" #: wt-status.c:1316 msgid " (all conflicts fixed: run \"git rebase --continue\")" -msgstr " (tots els conflictes estan arreglats: executeu \"git rebase --continue\")" +msgstr "" +" (tots els conflictes estan arreglats: executeu \"git rebase --continue\")" #: wt-status.c:1320 #, c-format -msgid "You are currently splitting a commit while rebasing branch '%s' on '%s'." +msgid "" +"You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "" -"Actualment esteu dividint una comissió mentre es fa «rebase» de la branca «%s» en «%s»." +"Actualment esteu dividint una comissió mentre es fa «rebase» de la branca " +"«%s» en «%s»." #: wt-status.c:1325 msgid "You are currently splitting a commit during a rebase." @@ -4724,14 +4861,15 @@ msgstr "Actualment esteu dividint una comissió durant un «rebase»." #: wt-status.c:1328 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" -" (Una vegada que el vostre directori de treball sigui net, executeu \"git rebase --" -"continue\")" +" (Una vegada que el vostre directori de treball sigui net, executeu \"git " +"rebase --continue\")" #: wt-status.c:1332 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" -"Actualment esteu editant una comissió mentre es fa «rebase» de la branca «%s» en «%s»." +"Actualment esteu editant una comissió mentre es fa «rebase» de la branca " +"«%s» en «%s»." #: wt-status.c:1337 msgid "You are currently editing a commit during a rebase." @@ -4742,10 +4880,11 @@ msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " (useu \"git commit --amend\" per a esmenar la comissió actual)" #: wt-status.c:1342 -msgid " (use \"git rebase --continue\" once you are satisfied with your changes)" +msgid "" +" (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" -" (useu \"git rebase --continue\" una vegada que estigueu satisfet amb els vostres " -"canvis)" +" (useu \"git rebase --continue\" una vegada que estigueu satisfet amb els " +"vostres canvis)" #: wt-status.c:1352 #, c-format @@ -4758,11 +4897,15 @@ msgstr " (arregleu els conflictes i executeu \"git cherry-pick --continue\")" #: wt-status.c:1360 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" -msgstr " (tots els conflictes estan arreglats: executeu \"git cherry-pick --continue\")" +msgstr "" +" (tots els conflictes estan arreglats: executeu \"git cherry-pick --continue" +"\")" #: wt-status.c:1362 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" -msgstr " (useu \"git cherry-pick --abort\" per a cancel·lar l'operació de «cherry pick»)" +msgstr "" +" (useu \"git cherry-pick --abort\" per a cancel·lar l'operació de «cherry " +"pick»)" #: wt-status.c:1371 #, c-format @@ -4775,11 +4918,13 @@ msgstr " (arregleu els conflictes i executeu \"git revert --continue\")" #: wt-status.c:1379 msgid " (all conflicts fixed: run \"git revert --continue\")" -msgstr " (tots els conflictes estan arreglats: executeu \"git revert --continue\")" +msgstr "" +" (tots els conflictes estan arreglats: executeu \"git revert --continue\")" #: wt-status.c:1381 msgid " (use \"git revert --abort\" to cancel the revert operation)" -msgstr " (useu \"git revert --abort\" per a cancel·lar l'operació de reversió)" +msgstr "" +" (useu \"git revert --abort\" per a cancel·lar l'operació de reversió)" #: wt-status.c:1392 #, c-format @@ -4862,7 +5007,8 @@ msgstr "Sense canvis" #: wt-status.c:1674 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" -msgstr "no hi ha canvis afegits a cometre (useu \"git add\" o \"git commit -a\")\n" +msgstr "" +"no hi ha canvis afegits a cometre (useu \"git add\" o \"git commit -a\")\n" #: wt-status.c:1677 #, c-format @@ -4871,10 +5017,12 @@ msgstr "no hi ha canvis afegits a cometre\n" #: wt-status.c:1680 #, c-format -msgid "nothing added to commit but untracked files present (use \"git add\" to track)\n" +msgid "" +"nothing added to commit but untracked files present (use \"git add\" to " +"track)\n" msgstr "" -"no hi ha res afegit a cometre però hi ha fitxers no seguits (useu \"git add\" per a " -"seguir-los)\n" +"no hi ha res afegit a cometre però hi ha fitxers no seguits (useu \"git add" +"\" per a seguir-los)\n" #: wt-status.c:1683 #, c-format @@ -4885,7 +5033,8 @@ msgstr "no hi ha res afegit a cometre però hi ha fitxers no seguits\n" #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" -"no hi ha res a cometre (creeu/copieu fitxers i useu \"git add\" per a seguir-los)\n" +"no hi ha res a cometre (creeu/copieu fitxers i useu \"git add\" per a seguir-" +"los)\n" #: wt-status.c:1689 wt-status.c:1694 #, c-format @@ -4895,7 +5044,8 @@ msgstr "no hi ha res a cometre\n" #: wt-status.c:1692 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" -msgstr "no hi ha res a cometre (useu -u per a mostrar els fitxers no seguits)\n" +msgstr "" +"no hi ha res a cometre (useu -u per a mostrar els fitxers no seguits)\n" #: wt-status.c:1696 #, c-format @@ -4997,11 +5147,12 @@ msgstr "No s'ha pogut aplicar «%s»" #: builtin/add.c:271 msgid "The following paths are ignored by one of your .gitignore files:\n" -msgstr "Els camins següents s'ignoren per un dels vostres fitxers .gitignore:\n" +msgstr "" +"Els camins següents s'ignoren per un dels vostres fitxers .gitignore:\n" #: builtin/add.c:291 builtin/clean.c:911 builtin/fetch.c:146 builtin/mv.c:124 -#: builtin/prune-packed.c:55 builtin/pull.c:207 builtin/push.c:541 builtin/remote.c:1333 -#: builtin/rm.c:242 builtin/send-pack.c:164 +#: builtin/prune-packed.c:55 builtin/pull.c:207 builtin/push.c:541 +#: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164 msgid "dry run" msgstr "marxa en sec" @@ -5039,7 +5190,8 @@ msgstr "afegeix els canvis de tots els fitxers seguits i no seguits" #: builtin/add.c:304 msgid "ignore paths removed in the working tree (same as --no-all)" -msgstr "ignora els camins eliminats en l'arbre de treball (el mateix que --no-all)" +msgstr "" +"ignora els camins eliminats en l'arbre de treball (el mateix que --no-all)" #: builtin/add.c:306 msgid "don't add, only refresh the index" @@ -5051,7 +5203,8 @@ msgstr "només omet els fitxers que no es poden afegir a causa d'errors" #: builtin/add.c:308 msgid "check if - even missing - files are ignored in dry run" -msgstr "comproveu si els fitxers - fins i tot els absents - s'ignoren en marxa en sec" +msgstr "" +"comproveu si els fitxers - fins i tot els absents - s'ignoren en marxa en sec" #: builtin/add.c:309 builtin/update-index.c:964 msgid "(+/-)x" @@ -5134,8 +5287,9 @@ msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Potser volíeu dir «git add .»?\n" #: builtin/add.c:449 builtin/check-ignore.c:177 builtin/checkout.c:280 -#: builtin/checkout.c:483 builtin/clean.c:958 builtin/commit.c:316 builtin/diff-tree.c:114 -#: builtin/mv.c:144 builtin/reset.c:241 builtin/rm.c:271 builtin/submodule--helper.c:326 +#: builtin/checkout.c:483 builtin/clean.c:958 builtin/commit.c:316 +#: builtin/diff-tree.c:114 builtin/mv.c:144 builtin/reset.c:241 +#: builtin/rm.c:271 builtin/submodule--helper.c:326 msgid "index file corrupt" msgstr "fitxer d'índex malmès" @@ -5208,12 +5362,15 @@ msgstr "Quan hàgiu resolt aquest problema, executeu \"%s --continue\"." #: builtin/am.c:1163 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." -msgstr "Si preferiu ometre aquest pedaç, executeu \"%s --skip\" en lloc d'això." +msgstr "" +"Si preferiu ometre aquest pedaç, executeu \"%s --skip\" en lloc d'això." #: builtin/am.c:1164 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." -msgstr "Per a restaurar la branca original i deixar d'apedaçar, executeu \"%s --abort\"." +msgstr "" +"Per a restaurar la branca original i deixar d'apedaçar, executeu \"%s --abort" +"\"." #: builtin/am.c:1271 msgid "Patch is empty." @@ -5231,7 +5388,9 @@ msgstr "no s'ha pogut analitzar la comissió %s" #: builtin/am.c:1554 msgid "Repository lacks necessary blobs to fall back on 3-way merge." -msgstr "Al dipòsit li manquen els blobs necessaris per a retrocedir a una fusió de 3 vies." +msgstr "" +"Al dipòsit li manquen els blobs necessaris per a retrocedir a una fusió de 3 " +"vies." #: builtin/am.c:1556 msgid "Using index info to reconstruct a base tree..." @@ -5264,7 +5423,8 @@ msgstr "no es pot reprendre: %s no existeix." #: builtin/am.c:1703 msgid "cannot be interactive without stdin connected to a terminal." -msgstr "no es pot ser interactiu sense que stdin estigui connectada a un terminal." +msgstr "" +"no es pot ser interactiu sense que stdin estigui connectada a un terminal." #: builtin/am.c:1708 msgid "Commit Body is:" @@ -5276,7 +5436,9 @@ msgstr "El cos de la comissió és:" #. #: builtin/am.c:1718 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " -msgstr "Voleu aplicar-lo? [y]es/[n]o/[e]dita/[v]isualitza el pedaç/[a]ccepta'ls tots: " +msgstr "" +"Voleu aplicar-lo? [y]es/[n]o/[e]dita/[v]isualitza el pedaç/[a]ccepta'ls " +"tots: " #: builtin/am.c:1768 #, c-format @@ -5314,12 +5476,15 @@ msgstr "" #: builtin/am.c:1889 msgid "" "You still have unmerged paths in your index.\n" -"You should 'git add' each file with resolved conflicts to mark them as such.\n" +"You should 'git add' each file with resolved conflicts to mark them as " +"such.\n" "You might run `git rm` on a file to accept \"deleted by them\" for it." msgstr "" "Encara teniu camins sense fusionar a l'índex.\n" -"Heu de fer 'git add' a cada fitxer amb conflictes resolts per marcar-los com a tal.\n" -"Podeu executar `git rm` en un fitxer per acceptar \"suprimit per ells\" pel fitxer." +"Heu de fer 'git add' a cada fitxer amb conflictes resolts per marcar-los com " +"a tal.\n" +"Podeu executar `git rm` en un fitxer per acceptar \"suprimit per ells\" pel " +"fitxer." #: builtin/am.c:1996 builtin/am.c:2000 builtin/am.c:2012 builtin/reset.c:324 #: builtin/reset.c:332 @@ -5364,7 +5529,8 @@ msgstr "opció històrica -- no-op" msgid "allow fall back on 3way merging if needed" msgstr "permet retrocedir a una fusió de 3 vies si és necessari" -#: builtin/am.c:2222 builtin/init-db.c:484 builtin/prune-packed.c:57 builtin/repack.c:182 +#: builtin/am.c:2222 builtin/init-db.c:484 builtin/prune-packed.c:57 +#: builtin/repack.c:182 msgid "be quiet" msgstr "silenciós" @@ -5394,7 +5560,8 @@ msgstr "passa l'indicador --keep-cr a git-mailsplit per al format mbox" #: builtin/am.c:2238 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" -msgstr "no passis l'indicador --keep-cr a git-mailsplit independent d'am.keepcr" +msgstr "" +"no passis l'indicador --keep-cr a git-mailsplit independent d'am.keepcr" #: builtin/am.c:2241 msgid "strip everything before a scissors line" @@ -5408,14 +5575,14 @@ msgstr "passa-ho a través de git-apply" #: builtin/am.c:2260 builtin/fmt-merge-msg.c:665 builtin/fmt-merge-msg.c:668 #: builtin/grep.c:853 builtin/merge.c:206 builtin/pull.c:145 builtin/pull.c:203 -#: builtin/repack.c:191 builtin/repack.c:195 builtin/repack.c:197 builtin/show-branch.c:631 -#: builtin/show-ref.c:169 builtin/tag.c:382 parse-options.h:144 parse-options.h:146 -#: parse-options.h:257 +#: builtin/repack.c:191 builtin/repack.c:195 builtin/repack.c:197 +#: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:382 +#: parse-options.h:144 parse-options.h:146 parse-options.h:257 msgid "n" msgstr "n" -#: builtin/am.c:2266 builtin/branch.c:629 builtin/for-each-ref.c:38 builtin/replace.c:445 -#: builtin/tag.c:418 builtin/verify-tag.c:39 +#: builtin/am.c:2266 builtin/branch.c:629 builtin/for-each-ref.c:38 +#: builtin/replace.c:445 builtin/tag.c:418 builtin/verify-tag.c:39 msgid "format" msgstr "format" @@ -5459,8 +5626,8 @@ msgstr "menteix sobre la data del comitent" msgid "use current timestamp for author date" msgstr "usa el marc de temps actual per la data d'autor" -#: builtin/am.c:2298 builtin/commit.c:1431 builtin/merge.c:237 builtin/pull.c:178 -#: builtin/revert.c:112 builtin/tag.c:398 +#: builtin/am.c:2298 builtin/commit.c:1431 builtin/merge.c:237 +#: builtin/pull.c:178 builtin/revert.c:112 builtin/tag.c:398 msgid "key-id" msgstr "ID de clau" @@ -5487,7 +5654,9 @@ msgstr "S'ha produït un error en llegir l'índex" #: builtin/am.c:2342 #, c-format msgid "previous rebase directory %s still exists but mbox given." -msgstr "un directori de «rebase» anterior %s encara existeix però s'ha donat una bústia." +msgstr "" +"un directori de «rebase» anterior %s encara existeix però s'ha donat una " +"bústia." #: builtin/am.c:2366 #, c-format @@ -5613,11 +5782,14 @@ msgstr "Mostra les entrades «blame» mentre les trobem, incrementalment" #: builtin/blame.c:678 msgid "Show blank SHA-1 for boundary commits (Default: off)" -msgstr "Mostra un SHA-1 en blanc per les comissions de frontera (Per defecte: desactivat)" +msgstr "" +"Mostra un SHA-1 en blanc per les comissions de frontera (Per defecte: " +"desactivat)" #: builtin/blame.c:679 msgid "Do not treat root commits as boundaries (Default: off)" -msgstr "No tractis les comissions d'arrel com a límits (Per defecte: desactivat)" +msgstr "" +"No tractis les comissions d'arrel com a límits (Per defecte: desactivat)" #: builtin/blame.c:680 msgid "Show work cost statistics" @@ -5649,7 +5821,8 @@ msgstr "Mostra el format de porcellana amb informació de comissió per línia" #: builtin/blame.c:687 msgid "Use the same output mode as git-annotate (Default: off)" -msgstr "Usa el mateix mode de sortida que git-annotate (Per defecte: desactivat)" +msgstr "" +"Usa el mateix mode de sortida que git-annotate (Per defecte: desactivat)" #: builtin/blame.c:688 msgid "Show raw timestamp (Default: off)" @@ -5665,7 +5838,9 @@ msgstr "Omet el nom d'autor i la marca de temps (Per defecte: desactivat)" #: builtin/blame.c:691 msgid "Show author email instead of name (Default: off)" -msgstr "Mostra l'adreça electrònica de l'autor en lloc del nom (Per defecte: desactivat)" +msgstr "" +"Mostra l'adreça electrònica de l'autor en lloc del nom (Per defecte: " +"desactivat)" #: builtin/blame.c:692 msgid "Ignore whitespace differences" @@ -5709,7 +5884,8 @@ msgstr "Processa només el rang de línies n,m, comptant des d'1" #: builtin/blame.c:753 msgid "--progress can't be used with --incremental or porcelain formats" -msgstr "no es pot usar --progress amb els formats --incremental o de porcellana" +msgstr "" +"no es pot usar --progress amb els formats --incremental o de porcellana" #. TRANSLATORS: This string is used to tell us the #. maximum display width for a relative timestamp in @@ -5880,7 +6056,7 @@ msgstr "La còpia de la branca ha fallat" #: builtin/branch.c:517 #, c-format -msgid "created a copy of a misnamed branch '%s'" +msgid "Created a copy of a misnamed branch '%s'" msgstr "S'ha creat una còpia d'una branca mal anomenada «%s»" #: builtin/branch.c:520 @@ -5896,11 +6072,14 @@ msgstr "S'ha canviat el nom de la branca a %s, però HEAD no està actualitzat!" #: builtin/branch.c:535 msgid "Branch is renamed, but update of config-file failed" msgstr "" -"La branca està canviada de nom, però l'actualització del fitxer de configuració ha fallat" +"La branca està canviada de nom, però l'actualització del fitxer de " +"configuració ha fallat" #: builtin/branch.c:537 msgid "Branch is copied, but update of config-file failed" -msgstr "La branca està copiada, però l'actualització del fitxer de configuració ha fallat" +msgstr "" +"La branca està copiada, però l'actualització del fitxer de configuració ha " +"fallat" #: builtin/branch.c:553 #, c-format @@ -6029,8 +6208,9 @@ msgstr "clau" msgid "field name to sort on" msgstr "nom del camp en el qual ordenar" -#: builtin/branch.c:625 builtin/for-each-ref.c:43 builtin/notes.c:408 builtin/notes.c:411 -#: builtin/notes.c:571 builtin/notes.c:574 builtin/tag.c:414 +#: builtin/branch.c:625 builtin/for-each-ref.c:43 builtin/notes.c:408 +#: builtin/notes.c:411 builtin/notes.c:571 builtin/notes.c:574 +#: builtin/tag.c:414 msgid "object" msgstr "objecte" @@ -6042,7 +6222,8 @@ msgstr "imprimeix només les branques de l'objecte" msgid "sorting and filtering are case insensitive" msgstr "l'ordenació i el filtratge distingeixen entre majúscules i minúscules" -#: builtin/branch.c:629 builtin/for-each-ref.c:38 builtin/tag.c:419 builtin/verify-tag.c:39 +#: builtin/branch.c:629 builtin/for-each-ref.c:38 builtin/tag.c:419 +#: builtin/verify-tag.c:39 msgid "format to use for the output" msgstr "format a usar en la sortida" @@ -6090,8 +6271,10 @@ msgstr "hi ha massa arguments per a establir una nova font" #: builtin/branch.c:766 #, c-format -msgid "could not set upstream of HEAD to %s when it does not point to any branch." -msgstr "no s'ha pogut establir la font de HEAD com a %s quan no assenyala cap branca." +msgid "" +"could not set upstream of HEAD to %s when it does not point to any branch." +msgstr "" +"no s'ha pogut establir la font de HEAD com a %s quan no assenyala cap branca." #: builtin/branch.c:769 builtin/branch.c:791 builtin/branch.c:807 #, c-format @@ -6109,7 +6292,8 @@ msgstr "hi ha massa arguments per a desassignar la font" #: builtin/branch.c:789 msgid "could not unset upstream of HEAD when it does not point to any branch." -msgstr "no s'ha pogut desassignar la font de HEAD perquè no assenyala cap branca." +msgstr "" +"no s'ha pogut desassignar la font de HEAD perquè no assenyala cap branca." #: builtin/branch.c:795 #, c-format @@ -6118,14 +6302,16 @@ msgstr "La branca «%s» no té informació de font" #: builtin/branch.c:810 msgid "-a and -r options to 'git branch' do not make sense with a branch name" -msgstr "les opcions -a i -r a 'git branch' no tenen sentit amb un nom de branca" +msgstr "" +"les opcions -a i -r a 'git branch' no tenen sentit amb un nom de branca" #: builtin/branch.c:813 msgid "" -"the '--set-upstream' option is no longer supported. Please use '--track' or '--set-" -"upstream-to' instead." +"the '--set-upstream' option is no longer supported. Please use '--track' or " +"'--set-upstream-to' instead." msgstr "" -"L'opció --set-upstream ja no està suportada. Useu en comptes --track o --set-upstream-to." +"L'opció --set-upstream ja no està suportada. Useu en comptes --track o --set-" +"upstream-to." #: builtin/bundle.c:45 #, c-format @@ -6142,16 +6328,19 @@ msgstr "Cal un dipòsit per a desfer un farcell." #: builtin/cat-file.c:523 msgid "" -"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -p | | " -"--textconv | --filters) [--path=] " +"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" +"p | | --textconv | --filters) [--path=] " msgstr "" -"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -p | " -"| --textconv | --filters [--path=]) " +"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" +"p | | --textconv | --filters [--path=]) " #: builtin/cat-file.c:524 -msgid "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --filters]" +msgid "" +"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" +"filters]" msgstr "" -"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --filters]" +"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" +"filters]" #: builtin/cat-file.c:561 msgid " can be one of: blob, tree, commit, tag" @@ -6179,7 +6368,8 @@ msgstr "en els objectes de blob, executa textconv en el contingut de l'objecte" #: builtin/cat-file.c:570 msgid "for blob objects, run filters on object's content" -msgstr "en els objectes de blob, executa els filtres en el contingut de l'objecte" +msgstr "" +"en els objectes de blob, executa els filtres en el contingut de l'objecte" #: builtin/cat-file.c:571 git-submodule.sh:878 msgid "blob" @@ -6199,7 +6389,8 @@ msgstr "posa la sortida de --batch en memòria intermèdia" #: builtin/cat-file.c:577 msgid "show info and content of objects fed from the standard input" -msgstr "mostra la informació i contingut dels objectes rebuts de l'entrada estàndard" +msgstr "" +"mostra la informació i contingut dels objectes rebuts de l'entrada estàndard" #: builtin/cat-file.c:580 msgid "show info about objects fed from the standard input" @@ -6207,7 +6398,8 @@ msgstr "mostra informació sobre els objectes rebuts de l'entrada estàndard" #: builtin/cat-file.c:583 msgid "follow in-tree symlinks (used with --batch or --batch-check)" -msgstr "segueix els enllaços simbòlics en l'arbre (s'usa amb --batch o --batch-check)" +msgstr "" +"segueix els enllaços simbòlics en l'arbre (s'usa amb --batch o --batch-check)" #: builtin/cat-file.c:585 msgid "show all objects with --batch or --batch-check" @@ -6308,7 +6500,8 @@ msgstr "força la sobreescriptura de fitxers existents" #: builtin/checkout-index.c:162 msgid "no warning for existing files and files not in index" -msgstr "cap advertència per a fitxers existents i fitxers que no siguin a l'índex" +msgstr "" +"cap advertència per a fitxers existents i fitxers que no siguin a l'índex" #: builtin/checkout-index.c:164 msgid "don't checkout new files" @@ -6326,9 +6519,10 @@ msgstr "llegeix la llista de camins des de l'entrada estàndard" msgid "write the content to temporary files" msgstr "escriu el contingut a fitxers temporals" -#: builtin/checkout-index.c:173 builtin/column.c:31 builtin/submodule--helper.c:1203 -#: builtin/submodule--helper.c:1206 builtin/submodule--helper.c:1212 -#: builtin/submodule--helper.c:1574 builtin/worktree.c:570 +#: builtin/checkout-index.c:173 builtin/column.c:31 +#: builtin/submodule--helper.c:1203 builtin/submodule--helper.c:1206 +#: builtin/submodule--helper.c:1212 builtin/submodule--helper.c:1574 +#: builtin/worktree.c:570 msgid "string" msgstr "cadena" @@ -6392,7 +6586,8 @@ msgstr "«%s» no es pot usar amb %s" #: builtin/checkout.c:271 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." -msgstr "No es poden actualitzar els camins i canviar a la branca «%s» a la vegada." +msgstr "" +"No es poden actualitzar els camins i canviar a la branca «%s» a la vegada." #: builtin/checkout.c:340 builtin/checkout.c:347 #, c-format @@ -6543,8 +6738,9 @@ msgstr "«%s» no es pot usar amb «%s»" msgid "Cannot switch branch to a non-commit '%s'" msgstr "No es pot canviar la branca a la no comissió «%s»" -#: builtin/checkout.c:1107 builtin/checkout.c:1109 builtin/clone.c:116 builtin/remote.c:166 -#: builtin/remote.c:168 builtin/worktree.c:387 builtin/worktree.c:389 +#: builtin/checkout.c:1107 builtin/checkout.c:1109 builtin/clone.c:116 +#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:387 +#: builtin/worktree.c:389 msgid "branch" msgstr "branca" @@ -6616,8 +6812,9 @@ msgstr "dubta 'git checkout '" msgid "do not check if another worktree is holding the given ref" msgstr "no comprovis si altre arbre de treball té la referència donada" -#: builtin/checkout.c:1138 builtin/clone.c:83 builtin/fetch.c:150 builtin/merge.c:236 -#: builtin/pull.c:123 builtin/push.c:556 builtin/send-pack.c:173 +#: builtin/checkout.c:1138 builtin/clone.c:83 builtin/fetch.c:150 +#: builtin/merge.c:236 builtin/pull.c:123 builtin/push.c:556 +#: builtin/send-pack.c:173 msgid "force progress reporting" msgstr "força l'informe de progrés" @@ -6641,7 +6838,8 @@ msgstr "especificació de camí no vàlida" #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "" -"«%s» no és una comissió i la branca «%s» no es pot crear a partir d'aquesta comissió" +"«%s» no és una comissió i la branca «%s» no es pot crear a partir d'aquesta " +"comissió" #: builtin/checkout.c:1237 #, c-format @@ -6657,8 +6855,10 @@ msgstr "" "agafar de l'índex." #: builtin/clean.c:26 -msgid "git clean [-d] [-f] [-i] [-n] [-q] [-e ] [-x | -X] [--] ..." -msgstr "git clean [-d] [-f] [-i] [-n] [-q] [-e ] [-x | -X] [--] ..." +msgid "" +"git clean [-d] [-f] [-i] [-n] [-q] [-e ] [-x | -X] [--] ..." +msgstr "" +"git clean [-d] [-f] [-i] [-n] [-q] [-e ] [-x | -X] [--] ..." #: builtin/clean.c:30 #, c-format @@ -6719,7 +6919,8 @@ msgstr "" "* - tria tots els ítems\n" " - (buit) finalitza la selecció\n" -#: builtin/clean.c:522 git-add--interactive.perl:547 git-add--interactive.perl:552 +#: builtin/clean.c:522 git-add--interactive.perl:547 +#: git-add--interactive.perl:552 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "Perdó (%s)?\n" @@ -6801,9 +7002,10 @@ msgstr "neteja interactiva" msgid "remove whole directories" msgstr "elimina directoris sencers" -#: builtin/clean.c:916 builtin/describe.c:533 builtin/describe.c:535 builtin/grep.c:871 -#: builtin/log.c:157 builtin/log.c:159 builtin/ls-files.c:548 builtin/name-rev.c:397 -#: builtin/name-rev.c:399 builtin/show-ref.c:176 +#: builtin/clean.c:916 builtin/describe.c:533 builtin/describe.c:535 +#: builtin/grep.c:871 builtin/log.c:157 builtin/log.c:159 +#: builtin/ls-files.c:548 builtin/name-rev.c:397 builtin/name-rev.c:399 +#: builtin/show-ref.c:176 msgid "pattern" msgstr "patró" @@ -6824,16 +7026,20 @@ msgid "-x and -X cannot be used together" msgstr "-x i -X no es poden usar junts" #: builtin/clean.c:942 -msgid "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to clean" +msgid "" +"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " +"clean" msgstr "" -"clean.requireForce està establerta en cert i ni -i, -n ni -f s'han indicat; refusant " -"netejar" +"clean.requireForce està establerta en cert i ni -i, -n ni -f s'han indicat; " +"refusant netejar" #: builtin/clean.c:945 msgid "" -"clean.requireForce defaults to true and neither -i, -n, nor -f given; refusing to clean" +"clean.requireForce defaults to true and neither -i, -n, nor -f given; " +"refusing to clean" msgstr "" -"clean.requireForce és per defecte cert i ni -i, -n ni -f s'han indicat; refusant netejar" +"clean.requireForce és per defecte cert i ni -i, -n ni -f s'han indicat; " +"refusant netejar" #: builtin/clone.c:40 msgid "git clone [] [--] []" @@ -6902,13 +7108,14 @@ msgstr "usa en lloc de 'origin' per a seguir la font" #: builtin/clone.c:117 msgid "checkout instead of the remote's HEAD" -msgstr "agafa en lloc del HEAD del remot" +msgstr "agafa en lloc de la HEAD del remot" #: builtin/clone.c:119 msgid "path to git-upload-pack on the remote" msgstr "camí a git-upload-pack en el remot" -#: builtin/clone.c:120 builtin/fetch.c:151 builtin/grep.c:813 builtin/pull.c:211 +#: builtin/clone.c:120 builtin/fetch.c:151 builtin/grep.c:813 +#: builtin/pull.c:211 msgid "depth" msgstr "profunditat" @@ -6916,7 +7123,8 @@ msgstr "profunditat" msgid "create a shallow clone of that depth" msgstr "crea un clon superficial de tal profunditat" -#: builtin/clone.c:122 builtin/fetch.c:153 builtin/pack-objects.c:3017 parse-options.h:154 +#: builtin/clone.c:122 builtin/fetch.c:153 builtin/pack-objects.c:3017 +#: parse-options.h:154 msgid "time" msgstr "hora" @@ -6938,7 +7146,8 @@ msgstr "clona només una branca, HEAD o --branch" #: builtin/clone.c:129 msgid "don't clone any tags, and make later fetches not to follow them" -msgstr "no cloneu cap etiqueta, i feu que els «fetch» següents no els segueixen" +msgstr "" +"no cloneu cap etiqueta, i feu que els «fetch» següents no els segueixen" #: builtin/clone.c:131 msgid "any cloned submodules will be shallow" @@ -6960,11 +7169,13 @@ msgstr "clau=valor" msgid "set config inside the new repository" msgstr "estableix la configuració dins del dipòsit nou" -#: builtin/clone.c:136 builtin/fetch.c:173 builtin/pull.c:224 builtin/push.c:567 +#: builtin/clone.c:136 builtin/fetch.c:173 builtin/pull.c:224 +#: builtin/push.c:567 msgid "use IPv4 addresses only" msgstr "usa només adreces IPv4" -#: builtin/clone.c:138 builtin/fetch.c:175 builtin/pull.c:227 builtin/push.c:569 +#: builtin/clone.c:138 builtin/fetch.c:175 builtin/pull.c:227 +#: builtin/push.c:569 msgid "use IPv6 addresses only" msgstr "usa només adreces IPv6" @@ -7039,7 +7250,8 @@ msgstr "no s'ha pogut actualitzar %s" #: builtin/clone.c:726 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" -"el HEAD remot es refereix a una referència que no existeix; no s'ha pogut agafar.\n" +"la HEAD remot es refereix a una referència que no existeix; no s'ha pogut " +"agafar.\n" #: builtin/clone.c:756 msgid "unable to checkout working tree" @@ -7094,8 +7306,8 @@ msgstr "el camí destí «%s» ja existeix i no és un directori buit." msgid "working tree '%s' already exists." msgstr "l'arbre de treball «%s» ja existeix." -#: builtin/clone.c:980 builtin/clone.c:1001 builtin/difftool.c:270 builtin/worktree.c:255 -#: builtin/worktree.c:285 +#: builtin/clone.c:980 builtin/clone.c:1001 builtin/difftool.c:270 +#: builtin/worktree.c:255 builtin/worktree.c:285 #, c-format msgid "could not create leading directories of '%s'" msgstr "no s'han pogut crear els directoris inicials de «%s»" @@ -7116,8 +7328,12 @@ msgid "Cloning into '%s'...\n" msgstr "S'està clonant a «%s»...\n" #: builtin/clone.c:1031 -msgid "clone --recursive is not compatible with both --reference and --reference-if-able" -msgstr "clone --recursive no és compatible amb ambdós --reference i --reference-if-able" +msgid "" +"clone --recursive is not compatible with both --reference and --reference-if-" +"able" +msgstr "" +"clone --recursive no és compatible amb ambdós --reference i --reference-if-" +"able" #: builtin/clone.c:1093 msgid "--depth is ignored in local clones; use file:// instead." @@ -7125,11 +7341,13 @@ msgstr "--depth s'ignora en els clons locals; useu file:// en lloc d'això." #: builtin/clone.c:1095 msgid "--shallow-since is ignored in local clones; use file:// instead." -msgstr "--shallow-since s'ignora en els clons locals; useu file:// en lloc d'això." +msgstr "" +"--shallow-since s'ignora en els clons locals; useu file:// en lloc d'això." #: builtin/clone.c:1097 msgid "--shallow-exclude is ignored in local clones; use file:// instead." -msgstr "--shallow-exclude s'ignora en els clons locals; useu file:// en lloc d'això." +msgstr "" +"--shallow-exclude s'ignora en els clons locals; useu file:// en lloc d'això." #: builtin/clone.c:1099 msgid "--filter is ignored in local clones; use file:// instead." @@ -7210,7 +7428,8 @@ msgid "" " git commit --allow-empty\n" "\n" msgstr "" -"El «cherry pick» previ ja està buit, possiblement a causa de resolució de conflicte.\n" +"El «cherry pick» previ ja està buit, possiblement a causa de resolució de " +"conflicte.\n" "Si el voleu cometre de totes maneres, useu:\n" "\n" " git commit --allow-empty\n" @@ -7377,7 +7596,8 @@ msgid "" "An empty message aborts the commit.\n" msgstr "" "Introduïu el missatge de comissió dels vostres canvis.\n" -"Es mantindran les línies que comencin amb '%c'; podeu eliminar-les vosaltres\n" +"Es mantindran les línies que comencin amb '%c'; podeu eliminar-les " +"vosaltres\n" "mateixos si voleu. Un missatge buit avorta la comissió.\n" #: builtin/commit.c:830 @@ -7498,7 +7718,8 @@ msgstr "" msgid "version" msgstr "versió" -#: builtin/commit.c:1286 builtin/commit.c:1449 builtin/push.c:542 builtin/worktree.c:541 +#: builtin/commit.c:1286 builtin/commit.c:1449 builtin/push.c:542 +#: builtin/worktree.c:541 msgid "machine-readable output" msgstr "sortida llegible per màquina" @@ -7518,23 +7739,28 @@ msgstr "mode" #: builtin/commit.c:1295 builtin/commit.c:1457 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" -"mostra els fitxers no seguits, modes opcionals: all, normal, no. (Per defecte: all)" +"mostra els fitxers no seguits, modes opcionals: all, normal, no. (Per " +"defecte: all)" #: builtin/commit.c:1299 msgid "" -"show ignored files, optional modes: traditional, matching, no. (Default: traditional)" +"show ignored files, optional modes: traditional, matching, no. (Default: " +"traditional)" msgstr "" -"mostra els fitxers ignorats, modes opcionals: traditional, matching, no. (Per defecte: " -"traditional, matching, no.)" +"mostra els fitxers ignorats, modes opcionals: traditional, matching, no. " +"(Per defecte: traditional, matching, no.)" #: builtin/commit.c:1301 parse-options.h:167 msgid "when" msgstr "quan" #: builtin/commit.c:1302 -msgid "ignore changes to submodules, optional when: all, dirty, untracked. (Default: all)" +msgid "" +"ignore changes to submodules, optional when: all, dirty, untracked. " +"(Default: all)" msgstr "" -"ignora els canvis als submòduls, opcional quan: all, dirty, untracked. (Per defecte: all)" +"ignora els canvis als submòduls, opcional quan: all, dirty, untracked. (Per " +"defecte: all)" #: builtin/commit.c:1304 msgid "list untracked files in columns" @@ -7576,8 +7802,8 @@ msgstr "data" msgid "override date for commit" msgstr "data corregida de la comissió" -#: builtin/commit.c:1420 builtin/merge.c:226 builtin/notes.c:402 builtin/notes.c:565 -#: builtin/tag.c:391 +#: builtin/commit.c:1420 builtin/merge.c:226 builtin/notes.c:402 +#: builtin/notes.c:565 builtin/tag.c:391 msgid "message" msgstr "missatge" @@ -7585,8 +7811,8 @@ msgstr "missatge" msgid "commit message" msgstr "missatge de comissió" -#: builtin/commit.c:1421 builtin/commit.c:1422 builtin/commit.c:1423 builtin/commit.c:1424 -#: parse-options.h:269 ref-filter.h:92 +#: builtin/commit.c:1421 builtin/commit.c:1422 builtin/commit.c:1423 +#: builtin/commit.c:1424 parse-options.h:269 ref-filter.h:92 msgid "commit" msgstr "comissió" @@ -7601,19 +7827,21 @@ msgstr "reusa el missatge de la comissió especificada" #: builtin/commit.c:1423 msgid "use autosquash formatted message to fixup specified commit" msgstr "" -"usa el missatge formatat de «squash» automàtic per a corregir la comissió especificada" +"usa el missatge formatat de «squash» automàtic per a corregir la comissió " +"especificada" #: builtin/commit.c:1424 msgid "use autosquash formatted message to squash specified commit" msgstr "" -"usa el missatge formatat de «squash» automàtic per a «squash» a la comissió especificada" +"usa el missatge formatat de «squash» automàtic per a «squash» a la comissió " +"especificada" #: builtin/commit.c:1425 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "l'autor de la comissió ja soc jo (s'usa amb -C/-c/--amend)" -#: builtin/commit.c:1426 builtin/log.c:1446 builtin/merge.c:240 builtin/pull.c:149 -#: builtin/revert.c:105 +#: builtin/commit.c:1426 builtin/log.c:1446 builtin/merge.c:240 +#: builtin/pull.c:149 builtin/revert.c:105 msgid "add Signed-off-by:" msgstr "afegeix Signed-off-by:" @@ -7637,7 +7865,8 @@ msgstr "com suprimir els espais i #comentaris del missatge" msgid "include status in commit message template" msgstr "inclou l'estat en la plantilla de missatge de comissió" -#: builtin/commit.c:1432 builtin/merge.c:238 builtin/pull.c:179 builtin/revert.c:113 +#: builtin/commit.c:1432 builtin/merge.c:238 builtin/pull.c:179 +#: builtin/revert.c:113 msgid "GPG sign commit" msgstr "signa la comissió amb GPG" @@ -7778,7 +8007,8 @@ msgstr "obtén el valor específic per a l'URL: secció[.variable] URL" #: builtin/config.c:69 msgid "replace all matching variables: name value [value_regex]" -msgstr "reemplaça totes les variables que coincideixen: nom valor [regex_de_valors]" +msgstr "" +"reemplaça totes les variables que coincideixen: nom valor [regex_de_valors]" #: builtin/config.c:70 msgid "add a new variable: name value" @@ -7859,7 +8089,8 @@ msgstr "respecta les directives d'inclusió en cercar" #: builtin/config.c:89 msgid "show origin of config (file, standard input, blob, command line)" msgstr "" -"mostra l'origen de la configuració (fitxer, entrada estàndard, blob, línia d'ordres)" +"mostra l'origen de la configuració (fitxer, entrada estàndard, blob, línia " +"d'ordres)" #: builtin/config.c:335 msgid "unable to parse default color value" @@ -8180,13 +8411,16 @@ msgstr "utilitza l'eina de diff especificada" #: builtin/difftool.c:709 msgid "print a list of diff tools that may be used with `--tool`" -msgstr "imprimeix una llista de totes les eines diff que podeu usar amb `--tool`" +msgstr "" +"imprimeix una llista de totes les eines diff que podeu usar amb `--tool`" #: builtin/difftool.c:712 -msgid "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit code" +msgid "" +"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " +"code" msgstr "" -"fes que 'git-difftool' surti quan l'eina de diff invocada torna un codi de sortida " -"diferent de zero" +"fes que 'git-difftool' surti quan l'eina de diff invocada torna un codi de " +"sortida diferent de zero" #: builtin/difftool.c:714 msgid "" @@ -8349,10 +8583,12 @@ msgid "prepend this to submodule path output" msgstr "anteposa això a la sortida de camí del submòdul" #: builtin/fetch.c:166 -msgid "default for recursive fetching of submodules (lower priority than config files)" +msgid "" +"default for recursive fetching of submodules (lower priority than config " +"files)" msgstr "" -"per defecte per a l'obtenció recursiva de submòduls (prioritat més baixa que els fitxers " -"de configuració)" +"per defecte per a l'obtenció recursiva de submòduls (prioritat més baixa que " +"els fitxers de configuració)" #: builtin/fetch.c:170 builtin/pull.c:218 msgid "accept refs that update .git/shallow" @@ -8396,7 +8632,8 @@ msgstr "no es pot obtenir en la branca actual" msgid "[tag update]" msgstr "[actualització d'etiqueta]" -#: builtin/fetch.c:670 builtin/fetch.c:703 builtin/fetch.c:719 builtin/fetch.c:734 +#: builtin/fetch.c:670 builtin/fetch.c:703 builtin/fetch.c:719 +#: builtin/fetch.c:734 msgid "unable to update local ref" msgstr "no s'ha pogut actualitzar la referència local" @@ -8428,7 +8665,8 @@ msgstr "%s no ha enviat tots els objectes necessaris\n" #: builtin/fetch.c:804 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" -msgstr "rebutja %s perquè no es permet que les arrels superficials s'actualitzin" +msgstr "" +"rebutja %s perquè no es permet que les arrels superficials s'actualitzin" #: builtin/fetch.c:892 builtin/fetch.c:988 #, c-format @@ -8489,7 +8727,8 @@ msgid "Could not fetch %s" msgstr "No s'ha pogut obtenir %s" #: builtin/fetch.c:1325 builtin/fetch.c:1498 -msgid "--filter can only be used with the remote configured in core.partialClone" +msgid "" +"--filter can only be used with the remote configured in core.partialClone" msgstr "" #: builtin/fetch.c:1350 @@ -8538,8 +8777,10 @@ msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Obtenir un grup i especificar referències no té sentit" #: builtin/fmt-merge-msg.c:15 -msgid "git fmt-merge-msg [-m ] [--log[=] | --no-log] [--file ]" -msgstr "git fmt-merge-msg [-m ] [--log[=] | --no-log] [--file ]" +msgid "" +"git fmt-merge-msg [-m ] [--log[=] | --no-log] [--file ]" +msgstr "" +"git fmt-merge-msg [-m ] [--log[=] | --no-log] [--file ]" #: builtin/fmt-merge-msg.c:666 msgid "populate log with at most entries from shortlog" @@ -8575,11 +8816,13 @@ msgstr "git for-each-ref [(--merged | --no-merged) []]" #: builtin/for-each-ref.c:13 msgid "git for-each-ref [--contains []] [--no-contains []]" -msgstr "git for-each-ref [--contains []] [--no-contains []]" +msgstr "" +"git for-each-ref [--contains []] [--no-contains []]" #: builtin/for-each-ref.c:28 msgid "quote placeholders suitably for shells" -msgstr "posa els marcadors de posició de forma adequada per a intèrprets d'ordres" +msgstr "" +"posa els marcadors de posició de forma adequada per a intèrprets d'ordres" #: builtin/for-each-ref.c:30 msgid "quote placeholders suitably for perl" @@ -8734,7 +8977,9 @@ msgstr "No s'ha pogut analitzar el valor gc.logexpiry %s" #: builtin/gc.c:412 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" -msgstr "S'està empaquetant el dipòsit automàticament en el fons per rendiment òptim.\n" +msgstr "" +"S'està empaquetant el dipòsit automàticament en el fons per rendiment " +"òptim.\n" #: builtin/gc.c:414 #, c-format @@ -8748,12 +8993,17 @@ msgstr "Vegeu \"git help gc\" per neteja manual.\n" #: builtin/gc.c:440 #, c-format -msgid "gc is already running on machine '%s' pid % (use --force if not)" -msgstr "gc ja s'està executant en la màquina «%s» pid % (useu --force si no)" +msgid "" +"gc is already running on machine '%s' pid % (use --force if not)" +msgstr "" +"gc ja s'està executant en la màquina «%s» pid % (useu --force si no)" #: builtin/gc.c:487 -msgid "There are too many unreachable loose objects; run 'git prune' to remove them." -msgstr "Hi ha massa objectes solts inabastables; executeu 'git prune' per a eliminar-los." +msgid "" +"There are too many unreachable loose objects; run 'git prune' to remove them." +msgstr "" +"Hi ha massa objectes solts inabastables; executeu 'git prune' per a eliminar-" +"los." #: builtin/grep.c:27 msgid "git grep [] [-e] [...] [[--] ...]" @@ -8904,7 +9154,8 @@ msgstr "imprimeix una línia buida entre coincidències de fitxers distints" #: builtin/grep.c:851 msgid "show filename only once above matches from same file" msgstr "" -"mostra el nom de fitxer només una vegada a dalt de les coincidències del mateix fitxer" +"mostra el nom de fitxer només una vegada a dalt de les coincidències del " +"mateix fitxer" #: builtin/grep.c:854 msgid "show context lines before and after matches" @@ -8952,7 +9203,9 @@ msgstr "indica coincidència amb estat de sortida sense sortida textual" #: builtin/grep.c:888 msgid "show only matches from files that match all patterns" -msgstr "mostra només les coincidències dels fitxers que coincideixin amb tots els patrons" +msgstr "" +"mostra només les coincidències dels fitxers que coincideixin amb tots els " +"patrons" #: builtin/grep.c:890 msgid "show parse tree for grep expression" @@ -9014,10 +9267,11 @@ msgstr "s'han donat ambdós --caches i arbres." #: builtin/hash-object.c:83 msgid "" -"git hash-object [-t ] [-w] [--path= | --no-filters] [--stdin] [--] ..." +"git hash-object [-t ] [-w] [--path= | --no-filters] [--stdin] " +"[--] ..." msgstr "" -"git hash-object [-t ] [-w] [--path= | --no-filters] [--stdin] [--] " -"..." +"git hash-object [-t ] [-w] [--path= | --no-filters] [--stdin] " +"[--] ..." #: builtin/hash-object.c:84 msgid "git hash-object --stdin-paths" @@ -9044,9 +9298,11 @@ msgid "store file as is without filters" msgstr "emmagatzema el fitxer tal com és sense filtres" #: builtin/hash-object.c:102 -msgid "just hash any random garbage to create corrupt objects for debugging Git" +msgid "" +"just hash any random garbage to create corrupt objects for debugging Git" msgstr "" -"només suma qualsevol brossa aleatòria per a crear objectes malmesos per a depurar al Git" +"només suma qualsevol brossa aleatòria per a crear objectes malmesos per a " +"depurar al Git" #: builtin/hash-object.c:103 msgid "process file as it were from this path" @@ -9258,7 +9514,8 @@ msgstr "la inflació ha retornat %d" #: builtin/index-pack.c:530 msgid "offset value overflow for delta base object" -msgstr "desbordament de valor de desplaçament per a l'objecte base de diferències" +msgstr "" +"desbordament de valor de desplaçament per a l'objecte base de diferències" #: builtin/index-pack.c:538 msgid "delta base offset is out of bound" @@ -9278,7 +9535,8 @@ msgstr "no es pot fer pread en el fitxer de paquet" msgid "premature end of pack file, % byte missing" msgid_plural "premature end of pack file, % bytes missing" msgstr[0] "el final del fitxer de paquet és prematur, manca % octet" -msgstr[1] "el final del fitxer de paquet és prematur, manquen % octets" +msgstr[1] "" +"el final del fitxer de paquet és prematur, manquen % octets" #: builtin/index-pack.c:605 msgid "serious inflate inconsistency" @@ -9290,7 +9548,8 @@ msgstr "hi ha una inconsistència seriosa d'inflació" msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "S'HA TROBAT UNA COL·LISIÓ SHA1 AMB %s !" -#: builtin/index-pack.c:753 builtin/pack-objects.c:182 builtin/pack-objects.c:276 +#: builtin/index-pack.c:753 builtin/pack-objects.c:182 +#: builtin/pack-objects.c:276 #, c-format msgid "unable to read %s" msgstr "no s'ha pogut llegir %s" @@ -9454,8 +9713,8 @@ msgstr[1] "longitud de cadena = %d: %lu objectes" msgid "Cannot come back to cwd" msgstr "No es pot tornar al directori de treball actual" -#: builtin/index-pack.c:1724 builtin/index-pack.c:1727 builtin/index-pack.c:1743 -#: builtin/index-pack.c:1747 +#: builtin/index-pack.c:1724 builtin/index-pack.c:1727 +#: builtin/index-pack.c:1743 builtin/index-pack.c:1747 #, c-format msgid "bad %s" msgstr "%s incorrecte" @@ -9771,7 +10030,8 @@ msgid "" "please use git branch --set-upstream-to to track a remote branch.\n" "Or you could specify base commit by --base= manually." msgstr "" -"S'ha produït un error en obtenir la font. Si voleu registrar la comissió base\n" +"S'ha produït un error en obtenir la font. Si voleu registrar la comissió " +"base\n" "automàticament, useu git branch --set-upstream-to per a\n" "seguir una branca remota. O podeu especificar la comissió base manualment\n" "amb --base=." @@ -9858,7 +10118,8 @@ msgstr "no incloguis pedaços que coincideixin amb comissions a la font" #: builtin/log.c:1478 msgid "show patch format instead of default (patch + stat)" -msgstr "mostra el format de pedaç en lloc del per defecte (pedaç + estadístiques)" +msgstr "" +"mostra el format de pedaç en lloc del per defecte (pedaç + estadístiques)" #: builtin/log.c:1480 msgid "Messaging" @@ -9890,7 +10151,8 @@ msgstr "identitat" #: builtin/log.c:1488 msgid "set From address to (or committer ident if absent)" -msgstr "estableix l'adreça From a (o la identitat del comitent si manca)" +msgstr "" +"estableix l'adreça From a (o la identitat del comitent si manca)" #: builtin/log.c:1490 msgid "message-id" @@ -9997,8 +10259,11 @@ msgstr "git cherry [-v] [ [ []]]" #: builtin/log.c:1921 #, c-format -msgid "Could not find a tracked remote branch, please specify manually.\n" -msgstr "No s'ha pogut trobar una branca remota seguida. Especifiqueu manualment.\n" +msgid "" +"Could not find a tracked remote branch, please specify manually.\n" +msgstr "" +"No s'ha pogut trobar una branca remota seguida. Especifiqueu " +"manualment.\n" #: builtin/ls-files.c:468 msgid "git ls-files [] [...]" @@ -10018,7 +10283,8 @@ msgstr "usa lletres minúscules per als fitxers 'fsmonitor clean'" #: builtin/ls-files.c:523 msgid "show cached files in the output (default)" -msgstr "mostra en la sortida els fitxers desats en la memòria cau (per defecte)" +msgstr "" +"mostra en la sortida els fitxers desats en la memòria cau (per defecte)" #: builtin/ls-files.c:525 msgid "show deleted files in the output" @@ -10098,7 +10364,8 @@ msgstr "arbre" #: builtin/ls-files.c:567 msgid "pretend that paths removed since are still present" -msgstr "pretén que els camins eliminats després de encara siguin presents" +msgstr "" +"pretén que els camins eliminats després de encara siguin presents" #: builtin/ls-files.c:569 msgid "show debugging data" @@ -10185,7 +10452,8 @@ msgstr "usa els noms de camí complets" #: builtin/ls-tree.c:144 msgid "list entire tree; not just current directory (implies --full-name)" -msgstr "llista l'arbre sencer; no només el directori actual (implica --full-name)" +msgstr "" +"llista l'arbre sencer; no només el directori actual (implica --full-name)" #: builtin/mailsplit.c:241 #, c-format @@ -10238,7 +10506,8 @@ msgstr "(sinònim de --stat)" #: builtin/merge.c:207 builtin/pull.c:146 msgid "add (at most ) entries from shortlog to merge commit message" msgstr "" -"afegeix (com a màxim ) entrades del registre curt al missatge de comissió de fusió" +"afegeix (com a màxim ) entrades del registre curt al missatge de comissió " +"de fusió" #: builtin/merge.c:210 builtin/pull.c:152 msgid "create a single commit instead of doing a merge" @@ -10264,7 +10533,8 @@ msgstr "avorta si l'avanç ràpid no és possible" msgid "verify that the named commit has a valid GPG signature" msgstr "verifica que la comissió anomenada tingui una signatura GPG vàlida" -#: builtin/merge.c:222 builtin/notes.c:777 builtin/pull.c:171 builtin/revert.c:109 +#: builtin/merge.c:222 builtin/notes.c:777 builtin/pull.c:171 +#: builtin/revert.c:109 msgid "strategy" msgstr "estratègia" @@ -10363,7 +10633,8 @@ msgstr "No s'ha pogut llegir de «%s»" #: builtin/merge.c:758 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" -msgstr "No s'està cometent la fusió; useu 'git commit' per a completar la fusió.\n" +msgstr "" +"No s'està cometent la fusió; useu 'git commit' per a completar la fusió.\n" #: builtin/merge.c:764 #, c-format @@ -10394,7 +10665,8 @@ msgstr "Meravellós.\n" #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" -"La fusió automàtica ha fallat; arregleu els conflictes i després cometeu el resultat.\n" +"La fusió automàtica ha fallat; arregleu els conflictes i després cometeu el " +"resultat.\n" #: builtin/merge.c:912 msgid "No current branch." @@ -10469,7 +10741,9 @@ msgstr "No podeu combinar --squash amb --no-ff." #: builtin/merge.c:1275 msgid "No commit specified and merge.defaultToUpstream not set." -msgstr "No hi ha una comissió especificada i merge.defaultToUpstream no està establert." +msgstr "" +"No hi ha una comissió especificada i merge.defaultToUpstream no està " +"establert." #: builtin/merge.c:1292 msgid "Squash commit into empty head not supported yet" @@ -10568,7 +10842,8 @@ msgstr "S'està usant el %s per a preparar la resolució a mà.\n" #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" -"La fusió automàtica ha sortit bé; s'ha aturat abans de cometre com s'havia demanat\n" +"La fusió automàtica ha sortit bé; s'ha aturat abans de cometre com s'havia " +"demanat\n" #: builtin/merge-base.c:30 msgid "git merge-base [-a | --all] ..." @@ -10608,15 +10883,16 @@ msgstr "és la primera un avantpassat de l'altre?" #: builtin/merge-base.c:228 msgid "find where forked from reflog of " -msgstr "troba on s'ha bifurcat del registre de referències de " +msgstr "" +"troba on s'ha bifurcat del registre de referències de " #: builtin/merge-file.c:9 msgid "" -"git merge-file [] [-L [-L [-L ]]] " -"" +"git merge-file [] [-L [-L [-L ]]] " +" " msgstr "" -"git merge-file [] [-L [-L [-L ]]] " +"git merge-file [] [-L [-L [-L ]]] " +" " #: builtin/merge-file.c:33 msgid "send results to standard output" @@ -10709,7 +10985,8 @@ msgstr "El directori %s és en l'índex i no hi ha cap submòdul?" #: builtin/mv.c:85 builtin/rm.c:289 msgid "Please stage your changes to .gitmodules or stash them to proceed" msgstr "" -"Feu «stage» dels vostres canvis a .gitmodules o feu «stash» dels mateixos per a procedir" +"Feu «stage» dels vostres canvis a .gitmodules o feu «stash» dels mateixos " +"per a procedir" #: builtin/mv.c:103 #, c-format @@ -10840,37 +11117,40 @@ msgstr "git notes [--ref ] [llista []]" #: builtin/notes.c:27 msgid "" -"git notes [--ref ] add [-f] [--allow-empty] [-m | -F | (-c | -C) " -"] []" +"git notes [--ref ] add [-f] [--allow-empty] [-m | -F " +"| (-c | -C) ] []" msgstr "" -"git notes [--ref ] add [-f] [--allow-empty] [-m | -F " -" | (-c | -C) ] []" +"git notes [--ref ] add [-f] [--allow-empty] [-m " +" | -F | (-c | -C) ] []" #: builtin/notes.c:28 msgid "git notes [--ref ] copy [-f] " -msgstr "git notes [--ref ] copy [-f] " +msgstr "" +"git notes [--ref ] copy [-f] " #: builtin/notes.c:29 msgid "" -"git notes [--ref ] append [--allow-empty] [-m | -F | (-c | -C) " -"] []" +"git notes [--ref ] append [--allow-empty] [-m | -F | " +"(-c | -C) ] []" msgstr "" -"git notes [--ref ] append [--allow-empty] [-m | -F " -" | (-c | -C) ] []" +"git notes [--ref ] append [--allow-empty] [-m " +" | -F | (-c | -C) ] []" #: builtin/notes.c:30 msgid "git notes [--ref ] edit [--allow-empty] []" -msgstr "git notes [--ref ] edit [--allow-empty] []" +msgstr "" +"git notes [--ref ] edit [--allow-empty] []" #: builtin/notes.c:31 msgid "git notes [--ref ] show []" msgstr "git notes [--ref ] show []" #: builtin/notes.c:32 -msgid "git notes [--ref ] merge [-v | -q] [-s ] " +msgid "" +"git notes [--ref ] merge [-v | -q] [-s ] " msgstr "" -"git notes [--ref ] merge [-v | -q] [-s ] " +"git notes [--ref ] merge [-v | -q] [-s ] " +"" #: builtin/notes.c:33 msgid "git notes merge --commit [-v | -q]" @@ -10964,7 +11244,8 @@ msgstr "S'ha produït un error en finalitzar 'show' per a l'objecte «%s»" #: builtin/notes.c:195 msgid "please supply the note contents using either -m or -F option" -msgstr "especifiqueu el contingut de la nota fent servir l'opció -m o l'opció -F" +msgstr "" +"especifiqueu el contingut de la nota fent servir l'opció -m o l'opció -F" #: builtin/notes.c:204 msgid "unable to write note object" @@ -10985,9 +11266,9 @@ msgstr "no es pot llegir «%s»" msgid "could not open or read '%s'" msgstr "no s'ha pogut obrir o llegir «%s»" -#: builtin/notes.c:255 builtin/notes.c:306 builtin/notes.c:308 builtin/notes.c:376 -#: builtin/notes.c:431 builtin/notes.c:517 builtin/notes.c:522 builtin/notes.c:600 -#: builtin/notes.c:662 +#: builtin/notes.c:255 builtin/notes.c:306 builtin/notes.c:308 +#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:517 +#: builtin/notes.c:522 builtin/notes.c:600 builtin/notes.c:662 #, c-format msgid "failed to resolve '%s' as a valid ref." msgstr "s'ha produït un error en resoldre «%s» com a referència vàlida." @@ -11020,9 +11301,9 @@ msgstr "s'ha produït un error en copiar les notes de «%s» a «%s»" msgid "refusing to %s notes in %s (outside of refs/notes/)" msgstr "s'està refusant %s les notes en %s (fora de refs/notes/)" -#: builtin/notes.c:369 builtin/notes.c:424 builtin/notes.c:500 builtin/notes.c:512 -#: builtin/notes.c:588 builtin/notes.c:655 builtin/notes.c:805 builtin/notes.c:952 -#: builtin/notes.c:973 +#: builtin/notes.c:369 builtin/notes.c:424 builtin/notes.c:500 +#: builtin/notes.c:512 builtin/notes.c:588 builtin/notes.c:655 +#: builtin/notes.c:805 builtin/notes.c:952 builtin/notes.c:973 msgid "too many parameters" msgstr "massa paràmetres" @@ -11058,11 +11339,11 @@ msgstr "reemplaça les notes existents" #: builtin/notes.c:441 #, c-format msgid "" -"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite existing " -"notes" +"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " +"existing notes" msgstr "" -"No es poden afegir les notes. S'han trobat notes existents de l'objecte %s. Useu '-f' " -"per a sobreescriure les notes existents." +"No es poden afegir les notes. S'han trobat notes existents de l'objecte %s. " +"Useu '-f' per a sobreescriure les notes existents." #: builtin/notes.c:456 builtin/notes.c:535 #, c-format @@ -11080,7 +11361,8 @@ msgstr "llegeix els objectes des de stdin" #: builtin/notes.c:490 msgid "load rewriting config for (implies --stdin)" -msgstr "carrega la configuració de reescriptura per a (implica --stdin)" +msgstr "" +"carrega la configuració de reescriptura per a (implica --stdin)" #: builtin/notes.c:508 msgid "too few parameters" @@ -11089,11 +11371,11 @@ msgstr "hi ha massa pocs paràmetres" #: builtin/notes.c:529 #, c-format msgid "" -"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite existing " -"notes" +"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " +"existing notes" msgstr "" -"No es poden copiar les notes. S'han trobat notes existents de l'objecte %s. Useu '-f' " -"per a sobreescriure les notes existents." +"No es poden copiar les notes. S'han trobat notes existents de l'objecte %s. " +"Useu '-f' per a sobreescriure les notes existents." #: builtin/notes.c:541 #, c-format @@ -11119,7 +11401,8 @@ msgstr "s'ha produït un error en suprimir la referència NOTES_MERGE_REF" #: builtin/notes.c:692 msgid "failed to remove 'git notes merge' worktree" -msgstr "s'ha produït un error en eliminar l'arbre de treball de 'git notes merge'" +msgstr "" +"s'ha produït un error en eliminar l'arbre de treball de 'git notes merge'" #: builtin/notes.c:712 msgid "failed to read ref NOTES_MERGE_PARTIAL" @@ -11156,10 +11439,11 @@ msgstr "Opcions de fusió" #: builtin/notes.c:778 msgid "" -"resolve notes conflicts using the given strategy (manual/ours/theirs/union/cat_sort_uniq)" -msgstr "" -"resol els conflictes de nota usant l'estratègia donada (manual/ours/theirs/union/" +"resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" +msgstr "" +"resol els conflictes de nota usant l'estratègia donada (manual/ours/theirs/" +"union/cat_sort_uniq)" #: builtin/notes.c:780 msgid "Committing unmerged notes" @@ -11199,17 +11483,19 @@ msgstr "una fusió de notes a %s ja està en curs a %s" #, c-format msgid "failed to store link to current notes ref (%s)" msgstr "" -"s'ha produït un error en emmagatzemar l'enllaç a la referència de notes actual (%s)" +"s'ha produït un error en emmagatzemar l'enllaç a la referència de notes " +"actual (%s)" #: builtin/notes.c:868 #, c-format msgid "" -"Automatic notes merge failed. Fix conflicts in %s and commit the result with 'git notes " -"merge --commit', or abort the merge with 'git notes merge --abort'.\n" -msgstr "" -"La fusió de notes automàtica ha fallat. Arregleu els conflictes en %s i cometeu el " -"resultat amb 'git notes merge --commit', o avorteu la fusió amb 'git notes merge --" +"Automatic notes merge failed. Fix conflicts in %s and commit the result with " +"'git notes merge --commit', or abort the merge with 'git notes merge --" "abort'.\n" +msgstr "" +"La fusió de notes automàtica ha fallat. Arregleu els conflictes en %s i " +"cometeu el resultat amb 'git notes merge --commit', o avorteu la fusió amb " +"'git notes merge --abort'.\n" #: builtin/notes.c:890 #, c-format @@ -11246,16 +11532,18 @@ msgid "unknown subcommand: %s" msgstr "subordre desconeguda: %s" #: builtin/pack-objects.c:33 -msgid "git pack-objects --stdout [...] [< | < ]" +msgid "" +"git pack-objects --stdout [...] [< | < ]" msgstr "" -"git pack-objects --stdout [...] [< | < ]" +"git pack-objects --stdout [...] [< | < " +"]" #: builtin/pack-objects.c:34 -msgid "git pack-objects [...] [< | < ]" +msgid "" +"git pack-objects [...] [< | < ]" msgstr "" -"git pack-objects [...] [< | < ]" +"git pack-objects [...] [< | < " +"]" #: builtin/pack-objects.c:195 builtin/pack-objects.c:198 #, c-format @@ -11265,8 +11553,8 @@ msgstr "error de deflació (%d)" #: builtin/pack-objects.c:791 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "" -"s'està inhabilitant l'escriptura de mapes de bits, es divideixen els paquets a causa de " -"pack.packSizeLimit" +"s'està inhabilitant l'escriptura de mapes de bits, es divideixen els paquets " +"a causa de pack.packSizeLimit" #: builtin/pack-objects.c:804 msgid "Writing objects" @@ -11275,11 +11563,12 @@ msgstr "S'estan escrivint els objectes" #: builtin/pack-objects.c:1084 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" -"s'està inhabilitant l'escriptura de mapes de bits, perquè alguns objectes no s'empaqueten" +"s'està inhabilitant l'escriptura de mapes de bits, perquè alguns objectes no " +"s'empaqueten" #: builtin/pack-objects.c:2454 msgid "Compressing objects" -msgstr "S'estan comprimint objectes" +msgstr "S'estan comprimint els objectes" #: builtin/pack-objects.c:2625 msgid "invalid value for --missing" @@ -11317,7 +11606,9 @@ msgstr "versió[,desplaçament]" #: builtin/pack-objects.c:2971 msgid "write the pack index file in the specified idx format version" -msgstr "escriu el fitxer d'índex de paquet en la versió de format d'índex especificada" +msgstr "" +"escriu el fitxer d'índex de paquet en la versió de format d'índex " +"especificada" #: builtin/pack-objects.c:2974 msgid "maximum size of each output pack file" @@ -11337,11 +11628,13 @@ msgstr "limita la finestra d'empaquetament per objectes" #: builtin/pack-objects.c:2982 msgid "limit pack window by memory in addition to object limit" -msgstr "limita la finestra d'empaquetament per memòria a més del límit d'objectes" +msgstr "" +"limita la finestra d'empaquetament per memòria a més del límit d'objectes" #: builtin/pack-objects.c:2984 msgid "maximum length of delta chain allowed in the resulting pack" -msgstr "longitud màxima de la cadena de diferències permesa en el paquet resultant" +msgstr "" +"longitud màxima de la cadena de diferències permesa en el paquet resultant" #: builtin/pack-objects.c:2986 msgid "reuse existing deltas" @@ -11378,7 +11671,8 @@ msgstr "inclou els objectes abastables de qualsevol referència" #: builtin/pack-objects.c:3004 msgid "include objects referred by reflog entries" msgstr "" -"inclou els objectes als quals facin referència les entrades del registre de referències" +"inclou els objectes als quals facin referència les entrades del registre de " +"referències" #: builtin/pack-objects.c:3007 msgid "include objects referred to by the index" @@ -11390,7 +11684,8 @@ msgstr "emet el paquet a stdout" #: builtin/pack-objects.c:3012 msgid "include tag objects that refer to objects to be packed" -msgstr "inclou els objectes d'etiqueta que facin referència als objectes a empaquetar" +msgstr "" +"inclou els objectes d'etiqueta que facin referència als objectes a empaquetar" #: builtin/pack-objects.c:3014 msgid "keep unreachable objects" @@ -11427,7 +11722,8 @@ msgstr "no amaguis les comissions per empelt" #: builtin/pack-objects.c:3031 msgid "use a bitmap index if available to speed up counting objects" msgstr "" -"usa un índex de mapa de bits, si està disponible, per a accelerar el recompte d'objectes" +"usa un índex de mapa de bits, si està disponible, per a accelerar el " +"recompte d'objectes" #: builtin/pack-objects.c:3033 msgid "write a bitmap index together with the pack index" @@ -11512,7 +11808,8 @@ msgstr "permet l'avanç ràpid" #: builtin/pull.c:170 msgid "automatically stash/stash pop before and after rebase" -msgstr "fes «stash» i «stash pop» automàticament abans i després de fer «rebase»" +msgstr "" +"fes «stash» i «stash pop» automàticament abans i després de fer «rebase»" #: builtin/pull.c:186 msgid "Options related to fetching" @@ -11528,14 +11825,18 @@ msgid "Invalid value for pull.ff: %s" msgstr "Valor no vàlid per a pull.ff: %s" #: builtin/pull.c:415 -msgid "There is no candidate for rebasing against among the refs that you just fetched." +msgid "" +"There is no candidate for rebasing against among the refs that you just " +"fetched." msgstr "" -"No hi ha cap candidat sobre el qual fer «rebase» entre les referències que acabeu " -"d'obtenir." +"No hi ha cap candidat sobre el qual fer «rebase» entre les referències que " +"acabeu d'obtenir." #: builtin/pull.c:417 -msgid "There are no candidates for merging among the refs that you just fetched." -msgstr "No hi ha candidats per a fusionar entre les referències que acabeu d'obtenir." +msgid "" +"There are no candidates for merging among the refs that you just fetched." +msgstr "" +"No hi ha candidats per a fusionar entre les referències que acabeu d'obtenir." #: builtin/pull.c:418 msgid "" @@ -11572,7 +11873,8 @@ msgstr "Especifiqueu amb quina branca voleu fusionar." msgid "See git-pull(1) for details." msgstr "Vegeu git-pull(1) per detalls." -#: builtin/pull.c:433 builtin/pull.c:439 builtin/pull.c:448 git-parse-remote.sh:64 +#: builtin/pull.c:433 builtin/pull.c:439 builtin/pull.c:448 +#: git-parse-remote.sh:64 msgid "" msgstr "" @@ -11586,8 +11888,11 @@ msgid "There is no tracking information for the current branch." msgstr "No hi ha cap informació de seguiment per a la branca actual." #: builtin/pull.c:450 git-parse-remote.sh:95 -msgid "If you wish to set tracking information for this branch you can do so with:" -msgstr "Si voleu establir informació de seguiment per a aquesta branca, podeu fer-ho amb:" +msgid "" +"If you wish to set tracking information for this branch you can do so with:" +msgstr "" +"Si voleu establir informació de seguiment per a aquesta branca, podeu fer-ho " +"amb:" #: builtin/pull.c:455 #, c-format @@ -11608,7 +11913,8 @@ msgstr "l'opció --[no-]-autostash és vàlid només amb --rebase." #: builtin/pull.c:875 msgid "Updating an unborn branch with changes added to the index." -msgstr "S'està actualitzant una branca no nascuda amb canvis afegits a l'índex." +msgstr "" +"S'està actualitzant una branca no nascuda amb canvis afegits a l'índex." #: builtin/pull.c:878 msgid "pull with rebase" @@ -11640,7 +11946,8 @@ msgid "" "to recover." msgstr "" "No es pot avançar ràpidament el vostre arbre de treball.\n" -"Després d'assegurar que hàgiu desat qualsevol cosa preciosa de la sortida de\n" +"Després d'assegurar que hàgiu desat qualsevol cosa preciosa de la sortida " +"de\n" "$ git diff %s\n" "executeu\n" "$ git reset --hard\n" @@ -11656,7 +11963,9 @@ msgstr "No es pot fer «rebase» sobre múltiples branques." #: builtin/pull.c:935 msgid "cannot rebase with locally recorded submodule modifications" -msgstr "no es pot fer «rebase» amb modificacions als submòduls enregistrades localment" +msgstr "" +"no es pot fer «rebase» amb modificacions als submòduls enregistrades " +"localment" #: builtin/push.c:17 msgid "git push [] [ [...]]" @@ -11676,7 +11985,8 @@ msgid "" "To choose either option permanently, see push.default in 'git help config'." msgstr "" "\n" -"Per a triar qualsevol opció permanentment, vegeu push.default a 'git help config'." +"Per a triar qualsevol opció permanentment, vegeu push.default a 'git help " +"config'." #: builtin/push.c:149 #, c-format @@ -11734,7 +12044,8 @@ msgstr "" #: builtin/push.c:186 #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." -msgstr "La branca actual %s té múltiples branques fonts, s'està refusant pujar." +msgstr "" +"La branca actual %s té múltiples branques fonts, s'està refusant pujar." #: builtin/push.c:189 #, c-format @@ -11748,10 +12059,11 @@ msgstr "" "quina branca remota." #: builtin/push.c:248 -msgid "You didn't specify any refspecs to push, and push.default is \"nothing\"." +msgid "" +"You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "" -"No heu especificat cap especificació de referència a pujar, i push.default és \"nothing" -"\"." +"No heu especificat cap especificació de referència a pujar, i push.default " +"és \"nothing\"." #: builtin/push.c:255 msgid "" @@ -11786,8 +12098,8 @@ msgid "" "(e.g., '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é treball\n" -"que no teniu localment. Això acostumar a ser causat per un altre dipòsit\n" +"S'han rebutjat les actualitzacions perquè el remot conté canvis\n" +"que no teniu localment. Això acostuma a ser causat per un altre dipòsit\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" @@ -11795,7 +12107,8 @@ msgstr "" #: builtin/push.c:274 msgid "Updates were rejected because the tag already exists in the remote." -msgstr "S'han rebutjat les actualitzacions perquè l'etiqueta ja existeix en el remot." +msgstr "" +"S'han rebutjat les actualitzacions perquè l'etiqueta ja existeix en el remot." #: builtin/push.c:277 msgid "" @@ -11826,7 +12139,8 @@ msgstr "dipòsit incorrecte «%s»" #: builtin/push.c:373 msgid "" "No configured push destination.\n" -"Either specify the URL from the command-line or configure a remote repository using\n" +"Either specify the URL from the command-line or configure a remote " +"repository using\n" "\n" " git remote add \n" "\n" @@ -11835,8 +12149,8 @@ msgid "" " git push \n" msgstr "" "No hi ha cap destí de pujada configurat.\n" -"Especifiqueu l'URL des de la línia d'ordres o bé configureu un dipòsit remot fent " -"servir\n" +"Especifiqueu l'URL des de la línia d'ordres o bé configureu un dipòsit remot " +"fent servir\n" "\n" " git remote add \n" "\n" @@ -11904,7 +12218,8 @@ msgstr "controla la pujada recursiva dels submòduls" msgid "use thin pack" msgstr "usa el paquet prim" -#: builtin/push.c:552 builtin/push.c:553 builtin/send-pack.c:160 builtin/send-pack.c:161 +#: builtin/push.c:552 builtin/push.c:553 builtin/send-pack.c:160 +#: builtin/send-pack.c:161 msgid "receive pack program" msgstr "programa que rep els paquets" @@ -11954,13 +12269,13 @@ msgstr "les opcions de pujada no han de tenir caràcters de línia nova" #: builtin/read-tree.c:40 msgid "" -"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=) [-u [--" -"exclude-per-directory=] | -i]] [--no-sparse-checkout] [--index-output=] " -"(--empty | [ []])" +"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=) " +"[-u [--exclude-per-directory=] | -i]] [--no-sparse-checkout] [--" +"index-output=] (--empty | [ []])" msgstr "" -"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=) [-u [--" -"exclude-per-directory=] | -i]] [--no-sparse-checkout] [--index-" -"output=] (--empty | [ []])" +"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=) " +"[-u [--exclude-per-directory=] | -i]] [--no-sparse-checkout] [--" +"index-output=] (--empty | [ []])" #: builtin/read-tree.c:121 msgid "write resulting index to " @@ -12150,11 +12465,11 @@ msgstr "git remote [-v | --verbose]" #: builtin/remote.c:14 msgid "" -"git remote add [-t ] [-m ] [-f] [--tags | --no-tags] [--mirror=] " +"git remote add [-t ] [-m ] [-f] [--tags | --no-tags] [--" +"mirror=] " msgstr "" -"git remote add [-t ] [-m ] [-f] [--tags | --no-tags] [--mirror=] " +"git remote add [-t ] [-m ] [-f] [--tags | --no-tags] [--" +"mirror=] " #: builtin/remote.c:15 builtin/remote.c:35 msgid "git remote rename " @@ -12177,8 +12492,10 @@ msgid "git remote prune [-n | --dry-run] " msgstr "git remote prune [-n | --dry-run] " #: builtin/remote.c:20 -msgid "git remote [-v | --verbose] update [-p | --prune] [( | )...]" -msgstr "git remote [-v | --verbose] update [-p | --prune] [( | )...]" +msgid "" +"git remote [-v | --verbose] update [-p | --prune] [( | )...]" +msgstr "" +"git remote [-v | --verbose] update [-p | --prune] [( | )...]" #: builtin/remote.c:21 msgid "git remote set-branches [--add] ..." @@ -12277,7 +12594,8 @@ msgstr "especificar una branca mestra no té sentit amb --mirror" #: builtin/remote.c:184 msgid "specifying branches to track makes sense only with fetch mirrors" -msgstr "especificar les branques a seguir té sentit només amb miralls d'obtenció" +msgstr "" +"especificar les branques a seguir té sentit només amb miralls d'obtenció" #: builtin/remote.c:191 builtin/remote.c:631 #, c-format @@ -12297,7 +12615,8 @@ msgstr "No s'ha pogut configurar la mestra «%s»" #: builtin/remote.c:337 #, c-format msgid "Could not get fetch map for refspec %s" -msgstr "No s'ha pogut obtenir el mapa d'obtenció de l'especificació de referència %s" +msgstr "" +"No s'ha pogut obtenir el mapa d'obtenció de l'especificació de referència %s" #: builtin/remote.c:438 builtin/remote.c:446 msgid "(matching)" @@ -12324,7 +12643,8 @@ msgid "" "\t%s\n" "\tPlease update the configuration manually if necessary." msgstr "" -"No s'està actualitzant l'especificació de referències d'obtenció no per defecte\n" +"No s'està actualitzant l'especificació de referències d'obtenció no per " +"defecte\n" "\t%s\n" "\tActualitzeu la configuració manualment si és necessari." @@ -12349,7 +12669,8 @@ msgstr[0] "" "Nota: Una branca fora de la jerarquia refs/remotes/ no s'ha eliminat;\n" "per a suprimir-la, useu:" msgstr[1] "" -"Nota: Algunes branques fora de la jerarquia refs/remotes/ no s'han eliminat;\n" +"Nota: Algunes branques fora de la jerarquia refs/remotes/ no s'han " +"eliminat;\n" "per a suprimir-les, useu:" #: builtin/remote.c:810 @@ -12486,8 +12807,10 @@ msgstr "(desconegut)" #: builtin/remote.c:1171 #, c-format -msgid " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" -msgstr " Branca de HEAD (el HEAD remot és ambigu, pot ser un dels següents):\n" +msgid "" +" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" +msgstr "" +" Branca de HEAD (la HEAD remot és ambigua, pot ser un dels següents):\n" #: builtin/remote.c:1183 #, c-format @@ -12527,7 +12850,7 @@ msgstr "suprimeix refs/remotes//HEAD" #: builtin/remote.c:1247 msgid "Cannot determine remote HEAD" -msgstr "No es pot determinar el HEAD remot" +msgstr "No es pot determinar la HEAD remota" #: builtin/remote.c:1249 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" @@ -12656,8 +12979,10 @@ msgid "" "Incremental repacks are incompatible with bitmap indexes. Use\n" "--no-write-bitmap-index or disable the pack.writebitmaps configuration." msgstr "" -"Els reempaquetaments incrementals són incompatibles amb els índexs de bitmaps. Useu\n" -"--no-write-bitmap-index o inhabiliteu el paràmetre de configuració pack.writebitmaps." +"Els reempaquetaments incrementals són incompatibles amb els índexs de " +"bitmaps. Useu\n" +"--no-write-bitmap-index o inhabiliteu el paràmetre de configuració pack." +"writebitmaps." #: builtin/repack.c:170 msgid "pack everything in a single pack" @@ -12714,7 +13039,8 @@ msgstr "octets" #: builtin/repack.c:194 msgid "same as the above, but limit memory size instead of entries count" msgstr "" -"el mateix que l'anterior, però limita la mida de memòria en lloc del nombre d'entrades" +"el mateix que l'anterior, però limita la mida de memòria en lloc del nombre " +"d'entrades" #: builtin/repack.c:196 msgid "limits the maximum delta depth" @@ -12783,11 +13109,11 @@ msgstr "etiqueta de fusió mal formada en la comissió «%s»" #: builtin/replace.c:374 #, c-format msgid "" -"original commit '%s' contains mergetag '%s' that is discarded; use --edit instead of --" -"graft" +"original commit '%s' contains mergetag '%s' that is discarded; use --edit " +"instead of --graft" msgstr "" -"la comissió original «%s» conté l'etiqueta de fusió «%s» que es descarta; useu --edit en " -"lloc de --graft" +"la comissió original «%s» conté l'etiqueta de fusió «%s» que es descarta; " +"useu --edit en lloc de --graft" #: builtin/replace.c:407 #, c-format @@ -12840,8 +13166,10 @@ msgid "register clean resolutions in index" msgstr "registra les resolucions netes en l'índex" #: builtin/reset.c:29 -msgid "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] []" -msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] []" +msgid "" +"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] []" +msgstr "" +"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] []" #: builtin/reset.c:30 msgid "git reset [-q] [] [--] ..." @@ -12934,7 +13262,9 @@ msgstr "--patch és incompatible amb --{hard,mixed,soft}" #: builtin/reset.c:347 msgid "--mixed with paths is deprecated; use 'git reset -- ' instead." -msgstr "--mixed amb camins està en desús; useu 'git reset -- ' en lloc d'això." +msgstr "" +"--mixed amb camins està en desús; useu 'git reset -- ' en lloc " +"d'això." #: builtin/reset.c:349 #, c-format @@ -13012,7 +13342,8 @@ msgstr "" " or: git rev-parse --sq-quote [...]\n" " or: git rev-parse [] [...]\n" "\n" -"Executeu \"git rev-parse --parseopt -h\" per més informació sobre l'ús inicial." +"Executeu \"git rev-parse --parseopt -h\" per més informació sobre l'ús " +"inicial." #: builtin/revert.c:23 msgid "git revert [] ..." @@ -13108,10 +13439,10 @@ msgid_plural "" "file and the HEAD:" msgstr[0] "" "el fitxer següent té contingut «stage» diferent d'ambdós el\n" -"fitxer i el HEAD:" +"fitxer i la HEAD:" msgstr[1] "" "els fitxers següents tenen contingut «stage» diferent d'ambdós\n" -"el fitxer i el HEAD:" +"el fitxer i la HEAD:" #: builtin/rm.c:211 msgid "" @@ -13178,12 +13509,14 @@ msgstr "no s'ha pogut suprimir «%s»" #: builtin/send-pack.c:19 msgid "" -"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=] [--verbose] [--thin] [--atomic] [:] [...]\n" +"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=] [--verbose] [--thin] [--atomic] [:] " +"[...]\n" " --all and explicit specification are mutually exclusive." msgstr "" -"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=] [--verbose] [--thin] [--atomic] [:] [...]\n" +"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-" +"pack=] [--verbose] [--thin] [--atomic] " +"[:] [...]\n" " --all i especificació explícita són mútuament excloents." #: builtin/send-pack.c:162 @@ -13216,7 +13549,8 @@ msgstr "ordena la sortida segons el nombre de comissions per autor" #: builtin/shortlog.c:267 msgid "Suppress commit descriptions, only provides commit count" -msgstr "Omet les descripcions de comissió, només proveeix el recompte de comissions" +msgstr "" +"Omet les descripcions de comissió, només proveeix el recompte de comissions" #: builtin/shortlog.c:269 msgid "Show the email address of each author" @@ -13323,8 +13657,10 @@ msgid "show most recent ref-log entries starting at base" msgstr "mostra les entrades més recents començant a la base" #: builtin/show-branch.c:690 -msgid "--reflog is incompatible with --all, --remotes, --independent or --merge-base" -msgstr "--reflog és incompatible amb --all, --remotes, --independent o --merge-base" +msgid "" +"--reflog is incompatible with --all, --remotes, --independent or --merge-base" +msgstr "" +"--reflog és incompatible amb --all, --remotes, --independent o --merge-base" #: builtin/show-branch.c:714 msgid "no branches given, and HEAD is not valid" @@ -13365,11 +13701,11 @@ msgstr "no es pot trobar la comissió %s (%s)" #: builtin/show-ref.c:10 msgid "" -"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --hash[=]] " -"[--abbrev[=]] [--tags] [--heads] [--] [...]" +"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" +"hash[=]] [--abbrev[=]] [--tags] [--heads] [--] [...]" msgstr "" -"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --hash[=]] " -"[--abbrev[=]] [--tags] [--heads] [--] [...]" +"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" +"hash[=]] [--abbrev[=]] [--tags] [--heads] [--] [...]" #: builtin/show-ref.c:11 msgid "git show-ref --exclude-existing[=]" @@ -13385,7 +13721,9 @@ msgstr "mostra només els caps (es pot combinar amb tags)" #: builtin/show-ref.c:161 msgid "stricter reference checking, requires exact ref path" -msgstr "comprovació de referència més estricta, requereix el camí de referència exacte" +msgstr "" +"comprovació de referència més estricta, requereix el camí de referència " +"exacte" #: builtin/show-ref.c:164 builtin/show-ref.c:166 msgid "show the HEAD reference, even if it would be filtered out" @@ -13417,7 +13755,8 @@ msgstr "git stripspace [-c | --comment-lines]" #: builtin/stripspace.c:36 msgid "skip and remove all lines starting with comment character" -msgstr "omet i elimina totes les línies que comencin amb el caràcter de comentari" +msgstr "" +"omet i elimina totes les línies que comencin amb el caràcter de comentari" #: builtin/stripspace.c:39 msgid "prepend comment character and space to each line" @@ -13458,11 +13797,11 @@ msgstr "No s'ha trobat cap url per al camí de submòdul «%s» a .gitmodules" #: builtin/submodule--helper.c:498 #, c-format msgid "" -"could not lookup configuration '%s'. Assuming this repository is its own authoritative " -"upstream." +"could not lookup configuration '%s'. Assuming this repository is its own " +"authoritative upstream." msgstr "" -"no s'ha pogut trobar la configuració «%s». S'assumeix que aquest dipòsit és el seu " -"dipòsit font autoritzat." +"no s'ha pogut trobar la configuració «%s». S'assumeix que aquest dipòsit és " +"el seu dipòsit font autoritzat." #: builtin/submodule--helper.c:509 #, c-format @@ -13477,13 +13816,16 @@ msgstr "S'ha registrat el submòdul «%s» (%s) per al camí «%s»\n" #: builtin/submodule--helper.c:523 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" -msgstr "advertència: se suggereix el mode d'actualització per ordre per al submòdul «%s»\n" +msgstr "" +"advertència: se suggereix el mode d'actualització per ordre per al submòdul " +"«%s»\n" #: builtin/submodule--helper.c:530 #, c-format msgid "Failed to register update mode for submodule path '%s'" msgstr "" -"S'ha produït un error en registrar el mode d'actualització per al camí de submòdul «%s»" +"S'ha produït un error en registrar el mode d'actualització per al camí de " +"submòdul «%s»" #: builtin/submodule--helper.c:552 msgid "Suppress output for initializing a submodule" @@ -13513,7 +13855,9 @@ msgid "Suppress submodule status output" msgstr "Suprimeix la sortida de l'estat del submòdul" #: builtin/submodule--helper.c:712 -msgid "Use commit stored in the index instead of the one stored in the submodule HEAD" +msgid "" +"Use commit stored in the index instead of the one stored in the submodule " +"HEAD" msgstr "" #: builtin/submodule--helper.c:713 @@ -13522,7 +13866,7 @@ msgstr "inclou recursivament els submòduls imbrincats" #: builtin/submodule--helper.c:718 msgid "git submodule status [--quiet] [--cached] [--recursive] [...]" -msgstr "git submodule status [--quiet] [--cached] [--recursive] [...]" +msgstr "git submodule status [--quiet] [--cached] [--recursive] [...]" #: builtin/submodule--helper.c:742 msgid "git submodule--helper name " @@ -13539,9 +13883,10 @@ msgid "failed to register url for submodule path '%s'" msgstr "s'ha produït un error en registrar l'url per al camí del submòdul «%s»" #: builtin/submodule--helper.c:826 -#, c-format +#, c-format msgid "failed to get the default remote for submodule '%s'" -msgstr "s'ha produït un error en obtenir el remot per defecte pel submòdul «%s»" +msgstr "" +"s'ha produït un error en obtenir el remot per defecte pel submòdul «%s»" #: builtin/submodule--helper.c:837 #, c-format @@ -13563,18 +13908,20 @@ msgstr "git submodule--helper sync [--quiet] [--recursive] []" #: builtin/submodule--helper.c:946 #, c-format msgid "" -"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you really want to " -"remove it including all of its history)" +"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " +"really want to remove it including all of its history)" msgstr "" "L'arbre de treball de submòdul «%s» conté un directori .git\n" "(useu 'rm -rf' si realment voleu eliminar-lo, incloent tota la seva història)" #: builtin/submodule--helper.c:958 #, c-format -msgid "Submodule work tree '%s' contains local modifications; use '-f' to discard them" +msgid "" +"Submodule work tree '%s' contains local modifications; use '-f' to discard " +"them" msgstr "" -"L'arbre de treball del submòdul «%s» conté modificacions locals; useu '-f' per " -"a descartar-les" +"L'arbre de treball del submòdul «%s» conté modificacions locals; useu '-f' " +"per a descartar-les" #: builtin/submodule--helper.c:966 #, c-format @@ -13592,22 +13939,25 @@ msgid "could not create empty submodule directory %s" msgstr "no s'ha pogut crear el directori de submòdul buit %s" #: builtin/submodule--helper.c:993 -#, fuzzy, c-format +#, c-format msgid "Submodule '%s' (%s) unregistered for path '%s'\n" -msgstr "S'ha registrat el submòdul «%s» (%s) per al camí «%s»\n" +msgstr "S'ha desregistrat el submòdul «%s» (%s) per al camí «%s»\n" #: builtin/submodule--helper.c:1022 msgid "Remove submodule working trees even if they contain local changes" -msgstr "Suprimeix els arbres de treball dels submòduls fins i tot si contenen canvis locals" +msgstr "" +"Suprimeix els arbres de treball dels submòduls fins i tot si contenen canvis " +"locals" #: builtin/submodule--helper.c:1023 -#, fuzzy msgid "Unregister all submodules" -msgstr "inclou recursivament als submòduls" +msgstr "Desregistra recursivament tots els submòduls" #: builtin/submodule--helper.c:1028 -msgid "git submodule deinit [--quiet] [-f | --force] [--all | [--] [...]]" -msgstr "git submodule deinit [--quiet] [-f | --force] [--all | [--] [...]]" +msgid "" +"git submodule deinit [--quiet] [-f | --force] [--all | [--] [...]]" +msgstr "" +"git submodule deinit [--quiet] [-f | --force] [--all | [--] [...]]" #: builtin/submodule--helper.c:1042 msgid "Use '--all' if you really want to deinitialize all submodules" @@ -13650,11 +14000,11 @@ msgstr "força el progrés del clonatge" #: builtin/submodule--helper.c:1221 msgid "" -"git submodule--helper clone [--prefix=] [--quiet] [--reference ] [--" -"name ] [--depth ] --url --path " +"git submodule--helper clone [--prefix=] [--quiet] [--reference " +"] [--name ] [--depth ] --url --path " msgstr "" -"git submodule--helper clone [--prefix=] [--quiet] [--reference ] [--name " -"] [--depth ] --url --path " +"git submodule--helper clone [--prefix=] [--quiet] [--reference " +"] [--name ] [--depth ] --url --path " #: builtin/submodule--helper.c:1252 #, c-format @@ -13734,11 +14084,11 @@ msgstr "valor incorrecte per al paràmetre update" #: builtin/submodule--helper.c:1673 #, c-format msgid "" -"Submodule (%s) branch configured to inherit branch from superproject, but the " -"superproject is not on any branch" +"Submodule (%s) branch configured to inherit branch from superproject, but " +"the superproject is not on any branch" msgstr "" -"La branca de submòdul (%s) està configurada per a heretar la branca del superprojecte, " -"però el superprojecte no és en cap branca" +"La branca de submòdul (%s) està configurada per a heretar la branca del " +"superprojecte, però el superprojecte no és en cap branca" #: builtin/submodule--helper.c:1789 msgid "recurse into submodules" @@ -13787,10 +14137,12 @@ msgid "reason of the update" msgstr "raó de l'actualització" #: builtin/tag.c:24 -msgid "git tag [-a | -s | -u ] [-f] [-m | -F ] []" +msgid "" +"git tag [-a | -s | -u ] [-f] [-m | -F ] " +"[]" msgstr "" -"git tag [-a | -s | -u ] [-f] [-m | -F ] " -"[]" +"git tag [-a | -s | -u ] [-f] [-m | -F ] []" #: builtin/tag.c:25 msgid "git tag -d ..." @@ -13798,12 +14150,12 @@ msgstr "git tag -d ..." #: builtin/tag.c:26 msgid "" -"git tag -l [-n[]] [--contains ] [--no-contains ] [--points-at " -"]\n" +"git tag -l [-n[]] [--contains ] [--no-contains ] [--" +"points-at ]\n" "\t\t[--format=] [--[no-]merged []] [...]" msgstr "" -"git tag -l [-n[]] [--contains ] [--no-contains ] [--points-" -"at ]\n" +"git tag -l [-n[]] [--contains ] [--no-contains ] " +"[--points-at ]\n" "\t\t[--format=] [--[no-]merged []] [...]" #: builtin/tag.c:28 @@ -13839,13 +14191,14 @@ msgid "" "\n" "Write a message for tag:\n" " %s\n" -"Lines starting with '%c' will be kept; you may remove them yourself if you want to.\n" +"Lines starting with '%c' will be kept; you may remove them yourself if you " +"want to.\n" msgstr "" "\n" "Escriviu el missatge de l'etiqueta:\n" " %s\n" -"Les línies que comencin amb '%c' es retindran; podeu eliminar-les per vós mateix si " -"voleu.\n" +"Les línies que comencin amb '%c' es retindran; podeu eliminar-les per vós " +"mateix si voleu.\n" #: builtin/tag.c:189 msgid "unable to sign the tag" @@ -14027,29 +14380,34 @@ msgstr "S'està provant mtime en «%s» " #: builtin/update-index.c:152 msgid "directory stat info does not change after adding a new file" -msgstr "la informació d'stat de directori no canvia després d'afegir un fitxer nou" +msgstr "" +"la informació d'stat de directori no canvia després d'afegir un fitxer nou" #: builtin/update-index.c:165 msgid "directory stat info does not change after adding a new directory" -msgstr "la informació d'stat de directori no canvia després d'afegir un directori nou" +msgstr "" +"la informació d'stat de directori no canvia després d'afegir un directori nou" #: builtin/update-index.c:178 msgid "directory stat info changes after updating a file" -msgstr "la informació d'stat de directori canvia després d'actualitzar un fitxer" +msgstr "" +"la informació d'stat de directori canvia després d'actualitzar un fitxer" #: builtin/update-index.c:189 msgid "directory stat info changes after adding a file inside subdirectory" msgstr "" -"la informació d'stat de directori canvia després d'afegir un fitxer dins d'un " -"subdirectori" +"la informació d'stat de directori canvia després d'afegir un fitxer dins " +"d'un subdirectori" #: builtin/update-index.c:200 msgid "directory stat info does not change after deleting a file" -msgstr "la informació d'stat de directori no canvia després de suprimir un fitxer" +msgstr "" +"la informació d'stat de directori no canvia després de suprimir un fitxer" #: builtin/update-index.c:213 msgid "directory stat info does not change after deleting a directory" -msgstr "la informació d'stat de directori no canvia després de suprimir un directori" +msgstr "" +"la informació d'stat de directori no canvia després de suprimir un directori" #: builtin/update-index.c:220 msgid " OK" @@ -14061,7 +14419,8 @@ msgstr "git update-index [] [--] [...]" #: builtin/update-index.c:936 msgid "continue refresh even when index needs update" -msgstr "continua l'actualització encara que l'índex necessiti una actualització" +msgstr "" +"continua l'actualització encara que l'índex necessiti una actualització" #: builtin/update-index.c:939 msgid "refresh: ignore submodules" @@ -14117,11 +14476,15 @@ msgstr "neteja el bit skip-worktree" #: builtin/update-index.c:981 msgid "add to index only; do not add content to object database" -msgstr "només afegeix a l'índex; no afegeixis el contingut a la base de dades d'objectes" +msgstr "" +"només afegeix a l'índex; no afegeixis el contingut a la base de dades " +"d'objectes" #: builtin/update-index.c:983 msgid "remove named paths even if present in worktree" -msgstr "elimina els camins anomenats encara que estiguin presents en l'arbre de treball" +msgstr "" +"elimina els camins anomenats encara que estiguin presents en l'arbre de " +"treball" #: builtin/update-index.c:985 msgid "with --stdin: input lines are terminated by null bytes" @@ -14193,27 +14556,27 @@ msgstr "neteja el bit de validesa del fsmonitor" #: builtin/update-index.c:1127 msgid "" -"core.splitIndex is set to false; remove or change it, if you really want to enable split " -"index" +"core.splitIndex is set to false; remove or change it, if you really want to " +"enable split index" msgstr "" -"core.splitIndex està establert a fals; elimineu-lo o canviar-lo, si realment voleu " -"habilitar l'índex dividit" +"core.splitIndex està establert a fals; elimineu-lo o canviar-lo, si realment " +"voleu habilitar l'índex dividit" #: builtin/update-index.c:1136 msgid "" -"core.splitIndex is set to true; remove or change it, if you really want to disable split " -"index" +"core.splitIndex is set to true; remove or change it, if you really want to " +"disable split index" msgstr "" -"core.splitIndex està establert a cert; elimineu-lo o canvieu-lo, si realment voleu " -"inhabilitar l'índex dividit" +"core.splitIndex està establert a cert; elimineu-lo o canvieu-lo, si realment " +"voleu inhabilitar l'índex dividit" #: builtin/update-index.c:1147 msgid "" -"core.untrackedCache is set to true; remove or change it, if you really want to disable " -"the untracked cache" +"core.untrackedCache is set to true; remove or change it, if you really want " +"to disable the untracked cache" msgstr "" -"core.untrackedCache està establert a cert; elimineu-lo o canvieu-lo, si realment voleu " -"inhabilitar el cau no seguit" +"core.untrackedCache està establert a cert; elimineu-lo o canvieu-lo, si " +"realment voleu inhabilitar el cau no seguit" #: builtin/update-index.c:1151 msgid "Untracked cache disabled" @@ -14221,11 +14584,11 @@ msgstr "La memòria cau no seguida està inhabilitada" #: builtin/update-index.c:1159 msgid "" -"core.untrackedCache is set to false; remove or change it, if you really want to enable " -"the untracked cache" +"core.untrackedCache is set to false; remove or change it, if you really want " +"to enable the untracked cache" msgstr "" -"core.untrackedCache està establert a fals; elimineu-lo o canviar-lo, si realment voleu " -"habilitar el cau no seguit" +"core.untrackedCache està establert a fals; elimineu-lo o canviar-lo, si " +"realment voleu habilitar el cau no seguit" #: builtin/update-index.c:1163 #, c-format @@ -14233,26 +14596,25 @@ msgid "Untracked cache enabled for '%s'" msgstr "La memòria cau no seguida està habilitada per a «%s»" #: builtin/update-index.c:1171 -#, fuzzy msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor" msgstr "" -"core.splitIndex està establert a fals; elimineu-lo o canviar-lo, si realment voleu " -"habilitar l'índex dividit" +"core.fsmonitor està establert a fals; establiu-lo a cert si realment voleu " +"habilitar fsmonitor" #: builtin/update-index.c:1175 msgid "fsmonitor enabled" -msgstr "" +msgstr "fsmonitor habilitat" #: builtin/update-index.c:1178 -#, fuzzy -msgid "core.fsmonitor is set; remove it if you really want to disable fsmonitor" +msgid "" +"core.fsmonitor is set; remove it if you really want to disable fsmonitor" msgstr "" -"core.splitIndex està establert a cert; elimineu-lo o canvieu-lo, si realment voleu " -"inhabilitar l'índex dividit" +"core.fsmonitor està establert a cert; elimineu-lo si realment voleu " +"inhabilitar fsmonitor" #: builtin/update-index.c:1182 msgid "fsmonitor disabled" -msgstr "" +msgstr "fsmonitor inhabilitat" #: builtin/update-ref.c:10 msgid "git update-ref [] -d []" @@ -14260,7 +14622,8 @@ msgstr "git update-ref [] -d []" #: builtin/update-ref.c:11 msgid "git update-ref [] []" -msgstr "git update-ref [] []" +msgstr "" +"git update-ref [] []" #: builtin/update-ref.c:12 msgid "git update-ref [] --stdin [-z]" @@ -14336,16 +14699,15 @@ msgstr "git worktree lock [] " #: builtin/worktree.c:20 msgid "git worktree move " -msgstr "git worktree move " +msgstr "git worktree move " #: builtin/worktree.c:21 msgid "git worktree prune []" msgstr "git worktree prune []" #: builtin/worktree.c:22 -#, fuzzy msgid "git worktree remove [] " -msgstr "git worktree lock [] " +msgstr "git worktree lock [] " #: builtin/worktree.c:23 msgid "git worktree unlock " @@ -14368,10 +14730,12 @@ msgstr "Eliminació de worktrees/%s: no s'ha pogut llegir el fitxer gitdir (%s)" #: builtin/worktree.c:90 #, c-format -msgid "Removing worktrees/%s: short read (expected % bytes, read %)" +msgid "" +"Removing worktrees/%s: short read (expected % bytes, read " +"%)" msgstr "" -"S'estan suprimint els arbres de treball/%s: lectura curta (s'esperaven % bytes, " -"llegits %)" +"S'estan suprimint els arbres de treball/%s: lectura curta (s'esperaven " +"% bytes, llegits %)" #: builtin/worktree.c:98 #, c-format @@ -14382,7 +14746,8 @@ msgstr "Eliminació de worktrees/%s: fitxer gitdir no vàlid" #, c-format msgid "Removing worktrees/%s: gitdir file points to non-existent location" msgstr "" -"Eliminació de worktrees/%s: el fitxer gitdir es refereix a una ubicació no existent" +"Eliminació de worktrees/%s: el fitxer gitdir es refereix a una ubicació no " +"existent" #: builtin/worktree.c:161 msgid "report pruned working trees" @@ -14583,7 +14948,8 @@ msgstr "surt immediatament després de l'anunci inicial de referència" #: upload-pack.c:1074 msgid "do not try /.git/ if is no Git directory" -msgstr "no intentis /.git/ si no és cap directori del Git" +msgstr "" +"no intentis /.git/ si no és cap directori del Git" #: upload-pack.c:1076 msgid "interrupt transfer after seconds of inactivity" @@ -14629,17 +14995,17 @@ msgstr "" #: git.c:95 #, c-format msgid "no directory given for --git-dir\n" -msgstr "" +msgstr "no s'ha especificat un directori per --git-dir\n" #: git.c:109 #, c-format msgid "no namespace given for --namespace\n" -msgstr "" +msgstr "no s'ha especificat un nom d'espai per --namespace\n" #: git.c:123 #, c-format msgid "no directory given for --work-tree\n" -msgstr "" +msgstr "no s'ha especificat un directori per --work-tree\n" #: git.c:137 #, fuzzy, c-format @@ -14649,12 +15015,12 @@ msgstr "%s no admet --super-prefix" #: git.c:159 #, c-format msgid "-c expects a configuration string\n" -msgstr "" +msgstr "-c espera una cadena de configuració\n" #: git.c:197 #, c-format msgid "no directory given for -C\n" -msgstr "" +msgstr "no s'ha especificat un directori per -C\n" #: git.c:212 #, c-format @@ -14755,7 +15121,8 @@ msgstr "Registra els canvis al dipòsit" #: common-cmds.h:23 msgid "Show changes between commits, commit and working tree, etc" -msgstr "Mostra els canvis entre comissions, la comissió i l'arbre de treball, etc." +msgstr "" +"Mostra els canvis entre comissions, la comissió i l'arbre de treball, etc." #: common-cmds.h:24 msgid "Download objects and refs from another repository" @@ -14787,7 +15154,8 @@ msgstr "Obtén i integra amb un altre dipòsit o una branca local" #: common-cmds.h:31 msgid "Update remote refs along with associated objects" -msgstr "Actualitza les referències remotes juntament amb els objectes associats" +msgstr "" +"Actualitza les referències remotes juntament amb els objectes associats" #: common-cmds.h:32 msgid "Reapply commits on top of another base tip" @@ -14795,7 +15163,7 @@ msgstr "Reaplica les comissions sobre un altre punt de basament" #: common-cmds.h:33 msgid "Reset current HEAD to the specified state" -msgstr "Restableix el HEAD actual a l'estat especificat" +msgstr "Restableix la HEAD actual a l'estat especificat" #: common-cmds.h:34 msgid "Remove files from the working tree and from the index" @@ -14811,7 +15179,8 @@ msgstr "Mostra l'estat de l'arbre de treball" #: common-cmds.h:37 msgid "Create, list, delete or verify a tag object signed with GPG" -msgstr "Crea, llista, suprimeix o verifica un objecte d'etiqueta signat amb GPG" +msgstr "" +"Crea, llista, suprimeix o verifica un objecte d'etiqueta signat amb GPG" #: parse-options.h:157 msgid "expiry-date" @@ -14835,7 +15204,8 @@ msgstr "usa xifres per presentar els SHA-1" #: rerere.h:40 msgid "update the index with reused conflict resolution if possible" -msgstr "actualitza l'índex amb la resolució de conflicte reusada si és possible" +msgstr "" +"actualitza l'índex amb la resolució de conflicte reusada si és possible" #: git-bisect.sh:54 msgid "You need to start by \"git bisect start\"" @@ -14864,8 +15234,11 @@ msgstr "HEAD incorrecte - Cal un HEAD" #: git-bisect.sh:167 #, sh-format -msgid "Checking out '$start_head' failed. Try 'git bisect reset '." -msgstr "L'agafament de '$start_head' ha fallat. Proveu 'git bisect reset '." +msgid "" +"Checking out '$start_head' failed. Try 'git bisect reset '." +msgstr "" +"L'agafament de '$start_head' ha fallat. Proveu 'git bisect reset '." #: git-bisect.sh:177 msgid "won't bisect on cg-seek'ed tree" @@ -14947,7 +15320,7 @@ msgid "" "Could not check out original HEAD '$branch'.\n" "Try 'git bisect reset '." msgstr "" -"No s'ha pogut agafar el HEAD original '$branch'.\n" +"No s'ha pogut agafar la HEAD original '$branch'.\n" "Proveu 'git bisect reset '." #: git-bisect.sh:422 @@ -15001,7 +15374,8 @@ msgstr "pas de bisecció reeixit" #: git-bisect.sh:533 #, sh-format msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect." -msgstr "Ordre no vàlida: actualment esteu en una bisecció $TERM_BAD/$TERM_GOOD." +msgstr "" +"Ordre no vàlida: actualment esteu en una bisecció $TERM_BAD/$TERM_GOOD." #: git-bisect.sh:567 msgid "no terms defined" @@ -15017,9 +15391,12 @@ msgstr "" "Les opcions admeses són: --term-good|--term-old i --term-bad|--term-new." #: git-merge-octopus.sh:46 -msgid "Error: Your local changes to the following files would be overwritten by merge" +msgid "" +"Error: Your local changes to the following files would be overwritten by " +"merge" msgstr "" -"Error: Els vostres canvis locals als fitxers següents se sobreescriurien per fusionar" +"Error: Els vostres canvis locals als fitxers següents se sobreescriurien per " +"fusionar" #: git-merge-octopus.sh:61 msgid "Automated merge did not work." @@ -15051,20 +15428,23 @@ msgstr "S'està intentant una fusió simple amb $pretty_name" #: git-merge-octopus.sh:102 msgid "Simple merge did not work, trying automatic merge." -msgstr "La fusió simple no ha funcionat, s'està intentant una fusió automàtica." +msgstr "" +"La fusió simple no ha funcionat, s'està intentant una fusió automàtica." #: git-rebase.sh:60 msgid "" "Resolve all conflicts manually, mark them as resolved with\n" "\"git add/rm \", then run \"git rebase --continue\".\n" "You can instead skip this commit: run \"git rebase --skip\".\n" -"To abort and get back to the state before \"git rebase\", run \"git rebase --abort\"." +"To abort and get back to the state before \"git rebase\", run \"git rebase --" +"abort\"." msgstr "" "Resolgueu tots els conflictes manualment, marqueu-los com a resolts amb\n" -"«git add/rm », llavors executeu «git rebase --continue».\n" +"«git add/rm », llavors executeu «git rebase --" +"continue».\n" "Podeu en comptes ometre aquesta comissió: executeu «git rebase --skip».\n" -"Per a avortar i tornar a l'estat anterior abans de l'ordre «git rebase», executeu «git " -"rebase --abort»." +"Per a avortar i tornar a l'estat anterior abans de l'ordre «git rebase», " +"executeu «git rebase --abort»." #: git-rebase.sh:163 git-rebase.sh:409 #, sh-format @@ -15195,7 +15575,8 @@ msgstr "Canvis de $mb a $onto:" #: git-rebase.sh:651 msgid "First, rewinding head to replay your work on top of it..." -msgstr "Primer, s'està rebobinant HEAD per a reproduir el vostre treball al damunt..." +msgstr "" +"Primer, s'està rebobinant HEAD per a reproduir el vostre treball al damunt..." #: git-rebase.sh:661 #, sh-format @@ -15350,7 +15731,9 @@ msgstr "(Per restaurar-les teclegeu \"git stash apply\")" #: git-submodule.sh:181 msgid "Relative path can only be used from the toplevel of the working tree" -msgstr "El camí relatiu només es pot usar des del nivell superior de l'arbre de treball" +msgstr "" +"El camí relatiu només es pot usar des del nivell superior de l'arbre de " +"treball" #: git-submodule.sh:191 #, sh-format @@ -15391,25 +15774,31 @@ msgstr "'$sm_path' ja existeix i no és un dipòsit de git vàlid" #: git-submodule.sh:247 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" -msgstr "Es troba un directori de git per a '$sm_name' localment amb els remots:" +msgstr "" +"Es troba un directori de git per a '$sm_name' localment amb els remots:" #: git-submodule.sh:249 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from\n" " $realrepo\n" -"use the '--force' option. If the local git directory is not the correct repo\n" -"or you are unsure what this means choose another name with the '--name' option." +"use the '--force' option. If the local git directory is not the correct " +"repo\n" +"or you are unsure what this means choose another name with the '--name' " +"option." msgstr "" "Si voleu reusar aquest directori de git local en lloc de clonar de nou de\n" " $realrepo\n" -"useu l'opció '--force'. Si el directori de git local no és el dipòsit correcte\n" -"o no esteu segur de què vol dir això, trieu un altre nom amb l'opció '--name'." +"useu l'opció '--force'. Si el directori de git local no és el dipòsit " +"correcte\n" +"o no esteu segur de què vol dir això, trieu un altre nom amb l'opció '--" +"name'." #: git-submodule.sh:255 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." -msgstr "S'està reactivant el directori de git local per al submòdul '$sm_name'." +msgstr "" +"S'està reactivant el directori de git local per al submòdul '$sm_name'." #: git-submodule.sh:267 #, sh-format @@ -15434,12 +15823,14 @@ msgstr "S'està entrant '$displaypath'" #: git-submodule.sh:362 #, sh-format msgid "Stopping at '$displaypath'; script returned non-zero status." -msgstr "S'està aturant a '$displaypath'; l'script ha retornat un estat no zero." +msgstr "" +"S'està aturant a '$displaypath'; l'script ha retornat un estat no zero." #: git-submodule.sh:584 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" -msgstr "No s'ha pogut trobar la revisió actual en el camí de submòdul '$displaypath'" +msgstr "" +"No s'ha pogut trobar la revisió actual en el camí de submòdul '$displaypath'" #: git-submodule.sh:594 #, sh-format @@ -15449,10 +15840,11 @@ msgstr "No s'ha pogut obtenir en el camí de submòdul '$sm_path'" #: git-submodule.sh:599 #, sh-format msgid "" -"Unable to find current ${remote_name}/${branch} revision in submodule path '$sm_path'" +"Unable to find current ${remote_name}/${branch} revision in submodule path " +"'$sm_path'" msgstr "" -"No s'ha pogut trobar la revisió actual de ${remote_name}/${branch} en el camí de " -"submòdul '$sm_path'" +"No s'ha pogut trobar la revisió actual de ${remote_name}/${branch} en el " +"camí de submòdul '$sm_path'" #: git-submodule.sh:617 #, sh-format @@ -15462,11 +15854,11 @@ msgstr "No s'ha pogut obtenir en el camí de submòdul '$displaypath'" #: git-submodule.sh:623 #, sh-format msgid "" -"Fetched in submodule path '$displaypath', but it did not contain $sha1. Direct fetching " -"of that commit failed." +"Fetched in submodule path '$displaypath', but it did not contain $sha1. " +"Direct fetching of that commit failed." msgstr "" -"S'ha obtingut en el camí de submòdul '$displaypath', però no contenia $sha1. L'obtenció " -"directa d'aquella comissió ha fallat." +"S'ha obtingut en el camí de submòdul '$displaypath', però no contenia $sha1. " +"L'obtenció directa d'aquella comissió ha fallat." #: git-submodule.sh:630 #, sh-format @@ -15481,7 +15873,8 @@ msgstr "Camí de submòdul '$displaypath': s'ha agafat '$sha1'" #: git-submodule.sh:635 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" -msgstr "No s'ha pogut fer «rebase» '$sha1' en el camí de submòdul '$displaypath'" +msgstr "" +"No s'ha pogut fer «rebase» '$sha1' en el camí de submòdul '$displaypath'" #: git-submodule.sh:636 #, sh-format @@ -15501,7 +15894,9 @@ msgstr "Camí de submòdul '$displaypath': s'ha fusionat en '$sha1'" #: git-submodule.sh:647 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" -msgstr "L'execució de '$command $sha1' ha fallat en el camí de submòdul '$displaypath'" +msgstr "" +"L'execució de '$command $sha1' ha fallat en el camí de submòdul " +"'$displaypath'" #: git-submodule.sh:648 #, sh-format @@ -15512,7 +15907,8 @@ msgstr "Camí de submòdul '$displaypath': '$command $sha1'" #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "" -"S'ha produït un error en recorre recursivament dins del camí de submòdul '$displaypath'" +"S'ha produït un error en recorre recursivament dins del camí de submòdul " +"'$displaypath'" #: git-submodule.sh:775 msgid "The --cached option cannot be used with the --files option" @@ -15568,8 +15964,10 @@ msgstr "" " r, reword = usa la comissió, però edita el missatge de comissió\n" " e, edit = usa la comissió, però atura't per a esmenar\n" " s, squash = usa la comissió, però fusiona'l a la comissió prèvia\n" -" f, fixup = com \"squash\", però descarta el missatge de registre d'aquesta comissió\n" -" x, exec = executa l'ordre (la resta de la línia) usant l'intèrpret d'ordres\n" +" f, fixup = com \"squash\", però descarta el missatge de registre d'aquesta " +"comissió\n" +" x, exec = executa l'ordre (la resta de la línia) usant l'intèrpret " +"d'ordres\n" " d, drop = elimina la comissió\n" "\n" "Es pot canviar l'ordre d'aquestes línies; s'executen de dalt a baix.\n" @@ -15580,7 +15978,8 @@ msgid "" "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" msgstr "" "\n" -"No elimineu cap línia. Useu 'drop' explícitament per a eliminar una comissió.\n" +"No elimineu cap línia. Useu 'drop' explícitament per a eliminar una " +"comissió.\n" #: git-rebase--interactive.sh:175 msgid "" @@ -15690,10 +16089,12 @@ msgstr "No s'ha pogut aplicar $sha1... $rest" msgid "" "Could not amend commit after successfully picking $sha1... $rest\n" "This is most likely due to an empty commit message, or the pre-commit hook\n" -"failed. If the pre-commit hook failed, you may need to resolve the issue before\n" +"failed. If the pre-commit hook failed, you may need to resolve the issue " +"before\n" "you are able to reword the commit." msgstr "" -"No s'ha pogut esmenar la comissió després d'escollir amb èxit $sha1... $rest\n" +"No s'ha pogut esmenar la comissió després d'escollir amb èxit $sha1... " +"$rest\n" "Això és probablement a causa d'un missatge de comissió buit, o el lligam de\n" "precomissió ha fallat. Si el lligam de precomissió ha fallat, pot ser que\n" "necessiteu resoldre el problema abans que pugueu canviar el missatge de\n" @@ -15805,7 +16206,8 @@ msgstr "" #: git-rebase--interactive.sh:793 msgid "Error trying to find the author identity to amend commit" msgstr "" -"Hi ha hagut un error en intentar trobar la identitat d'autor per a esmenar la comissió" +"Hi ha hagut un error en intentar trobar la identitat d'autor per a esmenar " +"la comissió" #: git-rebase--interactive.sh:798 msgid "" @@ -15892,7 +16294,9 @@ msgstr "ús: $dashless $USAGE" #: git-sh-setup.sh:190 #, sh-format msgid "Cannot chdir to $cdup, the toplevel of the working tree" -msgstr "No es pot canviar de directori a $cdup, el nivell superior de l'arbre de treball" +msgstr "" +"No es pot canviar de directori a $cdup, el nivell superior de l'arbre de " +"treball" #: git-sh-setup.sh:199 git-sh-setup.sh:206 #, sh-format @@ -15922,7 +16326,8 @@ msgstr "No es pot fer «rebase»: El vostre índex conté canvis sense cometre." #: git-sh-setup.sh:245 msgid "Cannot pull with rebase: Your index contains uncommitted changes." -msgstr "No es pot baixar fent «rebase»: El vostre índex conté canvis sense cometre." +msgstr "" +"No es pot baixar fent «rebase»: El vostre índex conté canvis sense cometre." #: git-sh-setup.sh:248 #, sh-format @@ -15935,7 +16340,8 @@ msgstr "Addicionalment, el vostre índex conté canvis sense cometre." #: git-sh-setup.sh:372 msgid "You need to run this command from the toplevel of the working tree." -msgstr "Heu d'executar aquesta ordre des del nivell superior de l'arbre de treball." +msgstr "" +"Heu d'executar aquesta ordre des del nivell superior de l'arbre de treball." #: git-sh-setup.sh:377 msgid "Unable to determine absolute path of git directory" @@ -16063,7 +16469,8 @@ msgstr "s'ha produït un error en escriure al fitxer d'edició del tros: %s" #: git-add--interactive.perl:1079 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" -msgstr "Mode d'edició de trossos manual - vegeu més avall per una guia ràpida.\n" +msgstr "" +"Mode d'edició de trossos manual - vegeu més avall per una guia ràpida.\n" #: git-add--interactive.perl:1085 #, perl-format @@ -16086,7 +16493,8 @@ msgid "" "aborted and the hunk is left unchanged.\n" msgstr "" "Si no s'aplica correctament, tindreu una oportunitat per editar-lo\n" -"de nou. Si totes les línies del tros se suprimeixen, llavors l'edició s'avorta\n" +"de nou. Si totes les línies del tros se suprimeixen, llavors l'edició " +"s'avorta\n" "i el tros es deixa sense cap canvi.\n" #: git-add--interactive.perl:1107 @@ -16101,9 +16509,11 @@ msgstr "s'ha produït un error en llegir al fitxer d'edició del tros: %s" #. (saying "n" for "no" discards!) if the translation #. of the word "no" does not start with n. #: git-add--interactive.perl:1206 -msgid "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " +msgid "" +"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " msgstr "" -"El tros editat no s'aplica. Editeu-lo de nou (si responeu \"no\" es descartarà) [y/n]? " +"El tros editat no s'aplica. Editeu-lo de nou (si responeu \"no\" es " +"descartarà) [y/n]? " #: git-add--interactive.perl:1215 msgid "" @@ -16332,22 +16742,27 @@ msgstr "Descarta aquest tros des de l'arbre de treball [y,n,q,a,d%s,?]? " #: git-add--interactive.perl:1408 #, perl-format msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " -msgstr "Descarta el canvi de mode des de l'índex i l'arbre de treball [y,n,q,a,d%s,?]? " +msgstr "" +"Descarta el canvi de mode des de l'índex i l'arbre de treball [y,n,q,a,d" +"%s,?]? " #: git-add--interactive.perl:1409 #, perl-format msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " -msgstr "Descarta la supressió des de l'índex i l'arbre de treball [y,n,q,a,d%s,?]? " +msgstr "" +"Descarta la supressió des de l'índex i l'arbre de treball [y,n,q,a,d%s,?]? " #: git-add--interactive.perl:1410 #, perl-format msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " -msgstr "Descarta aquest tros des de l'índex i l'arbre de treball [y,n,q,a,d%s,?]? " +msgstr "" +"Descarta aquest tros des de l'índex i l'arbre de treball [y,n,q,a,d%s,?]? " #: git-add--interactive.perl:1413 #, perl-format msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " -msgstr "Aplica el canvi de mode a l'índex i l'arbre de treball [y,n,q,a,d%s,?]? " +msgstr "" +"Aplica el canvi de mode a l'índex i l'arbre de treball [y,n,q,a,d%s,?]? " #: git-add--interactive.perl:1414 #, perl-format @@ -16385,7 +16800,7 @@ msgstr[1] "Només %d trossos disponibles.\n" #: git-add--interactive.perl:1564 msgid "No other hunks to search\n" -msgstr "" +msgstr "No hi ha cap altre tros a cercar\n" #: git-add--interactive.perl:1568 msgid "search for regex? " @@ -16410,7 +16825,7 @@ msgstr "No hi ha tros següent\n" #: git-add--interactive.perl:1637 msgid "Sorry, cannot split this hunk\n" -msgstr "" +msgstr "No es pot dividir aquest tros\n" #: git-add--interactive.perl:1643 #, perl-format @@ -16421,7 +16836,7 @@ msgstr[1] "Divideix en %d trossos.\n" #: git-add--interactive.perl:1653 msgid "Sorry, cannot edit this hunk\n" -msgstr "" +msgstr "No es pot editar aquest tros\n" #: git-add--interactive.perl:1699 msgid "Review diff" @@ -16436,15 +16851,17 @@ msgid "" "revert - revert staged set of changes back to the HEAD version\n" "patch - pick hunks and update selectively\n" "diff - view diff between HEAD and index\n" -"add untracked - add contents of untracked files to the staged set of changes\n" +"add untracked - add contents of untracked files to the staged set of " +"changes\n" msgstr "" "status - mostra els camins amb canvis\n" -"update - afegeix l'estat de l'arbre de treball al conjunt de canvis «staged»\n" +"update - afegeix l'estat de l'arbre de treball al conjunt de canvis " +"«staged»\n" "revert - reverteix el conjunt de canvis de «staged» a la versió HEAD\n" "patch - selecciona trossos i actualitza'ls selectivament\n" "diff - mostra la diferència entre HEAD i l'índex\n" -"add untracked - afegeix el contingut dels fitxers no seguits al conjunt de canvis " -"«staged»\n" +"add untracked - afegeix el contingut dels fitxers no seguits al conjunt de " +"canvis «staged»\n" #: git-add--interactive.perl:1735 git-add--interactive.perl:1740 #: git-add--interactive.perl:1743 git-add--interactive.perl:1750 @@ -16476,7 +16893,8 @@ msgstr "l'editor no ha sortit correctament, avortant-ho tot" #: git-send-email.perl:294 #, perl-format -msgid "'%s' contains an intermediate version of the email you were composing.\n" +msgid "" +"'%s' contains an intermediate version of the email you were composing.\n" msgstr "«%s» conté una versió intermèdia del correu que estàveu redactant.\n" #: git-send-email.perl:299 @@ -16494,8 +16912,8 @@ msgstr "No es pot executar git format-patch des de fora del dipòsit\n" #: git-send-email.perl:386 msgid "" -"`batch-size` and `relogin` must be specified together (via command-line or configuration " -"option)\n" +"`batch-size` and `relogin` must be specified together (via command-line or " +"configuration option)\n" msgstr "" #: git-send-email.perl:456 @@ -16612,8 +17030,12 @@ msgid "Are you sure you want to use <%s> [y/N]? " msgstr "Esteu segur que voleu usar <%s> [y/N]? " #: git-send-email.perl:868 -msgid "The following files are 8bit, but do not declare a Content-Transfer-Encoding.\n" -msgstr "Els fitxers següents són 8bit, però no declaren un Content-Transfer-Encoding.\n" +msgid "" +"The following files are 8bit, but do not declare a Content-Transfer-" +"Encoding.\n" +msgstr "" +"Els fitxers següents són 8bit, però no declaren un Content-Transfer-" +"Encoding.\n" #: git-send-email.perl:873 msgid "Which 8bit encoding should I declare [UTF-8]? " @@ -16624,17 +17046,18 @@ msgstr "Quina codificació de 8 bits hauria de declarar [UTF-8]? " msgid "" "Refusing to send because the patch\n" "\t%s\n" -"has the template subject '*** SUBJECT HERE ***'. Pass --force if you really want to " -"send.\n" +"has the template subject '*** SUBJECT HERE ***'. Pass --force if you really " +"want to send.\n" msgstr "" "S'ha refusat a enviar perquè el pedaç\n" "\t%s\n" -"perquè la plantilla té l'assumpte '*** SUBJECT HERE ***'. Passeu --force si realment " -"voleu enviar-lo.\n" +"perquè la plantilla té l'assumpte '*** SUBJECT HERE ***'. Passeu --force si " +"realment voleu enviar-lo.\n" #: git-send-email.perl:900 msgid "To whom should the emails be sent (if anyone)?" -msgstr "A qui s'haurien d'enviar els correus electrònics (si s'han d'enviar a algú)?" +msgstr "" +"A qui s'haurien d'enviar els correus electrònics (si s'han d'enviar a algú)?" #: git-send-email.perl:918 #, perl-format @@ -16643,7 +17066,9 @@ msgstr "fatal: l'àlies «%s» s'expandeix a si mateix\n" #: git-send-email.perl:930 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? " -msgstr "S'ha d'usar el Message-ID com a In-Reply-To pel primer correu (si n'hi ha cap)? " +msgstr "" +"S'ha d'usar el Message-ID com a In-Reply-To pel primer correu (si n'hi ha " +"cap)? " #: git-send-email.perl:988 git-send-email.perl:996 #, perl-format @@ -16714,8 +17139,8 @@ msgstr "STARTTLS ha fallat! %s" #: git-send-email.perl:1505 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." msgstr "" -"No s'ha pogut inicialitzar SMTP correctament. Comproveu-ho la configuració i useu --smtp-" -"debug." +"No s'ha pogut inicialitzar SMTP correctament. Comproveu-ho la configuració i " +"useu --smtp-debug." #: git-send-email.perl:1523 #, perl-format @@ -16816,71 +17241,3 @@ msgstr "S'està ometent %s amb el sufix de còpia de seguretat «%s».\n" #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "Esteu segur que voleu enviar %s? [y|N]: " - -#~ msgid "git fetch-pack: expected ACK/NAK, got EOF" -#~ msgstr "git fetch-pack: s'esperava ACK/NAK, s'ha rebut EOF" - -#~ msgid "" -#~ "empty strings as pathspecs will be made invalid in upcoming releases. please use . " -#~ "instead if you meant to match all paths" -#~ msgstr "" -#~ "es faran no vàlides les cadenes buides com especificacions de camí en versions " -#~ "futures. Useu . en lloc d'això si volíeu coincidir amb tots els camins" - -#~ msgid "unable to open '%s' for writing" -#~ msgstr "no s'ha pogut obrir «%s» per a escriptura" - -#~ msgid "could not truncate '%s'" -#~ msgstr "no s'ha pogut truncar a «%s»" - -#~ msgid "could not finish '%s'" -#~ msgstr "no s'ha pogut finalitzar «%s»" - -#~ msgid "could not close %s" -#~ msgstr "no s'ha pogut tancar %s" - -#~ msgid "The copy of the patch that failed is found in: %s" -#~ msgstr "La còpia del pedaç que ha fallat es troba en: %s" - -#~ msgid "Copied a misnamed branch '%s' away" -#~ msgstr "S'ha copiat el nom de la branca mal anomenada «%s»" - -#~ msgid "it does not make sense to create 'HEAD' manually" -#~ msgstr "no té sentit crear 'HEAD' manualment" - -#~ msgid "Don't know how to clone %s" -#~ msgstr "No se sap com clonar %s" - -#~ msgid "show ignored files" -#~ msgstr "mostra els fitxers ignorats" - -#~ msgid "%s is not a valid '%s' object" -#~ msgstr "%s no és un objecte de «%s» vàlid" - -#~ msgid "Don't know how to fetch from %s" -#~ msgstr "No se sap com obtenir de %s" - -#~ msgid "'$term' is not a valid term" -#~ msgstr "'$term' no és un terme vàlid" - -#~ msgid "" -#~ "error: unknown option for 'stash save': $option\n" -#~ " To provide a message, use git stash save -- '$option'" -#~ msgstr "" -#~ "error: opció desconeguda de 'stash save': $option\n" -#~ " Per a proveir un missatge, useu git stash save -- '$option'" - -#~ msgid "pathspec and --all are incompatible" -#~ msgstr "--pathspec i --all són incompatibles" - -#~ msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" -#~ msgstr "Submòdul '$name' ($url) no registrat per al camí '$displaypath'" - -#~ msgid "Failed to recurse into submodule path '$sm_path'" -#~ msgstr "S'ha produït un error en cercar recursivament al camí de submòdul '$sm_path'" - -#~ msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n" -#~ msgstr "Els camps A/Cc/Bcc no s'interpreten encara, s'ignoraran\n" - -#~ msgid "%%(trailers) does not take arguments" -#~ msgstr "%%(trailers) no accepta paràmetres" From 4a5d2ec33a6441d55d548b567f088c97b6f1421d Mon Sep 17 00:00:00 2001 From: Andre Hinrichs Date: Tue, 3 Apr 2018 07:12:12 +0200 Subject: [PATCH 02/19] l10n: de.po: fix typos Signed-off-by: Andre Hinrichs --- po/de.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/de.po b/po/de.po index 793bd2a803..7df1cfcd49 100644 --- a/po/de.po +++ b/po/de.po @@ -15052,7 +15052,7 @@ msgstr "Kann gesperrtes Arbeitsverzeichnis nicht verschieben, Sperrgrund: %s" #: builtin/worktree.c:692 msgid "cannot move a locked working tree" -msgstr "Kann gesperrtes Arbeitsverzeichnisses nicht verschieben." +msgstr "Kann gesperrtes Arbeitsverzeichnis nicht verschieben." #: builtin/worktree.c:695 #, c-format @@ -16991,7 +16991,7 @@ msgstr "Löschung im Arbeitsverzeichnis verwerfen [y,n,q,a,d%s,?]? " #: git-add--interactive.perl:1405 #, perl-format msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " -msgstr "diesen Patch-Block im Arbeitsverzeichnis verwerfen [y,n,q,a,d%s,?]? " +msgstr "Diesen Patch-Block im Arbeitsverzeichnis verwerfen [y,n,q,a,d%s,?]? " #: git-add--interactive.perl:1408 #, perl-format From 9e8e262749f9f2bf878d2251b98d3ca49582dea1 Mon Sep 17 00:00:00 2001 From: Ralf Thielow Date: Tue, 3 Apr 2018 19:30:14 +0200 Subject: [PATCH 03/19] l10n: TEAMS: remove inactive de team members Thanks for your contributions! Signed-off-by: Ralf Thielow --- po/TEAMS | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/po/TEAMS b/po/TEAMS index 065771cfe6..762879550a 100644 --- a/po/TEAMS +++ b/po/TEAMS @@ -13,12 +13,8 @@ Members: Alex Henrie Language: de (German) Repository: https://github.com/ralfth/git-po-de Leader: Ralf Thielow -Members: Thomas Rast - Jan Krüger - Christian Stimming +Members: Matthias Rüster Phillip Szelat - Matthias Rüster - Magnus Görlitz Language: es (Spanish) Repository: https://github.com/ChrisADR/git-po From 9b7388a855c22f619b07929c00e126631b544c4d Mon Sep 17 00:00:00 2001 From: Jiang Xin Date: Thu, 31 May 2018 23:35:22 +0800 Subject: [PATCH 04/19] l10n: git.pot: v2.18.0 round 1 (108 new, 14 removed) Generate po/git.pot from v2.18.0-rc0 for git v2.18.0 l10n round 1. Signed-off-by: Jiang Xin --- po/git.pot | 5130 ++++++++++++++++++++++++++++------------------------ 1 file changed, 2805 insertions(+), 2325 deletions(-) diff --git a/po/git.pot b/po/git.pot index ab5d179671..2c5e3d07ac 100644 --- a/po/git.pot +++ b/po/git.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: Git Mailing List \n" -"POT-Creation-Date: 2018-03-16 07:29+0800\n" +"POT-Creation-Date: 2018-05-31 23:32+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,59 +18,59 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: advice.c:62 +#: advice.c:92 #, c-format -msgid "hint: %.*s\n" +msgid "%shint: %.*s%s\n" msgstr "" -#: advice.c:90 +#: advice.c:137 msgid "Cherry-picking is not possible because you have unmerged files." msgstr "" -#: advice.c:92 +#: advice.c:139 msgid "Committing is not possible because you have unmerged files." msgstr "" -#: advice.c:94 +#: advice.c:141 msgid "Merging is not possible because you have unmerged files." msgstr "" -#: advice.c:96 +#: advice.c:143 msgid "Pulling is not possible because you have unmerged files." msgstr "" -#: advice.c:98 +#: advice.c:145 msgid "Reverting is not possible because you have unmerged files." msgstr "" -#: advice.c:100 +#: advice.c:147 #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "" -#: advice.c:108 +#: advice.c:155 msgid "" "Fix them up in the work tree, and then use 'git add/rm '\n" "as appropriate to mark resolution and make a commit." msgstr "" -#: advice.c:116 +#: advice.c:163 msgid "Exiting because of an unresolved conflict." msgstr "" -#: advice.c:121 builtin/merge.c:1251 +#: advice.c:168 builtin/merge.c:1249 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "" -#: advice.c:123 +#: advice.c:170 msgid "Please, commit your changes before merging." msgstr "" -#: advice.c:124 +#: advice.c:171 msgid "Exiting because of unfinished merge." msgstr "" -#: advice.c:130 +#: advice.c:177 #, c-format msgid "" "Note: checking out '%s'.\n" @@ -315,7 +315,7 @@ msgstr "" msgid "cannot checkout %s" msgstr "" -#: apply.c:3396 apply.c:3407 apply.c:3453 setup.c:277 +#: apply.c:3396 apply.c:3407 apply.c:3453 setup.c:278 #, c-format msgid "failed to read %s" msgstr "" @@ -514,7 +514,7 @@ msgstr[1] "" msgid "truncating .rej filename to %.*s.rej" msgstr "" -#: apply.c:4545 builtin/fetch.c:775 builtin/fetch.c:1025 +#: apply.c:4545 builtin/fetch.c:786 builtin/fetch.c:1036 #, c-format msgid "cannot open %s" msgstr "" @@ -568,15 +568,15 @@ msgid_plural "%d lines applied after fixing whitespace errors." msgstr[0] "" msgstr[1] "" -#: apply.c:4894 builtin/add.c:539 builtin/mv.c:298 builtin/rm.c:390 +#: apply.c:4894 builtin/add.c:538 builtin/mv.c:300 builtin/rm.c:389 msgid "Unable to write new index file" msgstr "" #: apply.c:4921 apply.c:4924 builtin/am.c:2254 builtin/am.c:2257 -#: builtin/clone.c:118 builtin/fetch.c:127 builtin/pull.c:193 -#: builtin/submodule--helper.c:403 builtin/submodule--helper.c:1197 -#: builtin/submodule--helper.c:1200 builtin/submodule--helper.c:1567 -#: builtin/submodule--helper.c:1570 builtin/submodule--helper.c:1787 +#: builtin/clone.c:120 builtin/fetch.c:126 builtin/pull.c:198 +#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1210 +#: builtin/submodule--helper.c:1213 builtin/submodule--helper.c:1584 +#: builtin/submodule--helper.c:1587 builtin/submodule--helper.c:1807 #: git-add--interactive.perl:197 msgid "path" msgstr "" @@ -651,7 +651,7 @@ msgstr "" #: apply.c:4960 builtin/am.c:2242 builtin/interpret-trailers.c:95 #: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99 -#: builtin/pack-objects.c:3035 +#: builtin/pack-objects.c:3177 msgid "action" msgstr "" @@ -679,9 +679,9 @@ msgstr "" msgid "allow overlapping hunks" msgstr "" -#: apply.c:4977 builtin/add.c:292 builtin/check-ignore.c:21 -#: builtin/commit.c:1276 builtin/count-objects.c:96 builtin/fsck.c:665 -#: builtin/log.c:1901 builtin/mv.c:123 builtin/read-tree.c:125 +#: apply.c:4977 builtin/add.c:290 builtin/check-ignore.c:21 +#: builtin/commit.c:1301 builtin/count-objects.c:98 builtin/fsck.c:666 +#: builtin/log.c:1901 builtin/mv.c:122 builtin/read-tree.c:124 msgid "be verbose" msgstr "" @@ -718,7 +718,7 @@ msgstr "" msgid "git archive --remote [--exec ] --list" msgstr "" -#: archive.c:351 builtin/add.c:176 builtin/add.c:515 builtin/rm.c:299 +#: archive.c:351 builtin/add.c:176 builtin/add.c:514 builtin/rm.c:298 #, c-format msgid "pathspec '%s' did not match any files" msgstr "" @@ -739,10 +739,10 @@ msgstr "" msgid "prepend prefix to each pathname in the archive" msgstr "" -#: archive.c:439 builtin/blame.c:702 builtin/blame.c:703 builtin/config.c:62 -#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:869 +#: archive.c:439 builtin/blame.c:813 builtin/blame.c:814 builtin/config.c:127 +#: builtin/fast-export.c:1007 builtin/fast-export.c:1009 builtin/grep.c:869 #: builtin/hash-object.c:103 builtin/ls-files.c:551 builtin/ls-files.c:554 -#: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:120 +#: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:119 #: parse-options.h:165 msgid "file" msgstr "" @@ -775,8 +775,8 @@ msgstr "" msgid "list supported archive formats" msgstr "" -#: archive.c:458 builtin/archive.c:90 builtin/clone.c:108 builtin/clone.c:111 -#: builtin/submodule--helper.c:1209 builtin/submodule--helper.c:1576 +#: archive.c:458 builtin/archive.c:90 builtin/clone.c:110 builtin/clone.c:113 +#: builtin/submodule--helper.c:1222 builtin/submodule--helper.c:1593 msgid "repo" msgstr "" @@ -825,43 +825,43 @@ msgid "" "Use '\\!' for literal leading exclamation." msgstr "" -#: bisect.c:460 +#: bisect.c:461 #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "" -#: bisect.c:668 +#: bisect.c:669 #, c-format msgid "We cannot bisect more!\n" msgstr "" -#: bisect.c:722 +#: bisect.c:723 #, c-format msgid "Not a valid commit name %s" msgstr "" -#: bisect.c:746 +#: bisect.c:747 #, c-format msgid "" "The merge base %s is bad.\n" "This means the bug has been fixed between %s and [%s].\n" msgstr "" -#: bisect.c:751 +#: bisect.c:752 #, c-format msgid "" "The merge base %s is new.\n" "The property has changed between %s and [%s].\n" msgstr "" -#: bisect.c:756 +#: bisect.c:757 #, c-format msgid "" "The merge base %s is %s.\n" "This means the first '%s' commit is between %s and [%s].\n" msgstr "" -#: bisect.c:764 +#: bisect.c:765 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -869,7 +869,7 @@ msgid "" "Maybe you mistook %s and %s revs?\n" msgstr "" -#: bisect.c:777 +#: bisect.c:778 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -877,43 +877,43 @@ msgid "" "We continue anyway." msgstr "" -#: bisect.c:810 +#: bisect.c:811 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "" -#: bisect.c:850 +#: bisect.c:851 #, c-format msgid "a %s revision is needed" msgstr "" -#: bisect.c:869 builtin/notes.c:175 builtin/tag.c:235 +#: bisect.c:870 builtin/notes.c:175 builtin/tag.c:236 #, c-format msgid "could not create file '%s'" msgstr "" -#: bisect.c:920 +#: bisect.c:921 #, c-format msgid "could not read file '%s'" msgstr "" -#: bisect.c:950 +#: bisect.c:951 msgid "reading bisect refs failed" msgstr "" -#: bisect.c:969 +#: bisect.c:970 #, c-format msgid "%s was both %s and %s\n" msgstr "" -#: bisect.c:977 +#: bisect.c:978 #, c-format msgid "" "No testable commit found.\n" "Maybe you started with bad path parameters?\n" msgstr "" -#: bisect.c:996 +#: bisect.c:997 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -923,48 +923,48 @@ msgstr[1] "" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. -#: bisect.c:1002 +#: bisect.c:1003 #, c-format msgid "Bisecting: %d revision left to test after this %s\n" msgid_plural "Bisecting: %d revisions left to test after this %s\n" msgstr[0] "" msgstr[1] "" -#: blame.c:1758 +#: blame.c:1756 msgid "--contents and --reverse do not blend well." msgstr "" -#: blame.c:1769 +#: blame.c:1767 msgid "cannot use --contents with final commit object name" msgstr "" -#: blame.c:1789 +#: blame.c:1787 msgid "--reverse and --first-parent together require specified latest commit" msgstr "" -#: blame.c:1798 bundle.c:160 ref-filter.c:1978 sequencer.c:1699 -#: sequencer.c:2901 builtin/commit.c:976 builtin/log.c:366 builtin/log.c:920 -#: builtin/log.c:1371 builtin/log.c:1702 builtin/log.c:1950 builtin/merge.c:370 -#: builtin/shortlog.c:191 +#: blame.c:1796 bundle.c:160 ref-filter.c:2075 sequencer.c:1860 +#: sequencer.c:3631 builtin/commit.c:981 builtin/log.c:366 builtin/log.c:920 +#: builtin/log.c:1371 builtin/log.c:1702 builtin/log.c:1950 builtin/merge.c:371 +#: builtin/shortlog.c:192 msgid "revision walk setup failed" msgstr "" -#: blame.c:1816 +#: blame.c:1814 msgid "" "--reverse --first-parent together require range along first-parent chain" msgstr "" -#: blame.c:1827 +#: blame.c:1825 #, c-format msgid "no such path %s in %s" msgstr "" -#: blame.c:1838 +#: blame.c:1836 #, c-format msgid "cannot read blob %s for path %s" msgstr "" -#: branch.c:53 +#: branch.c:54 #, c-format msgid "" "\n" @@ -973,85 +973,85 @@ msgid "" "\"git branch --set-upstream-to=%s%s%s\"." msgstr "" -#: branch.c:67 +#: branch.c:68 #, c-format msgid "Not setting branch %s as its own upstream." msgstr "" -#: branch.c:93 +#: branch.c:94 #, c-format msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing." msgstr "" -#: branch.c:94 +#: branch.c:95 #, c-format msgid "Branch '%s' set up to track remote branch '%s' from '%s'." msgstr "" -#: branch.c:98 +#: branch.c:99 #, c-format msgid "Branch '%s' set up to track local branch '%s' by rebasing." msgstr "" -#: branch.c:99 +#: branch.c:100 #, c-format msgid "Branch '%s' set up to track local branch '%s'." msgstr "" -#: branch.c:104 +#: branch.c:105 #, c-format msgid "Branch '%s' set up to track remote ref '%s' by rebasing." msgstr "" -#: branch.c:105 +#: branch.c:106 #, c-format msgid "Branch '%s' set up to track remote ref '%s'." msgstr "" -#: branch.c:109 +#: branch.c:110 #, c-format msgid "Branch '%s' set up to track local ref '%s' by rebasing." msgstr "" -#: branch.c:110 +#: branch.c:111 #, c-format msgid "Branch '%s' set up to track local ref '%s'." msgstr "" -#: branch.c:119 +#: branch.c:120 msgid "Unable to write upstream branch configuration" msgstr "" -#: branch.c:156 +#: branch.c:157 #, c-format msgid "Not tracking: ambiguous information for ref %s" msgstr "" -#: branch.c:189 +#: branch.c:190 #, c-format msgid "'%s' is not a valid branch name." msgstr "" -#: branch.c:208 +#: branch.c:209 #, c-format msgid "A branch named '%s' already exists." msgstr "" -#: branch.c:213 +#: branch.c:214 msgid "Cannot force update the current branch." msgstr "" -#: branch.c:233 +#: branch.c:234 #, c-format msgid "Cannot setup tracking information; starting point '%s' is not a branch." msgstr "" -#: branch.c:235 +#: branch.c:236 #, c-format msgid "the requested upstream branch '%s' does not exist" msgstr "" -#: branch.c:237 +#: branch.c:238 msgid "" "\n" "If you are planning on basing your work on an upstream\n" @@ -1063,27 +1063,27 @@ msgid "" "\"git push -u\" to set the upstream config as you push." msgstr "" -#: branch.c:280 +#: branch.c:281 #, c-format msgid "Not a valid object name: '%s'." msgstr "" -#: branch.c:300 +#: branch.c:301 #, c-format msgid "Ambiguous object name: '%s'." msgstr "" -#: branch.c:305 +#: branch.c:306 #, c-format msgid "Not a valid branch point: '%s'." msgstr "" -#: branch.c:359 +#: branch.c:360 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "" -#: branch.c:382 +#: branch.c:383 #, c-format msgid "HEAD of working tree %s is not updated" msgstr "" @@ -1098,7 +1098,7 @@ msgstr "" msgid "unrecognized header: %s%s (%d)" msgstr "" -#: bundle.c:88 sequencer.c:1879 sequencer.c:2337 builtin/commit.c:750 +#: bundle.c:88 sequencer.c:2080 sequencer.c:2557 builtin/commit.c:755 #, c-format msgid "could not open '%s'" msgstr "" @@ -1142,7 +1142,7 @@ msgstr "" msgid "ref '%s' is excluded by the rev-list options" msgstr "" -#: bundle.c:450 builtin/log.c:183 builtin/log.c:1607 builtin/shortlog.c:296 +#: bundle.c:450 builtin/log.c:183 builtin/log.c:1607 builtin/shortlog.c:303 #, c-format msgid "unrecognized argument: %s" msgstr "" @@ -1165,188 +1165,215 @@ msgstr "" msgid "invalid color value: %.*s" msgstr "" -#: commit.c:41 sequencer.c:2141 builtin/am.c:421 builtin/am.c:465 -#: builtin/am.c:1436 builtin/am.c:2072 +#: commit.c:43 sequencer.c:2363 builtin/am.c:421 builtin/am.c:465 +#: builtin/am.c:1436 builtin/am.c:2072 builtin/replace.c:376 +#: builtin/replace.c:448 #, c-format msgid "could not parse %s" msgstr "" -#: commit.c:43 +#: commit.c:45 #, c-format msgid "%s %s is not a commit!" msgstr "" -#: commit.c:1506 +#: commit.c:182 +msgid "" +"Support for /info/grafts is deprecated\n" +"and will be removed in a future Git version.\n" +"\n" +"Please use \"git replace --convert-graft-file\"\n" +"to convert the grafts into replace refs.\n" +"\n" +"Turn this message off by running\n" +"\"git config advice.graftFileDeprecated false\"" +msgstr "" + +#: commit.c:1537 msgid "" "Warning: commit message did not conform to UTF-8.\n" "You may want to amend it after fixing the message, or set the config\n" "variable i18n.commitencoding to the encoding your project uses.\n" msgstr "" +#: commit-graph.c:669 +#, c-format +msgid "the commit graph format cannot write %d commits" +msgstr "" + +#: commit-graph.c:696 +msgid "too many commits to write graph" +msgstr "" + +#: commit-graph.c:707 builtin/init-db.c:516 builtin/init-db.c:521 +#, c-format +msgid "cannot mkdir %s" +msgstr "" + #: compat/obstack.c:405 compat/obstack.c:407 msgid "memory exhausted" msgstr "" -#: config.c:186 +#: config.c:187 msgid "relative config include conditionals must come from files" msgstr "" -#: config.c:720 +#: config.c:788 #, c-format msgid "bad config line %d in blob %s" msgstr "" -#: config.c:724 +#: config.c:792 #, c-format msgid "bad config line %d in file %s" msgstr "" -#: config.c:728 +#: config.c:796 #, c-format msgid "bad config line %d in standard input" msgstr "" -#: config.c:732 +#: config.c:800 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "" -#: config.c:736 +#: config.c:804 #, c-format msgid "bad config line %d in command line %s" msgstr "" -#: config.c:740 +#: config.c:808 #, c-format msgid "bad config line %d in %s" msgstr "" -#: config.c:868 +#: config.c:936 msgid "out of range" msgstr "" -#: config.c:868 +#: config.c:936 msgid "invalid unit" msgstr "" -#: config.c:874 +#: config.c:942 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "" -#: config.c:879 +#: config.c:947 #, c-format msgid "bad numeric config value '%s' for '%s' in blob %s: %s" msgstr "" -#: config.c:882 +#: config.c:950 #, c-format msgid "bad numeric config value '%s' for '%s' in file %s: %s" msgstr "" -#: config.c:885 +#: config.c:953 #, c-format msgid "bad numeric config value '%s' for '%s' in standard input: %s" msgstr "" -#: config.c:888 +#: config.c:956 #, c-format msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" msgstr "" -#: config.c:891 +#: config.c:959 #, c-format msgid "bad numeric config value '%s' for '%s' in command line %s: %s" msgstr "" -#: config.c:894 +#: config.c:962 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "" -#: config.c:989 +#: config.c:1057 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "" -#: config.c:998 +#: config.c:1066 #, c-format msgid "'%s' for '%s' is not a valid timestamp" msgstr "" -#: config.c:1094 config.c:1105 +#: config.c:1171 config.c:1182 #, c-format msgid "bad zlib compression level %d" msgstr "" -#: config.c:1225 +#: config.c:1307 #, c-format msgid "invalid mode for object creation: %s" msgstr "" -#: config.c:1386 +#: config.c:1473 #, c-format msgid "bad pack compression level %d" msgstr "" -#: config.c:1582 +#: config.c:1681 msgid "unable to parse command-line config" msgstr "" -#: config.c:1914 +#: config.c:2013 msgid "unknown error occurred while reading the configuration files" msgstr "" -#: config.c:2101 +#: config.c:2200 #, c-format msgid "Invalid %s: '%s'" msgstr "" -#: config.c:2144 +#: config.c:2243 #, c-format msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" msgstr "" -#: config.c:2170 +#: config.c:2269 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "" -#: config.c:2195 +#: config.c:2294 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "" -#: config.c:2197 +#: config.c:2296 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "" -#: config.c:2256 +#: config.c:2402 #, c-format msgid "%s has multiple values" msgstr "" -#: config.c:2599 config.c:2816 +#: config.c:2766 config.c:3019 #, c-format msgid "fstat on %s failed" msgstr "" -#: config.c:2706 +#: config.c:2905 #, c-format msgid "could not set '%s' to '%s'" msgstr "" -#: config.c:2708 builtin/remote.c:776 +#: config.c:2907 builtin/remote.c:779 #, c-format msgid "could not unset '%s'" msgstr "" -#: connect.c:52 +#: connect.c:60 msgid "The remote end hung up upon initial contact" msgstr "" -#: connect.c:54 +#: connect.c:62 msgid "" "Could not read from remote repository.\n" "\n" @@ -1354,7 +1381,7 @@ msgid "" "and the repository exists." msgstr "" -#: connected.c:66 builtin/fsck.c:198 builtin/prune.c:144 +#: connected.c:66 builtin/fsck.c:201 builtin/prune.c:145 msgid "Checking connectivity" msgstr "" @@ -1370,30 +1397,68 @@ msgstr "" msgid "failed to close rev-list's stdin" msgstr "" -#: convert.c:205 +#: convert.c:206 #, c-format msgid "CRLF would be replaced by LF in %s." msgstr "" -#: convert.c:207 +#: convert.c:208 #, c-format msgid "" "CRLF will be replaced by LF in %s.\n" "The file will have its original line endings in your working directory." msgstr "" -#: convert.c:215 +#: convert.c:216 #, c-format msgid "LF would be replaced by CRLF in %s" msgstr "" -#: convert.c:217 +#: convert.c:218 #, c-format msgid "" "LF will be replaced by CRLF in %s.\n" "The file will have its original line endings in your working directory." msgstr "" +#: convert.c:279 +#, c-format +msgid "BOM is prohibited in '%s' if encoded as %s" +msgstr "" + +#: convert.c:286 +#, c-format +msgid "" +"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-" +"tree-encoding." +msgstr "" + +#: convert.c:304 +#, c-format +msgid "BOM is required in '%s' if encoded as %s" +msgstr "" + +#: convert.c:306 +#, c-format +msgid "" +"The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-" +"%sLE (depending on the byte order) as working-tree-encoding." +msgstr "" + +#: convert.c:424 +#, c-format +msgid "failed to encode '%s' from %s to %s" +msgstr "" + +#: convert.c:467 +#, c-format +msgid "encoding '%s' from %s to %s and back is not the same" +msgstr "" + +#: convert.c:1225 +msgid "true/false are no valid working-tree-encodings" +msgstr "" + #: date.c:116 msgid "in the future" msgstr "" @@ -1504,68 +1569,68 @@ msgid "" "%s" msgstr "" -#: diff.c:3822 +#: diff.c:3823 #, c-format msgid "external diff died, stopping at %s" msgstr "" -#: diff.c:4146 +#: diff.c:4153 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "" -#: diff.c:4149 +#: diff.c:4156 msgid "-G, -S and --find-object are mutually exclusive" msgstr "" -#: diff.c:4237 +#: diff.c:4244 msgid "--follow requires exactly one pathspec" msgstr "" -#: diff.c:4403 +#: diff.c:4410 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" "%s" msgstr "" -#: diff.c:4417 +#: diff.c:4424 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "" -#: diff.c:5493 +#: diff.c:5500 msgid "inexact rename detection was skipped due to too many files." msgstr "" -#: diff.c:5496 +#: diff.c:5503 msgid "only found copies from modified paths due to too many files." msgstr "" -#: diff.c:5499 +#: diff.c:5506 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." msgstr "" -#: dir.c:1866 +#: dir.c:1867 #, c-format msgid "could not open directory '%s'" msgstr "" -#: dir.c:2108 +#: dir.c:2109 msgid "failed to get kernel name and information" msgstr "" -#: dir.c:2232 +#: dir.c:2233 msgid "Untracked cache is disabled on this system or location." msgstr "" -#: dir.c:3024 dir.c:3029 +#: dir.c:3075 dir.c:3080 #, c-format msgid "could not create directories for %s" msgstr "" -#: dir.c:3054 +#: dir.c:3109 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "" @@ -1588,201 +1653,205 @@ msgstr "" msgid "Remote with no URL" msgstr "" -#: fetch-pack.c:253 +#: fetch-pack.c:254 msgid "git fetch-pack: expected shallow list" msgstr "" -#: fetch-pack.c:265 +#: fetch-pack.c:266 msgid "git fetch-pack: expected ACK/NAK, got a flush packet" msgstr "" -#: fetch-pack.c:284 builtin/archive.c:63 +#: fetch-pack.c:285 builtin/archive.c:63 #, c-format msgid "remote error: %s" msgstr "" -#: fetch-pack.c:285 +#: fetch-pack.c:286 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "" -#: fetch-pack.c:337 +#: fetch-pack.c:338 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "" -#: fetch-pack.c:428 +#: fetch-pack.c:429 fetch-pack.c:1310 #, c-format msgid "invalid shallow line: %s" msgstr "" -#: fetch-pack.c:434 +#: fetch-pack.c:435 fetch-pack.c:1316 #, c-format msgid "invalid unshallow line: %s" msgstr "" -#: fetch-pack.c:436 +#: fetch-pack.c:437 fetch-pack.c:1318 #, c-format msgid "object not found: %s" msgstr "" -#: fetch-pack.c:439 +#: fetch-pack.c:440 fetch-pack.c:1321 #, c-format msgid "error in object: %s" msgstr "" -#: fetch-pack.c:441 +#: fetch-pack.c:442 fetch-pack.c:1323 #, c-format msgid "no shallow found: %s" msgstr "" -#: fetch-pack.c:444 +#: fetch-pack.c:445 fetch-pack.c:1326 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "" -#: fetch-pack.c:485 +#: fetch-pack.c:486 #, c-format msgid "got %s %d %s" msgstr "" -#: fetch-pack.c:499 +#: fetch-pack.c:500 #, c-format msgid "invalid commit %s" msgstr "" -#: fetch-pack.c:532 +#: fetch-pack.c:533 msgid "giving up" msgstr "" -#: fetch-pack.c:542 progress.c:229 +#: fetch-pack.c:543 progress.c:229 msgid "done" msgstr "" -#: fetch-pack.c:554 +#: fetch-pack.c:555 #, c-format msgid "got %s (%d) %s" msgstr "" -#: fetch-pack.c:600 +#: fetch-pack.c:601 #, c-format msgid "Marking %s as complete" msgstr "" -#: fetch-pack.c:788 +#: fetch-pack.c:828 #, c-format msgid "already have %s (%s)" msgstr "" -#: fetch-pack.c:829 +#: fetch-pack.c:869 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "" -#: fetch-pack.c:837 +#: fetch-pack.c:877 msgid "protocol error: bad pack header" msgstr "" -#: fetch-pack.c:895 +#: fetch-pack.c:944 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "" -#: fetch-pack.c:911 +#: fetch-pack.c:960 #, c-format msgid "%s failed" msgstr "" -#: fetch-pack.c:913 +#: fetch-pack.c:962 msgid "error in sideband demultiplexer" msgstr "" -#: fetch-pack.c:940 +#: fetch-pack.c:989 msgid "Server does not support shallow clients" msgstr "" -#: fetch-pack.c:944 +#: fetch-pack.c:993 msgid "Server supports multi_ack_detailed" msgstr "" -#: fetch-pack.c:947 +#: fetch-pack.c:996 msgid "Server supports no-done" msgstr "" -#: fetch-pack.c:953 +#: fetch-pack.c:1002 msgid "Server supports multi_ack" msgstr "" -#: fetch-pack.c:957 +#: fetch-pack.c:1006 msgid "Server supports side-band-64k" msgstr "" -#: fetch-pack.c:961 +#: fetch-pack.c:1010 msgid "Server supports side-band" msgstr "" -#: fetch-pack.c:965 +#: fetch-pack.c:1014 msgid "Server supports allow-tip-sha1-in-want" msgstr "" -#: fetch-pack.c:969 +#: fetch-pack.c:1018 msgid "Server supports allow-reachable-sha1-in-want" msgstr "" -#: fetch-pack.c:979 +#: fetch-pack.c:1028 msgid "Server supports ofs-delta" msgstr "" -#: fetch-pack.c:985 +#: fetch-pack.c:1034 fetch-pack.c:1204 msgid "Server supports filter" msgstr "" -#: fetch-pack.c:993 +#: fetch-pack.c:1042 #, c-format msgid "Server version is %.*s" msgstr "" -#: fetch-pack.c:999 +#: fetch-pack.c:1048 msgid "Server does not support --shallow-since" msgstr "" -#: fetch-pack.c:1003 +#: fetch-pack.c:1052 msgid "Server does not support --shallow-exclude" msgstr "" -#: fetch-pack.c:1005 +#: fetch-pack.c:1054 msgid "Server does not support --deepen" msgstr "" -#: fetch-pack.c:1016 +#: fetch-pack.c:1065 msgid "no common commits" msgstr "" -#: fetch-pack.c:1028 +#: fetch-pack.c:1077 fetch-pack.c:1414 msgid "git fetch-pack: fetch failed." msgstr "" -#: fetch-pack.c:1190 +#: fetch-pack.c:1199 +msgid "Server does not support shallow requests" +msgstr "" + +#: fetch-pack.c:1584 msgid "no matching remote head" msgstr "" -#: fetch-pack.c:1212 +#: fetch-pack.c:1610 #, c-format msgid "no such remote ref %s" msgstr "" -#: fetch-pack.c:1215 +#: fetch-pack.c:1613 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "" -#: gpg-interface.c:181 +#: gpg-interface.c:185 msgid "gpg failed to sign the data" msgstr "" -#: gpg-interface.c:211 +#: gpg-interface.c:210 msgid "could not create temporary file" msgstr "" -#: gpg-interface.c:214 +#: gpg-interface.c:213 #, c-format msgid "failed writing detached signature to '%s'" msgstr "" @@ -1792,18 +1861,18 @@ msgstr "" msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "" -#: grep.c:2022 +#: grep.c:2020 #, c-format msgid "'%s': unable to read %s" msgstr "" -#: grep.c:2039 setup.c:163 builtin/clone.c:407 builtin/diff.c:81 +#: grep.c:2037 setup.c:164 builtin/clone.c:409 builtin/diff.c:81 #: builtin/rm.c:134 #, c-format msgid "failed to stat '%s'" msgstr "" -#: grep.c:2050 +#: grep.c:2048 #, c-format msgid "'%s': short read" msgstr "" @@ -1924,7 +1993,7 @@ msgstr "" msgid "name consists only of disallowed characters: %s" msgstr "" -#: ident.c:416 builtin/commit.c:582 +#: ident.c:416 builtin/commit.c:587 #, c-format msgid "invalid date format: %s" msgstr "" @@ -1954,261 +2023,378 @@ msgstr "" msgid "Unable to create '%s.lock': %s" msgstr "" -#: merge.c:74 +#: merge.c:71 msgid "failed to read the cache" msgstr "" -#: merge.c:134 builtin/am.c:1946 builtin/am.c:1980 builtin/checkout.c:378 -#: builtin/checkout.c:599 builtin/clone.c:759 +#: merge.c:136 builtin/am.c:1946 builtin/am.c:1980 builtin/checkout.c:378 +#: builtin/checkout.c:606 builtin/clone.c:761 msgid "unable to write new index file" msgstr "" -#: merge-recursive.c:235 +#: merge-recursive.c:298 msgid "(bad commit)\n" msgstr "" -#: merge-recursive.c:257 merge-recursive.c:265 +#: merge-recursive.c:320 #, c-format -msgid "addinfo_cache failed for path '%s'" +msgid "add_cacheinfo failed for path '%s'; merge aborting." msgstr "" -#: merge-recursive.c:329 +#: merge-recursive.c:328 +#, c-format +msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." +msgstr "" + +#: merge-recursive.c:410 msgid "error building trees" msgstr "" -#: merge-recursive.c:771 +#: merge-recursive.c:881 #, c-format msgid "failed to create path '%s'%s" msgstr "" -#: merge-recursive.c:782 +#: merge-recursive.c:892 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "" -#: merge-recursive.c:796 merge-recursive.c:815 +#: merge-recursive.c:906 merge-recursive.c:925 msgid ": perhaps a D/F conflict?" msgstr "" -#: merge-recursive.c:805 +#: merge-recursive.c:915 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "" -#: merge-recursive.c:847 builtin/cat-file.c:37 +#: merge-recursive.c:957 builtin/cat-file.c:37 #, c-format msgid "cannot read object %s '%s'" msgstr "" -#: merge-recursive.c:849 +#: merge-recursive.c:959 #, c-format msgid "blob expected for %s '%s'" msgstr "" -#: merge-recursive.c:873 +#: merge-recursive.c:983 #, c-format msgid "failed to open '%s': %s" msgstr "" -#: merge-recursive.c:884 +#: merge-recursive.c:994 #, c-format msgid "failed to symlink '%s': %s" msgstr "" -#: merge-recursive.c:889 +#: merge-recursive.c:999 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "" -#: merge-recursive.c:1029 +#: merge-recursive.c:1186 +#, c-format +msgid "Failed to merge submodule %s (not checked out)" +msgstr "" + +#: merge-recursive.c:1193 +#, c-format +msgid "Failed to merge submodule %s (commits not present)" +msgstr "" + +#: merge-recursive.c:1200 +#, c-format +msgid "Failed to merge submodule %s (commits don't follow merge-base)" +msgstr "" + +#: merge-recursive.c:1208 merge-recursive.c:1220 +#, c-format +msgid "Fast-forwarding submodule %s to the following commit:" +msgstr "" + +#: merge-recursive.c:1211 merge-recursive.c:1223 +#, c-format +msgid "Fast-forwarding submodule %s to %s" +msgstr "" + +#: merge-recursive.c:1245 +#, c-format +msgid "Failed to merge submodule %s (merge following commits not found)" +msgstr "" + +#: merge-recursive.c:1249 +#, c-format +msgid "Failed to merge submodule %s (not fast-forward)" +msgstr "" + +#: merge-recursive.c:1250 +msgid "Found a possible merge resolution for the submodule:\n" +msgstr "" + +#: merge-recursive.c:1253 +#, c-format +msgid "" +"If this is correct simply add it to the index for example\n" +"by using:\n" +"\n" +" git update-index --cacheinfo 160000 %s \"%s\"\n" +"\n" +"which will accept this suggestion.\n" +msgstr "" + +#: merge-recursive.c:1262 +#, c-format +msgid "Failed to merge submodule %s (multiple merges found)" +msgstr "" + +#: merge-recursive.c:1321 msgid "Failed to execute internal merge" msgstr "" -#: merge-recursive.c:1034 +#: merge-recursive.c:1326 #, c-format msgid "Unable to add %s to database" msgstr "" -#: merge-recursive.c:1146 +#: merge-recursive.c:1358 +#, c-format +msgid "Auto-merging %s" +msgstr "" + +#: merge-recursive.c:1423 +#, c-format +msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." +msgstr "" + +#: merge-recursive.c:1475 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " "in tree." msgstr "" -#: merge-recursive.c:1151 +#: merge-recursive.c:1480 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " "left in tree." msgstr "" -#: merge-recursive.c:1158 +#: merge-recursive.c:1487 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " "in tree at %s." msgstr "" -#: merge-recursive.c:1163 +#: merge-recursive.c:1492 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " "left in tree at %s." msgstr "" -#: merge-recursive.c:1197 +#: merge-recursive.c:1526 msgid "rename" msgstr "" -#: merge-recursive.c:1197 +#: merge-recursive.c:1526 msgid "renamed" msgstr "" -#: merge-recursive.c:1254 +#: merge-recursive.c:1580 merge-recursive.c:1736 merge-recursive.c:2368 +#: merge-recursive.c:3086 +#, c-format +msgid "Refusing to lose dirty file at %s" +msgstr "" + +#: merge-recursive.c:1594 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "" -#: merge-recursive.c:1279 +#: merge-recursive.c:1599 +#, c-format +msgid "Refusing to lose untracked file at %s; adding as %s instead" +msgstr "" + +#: merge-recursive.c:1625 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" "\"->\"%s\" in \"%s\"%s" msgstr "" -#: merge-recursive.c:1284 +#: merge-recursive.c:1630 msgid " (left unresolved)" msgstr "" -#: merge-recursive.c:1346 +#: merge-recursive.c:1694 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" -#: merge-recursive.c:1379 +#: merge-recursive.c:1733 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "" -#: merge-recursive.c:1582 +#: merge-recursive.c:1745 +#, c-format +msgid "Refusing to lose untracked file at %s, even though it's in the way." +msgstr "" + +#: merge-recursive.c:1951 +#, c-format +msgid "" +"CONFLICT (directory rename split): Unclear where to place %s because " +"directory %s was renamed to multiple other directories, with no destination " +"getting a majority of the files." +msgstr "" + +#: merge-recursive.c:1983 +#, c-format +msgid "" +"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " +"implicit directory rename(s) putting the following path(s) there: %s." +msgstr "" + +#: merge-recursive.c:1993 +#, c-format +msgid "" +"CONFLICT (implicit dir rename): Cannot map more than one path to %s; " +"implicit directory renames tried to put these paths there: %s" +msgstr "" + +#: merge-recursive.c:2085 +#, c-format +msgid "" +"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" +">%s in %s" +msgstr "" + +#: merge-recursive.c:2330 +#, c-format +msgid "" +"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " +"renamed." +msgstr "" + +#: merge-recursive.c:2736 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" msgstr "" -#: merge-recursive.c:1597 +#: merge-recursive.c:2751 #, c-format msgid "Adding merged %s" msgstr "" -#: merge-recursive.c:1604 merge-recursive.c:1834 +#: merge-recursive.c:2758 merge-recursive.c:3089 #, c-format msgid "Adding as %s instead" msgstr "" -#: merge-recursive.c:1661 +#: merge-recursive.c:2914 #, c-format msgid "cannot read object %s" msgstr "" -#: merge-recursive.c:1664 +#: merge-recursive.c:2917 #, c-format msgid "object %s is not a blob" msgstr "" -#: merge-recursive.c:1733 +#: merge-recursive.c:2986 msgid "modify" msgstr "" -#: merge-recursive.c:1733 +#: merge-recursive.c:2986 msgid "modified" msgstr "" -#: merge-recursive.c:1743 +#: merge-recursive.c:2997 msgid "content" msgstr "" -#: merge-recursive.c:1750 +#: merge-recursive.c:3004 msgid "add/add" msgstr "" -#: merge-recursive.c:1786 +#: merge-recursive.c:3046 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "" -#: merge-recursive.c:1800 -#, c-format -msgid "Auto-merging %s" -msgstr "" - -#: merge-recursive.c:1804 git-submodule.sh:879 +#: merge-recursive.c:3055 git-submodule.sh:895 msgid "submodule" msgstr "" -#: merge-recursive.c:1805 +#: merge-recursive.c:3056 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "" -#: merge-recursive.c:1899 +#: merge-recursive.c:3178 #, c-format msgid "Removing %s" msgstr "" -#: merge-recursive.c:1925 +#: merge-recursive.c:3204 msgid "file/directory" msgstr "" -#: merge-recursive.c:1931 +#: merge-recursive.c:3210 msgid "directory/file" msgstr "" -#: merge-recursive.c:1938 +#: merge-recursive.c:3217 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" -#: merge-recursive.c:1947 +#: merge-recursive.c:3226 #, c-format msgid "Adding %s" msgstr "" -#: merge-recursive.c:1987 +#: merge-recursive.c:3267 #, c-format msgid "Dirty index: cannot merge (dirty: %s)" msgstr "" -#: merge-recursive.c:1991 +#: merge-recursive.c:3271 msgid "Already up to date!" msgstr "" -#: merge-recursive.c:2000 +#: merge-recursive.c:3280 #, c-format msgid "merging of trees %s and %s failed" msgstr "" -#: merge-recursive.c:2097 +#: merge-recursive.c:3379 msgid "Merging:" msgstr "" -#: merge-recursive.c:2110 +#: merge-recursive.c:3392 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "" msgstr[1] "" -#: merge-recursive.c:2149 +#: merge-recursive.c:3431 msgid "merge returned no commit" msgstr "" -#: merge-recursive.c:2212 +#: merge-recursive.c:3495 #, c-format msgid "Could not parse object '%s'" msgstr "" -#: merge-recursive.c:2228 builtin/merge.c:657 builtin/merge.c:816 +#: merge-recursive.c:3511 builtin/merge.c:658 builtin/merge.c:815 msgid "Unable to write index." msgstr "" @@ -2248,30 +2434,30 @@ msgstr "" msgid "Bad %s value: '%s'" msgstr "" -#: object.c:239 +#: object.c:242 #, c-format msgid "unable to parse object: %s" msgstr "" -#: packfile.c:561 +#: packfile.c:563 msgid "offset before end of packfile (broken .idx?)" msgstr "" -#: packfile.c:1694 +#: packfile.c:1742 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "" -#: packfile.c:1698 +#: packfile.c:1746 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "" -#: parse-options.c:619 +#: parse-options.c:621 msgid "..." msgstr "" -#: parse-options.c:638 +#: parse-options.c:640 #, c-format msgid "usage: %s" msgstr "" @@ -2279,26 +2465,31 @@ msgstr "" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c:644 +#: parse-options.c:646 #, c-format msgid " or: %s" msgstr "" -#: parse-options.c:647 +#: parse-options.c:649 #, c-format msgid " %s" msgstr "" -#: parse-options.c:686 +#: parse-options.c:688 msgid "-NUM" msgstr "" -#: parse-options-cb.c:108 +#: parse-options-cb.c:44 +#, c-format +msgid "malformed expiration date '%s'" +msgstr "" + +#: parse-options-cb.c:112 #, c-format msgid "malformed object name '%s'" msgstr "" -#: path.c:891 +#: path.c:892 #, c-format msgid "Could not make %s writable by group" msgstr "" @@ -2378,66 +2569,67 @@ msgstr "" msgid "unable to parse --pretty format" msgstr "" -#: read-cache.c:1473 +#: read-cache.c:1500 #, c-format msgid "" "index.version set, but the value is invalid.\n" "Using version %i" msgstr "" -#: read-cache.c:1483 +#: read-cache.c:1510 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" "Using version %i" msgstr "" -#: read-cache.c:2375 sequencer.c:3248 wrapper.c:658 builtin/merge.c:1049 +#: read-cache.c:2404 sequencer.c:4337 wrapper.c:658 builtin/merge.c:1047 #, c-format msgid "could not close '%s'" msgstr "" -#: read-cache.c:2448 sequencer.c:1900 sequencer.c:2627 +#: read-cache.c:2477 sequencer.c:2101 sequencer.c:3233 #, c-format msgid "could not stat '%s'" msgstr "" -#: read-cache.c:2461 +#: read-cache.c:2490 #, c-format msgid "unable to open git dir: %s" msgstr "" -#: read-cache.c:2473 +#: read-cache.c:2502 #, c-format msgid "unable to unlink: %s" msgstr "" -#: refs.c:706 +#: refs.c:732 sequencer.c:4333 sequencer.c:4392 wrapper.c:225 wrapper.c:395 +#: builtin/am.c:779 #, c-format -msgid "Could not open '%s' for writing" +msgid "could not open '%s' for writing" msgstr "" -#: refs.c:1850 +#: refs.c:1880 msgid "ref updates forbidden inside quarantine environment" msgstr "" -#: refs/files-backend.c:1189 +#: refs/files-backend.c:1191 #, c-format msgid "could not remove reference %s" msgstr "" -#: refs/files-backend.c:1203 refs/packed-backend.c:1528 -#: refs/packed-backend.c:1538 +#: refs/files-backend.c:1205 refs/packed-backend.c:1531 +#: refs/packed-backend.c:1541 #, c-format msgid "could not delete reference %s: %s" msgstr "" -#: refs/files-backend.c:1206 refs/packed-backend.c:1541 +#: refs/files-backend.c:1208 refs/packed-backend.c:1544 #, c-format msgid "could not delete references: %s" msgstr "" -#: ref-filter.c:35 wt-status.c:1842 +#: ref-filter.c:35 wt-status.c:1850 msgid "gone" msgstr "" @@ -2456,157 +2648,162 @@ msgstr "" msgid "ahead %d, behind %d" msgstr "" -#: ref-filter.c:107 +#: ref-filter.c:121 #, c-format msgid "expected format: %%(color:)" msgstr "" -#: ref-filter.c:109 +#: ref-filter.c:123 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "" -#: ref-filter.c:129 +#: ref-filter.c:145 #, c-format msgid "Integer value expected refname:lstrip=%s" msgstr "" -#: ref-filter.c:133 +#: ref-filter.c:149 #, c-format msgid "Integer value expected refname:rstrip=%s" msgstr "" -#: ref-filter.c:135 +#: ref-filter.c:151 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "" -#: ref-filter.c:184 +#: ref-filter.c:206 #, c-format msgid "%%(body) does not take arguments" msgstr "" -#: ref-filter.c:191 +#: ref-filter.c:215 #, c-format msgid "%%(subject) does not take arguments" msgstr "" -#: ref-filter.c:209 +#: ref-filter.c:235 #, c-format msgid "unknown %%(trailers) argument: %s" msgstr "" -#: ref-filter.c:232 +#: ref-filter.c:264 #, c-format msgid "positive value expected contents:lines=%s" msgstr "" -#: ref-filter.c:234 +#: ref-filter.c:266 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "" -#: ref-filter.c:247 +#: ref-filter.c:281 #, c-format msgid "positive value expected objectname:short=%s" msgstr "" -#: ref-filter.c:251 +#: ref-filter.c:285 #, c-format msgid "unrecognized %%(objectname) argument: %s" msgstr "" -#: ref-filter.c:278 +#: ref-filter.c:315 #, c-format msgid "expected format: %%(align:,)" msgstr "" -#: ref-filter.c:290 +#: ref-filter.c:327 #, c-format msgid "unrecognized position:%s" msgstr "" -#: ref-filter.c:294 +#: ref-filter.c:334 #, c-format msgid "unrecognized width:%s" msgstr "" -#: ref-filter.c:300 +#: ref-filter.c:343 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "" -#: ref-filter.c:304 +#: ref-filter.c:351 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "" -#: ref-filter.c:319 +#: ref-filter.c:369 #, c-format msgid "unrecognized %%(if) argument: %s" msgstr "" -#: ref-filter.c:409 +#: ref-filter.c:464 #, c-format msgid "malformed field name: %.*s" msgstr "" -#: ref-filter.c:435 +#: ref-filter.c:491 #, c-format msgid "unknown field name: %.*s" msgstr "" -#: ref-filter.c:547 +#: ref-filter.c:608 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "" -#: ref-filter.c:607 +#: ref-filter.c:671 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "" -#: ref-filter.c:609 +#: ref-filter.c:673 #, c-format msgid "format: %%(then) atom used more than once" msgstr "" -#: ref-filter.c:611 +#: ref-filter.c:675 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "" -#: ref-filter.c:637 +#: ref-filter.c:703 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "" -#: ref-filter.c:639 +#: ref-filter.c:705 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "" -#: ref-filter.c:641 +#: ref-filter.c:707 #, c-format msgid "format: %%(else) atom used more than once" msgstr "" -#: ref-filter.c:654 +#: ref-filter.c:722 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "" -#: ref-filter.c:709 +#: ref-filter.c:779 #, c-format msgid "malformed format string %s" msgstr "" -#: ref-filter.c:1313 +#: ref-filter.c:1387 #, c-format msgid "(no branch, rebasing %s)" msgstr "" -#: ref-filter.c:1316 +#: ref-filter.c:1390 +#, c-format +msgid "(no branch, rebasing detached HEAD %s)" +msgstr "" + +#: ref-filter.c:1393 #, c-format msgid "(no branch, bisect started on %s)" msgstr "" @@ -2614,7 +2811,7 @@ msgstr "" #. TRANSLATORS: make sure this matches "HEAD #. detached at " in wt-status.c #. -#: ref-filter.c:1324 +#: ref-filter.c:1401 #, c-format msgid "(HEAD detached at %s)" msgstr "" @@ -2622,147 +2819,147 @@ msgstr "" #. TRANSLATORS: make sure this matches "HEAD #. detached from " in wt-status.c #. -#: ref-filter.c:1331 +#: ref-filter.c:1408 #, c-format msgid "(HEAD detached from %s)" msgstr "" -#: ref-filter.c:1335 +#: ref-filter.c:1412 msgid "(no branch)" msgstr "" -#: ref-filter.c:1364 +#: ref-filter.c:1442 #, c-format msgid "missing object %s for %s" msgstr "" -#: ref-filter.c:1367 +#: ref-filter.c:1445 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "" -#: ref-filter.c:1819 +#: ref-filter.c:1902 #, c-format msgid "malformed object at '%s'" msgstr "" -#: ref-filter.c:1886 +#: ref-filter.c:1984 #, c-format msgid "ignoring ref with broken name %s" msgstr "" -#: ref-filter.c:1891 +#: ref-filter.c:1989 #, c-format msgid "ignoring broken ref %s" msgstr "" -#: ref-filter.c:2152 +#: ref-filter.c:2261 #, c-format msgid "format: %%(end) atom missing" msgstr "" -#: ref-filter.c:2246 +#: ref-filter.c:2365 #, c-format msgid "malformed object name %s" msgstr "" -#: remote.c:795 +#: remote.c:605 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "" -#: remote.c:799 +#: remote.c:609 #, c-format msgid "%s usually tracks %s, not %s" msgstr "" -#: remote.c:803 +#: remote.c:613 #, c-format msgid "%s tracks both %s and %s" msgstr "" -#: remote.c:811 +#: remote.c:621 msgid "Internal error" msgstr "" -#: remote.c:1726 remote.c:1828 +#: remote.c:1534 remote.c:1635 msgid "HEAD does not point to a branch" msgstr "" -#: remote.c:1735 +#: remote.c:1543 #, c-format msgid "no such branch: '%s'" msgstr "" -#: remote.c:1738 +#: remote.c:1546 #, c-format msgid "no upstream configured for branch '%s'" msgstr "" -#: remote.c:1744 +#: remote.c:1552 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "" -#: remote.c:1759 +#: remote.c:1567 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "" -#: remote.c:1771 +#: remote.c:1579 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "" -#: remote.c:1782 +#: remote.c:1589 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "" -#: remote.c:1795 +#: remote.c:1602 msgid "push has no destination (push.default is 'nothing')" msgstr "" -#: remote.c:1817 +#: remote.c:1624 msgid "cannot resolve 'simple' push to a single destination" msgstr "" -#: remote.c:2132 +#: remote.c:1939 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "" -#: remote.c:2136 +#: remote.c:1943 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr "" -#: remote.c:2139 +#: remote.c:1946 #, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "" -#: remote.c:2143 +#: remote.c:1950 #, c-format msgid "Your branch and '%s' refer to different commits.\n" msgstr "" -#: remote.c:2146 +#: remote.c:1953 #, c-format msgid " (use \"%s\" for details)\n" msgstr "" -#: remote.c:2150 +#: remote.c:1957 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "" msgstr[1] "" -#: remote.c:2156 +#: remote.c:1963 msgid " (use \"git push\" to publish your local commits)\n" msgstr "" -#: remote.c:2159 +#: remote.c:1966 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -2770,11 +2967,11 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: remote.c:2167 +#: remote.c:1974 msgid " (use \"git pull\" to update your local branch)\n" msgstr "" -#: remote.c:2170 +#: remote.c:1977 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -2785,28 +2982,28 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: remote.c:2180 +#: remote.c:1987 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr "" -#: revision.c:2277 +#: revision.c:2289 msgid "your current branch appears to be broken" msgstr "" -#: revision.c:2280 +#: revision.c:2292 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "" -#: revision.c:2477 +#: revision.c:2489 msgid "--first-parent is incompatible with --bisect" msgstr "" -#: run-command.c:731 +#: run-command.c:728 msgid "open /dev/null failed" msgstr "" -#: run-command.c:1274 +#: run-command.c:1271 #, c-format msgid "" "The '%s' hook was ignored because it's not set as executable.\n" @@ -2849,78 +3046,85 @@ msgstr "" msgid "the receiving end does not support push options" msgstr "" -#: sequencer.c:158 +#: sequencer.c:174 #, c-format msgid "invalid commit message cleanup mode '%s'" msgstr "" -#: sequencer.c:267 +#: sequencer.c:274 +#, c-format +msgid "could not delete '%s'" +msgstr "" + +#: sequencer.c:300 msgid "revert" msgstr "" -#: sequencer.c:269 +#: sequencer.c:302 msgid "cherry-pick" msgstr "" -#: sequencer.c:271 +#: sequencer.c:304 msgid "rebase -i" msgstr "" -#: sequencer.c:273 +#: sequencer.c:306 #, c-format msgid "Unknown action: %d" msgstr "" -#: sequencer.c:330 +#: sequencer.c:363 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add ' or 'git rm '" msgstr "" -#: sequencer.c:333 +#: sequencer.c:366 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add ' or 'git rm '\n" "and commit the result with 'git commit'" msgstr "" -#: sequencer.c:346 sequencer.c:2245 +#: sequencer.c:379 sequencer.c:2467 #, c-format msgid "could not lock '%s'" msgstr "" -#: sequencer.c:349 sequencer.c:2124 sequencer.c:2250 sequencer.c:2264 -#: sequencer.c:3246 sequencer.c:3310 wrapper.c:656 +#: sequencer.c:381 sequencer.c:2345 sequencer.c:2471 sequencer.c:2485 +#: sequencer.c:2693 sequencer.c:4335 sequencer.c:4398 wrapper.c:656 #, c-format msgid "could not write to '%s'" msgstr "" -#: sequencer.c:353 +#: sequencer.c:386 #, c-format msgid "could not write eol to '%s'" msgstr "" -#: sequencer.c:356 sequencer.c:2128 sequencer.c:2252 +#: sequencer.c:391 sequencer.c:2350 sequencer.c:2473 sequencer.c:2487 +#: sequencer.c:2701 #, c-format msgid "failed to finalize '%s'" msgstr "" -#: sequencer.c:379 sequencer.c:1340 sequencer.c:2148 builtin/am.c:259 -#: builtin/commit.c:722 builtin/merge.c:1047 +#: sequencer.c:414 sequencer.c:803 sequencer.c:1492 sequencer.c:2370 +#: sequencer.c:2683 sequencer.c:2787 builtin/am.c:259 builtin/commit.c:727 +#: builtin/merge.c:1045 #, c-format msgid "could not read '%s'" msgstr "" -#: sequencer.c:405 +#: sequencer.c:440 #, c-format msgid "your local changes would be overwritten by %s." msgstr "" -#: sequencer.c:409 +#: sequencer.c:444 msgid "commit your changes or stash them to proceed." msgstr "" -#: sequencer.c:438 +#: sequencer.c:473 #, c-format msgid "%s: fast-forward" msgstr "" @@ -2928,20 +3132,20 @@ msgstr "" #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase -i". #. -#: sequencer.c:526 +#: sequencer.c:562 #, c-format msgid "%s: Unable to write new index file" msgstr "" -#: sequencer.c:542 -msgid "could not resolve HEAD commit" -msgstr "" - -#: sequencer.c:562 +#: sequencer.c:578 msgid "unable to update cache tree" msgstr "" -#: sequencer.c:658 +#: sequencer.c:591 +msgid "could not resolve HEAD commit" +msgstr "" + +#: sequencer.c:748 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -2958,11 +3162,15 @@ msgid "" " git rebase --continue\n" msgstr "" -#: sequencer.c:915 +#: sequencer.c:817 +msgid "writing root commit" +msgstr "" + +#: sequencer.c:1042 msgid "'prepare-commit-msg' hook failed" msgstr "" -#: sequencer.c:922 +#: sequencer.c:1049 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -2977,7 +3185,7 @@ msgid "" " git commit --amend --reset-author\n" msgstr "" -#: sequencer.c:935 +#: sequencer.c:1062 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -2991,321 +3199,313 @@ msgid "" " git commit --amend --reset-author\n" msgstr "" -#: sequencer.c:975 +#: sequencer.c:1102 msgid "couldn't look up newly created commit" msgstr "" -#: sequencer.c:977 +#: sequencer.c:1104 msgid "could not parse newly created commit" msgstr "" -#: sequencer.c:1023 +#: sequencer.c:1150 msgid "unable to resolve HEAD after creating commit" msgstr "" -#: sequencer.c:1025 +#: sequencer.c:1152 msgid "detached HEAD" msgstr "" -#: sequencer.c:1029 +#: sequencer.c:1156 msgid " (root-commit)" msgstr "" -#: sequencer.c:1050 +#: sequencer.c:1177 msgid "could not parse HEAD" msgstr "" -#: sequencer.c:1052 +#: sequencer.c:1179 #, c-format msgid "HEAD %s is not a commit!" msgstr "" -#: sequencer.c:1056 builtin/commit.c:1491 +#: sequencer.c:1183 builtin/commit.c:1528 msgid "could not parse HEAD commit" msgstr "" -#: sequencer.c:1107 sequencer.c:1673 +#: sequencer.c:1234 sequencer.c:1831 msgid "unable to parse commit author" msgstr "" -#: sequencer.c:1117 builtin/am.c:1630 builtin/merge.c:643 +#: sequencer.c:1244 builtin/am.c:1630 builtin/merge.c:644 msgid "git write-tree failed to write a tree" msgstr "" -#: sequencer.c:1134 sequencer.c:1186 +#: sequencer.c:1261 sequencer.c:1316 #, c-format msgid "unable to read commit message from '%s'" msgstr "" -#: sequencer.c:1154 builtin/am.c:1650 builtin/commit.c:1594 builtin/merge.c:826 -#: builtin/merge.c:851 +#: sequencer.c:1283 builtin/am.c:1650 builtin/commit.c:1631 builtin/merge.c:824 +#: builtin/merge.c:849 msgid "failed to write commit object" msgstr "" -#: sequencer.c:1213 +#: sequencer.c:1343 #, c-format msgid "could not parse commit %s" msgstr "" -#: sequencer.c:1218 +#: sequencer.c:1348 #, c-format msgid "could not parse parent commit %s" msgstr "" -#: sequencer.c:1347 -#, c-format -msgid "" -"unexpected 1st line of squash message:\n" -"\n" -"\t%.*s" -msgstr "" - -#: sequencer.c:1353 -#, c-format -msgid "" -"invalid 1st line of squash message:\n" -"\n" -"\t%.*s" -msgstr "" - -#: sequencer.c:1359 sequencer.c:1384 +#: sequencer.c:1499 sequencer.c:1524 #, c-format msgid "This is a combination of %d commits." msgstr "" -#: sequencer.c:1368 sequencer.c:3265 +#: sequencer.c:1509 sequencer.c:4354 msgid "need a HEAD to fixup" msgstr "" -#: sequencer.c:1370 +#: sequencer.c:1511 sequencer.c:2728 msgid "could not read HEAD" msgstr "" -#: sequencer.c:1372 +#: sequencer.c:1513 msgid "could not read HEAD's commit message" msgstr "" -#: sequencer.c:1378 +#: sequencer.c:1519 #, c-format msgid "cannot write '%s'" msgstr "" -#: sequencer.c:1387 git-rebase--interactive.sh:452 +#: sequencer.c:1526 git-rebase--interactive.sh:457 msgid "This is the 1st commit message:" msgstr "" -#: sequencer.c:1395 +#: sequencer.c:1534 #, c-format msgid "could not read commit message of %s" msgstr "" -#: sequencer.c:1402 +#: sequencer.c:1541 #, c-format msgid "This is the commit message #%d:" msgstr "" -#: sequencer.c:1407 +#: sequencer.c:1547 #, c-format msgid "The commit message #%d will be skipped:" msgstr "" -#: sequencer.c:1412 +#: sequencer.c:1552 #, c-format msgid "unknown command: %d" msgstr "" -#: sequencer.c:1479 +#: sequencer.c:1630 msgid "your index file is unmerged." msgstr "" -#: sequencer.c:1498 +#: sequencer.c:1637 +msgid "cannot fixup root commit" +msgstr "" + +#: sequencer.c:1656 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "" -#: sequencer.c:1506 +#: sequencer.c:1664 #, c-format msgid "commit %s does not have parent %d" msgstr "" -#: sequencer.c:1510 +#: sequencer.c:1668 #, c-format msgid "mainline was specified but commit %s is not a merge." msgstr "" -#: sequencer.c:1516 +#: sequencer.c:1674 #, c-format msgid "cannot get commit message for %s" msgstr "" #. TRANSLATORS: The first %s will be a "todo" command like #. "revert" or "pick", the second %s a SHA1. -#: sequencer.c:1535 +#: sequencer.c:1693 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "" -#: sequencer.c:1600 sequencer.c:2397 +#: sequencer.c:1758 #, c-format msgid "could not rename '%s' to '%s'" msgstr "" -#: sequencer.c:1654 +#: sequencer.c:1812 #, c-format msgid "could not revert %s... %s" msgstr "" -#: sequencer.c:1655 +#: sequencer.c:1813 #, c-format msgid "could not apply %s... %s" msgstr "" -#: sequencer.c:1702 +#: sequencer.c:1863 msgid "empty commit set passed" msgstr "" -#: sequencer.c:1712 +#: sequencer.c:1873 #, c-format msgid "git %s: failed to read the index" msgstr "" -#: sequencer.c:1718 +#: sequencer.c:1880 #, c-format msgid "git %s: failed to refresh the index" msgstr "" -#: sequencer.c:1792 +#: sequencer.c:1960 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "" -#: sequencer.c:1801 +#: sequencer.c:1969 #, c-format msgid "missing arguments for %s" msgstr "" -#: sequencer.c:1844 +#: sequencer.c:2028 #, c-format msgid "invalid line %d: %.*s" msgstr "" -#: sequencer.c:1852 +#: sequencer.c:2036 #, c-format msgid "cannot '%s' without a previous commit" msgstr "" -#: sequencer.c:1883 sequencer.c:3056 sequencer.c:3091 +#: sequencer.c:2084 sequencer.c:4137 sequencer.c:4172 #, c-format msgid "could not read '%s'." msgstr "" -#: sequencer.c:1906 +#: sequencer.c:2107 msgid "please fix this using 'git rebase --edit-todo'." msgstr "" -#: sequencer.c:1908 +#: sequencer.c:2109 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "" -#: sequencer.c:1913 +#: sequencer.c:2114 msgid "no commits parsed." msgstr "" -#: sequencer.c:1924 +#: sequencer.c:2125 msgid "cannot cherry-pick during a revert." msgstr "" -#: sequencer.c:1926 +#: sequencer.c:2127 msgid "cannot revert during a cherry-pick." msgstr "" -#: sequencer.c:1993 +#: sequencer.c:2194 #, c-format msgid "invalid key: %s" msgstr "" -#: sequencer.c:1996 +#: sequencer.c:2197 #, c-format msgid "invalid value for %s: %s" msgstr "" -#: sequencer.c:2062 +#: sequencer.c:2268 +msgid "unusable squash-onto" +msgstr "" + +#: sequencer.c:2284 #, c-format msgid "malformed options sheet: '%s'" msgstr "" -#: sequencer.c:2100 +#: sequencer.c:2322 msgid "a cherry-pick or revert is already in progress" msgstr "" -#: sequencer.c:2101 +#: sequencer.c:2323 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "" -#: sequencer.c:2104 +#: sequencer.c:2326 #, c-format msgid "could not create sequencer directory '%s'" msgstr "" -#: sequencer.c:2118 +#: sequencer.c:2340 msgid "could not lock HEAD" msgstr "" -#: sequencer.c:2173 sequencer.c:2761 +#: sequencer.c:2395 sequencer.c:3402 msgid "no cherry-pick or revert in progress" msgstr "" -#: sequencer.c:2175 +#: sequencer.c:2397 msgid "cannot resolve HEAD" msgstr "" -#: sequencer.c:2177 sequencer.c:2212 +#: sequencer.c:2399 sequencer.c:2434 msgid "cannot abort from a branch yet to be born" msgstr "" -#: sequencer.c:2198 builtin/grep.c:720 +#: sequencer.c:2420 builtin/grep.c:720 #, c-format msgid "cannot open '%s'" msgstr "" -#: sequencer.c:2200 +#: sequencer.c:2422 #, c-format msgid "cannot read '%s': %s" msgstr "" -#: sequencer.c:2201 +#: sequencer.c:2423 msgid "unexpected end of file" msgstr "" -#: sequencer.c:2207 +#: sequencer.c:2429 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "" -#: sequencer.c:2218 +#: sequencer.c:2440 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "" -#: sequencer.c:2324 sequencer.c:2679 +#: sequencer.c:2544 sequencer.c:3320 #, c-format msgid "could not update %s" msgstr "" -#: sequencer.c:2362 sequencer.c:2659 +#: sequencer.c:2582 sequencer.c:3300 msgid "cannot read HEAD" msgstr "" -#: sequencer.c:2402 builtin/difftool.c:639 +#: sequencer.c:2617 sequencer.c:2621 builtin/difftool.c:639 #, c-format msgid "could not copy '%s' to '%s'" msgstr "" -#: sequencer.c:2421 +#: sequencer.c:2640 msgid "could not read index" msgstr "" -#: sequencer.c:2426 +#: sequencer.c:2645 #, c-format msgid "" "execution failed: %s\n" @@ -3315,11 +3515,11 @@ msgid "" "\n" msgstr "" -#: sequencer.c:2432 +#: sequencer.c:2651 msgid "and made changes to the index and/or the working tree\n" msgstr "" -#: sequencer.c:2438 +#: sequencer.c:2657 #, c-format msgid "" "execution succeeded: %s\n" @@ -3330,17 +3530,62 @@ msgid "" "\n" msgstr "" -#: sequencer.c:2497 +#: sequencer.c:2770 +msgid "writing fake root commit" +msgstr "" + +#: sequencer.c:2775 +msgid "writing squash-onto" +msgstr "" + +#: sequencer.c:2810 +#, c-format +msgid "failed to find tree of %s" +msgstr "" + +#: sequencer.c:2828 +msgid "could not write index" +msgstr "" + +#: sequencer.c:2860 +msgid "cannot merge without a current revision" +msgstr "" + +#: sequencer.c:2883 +#, c-format +msgid "could not resolve '%s'" +msgstr "" + +#: sequencer.c:2905 +#, c-format +msgid "could not get commit message of '%s'" +msgstr "" + +#: sequencer.c:2915 sequencer.c:2940 +#, c-format +msgid "could not write '%s'" +msgstr "" + +#: sequencer.c:3004 +#, c-format +msgid "could not even attempt to merge '%.*s'" +msgstr "" + +#: sequencer.c:3020 +msgid "merge: Unable to write new index file" +msgstr "" + +#: sequencer.c:3087 #, c-format msgid "Applied autostash.\n" msgstr "" -#: sequencer.c:2509 +#: sequencer.c:3099 #, c-format msgid "cannot store %s" msgstr "" -#: sequencer.c:2512 git-rebase.sh:178 +#: sequencer.c:3102 git-rebase.sh:188 #, c-format msgid "" "Applying autostash resulted in conflicts.\n" @@ -3348,103 +3593,121 @@ msgid "" "You can run \"git stash pop\" or \"git stash drop\" at any time.\n" msgstr "" -#: sequencer.c:2595 +#: sequencer.c:3133 +#, c-format +msgid "" +"Could not execute the todo command\n" +"\n" +" %.*s\n" +"It has been rescheduled; To edit the command before continuing, please\n" +"edit the todo list first:\n" +"\n" +" git rebase --edit-todo\n" +" git rebase --continue\n" +msgstr "" + +#: sequencer.c:3201 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "" -#: sequencer.c:2637 +#: sequencer.c:3263 #, c-format msgid "unknown command %d" msgstr "" -#: sequencer.c:2667 +#: sequencer.c:3308 msgid "could not read orig-head" msgstr "" -#: sequencer.c:2672 sequencer.c:3262 +#: sequencer.c:3313 sequencer.c:4351 msgid "could not read 'onto'" msgstr "" -#: sequencer.c:2686 +#: sequencer.c:3327 #, c-format msgid "could not update HEAD to %s" msgstr "" -#: sequencer.c:2770 +#: sequencer.c:3413 msgid "cannot rebase: You have unstaged changes." msgstr "" -#: sequencer.c:2775 -msgid "could not remove CHERRY_PICK_HEAD" -msgstr "" - -#: sequencer.c:2784 +#: sequencer.c:3422 msgid "cannot amend non-existing commit" msgstr "" -#: sequencer.c:2786 +#: sequencer.c:3424 #, c-format msgid "invalid file: '%s'" msgstr "" -#: sequencer.c:2788 +#: sequencer.c:3426 #, c-format msgid "invalid contents: '%s'" msgstr "" -#: sequencer.c:2791 +#: sequencer.c:3429 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" "first and then run 'git rebase --continue' again." msgstr "" -#: sequencer.c:2801 +#: sequencer.c:3454 sequencer.c:3492 +#, c-format +msgid "could not write file: '%s'" +msgstr "" + +#: sequencer.c:3507 +msgid "could not remove CHERRY_PICK_HEAD" +msgstr "" + +#: sequencer.c:3514 msgid "could not commit staged changes." msgstr "" -#: sequencer.c:2881 +#: sequencer.c:3611 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "" -#: sequencer.c:2885 +#: sequencer.c:3615 #, c-format msgid "%s: bad revision" msgstr "" -#: sequencer.c:2918 +#: sequencer.c:3648 msgid "can't revert as initial commit" msgstr "" -#: sequencer.c:3023 +#: sequencer.c:4097 msgid "make_script: unhandled options" msgstr "" -#: sequencer.c:3026 +#: sequencer.c:4100 msgid "make_script: error preparing revisions" msgstr "" -#: sequencer.c:3060 sequencer.c:3095 +#: sequencer.c:4141 sequencer.c:4176 #, c-format msgid "unusable todo list: '%s'" msgstr "" -#: sequencer.c:3146 +#: sequencer.c:4235 #, c-format msgid "" "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." msgstr "" -#: sequencer.c:3212 +#: sequencer.c:4301 #, c-format msgid "" "Warning: some commits may have been dropped accidentally.\n" "Dropped commits (newer to older):\n" msgstr "" -#: sequencer.c:3219 +#: sequencer.c:4308 #, c-format msgid "" "To avoid this message, use \"drop\" to explicitly remove a commit.\n" @@ -3455,7 +3718,7 @@ msgid "" "\n" msgstr "" -#: sequencer.c:3231 +#: sequencer.c:4320 #, c-format msgid "" "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" @@ -3463,34 +3726,28 @@ msgid "" "Or you can abort the rebase with 'git rebase --abort'.\n" msgstr "" -#: sequencer.c:3244 sequencer.c:3304 wrapper.c:225 wrapper.c:395 -#: builtin/am.c:779 -#, c-format -msgid "could not open '%s' for writing" -msgstr "" - -#: sequencer.c:3285 +#: sequencer.c:4374 #, c-format msgid "could not parse commit '%s'" msgstr "" -#: sequencer.c:3401 +#: sequencer.c:4489 msgid "the script was already rearranged." msgstr "" -#: setup.c:122 +#: setup.c:123 #, c-format msgid "'%s' is outside repository" msgstr "" -#: setup.c:171 +#: setup.c:172 #, c-format msgid "" "%s: no such path in the working tree.\n" "Use 'git -- ...' to specify paths that do not exist locally." msgstr "" -#: setup.c:184 +#: setup.c:185 #, c-format msgid "" "ambiguous argument '%s': unknown revision or path not in the working tree.\n" @@ -3498,12 +3755,12 @@ msgid "" "'git [...] -- [...]'" msgstr "" -#: setup.c:233 +#: setup.c:234 #, c-format msgid "option '%s' must come before non-option arguments" msgstr "" -#: setup.c:252 +#: setup.c:253 #, c-format msgid "" "ambiguous argument '%s': both revision and filename\n" @@ -3511,152 +3768,152 @@ msgid "" "'git [...] -- [...]'" msgstr "" -#: setup.c:388 +#: setup.c:389 msgid "unable to set up work tree using invalid config" msgstr "" -#: setup.c:395 +#: setup.c:393 msgid "this operation must be run in a work tree" msgstr "" -#: setup.c:506 +#: setup.c:503 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "" -#: setup.c:514 +#: setup.c:511 msgid "unknown repository extensions found:" msgstr "" -#: setup.c:533 +#: setup.c:530 #, c-format msgid "error opening '%s'" msgstr "" -#: setup.c:535 +#: setup.c:532 #, c-format msgid "too large to be a .git file: '%s'" msgstr "" -#: setup.c:537 +#: setup.c:534 #, c-format msgid "error reading %s" msgstr "" -#: setup.c:539 +#: setup.c:536 #, c-format msgid "invalid gitfile format: %s" msgstr "" -#: setup.c:541 +#: setup.c:538 #, c-format msgid "no path in gitfile: %s" msgstr "" -#: setup.c:543 +#: setup.c:540 #, c-format msgid "not a git repository: %s" msgstr "" -#: setup.c:642 +#: setup.c:639 #, c-format msgid "'$%s' too big" msgstr "" -#: setup.c:656 +#: setup.c:653 #, c-format msgid "not a git repository: '%s'" msgstr "" -#: setup.c:685 setup.c:687 setup.c:718 +#: setup.c:682 setup.c:684 setup.c:715 #, c-format msgid "cannot chdir to '%s'" msgstr "" -#: setup.c:690 setup.c:746 setup.c:756 setup.c:795 setup.c:803 setup.c:818 +#: setup.c:687 setup.c:743 setup.c:753 setup.c:792 setup.c:800 setup.c:815 msgid "cannot come back to cwd" msgstr "" -#: setup.c:816 +#: setup.c:813 #, c-format msgid "not a git repository (or any of the parent directories): %s" msgstr "" -#: setup.c:827 +#: setup.c:824 #, c-format msgid "failed to stat '%*s%s%s'" msgstr "" -#: setup.c:1057 +#: setup.c:1054 msgid "Unable to read current working directory" msgstr "" -#: setup.c:1069 setup.c:1075 +#: setup.c:1066 setup.c:1072 #, c-format msgid "cannot change to '%s'" msgstr "" -#: setup.c:1088 +#: setup.c:1085 #, c-format msgid "" "not a git repository (or any parent up to mount point %s)\n" "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)." msgstr "" -#: setup.c:1172 +#: setup.c:1168 #, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" "The owner of files must always have read and write permissions." msgstr "" -#: setup.c:1215 +#: setup.c:1211 msgid "open /dev/null or dup failed" msgstr "" -#: setup.c:1230 +#: setup.c:1226 msgid "fork failed" msgstr "" -#: setup.c:1235 +#: setup.c:1231 msgid "setsid failed" msgstr "" -#: sha1_file.c:592 +#: sha1-file.c:625 #, c-format msgid "path '%s' does not exist" msgstr "" -#: sha1_file.c:618 +#: sha1-file.c:651 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "" -#: sha1_file.c:624 +#: sha1-file.c:657 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "" -#: sha1_file.c:630 +#: sha1-file.c:663 #, c-format msgid "reference repository '%s' is shallow" msgstr "" -#: sha1_file.c:638 +#: sha1-file.c:671 #, c-format msgid "reference repository '%s' is grafted" msgstr "" -#: sha1_name.c:422 +#: sha1-name.c:442 #, c-format msgid "short SHA1 %s is ambiguous" msgstr "" -#: sha1_name.c:433 +#: sha1-name.c:453 msgid "The candidates are:" msgstr "" -#: sha1_name.c:693 +#: sha1-name.c:695 msgid "" "Git normally never creates a ref that ends with 40 hex characters\n" "because it will be ignored when you just specify 40-hex. These refs\n" @@ -3669,86 +3926,86 @@ msgid "" "running \"git config advice.objectNameWarning false\"" msgstr "" -#: submodule.c:96 submodule.c:130 +#: submodule.c:97 submodule.c:131 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" -#: submodule.c:100 submodule.c:134 +#: submodule.c:101 submodule.c:135 #, c-format msgid "Could not find section in .gitmodules where path=%s" msgstr "" -#: submodule.c:108 +#: submodule.c:109 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "" -#: submodule.c:141 +#: submodule.c:142 #, c-format msgid "Could not remove .gitmodules entry for %s" msgstr "" -#: submodule.c:152 +#: submodule.c:153 msgid "staging updated .gitmodules failed" msgstr "" -#: submodule.c:312 +#: submodule.c:315 #, c-format msgid "in unpopulated submodule '%s'" msgstr "" -#: submodule.c:343 +#: submodule.c:346 #, c-format msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "" -#: submodule.c:833 +#: submodule.c:837 #, c-format msgid "submodule entry '%s' (%s) is a %s, not a commit" msgstr "" -#: submodule.c:1065 builtin/branch.c:648 builtin/submodule--helper.c:1724 +#: submodule.c:1069 builtin/branch.c:651 builtin/submodule--helper.c:1743 msgid "Failed to resolve HEAD as a valid ref." msgstr "" -#: submodule.c:1370 +#: submodule.c:1373 #, c-format msgid "'%s' not recognized as a git repository" msgstr "" -#: submodule.c:1508 +#: submodule.c:1511 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "" -#: submodule.c:1521 +#: submodule.c:1524 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "" -#: submodule.c:1614 +#: submodule.c:1617 #, c-format msgid "submodule '%s' has dirty index" msgstr "" -#: submodule.c:1878 +#: submodule.c:1716 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" msgstr "" -#: submodule.c:1890 submodule.c:1946 +#: submodule.c:1728 submodule.c:1784 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "" -#: submodule.c:1894 builtin/submodule--helper.c:1246 -#: builtin/submodule--helper.c:1256 +#: submodule.c:1732 builtin/submodule--helper.c:1261 +#: builtin/submodule--helper.c:1271 #, c-format msgid "could not create directory '%s'" msgstr "" -#: submodule.c:1897 +#: submodule.c:1735 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -3756,29 +4013,30 @@ msgid "" "'%s'\n" msgstr "" -#: submodule.c:1981 +#: submodule.c:1819 #, c-format msgid "could not recurse into submodule '%s'" msgstr "" -#: submodule.c:2025 +#: submodule.c:1863 msgid "could not start ls-files in .." msgstr "" -#: submodule.c:2045 -msgid "BUG: returned path string doesn't match cwd?" -msgstr "" - -#: submodule.c:2064 +#: submodule.c:1902 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "" -#: submodule-config.c:263 +#: submodule-config.c:230 +#, c-format +msgid "ignoring suspicious submodule name: %s" +msgstr "" + +#: submodule-config.c:294 msgid "negative values not allowed for submodule.fetchjobs" msgstr "" -#: submodule-config.c:436 +#: submodule-config.c:467 #, c-format msgid "invalid value for %s" msgstr "" @@ -3794,7 +4052,7 @@ msgstr "" msgid "unknown value '%s' for key '%s'" msgstr "" -#: trailer.c:539 trailer.c:544 builtin/remote.c:290 +#: trailer.c:539 trailer.c:544 builtin/remote.c:293 #, c-format msgid "more than one %s" msgstr "" @@ -3837,24 +4095,28 @@ msgstr "" msgid "could not rename temporary file to %s" msgstr "" -#: transport.c:63 +#: transport.c:116 #, c-format msgid "Would set upstream of '%s' to '%s' of '%s'\n" msgstr "" -#: transport.c:152 +#: transport.c:208 #, c-format msgid "transport: invalid depth option '%s'" msgstr "" -#: transport.c:916 +#: transport.c:584 +msgid "could not parse transport.color.* config" +msgstr "" + +#: transport.c:996 #, c-format msgid "" "The following submodule paths contain changes that can\n" "not be found on any remote:\n" msgstr "" -#: transport.c:920 +#: transport.c:1000 #, c-format msgid "" "\n" @@ -3870,11 +4132,11 @@ msgid "" "\n" msgstr "" -#: transport.c:928 +#: transport.c:1008 msgid "Aborting." msgstr "" -#: transport-helper.c:1079 +#: transport-helper.c:1087 #, c-format msgid "Could not read ref %s" msgstr "" @@ -3891,102 +4153,102 @@ msgstr "" msgid "empty filename in tree entry" msgstr "" -#: tree-walk.c:114 +#: tree-walk.c:113 msgid "too-short tree file" msgstr "" -#: unpack-trees.c:108 +#: unpack-trees.c:111 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" "%%sPlease commit your changes or stash them before you switch branches." msgstr "" -#: unpack-trees.c:110 +#: unpack-trees.c:113 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" "%%s" msgstr "" -#: unpack-trees.c:113 +#: unpack-trees.c:116 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" "%%sPlease commit your changes or stash them before you merge." msgstr "" -#: unpack-trees.c:115 +#: unpack-trees.c:118 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" "%%s" msgstr "" -#: unpack-trees.c:118 +#: unpack-trees.c:121 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" "%%sPlease commit your changes or stash them before you %s." msgstr "" -#: unpack-trees.c:120 +#: unpack-trees.c:123 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" "%%s" msgstr "" -#: unpack-trees.c:125 +#: unpack-trees.c:128 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" "%s" msgstr "" -#: unpack-trees.c:129 +#: unpack-trees.c:132 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" "%%sPlease move or remove them before you switch branches." msgstr "" -#: unpack-trees.c:131 -#, c-format -msgid "" -"The following untracked working tree files would be removed by checkout:\n" -"%%s" -msgstr "" - #: unpack-trees.c:134 #, c-format msgid "" +"The following untracked working tree files would be removed by checkout:\n" +"%%s" +msgstr "" + +#: unpack-trees.c:137 +#, c-format +msgid "" "The following untracked working tree files would be removed by merge:\n" "%%sPlease move or remove them before you merge." msgstr "" -#: unpack-trees.c:136 +#: unpack-trees.c:139 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" "%%s" msgstr "" -#: unpack-trees.c:139 +#: unpack-trees.c:142 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" "%%sPlease move or remove them before you %s." msgstr "" -#: unpack-trees.c:141 +#: unpack-trees.c:144 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" "%%s" msgstr "" -#: unpack-trees.c:146 +#: unpack-trees.c:150 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -3994,7 +4256,7 @@ msgid "" "%%sPlease move or remove them before you switch branches." msgstr "" -#: unpack-trees.c:148 +#: unpack-trees.c:152 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -4002,47 +4264,47 @@ msgid "" "%%s" msgstr "" -#: unpack-trees.c:151 +#: unpack-trees.c:155 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" "%%sPlease move or remove them before you merge." msgstr "" -#: unpack-trees.c:153 +#: unpack-trees.c:157 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" "%%s" msgstr "" -#: unpack-trees.c:156 +#: unpack-trees.c:160 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" "%%sPlease move or remove them before you %s." msgstr "" -#: unpack-trees.c:158 +#: unpack-trees.c:162 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" "%%s" msgstr "" -#: unpack-trees.c:165 +#: unpack-trees.c:170 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "" -#: unpack-trees.c:168 +#: unpack-trees.c:173 #, c-format msgid "" "Cannot update sparse checkout: the following entries are not up to date:\n" "%s" msgstr "" -#: unpack-trees.c:170 +#: unpack-trees.c:175 #, c-format msgid "" "The following working tree files would be overwritten by sparse checkout " @@ -4050,7 +4312,7 @@ msgid "" "%s" msgstr "" -#: unpack-trees.c:172 +#: unpack-trees.c:177 #, c-format msgid "" "The following working tree files would be removed by sparse checkout " @@ -4058,19 +4320,19 @@ msgid "" "%s" msgstr "" -#: unpack-trees.c:174 +#: unpack-trees.c:179 #, c-format msgid "" "Cannot update submodule:\n" "%s" msgstr "" -#: unpack-trees.c:251 +#: unpack-trees.c:262 #, c-format msgid "Aborting\n" msgstr "" -#: unpack-trees.c:333 +#: unpack-trees.c:344 msgid "Checking out files" msgstr "" @@ -4139,7 +4401,7 @@ msgid "could not open '%s' for reading and writing" msgstr "" #: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:770 -#: builtin/am.c:862 builtin/merge.c:1044 +#: builtin/am.c:862 builtin/merge.c:1042 #, c-format msgid "could not open '%s' for reading" msgstr "" @@ -4153,374 +4415,374 @@ msgstr "" msgid "unable to get current working directory" msgstr "" -#: wt-status.c:151 +#: wt-status.c:154 msgid "Unmerged paths:" msgstr "" -#: wt-status.c:178 wt-status.c:205 +#: wt-status.c:181 wt-status.c:208 #, c-format msgid " (use \"git reset %s ...\" to unstage)" msgstr "" -#: wt-status.c:180 wt-status.c:207 +#: wt-status.c:183 wt-status.c:210 msgid " (use \"git rm --cached ...\" to unstage)" msgstr "" -#: wt-status.c:184 +#: wt-status.c:187 msgid " (use \"git add ...\" to mark resolution)" msgstr "" -#: wt-status.c:186 wt-status.c:190 +#: wt-status.c:189 wt-status.c:193 msgid " (use \"git add/rm ...\" as appropriate to mark resolution)" msgstr "" -#: wt-status.c:188 +#: wt-status.c:191 msgid " (use \"git rm ...\" to mark resolution)" msgstr "" -#: wt-status.c:199 wt-status.c:1007 +#: wt-status.c:202 wt-status.c:1015 msgid "Changes to be committed:" msgstr "" -#: wt-status.c:217 wt-status.c:1016 +#: wt-status.c:220 wt-status.c:1024 msgid "Changes not staged for commit:" msgstr "" -#: wt-status.c:221 +#: wt-status.c:224 msgid " (use \"git add ...\" to update what will be committed)" msgstr "" -#: wt-status.c:223 +#: wt-status.c:226 msgid " (use \"git add/rm ...\" to update what will be committed)" msgstr "" -#: wt-status.c:224 +#: wt-status.c:227 msgid "" " (use \"git checkout -- ...\" to discard changes in working directory)" msgstr "" -#: wt-status.c:226 +#: wt-status.c:229 msgid " (commit or discard the untracked or modified content in submodules)" msgstr "" -#: wt-status.c:238 +#: wt-status.c:241 #, c-format msgid " (use \"git %s ...\" to include in what will be committed)" msgstr "" -#: wt-status.c:253 +#: wt-status.c:256 msgid "both deleted:" msgstr "" -#: wt-status.c:255 +#: wt-status.c:258 msgid "added by us:" msgstr "" -#: wt-status.c:257 +#: wt-status.c:260 msgid "deleted by them:" msgstr "" -#: wt-status.c:259 +#: wt-status.c:262 msgid "added by them:" msgstr "" -#: wt-status.c:261 +#: wt-status.c:264 msgid "deleted by us:" msgstr "" -#: wt-status.c:263 +#: wt-status.c:266 msgid "both added:" msgstr "" -#: wt-status.c:265 +#: wt-status.c:268 msgid "both modified:" msgstr "" -#: wt-status.c:275 +#: wt-status.c:278 msgid "new file:" msgstr "" -#: wt-status.c:277 +#: wt-status.c:280 msgid "copied:" msgstr "" -#: wt-status.c:279 +#: wt-status.c:282 msgid "deleted:" msgstr "" -#: wt-status.c:281 +#: wt-status.c:284 msgid "modified:" msgstr "" -#: wt-status.c:283 +#: wt-status.c:286 msgid "renamed:" msgstr "" -#: wt-status.c:285 +#: wt-status.c:288 msgid "typechange:" msgstr "" -#: wt-status.c:287 +#: wt-status.c:290 msgid "unknown:" msgstr "" -#: wt-status.c:289 +#: wt-status.c:292 msgid "unmerged:" msgstr "" -#: wt-status.c:369 +#: wt-status.c:372 msgid "new commits, " msgstr "" -#: wt-status.c:371 +#: wt-status.c:374 msgid "modified content, " msgstr "" -#: wt-status.c:373 +#: wt-status.c:376 msgid "untracked content, " msgstr "" -#: wt-status.c:847 +#: wt-status.c:853 #, c-format msgid "Your stash currently has %d entry" msgid_plural "Your stash currently has %d entries" msgstr[0] "" msgstr[1] "" -#: wt-status.c:879 +#: wt-status.c:885 msgid "Submodules changed but not updated:" msgstr "" -#: wt-status.c:881 +#: wt-status.c:887 msgid "Submodule changes to be committed:" msgstr "" -#: wt-status.c:963 +#: wt-status.c:969 msgid "" "Do not modify or remove the line above.\n" "Everything below it will be ignored." msgstr "" -#: wt-status.c:1076 +#: wt-status.c:1084 msgid "You have unmerged paths." msgstr "" -#: wt-status.c:1079 +#: wt-status.c:1087 msgid " (fix conflicts and run \"git commit\")" msgstr "" -#: wt-status.c:1081 +#: wt-status.c:1089 msgid " (use \"git merge --abort\" to abort the merge)" msgstr "" -#: wt-status.c:1086 +#: wt-status.c:1094 msgid "All conflicts fixed but you are still merging." msgstr "" -#: wt-status.c:1089 +#: wt-status.c:1097 msgid " (use \"git commit\" to conclude merge)" msgstr "" -#: wt-status.c:1099 +#: wt-status.c:1107 msgid "You are in the middle of an am session." msgstr "" -#: wt-status.c:1102 +#: wt-status.c:1110 msgid "The current patch is empty." msgstr "" -#: wt-status.c:1106 +#: wt-status.c:1114 msgid " (fix conflicts and then run \"git am --continue\")" msgstr "" -#: wt-status.c:1108 +#: wt-status.c:1116 msgid " (use \"git am --skip\" to skip this patch)" msgstr "" -#: wt-status.c:1110 +#: wt-status.c:1118 msgid " (use \"git am --abort\" to restore the original branch)" msgstr "" -#: wt-status.c:1242 +#: wt-status.c:1250 msgid "git-rebase-todo is missing." msgstr "" -#: wt-status.c:1244 +#: wt-status.c:1252 msgid "No commands done." msgstr "" -#: wt-status.c:1247 +#: wt-status.c:1255 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" msgstr[0] "" msgstr[1] "" -#: wt-status.c:1258 +#: wt-status.c:1266 #, c-format msgid " (see more in file %s)" msgstr "" -#: wt-status.c:1263 +#: wt-status.c:1271 msgid "No commands remaining." msgstr "" -#: wt-status.c:1266 +#: wt-status.c:1274 #, c-format msgid "Next command to do (%d remaining command):" msgid_plural "Next commands to do (%d remaining commands):" msgstr[0] "" msgstr[1] "" -#: wt-status.c:1274 +#: wt-status.c:1282 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr "" -#: wt-status.c:1287 +#: wt-status.c:1295 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "" -#: wt-status.c:1292 +#: wt-status.c:1300 msgid "You are currently rebasing." msgstr "" -#: wt-status.c:1306 +#: wt-status.c:1314 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr "" -#: wt-status.c:1308 +#: wt-status.c:1316 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr "" -#: wt-status.c:1310 +#: wt-status.c:1318 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr "" -#: wt-status.c:1316 +#: wt-status.c:1324 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr "" -#: wt-status.c:1320 +#: wt-status.c:1328 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "" -#: wt-status.c:1325 +#: wt-status.c:1333 msgid "You are currently splitting a commit during a rebase." msgstr "" -#: wt-status.c:1328 +#: wt-status.c:1336 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" -#: wt-status.c:1332 +#: wt-status.c:1340 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" -#: wt-status.c:1337 +#: wt-status.c:1345 msgid "You are currently editing a commit during a rebase." msgstr "" -#: wt-status.c:1340 +#: wt-status.c:1348 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr "" -#: wt-status.c:1342 +#: wt-status.c:1350 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" -#: wt-status.c:1352 +#: wt-status.c:1360 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "" -#: wt-status.c:1357 +#: wt-status.c:1365 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr "" -#: wt-status.c:1360 +#: wt-status.c:1368 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" -#: wt-status.c:1362 +#: wt-status.c:1370 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" -#: wt-status.c:1371 +#: wt-status.c:1379 #, c-format msgid "You are currently reverting commit %s." msgstr "" -#: wt-status.c:1376 +#: wt-status.c:1384 msgid " (fix conflicts and run \"git revert --continue\")" msgstr "" -#: wt-status.c:1379 +#: wt-status.c:1387 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr "" -#: wt-status.c:1381 +#: wt-status.c:1389 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr "" -#: wt-status.c:1392 +#: wt-status.c:1400 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "" -#: wt-status.c:1396 +#: wt-status.c:1404 msgid "You are currently bisecting." msgstr "" -#: wt-status.c:1399 +#: wt-status.c:1407 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr "" -#: wt-status.c:1596 +#: wt-status.c:1604 msgid "On branch " msgstr "" -#: wt-status.c:1602 +#: wt-status.c:1610 msgid "interactive rebase in progress; onto " msgstr "" -#: wt-status.c:1604 +#: wt-status.c:1612 msgid "rebase in progress; onto " msgstr "" -#: wt-status.c:1609 +#: wt-status.c:1617 msgid "HEAD detached at " msgstr "" -#: wt-status.c:1611 +#: wt-status.c:1619 msgid "HEAD detached from " msgstr "" -#: wt-status.c:1614 +#: wt-status.c:1622 msgid "Not currently on any branch." msgstr "" -#: wt-status.c:1634 +#: wt-status.c:1642 msgid "Initial commit" msgstr "" -#: wt-status.c:1635 +#: wt-status.c:1643 msgid "No commits yet" msgstr "" -#: wt-status.c:1649 +#: wt-status.c:1657 msgid "Untracked files" msgstr "" -#: wt-status.c:1651 +#: wt-status.c:1659 msgid "Ignored files" msgstr "" -#: wt-status.c:1655 +#: wt-status.c:1663 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -4528,97 +4790,97 @@ msgid "" "new files yourself (see 'git help status')." msgstr "" -#: wt-status.c:1661 +#: wt-status.c:1669 #, c-format msgid "Untracked files not listed%s" msgstr "" -#: wt-status.c:1663 +#: wt-status.c:1671 msgid " (use -u option to show untracked files)" msgstr "" -#: wt-status.c:1669 +#: wt-status.c:1677 msgid "No changes" msgstr "" -#: wt-status.c:1674 +#: wt-status.c:1682 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" -#: wt-status.c:1677 +#: wt-status.c:1685 #, c-format msgid "no changes added to commit\n" msgstr "" -#: wt-status.c:1680 +#: wt-status.c:1688 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " "track)\n" msgstr "" -#: wt-status.c:1683 +#: wt-status.c:1691 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "" -#: wt-status.c:1686 +#: wt-status.c:1694 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" -#: wt-status.c:1689 wt-status.c:1694 +#: wt-status.c:1697 wt-status.c:1702 #, c-format msgid "nothing to commit\n" msgstr "" -#: wt-status.c:1692 +#: wt-status.c:1700 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" -#: wt-status.c:1696 +#: wt-status.c:1704 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "" -#: wt-status.c:1809 +#: wt-status.c:1817 msgid "No commits yet on " msgstr "" -#: wt-status.c:1813 +#: wt-status.c:1821 msgid "HEAD (no branch)" msgstr "" -#: wt-status.c:1844 +#: wt-status.c:1852 msgid "different" msgstr "" -#: wt-status.c:1846 wt-status.c:1854 +#: wt-status.c:1854 wt-status.c:1862 msgid "behind " msgstr "" -#: wt-status.c:1849 wt-status.c:1852 +#: wt-status.c:1857 wt-status.c:1860 msgid "ahead " msgstr "" #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2358 +#: wt-status.c:2366 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "" -#: wt-status.c:2364 +#: wt-status.c:2372 msgid "additionally, your index contains uncommitted changes." msgstr "" -#: wt-status.c:2366 +#: wt-status.c:2374 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "" -#: compat/precompose_utf8.c:58 builtin/clone.c:440 +#: compat/precompose_utf8.c:58 builtin/clone.c:442 #, c-format msgid "failed to unlink '%s'" msgstr "" @@ -4632,7 +4894,7 @@ msgstr "" msgid "unexpected diff status %c" msgstr "" -#: builtin/add.c:88 builtin/commit.c:257 +#: builtin/add.c:88 builtin/commit.c:266 msgid "updating files failed" msgstr "" @@ -4676,77 +4938,77 @@ msgstr "" msgid "Could not apply '%s'" msgstr "" -#: builtin/add.c:271 +#: builtin/add.c:269 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" -#: builtin/add.c:291 builtin/clean.c:911 builtin/fetch.c:146 builtin/mv.c:124 -#: builtin/prune-packed.c:55 builtin/pull.c:207 builtin/push.c:541 -#: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164 +#: builtin/add.c:289 builtin/clean.c:911 builtin/fetch.c:145 builtin/mv.c:123 +#: builtin/prune-packed.c:55 builtin/pull.c:212 builtin/push.c:557 +#: builtin/remote.c:1342 builtin/rm.c:240 builtin/send-pack.c:165 msgid "dry run" msgstr "" -#: builtin/add.c:294 +#: builtin/add.c:292 msgid "interactive picking" msgstr "" -#: builtin/add.c:295 builtin/checkout.c:1128 builtin/reset.c:302 +#: builtin/add.c:293 builtin/checkout.c:1135 builtin/reset.c:302 msgid "select hunks interactively" msgstr "" -#: builtin/add.c:296 +#: builtin/add.c:294 msgid "edit current diff and apply" msgstr "" -#: builtin/add.c:297 +#: builtin/add.c:295 msgid "allow adding otherwise ignored files" msgstr "" -#: builtin/add.c:298 +#: builtin/add.c:296 msgid "update tracked files" msgstr "" -#: builtin/add.c:299 +#: builtin/add.c:297 msgid "renormalize EOL of tracked files (implies -u)" msgstr "" -#: builtin/add.c:300 +#: builtin/add.c:298 msgid "record only the fact that the path will be added later" msgstr "" -#: builtin/add.c:301 +#: builtin/add.c:299 msgid "add changes from all tracked and untracked files" msgstr "" -#: builtin/add.c:304 +#: builtin/add.c:302 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "" -#: builtin/add.c:306 +#: builtin/add.c:304 msgid "don't add, only refresh the index" msgstr "" -#: builtin/add.c:307 +#: builtin/add.c:305 msgid "just skip files which cannot be added because of errors" msgstr "" -#: builtin/add.c:308 +#: builtin/add.c:306 msgid "check if - even missing - files are ignored in dry run" msgstr "" -#: builtin/add.c:309 builtin/update-index.c:964 +#: builtin/add.c:307 builtin/update-index.c:974 msgid "(+/-)x" msgstr "" -#: builtin/add.c:309 builtin/update-index.c:965 +#: builtin/add.c:307 builtin/update-index.c:975 msgid "override the executable bit of the listed files" msgstr "" -#: builtin/add.c:311 +#: builtin/add.c:309 msgid "warn when adding an embedded repository" msgstr "" -#: builtin/add.c:326 +#: builtin/add.c:324 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -4764,47 +5026,47 @@ msgid "" "See \"git help submodule\" for more information." msgstr "" -#: builtin/add.c:354 +#: builtin/add.c:352 #, c-format msgid "adding embedded git repository: %s" msgstr "" -#: builtin/add.c:372 +#: builtin/add.c:370 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "" -#: builtin/add.c:380 +#: builtin/add.c:378 msgid "adding files failed" msgstr "" -#: builtin/add.c:417 +#: builtin/add.c:416 msgid "-A and -u are mutually incompatible" msgstr "" -#: builtin/add.c:424 +#: builtin/add.c:423 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "" -#: builtin/add.c:428 +#: builtin/add.c:427 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "" -#: builtin/add.c:443 +#: builtin/add.c:442 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "" -#: builtin/add.c:444 +#: builtin/add.c:443 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "" -#: builtin/add.c:449 builtin/check-ignore.c:177 builtin/checkout.c:280 -#: builtin/checkout.c:483 builtin/clean.c:958 builtin/commit.c:316 +#: builtin/add.c:448 builtin/check-ignore.c:177 builtin/checkout.c:280 +#: builtin/checkout.c:483 builtin/clean.c:958 builtin/commit.c:325 #: builtin/diff-tree.c:114 builtin/mv.c:144 builtin/reset.c:241 -#: builtin/rm.c:271 builtin/submodule--helper.c:326 +#: builtin/rm.c:270 builtin/submodule--helper.c:328 msgid "index file corrupt" msgstr "" @@ -4856,7 +5118,7 @@ msgstr "" msgid "Patch format detection failed." msgstr "" -#: builtin/am.c:1013 builtin/clone.c:405 +#: builtin/am.c:1013 builtin/clone.c:407 #, c-format msgid "failed to create directory '%s'" msgstr "" @@ -4865,7 +5127,7 @@ msgstr "" msgid "Failed to split patches." msgstr "" -#: builtin/am.c:1148 builtin/commit.c:342 +#: builtin/am.c:1148 builtin/commit.c:351 msgid "unable to write index file" msgstr "" @@ -5025,7 +5287,7 @@ msgid "allow fall back on 3way merging if needed" msgstr "" #: builtin/am.c:2222 builtin/init-db.c:484 builtin/prune-packed.c:57 -#: builtin/repack.c:182 +#: builtin/repack.c:192 msgid "be quiet" msgstr "" @@ -5067,16 +5329,17 @@ msgstr "" msgid "pass it through git-apply" msgstr "" -#: builtin/am.c:2260 builtin/fmt-merge-msg.c:665 builtin/fmt-merge-msg.c:668 -#: builtin/grep.c:853 builtin/merge.c:206 builtin/pull.c:145 builtin/pull.c:203 -#: builtin/repack.c:191 builtin/repack.c:195 builtin/repack.c:197 -#: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:382 -#: parse-options.h:144 parse-options.h:146 parse-options.h:257 +#: builtin/am.c:2260 builtin/commit.c:1332 builtin/fmt-merge-msg.c:665 +#: builtin/fmt-merge-msg.c:668 builtin/grep.c:853 builtin/merge.c:207 +#: builtin/pull.c:150 builtin/pull.c:208 builtin/repack.c:201 +#: builtin/repack.c:205 builtin/repack.c:207 builtin/show-branch.c:631 +#: builtin/show-ref.c:169 builtin/tag.c:383 parse-options.h:144 +#: parse-options.h:146 parse-options.h:258 msgid "n" msgstr "" -#: builtin/am.c:2266 builtin/branch.c:629 builtin/for-each-ref.c:38 -#: builtin/replace.c:445 builtin/tag.c:418 builtin/verify-tag.c:39 +#: builtin/am.c:2266 builtin/branch.c:632 builtin/for-each-ref.c:38 +#: builtin/replace.c:543 builtin/tag.c:419 builtin/verify-tag.c:39 msgid "format" msgstr "" @@ -5120,8 +5383,8 @@ msgstr "" msgid "use current timestamp for author date" msgstr "" -#: builtin/am.c:2298 builtin/commit.c:1431 builtin/merge.c:237 -#: builtin/pull.c:178 builtin/revert.c:112 builtin/tag.c:398 +#: builtin/am.c:2298 builtin/commit.c:1468 builtin/merge.c:238 +#: builtin/pull.c:183 builtin/revert.c:112 builtin/tag.c:399 msgid "key-id" msgstr "" @@ -5256,115 +5519,141 @@ msgstr "" msgid "--bisect-clean-state requires no arguments" msgstr "" -#: builtin/blame.c:27 +#: builtin/blame.c:29 msgid "git blame [] [] [] [--] " msgstr "" -#: builtin/blame.c:32 +#: builtin/blame.c:34 msgid " are documented in git-rev-list(1)" msgstr "" -#: builtin/blame.c:677 +#: builtin/blame.c:404 +#, c-format +msgid "expecting a color: %s" +msgstr "" + +#: builtin/blame.c:411 +msgid "must end with a color" +msgstr "" + +#: builtin/blame.c:697 +#, c-format +msgid "invalid color '%s' in color.blame.repeatedLines" +msgstr "" + +#: builtin/blame.c:715 +msgid "invalid value for blame.coloring" +msgstr "" + +#: builtin/blame.c:786 msgid "Show blame entries as we find them, incrementally" msgstr "" -#: builtin/blame.c:678 +#: builtin/blame.c:787 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "" -#: builtin/blame.c:679 +#: builtin/blame.c:788 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "" -#: builtin/blame.c:680 +#: builtin/blame.c:789 msgid "Show work cost statistics" msgstr "" -#: builtin/blame.c:681 +#: builtin/blame.c:790 msgid "Force progress reporting" msgstr "" -#: builtin/blame.c:682 +#: builtin/blame.c:791 msgid "Show output score for blame entries" msgstr "" -#: builtin/blame.c:683 +#: builtin/blame.c:792 msgid "Show original filename (Default: auto)" msgstr "" -#: builtin/blame.c:684 +#: builtin/blame.c:793 msgid "Show original linenumber (Default: off)" msgstr "" -#: builtin/blame.c:685 +#: builtin/blame.c:794 msgid "Show in a format designed for machine consumption" msgstr "" -#: builtin/blame.c:686 +#: builtin/blame.c:795 msgid "Show porcelain format with per-line commit information" msgstr "" -#: builtin/blame.c:687 +#: builtin/blame.c:796 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "" -#: builtin/blame.c:688 +#: builtin/blame.c:797 msgid "Show raw timestamp (Default: off)" msgstr "" -#: builtin/blame.c:689 +#: builtin/blame.c:798 msgid "Show long commit SHA1 (Default: off)" msgstr "" -#: builtin/blame.c:690 +#: builtin/blame.c:799 msgid "Suppress author name and timestamp (Default: off)" msgstr "" -#: builtin/blame.c:691 +#: builtin/blame.c:800 msgid "Show author email instead of name (Default: off)" msgstr "" -#: builtin/blame.c:692 +#: builtin/blame.c:801 msgid "Ignore whitespace differences" msgstr "" -#: builtin/blame.c:699 +#: builtin/blame.c:802 +msgid "color redundant metadata from previous line differently" +msgstr "" + +#: builtin/blame.c:803 +msgid "color lines by age" +msgstr "" + +#: builtin/blame.c:810 msgid "Use an experimental heuristic to improve diffs" msgstr "" -#: builtin/blame.c:701 +#: builtin/blame.c:812 msgid "Spend extra cycles to find better match" msgstr "" -#: builtin/blame.c:702 +#: builtin/blame.c:813 msgid "Use revisions from instead of calling git-rev-list" msgstr "" -#: builtin/blame.c:703 +#: builtin/blame.c:814 msgid "Use 's contents as the final image" msgstr "" -#: builtin/blame.c:704 builtin/blame.c:705 +#: builtin/blame.c:815 builtin/blame.c:816 msgid "score" msgstr "" -#: builtin/blame.c:704 +#: builtin/blame.c:815 msgid "Find line copies within and across files" msgstr "" -#: builtin/blame.c:705 +#: builtin/blame.c:816 msgid "Find line movements within and across files" msgstr "" -#: builtin/blame.c:706 +#: builtin/blame.c:817 msgid "n,m" msgstr "" -#: builtin/blame.c:706 +#: builtin/blame.c:817 msgid "Process only line range n,m, counting from 1" msgstr "" -#: builtin/blame.c:753 +#: builtin/blame.c:866 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "" @@ -5376,18 +5665,18 @@ msgstr "" #. your language may need more or fewer display #. columns. #. -#: builtin/blame.c:804 +#: builtin/blame.c:917 msgid "4 years, 11 months ago" msgstr "" -#: builtin/blame.c:890 +#: builtin/blame.c:1003 #, c-format msgid "file %s has only %lu line" msgid_plural "file %s has only %lu lines" msgstr[0] "" msgstr[1] "" -#: builtin/blame.c:936 +#: builtin/blame.c:1049 msgid "Blaming lines" msgstr "" @@ -5492,65 +5781,65 @@ msgstr "" msgid "Deleted branch %s (was %s).\n" msgstr "" -#: builtin/branch.c:417 builtin/tag.c:58 +#: builtin/branch.c:416 builtin/tag.c:58 msgid "unable to parse format string" msgstr "" -#: builtin/branch.c:450 +#: builtin/branch.c:453 #, c-format msgid "Branch %s is being rebased at %s" msgstr "" -#: builtin/branch.c:454 +#: builtin/branch.c:457 #, c-format msgid "Branch %s is being bisected at %s" msgstr "" -#: builtin/branch.c:471 +#: builtin/branch.c:474 msgid "cannot copy the current branch while not on any." msgstr "" -#: builtin/branch.c:473 +#: builtin/branch.c:476 msgid "cannot rename the current branch while not on any." msgstr "" -#: builtin/branch.c:484 +#: builtin/branch.c:487 #, c-format msgid "Invalid branch name: '%s'" msgstr "" -#: builtin/branch.c:511 +#: builtin/branch.c:514 msgid "Branch rename failed" msgstr "" -#: builtin/branch.c:513 +#: builtin/branch.c:516 msgid "Branch copy failed" msgstr "" -#: builtin/branch.c:517 -#, c-format -msgid "Created a copy of a misnamed branch '%s'" -msgstr "" - #: builtin/branch.c:520 #, c-format +msgid "Created a copy of a misnamed branch '%s'" +msgstr "" + +#: builtin/branch.c:523 +#, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "" -#: builtin/branch.c:526 +#: builtin/branch.c:529 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "" -#: builtin/branch.c:535 +#: builtin/branch.c:538 msgid "Branch is renamed, but update of config-file failed" msgstr "" -#: builtin/branch.c:537 +#: builtin/branch.c:540 msgid "Branch is copied, but update of config-file failed" msgstr "" -#: builtin/branch.c:553 +#: builtin/branch.c:556 #, c-format msgid "" "Please edit the description for the branch\n" @@ -5558,217 +5847,219 @@ msgid "" "Lines starting with '%c' will be stripped.\n" msgstr "" -#: builtin/branch.c:586 +#: builtin/branch.c:589 msgid "Generic options" msgstr "" -#: builtin/branch.c:588 +#: builtin/branch.c:591 msgid "show hash and subject, give twice for upstream branch" msgstr "" -#: builtin/branch.c:589 +#: builtin/branch.c:592 msgid "suppress informational messages" msgstr "" -#: builtin/branch.c:590 +#: builtin/branch.c:593 msgid "set up tracking mode (see git-pull(1))" msgstr "" -#: builtin/branch.c:592 +#: builtin/branch.c:595 msgid "do not use" msgstr "" -#: builtin/branch.c:594 +#: builtin/branch.c:597 msgid "upstream" msgstr "" -#: builtin/branch.c:594 +#: builtin/branch.c:597 msgid "change the upstream info" msgstr "" -#: builtin/branch.c:595 +#: builtin/branch.c:598 msgid "Unset the upstream info" msgstr "" -#: builtin/branch.c:596 +#: builtin/branch.c:599 msgid "use colored output" msgstr "" -#: builtin/branch.c:597 +#: builtin/branch.c:600 msgid "act on remote-tracking branches" msgstr "" -#: builtin/branch.c:599 builtin/branch.c:601 +#: builtin/branch.c:602 builtin/branch.c:604 msgid "print only branches that contain the commit" msgstr "" -#: builtin/branch.c:600 builtin/branch.c:602 +#: builtin/branch.c:603 builtin/branch.c:605 msgid "print only branches that don't contain the commit" msgstr "" -#: builtin/branch.c:605 +#: builtin/branch.c:608 msgid "Specific git-branch actions:" msgstr "" -#: builtin/branch.c:606 +#: builtin/branch.c:609 msgid "list both remote-tracking and local branches" msgstr "" -#: builtin/branch.c:608 +#: builtin/branch.c:611 msgid "delete fully merged branch" msgstr "" -#: builtin/branch.c:609 +#: builtin/branch.c:612 msgid "delete branch (even if not merged)" msgstr "" -#: builtin/branch.c:610 +#: builtin/branch.c:613 msgid "move/rename a branch and its reflog" msgstr "" -#: builtin/branch.c:611 +#: builtin/branch.c:614 msgid "move/rename a branch, even if target exists" msgstr "" -#: builtin/branch.c:612 +#: builtin/branch.c:615 msgid "copy a branch and its reflog" msgstr "" -#: builtin/branch.c:613 +#: builtin/branch.c:616 msgid "copy a branch, even if target exists" msgstr "" -#: builtin/branch.c:614 +#: builtin/branch.c:617 msgid "list branch names" msgstr "" -#: builtin/branch.c:615 +#: builtin/branch.c:618 msgid "create the branch's reflog" msgstr "" -#: builtin/branch.c:617 +#: builtin/branch.c:620 msgid "edit the description for the branch" msgstr "" -#: builtin/branch.c:618 +#: builtin/branch.c:621 msgid "force creation, move/rename, deletion" msgstr "" -#: builtin/branch.c:619 +#: builtin/branch.c:622 msgid "print only branches that are merged" msgstr "" -#: builtin/branch.c:620 +#: builtin/branch.c:623 msgid "print only branches that are not merged" msgstr "" -#: builtin/branch.c:621 +#: builtin/branch.c:624 msgid "list branches in columns" msgstr "" -#: builtin/branch.c:622 builtin/for-each-ref.c:40 builtin/tag.c:411 +#: builtin/branch.c:625 builtin/for-each-ref.c:40 builtin/ls-remote.c:70 +#: builtin/tag.c:412 msgid "key" msgstr "" -#: builtin/branch.c:623 builtin/for-each-ref.c:41 builtin/tag.c:412 +#: builtin/branch.c:626 builtin/for-each-ref.c:41 builtin/ls-remote.c:71 +#: builtin/tag.c:413 msgid "field name to sort on" msgstr "" -#: builtin/branch.c:625 builtin/for-each-ref.c:43 builtin/notes.c:408 +#: builtin/branch.c:628 builtin/for-each-ref.c:43 builtin/notes.c:408 #: builtin/notes.c:411 builtin/notes.c:571 builtin/notes.c:574 -#: builtin/tag.c:414 +#: builtin/tag.c:415 msgid "object" msgstr "" -#: builtin/branch.c:626 +#: builtin/branch.c:629 msgid "print only branches of the object" msgstr "" -#: builtin/branch.c:628 builtin/for-each-ref.c:49 builtin/tag.c:421 +#: builtin/branch.c:631 builtin/for-each-ref.c:49 builtin/tag.c:422 msgid "sorting and filtering are case insensitive" msgstr "" -#: builtin/branch.c:629 builtin/for-each-ref.c:38 builtin/tag.c:419 +#: builtin/branch.c:632 builtin/for-each-ref.c:38 builtin/tag.c:420 #: builtin/verify-tag.c:39 msgid "format to use for the output" msgstr "" -#: builtin/branch.c:652 builtin/clone.c:735 +#: builtin/branch.c:655 builtin/clone.c:737 msgid "HEAD not found below refs/heads!" msgstr "" -#: builtin/branch.c:675 +#: builtin/branch.c:678 msgid "--column and --verbose are incompatible" msgstr "" -#: builtin/branch.c:690 builtin/branch.c:742 builtin/branch.c:751 +#: builtin/branch.c:693 builtin/branch.c:745 builtin/branch.c:754 msgid "branch name required" msgstr "" -#: builtin/branch.c:718 +#: builtin/branch.c:721 msgid "Cannot give description to detached HEAD" msgstr "" -#: builtin/branch.c:723 +#: builtin/branch.c:726 msgid "cannot edit description of more than one branch" msgstr "" -#: builtin/branch.c:730 -#, c-format -msgid "No commit on branch '%s' yet." -msgstr "" - #: builtin/branch.c:733 #, c-format +msgid "No commit on branch '%s' yet." +msgstr "" + +#: builtin/branch.c:736 +#, c-format msgid "No branch named '%s'." msgstr "" -#: builtin/branch.c:748 +#: builtin/branch.c:751 msgid "too many branches for a copy operation" msgstr "" -#: builtin/branch.c:757 +#: builtin/branch.c:760 msgid "too many arguments for a rename operation" msgstr "" -#: builtin/branch.c:762 +#: builtin/branch.c:765 msgid "too many arguments to set new upstream" msgstr "" -#: builtin/branch.c:766 +#: builtin/branch.c:769 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." msgstr "" -#: builtin/branch.c:769 builtin/branch.c:791 builtin/branch.c:807 +#: builtin/branch.c:772 builtin/branch.c:794 builtin/branch.c:810 #, c-format msgid "no such branch '%s'" msgstr "" -#: builtin/branch.c:773 +#: builtin/branch.c:776 #, c-format msgid "branch '%s' does not exist" msgstr "" -#: builtin/branch.c:785 +#: builtin/branch.c:788 msgid "too many arguments to unset upstream" msgstr "" -#: builtin/branch.c:789 +#: builtin/branch.c:792 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" -#: builtin/branch.c:795 +#: builtin/branch.c:798 #, c-format msgid "Branch '%s' has no upstream information" msgstr "" -#: builtin/branch.c:810 +#: builtin/branch.c:813 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "" -#: builtin/branch.c:813 +#: builtin/branch.c:816 msgid "" "the '--set-upstream' option is no longer supported. Please use '--track' or " "'--set-upstream-to' instead." @@ -5787,75 +6078,75 @@ msgstr "" msgid "Need a repository to unbundle." msgstr "" -#: builtin/cat-file.c:523 +#: builtin/cat-file.c:525 msgid "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | | --textconv | --filters) [--path=] " msgstr "" -#: builtin/cat-file.c:524 +#: builtin/cat-file.c:526 msgid "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" msgstr "" -#: builtin/cat-file.c:561 +#: builtin/cat-file.c:563 msgid " can be one of: blob, tree, commit, tag" msgstr "" -#: builtin/cat-file.c:562 +#: builtin/cat-file.c:564 msgid "show object type" msgstr "" -#: builtin/cat-file.c:563 +#: builtin/cat-file.c:565 msgid "show object size" msgstr "" -#: builtin/cat-file.c:565 +#: builtin/cat-file.c:567 msgid "exit with zero when there's no error" msgstr "" -#: builtin/cat-file.c:566 +#: builtin/cat-file.c:568 msgid "pretty-print object's content" msgstr "" -#: builtin/cat-file.c:568 +#: builtin/cat-file.c:570 msgid "for blob objects, run textconv on object's content" msgstr "" -#: builtin/cat-file.c:570 +#: builtin/cat-file.c:572 msgid "for blob objects, run filters on object's content" msgstr "" -#: builtin/cat-file.c:571 git-submodule.sh:878 +#: builtin/cat-file.c:573 git-submodule.sh:894 msgid "blob" msgstr "" -#: builtin/cat-file.c:572 +#: builtin/cat-file.c:574 msgid "use a specific path for --textconv/--filters" msgstr "" -#: builtin/cat-file.c:574 +#: builtin/cat-file.c:576 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "" -#: builtin/cat-file.c:575 +#: builtin/cat-file.c:577 msgid "buffer --batch output" msgstr "" -#: builtin/cat-file.c:577 +#: builtin/cat-file.c:579 msgid "show info and content of objects fed from the standard input" msgstr "" -#: builtin/cat-file.c:580 +#: builtin/cat-file.c:582 msgid "show info about objects fed from the standard input" msgstr "" -#: builtin/cat-file.c:583 +#: builtin/cat-file.c:585 msgid "follow in-tree symlinks (used with --batch or --batch-check)" msgstr "" -#: builtin/cat-file.c:585 +#: builtin/cat-file.c:587 msgid "show all objects with --batch or --batch-check" msgstr "" @@ -5883,7 +6174,7 @@ msgstr "" msgid "terminate input and output records by a NUL character" msgstr "" -#: builtin/check-ignore.c:20 builtin/checkout.c:1106 builtin/gc.c:358 +#: builtin/check-ignore.c:20 builtin/checkout.c:1113 builtin/gc.c:500 msgid "suppress progress reporting" msgstr "" @@ -5973,9 +6264,9 @@ msgid "write the content to temporary files" msgstr "" #: builtin/checkout-index.c:173 builtin/column.c:31 -#: builtin/submodule--helper.c:1203 builtin/submodule--helper.c:1206 -#: builtin/submodule--helper.c:1212 builtin/submodule--helper.c:1574 -#: builtin/worktree.c:570 +#: builtin/submodule--helper.c:1216 builtin/submodule--helper.c:1219 +#: builtin/submodule--helper.c:1227 builtin/submodule--helper.c:1591 +#: builtin/worktree.c:610 msgid "string" msgstr "" @@ -6046,54 +6337,54 @@ msgstr "" msgid "path '%s' is unmerged" msgstr "" -#: builtin/checkout.c:505 +#: builtin/checkout.c:506 msgid "you need to resolve your current index first" msgstr "" -#: builtin/checkout.c:636 +#: builtin/checkout.c:643 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "" -#: builtin/checkout.c:677 +#: builtin/checkout.c:684 msgid "HEAD is now at" msgstr "" -#: builtin/checkout.c:681 builtin/clone.c:689 +#: builtin/checkout.c:688 builtin/clone.c:691 msgid "unable to update HEAD" msgstr "" -#: builtin/checkout.c:685 -#, c-format -msgid "Reset branch '%s'\n" -msgstr "" - -#: builtin/checkout.c:688 -#, c-format -msgid "Already on '%s'\n" -msgstr "" - #: builtin/checkout.c:692 #, c-format +msgid "Reset branch '%s'\n" +msgstr "" + +#: builtin/checkout.c:695 +#, c-format +msgid "Already on '%s'\n" +msgstr "" + +#: builtin/checkout.c:699 +#, c-format msgid "Switched to and reset branch '%s'\n" msgstr "" -#: builtin/checkout.c:694 builtin/checkout.c:1039 +#: builtin/checkout.c:701 builtin/checkout.c:1046 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "" -#: builtin/checkout.c:696 +#: builtin/checkout.c:703 #, c-format msgid "Switched to branch '%s'\n" msgstr "" -#: builtin/checkout.c:747 +#: builtin/checkout.c:754 #, c-format msgid " ... and %d more.\n" msgstr "" -#: builtin/checkout.c:753 +#: builtin/checkout.c:760 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -6108,7 +6399,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:772 +#: builtin/checkout.c:779 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -6125,160 +6416,160 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:804 +#: builtin/checkout.c:811 msgid "internal error in revision walk" msgstr "" -#: builtin/checkout.c:808 +#: builtin/checkout.c:815 msgid "Previous HEAD position was" msgstr "" -#: builtin/checkout.c:836 builtin/checkout.c:1034 +#: builtin/checkout.c:843 builtin/checkout.c:1041 msgid "You are on a branch yet to be born" msgstr "" -#: builtin/checkout.c:940 +#: builtin/checkout.c:947 #, c-format msgid "only one reference expected, %d given." msgstr "" -#: builtin/checkout.c:980 builtin/worktree.c:249 +#: builtin/checkout.c:987 builtin/worktree.c:240 builtin/worktree.c:389 #, c-format msgid "invalid reference: %s" msgstr "" -#: builtin/checkout.c:1009 +#: builtin/checkout.c:1016 #, c-format msgid "reference is not a tree: %s" msgstr "" -#: builtin/checkout.c:1048 +#: builtin/checkout.c:1055 msgid "paths cannot be used with switching branches" msgstr "" -#: builtin/checkout.c:1051 builtin/checkout.c:1055 +#: builtin/checkout.c:1058 builtin/checkout.c:1062 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "" -#: builtin/checkout.c:1059 builtin/checkout.c:1062 builtin/checkout.c:1067 -#: builtin/checkout.c:1070 +#: builtin/checkout.c:1066 builtin/checkout.c:1069 builtin/checkout.c:1074 +#: builtin/checkout.c:1077 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "" -#: builtin/checkout.c:1075 +#: builtin/checkout.c:1082 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "" -#: builtin/checkout.c:1107 builtin/checkout.c:1109 builtin/clone.c:116 -#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:387 -#: builtin/worktree.c:389 +#: builtin/checkout.c:1114 builtin/checkout.c:1116 builtin/clone.c:118 +#: builtin/remote.c:167 builtin/remote.c:169 builtin/worktree.c:433 +#: builtin/worktree.c:435 msgid "branch" msgstr "" -#: builtin/checkout.c:1108 +#: builtin/checkout.c:1115 msgid "create and checkout a new branch" msgstr "" -#: builtin/checkout.c:1110 +#: builtin/checkout.c:1117 msgid "create/reset and checkout a branch" msgstr "" -#: builtin/checkout.c:1111 +#: builtin/checkout.c:1118 msgid "create reflog for new branch" msgstr "" -#: builtin/checkout.c:1112 builtin/worktree.c:391 +#: builtin/checkout.c:1119 builtin/worktree.c:437 msgid "detach HEAD at named commit" msgstr "" -#: builtin/checkout.c:1113 +#: builtin/checkout.c:1120 msgid "set upstream info for new branch" msgstr "" -#: builtin/checkout.c:1115 +#: builtin/checkout.c:1122 msgid "new-branch" msgstr "" -#: builtin/checkout.c:1115 +#: builtin/checkout.c:1122 msgid "new unparented branch" msgstr "" -#: builtin/checkout.c:1116 +#: builtin/checkout.c:1123 msgid "checkout our version for unmerged files" msgstr "" -#: builtin/checkout.c:1118 +#: builtin/checkout.c:1125 msgid "checkout their version for unmerged files" msgstr "" -#: builtin/checkout.c:1120 +#: builtin/checkout.c:1127 msgid "force checkout (throw away local modifications)" msgstr "" -#: builtin/checkout.c:1122 +#: builtin/checkout.c:1129 msgid "perform a 3-way merge with the new branch" msgstr "" -#: builtin/checkout.c:1124 builtin/merge.c:239 +#: builtin/checkout.c:1131 builtin/merge.c:240 msgid "update ignored files (default)" msgstr "" -#: builtin/checkout.c:1126 builtin/log.c:1499 parse-options.h:263 +#: builtin/checkout.c:1133 builtin/log.c:1499 parse-options.h:264 msgid "style" msgstr "" -#: builtin/checkout.c:1127 +#: builtin/checkout.c:1134 msgid "conflict style (merge or diff3)" msgstr "" -#: builtin/checkout.c:1130 +#: builtin/checkout.c:1137 msgid "do not limit pathspecs to sparse entries only" msgstr "" -#: builtin/checkout.c:1132 +#: builtin/checkout.c:1139 msgid "second guess 'git checkout '" msgstr "" -#: builtin/checkout.c:1134 +#: builtin/checkout.c:1141 msgid "do not check if another worktree is holding the given ref" msgstr "" -#: builtin/checkout.c:1138 builtin/clone.c:83 builtin/fetch.c:150 -#: builtin/merge.c:236 builtin/pull.c:123 builtin/push.c:556 -#: builtin/send-pack.c:173 +#: builtin/checkout.c:1145 builtin/clone.c:85 builtin/fetch.c:149 +#: builtin/merge.c:237 builtin/pull.c:128 builtin/push.c:572 +#: builtin/send-pack.c:174 msgid "force progress reporting" msgstr "" -#: builtin/checkout.c:1168 +#: builtin/checkout.c:1175 msgid "-b, -B and --orphan are mutually exclusive" msgstr "" -#: builtin/checkout.c:1185 +#: builtin/checkout.c:1192 msgid "--track needs a branch name" msgstr "" -#: builtin/checkout.c:1190 +#: builtin/checkout.c:1197 msgid "Missing branch name; try -b" msgstr "" -#: builtin/checkout.c:1226 +#: builtin/checkout.c:1233 msgid "invalid path specification" msgstr "" -#: builtin/checkout.c:1233 +#: builtin/checkout.c:1240 #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "" -#: builtin/checkout.c:1237 +#: builtin/checkout.c:1244 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "" -#: builtin/checkout.c:1241 +#: builtin/checkout.c:1248 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -6314,7 +6605,7 @@ msgstr "" msgid "failed to remove %s" msgstr "" -#: builtin/clean.c:302 git-add--interactive.perl:572 +#: builtin/clean.c:302 git-add--interactive.perl:579 #, c-format msgid "" "Prompt help:\n" @@ -6323,7 +6614,7 @@ msgid "" " - (empty) select nothing\n" msgstr "" -#: builtin/clean.c:306 git-add--interactive.perl:581 +#: builtin/clean.c:306 git-add--interactive.perl:588 #, c-format msgid "" "Prompt help:\n" @@ -6336,8 +6627,8 @@ msgid "" " - (empty) finish selecting\n" msgstr "" -#: builtin/clean.c:522 git-add--interactive.perl:547 -#: git-add--interactive.perl:552 +#: builtin/clean.c:522 git-add--interactive.perl:554 +#: git-add--interactive.perl:559 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "" @@ -6362,7 +6653,7 @@ msgstr "" msgid "Remove %s [y/N]? " msgstr "" -#: builtin/clean.c:788 git-add--interactive.perl:1710 +#: builtin/clean.c:788 git-add--interactive.perl:1717 #, c-format msgid "Bye.\n" msgstr "" @@ -6378,11 +6669,11 @@ msgid "" "? - help for prompt selection" msgstr "" -#: builtin/clean.c:823 git-add--interactive.perl:1786 +#: builtin/clean.c:823 git-add--interactive.perl:1793 msgid "*** Commands ***" msgstr "" -#: builtin/clean.c:824 git-add--interactive.perl:1783 +#: builtin/clean.c:824 git-add--interactive.perl:1790 msgid "What now" msgstr "" @@ -6447,284 +6738,286 @@ msgid "" "refusing to clean" msgstr "" -#: builtin/clone.c:40 +#: builtin/clone.c:42 msgid "git clone [] [--] []" msgstr "" -#: builtin/clone.c:85 +#: builtin/clone.c:87 msgid "don't create a checkout" msgstr "" -#: builtin/clone.c:86 builtin/clone.c:88 builtin/init-db.c:479 +#: builtin/clone.c:88 builtin/clone.c:90 builtin/init-db.c:479 msgid "create a bare repository" msgstr "" -#: builtin/clone.c:90 +#: builtin/clone.c:92 msgid "create a mirror repository (implies bare)" msgstr "" -#: builtin/clone.c:92 +#: builtin/clone.c:94 msgid "to clone from a local repository" msgstr "" -#: builtin/clone.c:94 +#: builtin/clone.c:96 msgid "don't use local hardlinks, always copy" msgstr "" -#: builtin/clone.c:96 +#: builtin/clone.c:98 msgid "setup as shared repository" msgstr "" -#: builtin/clone.c:98 builtin/clone.c:102 +#: builtin/clone.c:100 builtin/clone.c:104 msgid "pathspec" msgstr "" -#: builtin/clone.c:98 builtin/clone.c:102 +#: builtin/clone.c:100 builtin/clone.c:104 msgid "initialize submodules in the clone" msgstr "" -#: builtin/clone.c:105 +#: builtin/clone.c:107 msgid "number of submodules cloned in parallel" msgstr "" -#: builtin/clone.c:106 builtin/init-db.c:476 +#: builtin/clone.c:108 builtin/init-db.c:476 msgid "template-directory" msgstr "" -#: builtin/clone.c:107 builtin/init-db.c:477 +#: builtin/clone.c:109 builtin/init-db.c:477 msgid "directory from which templates will be used" msgstr "" -#: builtin/clone.c:109 builtin/clone.c:111 builtin/submodule--helper.c:1210 -#: builtin/submodule--helper.c:1577 +#: builtin/clone.c:111 builtin/clone.c:113 builtin/submodule--helper.c:1223 +#: builtin/submodule--helper.c:1594 msgid "reference repository" msgstr "" -#: builtin/clone.c:113 +#: builtin/clone.c:115 builtin/submodule--helper.c:1225 +#: builtin/submodule--helper.c:1596 msgid "use --reference only while cloning" msgstr "" -#: builtin/clone.c:114 builtin/column.c:27 builtin/merge-file.c:44 +#: builtin/clone.c:116 builtin/column.c:27 builtin/merge-file.c:44 +#: builtin/pack-objects.c:3166 builtin/repack.c:213 msgid "name" msgstr "" -#: builtin/clone.c:115 +#: builtin/clone.c:117 msgid "use instead of 'origin' to track upstream" msgstr "" -#: builtin/clone.c:117 +#: builtin/clone.c:119 msgid "checkout instead of the remote's HEAD" msgstr "" -#: builtin/clone.c:119 +#: builtin/clone.c:121 msgid "path to git-upload-pack on the remote" msgstr "" -#: builtin/clone.c:120 builtin/fetch.c:151 builtin/grep.c:813 -#: builtin/pull.c:211 +#: builtin/clone.c:122 builtin/fetch.c:150 builtin/grep.c:813 +#: builtin/pull.c:216 msgid "depth" msgstr "" -#: builtin/clone.c:121 +#: builtin/clone.c:123 msgid "create a shallow clone of that depth" msgstr "" -#: builtin/clone.c:122 builtin/fetch.c:153 builtin/pack-objects.c:3017 +#: builtin/clone.c:124 builtin/fetch.c:152 builtin/pack-objects.c:3157 #: parse-options.h:154 msgid "time" msgstr "" -#: builtin/clone.c:123 +#: builtin/clone.c:125 msgid "create a shallow clone since a specific time" msgstr "" -#: builtin/clone.c:124 builtin/fetch.c:155 +#: builtin/clone.c:126 builtin/fetch.c:154 msgid "revision" msgstr "" -#: builtin/clone.c:125 builtin/fetch.c:156 +#: builtin/clone.c:127 builtin/fetch.c:155 msgid "deepen history of shallow clone, excluding rev" msgstr "" -#: builtin/clone.c:127 +#: builtin/clone.c:129 msgid "clone only one branch, HEAD or --branch" msgstr "" -#: builtin/clone.c:129 +#: builtin/clone.c:131 msgid "don't clone any tags, and make later fetches not to follow them" msgstr "" -#: builtin/clone.c:131 +#: builtin/clone.c:133 msgid "any cloned submodules will be shallow" msgstr "" -#: builtin/clone.c:132 builtin/init-db.c:485 +#: builtin/clone.c:134 builtin/init-db.c:485 msgid "gitdir" msgstr "" -#: builtin/clone.c:133 builtin/init-db.c:486 +#: builtin/clone.c:135 builtin/init-db.c:486 msgid "separate git dir from working tree" msgstr "" -#: builtin/clone.c:134 +#: builtin/clone.c:136 msgid "key=value" msgstr "" -#: builtin/clone.c:135 +#: builtin/clone.c:137 msgid "set config inside the new repository" msgstr "" -#: builtin/clone.c:136 builtin/fetch.c:173 builtin/pull.c:224 -#: builtin/push.c:567 +#: builtin/clone.c:138 builtin/fetch.c:173 builtin/pull.c:229 +#: builtin/push.c:583 msgid "use IPv4 addresses only" msgstr "" -#: builtin/clone.c:138 builtin/fetch.c:175 builtin/pull.c:227 -#: builtin/push.c:569 +#: builtin/clone.c:140 builtin/fetch.c:175 builtin/pull.c:232 +#: builtin/push.c:585 msgid "use IPv6 addresses only" msgstr "" -#: builtin/clone.c:276 +#: builtin/clone.c:278 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" msgstr "" -#: builtin/clone.c:329 +#: builtin/clone.c:331 #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "" -#: builtin/clone.c:401 +#: builtin/clone.c:403 #, c-format msgid "failed to open '%s'" msgstr "" -#: builtin/clone.c:409 +#: builtin/clone.c:411 #, c-format msgid "%s exists and is not a directory" msgstr "" -#: builtin/clone.c:423 +#: builtin/clone.c:425 #, c-format msgid "failed to stat %s\n" msgstr "" -#: builtin/clone.c:445 +#: builtin/clone.c:447 #, c-format msgid "failed to create link '%s'" msgstr "" -#: builtin/clone.c:449 +#: builtin/clone.c:451 #, c-format msgid "failed to copy file to '%s'" msgstr "" -#: builtin/clone.c:475 +#: builtin/clone.c:477 #, c-format msgid "done.\n" msgstr "" -#: builtin/clone.c:489 +#: builtin/clone.c:491 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" "and retry the checkout with 'git checkout -f HEAD'\n" msgstr "" -#: builtin/clone.c:566 +#: builtin/clone.c:568 #, c-format msgid "Could not find remote branch %s to clone." msgstr "" -#: builtin/clone.c:661 +#: builtin/clone.c:663 msgid "remote did not send all necessary objects" msgstr "" -#: builtin/clone.c:677 +#: builtin/clone.c:679 #, c-format msgid "unable to update %s" msgstr "" -#: builtin/clone.c:726 +#: builtin/clone.c:728 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" -#: builtin/clone.c:756 +#: builtin/clone.c:758 msgid "unable to checkout working tree" msgstr "" -#: builtin/clone.c:801 +#: builtin/clone.c:803 msgid "unable to write parameters to config file" msgstr "" -#: builtin/clone.c:864 +#: builtin/clone.c:866 msgid "cannot repack to clean up" msgstr "" -#: builtin/clone.c:866 +#: builtin/clone.c:868 msgid "cannot unlink temporary alternates file" msgstr "" -#: builtin/clone.c:906 builtin/receive-pack.c:1946 +#: builtin/clone.c:907 builtin/receive-pack.c:1947 msgid "Too many arguments." msgstr "" -#: builtin/clone.c:910 +#: builtin/clone.c:911 msgid "You must specify a repository to clone." msgstr "" -#: builtin/clone.c:923 +#: builtin/clone.c:924 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "" -#: builtin/clone.c:926 +#: builtin/clone.c:927 msgid "--bare and --separate-git-dir are incompatible." msgstr "" -#: builtin/clone.c:939 +#: builtin/clone.c:940 #, c-format msgid "repository '%s' does not exist" msgstr "" -#: builtin/clone.c:945 builtin/fetch.c:1455 +#: builtin/clone.c:946 builtin/fetch.c:1460 #, c-format msgid "depth %s is not a positive number" msgstr "" -#: builtin/clone.c:955 +#: builtin/clone.c:956 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "" -#: builtin/clone.c:965 +#: builtin/clone.c:966 #, c-format msgid "working tree '%s' already exists." msgstr "" -#: builtin/clone.c:980 builtin/clone.c:1001 builtin/difftool.c:270 -#: builtin/worktree.c:255 builtin/worktree.c:285 +#: builtin/clone.c:981 builtin/clone.c:1002 builtin/difftool.c:270 +#: builtin/worktree.c:246 builtin/worktree.c:276 #, c-format msgid "could not create leading directories of '%s'" msgstr "" -#: builtin/clone.c:985 +#: builtin/clone.c:986 #, c-format msgid "could not create work tree dir '%s'" msgstr "" -#: builtin/clone.c:1005 +#: builtin/clone.c:1006 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "" -#: builtin/clone.c:1007 +#: builtin/clone.c:1008 #, c-format msgid "Cloning into '%s'...\n" msgstr "" -#: builtin/clone.c:1031 +#: builtin/clone.c:1032 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" @@ -6791,7 +7084,7 @@ msgstr "" msgid "Padding space between columns" msgstr "" -#: builtin/column.c:52 +#: builtin/column.c:51 msgid "--command must be the first argument" msgstr "" @@ -6833,98 +7126,98 @@ msgid "" "the remaining commits.\n" msgstr "" -#: builtin/commit.c:284 +#: builtin/commit.c:293 msgid "failed to unpack HEAD tree object" msgstr "" -#: builtin/commit.c:325 +#: builtin/commit.c:334 msgid "unable to create temporary index" msgstr "" -#: builtin/commit.c:331 +#: builtin/commit.c:340 msgid "interactive add failed" msgstr "" -#: builtin/commit.c:344 +#: builtin/commit.c:353 msgid "unable to update temporary index" msgstr "" -#: builtin/commit.c:346 +#: builtin/commit.c:355 msgid "Failed to update main cache tree" msgstr "" -#: builtin/commit.c:371 builtin/commit.c:395 builtin/commit.c:444 +#: builtin/commit.c:380 builtin/commit.c:403 builtin/commit.c:449 msgid "unable to write new_index file" msgstr "" -#: builtin/commit.c:427 +#: builtin/commit.c:432 msgid "cannot do a partial commit during a merge." msgstr "" -#: builtin/commit.c:429 +#: builtin/commit.c:434 msgid "cannot do a partial commit during a cherry-pick." msgstr "" -#: builtin/commit.c:437 +#: builtin/commit.c:442 msgid "cannot read the index" msgstr "" -#: builtin/commit.c:456 +#: builtin/commit.c:461 msgid "unable to write temporary index file" msgstr "" -#: builtin/commit.c:553 +#: builtin/commit.c:558 #, c-format msgid "commit '%s' lacks author header" msgstr "" -#: builtin/commit.c:555 +#: builtin/commit.c:560 #, c-format msgid "commit '%s' has malformed author line" msgstr "" -#: builtin/commit.c:574 +#: builtin/commit.c:579 msgid "malformed --author parameter" msgstr "" -#: builtin/commit.c:626 +#: builtin/commit.c:631 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" msgstr "" -#: builtin/commit.c:663 builtin/commit.c:696 builtin/commit.c:1024 +#: builtin/commit.c:668 builtin/commit.c:701 builtin/commit.c:1029 #, c-format msgid "could not lookup commit %s" msgstr "" -#: builtin/commit.c:675 builtin/shortlog.c:309 +#: builtin/commit.c:680 builtin/shortlog.c:316 #, c-format msgid "(reading log message from standard input)\n" msgstr "" -#: builtin/commit.c:677 +#: builtin/commit.c:682 msgid "could not read log from standard input" msgstr "" -#: builtin/commit.c:681 +#: builtin/commit.c:686 #, c-format msgid "could not read log file '%s'" msgstr "" -#: builtin/commit.c:710 builtin/commit.c:718 +#: builtin/commit.c:715 builtin/commit.c:723 msgid "could not read SQUASH_MSG" msgstr "" -#: builtin/commit.c:715 +#: builtin/commit.c:720 msgid "could not read MERGE_MSG" msgstr "" -#: builtin/commit.c:769 +#: builtin/commit.c:774 msgid "could not write commit template" msgstr "" -#: builtin/commit.c:787 +#: builtin/commit.c:792 #, c-format msgid "" "\n" @@ -6934,7 +7227,7 @@ msgid "" "and try again.\n" msgstr "" -#: builtin/commit.c:792 +#: builtin/commit.c:797 #, c-format msgid "" "\n" @@ -6944,14 +7237,14 @@ msgid "" "and try again.\n" msgstr "" -#: builtin/commit.c:805 +#: builtin/commit.c:810 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" "with '%c' will be ignored, and an empty message aborts the commit.\n" msgstr "" -#: builtin/commit.c:813 +#: builtin/commit.c:818 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -6959,484 +7252,554 @@ msgid "" "An empty message aborts the commit.\n" msgstr "" -#: builtin/commit.c:830 +#: builtin/commit.c:835 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "" -#: builtin/commit.c:838 +#: builtin/commit.c:843 #, c-format msgid "%sDate: %s" msgstr "" -#: builtin/commit.c:845 +#: builtin/commit.c:850 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "" -#: builtin/commit.c:862 +#: builtin/commit.c:867 msgid "Cannot read index" msgstr "" -#: builtin/commit.c:928 +#: builtin/commit.c:933 msgid "Error building trees" msgstr "" -#: builtin/commit.c:942 builtin/tag.c:256 +#: builtin/commit.c:947 builtin/tag.c:257 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "" -#: builtin/commit.c:986 +#: builtin/commit.c:991 #, c-format msgid "--author '%s' is not 'Name ' and matches no existing author" msgstr "" -#: builtin/commit.c:1000 +#: builtin/commit.c:1005 #, c-format msgid "Invalid ignored mode '%s'" msgstr "" -#: builtin/commit.c:1014 builtin/commit.c:1264 +#: builtin/commit.c:1019 builtin/commit.c:1269 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "" -#: builtin/commit.c:1052 +#: builtin/commit.c:1057 msgid "--long and -z are incompatible" msgstr "" -#: builtin/commit.c:1085 +#: builtin/commit.c:1090 msgid "Using both --reset-author and --author does not make sense" msgstr "" -#: builtin/commit.c:1094 +#: builtin/commit.c:1099 msgid "You have nothing to amend." msgstr "" -#: builtin/commit.c:1097 +#: builtin/commit.c:1102 msgid "You are in the middle of a merge -- cannot amend." msgstr "" -#: builtin/commit.c:1099 +#: builtin/commit.c:1104 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "" -#: builtin/commit.c:1102 +#: builtin/commit.c:1107 msgid "Options --squash and --fixup cannot be used together" msgstr "" -#: builtin/commit.c:1112 +#: builtin/commit.c:1117 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "" -#: builtin/commit.c:1114 +#: builtin/commit.c:1119 msgid "Option -m cannot be combined with -c/-C/-F." msgstr "" -#: builtin/commit.c:1122 +#: builtin/commit.c:1127 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "" -#: builtin/commit.c:1139 +#: builtin/commit.c:1144 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" -#: builtin/commit.c:1141 +#: builtin/commit.c:1146 msgid "No paths with --include/--only does not make sense." msgstr "" -#: builtin/commit.c:1155 builtin/tag.c:542 +#: builtin/commit.c:1160 builtin/tag.c:543 #, c-format msgid "Invalid cleanup mode %s" msgstr "" -#: builtin/commit.c:1160 +#: builtin/commit.c:1165 msgid "Paths with -a does not make sense." msgstr "" -#: builtin/commit.c:1278 builtin/commit.c:1443 +#: builtin/commit.c:1303 builtin/commit.c:1480 msgid "show status concisely" msgstr "" -#: builtin/commit.c:1280 builtin/commit.c:1445 +#: builtin/commit.c:1305 builtin/commit.c:1482 msgid "show branch information" msgstr "" -#: builtin/commit.c:1282 +#: builtin/commit.c:1307 msgid "show stash information" msgstr "" -#: builtin/commit.c:1284 builtin/commit.c:1447 +#: builtin/commit.c:1309 builtin/commit.c:1484 msgid "compute full ahead/behind values" msgstr "" -#: builtin/commit.c:1286 +#: builtin/commit.c:1311 msgid "version" msgstr "" -#: builtin/commit.c:1286 builtin/commit.c:1449 builtin/push.c:542 -#: builtin/worktree.c:541 +#: builtin/commit.c:1311 builtin/commit.c:1486 builtin/push.c:558 +#: builtin/worktree.c:581 msgid "machine-readable output" msgstr "" -#: builtin/commit.c:1289 builtin/commit.c:1451 +#: builtin/commit.c:1314 builtin/commit.c:1488 msgid "show status in long format (default)" msgstr "" -#: builtin/commit.c:1292 builtin/commit.c:1454 +#: builtin/commit.c:1317 builtin/commit.c:1491 msgid "terminate entries with NUL" msgstr "" -#: builtin/commit.c:1294 builtin/commit.c:1298 builtin/commit.c:1457 -#: builtin/fast-export.c:999 builtin/fast-export.c:1002 builtin/tag.c:396 +#: builtin/commit.c:1319 builtin/commit.c:1323 builtin/commit.c:1494 +#: builtin/fast-export.c:1001 builtin/fast-export.c:1004 builtin/tag.c:397 msgid "mode" msgstr "" -#: builtin/commit.c:1295 builtin/commit.c:1457 +#: builtin/commit.c:1320 builtin/commit.c:1494 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" -#: builtin/commit.c:1299 +#: builtin/commit.c:1324 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" msgstr "" -#: builtin/commit.c:1301 parse-options.h:167 +#: builtin/commit.c:1326 parse-options.h:167 msgid "when" msgstr "" -#: builtin/commit.c:1302 +#: builtin/commit.c:1327 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "" -#: builtin/commit.c:1304 +#: builtin/commit.c:1329 msgid "list untracked files in columns" msgstr "" -#: builtin/commit.c:1323 +#: builtin/commit.c:1330 +msgid "do not detect renames" +msgstr "" + +#: builtin/commit.c:1332 +msgid "detect renames, optionally set similarity index" +msgstr "" + +#: builtin/commit.c:1352 msgid "Unsupported combination of ignored and untracked-files arguments" msgstr "" -#: builtin/commit.c:1413 +#: builtin/commit.c:1450 msgid "suppress summary after successful commit" msgstr "" -#: builtin/commit.c:1414 +#: builtin/commit.c:1451 msgid "show diff in commit message template" msgstr "" -#: builtin/commit.c:1416 +#: builtin/commit.c:1453 msgid "Commit message options" msgstr "" -#: builtin/commit.c:1417 builtin/tag.c:393 +#: builtin/commit.c:1454 builtin/tag.c:394 msgid "read message from file" msgstr "" -#: builtin/commit.c:1418 +#: builtin/commit.c:1455 msgid "author" msgstr "" -#: builtin/commit.c:1418 +#: builtin/commit.c:1455 msgid "override author for commit" msgstr "" -#: builtin/commit.c:1419 builtin/gc.c:359 +#: builtin/commit.c:1456 builtin/gc.c:501 msgid "date" msgstr "" -#: builtin/commit.c:1419 +#: builtin/commit.c:1456 msgid "override date for commit" msgstr "" -#: builtin/commit.c:1420 builtin/merge.c:226 builtin/notes.c:402 -#: builtin/notes.c:565 builtin/tag.c:391 +#: builtin/commit.c:1457 builtin/merge.c:227 builtin/notes.c:402 +#: builtin/notes.c:565 builtin/tag.c:392 msgid "message" msgstr "" -#: builtin/commit.c:1420 +#: builtin/commit.c:1457 msgid "commit message" msgstr "" -#: builtin/commit.c:1421 builtin/commit.c:1422 builtin/commit.c:1423 -#: builtin/commit.c:1424 parse-options.h:269 ref-filter.h:92 +#: builtin/commit.c:1458 builtin/commit.c:1459 builtin/commit.c:1460 +#: builtin/commit.c:1461 parse-options.h:270 ref-filter.h:92 msgid "commit" msgstr "" -#: builtin/commit.c:1421 +#: builtin/commit.c:1458 msgid "reuse and edit message from specified commit" msgstr "" -#: builtin/commit.c:1422 +#: builtin/commit.c:1459 msgid "reuse message from specified commit" msgstr "" -#: builtin/commit.c:1423 +#: builtin/commit.c:1460 msgid "use autosquash formatted message to fixup specified commit" msgstr "" -#: builtin/commit.c:1424 +#: builtin/commit.c:1461 msgid "use autosquash formatted message to squash specified commit" msgstr "" -#: builtin/commit.c:1425 +#: builtin/commit.c:1462 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "" -#: builtin/commit.c:1426 builtin/log.c:1446 builtin/merge.c:240 -#: builtin/pull.c:149 builtin/revert.c:105 +#: builtin/commit.c:1463 builtin/log.c:1446 builtin/merge.c:241 +#: builtin/pull.c:154 builtin/revert.c:105 msgid "add Signed-off-by:" msgstr "" -#: builtin/commit.c:1427 +#: builtin/commit.c:1464 msgid "use specified template file" msgstr "" -#: builtin/commit.c:1428 +#: builtin/commit.c:1465 msgid "force edit of commit" msgstr "" -#: builtin/commit.c:1429 +#: builtin/commit.c:1466 msgid "default" msgstr "" -#: builtin/commit.c:1429 builtin/tag.c:397 +#: builtin/commit.c:1466 builtin/tag.c:398 msgid "how to strip spaces and #comments from message" msgstr "" -#: builtin/commit.c:1430 +#: builtin/commit.c:1467 msgid "include status in commit message template" msgstr "" -#: builtin/commit.c:1432 builtin/merge.c:238 builtin/pull.c:179 +#: builtin/commit.c:1469 builtin/merge.c:239 builtin/pull.c:184 #: builtin/revert.c:113 msgid "GPG sign commit" msgstr "" -#: builtin/commit.c:1435 +#: builtin/commit.c:1472 msgid "Commit contents options" msgstr "" -#: builtin/commit.c:1436 +#: builtin/commit.c:1473 msgid "commit all changed files" msgstr "" -#: builtin/commit.c:1437 +#: builtin/commit.c:1474 msgid "add specified files to index for commit" msgstr "" -#: builtin/commit.c:1438 +#: builtin/commit.c:1475 msgid "interactively add files" msgstr "" -#: builtin/commit.c:1439 +#: builtin/commit.c:1476 msgid "interactively add changes" msgstr "" -#: builtin/commit.c:1440 +#: builtin/commit.c:1477 msgid "commit only specified files" msgstr "" -#: builtin/commit.c:1441 +#: builtin/commit.c:1478 msgid "bypass pre-commit and commit-msg hooks" msgstr "" -#: builtin/commit.c:1442 +#: builtin/commit.c:1479 msgid "show what would be committed" msgstr "" -#: builtin/commit.c:1455 +#: builtin/commit.c:1492 msgid "amend previous commit" msgstr "" -#: builtin/commit.c:1456 +#: builtin/commit.c:1493 msgid "bypass post-rewrite hook" msgstr "" -#: builtin/commit.c:1461 +#: builtin/commit.c:1498 msgid "ok to record an empty change" msgstr "" -#: builtin/commit.c:1463 +#: builtin/commit.c:1500 msgid "ok to record a change with an empty message" msgstr "" -#: builtin/commit.c:1536 -#, c-format -msgid "Corrupt MERGE_HEAD file (%s)" -msgstr "" - -#: builtin/commit.c:1543 -msgid "could not read MERGE_MODE" -msgstr "" - -#: builtin/commit.c:1562 -#, c-format -msgid "could not read commit message: %s" -msgstr "" - #: builtin/commit.c:1573 #, c-format +msgid "Corrupt MERGE_HEAD file (%s)" +msgstr "" + +#: builtin/commit.c:1580 +msgid "could not read MERGE_MODE" +msgstr "" + +#: builtin/commit.c:1599 +#, c-format +msgid "could not read commit message: %s" +msgstr "" + +#: builtin/commit.c:1610 +#, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "" -#: builtin/commit.c:1578 +#: builtin/commit.c:1615 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "" -#: builtin/commit.c:1613 +#: builtin/commit.c:1650 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" "not exceeded, and then \"git reset HEAD\" to recover." msgstr "" +#: builtin/commit-graph.c:9 +msgid "git commit-graph [--object-dir ]" +msgstr "" + +#: builtin/commit-graph.c:10 builtin/commit-graph.c:16 +msgid "git commit-graph read [--object-dir ]" +msgstr "" + +#: builtin/commit-graph.c:11 builtin/commit-graph.c:21 +msgid "" +"git commit-graph write [--object-dir ] [--append] [--stdin-packs|--" +"stdin-commits]" +msgstr "" + +#: builtin/commit-graph.c:39 builtin/commit-graph.c:92 +#: builtin/commit-graph.c:147 builtin/fetch.c:161 builtin/log.c:1466 +msgid "dir" +msgstr "" + +#: builtin/commit-graph.c:40 builtin/commit-graph.c:93 +#: builtin/commit-graph.c:148 +msgid "The object directory to store the graph" +msgstr "" + +#: builtin/commit-graph.c:95 +msgid "scan pack-indexes listed by stdin for commits" +msgstr "" + +#: builtin/commit-graph.c:97 +msgid "start walk at commits listed by stdin" +msgstr "" + +#: builtin/commit-graph.c:99 +msgid "include all commits already in the commit-graph file" +msgstr "" + +#: builtin/commit-graph.c:108 +msgid "cannot use both --stdin-commits and --stdin-packs" +msgstr "" + #: builtin/config.c:10 msgid "git config []" msgstr "" -#: builtin/config.c:58 +#: builtin/config.c:101 +#, c-format +msgid "unrecognized --type argument, %s" +msgstr "" + +#: builtin/config.c:123 msgid "Config file location" msgstr "" -#: builtin/config.c:59 +#: builtin/config.c:124 msgid "use global config file" msgstr "" -#: builtin/config.c:60 +#: builtin/config.c:125 msgid "use system config file" msgstr "" -#: builtin/config.c:61 +#: builtin/config.c:126 msgid "use repository config file" msgstr "" -#: builtin/config.c:62 +#: builtin/config.c:127 msgid "use given config file" msgstr "" -#: builtin/config.c:63 +#: builtin/config.c:128 msgid "blob-id" msgstr "" -#: builtin/config.c:63 +#: builtin/config.c:128 msgid "read config from given blob object" msgstr "" -#: builtin/config.c:64 +#: builtin/config.c:129 msgid "Action" msgstr "" -#: builtin/config.c:65 +#: builtin/config.c:130 msgid "get value: name [value-regex]" msgstr "" -#: builtin/config.c:66 +#: builtin/config.c:131 msgid "get all values: key [value-regex]" msgstr "" -#: builtin/config.c:67 +#: builtin/config.c:132 msgid "get values for regexp: name-regex [value-regex]" msgstr "" -#: builtin/config.c:68 +#: builtin/config.c:133 msgid "get value specific for the URL: section[.var] URL" msgstr "" -#: builtin/config.c:69 +#: builtin/config.c:134 msgid "replace all matching variables: name value [value_regex]" msgstr "" -#: builtin/config.c:70 +#: builtin/config.c:135 msgid "add a new variable: name value" msgstr "" -#: builtin/config.c:71 +#: builtin/config.c:136 msgid "remove a variable: name [value-regex]" msgstr "" -#: builtin/config.c:72 +#: builtin/config.c:137 msgid "remove all matches: name [value-regex]" msgstr "" -#: builtin/config.c:73 +#: builtin/config.c:138 msgid "rename section: old-name new-name" msgstr "" -#: builtin/config.c:74 +#: builtin/config.c:139 msgid "remove a section: name" msgstr "" -#: builtin/config.c:75 +#: builtin/config.c:140 msgid "list all" msgstr "" -#: builtin/config.c:76 +#: builtin/config.c:141 msgid "open an editor" msgstr "" -#: builtin/config.c:77 +#: builtin/config.c:142 msgid "find the color configured: slot [default]" msgstr "" -#: builtin/config.c:78 +#: builtin/config.c:143 msgid "find the color setting: slot [stdout-is-tty]" msgstr "" -#: builtin/config.c:79 +#: builtin/config.c:144 msgid "Type" msgstr "" -#: builtin/config.c:80 +#: builtin/config.c:145 +msgid "value is given this type" +msgstr "" + +#: builtin/config.c:146 msgid "value is \"true\" or \"false\"" msgstr "" -#: builtin/config.c:81 +#: builtin/config.c:147 msgid "value is decimal number" msgstr "" -#: builtin/config.c:82 +#: builtin/config.c:148 msgid "value is --bool or --int" msgstr "" -#: builtin/config.c:83 +#: builtin/config.c:149 msgid "value is a path (file or directory name)" msgstr "" -#: builtin/config.c:84 +#: builtin/config.c:150 msgid "value is an expiry date" msgstr "" -#: builtin/config.c:85 +#: builtin/config.c:151 msgid "Other" msgstr "" -#: builtin/config.c:86 +#: builtin/config.c:152 msgid "terminate values with NUL byte" msgstr "" -#: builtin/config.c:87 +#: builtin/config.c:153 msgid "show variable names only" msgstr "" -#: builtin/config.c:88 +#: builtin/config.c:154 msgid "respect include directives on lookup" msgstr "" -#: builtin/config.c:89 +#: builtin/config.c:155 msgid "show origin of config (file, standard input, blob, command line)" msgstr "" -#: builtin/config.c:335 +#: builtin/config.c:156 +msgid "value" +msgstr "" + +#: builtin/config.c:156 +msgid "with --get, use default value when missing entry" +msgstr "" + +#: builtin/config.c:332 +#, c-format +msgid "failed to format default config value: %s" +msgstr "" + +#: builtin/config.c:431 msgid "unable to parse default color value" msgstr "" -#: builtin/config.c:479 +#: builtin/config.c:575 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -7446,27 +7809,31 @@ msgid "" "#\temail = %s\n" msgstr "" -#: builtin/config.c:507 +#: builtin/config.c:603 msgid "--local can only be used inside a git repository" msgstr "" -#: builtin/config.c:632 +#: builtin/config.c:606 +msgid "--blob can only be used inside a git repository" +msgstr "" + +#: builtin/config.c:735 #, c-format msgid "cannot create configuration file %s" msgstr "" -#: builtin/config.c:645 +#: builtin/config.c:748 #, c-format msgid "" "cannot overwrite multiple values with a single value\n" " Use a regexp, --add or --replace-all to change %s." msgstr "" -#: builtin/count-objects.c:88 +#: builtin/count-objects.c:90 msgid "git count-objects [-v] [-H | --human-readable]" msgstr "" -#: builtin/count-objects.c:98 +#: builtin/count-objects.c:100 msgid "print sizes in human readable format" msgstr "" @@ -7760,333 +8127,339 @@ msgstr "" msgid "no given for --extcmd=" msgstr "" -#: builtin/fast-export.c:26 +#: builtin/fast-export.c:27 msgid "git fast-export [rev-list-opts]" msgstr "" -#: builtin/fast-export.c:998 +#: builtin/fast-export.c:1000 msgid "show progress after objects" msgstr "" -#: builtin/fast-export.c:1000 +#: builtin/fast-export.c:1002 msgid "select handling of signed tags" msgstr "" -#: builtin/fast-export.c:1003 +#: builtin/fast-export.c:1005 msgid "select handling of tags that tag filtered objects" msgstr "" -#: builtin/fast-export.c:1006 +#: builtin/fast-export.c:1008 msgid "Dump marks to this file" msgstr "" -#: builtin/fast-export.c:1008 +#: builtin/fast-export.c:1010 msgid "Import marks from this file" msgstr "" -#: builtin/fast-export.c:1010 +#: builtin/fast-export.c:1012 msgid "Fake a tagger when tags lack one" msgstr "" -#: builtin/fast-export.c:1012 +#: builtin/fast-export.c:1014 msgid "Output full tree for each commit" msgstr "" -#: builtin/fast-export.c:1014 +#: builtin/fast-export.c:1016 msgid "Use the done feature to terminate the stream" msgstr "" -#: builtin/fast-export.c:1015 +#: builtin/fast-export.c:1017 msgid "Skip output of blob data" msgstr "" -#: builtin/fast-export.c:1016 +#: builtin/fast-export.c:1018 msgid "refspec" msgstr "" -#: builtin/fast-export.c:1017 +#: builtin/fast-export.c:1019 msgid "Apply refspec to exported refs" msgstr "" -#: builtin/fast-export.c:1018 +#: builtin/fast-export.c:1020 msgid "anonymize output" msgstr "" -#: builtin/fetch.c:25 +#: builtin/fetch.c:26 msgid "git fetch [] [ [...]]" msgstr "" -#: builtin/fetch.c:26 +#: builtin/fetch.c:27 msgid "git fetch [] " msgstr "" -#: builtin/fetch.c:27 +#: builtin/fetch.c:28 msgid "git fetch --multiple [] [( | )...]" msgstr "" -#: builtin/fetch.c:28 +#: builtin/fetch.c:29 msgid "git fetch --all []" msgstr "" -#: builtin/fetch.c:124 builtin/pull.c:188 +#: builtin/fetch.c:123 builtin/pull.c:193 msgid "fetch from all remotes" msgstr "" -#: builtin/fetch.c:126 builtin/pull.c:191 +#: builtin/fetch.c:125 builtin/pull.c:196 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "" -#: builtin/fetch.c:128 builtin/pull.c:194 +#: builtin/fetch.c:127 builtin/pull.c:199 msgid "path to upload pack on remote end" msgstr "" -#: builtin/fetch.c:129 builtin/pull.c:196 +#: builtin/fetch.c:128 builtin/pull.c:201 msgid "force overwrite of local branch" msgstr "" -#: builtin/fetch.c:131 +#: builtin/fetch.c:130 msgid "fetch from multiple remotes" msgstr "" -#: builtin/fetch.c:133 builtin/pull.c:198 +#: builtin/fetch.c:132 builtin/pull.c:203 msgid "fetch all tags and associated objects" msgstr "" -#: builtin/fetch.c:135 +#: builtin/fetch.c:134 msgid "do not fetch all tags (--no-tags)" msgstr "" -#: builtin/fetch.c:137 +#: builtin/fetch.c:136 msgid "number of submodules fetched in parallel" msgstr "" -#: builtin/fetch.c:139 builtin/pull.c:201 +#: builtin/fetch.c:138 builtin/pull.c:206 msgid "prune remote-tracking branches no longer on remote" msgstr "" -#: builtin/fetch.c:141 +#: builtin/fetch.c:140 msgid "prune local tags no longer on remote and clobber changed tags" msgstr "" -#: builtin/fetch.c:142 builtin/fetch.c:165 builtin/pull.c:126 +#: builtin/fetch.c:141 builtin/fetch.c:164 builtin/pull.c:131 msgid "on-demand" msgstr "" -#: builtin/fetch.c:143 +#: builtin/fetch.c:142 msgid "control recursive fetching of submodules" msgstr "" -#: builtin/fetch.c:147 builtin/pull.c:209 +#: builtin/fetch.c:146 builtin/pull.c:214 msgid "keep downloaded pack" msgstr "" -#: builtin/fetch.c:149 +#: builtin/fetch.c:148 msgid "allow updating of HEAD ref" msgstr "" -#: builtin/fetch.c:152 builtin/fetch.c:158 builtin/pull.c:212 +#: builtin/fetch.c:151 builtin/fetch.c:157 builtin/pull.c:217 msgid "deepen history of shallow clone" msgstr "" -#: builtin/fetch.c:154 +#: builtin/fetch.c:153 msgid "deepen history of shallow repository based on time" msgstr "" -#: builtin/fetch.c:160 builtin/pull.c:215 +#: builtin/fetch.c:159 builtin/pull.c:220 msgid "convert to a complete repository" msgstr "" -#: builtin/fetch.c:162 builtin/log.c:1466 -msgid "dir" -msgstr "" - -#: builtin/fetch.c:163 +#: builtin/fetch.c:162 msgid "prepend this to submodule path output" msgstr "" -#: builtin/fetch.c:166 +#: builtin/fetch.c:165 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" msgstr "" -#: builtin/fetch.c:170 builtin/pull.c:218 +#: builtin/fetch.c:169 builtin/pull.c:223 msgid "accept refs that update .git/shallow" msgstr "" -#: builtin/fetch.c:171 builtin/pull.c:220 +#: builtin/fetch.c:170 builtin/pull.c:225 msgid "refmap" msgstr "" -#: builtin/fetch.c:172 builtin/pull.c:221 +#: builtin/fetch.c:171 builtin/pull.c:226 msgid "specify fetch refmap" msgstr "" -#: builtin/fetch.c:431 +#: builtin/fetch.c:172 builtin/ls-remote.c:77 builtin/push.c:582 +#: builtin/send-pack.c:172 +msgid "server-specific" +msgstr "" + +#: builtin/fetch.c:172 builtin/ls-remote.c:77 builtin/push.c:582 +#: builtin/send-pack.c:173 +msgid "option to transmit" +msgstr "" + +#: builtin/fetch.c:442 msgid "Couldn't find remote ref HEAD" msgstr "" -#: builtin/fetch.c:549 +#: builtin/fetch.c:560 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "" -#: builtin/fetch.c:642 +#: builtin/fetch.c:653 #, c-format msgid "object %s not found" msgstr "" -#: builtin/fetch.c:646 +#: builtin/fetch.c:657 msgid "[up to date]" msgstr "" -#: builtin/fetch.c:659 builtin/fetch.c:739 +#: builtin/fetch.c:670 builtin/fetch.c:750 msgid "[rejected]" msgstr "" -#: builtin/fetch.c:660 +#: builtin/fetch.c:671 msgid "can't fetch in current branch" msgstr "" -#: builtin/fetch.c:669 +#: builtin/fetch.c:680 msgid "[tag update]" msgstr "" -#: builtin/fetch.c:670 builtin/fetch.c:703 builtin/fetch.c:719 -#: builtin/fetch.c:734 +#: builtin/fetch.c:681 builtin/fetch.c:714 builtin/fetch.c:730 +#: builtin/fetch.c:745 msgid "unable to update local ref" msgstr "" -#: builtin/fetch.c:689 +#: builtin/fetch.c:700 msgid "[new tag]" msgstr "" -#: builtin/fetch.c:692 +#: builtin/fetch.c:703 msgid "[new branch]" msgstr "" -#: builtin/fetch.c:695 +#: builtin/fetch.c:706 msgid "[new ref]" msgstr "" -#: builtin/fetch.c:734 +#: builtin/fetch.c:745 msgid "forced update" msgstr "" -#: builtin/fetch.c:739 +#: builtin/fetch.c:750 msgid "non-fast-forward" msgstr "" -#: builtin/fetch.c:784 +#: builtin/fetch.c:795 #, c-format msgid "%s did not send all necessary objects\n" msgstr "" -#: builtin/fetch.c:804 +#: builtin/fetch.c:815 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "" -#: builtin/fetch.c:892 builtin/fetch.c:988 +#: builtin/fetch.c:903 builtin/fetch.c:999 #, c-format msgid "From %.*s\n" msgstr "" -#: builtin/fetch.c:903 +#: builtin/fetch.c:914 #, c-format msgid "" "some local refs could not be updated; try running\n" " 'git remote prune %s' to remove any old, conflicting branches" msgstr "" -#: builtin/fetch.c:958 +#: builtin/fetch.c:969 #, c-format msgid " (%s will become dangling)" msgstr "" -#: builtin/fetch.c:959 +#: builtin/fetch.c:970 #, c-format msgid " (%s has become dangling)" msgstr "" -#: builtin/fetch.c:991 +#: builtin/fetch.c:1002 msgid "[deleted]" msgstr "" -#: builtin/fetch.c:992 builtin/remote.c:1024 +#: builtin/fetch.c:1003 builtin/remote.c:1033 msgid "(none)" msgstr "" -#: builtin/fetch.c:1015 +#: builtin/fetch.c:1026 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "" -#: builtin/fetch.c:1034 +#: builtin/fetch.c:1045 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "" -#: builtin/fetch.c:1037 +#: builtin/fetch.c:1048 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "" -#: builtin/fetch.c:1277 +#: builtin/fetch.c:1287 #, c-format msgid "Fetching %s\n" msgstr "" -#: builtin/fetch.c:1279 builtin/remote.c:97 +#: builtin/fetch.c:1289 builtin/remote.c:98 #, c-format msgid "Could not fetch %s" msgstr "" -#: builtin/fetch.c:1325 builtin/fetch.c:1498 +#: builtin/fetch.c:1335 builtin/fetch.c:1503 msgid "" "--filter can only be used with the remote configured in core.partialClone" msgstr "" -#: builtin/fetch.c:1350 +#: builtin/fetch.c:1358 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." msgstr "" -#: builtin/fetch.c:1394 +#: builtin/fetch.c:1395 msgid "You need to specify a tag name." msgstr "" -#: builtin/fetch.c:1439 +#: builtin/fetch.c:1444 msgid "Negative depth in --deepen is not supported" msgstr "" -#: builtin/fetch.c:1441 +#: builtin/fetch.c:1446 msgid "--deepen and --depth are mutually exclusive" msgstr "" -#: builtin/fetch.c:1446 +#: builtin/fetch.c:1451 msgid "--depth and --unshallow cannot be used together" msgstr "" -#: builtin/fetch.c:1448 +#: builtin/fetch.c:1453 msgid "--unshallow on a complete repository does not make sense" msgstr "" -#: builtin/fetch.c:1464 +#: builtin/fetch.c:1469 msgid "fetch --all does not take a repository argument" msgstr "" -#: builtin/fetch.c:1466 +#: builtin/fetch.c:1471 msgid "fetch --all does not make sense with refspecs" msgstr "" -#: builtin/fetch.c:1475 +#: builtin/fetch.c:1480 #, c-format msgid "No such remote or remote group: %s" msgstr "" -#: builtin/fetch.c:1482 +#: builtin/fetch.c:1487 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "" @@ -8151,7 +8524,7 @@ msgstr "" msgid "show only matched refs" msgstr "" -#: builtin/for-each-ref.c:39 builtin/tag.c:420 +#: builtin/for-each-ref.c:39 builtin/tag.c:421 msgid "respect format colors" msgstr "" @@ -8175,81 +8548,81 @@ msgstr "" msgid "print only refs which don't contain the commit" msgstr "" -#: builtin/fsck.c:568 +#: builtin/fsck.c:569 msgid "Checking object directories" msgstr "" -#: builtin/fsck.c:660 +#: builtin/fsck.c:661 msgid "git fsck [] [...]" msgstr "" -#: builtin/fsck.c:666 +#: builtin/fsck.c:667 msgid "show unreachable objects" msgstr "" -#: builtin/fsck.c:667 +#: builtin/fsck.c:668 msgid "show dangling objects" msgstr "" -#: builtin/fsck.c:668 +#: builtin/fsck.c:669 msgid "report tags" msgstr "" -#: builtin/fsck.c:669 +#: builtin/fsck.c:670 msgid "report root nodes" msgstr "" -#: builtin/fsck.c:670 +#: builtin/fsck.c:671 msgid "make index objects head nodes" msgstr "" -#: builtin/fsck.c:671 +#: builtin/fsck.c:672 msgid "make reflogs head nodes (default)" msgstr "" -#: builtin/fsck.c:672 +#: builtin/fsck.c:673 msgid "also consider packs and alternate objects" msgstr "" -#: builtin/fsck.c:673 +#: builtin/fsck.c:674 msgid "check only connectivity" msgstr "" -#: builtin/fsck.c:674 +#: builtin/fsck.c:675 msgid "enable more strict checking" msgstr "" -#: builtin/fsck.c:676 +#: builtin/fsck.c:677 msgid "write dangling objects in .git/lost-found" msgstr "" -#: builtin/fsck.c:677 builtin/prune.c:108 +#: builtin/fsck.c:678 builtin/prune.c:109 msgid "show progress" msgstr "" -#: builtin/fsck.c:678 +#: builtin/fsck.c:679 msgid "show verbose names for reachable objects" msgstr "" -#: builtin/fsck.c:742 +#: builtin/fsck.c:745 msgid "Checking objects" msgstr "" -#: builtin/gc.c:27 +#: builtin/gc.c:33 msgid "git gc []" msgstr "" -#: builtin/gc.c:80 +#: builtin/gc.c:88 #, c-format msgid "Failed to fstat %s: %s" msgstr "" -#: builtin/gc.c:312 +#: builtin/gc.c:452 #, c-format msgid "Can't stat %s" msgstr "" -#: builtin/gc.c:321 +#: builtin/gc.c:461 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -8259,63 +8632,72 @@ msgid "" "%s" msgstr "" -#: builtin/gc.c:360 +#: builtin/gc.c:502 msgid "prune unreferenced objects" msgstr "" -#: builtin/gc.c:362 +#: builtin/gc.c:504 msgid "be more thorough (increased runtime)" msgstr "" -#: builtin/gc.c:363 +#: builtin/gc.c:505 msgid "enable auto-gc mode" msgstr "" -#: builtin/gc.c:366 +#: builtin/gc.c:508 msgid "force running gc even if there may be another gc running" msgstr "" -#: builtin/gc.c:384 -#, c-format -msgid "Failed to parse gc.logexpiry value %s" +#: builtin/gc.c:511 +msgid "repack all other packs except the largest pack" msgstr "" -#: builtin/gc.c:412 +#: builtin/gc.c:528 +#, c-format +msgid "failed to parse gc.logexpiry value %s" +msgstr "" + +#: builtin/gc.c:539 +#, c-format +msgid "failed to parse prune expiry value %s" +msgstr "" + +#: builtin/gc.c:559 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "" -#: builtin/gc.c:414 +#: builtin/gc.c:561 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "" -#: builtin/gc.c:415 +#: builtin/gc.c:562 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "" -#: builtin/gc.c:440 +#: builtin/gc.c:598 #, c-format msgid "" "gc is already running on machine '%s' pid % (use --force if not)" msgstr "" -#: builtin/gc.c:487 +#: builtin/gc.c:645 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" -#: builtin/grep.c:27 +#: builtin/grep.c:28 msgid "git grep [] [-e] [...] [[--] ...]" msgstr "" -#: builtin/grep.c:225 +#: builtin/grep.c:226 #, c-format msgid "grep: failed to create thread: %s" msgstr "" -#: builtin/grep.c:283 +#: builtin/grep.c:284 #, c-format msgid "invalid number of threads specified (%d) for %s" msgstr "" @@ -8324,17 +8706,17 @@ msgstr "" #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c:292 builtin/index-pack.c:1523 builtin/index-pack.c:1712 +#: builtin/grep.c:293 builtin/index-pack.c:1531 builtin/index-pack.c:1723 #, c-format msgid "no threads support, ignoring %s" msgstr "" -#: builtin/grep.c:460 builtin/grep.c:580 builtin/grep.c:622 +#: builtin/grep.c:461 builtin/grep.c:582 builtin/grep.c:623 #, c-format msgid "unable to read tree (%s)" msgstr "" -#: builtin/grep.c:637 +#: builtin/grep.c:638 #, c-format msgid "unable to grep from object of type %s" msgstr "" @@ -8533,7 +8915,7 @@ msgstr "" msgid "unable to resolve revision: %s" msgstr "" -#: builtin/grep.c:1036 builtin/index-pack.c:1519 +#: builtin/grep.c:1036 builtin/index-pack.c:1527 #, c-format msgid "invalid number of threads specified (%d)" msgstr "" @@ -8725,299 +9107,303 @@ msgstr "" msgid "usage: %s%s" msgstr "" -#: builtin/index-pack.c:157 +#: builtin/index-pack.c:158 #, c-format msgid "unable to open %s" msgstr "" -#: builtin/index-pack.c:207 +#: builtin/index-pack.c:208 #, c-format msgid "object type mismatch at %s" msgstr "" -#: builtin/index-pack.c:227 +#: builtin/index-pack.c:228 #, c-format msgid "did not receive expected object %s" msgstr "" -#: builtin/index-pack.c:230 +#: builtin/index-pack.c:231 #, c-format msgid "object %s: expected type %s, found %s" msgstr "" -#: builtin/index-pack.c:272 +#: builtin/index-pack.c:273 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:282 +#: builtin/index-pack.c:283 msgid "early EOF" msgstr "" -#: builtin/index-pack.c:283 +#: builtin/index-pack.c:284 msgid "read error on input" msgstr "" -#: builtin/index-pack.c:295 +#: builtin/index-pack.c:296 msgid "used more bytes than were available" msgstr "" -#: builtin/index-pack.c:302 +#: builtin/index-pack.c:303 msgid "pack too large for current definition of off_t" msgstr "" -#: builtin/index-pack.c:305 builtin/unpack-objects.c:93 +#: builtin/index-pack.c:306 builtin/unpack-objects.c:93 msgid "pack exceeds maximum allowed size" msgstr "" -#: builtin/index-pack.c:320 +#: builtin/index-pack.c:321 #, c-format msgid "unable to create '%s'" msgstr "" -#: builtin/index-pack.c:326 +#: builtin/index-pack.c:327 #, c-format msgid "cannot open packfile '%s'" msgstr "" -#: builtin/index-pack.c:340 +#: builtin/index-pack.c:341 msgid "pack signature mismatch" msgstr "" -#: builtin/index-pack.c:342 +#: builtin/index-pack.c:343 #, c-format msgid "pack version % unsupported" msgstr "" -#: builtin/index-pack.c:360 +#: builtin/index-pack.c:361 #, c-format msgid "pack has bad object at offset %: %s" msgstr "" -#: builtin/index-pack.c:481 +#: builtin/index-pack.c:482 #, c-format msgid "inflate returned %d" msgstr "" -#: builtin/index-pack.c:530 +#: builtin/index-pack.c:531 msgid "offset value overflow for delta base object" msgstr "" -#: builtin/index-pack.c:538 +#: builtin/index-pack.c:539 msgid "delta base offset is out of bound" msgstr "" -#: builtin/index-pack.c:546 +#: builtin/index-pack.c:547 #, c-format msgid "unknown object type %d" msgstr "" -#: builtin/index-pack.c:577 +#: builtin/index-pack.c:578 msgid "cannot pread pack file" msgstr "" -#: builtin/index-pack.c:579 +#: builtin/index-pack.c:580 #, c-format msgid "premature end of pack file, % byte missing" msgid_plural "premature end of pack file, % bytes missing" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:605 +#: builtin/index-pack.c:606 msgid "serious inflate inconsistency" msgstr "" -#: builtin/index-pack.c:750 builtin/index-pack.c:756 builtin/index-pack.c:779 -#: builtin/index-pack.c:818 builtin/index-pack.c:827 +#: builtin/index-pack.c:751 builtin/index-pack.c:757 builtin/index-pack.c:780 +#: builtin/index-pack.c:819 builtin/index-pack.c:828 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "" -#: builtin/index-pack.c:753 builtin/pack-objects.c:182 -#: builtin/pack-objects.c:276 +#: builtin/index-pack.c:754 builtin/pack-objects.c:198 +#: builtin/pack-objects.c:292 #, c-format msgid "unable to read %s" msgstr "" -#: builtin/index-pack.c:816 +#: builtin/index-pack.c:817 #, c-format msgid "cannot read existing object info %s" msgstr "" -#: builtin/index-pack.c:824 +#: builtin/index-pack.c:825 #, c-format msgid "cannot read existing object %s" msgstr "" -#: builtin/index-pack.c:838 +#: builtin/index-pack.c:839 #, c-format msgid "invalid blob object %s" msgstr "" -#: builtin/index-pack.c:853 +#: builtin/index-pack.c:842 builtin/index-pack.c:860 +msgid "fsck error in packed object" +msgstr "" + +#: builtin/index-pack.c:857 #, c-format msgid "invalid %s" msgstr "" -#: builtin/index-pack.c:856 -msgid "Error in object" -msgstr "" - -#: builtin/index-pack.c:858 +#: builtin/index-pack.c:862 #, c-format msgid "Not all child objects of %s are reachable" msgstr "" -#: builtin/index-pack.c:930 builtin/index-pack.c:961 +#: builtin/index-pack.c:934 builtin/index-pack.c:965 msgid "failed to apply delta" msgstr "" -#: builtin/index-pack.c:1131 +#: builtin/index-pack.c:1135 msgid "Receiving objects" msgstr "" -#: builtin/index-pack.c:1131 +#: builtin/index-pack.c:1135 msgid "Indexing objects" msgstr "" -#: builtin/index-pack.c:1165 +#: builtin/index-pack.c:1169 msgid "pack is corrupted (SHA1 mismatch)" msgstr "" -#: builtin/index-pack.c:1170 +#: builtin/index-pack.c:1174 msgid "cannot fstat packfile" msgstr "" -#: builtin/index-pack.c:1173 +#: builtin/index-pack.c:1177 msgid "pack has junk at the end" msgstr "" -#: builtin/index-pack.c:1185 +#: builtin/index-pack.c:1189 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "" -#: builtin/index-pack.c:1208 +#: builtin/index-pack.c:1212 msgid "Resolving deltas" msgstr "" -#: builtin/index-pack.c:1219 +#: builtin/index-pack.c:1223 #, c-format msgid "unable to create thread: %s" msgstr "" -#: builtin/index-pack.c:1261 +#: builtin/index-pack.c:1265 msgid "confusion beyond insanity" msgstr "" -#: builtin/index-pack.c:1267 +#: builtin/index-pack.c:1271 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1279 +#: builtin/index-pack.c:1283 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "" -#: builtin/index-pack.c:1283 +#: builtin/index-pack.c:1287 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1307 +#: builtin/index-pack.c:1311 #, c-format msgid "unable to deflate appended object (%d)" msgstr "" -#: builtin/index-pack.c:1383 +#: builtin/index-pack.c:1388 #, c-format msgid "local object %s is corrupt" msgstr "" -#: builtin/index-pack.c:1397 +#: builtin/index-pack.c:1402 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "" -#: builtin/index-pack.c:1422 +#: builtin/index-pack.c:1427 #, c-format msgid "cannot write %s file '%s'" msgstr "" -#: builtin/index-pack.c:1430 +#: builtin/index-pack.c:1435 #, c-format msgid "cannot close written %s file '%s'" msgstr "" -#: builtin/index-pack.c:1454 +#: builtin/index-pack.c:1459 msgid "error while closing pack file" msgstr "" -#: builtin/index-pack.c:1468 +#: builtin/index-pack.c:1473 msgid "cannot store pack file" msgstr "" -#: builtin/index-pack.c:1476 +#: builtin/index-pack.c:1481 msgid "cannot store index file" msgstr "" -#: builtin/index-pack.c:1513 +#: builtin/index-pack.c:1521 #, c-format msgid "bad pack.indexversion=%" msgstr "" -#: builtin/index-pack.c:1581 +#: builtin/index-pack.c:1590 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "" -#: builtin/index-pack.c:1583 +#: builtin/index-pack.c:1592 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "" -#: builtin/index-pack.c:1631 +#: builtin/index-pack.c:1640 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1638 +#: builtin/index-pack.c:1647 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "" msgstr[1] "" -#: builtin/index-pack.c:1675 +#: builtin/index-pack.c:1684 msgid "Cannot come back to cwd" msgstr "" -#: builtin/index-pack.c:1724 builtin/index-pack.c:1727 -#: builtin/index-pack.c:1743 builtin/index-pack.c:1747 +#: builtin/index-pack.c:1735 builtin/index-pack.c:1738 +#: builtin/index-pack.c:1754 builtin/index-pack.c:1758 #, c-format msgid "bad %s" msgstr "" -#: builtin/index-pack.c:1763 +#: builtin/index-pack.c:1774 msgid "--fix-thin cannot be used without --stdin" msgstr "" -#: builtin/index-pack.c:1765 +#: builtin/index-pack.c:1776 msgid "--stdin requires a git repository" msgstr "" -#: builtin/index-pack.c:1771 +#: builtin/index-pack.c:1782 msgid "--verify with no packfile name given" msgstr "" +#: builtin/index-pack.c:1832 builtin/unpack-objects.c:578 +msgid "fsck error in pack objects" +msgstr "" + #: builtin/init-db.c:55 #, c-format msgid "cannot stat '%s'" @@ -9112,11 +9498,6 @@ msgstr "" msgid "specify that the git repository is to be shared amongst several users" msgstr "" -#: builtin/init-db.c:516 builtin/init-db.c:521 -#, c-format -msgid "cannot mkdir %s" -msgstr "" - #: builtin/init-db.c:525 #, c-format msgid "cannot chdir to %s" @@ -9296,7 +9677,7 @@ msgstr "" msgid "Unknown commit %s" msgstr "" -#: builtin/log.c:1289 builtin/notes.c:887 builtin/tag.c:522 +#: builtin/log.c:1289 builtin/notes.c:887 builtin/tag.c:523 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "" @@ -9641,46 +10022,46 @@ msgstr "" msgid "show debugging data" msgstr "" -#: builtin/ls-remote.c:7 +#: builtin/ls-remote.c:9 msgid "" "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=]\n" " [-q | --quiet] [--exit-code] [--get-url]\n" " [--symref] [ [...]]" msgstr "" -#: builtin/ls-remote.c:52 +#: builtin/ls-remote.c:59 msgid "do not print remote URL" msgstr "" -#: builtin/ls-remote.c:53 builtin/ls-remote.c:55 +#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 msgid "exec" msgstr "" -#: builtin/ls-remote.c:54 builtin/ls-remote.c:56 +#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 msgid "path of git-upload-pack on the remote host" msgstr "" -#: builtin/ls-remote.c:58 +#: builtin/ls-remote.c:65 msgid "limit to tags" msgstr "" -#: builtin/ls-remote.c:59 +#: builtin/ls-remote.c:66 msgid "limit to heads" msgstr "" -#: builtin/ls-remote.c:60 +#: builtin/ls-remote.c:67 msgid "do not show peeled tags" msgstr "" -#: builtin/ls-remote.c:62 +#: builtin/ls-remote.c:69 msgid "take url..insteadOf into account" msgstr "" -#: builtin/ls-remote.c:64 +#: builtin/ls-remote.c:73 msgid "exit with exit code 2 if no matching refs are found" msgstr "" -#: builtin/ls-remote.c:67 +#: builtin/ls-remote.c:76 msgid "show underlying ref in addition to the object pointed by it" msgstr "" @@ -9725,151 +10106,151 @@ msgstr "" msgid "empty mbox: '%s'" msgstr "" -#: builtin/merge.c:49 +#: builtin/merge.c:50 msgid "git merge [] [...]" msgstr "" -#: builtin/merge.c:50 +#: builtin/merge.c:51 msgid "git merge --abort" msgstr "" -#: builtin/merge.c:51 +#: builtin/merge.c:52 msgid "git merge --continue" msgstr "" -#: builtin/merge.c:108 +#: builtin/merge.c:109 msgid "switch `m' requires a value" msgstr "" -#: builtin/merge.c:145 -#, c-format -msgid "Could not find merge strategy '%s'.\n" -msgstr "" - #: builtin/merge.c:146 #, c-format +msgid "Could not find merge strategy '%s'.\n" +msgstr "" + +#: builtin/merge.c:147 +#, c-format msgid "Available strategies are:" msgstr "" -#: builtin/merge.c:151 +#: builtin/merge.c:152 #, c-format msgid "Available custom strategies are:" msgstr "" -#: builtin/merge.c:201 builtin/pull.c:137 +#: builtin/merge.c:202 builtin/pull.c:142 msgid "do not show a diffstat at the end of the merge" msgstr "" -#: builtin/merge.c:204 builtin/pull.c:140 +#: builtin/merge.c:205 builtin/pull.c:145 msgid "show a diffstat at the end of the merge" msgstr "" -#: builtin/merge.c:205 builtin/pull.c:143 +#: builtin/merge.c:206 builtin/pull.c:148 msgid "(synonym to --stat)" msgstr "" -#: builtin/merge.c:207 builtin/pull.c:146 +#: builtin/merge.c:208 builtin/pull.c:151 msgid "add (at most ) entries from shortlog to merge commit message" msgstr "" -#: builtin/merge.c:210 builtin/pull.c:152 +#: builtin/merge.c:211 builtin/pull.c:157 msgid "create a single commit instead of doing a merge" msgstr "" -#: builtin/merge.c:212 builtin/pull.c:155 +#: builtin/merge.c:213 builtin/pull.c:160 msgid "perform a commit if the merge succeeds (default)" msgstr "" -#: builtin/merge.c:214 builtin/pull.c:158 +#: builtin/merge.c:215 builtin/pull.c:163 msgid "edit message before committing" msgstr "" -#: builtin/merge.c:215 +#: builtin/merge.c:216 msgid "allow fast-forward (default)" msgstr "" -#: builtin/merge.c:217 builtin/pull.c:164 +#: builtin/merge.c:218 builtin/pull.c:169 msgid "abort if fast-forward is not possible" msgstr "" -#: builtin/merge.c:221 builtin/pull.c:167 +#: builtin/merge.c:222 builtin/pull.c:172 msgid "verify that the named commit has a valid GPG signature" msgstr "" -#: builtin/merge.c:222 builtin/notes.c:777 builtin/pull.c:171 +#: builtin/merge.c:223 builtin/notes.c:777 builtin/pull.c:176 #: builtin/revert.c:109 msgid "strategy" msgstr "" -#: builtin/merge.c:223 builtin/pull.c:172 +#: builtin/merge.c:224 builtin/pull.c:177 msgid "merge strategy to use" msgstr "" -#: builtin/merge.c:224 builtin/pull.c:175 +#: builtin/merge.c:225 builtin/pull.c:180 msgid "option=value" msgstr "" -#: builtin/merge.c:225 builtin/pull.c:176 +#: builtin/merge.c:226 builtin/pull.c:181 msgid "option for selected merge strategy" msgstr "" -#: builtin/merge.c:227 +#: builtin/merge.c:228 msgid "merge commit message (for a non-fast-forward merge)" msgstr "" -#: builtin/merge.c:231 +#: builtin/merge.c:232 msgid "abort the current in-progress merge" msgstr "" -#: builtin/merge.c:233 +#: builtin/merge.c:234 msgid "continue the current in-progress merge" msgstr "" -#: builtin/merge.c:235 builtin/pull.c:183 +#: builtin/merge.c:236 builtin/pull.c:188 msgid "allow merging unrelated histories" msgstr "" -#: builtin/merge.c:241 +#: builtin/merge.c:242 msgid "verify commit-msg hook" msgstr "" -#: builtin/merge.c:266 +#: builtin/merge.c:267 msgid "could not run stash." msgstr "" -#: builtin/merge.c:271 +#: builtin/merge.c:272 msgid "stash failed" msgstr "" -#: builtin/merge.c:276 +#: builtin/merge.c:277 #, c-format msgid "not a valid object: %s" msgstr "" -#: builtin/merge.c:298 builtin/merge.c:315 +#: builtin/merge.c:299 builtin/merge.c:316 msgid "read-tree failed" msgstr "" -#: builtin/merge.c:345 +#: builtin/merge.c:346 msgid " (nothing to squash)" msgstr "" -#: builtin/merge.c:356 +#: builtin/merge.c:357 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "" -#: builtin/merge.c:406 +#: builtin/merge.c:407 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "" -#: builtin/merge.c:456 +#: builtin/merge.c:457 #, c-format msgid "'%s' does not point to a commit" msgstr "" -#: builtin/merge.c:546 +#: builtin/merge.c:547 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "" @@ -9888,17 +10269,17 @@ msgstr "" msgid "unable to write %s" msgstr "" -#: builtin/merge.c:749 +#: builtin/merge.c:748 #, c-format msgid "Could not read from '%s'" msgstr "" -#: builtin/merge.c:758 +#: builtin/merge.c:757 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" -#: builtin/merge.c:764 +#: builtin/merge.c:763 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -9908,185 +10289,185 @@ msgid "" "the commit.\n" msgstr "" -#: builtin/merge.c:800 +#: builtin/merge.c:799 msgid "Empty commit message." msgstr "" -#: builtin/merge.c:820 +#: builtin/merge.c:818 #, c-format msgid "Wonderful.\n" msgstr "" -#: builtin/merge.c:873 +#: builtin/merge.c:871 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" -#: builtin/merge.c:912 +#: builtin/merge.c:910 msgid "No current branch." msgstr "" -#: builtin/merge.c:914 +#: builtin/merge.c:912 msgid "No remote for the current branch." msgstr "" -#: builtin/merge.c:916 +#: builtin/merge.c:914 msgid "No default upstream defined for the current branch." msgstr "" -#: builtin/merge.c:921 +#: builtin/merge.c:919 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "" -#: builtin/merge.c:974 +#: builtin/merge.c:972 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "" -#: builtin/merge.c:1076 +#: builtin/merge.c:1074 #, c-format msgid "not something we can merge in %s: %s" msgstr "" -#: builtin/merge.c:1110 +#: builtin/merge.c:1108 msgid "not something we can merge" msgstr "" -#: builtin/merge.c:1212 +#: builtin/merge.c:1210 msgid "--abort expects no arguments" msgstr "" -#: builtin/merge.c:1216 +#: builtin/merge.c:1214 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "" -#: builtin/merge.c:1228 +#: builtin/merge.c:1226 msgid "--continue expects no arguments" msgstr "" -#: builtin/merge.c:1232 +#: builtin/merge.c:1230 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "" -#: builtin/merge.c:1248 +#: builtin/merge.c:1246 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." msgstr "" -#: builtin/merge.c:1255 +#: builtin/merge.c:1253 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." msgstr "" -#: builtin/merge.c:1258 +#: builtin/merge.c:1256 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "" -#: builtin/merge.c:1267 +#: builtin/merge.c:1265 msgid "You cannot combine --squash with --no-ff." msgstr "" -#: builtin/merge.c:1275 +#: builtin/merge.c:1273 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" -#: builtin/merge.c:1292 +#: builtin/merge.c:1290 msgid "Squash commit into empty head not supported yet" msgstr "" -#: builtin/merge.c:1294 +#: builtin/merge.c:1292 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "" -#: builtin/merge.c:1299 +#: builtin/merge.c:1297 #, c-format msgid "%s - not something we can merge" msgstr "" -#: builtin/merge.c:1301 +#: builtin/merge.c:1299 msgid "Can merge only exactly one commit into empty head" msgstr "" -#: builtin/merge.c:1335 +#: builtin/merge.c:1333 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "" -#: builtin/merge.c:1338 +#: builtin/merge.c:1336 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "" -#: builtin/merge.c:1341 +#: builtin/merge.c:1339 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "" -#: builtin/merge.c:1344 +#: builtin/merge.c:1342 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "" -#: builtin/merge.c:1403 +#: builtin/merge.c:1401 msgid "refusing to merge unrelated histories" msgstr "" -#: builtin/merge.c:1412 +#: builtin/merge.c:1410 msgid "Already up to date." msgstr "" -#: builtin/merge.c:1422 +#: builtin/merge.c:1420 #, c-format msgid "Updating %s..%s\n" msgstr "" -#: builtin/merge.c:1463 +#: builtin/merge.c:1461 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "" -#: builtin/merge.c:1470 +#: builtin/merge.c:1468 #, c-format msgid "Nope.\n" msgstr "" -#: builtin/merge.c:1495 +#: builtin/merge.c:1493 msgid "Already up to date. Yeeah!" msgstr "" -#: builtin/merge.c:1501 +#: builtin/merge.c:1499 msgid "Not possible to fast-forward, aborting." msgstr "" -#: builtin/merge.c:1524 builtin/merge.c:1603 +#: builtin/merge.c:1522 builtin/merge.c:1601 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "" -#: builtin/merge.c:1528 +#: builtin/merge.c:1526 #, c-format msgid "Trying merge strategy %s...\n" msgstr "" -#: builtin/merge.c:1594 +#: builtin/merge.c:1592 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "" -#: builtin/merge.c:1596 +#: builtin/merge.c:1594 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "" -#: builtin/merge.c:1605 +#: builtin/merge.c:1603 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "" -#: builtin/merge.c:1617 +#: builtin/merge.c:1615 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -10220,25 +10601,25 @@ msgstr "" msgid "git mv [] ... " msgstr "" -#: builtin/mv.c:83 +#: builtin/mv.c:82 #, c-format msgid "Directory %s is in index and no submodule?" msgstr "" -#: builtin/mv.c:85 builtin/rm.c:289 +#: builtin/mv.c:84 builtin/rm.c:288 msgid "Please stage your changes to .gitmodules or stash them to proceed" msgstr "" -#: builtin/mv.c:103 +#: builtin/mv.c:102 #, c-format msgid "%.*s is in index" msgstr "" -#: builtin/mv.c:125 +#: builtin/mv.c:124 msgid "force move/rename even if target exists" msgstr "" -#: builtin/mv.c:127 +#: builtin/mv.c:126 msgid "skip move/rename errors" msgstr "" @@ -10303,7 +10684,7 @@ msgstr "" msgid "Renaming %s to %s\n" msgstr "" -#: builtin/mv.c:276 builtin/remote.c:712 builtin/repack.c:394 +#: builtin/mv.c:276 builtin/remote.c:715 builtin/repack.c:409 #, c-format msgid "renaming '%s' failed" msgstr "" @@ -10488,12 +10869,12 @@ msgstr "" msgid "the note contents have been left in %s" msgstr "" -#: builtin/notes.c:234 builtin/tag.c:506 +#: builtin/notes.c:234 builtin/tag.c:507 #, c-format msgid "cannot read '%s'" msgstr "" -#: builtin/notes.c:236 builtin/tag.c:509 +#: builtin/notes.c:236 builtin/tag.c:510 #, c-format msgid "could not open or read '%s'" msgstr "" @@ -10727,7 +11108,7 @@ msgstr "" msgid "read object names from the standard input" msgstr "" -#: builtin/notes.c:943 builtin/prune.c:106 builtin/worktree.c:160 +#: builtin/notes.c:943 builtin/prune.c:107 builtin/worktree.c:151 msgid "do not remove, show only" msgstr "" @@ -10748,208 +11129,236 @@ msgstr "" msgid "unknown subcommand: %s" msgstr "" -#: builtin/pack-objects.c:33 +#: builtin/pack-objects.c:48 msgid "" "git pack-objects --stdout [...] [< | < ]" msgstr "" -#: builtin/pack-objects.c:34 +#: builtin/pack-objects.c:49 msgid "" "git pack-objects [...] [< | < ]" msgstr "" -#: builtin/pack-objects.c:195 builtin/pack-objects.c:198 +#: builtin/pack-objects.c:211 builtin/pack-objects.c:214 #, c-format msgid "deflate error (%d)" msgstr "" -#: builtin/pack-objects.c:791 +#: builtin/pack-objects.c:810 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "" -#: builtin/pack-objects.c:804 +#: builtin/pack-objects.c:823 msgid "Writing objects" msgstr "" -#: builtin/pack-objects.c:1084 +#: builtin/pack-objects.c:1106 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" -#: builtin/pack-objects.c:2454 +#: builtin/pack-objects.c:1765 +msgid "Counting objects" +msgstr "" + +#: builtin/pack-objects.c:1895 +#, c-format +msgid "unable to get size of %s" +msgstr "" + +#: builtin/pack-objects.c:1910 +#, c-format +msgid "unable to parse object header of %s" +msgstr "" + +#: builtin/pack-objects.c:2564 msgid "Compressing objects" msgstr "" -#: builtin/pack-objects.c:2625 +#: builtin/pack-objects.c:2735 msgid "invalid value for --missing" msgstr "" -#: builtin/pack-objects.c:2928 +#: builtin/pack-objects.c:3067 #, c-format msgid "unsupported index version %s" msgstr "" -#: builtin/pack-objects.c:2932 +#: builtin/pack-objects.c:3071 #, c-format msgid "bad index version '%s'" msgstr "" -#: builtin/pack-objects.c:2962 +#: builtin/pack-objects.c:3102 msgid "do not show progress meter" msgstr "" -#: builtin/pack-objects.c:2964 +#: builtin/pack-objects.c:3104 msgid "show progress meter" msgstr "" -#: builtin/pack-objects.c:2966 +#: builtin/pack-objects.c:3106 msgid "show progress meter during object writing phase" msgstr "" -#: builtin/pack-objects.c:2969 +#: builtin/pack-objects.c:3109 msgid "similar to --all-progress when progress meter is shown" msgstr "" -#: builtin/pack-objects.c:2970 +#: builtin/pack-objects.c:3110 msgid "version[,offset]" msgstr "" -#: builtin/pack-objects.c:2971 +#: builtin/pack-objects.c:3111 msgid "write the pack index file in the specified idx format version" msgstr "" -#: builtin/pack-objects.c:2974 +#: builtin/pack-objects.c:3114 msgid "maximum size of each output pack file" msgstr "" -#: builtin/pack-objects.c:2976 +#: builtin/pack-objects.c:3116 msgid "ignore borrowed objects from alternate object store" msgstr "" -#: builtin/pack-objects.c:2978 +#: builtin/pack-objects.c:3118 msgid "ignore packed objects" msgstr "" -#: builtin/pack-objects.c:2980 +#: builtin/pack-objects.c:3120 msgid "limit pack window by objects" msgstr "" -#: builtin/pack-objects.c:2982 +#: builtin/pack-objects.c:3122 msgid "limit pack window by memory in addition to object limit" msgstr "" -#: builtin/pack-objects.c:2984 +#: builtin/pack-objects.c:3124 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "" -#: builtin/pack-objects.c:2986 +#: builtin/pack-objects.c:3126 msgid "reuse existing deltas" msgstr "" -#: builtin/pack-objects.c:2988 +#: builtin/pack-objects.c:3128 msgid "reuse existing objects" msgstr "" -#: builtin/pack-objects.c:2990 +#: builtin/pack-objects.c:3130 msgid "use OFS_DELTA objects" msgstr "" -#: builtin/pack-objects.c:2992 +#: builtin/pack-objects.c:3132 msgid "use threads when searching for best delta matches" msgstr "" -#: builtin/pack-objects.c:2994 +#: builtin/pack-objects.c:3134 msgid "do not create an empty pack output" msgstr "" -#: builtin/pack-objects.c:2996 +#: builtin/pack-objects.c:3136 msgid "read revision arguments from standard input" msgstr "" -#: builtin/pack-objects.c:2998 +#: builtin/pack-objects.c:3138 msgid "limit the objects to those that are not yet packed" msgstr "" -#: builtin/pack-objects.c:3001 +#: builtin/pack-objects.c:3141 msgid "include objects reachable from any reference" msgstr "" -#: builtin/pack-objects.c:3004 +#: builtin/pack-objects.c:3144 msgid "include objects referred by reflog entries" msgstr "" -#: builtin/pack-objects.c:3007 +#: builtin/pack-objects.c:3147 msgid "include objects referred to by the index" msgstr "" -#: builtin/pack-objects.c:3010 +#: builtin/pack-objects.c:3150 msgid "output pack to stdout" msgstr "" -#: builtin/pack-objects.c:3012 +#: builtin/pack-objects.c:3152 msgid "include tag objects that refer to objects to be packed" msgstr "" -#: builtin/pack-objects.c:3014 +#: builtin/pack-objects.c:3154 msgid "keep unreachable objects" msgstr "" -#: builtin/pack-objects.c:3016 +#: builtin/pack-objects.c:3156 msgid "pack loose unreachable objects" msgstr "" -#: builtin/pack-objects.c:3018 +#: builtin/pack-objects.c:3158 msgid "unpack unreachable objects newer than