diff options
| author | Jiang Xin <worldhello.net@gmail.com> | 2018-11-20 02:07:25 (GMT) |
|---|---|---|
| committer | Jiang Xin <worldhello.net@gmail.com> | 2018-11-20 02:07:25 (GMT) |
| commit | 1f5a6ca2c7d61abee33c67f3c29e63a3fd55963c (patch) | |
| tree | 7409be6491e36412b4237a44515f604fe26b8e84 /po | |
| parent | 12705546659f4c6ee31fd314b70c167cc822f965 (diff) | |
| parent | 87af1bb0d80146a84e6b4a2bd8f5f34eeea81ae1 (diff) | |
| download | git-1f5a6ca2c7d61abee33c67f3c29e63a3fd55963c.zip git-1f5a6ca2c7d61abee33c67f3c29e63a3fd55963c.tar.gz git-1f5a6ca2c7d61abee33c67f3c29e63a3fd55963c.tar.bz2 | |
Merge branch 'master' of git://github.com/git-l10n/git-po
Diffstat (limited to 'po')
| -rw-r--r-- | po/ca.po | 9577 | ||||
| -rw-r--r-- | po/de.po | 8018 | ||||
| -rw-r--r-- | po/vi.po | 2 | ||||
| -rw-r--r-- | po/zh_CN.po | 66 |
4 files changed, 11511 insertions, 6152 deletions
@@ -47,7 +47,7 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2018-03-16 07:29+0800\n" +"POT-Creation-Date: 2018-09-04 08:50+0800\n" "PO-Revision-Date: 2018-03-29 15:32+0200\n" "Last-Translator: Jordi Mas <jmas@softcatala.org>\n" "Language-Team: Catalan\n" @@ -58,37 +58,37 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 2.0.4\n" -#: advice.c:62 -#, c-format -msgid "hint: %.*s\n" +#: advice.c:97 +#, fuzzy, c-format +msgid "%shint: %.*s%s\n" msgstr "pista: %.*s\n" -#: advice.c:90 +#: advice.c:150 msgid "Cherry-picking is not possible because you have unmerged files." msgstr "Fer «cherry pick» no és possible perquè teniu fitxers sense fusionar." -#: advice.c:92 +#: advice.c:152 msgid "Committing is not possible because you have unmerged files." msgstr "Cometre no és possible perquè teniu fitxers sense fusionar." -#: advice.c:94 +#: advice.c:154 msgid "Merging is not possible because you have unmerged files." msgstr "Fusionar no és possible perquè teniu fitxers sense fusionar." -#: advice.c:96 +#: advice.c:156 msgid "Pulling is not possible because you have unmerged files." msgstr "Baixar no és possible perquè teniu fitxers sense fusionar." -#: advice.c:98 +#: advice.c:158 msgid "Reverting is not possible because you have unmerged files." msgstr "Revertir no és possible perquè teniu fitxers sense fusionar." -#: advice.c:100 +#: advice.c:160 #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "No és possible %s perquè teniu fitxers sense fusionar." -#: advice.c:108 +#: advice.c:168 msgid "" "Fix them up in the work tree, and then use 'git add/rm <file>'\n" "as appropriate to mark resolution and make a commit." @@ -97,23 +97,23 @@ msgstr "" "'git add/rm <fitxer>' segons sigui apropiat per a marcar la\n" "resolució i feu una comissió." -#: advice.c:116 +#: advice.c:176 msgid "Exiting because of an unresolved conflict." msgstr "S'està sortint a causa d'un conflicte no resolt." -#: advice.c:121 builtin/merge.c:1251 +#: advice.c:181 builtin/merge.c:1286 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "No heu conclòs la vostra fusió (MERGE_HEAD existeix)." -#: advice.c:123 +#: advice.c:183 msgid "Please, commit your changes before merging." msgstr "Cometeu els vostres canvis abans de fusionar." -#: advice.c:124 +#: advice.c:184 msgid "Exiting because of unfinished merge." msgstr "S'està sortint a causa d'una fusió no terminada." -#: advice.c:130 +#: advice.c:190 #, c-format msgid "" "Note: checking out '%s'.\n" @@ -140,98 +140,98 @@ msgstr "" "\n" " git checkout -b <nom-de-branca-nova>\n" -#: apply.c:58 +#: apply.c:59 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "opció d'espai en blanc «%s» no reconeguda" -#: apply.c:74 +#: apply.c:75 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "opció ignora l'espai en blanc «%s» no reconeguda" -#: apply.c:122 +#: apply.c:125 msgid "--reject and --3way cannot be used together." msgstr "--reject i --3way no es poden usar junts." -#: apply.c:124 +#: apply.c:127 msgid "--cached and --3way cannot be used together." msgstr "--cached i --3way no es poden usar junts." -#: apply.c:127 +#: apply.c:130 msgid "--3way outside a repository" msgstr "--3way fora d'un dipòsit" -#: apply.c:138 +#: apply.c:141 msgid "--index outside a repository" msgstr "--index fora d'un dipòsit" -#: apply.c:141 +#: apply.c:144 msgid "--cached outside a repository" msgstr "--cached fora d'un dipòsit" -#: apply.c:821 +#: apply.c:826 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "No es pot preparar l'expressió regular de marca de temps %s" -#: apply.c:830 +#: apply.c:835 #, c-format msgid "regexec returned %d for input: %s" msgstr "regexec ha retornat %d per l'entrada: %s" -#: apply.c:904 +#: apply.c:909 #, c-format msgid "unable to find filename in patch at line %d" msgstr "no s'ha pogut trobar el nom de fitxer en el pedaç a la línia %d" -#: apply.c:942 +#: apply.c:947 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "" "git apply: git-diff incorrecte - s'esperava /dev/null, s'ha rebut %s en la " "línia %d" -#: apply.c:948 +#: apply.c:953 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "" "git apply: git-diff incorrecte - nom de fitxer nou inconsistent en la línia " "%d" -#: apply.c:949 +#: apply.c:954 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "" "git apply: git-diff incorrecte - nom de fitxer antic inconsistent en la " "línia %d" -#: apply.c:954 +#: apply.c:959 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "git apply: git-diff incorrecte - s'esperava /dev/null en la línia %d" -#: apply.c:983 +#: apply.c:988 #, c-format msgid "invalid mode on line %d: %s" msgstr "mode no vàlid en la línia %d: %s" -#: apply.c:1301 +#: apply.c:1306 #, c-format msgid "inconsistent header lines %d and %d" msgstr "línies de capçalera %d i %d inconsistents" -#: apply.c:1473 +#: apply.c:1478 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recompte: línia inesperada: %.*s" -#: apply.c:1542 +#: apply.c:1547 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "fragment de pedaç sense capçalera a la línia %d: %.*s" -#: apply.c:1562 +#: apply.c:1567 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -246,83 +246,83 @@ 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)" -#: apply.c:1575 +#: apply.c:1580 #, 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)" -#: apply.c:1763 +#: apply.c:1768 msgid "new file depends on old contents" msgstr "el fitxer nou depèn dels continguts antics" -#: apply.c:1765 +#: apply.c:1770 msgid "deleted file still has contents" msgstr "el fitxer suprimit encara té continguts" -#: apply.c:1799 +#: apply.c:1804 #, c-format msgid "corrupt patch at line %d" msgstr "pedaç malmès a la línia %d" -#: apply.c:1836 +#: apply.c:1841 #, c-format msgid "new file %s depends on old contents" msgstr "el fitxer nou %s depèn dels continguts antics" -#: apply.c:1838 +#: apply.c:1843 #, c-format msgid "deleted file %s still has contents" msgstr "el fitxer suprimit %s encara té continguts" -#: apply.c:1841 +#: apply.c:1846 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** advertència: el fitxer %s queda buit però no se suprimeix" -#: apply.c:1988 +#: apply.c:1993 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "pedaç binari malmès a la línia %d: %.*s" -#: apply.c:2025 +#: apply.c:2030 #, c-format msgid "unrecognized binary patch at line %d" msgstr "pedaç binari no reconegut a la línia %d" -#: apply.c:2185 +#: apply.c:2190 #, c-format msgid "patch with only garbage at line %d" msgstr "pedaç amb només escombraries a la línia %d" -#: apply.c:2271 +#: apply.c:2276 #, c-format msgid "unable to read symlink %s" msgstr "no s'ha pogut llegir l'enllaç simbòlic %s" -#: apply.c:2275 +#: apply.c:2280 #, c-format msgid "unable to open or read %s" msgstr "no s'ha pogut obrir o llegir %s" -#: apply.c:2934 +#: apply.c:2939 #, c-format msgid "invalid start of line: '%c'" msgstr "inici de línia no vàlid: '%c'" -#: apply.c:3055 +#: apply.c:3060 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "El tros #%d ha tingut èxit a %d (desplaçament d'%d línia)." msgstr[1] "El tros #%d ha tingut èxit a %d (desplaçament de %d línies)." -#: apply.c:3067 +#: apply.c:3072 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "El context s'ha reduït a (%ld/%ld) per a aplicar el fragment a %d" -#: apply.c:3073 +#: apply.c:3078 #, c-format msgid "" "while searching for:\n" @@ -331,23 +331,23 @@ msgstr "" "tot cercant:\n" "%.*s" -#: apply.c:3095 +#: apply.c:3100 #, c-format msgid "missing binary patch data for '%s'" msgstr "manquen les dades de pedaç binari de «%s»" -#: apply.c:3103 +#: apply.c:3108 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "no es pot aplicar al revés un pedaç binari sense el tros revés a «%s»" -#: apply.c:3149 +#: apply.c:3154 #, 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" -#: apply.c:3159 +#: apply.c:3164 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." @@ -355,288 +355,288 @@ msgstr "" "el pedaç s'aplica a «%s» (%s), el qual no coincideix amb els continguts " "actuals." -#: apply.c:3167 +#: apply.c:3172 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "el pedaç s'aplica a un «%s» buit però no és buit" -#: apply.c:3185 +#: apply.c:3190 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "no es pot llegir la postimatge %s necessària per a «%s»" -#: apply.c:3198 +#: apply.c:3203 #, c-format msgid "binary patch does not apply to '%s'" msgstr "el pedaç binari no s'aplica a «%s»" -#: apply.c:3204 +#: apply.c:3209 #, 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)" -#: apply.c:3225 +#: apply.c:3230 #, c-format msgid "patch failed: %s:%ld" msgstr "el pedaç ha fallat: %s:%ld" -#: apply.c:3347 +#: apply.c:3352 #, c-format msgid "cannot checkout %s" msgstr "no es pot agafar %s" -#: apply.c:3396 apply.c:3407 apply.c:3453 setup.c:277 +#: apply.c:3404 apply.c:3415 apply.c:3461 setup.c:278 #, c-format msgid "failed to read %s" msgstr "s'ha produït un error en llegir %s" -#: apply.c:3404 +#: apply.c:3412 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "s'està llegint de «%s» més enllà d'un enllaç simbòlic" -#: apply.c:3433 apply.c:3673 +#: apply.c:3441 apply.c:3681 #, c-format msgid "path %s has been renamed/deleted" msgstr "el camí %s s'ha canviat de nom / s'ha suprimit" -#: apply.c:3516 apply.c:3687 +#: apply.c:3524 apply.c:3696 #, c-format msgid "%s: does not exist in index" msgstr "%s: no existeix en l'índex" -#: apply.c:3525 apply.c:3695 +#: apply.c:3533 apply.c:3704 #, c-format msgid "%s: does not match index" msgstr "%s: no coincideix amb l'índex" -#: apply.c:3560 +#: apply.c:3568 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." -#: apply.c:3563 +#: apply.c:3571 #, c-format msgid "Falling back to three-way merge...\n" msgstr "S'està retrocedint a una fusió de 3 vies...\n" -#: apply.c:3579 apply.c:3583 +#: apply.c:3587 apply.c:3591 #, c-format msgid "cannot read the current contents of '%s'" msgstr "no es poden llegir els continguts actuals de «%s»" -#: apply.c:3595 +#: apply.c:3603 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "S'ha produït un error en retrocedir a una fusió de 3 vies...\n" -#: apply.c:3609 +#: apply.c:3617 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "S'ha aplicat el pedaç a «%s» amb conflictes.\n" -#: apply.c:3614 +#: apply.c:3622 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "S'ha aplicat el pedaç a «%s» netament.\n" -#: apply.c:3640 +#: apply.c:3648 msgid "removal patch leaves file contents" msgstr "el pedaç d'eliminació deixa els continguts dels fitxers" -#: apply.c:3712 +#: apply.c:3721 #, c-format msgid "%s: wrong type" msgstr "%s: tipus erroni" -#: apply.c:3714 +#: apply.c:3723 #, c-format msgid "%s has type %o, expected %o" msgstr "%s és del tipus %o, s'esperava %o" -#: apply.c:3864 apply.c:3866 +#: apply.c:3874 apply.c:3876 #, c-format msgid "invalid path '%s'" msgstr "camí no vàlid: «%s»" -#: apply.c:3922 +#: apply.c:3932 #, c-format msgid "%s: already exists in index" msgstr "%s: ja existeix en l'índex" -#: apply.c:3925 +#: apply.c:3935 #, c-format msgid "%s: already exists in working directory" msgstr "%s: ja existeix en el directori de treball" -#: apply.c:3945 +#: apply.c:3955 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "el mode nou (%o) de %s no coincideix amb el mode antic (%o)" -#: apply.c:3950 +#: apply.c:3960 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "el mode nou (%o) de %s no coincideix amb el mode antic (%o) de %s" -#: apply.c:3970 +#: apply.c:3980 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "el fitxer afectat «%s» és més enllà d'un enllaç simbòlic" -#: apply.c:3974 +#: apply.c:3984 #, c-format msgid "%s: patch does not apply" msgstr "%s: el pedaç no s'aplica" -#: apply.c:3989 +#: apply.c:3999 #, c-format msgid "Checking patch %s..." msgstr "S'està comprovant el pedaç %s..." -#: apply.c:4080 +#: apply.c:4091 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "falta la informació sha1 o és inútil per al submòdul %s" -#: apply.c:4087 +#: apply.c:4098 #, 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 la HEAD actual" -#: apply.c:4090 +#: apply.c:4101 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "falta informació sha1 o és inútil (%s)." -#: apply.c:4095 builtin/checkout.c:235 builtin/reset.c:140 +#: apply.c:4106 builtin/checkout.c:237 builtin/reset.c:140 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "make_cache_entry ha fallat per al camí «%s»" -#: apply.c:4099 +#: apply.c:4110 #, c-format msgid "could not add %s to temporary index" msgstr "no s'ha pogut afegir %s a l'índex temporal" -#: apply.c:4109 +#: apply.c:4120 #, c-format msgid "could not write temporary index to %s" msgstr "no s'ha pogut escriure l'índex temporal a %s" -#: apply.c:4247 +#: apply.c:4258 #, c-format msgid "unable to remove %s from index" msgstr "no s'ha pogut eliminar %s de l'índex" -#: apply.c:4282 +#: apply.c:4292 #, c-format msgid "corrupt patch for submodule %s" msgstr "pedaç malmès per al submòdul %s" -#: apply.c:4288 +#: apply.c:4298 #, c-format msgid "unable to stat newly created file '%s'" msgstr "no s'ha pogut fer stat al fitxer novament creat «%s»" -#: apply.c:4296 +#: apply.c:4306 #, 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" -#: apply.c:4302 apply.c:4446 +#: apply.c:4312 apply.c:4457 #, c-format msgid "unable to add cache entry for %s" msgstr "no s'ha pogut afegir una entrada de cau per a %s" -#: apply.c:4343 +#: apply.c:4355 #, c-format msgid "failed to write to '%s'" msgstr "no s'ha pogut escriure a «%s»" -#: apply.c:4347 +#: apply.c:4359 #, c-format msgid "closing file '%s'" msgstr "s'està tancant el fitxer «%s»" -#: apply.c:4417 +#: apply.c:4429 #, c-format msgid "unable to write file '%s' mode %o" msgstr "no s'ha pogut escriure el fitxer «%s» mode %o" -#: apply.c:4515 +#: apply.c:4527 #, c-format msgid "Applied patch %s cleanly." msgstr "El pedaç %s s'ha aplicat netament." -#: apply.c:4523 +#: apply.c:4535 msgid "internal error" msgstr "error intern" -#: apply.c:4526 +#: apply.c:4538 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "S'està aplicant el pedaç %%s amb %d rebuig..." msgstr[1] "S'està aplicant el pedaç %%s amb %d rebutjos..." -#: apply.c:4537 +#: apply.c:4549 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "s'està truncant el nom del fitxer .rej a %.*s.rej" -#: apply.c:4545 builtin/fetch.c:775 builtin/fetch.c:1025 +#: apply.c:4557 builtin/fetch.c:780 builtin/fetch.c:1048 #, c-format msgid "cannot open %s" msgstr "no es pot obrir %s" -#: apply.c:4559 +#: apply.c:4571 #, c-format msgid "Hunk #%d applied cleanly." msgstr "El tros #%d s'ha aplicat netament." -#: apply.c:4563 +#: apply.c:4575 #, c-format msgid "Rejected hunk #%d." msgstr "S'ha rebutjat el tros #%d." -#: apply.c:4673 +#: apply.c:4685 #, c-format msgid "Skipped patch '%s'." msgstr "S'ha omès el pedaç «%s»." -#: apply.c:4681 +#: apply.c:4693 msgid "unrecognized input" msgstr "entrada no reconeguda" -#: apply.c:4700 +#: apply.c:4712 msgid "unable to read index file" msgstr "no es pot llegir el fitxer d'índex" -#: apply.c:4837 +#: apply.c:4849 #, c-format msgid "can't open patch '%s': %s" msgstr "no es pot obrir el pedaç «%s»: %s" -#: apply.c:4864 +#: apply.c:4876 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "s'ha silenciat %d error d'espai en blanc" msgstr[1] "s'han silenciat %d errors d'espai en blanc" -#: apply.c:4870 apply.c:4885 +#: apply.c:4882 apply.c:4897 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "%d línia afegeix errors d'espai en blanc." msgstr[1] "%d línies afegeixen errors d'espai en blanc." -#: apply.c:4878 +#: apply.c:4890 #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." @@ -645,258 +645,313 @@ msgstr[0] "" 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 +#: apply.c:4906 builtin/add.c:539 builtin/mv.c:300 builtin/rm.c:389 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:4933 apply.c:4936 builtin/am.c:2254 builtin/am.c:2257 +#: builtin/clone.c:121 builtin/fetch.c:115 builtin/merge.c:260 +#: builtin/pull.c:198 builtin/submodule--helper.c:406 +#: builtin/submodule--helper.c:1355 builtin/submodule--helper.c:1358 +#: builtin/submodule--helper.c:1729 builtin/submodule--helper.c:1732 +#: builtin/submodule--helper.c:1952 git-add--interactive.perl:197 msgid "path" msgstr "camí" -#: apply.c:4922 +#: apply.c:4934 msgid "don't apply changes matching the given path" msgstr "no apliquis els canvis que coincideixin amb el camí donat" -#: apply.c:4925 +#: apply.c:4937 msgid "apply changes matching the given path" msgstr "aplica els canvis que coincideixin amb el camí donat" -#: apply.c:4927 builtin/am.c:2263 +#: apply.c:4939 builtin/am.c:2263 msgid "num" msgstr "número" -#: apply.c:4928 +#: apply.c:4940 msgid "remove <num> leading slashes from traditional diff paths" msgstr "" "elimina <nombre> barres obliqües inicials dels camins de diferència " "tradicionals" -#: apply.c:4931 +#: apply.c:4943 msgid "ignore additions made by the patch" msgstr "ignora afegiments fets pel pedaç" -#: apply.c:4933 +#: apply.c:4945 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" -#: apply.c:4937 +#: apply.c:4949 msgid "show number of added and deleted lines in decimal notation" msgstr "mostra el nombre de línies afegides i suprimides en notació decimal" -#: apply.c:4939 +#: apply.c:4951 msgid "instead of applying the patch, output a summary for the input" msgstr "en lloc d'aplicar el pedaç, emet un resum de l'entrada" -#: apply.c:4941 +#: apply.c:4953 msgid "instead of applying the patch, see if the patch is applicable" msgstr "en lloc d'aplicar el pedaç, veges si el pedaç és aplicable" -#: apply.c:4943 +#: apply.c:4955 msgid "make sure the patch is applicable to the current index" msgstr "assegura que el pedaç sigui aplicable a l'índex actual" -#: apply.c:4945 +#: apply.c:4957 +msgid "mark new files with `git add --intent-to-add`" +msgstr "" + +#: apply.c:4959 msgid "apply a patch without touching the working tree" msgstr "aplica un pedaç sense tocar l'arbre de treball" -#: apply.c:4947 +#: apply.c:4961 msgid "accept a patch that touches outside the working area" msgstr "accepta un pedaç que toqui fora de l'àrea de treball" -#: apply.c:4950 +#: apply.c:4964 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "aplica el pedaç també (useu amb --stat/--summary/--check)" -#: apply.c:4952 +#: apply.c:4966 msgid "attempt three-way merge if a patch does not apply" msgstr "intenta una fusió de tres vies si el pedaç no s'aplica" -#: apply.c:4954 +#: apply.c:4968 msgid "build a temporary index based on embedded index information" msgstr "construeix un índex temporal basat en la informació d'índex incrustada" -#: apply.c:4957 builtin/checkout-index.c:168 builtin/ls-files.c:515 +#: apply.c:4971 builtin/checkout-index.c:168 builtin/ls-files.c:516 msgid "paths are separated with NUL character" msgstr "els camins se separen amb el caràcter NUL" -#: apply.c:4959 +#: apply.c:4973 msgid "ensure at least <n> lines of context match" msgstr "assegura't que almenys <n> línies de context coincideixin" -#: apply.c:4960 builtin/am.c:2242 builtin/interpret-trailers.c:95 +#: apply.c:4974 builtin/am.c:2242 builtin/interpret-trailers.c:95 #: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99 -#: builtin/pack-objects.c:3035 +#: builtin/pack-objects.c:3202 msgid "action" msgstr "acció" -#: apply.c:4961 +#: apply.c:4975 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" -#: apply.c:4964 apply.c:4967 +#: apply.c:4978 apply.c:4981 msgid "ignore changes in whitespace when finding context" msgstr "ignora els canvis d'espai en blanc en cercar context" -#: apply.c:4970 +#: apply.c:4984 msgid "apply the patch in reverse" msgstr "aplica el pedaç al revés" -#: apply.c:4972 +#: apply.c:4986 msgid "don't expect at least one line of context" msgstr "no esperis almenys una línia de context" -#: apply.c:4974 +#: apply.c:4988 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "deixa els trossos rebutjats en fitxers *.rej corresponents" -#: apply.c:4976 +#: apply.c:4990 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:4991 builtin/add.c:290 builtin/check-ignore.c:21 +#: builtin/commit.c:1301 builtin/count-objects.c:98 builtin/fsck.c:671 +#: builtin/log.c:1914 builtin/mv.c:122 builtin/read-tree.c:124 msgid "be verbose" msgstr "sigues detallat" -#: apply.c:4979 +#: apply.c:4993 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "tolera una línia nova incorrectament detectada al final del fitxer" -#: apply.c:4982 +#: apply.c:4996 msgid "do not trust the line counts in the hunk headers" msgstr "no confiïs en els recomptes de línia en les capçaleres dels trossos" -#: apply.c:4984 builtin/am.c:2251 +#: apply.c:4998 builtin/am.c:2251 msgid "root" msgstr "arrel" -#: apply.c:4985 +#: apply.c:4999 msgid "prepend <root> to all filenames" msgstr "anteposa <arrel> a tots els noms de fitxer" -#: archive.c:13 +#: archive.c:14 msgid "git archive [<options>] <tree-ish> [<path>...]" msgstr "git archive [<opcions>] <arbre> [<camí>...]" -#: archive.c:14 +#: archive.c:15 msgid "git archive --list" msgstr "git archive --list" -#: archive.c:15 +#: archive.c:16 msgid "" "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]" msgstr "" "git archive --remote <dipòsit> [--exec <ordre>] [<opcions>] <arbre> " "[<camí>...]" -#: archive.c:16 +#: archive.c:17 msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <dipòsit> [--exec <ordre>] --list" -#: archive.c:351 builtin/add.c:176 builtin/add.c:515 builtin/rm.c:299 +#: archive.c:363 builtin/add.c:176 builtin/add.c:515 builtin/rm.c:298 #, c-format msgid "pathspec '%s' did not match any files" msgstr "l'especificació de camí «%s» no ha coincidit amb cap fitxer" -#: archive.c:436 +#: archive.c:446 msgid "fmt" msgstr "format" -#: archive.c:436 +#: archive.c:446 msgid "archive format" msgstr "format d'arxiu" -#: archive.c:437 builtin/log.c:1462 +#: archive.c:447 builtin/log.c:1473 msgid "prefix" msgstr "prefix" -#: archive.c:438 +#: archive.c:448 msgid "prepend prefix to each pathname in the archive" 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 +#: archive.c:449 builtin/blame.c:816 builtin/blame.c:817 builtin/config.c:126 +#: builtin/fast-export.c:1013 builtin/fast-export.c:1015 builtin/grep.c:873 +#: builtin/hash-object.c:104 builtin/ls-files.c:552 builtin/ls-files.c:555 +#: builtin/notes.c:407 builtin/notes.c:570 builtin/read-tree.c:119 #: parse-options.h:165 msgid "file" msgstr "fitxer" -#: archive.c:440 builtin/archive.c:89 +#: archive.c:450 builtin/archive.c:89 msgid "write the archive to this file" msgstr "escriu l'arxiu a aquest fitxer" -#: archive.c:442 +#: archive.c:452 msgid "read .gitattributes in working directory" msgstr "llegeix .gitattributes en el directori de treball" -#: archive.c:443 +#: archive.c:453 msgid "report archived files on stderr" msgstr "informa de fitxers arxivats en stderr" -#: archive.c:444 +#: archive.c:454 msgid "store only" msgstr "només emmagatzema" -#: archive.c:445 +#: archive.c:455 msgid "compress faster" msgstr "comprimeix més ràpidament" -#: archive.c:453 +#: archive.c:463 msgid "compress better" msgstr "comprimeix millor" -#: archive.c:456 +#: archive.c:466 msgid "list supported archive formats" msgstr "llista els formats d'arxiu admesos" -#: 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:468 builtin/archive.c:90 builtin/clone.c:111 builtin/clone.c:114 +#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1738 msgid "repo" msgstr "dipòsit" -#: archive.c:459 builtin/archive.c:91 +#: archive.c:469 builtin/archive.c:91 msgid "retrieve the archive from remote repository <repo>" msgstr "recupera l'arxiu del dipòsit remot <dipòsit>" -#: archive.c:460 builtin/archive.c:92 builtin/notes.c:489 +#: archive.c:470 builtin/archive.c:92 builtin/difftool.c:714 +#: builtin/notes.c:491 msgid "command" msgstr "ordre" -#: archive.c:461 builtin/archive.c:93 +#: archive.c:471 builtin/archive.c:93 msgid "path to the remote git-upload-archive command" msgstr "camí a l'ordre git-upload-archive remota" -#: archive.c:468 +#: archive.c:478 msgid "Unexpected option --remote" msgstr "Opció inesperada --remote" -#: archive.c:470 +#: archive.c:480 msgid "Option --exec can only be used together with --remote" msgstr "L'opció --exec només es pot usar juntament amb --remote" -#: archive.c:472 +#: archive.c:482 msgid "Unexpected option --output" msgstr "Opció inesperada --output" -#: archive.c:494 +#: archive.c:504 #, c-format msgid "Unknown archive format '%s'" msgstr "Format d'arxiu desconegut «%s»" -#: archive.c:501 +#: archive.c:511 #, c-format msgid "Argument not supported for format '%s': -%d" msgstr "Paràmetre no admès per al format «%s»: -%d" +#: archive-tar.c:125 archive-zip.c:344 +#, fuzzy, c-format +msgid "cannot stream blob %s" +msgstr "no es pot emmagatzemar %s" + +#: archive-tar.c:260 archive-zip.c:361 +#, c-format +msgid "unsupported file mode: 0%o (SHA1: %s)" +msgstr "mode de fitxer no compatible: 0%o (SHA1: %s)" + +#: archive-tar.c:287 archive-zip.c:352 +#, c-format +msgid "cannot read %s" +msgstr "no es pot llegir «%s»" + +#: archive-tar.c:458 +#, c-format +msgid "unable to start '%s' filter" +msgstr "no s'ha pogut iniciar el filtre «%s»" + +#: archive-tar.c:461 +#, fuzzy +msgid "unable to redirect descriptor" +msgstr "no s'ha pogut actualitzar l'índex" + +#: archive-tar.c:468 +#, fuzzy, c-format +msgid "'%s' filter reported error" +msgstr "«%s» és fora del dipòsit" + +#: archive-zip.c:313 +#, c-format +msgid "path is not valid UTF-8: %s" +msgstr "" + +#: archive-zip.c:317 +#, c-format +msgid "path too long (%d chars, SHA1: %s): %s" +msgstr "" + +#: archive-zip.c:470 builtin/pack-objects.c:216 builtin/pack-objects.c:219 +#, c-format +msgid "deflate error (%d)" +msgstr "error de deflació (%d)" + +#: archive-zip.c:605 +#, c-format +msgid "timestamp too large for this system: %<PRIuMAX>" +msgstr "" + #: attr.c:218 #, c-format msgid "%.*s is not a valid attribute name" @@ -910,22 +965,22 @@ msgstr "" "Els patrons negatius s'ignoren en els atributs de git\n" "Useu '\\!' per exclamació capdavantera literal." -#: bisect.c:460 +#: bisect.c:467 #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "Comentari amb cometes errònies en el fitxer «%s»: %s" -#: bisect.c:668 +#: bisect.c:675 #, c-format msgid "We cannot bisect more!\n" msgstr "No podem bisecar més!\n" -#: bisect.c:722 +#: bisect.c:729 #, c-format msgid "Not a valid commit name %s" msgstr "No és un nom de comissió vàlid %s" -#: bisect.c:746 +#: bisect.c:753 #, c-format msgid "" "The merge base %s is bad.\n" @@ -934,7 +989,7 @@ msgstr "" "La base de fusió %s és errònia.\n" "Això vol dir que el defecte s'ha arreglat entre %s i [%s].\n" -#: bisect.c:751 +#: bisect.c:758 #, c-format msgid "" "The merge base %s is new.\n" @@ -943,7 +998,7 @@ msgstr "" "La base de fusió %s és nova.\n" "La propietat s'ha canviat entre %s i [%s].\n" -#: bisect.c:756 +#: bisect.c:763 #, c-format msgid "" "The merge base %s is %s.\n" @@ -952,7 +1007,7 @@ msgstr "" "La base de fusió %s és %s.\n" "Això vol dir que la primera comissió «%s» és entre %s i [%s].\n" -#: bisect.c:764 +#: bisect.c:771 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -963,7 +1018,7 @@ msgstr "" "git bisect no pot funcionar correctament en aquest cas.\n" "Potser heu confós les revisions %s i %s?\n" -#: bisect.c:777 +#: bisect.c:784 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -975,36 +1030,36 @@ msgstr "" "%s.\n" "Continuem de totes maneres." -#: bisect.c:810 +#: bisect.c:817 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "Bisecant: s'ha de provar una base de fusió\n" -#: bisect.c:850 +#: bisect.c:857 #, c-format msgid "a %s revision is needed" msgstr "es necessita una revisió %s" -#: bisect.c:869 builtin/notes.c:175 builtin/tag.c:235 +#: bisect.c:876 builtin/notes.c:177 builtin/tag.c:237 #, c-format msgid "could not create file '%s'" msgstr "no s'ha pogut crear el fitxer «%s»" -#: bisect.c:920 +#: bisect.c:927 builtin/merge.c:137 #, c-format msgid "could not read file '%s'" msgstr "no s'ha pogut llegir el fitxer «%s»" -#: bisect.c:950 +#: bisect.c:957 msgid "reading bisect refs failed" msgstr "la lectura de les referències de bisecció ha fallat" -#: bisect.c:969 +#: bisect.c:976 #, c-format msgid "%s was both %s and %s\n" msgstr "%s era ambdós %s i %s\n" -#: bisect.c:977 +#: bisect.c:984 #, c-format msgid "" "No testable commit found.\n" @@ -1013,7 +1068,7 @@ msgstr "" "No s'ha trobat cap comissió comprovable.\n" "Potser heu començat amb paràmetres de camí incorrectes?\n" -#: bisect.c:996 +#: bisect.c:1003 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -1023,52 +1078,53 @@ msgstr[1] "(aproximadament %d passos)" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. -#: bisect.c:1002 +#: bisect.c:1009 #, c-format msgid "Bisecting: %d revision left to test after this %s\n" msgid_plural "Bisecting: %d revisions left to test after this %s\n" msgstr[0] "Bisecant: manca %d revisió a provar després d'aquesta %s\n" msgstr[1] "Bisecant: manquen %d revisions a provar després d'aquesta %s\n" -#: blame.c:1758 +#: blame.c:1784 msgid "--contents and --reverse do not blend well." msgstr "--contents i --reverse no funcionen bé juntes." -#: blame.c:1769 +#: blame.c:1798 msgid "cannot use --contents with final commit object name" msgstr "no es pot usar --contents amb el nom d'objecte de la comissió final" -#: blame.c:1789 +#: blame.c:1819 msgid "--reverse and --first-parent together require specified latest commit" 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:1828 bundle.c:162 ref-filter.c:2154 sequencer.c:1874 +#: sequencer.c:3772 builtin/commit.c:994 builtin/log.c:372 builtin/log.c:926 +#: builtin/log.c:1381 builtin/log.c:1713 builtin/log.c:1963 builtin/merge.c:404 +#: builtin/pack-objects.c:3029 builtin/pack-objects.c:3044 +#: builtin/shortlog.c:192 msgid "revision walk setup failed" msgstr "la configuració del passeig per revisions ha fallat" -#: blame.c:1816 +#: blame.c:1846 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 +#: blame.c:1857 #, c-format msgid "no such path %s in %s" msgstr "no hi ha tal camí %s en %s" -#: blame.c:1838 +#: blame.c:1868 #, c-format msgid "cannot read blob %s for path %s" msgstr "no es pot llegir el blob %s per al camí %s" -#: branch.c:53 +#: branch.c:52 #, c-format msgid "" "\n" @@ -1081,97 +1137,97 @@ msgstr "" "intentar corregir la informació de seguiment remot\n" "invocant \"git branch --set-upstream-to=%s%s%s\"." -#: branch.c:67 +#: branch.c:66 #, c-format msgid "Not setting branch %s as its own upstream." msgstr "No s'està establint la branca %s com a la seva pròpia font." -#: branch.c:93 +#: branch.c:92 #, 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»." -#: branch.c:94 +#: branch.c:93 #, 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»." -#: branch.c:98 +#: branch.c:97 #, 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»." -#: branch.c:99 +#: branch.c:98 #, c-format msgid "Branch '%s' set up to track local branch '%s'." msgstr "La branca «%s» està configurada per a seguir la branca local «%s»." -#: branch.c:104 +#: branch.c:103 #, 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»." -#: branch.c:105 +#: branch.c:104 #, 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»." -#: branch.c:109 +#: branch.c:108 #, 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»." -#: branch.c:110 +#: branch.c:109 #, c-format msgid "Branch '%s' set up to track local ref '%s'." msgstr "La branca «%s» està configurada per a seguir la referència local «%s»." -#: branch.c:119 +#: branch.c:118 msgid "Unable to write upstream branch configuration" msgstr "No es pot escriure la configuració de la branca font" -#: branch.c:156 +#: branch.c:155 #, c-format msgid "Not tracking: ambiguous information for ref %s" msgstr "No seguint: informació ambigua per a la referència %s" -#: branch.c:189 +#: branch.c:188 #, c-format msgid "'%s' is not a valid branch name." msgstr "«%s» no és un nom de branca vàlid." -#: branch.c:208 +#: branch.c:207 #, c-format msgid "A branch named '%s' already exists." msgstr "Una branca amb nom «%s» ja existeix." -#: branch.c:213 +#: branch.c:212 msgid "Cannot force update the current branch." msgstr "No es pot actualitzar la branca actual a la força." -#: branch.c:233 +#: branch.c:232 #, 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." -#: branch.c:235 +#: branch.c:234 #, c-format msgid "the requested upstream branch '%s' does not exist" msgstr "la branca font demanada «%s» no existeix" -#: branch.c:237 +#: branch.c:236 msgid "" "\n" "If you are planning on basing your work on an upstream\n" @@ -1192,100 +1248,100 @@ msgstr "" "«git push -u» per a establir la configuració font\n" "mentre pugeu." -#: branch.c:280 +#: branch.c:279 #, c-format msgid "Not a valid object name: '%s'." msgstr "No és un nom d'objecte vàlid: «%s»." -#: branch.c:300 +#: branch.c:299 #, c-format msgid "Ambiguous object name: '%s'." msgstr "Nom d'objecte ambigu: «%s»." -#: branch.c:305 +#: branch.c:304 #, c-format msgid "Not a valid branch point: '%s'." msgstr "No és un punt de ramificació vàlid: «%s»." -#: branch.c:359 +#: branch.c:358 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "«%s» ja s'ha agafat a «%s»" -#: branch.c:382 +#: branch.c:381 #, c-format msgid "HEAD of working tree %s is not updated" msgstr "HEAD de l'arbre de treball %s no està actualitzat" -#: bundle.c:34 +#: bundle.c:36 #, c-format msgid "'%s' does not look like a v2 bundle file" msgstr "«%s» no sembla un fitxer de farcell v2" -#: bundle.c:62 +#: bundle.c:64 #, c-format msgid "unrecognized header: %s%s (%d)" msgstr "capçalera no reconeguda: %s%s (%d)" -#: bundle.c:88 sequencer.c:1879 sequencer.c:2337 builtin/commit.c:750 +#: bundle.c:90 sequencer.c:2092 sequencer.c:2578 builtin/commit.c:768 #, c-format msgid "could not open '%s'" msgstr "no s'ha pogut obrir «%s»" -#: bundle.c:139 +#: bundle.c:141 msgid "Repository lacks these prerequisite commits:" msgstr "Al dipòsit li manquen aquestes comissions prerequisits:" -#: bundle.c:190 +#: bundle.c:192 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" msgstr[0] "El farcell conté aquesta referència:" msgstr[1] "El farcell conté aquestes %d referències:" -#: bundle.c:197 +#: bundle.c:199 msgid "The bundle records a complete history." msgstr "El farcell registra una història completa." -#: bundle.c:199 +#: bundle.c:201 #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" msgstr[0] "El farcell requereix aquesta referència:" msgstr[1] "El farcell requereix aquestes %d referències:" -#: bundle.c:258 +#: bundle.c:260 msgid "Could not spawn pack-objects" msgstr "No s'ha pogut executar el pack-objects" -#: bundle.c:269 +#: bundle.c:271 msgid "pack-objects died" msgstr "El pack-objects s'ha mort" -#: bundle.c:311 +#: bundle.c:313 msgid "rev-list died" msgstr "El rev-list s'ha mort" -#: bundle.c:360 +#: bundle.c:362 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "les opcions de la llista de revisions exclouen la referència «%s»" -#: bundle.c:450 builtin/log.c:183 builtin/log.c:1607 builtin/shortlog.c:296 +#: bundle.c:453 builtin/log.c:187 builtin/log.c:1618 builtin/shortlog.c:304 #, c-format msgid "unrecognized argument: %s" msgstr "paràmetre no reconegut: %s" -#: bundle.c:458 +#: bundle.c:461 msgid "Refusing to create empty bundle." msgstr "S'està refusant crear un farcell buit." -#: bundle.c:470 +#: bundle.c:473 #, c-format msgid "cannot create '%s'" msgstr "no es pot crear «%s»" -#: bundle.c:498 +#: bundle.c:501 msgid "index-pack died" msgstr "L'index-pack s'ha mort" @@ -1294,18 +1350,31 @@ 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:48 sequencer.c:2384 builtin/am.c:422 builtin/am.c:466 +#: builtin/am.c:1438 builtin/am.c:2072 builtin/replace.c:376 +#: builtin/replace.c:448 #, c-format msgid "could not parse %s" msgstr "no s'ha pogut analitzar %s" -#: commit.c:43 +#: commit.c:50 #, c-format msgid "%s %s is not a commit!" msgstr "%s %s no és una comissió!" -#: commit.c:1506 +#: commit.c:191 +msgid "" +"Support for <GIT_DIR>/info/grafts is deprecated\n" +"and will be removed in a future Git version.\n" +"\n" +"Please use \"git replace --convert-graft-file\"\n" +"to convert the grafts into replace refs.\n" +"\n" +"Turn this message off by running\n" +"\"git config advice.graftFileDeprecated false\"" +msgstr "" + +#: commit.c:1629 msgid "" "Warning: commit message did not conform to UTF-8.\n" "You may want to amend it after fixing the message, or set the config\n" @@ -1316,178 +1385,395 @@ msgstr "" "la variable de configuració i18n.commitencoding a la codificació que\n" "usi el vostre projecte.\n" +#: commit-graph.c:83 +#, c-format +msgid "graph file %s is too small" +msgstr "" + +#: commit-graph.c:90 +#, c-format +msgid "graph signature %X does not match signature %X" +msgstr "" + +#: commit-graph.c:97 +#, fuzzy, c-format +msgid "graph version %X does not match version %X" +msgstr "el camí «%s» no té la seva versió" + +#: commit-graph.c:104 +#, fuzzy, c-format +msgid "hash version %X does not match version %X" +msgstr "el camí «%s» no té la seva versió" + +#: commit-graph.c:128 +#, c-format +msgid "improper chunk offset %08x%08x" +msgstr "" + +#: commit-graph.c:164 +#, c-format +msgid "chunk id %08x appears multiple times" +msgstr "" + +#: commit-graph.c:261 +#, c-format +msgid "could not find commit %s" +msgstr "no s'ha pogut trobar la comissió %s" + +#: commit-graph.c:565 builtin/pack-objects.c:2568 +#, c-format +msgid "unable to get type of object %s" +msgstr "no s'ha pogut obtenir el tipus de l'objecte: %s" + +#: commit-graph.c:730 +#, c-format +msgid "error adding pack %s" +msgstr "error en afegir paquet %s" + +#: commit-graph.c:732 +#, c-format +msgid "error opening index for %s" +msgstr "s'ha produït un error en obrir l'índex per «%s»" + +#: commit-graph.c:773 +#, c-format +msgid "the commit graph format cannot write %d commits" +msgstr "" + +#: commit-graph.c:800 +#, fuzzy +msgid "too many commits to write graph" +msgstr "masses comissions per escriure un graf" + +#: commit-graph.c:806 +#, c-format +msgid "unable to create leading directories of %s" +msgstr "no s'han pogut crear els directoris inicials de «%s»" + +#: commit-graph.c:904 +msgid "the commit-graph file has incorrect checksum and is likely corrupt" +msgstr "" + #: compat/obstack.c:405 compat/obstack.c:407 msgid "memory exhausted" msgstr "memòria esgotada" -#: config.c:186 +#: config.c:123 +#, c-format +msgid "" +"exceeded maximum include depth (%d) while including\n" +"\t%s\n" +"from\n" +"\t%s\n" +"This might be due to circular includes." +msgstr "" + +#: config.c:139 +#, c-format +msgid "could not expand include path '%s'" +msgstr "no s'ha pogut expandir el camí d'inclusió «%s»" + +#: config.c:150 +msgid "relative config includes must come from files" +msgstr "" +"les inclusions de configuració relatives han de venir de fitxers" + +#: config.c:190 msgid "relative config include conditionals must come from files" msgstr "" "els condicionals d'inclusió de configuració relatius han de venir de fitxers" -#: config.c:720 +#: config.c:348 +#, c-format +msgid "key does not contain a section: %s" +msgstr "la clau no conté una secció: «%s»" + +#: config.c:354 +#, c-format +msgid "key does not contain variable name: %s" +msgstr "la clau no conté un nom de variable: «%s»" + +#: config.c:378 sequencer.c:2206 +#, c-format +msgid "invalid key: %s" +msgstr "clau no vàlida: %s" + +#: config.c:384 +#, c-format +msgid "invalid key (newline): %s" +msgstr "clau no vàlida (línea nova): %s" + +#: config.c:420 config.c:432 +#, c-format +msgid "bogus config parameter: %s" +msgstr "paràmetre de configuració erroni: %s" + +#: config.c:467 +#, c-format +msgid "bogus format in %s" +msgstr "format erroni a %s" + +#: config.c:793 #, c-format msgid "bad config line %d in blob %s" msgstr "línia de configuració %d errònia en el blob %s" -#: config.c:724 +#: config.c:797 #, c-format msgid "bad config line %d in file %s" msgstr "línia de configuració %d errònia en el fitxer %s" -#: config.c:728 +#: config.c:801 #, c-format msgid "bad config line %d in standard input" msgstr "línia de configuració %d errònia en l'entrada estàndard" -#: config.c:732 +#: config.c:805 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "línia de configuració %d errònia en el blob de submòdul %s" -#: config.c:736 +#: config.c:809 #, c-format msgid "bad config line %d in command line %s" msgstr "línia de configuració %d errònia en la línia d'ordres %s" -#: config.c:740 +#: config.c:813 #, c-format msgid "bad config line %d in %s" msgstr "línia de configuració %d errònia en %s" -#: config.c:868 +#: config.c:952 msgid "out of range" msgstr "fora de rang" -#: config.c:868 +#: config.c:952 msgid "invalid unit" msgstr "unitat no vàlida" -#: config.c:874 +#: config.c:958 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "valor de configuració numèric erroni «%s» per «%s»: %s" -#: config.c:879 +#: config.c:963 #, c-format msgid "bad numeric config value '%s' for '%s' in blob %s: %s" msgstr "valor de configuració numèric erroni «%s» per «%s» en el blob %s: %s" -#: config.c:882 +#: config.c:966 #, c-format msgid "bad numeric config value '%s' for '%s' in file %s: %s" msgstr "valor de configuració numèric «%s» erroni per «%s» en el fitxer %s: %s" -#: config.c:885 +#: config.c:969 #, 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" -#: config.c:888 +#: config.c:972 #, 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" -#: config.c:891 +#: config.c:975 #, 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" -#: config.c:894 +#: config.c:978 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "valor de configuració numèric incorrecte «%s» per «%s» en %s: %s" -#: config.c:989 +#: config.c:1073 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "s'ha produït un error en expandir el directori d'usuari en: «%s»" -#: config.c:998 +#: config.c:1082 #, c-format msgid "'%s' for '%s' is not a valid timestamp" msgstr "«%s» per a «%s» no és una marca de temps vàlida" -#: config.c:1094 config.c:1105 +#: config.c:1173 +#, c-format +msgid "abbrev length out of range: %d" +msgstr "" + +#: config.c:1187 config.c:1198 #, c-format msgid "bad zlib compression level %d" msgstr "nivell de compressió de zlib incorrecte %d" -#: config.c:1225 +#: config.c:1290 +msgid "core.commentChar should only be one character" +msgstr "" + +#: config.c:1323 #, c-format msgid "invalid mode for object creation: %s" msgstr "mode de creació d'objecte no vàlid: %s" -#: config.c:1386 +#: config.c:1403 +#, c-format +msgid "malformed value for %s" +msgstr "valor no vàlid per a %s" + +#: config.c:1429 +#, c-format +msgid "malformed value for %s: %s" +msgstr "valor no vàlid per a %s: %s" + +#: config.c:1430 +msgid "must be one of nothing, matching, simple, upstream or current" +msgstr "" + +#: config.c:1489 builtin/pack-objects.c:3279 #, c-format msgid "bad pack compression level %d" msgstr "nivell de compressió de paquet %d Erroni" -#: config.c:1582 +#: config.c:1610 +#, c-format +msgid "unable to load config blob object '%s'" +msgstr "no s'ha pogut carregar l'objecte blob de configuració «%s»" + +#: config.c:1613 +#, c-format +msgid "reference '%s' does not point to a blob" +msgstr "la referència «%s» no assenyala a un blob" + +#: config.c:1630 +#, c-format +msgid "unable to resolve config blob '%s'" +msgstr "no s'ha pogut resoldre el blob de configuració: «%s»" + +#: config.c:1660 +#, c-format +msgid "failed to parse %s" +msgstr "s'ha produït un error en analitzar %s" + +#: config.c:1700 msgid "unable to parse command-line config" msgstr "no s'ha pogut analitzar la configuració de la línia d'ordres" -#: config.c:1914 +#: config.c:2032 msgid "unknown error occurred while reading the configuration files" msgstr "un error desconegut ha ocorregut en llegir els fitxers de configuració" -#: config.c:2101 +#: config.c:2202 #, c-format msgid "Invalid %s: '%s'" msgstr "%s no vàlid: «%s»" -#: config.c:2144 +#: config.c:2245 #, 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»" -#: config.c:2170 +#: config.c:2271 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "valor «%d» a splitIndex.maxPercentChange ha d'estar entre 0 i 100" -#: config.c:2195 +#: config.c:2296 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "no s'ha pogut analitzar «%s» de la configuració de la línia d'ordres" -#: config.c:2197 +#: config.c:2298 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "variable de configuració «%s» errònia en el fitxer «%s» a la línia %d" -#: config.c:2256 +#: config.c:2379 +#, c-format +msgid "invalid section name '%s'" +msgstr "nom de secció no vàlid «%s»" + +#: config.c:2411 #, c-format msgid "%s has multiple values" msgstr "%s té múltiples valors" -#: config.c:2599 config.c:2816 +#: config.c:2440 +#, c-format +msgid "failed to write new configuration file %s" +msgstr "no es pot escriure un nou fitxer de configuració %s" + +#: config.c:2691 config.c:3015 +#, c-format +msgid "could not lock config file %s" +msgstr "no s'ha pogut blocar el fitxer de configuració %s" + +#: config.c:2702 +#, c-format +msgid "opening %s" +msgstr "s'està obrint %s" + +#: config.c:2737 builtin/config.c:324 +#, c-format +msgid "invalid pattern: %s" +msgstr "patró no vàlid: %s" + +#: config.c:2762 +#, c-format +msgid "invalid config file %s" +msgstr "fitxer de configuració vàlid %s" + +#: config.c:2775 config.c:3028 #, c-format msgid "fstat on %s failed" msgstr "ha fallat fstat a %s" -#: config.c:2706 +#: config.c:2786 +#, fuzzy, c-format +msgid "unable to mmap '%s'" +msgstr "no s'ha pogut accedir a «%s»" + +#: config.c:2795 config.c:3033 +#, c-format +msgid "chmod on %s failed" +msgstr "ha fallat chmod a %s" + +#: config.c:2880 config.c:3130 +#, c-format +msgid "could not write config file %s" +msgstr "no s'ha pogut escriure el fitxer de configuració «%s»" + +#: config.c:2914 #, c-format msgid "could not set '%s' to '%s'" msgstr "no s'ha pogut establir «%s» a «%s»" -#: config.c:2708 builtin/remote.c:776 +#: config.c:2916 builtin/remote.c:781 #, c-format msgid "could not unset '%s'" msgstr "no s'ha pogut desassignar «%s»" -#: connect.c:52 -msgid "The remote end hung up upon initial contact" -msgstr "El costat remot ha penjat en el moment de contacte inicial" +#: config.c:3006 +#, c-format +msgid "invalid section name: %s" +msgstr "nom de secció no vàlida: %s" + +#: config.c:3173 +#, c-format +msgid "missing value for '%s'" +msgstr "falta el valor per «%s»" + +#: connect.c:61 +msgid "the remote end hung up upon initial contact" +msgstr "el costat remot ha penjat en el moment de contacte inicial" -#: connect.c:54 +#: connect.c:63 msgid "" "Could not read from remote repository.\n" "\n" @@ -1499,52 +1785,293 @@ msgstr "" "Assegureu-vos que tingueu els permisos\n" "d'accés correctes i que el dipòsit existeixi." -#: connected.c:66 builtin/fsck.c:198 builtin/prune.c:144 +#: connect.c:81 +#, c-format +msgid "server doesn't support '%s'" +msgstr "el servidor no és compatible amb «%s»" + +#: connect.c:103 +#, c-format +msgid "server doesn't support feature '%s'" +msgstr "el servidor no es compatible amb la característica «%s»" + +#: connect.c:114 +msgid "expected flush after capabilities" +msgstr "" + +#: connect.c:233 +#, c-format +msgid "ignoring capabilities after first line '%s'" +msgstr "" + +#: connect.c:252 +msgid "protocol error: unexpected capabilities^{}" +msgstr "" + +#: connect.c:273 +#, fuzzy, c-format +msgid "protocol error: expected shallow sha-1, got '%s'" +msgstr "s'esperava shallow/unshallow, s'ha rebut %s" + +#: connect.c:275 +msgid "repository on the other end cannot be shallow" +msgstr "" + +#: connect.c:310 fetch-pack.c:183 builtin/archive.c:63 +#, c-format +msgid "remote error: %s" +msgstr "error remot: %s" + +#: connect.c:316 +msgid "invalid packet" +msgstr "paquet no vàlid" + +#: connect.c:336 +#, fuzzy, c-format +msgid "protocol error: unexpected '%s'" +msgstr "error de protocol: capçalera de paquet errònia" + +#: connect.c:444 +#, fuzzy, c-format +msgid "invalid ls-refs response: %s" +msgstr "referència no vàlida: %s" + +#: connect.c:448 +msgid "expected flush after ref listing" +msgstr "" + +#: connect.c:547 +#, c-format +msgid "protocol '%s' is not supported" +msgstr "el protocol «%s» no és compatible" + +#: connect.c:598 +msgid "unable to set SO_KEEPALIVE on socket" +msgstr "" + +#: connect.c:638 connect.c:701 +#, fuzzy, c-format +msgid "Looking up %s ... " +msgstr "S'està comprovant el pedaç %s..." + +#: connect.c:642 +#, fuzzy, c-format +msgid "unable to look up %s (port %s) (%s)" +msgstr "no s'ha pogut moure %s a %s" + +#. TRANSLATORS: this is the end of "Looking up %s ... " +#: connect.c:646 connect.c:717 +#, c-format +msgid "" +"done.\n" +"Connecting to %s (port %s) ... " +msgstr "" + +#: connect.c:668 connect.c:745 +#, c-format +msgid "" +"unable to connect to %s:\n" +"%s" +msgstr "no s'ha pogut connectar a %s:\n" +"%s" + +#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... " +#: connect.c:674 connect.c:751 +msgid "done." +msgstr "fet." + +#: connect.c:705 +#, fuzzy, c-format +msgid "unable to look up %s (%s)" +msgstr "no s'ha pogut obrir %s: %s\n" + +#: connect.c:711 +#, c-format +msgid "unknown port %s" +msgstr "port desconegut %s" + +#: connect.c:848 connect.c:1174 +#, c-format +msgid "strange hostname '%s' blocked" +msgstr "" + +#: connect.c:850 +#, c-format +msgid "strange port '%s' blocked" +msgstr "" + +#: connect.c:860 +#, fuzzy, c-format +msgid "cannot start proxy %s" +msgstr "no es pot fer stat en «%s»" + +#: connect.c:927 +msgid "no path specified; see 'git help pull' for valid url syntax" +msgstr "" + +#: connect.c:1122 +msgid "ssh variant 'simple' does not support -4" +msgstr "" + +#: connect.c:1134 +msgid "ssh variant 'simple' does not support -6" +msgstr "" + +#: connect.c:1151 +#, fuzzy +msgid "ssh variant 'simple' does not support setting port" +msgstr "el destí receptor no admet pujar --signed" + +#: connect.c:1262 +#, c-format +msgid "strange pathname '%s' blocked" +msgstr "" + +#: connect.c:1307 +#, fuzzy +msgid "unable to fork" +msgstr "no s'ha pogut obrir %s" + +#: connected.c:68 builtin/fsck.c:203 builtin/prune.c:146 msgid "Checking connectivity" msgstr "S'està comprovant la connectivitat" -#: connected.c:78 +#: connected.c:80 msgid "Could not run 'git rev-list'" msgstr "No s'ha pogut executar 'git rev-list'" -#: connected.c:98 +#: connected.c:100 msgid "failed write to rev-list" msgstr "escriptura fallada al rev-list" -#: connected.c:105 +#: connected.c:107 msgid "failed to close rev-list's stdin" msgstr "s'ha produït un error en tancar l'stdin del rev-list" -#: convert.c:205 +#: convert.c:194 #, c-format -msgid "CRLF would be replaced by LF in %s." -msgstr "LF reemplaçaria CRLF en %s." +msgid "illegal crlf_action %d" +msgstr "" #: convert.c:207 -#, c-format +#, fuzzy, c-format +msgid "CRLF would be replaced by LF in %s" +msgstr "LF reemplaçaria CRLF en %s." + +#: convert.c:209 +#, fuzzy, c-format msgid "" "CRLF will be replaced by LF in %s.\n" -"The file will have its original line endings in your working directory." +"The file will have its original line endings in your working directory" msgstr "" "LF reemplaçarà CRLF en %s.\n" "El fitxer tindrà els seus terminadors de línia originals en el vostre " "directori de treball." -#: convert.c:215 +#: convert.c:217 #, c-format msgid "LF would be replaced by CRLF in %s" msgstr "CRLF reemplaçaria LF en %s" -#: convert.c:217 -#, c-format +#: convert.c:219 +#, fuzzy, c-format msgid "" "LF will be replaced by CRLF in %s.\n" -"The file will have its original line endings in your working directory." +"The file will have its original line endings in your working directory" msgstr "" "CRLF reemplaçarà LF en %s.\n" "El fitxer tindrà els seus terminadors de línia originals en el vostre " "directori de treball." +#: convert.c:280 +#, c-format +msgid "BOM is prohibited in '%s' if encoded as %s" +msgstr "" + +#: convert.c:287 +#, c-format +msgid "" +"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-" +"tree-encoding." +msgstr "" + +#: convert.c:305 +#, c-format +msgid "BOM is required in '%s' if encoded as %s" +msgstr "" + +#: convert.c:307 +#, c-format +msgid "" +"The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-" +"%sLE (depending on the byte order) as working-tree-encoding." +msgstr "" + +#: convert.c:425 convert.c:496 +#, fuzzy, c-format +msgid "failed to encode '%s' from %s to %s" +msgstr "s'ha produït un error en copiar les notes de «%s» a «%s»" + +#: convert.c:468 +#, c-format +msgid "encoding '%s' from %s to %s and back is not the same" +msgstr "" + +#: convert.c:674 +#, fuzzy, c-format +msgid "cannot fork to run external filter '%s'" +msgstr "No es pot obrir el fitxer de paquet existent «%s»" + +#: convert.c:694 +#, fuzzy, c-format +msgid "cannot feed the input to external filter '%s'" +msgstr "no es poden llegir els continguts actuals de «%s»" + +#: convert.c:701 +#, c-format +msgid "external filter '%s' failed %d" +msgstr "el filtre extern «%s» ha fallat %d" + +#: convert.c:736 convert.c:739 +#, c-format +msgid "read from external filter '%s' failed" +msgstr "la lectura del filtre extern «%s» ha fallat" + +#: convert.c:742 convert.c:796 +#, c-format +msgid "external filter '%s' failed" +msgstr "el filtre extern «%s» ha fallat" + +#: convert.c:844 +#, fuzzy +msgid "unexpected filter type" +msgstr "final de fitxer inesperat" + +#: convert.c:855 +msgid "path name too long for external filter" +msgstr "" + +#: convert.c:929 +#, c-format +msgid "" +"external filter '%s' is not available anymore although not all paths have " +"been filtered" +msgstr "" + +#: convert.c:1228 +msgid "true/false are no valid working-tree-encodings" +msgstr "" + +#: convert.c:1402 convert.c:1436 +#, fuzzy, c-format +msgid "%s: clean filter '%s' failed" +msgstr "la creació de «%s» ha fallat" + +#: convert.c:1480 +#, fuzzy, c-format +msgid "%s: smudge filter %s failed" +msgstr "s'ha produït un error en actualitzar els fitxers" + #: date.c:116 msgid "in the future" msgstr "en el futur" @@ -1618,42 +2145,54 @@ msgstr[1] "fa %<PRIuMAX> anys" msgid "failed to read orderfile '%s'" msgstr "s'ha produït un error en llegir el fitxer d'ordres «%s»" -#: diffcore-rename.c:535 +#: diffcore-rename.c:536 msgid "Performing inexact rename detection" msgstr "S'està realitzant una detecció inexacta de canvis de nom" -#: diff.c:74 +#: diff.c:108 #, c-format msgid "option '%s' requires a value" msgstr "l'opció «%s» requereix un valor" -#: diff.c:152 +#: diff.c:158 #, 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" -#: diff.c:157 +#: diff.c:163 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr " Paràmetre de dirstat desconegut «%s»\n" -#: diff.c:281 +#: diff.c:291 +#, fuzzy msgid "" -"color moved setting must be one of 'no', 'default', 'zebra', 'dimmed_zebra', " -"'plain'" +"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', " +"'dimmed-zebra', 'plain'" msgstr "" "el paràmetre de color en moviment ha de ser «no», «default», «zebra», " "«dimmed_zebra» o «plain»" -#: diff.c:341 +#: diff.c:316 +#, c-format +msgid "ignoring unknown color-moved-ws mode '%s'" +msgstr "" + +#: diff.c:323 +msgid "" +"color-moved-ws: allow-indentation-change cannot be combined with other white " +"space modes" +msgstr "" + +#: diff.c:394 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "" "Valor desconegut de la variable de configuració de 'diff.submodule': «%s»" -#: diff.c:401 +#: diff.c:454 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -1662,24 +2201,24 @@ msgstr "" "S'han trobat errors en la variable de configuració 'diff.dirstat':\n" "%s" -#: diff.c:3822 +#: diff.c:4096 #, c-format msgid "external diff died, stopping at %s" msgstr "el diff external s'ha mort, s'està aturant a %s" -#: diff.c:4146 +#: diff.c:4427 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-only, --name-status, --check i -s són mútuament excloents" -#: diff.c:4149 +#: diff.c:4430 msgid "-G, -S and --find-object are mutually exclusive" msgstr "-G, -S and --find-object són mútuament excloents" -#: diff.c:4237 +#: diff.c:4508 msgid "--follow requires exactly one pathspec" msgstr "--follow requereix exactament una especificació de camí" -#: diff.c:4403 +#: diff.c:4674 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -1688,22 +2227,22 @@ msgstr "" "S'ha produït un error en analitzar el paràmetre d'opció de --dirstat/-X:\n" "%s" -#: diff.c:4417 +#: diff.c:4688 #, 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»" -#: diff.c:5493 +#: diff.c:5766 msgid "inexact rename detection was skipped due to too many files." msgstr "s'ha omès la detecció de canvi de nom a causa de massa fitxers." -#: diff.c:5496 +#: diff.c:5769 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." -#: diff.c:5499 +#: diff.c:5772 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." @@ -1711,26 +2250,40 @@ msgstr "" "potser voleu establir la vostra variable %s a almenys %d i tornar a intentar " "l'ordre." -#: dir.c:1866 +#: dir.c:569 +#, c-format +msgid "pathspec '%s' did not match any file(s) known to git" +msgstr "l'especificació de camí «%s» no ha coincidit amb cap fitxer que git conegui" + +#: dir.c:958 +#, c-format +msgid "cannot use %s as an exclude file" +msgstr "no es pot usar %s com a fitxer d'exclusió" + +#: dir.c:1873 #, c-format msgid "could not open directory '%s'" msgstr "no s'ha pogut obrir el directori «%s»" -#: dir.c:2108 +#: dir.c:2115 msgid "failed to get kernel name and information" 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ó." +#: dir.c:2239 +msgid "untracked cache is disabled on this system or location" +msgstr "la memòria cau no seguida està inhabilitada en aquest sistema o ubicació" -#: dir.c:3024 dir.c:3029 +#: dir.c:3037 +#, c-format +msgid "index file corrupt in repo %s" +msgstr "el fitxer d'índex al dipòsit %s és malmès" + +#: dir.c:3082 dir.c:3087 #, c-format msgid "could not create directories for %s" msgstr "no s'han pogut crear directoris per %s" -#: dir.c:3054 +#: dir.c:3116 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "no s'ha pogut migrar el directori de «%s» a «%s»" @@ -1740,214 +2293,273 @@ msgstr "no s'ha pogut migrar el directori de «%s» a «%s»" msgid "hint: Waiting for your editor to close the file...%c" msgstr "" -#: entry.c:177 +#: entry.c:178 msgid "Filtering content" msgstr "S'està filtrant el contingut" -#: entry.c:435 +#: entry.c:437 #, c-format msgid "could not stat file '%s'" msgstr "no s'ha pogut fer «stat» sobre el fitxer «%s»" +#: environment.c:150 +#, c-format +msgid "bad git namespace path \"%s\"" +msgstr "" + +#: environment.c:332 +#, c-format +msgid "could not set GIT_DIR to '%s'" +msgstr "no s'ha pogut establir GIT_DIR a «%s»" + +#: exec-cmd.c:361 +#, c-format +msgid "too many args to run %s" +msgstr "hi ha massa arguments per a executar %s" + #: fetch-object.c:17 msgid "Remote with no URL" msgstr "Remot sense URL" -#: fetch-pack.c:253 +#: fetch-pack.c:152 msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack: llista superficial esperada" -#: fetch-pack.c:265 +#: fetch-pack.c:164 msgid "git fetch-pack: expected ACK/NAK, got a flush packet" msgstr "git fetch-pack: s'esperava ACK/NAK, s'ha rebut un paquet de neteja" -#: fetch-pack.c:284 builtin/archive.c:63 -#, c-format -msgid "remote error: %s" -msgstr "error remot: %s" - -#: fetch-pack.c:285 +#: fetch-pack.c:184 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "git fetch-pack: s'esperava ACK/NAK, s'ha rebut «%s»" -#: fetch-pack.c:337 +#: fetch-pack.c:254 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc requereix multi_ack_detailed" -#: fetch-pack.c:428 +#: fetch-pack.c:342 fetch-pack.c:1257 #, c-format msgid "invalid shallow line: %s" msgstr "línia de shallow no vàlida: %s" -#: fetch-pack.c:434 +#: fetch-pack.c:348 fetch-pack.c:1263 #, c-format msgid "invalid unshallow line: %s" msgstr "línia d'unshallow no vàlida: %s" -#: fetch-pack.c:436 +#: fetch-pack.c:350 fetch-pack.c:1265 #, c-format msgid "object not found: %s" msgstr "objecte no trobat: %s" -#: fetch-pack.c:439 +#: fetch-pack.c:353 fetch-pack.c:1268 #, c-format msgid "error in object: %s" msgstr "error en objecte: %s" -#: fetch-pack.c:441 +#: fetch-pack.c:355 fetch-pack.c:1270 #, c-format msgid "no shallow found: %s" msgstr "no s'ha trobat cap shallow: %s" -#: fetch-pack.c:444 +#: fetch-pack.c:358 fetch-pack.c:1273 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "s'esperava shallow/unshallow, s'ha rebut %s" -#: fetch-pack.c:485 +#: fetch-pack.c:399 #, c-format msgid "got %s %d %s" msgstr "s'ha rebut %s %d %s" -#: fetch-pack.c:499 +#: fetch-pack.c:416 #, c-format msgid "invalid commit %s" msgstr "comissió no vàlida %s" -#: fetch-pack.c:532 +#: fetch-pack.c:447 msgid "giving up" msgstr "s'està rendint" -#: fetch-pack.c:542 progress.c:229 +#: fetch-pack.c:459 progress.c:229 msgid "done" msgstr "fet" -#: fetch-pack.c:554 +#: fetch-pack.c:471 #, c-format msgid "got %s (%d) %s" msgstr "s'ha rebut %s (%d) %s" -#: fetch-pack.c:600 +#: fetch-pack.c:517 #, c-format msgid "Marking %s as complete" msgstr "S'està marcant %s com a complet" -#: fetch-pack.c:788 +#: fetch-pack.c:764 #, c-format msgid "already have %s (%s)" msgstr "ja es té %s (%s)" -#: fetch-pack.c:829 +#: fetch-pack.c:803 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-pack: no s'ha pogut bifurcar del desmultiplexor de banda lateral" -#: fetch-pack.c:837 +#: fetch-pack.c:811 msgid "protocol error: bad pack header" msgstr "error de protocol: capçalera de paquet errònia" -#: fetch-pack.c:895 +#: fetch-pack.c:879 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-pack: no es pot bifurcar de %s" -#: fetch-pack.c:911 +#: fetch-pack.c:895 #, c-format msgid "%s failed" msgstr "%s ha fallat" -#: fetch-pack.c:913 +#: fetch-pack.c:897 msgid "error in sideband demultiplexer" msgstr "error en desmultiplexor de banda lateral" -#: fetch-pack.c:940 +#: fetch-pack.c:926 msgid "Server does not support shallow clients" msgstr "El servidor no permet clients superficials" -#: fetch-pack.c:944 +#: fetch-pack.c:930 msgid "Server supports multi_ack_detailed" msgstr "El servidor accepta multi_ack_detailed" -#: fetch-pack.c:947 +#: fetch-pack.c:933 msgid "Server supports no-done" msgstr "El servidor accepta no-done" -#: fetch-pack.c:953 +#: fetch-pack.c:939 msgid "Server supports multi_ack" msgstr "El servidor accepta multi_ack" -#: fetch-pack.c:957 +#: fetch-pack.c:943 msgid "Server supports side-band-64k" msgstr "El servidor accepta side-band-64k" -#: fetch-pack.c:961 +#: fetch-pack.c:947 msgid "Server supports side-band" msgstr "El servidor accepta banda lateral" -#: fetch-pack.c:965 +#: fetch-pack.c:951 msgid "Server supports allow-tip-sha1-in-want" msgstr "El servidor accepta allow-tip-sha1-in-want" -#: fetch-pack.c:969 +#: fetch-pack.c:955 msgid "Server supports allow-reachable-sha1-in-want" msgstr "El servidor accepta allow-reachable-sha1-in-want" -#: fetch-pack.c:979 +#: fetch-pack.c:965 msgid "Server supports ofs-delta" msgstr "El servidor accepta ofs-delta" -#: fetch-pack.c:985 +#: fetch-pack.c:971 fetch-pack.c:1150 msgid "Server supports filter" msgstr "El servidor accepta filtre" -#: fetch-pack.c:993 +#: fetch-pack.c:979 #, c-format msgid "Server version is %.*s" msgstr "La versió del servidor és %.*s" -#: fetch-pack.c:999 +#: fetch-pack.c:985 msgid "Server does not support --shallow-since" msgstr "El servidor no admet --shallow-since" -#: fetch-pack.c:1003 +#: fetch-pack.c:989 msgid "Server does not support --shallow-exclude" msgstr "El servidor no admet --shallow-exclude" -#: fetch-pack.c:1005 +#: fetch-pack.c:991 msgid "Server does not support --deepen" msgstr "El servidor no admet --deepen" -#: fetch-pack.c:1016 +#: fetch-pack.c:1004 msgid "no common commits" msgstr "cap comissió en comú" -#: fetch-pack.c:1028 +#: fetch-pack.c:1016 fetch-pack.c:1393 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack: l'obtenció ha fallat." -#: fetch-pack.c:1190 +#: fetch-pack.c:1145 +#, fuzzy +msgid "Server does not support shallow requests" +msgstr "El servidor no permet clients superficials" + +#: fetch-pack.c:1191 +#, c-format +msgid "error reading section header '%s'" +msgstr "error en llegir la capçalera de la secció «%s»" + +#: fetch-pack.c:1197 +#, c-format +msgid "expected '%s', received '%s'" +msgstr "s'esperava «%s», s'ha rebut «%s»" + +#: fetch-pack.c:1236 +#, c-format +msgid "unexpected acknowledgment line: '%s'" +msgstr "" + +#: fetch-pack.c:1241 +#, fuzzy, c-format +msgid "error processing acks: %d" +msgstr "error en llegir %s" + +#: fetch-pack.c:1278 +#, c-format +msgid "error processing shallow info: %d" +msgstr "" + +#: fetch-pack.c:1294 +#, fuzzy, c-format +msgid "expected wanted-ref, got '%s'" +msgstr "s'esperava shallow/unshallow, s'ha rebut %s" + +#: fetch-pack.c:1304 +#, fuzzy, c-format +msgid "unexpected wanted-ref: '%s'" +msgstr "final de fitxer inesperat" + +#: fetch-pack.c:1308 +#, c-format +msgid "error processing wanted refs: %d" +msgstr "" + +#: fetch-pack.c:1603 msgid "no matching remote head" msgstr "no hi ha cap HEAD remot coincident" -#: fetch-pack.c:1212 +#: fetch-pack.c:1621 builtin/clone.c:664 +msgid "remote did not send all necessary objects" +msgstr "el remot no ha enviat tots els objectes necessaris" + +#: fetch-pack.c:1647 #, c-format msgid "no such remote ref %s" msgstr "no existeix la referència remota %s" -#: fetch-pack.c:1215 +#: fetch-pack.c:1650 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "El servidor no permet sol·licitar objectes no anunciats %s" -#: gpg-interface.c:181 +#: gpg-interface.c:253 msgid "gpg failed to sign the data" msgstr "gpg ha fallat en signar les dades" -#: gpg-interface.c:211 +#: gpg-interface.c:279 msgid "could not create temporary file" msgstr "no s'ha pogut crear el fitxer temporal" -#: gpg-interface.c:214 +#: gpg-interface.c:282 #, c-format msgid "failed writing detached signature to '%s'" msgstr "s'ha produït un error en escriure la signatura separada a «%s»" @@ -1957,37 +2569,99 @@ msgstr "s'ha produït un error en escriure la signatura separada a «%s»" msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "ignora el color no vàlid «%.*s» en log.graphColors" -#: grep.c:2022 +#: grep.c:2115 #, c-format 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 +#: grep.c:2132 setup.c:164 builtin/clone.c:410 builtin/diff.c:81 #: builtin/rm.c:134 #, c-format msgid "failed to stat '%s'" msgstr "s'ha produït un error en fer stat a «%s»" -#: grep.c:2050 +#: grep.c:2143 #, c-format msgid "'%s': short read" msgstr "«%s»: lectura curta" -#: help.c:179 +#: help.c:23 +msgid "start a working area (see also: git help tutorial)" +msgstr "començar una àrea de treball (vegeu també: git help tutorial)" + +#: help.c:24 +msgid "work on the current change (see also: git help everyday)" +msgstr "treballar en el canvi actual (vegeu també: git help everyday)" + +#: help.c:25 +msgid "examine the history and state (see also: git help revisions)" +msgstr "examinar la història i l'estat (vegeu també: git help revisions)" + +#: help.c:26 +msgid "grow, mark and tweak your common history" +msgstr "fer créixer, marcar i ajustar la vostra història comuna" + +#: help.c:27 +msgid "collaborate (see also: git help workflows)" +msgstr "col·laborar (vegeu també: git help workflow)" + +#: help.c:31 +msgid "Main Porcelain Commands" +msgstr "" + +#: help.c:32 +msgid "Ancillary Commands / Manipulators" +msgstr "" + +#: help.c:33 +msgid "Ancillary Commands / Interrogators" +msgstr "" + +#: help.c:34 +msgid "Interacting with Others" +msgstr "Interaccionar amb altres" + +#: help.c:35 +msgid "Low-level Commands / Manipulators" +msgstr "" + +#: help.c:36 +msgid "Low-level Commands / Interrogators" +msgstr "" + +#: help.c:37 +msgid "Low-level Commands / Synching Repositories" +msgstr "" + +#: help.c:38 +msgid "Low-level Commands / Internal Helpers" +msgstr "" + +#: help.c:293 #, c-format msgid "available git commands in '%s'" msgstr "ordres de git disponibles en «%s»" -#: help.c:186 +#: help.c:300 msgid "git commands available from elsewhere on your $PATH" msgstr "ordres de git disponibles d'altres llocs en el vostre $PATH" -#: help.c:217 +#: help.c:309 msgid "These are common Git commands used in various situations:" msgstr "" "Aquestes són ordres del Git habitualment usades en diverses situacions:" -#: help.c:281 +#: help.c:358 git.c:90 +#, fuzzy, c-format +msgid "unsupported command listing type '%s'" +msgstr "versió d'índex no compatible %s" + +#: help.c:405 +#, fuzzy +msgid "The common Git guides are:" +msgstr "Les guies de Git comunes són:\n" + +#: help.c:552 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" @@ -1996,33 +2670,33 @@ msgstr "" "«%s» sembla una ordre de git, però no hem pogut\n" "executar-la. Pot ser que git-%s estigui malmès?" -#: help.c:336 +#: help.c:611 msgid "Uh oh. Your system reports no Git commands at all." msgstr "Ai. El vostre sistema no informa de cap ordre de Git." -#: help.c:358 +#: help.c:633 #, 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." -#: help.c:363 +#: help.c:638 #, c-format msgid "Continuing under the assumption that you meant '%s'." msgstr "El procés continuarà, pressuposant que volíeu dir «%s»." -#: help.c:368 +#: help.c:643 #, 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»." -#: help.c:376 +#: help.c:651 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "git: «%s» no és una ordre de git. Vegeu 'git --help'." -#: help.c:380 +#: help.c:655 msgid "" "\n" "The most similar command is" @@ -2036,16 +2710,16 @@ msgstr[1] "" "\n" "Les ordres més similar són" -#: help.c:395 +#: help.c:670 msgid "git version [<options>]" msgstr "git version [<opcions>]" -#: help.c:462 +#: help.c:738 #, c-format msgid "%s: %s - %s" msgstr "%s: %s - %s" -#: help.c:466 +#: help.c:742 msgid "" "\n" "Did you mean this?" @@ -2117,7 +2791,7 @@ msgstr "nom d'identitat buit (per <%s>) no és permès" msgid "name consists only of disallowed characters: %s" msgstr "el nom conté només caràcters no permesos: %s" -#: ident.c:416 builtin/commit.c:582 +#: ident.c:416 builtin/commit.c:600 #, c-format msgid "invalid date format: %s" msgstr "format de data no vàlid: %s" @@ -2155,82 +2829,152 @@ msgstr "" msgid "Unable to create '%s.lock': %s" msgstr "No s'ha pogut crear '%s.lock': %s" -#: merge.c:74 +#: merge.c:40 msgid "failed to read the cache" msgstr "s'ha produït un error en llegir la memòria cau" -#: 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:105 builtin/am.c:1946 builtin/am.c:1980 builtin/checkout.c:380 +#: builtin/checkout.c:608 builtin/clone.c:763 msgid "unable to write new index file" msgstr "no s'ha pogut escriure un fitxer d'índex nou" -#: merge-recursive.c:235 +#: merge-recursive.c:303 msgid "(bad commit)\n" msgstr "(comissió errònia)\n" -#: merge-recursive.c:257 merge-recursive.c:265 -#, c-format -msgid "addinfo_cache failed for path '%s'" +#: merge-recursive.c:325 +#, fuzzy, c-format +msgid "add_cacheinfo failed for path '%s'; merge aborting." msgstr "addinfo_cache ha fallat per al camí «%s»" -#: merge-recursive.c:329 +#: merge-recursive.c:333 +#, fuzzy, c-format +msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." +msgstr "addinfo_cache ha fallat per al camí «%s»" + +#: merge-recursive.c:415 msgid "error building trees" msgstr "error en construir arbres" -#: merge-recursive.c:771 +#: merge-recursive.c:886 #, c-format msgid "failed to create path '%s'%s" msgstr "s'ha produït un error en crear el camí «%s»%s" -#: merge-recursive.c:782 +#: merge-recursive.c:897 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "S'està eliminant %s per a fer espai per al subdirectori\n" -#: merge-recursive.c:796 merge-recursive.c:815 +#: merge-recursive.c:911 merge-recursive.c:930 msgid ": perhaps a D/F conflict?" msgstr ": potser un conflicte D/F?" -#: merge-recursive.c:805 +#: merge-recursive.c:920 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "s'està refusant perdre el fitxer no seguit a «%s»" -#: merge-recursive.c:847 builtin/cat-file.c:37 +#: merge-recursive.c:962 builtin/cat-file.c:39 #, c-format msgid "cannot read object %s '%s'" msgstr "no es pot llegir l'objecte %s «%s»" -#: merge-recursive.c:849 +#: merge-recursive.c:964 #, c-format msgid "blob expected for %s '%s'" msgstr "blob esperat per a %s «%s»" -#: merge-recursive.c:873 +#: merge-recursive.c:988 #, c-format msgid "failed to open '%s': %s" msgstr "s'ha produït un error en obrir «%s»: %s" -#: merge-recursive.c:884 +#: merge-recursive.c:999 #, c-format msgid "failed to symlink '%s': %s" msgstr "s'ha produït un error en fer l'enllaç simbòlic «%s»: %s" -#: merge-recursive.c:889 +#: merge-recursive.c:1004 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "no se sap què fer amb %06o %s «%s»" -#: merge-recursive.c:1029 +#: merge-recursive.c:1191 +#, fuzzy, c-format +msgid "Failed to merge submodule %s (not checked out)" +msgstr "S'ha produït un error en registrar el submòdul '$sm_path'" + +#: merge-recursive.c:1198 +#, fuzzy, c-format +msgid "Failed to merge submodule %s (commits not present)" +msgstr "S'ha produït un error en registrar el submòdul '$sm_path'" + +#: merge-recursive.c:1205 +#, c-format +msgid "Failed to merge submodule %s (commits don't follow merge-base)" +msgstr "" + +#: merge-recursive.c:1213 merge-recursive.c:1225 +#, c-format +msgid "Fast-forwarding submodule %s to the following commit:" +msgstr "" + +#: merge-recursive.c:1216 merge-recursive.c:1228 +#, fuzzy, c-format +msgid "Fast-forwarding submodule %s" +msgstr "Avanç ràpid a $sha1" + +#: merge-recursive.c:1250 +#, c-format +msgid "Failed to merge submodule %s (merge following commits not found)" +msgstr "" + +#: merge-recursive.c:1254 +#, fuzzy, c-format +msgid "Failed to merge submodule %s (not fast-forward)" +msgstr "S'ha produït un error en registrar el submòdul '$sm_path'" + +#: merge-recursive.c:1255 +msgid "Found a possible merge resolution for the submodule:\n" +msgstr "" + +#: merge-recursive.c:1258 +#, c-format +msgid "" +"If this is correct simply add it to the index for example\n" +"by using:\n" +"\n" +" git update-index --cacheinfo 160000 %s \"%s\"\n" +"\n" +"which will accept this suggestion.\n" +msgstr "" + +#: merge-recursive.c:1267 +#, c-format +msgid "Failed to merge submodule %s (multiple merges found)" +msgstr "" + +#: merge-recursive.c:1326 msgid "Failed to execute internal merge" msgstr "S'ha produït un error en executar la fusió interna" -#: merge-recursive.c:1034 +#: merge-recursive.c:1331 #, c-format msgid "Unable to add %s to database" msgstr "No s'ha pogut afegir %s a la base de dades" -#: merge-recursive.c:1146 +#: merge-recursive.c:1363 +#, c-format +msgid "Auto-merging %s" +msgstr "S'està autofusionant %s" + +#: merge-recursive.c:1434 +#, fuzzy, c-format +msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." +msgstr "s'està refusant perdre el fitxer no seguit a «%s»" + +#: merge-recursive.c:1501 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -2239,7 +2983,7 @@ msgstr "" "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 +#: merge-recursive.c:1506 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -2248,7 +2992,7 @@ 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." -#: merge-recursive.c:1158 +#: merge-recursive.c:1513 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -2257,7 +3001,7 @@ 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." -#: merge-recursive.c:1163 +#: merge-recursive.c:1518 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -2266,20 +3010,31 @@ 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." -#: merge-recursive.c:1197 +#: merge-recursive.c:1552 msgid "rename" msgstr "canvi de nom" -#: merge-recursive.c:1197 +#: merge-recursive.c:1552 msgid "renamed" msgstr "canviat de nom" -#: merge-recursive.c:1254 +#: merge-recursive.c:1606 merge-recursive.c:1762 merge-recursive.c:2394 +#: merge-recursive.c:3129 +#, c-format +msgid "Refusing to lose dirty file at %s" +msgstr "s'està refusant a perdre el fitxer brut a %s" + +#: merge-recursive.c:1620 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s és un directori en %s; s'està afegint com a %s en lloc d'això" -#: merge-recursive.c:1279 +#: merge-recursive.c:1625 +#, c-format +msgid "Refusing to lose untracked file at %s; adding as %s instead" +msgstr "s'està refusant perdre el fitxer no seguit a %s; en comptes, s'està afegint com a %s" + +#: merge-recursive.c:1651 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -2288,148 +3043,191 @@ 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" -#: merge-recursive.c:1284 +#: merge-recursive.c:1656 msgid " (left unresolved)" msgstr " (deixat sense resolució)" -#: merge-recursive.c:1346 +#: merge-recursive.c:1720 #, 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" -#: merge-recursive.c:1379 +#: merge-recursive.c:1759 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "S'està canviant el nom de %s a %s i %s a %s en lloc d'això" -#: merge-recursive.c:1582 +#: merge-recursive.c:1771 +#, fuzzy, c-format +msgid "Refusing to lose untracked file at %s, even though it's in the way." +msgstr "s'està refusant perdre el fitxer no seguit a «%s»" + +#: merge-recursive.c:1977 +#, c-format +msgid "" +"CONFLICT (directory rename split): Unclear where to place %s because " +"directory %s was renamed to multiple other directories, with no destination " +"getting a majority of the files." +msgstr "" + +#: merge-recursive.c:2009 +#, c-format +msgid "" +"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " +"implicit directory rename(s) putting the following path(s) there: %s." +msgstr "" + +#: merge-recursive.c:2019 +#, c-format +msgid "" +"CONFLICT (implicit dir rename): Cannot map more than one path to %s; " +"implicit directory renames tried to put these paths there: %s" +msgstr "" + +#: merge-recursive.c:2111 +#, fuzzy, c-format +msgid "" +"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %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" + +#: merge-recursive.c:2356 +#, c-format +msgid "" +"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " +"renamed." +msgstr "" + +#: merge-recursive.c:2762 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" msgstr "" "CONFLICTE (canvi de nom/afegiment): Canvi de nom %s->%s en %s. %s afegit en " "%s" -#: merge-recursive.c:1597 +#: merge-recursive.c:2777 #, c-format msgid "Adding merged %s" msgstr "S'està afegint %s fusionat" -#: merge-recursive.c:1604 merge-recursive.c:1834 +#: merge-recursive.c:2784 merge-recursive.c:3132 #, c-format msgid "Adding as %s instead" msgstr "S'està afegint com a %s en lloc d'això" -#: merge-recursive.c:1661 +#: merge-recursive.c:2941 #, c-format msgid "cannot read object %s" msgstr "no es pot llegir l'objecte %s" -#: merge-recursive.c:1664 +#: merge-recursive.c:2944 #, c-format msgid "object %s is not a blob" msgstr "l'objecte %s no és un blob" -#: merge-recursive.c:1733 +#: merge-recursive.c:3013 msgid "modify" msgstr "modificació" -#: merge-recursive.c:1733 +#: merge-recursive.c:3013 msgid "modified" msgstr "modificat" -#: merge-recursive.c:1743 +#: merge-recursive.c:3024 msgid "content" msgstr "contingut" -#: merge-recursive.c:1750 +#: merge-recursive.c:3031 msgid "add/add" msgstr "afegiment/afegiment" -#: merge-recursive.c:1786 +#: merge-recursive.c:3076 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "S'ha omès %s (el fusionat és igual a l'existent)" -#: merge-recursive.c:1800 -#, c-format -msgid "Auto-merging %s" -msgstr "S'està autofusionant %s" - -#: merge-recursive.c:1804 git-submodule.sh:879 +#: merge-recursive.c:3098 git-submodule.sh:865 msgid "submodule" msgstr "submòdul" -#: merge-recursive.c:1805 +#: merge-recursive.c:3099 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "CONFLICTE (%s): Conflicte de fusió en %s" -#: merge-recursive.c:1899 +#: merge-recursive.c:3221 #, c-format msgid "Removing %s" msgstr "S'està eliminant %s" -#: merge-recursive.c:1925 +#: merge-recursive.c:3247 msgid "file/directory" msgstr "fitxer/directori" -#: merge-recursive.c:1931 +#: merge-recursive.c:3253 msgid "directory/file" msgstr "directori/fitxer" -#: merge-recursive.c:1938 +#: merge-recursive.c:3260 #, 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" -#: merge-recursive.c:1947 +#: merge-recursive.c:3269 #, c-format msgid "Adding %s" msgstr "S'està afegint %s" -#: merge-recursive.c:1987 -#, c-format -msgid "Dirty index: cannot merge (dirty: %s)" -msgstr "Índex brut: no es pot fusionar (bruts: %s)" +#: merge-recursive.c:3303 +#, fuzzy, c-format +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" +"%%s" -#: merge-recursive.c:1991 +#: merge-recursive.c:3314 msgid "Already up to date!" msgstr "Ja està al dia!" -#: merge-recursive.c:2000 +#: merge-recursive.c:3323 #, c-format msgid "merging of trees %s and %s failed" msgstr "la fusió dels arbres %s i %s ha fallat" -#: merge-recursive.c:2097 +#: merge-recursive.c:3422 msgid "Merging:" msgstr "S'està fusionant:" -#: merge-recursive.c:2110 +#: merge-recursive.c:3435 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "s'ha trobat %u avantpassat en comú:" msgstr[1] "s'han trobat %u avantpassats en comú:" -#: merge-recursive.c:2149 +#: merge-recursive.c:3474 msgid "merge returned no commit" msgstr "la fusió no ha retornat cap comissió" -#: merge-recursive.c:2212 +#: merge-recursive.c:3540 #, c-format msgid "Could not parse object '%s'" msgstr "No s'ha pogut analitzar l'objecte «%s»" -#: merge-recursive.c:2228 builtin/merge.c:657 builtin/merge.c:816 +#: merge-recursive.c:3556 builtin/merge.c:689 builtin/merge.c:846 msgid "Unable to write index." msgstr "No s'ha pogut escriure l'índex." -#: notes-merge.c:272 +#: notes-merge.c:274 #, c-format msgid "" "You have not concluded your previous notes merge (%s exists).\n" @@ -2440,21 +3238,21 @@ msgstr "" "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 +#: notes-merge.c:281 #, c-format msgid "You have not concluded your notes merge (%s exists)." msgstr "No heu conclòs la vostra fusió de notes (%s existeix)." -#: notes-utils.c:43 +#: notes-utils.c:45 msgid "Cannot commit uninitialized/unreferenced notes tree" msgstr "No es pot cometre un arbre de notes no inicialitzat / no referenciat" -#: notes-utils.c:102 +#: notes-utils.c:104 #, c-format msgid "Bad notes.rewriteMode value: '%s'" msgstr "Valor de notes.rewriteMode erroni: «%s»" -#: notes-utils.c:112 +#: notes-utils.c:114 #, c-format msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" msgstr "S'està refusant reescriure les notes en %s (fora de refs/notes/)" @@ -2463,37 +3261,57 @@ msgstr "S'està refusant reescriure les notes en %s (fora de refs/notes/)" #. the environment variable, the second %s is #. its value. #. -#: notes-utils.c:142 +#: notes-utils.c:144 #, c-format msgid "Bad %s value: '%s'" msgstr "Valor erroni de %s: «%s»" -#: object.c:239 +#: object.c:54 +#, fuzzy, c-format +msgid "invalid object type \"%s\"" +msgstr "objecte de blob no vàlid %s" + +#: object.c:173 +#, fuzzy, c-format +msgid "object %s is a %s, not a %s" +msgstr "l'objecte %s no és un blob" + +#: object.c:233 +#, fuzzy, c-format +msgid "object %s has unknown type id %d" +msgstr "L'objecte %s no té cap nota\n" + +#: object.c:246 #, c-format msgid "unable to parse object: %s" msgstr "no s'ha pogut analitzar l'objecte: %s" -#: packfile.c:561 +#: object.c:266 object.c:277 +#, c-format +msgid "sha1 mismatch %s" +msgstr "" + +#: packfile.c:563 msgid "offset before end of packfile (broken .idx?)" msgstr "desplaçament abans de la fi del fitxer de paquet (.idx trencat?)" -#: packfile.c:1694 +#: packfile.c:1745 #, 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?)" -#: packfile.c:1698 +#: packfile.c:1749 #, 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?)" -#: parse-options.c:619 +#: parse-options.c:672 msgid "..." msgstr "..." -#: parse-options.c:638 +#: parse-options.c:691 #, c-format msgid "usage: %s" msgstr "ús: %s" @@ -2501,26 +3319,31 @@ msgstr "ús: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c:644 +#: parse-options.c:697 #, c-format msgid " or: %s" msgstr " o: %s" -#: parse-options.c:647 +#: parse-options.c:700 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:686 +#: parse-options.c:739 msgid "-NUM" msgstr "-NUM" -#: parse-options-cb.c:108 +#: parse-options-cb.c:44 +#, fuzzy, c-format +msgid "malformed expiration date '%s'" +msgstr "full d'opcions mal format: «%s»" + +#: parse-options-cb.c:112 #, c-format msgid "malformed object name '%s'" msgstr "nom d'objecte mal format «%s»" -#: path.c:891 +#: path.c:892 #, c-format msgid "Could not make %s writable by group" msgstr "No s'ha pogut fer %s escrivible pel grup" @@ -2603,11 +3426,79 @@ msgstr "" msgid "pathspec '%s' is beyond a symbolic link" msgstr "l'especificació de camí «%s» és més enllà d'un enllaç simbòlic" +#: pkt-line.c:104 +#, fuzzy +msgid "flush packet write failed" +msgstr "no s'ha pogut escriure el fitxer d'etiqueta" + +#: pkt-line.c:142 pkt-line.c:228 +msgid "protocol error: impossibly long line" +msgstr "" + +#: pkt-line.c:158 pkt-line.c:160 +#, fuzzy +msgid "packet write with format failed" +msgstr "no s'ha pogut escriure el fitxer d'etiqueta" + +#: pkt-line.c:192 +msgid "packet write failed - data exceeds max packet size" +msgstr "" + +#: pkt-line.c:199 pkt-line.c:206 +#, fuzzy +msgid "packet write failed" +msgstr "no s'ha pogut escriure el fitxer d'etiqueta" + +#: pkt-line.c:291 +#, fuzzy +msgid "read error" +msgstr "error de lectura d'entrada" + +#: pkt-line.c:299 +#, fuzzy +msgid "the remote end hung up unexpectedly" +msgstr "El costat remot ha penjat en el moment de contacte inicial" + +#: pkt-line.c:327 +#, fuzzy, c-format +msgid "protocol error: bad line length character: %.4s" +msgstr "error de protocol: capçalera de paquet errònia" + +#: pkt-line.c:337 pkt-line.c:342 +#, fuzzy, c-format +msgid "protocol error: bad line length %d" +msgstr "error de protocol: capçalera de paquet errònia" + #: pretty.c:962 msgid "unable to parse --pretty format" msgstr "no s'ha pogut analitzar el format --pretty" -#: read-cache.c:1473 +#: range-diff.c:48 +#, fuzzy +msgid "could not start `log`" +msgstr "no s'ha pogut fer stat a %s" + +#: range-diff.c:51 +#, fuzzy +msgid "could not read `log` output" +msgstr "no s'ha pogut llegir la sortida de 'show'" + +#: range-diff.c:66 sequencer.c:4540 +#, c-format +msgid "could not parse commit '%s'" +msgstr "no s'ha pogut analitzar la comissió «%s»" + +#: range-diff.c:196 +#, fuzzy +msgid "failed to generate diff" +msgstr "s'ha produït un error en executar «%s»" + +#: range-diff.c:421 range-diff.c:423 +#, fuzzy, c-format +msgid "could not parse log for '%s'" +msgstr "no s'ha pogut llegir el fitxer de registre «%s»" + +#: read-cache.c:1579 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -2616,7 +3507,7 @@ msgstr "" "index.version està establerta, però el valor no és vàlid.\n" "S'està usant la versió %i" -#: read-cache.c:1483 +#: read-cache.c:1589 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -2625,221 +3516,330 @@ msgstr "" "GIT_INDEX_VERSION està establerta, però el valor no és vàlid.\n" "S'està usant la versió %i" -#: read-cache.c:2375 sequencer.c:3248 wrapper.c:658 builtin/merge.c:1049 +#: read-cache.c:2580 sequencer.c:4503 wrapper.c:658 builtin/merge.c:1083 #, c-format msgid "could not close '%s'" msgstr "no s'ha pogut tancar «%s»" -#: read-cache.c:2448 sequencer.c:1900 sequencer.c:2627 +#: read-cache.c:2653 sequencer.c:2113 sequencer.c:3374 #, c-format msgid "could not stat '%s'" msgstr "no s'ha pogut fer stat a «%s»" -#: read-cache.c:2461 +#: read-cache.c:2666 #, c-format msgid "unable to open git dir: %s" msgstr "no s'ha pogut obrir el directori git: %s" -#: read-cache.c:2473 +#: read-cache.c:2678 #, c-format msgid "unable to unlink: %s" msgstr "no s'ha pogut desenllaçar: %s" +#: refs.c:192 +#, fuzzy, c-format +msgid "%s does not point to a valid object!" +msgstr "«%s» no assenyala una comissió" + +#: refs.c:579 +#, fuzzy, c-format +msgid "ignoring dangling symref %s" +msgstr "s'està ignorant la referència trencada %s" + +#: refs.c:581 ref-filter.c:2067 +#, c-format +msgid "ignoring broken ref %s" +msgstr "s'està ignorant la referència trencada %s" + +#: refs.c:685 +#, fuzzy, c-format +msgid "could not open '%s' for writing: %s" +msgstr "no s'ha pogut obrir «%s» per a escriptura" + +#: refs.c:695 refs.c:746 +#, fuzzy, c-format +msgid "could not read ref '%s'" +msgstr "No s'ha pogut llegir la referència %s" + +#: refs.c:701 +#, fuzzy, c-format +msgid "ref '%s' already exists" +msgstr "«%s» ja existeix" + #: refs.c:706 #, c-format -msgid "Could not open '%s' for writing" -msgstr "No s'ha pogut obrir «%s» per a escriptura" +msgid "unexpected object ID when writing '%s'" +msgstr "" -#: refs.c:1850 +#: refs.c:714 sequencer.c:385 sequencer.c:2366 sequencer.c:2492 +#: sequencer.c:2506 sequencer.c:2733 sequencer.c:4501 sequencer.c:4564 +#: wrapper.c:656 +#, c-format +msgid "could not write to '%s'" +msgstr "no s'ha pogut escriure a «%s»" + +#: refs.c:741 sequencer.c:4499 sequencer.c:4558 wrapper.c:225 wrapper.c:395 +#: builtin/am.c:780 +#, c-format +msgid "could not open '%s' for writing" +msgstr "no s'ha pogut obrir «%s» per a escriptura" + +#: refs.c:748 +#, c-format +msgid "unexpected object ID when deleting '%s'" +msgstr "" + +#: refs.c:879 +#, c-format +msgid "log for ref %s has gap after %s" +msgstr "" + +#: refs.c:885 +#, c-format +msgid "log for ref %s unexpectedly ended on %s" +msgstr "" + +#: refs.c:943 +#, c-format +msgid "log for %s is empty" +msgstr "" + +#: refs.c:1035 +#, fuzzy, c-format +msgid "refusing to update ref with bad name '%s'" +msgstr "s'està ignorant la referència amb nom malmès %s" + +#: refs.c:1111 +#, fuzzy, c-format +msgid "update_ref failed for ref '%s': %s" +msgstr "s'ha produït un error en obrir «%s»: %s" + +#: refs.c:1853 +#, fuzzy, c-format +msgid "multiple updates for ref '%s' not allowed" +msgstr "nom d'identitat buit (per <%s>) no és permès" + +#: refs.c:1885 msgid "ref updates forbidden inside quarantine environment" msgstr "no està permès actualitzar les referències en un entorn de quarantena" -#: refs/files-backend.c:1189 +#: refs.c:1981 refs.c:2011 +#, fuzzy, c-format +msgid "'%s' exists; cannot create '%s'" +msgstr "no es pot crear «%s»" + +#: refs.c:1987 refs.c:2022 +#, fuzzy, c-format +msgid "cannot process '%s' and '%s' at the same time" +msgstr "" +"No es poden actualitzar els camins i canviar a la branca «%s» a la vegada." + +#: refs/files-backend.c:1191 #, c-format 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:1205 refs/packed-backend.c:1532 +#: refs/packed-backend.c:1542 #, c-format msgid "could not delete reference %s: %s" msgstr "no s'ha pogut suprimir la referència %s: %s" -#: refs/files-backend.c:1206 refs/packed-backend.c:1541 +#: refs/files-backend.c:1208 refs/packed-backend.c:1545 #, c-format msgid "could not delete references: %s" msgstr "no s'han pogut suprimir les referències: %s" -#: ref-filter.c:35 wt-status.c:1842 +#: refspec.c:137 +#, fuzzy, c-format +msgid "invalid refspec '%s'" +msgstr "fitxer no vàlid: «%s»" + +#: ref-filter.c:38 wt-status.c:1850 msgid "gone" msgstr "no hi és" -#: ref-filter.c:36 +#: ref-filter.c:39 #, c-format msgid "ahead %d" msgstr "davant per %d" -#: ref-filter.c:37 +#: ref-filter.c:40 #, c-format msgid "behind %d" msgstr "darrere per %d" -#: ref-filter.c:38 +#: ref-filter.c:41 #, c-format msgid "ahead %d, behind %d" msgstr "davant per %d, darrere per %d" -#: ref-filter.c:107 +#: ref-filter.c:137 #, c-format msgid "expected format: %%(color:<color>)" msgstr "format esperat: %%(color:<color>)" -#: ref-filter.c:109 +#: ref-filter.c:139 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "color no reconegut: %%(color:%s)" -#: ref-filter.c:129 +#: ref-filter.c:161 #, c-format msgid "Integer value expected refname:lstrip=%s" msgstr "valor enter esperat pel nom de referència:lstrip=%s" -#: ref-filter.c:133 +#: ref-filter.c:165 #, c-format msgid "Integer value expected refname:rstrip=%s" msgstr "valor enter esperat pel nom de referència:rstrip=%s" -#: ref-filter.c:135 +#: ref-filter.c:167 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "paràmetre %%(%s) desconegut: %s" -#: ref-filter.c:184 +#: ref-filter.c:222 +#, c-format +msgid "%%(objecttype) does not take arguments" +msgstr "%%(subject) no accepta paràmetres" + +#: ref-filter.c:234 +#, c-format +msgid "%%(objectsize) does not take arguments" +msgstr "%%(objectsize) no accepta paràmetres" + +#: ref-filter.c:246 #, c-format msgid "%%(body) does not take arguments" msgstr "%%(body) no accepta paràmetres" -#: ref-filter.c:191 +#: ref-filter.c:255 #, c-format msgid "%%(subject) does not take arguments" msgstr "%%(subject) no accepta paràmetres" -#: ref-filter.c:209 +#: ref-filter.c:275 #, c-format msgid "unknown %%(trailers) argument: %s" msgstr "paràmetre %%(trailers) desconegut: %s" -#: ref-filter.c:232 +#: ref-filter.c:304 #, c-format msgid "positive value expected contents:lines=%s" msgstr "valor positiu esperat conté:lines=%s" -#: ref-filter.c:234 +#: ref-filter.c:306 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "paràmetre %%(contents) no reconegut: %s" -#: ref-filter.c:247 +#: ref-filter.c:321 #, c-format msgid "positive value expected objectname:short=%s" msgstr "valor positiu esperat nom d'objecte:curt=%s" -#: ref-filter.c:251 +#: ref-filter.c:325 #, c-format msgid "unrecognized %%(objectname) argument: %s" msgstr "paràmetre %%(objectname) no reconegut: %s" -#: ref-filter.c:278 +#: ref-filter.c:355 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "format esperat: %%(align:<amplada>,<posició>)" -#: ref-filter.c:290 +#: ref-filter.c:367 #, c-format msgid "unrecognized position:%s" msgstr "posició no reconeguda:%s" -#: ref-filter.c:294 +#: ref-filter.c:374 #, c-format msgid "unrecognized width:%s" msgstr "amplada no reconeguda:%s" -#: ref-filter.c:300 +#: ref-filter.c:383 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "paràmetre %%(align) no reconegut: %s" -#: ref-filter.c:304 +#: ref-filter.c:391 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "amplada positiva esperada amb l'àtom %%(align)" -#: ref-filter.c:319 +#: ref-filter.c:409 #, c-format msgid "unrecognized %%(if) argument: %s" msgstr "paràmetre %%(if) no reconegut: %s" -#: ref-filter.c:409 +#: ref-filter.c:505 #, c-format msgid "malformed field name: %.*s" msgstr "nom de camp mal format: %.*s" -#: ref-filter.c:435 +#: ref-filter.c:532 #, c-format msgid "unknown field name: %.*s" msgstr "nom de camp desconegut: %.*s" -#: ref-filter.c:547 +#: ref-filter.c:656 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "format: s'ha usat l'àtom %%(if) sense un àtom %%(then)" -#: ref-filter.c:607 +#: ref-filter.c:719 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "format: s'ha usat l'àtom %%(then) sense un àtom %%(if)" -#: ref-filter.c:609 +#: ref-filter.c:721 #, c-format msgid "format: %%(then) atom used more than once" msgstr "format: s'ha usat l'àtom %%(then) més d'un cop" -#: ref-filter.c:611 +#: ref-filter.c:723 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "format: s'ha usat l'àtom %%(then) després de %%(else)" -#: ref-filter.c:637 +#: ref-filter.c:751 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "format: s'ha usat l'àtom %%(else) sense un àtom %%(if)" -#: ref-filter.c:639 +#: ref-filter.c:753 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "format: s'ha usat l'àtom %%(else) sense un àtom %%(then)" -#: ref-filter.c:641 +#: ref-filter.c:755 #, c-format msgid "format: %%(else) atom used more than once" msgstr "format: s'ha usat l'àtom %%(else) més d'un cop" -#: ref-filter.c:654 +#: ref-filter.c:770 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "format: s'ha usat l'àtom %%(end) sense l'àtom corresponent" -#: ref-filter.c:709 +#: ref-filter.c:827 #, c-format msgid "malformed format string %s" msgstr "cadena de format mal format %s" -#: ref-filter.c:1313 +#: ref-filter.c:1416 #, c-format msgid "(no branch, rebasing %s)" msgstr "(cap branca, s'està fent «rebase» %s)" -#: ref-filter.c:1316 +#: ref-filter.c:1419 +#, c-format +msgid "(no branch, rebasing detached HEAD %s)" +msgstr "(cap branca, s'està fent «rebase» d'un «HEAD» %s no adjuntat)" + +#: ref-filter.c:1422 #, c-format msgid "(no branch, bisect started on %s)" msgstr "(cap branca, bisecció començada en %s)" @@ -2847,7 +3847,7 @@ msgstr "(cap branca, bisecció començada en %s)" #. TRANSLATORS: make sure this matches "HEAD #. detached at " in wt-status.c #. -#: ref-filter.c:1324 +#: ref-filter.c:1430 #, c-format msgid "(HEAD detached at %s)" msgstr "(HEAD separat a %s)" @@ -2855,148 +3855,143 @@ msgstr "(HEAD separat a %s)" #. TRANSLATORS: make sure this matches "HEAD #. detached from " in wt-status.c #. -#: ref-filter.c:1331 +#: ref-filter.c:1437 #, c-format msgid "(HEAD detached from %s)" msgstr "(HEAD separat de %s)" -#: ref-filter.c:1335 +#: ref-filter.c:1441 msgid "(no branch)" msgstr "(cap branca)" -#: ref-filter.c:1364 +#: ref-filter.c:1475 ref-filter.c:1623 #, c-format msgid "missing object %s for %s" msgstr "manca l'objecte %s per a %s" -#: ref-filter.c:1367 +#: ref-filter.c:1483 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "parse_object_buffer ha fallat en %s per a %s" -#: ref-filter.c:1819 +#: ref-filter.c:1980 #, c-format msgid "malformed object at '%s'" msgstr "objecte mal format a «%s»" -#: ref-filter.c:1886 +#: ref-filter.c:2062 #, c-format msgid "ignoring ref with broken name %s" msgstr "s'està ignorant la referència amb nom malmès %s" -#: ref-filter.c:1891 -#, c-format -msgid "ignoring broken ref %s" -msgstr "s'està ignorant la referència trencada %s" - -#: ref-filter.c:2152 +#: ref-filter.c:2340 #, c-format msgid "format: %%(end) atom missing" msgstr "format: manca l'àtom %%(end)" -#: ref-filter.c:2246 +#: ref-filter.c:2444 #, c-format msgid "malformed object name %s" msgstr "nom d'objecte %s mal format" -#: remote.c:795 +#: remote.c:606 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "No es poden obtenir ambdós %s i %s a %s" -#: remote.c:799 +#: remote.c:610 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s generalment segueix %s, no %s" -#: remote.c:803 +#: remote.c:614 #, c-format msgid "%s tracks both %s and %s" msgstr "%s segueix ambdós %s i %s" -#: remote.c:811 +#: remote.c:622 msgid "Internal error" msgstr "Error intern" -#: remote.c:1726 remote.c:1828 +#: remote.c:1536 remote.c:1637 msgid "HEAD does not point to a branch" msgstr "HEAD no assenyala cap branca" -#: remote.c:1735 +#: remote.c:1545 #, c-format msgid "no such branch: '%s'" msgstr "no hi ha tal branca: «%s»" -#: remote.c:1738 +#: remote.c:1548 #, c-format msgid "no upstream configured for branch '%s'" msgstr "cap font configurada per a la branca «%s»" -#: remote.c:1744 +#: remote.c:1554 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "la branca font «%s» no s'emmagatzema com a branca amb seguiment remot" -#: remote.c:1759 +#: remote.c:1569 #, 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" -#: remote.c:1771 +#: remote.c:1581 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "la branca «%s» no té cap remot al qual pujar" -#: remote.c:1782 +#: remote.c:1591 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "les especificacions de referència de «%s» no inclouen «%s»" -#: remote.c:1795 +#: remote.c:1604 msgid "push has no destination (push.default is 'nothing')" msgstr "push no té destí (push.default és 'nothing')" -#: remote.c:1817 +#: remote.c:1626 msgid "cannot resolve 'simple' push to a single destination" msgstr "no es pot resoldre una pujada 'simple' a un sol destí" -#: remote.c:2132 +#: remote.c:1951 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "La vostra branca està basada en «%s», però la font no hi és.\n" -#: remote.c:2136 +#: remote.c:1955 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (useu \"git branch --unset-upstream\" per a arreglar)\n" -#: remote.c:2139 +#: remote.c:1958 #, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "La vostra branca està al dia amb «%s».\n" -#: remote.c:2143 +#: remote.c:1962 #, c-format msgid "Your branch and '%s' refer to different commits.\n" msgstr "La vostra branca i «%s» es refereixen a diferents comissions.\n" -#: remote.c:2146 +#: remote.c:1965 #, c-format msgid " (use \"%s\" for details)\n" msgstr "" -#: remote.c:2150 +#: remote.c:1969 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "La vostra branca està davant de «%s» per %d comissió.\n" msgstr[1] "La vostra branca està davant de «%s» per %d comissions.\n" -#: remote.c:2156 +#: remote.c:1975 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (useu \"git push\" per a publicar les vostres comissions locals)\n" -#: remote.c:2159 +#: remote.c:1978 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -3008,11 +4003,11 @@ msgstr[1] "" "La vostra branca està darrere de «%s» per %d comissions, i pot avançar-se " "ràpidament.\n" -#: remote.c:2167 +#: remote.c:1986 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (useu \"git pull\" per a actualitzar la vostra branca local)\n" -#: remote.c:2170 +#: remote.c:1989 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -3027,59 +4022,74 @@ msgstr[1] "" "La vostra branca i «%s» han divergit,\n" "i tenen %d i %d comissions distintes cada una, respectivament.\n" -#: remote.c:2180 +#: remote.c:1999 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr " (useu \"git pull\" per a fusionar la branca remota a la vostra)\n" -#: revision.c:2277 +#: replace-object.c:20 +#, fuzzy, c-format +msgid "bad replace ref name: %s" +msgstr "suprimeix les referències reemplaçades" + +#: replace-object.c:29 +#, fuzzy, c-format +msgid "duplicate replace ref: %s" +msgstr "suprimeix les referències reemplaçades" + +#: replace-object.c:72 +#, fuzzy, c-format +msgid "replace depth too high for object %s" +msgstr "reemplaça l'etiqueta si existeix" + +#: revision.c:2305 msgid "your current branch appears to be broken" msgstr "la vostra branca actual sembla malmesa" -#: revision.c:2280 +#: revision.c:2308 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "la branca actual «%s» encara no té cap comissió" -#: revision.c:2477 +#: revision.c:2505 msgid "--first-parent is incompatible with --bisect" msgstr "--first-parent és incompatible amb --bisect" -#: run-command.c:731 +#: run-command.c:728 msgid "open /dev/null failed" msgstr "s'ha produït un error en obrir /dev/null" -#: run-command.c:1274 +#: run-command.c:1271 #, c-format msgid "" "The '%s' hook was ignored because it's not set as executable.\n" "You can disable this warning with `git config advice.ignoredHook false`." msgstr "" -#: send-pack.c:141 +#: send-pack.c:142 msgid "unexpected flush packet while reading remote unpack status" msgstr "" "paquet de neteja no esperat quan estava llegint l'estat del desempaquetament " "remot" -#: send-pack.c:143 +#: send-pack.c:144 #, c-format msgid "unable to parse remote unpack status: %s" msgstr "no s'ha pogut analitzar l'estat del desempaquetament remot: %s" -#: send-pack.c:145 +#: send-pack.c:146 #, c-format msgid "remote unpack failed: %s" msgstr "s'ha produït un error en el desempaquetament remot: %s" -#: send-pack.c:308 +#: send-pack.c:309 msgid "failed to sign the push certificate" msgstr "s'ha produït un error en signar el certificat de pujada" -#: send-pack.c:421 +#: send-pack.c:422 msgid "the receiving end does not support --signed push" msgstr "el destí receptor no admet pujar --signed" -#: send-pack.c:423 +#: send-pack.c:424 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" @@ -3087,37 +4097,42 @@ msgstr "" "no s'està enviant una certificació de pujada perquè el destí receptor no " "admet pujar --signed" -#: send-pack.c:435 +#: send-pack.c:436 msgid "the receiving end does not support --atomic push" msgstr "el destí receptor no admet pujar --atomic" -#: send-pack.c:440 +#: send-pack.c:441 msgid "the receiving end does not support push options" msgstr "el destí receptor no admet opcions de pujada" -#: sequencer.c:158 +#: sequencer.c:177 #, c-format msgid "invalid commit message cleanup mode '%s'" msgstr "mode de neteja «%s» no vàlid en la comissió del missatge" -#: sequencer.c:267 +#: sequencer.c:278 +#, fuzzy, c-format +msgid "could not delete '%s'" +msgstr "No s'ha pogut suprimir %s" + +#: sequencer.c:304 msgid "revert" msgstr "revertir" -#: sequencer.c:269 +#: sequencer.c:306 msgid "cherry-pick" msgstr "cherry-pick" -#: sequencer.c:271 +#: sequencer.c:308 msgid "rebase -i" msgstr "rebase -i" -#: sequencer.c:273 -#, c-format -msgid "Unknown action: %d" +#: sequencer.c:310 +#, fuzzy, c-format +msgid "unknown action: %d" msgstr "Acció desconeguda: %d" -#: sequencer.c:330 +#: sequencer.c:367 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -3125,7 +4140,7 @@ msgstr "" "després de resoldre els conflictes, marqueu els camins\n" "corregits amb 'git add <camins>' o 'git rm <camins>'" -#: sequencer.c:333 +#: sequencer.c:370 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -3135,43 +4150,39 @@ msgstr "" "corregits amb 'git add <camins>' o 'git rm <camins>'\n" "i cometeu el resultat amb 'git commit'" -#: sequencer.c:346 sequencer.c:2245 +#: sequencer.c:383 sequencer.c:2488 #, c-format 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 -#, c-format -msgid "could not write to '%s'" -msgstr "no s'ha pogut escriure a «%s»" - -#: sequencer.c:353 +#: sequencer.c:390 #, c-format msgid "could not write eol to '%s'" msgstr "no s'ha pogut escriure el terminador de línia a «%s»" -#: sequencer.c:356 sequencer.c:2128 sequencer.c:2252 +#: sequencer.c:395 sequencer.c:2371 sequencer.c:2494 sequencer.c:2508 +#: sequencer.c:2741 #, c-format 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:418 sequencer.c:816 sequencer.c:1505 sequencer.c:2391 +#: sequencer.c:2723 sequencer.c:2827 builtin/am.c:260 builtin/commit.c:740 +#: builtin/merge.c:1081 #, c-format msgid "could not read '%s'" msgstr "no s'ha pogut llegir «%s»" -#: sequencer.c:405 +#: sequencer.c:444 #, c-format msgid "your local changes would be overwritten by %s." msgstr "els vostres canvis locals se sobreescriurien per %s." -#: sequencer.c:409 +#: sequencer.c:448 msgid "commit your changes or stash them to proceed." msgstr "cometeu els vostres canvis o feu un «stash» per a procedir." -#: sequencer.c:438 +#: sequencer.c:477 #, c-format msgid "%s: fast-forward" msgstr "%s: avanç ràpid" @@ -3179,20 +4190,35 @@ msgstr "%s: avanç ràpid" #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase -i". #. -#: sequencer.c:526 +#: sequencer.c:566 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: No s'ha pogut escriure un fitxer d'índex nou" -#: sequencer.c:542 +#: sequencer.c:582 +msgid "unable to update cache tree" +msgstr "no s'ha pogut actualitzar l'arbre cau" + +#: sequencer.c:595 msgid "could not resolve HEAD commit" msgstr "no s'ha pogut resoldre la comissió HEAD" -#: sequencer.c:562 -msgid "unable to update cache tree" -msgstr "no s'ha pogut actualitzar l'arbre cau" +#: sequencer.c:723 sequencer.c:740 +#, fuzzy, c-format +msgid "could not parse '%s' (looking for '%s')" +msgstr "no s'ha pogut establir «%s» a «%s»" -#: sequencer.c:658 +#: sequencer.c:731 +#, fuzzy, c-format +msgid "bad quoting on %s value in '%s'" +msgstr "Valor erroni de %s: «%s»" + +#: sequencer.c:747 +#, fuzzy, c-format +msgid "invalid date format '%s' in '%s'" +msgstr "format de data no vàlid: %s" + +#: sequencer.c:761 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -3222,11 +4248,16 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:915 +#: sequencer.c:830 +#, fuzzy +msgid "writing root commit" +msgstr "no hi ha res a cometre\n" + +#: sequencer.c:1055 msgid "'prepare-commit-msg' hook failed" msgstr "el lligam «prepare-commit-msg» ha fallat" -#: sequencer.c:922 +#: 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" @@ -3253,7 +4284,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:935 +#: sequencer.c:1075 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -3279,328 +4310,344 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:975 +#: sequencer.c:1115 msgid "couldn't look up newly created commit" msgstr "no s'ha pogut trobar la comissió novament creada" -#: sequencer.c:977 +#: sequencer.c:1117 msgid "could not parse newly created commit" msgstr "no s'ha pogut analitzar la comissió novament creada" -#: sequencer.c:1023 +#: sequencer.c:1163 msgid "unable to resolve HEAD after creating commit" msgstr "no s'ha pogut resoldre HEAD després de crear la comissió" -#: sequencer.c:1025 +#: sequencer.c:1165 msgid "detached HEAD" msgstr "HEAD separat" -#: sequencer.c:1029 +#: sequencer.c:1169 msgid " (root-commit)" msgstr " (comissió d'arrel)" -#: sequencer.c:1050 +#: sequencer.c:1190 msgid "could not parse HEAD" msgstr "no s'ha pogut analitzar HEAD" -#: sequencer.c:1052 +#: sequencer.c:1192 #, c-format msgid "HEAD %s is not a commit!" msgstr "HEAD %s no és una comissió!" -#: sequencer.c:1056 builtin/commit.c:1491 +#: sequencer.c:1196 builtin/commit.c:1528 msgid "could not parse HEAD commit" msgstr "no s'ha pogut analitzar la comissió HEAD" -#: sequencer.c:1107 sequencer.c:1673 +#: sequencer.c:1247 sequencer.c:1845 msgid "unable to parse commit author" msgstr "no s'ha pogut analitzar l'autor de la comissió" -#: sequencer.c:1117 builtin/am.c:1630 builtin/merge.c:643 +#: sequencer.c:1257 builtin/am.c:1632 builtin/merge.c:675 msgid "git write-tree failed to write a tree" msgstr "git write-tree ha fallat en escriure un arbre" -#: sequencer.c:1134 sequencer.c:1186 +#: sequencer.c:1274 sequencer.c:1329 #, c-format msgid "unable to read commit message from '%s'" msgstr "no s'ha pogut llegir el missatge de comissió des de «%s»" -#: sequencer.c:1154 builtin/am.c:1650 builtin/commit.c:1594 builtin/merge.c:826 -#: builtin/merge.c:851 +#: sequencer.c:1296 builtin/am.c:1653 builtin/commit.c:1631 builtin/merge.c:855 +#: builtin/merge.c:880 msgid "failed to write commit object" msgstr "s'ha produït un error en escriure l'objecte de comissió" -#: sequencer.c:1213 +#: sequencer.c:1356 #, c-format msgid "could not parse commit %s" msgstr "no s'ha pogut analitzar la comissió %s" -#: sequencer.c:1218 +#: sequencer.c:1361 #, c-format msgid "could not parse parent commit %s" msgstr "no s'ha pogut analitzar la comissió pare %s" -#: sequencer.c:1347 -#, c-format -msgid "" -"unexpected 1st line of squash message:\n" -"\n" -"\t%.*s" -msgstr "" -"Primera línia del missatge de «squash» no esperada:\n" -"\n" -"\t%.*s" - -#: sequencer.c:1353 +#: sequencer.c:1457 sequencer.c:1565 #, c-format -msgid "" -"invalid 1st line of squash message:\n" -"\n" -"\t%.*s" -msgstr "" -"Primera línia del missatge de «squash» no vàlida:\n" -"\n" -"\t%.*s" +msgid "unknown command: %d" +msgstr "ordre desconeguda: %d" -#: sequencer.c:1359 sequencer.c:1384 +#: sequencer.c:1512 sequencer.c:1537 #, c-format msgid "This is a combination of %d commits." msgstr "Això és una combinació de %d comissions." -#: sequencer.c:1368 sequencer.c:3265 +#: sequencer.c:1522 sequencer.c:4520 msgid "need a HEAD to fixup" msgstr "cal un HEAD per reparar-ho" -#: sequencer.c:1370 +#: sequencer.c:1524 sequencer.c:2768 msgid "could not read HEAD" msgstr "no s'ha pogut llegir HEAD" -#: sequencer.c:1372 +#: sequencer.c:1526 msgid "could not read HEAD's commit message" msgstr "no s'ha pogut llegir el missatge de comissió de HEAD" -#: sequencer.c:1378 +#: sequencer.c:1532 #, c-format msgid "cannot write '%s'" msgstr "no es pot escriure «%s»" -#: sequencer.c:1387 git-rebase--interactive.sh:452 +#: sequencer.c:1539 git-rebase--preserve-merges.sh:441 msgid "This is the 1st commit message:" msgstr "Aquest és el 1r missatge de comissió:" -#: sequencer.c:1395 +#: sequencer.c:1547 #, c-format msgid "could not read commit message of %s" msgstr "no s'ha pogut llegir el missatge de comissió: %s" -#: sequencer.c:1402 +#: sequencer.c:1554 #, c-format msgid "This is the commit message #%d:" msgstr "Aquest és el missatge de comissió #%d:" -#: sequencer.c:1407 +#: sequencer.c:1560 #, c-format msgid "The commit message #%d will be skipped:" msgstr "El missatge de comissió núm. #%d s'ometrà:" -#: sequencer.c:1412 -#, c-format -msgid "unknown command: %d" -msgstr "ordre desconeguda: %d" - -#: sequencer.c:1479 +#: sequencer.c:1643 msgid "your index file is unmerged." msgstr "el vostre fitxer d'índex està sense fusionar." -#: sequencer.c:1498 +#: sequencer.c:1650 +#, fuzzy +msgid "cannot fixup root commit" +msgstr "no es pot trobar la comissió %s (%s)" + +#: sequencer.c:1669 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "la comissió %s és una fusió però no s'ha donat cap opció -m." -#: sequencer.c:1506 +#: sequencer.c:1677 #, c-format msgid "commit %s does not have parent %d" msgstr "la comissió %s no té pare %d" -#: sequencer.c:1510 +#: sequencer.c:1681 #, 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ó." -#: sequencer.c:1516 +#: sequencer.c:1687 #, c-format msgid "cannot get commit message for %s" msgstr "no es pot obtenir el missatge de comissió de %s" #. TRANSLATORS: The first %s will be a "todo" command like #. "revert" or "pick", the second %s a SHA1. -#: sequencer.c:1535 +#: sequencer.c:1706 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: no es pot analitzar la comissió pare %s" -#: sequencer.c:1600 sequencer.c:2397 +#: sequencer.c:1771 #, c-format msgid "could not rename '%s' to '%s'" msgstr "no s'ha pogut canviar el nom «%s» a «%s»" -#: sequencer.c:1654 +#: sequencer.c:1826 #, c-format msgid "could not revert %s... %s" msgstr "no s'ha pogut revertir %s... %s" -#: sequencer.c:1655 +#: sequencer.c:1827 #, c-format msgid "could not apply %s... %s" msgstr "no s'ha pogut aplicar %s... %s" -#: sequencer.c:1702 -msgid "empty commit set passed" -msgstr "conjunt de comissions buit passat" - -#: sequencer.c:1712 +#: sequencer.c:1885 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: s'ha produït un error en llegir l'índex" -#: sequencer.c:1718 +#: sequencer.c:1892 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: s'ha produït un error en actualitzar l'índex" -#: sequencer.c:1792 +#: sequencer.c:1972 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "%s no accepta paràmetres: «%s»" -#: sequencer.c:1801 +#: sequencer.c:1981 #, c-format msgid "missing arguments for %s" msgstr "falten els arguments per %s" -#: sequencer.c:1844 +#: sequencer.c:2040 #, c-format msgid "invalid line %d: %.*s" msgstr "línia no vàlida %d: %.*s" -#: sequencer.c:1852 +#: sequencer.c:2048 #, c-format msgid "cannot '%s' without a previous commit" msgstr "No es pot «%s» sense una comissió prèvia" -#: sequencer.c:1883 sequencer.c:3056 sequencer.c:3091 +#: sequencer.c:2096 sequencer.c:4277 sequencer.c:4333 #, c-format msgid "could not read '%s'." msgstr "no s'ha pogut llegir «%s»." -#: sequencer.c:1906 +#: sequencer.c:2119 msgid "please fix this using 'git rebase --edit-todo'." msgstr "corregiu-ho usant «git rebase --edit-todo»." -#: sequencer.c:1908 +#: sequencer.c:2121 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "full d'instruccions inusable: «%s»" -#: sequencer.c:1913 +#: sequencer.c:2126 msgid "no commits parsed." msgstr "no s'ha analitzat cap comissió." -#: sequencer.c:1924 +#: sequencer.c:2137 msgid "cannot cherry-pick during a revert." msgstr "no es pot fer «cherry pick» durant una reversió." -#: sequencer.c:1926 +#: sequencer.c:2139 msgid "cannot revert during a cherry-pick." msgstr "no es pot revertir durant un «cherry pick»." -#: sequencer.c:1993 -#, c-format -msgid "invalid key: %s" -msgstr "clau no vàlida: %s" - -#: sequencer.c:1996 +#: sequencer.c:2209 #, c-format msgid "invalid value for %s: %s" msgstr "valor no vàlid per a %s: %s" -#: sequencer.c:2062 +#: sequencer.c:2285 +msgid "unusable squash-onto" +msgstr "" + +#: sequencer.c:2301 #, c-format msgid "malformed options sheet: '%s'" msgstr "full d'opcions mal format: «%s»" -#: sequencer.c:2100 +#: sequencer.c:2335 sequencer.c:3775 +msgid "empty commit set passed" +msgstr "conjunt de comissions buit passat" + +#: sequencer.c:2343 msgid "a cherry-pick or revert is already in progress" msgstr "un «cherry pick» o una reversió ja està en curs" -#: sequencer.c:2101 +#: sequencer.c:2344 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "intenteu \"git cherry-pick (--continue | --quit | --abort)\"" -#: sequencer.c:2104 +#: sequencer.c:2347 #, c-format msgid "could not create sequencer directory '%s'" msgstr "no s'ha pogut crear el directori de seqüenciador «%s»" -#: sequencer.c:2118 +#: sequencer.c:2361 msgid "could not lock HEAD" msgstr "no s'ha pogut bloquejar HEAD" -#: sequencer.c:2173 sequencer.c:2761 +#: sequencer.c:2416 sequencer.c:3543 msgid "no cherry-pick or revert in progress" msgstr "ni hi ha cap «cherry pick» ni cap reversió en curs" -#: sequencer.c:2175 +#: sequencer.c:2418 msgid "cannot resolve HEAD" msgstr "no es pot resoldre HEAD" -#: sequencer.c:2177 sequencer.c:2212 +#: sequencer.c:2420 sequencer.c:2455 msgid "cannot abort from a branch yet to be born" msgstr "no es pot avortar des d'una branca que encara ha de nàixer" -#: sequencer.c:2198 builtin/grep.c:720 +#: sequencer.c:2441 builtin/grep.c:721 #, c-format msgid "cannot open '%s'" msgstr "no es pot obrir «%s»" -#: sequencer.c:2200 +#: sequencer.c:2443 #, c-format msgid "cannot read '%s': %s" msgstr "no es pot llegir «%s»: %s" -#: sequencer.c:2201 +#: sequencer.c:2444 msgid "unexpected end of file" msgstr "final de fitxer inesperat" -#: sequencer.c:2207 +#: sequencer.c:2450 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "el fitxer HEAD emmagatzemat abans de fer «cherry pick» «%s» és malmès" -#: sequencer.c:2218 +#: sequencer.c:2461 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "Sembla que heu mogut HEAD sense rebobinar, comproveu-ho HEAD" -#: sequencer.c:2324 sequencer.c:2679 +#: sequencer.c:2565 sequencer.c:3461 #, c-format msgid "could not update %s" msgstr "no s'ha pogut actualitzar %s" -#: sequencer.c:2362 sequencer.c:2659 +#: sequencer.c:2603 sequencer.c:3441 msgid "cannot read HEAD" msgstr "No es pot llegir HEAD" -#: sequencer.c:2402 builtin/difftool.c:639 +#: sequencer.c:2618 +#, fuzzy, c-format +msgid "unable to copy '%s' to '%s'" +msgstr "no s'ha pogut copiar «%s» a «%s»" + +#: sequencer.c:2626 +#, fuzzy, c-format +msgid "" +"You can amend the commit now, with\n" +"\n" +" git commit --amend %s\n" +"\n" +"Once you are satisfied with your changes, run\n" +"\n" +" git rebase --continue\n" +msgstr "" +"Podeu esmenar la comissió ara, amb\n" +"\n" +"\tgit commit --amend $gpg_sign_opt_quoted\n" +"\n" +"Una vegada que estigueu satisfet amb els vostres canvis, executeu\n" +"\n" +"\tgit rebase --continue" + +#: sequencer.c:2636 +#, c-format +msgid "Could not apply %s... %.*s" +msgstr "No s'ha pogut aplicar %s... %.*s" + +#: sequencer.c:2643 +#, c-format +msgid "Could not merge %.*s" +msgstr "No s'ha pogut fusionar %.*s" + +#: sequencer.c:2654 sequencer.c:2658 builtin/difftool.c:640 #, c-format msgid "could not copy '%s' to '%s'" msgstr "no s'ha pogut copiar «%s» a «%s»" -#: sequencer.c:2421 +#: sequencer.c:2680 sequencer.c:3095 msgid "could not read index" msgstr "no s'ha pogut llegir l'índex" -#: sequencer.c:2426 +#: sequencer.c:2685 #, c-format msgid "" "execution failed: %s\n" @@ -3615,11 +4662,11 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:2432 +#: sequencer.c:2691 msgid "and made changes to the index and/or the working tree\n" msgstr "i ha fet canvis a l'índex i/o l'arbre de treball\n" -#: sequencer.c:2438 +#: sequencer.c:2697 #, c-format msgid "" "execution succeeded: %s\n" @@ -3635,17 +4682,84 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:2497 +#: sequencer.c:2758 +#, c-format +msgid "illegal label name: '%.*s'" +msgstr "nom d'etiqueta no permès: «%.*s»" + +#: sequencer.c:2810 +#, fuzzy +msgid "writing fake root commit" +msgstr "no hi ha res a cometre\n" + +#: sequencer.c:2815 +msgid "writing squash-onto" +msgstr "" + +#: sequencer.c:2850 +#, fuzzy, c-format +msgid "failed to find tree of %s" +msgstr "S'ha produït un error en cercar l'arbre de %s." + +#: sequencer.c:2868 +msgid "could not write index" +msgstr "no s'ha pogut escriure l'índex" + +#: sequencer.c:2895 +#, c-format +msgid "could not resolve '%s'" +msgstr "no s'ha pogut resoldre «%s»" + +#: sequencer.c:2921 +#, fuzzy +msgid "cannot merge without a current revision" +msgstr "No es pot «%s» sense una comissió prèvia" + +#: sequencer.c:2943 +#, c-format +msgid "unable to parse '%.*s'" +msgstr "no s'ha pogut analitzar «%.*s»" + +#: sequencer.c:2952 +#, c-format +msgid "nothing to merge: '%.*s'" +msgstr "no hi ha res per fusionar «%.*s»" + +#: sequencer.c:2964 +msgid "octopus merge cannot be executed on top of a [new root]" +msgstr "" + +#: sequencer.c:2979 +#, fuzzy, c-format +msgid "could not get commit message of '%s'" +msgstr "no s'ha pogut llegir el missatge de comissió: %s" + +#: sequencer.c:2989 sequencer.c:3015 +#, fuzzy, c-format +msgid "could not write '%s'" +msgstr "no s'ha pogut escriure a «%s»" + +#: sequencer.c:3127 +#, fuzzy, c-format +msgid "could not even attempt to merge '%.*s'" +msgstr "no s'ha pogut obrir o llegir «%s»" + +#: sequencer.c:3143 +#, fuzzy +msgid "merge: Unable to write new index file" +msgstr "%s: No s'ha pogut escriure un fitxer d'índex nou" + +#: sequencer.c:3211 #, c-format msgid "Applied autostash.\n" msgstr "S'ha aplicat el «stash» automàticament.\n" -#: sequencer.c:2509 +#: sequencer.c:3223 #, c-format msgid "cannot store %s" msgstr "no es pot emmagatzemar %s" -#: sequencer.c:2512 git-rebase.sh:178 +#: sequencer.c:3226 git-rebase.sh:188 #, c-format msgid "" "Applying autostash resulted in conflicts.\n" @@ -3656,52 +4770,61 @@ msgstr "" "Els vostres canvis estan segurs en el «stash».\n" "Podeu executar \"git stash pop\" o \"git stash drop\" en qualsevol moment.\n" -#: sequencer.c:2595 +#: sequencer.c:3257 +#, c-format +msgid "" +"Could not execute the todo command\n" +"\n" +" %.*s\n" +"It has been rescheduled; To edit the command before continuing, please\n" +"edit the todo list first:\n" +"\n" +" git rebase --edit-todo\n" +" git rebase --continue\n" +msgstr "" + +#: sequencer.c:3325 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "Aturat a %s... %.*s\n" -#: sequencer.c:2637 +#: sequencer.c:3404 #, c-format msgid "unknown command %d" msgstr "ordre %d desconeguda" -#: sequencer.c:2667 +#: sequencer.c:3449 msgid "could not read orig-head" msgstr "No s'ha pogut llegir orig-head" -#: sequencer.c:2672 sequencer.c:3262 +#: sequencer.c:3454 sequencer.c:4517 msgid "could not read 'onto'" msgstr "no s'ha pogut llegir 'onto'" -#: sequencer.c:2686 +#: sequencer.c:3468 #, c-format msgid "could not update HEAD to %s" msgstr "no s'ha pogut actualitzar HEAD a %s" -#: sequencer.c:2770 +#: sequencer.c:3554 msgid "cannot rebase: You have unstaged changes." msgstr "No es pot fer «rebase»: teniu canvis «unstaged»." -#: sequencer.c:2775 -msgid "could not remove CHERRY_PICK_HEAD" -msgstr "No s'ha pogut eliminar CHERRY_PICK_HEAD" - -#: sequencer.c:2784 +#: sequencer.c:3563 msgid "cannot amend non-existing commit" msgstr "no es pot esmenar una comissió no existent" -#: sequencer.c:2786 +#: sequencer.c:3565 #, c-format msgid "invalid file: '%s'" msgstr "fitxer no vàlid: «%s»" -#: sequencer.c:2788 +#: sequencer.c:3567 #, c-format msgid "invalid contents: '%s'" msgstr "contingut no vàlid: «%s»" -#: sequencer.c:2791 +#: sequencer.c:3570 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -3711,38 +4834,47 @@ msgstr "" "Teniu canvis no comesos en el vostre arbre de treball. \n" "Primer cometeu-los i després executeu 'git rebase --continue' de nou." -#: sequencer.c:2801 +#: sequencer.c:3595 sequencer.c:3633 +#, fuzzy, c-format +msgid "could not write file: '%s'" +msgstr "no s'ha pogut crear el fitxer «%s»" + +#: sequencer.c:3648 +msgid "could not remove CHERRY_PICK_HEAD" +msgstr "No s'ha pogut eliminar CHERRY_PICK_HEAD" + +#: sequencer.c:3655 msgid "could not commit staged changes." msgstr "No s'han pogut cometre els canvis «staged»." -#: sequencer.c:2881 +#: sequencer.c:3752 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: no es pot fer «cherry pick» a %s" -#: sequencer.c:2885 +#: sequencer.c:3756 #, c-format msgid "%s: bad revision" msgstr "%s: revisió incorrecta" -#: sequencer.c:2918 +#: sequencer.c:3791 msgid "can't revert as initial commit" msgstr "no es pot revertir com a comissió inicial" -#: sequencer.c:3023 +#: sequencer.c:4238 msgid "make_script: unhandled options" msgstr "make_script: opcions no gestionades" -#: sequencer.c:3026 +#: sequencer.c:4241 msgid "make_script: error preparing revisions" msgstr "make_script: s'ha produït un error en preparar les revisions" -#: sequencer.c:3060 sequencer.c:3095 +#: sequencer.c:4281 sequencer.c:4337 #, c-format msgid "unusable todo list: '%s'" msgstr "llista per a fer inestable: «%s»" -#: sequencer.c:3146 +#: sequencer.c:4396 #, c-format msgid "" "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." @@ -3750,7 +4882,7 @@ msgstr "" "No s'ha reconegut el paràmetre %s per rebase.missingCommitsCheck. S'està " "ignorant." -#: sequencer.c:3212 +#: sequencer.c:4466 #, c-format msgid "" "Warning: some commits may have been dropped accidentally.\n" @@ -3760,7 +4892,7 @@ msgstr "" "accidentalment.\n" "Les comissions descartades (més nova a més vella):\n" -#: sequencer.c:3219 +#: sequencer.c:4473 #, c-format msgid "" "To avoid this message, use \"drop\" to explicitly remove a commit.\n" @@ -3777,7 +4909,7 @@ msgstr "" "d'advertències.\n" "Els comportaments possibles són: ignore, warn, error.\n" -#: sequencer.c:3231 +#: sequencer.c:4486 #, c-format msgid "" "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" @@ -3787,27 +4919,16 @@ msgstr "" "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 -#, c-format -msgid "could not open '%s' for writing" -msgstr "no s'ha pogut obrir «%s» per a escriptura" - -#: sequencer.c:3285 -#, c-format -msgid "could not parse commit '%s'" -msgstr "no s'ha pogut analitzar la comissió «%s»" - -#: sequencer.c:3401 +#: sequencer.c:4660 msgid "the script was already rearranged." msgstr "l'script ja estava endreçat." -#: setup.c:122 +#: setup.c:123 #, c-format msgid "'%s' is outside repository" msgstr "«%s» és fora del dipòsit" -#: setup.c:171 +#: setup.c:172 #, c-format msgid "" "%s: no such path in the working tree.\n" @@ -3817,7 +4938,7 @@ msgstr "" "Useu 'git <ordre> -- <camí>...' per a especificar camins que no existeixin " "localment." -#: setup.c:184 +#: setup.c:185 #, c-format msgid "" "ambiguous argument '%s': unknown revision or path not in the working tree.\n" @@ -3828,12 +4949,12 @@ msgstr "" "Useu '--' per a separar els camins de les revisions, com això:\n" "'git <ordre> [<revisió>...] -- [<fitxer>...]'" -#: setup.c:233 +#: setup.c:234 #, c-format msgid "option '%s' must come before non-option arguments" msgstr "l'opció «%s» ha de venir abans dels arguments opcionals" -#: setup.c:252 +#: setup.c:253 #, c-format msgid "" "ambiguous argument '%s': both revision and filename\n" @@ -3844,93 +4965,93 @@ msgstr "" "Useu '--' per a separar els camins de les revisions, com això:\n" "'git <ordre> [<revisió>...] -- [<fitxer>...]'" -#: setup.c:388 +#: setup.c:389 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" -#: setup.c:395 +#: setup.c:393 msgid "this operation must be run in a work tree" msgstr "aquesta operació s'ha d'executar en un arbre de treball" -#: setup.c:506 +#: setup.c:503 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "S'esperava una versió de dipòsit de git <= %d, s'ha trobat %d" -#: setup.c:514 +#: setup.c:511 msgid "unknown repository extensions found:" msgstr "s'han trobat extensions de dipòsit desconegudes:" -#: setup.c:533 +#: setup.c:530 #, c-format msgid "error opening '%s'" msgstr "s'ha produït un error en obrir «%s»" -#: setup.c:535 +#: setup.c:532 #, c-format msgid "too large to be a .git file: '%s'" msgstr "massa larg per a ser un fitxer .git: «%s»" -#: setup.c:537 +#: setup.c:534 #, c-format msgid "error reading %s" msgstr "error en llegir %s" -#: setup.c:539 +#: setup.c:536 #, c-format msgid "invalid gitfile format: %s" msgstr "format gitfile no vàlid: %s" -#: setup.c:541 +#: setup.c:538 #, c-format msgid "no path in gitfile: %s" msgstr "sense camí al gitfile: %s" -#: setup.c:543 +#: setup.c:540 #, c-format msgid "not a git repository: %s" msgstr "no és un dipòsit de git: %s" -#: setup.c:642 +#: setup.c:639 #, c-format msgid "'$%s' too big" msgstr "«$%s» massa gran" -#: setup.c:656 +#: setup.c:653 #, c-format msgid "not a git repository: '%s'" msgstr "no és un dipòsit de git: «%s»" -#: setup.c:685 setup.c:687 setup.c:718 +#: setup.c:682 setup.c:684 setup.c:715 #, c-format msgid "cannot chdir to '%s'" msgstr "no es pot canviar de directori a «%s»" -#: 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 "no es pot tornar al directori de treball actual" -#: setup.c:816 +#: setup.c:813 #, c-format msgid "not a git repository (or any of the parent directories): %s" msgstr "no és un dipòsit de git (ni cap dels directoris pares): %s" -#: setup.c:827 +#: setup.c:824 #, c-format msgid "failed to stat '%*s%s%s'" msgstr "s'ha produït un error en fer stat a «%*s%s%s»" -#: setup.c:1057 +#: setup.c:1054 msgid "Unable to read current working directory" msgstr "No s'ha pogut llegir el directori de treball actual" -#: setup.c:1069 setup.c:1075 +#: setup.c:1066 setup.c:1072 #, c-format msgid "cannot change to '%s'" msgstr "no es pot canviar a «%s»" -#: setup.c:1088 +#: setup.c:1085 #, c-format msgid "" "not a git repository (or any parent up to mount point %s)\n" @@ -3940,7 +5061,7 @@ msgstr "" "S'atura a la frontera de sistema de fitxers (GIT_DISCOVERY_ACROSS_FILESYSTEM " "no està establert)." -#: setup.c:1172 +#: setup.c:1168 #, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" @@ -3951,54 +5072,289 @@ msgstr "" "El propietari dels fitxers sempre ha de tenir permisos de lectura i " "escriptura." -#: setup.c:1215 +#: setup.c:1211 msgid "open /dev/null or dup failed" msgstr "s'ha produït un error en obrir /dev/null o dup" -#: setup.c:1230 +#: setup.c:1226 msgid "fork failed" msgstr "el «fork» ha fallat" -#: setup.c:1235 +#: setup.c:1231 msgid "setsid failed" msgstr "l'«stash» ha fallat" -#: sha1_file.c:592 +#: sha1-file.c:381 +#, c-format +msgid "object directory %s does not exist; check .git/objects/info/alternates" +msgstr "" + +#: sha1-file.c:432 +#, fuzzy, c-format +msgid "unable to normalize alternate object path: %s" +msgstr "no s'ha pogut analitzar l'objecte: %s" + +#: sha1-file.c:503 +#, c-format +msgid "%s: ignoring alternate object stores, nesting too deep" +msgstr "" + +#: sha1-file.c:510 +#, fuzzy, c-format +msgid "unable to normalize object directory: %s" +msgstr "no s'ha pogut analitzar l'objecte: %s" + +#: sha1-file.c:565 +#, fuzzy +msgid "unable to fdopen alternates lockfile" +msgstr "no s'han pogut escriure els paràmetres al fitxer de configuració" + +#: sha1-file.c:583 +#, fuzzy +msgid "unable to read alternates file" +msgstr "no es pot llegir el fitxer d'índex" + +#: sha1-file.c:590 +#, fuzzy +msgid "unable to move new alternates file into place" +msgstr "no s'ha pogut escriure un fitxer d'índex nou" + +#: sha1-file.c:625 #, c-format msgid "path '%s' does not exist" msgstr "el camí «%s» no existeix" -#: sha1_file.c:618 +#: sha1-file.c:651 #, 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." -#: sha1_file.c:624 +#: sha1-file.c:657 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "el dipòsit de referència «%s» no és un dipòsit local." -#: sha1_file.c:630 +#: sha1-file.c:663 #, c-format msgid "reference repository '%s' is shallow" msgstr "el dipòsit de referència «%s» és superficial" -#: sha1_file.c:638 +#: sha1-file.c:671 #, c-format msgid "reference repository '%s' is grafted" msgstr "el dipòsit de referència «%s» és empeltat" -#: sha1_name.c:422 +#: sha1-file.c:781 +#, c-format +msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" +msgstr "" + +#: sha1-file.c:806 +#, fuzzy +msgid "mmap failed" +msgstr "%s ha fallat" + +#: sha1-file.c:973 +#, fuzzy, c-format +msgid "object file %s is empty" +msgstr "tipus d'objecte" + +#: sha1-file.c:1093 sha1-file.c:2206 +#, fuzzy, c-format +msgid "corrupt loose object '%s'" +msgstr "no s'ha pogut analitzar l'objecte «%s»" + +#: sha1-file.c:1095 sha1-file.c:2210 +#, fuzzy, c-format +msgid "garbage at end of loose object '%s'" +msgstr "no s'ha pogut analitzar l'objecte: %s" + +#: sha1-file.c:1137 +#, fuzzy +msgid "invalid object type" +msgstr "el tipus d'objecte és incorrecte." + +#: sha1-file.c:1219 +#, c-format +msgid "unable to unpack %s header with --allow-unknown-type" +msgstr "" + +#: sha1-file.c:1222 +#, fuzzy, c-format +msgid "unable to unpack %s header" +msgstr "no s'ha pogut actualitzar %s" + +#: sha1-file.c:1228 +#, c-format +msgid "unable to parse %s header with --allow-unknown-type" +msgstr "" + +#: sha1-file.c:1231 +#, fuzzy, c-format +msgid "unable to parse %s header" +msgstr "no s'ha pogut actualitzar %s" + +#: sha1-file.c:1422 +#, fuzzy, c-format +msgid "failed to read object %s" +msgstr "s'ha produït un error en llegir l'objecte «%s»." + +#: sha1-file.c:1426 +#, fuzzy, c-format +msgid "replacement %s not found for %s" +msgstr "no s'han trobat les plantilles %s" + +#: sha1-file.c:1430 +#, fuzzy, c-format +msgid "loose object %s (stored in %s) is corrupt" +msgstr "l'objecte local %s és malmès" + +#: sha1-file.c:1434 +#, fuzzy, c-format +msgid "packed object %s (stored in %s) is corrupt" +msgstr "l'objecte local %s és malmès" + +#: sha1-file.c:1536 +#, fuzzy, c-format +msgid "unable to write sha1 filename %s" +msgstr "no s'ha pogut escriure el fitxer d'etiqueta" + +#: sha1-file.c:1543 +#, fuzzy, c-format +msgid "unable to set permission to '%s'" +msgstr "no s'ha pogut resoldre la revisió: %s" + +#: sha1-file.c:1550 +#, fuzzy +msgid "file write error" +msgstr "escriptura fallada al rev-list" + +#: sha1-file.c:1569 +#, fuzzy +msgid "error when closing sha1 file" +msgstr "error en tancar el fitxer de paquet" + +#: sha1-file.c:1635 +#, c-format +msgid "insufficient permission for adding an object to repository database %s" +msgstr "" + +#: sha1-file.c:1637 +#, fuzzy +msgid "unable to create temporary file" +msgstr "no s'ha pogut crear un índex temporal" + +#: sha1-file.c:1661 +#, fuzzy +msgid "unable to write sha1 file" +msgstr "no s'ha pogut escriure el fitxer d'etiqueta" + +#: sha1-file.c:1667 +#, fuzzy, c-format +msgid "unable to deflate new object %s (%d)" +msgstr "no s'ha pogut desinflar l'objecte annexat (%d)" + +#: sha1-file.c:1671 +#, fuzzy, c-format +msgid "deflateEnd on object %s failed (%d)" +msgstr "ha fallat fstat a %s" + +#: sha1-file.c:1675 +#, c-format +msgid "confused by unstable object source data for %s" +msgstr "" + +#: sha1-file.c:1685 builtin/pack-objects.c:899 +#, fuzzy, c-format +msgid "failed utime() on %s" +msgstr "s'ha produït un error en obrir «%s»" + +#: sha1-file.c:1760 +#, fuzzy, c-format +msgid "cannot read sha1_file for %s" +msgstr "no es pot llegir $file per a reproducció" + +#: sha1-file.c:1805 +#, fuzzy +msgid "corrupt commit" +msgstr "autor corregit de la comissió" + +#: sha1-file.c:1813 +#, fuzzy +msgid "corrupt tag" +msgstr "informa de les etiquetes" + +#: sha1-file.c:1906 +#, fuzzy, c-format +msgid "read error while indexing %s" +msgstr "error en llegir %s" + +#: sha1-file.c:1909 +#, fuzzy, c-format +msgid "short read while indexing %s" +msgstr "no es pot llegir l'índex" + +#: sha1-file.c:1980 sha1-file.c:1989 +#, fuzzy, c-format +msgid "%s: failed to insert into database" +msgstr "gpg ha fallat en signar les dades" + +#: sha1-file.c:1995 +#, fuzzy, c-format +msgid "%s: unsupported file type" +msgstr "versió d'índex no compatible %s" + +#: sha1-file.c:2019 +#, fuzzy, c-format +msgid "%s is not a valid object" +msgstr "«%s» no és una terme vàlid" + +#: sha1-file.c:2021 +#, fuzzy, c-format +msgid "%s is not a valid '%s' object" +msgstr "«%s» no és una terme vàlid" + +#: sha1-file.c:2048 builtin/index-pack.c:158 +#, c-format +msgid "unable to open %s" +msgstr "no s'ha pogut obrir %s" + +#: sha1-file.c:2217 sha1-file.c:2269 +#, c-format +msgid "sha1 mismatch for %s (expected %s)" +msgstr "" + +#: sha1-file.c:2241 +#, fuzzy, c-format +msgid "unable to mmap %s" +msgstr "no s'ha pogut obrir %s" + +#: sha1-file.c:2246 +#, fuzzy, c-format +msgid "unable to unpack header of %s" +msgstr "no s'ha pogut actualitzar %s" + +#: sha1-file.c:2252 +#, fuzzy, c-format +msgid "unable to parse header of %s" +msgstr "no s'ha pogut llegir %s" + +#: sha1-file.c:2263 +#, fuzzy, c-format +msgid "unable to unpack contents of %s" +msgstr "no s'ha pogut analitzar el contacte: %s" + +#: sha1-name.c:444 #, c-format msgid "short SHA1 %s is ambiguous" msgstr "l'SHA1 %s curt és ambigu" -#: sha1_name.c:433 +#: sha1-name.c:455 msgid "The candidates are:" msgstr "Els candidats són:" -#: sha1_name.c:693 +#: sha1-name.c:699 msgid "" "Git normally never creates a ref that ends with 40 hex characters\n" "because it will be ignored when you just specify 40-hex. These refs\n" @@ -4022,71 +5378,81 @@ msgstr "" "suprimiu-les. Desactiveu aquest missatge executant\n" "«git config advice.objectNameWarning false»" -#: submodule.c:96 submodule.c:130 +#: submodule.c:97 submodule.c:131 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" "No es pot canviar un .gitmodules no fusionat, primer resoleu els conflictes " "de fusió" -#: 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 "No s'ha pogut trobar la secció en .gitmodules on path=%s" -#: submodule.c:108 +#: submodule.c:109 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "No s'ha pogut actualitzar l'entrada de .gitmodules %s" -#: submodule.c:141 +#: submodule.c:142 #, c-format msgid "Could not remove .gitmodules entry for %s" msgstr "No s'ha pogut eliminar l'entrada de .gitmodules per a %s" -#: submodule.c:152 +#: submodule.c:153 msgid "staging updated .gitmodules failed" msgstr "l'allistament del .gitmodules actualitzat ha fallat" -#: submodule.c:312 +#: submodule.c:315 #, c-format msgid "in unpopulated submodule '%s'" msgstr "al submòdul no populat «%s»" -#: submodule.c:343 +#: submodule.c:346 #, c-format msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "L'especificació «%s» és en el submòdul «%.*s»" -#: submodule.c:833 +#: submodule.c:839 #, c-format msgid "submodule entry '%s' (%s) is a %s, not a commit" msgstr "l'entrada del submòdul «%s» (%s) és a %s, no és una comissió" -#: submodule.c:1065 builtin/branch.c:648 builtin/submodule--helper.c:1724 +#: submodule.c:1071 builtin/branch.c:670 builtin/submodule--helper.c:1888 msgid "Failed to resolve HEAD as a valid ref." msgstr "S'ha produït un error en resoldre HEAD com a referència vàlida." -#: submodule.c:1370 +#: submodule.c:1377 #, c-format msgid "'%s' not recognized as a git repository" msgstr "«%s» no reconegut com un dipòsit git" -#: submodule.c:1508 +#: submodule.c:1515 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "no s'ha pogut iniciar «git status» al submòdul «%s»" -#: submodule.c:1521 +#: submodule.c:1528 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "no s'ha pogut executar 'git status' al submòdul «%s»" -#: submodule.c:1614 +#: submodule.c:1543 +#, fuzzy, c-format +msgid "Could not unset core.worktree setting in submodule '%s'" +msgstr "no s'ha pogut executar 'git status' al submòdul «%s»" + +#: submodule.c:1633 #, c-format msgid "submodule '%s' has dirty index" msgstr "el submòdul «%s» té l'índex brut" -#: submodule.c:1878 +#: submodule.c:1685 +#, fuzzy, c-format +msgid "Submodule '%s' could not be updated." +msgstr "Submòduls canviats però no actualitzats:" + +#: submodule.c:1734 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" @@ -4094,18 +5460,18 @@ 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 +#: submodule.c:1746 submodule.c:1802 #, 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:1750 builtin/submodule--helper.c:1406 +#: builtin/submodule--helper.c:1416 #, c-format msgid "could not create directory '%s'" msgstr "no s'ha pogut crear el directori «%s»" -#: submodule.c:1897 +#: submodule.c:1753 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -4116,29 +5482,30 @@ msgstr "" "«%s» a\n" "«%s»\n" -#: submodule.c:1981 +#: submodule.c:1837 #, c-format msgid "could not recurse into submodule '%s'" msgstr "s'ha produït un error en cercar recursivament al camí de submòdul «%s»" -#: submodule.c:2025 +#: submodule.c:1881 msgid "could not start ls-files in .." msgstr "no s'ha pogut iniciar ls-files a .." -#: submodule.c:2045 -msgid "BUG: returned path string doesn't match cwd?" -msgstr "ERRADA: la cadena del camí retornada no coincideix amb cwd?" - -#: submodule.c:2064 +#: submodule.c:1920 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree ha retornat un codi de retorn %d no esperat" -#: submodule-config.c:263 +#: submodule-config.c:231 +#, fuzzy, c-format +msgid "ignoring suspicious submodule name: %s" +msgstr "s'està ignorant la referència amb nom malmès %s" + +#: submodule-config.c:295 msgid "negative values not allowed for submodule.fetchjobs" msgstr "no es permeten els valors negatius a submodule.fetchjobs" -#: submodule-config.c:436 +#: submodule-config.c:468 #, c-format msgid "invalid value for %s" msgstr "valor no vàlid per a %s" @@ -4154,7 +5521,7 @@ msgstr "l'execució de l'ordre de remolc «%s» ha fallat" msgid "unknown value '%s' for key '%s'" msgstr "valor desconegut «%s» per a la clau «%s»" -#: trailer.c:539 trailer.c:544 builtin/remote.c:290 +#: trailer.c:539 trailer.c:544 builtin/remote.c:294 #, c-format msgid "more than one %s" msgstr "més d'un %s" @@ -4173,7 +5540,7 @@ msgstr "no s'ha pogut llegir el fitxer d'entrada «%s»" msgid "could not read from stdin" msgstr "no s'ha pogut llegir des de stdin" -#: trailer.c:1008 builtin/am.c:46 +#: trailer.c:1008 builtin/am.c:47 #, c-format msgid "could not stat %s" msgstr "no s'ha pogut fer stat a %s" @@ -4197,17 +5564,45 @@ msgstr "no s'ha pogut obrir el fitxer temporal" msgid "could not rename temporary file to %s" msgstr "no s'ha pogut canviar el nom del fitxer temporal a %s" -#: transport.c:63 +#: transport.c:116 #, c-format msgid "Would set upstream of '%s' to '%s' of '%s'\n" msgstr "Canviaria la font de «%s» a «%s» de «%s»\n" -#: transport.c:152 +#: transport.c:142 +#, fuzzy, c-format +msgid "could not read bundle '%s'" +msgstr "no s'ha pogut llegir el fitxer «%s»" + +#: transport.c:208 #, c-format msgid "transport: invalid depth option '%s'" msgstr "transport: opció de profunditat no vàlida «%s»" -#: transport.c:916 +#: transport.c:586 +#, fuzzy +msgid "could not parse transport.color.* config" +msgstr "no s'ha pogut analitzar l'script d'autor" + +#: transport.c:659 +msgid "support for protocol v2 not implemented yet" +msgstr "" + +#: transport.c:785 +#, fuzzy, c-format +msgid "unknown value for config '%s': %s" +msgstr "valor desconegut «%s» per a la clau «%s»" + +#: transport.c:851 +#, fuzzy, c-format +msgid "transport '%s' not allowed" +msgstr "no s'ha trobat la branca «%s»." + +#: transport.c:903 +msgid "git-over-rsync is no longer supported" +msgstr "" + +#: transport.c:998 #, c-format msgid "" "The following submodule paths contain changes that can\n" @@ -4216,7 +5611,7 @@ msgstr "" "Els camins de submòdul següents contenen canvis que no\n" "es poden trobar en cap remot:\n" -#: transport.c:920 +#: transport.c:1002 #, c-format msgid "" "\n" @@ -4242,32 +5637,211 @@ msgstr "" "\n" "per a pujar-los a un remot.\n" -#: transport.c:928 +#: transport.c:1010 msgid "Aborting." msgstr "S'està avortant." -#: transport-helper.c:1079 +#: transport.c:1148 +#, fuzzy +msgid "failed to push all needed submodules" +msgstr "s'ha produït un error en cercar recursivament al submòdul «%s»" + +#: transport.c:1270 transport-helper.c:643 +#, fuzzy +msgid "operation not supported by protocol" +msgstr "opció no admesa amb --recurse-submodules." + +#: transport.c:1352 +#, c-format +msgid "invalid line while parsing alternate refs: %s" +msgstr "" + +#: transport-helper.c:51 transport-helper.c:80 +#, fuzzy +msgid "full write to remote helper failed" +msgstr "imprimeix l'estat des de l'ajudant remot" + +#: transport-helper.c:132 +#, fuzzy, c-format +msgid "unable to find remote helper for '%s'" +msgstr "No s'ha pogut afegir el resultat de fusió per a «%s»" + +#: transport-helper.c:148 transport-helper.c:557 +msgid "can't dup helper output fd" +msgstr "" + +#: transport-helper.c:199 +#, c-format +msgid "" +"unknown mandatory capability %s; this remote helper probably needs newer " +"version of Git" +msgstr "" + +#: transport-helper.c:205 +msgid "this remote helper should implement refspec capability" +msgstr "" + +#: transport-helper.c:272 transport-helper.c:412 +#, fuzzy, c-format +msgid "%s unexpectedly said: '%s'" +msgstr "blob esperat per a %s «%s»" + +#: transport-helper.c:401 #, c-format -msgid "Could not read ref %s" +msgid "%s also locked %s" +msgstr "%s també ha bloquejat %s" + +#: transport-helper.c:479 +#, fuzzy +msgid "couldn't run fast-import" +msgstr "no s'ha pogut executar «stash»." + +#: transport-helper.c:502 +#, fuzzy +msgid "error while running fast-import" +msgstr "error en tancar el fitxer de paquet" + +#: transport-helper.c:531 transport-helper.c:1091 +#, fuzzy, c-format +msgid "could not read ref %s" msgstr "No s'ha pogut llegir la referència %s" -#: tree-walk.c:31 +#: transport-helper.c:576 +#, fuzzy, c-format +msgid "unknown response to connect: %s" +msgstr "opció desconeguda: %s\n" + +#: transport-helper.c:598 +msgid "setting remote service path not supported by protocol" +msgstr "" + +#: transport-helper.c:600 +#, fuzzy +msgid "invalid remote service path" +msgstr "referència no vàlida: %s" + +#: transport-helper.c:646 +#, c-format +msgid "can't connect to subservice %s" +msgstr "" + +#: transport-helper.c:713 +#, fuzzy, c-format +msgid "expected ok/error, helper said '%s'" +msgstr "blob esperat per a %s «%s»" + +#: transport-helper.c:766 +#, fuzzy, c-format +msgid "helper reported unexpected status of %s" +msgstr "ls-tree ha retornat un codi de retorn %d no esperat" + +#: transport-helper.c:827 +#, fuzzy, c-format +msgid "helper %s does not support dry-run" +msgstr "El servidor no admet --deepen" + +#: transport-helper.c:830 +#, fuzzy, c-format +msgid "helper %s does not support --signed" +msgstr "El servidor no admet --shallow-since" + +#: transport-helper.c:833 +#, fuzzy, c-format +msgid "helper %s does not support --signed=if-asked" +msgstr "el destí receptor no admet pujar --signed" + +#: transport-helper.c:840 +#, fuzzy, c-format +msgid "helper %s does not support 'push-option'" +msgstr "el destí receptor no admet opcions de pujada" + +#: transport-helper.c:932 +msgid "remote-helper doesn't support push; refspec needed" +msgstr "" + +#: transport-helper.c:937 +#, fuzzy, c-format +msgid "helper %s does not support 'force'" +msgstr "El servidor no admet --deepen" + +#: transport-helper.c:984 +#, fuzzy +msgid "couldn't run fast-export" +msgstr "no s'ha pogut executar «stash»." + +#: transport-helper.c:989 +#, fuzzy +msgid "error while running fast-export" +msgstr "error en tancar el fitxer de paquet" + +#: transport-helper.c:1014 +#, c-format +msgid "" +"No refs in common and none specified; doing nothing.\n" +"Perhaps you should specify a branch such as 'master'.\n" +msgstr "" + +#: transport-helper.c:1077 +#, fuzzy, c-format +msgid "malformed response in ref list: %s" +msgstr "full d'opcions mal format: «%s»" + +#: transport-helper.c:1230 +#, fuzzy, c-format +msgid "read(%s) failed" +msgstr "%s ha fallat" + +#: transport-helper.c:1257 +#, fuzzy, c-format +msgid "write(%s) failed" +msgstr "%s ha fallat" + +#: transport-helper.c:1306 +#, fuzzy, c-format +msgid "%s thread failed" +msgstr "%s ha fallat" + +#: transport-helper.c:1310 +#, fuzzy, c-format +msgid "%s thread failed to join: %s" +msgstr "s'ha produït un error en obrir «%s»" + +#: transport-helper.c:1329 transport-helper.c:1333 +#, c-format +msgid "can't start thread for copying data: %s" +msgstr "" + +#: transport-helper.c:1370 +#, c-format +msgid "%s process failed to wait" +msgstr "" + +#: transport-helper.c:1374 +#, fuzzy, c-format +msgid "%s process failed" +msgstr "%s ha fallat" + +#: transport-helper.c:1392 transport-helper.c:1401 +msgid "can't start thread for copying data" +msgstr "" + +#: tree-walk.c:33 msgid "too-short tree object" msgstr "objecte d'arbre massa curt" -#: tree-walk.c:37 +#: tree-walk.c:39 msgid "malformed mode in tree entry" msgstr "mode mal format en entrada d'arbre" -#: tree-walk.c:41 +#: tree-walk.c:43 msgid "empty filename in tree entry" msgstr "nom de fitxer buit en una entrada d'arbre" -#: tree-walk.c:114 +#: tree-walk.c:115 msgid "too-short tree file" msgstr "fitxer d'arbre massa curt" -#: unpack-trees.c:108 +#: unpack-trees.c:112 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -4277,7 +5851,7 @@ msgstr "" "agafar:\n" "%%sCometeu els vostres canvis o feu «stash» abans de canviar de branca." -#: unpack-trees.c:110 +#: unpack-trees.c:114 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -4287,7 +5861,7 @@ msgstr "" "agafar:\n" "%%s" -#: unpack-trees.c:113 +#: unpack-trees.c:117 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -4297,7 +5871,7 @@ msgstr "" "fusionar:\n" "%%sCometeu els vostres canvis o feu «stash» abans de fusionar." -#: unpack-trees.c:115 +#: unpack-trees.c:119 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -4307,7 +5881,7 @@ msgstr "" "fusionar:\n" "%%s" -#: unpack-trees.c:118 +#: unpack-trees.c:122 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -4316,7 +5890,7 @@ msgstr "" "Els vostres canvis locals als fitxers següents se sobreescriurien per %s:\n" "%%sCometeu els vostres canvis o feu «stash» abans de %s." -#: unpack-trees.c:120 +#: unpack-trees.c:124 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -4325,7 +5899,7 @@ msgstr "" "Els vostres canvis locals als fitxers següents se sobreescriurien per %s:\n" "%%s" -#: unpack-trees.c:125 +#: unpack-trees.c:129 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" @@ -4334,7 +5908,7 @@ msgstr "" "En actualitzar els directoris següents perdria fitxers no seguits en el:\n" "%s" -#: unpack-trees.c:129 +#: unpack-trees.c:133 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -4344,7 +5918,7 @@ msgstr "" "agafar:\n" "%%sMoveu-los o elimineu-los abans de canviar de branca." -#: unpack-trees.c:131 +#: unpack-trees.c:135 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -4354,7 +5928,7 @@ msgstr "" "agafar:\n" "%%s" -#: unpack-trees.c:134 +#: unpack-trees.c:138 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -4364,7 +5938,7 @@ msgstr "" "fusionar:\n" "%%sMoveu-los o elimineu-los abans de fusionar." -#: unpack-trees.c:136 +#: unpack-trees.c:140 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -4374,7 +5948,7 @@ msgstr "" "fusionar:\n" "%%s" -#: unpack-trees.c:139 +#: unpack-trees.c:143 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -4383,7 +5957,7 @@ msgstr "" "Els següents fitxers no seguits en l'arbre de treball s'eliminarien per %s:\n" "%%sMoveu-los o elimineu-los abans de %s." -#: unpack-trees.c:141 +#: unpack-trees.c:145 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -4392,7 +5966,7 @@ msgstr "" "Els següents fitxers no seguits en l'arbre de treball s'eliminarien per %s:\n" "%%s" -#: unpack-trees.c:146 +#: unpack-trees.c:151 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -4403,7 +5977,7 @@ msgstr "" "agafar:\n" "%%sMoveu-los o elimineu-los abans de canviar de branca." -#: unpack-trees.c:148 +#: unpack-trees.c:153 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -4414,7 +5988,7 @@ msgstr "" "agafar:\n" "%%s" -#: unpack-trees.c:151 +#: unpack-trees.c:156 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -4424,7 +5998,7 @@ msgstr "" "fusionar:\n" "%%sMoveu-los o elimineu-los abans de fusionar." -#: unpack-trees.c:153 +#: unpack-trees.c:158 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -4434,7 +6008,7 @@ msgstr "" "fusionar:\n" "%%s" -#: unpack-trees.c:156 +#: unpack-trees.c:161 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -4444,7 +6018,7 @@ msgstr "" "%s:\n" "%%sMoveu-los o elimineu-los abans de %s." -#: unpack-trees.c:158 +#: unpack-trees.c:163 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -4454,12 +6028,12 @@ msgstr "" "%s:\n" "%%s" -#: unpack-trees.c:165 +#: unpack-trees.c:171 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "L'entrada «%s» encavalca amb «%s». No es pot vincular." -#: unpack-trees.c:168 +#: unpack-trees.c:174 #, c-format msgid "" "Cannot update sparse checkout: the following entries are not up to date:\n" @@ -4469,7 +6043,7 @@ msgstr "" "dia:\n" "%s" -#: unpack-trees.c:170 +#: unpack-trees.c:176 #, c-format msgid "" "The following working tree files would be overwritten by sparse checkout " @@ -4480,7 +6054,7 @@ msgstr "" "actualitzar l'agafament parcial:\n" "%s" -#: unpack-trees.c:172 +#: unpack-trees.c:178 #, c-format msgid "" "The following working tree files would be removed by sparse checkout " @@ -4491,7 +6065,7 @@ msgstr "" "l'agafament parcial:\n" "%s" -#: unpack-trees.c:174 +#: unpack-trees.c:180 #, c-format msgid "" "Cannot update submodule:\n" @@ -4500,12 +6074,12 @@ msgstr "" "No es pot actualitzar el submòdul:\n" "%s" -#: unpack-trees.c:251 +#: unpack-trees.c:254 #, c-format msgid "Aborting\n" msgstr "S'està avortant\n" -#: unpack-trees.c:333 +#: unpack-trees.c:336 msgid "Checking out files" msgstr "S'estan agafant fitxers" @@ -4573,8 +6147,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:321 builtin/am.c:771 +#: builtin/am.c:863 builtin/merge.c:1078 #, c-format msgid "could not open '%s' for reading" msgstr "no s'ha pogut obrir «%s» per a lectura" @@ -4588,155 +6162,155 @@ msgstr "no s'ha pogut accedir a «%s»" msgid "unable to get current working directory" msgstr "no s'ha pogut obtenir el directori de treball actual" -#: wt-status.c:151 +#: wt-status.c:154 msgid "Unmerged paths:" msgstr "Camins sense fusionar:" -#: wt-status.c:178 wt-status.c:205 +#: wt-status.c:181 wt-status.c:208 #, c-format msgid " (use \"git reset %s <file>...\" to unstage)" msgstr " (useu \"git reset %s <fitxer>...\" per a fer «unstage»)" -#: wt-status.c:180 wt-status.c:207 +#: wt-status.c:183 wt-status.c:210 msgid " (use \"git rm --cached <file>...\" to unstage)" msgstr " (useu \"git rm --cached <fitxer>...\" per a fer «unstage»)" -#: wt-status.c:184 +#: wt-status.c:187 msgid " (use \"git add <file>...\" to mark resolution)" msgstr " (useu \"git add <fitxer>...\" per a senyalar resolució)" -#: wt-status.c:186 wt-status.c:190 +#: wt-status.c:189 wt-status.c:193 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr "" " (useu \"git add/rm <fitxer>...\" segons sigui apropiat per a senyalar " "resolució)" -#: wt-status.c:188 +#: wt-status.c:191 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (useu \"git rm <fitxer>...\" per a senyalar resolució)" -#: wt-status.c:199 wt-status.c:1007 +#: wt-status.c:202 wt-status.c:1015 msgid "Changes to be committed:" msgstr "Canvis a cometre:" -#: wt-status.c:217 wt-status.c:1016 +#: wt-status.c:220 wt-status.c:1024 msgid "Changes not staged for commit:" msgstr "Canvis no «staged» per a cometre:" -#: wt-status.c:221 +#: wt-status.c:224 msgid " (use \"git add <file>...\" to update what will be committed)" msgstr " (useu \"git add <fitxer>...\" per a actualitzar què es cometrà)" -#: wt-status.c:223 +#: wt-status.c:226 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr " (useu \"git add/rm <fitxer>...\" per a actualitzar què es cometrà)" -#: wt-status.c:224 +#: wt-status.c:227 msgid "" " (use \"git checkout -- <file>...\" to discard changes in working directory)" msgstr "" " (useu \"git checkout -- <fitxer>...\" per a descartar els canvis en el " "directori de treball)" -#: wt-status.c:226 +#: wt-status.c:229 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)" -#: wt-status.c:238 +#: wt-status.c:241 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr "" " (useu \"git %s <fitxer>...\" per a incloure-ho en el qual es cometrà)" -#: wt-status.c:253 +#: wt-status.c:256 msgid "both deleted:" msgstr "suprimit per ambdós:" -#: wt-status.c:255 +#: wt-status.c:258 msgid "added by us:" msgstr "afegit per nosaltres:" -#: wt-status.c:257 +#: wt-status.c:260 msgid "deleted by them:" msgstr "suprimit per ells:" -#: wt-status.c:259 +#: wt-status.c:262 msgid "added by them:" msgstr "afegit per ells:" -#: wt-status.c:261 +#: wt-status.c:264 msgid "deleted by us:" msgstr "suprimit per nosaltres:" -#: wt-status.c:263 +#: wt-status.c:266 msgid "both added:" msgstr "afegit per ambdós:" -#: wt-status.c:265 +#: wt-status.c:268 msgid "both modified:" msgstr "modificat per ambdós:" -#: wt-status.c:275 +#: wt-status.c:278 msgid "new file:" msgstr "fitxer nou:" -#: wt-status.c:277 +#: wt-status.c:280 msgid "copied:" msgstr "copiat:" -#: wt-status.c:279 +#: wt-status.c:282 msgid "deleted:" msgstr "suprimit:" -#: wt-status.c:281 +#: wt-status.c:284 msgid "modified:" msgstr "modificat:" -#: wt-status.c:283 +#: wt-status.c:286 msgid "renamed:" msgstr "canviat de nom:" -#: wt-status.c:285 +#: wt-status.c:288 msgid "typechange:" msgstr "canviat de tipus:" -#: wt-status.c:287 +#: wt-status.c:290 msgid "unknown:" msgstr "desconegut:" -#: wt-status.c:289 +#: wt-status.c:292 msgid "unmerged:" msgstr "sense fusionar:" -#: wt-status.c:369 +#: wt-status.c:372 msgid "new commits, " msgstr "comissions noves, " -#: wt-status.c:371 +#: wt-status.c:374 msgid "modified content, " msgstr "contingut modificat, " -#: wt-status.c:373 +#: wt-status.c:376 msgid "untracked content, " msgstr "contingut no seguit, " -#: 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] "L'«stash» té actualment %d entrada" msgstr[1] "L'«stash» té actualment %d entrades" -#: wt-status.c:879 +#: wt-status.c:885 msgid "Submodules changed but not updated:" msgstr "Submòduls canviats però no actualitzats:" -#: wt-status.c:881 +#: wt-status.c:887 msgid "Submodule changes to be committed:" msgstr "Canvis de submòdul a cometre:" -#: wt-status.c:963 +#: wt-status.c:969 msgid "" "Do not modify or remove the line above.\n" "Everything below it will be ignored." @@ -4744,109 +6318,109 @@ msgstr "" "No modifiqueu o suprimiu la línia de dalt.\n" "Tot el que hi ha a sota s'ignorarà." -#: wt-status.c:1076 +#: wt-status.c:1084 msgid "You have unmerged paths." msgstr "Teniu camins sense fusionar." -#: wt-status.c:1079 +#: wt-status.c:1087 msgid " (fix conflicts and run \"git commit\")" msgstr " (arregleu els conflictes i executeu \"git commit\")" -#: wt-status.c:1081 +#: wt-status.c:1089 msgid " (use \"git merge --abort\" to abort the merge)" msgstr " (useu \"git merge --abort\" per a avortar la fusió)" -#: wt-status.c:1086 +#: wt-status.c:1094 msgid "All conflicts fixed but you are still merging." msgstr "Tots els conflictes estan arreglats però encara esteu fusionant." -#: wt-status.c:1089 +#: wt-status.c:1097 msgid " (use \"git commit\" to conclude merge)" msgstr " (useu \"git commit\" per a concloure la fusió)" -#: wt-status.c:1099 +#: wt-status.c:1107 msgid "You are in the middle of an am session." msgstr "Esteu enmig d'una sessió am." -#: wt-status.c:1102 +#: wt-status.c:1110 msgid "The current patch is empty." msgstr "El pedaç actual està buit." -#: wt-status.c:1106 +#: wt-status.c:1114 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (arregleu els conflictes i després executeu \"git am --continue\")" -#: wt-status.c:1108 +#: wt-status.c:1116 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (useu \"git am --skip\" per a ometre aquest pedaç)" -#: wt-status.c:1110 +#: wt-status.c:1118 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (useu \"git am --abort\" per a restaurar la branca original)" -#: wt-status.c:1242 +#: wt-status.c:1250 msgid "git-rebase-todo is missing." msgstr "Manca git-rebase-todo." -#: wt-status.c:1244 +#: wt-status.c:1252 msgid "No commands done." msgstr "No s'ha fet cap ordre." -#: 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] "Última ordre feta (%d ordre feta):" msgstr[1] "Últimes ordres fetes (%d ordres fetes):" -#: wt-status.c:1258 +#: wt-status.c:1266 #, c-format msgid " (see more in file %s)" msgstr " (vegeu més en el fitxer %s)" -#: wt-status.c:1263 +#: wt-status.c:1271 msgid "No commands remaining." msgstr "No manca cap ordre." -#: 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] "Ordre següent a fer (manca %d ordre):" msgstr[1] "Ordres següents a fer (manquen %d ordres):" -#: wt-status.c:1274 +#: wt-status.c:1282 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr " (useu \"git rebase --edit-todo\" per a veure i editar)" -#: wt-status.c:1287 +#: wt-status.c:1295 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "Actualment esteu fent «rebase» de la branca «%s» en «%s»." -#: wt-status.c:1292 +#: wt-status.c:1300 msgid "You are currently rebasing." msgstr "Actualment esteu fent «rebase»." -#: wt-status.c:1306 +#: wt-status.c:1314 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr "" " (arregleu els conflictes i després executeu \"git rebase --continue\")" -#: wt-status.c:1308 +#: wt-status.c:1316 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (useu \"git rebase --skip\" per a ometre aquest pedaç)" -#: wt-status.c:1310 +#: wt-status.c:1318 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " (useu \"git rebase --abort\" per a agafar la branca original)" -#: wt-status.c:1316 +#: wt-status.c:1324 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr "" " (tots els conflictes estan arreglats: executeu \"git rebase --continue\")" -#: wt-status.c:1320 +#: wt-status.c:1328 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." @@ -4854,132 +6428,132 @@ msgstr "" "Actualment esteu dividint una comissió mentre es fa «rebase» de la branca " "«%s» en «%s»." -#: wt-status.c:1325 +#: wt-status.c:1333 msgid "You are currently splitting a commit during a rebase." msgstr "Actualment esteu dividint una comissió durant un «rebase»." -#: wt-status.c:1328 +#: wt-status.c:1336 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\")" -#: wt-status.c:1332 +#: wt-status.c:1340 #, 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»." -#: wt-status.c:1337 +#: wt-status.c:1345 msgid "You are currently editing a commit during a rebase." msgstr "Actualment esteu editant una comissió durant un «rebase»." -#: wt-status.c:1340 +#: wt-status.c:1348 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 +#: wt-status.c:1350 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)" -#: wt-status.c:1352 +#: wt-status.c:1360 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "Actualment esteu fent «cherry pick» a la comissió %s." -#: wt-status.c:1357 +#: wt-status.c:1365 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (arregleu els conflictes i executeu \"git cherry-pick --continue\")" -#: wt-status.c:1360 +#: wt-status.c:1368 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr "" " (tots els conflictes estan arreglats: executeu \"git cherry-pick --continue" "\")" -#: wt-status.c:1362 +#: wt-status.c:1370 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»)" -#: wt-status.c:1371 +#: wt-status.c:1379 #, c-format msgid "You are currently reverting commit %s." msgstr "Actualment esteu revertint la comissió %s." -#: wt-status.c:1376 +#: wt-status.c:1384 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (arregleu els conflictes i executeu \"git revert --continue\")" -#: wt-status.c:1379 +#: wt-status.c:1387 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr "" " (tots els conflictes estan arreglats: executeu \"git revert --continue\")" -#: wt-status.c:1381 +#: wt-status.c:1389 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr "" " (useu \"git revert --abort\" per a cancel·lar l'operació de reversió)" -#: wt-status.c:1392 +#: wt-status.c:1400 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "Actualment esteu bisecant, heu començat des de la branca «%s»." -#: wt-status.c:1396 +#: wt-status.c:1404 msgid "You are currently bisecting." msgstr "Actualment esteu bisecant." -#: wt-status.c:1399 +#: wt-status.c:1407 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " (useu \"git bisect reset\" per a tornar a la branca original)" -#: wt-status.c:1596 +#: wt-status.c:1604 msgid "On branch " msgstr "En la branca " -#: wt-status.c:1602 +#: wt-status.c:1610 msgid "interactive rebase in progress; onto " msgstr "«rebase» interactiu en curs; sobre " -#: wt-status.c:1604 +#: wt-status.c:1612 msgid "rebase in progress; onto " msgstr "«rebase» en curs; sobre " -#: wt-status.c:1609 +#: wt-status.c:1617 msgid "HEAD detached at " msgstr "HEAD separat a " -#: wt-status.c:1611 +#: wt-status.c:1619 msgid "HEAD detached from " msgstr "HEAD separat de " -#: wt-status.c:1614 +#: wt-status.c:1622 msgid "Not currently on any branch." msgstr "Actualment no s'és en cap branca." -#: wt-status.c:1634 +#: wt-status.c:1642 msgid "Initial commit" msgstr "Comissió inicial" -#: wt-status.c:1635 +#: wt-status.c:1643 msgid "No commits yet" msgstr "No s'ha fet cap comissió encara." -#: wt-status.c:1649 +#: wt-status.c:1657 msgid "Untracked files" msgstr "Fitxers no seguits" -#: wt-status.c:1651 +#: wt-status.c:1659 msgid "Ignored files" msgstr "Fitxers ignorats" -#: wt-status.c:1655 +#: wt-status.c:1663 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -4991,31 +6565,31 @@ msgstr "" "oblidar-vos d'afegir fitxers nous vosaltres mateixos (vegeu\n" "'git help status')." -#: wt-status.c:1661 +#: wt-status.c:1669 #, c-format msgid "Untracked files not listed%s" msgstr "Els fitxers no seguits no estan llistats%s" -#: wt-status.c:1663 +#: wt-status.c:1671 msgid " (use -u option to show untracked files)" msgstr " (useu l'opció -u per a mostrar els fitxers no seguits)" -#: wt-status.c:1669 +#: wt-status.c:1677 msgid "No changes" msgstr "Sense canvis" -#: 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 "" "no hi ha canvis afegits a cometre (useu \"git add\" o \"git commit -a\")\n" -#: wt-status.c:1677 +#: wt-status.c:1685 #, c-format msgid "no changes added to commit\n" msgstr "no hi ha canvis afegits a cometre\n" -#: wt-status.c:1680 +#: wt-status.c:1688 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -5024,70 +6598,70 @@ msgstr "" "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 +#: wt-status.c:1691 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "no hi ha res afegit a cometre però hi ha fitxers no seguits\n" -#: wt-status.c:1686 +#: wt-status.c:1694 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" "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 +#: wt-status.c:1697 wt-status.c:1702 #, c-format msgid "nothing to commit\n" msgstr "no hi ha res a cometre\n" -#: wt-status.c:1692 +#: wt-status.c:1700 #, 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" -#: wt-status.c:1696 +#: wt-status.c:1704 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "no hi ha res a cometre, l'arbre de treball està net\n" -#: wt-status.c:1809 +#: wt-status.c:1817 msgid "No commits yet on " msgstr "No s'ha fet cap comissió encara a " -#: wt-status.c:1813 +#: wt-status.c:1821 msgid "HEAD (no branch)" msgstr "HEAD (sense branca)" -#: wt-status.c:1844 +#: wt-status.c:1852 msgid "different" msgstr "diferent" -#: wt-status.c:1846 wt-status.c:1854 +#: wt-status.c:1854 wt-status.c:1862 msgid "behind " msgstr "darrere " -#: wt-status.c:1849 wt-status.c:1852 +#: wt-status.c:1857 wt-status.c:1860 msgid "ahead " msgstr "davant per " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2358 +#: wt-status.c:2376 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "no es pot %s: Teniu canvis «unstaged»." -#: wt-status.c:2364 +#: wt-status.c:2382 msgid "additionally, your index contains uncommitted changes." msgstr "addicionalment, el vostre índex conté canvis sense cometre." -#: wt-status.c:2366 +#: wt-status.c:2384 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "no es pot %s: El vostre índex conté canvis sense cometre." -#: compat/precompose_utf8.c:58 builtin/clone.c:440 +#: compat/precompose_utf8.c:58 builtin/clone.c:443 #, c-format msgid "failed to unlink '%s'" msgstr "s'ha produït un error en desenllaçar «%s»" @@ -5101,7 +6675,7 @@ msgstr "git add [<opcions>] [--] <especificació-de-camí>..." msgid "unexpected diff status %c" msgstr "estat de diff inesperat %c" -#: builtin/add.c:88 builtin/commit.c:257 +#: builtin/add.c:88 builtin/commit.c:279 msgid "updating files failed" msgstr "s'ha produït un error en actualitzar els fitxers" @@ -5114,7 +6688,7 @@ msgstr "elimina «%s»\n" msgid "Unstaged changes after refreshing the index:" msgstr "Canvis «unstaged» després d'actualitzar l'índex:" -#: builtin/add.c:233 builtin/rev-parse.c:888 +#: builtin/add.c:233 builtin/rev-parse.c:893 msgid "Could not read the index" msgstr "No s'ha pogut llegir l'índex" @@ -5145,80 +6719,76 @@ msgstr "El pedaç és buit. S'ha avortat." msgid "Could not apply '%s'" msgstr "No s'ha pogut aplicar «%s»" -#: builtin/add.c:271 +#: builtin/add.c:269 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" -#: 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:906 builtin/fetch.c:134 builtin/mv.c:123 +#: builtin/prune-packed.c:56 builtin/pull.c:212 builtin/push.c:557 +#: builtin/remote.c:1344 builtin/rm.c:240 builtin/send-pack.c:165 msgid "dry run" msgstr "marxa en sec" -#: builtin/add.c:294 +#: builtin/add.c:292 msgid "interactive picking" msgstr "recull interactiu" -#: builtin/add.c:295 builtin/checkout.c:1128 builtin/reset.c:302 +#: builtin/add.c:293 builtin/checkout.c:1144 builtin/reset.c:302 msgid "select hunks interactively" msgstr "selecciona els trossos interactivament" -#: builtin/add.c:296 +#: builtin/add.c:294 msgid "edit current diff and apply" msgstr "edita la diferència actual i aplica-la" -#: builtin/add.c:297 +#: builtin/add.c:295 msgid "allow adding otherwise ignored files" msgstr "permet afegir fitxers que d'altra manera s'ignoren" -#: builtin/add.c:298 +#: builtin/add.c:296 msgid "update tracked files" msgstr "actualitza els fitxers seguits" -#: 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 "registra només el fet que el camí s'afegirà més tard" -#: builtin/add.c:301 +#: builtin/add.c:299 msgid "add changes from all tracked and untracked files" msgstr "afegeix els canvis de tots els fitxers seguits i no seguits" -#: builtin/add.c:304 +#: builtin/add.c:302 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)" -#: builtin/add.c:306 +#: builtin/add.c:304 msgid "don't add, only refresh the index" msgstr "no afegeixis, només actualitza l'índex" -#: builtin/add.c:307 +#: builtin/add.c:305 msgid "just skip files which cannot be added because of errors" msgstr "només omet els fitxers que no es poden afegir a causa d'errors" -#: builtin/add.c:308 +#: builtin/add.c:306 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" -#: builtin/add.c:309 builtin/update-index.c:964 -msgid "(+/-)x" -msgstr "(+/-)x" - -#: builtin/add.c:309 builtin/update-index.c:965 +#: builtin/add.c:308 builtin/update-index.c:973 msgid "override the executable bit of the listed files" msgstr "passa per alt el bit executable dels fitxers llistats" -#: builtin/add.c:311 +#: builtin/add.c:310 msgid "warn when adding an embedded repository" msgstr "avisa'm quan s'afegeixi un dipòsit incrustat" -#: builtin/add.c:326 +#: builtin/add.c:325 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -5249,17 +6819,17 @@ msgstr "" "\n" "Vegeu \"git help submodule\" per a més informació." -#: builtin/add.c:354 +#: builtin/add.c:353 #, c-format msgid "adding embedded git repository: %s" msgstr "s'està afegint un dipòsit incrustat: %s" -#: builtin/add.c:372 +#: builtin/add.c:371 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "Useu -f si realment els voleu afegir.\n" -#: builtin/add.c:380 +#: builtin/add.c:379 msgid "adding files failed" msgstr "l'afegiment de fitxers ha fallat" @@ -5286,117 +6856,117 @@ msgstr "No s'ha especificat res, no s'ha afegit res.\n" 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/add.c:449 builtin/check-ignore.c:177 builtin/checkout.c:282 +#: builtin/checkout.c:485 builtin/clean.c:953 builtin/commit.c:338 +#: builtin/diff-tree.c:115 builtin/grep.c:492 builtin/mv.c:144 +#: builtin/reset.c:241 builtin/rm.c:270 builtin/submodule--helper.c:329 msgid "index file corrupt" msgstr "fitxer d'índex malmès" -#: builtin/am.c:414 +#: builtin/am.c:415 msgid "could not parse author script" msgstr "no s'ha pogut analitzar l'script d'autor" -#: builtin/am.c:498 +#: builtin/am.c:499 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "s'ha suprimit «%s» pel lligam applypatch-msg" -#: builtin/am.c:539 +#: builtin/am.c:540 #, c-format msgid "Malformed input line: '%s'." msgstr "Línia d'entrada mal formada: «%s»." -#: builtin/am.c:576 +#: builtin/am.c:577 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "S'ha produït un error en copiar les notes de «%s» a «%s»" -#: builtin/am.c:602 +#: builtin/am.c:603 msgid "fseek failed" msgstr "fseek ha fallat" -#: builtin/am.c:790 +#: builtin/am.c:791 #, c-format msgid "could not parse patch '%s'" msgstr "no s'ha pogut analitzar el pedaç «%s»" -#: builtin/am.c:855 +#: builtin/am.c:856 msgid "Only one StGIT patch series can be applied at once" msgstr "Només una sèrie de pedaços StGIT es pot aplicar a la vegada" -#: builtin/am.c:903 +#: builtin/am.c:904 msgid "invalid timestamp" msgstr "marca de temps no vàlida" -#: builtin/am.c:908 builtin/am.c:920 +#: builtin/am.c:909 builtin/am.c:921 msgid "invalid Date line" msgstr "línia Date no vàlida" -#: builtin/am.c:915 +#: builtin/am.c:916 msgid "invalid timezone offset" msgstr "desplaçament de zona de temps no vàlid" -#: builtin/am.c:1008 +#: builtin/am.c:1009 msgid "Patch format detection failed." msgstr "La detecció de format de pedaç ha fallat." -#: builtin/am.c:1013 builtin/clone.c:405 +#: builtin/am.c:1014 builtin/clone.c:408 #, c-format msgid "failed to create directory '%s'" msgstr "s'ha produït un error en crear el directori «%s»" -#: builtin/am.c:1018 +#: builtin/am.c:1019 msgid "Failed to split patches." msgstr "S'ha produït un error en dividir els pedaços." -#: builtin/am.c:1148 builtin/commit.c:342 +#: builtin/am.c:1149 builtin/commit.c:364 msgid "unable to write index file" msgstr "no s'ha pogut escriure el fitxer d'índex" -#: builtin/am.c:1162 +#: builtin/am.c:1163 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "Quan hàgiu resolt aquest problema, executeu \"%s --continue\"." -#: builtin/am.c:1163 +#: builtin/am.c:1164 #, 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ò." -#: builtin/am.c:1164 +#: builtin/am.c:1165 #, 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" "\"." -#: builtin/am.c:1271 +#: builtin/am.c:1272 msgid "Patch is empty." msgstr "El pedaç està buit." -#: builtin/am.c:1337 +#: builtin/am.c:1338 #, c-format msgid "invalid ident line: %.*s" msgstr "línia d'identitat no vàlida: %.*s" -#: builtin/am.c:1359 +#: builtin/am.c:1360 #, c-format msgid "unable to parse commit %s" msgstr "no s'ha pogut analitzar la comissió %s" -#: builtin/am.c:1554 +#: builtin/am.c:1556 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." -#: builtin/am.c:1556 +#: builtin/am.c:1558 msgid "Using index info to reconstruct a base tree..." msgstr "S'està usant la informació d'índex per a reconstruir un arbre base..." -#: builtin/am.c:1575 +#: builtin/am.c:1577 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -5404,29 +6974,29 @@ msgstr "" "Heu editat el vostre pedaç a mà?\n" "No s'aplica als blobs recordats en el seu índex." -#: builtin/am.c:1581 +#: builtin/am.c:1583 msgid "Falling back to patching base and 3-way merge..." msgstr "S'està retrocedint a apedaçar la base i una fusió de 3 vies..." -#: builtin/am.c:1606 +#: builtin/am.c:1608 msgid "Failed to merge in the changes." msgstr "S'ha produït un error en fusionar els canvis." -#: builtin/am.c:1637 +#: builtin/am.c:1640 msgid "applying to an empty history" msgstr "s'està aplicant a una història buida" -#: builtin/am.c:1683 builtin/am.c:1687 +#: builtin/am.c:1686 builtin/am.c:1690 #, c-format msgid "cannot resume: %s does not exist." msgstr "no es pot reprendre: %s no existeix." -#: builtin/am.c:1703 +#: builtin/am.c:1706 msgid "cannot be interactive without stdin connected to a terminal." msgstr "" "no es pot ser interactiu sense que stdin estigui connectada a un terminal." -#: builtin/am.c:1708 +#: builtin/am.c:1711 msgid "Commit Body is:" msgstr "El cos de la comissió és:" @@ -5434,27 +7004,27 @@ msgstr "El cos de la comissió és:" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1718 +#: builtin/am.c:1721 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "" "Voleu aplicar-lo? [y]es/[n]o/[e]dita/[v]isualitza el pedaç/[a]ccepta'ls " "tots: " -#: builtin/am.c:1768 +#: builtin/am.c:1771 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Índex brut: no es poden aplicar pedaços (bruts: %s)" -#: builtin/am.c:1808 builtin/am.c:1879 +#: builtin/am.c:1811 builtin/am.c:1879 #, c-format msgid "Applying: %.*s" msgstr "S'està aplicant: %.*s" -#: builtin/am.c:1824 +#: builtin/am.c:1828 msgid "No changes -- Patch already applied." msgstr "Sense canvis -- El pedaç ja s'ha aplicat." -#: builtin/am.c:1832 +#: builtin/am.c:1834 #, c-format msgid "Patch failed at %s %.*s" msgstr "El pedaç ha fallat a %s %.*s" @@ -5529,8 +7099,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:485 builtin/prune-packed.c:58 +#: builtin/repack.c:299 msgid "be quiet" msgstr "silenciós" @@ -5573,16 +7143,17 @@ msgstr "elimina tot abans d'una línia de tisores" msgid "pass it through git-apply" 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/am.c:2260 builtin/commit.c:1332 builtin/fmt-merge-msg.c:670 +#: builtin/fmt-merge-msg.c:673 builtin/grep.c:857 builtin/merge.c:237 +#: builtin/pull.c:150 builtin/pull.c:208 builtin/repack.c:308 +#: builtin/repack.c:312 builtin/repack.c:314 builtin/show-branch.c:650 +#: builtin/show-ref.c:170 builtin/tag.c:384 parse-options.h:144 +#: parse-options.h:146 parse-options.h:258 msgid "n" msgstr "n" -#: builtin/am.c: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:651 builtin/for-each-ref.c:38 +#: builtin/replace.c:543 builtin/tag.c:420 builtin/verify-tag.c:39 msgid "format" msgstr "format" @@ -5626,8 +7197,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:1468 builtin/merge.c:271 +#: builtin/pull.c:183 builtin/revert.c:113 builtin/tag.c:400 msgid "key-id" msgstr "ID de clau" @@ -5768,121 +7339,148 @@ msgstr "--write-terms requereix dos paràmetres" msgid "--bisect-clean-state requires no arguments" msgstr "--bisect-clean-state no accepta paràmetres" -#: builtin/blame.c:27 +#: builtin/blame.c:31 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "git blame [<opcions>] [<opcions-de-revisió>] [<revisió>] [--] fitxer" -#: builtin/blame.c:32 +#: builtin/blame.c:36 msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "es documenten les <opcions-de-revisió> en git-rev-list(1)" -#: builtin/blame.c:677 +#: builtin/blame.c:406 +#, fuzzy, c-format +msgid "expecting a color: %s" +msgstr "respecta els colors del format" + +#: builtin/blame.c:413 +msgid "must end with a color" +msgstr "" + +#: builtin/blame.c:700 +#, fuzzy, c-format +msgid "invalid color '%s' in color.blame.repeatedLines" +msgstr "ignora el color no vàlid «%.*s» en log.graphColors" + +#: builtin/blame.c:718 +#, fuzzy +msgid "invalid value for blame.coloring" +msgstr "valor no vàlid per a --missing" + +#: builtin/blame.c:789 msgid "Show blame entries as we find them, incrementally" msgstr "Mostra les entrades «blame» mentre les trobem, incrementalment" -#: builtin/blame.c:678 +#: builtin/blame.c:790 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)" -#: builtin/blame.c:679 +#: builtin/blame.c:791 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "" "No tractis les comissions d'arrel com a límits (Per defecte: desactivat)" -#: builtin/blame.c:680 +#: builtin/blame.c:792 msgid "Show work cost statistics" msgstr "Mostra les estadístiques de preu de treball" -#: builtin/blame.c:681 +#: builtin/blame.c:793 msgid "Force progress reporting" msgstr "Força l'informe de progrés" -#: builtin/blame.c:682 +#: builtin/blame.c:794 msgid "Show output score for blame entries" msgstr "Mostra la puntuació de sortida de les entrades «blame»" -#: builtin/blame.c:683 +#: builtin/blame.c:795 msgid "Show original filename (Default: auto)" msgstr "Mostra el nom de fitxer original (Per defecte: automàtic)" -#: builtin/blame.c:684 +#: builtin/blame.c:796 msgid "Show original linenumber (Default: off)" msgstr "Mostra el número de línia original (Per defecte: desactivat)" -#: builtin/blame.c:685 +#: builtin/blame.c:797 msgid "Show in a format designed for machine consumption" msgstr "Presenta en un format dissenyat per consumpció per màquina" -#: builtin/blame.c:686 +#: builtin/blame.c:798 msgid "Show porcelain format with per-line commit information" msgstr "Mostra el format de porcellana amb informació de comissió per línia" -#: builtin/blame.c:687 +#: builtin/blame.c:799 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "" "Usa el mateix mode de sortida que git-annotate (Per defecte: desactivat)" -#: builtin/blame.c:688 +#: builtin/blame.c:800 msgid "Show raw timestamp (Default: off)" msgstr "Mostra la marca de temps crua (Per defecte: desactivat)" -#: builtin/blame.c:689 +#: builtin/blame.c:801 msgid "Show long commit SHA1 (Default: off)" msgstr "Mostra l'SHA1 de comissió llarg (Per defecte: desactivat)" -#: builtin/blame.c:690 +#: builtin/blame.c:802 msgid "Suppress author name and timestamp (Default: off)" msgstr "Omet el nom d'autor i la marca de temps (Per defecte: desactivat)" -#: builtin/blame.c:691 +#: builtin/blame.c:803 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)" -#: builtin/blame.c:692 +#: builtin/blame.c:804 msgid "Ignore whitespace differences" msgstr "Ignora les diferències d'espai en blanc" -#: builtin/blame.c:699 +#: builtin/blame.c:805 +msgid "color redundant metadata from previous line differently" +msgstr "" + +#: builtin/blame.c:806 +msgid "color lines by age" +msgstr "" + +#: builtin/blame.c:813 msgid "Use an experimental heuristic to improve diffs" msgstr "Usa un heurístic experimental per a millorar les diferències" -#: builtin/blame.c:701 +#: builtin/blame.c:815 msgid "Spend extra cycles to find better match" msgstr "Gasta cicles extres per a trobar una coincidència millor" -#: builtin/blame.c:702 +#: builtin/blame.c:816 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "Usa les revisions de <fitxer> en lloc d'invocar git-rev-list" -#: builtin/blame.c:703 +#: builtin/blame.c:817 msgid "Use <file>'s contents as the final image" msgstr "Usa els continguts de <fitxer> com a la imatge final" -#: builtin/blame.c:704 builtin/blame.c:705 +#: builtin/blame.c:818 builtin/blame.c:819 msgid "score" msgstr "puntuació" -#: builtin/blame.c:704 +#: builtin/blame.c:818 msgid "Find line copies within and across files" msgstr "Troba còpies de línia dins i a través dels fitxers" -#: builtin/blame.c:705 +#: builtin/blame.c:819 msgid "Find line movements within and across files" msgstr "Troba moviments de línia dins i a través dels fitxers" -#: builtin/blame.c:706 +#: builtin/blame.c:820 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:706 +#: builtin/blame.c:820 msgid "Process only line range n,m, counting from 1" msgstr "Processa només el rang de línies n,m, comptant des d'1" -#: builtin/blame.c:753 +#: builtin/blame.c:869 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "" "no es pot usar --progress amb els formats --incremental o de porcellana" @@ -5895,50 +7493,50 @@ msgstr "" #. your language may need more or fewer display #. columns. #. -#: builtin/blame.c:804 +#: builtin/blame.c:920 msgid "4 years, 11 months ago" msgstr "fa 4 anys i 11 mesos" -#: builtin/blame.c:890 +#: builtin/blame.c:1007 #, c-format msgid "file %s has only %lu line" msgid_plural "file %s has only %lu lines" msgstr[0] "el fitxer %s té només %lu línia" msgstr[1] "el fitxer %s té només %lu línies" -#: builtin/blame.c:936 +#: builtin/blame.c:1053 msgid "Blaming lines" msgstr "S'està fent un «blame»" -#: builtin/branch.c:27 +#: builtin/branch.c:28 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" msgstr "git branch [<opcions>] [-r | -a] [--merged | --no-merged]" -#: builtin/branch.c:28 +#: builtin/branch.c:29 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" msgstr "git branch [<opcions>] [-l] [-f] <nom-de-branca> [<punt-inicial>]" -#: builtin/branch.c:29 +#: builtin/branch.c:30 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." msgstr "git branch [<opcions>] [-r] (-d | -D) <nom-de-branca>..." -#: builtin/branch.c:30 +#: builtin/branch.c:31 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" msgstr "git branch [<opcions>] (-m | -M) [<branca-antiga>] <branca-nova>" -#: builtin/branch.c:31 +#: builtin/branch.c:32 msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>" msgstr "git branch [<opcions>] (-c | -C) [<branca-antiga>] <branca-nova>" -#: builtin/branch.c:32 +#: builtin/branch.c:33 msgid "git branch [<options>] [-r | -a] [--points-at]" msgstr "git branch [<opcions>] [-r | -a] [--points-at]" -#: builtin/branch.c:33 +#: builtin/branch.c:34 msgid "git branch [<options>] [-r | -a] [--format]" msgstr "git branch [<opcions>] [-r | -a] [--format]" -#: builtin/branch.c:146 +#: builtin/branch.c:151 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" @@ -5948,7 +7546,7 @@ msgstr "" " fusionat a «%s», però encara no\n" " s'ha fusionat a HEAD." -#: builtin/branch.c:150 +#: builtin/branch.c:155 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" @@ -5958,12 +7556,12 @@ msgstr "" " s'ha fusionat a «%s», encara que està\n" " fusionada a HEAD." -#: builtin/branch.c:164 +#: builtin/branch.c:169 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "No s'ha pogut trobar l'objecte de comissió de «%s»" -#: builtin/branch.c:168 +#: builtin/branch.c:173 #, c-format msgid "" "The branch '%s' is not fully merged.\n" @@ -5972,116 +7570,116 @@ msgstr "" "La branca «%s» no està totalment fusionada.\n" "Si esteu segur que la voleu suprimir, executeu 'git branch -D %s'." -#: builtin/branch.c:181 +#: builtin/branch.c:186 msgid "Update of config-file failed" msgstr "L'actualització del fitxer de configuració ha fallat" -#: builtin/branch.c:212 +#: builtin/branch.c:217 msgid "cannot use -a with -d" msgstr "no es pot usar -a amb -d" -#: builtin/branch.c:218 +#: builtin/branch.c:223 msgid "Couldn't look up commit object for HEAD" msgstr "No s'ha pogut trobar l'objecte de comissió de HEAD" -#: builtin/branch.c:232 +#: builtin/branch.c:237 #, c-format msgid "Cannot delete branch '%s' checked out at '%s'" msgstr "No es pot suprimir la branca «%s» agafada a «%s»" -#: builtin/branch.c:247 +#: builtin/branch.c:252 #, c-format msgid "remote-tracking branch '%s' not found." msgstr "no s'ha trobat la branca amb seguiment remot «%s»." -#: builtin/branch.c:248 +#: builtin/branch.c:253 #, c-format msgid "branch '%s' not found." msgstr "no s'ha trobat la branca «%s»." -#: builtin/branch.c:263 +#: builtin/branch.c:268 #, c-format msgid "Error deleting remote-tracking branch '%s'" msgstr "Error en suprimir la branca amb seguiment remot «%s»" -#: builtin/branch.c:264 +#: builtin/branch.c:269 #, c-format msgid "Error deleting branch '%s'" msgstr "Error en suprimir la branca «%s»" -#: builtin/branch.c:271 +#: builtin/branch.c:276 #, c-format msgid "Deleted remote-tracking branch %s (was %s).\n" msgstr "S'ha suprimit la branca amb seguiment remot %s (era %s).\n" -#: builtin/branch.c:272 +#: builtin/branch.c:277 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "S'ha suprimit la branca %s (era %s).\n" -#: builtin/branch.c:417 builtin/tag.c:58 +#: builtin/branch.c:421 builtin/tag.c:59 msgid "unable to parse format string" msgstr "no s'ha pogut analitzar la cadena de format" -#: builtin/branch.c:450 +#: builtin/branch.c:458 #, c-format msgid "Branch %s is being rebased at %s" msgstr "S'està fent «rebase» en la branca %s a %s" -#: builtin/branch.c:454 +#: builtin/branch.c:462 #, c-format msgid "Branch %s is being bisected at %s" msgstr "La branca %s s'està bisecant a %s" -#: builtin/branch.c:471 +#: builtin/branch.c:479 msgid "cannot copy the current branch while not on any." msgstr "no es pot copiar branca actual mentre no s'és a cap." -#: builtin/branch.c:473 +#: builtin/branch.c:481 msgid "cannot rename the current branch while not on any." msgstr "no es pot canviar el nom de la branca actual mentre no s'és a cap." -#: builtin/branch.c:484 +#: builtin/branch.c:492 #, c-format msgid "Invalid branch name: '%s'" msgstr "Nom de branca no vàlid: «%s»" -#: builtin/branch.c:511 +#: builtin/branch.c:519 msgid "Branch rename failed" msgstr "El canvi de nom de branca ha fallat" -#: builtin/branch.c:513 +#: builtin/branch.c:521 msgid "Branch copy failed" msgstr "La còpia de la branca ha fallat" -#: builtin/branch.c:517 +#: builtin/branch.c:525 #, c-format 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 +#: builtin/branch.c:528 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "S'ha canviat el nom de la branca mal anomenada «%s»" -#: builtin/branch.c:526 +#: builtin/branch.c:534 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "S'ha canviat el nom de la branca a %s, però HEAD no està actualitzat!" -#: builtin/branch.c:535 +#: builtin/branch.c:543 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" -#: builtin/branch.c:537 +#: builtin/branch.c:545 msgid "Branch is copied, but update of config-file failed" msgstr "" "La branca està copiada, però l'actualització del fitxer de configuració ha " "fallat" -#: builtin/branch.c:553 +#: builtin/branch.c:561 #, c-format msgid "" "Please edit the description for the branch\n" @@ -6092,220 +7690,226 @@ msgstr "" " %s\n" "S'eliminaran les línies que comencin amb '%c'.\n" -#: builtin/branch.c:586 +#: builtin/branch.c:602 msgid "Generic options" msgstr "Opcions genèriques" -#: builtin/branch.c:588 +#: builtin/branch.c:604 msgid "show hash and subject, give twice for upstream branch" msgstr "mostra el hash i l'assumpte, doneu dues vegades per la branca font" -#: builtin/branch.c:589 +#: builtin/branch.c:605 msgid "suppress informational messages" msgstr "omet els missatges informatius" -#: builtin/branch.c:590 +#: builtin/branch.c:606 msgid "set up tracking mode (see git-pull(1))" msgstr "configura el mode de seguiment (vegeu git-pull(1))" -#: builtin/branch.c:592 +#: builtin/branch.c:608 msgid "do not use" msgstr "no usar" -#: builtin/branch.c:594 +#: builtin/branch.c:610 msgid "upstream" msgstr "font" -#: builtin/branch.c:594 +#: builtin/branch.c:610 msgid "change the upstream info" msgstr "canvia la informació de font" -#: builtin/branch.c:595 +#: builtin/branch.c:611 msgid "Unset the upstream info" msgstr "Desassigna la informació de font" -#: builtin/branch.c:596 +#: builtin/branch.c:612 msgid "use colored output" msgstr "usa sortida colorada" -#: builtin/branch.c:597 +#: builtin/branch.c:613 msgid "act on remote-tracking branches" msgstr "actua en branques amb seguiment remot" -#: builtin/branch.c:599 builtin/branch.c:601 +#: builtin/branch.c:615 builtin/branch.c:617 msgid "print only branches that contain the commit" msgstr "imprimeix només les branques que continguin la comissió" -#: builtin/branch.c:600 builtin/branch.c:602 +#: builtin/branch.c:616 builtin/branch.c:618 msgid "print only branches that don't contain the commit" msgstr "imprimeix només les branques que no continguin la comissió" -#: builtin/branch.c:605 +#: builtin/branch.c:621 msgid "Specific git-branch actions:" msgstr "Accions de git-branch específiques:" -#: builtin/branch.c:606 +#: builtin/branch.c:622 msgid "list both remote-tracking and local branches" msgstr "llista les branques amb seguiment remot i les locals" -#: builtin/branch.c:608 +#: builtin/branch.c:624 msgid "delete fully merged branch" msgstr "suprimeix la branca si està completament fusionada" -#: builtin/branch.c:609 +#: builtin/branch.c:625 msgid "delete branch (even if not merged)" msgstr "suprimeix la branca (encara que no estigui fusionada)" -#: builtin/branch.c:610 +#: builtin/branch.c:626 msgid "move/rename a branch and its reflog" msgstr "mou/canvia de nom una branca i el seu registre de referència" -#: builtin/branch.c:611 +#: builtin/branch.c:627 msgid "move/rename a branch, even if target exists" msgstr "mou/canvia de nom una branca, encara que el destí existeixi" -#: builtin/branch.c:612 +#: builtin/branch.c:628 msgid "copy a branch and its reflog" msgstr "copia una branca i el seu registre de referència" -#: builtin/branch.c:613 +#: builtin/branch.c:629 msgid "copy a branch, even if target exists" msgstr "copia una branca, encara que el destí existeixi" -#: builtin/branch.c:614 +#: builtin/branch.c:630 msgid "list branch names" msgstr "llista els noms de branca" -#: builtin/branch.c:615 +#: builtin/branch.c:631 msgid "create the branch's reflog" msgstr "crea el registre de referència de la branca" -#: builtin/branch.c:617 +#: builtin/branch.c:634 +msgid "deprecated synonym for --create-reflog" +msgstr "" + +#: builtin/branch.c:639 msgid "edit the description for the branch" msgstr "edita la descripció de la branca" -#: builtin/branch.c:618 +#: builtin/branch.c:640 msgid "force creation, move/rename, deletion" msgstr "força creació, moviment/canvi de nom, supressió" -#: builtin/branch.c:619 +#: builtin/branch.c:641 msgid "print only branches that are merged" msgstr "imprimeix només les branques que s'han fusionat" -#: builtin/branch.c:620 +#: builtin/branch.c:642 msgid "print only branches that are not merged" msgstr "imprimeix només les branques que no s'han fusionat" -#: builtin/branch.c:621 +#: builtin/branch.c:643 msgid "list branches in columns" msgstr "llista les branques en columnes" -#: builtin/branch.c:622 builtin/for-each-ref.c:40 builtin/tag.c:411 +#: builtin/branch.c:644 builtin/for-each-ref.c:40 builtin/ls-remote.c:70 +#: builtin/tag.c:413 msgid "key" msgstr "clau" -#: builtin/branch.c:623 builtin/for-each-ref.c:41 builtin/tag.c:412 +#: builtin/branch.c:645 builtin/for-each-ref.c:41 builtin/ls-remote.c:71 +#: builtin/tag.c:414 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:647 builtin/for-each-ref.c:43 builtin/notes.c:410 +#: builtin/notes.c:413 builtin/notes.c:573 builtin/notes.c:576 +#: builtin/tag.c:416 msgid "object" msgstr "objecte" -#: builtin/branch.c:626 +#: builtin/branch.c:648 msgid "print only branches of the object" msgstr "imprimeix només les branques de l'objecte" -#: builtin/branch.c:628 builtin/for-each-ref.c:49 builtin/tag.c:421 +#: builtin/branch.c:650 builtin/for-each-ref.c:49 builtin/tag.c:423 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/branch.c:651 builtin/for-each-ref.c:38 builtin/tag.c:421 #: builtin/verify-tag.c:39 msgid "format to use for the output" msgstr "format a usar en la sortida" -#: builtin/branch.c:652 builtin/clone.c:735 +#: builtin/branch.c:674 builtin/clone.c:739 msgid "HEAD not found below refs/heads!" msgstr "HEAD no trobat sota refs/heads!" -#: builtin/branch.c:675 +#: builtin/branch.c:697 msgid "--column and --verbose are incompatible" msgstr "--column i --verbose són incompatibles" -#: builtin/branch.c:690 builtin/branch.c:742 builtin/branch.c:751 +#: builtin/branch.c:717 builtin/branch.c:769 builtin/branch.c:778 msgid "branch name required" msgstr "cal el nom de branca" -#: builtin/branch.c:718 +#: builtin/branch.c:745 msgid "Cannot give description to detached HEAD" msgstr "No es pot donar descripció a un HEAD separat" -#: builtin/branch.c:723 +#: builtin/branch.c:750 msgid "cannot edit description of more than one branch" msgstr "no es pot editar la descripció de més d'una branca" -#: builtin/branch.c:730 +#: builtin/branch.c:757 #, c-format msgid "No commit on branch '%s' yet." msgstr "Encara no hi ha cap comissió en la branca «%s»." -#: builtin/branch.c:733 +#: builtin/branch.c:760 #, c-format msgid "No branch named '%s'." msgstr "No hi ha cap branca amb nom «%s»." -#: builtin/branch.c:748 +#: builtin/branch.c:775 msgid "too many branches for a copy operation" msgstr "hi ha massa branques per a una operació de còpia" -#: builtin/branch.c:757 +#: builtin/branch.c:784 msgid "too many arguments for a rename operation" msgstr "hi ha massa arguments per a una operació remota" -#: builtin/branch.c:762 +#: builtin/branch.c:789 msgid "too many arguments to set new upstream" msgstr "hi ha massa arguments per a establir una nova font" -#: builtin/branch.c:766 +#: builtin/branch.c:793 #, 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." -#: builtin/branch.c:769 builtin/branch.c:791 builtin/branch.c:807 +#: builtin/branch.c:796 builtin/branch.c:818 builtin/branch.c:834 #, c-format msgid "no such branch '%s'" msgstr "no hi ha tal branca «%s»" -#: builtin/branch.c:773 +#: builtin/branch.c:800 #, c-format msgid "branch '%s' does not exist" msgstr "la branca «%s» no existeix" -#: builtin/branch.c:785 +#: builtin/branch.c:812 msgid "too many arguments to unset upstream" msgstr "hi ha massa arguments per a desassignar la font" -#: builtin/branch.c:789 +#: builtin/branch.c:816 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." -#: builtin/branch.c:795 +#: builtin/branch.c:822 #, c-format msgid "Branch '%s' has no upstream information" msgstr "La branca «%s» no té informació de font" -#: builtin/branch.c:810 +#: builtin/branch.c:837 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" -#: builtin/branch.c:813 +#: builtin/branch.c:840 msgid "" "the '--set-upstream' option is no longer supported. Please use '--track' or " "'--set-upstream-to' instead." @@ -6326,7 +7930,7 @@ msgstr "Cal un dipòsit per a fer un farcell." msgid "Need a repository to unbundle." msgstr "Cal un dipòsit per a desfer un farcell." -#: builtin/cat-file.c:523 +#: builtin/cat-file.c:577 msgid "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <type> | --textconv | --filters) [--path=<path>] <object>" @@ -6334,7 +7938,7 @@ msgstr "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <tipus> | --textconv | --filters [--path=<camí>]) <objecte>" -#: builtin/cat-file.c:524 +#: builtin/cat-file.c:578 msgid "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" @@ -6342,69 +7946,73 @@ msgstr "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" -#: builtin/cat-file.c:561 +#: builtin/cat-file.c:615 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<tipus> pot ser un de: blob, tree, commit, tag" -#: builtin/cat-file.c:562 +#: builtin/cat-file.c:616 msgid "show object type" msgstr "mostra el tipus de l'objecte" -#: builtin/cat-file.c:563 +#: builtin/cat-file.c:617 msgid "show object size" msgstr "mostra la mida de l'objecte" -#: builtin/cat-file.c:565 +#: builtin/cat-file.c:619 msgid "exit with zero when there's no error" msgstr "surt amb zero quan no hi ha error" -#: builtin/cat-file.c:566 +#: builtin/cat-file.c:620 msgid "pretty-print object's content" msgstr "imprimeix bellament el contingut de l'objecte" -#: builtin/cat-file.c:568 +#: builtin/cat-file.c:622 msgid "for blob objects, run textconv on object's content" msgstr "en els objectes de blob, executa textconv en el contingut de l'objecte" -#: builtin/cat-file.c:570 +#: builtin/cat-file.c:624 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" -#: builtin/cat-file.c:571 git-submodule.sh:878 +#: builtin/cat-file.c:625 git-submodule.sh:864 msgid "blob" msgstr "blob" -#: builtin/cat-file.c:572 +#: builtin/cat-file.c:626 msgid "use a specific path for --textconv/--filters" msgstr "usa un camí específic per a --textconv/--filters" -#: builtin/cat-file.c:574 +#: builtin/cat-file.c:628 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "permet que -s i -t funcionin amb objectes trencats/malmesos" -#: builtin/cat-file.c:575 +#: builtin/cat-file.c:629 msgid "buffer --batch output" msgstr "posa la sortida de --batch en memòria intermèdia" -#: builtin/cat-file.c:577 +#: builtin/cat-file.c:631 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" -#: builtin/cat-file.c:580 +#: builtin/cat-file.c:634 msgid "show info about objects fed from the standard input" msgstr "mostra informació sobre els objectes rebuts de l'entrada estàndard" -#: builtin/cat-file.c:583 +#: builtin/cat-file.c:637 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)" -#: builtin/cat-file.c:585 +#: builtin/cat-file.c:639 msgid "show all objects with --batch or --batch-check" msgstr "mostra tots els objectes amb --batch o --batch-check" +#: builtin/cat-file.c:641 +msgid "do not order --batch-all-objects output" +msgstr "" + #: builtin/check-attr.c:12 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." msgstr "git check-attr [-a | --all | <atribut>...] [--] <nom-de-camí>..." @@ -6421,7 +8029,7 @@ msgstr "informa de tots els atributs establerts en el fitxer" msgid "use .gitattributes only from the index" msgstr "usa .gitattributes només des de l'índex" -#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:100 +#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:101 msgid "read file names from stdin" msgstr "llegeix els noms de fitxer de stdin" @@ -6429,7 +8037,8 @@ msgstr "llegeix els noms de fitxer de stdin" msgid "terminate input and output records by a NUL character" msgstr "acaba els registres d'entrada i de sortida amb un caràcter NUL" -#: builtin/check-ignore.c:20 builtin/checkout.c:1106 builtin/gc.c:358 +#: builtin/check-ignore.c:20 builtin/checkout.c:1120 builtin/gc.c:503 +#: builtin/worktree.c:447 msgid "suppress progress reporting" msgstr "omet els informes de progrés" @@ -6520,9 +8129,9 @@ 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/submodule--helper.c:1361 builtin/submodule--helper.c:1364 +#: builtin/submodule--helper.c:1372 builtin/submodule--helper.c:1736 +#: builtin/worktree.c:620 msgid "string" msgstr "cadena" @@ -6534,114 +8143,114 @@ msgstr "en crear fitxers, anteposa <cadena>" msgid "copy out the files from named stage" msgstr "copia els fitxers des de «stage» amb nom" -#: builtin/checkout.c:27 +#: builtin/checkout.c:29 msgid "git checkout [<options>] <branch>" msgstr "git checkout [<opcions>] <branca>" -#: builtin/checkout.c:28 +#: builtin/checkout.c:30 msgid "git checkout [<options>] [<branch>] -- <file>..." msgstr "git checkout [<opcions>] [<branca>] -- <fitxer>..." -#: builtin/checkout.c:136 builtin/checkout.c:169 +#: builtin/checkout.c:138 builtin/checkout.c:171 #, c-format msgid "path '%s' does not have our version" msgstr "el camí «%s» no té la nostra versió" -#: builtin/checkout.c:138 builtin/checkout.c:171 +#: builtin/checkout.c:140 builtin/checkout.c:173 #, c-format msgid "path '%s' does not have their version" msgstr "el camí «%s» no té la seva versió" -#: builtin/checkout.c:154 +#: builtin/checkout.c:156 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "el camí «%s» no té totes les versions necessàries" -#: builtin/checkout.c:198 +#: builtin/checkout.c:200 #, c-format msgid "path '%s' does not have necessary versions" msgstr "el camí «%s» no té les versions necessàries" -#: builtin/checkout.c:215 +#: builtin/checkout.c:217 #, c-format msgid "path '%s': cannot merge" msgstr "camí «%s»: no es pot fusionar" -#: builtin/checkout.c:231 +#: builtin/checkout.c:233 #, c-format msgid "Unable to add merge result for '%s'" msgstr "No s'ha pogut afegir el resultat de fusió per a «%s»" -#: builtin/checkout.c:253 builtin/checkout.c:256 builtin/checkout.c:259 -#: builtin/checkout.c:262 +#: builtin/checkout.c:255 builtin/checkout.c:258 builtin/checkout.c:261 +#: builtin/checkout.c:264 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "«%s» no es pot usar amb actualització de camins" -#: builtin/checkout.c:265 builtin/checkout.c:268 +#: builtin/checkout.c:267 builtin/checkout.c:270 #, c-format msgid "'%s' cannot be used with %s" msgstr "«%s» no es pot usar amb %s" -#: builtin/checkout.c:271 +#: builtin/checkout.c:273 #, 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." -#: builtin/checkout.c:340 builtin/checkout.c:347 +#: builtin/checkout.c:342 builtin/checkout.c:349 #, c-format msgid "path '%s' is unmerged" msgstr "el camí «%s» està sense fusionar" -#: builtin/checkout.c:505 +#: builtin/checkout.c:508 msgid "you need to resolve your current index first" msgstr "heu de primer resoldre el vostre índex actual" -#: builtin/checkout.c:636 +#: builtin/checkout.c:645 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "No es pot fer reflog per a «%s»: %s\n" -#: builtin/checkout.c:677 +#: builtin/checkout.c:686 msgid "HEAD is now at" msgstr "HEAD ara és a" -#: builtin/checkout.c:681 builtin/clone.c:689 +#: builtin/checkout.c:690 builtin/clone.c:692 msgid "unable to update HEAD" msgstr "no s'ha pogut actualitzar HEAD" -#: builtin/checkout.c:685 +#: builtin/checkout.c:694 #, c-format msgid "Reset branch '%s'\n" msgstr "Restableix la branca «%s»\n" -#: builtin/checkout.c:688 +#: builtin/checkout.c:697 #, c-format msgid "Already on '%s'\n" msgstr "Ja en «%s»\n" -#: builtin/checkout.c:692 +#: builtin/checkout.c:701 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "S'ha canviat i restablert a la branca «%s»\n" -#: builtin/checkout.c:694 builtin/checkout.c:1039 +#: builtin/checkout.c:703 builtin/checkout.c:1052 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "S'ha canviat a la branca nova «%s»\n" -#: builtin/checkout.c:696 +#: builtin/checkout.c:705 #, c-format msgid "Switched to branch '%s'\n" msgstr "S'ha canviat a la branca «%s»\n" -#: builtin/checkout.c:747 +#: builtin/checkout.c:756 #, c-format msgid " ... and %d more.\n" msgstr " ... i %d més.\n" -#: builtin/checkout.c:753 +#: builtin/checkout.c:762 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -6664,7 +8273,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:772 +#: builtin/checkout.c:781 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -6691,162 +8300,163 @@ msgstr[1] "" " git branch <nom-de-branca-nova> %s\n" "\n" -#: builtin/checkout.c:804 +#: builtin/checkout.c:813 msgid "internal error in revision walk" msgstr "error intern en el passeig per revisions" -#: builtin/checkout.c:808 +#: builtin/checkout.c:817 msgid "Previous HEAD position was" msgstr "La posició de HEAD anterior era" -#: builtin/checkout.c:836 builtin/checkout.c:1034 +#: builtin/checkout.c:845 builtin/checkout.c:1047 msgid "You are on a branch yet to be born" msgstr "Sou en una branca que encara ha de néixer" -#: builtin/checkout.c:940 +#: builtin/checkout.c:952 #, c-format msgid "only one reference expected, %d given." msgstr "s'esperava només una referència, s'han donat %d." -#: builtin/checkout.c:980 builtin/worktree.c:249 +#: builtin/checkout.c:993 builtin/worktree.c:241 builtin/worktree.c:396 #, c-format msgid "invalid reference: %s" msgstr "referència no vàlida: %s" -#: builtin/checkout.c:1009 +#: builtin/checkout.c:1022 #, c-format msgid "reference is not a tree: %s" msgstr "la referència no és un arbre: %s" -#: builtin/checkout.c:1048 +#: builtin/checkout.c:1061 msgid "paths cannot be used with switching branches" msgstr "els camins no es poden usar amb canvi de branca" -#: builtin/checkout.c:1051 builtin/checkout.c:1055 +#: builtin/checkout.c:1064 builtin/checkout.c:1068 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "«%s» no es pot usar amb canvi de branca" -#: builtin/checkout.c:1059 builtin/checkout.c:1062 builtin/checkout.c:1067 -#: builtin/checkout.c:1070 +#: builtin/checkout.c:1072 builtin/checkout.c:1075 builtin/checkout.c:1080 +#: builtin/checkout.c:1083 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "«%s» no es pot usar amb «%s»" -#: builtin/checkout.c:1075 +#: builtin/checkout.c:1088 #, c-format 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:1121 builtin/checkout.c:1123 builtin/clone.c:119 +#: builtin/remote.c:168 builtin/remote.c:170 builtin/worktree.c:440 +#: builtin/worktree.c:442 msgid "branch" msgstr "branca" -#: builtin/checkout.c:1108 +#: builtin/checkout.c:1122 msgid "create and checkout a new branch" msgstr "crea i agafa una branca nova" -#: builtin/checkout.c:1110 +#: builtin/checkout.c:1124 msgid "create/reset and checkout a branch" msgstr "crea/restableix i agafa una branca" -#: builtin/checkout.c:1111 +#: builtin/checkout.c:1125 msgid "create reflog for new branch" msgstr "crea un registre de referència per a la branca nova" -#: builtin/checkout.c:1112 builtin/worktree.c:391 +#: builtin/checkout.c:1126 builtin/worktree.c:444 msgid "detach HEAD at named commit" msgstr "separa HEAD a la comissió anomenada" -#: builtin/checkout.c:1113 +#: builtin/checkout.c:1127 msgid "set upstream info for new branch" msgstr "estableix la informació de font de la branca nova" -#: builtin/checkout.c:1115 +#: builtin/checkout.c:1129 msgid "new-branch" msgstr "branca-nova" -#: builtin/checkout.c:1115 +#: builtin/checkout.c:1129 msgid "new unparented branch" msgstr "branca òrfena nova" -#: builtin/checkout.c:1116 +#: builtin/checkout.c:1131 msgid "checkout our version for unmerged files" msgstr "agafa la versió nostra dels fitxers sense fusionar" -#: builtin/checkout.c:1118 +#: builtin/checkout.c:1134 msgid "checkout their version for unmerged files" msgstr "agafa la versió seva dels fitxers sense fusionar" -#: builtin/checkout.c:1120 +#: builtin/checkout.c:1136 msgid "force checkout (throw away local modifications)" msgstr "agafa a la força (descarta qualsevol modificació local)" -#: builtin/checkout.c:1122 +#: builtin/checkout.c:1138 msgid "perform a 3-way merge with the new branch" msgstr "realitza una fusió de 3 vies amb la branca nova" -#: builtin/checkout.c:1124 builtin/merge.c:239 +#: builtin/checkout.c:1140 builtin/merge.c:273 msgid "update ignored files (default)" msgstr "actualitza els fitxers ignorats (per defecte)" -#: builtin/checkout.c:1126 builtin/log.c:1499 parse-options.h:263 +#: builtin/checkout.c:1142 builtin/log.c:1510 parse-options.h:264 msgid "style" msgstr "estil" -#: builtin/checkout.c:1127 +#: builtin/checkout.c:1143 msgid "conflict style (merge or diff3)" msgstr "estil de conflicte (fusió o diff3)" -#: builtin/checkout.c:1130 +#: builtin/checkout.c:1146 msgid "do not limit pathspecs to sparse entries only" msgstr "no limitis les especificacions de camí només a entrades disperses" -#: builtin/checkout.c:1132 +#: builtin/checkout.c:1148 msgid "second guess 'git checkout <no-such-branch>'" msgstr "dubta 'git checkout <cap-branca-així>'" -#: builtin/checkout.c:1134 +#: builtin/checkout.c:1150 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:1154 builtin/clone.c:86 builtin/fetch.c:138 +#: builtin/merge.c:270 builtin/pull.c:128 builtin/push.c:572 +#: builtin/send-pack.c:174 msgid "force progress reporting" msgstr "força l'informe de progrés" -#: builtin/checkout.c:1168 +#: builtin/checkout.c:1184 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-b, -B i --orphan són mútuament excloents" -#: builtin/checkout.c:1185 +#: builtin/checkout.c:1201 msgid "--track needs a branch name" msgstr "--track necessita un nom de branca" -#: builtin/checkout.c:1190 -msgid "Missing branch name; try -b" +#: builtin/checkout.c:1206 +#, fuzzy +msgid "missing branch name; try -b" msgstr "Manca el nom de branca; proveu -b" -#: builtin/checkout.c:1226 +#: builtin/checkout.c:1243 msgid "invalid path specification" msgstr "especificació de camí no vàlida" -#: builtin/checkout.c:1233 +#: builtin/checkout.c:1250 #, 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ó" -#: builtin/checkout.c:1237 +#: builtin/checkout.c:1254 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: --detach no accepta un paràmetre de camí «%s»" -#: builtin/checkout.c:1241 +#: builtin/checkout.c:1258 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -6854,38 +8464,55 @@ msgstr "" "git checkout: --ours/--theirs, --force i --merge són incompatibles en\n" "agafar de l'índex." -#: builtin/clean.c:26 +#: builtin/checkout.c:1278 +#, c-format +msgid "" +"'%s' matched more than one remote tracking branch.\n" +"We found %d remotes with a reference that matched. So we fell back\n" +"on trying to resolve the argument as a path, but failed there too!\n" +"\n" +"If you meant to check out a remote tracking branch on, e.g. 'origin',\n" +"you can do so by fully qualifying the name with the --track option:\n" +"\n" +" git checkout --track origin/<name>\n" +"\n" +"If you'd like to always have checkouts of an ambiguous <name> prefer\n" +"one remote, e.g. the 'origin' remote, consider setting\n" +"checkout.defaultRemote=origin in your config." +msgstr "" + +#: builtin/clean.c:27 msgid "" "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." msgstr "" "git clean [-d] [-f] [-i] [-n] [-q] [-e <patró>] [-x | -X] [--] <camins>..." -#: builtin/clean.c:30 +#: builtin/clean.c:31 #, c-format msgid "Removing %s\n" msgstr "S'està eliminant %s\n" -#: builtin/clean.c:31 +#: builtin/clean.c:32 #, c-format msgid "Would remove %s\n" msgstr "Eliminaria %s\n" -#: builtin/clean.c:32 +#: builtin/clean.c:33 #, c-format msgid "Skipping repository %s\n" msgstr "S'està ometent el dipòsit %s\n" -#: builtin/clean.c:33 +#: builtin/clean.c:34 #, c-format msgid "Would skip repository %s\n" msgstr "Ometria el dipòsit %s\n" -#: builtin/clean.c:34 +#: builtin/clean.c:35 #, c-format msgid "failed to remove %s" msgstr "s'ha produït un error en eliminar %s" -#: builtin/clean.c:302 git-add--interactive.perl:572 +#: builtin/clean.c:297 git-add--interactive.perl:579 #, c-format msgid "" "Prompt help:\n" @@ -6898,7 +8525,7 @@ msgstr "" "foo - selecciona un ítem basat en un prefix únic\n" " - (buit) no seleccionis res\n" -#: builtin/clean.c:306 git-add--interactive.perl:581 +#: builtin/clean.c:301 git-add--interactive.perl:588 #, c-format msgid "" "Prompt help:\n" @@ -6919,38 +8546,38 @@ 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:517 git-add--interactive.perl:554 +#: git-add--interactive.perl:559 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "Perdó (%s)?\n" -#: builtin/clean.c:664 +#: builtin/clean.c:659 #, c-format msgid "Input ignore patterns>> " msgstr "Introduïu els patrons a ignorar>> " -#: builtin/clean.c:701 +#: builtin/clean.c:696 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "ADVERTÈNCIA: No es poden trobar ítems que coincideixin amb: %s" -#: builtin/clean.c:722 +#: builtin/clean.c:717 msgid "Select items to delete" msgstr "Selecciona els ítems a suprimir" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:763 +#: builtin/clean.c:758 #, c-format msgid "Remove %s [y/N]? " msgstr "Voleu eliminar %s [y/N]? " -#: builtin/clean.c:788 git-add--interactive.perl:1710 +#: builtin/clean.c:783 git-add--interactive.perl:1717 #, c-format msgid "Bye.\n" msgstr "Adeu.\n" -#: builtin/clean.c:796 +#: builtin/clean.c:791 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -6968,64 +8595,64 @@ msgstr "" "help - aquesta pantalla\n" "? - ajuda de selecció de l'avís" -#: builtin/clean.c:823 git-add--interactive.perl:1786 +#: builtin/clean.c:818 git-add--interactive.perl:1793 msgid "*** Commands ***" msgstr "*** Ordres ***" -#: builtin/clean.c:824 git-add--interactive.perl:1783 +#: builtin/clean.c:819 git-add--interactive.perl:1790 msgid "What now" msgstr "I ara què" -#: builtin/clean.c:832 +#: builtin/clean.c:827 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "Eliminaria l'ítem següent:" msgstr[1] "Eliminaria els ítems següents:" -#: builtin/clean.c:848 +#: builtin/clean.c:843 msgid "No more files to clean, exiting." msgstr "No hi ha més fitxers a netejar; s'està sortint." -#: builtin/clean.c:910 +#: builtin/clean.c:905 msgid "do not print names of files removed" msgstr "no imprimeixis els noms dels fitxers eliminats" -#: builtin/clean.c:912 +#: builtin/clean.c:907 msgid "force" msgstr "força" -#: builtin/clean.c:913 +#: builtin/clean.c:908 msgid "interactive cleaning" msgstr "neteja interactiva" -#: builtin/clean.c:915 +#: builtin/clean.c:910 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:911 builtin/describe.c:545 builtin/describe.c:547 +#: builtin/grep.c:875 builtin/log.c:161 builtin/log.c:163 +#: builtin/ls-files.c:549 builtin/name-rev.c:415 builtin/name-rev.c:417 +#: builtin/show-ref.c:177 msgid "pattern" msgstr "patró" -#: builtin/clean.c:917 +#: builtin/clean.c:912 msgid "add <pattern> to ignore rules" msgstr "afegiu <patró> per a ignorar les regles" -#: builtin/clean.c:918 +#: builtin/clean.c:913 msgid "remove ignored files, too" msgstr "elimina els fitxers ignorats, també" -#: builtin/clean.c:920 +#: builtin/clean.c:915 msgid "remove only ignored files" msgstr "elimina només els fitxers ignorats" -#: builtin/clean.c:938 +#: builtin/clean.c:933 msgid "-x and -X cannot be used together" msgstr "-x i -X no es poden usar junts" -#: builtin/clean.c:942 +#: builtin/clean.c:937 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" @@ -7033,7 +8660,7 @@ msgstr "" "clean.requireForce està establerta en cert i ni -i, -n ni -f s'han indicat; " "refusant netejar" -#: builtin/clean.c:945 +#: builtin/clean.c:940 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -7041,145 +8668,147 @@ msgstr "" "clean.requireForce és per defecte cert i ni -i, -n ni -f s'han indicat; " "refusant netejar" -#: builtin/clone.c:40 +#: builtin/clone.c:43 msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<opcions>] [--] <dipòsit> [<directori>]" -#: builtin/clone.c:85 +#: builtin/clone.c:88 msgid "don't create a checkout" msgstr "no facis cap agafament" -#: builtin/clone.c:86 builtin/clone.c:88 builtin/init-db.c:479 +#: builtin/clone.c:89 builtin/clone.c:91 builtin/init-db.c:480 msgid "create a bare repository" msgstr "crea un dipòsit nu" -#: builtin/clone.c:90 +#: builtin/clone.c:93 msgid "create a mirror repository (implies bare)" msgstr "crea un dipòsit mirall (implica bare)" -#: builtin/clone.c:92 +#: builtin/clone.c:95 msgid "to clone from a local repository" msgstr "per a clonar des d'un dipòsit local" -#: builtin/clone.c:94 +#: builtin/clone.c:97 msgid "don't use local hardlinks, always copy" msgstr "no usis enllaços durs locals, sempre copia" -#: builtin/clone.c:96 +#: builtin/clone.c:99 msgid "setup as shared repository" msgstr "configura com a dipòsit compartit" -#: builtin/clone.c:98 builtin/clone.c:102 +#: builtin/clone.c:101 builtin/clone.c:105 msgid "pathspec" msgstr "especificació de camí" -#: builtin/clone.c:98 builtin/clone.c:102 +#: builtin/clone.c:101 builtin/clone.c:105 msgid "initialize submodules in the clone" msgstr "inicialitza els submòduls en el clon" -#: builtin/clone.c:105 +#: builtin/clone.c:108 msgid "number of submodules cloned in parallel" msgstr "nombre de submòduls clonats en paral·lel" -#: builtin/clone.c:106 builtin/init-db.c:476 +#: builtin/clone.c:109 builtin/init-db.c:477 msgid "template-directory" msgstr "directori-de-plantilla" -#: builtin/clone.c:107 builtin/init-db.c:477 +#: builtin/clone.c:110 builtin/init-db.c:478 msgid "directory from which templates will be used" msgstr "directori des del qual s'usaran les plantilles" -#: builtin/clone.c:109 builtin/clone.c:111 builtin/submodule--helper.c:1210 -#: builtin/submodule--helper.c:1577 +#: builtin/clone.c:112 builtin/clone.c:114 builtin/submodule--helper.c:1368 +#: builtin/submodule--helper.c:1739 msgid "reference repository" msgstr "dipòsit de referència" -#: builtin/clone.c:113 +#: builtin/clone.c:116 builtin/submodule--helper.c:1370 +#: builtin/submodule--helper.c:1741 msgid "use --reference only while cloning" msgstr "usa --reference només en clonar" -#: builtin/clone.c:114 builtin/column.c:27 builtin/merge-file.c:44 +#: builtin/clone.c:117 builtin/column.c:27 builtin/merge-file.c:44 +#: builtin/pack-objects.c:3191 builtin/repack.c:320 msgid "name" msgstr "nom" -#: builtin/clone.c:115 +#: builtin/clone.c:118 msgid "use <name> instead of 'origin' to track upstream" msgstr "usa <nom> en lloc de 'origin' per a seguir la font" -#: builtin/clone.c:117 +#: builtin/clone.c:120 msgid "checkout <branch> instead of the remote's HEAD" msgstr "agafa <branca> en lloc de la HEAD del remot" -#: builtin/clone.c:119 +#: builtin/clone.c:122 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:123 builtin/fetch.c:139 builtin/grep.c:814 +#: builtin/pull.c:216 msgid "depth" msgstr "profunditat" -#: builtin/clone.c:121 +#: builtin/clone.c:124 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 +#: builtin/clone.c:125 builtin/fetch.c:141 builtin/pack-objects.c:3182 #: parse-options.h:154 msgid "time" msgstr "hora" -#: builtin/clone.c:123 +#: builtin/clone.c:126 msgid "create a shallow clone since a specific time" msgstr "crea un clon superficial des d'una hora específica" -#: builtin/clone.c:124 builtin/fetch.c:155 +#: builtin/clone.c:127 builtin/fetch.c:143 builtin/fetch.c:166 msgid "revision" msgstr "revisió" -#: builtin/clone.c:125 builtin/fetch.c:156 +#: builtin/clone.c:128 builtin/fetch.c:144 msgid "deepen history of shallow clone, excluding rev" msgstr "aprofundeix la història d'un clon superficial, excloent una revisió" -#: builtin/clone.c:127 +#: builtin/clone.c:130 msgid "clone only one branch, HEAD or --branch" msgstr "clona només una branca, HEAD o --branch" -#: builtin/clone.c:129 +#: builtin/clone.c:132 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" -#: builtin/clone.c:131 +#: builtin/clone.c:134 msgid "any cloned submodules will be shallow" msgstr "qualsevol submòdul clonat serà superficial" -#: builtin/clone.c:132 builtin/init-db.c:485 +#: builtin/clone.c:135 builtin/init-db.c:486 msgid "gitdir" msgstr "directori de git" -#: builtin/clone.c:133 builtin/init-db.c:486 +#: builtin/clone.c:136 builtin/init-db.c:487 msgid "separate git dir from working tree" msgstr "separa el directori de git de l'arbre de treball" -#: builtin/clone.c:134 +#: builtin/clone.c:137 msgid "key=value" msgstr "clau=valor" -#: builtin/clone.c:135 +#: builtin/clone.c:138 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:139 builtin/fetch.c:162 builtin/pull.c:229 +#: builtin/push.c:583 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:141 builtin/fetch.c:164 builtin/pull.c:232 +#: builtin/push.c:585 msgid "use IPv6 addresses only" msgstr "usa només adreces IPv6" -#: builtin/clone.c:276 +#: builtin/clone.c:279 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -7187,42 +8816,42 @@ msgstr "" "No s'ha pogut endevinar cap nom de directori.\n" "Especifiqueu un directori en la línia d'ordres" -#: builtin/clone.c:329 +#: builtin/clone.c:332 #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "info: No s'ha pogut afegir un alternatiu per a «%s»: %s\n" -#: builtin/clone.c:401 +#: builtin/clone.c:404 #, c-format msgid "failed to open '%s'" msgstr "s'ha produït un error en obrir «%s»" -#: builtin/clone.c:409 +#: builtin/clone.c:412 #, c-format msgid "%s exists and is not a directory" msgstr "%s existeix i no és directori" -#: builtin/clone.c:423 +#: builtin/clone.c:426 #, c-format msgid "failed to stat %s\n" msgstr "s'ha produït un error en fer stat a '%s'\n" -#: builtin/clone.c:445 +#: builtin/clone.c:448 #, c-format msgid "failed to create link '%s'" msgstr "s'ha produït un error en crear l'enllaç «%s»" -#: builtin/clone.c:449 +#: builtin/clone.c:452 #, c-format msgid "failed to copy file to '%s'" msgstr "s'ha produït un error en copiar el fitxer a «%s»" -#: builtin/clone.c:475 +#: builtin/clone.c:478 #, c-format msgid "done.\n" msgstr "fet.\n" -#: builtin/clone.c:489 +#: builtin/clone.c:492 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -7233,101 +8862,97 @@ msgstr "" "'git status' i tornar a intentar l'agafament amb\n" "'git checkout -f HEAD'\n" -#: builtin/clone.c:566 +#: builtin/clone.c:569 #, c-format msgid "Could not find remote branch %s to clone." msgstr "No s'ha pogut trobar la branca remota %s per a clonar." -#: builtin/clone.c:661 -msgid "remote did not send all necessary objects" -msgstr "el remot no ha enviat tots els objectes necessaris" - -#: builtin/clone.c:677 +#: builtin/clone.c:680 #, c-format msgid "unable to update %s" msgstr "no s'ha pogut actualitzar %s" -#: builtin/clone.c:726 +#: builtin/clone.c:730 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" "la HEAD remot es refereix a una referència que no existeix; no s'ha pogut " "agafar.\n" -#: builtin/clone.c:756 +#: builtin/clone.c:760 msgid "unable to checkout working tree" msgstr "no s'ha pogut agafar l'arbre de treball" -#: builtin/clone.c:801 +#: builtin/clone.c:805 msgid "unable to write parameters to config file" msgstr "no s'han pogut escriure els paràmetres al fitxer de configuració" -#: builtin/clone.c:864 +#: builtin/clone.c:868 msgid "cannot repack to clean up" msgstr "no es pot reempaquetar per a netejar" -#: builtin/clone.c:866 +#: builtin/clone.c:870 msgid "cannot unlink temporary alternates file" msgstr "no es pot desenllaçar el fitxer d'alternatives temporal" -#: builtin/clone.c:906 builtin/receive-pack.c:1946 +#: builtin/clone.c:910 builtin/receive-pack.c:1935 msgid "Too many arguments." msgstr "Hi ha massa paràmetres." -#: builtin/clone.c:910 +#: builtin/clone.c:914 msgid "You must specify a repository to clone." msgstr "Heu d'especificar un dipòsit per a clonar." -#: builtin/clone.c:923 +#: builtin/clone.c:927 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "les opcions --bare i --origin %s són incompatibles." -#: builtin/clone.c:926 +#: builtin/clone.c:930 msgid "--bare and --separate-git-dir are incompatible." msgstr "--bare i --separate-git-dir són incompatibles." -#: builtin/clone.c:939 +#: builtin/clone.c:943 #, c-format msgid "repository '%s' does not exist" msgstr "el dipòsit «%s» no existeix" -#: builtin/clone.c:945 builtin/fetch.c:1455 +#: builtin/clone.c:949 builtin/fetch.c:1512 #, c-format msgid "depth %s is not a positive number" msgstr "la profunditat %s no és nombre positiu" -#: builtin/clone.c:955 +#: builtin/clone.c:959 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "el camí destí «%s» ja existeix i no és un directori buit." -#: builtin/clone.c:965 +#: builtin/clone.c:969 #, c-format 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:984 builtin/clone.c:1005 builtin/difftool.c:271 +#: builtin/worktree.c:247 builtin/worktree.c:277 #, c-format msgid "could not create leading directories of '%s'" msgstr "no s'han pogut crear els directoris inicials de «%s»" -#: builtin/clone.c:985 +#: builtin/clone.c:989 #, c-format msgid "could not create work tree dir '%s'" msgstr "no s'ha pogut crear el directori d'arbre de treball «%s»" -#: builtin/clone.c:1005 +#: builtin/clone.c:1009 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "S'està clonant al dipòsit nu «%s»...\n" -#: builtin/clone.c:1007 +#: builtin/clone.c:1011 #, c-format msgid "Cloning into '%s'...\n" msgstr "S'està clonant a «%s»...\n" -#: builtin/clone.c:1031 +#: builtin/clone.c:1035 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" @@ -7335,38 +8960,38 @@ msgstr "" "clone --recursive no és compatible amb ambdós --reference i --reference-if-" "able" -#: builtin/clone.c:1093 +#: builtin/clone.c:1096 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth s'ignora en els clons locals; useu file:// en lloc d'això." -#: builtin/clone.c:1095 +#: builtin/clone.c:1098 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ò." -#: builtin/clone.c:1097 +#: builtin/clone.c:1100 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ò." -#: builtin/clone.c:1099 +#: builtin/clone.c:1102 msgid "--filter is ignored in local clones; use file:// instead." msgstr "--filter s'ignora en els clons locals; useu file:// en lloc d'això." -#: builtin/clone.c:1102 +#: builtin/clone.c:1105 msgid "source repository is shallow, ignoring --local" msgstr "el dipòsit font és superficial, s'està ignorant --local" -#: builtin/clone.c:1107 +#: builtin/clone.c:1110 msgid "--local is ignored" msgstr "--local s'ignora" -#: builtin/clone.c:1169 builtin/clone.c:1177 +#: builtin/clone.c:1180 builtin/clone.c:1188 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "La branca remota %s no es troba en la font %s" -#: builtin/clone.c:1180 +#: builtin/clone.c:1191 msgid "You appear to have cloned an empty repository." msgstr "Sembla que heu clonat un dipòsit buit." @@ -7398,19 +9023,19 @@ msgstr "Espai d'encoixinada en el marge dret" msgid "Padding space between columns" msgstr "Espai d'encoixinada entre columnes" -#: builtin/column.c:52 +#: builtin/column.c:51 msgid "--command must be the first argument" msgstr "--command ha de ser el primer paràmetre" -#: builtin/commit.c:37 +#: builtin/commit.c:38 msgid "git commit [<options>] [--] <pathspec>..." msgstr "git commit [<opcions>] [--] <especificació-de-camí>..." -#: builtin/commit.c:42 +#: builtin/commit.c:43 msgid "git status [<options>] [--] <pathspec>..." msgstr "git status [<opcions>] [--] <especificació-de-camí>..." -#: builtin/commit.c:47 +#: builtin/commit.c:48 msgid "" "You asked to amend the most recent commit, but doing so would make\n" "it empty. You can repeat your command with --allow-empty, or you can\n" @@ -7420,7 +9045,7 @@ msgstr "" "deixaria buida. Podeu repetir la vostra ordre amb --allow-empty, o\n" "podeu eliminar la comissió per complet amb \"git reset HEAD^\".\n" -#: builtin/commit.c:52 +#: builtin/commit.c:53 msgid "" "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" "If you wish to commit it anyway, use:\n" @@ -7435,11 +9060,11 @@ msgstr "" " git commit --allow-empty\n" "\n" -#: builtin/commit.c:59 +#: builtin/commit.c:60 msgid "Otherwise, please use 'git reset'\n" msgstr "D'altra manera, useu «git reset»\n" -#: builtin/commit.c:62 +#: builtin/commit.c:63 msgid "" "If you wish to skip this commit, use:\n" "\n" @@ -7455,61 +9080,61 @@ msgstr "" "Llavors \"git cherry-pick --continue\" reprendrà\n" "com a «cherry pick» les comissions restants.\n" -#: builtin/commit.c:284 +#: builtin/commit.c:306 msgid "failed to unpack HEAD tree object" msgstr "s'ha produït un error en desempaquetar l'objecte d'arbre HEAD" -#: builtin/commit.c:325 +#: builtin/commit.c:347 msgid "unable to create temporary index" msgstr "no s'ha pogut crear un índex temporal" -#: builtin/commit.c:331 +#: builtin/commit.c:353 msgid "interactive add failed" msgstr "l'afegiment interactiu ha fallat" -#: builtin/commit.c:344 +#: builtin/commit.c:366 msgid "unable to update temporary index" msgstr "no s'ha pogut actualitzar l'índex temporal" -#: builtin/commit.c:346 +#: builtin/commit.c:368 msgid "Failed to update main cache tree" msgstr "S'ha produït un error en actualitzar l'arbre principal de memòria cau" -#: builtin/commit.c:371 builtin/commit.c:395 builtin/commit.c:444 +#: builtin/commit.c:393 builtin/commit.c:416 builtin/commit.c:462 msgid "unable to write new_index file" msgstr "no s'ha pogut escriure el fitxer new_index" -#: builtin/commit.c:427 +#: builtin/commit.c:445 msgid "cannot do a partial commit during a merge." msgstr "no es pot fer una comissió parcial durant una fusió." -#: builtin/commit.c:429 +#: builtin/commit.c:447 msgid "cannot do a partial commit during a cherry-pick." msgstr "no es pot fer una comissió parcial durant un «cherry pick»." -#: builtin/commit.c:437 +#: builtin/commit.c:455 msgid "cannot read the index" msgstr "no es pot llegir l'índex" -#: builtin/commit.c:456 +#: builtin/commit.c:474 msgid "unable to write temporary index file" msgstr "no s'ha pogut escriure un fitxer d'índex temporal" -#: builtin/commit.c:553 +#: builtin/commit.c:571 #, c-format msgid "commit '%s' lacks author header" msgstr "a la comissió «%s» li manca la capçalera d'autor" -#: builtin/commit.c:555 +#: builtin/commit.c:573 #, c-format msgid "commit '%s' has malformed author line" msgstr "la comissió «%s» té una línia d'autor mal formada" -#: builtin/commit.c:574 +#: builtin/commit.c:592 msgid "malformed --author parameter" msgstr "paràmetre --author mal format" -#: builtin/commit.c:626 +#: builtin/commit.c:644 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -7517,38 +9142,38 @@ msgstr "" "no es pot seleccionar un caràcter de comentari que\n" "no sigui usat en el missatge de comissió actual" -#: builtin/commit.c:663 builtin/commit.c:696 builtin/commit.c:1024 +#: builtin/commit.c:681 builtin/commit.c:714 builtin/commit.c:1042 #, c-format msgid "could not lookup commit %s" msgstr "no s'ha pogut trobar la comissió %s" -#: builtin/commit.c:675 builtin/shortlog.c:309 +#: builtin/commit.c:693 builtin/shortlog.c:317 #, c-format msgid "(reading log message from standard input)\n" msgstr "(s'està llegint el missatge de registre des de l'entrada estàndard)\n" -#: builtin/commit.c:677 +#: builtin/commit.c:695 msgid "could not read log from standard input" msgstr "no s'ha pogut llegir el registre des de l'entrada estàndard" -#: builtin/commit.c:681 +#: builtin/commit.c:699 #, c-format msgid "could not read log file '%s'" msgstr "no s'ha pogut llegir el fitxer de registre «%s»" -#: builtin/commit.c:710 builtin/commit.c:718 +#: builtin/commit.c:728 builtin/commit.c:736 msgid "could not read SQUASH_MSG" msgstr "no s'ha pogut llegir SQUASH_MSG" -#: builtin/commit.c:715 +#: builtin/commit.c:733 msgid "could not read MERGE_MSG" msgstr "no s'ha pogut llegir MERGE_MSG" -#: builtin/commit.c:769 +#: builtin/commit.c:787 msgid "could not write commit template" msgstr "no s'ha pogut escriure la plantilla de comissió" -#: builtin/commit.c:787 +#: builtin/commit.c:805 #, c-format msgid "" "\n" @@ -7563,7 +9188,7 @@ msgstr "" "\t%s\n" "i intenteu-ho de nou.\n" -#: builtin/commit.c:792 +#: builtin/commit.c:810 #, c-format msgid "" "\n" @@ -7578,7 +9203,7 @@ msgstr "" "\t%s\n" "i intenteu-ho de nou.\n" -#: builtin/commit.c:805 +#: builtin/commit.c:823 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -7588,7 +9213,7 @@ msgstr "" "S'ignoraran les línies començant amb '%c', i un missatge de\n" "comissió buit avorta la comissió.\n" -#: builtin/commit.c:813 +#: builtin/commit.c:831 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -7600,149 +9225,149 @@ msgstr "" "vosaltres\n" "mateixos si voleu. Un missatge buit avorta la comissió.\n" -#: builtin/commit.c:830 +#: builtin/commit.c:848 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sAutor: %.*s <%.*s>" -#: builtin/commit.c:838 +#: builtin/commit.c:856 #, c-format msgid "%sDate: %s" msgstr "%sData: %s" -#: builtin/commit.c:845 +#: builtin/commit.c:863 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sComitent: %.*s <%.*s>" -#: builtin/commit.c:862 +#: builtin/commit.c:880 msgid "Cannot read index" msgstr "No es pot llegir l'índex" -#: builtin/commit.c:928 +#: builtin/commit.c:946 msgid "Error building trees" msgstr "Error en construir arbres" -#: builtin/commit.c:942 builtin/tag.c:256 +#: builtin/commit.c:960 builtin/tag.c:258 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Especifiqueu el missatge usant l'opció -m o l'opció -F.\n" -#: builtin/commit.c:986 +#: builtin/commit.c:1004 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "" "--author «%s» no és «Nom <adreça-electrònica>» i no coincideix amb\n" "cap autor existent" -#: builtin/commit.c:1000 +#: builtin/commit.c:1018 #, c-format msgid "Invalid ignored mode '%s'" msgstr "mode ignorat no vàlid «%s»" -#: builtin/commit.c:1014 builtin/commit.c:1264 +#: builtin/commit.c:1032 builtin/commit.c:1269 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Mode de fitxers no seguits no vàlid «%s»" -#: builtin/commit.c:1052 +#: builtin/commit.c:1070 msgid "--long and -z are incompatible" msgstr "--long i -z són incompatibles" -#: builtin/commit.c:1085 +#: builtin/commit.c:1103 msgid "Using both --reset-author and --author does not make sense" msgstr "Usar ambdós --reset-author i --author no té sentit" -#: builtin/commit.c:1094 +#: builtin/commit.c:1112 msgid "You have nothing to amend." msgstr "No teniu res a esmenar." -#: builtin/commit.c:1097 +#: builtin/commit.c:1115 msgid "You are in the middle of a merge -- cannot amend." msgstr "Esteu enmig d'una fusió -- no es pot esmenar." -#: builtin/commit.c:1099 +#: builtin/commit.c:1117 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "Esteu enmig d'un «cherry pick» -- no es pot esmenar." -#: builtin/commit.c:1102 +#: builtin/commit.c:1120 msgid "Options --squash and --fixup cannot be used together" msgstr "Les opcions --squash i --fixup no es poden usar juntes" -#: builtin/commit.c:1112 +#: builtin/commit.c:1130 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "Només un de -c/-C/-F/--fixup es pot usar." -#: builtin/commit.c:1114 +#: builtin/commit.c:1132 msgid "Option -m cannot be combined with -c/-C/-F." msgstr "L'opció -m no es pot combinar amb -c/-C/-F/." -#: builtin/commit.c:1122 +#: builtin/commit.c:1140 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author només es pot usar amb -C, -c o --amend." -#: builtin/commit.c:1139 +#: builtin/commit.c:1157 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "Només un de --include/--only/--all/--interactive/--patch es pot usar." -#: builtin/commit.c:1141 +#: builtin/commit.c:1159 msgid "No paths with --include/--only does not make sense." msgstr "--include/--only no té sentit sense camí." -#: builtin/commit.c:1155 builtin/tag.c:542 +#: builtin/commit.c:1173 builtin/tag.c:544 #, c-format msgid "Invalid cleanup mode %s" msgstr "Mode de neteja no vàlid %s" -#: builtin/commit.c:1160 +#: builtin/commit.c:1178 msgid "Paths with -a does not make sense." msgstr "-a no té sentit amb camins." -#: builtin/commit.c:1278 builtin/commit.c:1443 +#: builtin/commit.c:1303 builtin/commit.c:1480 msgid "show status concisely" msgstr "mostra l'estat concisament" -#: builtin/commit.c:1280 builtin/commit.c:1445 +#: builtin/commit.c:1305 builtin/commit.c:1482 msgid "show branch information" msgstr "mostra la informació de branca" -#: builtin/commit.c:1282 +#: builtin/commit.c:1307 msgid "show stash information" msgstr "mostra la informació de «stash»" -#: 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 "versió" -#: 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:591 msgid "machine-readable output" msgstr "sortida llegible per màquina" -#: builtin/commit.c:1289 builtin/commit.c:1451 +#: builtin/commit.c:1314 builtin/commit.c:1488 msgid "show status in long format (default)" msgstr "mostra l'estat en format llarg (per defecte)" -#: builtin/commit.c:1292 builtin/commit.c:1454 +#: builtin/commit.c:1317 builtin/commit.c:1491 msgid "terminate entries with NUL" msgstr "acaba les entrades amb NUL" -#: 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:1007 builtin/fast-export.c:1010 builtin/tag.c:398 msgid "mode" msgstr "mode" -#: 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 "" "mostra els fitxers no seguits, modes opcionals: all, normal, no. (Per " "defecte: all)" -#: builtin/commit.c:1299 +#: builtin/commit.c:1324 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" @@ -7750,11 +9375,11 @@ msgstr "" "mostra els fitxers ignorats, modes opcionals: traditional, matching, no. " "(Per defecte: traditional, matching, no.)" -#: builtin/commit.c:1301 parse-options.h:167 +#: builtin/commit.c:1326 parse-options.h:167 msgid "when" msgstr "quan" -#: builtin/commit.c:1302 +#: builtin/commit.c:1327 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -7762,189 +9387,199 @@ msgstr "" "ignora els canvis als submòduls, opcional quan: all, dirty, untracked. (Per " "defecte: all)" -#: builtin/commit.c:1304 +#: builtin/commit.c:1329 msgid "list untracked files in columns" msgstr "mostra els fitxers no seguits en columnes" -#: builtin/commit.c:1323 +#: builtin/commit.c:1330 +#, fuzzy +msgid "do not detect renames" +msgstr "no consultis els remots" + +#: 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 "omet el resum després d'una comissió reeixida" -#: builtin/commit.c:1414 +#: builtin/commit.c:1451 msgid "show diff in commit message template" msgstr "mostra la diferència en la plantilla de missatge de comissió" -#: builtin/commit.c:1416 +#: builtin/commit.c:1453 msgid "Commit message options" msgstr "Opcions de missatge de comissió" -#: builtin/commit.c:1417 builtin/tag.c:393 +#: builtin/commit.c:1454 builtin/merge.c:261 builtin/tag.c:395 msgid "read message from file" msgstr "llegiu el missatge des d'un fitxer" -#: builtin/commit.c:1418 +#: builtin/commit.c:1455 msgid "author" msgstr "autor" -#: builtin/commit.c:1418 +#: builtin/commit.c:1455 msgid "override author for commit" msgstr "autor corregit de la comissió" -#: builtin/commit.c:1419 builtin/gc.c:359 +#: builtin/commit.c:1456 builtin/gc.c:504 msgid "date" msgstr "data" -#: builtin/commit.c:1419 +#: builtin/commit.c:1456 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:1457 builtin/merge.c:257 builtin/notes.c:404 +#: builtin/notes.c:567 builtin/tag.c:393 msgid "message" msgstr "missatge" -#: builtin/commit.c:1420 +#: builtin/commit.c:1457 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:1458 builtin/commit.c:1459 builtin/commit.c:1460 +#: builtin/commit.c:1461 parse-options.h:270 ref-filter.h:92 msgid "commit" msgstr "comissió" -#: builtin/commit.c:1421 +#: builtin/commit.c:1458 msgid "reuse and edit message from specified commit" msgstr "reusa i edita el missatge de la comissió especificada" -#: builtin/commit.c:1422 +#: builtin/commit.c:1459 msgid "reuse message from specified commit" msgstr "reusa el missatge de la comissió especificada" -#: builtin/commit.c:1423 +#: builtin/commit.c:1460 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "usa el missatge formatat de «squash» automàtic per a corregir la comissió " "especificada" -#: builtin/commit.c:1424 +#: builtin/commit.c:1461 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" -#: builtin/commit.c:1425 +#: builtin/commit.c:1462 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:1463 builtin/log.c:1457 builtin/merge.c:274 +#: builtin/pull.c:154 builtin/revert.c:106 msgid "add Signed-off-by:" msgstr "afegeix Signed-off-by:" -#: builtin/commit.c:1427 +#: builtin/commit.c:1464 msgid "use specified template file" msgstr "usa el fitxer de plantilla especificat" -#: builtin/commit.c:1428 +#: builtin/commit.c:1465 msgid "force edit of commit" msgstr "força l'edició de la comissió" -#: builtin/commit.c:1429 +#: builtin/commit.c:1466 msgid "default" msgstr "per defecte" -#: builtin/commit.c:1429 builtin/tag.c:397 +#: builtin/commit.c:1466 builtin/tag.c:399 msgid "how to strip spaces and #comments from message" msgstr "com suprimir els espais i #comentaris del missatge" -#: builtin/commit.c:1430 +#: builtin/commit.c:1467 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:1469 builtin/merge.c:272 builtin/pull.c:184 +#: builtin/revert.c:114 msgid "GPG sign commit" msgstr "signa la comissió amb GPG" -#: builtin/commit.c:1435 +#: builtin/commit.c:1472 msgid "Commit contents options" msgstr "Opcions dels continguts de les comissions" -#: builtin/commit.c:1436 +#: builtin/commit.c:1473 msgid "commit all changed files" msgstr "comet tots els fitxers canviats" -#: builtin/commit.c:1437 +#: builtin/commit.c:1474 msgid "add specified files to index for commit" msgstr "afegeix els fitxers especificats a l'índex per a cometre" -#: builtin/commit.c:1438 +#: builtin/commit.c:1475 msgid "interactively add files" msgstr "afegeix els fitxers interactivament" -#: builtin/commit.c:1439 +#: builtin/commit.c:1476 msgid "interactively add changes" msgstr "afegeix els canvis interactivament" -#: builtin/commit.c:1440 +#: builtin/commit.c:1477 msgid "commit only specified files" msgstr "comet només els fitxers especificats" -#: builtin/commit.c:1441 +#: builtin/commit.c:1478 msgid "bypass pre-commit and commit-msg hooks" msgstr "evita els lligams de precomissió i missatge de comissió" -#: builtin/commit.c:1442 +#: builtin/commit.c:1479 msgid "show what would be committed" msgstr "mostra què es cometria" -#: builtin/commit.c:1455 +#: builtin/commit.c:1492 msgid "amend previous commit" msgstr "esmena la comissió anterior" -#: builtin/commit.c:1456 +#: builtin/commit.c:1493 msgid "bypass post-rewrite hook" msgstr "evita el lligam de post escriptura" -#: builtin/commit.c:1461 +#: builtin/commit.c:1498 msgid "ok to record an empty change" msgstr "està bé registrar un canvi buit" -#: builtin/commit.c:1463 +#: builtin/commit.c:1500 msgid "ok to record a change with an empty message" msgstr "està bé registrar un canvi amb missatge buit" -#: builtin/commit.c:1536 +#: builtin/commit.c:1573 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Fitxer MERGE_HEAD malmès (%s)" -#: builtin/commit.c:1543 +#: builtin/commit.c:1580 msgid "could not read MERGE_MODE" msgstr "no s'ha pogut llegir MERGE_MODE" -#: builtin/commit.c:1562 +#: builtin/commit.c:1599 #, c-format msgid "could not read commit message: %s" msgstr "no s'ha pogut llegir el missatge de comissió: %s" -#: builtin/commit.c:1573 +#: builtin/commit.c:1610 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "S'està avortant la comissió a causa d'un missatge de comissió buit.\n" -#: builtin/commit.c:1578 +#: builtin/commit.c:1615 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "S'està avortant la comissió; no heu editat el missatge.\n" -#: builtin/commit.c:1613 +#: builtin/commit.c:1650 +#, fuzzy msgid "" -"Repository has been updated, but unable to write\n" +"repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" "not exceeded, and then \"git reset HEAD\" to recover." msgstr "" @@ -7953,150 +9588,262 @@ msgstr "" "que la quota no estigui excedida, i després\n" "«git reset HEAD» per a recuperar." +#: builtin/commit-graph.c:10 +msgid "git commit-graph [--object-dir <objdir>]" +msgstr "" + +#: builtin/commit-graph.c:11 builtin/commit-graph.c:23 +msgid "git commit-graph read [--object-dir <objdir>]" +msgstr "" + +#: builtin/commit-graph.c:12 builtin/commit-graph.c:18 +msgid "git commit-graph verify [--object-dir <objdir>]" +msgstr "" + +#: builtin/commit-graph.c:13 builtin/commit-graph.c:28 +msgid "" +"git commit-graph write [--object-dir <objdir>] [--append] [--reachable|--" +"stdin-packs|--stdin-commits]" +msgstr "" + +#: builtin/commit-graph.c:48 builtin/commit-graph.c:77 +#: builtin/commit-graph.c:131 builtin/commit-graph.c:184 builtin/fetch.c:150 +#: builtin/log.c:1477 +msgid "dir" +msgstr "directori" + +#: builtin/commit-graph.c:49 builtin/commit-graph.c:78 +#: builtin/commit-graph.c:132 builtin/commit-graph.c:185 +msgid "The object directory to store the graph" +msgstr "" + +#: builtin/commit-graph.c:134 +msgid "start walk at all refs" +msgstr "" + +#: builtin/commit-graph.c:136 +msgid "scan pack-indexes listed by stdin for commits" +msgstr "" + +#: builtin/commit-graph.c:138 +msgid "start walk at commits listed by stdin" +msgstr "" + +#: builtin/commit-graph.c:140 +msgid "include all commits already in the commit-graph file" +msgstr "" + +#: builtin/commit-graph.c:149 +msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" +msgstr "" + #: builtin/config.c:10 msgid "git config [<options>]" msgstr "git config [<opcions>]" -#: builtin/config.c:58 +#: builtin/config.c:101 +#, fuzzy, c-format +msgid "unrecognized --type argument, %s" +msgstr "paràmetre no reconegut: %s" + +#: builtin/config.c:113 +#, fuzzy +msgid "only one type at a time" +msgstr "emet només coincidències exactes" + +#: builtin/config.c:122 msgid "Config file location" msgstr "Ubicació del fitxer de configuració" -#: builtin/config.c:59 +#: builtin/config.c:123 msgid "use global config file" msgstr "usa el fitxer de configuració global" -#: builtin/config.c:60 +#: builtin/config.c:124 msgid "use system config file" msgstr "usa el fitxer de configuració del sistema" -#: builtin/config.c:61 +#: builtin/config.c:125 msgid "use repository config file" msgstr "usa el fitxer de configuració del dipòsit" -#: builtin/config.c:62 +#: builtin/config.c:126 msgid "use given config file" msgstr "usa el fitxer de configuració donat" -#: builtin/config.c:63 +#: builtin/config.c:127 msgid "blob-id" msgstr "ID de blob" -#: builtin/config.c:63 +#: builtin/config.c:127 msgid "read config from given blob object" msgstr "llegeix la configuració de l'objecte de blob donat" -#: builtin/config.c:64 +#: builtin/config.c:128 msgid "Action" msgstr "Acció" -#: builtin/config.c:65 +#: builtin/config.c:129 msgid "get value: name [value-regex]" msgstr "obtén valor: nom [regex-de-valors]" -#: builtin/config.c:66 +#: builtin/config.c:130 msgid "get all values: key [value-regex]" msgstr "obtén tots els valors: clau [regex-de-valors]" -#: builtin/config.c:67 +#: builtin/config.c:131 msgid "get values for regexp: name-regex [value-regex]" msgstr "obtén valors de regexp: regex-de-noms [regex-de-valors]" -#: builtin/config.c:68 +#: builtin/config.c:132 msgid "get value specific for the URL: section[.var] URL" msgstr "obtén el valor específic per a l'URL: secció[.variable] URL" -#: builtin/config.c:69 +#: builtin/config.c:133 msgid "replace all matching variables: name value [value_regex]" msgstr "" "reemplaça totes les variables que coincideixen: nom valor [regex_de_valors]" -#: builtin/config.c:70 +#: builtin/config.c:134 msgid "add a new variable: name value" msgstr "afegeix una variable nova: nom valor" -#: builtin/config.c:71 +#: builtin/config.c:135 msgid "remove a variable: name [value-regex]" msgstr "elimina una variable: nom [regex-de-valors]" -#: builtin/config.c:72 +#: builtin/config.c:136 msgid "remove all matches: name [value-regex]" msgstr "elimina totes les coincidències: nom [regex-de-valors]" -#: builtin/config.c:73 +#: builtin/config.c:137 msgid "rename section: old-name new-name" msgstr "canvia el nom de secció: nom-antic nom-nou" -#: builtin/config.c:74 +#: builtin/config.c:138 msgid "remove a section: name" msgstr "elimina una secció: nom" -#: builtin/config.c:75 +#: builtin/config.c:139 msgid "list all" msgstr "llista tots" -#: builtin/config.c:76 +#: builtin/config.c:140 msgid "open an editor" msgstr "obre un editor" -#: builtin/config.c:77 +#: builtin/config.c:141 msgid "find the color configured: slot [default]" msgstr "troba el color configurat: ranura [per defecte]" -#: builtin/config.c:78 +#: builtin/config.c:142 msgid "find the color setting: slot [stdout-is-tty]" msgstr "troba el paràmetre de color: ranura [stdout-és-tty]" -#: builtin/config.c:79 +#: builtin/config.c:143 msgid "Type" msgstr "Tipus" -#: builtin/config.c:80 +#: builtin/config.c:144 +#, fuzzy +msgid "value is given this type" +msgstr "el valor és una data de venciment" + +#: builtin/config.c:145 msgid "value is \"true\" or \"false\"" msgstr "el valor és \"true\" o \"false\"" -#: builtin/config.c:81 +#: builtin/config.c:146 msgid "value is decimal number" msgstr "el valor és un nombre decimal" -#: builtin/config.c:82 +#: builtin/config.c:147 msgid "value is --bool or --int" msgstr "el valor és --bool o --int" -#: builtin/config.c:83 +#: builtin/config.c:148 msgid "value is a path (file or directory name)" msgstr "el valor és un camí (nom de fitxer o directori)" -#: builtin/config.c:84 +#: builtin/config.c:149 msgid "value is an expiry date" msgstr "el valor és una data de venciment" -#: builtin/config.c:85 +#: builtin/config.c:150 msgid "Other" msgstr "Altre" -#: builtin/config.c:86 +#: builtin/config.c:151 msgid "terminate values with NUL byte" msgstr "acaba els valors amb un octet NUL" -#: builtin/config.c:87 +#: builtin/config.c:152 msgid "show variable names only" msgstr "mostra només els noms de variable" -#: builtin/config.c:88 +#: builtin/config.c:153 msgid "respect include directives on lookup" msgstr "respecta les directives d'inclusió en cercar" -#: builtin/config.c:89 +#: builtin/config.c:154 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)" -#: builtin/config.c:335 +#: builtin/config.c:155 +msgid "value" +msgstr "valor" + +#: builtin/config.c:155 +msgid "with --get, use default value when missing entry" +msgstr "" + +#: builtin/config.c:168 +#, c-format +msgid "wrong number of arguments, should be %d" +msgstr "" + +#: builtin/config.c:170 +#, c-format +msgid "wrong number of arguments, should be from %d to %d" +msgstr "" + +#: builtin/config.c:304 +#, c-format +msgid "invalid key pattern: %s" +msgstr "patró de la clau no vàlid: %s" + +#: builtin/config.c:340 +#, fuzzy, c-format +msgid "failed to format default config value: %s" +msgstr "s'ha produït un error en crear el fitxer %s" + +#: builtin/config.c:397 +#, c-format +msgid "cannot parse color '%s'" +msgstr "no es pot analitzar el color «%s»" + +#: builtin/config.c:439 msgid "unable to parse default color value" msgstr "no s'ha pogut analitzar el valor de color per defecte" -#: builtin/config.c:479 +#: builtin/config.c:492 builtin/config.c:724 +#, fuzzy +msgid "not in a git directory" +msgstr "no és en un dipòsit de git" + +#: builtin/config.c:495 +#, fuzzy +msgid "writing to stdin is not supported" +msgstr "No s'admet una profunditat negativa en --deepen" + +#: builtin/config.c:498 +#, fuzzy +msgid "writing config blobs is not supported" +msgstr "avís: el sobrenom de sendmail amb cometes no està suportat: %s\n" + +#: builtin/config.c:583 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -8111,16 +9858,72 @@ msgstr "" "#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c:507 +#: builtin/config.c:606 +msgid "only one config file at a time" +msgstr "" + +#: builtin/config.c:611 msgid "--local can only be used inside a git repository" msgstr "--local només es pot usar dins d'un dipòsit git" -#: builtin/config.c:632 +#: builtin/config.c:614 +#, fuzzy +msgid "--blob can only be used inside a git repository" +msgstr "--local només es pot usar dins d'un dipòsit git" + +#: builtin/config.c:633 +#, fuzzy +msgid "$HOME not set" +msgstr "no usar" + +#: builtin/config.c:670 +msgid "--get-color and variable type are incoherent" +msgstr "" + +#: builtin/config.c:675 +msgid "only one action at a time" +msgstr "" + +#: builtin/config.c:688 +msgid "--name-only is only applicable to --list or --get-regexp" +msgstr "" + +#: builtin/config.c:694 +msgid "" +"--show-origin is only applicable to --get, --get-all, --get-regexp, and --" +"list" +msgstr "" + +#: builtin/config.c:700 +msgid "--default is only applicable to --get" +msgstr "" + +#: builtin/config.c:713 +#, fuzzy, c-format +msgid "unable to read config file '%s'" +msgstr "no s'ha pogut llegir el fitxer de signatura «%s»" + +#: builtin/config.c:716 +#, fuzzy +msgid "error processing config file(s)" +msgstr "usa el fitxer de configuració del dipòsit" + +#: builtin/config.c:726 +#, fuzzy +msgid "editing stdin is not supported" +msgstr "No s'admet una profunditat negativa en --deepen" + +#: builtin/config.c:728 +#, fuzzy +msgid "editing blobs is not supported" +msgstr "No s'admet una profunditat negativa en --deepen" + +#: builtin/config.c:742 #, c-format msgid "cannot create configuration file %s" msgstr "no es pot crear el fitxer de configuració %s" -#: builtin/config.c:645 +#: builtin/config.c:755 #, c-format msgid "" "cannot overwrite multiple values with a single value\n" @@ -8129,65 +9932,70 @@ msgstr "" "no es poden sobreescriure múltiples valors amb un sol valor\n" " Useu una expressió regular, --add o --replace-all per a canviar %s." -#: builtin/count-objects.c:88 +#: builtin/config.c:829 builtin/config.c:840 +#, fuzzy, c-format +msgid "no such section: %s" +msgstr "no hi ha tal referència %s" + +#: builtin/count-objects.c:90 msgid "git count-objects [-v] [-H | --human-readable]" msgstr "git count-objects [-v] [-H | --human-readable]" -#: builtin/count-objects.c:98 +#: builtin/count-objects.c:100 msgid "print sizes in human readable format" msgstr "imprimeix les mides en un format llegible pels humans" -#: builtin/describe.c:22 +#: builtin/describe.c:26 msgid "git describe [<options>] [<commit-ish>...]" msgstr "git describe [<opcions>] [<comissió>...]" -#: builtin/describe.c:23 +#: builtin/describe.c:27 msgid "git describe [<options>] --dirty" msgstr "git describe [<opcions>] --dirty" -#: builtin/describe.c:57 +#: builtin/describe.c:62 msgid "head" msgstr "davant per" -#: builtin/describe.c:57 +#: builtin/describe.c:62 msgid "lightweight" msgstr "lleuger" -#: builtin/describe.c:57 +#: builtin/describe.c:62 msgid "annotated" msgstr "anotat" -#: builtin/describe.c:267 +#: builtin/describe.c:272 #, c-format msgid "annotated tag %s not available" msgstr "l'etiqueta anotada %s no és disponible" -#: builtin/describe.c:271 +#: builtin/describe.c:276 #, c-format msgid "annotated tag %s has no embedded name" msgstr "l'etiqueta anotada %s no té nom incrustat" -#: builtin/describe.c:273 +#: builtin/describe.c:278 #, c-format msgid "tag '%s' is really '%s' here" msgstr "l'etiqueta «%s» realment és «%s» aquí" -#: builtin/describe.c:317 +#: builtin/describe.c:322 #, c-format msgid "no tag exactly matches '%s'" msgstr "cap etiqueta coincideix exactament amb «%s»" -#: builtin/describe.c:319 +#: builtin/describe.c:324 #, c-format msgid "No exact match on refs or tags, searching to describe\n" msgstr "" -#: builtin/describe.c:366 +#: builtin/describe.c:378 #, c-format msgid "finished search at %s\n" msgstr "s'ha finalitzat la cerca a %s\n" -#: builtin/describe.c:392 +#: builtin/describe.c:404 #, c-format msgid "" "No annotated tags can describe '%s'.\n" @@ -8196,7 +10004,7 @@ msgstr "" "Cap etiqueta anotada pot descriure «%s».\n" "No obstant, hi havia etiquetes no anotades: proveu --tags." -#: builtin/describe.c:396 +#: builtin/describe.c:408 #, c-format msgid "" "No tags can describe '%s'.\n" @@ -8205,12 +10013,12 @@ msgstr "" "Cap etiqueta pot descriure «%s».\n" "Proveu --always, o creeu algunes etiquetes." -#: builtin/describe.c:426 +#: builtin/describe.c:438 #, c-format msgid "traversed %lu commits\n" msgstr "%lu comissions travessades\n" -#: builtin/describe.c:429 +#: builtin/describe.c:441 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" @@ -8219,90 +10027,90 @@ msgstr "" "s'han trobat més de %i etiquetes: s'han llistat les %i més recents\n" "s'ha renunciat la cerca a %s\n" -#: builtin/describe.c:497 +#: builtin/describe.c:509 #, c-format msgid "describe %s\n" msgstr "descriu %s\n" -#: builtin/describe.c:500 builtin/log.c:502 +#: builtin/describe.c:512 builtin/log.c:508 #, c-format msgid "Not a valid object name %s" msgstr "%s no és un nom d'objecte vàlid" -#: builtin/describe.c:508 +#: builtin/describe.c:520 #, c-format msgid "%s is neither a commit nor blob" msgstr "%s no és una comissió o un blob" -#: builtin/describe.c:522 +#: builtin/describe.c:534 msgid "find the tag that comes after the commit" msgstr "troba l'etiqueta que vingui després de la comissió" -#: builtin/describe.c:523 +#: builtin/describe.c:535 msgid "debug search strategy on stderr" msgstr "estratègia de cerca de depuració en stderr" -#: builtin/describe.c:524 +#: builtin/describe.c:536 msgid "use any ref" msgstr "usa qualsevol referència" -#: builtin/describe.c:525 +#: builtin/describe.c:537 msgid "use any tag, even unannotated" msgstr "usa qualsevol etiqueta, fins i tot aquelles sense anotar" -#: builtin/describe.c:526 +#: builtin/describe.c:538 msgid "always use long format" msgstr "sempre usa el format llarg" -#: builtin/describe.c:527 +#: builtin/describe.c:539 msgid "only follow first parent" msgstr "només segueix la primera mare" -#: builtin/describe.c:530 +#: builtin/describe.c:542 msgid "only output exact matches" msgstr "emet només coincidències exactes" -#: builtin/describe.c:532 +#: builtin/describe.c:544 msgid "consider <n> most recent tags (default: 10)" msgstr "considera les <n> etiquetes més recents (per defecte: 10)" -#: builtin/describe.c:534 +#: builtin/describe.c:546 msgid "only consider tags matching <pattern>" msgstr "només considera les etiquetes que coincideixen amb <patró>" -#: builtin/describe.c:536 +#: builtin/describe.c:548 msgid "do not consider tags matching <pattern>" msgstr "no consideris les etiquetes que no coincideixen amb <patró>" -#: builtin/describe.c:538 builtin/name-rev.c:406 +#: builtin/describe.c:550 builtin/name-rev.c:424 msgid "show abbreviated commit object as fallback" msgstr "mostra l'objecte de comissió abreviat com a sistema alternatiu" -#: builtin/describe.c:539 builtin/describe.c:542 +#: builtin/describe.c:551 builtin/describe.c:554 msgid "mark" msgstr "marca" -#: builtin/describe.c:540 +#: builtin/describe.c:552 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "annexa <marca> en l'arbre de treball brut (per defecte: \"-dirty\")" -#: builtin/describe.c:543 +#: builtin/describe.c:555 msgid "append <mark> on broken working tree (default: \"-broken\")" msgstr "annexa <marca> en l'arbre de treball brut (per defecte: \"-broken\")" -#: builtin/describe.c:561 +#: builtin/describe.c:573 msgid "--long is incompatible with --abbrev=0" msgstr "--long és incompatible amb --abbrev=0" -#: builtin/describe.c:590 +#: builtin/describe.c:602 msgid "No names found, cannot describe anything." msgstr "No s'ha trobat cap nom, no es pot descriure res." -#: builtin/describe.c:640 +#: builtin/describe.c:652 msgid "--dirty is incompatible with commit-ishes" msgstr "--dirty és incompatible amb les comissions" -#: builtin/describe.c:642 +#: builtin/describe.c:654 msgid "--broken is incompatible with commit-ishes" msgstr "--broken és incompatible amb les comissions" @@ -8316,50 +10124,50 @@ msgstr "«%s»: no és ni fitxer regular ni enllaç simbòlic" msgid "invalid option: %s" msgstr "opció no vàlida: %s" -#: builtin/diff.c:356 +#: builtin/diff.c:363 msgid "Not a git repository" msgstr "No és un dipòsit de git" -#: builtin/diff.c:399 +#: builtin/diff.c:407 #, c-format msgid "invalid object '%s' given." msgstr "s'ha donat un objecte no vàlid «%s»." -#: builtin/diff.c:408 +#: builtin/diff.c:416 #, c-format msgid "more than two blobs given: '%s'" msgstr "s'ha donat més de dos blobs: «%s»" -#: builtin/diff.c:413 +#: builtin/diff.c:421 #, c-format msgid "unhandled object '%s' given." msgstr "s'ha donat l'objecte no gestionat «%s»." -#: builtin/difftool.c:29 +#: builtin/difftool.c:30 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" msgstr "git difftool [<opcions>] [<commit> [<commit>]] [--] [<camí>...]" -#: builtin/difftool.c:259 +#: builtin/difftool.c:260 #, c-format msgid "failed: %d" msgstr "ha fallat: %d" -#: builtin/difftool.c:301 +#: builtin/difftool.c:302 #, c-format msgid "could not read symlink %s" msgstr "no s'ha pogut llegir l'enllaç simbòlic %s" -#: builtin/difftool.c:303 +#: builtin/difftool.c:304 #, c-format msgid "could not read symlink file %s" msgstr "no s'ha pogut llegir el fitxer d'enllaç simbòlic %s" -#: builtin/difftool.c:311 +#: builtin/difftool.c:312 #, c-format msgid "could not read object %s for symlink %s" msgstr "No es pot llegir l'objecte %s per l'enllaç simbòlic %s" -#: builtin/difftool.c:412 +#: builtin/difftool.c:413 msgid "" "combined diff formats('-c' and '--cc') are not supported in\n" "directory diff mode('-d' and '--dir-diff')." @@ -8367,33 +10175,33 @@ msgstr "" "els formats de diff combinats ('-c' and '--cc') no són admesos \n" "en el mode diff per directoris ('-d' and '--dir-diff')." -#: builtin/difftool.c:632 +#: builtin/difftool.c:633 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "s'han modificat ambdós fitxers: «%s» i «%s»." -#: builtin/difftool.c:634 +#: builtin/difftool.c:635 msgid "working tree file has been left." msgstr "s'ha deixat un fitxer de l'arbre de treball." -#: builtin/difftool.c:645 +#: builtin/difftool.c:646 #, c-format msgid "temporary files exist in '%s'." msgstr "existeix un fitxer temporal a %s'." -#: builtin/difftool.c:646 +#: builtin/difftool.c:647 msgid "you may want to cleanup or recover these." msgstr "podeu netejar o recuperar-los." -#: builtin/difftool.c:695 +#: builtin/difftool.c:696 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "utilitza `diff.guitool` en comptes de `diff.tool`" -#: builtin/difftool.c:697 +#: builtin/difftool.c:698 msgid "perform a full-directory diff" msgstr "fes un diff de tot el directori" -#: builtin/difftool.c:699 +#: builtin/difftool.c:700 msgid "do not prompt before launching a diff tool" msgstr "no preguntis abans d'executar l'eina diff" @@ -8402,7 +10210,8 @@ msgid "use symlinks in dir-diff mode" msgstr "utilitza enllaços simbòlics en mode dir-diff" #: builtin/difftool.c:706 -msgid "<tool>" +#, fuzzy +msgid "tool" msgstr "<tool>" #: builtin/difftool.c:707 @@ -8422,10 +10231,6 @@ msgstr "" "fes que 'git-difftool' surti quan l'eina de diff invocada torna un codi de " "sortida diferent de zero" -#: builtin/difftool.c:714 -msgid "<command>" -msgstr "<command>" - #: builtin/difftool.c:715 msgid "specify a custom command for viewing diffs" msgstr "especifiqueu una ordre personalitzada per veure diffs" @@ -8438,151 +10243,147 @@ msgstr "no s'ha proporcionat <tool> per --tool=<tool>" msgid "no <cmd> given for --extcmd=<cmd>" msgstr "no s'ha proporcionat <cmd> per --extcmd=<cmd>" -#: builtin/fast-export.c:26 +#: builtin/fast-export.c:29 msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [opcions-de-llista-de-revisions]" -#: builtin/fast-export.c:998 +#: builtin/fast-export.c:1006 msgid "show progress after <n> objects" msgstr "mostra el progrés després de <n> objectes" -#: builtin/fast-export.c:1000 +#: builtin/fast-export.c:1008 msgid "select handling of signed tags" msgstr "selecciona la gestió de les etiquetes signades" -#: builtin/fast-export.c:1003 +#: builtin/fast-export.c:1011 msgid "select handling of tags that tag filtered objects" msgstr "selecciona la gestió de les etiquetes que etiquetin objectes filtrats" -#: builtin/fast-export.c:1006 +#: builtin/fast-export.c:1014 msgid "Dump marks to this file" msgstr "Bolca les marques a aquest fitxer" -#: builtin/fast-export.c:1008 +#: builtin/fast-export.c:1016 msgid "Import marks from this file" msgstr "Importa les marques d'aquest fitxer" -#: builtin/fast-export.c:1010 +#: builtin/fast-export.c:1018 msgid "Fake a tagger when tags lack one" msgstr "Fingeix un etiquetador quan els en manca un a les etiquetes" -#: builtin/fast-export.c:1012 +#: builtin/fast-export.c:1020 msgid "Output full tree for each commit" msgstr "Imprimeix l'arbre complet de cada comissió" -#: builtin/fast-export.c:1014 +#: builtin/fast-export.c:1022 msgid "Use the done feature to terminate the stream" msgstr "Usa la característica done per a acabar el corrent" -#: builtin/fast-export.c:1015 +#: builtin/fast-export.c:1023 msgid "Skip output of blob data" msgstr "Omet l'emissió de dades de blob" -#: builtin/fast-export.c:1016 +#: builtin/fast-export.c:1024 msgid "refspec" msgstr "especificació de referència" -#: builtin/fast-export.c:1017 +#: builtin/fast-export.c:1025 msgid "Apply refspec to exported refs" msgstr "Aplica l'especificació de referència a les referències exportades" -#: builtin/fast-export.c:1018 +#: builtin/fast-export.c:1026 msgid "anonymize output" msgstr "anonimitza la sortida" -#: builtin/fetch.c:25 +#: builtin/fetch.c:27 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [<opcions>] [<dipòsit> [<especificació-de-referència>...]]" -#: builtin/fetch.c:26 +#: builtin/fetch.c:28 msgid "git fetch [<options>] <group>" msgstr "git fetch [<opcions>] <grup>" -#: builtin/fetch.c:27 +#: builtin/fetch.c:29 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [<opcions>] [(<dipòsit> | <grup>)...]" -#: builtin/fetch.c:28 +#: builtin/fetch.c:30 msgid "git fetch --all [<options>]" msgstr "git fetch --all [<opcions>]" -#: builtin/fetch.c:124 builtin/pull.c:188 +#: builtin/fetch.c:112 builtin/pull.c:193 msgid "fetch from all remotes" msgstr "obtén de tots els remots" -#: builtin/fetch.c:126 builtin/pull.c:191 +#: builtin/fetch.c:114 builtin/pull.c:196 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "annexa a .git/FETCH_HEAD en lloc de sobreescriure" -#: builtin/fetch.c:128 builtin/pull.c:194 +#: builtin/fetch.c:116 builtin/pull.c:199 msgid "path to upload pack on remote end" msgstr "camí al qual pujar el paquet al costat remot" -#: builtin/fetch.c:129 builtin/pull.c:196 +#: builtin/fetch.c:117 builtin/pull.c:201 msgid "force overwrite of local branch" msgstr "força la sobreescriptura de la branca local" -#: builtin/fetch.c:131 +#: builtin/fetch.c:119 msgid "fetch from multiple remotes" msgstr "obtén de múltiples remots" -#: builtin/fetch.c:133 builtin/pull.c:198 +#: builtin/fetch.c:121 builtin/pull.c:203 msgid "fetch all tags and associated objects" msgstr "obtén totes les etiquetes i tots els objectes associats" -#: builtin/fetch.c:135 +#: builtin/fetch.c:123 msgid "do not fetch all tags (--no-tags)" msgstr "no obtinguis les etiquetes (--no-tags)" -#: builtin/fetch.c:137 +#: builtin/fetch.c:125 msgid "number of submodules fetched in parallel" msgstr "nombre de submòduls obtinguts en paral·lel" -#: builtin/fetch.c:139 builtin/pull.c:201 +#: builtin/fetch.c:127 builtin/pull.c:206 msgid "prune remote-tracking branches no longer on remote" msgstr "poda les branques amb seguiment remot que ja no estiguin en el remot" -#: builtin/fetch.c:141 +#: builtin/fetch.c:129 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:130 builtin/fetch.c:153 builtin/pull.c:131 msgid "on-demand" msgstr "sota demanda" -#: builtin/fetch.c:143 +#: builtin/fetch.c:131 msgid "control recursive fetching of submodules" msgstr "controla l'obtenció recursiva de submòduls" -#: builtin/fetch.c:147 builtin/pull.c:209 +#: builtin/fetch.c:135 builtin/pull.c:214 msgid "keep downloaded pack" msgstr "retén el paquet baixat" -#: builtin/fetch.c:149 +#: builtin/fetch.c:137 msgid "allow updating of HEAD ref" msgstr "permet l'actualització de la referència HEAD" -#: builtin/fetch.c:152 builtin/fetch.c:158 builtin/pull.c:212 +#: builtin/fetch.c:140 builtin/fetch.c:146 builtin/pull.c:217 msgid "deepen history of shallow clone" msgstr "aprofundeix la història d'un clon superficial" -#: builtin/fetch.c:154 +#: builtin/fetch.c:142 msgid "deepen history of shallow repository based on time" msgstr "aprofundeix la història d'un clon superficial basat en temps" -#: builtin/fetch.c:160 builtin/pull.c:215 +#: builtin/fetch.c:148 builtin/pull.c:220 msgid "convert to a complete repository" msgstr "converteix en un dipòsit complet" -#: builtin/fetch.c:162 builtin/log.c:1466 -msgid "dir" -msgstr "directori" - -#: builtin/fetch.c:163 +#: builtin/fetch.c:151 msgid "prepend this to submodule path output" msgstr "anteposa això a la sortida de camí del submòdul" -#: builtin/fetch.c:166 +#: builtin/fetch.c:154 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" @@ -8590,90 +10391,104 @@ msgstr "" "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 +#: builtin/fetch.c:158 builtin/pull.c:223 msgid "accept refs that update .git/shallow" msgstr "accepta les referències que actualitzin .git/shallow" -#: builtin/fetch.c:171 builtin/pull.c:220 +#: builtin/fetch.c:159 builtin/pull.c:225 msgid "refmap" msgstr "mapa de referències" -#: builtin/fetch.c:172 builtin/pull.c:221 +#: builtin/fetch.c:160 builtin/pull.c:226 msgid "specify fetch refmap" msgstr "mostra el mapa de referències d'obtenció" -#: builtin/fetch.c:431 +#: builtin/fetch.c:161 builtin/ls-remote.c:77 builtin/push.c:582 +#: builtin/send-pack.c:172 +msgid "server-specific" +msgstr "específic al servidor" + +#: builtin/fetch.c:161 builtin/ls-remote.c:77 builtin/push.c:582 +#: builtin/send-pack.c:173 +msgid "option to transmit" +msgstr "opció a transmetre" + +#: builtin/fetch.c:167 +msgid "report that we have only objects reachable from this object" +msgstr "" + +#: builtin/fetch.c:418 msgid "Couldn't find remote ref HEAD" msgstr "No s'ha pogut trobar la referència HEAD remota" -#: builtin/fetch.c:549 +#: builtin/fetch.c:552 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "la configuració fetch.output conté un valor no vàlid %s" -#: builtin/fetch.c:642 +#: builtin/fetch.c:645 #, c-format msgid "object %s not found" msgstr "objecte %s no trobat" -#: builtin/fetch.c:646 +#: builtin/fetch.c:649 msgid "[up to date]" msgstr "[al dia]" -#: builtin/fetch.c:659 builtin/fetch.c:739 +#: builtin/fetch.c:662 builtin/fetch.c:744 msgid "[rejected]" msgstr "[rebutjat]" -#: builtin/fetch.c:660 +#: builtin/fetch.c:663 msgid "can't fetch in current branch" msgstr "no es pot obtenir en la branca actual" -#: builtin/fetch.c:669 +#: builtin/fetch.c:672 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:673 builtin/fetch.c:708 builtin/fetch.c:724 +#: builtin/fetch.c:739 msgid "unable to update local ref" msgstr "no s'ha pogut actualitzar la referència local" -#: builtin/fetch.c:689 +#: builtin/fetch.c:694 msgid "[new tag]" msgstr "[etiqueta nova]" -#: builtin/fetch.c:692 +#: builtin/fetch.c:697 msgid "[new branch]" msgstr "[branca nova]" -#: builtin/fetch.c:695 +#: builtin/fetch.c:700 msgid "[new ref]" msgstr "[referència nova]" -#: builtin/fetch.c:734 +#: builtin/fetch.c:739 msgid "forced update" msgstr "actualització forçada" -#: builtin/fetch.c:739 +#: builtin/fetch.c:744 msgid "non-fast-forward" msgstr "sense avanç ràpid" -#: builtin/fetch.c:784 +#: builtin/fetch.c:790 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s no ha enviat tots els objectes necessaris\n" -#: builtin/fetch.c:804 +#: builtin/fetch.c:811 #, 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" -#: builtin/fetch.c:892 builtin/fetch.c:988 +#: builtin/fetch.c:900 builtin/fetch.c:1011 #, c-format msgid "From %.*s\n" msgstr "De %.*s\n" -#: builtin/fetch.c:903 +#: builtin/fetch.c:911 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -8683,55 +10498,55 @@ msgstr "" " intenteu executar 'git remote prune %s' per a eliminar\n" " qualsevol branca antiga o conflictiva" -#: builtin/fetch.c:958 +#: builtin/fetch.c:981 #, c-format msgid " (%s will become dangling)" msgstr " (%s es tornarà penjant)" -#: builtin/fetch.c:959 +#: builtin/fetch.c:982 #, c-format msgid " (%s has become dangling)" msgstr " (%s s'ha tornat penjant)" -#: builtin/fetch.c:991 +#: builtin/fetch.c:1014 msgid "[deleted]" msgstr "[suprimit]" -#: builtin/fetch.c:992 builtin/remote.c:1024 +#: builtin/fetch.c:1015 builtin/remote.c:1035 msgid "(none)" msgstr "(cap)" -#: builtin/fetch.c:1015 +#: builtin/fetch.c:1038 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "S'està refusant obtenir en la branca actual %s d'un dipòsit no nu" -#: builtin/fetch.c:1034 +#: builtin/fetch.c:1057 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "L'opció \"%s\" amb valor \"%s\" no és vàlida per a %s" -#: builtin/fetch.c:1037 +#: builtin/fetch.c:1060 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "S'ignora l'opció \"%s\" per a %s\n" -#: builtin/fetch.c:1277 +#: builtin/fetch.c:1339 #, c-format msgid "Fetching %s\n" msgstr "S'està obtenint %s\n" -#: builtin/fetch.c:1279 builtin/remote.c:97 +#: builtin/fetch.c:1341 builtin/remote.c:99 #, c-format msgid "Could not fetch %s" msgstr "No s'ha pogut obtenir %s" -#: builtin/fetch.c:1325 builtin/fetch.c:1498 +#: builtin/fetch.c:1387 builtin/fetch.c:1555 msgid "" "--filter can only be used with the remote configured in core.partialClone" msgstr "" -#: builtin/fetch.c:1350 +#: builtin/fetch.c:1410 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -8739,66 +10554,66 @@ msgstr "" "Cap dipòsit remot especificat. Especifiqueu un URL o\n" "un nom remot del qual es deuen obtenir les revisions noves." -#: builtin/fetch.c:1394 +#: builtin/fetch.c:1447 msgid "You need to specify a tag name." msgstr "Necessiteu especificar un nom d'etiqueta." -#: builtin/fetch.c:1439 +#: builtin/fetch.c:1496 msgid "Negative depth in --deepen is not supported" msgstr "No s'admet una profunditat negativa en --deepen" -#: builtin/fetch.c:1441 +#: builtin/fetch.c:1498 msgid "--deepen and --depth are mutually exclusive" msgstr "--deepen i --depth són mútuament excloents" -#: builtin/fetch.c:1446 +#: builtin/fetch.c:1503 msgid "--depth and --unshallow cannot be used together" msgstr "--depth i --unshallow no es poden usar junts" -#: builtin/fetch.c:1448 +#: builtin/fetch.c:1505 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow en un dipòsit complet no té sentit" -#: builtin/fetch.c:1464 +#: builtin/fetch.c:1521 msgid "fetch --all does not take a repository argument" msgstr "fetch --all no accepta un paràmetre de dipòsit" -#: builtin/fetch.c:1466 +#: builtin/fetch.c:1523 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all no té sentit amb especificacions de referència" -#: builtin/fetch.c:1475 +#: builtin/fetch.c:1532 #, c-format msgid "No such remote or remote group: %s" msgstr "No hi ha tal remot ni tal grup remot: %s" -#: builtin/fetch.c:1482 +#: builtin/fetch.c:1539 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 +#: builtin/fmt-merge-msg.c:17 msgid "" "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" msgstr "" "git fmt-merge-msg [-m <missatge>] [--log[=<n>] | --no-log] [--file <fitxer>]" -#: builtin/fmt-merge-msg.c:666 +#: builtin/fmt-merge-msg.c:671 msgid "populate log with at most <n> entries from shortlog" msgstr "emplena el registre amb <n> entrades del registre curt com a màxim" -#: builtin/fmt-merge-msg.c:669 +#: builtin/fmt-merge-msg.c:674 msgid "alias for --log (deprecated)" msgstr "àlies per --log (en desús)" -#: builtin/fmt-merge-msg.c:672 +#: builtin/fmt-merge-msg.c:677 msgid "text" msgstr "text" -#: builtin/fmt-merge-msg.c:673 +#: builtin/fmt-merge-msg.c:678 msgid "use <text> as start of message" msgstr "usa <text> com a inici de missatge" -#: builtin/fmt-merge-msg.c:674 +#: builtin/fmt-merge-msg.c:679 msgid "file to read from" msgstr "fitxer del qual llegir" @@ -8840,7 +10655,7 @@ msgstr "posa els marcadors de posició entre cometes adequades per al Tcl" msgid "show only <n> matched refs" msgstr "mostra només <n> referències coincidents" -#: builtin/for-each-ref.c:39 builtin/tag.c:420 +#: builtin/for-each-ref.c:39 builtin/tag.c:422 msgid "respect format colors" msgstr "respecta els colors del format" @@ -8864,81 +10679,81 @@ msgstr "imprimeix només les referències que continguin la comissió" msgid "print only refs which don't contain the commit" msgstr "imprimeix només les referències que no continguin la comissió" -#: builtin/fsck.c:568 +#: builtin/fsck.c:574 msgid "Checking object directories" msgstr "S'estan comprovant els directoris d'objecte" -#: builtin/fsck.c:660 +#: builtin/fsck.c:666 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<opcions>] [<objecte>...]" -#: builtin/fsck.c:666 +#: builtin/fsck.c:672 msgid "show unreachable objects" msgstr "mostra els objectes inabastables" -#: builtin/fsck.c:667 +#: builtin/fsck.c:673 msgid "show dangling objects" msgstr "mostra els objectes penjants" -#: builtin/fsck.c:668 +#: builtin/fsck.c:674 msgid "report tags" msgstr "informa de les etiquetes" -#: builtin/fsck.c:669 +#: builtin/fsck.c:675 msgid "report root nodes" msgstr "informa dels nodes d'arrel" -#: builtin/fsck.c:670 +#: builtin/fsck.c:676 msgid "make index objects head nodes" msgstr "fes els objectes d'índex nodes de cap" -#: builtin/fsck.c:671 +#: builtin/fsck.c:677 msgid "make reflogs head nodes (default)" msgstr "fes que els registres de referències siguin nodes de cap (per defecte)" -#: builtin/fsck.c:672 +#: builtin/fsck.c:678 msgid "also consider packs and alternate objects" msgstr "també considera els paquets i els objectes alternatius" -#: builtin/fsck.c:673 +#: builtin/fsck.c:679 msgid "check only connectivity" msgstr "comprova només la connectivitat" -#: builtin/fsck.c:674 +#: builtin/fsck.c:680 msgid "enable more strict checking" msgstr "habilita la comprovació més estricta" -#: builtin/fsck.c:676 +#: builtin/fsck.c:682 msgid "write dangling objects in .git/lost-found" msgstr "escriu objectes penjants a .git/lost-found" -#: builtin/fsck.c:677 builtin/prune.c:108 +#: builtin/fsck.c:683 builtin/prune.c:110 msgid "show progress" msgstr "mostra el progrés" -#: builtin/fsck.c:678 +#: builtin/fsck.c:684 msgid "show verbose names for reachable objects" msgstr "mostra els noms detallats dels objectes abastables" -#: builtin/fsck.c:742 +#: builtin/fsck.c:750 msgid "Checking objects" msgstr "S'estan comprovant els objectes" -#: builtin/gc.c:27 +#: builtin/gc.c:34 msgid "git gc [<options>]" msgstr "git gc [<opcions>]" -#: builtin/gc.c:80 +#: builtin/gc.c:90 #, c-format msgid "Failed to fstat %s: %s" msgstr "S'ha produït un error en fer fstat %s: %s" -#: builtin/gc.c:312 +#: builtin/gc.c:455 #, c-format msgid "Can't stat %s" msgstr "No es pot fer stat en %s" -#: builtin/gc.c:321 +#: builtin/gc.c:464 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -8953,68 +10768,77 @@ msgstr "" "\n" "%s" -#: builtin/gc.c:360 +#: builtin/gc.c:505 msgid "prune unreferenced objects" msgstr "poda objectes sense referència" -#: builtin/gc.c:362 +#: builtin/gc.c:507 msgid "be more thorough (increased runtime)" msgstr "sigues més exhaustiu (el temps d'execució augmenta)" -#: builtin/gc.c:363 +#: builtin/gc.c:508 msgid "enable auto-gc mode" msgstr "habilita el mode de recollida d'escombraries automàtica" -#: builtin/gc.c:366 +#: builtin/gc.c:511 msgid "force running gc even if there may be another gc running" msgstr "força l'execució de gc encara que hi pugui haver un altre gc executant" -#: builtin/gc.c:384 -#, c-format -msgid "Failed to parse gc.logexpiry value %s" +#: builtin/gc.c:514 +msgid "repack all other packs except the largest pack" +msgstr "" + +#: builtin/gc.c:531 +#, fuzzy, c-format +msgid "failed to parse gc.logexpiry value %s" msgstr "No s'ha pogut analitzar el valor gc.logexpiry %s" -#: builtin/gc.c:412 +#: builtin/gc.c:542 +#, fuzzy, c-format +msgid "failed to parse prune expiry value %s" +msgstr "No s'ha pogut analitzar el valor gc.logexpiry %s" + +#: builtin/gc.c:562 #, 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" -#: builtin/gc.c:414 +#: builtin/gc.c:564 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "S'està empaquetant automàticament el dipòsit per rendiment òptim.\n" -#: builtin/gc.c:415 +#: builtin/gc.c:565 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "Vegeu \"git help gc\" per neteja manual.\n" -#: builtin/gc.c:440 +#: builtin/gc.c:601 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" msgstr "" "gc ja s'està executant en la màquina «%s» pid %<PRIuMAX> (useu --force si no)" -#: builtin/gc.c:487 +#: builtin/gc.c:652 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 +#: builtin/grep.c:28 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "git grep [<opcions>] [-e] <patró> [<revisió>...] [[--] <camí>...]" -#: builtin/grep.c:225 +#: builtin/grep.c:226 #, c-format msgid "grep: failed to create thread: %s" msgstr "grep: s'ha produït un error en crear fil: %s" -#: builtin/grep.c:283 +#: builtin/grep.c:284 #, c-format msgid "invalid number of threads specified (%d) for %s" msgstr "s'ha especificat un nombre de fils no vàlid (%d) per a %s" @@ -9023,249 +10847,265 @@ msgstr "s'ha especificat un nombre de fils no vàlid (%d) per a %s" #. 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:1536 builtin/index-pack.c:1728 +#: builtin/pack-objects.c:2636 #, c-format msgid "no threads support, ignoring %s" msgstr "no hi ha suport de fils, s'està ignorant %s" -#: 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 "no s'ha pogut llegir l'arbre (%s)" -#: builtin/grep.c:637 +#: builtin/grep.c:638 #, c-format msgid "unable to grep from object of type %s" msgstr "no es pot fer grep des d'un objecte de tipus %s" -#: builtin/grep.c:703 +#: builtin/grep.c:704 #, c-format msgid "switch `%c' expects a numerical value" msgstr "l'opció «%c» espera un valor numèric" -#: builtin/grep.c:790 +#: builtin/grep.c:791 msgid "search in index instead of in the work tree" msgstr "cerca en l'índex en lloc de l'arbre de treball" -#: builtin/grep.c:792 +#: builtin/grep.c:793 msgid "find in contents not managed by git" msgstr "cerca en continguts no gestionats per git" -#: builtin/grep.c:794 +#: builtin/grep.c:795 msgid "search in both tracked and untracked files" msgstr "cerca tant en fitxers seguits com en no seguits" -#: builtin/grep.c:796 +#: builtin/grep.c:797 msgid "ignore files specified via '.gitignore'" msgstr "ignora els fitxers especificats mitjançant '.gitignore'" -#: builtin/grep.c:798 +#: builtin/grep.c:799 msgid "recursively search in each submodule" msgstr "cerca recursivament a cada submòdul" -#: builtin/grep.c:801 +#: builtin/grep.c:802 msgid "show non-matching lines" msgstr "mostra les línies no coincidents" -#: builtin/grep.c:803 +#: builtin/grep.c:804 msgid "case insensitive matching" msgstr "coincidència insensible a majúscula i minúscula" -#: builtin/grep.c:805 +#: builtin/grep.c:806 msgid "match patterns only at word boundaries" msgstr "coincideix amb els patrons només als límits de paraula" -#: builtin/grep.c:807 +#: builtin/grep.c:808 msgid "process binary files as text" msgstr "processa els fitxers binaris com a text" -#: builtin/grep.c:809 +#: builtin/grep.c:810 msgid "don't match patterns in binary files" msgstr "no coincideixis amb els patrons en els fitxers binaris" -#: builtin/grep.c:812 +#: builtin/grep.c:813 msgid "process binary files with textconv filters" msgstr "processa els fitxers binaris amb filtres de textconv" -#: builtin/grep.c:814 +#: builtin/grep.c:815 msgid "descend at most <depth> levels" msgstr "descendeix com a màxim <profunditat> nivells" -#: builtin/grep.c:818 +#: builtin/grep.c:819 msgid "use extended POSIX regular expressions" msgstr "usa les expressions regulars POSIX ampliades" -#: builtin/grep.c:821 +#: builtin/grep.c:822 msgid "use basic POSIX regular expressions (default)" msgstr "usa les expressions regulars POSIX bàsiques (per defecte)" -#: builtin/grep.c:824 +#: builtin/grep.c:825 msgid "interpret patterns as fixed strings" msgstr "interpreta els patrons com a cadenes fixes" -#: builtin/grep.c:827 +#: builtin/grep.c:828 msgid "use Perl-compatible regular expressions" msgstr "usa les expressions regulars compatibles amb Perl" -#: builtin/grep.c:830 +#: builtin/grep.c:831 msgid "show line numbers" msgstr "mostra els números de línia" -#: builtin/grep.c:831 +#: builtin/grep.c:832 +#, fuzzy +msgid "show column number of first match" +msgstr "mostra només els noms dels fitxers sense coincidència" + +#: builtin/grep.c:833 msgid "don't show filenames" msgstr "no mostris els noms de fitxer" -#: builtin/grep.c:832 +#: builtin/grep.c:834 msgid "show filenames" msgstr "mostra els noms de fitxer" -#: builtin/grep.c:834 +#: builtin/grep.c:836 msgid "show filenames relative to top directory" msgstr "mostra els noms de fitxer relatius al directori superior" -#: builtin/grep.c:836 +#: builtin/grep.c:838 msgid "show only filenames instead of matching lines" msgstr "mostra només els noms de fitxer en lloc de les línies coincidents" -#: builtin/grep.c:838 +#: builtin/grep.c:840 msgid "synonym for --files-with-matches" msgstr "sinònim de --files-with-matches" -#: builtin/grep.c:841 +#: builtin/grep.c:843 msgid "show only the names of files without match" msgstr "mostra només els noms dels fitxers sense coincidència" -#: builtin/grep.c:843 +#: builtin/grep.c:845 msgid "print NUL after filenames" msgstr "imprimeix NUL després dels noms de fitxer" -#: builtin/grep.c:846 +#: builtin/grep.c:848 +#, fuzzy +msgid "show only matching parts of a line" +msgstr "mostra les línies no coincidents" + +#: builtin/grep.c:850 msgid "show the number of matches instead of matching lines" msgstr "mostra el nombre de coincidències en lloc de les línies coincidents" -#: builtin/grep.c:847 +#: builtin/grep.c:851 msgid "highlight matches" msgstr "ressalta les coincidències" -#: builtin/grep.c:849 +#: builtin/grep.c:853 msgid "print empty line between matches from different files" msgstr "imprimeix una línia buida entre coincidències de fitxers distints" -#: builtin/grep.c:851 +#: builtin/grep.c:855 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" -#: builtin/grep.c:854 +#: builtin/grep.c:858 msgid "show <n> context lines before and after matches" msgstr "mostra <n> línies de context abans i després d'una coincidència" -#: builtin/grep.c:857 +#: builtin/grep.c:861 msgid "show <n> context lines before matches" msgstr "mostra <n> línies de context abans d'una coincidència" -#: builtin/grep.c:859 +#: builtin/grep.c:863 msgid "show <n> context lines after matches" msgstr "mostra <n> línies de context després d'una coincidència" -#: builtin/grep.c:861 +#: builtin/grep.c:865 msgid "use <n> worker threads" msgstr "usa <n> fils de treball" -#: builtin/grep.c:862 +#: builtin/grep.c:866 msgid "shortcut for -C NUM" msgstr "drecera per -C NUM" -#: builtin/grep.c:865 +#: builtin/grep.c:869 msgid "show a line with the function name before matches" msgstr "mostra una línia amb el nom de funció abans de les coincidències" -#: builtin/grep.c:867 +#: builtin/grep.c:871 msgid "show the surrounding function" msgstr "mostra la funció circumdant" -#: builtin/grep.c:870 +#: builtin/grep.c:874 msgid "read patterns from file" msgstr "llegeix els patrons des d'un fitxer" -#: builtin/grep.c:872 +#: builtin/grep.c:876 msgid "match <pattern>" msgstr "coincideix amb <patró>" -#: builtin/grep.c:874 +#: builtin/grep.c:878 msgid "combine patterns specified with -e" msgstr "combina els patrons especificats amb -e" -#: builtin/grep.c:886 +#: builtin/grep.c:890 msgid "indicate hit with exit status without output" msgstr "indica coincidència amb estat de sortida sense sortida textual" -#: builtin/grep.c:888 +#: builtin/grep.c:892 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" -#: builtin/grep.c:890 +#: builtin/grep.c:894 msgid "show parse tree for grep expression" msgstr "mostra l'arbre d'anàlisi de l'expressió grep" -#: builtin/grep.c:894 +#: builtin/grep.c:898 msgid "pager" msgstr "paginador" -#: builtin/grep.c:894 +#: builtin/grep.c:898 msgid "show matching files in the pager" msgstr "mostra els fitxers coincidents en el paginador" -#: builtin/grep.c:898 +#: builtin/grep.c:902 msgid "allow calling of grep(1) (ignored by this build)" msgstr "permet la invocació de grep(1) (ignorat per aquesta compilació)" -#: builtin/grep.c:962 -msgid "no pattern given." +#: builtin/grep.c:966 +#, fuzzy +msgid "no pattern given" msgstr "cap patró donat." -#: builtin/grep.c:994 +#: builtin/grep.c:1002 msgid "--no-index or --untracked cannot be used with revs" msgstr "--no-index o --untracked no es pot usar amb revisions" -#: builtin/grep.c:1001 +#: builtin/grep.c:1009 #, c-format msgid "unable to resolve revision: %s" msgstr "no s'ha pogut resoldre la revisió: %s" -#: builtin/grep.c:1036 builtin/index-pack.c:1519 +#: builtin/grep.c:1044 builtin/index-pack.c:1532 builtin/pack-objects.c:2632 #, c-format msgid "invalid number of threads specified (%d)" msgstr "s'ha especificat un nombre de fils no vàlid (%d)" -#: builtin/grep.c:1041 +#: builtin/grep.c:1049 builtin/pack-objects.c:3286 msgid "no threads support, ignoring --threads" msgstr "no hi ha suport de fils, s'està ignorant --threads" -#: builtin/grep.c:1065 +#: builtin/grep.c:1073 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager només funciona en l'arbre de treball" -#: builtin/grep.c:1088 -msgid "option not supported with --recurse-submodules." +#: builtin/grep.c:1096 +#, fuzzy +msgid "option not supported with --recurse-submodules" msgstr "opció no admesa amb --recurse-submodules." -#: builtin/grep.c:1094 -msgid "--cached or --untracked cannot be used with --no-index." +#: builtin/grep.c:1102 +#, fuzzy +msgid "--cached or --untracked cannot be used with --no-index" msgstr "--cached o --untracked no es pot usar amb --no-index." -#: builtin/grep.c:1100 -msgid "--[no-]exclude-standard cannot be used for tracked contents." +#: builtin/grep.c:1108 +#, fuzzy +msgid "--[no-]exclude-standard cannot be used for tracked contents" msgstr "--[no-]exclude-standard no es pot usar per als continguts seguits." -#: builtin/grep.c:1108 -msgid "both --cached and trees are given." +#: builtin/grep.c:1116 +#, fuzzy +msgid "both --cached and trees are given" msgstr "s'han donat ambdós --caches i arbres." -#: builtin/hash-object.c:83 +#: builtin/hash-object.c:84 msgid "" "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " "[--] <file>..." @@ -9273,93 +11113,103 @@ msgstr "" "git hash-object [-t <tipus>] [-w] [--path=<fitxer> | --no-filters] [--stdin] " "[--] <fitxer>..." -#: builtin/hash-object.c:84 +#: builtin/hash-object.c:85 msgid "git hash-object --stdin-paths" msgstr "git hash-object --stdin-paths" -#: builtin/hash-object.c:96 +#: builtin/hash-object.c:97 msgid "type" msgstr "tipus" -#: builtin/hash-object.c:96 +#: builtin/hash-object.c:97 msgid "object type" msgstr "tipus d'objecte" -#: builtin/hash-object.c:97 +#: builtin/hash-object.c:98 msgid "write the object into the object database" msgstr "escriu l'objecte a la base de dades d'objectes" -#: builtin/hash-object.c:99 +#: builtin/hash-object.c:100 msgid "read the object from stdin" msgstr "llegeix l'objecte des de stdin" -#: builtin/hash-object.c:101 +#: builtin/hash-object.c:102 msgid "store file as is without filters" msgstr "emmagatzema el fitxer tal com és sense filtres" -#: builtin/hash-object.c:102 +#: builtin/hash-object.c:103 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" -#: builtin/hash-object.c:103 +#: builtin/hash-object.c:104 msgid "process file as it were from this path" msgstr "processa el fitxer com si fos d'aquest camí" -#: builtin/help.c:43 +#: builtin/help.c:46 msgid "print all available commands" msgstr "imprimeix totes les ordres disponibles" -#: builtin/help.c:44 +#: builtin/help.c:47 msgid "exclude guides" msgstr "exclou guies" -#: builtin/help.c:45 +#: builtin/help.c:48 msgid "print list of useful guides" msgstr "imprimeix la llista de guies útils" -#: builtin/help.c:46 +#: builtin/help.c:49 +#, fuzzy +msgid "print all configuration variable names" +msgstr "no es pot crear el fitxer de configuració %s" + +#: builtin/help.c:51 msgid "show man page" msgstr "mostra la pàgina de manual" -#: builtin/help.c:47 +#: builtin/help.c:52 msgid "show manual in web browser" msgstr "mostra la pàgina de manual en el navegador web" -#: builtin/help.c:49 +#: builtin/help.c:54 msgid "show info page" msgstr "mostra la pàgina d'informació" -#: builtin/help.c:55 +#: builtin/help.c:56 +#, fuzzy +msgid "print command description" +msgstr "imprimeix els continguts de la comissió" + +#: builtin/help.c:61 msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" msgstr "git help [--all] [--guides] [--man | --web | --info] [<ordre>]" -#: builtin/help.c:67 +#: builtin/help.c:73 #, c-format msgid "unrecognized help format '%s'" msgstr "format d'ajuda no reconegut «%s»" -#: builtin/help.c:94 +#: builtin/help.c:100 msgid "Failed to start emacsclient." msgstr "S'ha produït un error'ha produït un error en iniciar emacsclient." -#: builtin/help.c:107 +#: builtin/help.c:113 msgid "Failed to parse emacsclient version." msgstr "S'ha produït un error en analitzar la versió d'emacsclient." -#: builtin/help.c:115 +#: builtin/help.c:121 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "la versió d'emacsclient «%d» és massa vella (< 22)." -#: builtin/help.c:133 builtin/help.c:155 builtin/help.c:165 builtin/help.c:173 +#: builtin/help.c:139 builtin/help.c:161 builtin/help.c:171 builtin/help.c:179 #, c-format msgid "failed to exec '%s'" msgstr "s'ha produït un error en executar «%s»" -#: builtin/help.c:211 +#: builtin/help.c:217 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" @@ -9368,7 +11218,7 @@ msgstr "" "«%s»: camí a un visualitzador de manuals no compatible.\n" "Considereu usar 'man.<eina>.cmd' en lloc d'això." -#: builtin/help.c:223 +#: builtin/help.c:229 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" @@ -9377,160 +11227,123 @@ msgstr "" "«%s»: ordre per a un visualitzador de manuals compatible.\n" "Considereu usar 'man.<eina>.path' en lloc d'això." -#: builtin/help.c:340 +#: builtin/help.c:346 #, c-format msgid "'%s': unknown man viewer." msgstr "«%s»: visualitzador de manuals desconegut." -#: builtin/help.c:357 +#: builtin/help.c:363 msgid "no man viewer handled the request" msgstr "cap visualitzador de manuals ha gestionat la sol·licitud" -#: builtin/help.c:365 +#: builtin/help.c:371 msgid "no info viewer handled the request" msgstr "cap visualitzador d'informació ha gestionat la sol·licitud" -#: builtin/help.c:407 -msgid "Defining attributes per path" -msgstr "La definició d'atributs per camí" - -#: builtin/help.c:408 -msgid "Everyday Git With 20 Commands Or So" -msgstr "Git quotidià amb més o menys 20 ordres" - -#: builtin/help.c:409 -msgid "A Git glossary" -msgstr "Un glossari de Git" - -#: builtin/help.c:410 -msgid "Specifies intentionally untracked files to ignore" -msgstr "Especifica els fitxers intencionalment no seguits a ignorar" - -#: builtin/help.c:411 -msgid "Defining submodule properties" -msgstr "La definició de les propietats de submòduls" - -#: builtin/help.c:412 -msgid "Specifying revisions and ranges for Git" -msgstr "L'especificació de revisions i rangs per al Git" - -#: builtin/help.c:413 -msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" -msgstr "Una introducció tutorial al Git (per a la versió 1.5.1 o més nova)" - -#: builtin/help.c:414 -msgid "An overview of recommended workflows with Git" -msgstr "Una visió de conjunt de fluxos de treball recomanats amb Git" - -#: builtin/help.c:426 -msgid "The common Git guides are:\n" -msgstr "Les guies de Git comunes són:\n" - -#: builtin/help.c:444 +#: builtin/help.c:418 #, c-format msgid "'%s' is aliased to '%s'" msgstr "«%s» és un àlies de «%s»" -#: builtin/help.c:466 builtin/help.c:483 +#: builtin/help.c:445 builtin/help.c:475 #, c-format msgid "usage: %s%s" msgstr "ús: %s%s" -#: builtin/index-pack.c:157 -#, c-format -msgid "unable to open %s" -msgstr "no s'ha pogut obrir %s" +#: builtin/help.c:459 +msgid "'git help config' for more information" +msgstr "" -#: builtin/index-pack.c:207 +#: builtin/index-pack.c:208 #, c-format msgid "object type mismatch at %s" msgstr "hi ha una discordança de tipus d'objecte a %s" -#: builtin/index-pack.c:227 +#: builtin/index-pack.c:228 #, c-format msgid "did not receive expected object %s" msgstr "no s'ha rebut l'objecte esperat %s" -#: builtin/index-pack.c:230 +#: builtin/index-pack.c:231 #, c-format msgid "object %s: expected type %s, found %s" msgstr "objecte %s: s'esperava el tipus %s, s'ha trobat %s" -#: 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] "no es pot omplir %d octet" msgstr[1] "no es pot omplir %d octets" -#: builtin/index-pack.c:282 +#: builtin/index-pack.c:283 msgid "early EOF" msgstr "EOF prematur" -#: builtin/index-pack.c:283 +#: builtin/index-pack.c:284 msgid "read error on input" msgstr "error de lectura d'entrada" -#: builtin/index-pack.c:295 +#: builtin/index-pack.c:296 msgid "used more bytes than were available" msgstr "s'han usat més octets que hi havia disponibles" -#: builtin/index-pack.c:302 +#: builtin/index-pack.c:303 builtin/pack-objects.c:590 msgid "pack too large for current definition of off_t" msgstr "paquet massa gran per a la definició actual d'off_t" -#: builtin/index-pack.c:305 builtin/unpack-objects.c:93 +#: builtin/index-pack.c:306 builtin/unpack-objects.c:94 msgid "pack exceeds maximum allowed size" msgstr "el paquet supera la mida màxima permesa" -#: builtin/index-pack.c:320 +#: builtin/index-pack.c:321 #, c-format msgid "unable to create '%s'" msgstr "no s'ha pogut crear «%s»" -#: builtin/index-pack.c:326 +#: builtin/index-pack.c:327 #, c-format msgid "cannot open packfile '%s'" msgstr "no es pot obrir el fitxer de paquet «%s»" -#: builtin/index-pack.c:340 +#: builtin/index-pack.c:341 msgid "pack signature mismatch" msgstr "hi ha una discordança de signatura de paquet" -#: builtin/index-pack.c:342 +#: builtin/index-pack.c:343 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "la versió de paquet %<PRIu32> no és compatible" -#: builtin/index-pack.c:360 +#: builtin/index-pack.c:361 #, c-format msgid "pack has bad object at offset %<PRIuMAX>: %s" msgstr "el paquet té un objecte incorrecte a la posició %<PRIuMAX>: %s" -#: builtin/index-pack.c:481 +#: builtin/index-pack.c:482 #, c-format msgid "inflate returned %d" msgstr "la inflació ha retornat %d" -#: builtin/index-pack.c:530 +#: builtin/index-pack.c:531 msgid "offset value overflow for delta base object" msgstr "" "desbordament de valor de desplaçament per a l'objecte base de diferències" -#: builtin/index-pack.c:538 +#: builtin/index-pack.c:539 msgid "delta base offset is out of bound" msgstr "el desplaçament de base de diferències està fora de límits" -#: builtin/index-pack.c:546 +#: builtin/index-pack.c:547 #, c-format msgid "unknown object type %d" msgstr "tipus d'objecte desconegut %d" -#: builtin/index-pack.c:577 +#: builtin/index-pack.c:578 msgid "cannot pread pack file" msgstr "no es pot fer pread en el fitxer de paquet" -#: builtin/index-pack.c:579 +#: builtin/index-pack.c:580 #, c-format msgid "premature end of pack file, %<PRIuMAX> byte missing" msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing" @@ -9538,199 +11351,205 @@ msgstr[0] "el final del fitxer de paquet és prematur, manca %<PRIuMAX> octet" msgstr[1] "" "el final del fitxer de paquet és prematur, manquen %<PRIuMAX> octets" -#: builtin/index-pack.c:605 +#: builtin/index-pack.c:606 msgid "serious inflate inconsistency" msgstr "hi ha una inconsistència seriosa d'inflació" -#: 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 "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:754 builtin/pack-objects.c:143 +#: builtin/pack-objects.c:203 builtin/pack-objects.c:297 #, c-format msgid "unable to read %s" msgstr "no s'ha pogut llegir %s" -#: builtin/index-pack.c:816 +#: builtin/index-pack.c:817 #, c-format msgid "cannot read existing object info %s" msgstr "no es pot llegir la informació d'objecte existent %s" -#: builtin/index-pack.c:824 +#: builtin/index-pack.c:825 #, c-format msgid "cannot read existing object %s" msgstr "no es pot llegir l'objecte existent %s" -#: builtin/index-pack.c:838 +#: builtin/index-pack.c:839 #, c-format msgid "invalid blob object %s" msgstr "objecte de blob no vàlid %s" -#: builtin/index-pack.c:853 +#: builtin/index-pack.c:842 builtin/index-pack.c:861 +#, fuzzy +msgid "fsck error in packed object" +msgstr "ignora els objectes empaquetats" + +#: builtin/index-pack.c:858 #, c-format msgid "invalid %s" msgstr "%s no vàlid" -#: builtin/index-pack.c:856 -msgid "Error in object" -msgstr "Error en objecte" - -#: builtin/index-pack.c:858 +#: builtin/index-pack.c:863 #, c-format msgid "Not all child objects of %s are reachable" msgstr "No tots els objectes fills de %s són abastables" -#: builtin/index-pack.c:930 builtin/index-pack.c:961 +#: builtin/index-pack.c:935 builtin/index-pack.c:966 msgid "failed to apply delta" msgstr "s'ha produït un error en aplicar la diferència" -#: builtin/index-pack.c:1131 +#: builtin/index-pack.c:1136 msgid "Receiving objects" msgstr "S'estan rebent objectes" -#: builtin/index-pack.c:1131 +#: builtin/index-pack.c:1136 msgid "Indexing objects" msgstr "S'estan indexant objectes" -#: builtin/index-pack.c:1165 +#: builtin/index-pack.c:1170 msgid "pack is corrupted (SHA1 mismatch)" msgstr "el paquet és malmès (discordança SHA1)" -#: builtin/index-pack.c:1170 +#: builtin/index-pack.c:1175 msgid "cannot fstat packfile" msgstr "no es pot fer fstat en el fitxer de paquet" -#: builtin/index-pack.c:1173 +#: builtin/index-pack.c:1178 msgid "pack has junk at the end" msgstr "el paquet té brossa al seu final" -#: builtin/index-pack.c:1185 +#: builtin/index-pack.c:1190 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "confusió més enllà de la bogeria en parse_pack_objects()" -#: builtin/index-pack.c:1208 +#: builtin/index-pack.c:1213 msgid "Resolving deltas" msgstr "S'estan resolent les diferències" -#: builtin/index-pack.c:1219 +#: builtin/index-pack.c:1224 builtin/pack-objects.c:2407 #, c-format msgid "unable to create thread: %s" msgstr "no s'ha pogut crear fil: %s" -#: builtin/index-pack.c:1261 +#: builtin/index-pack.c:1266 msgid "confusion beyond insanity" msgstr "confusió més enllà de la bogeria" -#: builtin/index-pack.c:1267 +#: builtin/index-pack.c:1272 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" msgstr[0] "s'ha completat amb %d objecte local" msgstr[1] "s'ha completat amb %d objectes locals" -#: builtin/index-pack.c:1279 +#: builtin/index-pack.c:1284 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "Suma de verificació final no esperada per a %s (corrupció de disc?)" -#: builtin/index-pack.c:1283 +#: builtin/index-pack.c:1288 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "El paquet té %d diferència no resolta" msgstr[1] "El paquet té %d diferències no resoltes" -#: builtin/index-pack.c:1307 +#: builtin/index-pack.c:1312 #, c-format msgid "unable to deflate appended object (%d)" msgstr "no s'ha pogut desinflar l'objecte annexat (%d)" -#: builtin/index-pack.c:1383 +#: builtin/index-pack.c:1389 #, c-format msgid "local object %s is corrupt" msgstr "l'objecte local %s és malmès" -#: builtin/index-pack.c:1397 +#: builtin/index-pack.c:1403 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "el nom del fitxer de paquet «%s» no acaba amb '.pack'" -#: builtin/index-pack.c:1422 +#: builtin/index-pack.c:1428 #, c-format msgid "cannot write %s file '%s'" msgstr "no es pot escriure «%s» al fitxer «%s»" -#: builtin/index-pack.c:1430 +#: builtin/index-pack.c:1436 #, fuzzy, c-format msgid "cannot close written %s file '%s'" msgstr "no es pot tancar el fitxer escrit a mantenir «%s»" -#: builtin/index-pack.c:1454 +#: builtin/index-pack.c:1460 msgid "error while closing pack file" msgstr "error en tancar el fitxer de paquet" -#: builtin/index-pack.c:1468 +#: builtin/index-pack.c:1474 msgid "cannot store pack file" msgstr "no es pot emmagatzemar el fitxer de paquet" -#: builtin/index-pack.c:1476 +#: builtin/index-pack.c:1482 msgid "cannot store index file" msgstr "no es pot emmagatzemar el fitxer d'índex" -#: builtin/index-pack.c:1513 +#: builtin/index-pack.c:1526 builtin/pack-objects.c:2645 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "pack.indexversion=%<PRIu32> incorrecte" -#: builtin/index-pack.c:1581 +#: builtin/index-pack.c:1595 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "No es pot obrir el fitxer de paquet existent «%s»" -#: builtin/index-pack.c:1583 +#: builtin/index-pack.c:1597 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "No es pot obrir el fitxer d'índex de paquets existent de «%s»" -#: builtin/index-pack.c:1631 +#: builtin/index-pack.c:1645 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "sense diferències: %d objecte" msgstr[1] "sense diferències: %d objectes" -#: builtin/index-pack.c:1638 +#: builtin/index-pack.c:1652 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "longitud de cadena = %d: %lu objecte" msgstr[1] "longitud de cadena = %d: %lu objectes" -#: builtin/index-pack.c:1675 +#: builtin/index-pack.c:1689 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:1740 builtin/index-pack.c:1743 +#: builtin/index-pack.c:1759 builtin/index-pack.c:1763 #, c-format msgid "bad %s" msgstr "%s incorrecte" -#: builtin/index-pack.c:1763 +#: builtin/index-pack.c:1779 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin no es pot usar sense --stdin" -#: builtin/index-pack.c:1765 +#: builtin/index-pack.c:1781 msgid "--stdin requires a git repository" msgstr "--stdin requereix un dipòsit git" -#: builtin/index-pack.c:1771 +#: builtin/index-pack.c:1787 msgid "--verify with no packfile name given" msgstr "s'ha donat --verify sense nom de fitxer de paquet" +#: builtin/index-pack.c:1837 builtin/unpack-objects.c:580 +#, fuzzy +msgid "fsck error in pack objects" +msgstr "error en objecte: %s" + #: builtin/init-db.c:55 #, c-format msgid "cannot stat '%s'" @@ -9746,72 +11565,72 @@ msgstr "no es pot fer stat en la plantilla «%s»" msgid "cannot opendir '%s'" msgstr "no es pot fer opendir en el directori «%s»" -#: builtin/init-db.c:77 +#: builtin/init-db.c:78 #, c-format msgid "cannot readlink '%s'" msgstr "no es pot fer readlink en «%s»" -#: builtin/init-db.c:79 +#: builtin/init-db.c:80 #, c-format msgid "cannot symlink '%s' '%s'" msgstr "no es pot fer symlink en «%s» «%s»" -#: builtin/init-db.c:85 +#: builtin/init-db.c:86 #, c-format msgid "cannot copy '%s' to '%s'" msgstr "no es pot copiar «%s» a «%s»" -#: builtin/init-db.c:89 +#: builtin/init-db.c:90 #, c-format msgid "ignoring template %s" msgstr "s'està ignorant la plantilla %s" -#: builtin/init-db.c:120 -#, c-format -msgid "templates not found %s" +#: builtin/init-db.c:121 +#, fuzzy, c-format +msgid "templates not found in %s" msgstr "no s'han trobat les plantilles %s" -#: builtin/init-db.c:135 +#: builtin/init-db.c:136 #, c-format msgid "not copying templates from '%s': %s" msgstr "no s'estan copiant plantilles de «%s»: %s" -#: builtin/init-db.c:328 +#: builtin/init-db.c:329 #, c-format msgid "unable to handle file type %d" msgstr "no s'ha pogut gestionar el tipus de fitxer %d" -#: builtin/init-db.c:331 +#: builtin/init-db.c:332 #, c-format msgid "unable to move %s to %s" msgstr "no s'ha pogut moure %s a %s" -#: builtin/init-db.c:348 builtin/init-db.c:351 +#: builtin/init-db.c:349 builtin/init-db.c:352 #, c-format msgid "%s already exists" msgstr "%s ja existeix" -#: builtin/init-db.c:404 +#: builtin/init-db.c:405 #, c-format msgid "Reinitialized existing shared Git repository in %s%s\n" msgstr "S'ha reinicialitzat el dipòsit compartit existent del Git en %s%s\n" -#: builtin/init-db.c:405 +#: builtin/init-db.c:406 #, c-format msgid "Reinitialized existing Git repository in %s%s\n" msgstr "S'ha reinicialitzat el dipòsit existent del Git en %s%s\n" -#: builtin/init-db.c:409 +#: builtin/init-db.c:410 #, c-format msgid "Initialized empty shared Git repository in %s%s\n" msgstr "S'ha inicialitzat un dipòsit compartit buit del Git en %s%s\n" -#: builtin/init-db.c:410 +#: builtin/init-db.c:411 #, c-format msgid "Initialized empty Git repository in %s%s\n" msgstr "S'ha inicialitzat un dipòsit buit del Git en %s%s\n" -#: builtin/init-db.c:458 +#: builtin/init-db.c:459 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" @@ -9819,25 +11638,25 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=<directori-de-plantilla>] [--" "shared[=<permisos>]] [<directori>]" -#: builtin/init-db.c:481 +#: builtin/init-db.c:482 msgid "permissions" msgstr "permisos" -#: builtin/init-db.c:482 +#: builtin/init-db.c:483 msgid "specify that the git repository is to be shared amongst several users" msgstr "especifica que el dipòsit de git es compartirà entre diversos usuaris" -#: builtin/init-db.c:516 builtin/init-db.c:521 +#: builtin/init-db.c:517 builtin/init-db.c:522 #, c-format msgid "cannot mkdir %s" msgstr "no es pot mkdir %s" -#: builtin/init-db.c:525 +#: builtin/init-db.c:526 #, c-format msgid "cannot chdir to %s" msgstr "no es pot canviar de directori a %s" -#: builtin/init-db.c:546 +#: builtin/init-db.c:547 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" @@ -9846,7 +11665,7 @@ msgstr "" "no es permet %s (o --work-tree=<directori>) sense especificar %s (o --git-" "dir=<directori>)" -#: builtin/init-db.c:574 +#: builtin/init-db.c:575 #, c-format msgid "Cannot access work tree '%s'" msgstr "No es pot accedir a l'arbre de treball «%s»" @@ -9911,120 +11730,120 @@ msgstr "--trailer amb --only-input no té sentit" msgid "no input file given for in-place editing" msgstr "no s'ha donat cap fitxer d'entrada per a edició in situ" -#: builtin/log.c:48 +#: builtin/log.c:51 msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "git log [<opcions>] [<rang-de-revisions>] [[--] <camí>...]" -#: builtin/log.c:49 +#: builtin/log.c:52 msgid "git show [<options>] <object>..." msgstr "git show [<opcions>] <objecte>..." -#: builtin/log.c:93 +#: builtin/log.c:96 #, c-format msgid "invalid --decorate option: %s" msgstr "opció --decorate no vàlida: %s" -#: builtin/log.c:153 +#: builtin/log.c:157 msgid "suppress diff output" msgstr "omet la sortida de diferències" -#: builtin/log.c:154 +#: builtin/log.c:158 msgid "show source" msgstr "mostra la font" -#: builtin/log.c:155 +#: builtin/log.c:159 msgid "Use mail map file" msgstr "Usa el fitxer de mapa de correu" -#: builtin/log.c:157 +#: builtin/log.c:161 msgid "only decorate refs that match <pattern>" msgstr "només decora les referències que coincideixin amb <patró>" -#: builtin/log.c:159 +#: builtin/log.c:163 msgid "do not decorate refs that match <pattern>" msgstr "no decoris les referències que coincideixen amb <patró>" -#: builtin/log.c:160 +#: builtin/log.c:164 msgid "decorate options" msgstr "opcions de decoració" -#: builtin/log.c:163 +#: builtin/log.c:167 msgid "Process line range n,m in file, counting from 1" msgstr "Processa el rang de línies n,m en el fitxer, comptant des d'1" -#: builtin/log.c:259 +#: builtin/log.c:265 #, c-format msgid "Final output: %d %s\n" msgstr "Sortida final: %d %s\n" -#: builtin/log.c:510 +#: builtin/log.c:516 #, c-format msgid "git show %s: bad file" msgstr "git show %s: fitxer incorrecte" -#: builtin/log.c:525 builtin/log.c:619 +#: builtin/log.c:531 builtin/log.c:625 #, c-format msgid "Could not read object %s" msgstr "No es pot llegir l'objecte %s" -#: builtin/log.c:643 +#: builtin/log.c:649 #, c-format msgid "Unknown type: %d" msgstr "Tipus desconegut: %d" -#: builtin/log.c:764 +#: builtin/log.c:770 msgid "format.headers without value" msgstr "format.headers sense valor" -#: builtin/log.c:865 +#: builtin/log.c:871 msgid "name of output directory is too long" msgstr "el nom del directori de sortida és massa llarg" -#: builtin/log.c:881 +#: builtin/log.c:887 #, c-format msgid "Cannot open patch file %s" msgstr "No es pot obrir el fitxer de pedaç %s" -#: builtin/log.c:898 +#: builtin/log.c:904 msgid "Need exactly one range." msgstr "Cal exactament un rang." -#: builtin/log.c:908 +#: builtin/log.c:914 msgid "Not a range." msgstr "No és un rang." -#: builtin/log.c:1014 +#: builtin/log.c:1020 msgid "Cover letter needs email format" msgstr "La carta de presentació necessita el format de correu electrònic" -#: builtin/log.c:1095 +#: builtin/log.c:1101 #, c-format msgid "insane in-reply-to: %s" msgstr "in-reply-to boig: %s" -#: builtin/log.c:1122 +#: builtin/log.c:1128 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<opcions>] [<des-de> | <rang-de-revisions>]" -#: builtin/log.c:1172 +#: builtin/log.c:1178 msgid "Two output directories?" msgstr "Hi ha dos directoris de sortida?" -#: builtin/log.c:1279 builtin/log.c:1932 builtin/log.c:1934 builtin/log.c:1946 +#: builtin/log.c:1285 builtin/log.c:1945 builtin/log.c:1947 builtin/log.c:1959 #, c-format msgid "Unknown commit %s" msgstr "Comissió desconeguda %s" -#: builtin/log.c:1289 builtin/notes.c:887 builtin/tag.c:522 +#: builtin/log.c:1295 builtin/notes.c:889 builtin/tag.c:524 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "S'ha produït un error en resoldre «%s» com a referència vàlida." -#: builtin/log.c:1294 +#: builtin/log.c:1300 msgid "Could not find exact merge base." msgstr "No s'ha pogut trobar la base exacta de fusió." -#: builtin/log.c:1298 +#: builtin/log.c:1304 msgid "" "Failed to get upstream, if you want to record base commit automatically,\n" "please use git branch --set-upstream-to to track a remote branch.\n" @@ -10036,228 +11855,230 @@ msgstr "" "seguir una branca remota. O podeu especificar la comissió base manualment\n" "amb --base=<id-de-comissió-base>." -#: builtin/log.c:1318 +#: builtin/log.c:1324 msgid "Failed to find exact merge base" msgstr "S'ha produït un error en trobar la base exacta de fusió." -#: builtin/log.c:1329 +#: builtin/log.c:1335 msgid "base commit should be the ancestor of revision list" msgstr "la comissió base ha de ser l'avantpassat de la llista de revisions" -#: builtin/log.c:1333 +#: builtin/log.c:1339 msgid "base commit shouldn't be in revision list" msgstr "la comissió base no ha de ser en la llista de revisions" -#: builtin/log.c:1382 +#: builtin/log.c:1392 msgid "cannot get patch id" msgstr "no es pot obtenir l'id del pedaç" -#: builtin/log.c:1441 +#: builtin/log.c:1452 msgid "use [PATCH n/m] even with a single patch" msgstr "usa [PATCH n/m] fins i tot amb un sol pedaç" -#: builtin/log.c:1444 +#: builtin/log.c:1455 msgid "use [PATCH] even with multiple patches" msgstr "usa [PATCH] fins i tot amb múltiples pedaços" -#: builtin/log.c:1448 +#: builtin/log.c:1459 msgid "print patches to standard out" msgstr "imprimeix els pedaços a la sortida estàndard" -#: builtin/log.c:1450 +#: builtin/log.c:1461 msgid "generate a cover letter" msgstr "genera una carta de presentació" -#: builtin/log.c:1452 +#: builtin/log.c:1463 msgid "use simple number sequence for output file names" msgstr "usa una seqüència de números per als noms dels fitxers de sortida" -#: builtin/log.c:1453 +#: builtin/log.c:1464 msgid "sfx" msgstr "sufix" -#: builtin/log.c:1454 +#: builtin/log.c:1465 msgid "use <sfx> instead of '.patch'" msgstr "usa <sufix> en lloc de '.patch'" -#: builtin/log.c:1456 +#: builtin/log.c:1467 msgid "start numbering patches at <n> instead of 1" msgstr "comença numerant els pedaços a <n> en lloc d'1" -#: builtin/log.c:1458 +#: builtin/log.c:1469 msgid "mark the series as Nth re-roll" msgstr "marca la sèrie com a l'enèsima llançada" -#: builtin/log.c:1460 +#: builtin/log.c:1471 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "Usa [RFC PATCH] en lloc de [PATCH]" -#: builtin/log.c:1463 +#: builtin/log.c:1474 msgid "Use [<prefix>] instead of [PATCH]" msgstr "Usa [<prefix>] en lloc de [PATCH]" -#: builtin/log.c:1466 +#: builtin/log.c:1477 msgid "store resulting files in <dir>" msgstr "emmagatzema els fitxers resultants a <directori>" -#: builtin/log.c:1469 +#: builtin/log.c:1480 msgid "don't strip/add [PATCH]" msgstr "no despullis/afegeixis [PATCH]" -#: builtin/log.c:1472 +#: builtin/log.c:1483 msgid "don't output binary diffs" msgstr "no emetis diferències binàries" -#: builtin/log.c:1474 +#: builtin/log.c:1485 msgid "output all-zero hash in From header" msgstr "emet un hash de tots zeros en la capçalera From" -#: builtin/log.c:1476 +#: builtin/log.c:1487 msgid "don't include a patch matching a commit upstream" msgstr "no incloguis pedaços que coincideixin amb comissions a la font" -#: builtin/log.c:1478 +#: builtin/log.c:1489 msgid "show patch format instead of default (patch + stat)" msgstr "" "mostra el format de pedaç en lloc del per defecte (pedaç + estadístiques)" -#: builtin/log.c:1480 +#: builtin/log.c:1491 msgid "Messaging" msgstr "Missatgeria" -#: builtin/log.c:1481 +#: builtin/log.c:1492 msgid "header" msgstr "capçalera" -#: builtin/log.c:1482 +#: builtin/log.c:1493 msgid "add email header" msgstr "afegeix una capçalera de correu electrònic" -#: builtin/log.c:1483 builtin/log.c:1485 +#: builtin/log.c:1494 builtin/log.c:1496 msgid "email" msgstr "correu electrònic" -#: builtin/log.c:1483 +#: builtin/log.c:1494 msgid "add To: header" msgstr "afegeix la capçalera To:" -#: builtin/log.c:1485 +#: builtin/log.c:1496 msgid "add Cc: header" msgstr "afegeix la capçalera Cc:" -#: builtin/log.c:1487 +#: builtin/log.c:1498 msgid "ident" msgstr "identitat" -#: builtin/log.c:1488 +#: builtin/log.c:1499 msgid "set From address to <ident> (or committer ident if absent)" msgstr "" "estableix l'adreça From a <identitat> (o la identitat del comitent si manca)" -#: builtin/log.c:1490 +#: builtin/log.c:1501 msgid "message-id" msgstr "ID de missatge" -#: builtin/log.c:1491 +#: builtin/log.c:1502 msgid "make first mail a reply to <message-id>" msgstr "fes que el primer missatge sigui una resposta a <ID de missatge>" -#: builtin/log.c:1492 builtin/log.c:1495 +#: builtin/log.c:1503 builtin/log.c:1506 msgid "boundary" msgstr "límit" -#: builtin/log.c:1493 +#: builtin/log.c:1504 msgid "attach the patch" msgstr "adjunta el pedaç" -#: builtin/log.c:1496 +#: builtin/log.c:1507 msgid "inline the patch" msgstr "posa el pedaç en el cos" -#: builtin/log.c:1500 +#: builtin/log.c:1511 msgid "enable message threading, styles: shallow, deep" msgstr "habilita l'enfilada de missatges, estils: shallow, deep" -#: builtin/log.c:1502 +#: builtin/log.c:1513 msgid "signature" msgstr "signatura" -#: builtin/log.c:1503 +#: builtin/log.c:1514 msgid "add a signature" msgstr "afegeix una signatura" -#: builtin/log.c:1504 +#: builtin/log.c:1515 msgid "base-commit" msgstr "comissió base" -#: builtin/log.c:1505 +#: builtin/log.c:1516 msgid "add prerequisite tree info to the patch series" msgstr "afegeix la informació d'arbre prerequerida a la sèrie de pedaços" -#: builtin/log.c:1507 +#: builtin/log.c:1518 msgid "add a signature from a file" msgstr "afegeix una signatura des d'un fitxer" -#: builtin/log.c:1508 +#: builtin/log.c:1519 msgid "don't print the patch filenames" msgstr "no imprimeixis els noms de fitxer del pedaç" -#: builtin/log.c:1510 +#: builtin/log.c:1521 msgid "show progress while generating patches" msgstr "mostra el progrés durant la generació de pedaços" -#: builtin/log.c:1585 +#: builtin/log.c:1596 #, c-format msgid "invalid ident line: %s" msgstr "línia d'identitat no vàlida: %s" -#: builtin/log.c:1600 -msgid "-n and -k are mutually exclusive." +#: builtin/log.c:1611 +#, fuzzy +msgid "-n and -k are mutually exclusive" msgstr "-n i -k són mútuament excloents." -#: builtin/log.c:1602 -msgid "--subject-prefix/--rfc and -k are mutually exclusive." +#: builtin/log.c:1613 +#, fuzzy +msgid "--subject-prefix/--rfc and -k are mutually exclusive" msgstr "--subject-prefix/--rfc i -k són mútuament excloents." -#: builtin/log.c:1610 +#: builtin/log.c:1621 msgid "--name-only does not make sense" msgstr "--name-only no té sentit" -#: builtin/log.c:1612 +#: builtin/log.c:1623 msgid "--name-status does not make sense" msgstr "--name-status no té sentit" -#: builtin/log.c:1614 +#: builtin/log.c:1625 msgid "--check does not make sense" msgstr "--check no té sentit" -#: builtin/log.c:1646 +#: builtin/log.c:1657 msgid "standard output, or directory, which one?" msgstr "sortida estàndard o directori, quin dels dos?" -#: builtin/log.c:1648 +#: builtin/log.c:1659 #, c-format msgid "Could not create directory '%s'" msgstr "No s'ha pogut crear el directori «%s»" -#: builtin/log.c:1741 +#: builtin/log.c:1752 #, c-format msgid "unable to read signature file '%s'" msgstr "no s'ha pogut llegir el fitxer de signatura «%s»" -#: builtin/log.c:1773 +#: builtin/log.c:1785 msgid "Generating patches" msgstr "S'estan generant els pedaços" -#: builtin/log.c:1817 +#: builtin/log.c:1829 msgid "Failed to create output files" msgstr "S'ha produït un error en crear els fitxers de sortida" -#: builtin/log.c:1867 +#: builtin/log.c:1880 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<font> [<cap> [<límit>]]]" -#: builtin/log.c:1921 +#: builtin/log.c:1934 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -10265,113 +12086,113 @@ msgstr "" "No s'ha pogut trobar una branca remota seguida. Especifiqueu <font> " "manualment.\n" -#: builtin/ls-files.c:468 +#: builtin/ls-files.c:469 msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<opcions>] [<fitxer>...]" -#: builtin/ls-files.c:517 +#: builtin/ls-files.c:518 msgid "identify the file status with tags" msgstr "identifica l'estat de fitxer amb etiquetes" -#: builtin/ls-files.c:519 +#: builtin/ls-files.c:520 msgid "use lowercase letters for 'assume unchanged' files" msgstr "usa lletres minúscules per als fitxers 'assume unchanged'" -#: builtin/ls-files.c:521 +#: builtin/ls-files.c:522 msgid "use lowercase letters for 'fsmonitor clean' files" msgstr "usa lletres minúscules per als fitxers 'fsmonitor clean'" -#: builtin/ls-files.c:523 +#: builtin/ls-files.c:524 msgid "show cached files in the output (default)" msgstr "" "mostra en la sortida els fitxers desats en la memòria cau (per defecte)" -#: builtin/ls-files.c:525 +#: builtin/ls-files.c:526 msgid "show deleted files in the output" msgstr "mostra en la sortida els fitxers suprimits" -#: builtin/ls-files.c:527 +#: builtin/ls-files.c:528 msgid "show modified files in the output" msgstr "mostra en la sortida els fitxers modificats" -#: builtin/ls-files.c:529 +#: builtin/ls-files.c:530 msgid "show other files in the output" msgstr "mostra en la sortida els altres fitxers" -#: builtin/ls-files.c:531 +#: builtin/ls-files.c:532 msgid "show ignored files in the output" msgstr "mostra en la sortida els fitxers ignorats" -#: builtin/ls-files.c:534 +#: builtin/ls-files.c:535 msgid "show staged contents' object name in the output" msgstr "mostra en la sortida el nom d'objecte dels continguts «stage»" -#: builtin/ls-files.c:536 +#: builtin/ls-files.c:537 msgid "show files on the filesystem that need to be removed" msgstr "mostra els fitxers en el sistema de fitxers que s'han d'eliminar" -#: builtin/ls-files.c:538 +#: builtin/ls-files.c:539 msgid "show 'other' directories' names only" msgstr "mostra només els noms dels directoris 'other'" -#: builtin/ls-files.c:540 +#: builtin/ls-files.c:541 msgid "show line endings of files" msgstr "mostra els terminadors de línia dels fitxers" -#: builtin/ls-files.c:542 +#: builtin/ls-files.c:543 msgid "don't show empty directories" msgstr "no mostris els directoris buits" -#: builtin/ls-files.c:545 +#: builtin/ls-files.c:546 msgid "show unmerged files in the output" msgstr "mostra en la sortida els fitxers sense fusionar" -#: builtin/ls-files.c:547 +#: builtin/ls-files.c:548 msgid "show resolve-undo information" msgstr "mostra la informació de resolució de desfet" -#: builtin/ls-files.c:549 +#: builtin/ls-files.c:550 msgid "skip files matching pattern" msgstr "omet els fitxers coincidents amb el patró" -#: builtin/ls-files.c:552 +#: builtin/ls-files.c:553 msgid "exclude patterns are read from <file>" msgstr "els patrons d'exclusió es llegeixen de <fitxer>" -#: builtin/ls-files.c:555 +#: builtin/ls-files.c:556 msgid "read additional per-directory exclude patterns in <file>" msgstr "llegeix els patrons addicionals d'exclusió per directori en <fitxer>" -#: builtin/ls-files.c:557 +#: builtin/ls-files.c:558 msgid "add the standard git exclusions" msgstr "afegeix les exclusions estàndards de git" -#: builtin/ls-files.c:560 +#: builtin/ls-files.c:561 msgid "make the output relative to the project top directory" msgstr "fes que la sortida sigui relativa al directori superior del projecte" -#: builtin/ls-files.c:563 +#: builtin/ls-files.c:564 msgid "recurse through submodules" msgstr "inclou recursivament als submòduls" -#: builtin/ls-files.c:565 +#: builtin/ls-files.c:566 msgid "if any <file> is not in the index, treat this as an error" msgstr "si qualsevol <fitxer> no és en l'índex, tracta-ho com a error" -#: builtin/ls-files.c:566 +#: builtin/ls-files.c:567 msgid "tree-ish" msgstr "arbre" -#: builtin/ls-files.c:567 +#: builtin/ls-files.c:568 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "" "pretén que els camins eliminats després de <arbre> encara siguin presents" -#: builtin/ls-files.c:569 +#: builtin/ls-files.c:570 msgid "show debugging data" msgstr "mostra les dades de depuració" -#: builtin/ls-remote.c:7 +#: builtin/ls-remote.c:9 msgid "" "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" " [-q | --quiet] [--exit-code] [--get-url]\n" @@ -10382,75 +12203,75 @@ msgstr "" " [--exit-code] [--get-url] [--symref]\n" " [<dipòsit> [<referències>...]]" -#: builtin/ls-remote.c:52 +#: builtin/ls-remote.c:59 msgid "do not print remote URL" msgstr "no imprimeixis l'URL remot" -#: builtin/ls-remote.c:53 builtin/ls-remote.c:55 +#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 msgid "exec" msgstr "executable" -#: 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 "camí a git-upload-pack en la màquina remota" -#: builtin/ls-remote.c:58 +#: builtin/ls-remote.c:65 msgid "limit to tags" msgstr "limita a etiquetes" -#: builtin/ls-remote.c:59 +#: builtin/ls-remote.c:66 msgid "limit to heads" msgstr "limita a caps" -#: builtin/ls-remote.c:60 +#: builtin/ls-remote.c:67 msgid "do not show peeled tags" msgstr "no mostris les etiquetes pelades" -#: builtin/ls-remote.c:62 +#: builtin/ls-remote.c:69 msgid "take url.<base>.insteadOf into account" msgstr "tingues en compte url.<base>.insteadOf" -#: builtin/ls-remote.c:64 +#: builtin/ls-remote.c:73 msgid "exit with exit code 2 if no matching refs are found" msgstr "surt amb codi de sortida 2 si no es troba cap referència coincident" -#: builtin/ls-remote.c:67 +#: builtin/ls-remote.c:76 msgid "show underlying ref in addition to the object pointed by it" msgstr "mostra la referència subjacent a més de l'objecte que senyali" -#: builtin/ls-tree.c:29 +#: builtin/ls-tree.c:30 msgid "git ls-tree [<options>] <tree-ish> [<path>...]" msgstr "git ls-tree [<opcions>] <arbre> [<camí>...]" -#: builtin/ls-tree.c:127 +#: builtin/ls-tree.c:128 msgid "only show trees" msgstr "mostra només els arbres" -#: builtin/ls-tree.c:129 +#: builtin/ls-tree.c:130 msgid "recurse into subtrees" msgstr "inclou recursivament als subarbres" -#: builtin/ls-tree.c:131 +#: builtin/ls-tree.c:132 msgid "show trees when recursing" msgstr "mostra els arbres quan es treballa recursivament" -#: builtin/ls-tree.c:134 +#: builtin/ls-tree.c:135 msgid "terminate entries with NUL byte" msgstr "acaba les entrades amb un octet NUL" -#: builtin/ls-tree.c:135 +#: builtin/ls-tree.c:136 msgid "include object size" msgstr "mida de l'objecte d'inclusió" -#: builtin/ls-tree.c:137 builtin/ls-tree.c:139 +#: builtin/ls-tree.c:138 builtin/ls-tree.c:140 msgid "list only filenames" msgstr "llista només els noms de fitxer" -#: builtin/ls-tree.c:142 +#: builtin/ls-tree.c:143 msgid "use full path names" msgstr "usa els noms de camí complets" -#: builtin/ls-tree.c:144 +#: builtin/ls-tree.c:145 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)" @@ -10460,183 +12281,183 @@ msgstr "" msgid "empty mbox: '%s'" msgstr "mbox buit: «%s»" -#: builtin/merge.c:49 +#: builtin/merge.c:51 msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<opcions>] [<comissió>...]" -#: builtin/merge.c:50 +#: builtin/merge.c:52 msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:51 +#: builtin/merge.c:53 msgid "git merge --continue" msgstr "git merge --continue" -#: builtin/merge.c:108 +#: builtin/merge.c:110 msgid "switch `m' requires a value" msgstr "l'opció «m» requereix un valor" -#: builtin/merge.c:145 +#: builtin/merge.c:176 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "No s'ha pogut trobar l'estratègia de fusió «%s».\n" -#: builtin/merge.c:146 +#: builtin/merge.c:177 #, c-format msgid "Available strategies are:" msgstr "Les estratègies disponibles són:" -#: builtin/merge.c:151 +#: builtin/merge.c:182 #, c-format msgid "Available custom strategies are:" msgstr "Les estratègies personalitzades disponibles són:" -#: builtin/merge.c:201 builtin/pull.c:137 +#: builtin/merge.c:232 builtin/pull.c:142 msgid "do not show a diffstat at the end of the merge" msgstr "no mostris les estadístiques de diferència al final de la fusió" -#: builtin/merge.c:204 builtin/pull.c:140 +#: builtin/merge.c:235 builtin/pull.c:145 msgid "show a diffstat at the end of the merge" msgstr "mostra les estadístiques de diferència al final de la fusió" -#: builtin/merge.c:205 builtin/pull.c:143 +#: builtin/merge.c:236 builtin/pull.c:148 msgid "(synonym to --stat)" msgstr "(sinònim de --stat)" -#: builtin/merge.c:207 builtin/pull.c:146 +#: builtin/merge.c:238 builtin/pull.c:151 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" "afegeix (com a màxim <n>) entrades del registre curt al missatge de comissió " "de fusió" -#: builtin/merge.c:210 builtin/pull.c:152 +#: builtin/merge.c:241 builtin/pull.c:157 msgid "create a single commit instead of doing a merge" msgstr "crea una única comissió en lloc de fusionar" -#: builtin/merge.c:212 builtin/pull.c:155 +#: builtin/merge.c:243 builtin/pull.c:160 msgid "perform a commit if the merge succeeds (default)" msgstr "realitza una comissió si la fusió té èxit (per defecte)" -#: builtin/merge.c:214 builtin/pull.c:158 +#: builtin/merge.c:245 builtin/pull.c:163 msgid "edit message before committing" msgstr "edita el missatge abans de cometre" -#: builtin/merge.c:215 +#: builtin/merge.c:246 msgid "allow fast-forward (default)" msgstr "permet l'avanç ràpid (per defecte)" -#: builtin/merge.c:217 builtin/pull.c:164 +#: builtin/merge.c:248 builtin/pull.c:169 msgid "abort if fast-forward is not possible" msgstr "avorta si l'avanç ràpid no és possible" -#: builtin/merge.c:221 builtin/pull.c:167 +#: builtin/merge.c:252 builtin/pull.c:172 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:253 builtin/notes.c:779 builtin/pull.c:176 +#: builtin/revert.c:110 msgid "strategy" msgstr "estratègia" -#: builtin/merge.c:223 builtin/pull.c:172 +#: builtin/merge.c:254 builtin/pull.c:177 msgid "merge strategy to use" msgstr "estratègia de fusió a usar" -#: builtin/merge.c:224 builtin/pull.c:175 +#: builtin/merge.c:255 builtin/pull.c:180 msgid "option=value" msgstr "opció=valor" -#: builtin/merge.c:225 builtin/pull.c:176 +#: builtin/merge.c:256 builtin/pull.c:181 msgid "option for selected merge strategy" msgstr "opció per a l'estratègia de fusió seleccionada" -#: builtin/merge.c:227 +#: builtin/merge.c:258 msgid "merge commit message (for a non-fast-forward merge)" msgstr "missatge de comissió de fusió (per a una fusió no d'avanç ràpid)" -#: builtin/merge.c:231 +#: builtin/merge.c:265 msgid "abort the current in-progress merge" msgstr "avorta la fusió en curs actual" -#: builtin/merge.c:233 +#: builtin/merge.c:267 msgid "continue the current in-progress merge" msgstr "continua la fusió en curs actual" -#: builtin/merge.c:235 builtin/pull.c:183 +#: builtin/merge.c:269 builtin/pull.c:188 msgid "allow merging unrelated histories" msgstr "permet fusionar històries no relacionades" -#: builtin/merge.c:241 +#: builtin/merge.c:275 msgid "verify commit-msg hook" msgstr "verifica el lligam de missatge de comissió" -#: builtin/merge.c:266 +#: builtin/merge.c:300 msgid "could not run stash." msgstr "no s'ha pogut executar «stash»." -#: builtin/merge.c:271 +#: builtin/merge.c:305 msgid "stash failed" msgstr "l'«stash» ha fallat" -#: builtin/merge.c:276 +#: builtin/merge.c:310 #, c-format msgid "not a valid object: %s" msgstr "no és un objecte vàlid: %s" -#: builtin/merge.c:298 builtin/merge.c:315 +#: builtin/merge.c:332 builtin/merge.c:349 msgid "read-tree failed" msgstr "read-tree ha fallat" -#: builtin/merge.c:345 +#: builtin/merge.c:379 msgid " (nothing to squash)" msgstr " (res a fer «squash»)" -#: builtin/merge.c:356 +#: builtin/merge.c:390 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Comissió «squash» -- no s'està actualitzant HEAD\n" -#: builtin/merge.c:406 +#: builtin/merge.c:440 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "Cap missatge de fusió -- no s'està actualitzant HEAD\n" -#: builtin/merge.c:456 +#: builtin/merge.c:491 #, c-format msgid "'%s' does not point to a commit" msgstr "«%s» no assenyala una comissió" -#: builtin/merge.c:546 +#: builtin/merge.c:578 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Cadena branch.%s.mergeoptions incorrecta: %s" -#: builtin/merge.c:668 +#: builtin/merge.c:699 msgid "Not handling anything other than two heads merge." msgstr "No s'està gestionant res a part de la fusió de dos caps." -#: builtin/merge.c:682 +#: builtin/merge.c:713 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Opció desconeguda de merge-recursive: -X%s" -#: builtin/merge.c:697 +#: builtin/merge.c:728 #, c-format msgid "unable to write %s" msgstr "no s'ha pogut escriure %s" -#: builtin/merge.c:749 +#: builtin/merge.c:779 #, c-format msgid "Could not read from '%s'" msgstr "No s'ha pogut llegir de «%s»" -#: builtin/merge.c:758 +#: builtin/merge.c:788 #, 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" -#: builtin/merge.c:764 +#: builtin/merge.c:794 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -10652,70 +12473,70 @@ msgstr "" "S'ignoraran les línies que comencin amb '%c', i un missatge buit\n" "avorta la comissió.\n" -#: builtin/merge.c:800 +#: builtin/merge.c:830 msgid "Empty commit message." msgstr "El missatge de comissió és buit." -#: builtin/merge.c:820 +#: builtin/merge.c:849 #, c-format msgid "Wonderful.\n" msgstr "Meravellós.\n" -#: builtin/merge.c:873 +#: builtin/merge.c:902 #, 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" -#: builtin/merge.c:912 +#: builtin/merge.c:941 msgid "No current branch." msgstr "No hi ha cap branca actual." -#: builtin/merge.c:914 +#: builtin/merge.c:943 msgid "No remote for the current branch." msgstr "No hi ha cap remot per a la branca actual." -#: builtin/merge.c:916 +#: builtin/merge.c:945 msgid "No default upstream defined for the current branch." msgstr "No hi ha cap font per defecte definida per a la branca actual." -#: builtin/merge.c:921 +#: builtin/merge.c:950 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "No hi ha cap branca amb seguiment remot per a %s de %s" -#: builtin/merge.c:974 +#: builtin/merge.c:1007 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Valor incorrecte «%s» en l'entorn «%s»" -#: builtin/merge.c:1076 +#: builtin/merge.c:1110 #, c-format msgid "not something we can merge in %s: %s" msgstr "no és quelcom que puguem fusionar en %s: %s" -#: builtin/merge.c:1110 +#: builtin/merge.c:1144 msgid "not something we can merge" msgstr "no és quelcom que puguem fusionar" -#: builtin/merge.c:1212 +#: builtin/merge.c:1247 msgid "--abort expects no arguments" msgstr "--abort no accepta paràmetres" -#: builtin/merge.c:1216 +#: builtin/merge.c:1251 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "No hi ha fusió a avortar (manca MERGE_HEAD)." -#: builtin/merge.c:1228 +#: builtin/merge.c:1263 msgid "--continue expects no arguments" msgstr "--continue no accepta paràmetres" -#: builtin/merge.c:1232 +#: builtin/merge.c:1267 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "No hi ha cap fusió en curs (manca MERGE_HEAD)." -#: builtin/merge.c:1248 +#: builtin/merge.c:1283 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -10723,7 +12544,7 @@ msgstr "" "No heu conclòs la vostra fusió (MERGE_HEAD existeix).\n" "Cometeu els vostres canvis abans de fusionar." -#: builtin/merge.c:1255 +#: builtin/merge.c:1290 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -10731,157 +12552,157 @@ msgstr "" "No heu conclòs el vostre «cherry pick» (CHERRY_PICK_HEAD existeix).\n" "Cometeu els vostres canvis abans de fusionar." -#: builtin/merge.c:1258 +#: builtin/merge.c:1293 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "No heu conclòs el vostre «cherry pick» (CHERRY_PICK_HEAD existeix)." -#: builtin/merge.c:1267 +#: builtin/merge.c:1302 msgid "You cannot combine --squash with --no-ff." msgstr "No podeu combinar --squash amb --no-ff." -#: builtin/merge.c:1275 +#: builtin/merge.c:1310 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" "No hi ha una comissió especificada i merge.defaultToUpstream no està " "establert." -#: builtin/merge.c:1292 +#: builtin/merge.c:1327 msgid "Squash commit into empty head not supported yet" msgstr "Una comissió «squash» a un HEAD buit encara no es permet" -#: builtin/merge.c:1294 +#: builtin/merge.c:1329 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "Una comissió no d'avanç ràpid no té sentit a un HEAD buit" -#: builtin/merge.c:1299 +#: builtin/merge.c:1334 #, c-format msgid "%s - not something we can merge" msgstr "%s - no és una cosa que puguem fusionar" -#: builtin/merge.c:1301 +#: builtin/merge.c:1336 msgid "Can merge only exactly one commit into empty head" msgstr "Es pot fusionar només una comissió a un HEAD buit" -#: builtin/merge.c:1335 +#: builtin/merge.c:1370 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "La comissió %s té una signatura GPG no fiable, suposadament de %s." -#: builtin/merge.c:1338 +#: builtin/merge.c:1373 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "La comissió %s té una signatura GPG incorrecta suposadament de %s." -#: builtin/merge.c:1341 +#: builtin/merge.c:1376 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "La comissió %s no té signatura GPG." -#: builtin/merge.c:1344 +#: builtin/merge.c:1379 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "La comissió %s té una signatura GPG bona de %s\n" -#: builtin/merge.c:1403 +#: builtin/merge.c:1438 msgid "refusing to merge unrelated histories" msgstr "s'està refusant fusionar històries no relacionades" -#: builtin/merge.c:1412 +#: builtin/merge.c:1447 msgid "Already up to date." msgstr "Ja està al dia." -#: builtin/merge.c:1422 +#: builtin/merge.c:1457 #, c-format msgid "Updating %s..%s\n" msgstr "S'estan actualitzant %s..%s\n" -#: builtin/merge.c:1463 +#: builtin/merge.c:1498 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "S'està intentant una fusió molt trivial en l'índex...\n" -#: builtin/merge.c:1470 +#: builtin/merge.c:1505 #, c-format msgid "Nope.\n" msgstr "No.\n" -#: builtin/merge.c:1495 +#: builtin/merge.c:1530 msgid "Already up to date. Yeeah!" msgstr "Ja està al dia. Estupend!" -#: builtin/merge.c:1501 +#: builtin/merge.c:1536 msgid "Not possible to fast-forward, aborting." msgstr "No és possible avançar ràpidament, s'està avortant." -#: builtin/merge.c:1524 builtin/merge.c:1603 +#: builtin/merge.c:1559 builtin/merge.c:1638 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "S'està rebobinant l'arbre a la pristina...\n" -#: builtin/merge.c:1528 +#: builtin/merge.c:1563 #, c-format msgid "Trying merge strategy %s...\n" msgstr "S'està intentant l'estratègia de fusió %s...\n" -#: builtin/merge.c:1594 +#: builtin/merge.c:1629 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Cap estratègia de fusió ha gestionat la fusió.\n" -#: builtin/merge.c:1596 +#: builtin/merge.c:1631 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "L'estratègia de fusió %s ha fallat.\n" -#: builtin/merge.c:1605 +#: builtin/merge.c:1640 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "S'està usant el %s per a preparar la resolució a mà.\n" -#: builtin/merge.c:1617 +#: builtin/merge.c:1652 #, 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" -#: builtin/merge-base.c:30 +#: builtin/merge-base.c:31 msgid "git merge-base [-a | --all] <commit> <commit>..." msgstr "git merge-base [-a | --all] <comissió> <comissió>..." -#: builtin/merge-base.c:31 +#: builtin/merge-base.c:32 msgid "git merge-base [-a | --all] --octopus <commit>..." msgstr "git merge-base [-a | --all] --octopus <comissió>..." -#: builtin/merge-base.c:32 +#: builtin/merge-base.c:33 msgid "git merge-base --independent <commit>..." msgstr "git merge-base --independent <comissió>..." -#: builtin/merge-base.c:33 +#: builtin/merge-base.c:34 msgid "git merge-base --is-ancestor <commit> <commit>" msgstr "git merge-base --is-ancestor <comissió> <comissió>" -#: builtin/merge-base.c:34 +#: builtin/merge-base.c:35 msgid "git merge-base --fork-point <ref> [<commit>]" msgstr "git merge-base --fork-point <referència> [<comissió>]" -#: builtin/merge-base.c:220 +#: builtin/merge-base.c:221 msgid "output all common ancestors" msgstr "emet tots els avantpassats comuns" -#: builtin/merge-base.c:222 +#: builtin/merge-base.c:223 msgid "find ancestors for a single n-way merge" msgstr "troba els avantpassats per a una sola fusió d'n vies" -#: builtin/merge-base.c:224 +#: builtin/merge-base.c:225 msgid "list revs not reachable from others" msgstr "llista les revisions no abastables d'altres" -#: builtin/merge-base.c:226 +#: builtin/merge-base.c:227 msgid "is the first one ancestor of the other?" msgstr "és la primera un avantpassat de l'altre?" -#: builtin/merge-base.c:228 +#: builtin/merge-base.c:229 msgid "find where <commit> forked from reflog of <ref>" msgstr "" "troba on <comissió> s'ha bifurcat del registre de referències de <referència>" @@ -10957,19 +12778,19 @@ msgstr "no s'ha pogut resoldre la referència «%s»" msgid "Merging %s with %s\n" msgstr "S'està fusionant %s amb %s\n" -#: builtin/mktree.c:65 +#: builtin/mktree.c:66 msgid "git mktree [-z] [--missing] [--batch]" msgstr "git mktree [-z] [--missing] [--batch]" -#: builtin/mktree.c:153 +#: builtin/mktree.c:154 msgid "input is NUL terminated" msgstr "l'entrada és acabada amb NUL" -#: builtin/mktree.c:154 builtin/write-tree.c:25 +#: builtin/mktree.c:155 builtin/write-tree.c:25 msgid "allow missing objects" msgstr "permet els objectes absents" -#: builtin/mktree.c:155 +#: builtin/mktree.c:156 msgid "allow creation of more than one tree" msgstr "permet la creació de més d'un arbre" @@ -10977,27 +12798,27 @@ msgstr "permet la creació de més d'un arbre" msgid "git mv [<options>] <source>... <destination>" msgstr "git mv [<opcions>] <font>... <destí>" -#: builtin/mv.c:83 +#: builtin/mv.c:82 #, c-format msgid "Directory %s is in index and no submodule?" msgstr "El directori %s és en l'índex i no hi ha cap submòdul?" -#: builtin/mv.c:85 builtin/rm.c:289 +#: builtin/mv.c:84 msgid "Please stage your changes to .gitmodules or stash them to proceed" msgstr "" "Feu «stage» dels vostres canvis a .gitmodules o feu «stash» dels mateixos " "per a procedir" -#: builtin/mv.c:103 +#: builtin/mv.c:102 #, c-format msgid "%.*s is in index" msgstr "%.*s és en l'índex" -#: builtin/mv.c:125 +#: builtin/mv.c:124 msgid "force move/rename even if target exists" msgstr "força el moviment / canvi de nom encara que el destí existeixi" -#: builtin/mv.c:127 +#: builtin/mv.c:126 msgid "skip move/rename errors" msgstr "omet els errors de moviment / canvi de nom" @@ -11062,60 +12883,60 @@ msgstr "%s, origen=%s, destí=%s" msgid "Renaming %s to %s\n" msgstr "S'està canviant el nom de %s a %s\n" -#: builtin/mv.c:276 builtin/remote.c:712 builtin/repack.c:394 +#: builtin/mv.c:276 builtin/remote.c:716 builtin/repack.c:494 #, c-format msgid "renaming '%s' failed" msgstr "el canvi del nom de «%s» ha fallat" -#: builtin/name-rev.c:338 +#: builtin/name-rev.c:355 msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [<opcions>] <comissió>..." -#: builtin/name-rev.c:339 +#: builtin/name-rev.c:356 msgid "git name-rev [<options>] --all" msgstr "git name-rev [<opcions>] --all" -#: builtin/name-rev.c:340 +#: builtin/name-rev.c:357 msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [<opcions>] --stdin" -#: builtin/name-rev.c:395 +#: builtin/name-rev.c:413 msgid "print only names (no SHA-1)" msgstr "imprimeix només els noms (sense SHA-1)" -#: builtin/name-rev.c:396 +#: builtin/name-rev.c:414 msgid "only use tags to name the commits" msgstr "només usa les etiquetes per a anomenar les comissions" -#: builtin/name-rev.c:398 +#: builtin/name-rev.c:416 msgid "only use refs matching <pattern>" msgstr "només usa les referències que coincideixin amb <patró>" -#: builtin/name-rev.c:400 +#: builtin/name-rev.c:418 msgid "ignore refs matching <pattern>" msgstr "ignora les referències que coincideixin amb <patró>" -#: builtin/name-rev.c:402 +#: builtin/name-rev.c:420 msgid "list all commits reachable from all refs" msgstr "llista totes les comissions abastables de totes les referències" -#: builtin/name-rev.c:403 +#: builtin/name-rev.c:421 msgid "read from stdin" msgstr "llegeix de stdin" -#: builtin/name-rev.c:404 +#: builtin/name-rev.c:422 msgid "allow to print `undefined` names (default)" msgstr "permet imprimir els noms `undefined` (per defecte)" -#: builtin/name-rev.c:410 +#: builtin/name-rev.c:428 msgid "dereference tags in the input (internal use)" msgstr "desreferencia les etiquetes en l'entrada (ús intern)" -#: builtin/notes.c:26 +#: builtin/notes.c:28 msgid "git notes [--ref <notes-ref>] [list [<object>]]" msgstr "git notes [--ref <referència-de-notes>] [llista [<objecte>]]" -#: builtin/notes.c:27 +#: builtin/notes.c:29 msgid "" "git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> " "| (-c | -C) <object>] [<object>]" @@ -11123,12 +12944,12 @@ msgstr "" "git notes [--ref <referència-de-notes>] add [-f] [--allow-empty] [-m " "<missatge> | -F <fitxer> | (-c | -C) <objecte>] [<objecte>]" -#: builtin/notes.c:28 +#: builtin/notes.c:30 msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>" msgstr "" "git notes [--ref <referència-de-notes>] copy [-f] <d'objecte> <a-objecte>" -#: builtin/notes.c:29 +#: builtin/notes.c:31 msgid "" "git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | " "(-c | -C) <object>] [<object>]" @@ -11136,159 +12957,159 @@ msgstr "" "git notes [--ref <referència-de-notes>] append [--allow-empty] [-m " "<missatge> | -F <fitxer> | (-c | -C) <objecte>] [<objecte>]" -#: builtin/notes.c:30 +#: builtin/notes.c:32 msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]" msgstr "" "git notes [--ref <referència-de-notes>] edit [--allow-empty] [<objecte>]" -#: builtin/notes.c:31 +#: builtin/notes.c:33 msgid "git notes [--ref <notes-ref>] show [<object>]" msgstr "git notes [--ref <referència-de-notes>] show [<objecte>]" -#: builtin/notes.c:32 +#: builtin/notes.c:34 msgid "" "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>" msgstr "" "git notes [--ref <referència-de-notes>] merge [-v | -q] [-s <estratègia>] " "<referència-de-notes>" -#: builtin/notes.c:33 +#: builtin/notes.c:35 msgid "git notes merge --commit [-v | -q]" msgstr "git notes merge --commit [-v | -q]" -#: builtin/notes.c:34 +#: builtin/notes.c:36 msgid "git notes merge --abort [-v | -q]" msgstr "git notes merge --abort [-v | -q]" -#: builtin/notes.c:35 +#: builtin/notes.c:37 msgid "git notes [--ref <notes-ref>] remove [<object>...]" msgstr "git notes [--ref <referència-de-notes>] remove [<objecte>...]" -#: builtin/notes.c:36 +#: builtin/notes.c:38 msgid "git notes [--ref <notes-ref>] prune [-n] [-v]" msgstr "git notes [--ref <referència-de-notes>] prune [-n] [-v]" -#: builtin/notes.c:37 +#: builtin/notes.c:39 msgid "git notes [--ref <notes-ref>] get-ref" msgstr "git notes [--ref <referència-de-notes>] get-ref" -#: builtin/notes.c:42 +#: builtin/notes.c:44 msgid "git notes [list [<object>]]" msgstr "git notes [llista [<objecte>]]" -#: builtin/notes.c:47 +#: builtin/notes.c:49 msgid "git notes add [<options>] [<object>]" msgstr "git notes add [<opcions>] [<objecte>]" -#: builtin/notes.c:52 +#: builtin/notes.c:54 msgid "git notes copy [<options>] <from-object> <to-object>" msgstr "git notes copy [<opcions>] <d'objecte> <a-objecte>" -#: builtin/notes.c:53 +#: builtin/notes.c:55 msgid "git notes copy --stdin [<from-object> <to-object>]..." msgstr "git notes copy --stdin [<d'objecte> <a-objecte>]..." -#: builtin/notes.c:58 +#: builtin/notes.c:60 msgid "git notes append [<options>] [<object>]" msgstr "git notes append [<opcions>] [<objecte>]" -#: builtin/notes.c:63 +#: builtin/notes.c:65 msgid "git notes edit [<object>]" msgstr "git notes edit [<objecte>]" -#: builtin/notes.c:68 +#: builtin/notes.c:70 msgid "git notes show [<object>]" msgstr "git notes show [<objecte>]" -#: builtin/notes.c:73 +#: builtin/notes.c:75 msgid "git notes merge [<options>] <notes-ref>" msgstr "git notes merge [<opcions>] <referència-de-notes>" -#: builtin/notes.c:74 +#: builtin/notes.c:76 msgid "git notes merge --commit [<options>]" msgstr "git notes merge --commit [<opcions>]" -#: builtin/notes.c:75 +#: builtin/notes.c:77 msgid "git notes merge --abort [<options>]" msgstr "git notes merge --abort [<opcions>]" -#: builtin/notes.c:80 +#: builtin/notes.c:82 msgid "git notes remove [<object>]" msgstr "git notes remove [<objecte>]" -#: builtin/notes.c:85 +#: builtin/notes.c:87 msgid "git notes prune [<options>]" msgstr "git notes prune [<opcions>]" -#: builtin/notes.c:90 +#: builtin/notes.c:92 msgid "git notes get-ref" msgstr "git notes get-ref" -#: builtin/notes.c:95 +#: builtin/notes.c:97 msgid "Write/edit the notes for the following object:" msgstr "Escriviu/editeu les notes per l'objecte següent:" -#: builtin/notes.c:148 +#: builtin/notes.c:150 #, c-format msgid "unable to start 'show' for object '%s'" msgstr "no s'ha pogut iniciar 'show' per a l'objecte «%s»" -#: builtin/notes.c:152 +#: builtin/notes.c:154 msgid "could not read 'show' output" msgstr "no s'ha pogut llegir la sortida de 'show'" -#: builtin/notes.c:160 +#: builtin/notes.c:162 #, c-format msgid "failed to finish 'show' for object '%s'" msgstr "S'ha produït un error en finalitzar 'show' per a l'objecte «%s»" -#: builtin/notes.c:195 +#: builtin/notes.c:197 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" -#: builtin/notes.c:204 +#: builtin/notes.c:206 msgid "unable to write note object" msgstr "no s'ha pogut escriure l'objecte de nota" -#: builtin/notes.c:206 +#: builtin/notes.c:208 #, c-format msgid "the note contents have been left in %s" msgstr "s'han deixat els continguts de la nota en %s" -#: builtin/notes.c:234 builtin/tag.c:506 +#: builtin/notes.c:236 builtin/tag.c:508 #, c-format msgid "cannot read '%s'" msgstr "no es pot llegir «%s»" -#: builtin/notes.c:236 builtin/tag.c:509 +#: builtin/notes.c:238 builtin/tag.c:511 #, c-format 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:257 builtin/notes.c:308 builtin/notes.c:310 +#: builtin/notes.c:378 builtin/notes.c:433 builtin/notes.c:519 +#: builtin/notes.c:524 builtin/notes.c:602 builtin/notes.c:664 #, c-format msgid "failed to resolve '%s' as a valid ref." msgstr "s'ha produït un error en resoldre «%s» com a referència vàlida." -#: builtin/notes.c:258 +#: builtin/notes.c:260 #, c-format msgid "failed to read object '%s'." msgstr "s'ha produït un error en llegir l'objecte «%s»." -#: builtin/notes.c:262 +#: builtin/notes.c:264 #, c-format msgid "cannot read note data from non-blob object '%s'." msgstr "no es poden llegir les dades de node de l'objecte no de blob «%s»." -#: builtin/notes.c:302 +#: builtin/notes.c:304 #, c-format msgid "malformed input line: '%s'." msgstr "línia d'entrada mal formada: «%s»." -#: builtin/notes.c:317 +#: builtin/notes.c:319 #, c-format msgid "failed to copy notes from '%s' to '%s'" msgstr "s'ha produït un error en copiar les notes de «%s» a «%s»" @@ -11296,47 +13117,47 @@ msgstr "s'ha produït un error en copiar les notes de «%s» a «%s»" #. TRANSLATORS: the first %s will be replaced by a git #. notes command: 'add', 'merge', 'remove', etc. #. -#: builtin/notes.c:349 +#: builtin/notes.c:351 #, c-format msgid "refusing to %s notes in %s (outside of refs/notes/)" msgstr "s'està refusant %s les notes en %s (fora de refs/notes/)" -#: builtin/notes.c:369 builtin/notes.c:424 builtin/notes.c:500 -#: builtin/notes.c:512 builtin/notes.c:588 builtin/notes.c:655 -#: builtin/notes.c:805 builtin/notes.c:952 builtin/notes.c:973 +#: builtin/notes.c:371 builtin/notes.c:426 builtin/notes.c:502 +#: builtin/notes.c:514 builtin/notes.c:590 builtin/notes.c:657 +#: builtin/notes.c:807 builtin/notes.c:954 builtin/notes.c:975 msgid "too many parameters" msgstr "massa paràmetres" -#: builtin/notes.c:382 builtin/notes.c:668 +#: builtin/notes.c:384 builtin/notes.c:670 #, c-format msgid "no note found for object %s." msgstr "no s'ha trobat cap nota per a l'objecte %s." -#: builtin/notes.c:403 builtin/notes.c:566 +#: builtin/notes.c:405 builtin/notes.c:568 msgid "note contents as a string" msgstr "anota els continguts com a cadena" -#: builtin/notes.c:406 builtin/notes.c:569 +#: builtin/notes.c:408 builtin/notes.c:571 msgid "note contents in a file" msgstr "anota els continguts en un fitxer" -#: builtin/notes.c:409 builtin/notes.c:572 +#: builtin/notes.c:411 builtin/notes.c:574 msgid "reuse and edit specified note object" msgstr "reusa i edita l'objecte de nota especificat" -#: builtin/notes.c:412 builtin/notes.c:575 +#: builtin/notes.c:414 builtin/notes.c:577 msgid "reuse specified note object" msgstr "reusa l'objecte de nota especificat" -#: builtin/notes.c:415 builtin/notes.c:578 +#: builtin/notes.c:417 builtin/notes.c:580 msgid "allow storing empty note" msgstr "permet l'emmagatzematge d'una nota buida" -#: builtin/notes.c:416 builtin/notes.c:487 +#: builtin/notes.c:418 builtin/notes.c:489 msgid "replace existing notes" msgstr "reemplaça les notes existents" -#: builtin/notes.c:441 +#: builtin/notes.c:443 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -11345,30 +13166,30 @@ msgstr "" "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 +#: builtin/notes.c:458 builtin/notes.c:537 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "S'estan sobreescrivint les notes existents de l'objecte %s\n" -#: builtin/notes.c:467 builtin/notes.c:627 builtin/notes.c:892 +#: builtin/notes.c:469 builtin/notes.c:629 builtin/notes.c:894 #, c-format msgid "Removing note for object %s\n" msgstr "S'està eliminant la nota de l'objecte %s\n" -#: builtin/notes.c:488 +#: builtin/notes.c:490 msgid "read objects from stdin" msgstr "llegeix els objectes des de stdin" -#: builtin/notes.c:490 +#: builtin/notes.c:492 msgid "load rewriting config for <command> (implies --stdin)" msgstr "" "carrega la configuració de reescriptura per a <ordre> (implica --stdin)" -#: builtin/notes.c:508 +#: builtin/notes.c:510 msgid "too few parameters" msgstr "hi ha massa pocs paràmetres" -#: builtin/notes.c:529 +#: builtin/notes.c:531 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -11377,12 +13198,12 @@ msgstr "" "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 +#: builtin/notes.c:543 #, c-format msgid "missing notes on source object %s. Cannot copy." msgstr "manquen notes a l'objecte font %s. No es pot copiar." -#: builtin/notes.c:593 +#: builtin/notes.c:595 #, c-format msgid "" "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" @@ -11391,53 +13212,53 @@ msgstr "" "Es desaconsellen les opcions -m/-F/-c/-C en favor de la subordre 'edit'.\n" "Useu «git notes add -f -m/-F/-c/-C» en lloc d'això.\n" -#: builtin/notes.c:688 +#: builtin/notes.c:690 msgid "failed to delete ref NOTES_MERGE_PARTIAL" msgstr "s'ha produït un error en suprimir la referència NOTES_MERGE_PARTIAL" -#: builtin/notes.c:690 +#: builtin/notes.c:692 msgid "failed to delete ref NOTES_MERGE_REF" msgstr "s'ha produït un error en suprimir la referència NOTES_MERGE_REF" -#: builtin/notes.c:692 +#: builtin/notes.c:694 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'" -#: builtin/notes.c:712 +#: builtin/notes.c:714 msgid "failed to read ref NOTES_MERGE_PARTIAL" msgstr "s'ha produït un error en llegir la referència NOTES_MERGE_PARTIAL" -#: builtin/notes.c:714 +#: builtin/notes.c:716 msgid "could not find commit from NOTES_MERGE_PARTIAL." msgstr "no s'ha pogut trobar cap comissió de NOTES_MERGE_PARTIAL." -#: builtin/notes.c:716 +#: builtin/notes.c:718 msgid "could not parse commit from NOTES_MERGE_PARTIAL." msgstr "no s'ha pogut analitzar la comissió de NOTES_MERGE_PARTIAL." -#: builtin/notes.c:729 +#: builtin/notes.c:731 msgid "failed to resolve NOTES_MERGE_REF" msgstr "s'ha produït un error en resoldre NOTES_MERGE_REF" -#: builtin/notes.c:732 +#: builtin/notes.c:734 msgid "failed to finalize notes merge" msgstr "s'ha produït un error en finalitzar la fusió de notes" -#: builtin/notes.c:758 +#: builtin/notes.c:760 #, c-format msgid "unknown notes merge strategy %s" msgstr "estratègia de fusió de notes desconeguda %s" -#: builtin/notes.c:774 +#: builtin/notes.c:776 msgid "General options" msgstr "Opcions generals" -#: builtin/notes.c:776 +#: builtin/notes.c:778 msgid "Merge options" msgstr "Opcions de fusió" -#: builtin/notes.c:778 +#: builtin/notes.c:780 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" @@ -11445,48 +13266,48 @@ msgstr "" "resol els conflictes de nota usant l'estratègia donada (manual/ours/theirs/" "union/cat_sort_uniq)" -#: builtin/notes.c:780 +#: builtin/notes.c:782 msgid "Committing unmerged notes" msgstr "S'estan cometent les notes sense fusionar" -#: builtin/notes.c:782 +#: builtin/notes.c:784 msgid "finalize notes merge by committing unmerged notes" msgstr "finalitza la fusió de notes cometent les notes sense fusionar" -#: builtin/notes.c:784 +#: builtin/notes.c:786 msgid "Aborting notes merge resolution" msgstr "S'està avortant la resolució de fusió de notes" -#: builtin/notes.c:786 +#: builtin/notes.c:788 msgid "abort notes merge" msgstr "avorta la fusió de notes" -#: builtin/notes.c:797 +#: builtin/notes.c:799 msgid "cannot mix --commit, --abort or -s/--strategy" msgstr "no es pot combinar --commit, --abort i -s/--strategy" -#: builtin/notes.c:802 +#: builtin/notes.c:804 msgid "must specify a notes ref to merge" msgstr "cal especificar una referència de notes a fusionar" -#: builtin/notes.c:826 +#: builtin/notes.c:828 #, c-format msgid "unknown -s/--strategy: %s" msgstr "-s/--strategy desconeguda: %s" -#: builtin/notes.c:863 +#: builtin/notes.c:865 #, c-format msgid "a notes merge into %s is already in-progress at %s" msgstr "una fusió de notes a %s ja està en curs a %s" -#: builtin/notes.c:866 +#: builtin/notes.c:868 #, 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)" -#: builtin/notes.c:868 +#: builtin/notes.c:870 #, c-format msgid "" "Automatic notes merge failed. Fix conflicts in %s and commit the result with " @@ -11497,334 +13318,521 @@ msgstr "" "cometeu el resultat amb 'git notes merge --commit', o avorteu la fusió amb " "'git notes merge --abort'.\n" -#: builtin/notes.c:890 +#: builtin/notes.c:892 #, c-format msgid "Object %s has no note\n" msgstr "L'objecte %s no té cap nota\n" -#: builtin/notes.c:902 +#: builtin/notes.c:904 msgid "attempt to remove non-existent note is not an error" msgstr "l'intent d'eliminar una nota no existent no és un error" -#: builtin/notes.c:905 +#: builtin/notes.c:907 msgid "read object names from the standard input" msgstr "llegeix els noms d'objecte des de l'entrada estàndard" -#: builtin/notes.c:943 builtin/prune.c:106 builtin/worktree.c:160 +#: builtin/notes.c:945 builtin/prune.c:108 builtin/worktree.c:152 msgid "do not remove, show only" msgstr "no eliminis, només mostra" -#: builtin/notes.c:944 +#: builtin/notes.c:946 msgid "report pruned notes" msgstr "informa de notes podades" -#: builtin/notes.c:986 +#: builtin/notes.c:988 msgid "notes-ref" msgstr "referència de notes" -#: builtin/notes.c:987 +#: builtin/notes.c:989 msgid "use notes from <notes-ref>" msgstr "usa les notes de <referència-de-notes>" -#: builtin/notes.c:1022 +#: builtin/notes.c:1024 #, c-format msgid "unknown subcommand: %s" msgstr "subordre desconeguda: %s" -#: builtin/pack-objects.c:33 +#: builtin/pack-objects.c:48 msgid "" "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" msgstr "" "git pack-objects --stdout [<opcions>...] [< <llista-de-referències> | < " "<llista-de-objectes>]" -#: builtin/pack-objects.c:34 +#: builtin/pack-objects.c:49 msgid "" "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" msgstr "" "git pack-objects [<opcions>...] <nom-base> [< <llista-de-referències> | < " "<llista-de-objectes>]" -#: builtin/pack-objects.c:195 builtin/pack-objects.c:198 +#: builtin/pack-objects.c:414 +#, fuzzy, c-format +msgid "bad packed object CRC for %s" +msgstr "ignora els objectes empaquetats" + +#: builtin/pack-objects.c:425 +#, fuzzy, c-format +msgid "corrupt packed object for %s" +msgstr "ignora els objectes empaquetats" + +#: builtin/pack-objects.c:556 +#, fuzzy, c-format +msgid "recursive delta detected for object %s" +msgstr "no s'ha rebut l'objecte esperat %s" + +#: builtin/pack-objects.c:756 #, c-format -msgid "deflate error (%d)" -msgstr "error de deflació (%d)" +msgid "ordered %u objects, expected %<PRIu32>" +msgstr "" + +#: builtin/pack-objects.c:769 +#, fuzzy, c-format +msgid "packfile is invalid: %s" +msgstr "%s no vàlid" + +#: builtin/pack-objects.c:773 +#, fuzzy, c-format +msgid "unable to open packfile for reuse: %s" +msgstr "no s'ha pogut obrir o llegir %s" + +#: builtin/pack-objects.c:777 +#, fuzzy +msgid "unable to seek in reused packfile" +msgstr "no es pot llegir el fitxer d'índex" + +#: builtin/pack-objects.c:788 +#, fuzzy +msgid "unable to read from reused packfile" +msgstr "no es pot llegir el fitxer d'índex" -#: builtin/pack-objects.c:791 +#: builtin/pack-objects.c:816 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" -#: builtin/pack-objects.c:804 +#: builtin/pack-objects.c:829 msgid "Writing objects" msgstr "S'estan escrivint els objectes" -#: builtin/pack-objects.c:1084 +#: builtin/pack-objects.c:891 builtin/update-index.c:88 +#, c-format +msgid "failed to stat %s" +msgstr "s'ha produït un error en fer stat a %s" + +#: builtin/pack-objects.c:944 +#, c-format +msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" +msgstr "" + +#: builtin/pack-objects.c:1112 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" "s'està inhabilitant l'escriptura de mapes de bits, perquè alguns objectes no " "s'empaqueten" -#: builtin/pack-objects.c:2454 +#: builtin/pack-objects.c:1489 +#, fuzzy, c-format +msgid "delta base offset overflow in pack for %s" +msgstr "el desplaçament de base de diferències està fora de límits" + +#: builtin/pack-objects.c:1498 +#, fuzzy, c-format +msgid "delta base offset out of bound for %s" +msgstr "el desplaçament de base de diferències està fora de límits" + +#: builtin/pack-objects.c:1771 +msgid "Counting objects" +msgstr "S'estan comptant els objectes" + +#: builtin/pack-objects.c:1913 +#, fuzzy, c-format +msgid "unable to get size of %s" +msgstr "no s'ha pogut moure %s a %s" + +#: builtin/pack-objects.c:1928 +#, fuzzy, c-format +msgid "unable to parse object header of %s" +msgstr "no s'ha pogut analitzar l'objecte: %s" + +#: builtin/pack-objects.c:1995 builtin/pack-objects.c:2011 +#: builtin/pack-objects.c:2021 +#, fuzzy, c-format +msgid "object %s cannot be read" +msgstr "objecte %s no trobat" + +#: builtin/pack-objects.c:1998 builtin/pack-objects.c:2025 +#, c-format +msgid "object %s inconsistent object length (%lu vs %lu)" +msgstr "" + +#: builtin/pack-objects.c:2035 +msgid "suboptimal pack - out of memory" +msgstr "" + +#: builtin/pack-objects.c:2366 +#, c-format +msgid "Delta compression using up to %d threads" +msgstr "" + +#: builtin/pack-objects.c:2502 +#, fuzzy, c-format +msgid "unable to pack objects reachable from tag %s" +msgstr "inclou els objectes abastables de qualsevol referència" + +#: builtin/pack-objects.c:2586 msgid "Compressing objects" msgstr "S'estan comprimint els objectes" -#: builtin/pack-objects.c:2625 +#: builtin/pack-objects.c:2592 +msgid "inconsistency with delta count" +msgstr "" + +#: builtin/pack-objects.c:2671 +#, c-format +msgid "" +"expected edge object ID, got garbage:\n" +" %s" +msgstr "" + +#: builtin/pack-objects.c:2677 +#, c-format +msgid "" +"expected object ID, got garbage:\n" +" %s" +msgstr "" + +#: builtin/pack-objects.c:2757 msgid "invalid value for --missing" msgstr "valor no vàlid per a --missing" -#: builtin/pack-objects.c:2928 +#: builtin/pack-objects.c:2816 builtin/pack-objects.c:2924 +#, fuzzy +msgid "cannot open pack index" +msgstr "no es pot fer pread en el fitxer de paquet" + +#: builtin/pack-objects.c:2847 +#, c-format +msgid "loose object at %s could not be examined" +msgstr "" + +#: builtin/pack-objects.c:2932 +#, fuzzy +msgid "unable to force loose object" +msgstr "no s'ha pogut escriure l'objecte de nota" + +#: builtin/pack-objects.c:3019 +#, fuzzy, c-format +msgid "not a rev '%s'" +msgstr "no es pot llegir «%s»" + +#: builtin/pack-objects.c:3022 +#, fuzzy, c-format +msgid "bad revision '%s'" +msgstr "dipòsit incorrecte «%s»" + +#: builtin/pack-objects.c:3042 +#, fuzzy +msgid "unable to add recent objects" +msgstr "no s'ha pogut analitzar l'objecte: %s" + +#: builtin/pack-objects.c:3092 #, c-format msgid "unsupported index version %s" msgstr "versió d'índex no compatible %s" -#: builtin/pack-objects.c:2932 +#: builtin/pack-objects.c:3096 #, c-format msgid "bad index version '%s'" msgstr "versió d'índex incorrecta «%s»" -#: builtin/pack-objects.c:2962 +#: builtin/pack-objects.c:3127 msgid "do not show progress meter" msgstr "no mostris l'indicador de progrés" -#: builtin/pack-objects.c:2964 +#: builtin/pack-objects.c:3129 msgid "show progress meter" msgstr "mostra l'indicador de progrés" -#: builtin/pack-objects.c:2966 +#: builtin/pack-objects.c:3131 msgid "show progress meter during object writing phase" msgstr "mostra l'indicador de progrés durant la fase d'escriptura d'objectes" -#: builtin/pack-objects.c:2969 +#: builtin/pack-objects.c:3134 msgid "similar to --all-progress when progress meter is shown" msgstr "similar a --all-progress quan l'indicador de progrés es mostra" -#: builtin/pack-objects.c:2970 -msgid "version[,offset]" +#: builtin/pack-objects.c:3135 +#, fuzzy +msgid "<version>[,<offset>]" msgstr "versió[,desplaçament]" -#: builtin/pack-objects.c:2971 +#: builtin/pack-objects.c:3136 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" -#: builtin/pack-objects.c:2974 +#: builtin/pack-objects.c:3139 msgid "maximum size of each output pack file" msgstr "mida màxima de cada fitxer de paquet de sortida" -#: builtin/pack-objects.c:2976 +#: builtin/pack-objects.c:3141 msgid "ignore borrowed objects from alternate object store" msgstr "ignora els objectes prestats d'un emmagatzematge d'objectes alternatiu" -#: builtin/pack-objects.c:2978 +#: builtin/pack-objects.c:3143 msgid "ignore packed objects" msgstr "ignora els objectes empaquetats" -#: builtin/pack-objects.c:2980 +#: builtin/pack-objects.c:3145 msgid "limit pack window by objects" msgstr "limita la finestra d'empaquetament per objectes" -#: builtin/pack-objects.c:2982 +#: builtin/pack-objects.c:3147 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" -#: builtin/pack-objects.c:2984 +#: builtin/pack-objects.c:3149 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" -#: builtin/pack-objects.c:2986 +#: builtin/pack-objects.c:3151 msgid "reuse existing deltas" msgstr "reusa les diferències existents" -#: builtin/pack-objects.c:2988 +#: builtin/pack-objects.c:3153 msgid "reuse existing objects" msgstr "reusa els objectes existents" -#: builtin/pack-objects.c:2990 +#: builtin/pack-objects.c:3155 msgid "use OFS_DELTA objects" msgstr "usa objectes OFS_DELTA" -#: builtin/pack-objects.c:2992 +#: builtin/pack-objects.c:3157 msgid "use threads when searching for best delta matches" msgstr "usa fils en cercar les millores coincidències de diferències" -#: builtin/pack-objects.c:2994 +#: builtin/pack-objects.c:3159 msgid "do not create an empty pack output" msgstr "no creïs una emissió de paquet buida" -#: builtin/pack-objects.c:2996 +#: builtin/pack-objects.c:3161 msgid "read revision arguments from standard input" msgstr "llegeix els paràmetres de revisió des de l'entrada estàndard" -#: builtin/pack-objects.c:2998 +#: builtin/pack-objects.c:3163 msgid "limit the objects to those that are not yet packed" msgstr "limita els objectes als quals encara no s'hagin empaquetat" -#: builtin/pack-objects.c:3001 +#: builtin/pack-objects.c:3166 msgid "include objects reachable from any reference" msgstr "inclou els objectes abastables de qualsevol referència" -#: builtin/pack-objects.c:3004 +#: builtin/pack-objects.c:3169 msgid "include objects referred by reflog entries" msgstr "" "inclou els objectes als quals facin referència les entrades del registre de " "referències" -#: builtin/pack-objects.c:3007 +#: builtin/pack-objects.c:3172 msgid "include objects referred to by the index" msgstr "inclou els objectes als quals faci referència l'índex" -#: builtin/pack-objects.c:3010 +#: builtin/pack-objects.c:3175 msgid "output pack to stdout" msgstr "emet el paquet a stdout" -#: builtin/pack-objects.c:3012 +#: builtin/pack-objects.c:3177 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" -#: builtin/pack-objects.c:3014 +#: builtin/pack-objects.c:3179 msgid "keep unreachable objects" msgstr "retén els objectes inabastables" -#: builtin/pack-objects.c:3016 +#: builtin/pack-objects.c:3181 msgid "pack loose unreachable objects" msgstr "empaqueta els objectes inabastables solts" -#: builtin/pack-objects.c:3018 +#: builtin/pack-objects.c:3183 msgid "unpack unreachable objects newer than <time>" msgstr "desempaqueta els objectes inabastables més nous que <hora>" -#: builtin/pack-objects.c:3021 +#: builtin/pack-objects.c:3186 msgid "create thin packs" msgstr "crea paquets prims" -#: builtin/pack-objects.c:3023 +#: builtin/pack-objects.c:3188 msgid "create packs suitable for shallow fetches" msgstr "crea paquets adequats per a les obtencions superficials" -#: builtin/pack-objects.c:3025 +#: builtin/pack-objects.c:3190 msgid "ignore packs that have companion .keep file" msgstr "ignora els paquets que tinguin un fitxer .keep corresponent" -#: builtin/pack-objects.c:3027 +#: builtin/pack-objects.c:3192 +#, fuzzy +msgid "ignore this pack" +msgstr "usa el paquet prim" + +#: builtin/pack-objects.c:3194 msgid "pack compression level" msgstr "nivell de compressió de paquet" -#: builtin/pack-objects.c:3029 +#: builtin/pack-objects.c:3196 msgid "do not hide commits by grafts" msgstr "no amaguis les comissions per empelt" -#: builtin/pack-objects.c:3031 +#: builtin/pack-objects.c:3198 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" -#: builtin/pack-objects.c:3033 +#: builtin/pack-objects.c:3200 msgid "write a bitmap index together with the pack index" msgstr "escriu un índex de mapa de bits juntament amb l'índex de paquet" -#: builtin/pack-objects.c:3036 +#: builtin/pack-objects.c:3203 msgid "handling for missing objects" msgstr "gestió dels objectes absents" -#: builtin/pack-objects.c:3039 +#: builtin/pack-objects.c:3206 msgid "do not pack objects in promisor packfiles" msgstr "" -#: builtin/pack-objects.c:3178 -msgid "Counting objects" -msgstr "S'estan comptant els objectes" +#: builtin/pack-objects.c:3230 +#, c-format +msgid "delta chain depth %d is too deep, forcing %d" +msgstr "" -#: builtin/pack-refs.c:6 +#: builtin/pack-objects.c:3235 +#, c-format +msgid "pack.deltaCacheLimit is too high, forcing %d" +msgstr "" + +#: builtin/pack-objects.c:3291 +msgid "--max-pack-size cannot be used to build a pack for transfer" +msgstr "" + +#: builtin/pack-objects.c:3293 +msgid "minimum pack size limit is 1 MiB" +msgstr "" + +#: builtin/pack-objects.c:3298 +#, fuzzy +msgid "--thin cannot be used to build an indexable pack" +msgstr "--fix-thin no es pot usar sense --stdin" + +#: builtin/pack-objects.c:3301 +#, fuzzy +msgid "--keep-unreachable and --unpack-unreachable are incompatible" +msgstr "--keep-unreachable i -A són incompatibles" + +#: builtin/pack-objects.c:3307 +#, fuzzy +msgid "cannot use --filter without --stdout" +msgstr "no es pot usar -a amb -d" + +#: builtin/pack-objects.c:3363 +#, fuzzy +msgid "Enumerating objects" +msgstr "S'estan escrivint els objectes" + +#: builtin/pack-objects.c:3382 +#, c-format +msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)" +msgstr "" + +#: builtin/pack-refs.c:7 msgid "git pack-refs [<options>]" msgstr "git pack-refs [<opcions>]" -#: builtin/pack-refs.c:14 +#: builtin/pack-refs.c:15 msgid "pack everything" msgstr "empaqueta-ho tot" -#: builtin/pack-refs.c:15 +#: builtin/pack-refs.c:16 msgid "prune loose refs (default)" msgstr "poda les referències soltes (per defecte)" -#: builtin/prune-packed.c:8 +#: builtin/prune-packed.c:9 msgid "git prune-packed [-n | --dry-run] [-q | --quiet]" msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]" -#: builtin/prune-packed.c:41 +#: builtin/prune-packed.c:42 msgid "Removing duplicate objects" msgstr "S'estan eliminant objectes duplicats" -#: builtin/prune.c:11 +#: builtin/prune.c:12 msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--progress] [--expire <hora>] [--] [<head>...]" -#: builtin/prune.c:107 +#: builtin/prune.c:109 msgid "report pruned objects" msgstr "informa d'objectes podats" -#: builtin/prune.c:110 +#: builtin/prune.c:112 msgid "expire objects older than <time>" msgstr "fes caducar els objectes més vells que <hora>" -#: builtin/prune.c:112 +#: builtin/prune.c:114 msgid "limit traversal to objects outside promisor packfiles" msgstr "" -#: builtin/prune.c:126 +#: builtin/prune.c:128 msgid "cannot prune in a precious-objects repo" msgstr "no es pot podar en un dipòsit d'objectes preciosos" -#: builtin/pull.c:54 builtin/pull.c:56 +#: builtin/pull.c:59 builtin/pull.c:61 #, c-format msgid "Invalid value for %s: %s" msgstr "Valor no vàlid per a %s: %s" -#: builtin/pull.c:76 +#: builtin/pull.c:81 msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "git pull [<opcions>] [<dipòsit> [<especificació-de-referència>...]]" -#: builtin/pull.c:127 +#: builtin/pull.c:132 msgid "control for recursive fetching of submodules" msgstr "controla l'obtenció recursiva de submòduls" -#: builtin/pull.c:131 +#: builtin/pull.c:136 msgid "Options related to merging" msgstr "Opcions relacionades amb fusionar" -#: builtin/pull.c:134 +#: builtin/pull.c:139 msgid "incorporate changes by rebasing rather than merging" msgstr "incorpora els canvis fent «rebase» en lloc de fusionar" -#: builtin/pull.c:161 builtin/rebase--helper.c:23 builtin/revert.c:121 +#: builtin/pull.c:166 builtin/rebase--helper.c:23 builtin/revert.c:122 msgid "allow fast-forward" msgstr "permet l'avanç ràpid" -#: builtin/pull.c:170 +#: builtin/pull.c:175 msgid "automatically stash/stash pop before and after rebase" msgstr "" "fes «stash» i «stash pop» automàticament abans i després de fer «rebase»" -#: builtin/pull.c:186 +#: builtin/pull.c:191 msgid "Options related to fetching" msgstr "Opcions relacionades amb obtenir" -#: builtin/pull.c:204 +#: builtin/pull.c:209 msgid "number of submodules pulled in parallel" msgstr "nombre de submòduls baixats en paral·lel" -#: builtin/pull.c:299 +#: builtin/pull.c:304 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "Valor no vàlid per a pull.ff: %s" -#: builtin/pull.c:415 +#: builtin/pull.c:420 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." @@ -11832,13 +13840,13 @@ msgstr "" "No hi ha cap candidat sobre el qual fer «rebase» entre les referències que " "acabeu d'obtenir." -#: builtin/pull.c:417 +#: builtin/pull.c:422 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 +#: builtin/pull.c:423 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." @@ -11846,7 +13854,7 @@ msgstr "" "Generalment això vol dir que heu proveït una especificació de\n" "referència de comodí que no tenia cap coincidència en el costat remot." -#: builtin/pull.c:421 +#: builtin/pull.c:426 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -11857,44 +13865,44 @@ msgstr "" "Perquè aquest no és el remot configurat per defecte per a la vostra\n" "branca actual, heu d'especificar una branca en la línia d'ordres." -#: builtin/pull.c:426 git-parse-remote.sh:73 +#: builtin/pull.c:431 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "Actualment no sou en cap branca." -#: builtin/pull.c:428 builtin/pull.c:443 git-parse-remote.sh:79 +#: builtin/pull.c:433 builtin/pull.c:448 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." msgstr "Especifiqueu sobre què branca voleu fer «rebase»." -#: builtin/pull.c:430 builtin/pull.c:445 git-parse-remote.sh:82 +#: builtin/pull.c:435 builtin/pull.c:450 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." msgstr "Especifiqueu amb quina branca voleu fusionar." -#: builtin/pull.c:431 builtin/pull.c:446 +#: builtin/pull.c:436 builtin/pull.c:451 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 +#: builtin/pull.c:438 builtin/pull.c:444 builtin/pull.c:453 #: git-parse-remote.sh:64 msgid "<remote>" msgstr "<remot>" -#: builtin/pull.c:433 builtin/pull.c:448 builtin/pull.c:453 git-rebase.sh:477 +#: builtin/pull.c:438 builtin/pull.c:453 builtin/pull.c:458 git-rebase.sh:576 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "<branca>" -#: builtin/pull.c:441 git-parse-remote.sh:75 +#: builtin/pull.c:446 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "No hi ha cap informació de seguiment per a la branca actual." -#: builtin/pull.c:450 git-parse-remote.sh:95 +#: builtin/pull.c:455 git-parse-remote.sh:95 msgid "" "If you wish to set tracking information for this branch you can do so with:" msgstr "" "Si voleu establir informació de seguiment per a aquesta branca, podeu fer-ho " "amb:" -#: builtin/pull.c:455 +#: builtin/pull.c:460 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -11903,28 +13911,28 @@ msgstr "" "La vostra configuració especifica fusionar amb la referència «%s»\n" "del remot, però no s'ha obtingut tal referència." -#: builtin/pull.c:819 +#: builtin/pull.c:829 msgid "ignoring --verify-signatures for rebase" msgstr "s'està ignorant --verify-signatures en fer «rebase»" -#: builtin/pull.c:867 +#: builtin/pull.c:877 msgid "--[no-]autostash option is only valid with --rebase." msgstr "l'opció --[no-]-autostash és vàlid només amb --rebase." -#: builtin/pull.c:875 +#: builtin/pull.c:885 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." -#: builtin/pull.c:878 +#: builtin/pull.c:888 msgid "pull with rebase" msgstr "baixar fent «rebase»" -#: builtin/pull.c:879 +#: builtin/pull.c:889 msgid "please commit or stash them." msgstr "cometeu-los o emmagatzemeu-los." -#: builtin/pull.c:904 +#: builtin/pull.c:914 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -11935,7 +13943,7 @@ msgstr "" "s'està avançant ràpidament el vostre arbre de treball des de\n" "la comissió %s." -#: builtin/pull.c:909 +#: builtin/pull.c:919 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -11953,33 +13961,33 @@ msgstr "" "$ git reset --hard\n" "per a recuperar." -#: builtin/pull.c:924 +#: builtin/pull.c:934 msgid "Cannot merge multiple branches into empty head." msgstr "No es poden fusionar múltiples branques a un HEAD buit." -#: builtin/pull.c:928 +#: builtin/pull.c:938 msgid "Cannot rebase onto multiple branches." msgstr "No es pot fer «rebase» sobre múltiples branques." -#: builtin/pull.c:935 +#: builtin/pull.c:945 msgid "cannot rebase with locally recorded submodule modifications" msgstr "" "no es pot fer «rebase» amb modificacions als submòduls enregistrades " "localment" -#: builtin/push.c:17 +#: builtin/push.c:19 msgid "git push [<options>] [<repository> [<refspec>...]]" msgstr "git push [<opcions>] [<dipòsit> [<especificació-de-referència>...]]" -#: builtin/push.c:92 +#: builtin/push.c:111 msgid "tag shorthand without <tag>" msgstr "abreviatura d'etiqueta sense <tag>" -#: builtin/push.c:102 +#: builtin/push.c:121 msgid "--delete only accepts plain target ref names" msgstr "--delete només accepta noms de referència de destí senzills" -#: builtin/push.c:146 +#: builtin/push.c:165 msgid "" "\n" "To choose either option permanently, see push.default in 'git help config'." @@ -11988,7 +13996,7 @@ msgstr "" "Per a triar qualsevol opció permanentment, vegeu push.default a 'git help " "config'." -#: builtin/push.c:149 +#: builtin/push.c:168 #, c-format msgid "" "The upstream branch of your current branch does not match\n" @@ -12013,7 +14021,7 @@ msgstr "" " git push %s %s\n" "%s" -#: builtin/push.c:164 +#: builtin/push.c:183 #, c-format msgid "" "You are not currently on a branch.\n" @@ -12028,7 +14036,7 @@ msgstr "" "\n" " git push %s HEAD:<nom-de-branca-remota>\n" -#: builtin/push.c:178 +#: builtin/push.c:197 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -12041,13 +14049,13 @@ msgstr "" "\n" " git push --set-upstream %s %s\n" -#: builtin/push.c:186 +#: builtin/push.c:205 #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." msgstr "" "La branca actual %s té múltiples branques fonts, s'està refusant pujar." -#: builtin/push.c:189 +#: builtin/push.c:208 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -12058,14 +14066,14 @@ msgstr "" "branca actual «%s», sense dir-me què pujar per a actualitzar\n" "quina branca remota." -#: builtin/push.c:248 +#: builtin/push.c:267 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\"." -#: builtin/push.c:255 +#: builtin/push.c:274 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -12077,7 +14085,7 @@ msgstr "" "els canvis remots (per exemple, 'git pull ...') abans de pujar de nou.\n" "Vegeu la 'Nota sobre avanços ràpids' a 'git push --help' per detalls." -#: builtin/push.c:261 +#: builtin/push.c:280 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. Check out this branch and integrate the remote changes\n" @@ -12090,7 +14098,7 @@ msgstr "" "abans de pujar de nou.\n" "Vegeu la 'Nota sobre avanços ràpids' a 'git push --help' per detalls." -#: builtin/push.c:267 +#: builtin/push.c:286 msgid "" "Updates were rejected because the remote contains work that you do\n" "not have locally. This is usually caused by another repository pushing\n" @@ -12105,12 +14113,12 @@ msgstr "" "pujar de nou.\n" "Vegeu la 'Nota sobre avanços ràpids' a 'git push --help' per detalls." -#: builtin/push.c:274 +#: builtin/push.c:293 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." -#: builtin/push.c:277 +#: builtin/push.c:296 msgid "" "You cannot update a remote ref that points at a non-commit object,\n" "or update a remote ref to make it point at a non-commit object,\n" @@ -12121,22 +14129,22 @@ msgstr "" "fer que assenyali un objecte no de comissió, sense usar l'opció\n" "'--force'.\n" -#: builtin/push.c:337 +#: builtin/push.c:357 #, c-format msgid "Pushing to %s\n" msgstr "S'està pujant a %s\n" -#: builtin/push.c:341 +#: builtin/push.c:361 #, c-format msgid "failed to push some refs to '%s'" msgstr "s'ha produït un error en pujar algunes referències a «%s»" -#: builtin/push.c:372 +#: builtin/push.c:395 #, c-format msgid "bad repository '%s'" msgstr "dipòsit incorrecte «%s»" -#: builtin/push.c:373 +#: builtin/push.c:396 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -12158,115 +14166,145 @@ msgstr "" "\n" " git push <nom>\n" -#: builtin/push.c:391 -msgid "--all and --tags are incompatible" -msgstr "--all i --tags són incompatibles" - -#: builtin/push.c:392 -msgid "--all can't be combined with refspecs" -msgstr "--all no es pot combinar amb especificacions de referència" - -#: builtin/push.c:397 -msgid "--mirror and --tags are incompatible" -msgstr "--mirror i --tags són incompatibles" - -#: builtin/push.c:398 -msgid "--mirror can't be combined with refspecs" -msgstr "--mirror no es pot combinar amb especificacions de referència" - -#: builtin/push.c:403 -msgid "--all and --mirror are incompatible" -msgstr "--all i --mirror són incompatibles" - -#: builtin/push.c:535 +#: builtin/push.c:551 msgid "repository" msgstr "dipòsit" -#: builtin/push.c:536 builtin/send-pack.c:163 +#: builtin/push.c:552 builtin/send-pack.c:164 msgid "push all refs" msgstr "puja totes les referències" -#: builtin/push.c:537 builtin/send-pack.c:165 +#: builtin/push.c:553 builtin/send-pack.c:166 msgid "mirror all refs" msgstr "reflecteix totes les referències" -#: builtin/push.c:539 +#: builtin/push.c:555 msgid "delete refs" msgstr "suprimeix les referències" -#: builtin/push.c:540 +#: builtin/push.c:556 msgid "push tags (can't be used with --all or --mirror)" msgstr "puja les etiquetes (no es pot usar amb --all o --mirror)" -#: builtin/push.c:543 builtin/send-pack.c:166 +#: builtin/push.c:559 builtin/send-pack.c:167 msgid "force updates" msgstr "força les actualitzacions" -#: builtin/push.c:545 builtin/send-pack.c:180 -msgid "refname>:<expect" +#: builtin/push.c:561 builtin/send-pack.c:181 +#, fuzzy +msgid "<refname>:<expect>" msgstr "nom-de-referència>:<esperat" -#: builtin/push.c:546 builtin/send-pack.c:181 +#: builtin/push.c:562 builtin/send-pack.c:182 msgid "require old value of ref to be at this value" msgstr "requereix que el valor antic de la referència sigui d'aquest valor" -#: builtin/push.c:549 +#: builtin/push.c:565 msgid "control recursive pushing of submodules" msgstr "controla la pujada recursiva dels submòduls" -#: builtin/push.c:551 builtin/send-pack.c:174 +#: builtin/push.c:567 builtin/send-pack.c:175 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:568 builtin/push.c:569 builtin/send-pack.c:161 +#: builtin/send-pack.c:162 msgid "receive pack program" msgstr "programa que rep els paquets" -#: builtin/push.c:554 +#: builtin/push.c:570 msgid "set upstream for git pull/status" msgstr "estableix la font per a git pull/status" -#: builtin/push.c:557 +#: builtin/push.c:573 msgid "prune locally removed refs" msgstr "poda les referències eliminades localment" -#: builtin/push.c:559 +#: builtin/push.c:575 msgid "bypass pre-push hook" msgstr "evita el lligam de prepujada" -#: builtin/push.c:560 +#: builtin/push.c:576 msgid "push missing but relevant tags" msgstr "puja les etiquetes absents però rellevants" -#: builtin/push.c:563 builtin/send-pack.c:168 +#: builtin/push.c:579 builtin/send-pack.c:169 msgid "GPG sign the push" msgstr "signa la pujada amb GPG" -#: builtin/push.c:565 builtin/send-pack.c:175 +#: builtin/push.c:581 builtin/send-pack.c:176 msgid "request atomic transaction on remote side" msgstr "demana una transacció atòmica al costat remot" -#: builtin/push.c:566 builtin/send-pack.c:171 -msgid "server-specific" -msgstr "específic al servidor" - -#: builtin/push.c:566 builtin/send-pack.c:172 -msgid "option to transmit" -msgstr "opció a transmetre" - -#: builtin/push.c:583 +#: builtin/push.c:599 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete és incompatible amb --all, --mirror i --tags" -#: builtin/push.c:585 +#: builtin/push.c:601 msgid "--delete doesn't make sense without any refs" msgstr "--delete no té sentit sense referències" #: builtin/push.c:604 +msgid "--all and --tags are incompatible" +msgstr "--all i --tags són incompatibles" + +#: builtin/push.c:606 +msgid "--all can't be combined with refspecs" +msgstr "--all no es pot combinar amb especificacions de referència" + +#: builtin/push.c:610 +msgid "--mirror and --tags are incompatible" +msgstr "--mirror i --tags són incompatibles" + +#: builtin/push.c:612 +msgid "--mirror can't be combined with refspecs" +msgstr "--mirror no es pot combinar amb especificacions de referència" + +#: builtin/push.c:615 +msgid "--all and --mirror are incompatible" +msgstr "--all i --mirror són incompatibles" + +#: builtin/push.c:634 msgid "push options must not have new line characters" msgstr "les opcions de pujada no han de tenir caràcters de línia nova" +#: builtin/range-diff.c:8 +msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>" +msgstr "" + +#: builtin/range-diff.c:9 +#, fuzzy +msgid "git range-diff [<options>] <old-tip>...<new-tip>" +msgstr "git merge [<opcions>] [<comissió>...]" + +#: builtin/range-diff.c:10 +#, fuzzy +msgid "git range-diff [<options>] <base> <old-tip> <new-tip>" +msgstr "git mv [<opcions>] <font>... <destí>" + +#: builtin/range-diff.c:26 +msgid "Percentage by which creation is weighted" +msgstr "" + +#: builtin/range-diff.c:28 +#, fuzzy +msgid "use simple diff colors" +msgstr "utilitza l'eina de diff especificada" + +#: builtin/range-diff.c:75 builtin/range-diff.c:79 +#, fuzzy, c-format +msgid "no .. in range: '%s'" +msgstr "no hi ha tal branca: «%s»" + +#: builtin/range-diff.c:89 +msgid "single arg format must be symmetric range" +msgstr "" + +#: builtin/range-diff.c:104 +#, fuzzy +msgid "need two commit ranges" +msgstr "edita el missatge de comissió" + #: builtin/read-tree.c:40 msgid "" "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) " @@ -12277,67 +14315,67 @@ msgstr "" "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" "index-output=<fitxer>] (--empty | <arbre1> [<arbre2> [<arbre3>]])" -#: builtin/read-tree.c:121 +#: builtin/read-tree.c:120 msgid "write resulting index to <file>" msgstr "escriu l'índex resultant al <fitxer>" -#: builtin/read-tree.c:124 +#: builtin/read-tree.c:123 msgid "only empty the index" msgstr "només buida l'índex" -#: builtin/read-tree.c:126 +#: builtin/read-tree.c:125 msgid "Merging" msgstr "S'està fusionant" -#: builtin/read-tree.c:128 +#: builtin/read-tree.c:127 msgid "perform a merge in addition to a read" msgstr "realitza una fusió a més d'una lectura" -#: builtin/read-tree.c:130 +#: builtin/read-tree.c:129 msgid "3-way merge if no file level merging required" msgstr "fusió de 3 vies si no cal fusió a nivell de fitxers" -#: builtin/read-tree.c:132 +#: builtin/read-tree.c:131 msgid "3-way merge in presence of adds and removes" msgstr "fusió de 3 vies en presència d'afegiments i eliminacions" -#: builtin/read-tree.c:134 +#: builtin/read-tree.c:133 msgid "same as -m, but discard unmerged entries" msgstr "el mateix que -m, però descarta les entrades no fusionades" -#: builtin/read-tree.c:135 +#: builtin/read-tree.c:134 msgid "<subdirectory>/" msgstr "<subdirectori>/" -#: builtin/read-tree.c:136 +#: builtin/read-tree.c:135 msgid "read the tree into the index under <subdirectory>/" msgstr "llegiu l'arbre a l'índex sota <subdirectori>/" -#: builtin/read-tree.c:139 +#: builtin/read-tree.c:138 msgid "update working tree with merge result" msgstr "actualitza l'arbre de treball amb el resultat de fusió" -#: builtin/read-tree.c:141 +#: builtin/read-tree.c:140 msgid "gitignore" msgstr "gitignore" -#: builtin/read-tree.c:142 +#: builtin/read-tree.c:141 msgid "allow explicitly ignored files to be overwritten" msgstr "permet que els fitxers explícitament ignorats se sobreescriguin" -#: builtin/read-tree.c:145 +#: builtin/read-tree.c:144 msgid "don't check the working tree after merging" msgstr "no comprovis l'arbre de treball després de fusionar" -#: builtin/read-tree.c:146 +#: builtin/read-tree.c:145 msgid "don't update the index or the work tree" msgstr "no actualitzis l'índex ni l'arbre de treball" -#: builtin/read-tree.c:148 +#: builtin/read-tree.c:147 msgid "skip applying sparse checkout filter" msgstr "omet l'aplicació del filtre d'agafament parcial" -#: builtin/read-tree.c:150 +#: builtin/read-tree.c:149 msgid "debug unpack-trees" msgstr "depura unpack-trees" @@ -12349,51 +14387,64 @@ msgstr "git rebase--helper [<opcions>]" msgid "keep empty commits" msgstr "mantén les comissions buides" -#: builtin/rebase--helper.c:26 builtin/revert.c:123 +#: builtin/rebase--helper.c:26 builtin/revert.c:124 msgid "allow commits with empty messages" msgstr "permet les comissions amb missatges buits" #: builtin/rebase--helper.c:27 +#, fuzzy +msgid "rebase merge commits" +msgstr "etiqueta de fusió incorrecta en la comissió «%s»" + +#: builtin/rebase--helper.c:29 +msgid "keep original branch points of cousins" +msgstr "" + +#: builtin/rebase--helper.c:30 msgid "continue rebase" msgstr "continua el «rebase»" -#: builtin/rebase--helper.c:29 +#: builtin/rebase--helper.c:32 msgid "abort rebase" msgstr "avorta el «rebase»" -#: builtin/rebase--helper.c:32 +#: builtin/rebase--helper.c:35 msgid "make rebase script" msgstr "fes un script de «rebase»" -#: builtin/rebase--helper.c:34 +#: builtin/rebase--helper.c:37 msgid "shorten commit ids in the todo list" msgstr "escurça els ids de les comissions en la llista per a fer" -#: builtin/rebase--helper.c:36 +#: builtin/rebase--helper.c:39 msgid "expand commit ids in the todo list" msgstr "expandeix els ids de els comissions en la llista per a fer" -#: builtin/rebase--helper.c:38 +#: builtin/rebase--helper.c:41 msgid "check the todo list" msgstr "comprova la llista a fer" -#: builtin/rebase--helper.c:40 +#: builtin/rebase--helper.c:43 msgid "skip unnecessary picks" msgstr "omet els «picks» no necessaris" -#: builtin/rebase--helper.c:42 +#: builtin/rebase--helper.c:45 msgid "rearrange fixup/squash lines" msgstr "reorganitza les línies «fixup/pick»" -#: builtin/rebase--helper.c:44 +#: builtin/rebase--helper.c:47 msgid "insert exec commands in todo list" msgstr "expandeix les ordres exec en la llista per a fer" -#: builtin/receive-pack.c:30 +#: builtin/rebase--helper.c:68 +msgid "--[no-]rebase-cousins has no effect without --rebase-merges" +msgstr "" + +#: builtin/receive-pack.c:32 msgid "git receive-pack <git-dir>" msgstr "git receive-pack <git-dir>" -#: builtin/receive-pack.c:841 +#: builtin/receive-pack.c:830 msgid "" "By default, updating the current branch in a non-bare repository\n" "is denied, because it will make the index and work tree inconsistent\n" @@ -12424,7 +14475,7 @@ msgstr "" "predeterminat, establiu la variable de configuració\n" "'receive.denyCurrentBranch' a 'refuse'." -#: builtin/receive-pack.c:861 +#: builtin/receive-pack.c:850 msgid "" "By default, deleting the current branch is denied, because the next\n" "'git clone' won't result in any file checked out, causing confusion.\n" @@ -12446,24 +14497,24 @@ msgstr "" "\n" "Per a silenciar aquest missatge, podeu establir-la a 'refuse'." -#: builtin/receive-pack.c:1934 +#: builtin/receive-pack.c:1923 msgid "quiet" msgstr "silenciós" -#: builtin/receive-pack.c:1948 +#: builtin/receive-pack.c:1937 msgid "You must specify a directory." msgstr "Heu d'especificar un directori." -#: builtin/reflog.c:532 builtin/reflog.c:537 +#: builtin/reflog.c:536 builtin/reflog.c:541 #, c-format msgid "'%s' is not a valid timestamp" msgstr "«%s» no és una marca de temps vàlida" -#: builtin/remote.c:13 +#: builtin/remote.c:15 msgid "git remote [-v | --verbose]" msgstr "git remote [-v | --verbose]" -#: builtin/remote.c:14 +#: builtin/remote.c:16 msgid "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <name> <url>" @@ -12471,82 +14522,82 @@ msgstr "" "git remote add [-t <branca>] [-m <mestra>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <nom> <url>" -#: builtin/remote.c:15 builtin/remote.c:35 +#: builtin/remote.c:17 builtin/remote.c:37 msgid "git remote rename <old> <new>" msgstr "git remote rename <antic> <nou>" -#: builtin/remote.c:16 builtin/remote.c:40 +#: builtin/remote.c:18 builtin/remote.c:42 msgid "git remote remove <name>" msgstr "git remote remove <nom>" -#: builtin/remote.c:17 builtin/remote.c:45 +#: builtin/remote.c:19 builtin/remote.c:47 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" msgstr "git remote set-head <nom> (-a | --auto | -d | --delete | <branca>)" -#: builtin/remote.c:18 +#: builtin/remote.c:20 msgid "git remote [-v | --verbose] show [-n] <name>" msgstr "git remote [-v | --verbose] show [-n] <nom>" -#: builtin/remote.c:19 +#: builtin/remote.c:21 msgid "git remote prune [-n | --dry-run] <name>" msgstr "git remote prune [-n | --dry-run] <nom>" -#: builtin/remote.c:20 +#: builtin/remote.c:22 msgid "" "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" msgstr "" "git remote [-v | --verbose] update [-p | --prune] [(<grup> | <remot>)...]" -#: builtin/remote.c:21 +#: builtin/remote.c:23 msgid "git remote set-branches [--add] <name> <branch>..." msgstr "git remote set-branches [--add] <nom> <branca>..." -#: builtin/remote.c:22 builtin/remote.c:71 +#: builtin/remote.c:24 builtin/remote.c:73 msgid "git remote get-url [--push] [--all] <name>" msgstr "git remote get-url [--push] [--all] <nom>" -#: builtin/remote.c:23 builtin/remote.c:76 +#: builtin/remote.c:25 builtin/remote.c:78 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" msgstr "git remote set-url [--push] <nom> <url-nou> [<url-antic>]" -#: builtin/remote.c:24 builtin/remote.c:77 +#: builtin/remote.c:26 builtin/remote.c:79 msgid "git remote set-url --add <name> <newurl>" msgstr "git remote set-url --add <nom> <url-nou>" -#: builtin/remote.c:25 builtin/remote.c:78 +#: builtin/remote.c:27 builtin/remote.c:80 msgid "git remote set-url --delete <name> <url>" msgstr "git remote set-url --delete <nom> <url>" -#: builtin/remote.c:30 +#: builtin/remote.c:32 msgid "git remote add [<options>] <name> <url>" msgstr "git remote add [<opcions>] <nom> <url>" -#: builtin/remote.c:50 +#: builtin/remote.c:52 msgid "git remote set-branches <name> <branch>..." msgstr "git remote set-branches <nom> <branca>..." -#: builtin/remote.c:51 +#: builtin/remote.c:53 msgid "git remote set-branches --add <name> <branch>..." msgstr "git remote set-branches --add <nom> <branca>..." -#: builtin/remote.c:56 +#: builtin/remote.c:58 msgid "git remote show [<options>] <name>" msgstr "git remote show [<opcions>] <nom>" -#: builtin/remote.c:61 +#: builtin/remote.c:63 msgid "git remote prune [<options>] <name>" msgstr "git remote prune [<opcions>] <nom>" -#: builtin/remote.c:66 +#: builtin/remote.c:68 msgid "git remote update [<options>] [<group> | <remote>]..." msgstr "git remote update [<opcions>] [<grup> | <remot>]..." -#: builtin/remote.c:95 +#: builtin/remote.c:97 #, c-format msgid "Updating %s" msgstr "S'està actualitzant %s" -#: builtin/remote.c:127 +#: builtin/remote.c:129 msgid "" "--mirror is dangerous and deprecated; please\n" "\t use --mirror=fetch or --mirror=push instead" @@ -12555,88 +14606,84 @@ msgstr "" "\t useu --mirror=fetch o\n" "\t --mirror=push en lloc d'això" -#: builtin/remote.c:144 +#: builtin/remote.c:146 #, c-format msgid "unknown mirror argument: %s" msgstr "paràmetre de reflexió desconegut: %s" -#: builtin/remote.c:160 +#: builtin/remote.c:162 msgid "fetch the remote branches" msgstr "obtén les branques remotes" -#: builtin/remote.c:162 +#: builtin/remote.c:164 msgid "import all tags and associated objects when fetching" msgstr "en obtenir, importa totes les etiquetes i tots els objectes" -#: builtin/remote.c:165 +#: builtin/remote.c:167 msgid "or do not fetch any tag at all (--no-tags)" msgstr "o no obtinguis cap etiqueta (--no-tags)" -#: builtin/remote.c:167 +#: builtin/remote.c:169 msgid "branch(es) to track" msgstr "branques a seguir" -#: builtin/remote.c:168 +#: builtin/remote.c:170 msgid "master branch" msgstr "branca mestra" -#: builtin/remote.c:169 -msgid "push|fetch" -msgstr "push|fetch" - -#: builtin/remote.c:170 +#: builtin/remote.c:172 msgid "set up remote as a mirror to push to or fetch from" msgstr "estableix el remot com a mirall al qual pujar o del qual obtenir" -#: builtin/remote.c:182 +#: builtin/remote.c:184 msgid "specifying a master branch makes no sense with --mirror" msgstr "especificar una branca mestra no té sentit amb --mirror" -#: builtin/remote.c:184 +#: builtin/remote.c:186 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ó" -#: builtin/remote.c:191 builtin/remote.c:631 +#: builtin/remote.c:193 builtin/remote.c:635 #, c-format msgid "remote %s already exists." msgstr "el remot %s ja existeix." -#: builtin/remote.c:195 builtin/remote.c:635 +#: builtin/remote.c:197 builtin/remote.c:639 #, c-format msgid "'%s' is not a valid remote name" msgstr "«%s» no és un nom de remot vàlid" -#: builtin/remote.c:235 +#: builtin/remote.c:237 #, c-format msgid "Could not setup master '%s'" msgstr "No s'ha pogut configurar la mestra «%s»" -#: builtin/remote.c:337 +#: builtin/remote.c:343 #, 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" -#: builtin/remote.c:438 builtin/remote.c:446 +#: builtin/remote.c:442 builtin/remote.c:450 msgid "(matching)" msgstr "(coincident)" -#: builtin/remote.c:450 +#: builtin/remote.c:454 msgid "(delete)" msgstr "(suprimir)" -#: builtin/remote.c:624 builtin/remote.c:759 builtin/remote.c:858 +#: builtin/remote.c:628 builtin/remote.c:764 builtin/remote.c:863 #, c-format msgid "No such remote: %s" msgstr "No hi ha tal remot: %s" -#: builtin/remote.c:641 +#: builtin/remote.c:645 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "No s'ha pogut canviar el nom de la secció de configuració «%s» a «%s»" -#: builtin/remote.c:661 +#: builtin/remote.c:665 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -12648,17 +14695,17 @@ msgstr "" "\t%s\n" "\tActualitzeu la configuració manualment si és necessari." -#: builtin/remote.c:697 +#: builtin/remote.c:701 #, c-format msgid "deleting '%s' failed" msgstr "la supressió de «%s» ha fallat" -#: builtin/remote.c:731 +#: builtin/remote.c:735 #, c-format msgid "creating '%s' failed" msgstr "la creació de «%s» ha fallat" -#: builtin/remote.c:796 +#: builtin/remote.c:801 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -12673,113 +14720,118 @@ msgstr[1] "" "eliminat;\n" "per a suprimir-les, useu:" -#: builtin/remote.c:810 +#: builtin/remote.c:815 #, c-format msgid "Could not remove config section '%s'" msgstr "No s'ha pogut eliminar la secció de configuració «%s»" -#: builtin/remote.c:911 +#: builtin/remote.c:916 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " nou (la pròxima obtenció emmagatzemarà a remotes/%s)" -#: builtin/remote.c:914 +#: builtin/remote.c:919 msgid " tracked" msgstr " seguit" -#: builtin/remote.c:916 +#: builtin/remote.c:921 msgid " stale (use 'git remote prune' to remove)" msgstr " estancat (useu 'git remote prune' per a eliminar)" -#: builtin/remote.c:918 +#: builtin/remote.c:923 msgid " ???" msgstr " ???" -#: builtin/remote.c:959 +#: builtin/remote.c:964 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "branch.%s.merge no vàlid; no es pot fer «rebase» sobre > 1 branca" -#: builtin/remote.c:967 +#: builtin/remote.c:973 #, c-format msgid "rebases interactively onto remote %s" msgstr "es fa «rebase» interactivament sobre el remot %s" -#: builtin/remote.c:968 +#: builtin/remote.c:975 +#, fuzzy, c-format +msgid "rebases interactively (with merges) onto remote %s" +msgstr "es fa «rebase» interactivament sobre el remot %s" + +#: builtin/remote.c:978 #, c-format msgid "rebases onto remote %s" msgstr "es fa «rebase» sobre el remot %s" -#: builtin/remote.c:971 +#: builtin/remote.c:982 #, c-format msgid " merges with remote %s" msgstr "es fusiona amb el remot %s" -#: builtin/remote.c:974 +#: builtin/remote.c:985 #, c-format msgid "merges with remote %s" msgstr "es fusiona amb el remot %s" -#: builtin/remote.c:977 +#: builtin/remote.c:988 #, c-format msgid "%-*s and with remote %s\n" msgstr "%-*s i amb el remot %s\n" -#: builtin/remote.c:1020 +#: builtin/remote.c:1031 msgid "create" msgstr "crea" -#: builtin/remote.c:1023 +#: builtin/remote.c:1034 msgid "delete" msgstr "suprimeix" -#: builtin/remote.c:1027 +#: builtin/remote.c:1038 msgid "up to date" msgstr "al dia" -#: builtin/remote.c:1030 +#: builtin/remote.c:1041 msgid "fast-forwardable" msgstr "avanç ràpid possible" -#: builtin/remote.c:1033 +#: builtin/remote.c:1044 msgid "local out of date" msgstr "local no actualitzat" -#: builtin/remote.c:1040 +#: builtin/remote.c:1051 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s força a %-*s (%s)" -#: builtin/remote.c:1043 +#: builtin/remote.c:1054 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s puja a %-*s (%s)" -#: builtin/remote.c:1047 +#: builtin/remote.c:1058 #, c-format msgid " %-*s forces to %s" msgstr " %-*s força a %s" -#: builtin/remote.c:1050 +#: builtin/remote.c:1061 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s puja a %s" -#: builtin/remote.c:1118 +#: builtin/remote.c:1129 msgid "do not query remotes" msgstr "no consultis els remots" -#: builtin/remote.c:1145 +#: builtin/remote.c:1156 #, c-format msgid "* remote %s" msgstr "* remot %s" -#: builtin/remote.c:1146 +#: builtin/remote.c:1157 #, c-format msgid " Fetch URL: %s" msgstr " URL d'obtenció: %s" -#: builtin/remote.c:1147 builtin/remote.c:1163 builtin/remote.c:1302 +#: builtin/remote.c:1158 builtin/remote.c:1174 builtin/remote.c:1313 msgid "(no URL)" msgstr "(sense URL)" @@ -12787,194 +14839,194 @@ msgstr "(sense URL)" #. with the one in " Fetch URL: %s" #. translation. #. -#: builtin/remote.c:1161 builtin/remote.c:1163 +#: builtin/remote.c:1172 builtin/remote.c:1174 #, c-format msgid " Push URL: %s" msgstr " URL de pujada: %s" -#: builtin/remote.c:1165 builtin/remote.c:1167 builtin/remote.c:1169 +#: builtin/remote.c:1176 builtin/remote.c:1178 builtin/remote.c:1180 #, c-format msgid " HEAD branch: %s" msgstr " Branca de HEAD: %s" -#: builtin/remote.c:1165 +#: builtin/remote.c:1176 msgid "(not queried)" msgstr "(no consultat)" -#: builtin/remote.c:1167 +#: builtin/remote.c:1178 msgid "(unknown)" msgstr "(desconegut)" -#: builtin/remote.c:1171 +#: builtin/remote.c:1182 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" msgstr "" " Branca de HEAD (la HEAD remot és ambigua, pot ser un dels següents):\n" -#: builtin/remote.c:1183 +#: builtin/remote.c:1194 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " Branca remota:%s" msgstr[1] " Branques remotes:%s" -#: builtin/remote.c:1186 builtin/remote.c:1212 +#: builtin/remote.c:1197 builtin/remote.c:1223 msgid " (status not queried)" msgstr " (estat no consultat)" -#: builtin/remote.c:1195 +#: builtin/remote.c:1206 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] " Branca local configurada per a «git pull»:" msgstr[1] " Branques locals configurades per a «git pull»:" -#: builtin/remote.c:1203 +#: builtin/remote.c:1214 msgid " Local refs will be mirrored by 'git push'" msgstr " «git push» reflectirà les referències locals" -#: builtin/remote.c:1209 +#: builtin/remote.c:1220 #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" msgstr[0] " Referència local configurada per a «git push»%s:" msgstr[1] " Referències locals configurades per a «git push»%s:" -#: builtin/remote.c:1230 +#: builtin/remote.c:1241 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "estableix refs/remotes/<name>/HEAD segons el remot" -#: builtin/remote.c:1232 +#: builtin/remote.c:1243 msgid "delete refs/remotes/<name>/HEAD" msgstr "suprimeix refs/remotes/<name>/HEAD" -#: builtin/remote.c:1247 +#: builtin/remote.c:1258 msgid "Cannot determine remote HEAD" msgstr "No es pot determinar la HEAD remota" -#: builtin/remote.c:1249 +#: builtin/remote.c:1260 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "Múltiples branques de HEAD remotes. Trieu-ne una explícitament amb:" -#: builtin/remote.c:1259 +#: builtin/remote.c:1270 #, c-format msgid "Could not delete %s" msgstr "No s'ha pogut suprimir %s" -#: builtin/remote.c:1267 +#: builtin/remote.c:1278 #, c-format msgid "Not a valid ref: %s" msgstr "No és una referència vàlida: %s" -#: builtin/remote.c:1269 +#: builtin/remote.c:1280 #, c-format msgid "Could not setup %s" msgstr "No s'ha pogut configurar %s" -#: builtin/remote.c:1287 +#: builtin/remote.c:1298 #, c-format msgid " %s will become dangling!" msgstr " %s es tornarà penjant!" -#: builtin/remote.c:1288 +#: builtin/remote.c:1299 #, c-format msgid " %s has become dangling!" msgstr " %s s'ha tornat penjant!" -#: builtin/remote.c:1298 +#: builtin/remote.c:1309 #, c-format msgid "Pruning %s" msgstr "S'està podant %s" -#: builtin/remote.c:1299 +#: builtin/remote.c:1310 #, c-format msgid "URL: %s" msgstr "URL: %s" -#: builtin/remote.c:1315 +#: builtin/remote.c:1326 #, c-format msgid " * [would prune] %s" msgstr " * [podaria] %s" -#: builtin/remote.c:1318 +#: builtin/remote.c:1329 #, c-format msgid " * [pruned] %s" msgstr " * [podat] %s" -#: builtin/remote.c:1363 +#: builtin/remote.c:1374 msgid "prune remotes after fetching" msgstr "poda els remots després d'obtenir-los" -#: builtin/remote.c:1426 builtin/remote.c:1480 builtin/remote.c:1548 +#: builtin/remote.c:1437 builtin/remote.c:1491 builtin/remote.c:1559 #, c-format msgid "No such remote '%s'" msgstr "No hi ha tal remot «%s»" -#: builtin/remote.c:1442 +#: builtin/remote.c:1453 msgid "add branch" msgstr "afegeix branca" -#: builtin/remote.c:1449 +#: builtin/remote.c:1460 msgid "no remote specified" msgstr "cap remot especificat" -#: builtin/remote.c:1466 +#: builtin/remote.c:1477 msgid "query push URLs rather than fetch URLs" msgstr "consulta els URL de pujada en lloc dels URL d'obtenció" -#: builtin/remote.c:1468 +#: builtin/remote.c:1479 msgid "return all URLs" msgstr "retorna tots els URL" -#: builtin/remote.c:1496 +#: builtin/remote.c:1507 #, c-format msgid "no URLs configured for remote '%s'" msgstr "cap URL configurat per al remot «%s»" -#: builtin/remote.c:1522 +#: builtin/remote.c:1533 msgid "manipulate push URLs" msgstr "manipula els URL de pujada" -#: builtin/remote.c:1524 +#: builtin/remote.c:1535 msgid "add URL" msgstr "afegeix URL" -#: builtin/remote.c:1526 +#: builtin/remote.c:1537 msgid "delete URLs" msgstr "suprimeix els URL" -#: builtin/remote.c:1533 +#: builtin/remote.c:1544 msgid "--add --delete doesn't make sense" msgstr "--add --delete no té sentit" -#: builtin/remote.c:1572 +#: builtin/remote.c:1583 #, c-format msgid "Invalid old URL pattern: %s" msgstr "Patró d'URL antic no vàlid: %s" -#: builtin/remote.c:1580 +#: builtin/remote.c:1591 #, c-format msgid "No such URL found: %s" msgstr "No s'ha trobat tal URL: %s" -#: builtin/remote.c:1582 +#: builtin/remote.c:1593 msgid "Will not delete all non-push URLs" msgstr "No se suprimiran tots els URL no de pujada" -#: builtin/remote.c:1598 +#: builtin/remote.c:1609 msgid "be verbose; must be placed before a subcommand" msgstr "sigues detallat; s'ha de col·locar abans d'una subordre" -#: builtin/remote.c:1629 +#: builtin/remote.c:1640 #, c-format msgid "Unknown subcommand: %s" msgstr "Subordre desconeguda: %s" -#: builtin/repack.c:18 +#: builtin/repack.c:20 msgid "git repack [<options>]" msgstr "git repack [<opcions>]" -#: builtin/repack.c:23 +#: builtin/repack.c:25 msgid "" "Incremental repacks are incompatible with bitmap indexes. Use\n" "--no-write-bitmap-index or disable the pack.writebitmaps configuration." @@ -12984,129 +15036,238 @@ msgstr "" "--no-write-bitmap-index o inhabiliteu el paràmetre de configuració pack." "writebitmaps." -#: builtin/repack.c:170 +#: builtin/repack.c:287 msgid "pack everything in a single pack" msgstr "empaqueta-ho tot en un únic paquet" -#: builtin/repack.c:172 +#: builtin/repack.c:289 msgid "same as -a, and turn unreachable objects loose" msgstr "el mateix que -a, i solta els objectes inabastables" -#: builtin/repack.c:175 +#: builtin/repack.c:292 msgid "remove redundant packs, and run git-prune-packed" msgstr "elimina els paquets redundants, i executeu git-prune-packed" -#: builtin/repack.c:177 +#: builtin/repack.c:294 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "passa --no-reuse-delta a git-pack-objects" -#: builtin/repack.c:179 +#: builtin/repack.c:296 msgid "pass --no-reuse-object to git-pack-objects" msgstr "passa --no-reuse-object a git-pack-objects" -#: builtin/repack.c:181 +#: builtin/repack.c:298 msgid "do not run git-update-server-info" msgstr "no executis git-update-server-info" -#: builtin/repack.c:184 +#: builtin/repack.c:301 msgid "pass --local to git-pack-objects" msgstr "passa --local a git-pack-objects" -#: builtin/repack.c:186 +#: builtin/repack.c:303 msgid "write bitmap index" msgstr "escriu índex de mapa de bits" -#: builtin/repack.c:187 +#: builtin/repack.c:304 msgid "approxidate" msgstr "data aproximada" -#: builtin/repack.c:188 +#: builtin/repack.c:305 msgid "with -A, do not loosen objects older than this" msgstr "amb -A, no soltis els objectes més vells que aquest" -#: builtin/repack.c:190 +#: builtin/repack.c:307 msgid "with -a, repack unreachable objects" msgstr "amb -a, reempaqueta els objectes inabastables" -#: builtin/repack.c:192 +#: builtin/repack.c:309 msgid "size of the window used for delta compression" msgstr "mida de la finestra que s'usa per a compressió de diferències" -#: builtin/repack.c:193 builtin/repack.c:199 +#: builtin/repack.c:310 builtin/repack.c:316 msgid "bytes" msgstr "octets" -#: builtin/repack.c:194 +#: builtin/repack.c:311 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" -#: builtin/repack.c:196 +#: builtin/repack.c:313 msgid "limits the maximum delta depth" msgstr "limita la profunditat màxima de les diferències" -#: builtin/repack.c:198 +#: builtin/repack.c:315 msgid "limits the maximum number of threads" msgstr "limita el nombre màxim de fils" -#: builtin/repack.c:200 +#: builtin/repack.c:317 msgid "maximum size of each packfile" msgstr "mida màxima de cada fitxer de paquet" -#: builtin/repack.c:202 +#: builtin/repack.c:319 msgid "repack objects in packs marked with .keep" msgstr "reempaqueta els objectes en paquets marcats amb .keep" -#: builtin/repack.c:212 +#: builtin/repack.c:321 +#, fuzzy +msgid "do not repack this pack" +msgstr "crea paquets prims" + +#: builtin/repack.c:331 msgid "cannot delete packs in a precious-objects repo" msgstr "no es poden suprimir paquets en un dipòsit d'objectes preciosos" -#: builtin/repack.c:216 +#: builtin/repack.c:335 msgid "--keep-unreachable and -A are incompatible" msgstr "--keep-unreachable i -A són incompatibles" -#: builtin/repack.c:410 builtin/worktree.c:148 +#: builtin/repack.c:510 builtin/worktree.c:140 #, c-format msgid "failed to remove '%s'" msgstr "s'ha produït un error en eliminar «%s»" -#: builtin/replace.c:20 +#: builtin/replace.c:22 msgid "git replace [-f] <object> <replacement>" msgstr "git replace [-f] <objecte> <reemplaçament>" -#: builtin/replace.c:21 +#: builtin/replace.c:23 msgid "git replace [-f] --edit <object>" msgstr "git replace [-f] --edit <objecte>" -#: builtin/replace.c:22 +#: builtin/replace.c:24 msgid "git replace [-f] --graft <commit> [<parent>...]" msgstr "git replace [-f] --graft <comissió> [<mare>...]" -#: builtin/replace.c:23 +#: builtin/replace.c:25 +msgid "git replace [-f] --convert-graft-file" +msgstr "git replace [-f] --convert-graft-file" + +#: builtin/replace.c:26 msgid "git replace -d <object>..." msgstr "git replace -d <objecte>..." -#: builtin/replace.c:24 +#: builtin/replace.c:27 msgid "git replace [--format=<format>] [-l [<pattern>]]" msgstr "git replace [--format=<format>] [-l [<patró>]]" -#: builtin/replace.c:331 builtin/replace.c:369 builtin/replace.c:397 +#: builtin/replace.c:57 builtin/replace.c:203 builtin/replace.c:206 +#, c-format +msgid "failed to resolve '%s' as a valid ref" +msgstr "s'ha produït un error en resoldre «%s» com a referència vàlida" + +#: builtin/replace.c:86 +#, c-format +msgid "" +"invalid replace format '%s'\n" +"valid formats are 'short', 'medium' and 'long'" +msgstr "" + +#: builtin/replace.c:121 +#, fuzzy, c-format +msgid "replace ref '%s' not found" +msgstr "no s'ha trobat la branca «%s»." + +#: builtin/replace.c:137 +#, fuzzy, c-format +msgid "Deleted replace ref '%s'" +msgstr "suprimeix les referències reemplaçades" + +#: builtin/replace.c:149 +#, fuzzy, c-format +msgid "'%s' is not a valid ref name" +msgstr "«%s» no és un nom de remot vàlid" + +#: builtin/replace.c:154 +#, fuzzy, c-format +msgid "replace ref '%s' already exists" +msgstr "el destí «%s» ja existeix" + +#: builtin/replace.c:174 #, c-format -msgid "Not a valid object name: '%s'" +msgid "" +"Objects must be of the same type.\n" +"'%s' points to a replaced object of type '%s'\n" +"while '%s' points to a replacement object of type '%s'." +msgstr "" + +#: builtin/replace.c:225 +#, fuzzy, c-format +msgid "unable to open %s for writing" +msgstr "No s'ha pogut obrir «%s» per a escriptura" + +#: builtin/replace.c:238 +msgid "cat-file reported failure" +msgstr "" + +#: builtin/replace.c:254 +#, fuzzy, c-format +msgid "unable to open %s for reading" +msgstr "no s'ha pogut obrir o llegir %s" + +#: builtin/replace.c:268 +#, fuzzy +msgid "unable to spawn mktree" +msgstr "no s'ha pogut llegir l'arbre (%s)" + +#: builtin/replace.c:272 +#, fuzzy +msgid "unable to read from mktree" +msgstr "no s'ha pogut llegir l'arbre (%s)" + +#: builtin/replace.c:281 +#, fuzzy +msgid "mktree reported failure" +msgstr "la reversió ha fallat" + +#: builtin/replace.c:285 +#, fuzzy +msgid "mktree did not return an object name" +msgstr "el remot no ha enviat tots els objectes necessaris" + +#: builtin/replace.c:294 +#, fuzzy, c-format +msgid "unable to fstat %s" +msgstr "no s'ha pogut actualitzar %s" + +#: builtin/replace.c:299 +#, fuzzy +msgid "unable to write object to database" +msgstr "no s'ha pogut escriure l'objecte de nota" + +#: builtin/replace.c:318 builtin/replace.c:371 builtin/replace.c:415 +#: builtin/replace.c:445 +#, fuzzy, c-format +msgid "not a valid object name: '%s'" msgstr "No és un nom d'objecte vàlid: «%s»" -#: builtin/replace.c:361 +#: builtin/replace.c:322 +#, fuzzy, c-format +msgid "unable to get object type for %s" +msgstr "no es pot fer grep des d'un objecte de tipus %s" + +#: builtin/replace.c:338 +#, fuzzy +msgid "editing object file failed" +msgstr "la lectura de les referències de bisecció ha fallat" + +#: builtin/replace.c:347 +#, c-format +msgid "new object is the same as the old one: '%s'" +msgstr "" + +#: builtin/replace.c:407 #, c-format msgid "bad mergetag in commit '%s'" msgstr "etiqueta de fusió incorrecta en la comissió «%s»" -#: builtin/replace.c:363 +#: builtin/replace.c:409 #, c-format msgid "malformed mergetag in commit '%s'" msgstr "etiqueta de fusió mal formada en la comissió «%s»" -#: builtin/replace.c:374 +#: builtin/replace.c:421 #, c-format msgid "" "original commit '%s' contains mergetag '%s' that is discarded; use --edit " @@ -13115,48 +15276,112 @@ msgstr "" "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 -msgid "the original commit '%s' has a gpg signature." +#: builtin/replace.c:460 +#, fuzzy, c-format +msgid "the original commit '%s' has a gpg signature" msgstr "la comissió original «%s» té una signatura gpg." -#: builtin/replace.c:408 +#: builtin/replace.c:461 msgid "the signature will be removed in the replacement commit!" msgstr "s'eliminarà la signatura en la comissió de reemplaçament!" -#: builtin/replace.c:414 +#: builtin/replace.c:471 #, c-format msgid "could not write replacement commit for: '%s'" msgstr "no s'ha pogut escriure la comissió de reemplaçament per a: «%s»" -#: builtin/replace.c:438 +#: builtin/replace.c:479 +#, c-format +msgid "graft for '%s' unnecessary" +msgstr "" + +#: builtin/replace.c:482 +#, c-format +msgid "new commit is the same as the old one: '%s'" +msgstr "" + +#: builtin/replace.c:514 +#, fuzzy, c-format +msgid "" +"could not convert the following graft(s):\n" +"%s" +msgstr "Eliminaria l'ítem següent:" + +#: builtin/replace.c:535 msgid "list replace refs" msgstr "llista les referències reemplaçades" -#: builtin/replace.c:439 +#: builtin/replace.c:536 msgid "delete replace refs" msgstr "suprimeix les referències reemplaçades" -#: builtin/replace.c:440 +#: builtin/replace.c:537 msgid "edit existing object" msgstr "edita un objecte existent" -#: builtin/replace.c:441 +#: builtin/replace.c:538 msgid "change a commit's parents" msgstr "canvia les mares d'una comissió" -#: builtin/replace.c:442 +#: builtin/replace.c:539 +#, fuzzy +msgid "convert existing graft file" +msgstr "força la sobreescriptura de fitxers existents" + +#: builtin/replace.c:540 msgid "replace the ref if it exists" msgstr "reemplaça la referència si existeix" -#: builtin/replace.c:444 +#: builtin/replace.c:542 msgid "do not pretty-print contents for --edit" msgstr "no imprimeixis bellament els continguts per a --edit" -#: builtin/replace.c:445 +#: builtin/replace.c:543 msgid "use this format" msgstr "usa aquest format" +#: builtin/replace.c:556 +#, fuzzy +msgid "--format cannot be used when not listing" +msgstr "--fix-thin no es pot usar sense --stdin" + +#: builtin/replace.c:564 +#, fuzzy +msgid "-f only makes sense when writing a replacement" +msgstr "-z només té sentit amb --stdin" + +#: builtin/replace.c:568 +#, fuzzy +msgid "--raw only makes sense with --edit" +msgstr "-z només té sentit amb --stdin" + +#: builtin/replace.c:574 +msgid "-d needs at least one argument" +msgstr "" + +#: builtin/replace.c:580 +msgid "bad number of arguments" +msgstr "" + +#: builtin/replace.c:586 +#, fuzzy +msgid "-e needs exactly one argument" +msgstr "Cal exactament un rang." + +#: builtin/replace.c:592 +msgid "-g needs at least one argument" +msgstr "" + +#: builtin/replace.c:598 +#, fuzzy +msgid "--convert-graft-file takes no argument" +msgstr "--continue no accepta paràmetres" + +#: builtin/replace.c:604 +#, fuzzy +msgid "only one pattern can be given with -l" +msgstr "combina els patrons especificats amb -e" + #: builtin/rerere.c:13 msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]" msgstr "git rerere [clear | forget <camí>... | status | remaining | diff | gc]" @@ -13293,44 +15518,44 @@ msgstr "No s'ha pogut restablir el fitxer d'índex a la revisió «%s»." msgid "Could not write new index file." msgstr "No s'ha pogut escriure el fitxer d'índex nou." -#: builtin/rev-list.c:397 +#: builtin/rev-list.c:399 msgid "cannot combine --exclude-promisor-objects and --missing" msgstr "" -#: builtin/rev-list.c:455 +#: builtin/rev-list.c:457 msgid "object filtering requires --objects" msgstr "el filtratge d'objectes requereix --objects" -#: builtin/rev-list.c:458 +#: builtin/rev-list.c:460 #, c-format msgid "invalid sparse value '%s'" msgstr "valor parcial no vàlid: «%s»" -#: builtin/rev-list.c:499 +#: builtin/rev-list.c:501 msgid "rev-list does not support display of notes" msgstr "el rev-list no permet mostrar notes" -#: builtin/rev-list.c:502 +#: builtin/rev-list.c:504 msgid "cannot combine --use-bitmap-index with object filtering" msgstr "no es pot combinar --use-bitmap-index amb el filtratge d'objectes" -#: builtin/rev-parse.c:402 +#: builtin/rev-parse.c:406 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" msgstr "git rev-parse --parseopt [<opcions>] -- [<paràmetres>...]" -#: builtin/rev-parse.c:407 +#: builtin/rev-parse.c:411 msgid "keep the `--` passed as an arg" msgstr "retén el «--» passat com a paràmetre" -#: builtin/rev-parse.c:409 +#: builtin/rev-parse.c:413 msgid "stop parsing after the first non-option argument" msgstr "deixa d'analitzar després del primer paràmetre no d'opció" -#: builtin/rev-parse.c:412 +#: builtin/rev-parse.c:416 msgid "output in stuck long form" msgstr "emet en forma llarga enganxada" -#: builtin/rev-parse.c:545 +#: builtin/rev-parse.c:549 msgid "" "git rev-parse --parseopt [<options>] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" @@ -13345,84 +15570,84 @@ msgstr "" "Executeu \"git rev-parse --parseopt -h\" per més informació sobre l'ús " "inicial." -#: builtin/revert.c:23 +#: builtin/revert.c:24 msgid "git revert [<options>] <commit-ish>..." msgstr "git revert [<opcions>] <comissió>..." -#: builtin/revert.c:24 +#: builtin/revert.c:25 msgid "git revert <subcommand>" msgstr "git revert <subordre>" -#: builtin/revert.c:29 +#: builtin/revert.c:30 msgid "git cherry-pick [<options>] <commit-ish>..." msgstr "git cherry-pick [<opcions>] <comissió>..." -#: builtin/revert.c:30 +#: builtin/revert.c:31 msgid "git cherry-pick <subcommand>" msgstr "git cherry-pick <subordre>" -#: builtin/revert.c:90 +#: builtin/revert.c:91 #, c-format msgid "%s: %s cannot be used with %s" msgstr "%s: %s no es pot usar amb %s" -#: builtin/revert.c:99 +#: builtin/revert.c:100 msgid "end revert or cherry-pick sequence" msgstr "acaba la seqüència de reversió o el «cherry pick»" -#: builtin/revert.c:100 +#: builtin/revert.c:101 msgid "resume revert or cherry-pick sequence" msgstr "reprèn la seqüència de reversió o el «cherry pick»" -#: builtin/revert.c:101 +#: builtin/revert.c:102 msgid "cancel revert or cherry-pick sequence" msgstr "cancel·la la seqüència de reversió o el «cherry pick»" -#: builtin/revert.c:102 +#: builtin/revert.c:103 msgid "don't automatically commit" msgstr "no cometis automàticament" -#: builtin/revert.c:103 +#: builtin/revert.c:104 msgid "edit the commit message" msgstr "edita el missatge de comissió" -#: builtin/revert.c:106 +#: builtin/revert.c:107 msgid "parent-number" msgstr "número del pare" -#: builtin/revert.c:107 +#: builtin/revert.c:108 msgid "select mainline parent" msgstr "selecciona la línia principal del pare" -#: builtin/revert.c:109 +#: builtin/revert.c:110 msgid "merge strategy" msgstr "estratègia de fusió" -#: builtin/revert.c:110 +#: builtin/revert.c:111 msgid "option" msgstr "opció" -#: builtin/revert.c:111 +#: builtin/revert.c:112 msgid "option for merge strategy" msgstr "opció d'estratègia de fusió" -#: builtin/revert.c:120 +#: builtin/revert.c:121 msgid "append commit name" msgstr "nom de la comissió a annexar" -#: builtin/revert.c:122 +#: builtin/revert.c:123 msgid "preserve initially empty commits" msgstr "preserva les comissions inicialment buides" -#: builtin/revert.c:124 +#: builtin/revert.c:125 msgid "keep redundant, empty commits" msgstr "retén les comissions redundants i buides" -#: builtin/revert.c:214 +#: builtin/revert.c:219 msgid "revert failed" msgstr "la reversió ha fallat" -#: builtin/revert.c:227 +#: builtin/revert.c:232 msgid "cherry-pick failed" msgstr "el «cherry pick» ha fallat" @@ -13472,42 +15697,49 @@ msgid_plural "the following files have local modifications:" msgstr[0] "el fitxer següent té modificacions locals:" msgstr[1] "els fitxers següents tenen modificacions locals:" -#: builtin/rm.c:243 +#: builtin/rm.c:241 msgid "do not list removed files" msgstr "no llistis els fitxers eliminats" -#: builtin/rm.c:244 +#: builtin/rm.c:242 msgid "only remove from the index" msgstr "només elimina de l'índex" -#: builtin/rm.c:245 +#: builtin/rm.c:243 msgid "override the up-to-date check" msgstr "passa per alt la comprovació d'actualitat" -#: builtin/rm.c:246 +#: builtin/rm.c:244 msgid "allow recursive removal" msgstr "permet l'eliminació recursiva" -#: builtin/rm.c:248 +#: builtin/rm.c:246 msgid "exit with a zero status even if nothing matched" msgstr "surt amb estat zero encara que res hagi coincidit" -#: builtin/rm.c:307 +#: builtin/rm.c:288 +#, fuzzy +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" + +#: builtin/rm.c:306 #, c-format msgid "not removing '%s' recursively without -r" msgstr "no s'està eliminant «%s» recursivament sense -r" -#: builtin/rm.c:346 +#: builtin/rm.c:345 #, c-format msgid "git rm: unable to remove %s" msgstr "git rm: no s'ha pogut eliminar %s" -#: builtin/rm.c:369 +#: builtin/rm.c:368 #, c-format msgid "could not remove '%s'" msgstr "no s'ha pogut suprimir «%s»" -#: builtin/send-pack.c:19 +#: builtin/send-pack.c:20 msgid "" "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-" "receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> " @@ -13519,52 +15751,77 @@ msgstr "" "[<màquina>:]<directori> [<referència>...]\n" " --all i especificació <referència> explícita són mútuament excloents." -#: builtin/send-pack.c:162 +#: builtin/send-pack.c:163 msgid "remote name" msgstr "nom del remot" -#: builtin/send-pack.c:176 +#: builtin/send-pack.c:177 msgid "use stateless RPC protocol" msgstr "usa el protocol RPC sense estat" -#: builtin/send-pack.c:177 +#: builtin/send-pack.c:178 msgid "read refs from stdin" msgstr "llegeix les referències des de stdin" -#: builtin/send-pack.c:178 +#: builtin/send-pack.c:179 msgid "print status from remote helper" msgstr "imprimeix l'estat des de l'ajudant remot" +#: builtin/serve.c:7 +#, fuzzy +msgid "git serve [<options>]" +msgstr "git repack [<opcions>]" + +#: builtin/serve.c:17 builtin/upload-pack.c:23 +msgid "quit after a single request/response exchange" +msgstr "surt després d'un sol intercanvi de sol·licitud/resposta" + +#: builtin/serve.c:19 +#, fuzzy +msgid "exit immediately after advertising capabilities" +msgstr "surt immediatament després de l'anunci inicial de referència" + #: builtin/shortlog.c:14 -msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]" +#, fuzzy +msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]" msgstr "git shortlog [<opcions>] [<rang-de-revisions>] [[--] [<camí>...]]" -#: builtin/shortlog.c:263 +#: builtin/shortlog.c:15 +#, fuzzy +msgid "git log --pretty=short | git shortlog [<options>]" +msgstr "git worktree list [<opcions>]" + +#: builtin/shortlog.c:264 msgid "Group by committer rather than author" msgstr "Agrupa per «comitter» en comptes de per autor" -#: builtin/shortlog.c:265 +#: builtin/shortlog.c:266 msgid "sort output according to the number of commits per author" msgstr "ordena la sortida segons el nombre de comissions per autor" -#: builtin/shortlog.c:267 +#: builtin/shortlog.c:268 msgid "Suppress commit descriptions, only provides commit count" msgstr "" "Omet les descripcions de comissió, només proveeix el recompte de comissions" -#: builtin/shortlog.c:269 +#: builtin/shortlog.c:270 msgid "Show the email address of each author" msgstr "Mostra l'adreça electrònica de cada autor" -#: builtin/shortlog.c:270 -msgid "w[,i1[,i2]]" -msgstr "w[,i1[,i2]]" - #: builtin/shortlog.c:271 +msgid "<w>[,<i1>[,<i2>]]" +msgstr "" + +#: builtin/shortlog.c:272 msgid "Linewrap output" msgstr "Ajusta les línies de la sortida" -#: builtin/show-branch.c:12 +#: builtin/shortlog.c:299 +#, fuzzy +msgid "too many arguments given outside repository" +msgstr "hi ha massa arguments per a desassignar la font" + +#: builtin/show-branch.c:13 msgid "" "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" "\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n" @@ -13576,130 +15833,130 @@ msgstr "" "\t\t[--more=<n> | --list | --independent | --merge-base]\n" "\t\t[--no-name | --sha1-name] [--topics] [(<revisió> | <glob>)...]" -#: builtin/show-branch.c:16 +#: builtin/show-branch.c:17 msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<referència>]" -#: builtin/show-branch.c:376 +#: builtin/show-branch.c:395 #, c-format msgid "ignoring %s; cannot handle more than %d ref" msgid_plural "ignoring %s; cannot handle more than %d refs" msgstr[0] "s'està ignorant %s; no es pot gestionar més de %d referència" msgstr[1] "s'està ignorant %s; no es poden gestionar més de %d referències" -#: builtin/show-branch.c:530 +#: builtin/show-branch.c:549 #, c-format msgid "no matching refs with %s" msgstr "no hi ha referències coincidents amb %s" -#: builtin/show-branch.c:626 +#: builtin/show-branch.c:645 msgid "show remote-tracking and local branches" msgstr "mostra les branques amb seguiment remot i les locals" -#: builtin/show-branch.c:628 +#: builtin/show-branch.c:647 msgid "show remote-tracking branches" msgstr "mostra les branques amb seguiment remot" -#: builtin/show-branch.c:630 +#: builtin/show-branch.c:649 msgid "color '*!+-' corresponding to the branch" msgstr "colora '*!+-' corresponent a la branca" -#: builtin/show-branch.c:632 +#: builtin/show-branch.c:651 msgid "show <n> more commits after the common ancestor" msgstr "mostra <n> comissions després de l'avantpassat comú" -#: builtin/show-branch.c:634 +#: builtin/show-branch.c:653 msgid "synonym to more=-1" msgstr "sinònim de more=-1" -#: builtin/show-branch.c:635 +#: builtin/show-branch.c:654 msgid "suppress naming strings" msgstr "omet anomenar cadenes" -#: builtin/show-branch.c:637 +#: builtin/show-branch.c:656 msgid "include the current branch" msgstr "inclou la branca actual" -#: builtin/show-branch.c:639 +#: builtin/show-branch.c:658 msgid "name commits with their object names" msgstr "anomena les comissions amb els seus noms d'objecte" -#: builtin/show-branch.c:641 +#: builtin/show-branch.c:660 msgid "show possible merge bases" msgstr "mostra les bases de fusió possibles" -#: builtin/show-branch.c:643 +#: builtin/show-branch.c:662 msgid "show refs unreachable from any other ref" msgstr "mostra les referències inabastables de qualsevol altra referència" -#: builtin/show-branch.c:645 +#: builtin/show-branch.c:664 msgid "show commits in topological order" msgstr "mostra les comissions en ordre topològic" -#: builtin/show-branch.c:648 +#: builtin/show-branch.c:667 msgid "show only commits not on the first branch" msgstr "mostra només les comissions que no siguin en la primera branca" -#: builtin/show-branch.c:650 +#: builtin/show-branch.c:669 msgid "show merges reachable from only one tip" msgstr "mostra les fusions abastables de només una punta" -#: builtin/show-branch.c:652 +#: builtin/show-branch.c:671 msgid "topologically sort, maintaining date order where possible" msgstr "ordena topològicament, mantenint l'ordre de dates on sigui possible" -#: builtin/show-branch.c:655 +#: builtin/show-branch.c:674 msgid "<n>[,<base>]" msgstr "<n>[,<base>]" -#: builtin/show-branch.c:656 +#: builtin/show-branch.c:675 msgid "show <n> most recent ref-log entries starting at base" msgstr "mostra les <n> entrades més recents començant a la base" -#: builtin/show-branch.c:690 +#: builtin/show-branch.c:711 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 +#: builtin/show-branch.c:735 msgid "no branches given, and HEAD is not valid" msgstr "no s'ha donat cap branca, i HEAD no és vàlid" -#: builtin/show-branch.c:717 +#: builtin/show-branch.c:738 msgid "--reflog option needs one branch name" msgstr "l'opció --reflog necessita un nom de branca" -#: builtin/show-branch.c:720 +#: builtin/show-branch.c:741 #, c-format msgid "only %d entry can be shown at one time." msgid_plural "only %d entries can be shown at one time." msgstr[0] "es pot mostrar només %d entrada a la vegada." msgstr[1] "es poden mostrar només %d entrades a la vegada." -#: builtin/show-branch.c:724 +#: builtin/show-branch.c:745 #, c-format msgid "no such ref %s" msgstr "no hi ha tal referència %s" -#: builtin/show-branch.c:808 +#: builtin/show-branch.c:829 #, c-format msgid "cannot handle more than %d rev." msgid_plural "cannot handle more than %d revs." msgstr[0] "no es pot gestionar més d'%d revisió." msgstr[1] "no es poden gestionar més de %d revisions." -#: builtin/show-branch.c:812 +#: builtin/show-branch.c:833 #, c-format msgid "'%s' is not a valid ref." msgstr "«%s» no és una referència vàlida." -#: builtin/show-branch.c:815 +#: builtin/show-branch.c:836 #, c-format msgid "cannot find commit %s (%s)" msgstr "no es pot trobar la comissió %s (%s)" -#: builtin/show-ref.c:10 +#: builtin/show-ref.c:11 msgid "" "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]" @@ -13707,41 +15964,41 @@ msgstr "" "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<patró>...]" -#: builtin/show-ref.c:11 +#: builtin/show-ref.c:12 msgid "git show-ref --exclude-existing[=<pattern>]" msgstr "git show-ref --exclude-existing[=<patró>]" -#: builtin/show-ref.c:159 +#: builtin/show-ref.c:160 msgid "only show tags (can be combined with heads)" msgstr "mostra només les etiquetes (es pot combinar amb heads)" -#: builtin/show-ref.c:160 +#: builtin/show-ref.c:161 msgid "only show heads (can be combined with tags)" msgstr "mostra només els caps (es pot combinar amb tags)" -#: builtin/show-ref.c:161 +#: builtin/show-ref.c:162 msgid "stricter reference checking, requires exact ref path" 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 +#: builtin/show-ref.c:165 builtin/show-ref.c:167 msgid "show the HEAD reference, even if it would be filtered out" msgstr "mostra la referència HEAD, encara que es filtrés" -#: builtin/show-ref.c:168 +#: builtin/show-ref.c:169 msgid "dereference tags into object IDs" msgstr "desreferencia les etiquetes a ID d'objecte" -#: builtin/show-ref.c:170 +#: builtin/show-ref.c:171 msgid "only show SHA1 hash using <n> digits" msgstr "mostra el hash SHA1 usant només <n> xifres" -#: builtin/show-ref.c:174 +#: builtin/show-ref.c:175 msgid "do not print results to stdout (useful with --verify)" msgstr "no imprimeixis els resultats a stdout (útil amb --verify)" -#: builtin/show-ref.c:176 +#: builtin/show-ref.c:177 msgid "show refs from stdin that aren't in local repository" msgstr "mostra les referències de stdin que no siguin en el dipòsit local" @@ -13762,39 +16019,74 @@ msgstr "" msgid "prepend comment character and space to each line" msgstr "anteposa el caràcter de comentari i un espai a cada línia" -#: builtin/submodule--helper.c:35 builtin/submodule--helper.c:1669 +#: builtin/submodule--helper.c:37 builtin/submodule--helper.c:1833 #, c-format msgid "No such ref: %s" msgstr "No hi ha tal referència: %s" -#: builtin/submodule--helper.c:42 builtin/submodule--helper.c:1678 +#: builtin/submodule--helper.c:44 builtin/submodule--helper.c:1842 #, c-format msgid "Expecting a full ref name, got %s" msgstr "S'espera un nom de referència ple, s'ha rebut %s" -#: builtin/submodule--helper.c:59 +#: builtin/submodule--helper.c:61 msgid "submodule--helper print-default-remote takes no arguments" msgstr "" -#: builtin/submodule--helper.c:96 +#: builtin/submodule--helper.c:99 #, c-format msgid "cannot strip one component off url '%s'" msgstr "no es pot despullar un component de l'url «%s»" -#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1198 +#: builtin/submodule--helper.c:407 builtin/submodule--helper.c:1356 msgid "alternative anchor for relative paths" msgstr "àncora alternativa per als camins relatius" -#: builtin/submodule--helper.c:409 +#: builtin/submodule--helper.c:412 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<camí>] [<camí>...]" -#: builtin/submodule--helper.c:460 builtin/submodule--helper.c:483 +#: builtin/submodule--helper.c:469 builtin/submodule--helper.c:606 +#: builtin/submodule--helper.c:629 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "No s'ha trobat cap url per al camí de submòdul «%s» a .gitmodules" -#: builtin/submodule--helper.c:498 +#: builtin/submodule--helper.c:521 +#, fuzzy, c-format +msgid "Entering '%s'\n" +msgstr "s'està sobreescrivint «%s»" + +#: builtin/submodule--helper.c:524 +#, c-format +msgid "" +"run_command returned non-zero status for %s\n" +"." +msgstr "" + +#: builtin/submodule--helper.c:545 +#, c-format +msgid "" +"run_command returned non-zero status while recursing in the nested " +"submodules of %s\n" +"." +msgstr "" + +#: builtin/submodule--helper.c:561 +#, fuzzy +msgid "Suppress output of entering each submodule command" +msgstr "Omet la sortida d'inicialitzar un submòdul" + +#: builtin/submodule--helper.c:563 builtin/submodule--helper.c:1040 +msgid "Recurse into nested submodules" +msgstr "Inclou recursivament els submòduls imbrincats" + +#: builtin/submodule--helper.c:568 +#, fuzzy +msgid "git submodule--helper foreach [--quiet] [--recursive] <command>" +msgstr "git submodule--helper sync [--quiet] [--recursive] [<camí>]" + +#: builtin/submodule--helper.c:644 #, c-format msgid "" "could not lookup configuration '%s'. Assuming this repository is its own " @@ -13803,109 +16095,105 @@ msgstr "" "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 +#: builtin/submodule--helper.c:655 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "S'ha produït un error en registrar l'url per al camí de submòdul «%s»" -#: builtin/submodule--helper.c:513 +#: builtin/submodule--helper.c:659 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "S'ha registrat el submòdul «%s» (%s) per al camí «%s»\n" -#: builtin/submodule--helper.c:523 +#: builtin/submodule--helper.c:669 #, 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" -#: builtin/submodule--helper.c:530 +#: builtin/submodule--helper.c:676 #, 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»" -#: builtin/submodule--helper.c:552 +#: builtin/submodule--helper.c:698 msgid "Suppress output for initializing a submodule" msgstr "Omet la sortida d'inicialitzar un submòdul" -#: builtin/submodule--helper.c:557 +#: builtin/submodule--helper.c:703 msgid "git submodule--helper init [<path>]" msgstr "git submodule--helper init [<camí>]" -#: builtin/submodule--helper.c:625 builtin/submodule--helper.c:747 +#: builtin/submodule--helper.c:775 builtin/submodule--helper.c:901 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "No s'ha trobat cap mapatge de submòdul a .gitmodules per al camí «%s»" -#: builtin/submodule--helper.c:660 +#: builtin/submodule--helper.c:814 #, c-format msgid "could not resolve HEAD ref inside the submodule '%s'" msgstr "no s'ha pogut resoldre la referència a HEAD dins del submòdul «%s»" -#: builtin/submodule--helper.c:687 builtin/submodule--helper.c:856 +#: builtin/submodule--helper.c:841 builtin/submodule--helper.c:1010 #, c-format msgid "failed to recurse into submodule '%s'" msgstr "s'ha produït un error en cercar recursivament al submòdul «%s»" -#: builtin/submodule--helper.c:711 builtin/submodule--helper.c:1021 +#: builtin/submodule--helper.c:865 builtin/submodule--helper.c:1176 msgid "Suppress submodule status output" msgstr "Suprimeix la sortida de l'estat del submòdul" -#: builtin/submodule--helper.c:712 +#: builtin/submodule--helper.c:866 msgid "" "Use commit stored in the index instead of the one stored in the submodule " "HEAD" msgstr "" -#: builtin/submodule--helper.c:713 +#: builtin/submodule--helper.c:867 msgid "recurse into nested submodules" msgstr "inclou recursivament els submòduls imbrincats" -#: builtin/submodule--helper.c:718 +#: builtin/submodule--helper.c:872 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" msgstr "git submodule status [--quiet] [--cached] [--recursive] [<camí>...]" -#: builtin/submodule--helper.c:742 +#: builtin/submodule--helper.c:896 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name <camí>" -#: builtin/submodule--helper.c:806 +#: builtin/submodule--helper.c:960 #, c-format msgid "Synchronizing submodule url for '%s'\n" msgstr "S'està sincronitzant l'url del submòdul per a «%s»\n" -#: builtin/submodule--helper.c:812 +#: builtin/submodule--helper.c:966 #, c-format 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 +#: builtin/submodule--helper.c:980 #, 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»" -#: builtin/submodule--helper.c:837 +#: builtin/submodule--helper.c:991 #, c-format msgid "failed to update remote for submodule '%s'" msgstr "s'ha produït un error en actualitzar el remot pel submòdul «%s»" -#: builtin/submodule--helper.c:885 +#: builtin/submodule--helper.c:1038 msgid "Suppress output of synchronizing submodule url" msgstr "Omet la sortida de la sincronització de l'url del submòdul" -#: builtin/submodule--helper.c:887 -msgid "Recurse into nested submodules" -msgstr "Inclou recursivament els submòduls imbrincats" - -#: builtin/submodule--helper.c:892 +#: builtin/submodule--helper.c:1045 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" msgstr "git submodule--helper sync [--quiet] [--recursive] [<camí>]" -#: builtin/submodule--helper.c:946 +#: builtin/submodule--helper.c:1099 #, c-format msgid "" "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " @@ -13914,7 +16202,7 @@ 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 +#: builtin/submodule--helper.c:1111 #, c-format msgid "" "Submodule work tree '%s' contains local modifications; use '-f' to discard " @@ -13923,82 +16211,82 @@ msgstr "" "L'arbre de treball del submòdul «%s» conté modificacions locals; useu '-f' " "per a descartar-les" -#: builtin/submodule--helper.c:966 +#: builtin/submodule--helper.c:1119 #, c-format msgid "Cleared directory '%s'\n" msgstr "S'ha netejat el directori «%s»\n" -#: builtin/submodule--helper.c:968 +#: builtin/submodule--helper.c:1121 #, c-format msgid "Could not remove submodule work tree '%s'\n" msgstr "No s'ha pogut eliminar l'arbre de treball de submòdul «%s»\n" -#: builtin/submodule--helper.c:977 +#: builtin/submodule--helper.c:1132 #, c-format 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 +#: builtin/submodule--helper.c:1148 #, c-format msgid "Submodule '%s' (%s) unregistered for path '%s'\n" msgstr "S'ha desregistrat el submòdul «%s» (%s) per al camí «%s»\n" -#: builtin/submodule--helper.c:1022 +#: builtin/submodule--helper.c:1177 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" -#: builtin/submodule--helper.c:1023 +#: builtin/submodule--helper.c:1178 msgid "Unregister all submodules" msgstr "Desregistra recursivament tots els submòduls" -#: builtin/submodule--helper.c:1028 +#: builtin/submodule--helper.c:1183 msgid "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" msgstr "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<camí>...]]" -#: builtin/submodule--helper.c:1042 +#: builtin/submodule--helper.c:1197 msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "Useu '--all' si realment voleu desinicialitzar tots els submòduls" -#: builtin/submodule--helper.c:1133 builtin/submodule--helper.c:1136 +#: builtin/submodule--helper.c:1290 builtin/submodule--helper.c:1293 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "el submòdul «%s» no pot afegir un alternatiu: %s" -#: builtin/submodule--helper.c:1172 +#: builtin/submodule--helper.c:1329 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "No es reconeix el valor «%s» per a submodule.alternateErrorStrategy" -#: builtin/submodule--helper.c:1179 +#: builtin/submodule--helper.c:1336 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "No es reconeix el valor «%s» per a submodule.alternateLocation" -#: builtin/submodule--helper.c:1201 +#: builtin/submodule--helper.c:1359 msgid "where the new submodule will be cloned to" msgstr "a on es clonarà el submòdul nou" -#: builtin/submodule--helper.c:1204 +#: builtin/submodule--helper.c:1362 msgid "name of the new submodule" msgstr "nom del submòdul nou" -#: builtin/submodule--helper.c:1207 +#: builtin/submodule--helper.c:1365 msgid "url where to clone the submodule from" msgstr "url del qual clonar el submòdul" -#: builtin/submodule--helper.c:1213 +#: builtin/submodule--helper.c:1373 msgid "depth for shallow clones" msgstr "profunditat dels clons superficials" -#: builtin/submodule--helper.c:1216 builtin/submodule--helper.c:1587 +#: builtin/submodule--helper.c:1376 builtin/submodule--helper.c:1751 msgid "force cloning progress" msgstr "força el progrés del clonatge" -#: builtin/submodule--helper.c:1221 +#: builtin/submodule--helper.c:1381 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" @@ -14006,82 +16294,82 @@ msgstr "" "git submodule--helper clone [--prefix=<camí>] [--quiet] [--reference " "<dipòsit>] [--name <nom>] [--depth <profunditat>] --url <url> --path <camí>" -#: builtin/submodule--helper.c:1252 +#: builtin/submodule--helper.c:1412 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "el clonatge de «%s» al camí de submòdul «%s» ha fallat" -#: builtin/submodule--helper.c:1267 +#: builtin/submodule--helper.c:1426 #, c-format msgid "could not get submodule directory for '%s'" msgstr "no s'ha pogut obtenir el directori de submòdul per a «%s»" -#: builtin/submodule--helper.c:1332 +#: builtin/submodule--helper.c:1492 #, c-format msgid "Submodule path '%s' not initialized" msgstr "El camí de submòdul «%s» no està inicialitzat" -#: builtin/submodule--helper.c:1336 +#: builtin/submodule--helper.c:1496 msgid "Maybe you want to use 'update --init'?" msgstr "Potser voleu usar 'update --init'?" -#: builtin/submodule--helper.c:1365 +#: builtin/submodule--helper.c:1525 #, c-format msgid "Skipping unmerged submodule %s" msgstr "S'està ometent el submòdul no fusionat %s" -#: builtin/submodule--helper.c:1394 +#: builtin/submodule--helper.c:1554 #, c-format msgid "Skipping submodule '%s'" msgstr "S'està ometent el submòdul «%s»" -#: builtin/submodule--helper.c:1527 +#: builtin/submodule--helper.c:1689 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "S'ha produït un error en clonar «%s». S'ha programat un reintent" -#: builtin/submodule--helper.c:1538 +#: builtin/submodule--helper.c:1700 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "S'ha produït un error per segon cop en clonar «%s», s'està avortant" -#: builtin/submodule--helper.c:1568 builtin/submodule--helper.c:1788 +#: builtin/submodule--helper.c:1730 builtin/submodule--helper.c:1953 msgid "path into the working tree" msgstr "camí a l'arbre de treball" -#: builtin/submodule--helper.c:1571 +#: builtin/submodule--helper.c:1733 msgid "path into the working tree, across nested submodule boundaries" msgstr "camí a l'arbre de treball, a través de fronteres de submòduls niats" -#: builtin/submodule--helper.c:1575 +#: builtin/submodule--helper.c:1737 msgid "rebase, merge, checkout or none" msgstr "rebase, merge, checkout o none" -#: builtin/submodule--helper.c:1579 +#: builtin/submodule--helper.c:1743 msgid "Create a shallow clone truncated to the specified number of revisions" msgstr "Crea un clon superficial truncat al nombre de revisions especificat" -#: builtin/submodule--helper.c:1582 +#: builtin/submodule--helper.c:1746 msgid "parallel jobs" msgstr "tasques paral·leles" -#: builtin/submodule--helper.c:1584 +#: builtin/submodule--helper.c:1748 msgid "whether the initial clone should follow the shallow recommendation" msgstr "si el clonatge inicial ha de seguir la recomanació de superficialitat" -#: builtin/submodule--helper.c:1585 +#: builtin/submodule--helper.c:1749 msgid "don't print cloning progress" msgstr "no imprimeixis el progrés del clonatge" -#: builtin/submodule--helper.c:1592 +#: builtin/submodule--helper.c:1756 msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" msgstr "git submodule--helper update_clone [--prefix=<camí>] [<camí>...]" -#: builtin/submodule--helper.c:1605 +#: builtin/submodule--helper.c:1769 msgid "bad value for update parameter" msgstr "valor incorrecte per al paràmetre update" -#: builtin/submodule--helper.c:1673 +#: builtin/submodule--helper.c:1837 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " @@ -14090,20 +16378,20 @@ msgstr "" "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 +#: builtin/submodule--helper.c:1954 msgid "recurse into submodules" msgstr "inclou recursivament als submòduls" -#: builtin/submodule--helper.c:1795 +#: builtin/submodule--helper.c:1960 msgid "git submodule--helper embed-git-dir [<path>...]" msgstr "git submodule--helper embed-git-dir [<camí>...]" -#: builtin/submodule--helper.c:1857 +#: builtin/submodule--helper.c:2071 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s no admet --super-prefix" -#: builtin/submodule--helper.c:1863 +#: builtin/submodule--helper.c:2077 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "«%s» no és una subordre vàlida de submodule--helper" @@ -14128,15 +16416,15 @@ msgstr "suprimeix la referència simbòlica" msgid "shorten ref output" msgstr "escurça la sortida de referències" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363 msgid "reason" msgstr "raó" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363 msgid "reason of the update" msgstr "raó de l'actualització" -#: builtin/tag.c:24 +#: builtin/tag.c:25 msgid "" "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> " "[<head>]" @@ -14144,11 +16432,11 @@ msgstr "" "git tag [-a | -s | -u <id-de-clau>] [-f] [-m <missatge> | -F <fitxer>] <nom-" "d'etiqueta> [<cap>]" -#: builtin/tag.c:25 +#: builtin/tag.c:26 msgid "git tag -d <tagname>..." msgstr "git tag -d <nom-d'etiqueta>..." -#: builtin/tag.c:26 +#: builtin/tag.c:27 msgid "" "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--" "points-at <object>]\n" @@ -14158,21 +16446,21 @@ msgstr "" "[--points-at <objecte>]\n" "\t\t[--format=<format>] [--[no-]merged [<comissió>]] [<patró>...]" -#: builtin/tag.c:28 +#: builtin/tag.c:29 msgid "git tag -v [--format=<format>] <tagname>..." msgstr "git tag -v [--format=<format>] <nom-d'etiqueta>..." -#: builtin/tag.c:86 +#: builtin/tag.c:87 #, c-format msgid "tag '%s' not found." msgstr "no s'ha trobat l'etiqueta «%s»." -#: builtin/tag.c:102 +#: builtin/tag.c:103 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "S'ha suprimit l'etiqueta «%s» (era %s)\n" -#: builtin/tag.c:131 +#: builtin/tag.c:133 #, c-format msgid "" "\n" @@ -14185,7 +16473,7 @@ msgstr "" " %s\n" "Les línies que comencin amb '%c' s'ignoraran.\n" -#: builtin/tag.c:135 +#: builtin/tag.c:137 #, c-format msgid "" "\n" @@ -14200,151 +16488,151 @@ msgstr "" "Les línies que comencin amb '%c' es retindran; podeu eliminar-les per vós " "mateix si voleu.\n" -#: builtin/tag.c:189 +#: builtin/tag.c:191 msgid "unable to sign the tag" msgstr "no s'ha pogut signar l'etiqueta" -#: builtin/tag.c:191 +#: builtin/tag.c:193 msgid "unable to write tag file" msgstr "no s'ha pogut escriure el fitxer d'etiqueta" -#: builtin/tag.c:216 +#: builtin/tag.c:218 msgid "bad object type." msgstr "el tipus d'objecte és incorrecte." -#: builtin/tag.c:265 +#: builtin/tag.c:267 msgid "no tag message?" msgstr "no hi ha cap missatge d'etiqueta?" -#: builtin/tag.c:272 +#: builtin/tag.c:274 #, c-format msgid "The tag message has been left in %s\n" msgstr "S'ha deixat el missatge de l'etiqueta en %s\n" -#: builtin/tag.c:381 +#: builtin/tag.c:383 msgid "list tag names" msgstr "llista els noms d'etiqueta" -#: builtin/tag.c:383 +#: builtin/tag.c:385 msgid "print <n> lines of each tag message" msgstr "imprimeix <n> línies de cada missatge d'etiqueta" -#: builtin/tag.c:385 +#: builtin/tag.c:387 msgid "delete tags" msgstr "suprimeix les etiquetes" -#: builtin/tag.c:386 +#: builtin/tag.c:388 msgid "verify tags" msgstr "verifica les etiquetes" -#: builtin/tag.c:388 +#: builtin/tag.c:390 msgid "Tag creation options" msgstr "Opcions de creació d'etiquetes" -#: builtin/tag.c:390 +#: builtin/tag.c:392 msgid "annotated tag, needs a message" msgstr "etiqueta anotada, necessita un missatge" -#: builtin/tag.c:392 +#: builtin/tag.c:394 msgid "tag message" msgstr "missatge d'etiqueta" -#: builtin/tag.c:394 +#: builtin/tag.c:396 msgid "force edit of tag message" msgstr "força l'edició del missatge de l'etiqueta" -#: builtin/tag.c:395 +#: builtin/tag.c:397 msgid "annotated and GPG-signed tag" msgstr "etiqueta anotada i signada per GPG" -#: builtin/tag.c:399 +#: builtin/tag.c:401 msgid "use another key to sign the tag" msgstr "usa una altra clau per a signar l'etiqueta" -#: builtin/tag.c:400 +#: builtin/tag.c:402 msgid "replace the tag if exists" msgstr "reemplaça l'etiqueta si existeix" -#: builtin/tag.c:401 builtin/update-ref.c:368 +#: builtin/tag.c:403 builtin/update-ref.c:369 msgid "create a reflog" msgstr "crea un registre de referències" -#: builtin/tag.c:403 +#: builtin/tag.c:405 msgid "Tag listing options" msgstr "Opcions de llistat d'etiquetes" -#: builtin/tag.c:404 +#: builtin/tag.c:406 msgid "show tag list in columns" msgstr "mostra la llista d'etiquetes en columnes" -#: builtin/tag.c:405 builtin/tag.c:407 +#: builtin/tag.c:407 builtin/tag.c:409 msgid "print only tags that contain the commit" msgstr "imprimeix només les etiquetes que continguin la comissió" -#: builtin/tag.c:406 builtin/tag.c:408 +#: builtin/tag.c:408 builtin/tag.c:410 msgid "print only tags that don't contain the commit" msgstr "imprimeix només les etiquetes que no continguin la comissió" -#: builtin/tag.c:409 +#: builtin/tag.c:411 msgid "print only tags that are merged" msgstr "imprimeix només les etiquetes que s'han fusionat" -#: builtin/tag.c:410 +#: builtin/tag.c:412 msgid "print only tags that are not merged" msgstr "imprimeix només les etiquetes que no s'han fusionat" -#: builtin/tag.c:415 +#: builtin/tag.c:417 msgid "print only tags of the object" msgstr "imprimeix només les etiquetes de l'objecte" -#: builtin/tag.c:459 +#: builtin/tag.c:461 msgid "--column and -n are incompatible" msgstr "--column i -n són incompatibles" -#: builtin/tag.c:481 +#: builtin/tag.c:483 msgid "-n option is only allowed in list mode" msgstr "es permet l'opció -n només amb mode llista" -#: builtin/tag.c:483 +#: builtin/tag.c:485 msgid "--contains option is only allowed in list mode" msgstr "es permet l'opció --contains només amb mode llista" -#: builtin/tag.c:485 +#: builtin/tag.c:487 msgid "--no-contains option is only allowed in list mode" msgstr "es permet l'opció --no-contains només amb mode llista" -#: builtin/tag.c:487 +#: builtin/tag.c:489 msgid "--points-at option is only allowed in list mode" msgstr "es permet --points-at option només amb mode llista" -#: builtin/tag.c:489 +#: builtin/tag.c:491 msgid "--merged and --no-merged options are only allowed in list mode" msgstr "es permeten les opcions --merged i --no-merged només amb mode llista" -#: builtin/tag.c:500 +#: builtin/tag.c:502 msgid "only one -F or -m option is allowed." msgstr "només es permet una opció -F o -m." -#: builtin/tag.c:519 +#: builtin/tag.c:521 msgid "too many params" msgstr "massa paràmetres" -#: builtin/tag.c:525 +#: builtin/tag.c:527 #, c-format msgid "'%s' is not a valid tag name." msgstr "«%s» no és un nom d'etiqueta vàlid." -#: builtin/tag.c:530 +#: builtin/tag.c:532 #, c-format msgid "tag '%s' already exists" msgstr "l'etiqueta «%s» ja existeix" -#: builtin/tag.c:561 +#: builtin/tag.c:563 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "Etiqueta «%s» actualitzada (era %s)\n" -#: builtin/unpack-objects.c:498 +#: builtin/unpack-objects.c:500 msgid "Unpacking objects" msgstr "S'estan desempaquetant els objectes" @@ -14353,11 +16641,6 @@ msgstr "S'estan desempaquetant els objectes" msgid "failed to create directory %s" msgstr "s'ha produït un error en crear el directori %s" -#: builtin/update-index.c:88 -#, c-format -msgid "failed to stat %s" -msgstr "s'ha produït un error en fer stat a %s" - #: builtin/update-index.c:98 #, c-format msgid "failed to create file %s" @@ -14413,148 +16696,148 @@ msgstr "" msgid " OK" msgstr " D'acord" -#: builtin/update-index.c:579 +#: builtin/update-index.c:588 msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [<opcions>] [--] [<fitxer>...]" -#: builtin/update-index.c:936 +#: builtin/update-index.c:944 msgid "continue refresh even when index needs update" msgstr "" "continua l'actualització encara que l'índex necessiti una actualització" -#: builtin/update-index.c:939 +#: builtin/update-index.c:947 msgid "refresh: ignore submodules" msgstr "actualitza: ignora els submòduls" -#: builtin/update-index.c:942 +#: builtin/update-index.c:950 msgid "do not ignore new files" msgstr "no ignoris els fitxers nous" -#: builtin/update-index.c:944 +#: builtin/update-index.c:952 msgid "let files replace directories and vice-versa" msgstr "deixa que els fitxers reemplacin els directoris i viceversa" -#: builtin/update-index.c:946 +#: builtin/update-index.c:954 msgid "notice files missing from worktree" msgstr "tingues en compte els fitxers absents de l'arbre de treball" -#: builtin/update-index.c:948 +#: builtin/update-index.c:956 msgid "refresh even if index contains unmerged entries" msgstr "actualitza encara que l'índex contingui entrades no fusionades" -#: builtin/update-index.c:951 +#: builtin/update-index.c:959 msgid "refresh stat information" msgstr "actualitza la informació d'estadístiques" -#: builtin/update-index.c:955 +#: builtin/update-index.c:963 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "com --refresh, però ignora el paràmetre assume-unchanged" -#: builtin/update-index.c:959 +#: builtin/update-index.c:967 msgid "<mode>,<object>,<path>" msgstr "<mode>,<objecte>,<camí>" -#: builtin/update-index.c:960 +#: builtin/update-index.c:968 msgid "add the specified entry to the index" msgstr "afegeix l'entrada especificada a l'índex" -#: builtin/update-index.c:969 +#: builtin/update-index.c:977 msgid "mark files as \"not changing\"" msgstr "marca els fitxers com a \"no canviant\"" -#: builtin/update-index.c:972 +#: builtin/update-index.c:980 msgid "clear assumed-unchanged bit" msgstr "neteja el bit assumed-unchanged" -#: builtin/update-index.c:975 +#: builtin/update-index.c:983 msgid "mark files as \"index-only\"" msgstr "marca els fitxers com a \"només índex\"" -#: builtin/update-index.c:978 +#: builtin/update-index.c:986 msgid "clear skip-worktree bit" msgstr "neteja el bit skip-worktree" -#: builtin/update-index.c:981 +#: builtin/update-index.c:989 msgid "add to index only; do not add content to object database" msgstr "" "només afegeix a l'índex; no afegeixis el contingut a la base de dades " "d'objectes" -#: builtin/update-index.c:983 +#: builtin/update-index.c:991 msgid "remove named paths even if present in worktree" msgstr "" "elimina els camins anomenats encara que estiguin presents en l'arbre de " "treball" -#: builtin/update-index.c:985 +#: builtin/update-index.c:993 msgid "with --stdin: input lines are terminated by null bytes" msgstr "amb --stdin: les línies d'entrada acaben amb octets nuls" -#: builtin/update-index.c:987 +#: builtin/update-index.c:995 msgid "read list of paths to be updated from standard input" msgstr "llegeix la llista de camins a actualitzar des de l'entrada estàndard" -#: builtin/update-index.c:991 +#: builtin/update-index.c:999 msgid "add entries from standard input to the index" msgstr "afegeix les entrades de l'entrada estàndard a l'índex" -#: builtin/update-index.c:995 +#: builtin/update-index.c:1003 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "reemplena les «stage» #2 i #3 per als camins llistats" -#: builtin/update-index.c:999 +#: builtin/update-index.c:1007 msgid "only update entries that differ from HEAD" msgstr "només actualitza les entrades que difereixin de HEAD" -#: builtin/update-index.c:1003 +#: builtin/update-index.c:1011 msgid "ignore files missing from worktree" msgstr "ignora els fitxers absents de l'arbre de treball" -#: builtin/update-index.c:1006 +#: builtin/update-index.c:1014 msgid "report actions to standard output" msgstr "informa de les accions en la sortida estàndard" -#: builtin/update-index.c:1008 +#: builtin/update-index.c:1016 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(per a porcellanes) oblida't dels conflictes no resolts ni desats" -#: builtin/update-index.c:1012 +#: builtin/update-index.c:1020 msgid "write index in this format" msgstr "escriu l'índex en aquest format" -#: builtin/update-index.c:1014 +#: builtin/update-index.c:1022 msgid "enable or disable split index" msgstr "habilita o inhabilita l'índex dividit" -#: builtin/update-index.c:1016 +#: builtin/update-index.c:1024 msgid "enable/disable untracked cache" msgstr "habilita/inhabilita la memòria cau no seguida" -#: builtin/update-index.c:1018 +#: builtin/update-index.c:1026 msgid "test if the filesystem supports untracked cache" msgstr "prova si el sistema de fitxers admet la memòria cau no seguida" -#: builtin/update-index.c:1020 +#: builtin/update-index.c:1028 msgid "enable untracked cache without testing the filesystem" msgstr "habilita la memòria cau no seguida sense provar el sistema de fitxers" -#: builtin/update-index.c:1022 +#: builtin/update-index.c:1030 msgid "write out the index even if is not flagged as changed" msgstr "" -#: builtin/update-index.c:1024 +#: builtin/update-index.c:1032 msgid "enable or disable file system monitor" msgstr "habilita o inhabilita el monitor del sistema de fitxers" -#: builtin/update-index.c:1026 +#: builtin/update-index.c:1034 msgid "mark files as fsmonitor valid" msgstr "marca els fitxers com a vàlids pel fsmonitor" -#: builtin/update-index.c:1029 +#: builtin/update-index.c:1037 msgid "clear fsmonitor valid bit" msgstr "neteja el bit de validesa del fsmonitor" -#: builtin/update-index.c:1127 +#: builtin/update-index.c:1136 msgid "" "core.splitIndex is set to false; remove or change it, if you really want to " "enable split index" @@ -14562,7 +16845,7 @@ msgstr "" "core.splitIndex està establert a fals; elimineu-lo o canviar-lo, si realment " "voleu habilitar l'índex dividit" -#: builtin/update-index.c:1136 +#: builtin/update-index.c:1145 msgid "" "core.splitIndex is set to true; remove or change it, if you really want to " "disable split index" @@ -14570,7 +16853,7 @@ msgstr "" "core.splitIndex està establert a cert; elimineu-lo o canvieu-lo, si realment " "voleu inhabilitar l'índex dividit" -#: builtin/update-index.c:1147 +#: builtin/update-index.c:1156 msgid "" "core.untrackedCache is set to true; remove or change it, if you really want " "to disable the untracked cache" @@ -14578,11 +16861,11 @@ msgstr "" "core.untrackedCache està establert a cert; elimineu-lo o canvieu-lo, si " "realment voleu inhabilitar el cau no seguit" -#: builtin/update-index.c:1151 +#: builtin/update-index.c:1160 msgid "Untracked cache disabled" msgstr "La memòria cau no seguida està inhabilitada" -#: builtin/update-index.c:1159 +#: builtin/update-index.c:1168 msgid "" "core.untrackedCache is set to false; remove or change it, if you really want " "to enable the untracked cache" @@ -14590,29 +16873,29 @@ msgstr "" "core.untrackedCache està establert a fals; elimineu-lo o canviar-lo, si " "realment voleu habilitar el cau no seguit" -#: builtin/update-index.c:1163 +#: builtin/update-index.c:1172 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "La memòria cau no seguida està habilitada per a «%s»" -#: builtin/update-index.c:1171 +#: builtin/update-index.c:1180 msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor" msgstr "" "core.fsmonitor està establert a fals; establiu-lo a cert si realment voleu " "habilitar fsmonitor" -#: builtin/update-index.c:1175 +#: builtin/update-index.c:1184 msgid "fsmonitor enabled" msgstr "fsmonitor habilitat" -#: builtin/update-index.c:1178 +#: builtin/update-index.c:1187 msgid "" "core.fsmonitor is set; remove it if you really want to disable fsmonitor" msgstr "" "core.fsmonitor està establert a cert; elimineu-lo si realment voleu " "inhabilitar fsmonitor" -#: builtin/update-index.c:1182 +#: builtin/update-index.c:1191 msgid "fsmonitor disabled" msgstr "fsmonitor inhabilitat" @@ -14629,19 +16912,19 @@ msgstr "" msgid "git update-ref [<options>] --stdin [-z]" msgstr "git update-ref [<opcions>] --stdin [-z]" -#: builtin/update-ref.c:363 +#: builtin/update-ref.c:364 msgid "delete the reference" msgstr "suprimeix la referència" -#: builtin/update-ref.c:365 +#: builtin/update-ref.c:366 msgid "update <refname> not the one it points to" msgstr "actualitza <nom de referència>, no la que assenyali" -#: builtin/update-ref.c:366 +#: builtin/update-ref.c:367 msgid "stdin has NUL-terminated arguments" msgstr "stdin té paràmetres acabats amb NUL" -#: builtin/update-ref.c:367 +#: builtin/update-ref.c:368 msgid "read updates from stdin" msgstr "llegeix les actualitzacions des de stdin" @@ -14653,15 +16936,32 @@ msgstr "git update-server-info [--force]" msgid "update the info files from scratch" msgstr "actualitza els fitxers d'informació des de zero" -#: builtin/verify-commit.c:18 +#: builtin/upload-pack.c:11 +msgid "git upload-pack [<options>] <dir>" +msgstr "git upload-pack [<opcions>] <directori>" + +#: builtin/upload-pack.c:25 +msgid "exit immediately after initial ref advertisement" +msgstr "surt immediatament després de l'anunci inicial de referència" + +#: builtin/upload-pack.c:27 +msgid "do not try <directory>/.git/ if <directory> is no Git directory" +msgstr "" +"no intentis <directori>/.git/ si <directori> no és cap directori del Git" + +#: builtin/upload-pack.c:29 +msgid "interrupt transfer after <n> seconds of inactivity" +msgstr "interromp la transferència després de <n> segons d'inactivitat" + +#: builtin/verify-commit.c:20 msgid "git verify-commit [-v | --verbose] <commit>..." msgstr "git verify-commit [-v | --verbose] <comissió>..." -#: builtin/verify-commit.c:73 +#: builtin/verify-commit.c:76 msgid "print commit contents" msgstr "imprimeix els continguts de la comissió" -#: builtin/verify-commit.c:74 builtin/verify-tag.c:38 +#: builtin/verify-commit.c:77 builtin/verify-tag.c:38 msgid "print raw gpg status output" msgstr "imprimeix la sortida crua de l'estat gpg" @@ -14713,22 +17013,22 @@ msgstr "git worktree lock [<opcions>] <arbre de treball>" msgid "git worktree unlock <path>" msgstr "git worktree unlock <camí>" -#: builtin/worktree.c:60 +#: builtin/worktree.c:59 #, c-format msgid "Removing worktrees/%s: not a valid directory" msgstr "Eliminació de worktrees/%s: no és un directori vàlid" -#: builtin/worktree.c:66 +#: builtin/worktree.c:65 #, c-format msgid "Removing worktrees/%s: gitdir file does not exist" msgstr "Eliminació de worktrees/%s: el fitxer gitdir no existeix" -#: builtin/worktree.c:71 builtin/worktree.c:80 +#: builtin/worktree.c:70 builtin/worktree.c:79 #, c-format msgid "Removing worktrees/%s: unable to read gitdir file (%s)" msgstr "Eliminació de worktrees/%s: no s'ha pogut llegir el fitxer gitdir (%s)" -#: builtin/worktree.c:90 +#: builtin/worktree.c:89 #, c-format msgid "" "Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read " @@ -14737,183 +17037,198 @@ msgstr "" "S'estan suprimint els arbres de treball/%s: lectura curta (s'esperaven " "%<PRIuMAX> bytes, llegits %<PRIuMAX>)" -#: builtin/worktree.c:98 +#: builtin/worktree.c:97 #, c-format msgid "Removing worktrees/%s: invalid gitdir file" msgstr "Eliminació de worktrees/%s: fitxer gitdir no vàlid" -#: builtin/worktree.c:114 +#: builtin/worktree.c:106 #, 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" -#: builtin/worktree.c:161 +#: builtin/worktree.c:153 msgid "report pruned working trees" msgstr "informa dels arbres de treball podats" -#: builtin/worktree.c:163 +#: builtin/worktree.c:155 msgid "expire working trees older than <time>" msgstr "fes caducar els arbres de treball més vells que <hora>" -#: builtin/worktree.c:238 +#: builtin/worktree.c:230 #, c-format msgid "'%s' already exists" msgstr "«%s» ja existeix" -#: builtin/worktree.c:269 +#: builtin/worktree.c:261 #, c-format msgid "could not create directory of '%s'" msgstr "no s'ha pogut crear directori de «%s»" -#: builtin/worktree.c:308 +#: builtin/worktree.c:380 builtin/worktree.c:386 +#, fuzzy, c-format +msgid "Preparing worktree (new branch '%s')" +msgstr "Error en suprimir la branca «%s»" + +#: builtin/worktree.c:382 +#, c-format +msgid "Preparing worktree (resetting branch '%s'; was at %s)" +msgstr "" + +#: builtin/worktree.c:391 #, c-format -msgid "Preparing %s (identifier %s)" +msgid "Preparing worktree (checking out '%s')" +msgstr "" + +#: builtin/worktree.c:397 +#, fuzzy, c-format +msgid "Preparing worktree (detached HEAD %s)" msgstr "S'està preparant %s (identificador %s)" -#: builtin/worktree.c:385 +#: builtin/worktree.c:438 msgid "checkout <branch> even if already checked out in other worktree" msgstr "agafa <branca> encara que sigui agafada en altre arbre de treball" -#: builtin/worktree.c:388 +#: builtin/worktree.c:441 msgid "create a new branch" msgstr "crea una branca nova" -#: builtin/worktree.c:390 +#: builtin/worktree.c:443 msgid "create or reset a branch" msgstr "crea o restableix una branca" -#: builtin/worktree.c:392 +#: builtin/worktree.c:445 msgid "populate the new working tree" msgstr "emplena l'arbre de treball nou" -#: builtin/worktree.c:393 +#: builtin/worktree.c:446 msgid "keep the new working tree locked" msgstr "mantén l'arbre de treball nou bloquejat" -#: builtin/worktree.c:395 +#: builtin/worktree.c:449 msgid "set up tracking mode (see git-branch(1))" msgstr "configura el mode de seguiment (vegeu git-branch(1))" -#: builtin/worktree.c:398 +#: builtin/worktree.c:452 #, fuzzy msgid "try to match the new branch name with a remote-tracking branch" msgstr "la branca font «%s» no s'emmagatzema com a branca amb seguiment remot" -#: builtin/worktree.c:406 +#: builtin/worktree.c:460 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b, -B i --detach són mútuament excloents" -#: builtin/worktree.c:471 +#: builtin/worktree.c:521 #, fuzzy msgid "--[no-]track can only be used if a new branch is created" msgstr "--local només es pot usar dins d'un dipòsit git" -#: builtin/worktree.c:571 +#: builtin/worktree.c:621 msgid "reason for locking" msgstr "raó per bloquejar" -#: builtin/worktree.c:583 builtin/worktree.c:616 builtin/worktree.c:670 -#: builtin/worktree.c:809 +#: builtin/worktree.c:633 builtin/worktree.c:666 builtin/worktree.c:720 +#: builtin/worktree.c:860 #, c-format msgid "'%s' is not a working tree" msgstr "«%s» no és un arbre de treball" -#: builtin/worktree.c:585 builtin/worktree.c:618 +#: builtin/worktree.c:635 builtin/worktree.c:668 msgid "The main working tree cannot be locked or unlocked" msgstr "No es pot bloquejar ni desbloquejar l'arbre de treball principal" -#: builtin/worktree.c:590 +#: builtin/worktree.c:640 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "«%s» ja està bloquejat, raó: «%s»" -#: builtin/worktree.c:592 +#: builtin/worktree.c:642 #, c-format msgid "'%s' is already locked" msgstr "«%s» ja està bloquejat" -#: builtin/worktree.c:620 +#: builtin/worktree.c:670 #, c-format msgid "'%s' is not locked" msgstr "«%s» no està bloquejat" -#: builtin/worktree.c:645 +#: builtin/worktree.c:695 msgid "working trees containing submodules cannot be moved or removed" msgstr "" -#: builtin/worktree.c:672 builtin/worktree.c:811 +#: builtin/worktree.c:722 builtin/worktree.c:862 #, c-format msgid "'%s' is a main working tree" msgstr "«%s» és un arbre de treball principal" -#: builtin/worktree.c:677 +#: builtin/worktree.c:727 #, c-format msgid "could not figure out destination name from '%s'" msgstr "no s'ha pogut deduir el nom de destí des de «%s»" -#: builtin/worktree.c:683 +#: builtin/worktree.c:733 #, c-format msgid "target '%s' already exists" msgstr "el destí «%s» ja existeix" -#: builtin/worktree.c:690 +#: builtin/worktree.c:740 #, fuzzy, c-format msgid "cannot move a locked working tree, lock reason: %s" msgstr "No es poden eliminar els canvis de l'arbre de treball" -#: builtin/worktree.c:692 +#: builtin/worktree.c:742 #, fuzzy msgid "cannot move a locked working tree" msgstr "No es pot registrar l'estat de l'arbre de treball" -#: builtin/worktree.c:695 +#: builtin/worktree.c:745 #, c-format msgid "validation failed, cannot move working tree: %s" msgstr "" -#: builtin/worktree.c:700 +#: builtin/worktree.c:750 #, c-format msgid "failed to move '%s' to '%s'" msgstr "s'ha produït un error en moure «%s» a «%s»" -#: builtin/worktree.c:748 +#: builtin/worktree.c:798 #, fuzzy, c-format msgid "failed to run 'git status' on '%s'" msgstr "no s'ha pogut escriure a «%s»" -#: builtin/worktree.c:752 +#: builtin/worktree.c:802 #, c-format msgid "'%s' is dirty, use --force to delete it" msgstr "" -#: builtin/worktree.c:757 +#: builtin/worktree.c:807 #, fuzzy, c-format msgid "failed to run 'git status' on '%s', code %d" msgstr "no s'ha pogut executar 'git status' al submòdul «%s»" -#: builtin/worktree.c:768 builtin/worktree.c:782 +#: builtin/worktree.c:818 builtin/worktree.c:832 #, fuzzy, c-format msgid "failed to delete '%s'" msgstr "s'ha produït un error en executar «%s»" -#: builtin/worktree.c:794 +#: builtin/worktree.c:844 #, fuzzy msgid "force removing even if the worktree is dirty" msgstr "força el moviment / canvi de nom encara que el destí existeixi" -#: builtin/worktree.c:815 +#: builtin/worktree.c:866 #, fuzzy, c-format msgid "cannot remove a locked working tree, lock reason: %s" msgstr "No es poden eliminar els canvis de l'arbre de treball" -#: builtin/worktree.c:817 +#: builtin/worktree.c:868 #, fuzzy msgid "cannot remove a locked working tree" msgstr "No es pot registrar l'estat de l'arbre de treball" -#: builtin/worktree.c:820 +#: builtin/worktree.c:871 #, c-format msgid "validation failed, cannot remove working tree: %s" msgstr "" @@ -14930,31 +17245,10 @@ msgstr "<prefix>/" msgid "write tree object for a subdirectory <prefix>" msgstr "escriu l'objecte d'arbre per a un subdirectori <prefix>" -#: builtin/write-tree.c:31 +#: builtin/write-tree.c:30 msgid "only useful for debugging" msgstr "només útil per a la depuració" -#: upload-pack.c:27 -msgid "git upload-pack [<options>] <dir>" -msgstr "git upload-pack [<opcions>] <directori>" - -#: upload-pack.c:1070 -msgid "quit after a single request/response exchange" -msgstr "surt després d'un sol intercanvi de sol·licitud/resposta" - -#: upload-pack.c:1072 -msgid "exit immediately after initial ref advertisement" -msgstr "surt immediatament després de l'anunci inicial de referència" - -#: upload-pack.c:1074 -msgid "do not try <directory>/.git/ if <directory> is no Git directory" -msgstr "" -"no intentis <directori>/.git/ si <directori> no és cap directori del Git" - -#: upload-pack.c:1076 -msgid "interrupt transfer after <n> seconds of inactivity" -msgstr "interromp la transferència després de <n> segons d'inactivitat" - #: credential-cache--daemon.c:222 #, c-format msgid "" @@ -14973,16 +17267,17 @@ msgstr "" msgid "print debugging messages to stderr" msgstr "imprimeix els missatges de depuració a stderr" -#: git.c:8 +#: git.c:27 msgid "" "git [--version] [--help] [-C <path>] [-c <name>=<value>]\n" " [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n" -" [-p | --paginate | --no-pager] [--no-replace-objects] [--bare]\n" +" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--" +"bare]\n" " [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n" " <command> [<args>]" msgstr "" -#: git.c:15 +#: git.c:34 msgid "" "'git help -a' and 'git help -g' list available subcommands and some\n" "concept guides. See 'git help <command>' or 'git help <concept>'\n" @@ -14992,65 +17287,65 @@ msgstr "" "algunes guies de concepte. Vegeu 'git help <ordre>' o\n" "'git help <concepte>' per a llegir sobre una subordre o concepte específic." -#: git.c:95 +#: git.c:173 #, c-format msgid "no directory given for --git-dir\n" msgstr "no s'ha especificat un directori per --git-dir\n" -#: git.c:109 +#: git.c:187 #, c-format msgid "no namespace given for --namespace\n" msgstr "no s'ha especificat un nom d'espai per --namespace\n" -#: git.c:123 +#: git.c:201 #, c-format msgid "no directory given for --work-tree\n" msgstr "no s'ha especificat un directori per --work-tree\n" -#: git.c:137 +#: git.c:215 #, fuzzy, c-format msgid "no prefix given for --super-prefix\n" msgstr "%s no admet --super-prefix" -#: git.c:159 +#: git.c:237 #, c-format msgid "-c expects a configuration string\n" msgstr "-c espera una cadena de configuració\n" -#: git.c:197 +#: git.c:275 #, c-format msgid "no directory given for -C\n" msgstr "no s'ha especificat un directori per -C\n" -#: git.c:212 +#: git.c:300 #, c-format msgid "unknown option: %s\n" msgstr "opció desconeguda: %s\n" -#: git.c:687 +#: git.c:770 #, c-format msgid "expansion of alias '%s' failed; '%s' is not a git command\n" msgstr "" -#: git.c:699 +#: git.c:782 #, fuzzy, c-format msgid "failed to run command '%s': %s\n" msgstr "s'ha produït un error en obrir «%s»: %s" -#: http.c:342 +#: http.c:348 #, c-format msgid "negative value for http.postbuffer; defaulting to %d" msgstr "valor negatiu per http.postbuffer; utilitzant el valor %d" -#: http.c:363 +#: http.c:369 msgid "Delegation control is not supported with cURL < 7.22.0" msgstr "No s'admet el control de delegació amb el cURL < 7.22.0" -#: http.c:372 +#: http.c:378 msgid "Public key pinning not supported with cURL < 7.44.0" msgstr "No s'admet l'enganx de clau pública amb cURL < 7.44.0" -#: http.c:1857 +#: http.c:1854 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -15061,7 +17356,7 @@ msgstr "" " petició: %s\n" " redirecció: %s" -#: remote-curl.c:345 +#: remote-curl.c:401 #, c-format msgid "redirecting to %s" msgstr "s'està redirigint a %s" @@ -15075,132 +17370,718 @@ msgstr "args" msgid "object filtering" msgstr "tipus d'objecte" -#: common-cmds.h:9 -msgid "start a working area (see also: git help tutorial)" -msgstr "començar una àrea de treball (vegeu també: git help tutorial)" +#: parse-options.h:157 +msgid "expiry-date" +msgstr "data-de-caducitat" -#: common-cmds.h:10 -msgid "work on the current change (see also: git help everyday)" -msgstr "treballar en el canvi actual (vegeu també: git help everyday)" +#: parse-options.h:172 +msgid "no-op (backward compatibility)" +msgstr "operació nul·la (per a compatibilitat amb versions anteriors)" -#: common-cmds.h:11 -msgid "examine the history and state (see also: git help revisions)" -msgstr "examinar la història i l'estat (vegeu també: git help revisions)" +#: parse-options.h:251 +msgid "be more verbose" +msgstr "sigues més detallat" -#: common-cmds.h:12 -msgid "grow, mark and tweak your common history" -msgstr "fer créixer, marcar i ajustar la vostra història comuna" +#: parse-options.h:253 +msgid "be more quiet" +msgstr "sigues més callat" -#: common-cmds.h:13 -msgid "collaborate (see also: git help workflows)" -msgstr "col·laborar (vegeu també: git help workflow)" +#: parse-options.h:259 +msgid "use <n> digits to display SHA-1s" +msgstr "usa <n> xifres per presentar els SHA-1" -#: common-cmds.h:17 +#: command-list.h:50 msgid "Add file contents to the index" msgstr "Afegeix els continguts dels fitxers a l'índex" -#: common-cmds.h:18 +#: command-list.h:51 +msgid "Apply a series of patches from a mailbox" +msgstr "" + +#: command-list.h:52 +#, fuzzy +msgid "Annotate file lines with commit information" +msgstr "Mostra el format de porcellana amb informació de comissió per línia" + +#: command-list.h:53 +#, fuzzy +msgid "Apply a patch to files and/or to the index" +msgstr "afegeix l'entrada especificada a l'índex" + +#: command-list.h:54 +#, fuzzy +msgid "Import an Arch repository into Git" +msgstr "Clona un dipòsit a un directori nou" + +#: command-list.h:55 +#, fuzzy +msgid "Create an archive of files from a named tree" +msgstr "informa de fitxers arxivats en stderr" + +#: command-list.h:56 msgid "Use binary search to find the commit that introduced a bug" msgstr "Troba per cerca binària el canvi que hagi introduït un defecte" -#: common-cmds.h:19 +#: command-list.h:57 +msgid "Show what revision and author last modified each line of a file" +msgstr "" + +#: command-list.h:58 msgid "List, create, or delete branches" msgstr "Llista, crea o suprimeix branques" -#: common-cmds.h:20 +#: command-list.h:59 +msgid "Move objects and refs by archive" +msgstr "" + +#: command-list.h:60 +msgid "Provide content or type and size information for repository objects" +msgstr "" + +#: command-list.h:61 +#, fuzzy +msgid "Display gitattributes information" +msgstr "usa .gitattributes només des de l'índex" + +#: command-list.h:62 +msgid "Debug gitignore / exclude files" +msgstr "" + +#: command-list.h:63 +#, fuzzy +msgid "Show canonical names and email addresses of contacts" +msgstr "Mostra l'adreça electrònica de cada autor" + +#: command-list.h:64 msgid "Switch branches or restore working tree files" msgstr "Canvia de branca o restaura els fitxers de l'arbre de treball" -#: common-cmds.h:21 +#: command-list.h:65 +#, fuzzy +msgid "Copy files from the index to the working tree" +msgstr "camí a l'arbre de treball" + +#: command-list.h:66 +msgid "Ensures that a reference name is well formed" +msgstr "" + +#: command-list.h:67 +msgid "Find commits yet to be applied to upstream" +msgstr "" + +#: command-list.h:68 +msgid "Apply the changes introduced by some existing commits" +msgstr "" + +#: command-list.h:69 +msgid "Graphical alternative to git-commit" +msgstr "" + +#: command-list.h:70 +#, fuzzy +msgid "Remove untracked files from the working tree" +msgstr "Elimina fitxers de l'arbre de treball i de l'índex" + +#: command-list.h:71 msgid "Clone a repository into a new directory" msgstr "Clona un dipòsit a un directori nou" -#: common-cmds.h:22 +#: command-list.h:72 +#, fuzzy +msgid "Display data in columns" +msgstr "llista les branques en columnes" + +#: command-list.h:73 msgid "Record changes to the repository" msgstr "Registra els canvis al dipòsit" -#: common-cmds.h:23 +#: command-list.h:74 +msgid "Write and verify Git commit graph files" +msgstr "" + +#: command-list.h:75 +#, fuzzy +msgid "Create a new commit object" +msgstr "s'ha produït un error en escriure l'objecte de comissió" + +#: command-list.h:76 +msgid "Get and set repository or global options" +msgstr "" + +#: command-list.h:77 +msgid "Count unpacked number of objects and their disk consumption" +msgstr "" + +#: command-list.h:78 +msgid "Retrieve and store user credentials" +msgstr "" + +#: command-list.h:79 +msgid "Helper to temporarily store passwords in memory" +msgstr "" + +#: command-list.h:80 +msgid "Helper to store credentials on disk" +msgstr "" + +#: command-list.h:81 +msgid "Export a single commit to a CVS checkout" +msgstr "" + +#: command-list.h:82 +msgid "Salvage your data out of another SCM people love to hate" +msgstr "" + +#: command-list.h:83 +msgid "A CVS server emulator for Git" +msgstr "" + +#: command-list.h:84 +msgid "A really simple server for Git repositories" +msgstr "" + +#: command-list.h:85 +msgid "Give an object a human readable name based on an available ref" +msgstr "" + +#: command-list.h:86 msgid "Show changes between commits, commit and working tree, etc" msgstr "" "Mostra els canvis entre comissions, la comissió i l'arbre de treball, etc." -#: common-cmds.h:24 +#: command-list.h:87 +#, fuzzy +msgid "Compares files in the working tree and the index" +msgstr "Elimina fitxers de l'arbre de treball i de l'índex" + +#: command-list.h:88 +#, fuzzy +msgid "Compare a tree to the working tree or index" +msgstr "camí a l'arbre de treball" + +#: command-list.h:89 +msgid "Compares the content and mode of blobs found via two tree objects" +msgstr "" + +#: command-list.h:90 +msgid "Show changes using common diff tools" +msgstr "" + +#: command-list.h:91 +msgid "Git data exporter" +msgstr "" + +#: command-list.h:92 +msgid "Backend for fast Git data importers" +msgstr "" + +#: command-list.h:93 msgid "Download objects and refs from another repository" msgstr "Baixa objectes i referències d'un altre dipòsit" -#: common-cmds.h:25 +#: command-list.h:94 +#, fuzzy +msgid "Receive missing objects from another repository" +msgstr "Baixa objectes i referències d'un altre dipòsit" + +#: command-list.h:95 +#, fuzzy +msgid "Rewrite branches" +msgstr " Branca remota:%s" + +#: command-list.h:96 +#, fuzzy +msgid "Produce a merge commit message" +msgstr "edita el missatge de comissió" + +#: command-list.h:97 +#, fuzzy +msgid "Output information on each ref" +msgstr "actualitza la informació d'estadístiques en el fitxer d'índex" + +#: command-list.h:98 +msgid "Prepare patches for e-mail submission" +msgstr "" + +#: command-list.h:99 +#, fuzzy +msgid "Verifies the connectivity and validity of the objects in the database" +msgstr "escriu l'objecte a la base de dades d'objectes" + +#: command-list.h:100 +msgid "Cleanup unnecessary files and optimize the local repository" +msgstr "" + +#: command-list.h:101 +msgid "Extract commit ID from an archive created using git-archive" +msgstr "" + +#: command-list.h:102 msgid "Print lines matching a pattern" msgstr "Imprimeix les línies coincidents amb un patró" -#: common-cmds.h:26 +#: command-list.h:103 +msgid "A portable graphical interface to Git" +msgstr "" + +#: command-list.h:104 +msgid "Compute object ID and optionally creates a blob from a file" +msgstr "" + +#: command-list.h:105 +msgid "Display help information about Git" +msgstr "" + +#: command-list.h:106 +msgid "Server side implementation of Git over HTTP" +msgstr "" + +#: command-list.h:107 +#, fuzzy +msgid "Download from a remote Git repository via HTTP" +msgstr "Baixa objectes i referències d'un altre dipòsit" + +#: command-list.h:108 +#, fuzzy +msgid "Push objects over HTTP/DAV to another repository" +msgstr "Baixa objectes i referències d'un altre dipòsit" + +#: command-list.h:109 +msgid "Send a collection of patches from stdin to an IMAP folder" +msgstr "" + +#: command-list.h:110 +msgid "Build pack index file for an existing packed archive" +msgstr "" + +#: command-list.h:111 msgid "Create an empty Git repository or reinitialize an existing one" msgstr "Crea un dipòsit de Git buit o reinicialitza un existent" -#: common-cmds.h:27 +#: command-list.h:112 +msgid "Instantly browse your working repository in gitweb" +msgstr "" + +#: command-list.h:113 +msgid "add or parse structured information in commit messages" +msgstr "" + +#: command-list.h:114 +#, fuzzy +msgid "The Git repository browser" +msgstr "no és un dipòsit de git: %s" + +#: command-list.h:115 msgid "Show commit logs" msgstr "Mostra els registres de comissió" -#: common-cmds.h:28 +#: command-list.h:116 +#, fuzzy +msgid "Show information about files in the index and the working tree" +msgstr "i ha fet canvis a l'índex o l'arbre de treball" + +#: command-list.h:117 +#, fuzzy +msgid "List references in a remote repository" +msgstr "dipòsit de referència" + +#: command-list.h:118 +#, fuzzy +msgid "List the contents of a tree object" +msgstr "imprimeix només les etiquetes de l'objecte" + +#: command-list.h:119 +msgid "Extracts patch and authorship from a single e-mail message" +msgstr "" + +#: command-list.h:120 +msgid "Simple UNIX mbox splitter program" +msgstr "" + +#: command-list.h:121 msgid "Join two or more development histories together" msgstr "Uneix dues o més històries de desenvolupament" -#: common-cmds.h:29 +#: command-list.h:122 +#, fuzzy +msgid "Find as good common ancestors as possible for a merge" +msgstr "troba els avantpassats per a una sola fusió d'n vies" + +#: command-list.h:123 +#, fuzzy +msgid "Run a three-way file merge" +msgstr "S'està retrocedint a una fusió de 3 vies...\n" + +#: command-list.h:124 +#, fuzzy +msgid "Run a merge for files needing merging" +msgstr "fusió de 3 vies si no cal fusió a nivell de fitxers" + +#: command-list.h:125 +msgid "The standard helper program to use with git-merge-index" +msgstr "" + +#: command-list.h:126 +msgid "Run merge conflict resolution tools to resolve merge conflicts" +msgstr "" + +#: command-list.h:127 +msgid "Show three-way merge without touching index" +msgstr "" + +#: command-list.h:128 +#, fuzzy +msgid "Creates a tag object" +msgstr "edita un objecte existent" + +#: command-list.h:129 +msgid "Build a tree-object from ls-tree formatted text" +msgstr "" + +#: command-list.h:130 msgid "Move or rename a file, a directory, or a symlink" msgstr "Mou o canvia de nom a un fitxer, directori o enllaç simbòlic" -#: common-cmds.h:30 +#: command-list.h:131 +msgid "Find symbolic names for given revs" +msgstr "" + +#: command-list.h:132 +#, fuzzy +msgid "Add or inspect object notes" +msgstr "no s'ha rebut l'objecte esperat %s" + +#: command-list.h:133 +msgid "Import from and submit to Perforce repositories" +msgstr "" + +#: command-list.h:134 +#, fuzzy +msgid "Create a packed archive of objects" +msgstr "ignora els objectes empaquetats" + +#: command-list.h:135 +#, fuzzy +msgid "Find redundant pack files" +msgstr "no es pot fer pread en el fitxer de paquet" + +#: command-list.h:136 +msgid "Pack heads and tags for efficient repository access" +msgstr "" + +#: command-list.h:137 +msgid "Routines to help parsing remote repository access parameters" +msgstr "" + +#: command-list.h:138 +msgid "Compute unique ID for a patch" +msgstr "" + +#: command-list.h:139 +#, fuzzy +msgid "Prune all unreachable objects from the object database" +msgstr "escriu l'objecte a la base de dades d'objectes" + +#: command-list.h:140 +msgid "Remove extra objects that are already in pack files" +msgstr "" + +#: command-list.h:141 msgid "Fetch from and integrate with another repository or a local branch" msgstr "Obtén i integra amb un altre dipòsit o una branca local" -#: common-cmds.h:31 +#: command-list.h:142 msgid "Update remote refs along with associated objects" msgstr "" "Actualitza les referències remotes juntament amb els objectes associats" -#: common-cmds.h:32 +#: command-list.h:143 +#, fuzzy +msgid "Applies a quilt patchset onto the current branch" +msgstr "No hi ha cap font per defecte definida per a la branca actual." + +#: command-list.h:144 +msgid "Compare two commit ranges (e.g. two versions of a branch)" +msgstr "" + +#: command-list.h:145 +#, fuzzy +msgid "Reads tree information into the index" +msgstr "actualitza la informació d'estadístiques en el fitxer d'índex" + +#: command-list.h:146 msgid "Reapply commits on top of another base tip" msgstr "Reaplica les comissions sobre un altre punt de basament" -#: common-cmds.h:33 +#: command-list.h:147 +#, fuzzy +msgid "Receive what is pushed into the repository" +msgstr "Registra els canvis al dipòsit" + +#: command-list.h:148 +#, fuzzy +msgid "Manage reflog information" +msgstr "mostra la informació de resolució de desfet" + +#: command-list.h:149 +#, fuzzy +msgid "Manage set of tracked repositories" +msgstr "Registra els canvis al dipòsit" + +#: command-list.h:150 +#, fuzzy +msgid "Pack unpacked objects in a repository" +msgstr "--cached fora d'un dipòsit" + +#: command-list.h:151 +#, fuzzy +msgid "Create, list, delete refs to replace objects" +msgstr "" +"Crea, llista, suprimeix o verifica un objecte d'etiqueta signat amb GPG" + +#: command-list.h:152 +msgid "Generates a summary of pending changes" +msgstr "" + +#: command-list.h:153 +msgid "Reuse recorded resolution of conflicted merges" +msgstr "" + +#: command-list.h:154 msgid "Reset current HEAD to the specified state" msgstr "Restableix la HEAD actual a l'estat especificat" -#: common-cmds.h:34 +#: command-list.h:155 +#, fuzzy +msgid "Revert some existing commits" +msgstr "no es pot esmenar una comissió no existent" + +#: command-list.h:156 +#, fuzzy +msgid "Lists commit objects in reverse chronological order" +msgstr "mostra les comissions en ordre topològic" + +#: command-list.h:157 +#, fuzzy +msgid "Pick out and massage parameters" +msgstr "massa paràmetres" + +#: command-list.h:158 msgid "Remove files from the working tree and from the index" msgstr "Elimina fitxers de l'arbre de treball i de l'índex" -#: common-cmds.h:35 +#: command-list.h:159 +msgid "Send a collection of patches as emails" +msgstr "" + +#: command-list.h:160 +#, fuzzy +msgid "Push objects over Git protocol to another repository" +msgstr "Baixa objectes i referències d'un altre dipòsit" + +#: command-list.h:161 +msgid "Restricted login shell for Git-only SSH access" +msgstr "" + +#: command-list.h:162 +msgid "Summarize 'git log' output" +msgstr "" + +#: command-list.h:163 msgid "Show various types of objects" msgstr "Mostra diversos tipus d'objectes" -#: common-cmds.h:36 +#: command-list.h:164 +#, fuzzy +msgid "Show branches and their commits" +msgstr "imprimeix només les branques que continguin la comissió" + +#: command-list.h:165 +msgid "Show packed archive index" +msgstr "" + +#: command-list.h:166 +#, fuzzy +msgid "List references in a local repository" +msgstr "el dipòsit de referència «%s» no és un dipòsit local." + +#: command-list.h:167 +msgid "Git's i18n setup code for shell scripts" +msgstr "" + +#: command-list.h:168 +msgid "Common Git shell script setup code" +msgstr "" + +#: command-list.h:169 +#, fuzzy +msgid "Stash the changes in a dirty working directory away" +msgstr "%s: ja existeix en el directori de treball" + +#: command-list.h:170 +#, fuzzy +msgid "Add file contents to the staging area" +msgstr "Afegeix els continguts dels fitxers a l'índex" + +#: command-list.h:171 msgid "Show the working tree status" msgstr "Mostra l'estat de l'arbre de treball" -#: common-cmds.h:37 +#: command-list.h:172 +msgid "Remove unnecessary whitespace" +msgstr "" + +#: command-list.h:173 +#, fuzzy +msgid "Initialize, update or inspect submodules" +msgstr "s'ha produït un error en actualitzar el remot pel submòdul «%s»" + +#: command-list.h:174 +msgid "Bidirectional operation between a Subversion repository and Git" +msgstr "" + +#: command-list.h:175 +#, fuzzy +msgid "Read, modify and delete symbolic refs" +msgstr "suprimeix la referència simbòlica" + +#: command-list.h:176 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" -#: parse-options.h:157 -msgid "expiry-date" -msgstr "data-de-caducitat" +#: command-list.h:177 +msgid "Creates a temporary file with a blob's contents" +msgstr "" -#: parse-options.h:172 -msgid "no-op (backward compatibility)" -msgstr "operació nul·la (per a compatibilitat amb versions anteriors)" +#: command-list.h:178 +msgid "Unpack objects from a packed archive" +msgstr "" -#: parse-options.h:250 -msgid "be more verbose" -msgstr "sigues més detallat" +#: command-list.h:179 +#, fuzzy +msgid "Register file contents in the working tree to the index" +msgstr "Elimina fitxers de l'arbre de treball i de l'índex" -#: parse-options.h:252 -msgid "be more quiet" -msgstr "sigues més callat" +#: command-list.h:180 +msgid "Update the object name stored in a ref safely" +msgstr "" -#: parse-options.h:258 -msgid "use <n> digits to display SHA-1s" -msgstr "usa <n> xifres per presentar els SHA-1" +#: command-list.h:181 +msgid "Update auxiliary info file to help dumb servers" +msgstr "" + +#: command-list.h:182 +msgid "Send archive back to git-archive" +msgstr "" + +#: command-list.h:183 +msgid "Send objects packed back to git-fetch-pack" +msgstr "" + +#: command-list.h:184 +msgid "Show a Git logical variable" +msgstr "" + +#: command-list.h:185 +#, fuzzy +msgid "Check the GPG signature of commits" +msgstr "signa la comissió amb GPG" + +#: command-list.h:186 +#, fuzzy +msgid "Validate packed Git archive files" +msgstr "no s'ha pogut crear el fitxer d'arxiu «%s»" + +#: command-list.h:187 +msgid "Check the GPG signature of tags" +msgstr "" + +#: command-list.h:188 +msgid "Git web interface (web frontend to Git repositories)" +msgstr "" + +#: command-list.h:189 +msgid "Show logs with difference each commit introduces" +msgstr "" + +#: command-list.h:190 +#, fuzzy +msgid "Manage multiple working trees" +msgstr "camí a l'arbre de treball" + +#: command-list.h:191 +#, fuzzy +msgid "Create a tree object from the current index" +msgstr "llegeix l'objecte des de stdin" + +#: command-list.h:192 +msgid "Defining attributes per path" +msgstr "La definició d'atributs per camí" + +#: command-list.h:193 +msgid "Git command-line interface and conventions" +msgstr "" + +#: command-list.h:194 +msgid "A Git core tutorial for developers" +msgstr "" + +#: command-list.h:195 +msgid "Git for CVS users" +msgstr "" + +#: command-list.h:196 +#, fuzzy +msgid "Tweaking diff output" +msgstr "omet la sortida de diferències" + +#: command-list.h:197 +msgid "A useful minimum set of commands for Everyday Git" +msgstr "" + +#: command-list.h:198 +#, fuzzy +msgid "A Git Glossary" +msgstr "Un glossari de Git" + +#: command-list.h:199 +msgid "Hooks used by Git" +msgstr "" + +#: command-list.h:200 +msgid "Specifies intentionally untracked files to ignore" +msgstr "Especifica els fitxers intencionalment no seguits a ignorar" + +#: command-list.h:201 +msgid "Defining submodule properties" +msgstr "La definició de les propietats de submòduls" + +#: command-list.h:202 +msgid "Git namespaces" +msgstr "" + +#: command-list.h:203 +msgid "Git Repository Layout" +msgstr "" + +#: command-list.h:204 +msgid "Specifying revisions and ranges for Git" +msgstr "L'especificació de revisions i rangs per al Git" + +#: command-list.h:205 +#, fuzzy +msgid "A tutorial introduction to Git: part two" +msgstr "Una introducció tutorial al Git (per a la versió 1.5.1 o més nova)" + +#: command-list.h:206 +#, fuzzy +msgid "A tutorial introduction to Git" +msgstr "Una introducció tutorial al Git (per a la versió 1.5.1 o més nova)" + +#: command-list.h:207 +msgid "An overview of recommended workflows with Git" +msgstr "Una visió de conjunt de fluxos de treball recomanats amb Git" #: rerere.h:40 msgid "update the index with reused conflict resolution if possible" @@ -15431,7 +18312,7 @@ msgid "Simple merge did not work, trying automatic merge." msgstr "" "La fusió simple no ha funcionat, s'està intentant una fusió automàtica." -#: git-rebase.sh:60 +#: git-rebase.sh:61 msgid "" "Resolve all conflicts manually, mark them as resolved with\n" "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n" @@ -15446,42 +18327,42 @@ msgstr "" "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 +#: git-rebase.sh:173 git-rebase.sh:454 #, sh-format msgid "Could not move back to $head_name" msgstr "No s'ha pogut tornar a $head_name" -#: git-rebase.sh:174 +#: git-rebase.sh:184 msgid "Applied autostash." msgstr "S'ha aplicat el magatzem automàtic." -#: git-rebase.sh:177 +#: git-rebase.sh:187 #, sh-format msgid "Cannot store $stash_sha1" msgstr "No es pot emmagatzemar $stash_sha1" -#: git-rebase.sh:218 +#: git-rebase.sh:236 msgid "The pre-rebase hook refused to rebase." msgstr "El lligam pre-«rebase» ha refusat a fer «rebase»." -#: git-rebase.sh:223 +#: git-rebase.sh:241 #, fuzzy msgid "It looks like 'git am' is in progress. Cannot rebase." msgstr "Sembla que git-am està en curs. No es pot fer «rebase»." -#: git-rebase.sh:370 +#: git-rebase.sh:415 msgid "No rebase in progress?" msgstr "No hi ha un «rebase» en curs?" -#: git-rebase.sh:381 +#: git-rebase.sh:426 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "L'acció --edit-todo només es pot usar durant un «rebase» interactiu." -#: git-rebase.sh:388 +#: git-rebase.sh:433 msgid "Cannot read HEAD" msgstr "No es pot llegir HEAD" -#: git-rebase.sh:391 +#: git-rebase.sh:436 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -15489,7 +18370,7 @@ msgstr "" "Heu d'editar tots els conflictes de fusió i després\n" "marcar-los com a resolts fent servir git add" -#: git-rebase.sh:435 +#: git-rebase.sh:480 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" @@ -15510,75 +18391,91 @@ msgstr "" "i executeu-me de nou. M'aturo per si encara hi teniu alguna cosa\n" "de valor." -#: git-rebase.sh:491 +#: git-rebase.sh:545 +msgid "error: cannot combine '--signoff' with '--preserve-merges'" +msgstr "" + +#: git-rebase.sh:556 +msgid "error: cannot combine '--preserve_merges' with '--rebase-merges'" +msgstr "" + +#: git-rebase.sh:562 +msgid "error: cannot combine '--rebase_merges' with '--strategy-option'" +msgstr "" + +#: git-rebase.sh:564 +msgid "error: cannot combine '--rebase_merges' with '--strategy'" +msgstr "" + +#: git-rebase.sh:590 #, fuzzy, sh-format msgid "invalid upstream '$upstream_name'" msgstr "font no vàlida $upstream_name" -#: git-rebase.sh:515 +#: git-rebase.sh:614 #, sh-format msgid "$onto_name: there are more than one merge bases" msgstr "$onto_name: ja hi ha més d'una base de fusió" -#: git-rebase.sh:518 git-rebase.sh:522 +#: git-rebase.sh:617 git-rebase.sh:621 #, sh-format msgid "$onto_name: there is no merge base" msgstr "$onto_name: no hi ha cap base de fusió" -#: git-rebase.sh:527 +#: git-rebase.sh:626 #, sh-format msgid "Does not point to a valid commit: $onto_name" msgstr "No assenyala una comissió vàlida: $onto_name" -#: git-rebase.sh:553 +#: git-rebase.sh:652 #, fuzzy, sh-format msgid "fatal: no such branch/commit '$branch_name'" msgstr "fatal: no hi ha tal branca: $branch_name" -#: git-rebase.sh:586 +#: git-rebase.sh:685 msgid "Cannot autostash" msgstr "No es pot emmagatzemar automàticament" -#: git-rebase.sh:591 +#: git-rebase.sh:690 #, sh-format msgid "Created autostash: $stash_abbrev" msgstr "S'ha creat un magatzem automàtic: $stash_abbrev" -#: git-rebase.sh:595 +#: git-rebase.sh:694 msgid "Please commit or stash them." msgstr "Cometeu-los o emmagatzemeu-los." -#: git-rebase.sh:618 +#: git-rebase.sh:717 #, sh-format msgid "HEAD is up to date." msgstr "HEAD està al dia." -#: git-rebase.sh:620 +#: git-rebase.sh:719 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "La branca actual $branch_name està al dia." -#: git-rebase.sh:628 +#: git-rebase.sh:727 #, fuzzy, sh-format msgid "HEAD is up to date, rebase forced." msgstr "La branca actual $branch_name està al dia; «rebase» forçat." -#: git-rebase.sh:630 +#: git-rebase.sh:729 #, sh-format msgid "Current branch $branch_name is up to date, rebase forced." msgstr "La branca actual $branch_name està al dia; «rebase» forçat." -#: git-rebase.sh:642 +#: git-rebase.sh:741 #, sh-format msgid "Changes from $mb to $onto:" msgstr "Canvis de $mb a $onto:" -#: git-rebase.sh:651 +#: git-rebase.sh:750 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..." -#: git-rebase.sh:661 +#: git-rebase.sh:760 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "S'ha avançat $branch_name ràpidament a $onto_name." @@ -15646,111 +18543,111 @@ msgstr "No es pot desar l'estat actual" msgid "Saved working directory and index state $stash_msg" msgstr "S'han desat el directori de treball i l'estat d'índex $stash_msg" -#: git-stash.sh:340 +#: git-stash.sh:342 msgid "Cannot remove worktree changes" msgstr "No es poden eliminar els canvis de l'arbre de treball" -#: git-stash.sh:488 +#: git-stash.sh:490 #, sh-format msgid "unknown option: $opt" msgstr "opció desconeguda: $opt" -#: git-stash.sh:501 +#: git-stash.sh:503 msgid "No stash entries found." msgstr "No s'ha trobat cap «stash»." -#: git-stash.sh:508 +#: git-stash.sh:510 #, sh-format msgid "Too many revisions specified: $REV" msgstr "S'han especificat massa revisions: $REV" -#: git-stash.sh:523 +#: git-stash.sh:525 #, sh-format msgid "$reference is not a valid reference" msgstr "$reference no és una referència vàlida" -#: git-stash.sh:551 +#: git-stash.sh:553 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "'$args' no és una comissió de tipus magatzem" -#: git-stash.sh:562 +#: git-stash.sh:564 #, sh-format msgid "'$args' is not a stash reference" msgstr "'$args' no és una referència de magatzem" -#: git-stash.sh:570 +#: git-stash.sh:572 msgid "unable to refresh index" msgstr "no s'ha pogut actualitzar l'índex" -#: git-stash.sh:574 +#: git-stash.sh:576 msgid "Cannot apply a stash in the middle of a merge" msgstr "No es pot aplicar un magatzem enmig d'una fusió" -#: git-stash.sh:582 +#: git-stash.sh:584 msgid "Conflicts in index. Try without --index." msgstr "Hi ha conflictes en l'índex. Proveu-ho sense --index." -#: git-stash.sh:584 +#: git-stash.sh:586 msgid "Could not save index tree" msgstr "No s'ha pogut desar l'arbre d'índex" -#: git-stash.sh:593 +#: git-stash.sh:595 msgid "Could not restore untracked files from stash entry" msgstr "No s'han pogut restaurar els fitxers no seguits des del «stash»" -#: git-stash.sh:618 +#: git-stash.sh:620 msgid "Cannot unstage modified files" msgstr "No es pot fer «unstage» dels fitxers modificats" -#: git-stash.sh:633 +#: git-stash.sh:635 msgid "Index was not unstashed." msgstr "L'índex no estava sense emmagatzemar." -#: git-stash.sh:647 +#: git-stash.sh:649 msgid "The stash entry is kept in case you need it again." msgstr "Es conserva l'entrada «stash» en cas que la necessiteu altra vegada." -#: git-stash.sh:656 +#: git-stash.sh:658 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "${REV} ($s) descartada" -#: git-stash.sh:657 +#: git-stash.sh:659 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "${REV}: No s'ha pogut descartar l'entrada de magatzem" -#: git-stash.sh:665 +#: git-stash.sh:667 msgid "No branch name specified" msgstr "Cap nom de branca especificat" -#: git-stash.sh:744 +#: git-stash.sh:746 msgid "(To restore them type \"git stash apply\")" msgstr "(Per restaurar-les teclegeu \"git stash apply\")" -#: git-submodule.sh:181 +#: git-submodule.sh:188 msgid "Relative path can only be used from the toplevel of the working tree" msgstr "" "El camí relatiu només es pot usar des del nivell superior de l'arbre de " "treball" -#: git-submodule.sh:191 +#: git-submodule.sh:198 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "URL de dipòsit: '$repo' ha de ser absolut o començar amb ./|../" -#: git-submodule.sh:210 +#: git-submodule.sh:217 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "'$sm_path' ja existeix en l'índex" -#: git-submodule.sh:213 +#: git-submodule.sh:220 #, sh-format msgid "'$sm_path' already exists in the index and is not a submodule" msgstr "'$sm_path' ja existeix en l'índex i no és submòdul" -#: git-submodule.sh:219 +#: git-submodule.sh:226 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -15761,23 +18658,23 @@ msgstr "" "$sm_path\n" "Useu -f si realment voleu afegir-lo." -#: git-submodule.sh:237 +#: git-submodule.sh:249 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "S'està afegint el dipòsit existent a '$sm_path' a l'índex" -#: git-submodule.sh:239 +#: git-submodule.sh:251 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "'$sm_path' ja existeix i no és un dipòsit de git vàlid" -#: git-submodule.sh:247 +#: git-submodule.sh:259 #, 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:" -#: git-submodule.sh:249 +#: git-submodule.sh:261 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from\n" @@ -15794,50 +18691,39 @@ msgstr "" "o no esteu segur de què vol dir això, trieu un altre nom amb l'opció '--" "name'." -#: git-submodule.sh:255 +#: git-submodule.sh:267 #, 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'." -#: git-submodule.sh:267 +#: git-submodule.sh:279 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "No s'ha pogut agafar el submòdul '$sm_path'" -#: git-submodule.sh:272 +#: git-submodule.sh:284 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "S'ha produït un error en afegir el submòdul '$sm_path'" -#: git-submodule.sh:281 +#: git-submodule.sh:293 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "S'ha produït un error en registrar el submòdul '$sm_path'" -#: git-submodule.sh:342 -#, sh-format -msgid "Entering '$displaypath'" -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." - -#: git-submodule.sh:584 +#: git-submodule.sh:565 #, 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'" -#: git-submodule.sh:594 +#: git-submodule.sh:575 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "No s'ha pogut obtenir en el camí de submòdul '$sm_path'" -#: git-submodule.sh:599 +#: git-submodule.sh:580 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " @@ -15846,12 +18732,12 @@ msgstr "" "No s'ha pogut trobar la revisió actual de ${remote_name}/${branch} en el " "camí de submòdul '$sm_path'" -#: git-submodule.sh:617 +#: git-submodule.sh:603 #, sh-format msgid "Unable to fetch in submodule path '$displaypath'" msgstr "No s'ha pogut obtenir en el camí de submòdul '$displaypath'" -#: git-submodule.sh:623 +#: git-submodule.sh:609 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " @@ -15860,76 +18746,76 @@ msgstr "" "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 +#: git-submodule.sh:616 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "No s'ha pogut agafar '$sha1' en el camí de submòdul '$displaypath'" -#: git-submodule.sh:631 +#: git-submodule.sh:617 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "Camí de submòdul '$displaypath': s'ha agafat '$sha1'" -#: git-submodule.sh:635 +#: git-submodule.sh:621 #, 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'" -#: git-submodule.sh:636 +#: git-submodule.sh:622 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "Camí de submòdul '$displaypath': s'ha fet «rebase» en '$sha1'" -#: git-submodule.sh:641 +#: git-submodule.sh:627 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "No s'ha pogut fusionar '$sha1' en el camí de submòdul '$displaypath'" -#: git-submodule.sh:642 +#: git-submodule.sh:628 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "Camí de submòdul '$displaypath': s'ha fusionat en '$sha1'" -#: git-submodule.sh:647 +#: git-submodule.sh:633 #, 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'" -#: git-submodule.sh:648 +#: git-submodule.sh:634 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "Camí de submòdul '$displaypath': '$command $sha1'" -#: git-submodule.sh:679 +#: git-submodule.sh:665 #, 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'" -#: git-submodule.sh:775 +#: git-submodule.sh:761 msgid "The --cached option cannot be used with the --files option" msgstr "L'opció --cached no es pot usar amb l'opció --files" -#: git-submodule.sh:827 +#: git-submodule.sh:813 #, sh-format msgid "unexpected mode $mod_dst" msgstr "mode inesperat $mod_dst" -#: git-submodule.sh:847 +#: git-submodule.sh:833 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr " Avís: $display_name no conté la comissió $sha1_src" -#: git-submodule.sh:850 +#: git-submodule.sh:836 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr " Avís: $display_name no conté la comissió $sha1_dst" -#: git-submodule.sh:853 +#: git-submodule.sh:839 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr " Avís: $display_name no conté les comissions $sha1_src i $sha1_dst" @@ -15939,22 +18825,24 @@ msgstr " Avís: $display_name no conté les comissions $sha1_src i $sha1_dst" msgid "See git-${cmd}(1) for details." msgstr "Vegeu git-${cmd}(1) per detalls." -#: git-rebase--interactive.sh:140 -#, sh-format -msgid "Rebasing ($new_count/$total)" -msgstr "S'està fent «rebase» ($new_count/$total)" - -#: git-rebase--interactive.sh:156 +#: git-rebase--interactive.sh:43 +#, fuzzy msgid "" "\n" "Commands:\n" -"p, pick = use commit\n" -"r, reword = use commit, but edit the commit message\n" -"e, edit = use commit, but stop for amending\n" -"s, squash = use commit, but meld into previous commit\n" -"f, fixup = like \"squash\", but discard this commit's log message\n" -"x, exec = run command (the rest of the line) using shell\n" -"d, drop = remove commit\n" +"p, pick <commit> = use commit\n" +"r, reword <commit> = use commit, but edit the commit message\n" +"e, edit <commit> = use commit, but stop for amending\n" +"s, squash <commit> = use commit, but meld into previous commit\n" +"f, fixup <commit> = like \"squash\", but discard this commit's log message\n" +"x, exec <command> = run command (the rest of the line) using shell\n" +"d, drop <commit> = remove commit\n" +"l, label <label> = label current HEAD with a name\n" +"t, reset <label> = reset HEAD to a label\n" +"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n" +". create a merge commit using the original merge commit's\n" +". message (or the oneline, if no original merge commit was\n" +". specified). Use -c <commit> to reword the commit message.\n" "\n" "These lines can be re-ordered; they are executed from top to bottom.\n" msgstr "" @@ -15972,7 +18860,7 @@ msgstr "" "\n" "Es pot canviar l'ordre d'aquestes línies; s'executen de dalt a baix.\n" -#: git-rebase--interactive.sh:171 +#: git-rebase--interactive.sh:64 git-rebase--preserve-merges.sh:173 msgid "" "\n" "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" @@ -15981,7 +18869,7 @@ msgstr "" "No elimineu cap línia. Useu 'drop' explícitament per a eliminar una " "comissió.\n" -#: git-rebase--interactive.sh:175 +#: git-rebase--interactive.sh:68 git-rebase--preserve-merges.sh:177 msgid "" "\n" "If you remove a line here THAT COMMIT WILL BE LOST.\n" @@ -15989,7 +18877,115 @@ msgstr "" "\n" "Si elimineu una línia aquí, ES PERDRÀ AQUELLA COMISSIÓ.\n" -#: git-rebase--interactive.sh:213 +#: git-rebase--interactive.sh:108 git-rebase--preserve-merges.sh:724 +msgid "could not detach HEAD" +msgstr "no s'ha pogut separar HEAD" + +#: git-rebase--interactive.sh:147 git-rebase--preserve-merges.sh:816 +msgid "" +"\n" +"You are editing the todo file of an ongoing interactive rebase.\n" +"To continue rebase after editing, run:\n" +" git rebase --continue\n" +"\n" +msgstr "" +"\n" +"Esteu editant el fitxer de coses a fer d'un «rebase» interactiu en marxa.\n" +"Per a continuar el «rebase» després d'editar, executeu:\n" +" git rebase --continue\n" +"\n" + +#: git-rebase--interactive.sh:155 git-rebase--interactive.sh:241 +#: git-rebase--preserve-merges.sh:824 git-rebase--preserve-merges.sh:910 +msgid "Could not execute editor" +msgstr "No s'ha pogut executar l'editor" + +#: git-rebase--interactive.sh:176 git-rebase--preserve-merges.sh:845 +#, sh-format +msgid "Could not checkout $switch_to" +msgstr "No s'ha pogut agafar $switch_to" + +#: git-rebase--interactive.sh:183 git-rebase--preserve-merges.sh:852 +msgid "No HEAD?" +msgstr "No hi ha cap HEAD?" + +#: git-rebase--interactive.sh:184 git-rebase--preserve-merges.sh:853 +#, sh-format +msgid "Could not create temporary $state_dir" +msgstr "No s'ha pogut crear el $state_dir temporal" + +#: git-rebase--interactive.sh:187 git-rebase--preserve-merges.sh:856 +msgid "Could not mark as interactive" +msgstr "No s'ha pogut marcar com a interactiu" + +#: git-rebase--interactive.sh:219 git-rebase--preserve-merges.sh:888 +#, sh-format +msgid "Rebase $shortrevisions onto $shortonto ($todocount command)" +msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" +msgstr[0] "Rebasa $shortrevisions sobre $shortonto ($todocount ordre)" +msgstr[1] "Rebasa $shortrevisions sobre $shortonto ($todocount ordres)" + +#: git-rebase--interactive.sh:224 +#, fuzzy +msgid "" +"\n" +"\tHowever, if you remove everything, the rebase will be aborted.\n" +"\n" +"\t" +msgstr "" +"\n" +"No obstant, si elimineu tot, s'avortarà el «rebase».\n" +"\n" + +#: git-rebase--interactive.sh:231 git-rebase--preserve-merges.sh:900 +msgid "Note that empty commits are commented out" +msgstr "Nota que les comissions buides estan comentades" + +#: git-rebase--interactive.sh:280 +msgid "Could not generate todo list" +msgstr "no s'ha pogut escriure la llista per a fer" + +#: git-rebase--preserve-merges.sh:136 +#, sh-format +msgid "Rebasing ($new_count/$total)" +msgstr "S'està fent «rebase» ($new_count/$total)" + +#: git-rebase--preserve-merges.sh:152 +#, fuzzy +msgid "" +"\n" +"Commands:\n" +"p, pick <commit> = use commit\n" +"r, reword <commit> = use commit, but edit the commit message\n" +"e, edit <commit> = use commit, but stop for amending\n" +"s, squash <commit> = use commit, but meld into previous commit\n" +"f, fixup <commit> = like \"squash\", but discard this commit's log message\n" +"x, exec <commit> = run command (the rest of the line) using shell\n" +"d, drop <commit> = remove commit\n" +"l, label <label> = label current HEAD with a name\n" +"t, reset <label> = reset HEAD to a label\n" +"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n" +". create a merge commit using the original merge commit's\n" +". message (or the oneline, if no original merge commit was\n" +". specified). Use -c <commit> to reword the commit message.\n" +"\n" +"These lines can be re-ordered; they are executed from top to bottom.\n" +msgstr "" +"\n" +"Ordres:\n" +" p, pick = usa la comissió\n" +" 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" +" d, drop = elimina la comissió\n" +"\n" +"Es pot canviar l'ordre d'aquestes línies; s'executen de dalt a baix.\n" + +#: git-rebase--preserve-merges.sh:215 #, sh-format msgid "" "You can amend the commit now, with\n" @@ -16008,83 +19004,83 @@ msgstr "" "\n" "\tgit rebase --continue" -#: git-rebase--interactive.sh:238 +#: git-rebase--preserve-merges.sh:240 #, sh-format msgid "$sha1: not a commit that can be picked" msgstr "$sha1: no és una comissió que es pugui escollir" -#: git-rebase--interactive.sh:277 +#: git-rebase--preserve-merges.sh:279 #, sh-format msgid "Invalid commit name: $sha1" msgstr "Nom de comissió no vàlid: $sha1" -#: git-rebase--interactive.sh:319 +#: git-rebase--preserve-merges.sh:309 msgid "Cannot write current commit's replacement sha1" msgstr "No es pot escriure el sha1 reemplaçant de la comissió actual" -#: git-rebase--interactive.sh:371 +#: git-rebase--preserve-merges.sh:360 #, sh-format msgid "Fast-forward to $sha1" msgstr "Avanç ràpid a $sha1" -#: git-rebase--interactive.sh:373 +#: git-rebase--preserve-merges.sh:362 #, sh-format msgid "Cannot fast-forward to $sha1" msgstr "No es pot avançar ràpidament a $sha1" -#: git-rebase--interactive.sh:382 +#: git-rebase--preserve-merges.sh:371 #, sh-format msgid "Cannot move HEAD to $first_parent" msgstr "No es pot moure HEAD a $first_parent" -#: git-rebase--interactive.sh:387 +#: git-rebase--preserve-merges.sh:376 #, sh-format msgid "Refusing to squash a merge: $sha1" msgstr "S'està refusant fer «squash» a una fusió: $sha1" -#: git-rebase--interactive.sh:405 +#: git-rebase--preserve-merges.sh:394 #, sh-format msgid "Error redoing merge $sha1" msgstr "Error en refer la fusió $sha1" -#: git-rebase--interactive.sh:414 +#: git-rebase--preserve-merges.sh:403 #, sh-format msgid "Could not pick $sha1" msgstr "No s'ha pogut escollir $sha1" -#: git-rebase--interactive.sh:423 +#: git-rebase--preserve-merges.sh:412 #, sh-format msgid "This is the commit message #${n}:" msgstr "Aquest és el missatge de comissió núm. ${n}:" -#: git-rebase--interactive.sh:428 +#: git-rebase--preserve-merges.sh:417 #, sh-format msgid "The commit message #${n} will be skipped:" msgstr "El missatge de comissió núm. ${n} s'ometrà:" -#: git-rebase--interactive.sh:439 +#: git-rebase--preserve-merges.sh:428 #, sh-format msgid "This is a combination of $count commit." msgid_plural "This is a combination of $count commits." msgstr[0] "Això és una combinació de $count comissió." msgstr[1] "Això és una combinació de $count comissions." -#: git-rebase--interactive.sh:448 +#: git-rebase--preserve-merges.sh:437 #, sh-format msgid "Cannot write $fixup_msg" msgstr "No es pot escriure $fixup_msg" -#: git-rebase--interactive.sh:451 +#: git-rebase--preserve-merges.sh:440 msgid "This is a combination of 2 commits." msgstr "Això és una combinació de 2 comissions." -#: git-rebase--interactive.sh:492 git-rebase--interactive.sh:535 -#: git-rebase--interactive.sh:538 +#: git-rebase--preserve-merges.sh:481 git-rebase--preserve-merges.sh:524 +#: git-rebase--preserve-merges.sh:527 #, sh-format msgid "Could not apply $sha1... $rest" msgstr "No s'ha pogut aplicar $sha1... $rest" -#: git-rebase--interactive.sh:567 +#: git-rebase--preserve-merges.sh:556 #, sh-format msgid "" "Could not amend commit after successfully picking $sha1... $rest\n" @@ -16100,31 +19096,31 @@ msgstr "" "necessiteu resoldre el problema abans que pugueu canviar el missatge de\n" "comissió." -#: git-rebase--interactive.sh:582 +#: git-rebase--preserve-merges.sh:571 #, sh-format msgid "Stopped at $sha1_abbrev... $rest" msgstr "S'ha aturat a $sha1_abbrev... $rest" -#: git-rebase--interactive.sh:597 +#: git-rebase--preserve-merges.sh:586 #, sh-format msgid "Cannot '$squash_style' without a previous commit" msgstr "No es pot '$squash_style' sense una comissió prèvia" -#: git-rebase--interactive.sh:639 +#: git-rebase--preserve-merges.sh:628 #, sh-format msgid "Executing: $rest" msgstr "S'està executant: $rest" -#: git-rebase--interactive.sh:647 +#: git-rebase--preserve-merges.sh:636 #, sh-format msgid "Execution failed: $rest" msgstr "L'execució ha fallat: $rest" -#: git-rebase--interactive.sh:649 +#: git-rebase--preserve-merges.sh:638 msgid "and made changes to the index and/or the working tree" msgstr "i ha fet canvis a l'índex o l'arbre de treball" -#: git-rebase--interactive.sh:651 +#: git-rebase--preserve-merges.sh:640 msgid "" "You can fix the problem, and then run\n" "\n" @@ -16135,7 +19131,7 @@ msgstr "" "\tgit rebase --continue" #. TRANSLATORS: after these lines is a command to be issued by the user -#: git-rebase--interactive.sh:664 +#: git-rebase--preserve-merges.sh:653 #, sh-format msgid "" "Execution succeeded: $rest\n" @@ -16150,29 +19146,25 @@ msgstr "" "\n" "\tgit rebase --continue" -#: git-rebase--interactive.sh:675 +#: git-rebase--preserve-merges.sh:664 #, sh-format msgid "Unknown command: $command $sha1 $rest" msgstr "Ordre desconeguda: $command $sha1 $rest" -#: git-rebase--interactive.sh:676 +#: git-rebase--preserve-merges.sh:665 msgid "Please fix this using 'git rebase --edit-todo'." msgstr "Corregiu-ho usant «git rebase --edit-todo»." -#: git-rebase--interactive.sh:711 +#: git-rebase--preserve-merges.sh:700 #, sh-format msgid "Successfully rebased and updated $head_name." msgstr "S'ha fet «rebase» i actualitzat $head_name amb èxit." -#: git-rebase--interactive.sh:735 -msgid "could not detach HEAD" -msgstr "no s'ha pogut separar HEAD" - -#: git-rebase--interactive.sh:771 +#: git-rebase--preserve-merges.sh:757 msgid "Could not remove CHERRY_PICK_HEAD" msgstr "No s'ha pogut eliminar CHERRY_PICK_HEAD" -#: git-rebase--interactive.sh:776 +#: git-rebase--preserve-merges.sh:762 #, sh-format msgid "" "You have staged changes in your working tree.\n" @@ -16203,13 +19195,13 @@ msgstr "" "\n" " git rebase --continue\n" -#: git-rebase--interactive.sh:793 +#: git-rebase--preserve-merges.sh:779 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ó" -#: git-rebase--interactive.sh:798 +#: git-rebase--preserve-merges.sh:784 msgid "" "You have uncommitted changes in your working tree. Please commit them\n" "first and then run 'git rebase --continue' again." @@ -16217,62 +19209,11 @@ msgstr "" "Teniu canvis no comesos en el vostre arbre de treball. \n" "Primer cometeu-los i després executeu «git rebase --continue» de nou." -#: git-rebase--interactive.sh:803 git-rebase--interactive.sh:807 +#: git-rebase--preserve-merges.sh:789 git-rebase--preserve-merges.sh:793 msgid "Could not commit staged changes." msgstr "No s'han pogut cometre els canvis «staged»." -#: git-rebase--interactive.sh:836 -msgid "" -"\n" -"You are editing the todo file of an ongoing interactive rebase.\n" -"To continue rebase after editing, run:\n" -" git rebase --continue\n" -"\n" -msgstr "" -"\n" -"Esteu editant el fitxer de coses a fer d'un «rebase» interactiu en marxa.\n" -"Per a continuar el «rebase» després d'editar, executeu:\n" -" git rebase --continue\n" -"\n" - -#: git-rebase--interactive.sh:844 git-rebase--interactive.sh:1008 -msgid "Could not execute editor" -msgstr "No s'ha pogut executar l'editor" - -#: git-rebase--interactive.sh:860 -#, sh-format -msgid "Could not checkout $switch_to" -msgstr "No s'ha pogut agafar $switch_to" - -#: git-rebase--interactive.sh:865 -msgid "No HEAD?" -msgstr "No hi ha cap HEAD?" - -#: git-rebase--interactive.sh:866 -#, sh-format -msgid "Could not create temporary $state_dir" -msgstr "No s'ha pogut crear el $state_dir temporal" - -#: git-rebase--interactive.sh:869 -msgid "Could not mark as interactive" -msgstr "No s'ha pogut marcar com a interactiu" - -#: git-rebase--interactive.sh:879 git-rebase--interactive.sh:884 -msgid "Could not init rewritten commits" -msgstr "No s'han pogut iniciar les comissions reescrites" - -#: git-rebase--interactive.sh:910 -msgid "Could not generate todo list" -msgstr "no s'ha pogut escriure la llista per a fer" - -#: git-rebase--interactive.sh:986 -#, sh-format -msgid "Rebase $shortrevisions onto $shortonto ($todocount command)" -msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" -msgstr[0] "Rebasa $shortrevisions sobre $shortonto ($todocount ordre)" -msgstr[1] "Rebasa $shortrevisions sobre $shortonto ($todocount ordres)" - -#: git-rebase--interactive.sh:991 +#: git-rebase--preserve-merges.sh:893 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" @@ -16282,9 +19223,9 @@ msgstr "" "No obstant, si elimineu tot, s'avortarà el «rebase».\n" "\n" -#: git-rebase--interactive.sh:998 -msgid "Note that empty commits are commented out" -msgstr "Nota que les comissions buides estan comentades" +#: git-rebase--preserve-merges.sh:942 git-rebase--preserve-merges.sh:947 +msgid "Could not init rewritten commits" +msgstr "No s'han pogut iniciar les comissions reescrites" #: git-sh-setup.sh:89 git-sh-setup.sh:94 #, sh-format @@ -16361,68 +19302,68 @@ msgstr "staged" msgid "unstaged" msgstr "unstaged" -#: git-add--interactive.perl:246 git-add--interactive.perl:271 +#: git-add--interactive.perl:253 git-add--interactive.perl:278 msgid "binary" msgstr "binari" -#: git-add--interactive.perl:255 git-add--interactive.perl:309 +#: git-add--interactive.perl:262 git-add--interactive.perl:316 msgid "nothing" msgstr "res" -#: git-add--interactive.perl:291 git-add--interactive.perl:306 +#: git-add--interactive.perl:298 git-add--interactive.perl:313 msgid "unchanged" msgstr "sense canvis" -#: git-add--interactive.perl:602 +#: git-add--interactive.perl:609 #, perl-format msgid "added %d path\n" msgid_plural "added %d paths\n" msgstr[0] "afegit %d camí\n" msgstr[1] "afegits %d camins\n" -#: git-add--interactive.perl:605 +#: git-add--interactive.perl:612 #, perl-format msgid "updated %d path\n" msgid_plural "updated %d paths\n" msgstr[0] "actualitzat %d camí\n" msgstr[1] "actualitzats %d camins\n" -#: git-add--interactive.perl:608 +#: git-add--interactive.perl:615 #, perl-format msgid "reverted %d path\n" msgid_plural "reverted %d paths\n" msgstr[0] "revertit %d camí\n" msgstr[1] "revertits %d camins\n" -#: git-add--interactive.perl:611 +#: git-add--interactive.perl:618 #, perl-format msgid "touched %d path\n" msgid_plural "touched %d paths\n" msgstr[0] "modificat %d camí\n" msgstr[1] "modificat %d camins\n" -#: git-add--interactive.perl:620 +#: git-add--interactive.perl:627 msgid "Update" msgstr "Actualitza" -#: git-add--interactive.perl:632 +#: git-add--interactive.perl:639 msgid "Revert" msgstr "Reverteix" -#: git-add--interactive.perl:655 +#: git-add--interactive.perl:662 #, perl-format msgid "note: %s is untracked now.\n" msgstr "nota: %s està ara sense seguiment.\n" -#: git-add--interactive.perl:666 +#: git-add--interactive.perl:673 msgid "Add untracked" msgstr "Afegeix sense seguiment" -#: git-add--interactive.perl:672 +#: git-add--interactive.perl:679 msgid "No untracked files.\n" msgstr "Sense fitxers no seguits.\n" -#: git-add--interactive.perl:1026 +#: git-add--interactive.perl:1033 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for staging." @@ -16430,7 +19371,7 @@ msgstr "" "Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n" "per «staging»." -#: git-add--interactive.perl:1029 +#: git-add--interactive.perl:1036 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for stashing." @@ -16438,7 +19379,7 @@ msgstr "" "Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n" "per «stashing»." -#: git-add--interactive.perl:1032 +#: git-add--interactive.perl:1039 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for unstaging." @@ -16446,7 +19387,7 @@ msgstr "" "Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n" "per «unstaging»." -#: git-add--interactive.perl:1035 git-add--interactive.perl:1044 +#: git-add--interactive.perl:1042 git-add--interactive.perl:1051 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for applying." @@ -16454,7 +19395,7 @@ msgstr "" "Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n" "per aplicar-se." -#: git-add--interactive.perl:1038 git-add--interactive.perl:1041 +#: git-add--interactive.perl:1045 git-add--interactive.perl:1048 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for discarding." @@ -16462,17 +19403,17 @@ msgstr "" "Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n" "per descartar-se." -#: git-add--interactive.perl:1078 +#: git-add--interactive.perl:1085 #, perl-format msgid "failed to open hunk edit file for writing: %s" msgstr "s'ha produït un error en escriure al fitxer d'edició del tros: %s" -#: git-add--interactive.perl:1079 +#: git-add--interactive.perl:1086 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" -#: git-add--interactive.perl:1085 +#: git-add--interactive.perl:1092 #, perl-format msgid "" "---\n" @@ -16486,7 +19427,7 @@ msgstr "" "Les línies que comencin per %s seran suprimides.\n" #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. -#: git-add--interactive.perl:1093 +#: git-add--interactive.perl:1100 msgid "" "If it does not apply cleanly, you will be given an opportunity to\n" "edit again. If all lines of the hunk are removed, then the edit is\n" @@ -16497,7 +19438,7 @@ msgstr "" "s'avorta\n" "i el tros es deixa sense cap canvi.\n" -#: git-add--interactive.perl:1107 +#: git-add--interactive.perl:1114 #, perl-format msgid "failed to open hunk edit file for reading: %s" msgstr "s'ha produït un error en llegir al fitxer d'edició del tros: %s" @@ -16508,14 +19449,14 @@ msgstr "s'ha produït un error en llegir al fitxer d'edició del tros: %s" #. Consider translating (saying "no" discards!) as #. (saying "n" for "no" discards!) if the translation #. of the word "no" does not start with n. -#: git-add--interactive.perl:1206 +#: git-add--interactive.perl:1213 msgid "" "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " msgstr "" "El tros editat no s'aplica. Editeu-lo de nou (si responeu \"no\" es " "descartarà) [y/n]? " -#: git-add--interactive.perl:1215 +#: git-add--interactive.perl:1222 msgid "" "y - stage this hunk\n" "n - do not stage this hunk\n" @@ -16529,7 +19470,7 @@ msgstr "" "a - fes «stage» d'aquest tros i tota la resta de trossos del fitxer\n" "d - no facis «stage» d'aquest tros o de cap altre restant del fitxer" -#: git-add--interactive.perl:1221 +#: git-add--interactive.perl:1228 msgid "" "y - stash this hunk\n" "n - do not stash this hunk\n" @@ -16543,7 +19484,7 @@ msgstr "" "a - fes «stash» d'aquest tros i tota la resta de trossos del fitxer\n" "d - no facis «stash» d'aquest tros o de cap altre restant del fitxer" -#: git-add--interactive.perl:1227 +#: git-add--interactive.perl:1234 msgid "" "y - unstage this hunk\n" "n - do not unstage this hunk\n" @@ -16557,7 +19498,7 @@ msgstr "" "a - fes «unstage» d'aquest tros i tota la resta de trossos del fitxer\n" "d - no facis «unstage» d'aquest tros o de cap altre restant del fitxer" -#: git-add--interactive.perl:1233 +#: git-add--interactive.perl:1240 msgid "" "y - apply this hunk to index\n" "n - do not apply this hunk to index\n" @@ -16571,7 +19512,7 @@ msgstr "" "a - aplica aquest tros i tots els trossos posteriors en el fitxer\n" "d - no apliquis aquest tros ni cap dels trossos posteriors en el fitxer" -#: git-add--interactive.perl:1239 +#: git-add--interactive.perl:1246 msgid "" "y - discard this hunk from worktree\n" "n - do not discard this hunk from worktree\n" @@ -16585,7 +19526,7 @@ msgstr "" "a - descarta aquest tros i tots els trossos posteriors en el fitxer\n" "d - no descartis aquest tros ni cap dels trossos posteriors en el fitxer" -#: git-add--interactive.perl:1245 +#: git-add--interactive.perl:1252 msgid "" "y - discard this hunk from index and worktree\n" "n - do not discard this hunk from index and worktree\n" @@ -16599,7 +19540,7 @@ msgstr "" "a - descarta aquest tros i tots els trossos posteriors en el fitxer\n" "d - no descartis aquest tros ni cap dels trossos posteriors en el fitxer" -#: git-add--interactive.perl:1251 +#: git-add--interactive.perl:1258 msgid "" "y - apply this hunk to index and worktree\n" "n - do not apply this hunk to index and worktree\n" @@ -16613,7 +19554,7 @@ msgstr "" "a - aplica aquest tros i tots els trossos posteriors en el fitxer\n" "d - no apliquis aquest tros ni cap dels trossos posteriors en el fitxer" -#: git-add--interactive.perl:1266 +#: git-add--interactive.perl:1273 msgid "" "g - select a hunk to go to\n" "/ - search for a hunk matching the given regex\n" @@ -16635,216 +19576,216 @@ msgstr "" "e - edita manualment el tros actual\n" "? - mostra l'ajuda\n" -#: git-add--interactive.perl:1297 +#: git-add--interactive.perl:1304 msgid "The selected hunks do not apply to the index!\n" msgstr "Els trossos seleccionats no apliquen a l'índex\n" -#: git-add--interactive.perl:1298 +#: git-add--interactive.perl:1305 msgid "Apply them to the worktree anyway? " msgstr "Voleu aplicar-los igualment a l'arbre de treball? " -#: git-add--interactive.perl:1301 +#: git-add--interactive.perl:1308 msgid "Nothing was applied.\n" msgstr "No s'ha aplicat res.\n" -#: git-add--interactive.perl:1312 +#: git-add--interactive.perl:1319 #, perl-format msgid "ignoring unmerged: %s\n" msgstr "s'està ignorant %s no fusionat\n" -#: git-add--interactive.perl:1321 +#: git-add--interactive.perl:1328 msgid "Only binary files changed.\n" msgstr "Només s'han canviat els fitxers binaris.\n" -#: git-add--interactive.perl:1323 +#: git-add--interactive.perl:1330 msgid "No changes.\n" msgstr "Sense canvis.\n" -#: git-add--interactive.perl:1331 +#: git-add--interactive.perl:1338 msgid "Patch update" msgstr "Actualització del pedaç" -#: git-add--interactive.perl:1383 +#: git-add--interactive.perl:1390 #, perl-format msgid "Stage mode change [y,n,q,a,d%s,?]? " msgstr "Canvia el mode de «stage» [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1384 +#: git-add--interactive.perl:1391 #, perl-format msgid "Stage deletion [y,n,q,a,d%s,?]? " msgstr "Suprimeix «stage» [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1385 +#: git-add--interactive.perl:1392 #, perl-format msgid "Stage this hunk [y,n,q,a,d%s,?]? " msgstr "Fer un «stage» d'aquest tros [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1388 +#: git-add--interactive.perl:1395 #, perl-format msgid "Stash mode change [y,n,q,a,d%s,?]? " msgstr "Canvia el mode de «stash» [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1389 +#: git-add--interactive.perl:1396 #, perl-format msgid "Stash deletion [y,n,q,a,d%s,?]? " msgstr "Suprimeix «stash» [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1390 +#: git-add--interactive.perl:1397 #, perl-format msgid "Stash this hunk [y,n,q,a,d%s,?]? " msgstr "Fer un «stash» d'aquest tros [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1393 +#: git-add--interactive.perl:1400 #, perl-format msgid "Unstage mode change [y,n,q,a,d%s,?]? " msgstr "Canvia el mode de «unstage» [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1394 +#: git-add--interactive.perl:1401 #, perl-format msgid "Unstage deletion [y,n,q,a,d%s,?]? " msgstr "Suprimeix «Unstage» [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1395 +#: git-add--interactive.perl:1402 #, perl-format msgid "Unstage this hunk [y,n,q,a,d%s,?]? " msgstr "Fer un «unstage» d'aquest tros [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1398 +#: git-add--interactive.perl:1405 #, perl-format msgid "Apply mode change to index [y,n,q,a,d%s,?]? " msgstr "Aplica el canvi de mode a l'índex [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1399 +#: git-add--interactive.perl:1406 #, perl-format msgid "Apply deletion to index [y,n,q,a,d%s,?]? " msgstr "Aplica l'esborrat a l'índex [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1400 +#: git-add--interactive.perl:1407 #, perl-format msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " msgstr "Aplica aquest tros a l'índex [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1403 +#: git-add--interactive.perl:1410 #, perl-format msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " msgstr "Descarta el canvi de mode des de l'arbre de treball [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1404 +#: git-add--interactive.perl:1411 #, perl-format msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " msgstr "Descarta l'esborrat des de l'arbre de treball [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1405 +#: git-add--interactive.perl:1412 #, perl-format msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " msgstr "Descarta aquest tros des de l'arbre de treball [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1408 +#: git-add--interactive.perl:1415 #, perl-format msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " msgstr "" "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 +#: git-add--interactive.perl:1416 #, 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,?]? " -#: git-add--interactive.perl:1410 +#: git-add--interactive.perl:1417 #, perl-format msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " msgstr "" "Descarta aquest tros des de l'índex i l'arbre de treball [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1413 +#: git-add--interactive.perl:1420 #, perl-format msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " msgstr "" "Aplica el canvi de mode a l'índex i l'arbre de treball [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1414 +#: git-add--interactive.perl:1421 #, perl-format msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " msgstr "Aplica la supressió a l'índex i l'arbre de treball [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1415 +#: git-add--interactive.perl:1422 #, perl-format msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " msgstr "Aplica aquest tros a l'índex i l'arbre de treball [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1515 +#: git-add--interactive.perl:1522 msgid "No other hunks to goto\n" msgstr "No hi ha altres trossos on anar-hi\n" -#: git-add--interactive.perl:1522 +#: git-add--interactive.perl:1529 msgid "go to which hunk (<ret> to see more)? " msgstr "ves a quin tros (<ret> per veure'n més)? " -#: git-add--interactive.perl:1524 +#: git-add--interactive.perl:1531 msgid "go to which hunk? " msgstr "ves a quin tros? " -#: git-add--interactive.perl:1533 +#: git-add--interactive.perl:1540 #, perl-format msgid "Invalid number: '%s'\n" msgstr "Número no vàlid: '%s'\n" -#: git-add--interactive.perl:1538 +#: git-add--interactive.perl:1545 #, perl-format msgid "Sorry, only %d hunk available.\n" msgid_plural "Sorry, only %d hunks available.\n" msgstr[0] "Només %d tros disponible.\n" msgstr[1] "Només %d trossos disponibles.\n" -#: git-add--interactive.perl:1564 +#: git-add--interactive.perl:1571 msgid "No other hunks to search\n" msgstr "No hi ha cap altre tros a cercar\n" -#: git-add--interactive.perl:1568 +#: git-add--interactive.perl:1575 msgid "search for regex? " msgstr "Cerca per expressió regular? " -#: git-add--interactive.perl:1581 +#: git-add--interactive.perl:1588 #, perl-format msgid "Malformed search regexp %s: %s\n" msgstr "Expressió regular de cerca mal formada %s: %s\n" -#: git-add--interactive.perl:1591 +#: git-add--interactive.perl:1598 msgid "No hunk matches the given pattern\n" msgstr "No hi ha trossos que coincideixin amb el patró donat\n" -#: git-add--interactive.perl:1603 git-add--interactive.perl:1625 +#: git-add--interactive.perl:1610 git-add--interactive.perl:1632 msgid "No previous hunk\n" msgstr "Sense tros previ\n" -#: git-add--interactive.perl:1612 git-add--interactive.perl:1631 +#: git-add--interactive.perl:1619 git-add--interactive.perl:1638 msgid "No next hunk\n" msgstr "No hi ha tros següent\n" -#: git-add--interactive.perl:1637 +#: git-add--interactive.perl:1644 msgid "Sorry, cannot split this hunk\n" msgstr "No es pot dividir aquest tros\n" -#: git-add--interactive.perl:1643 +#: git-add--interactive.perl:1650 #, perl-format msgid "Split into %d hunk.\n" msgid_plural "Split into %d hunks.\n" msgstr[0] "Divideix en %d tros.\n" msgstr[1] "Divideix en %d trossos.\n" -#: git-add--interactive.perl:1653 +#: git-add--interactive.perl:1660 msgid "Sorry, cannot edit this hunk\n" msgstr "No es pot editar aquest tros\n" -#: git-add--interactive.perl:1699 +#: git-add--interactive.perl:1706 msgid "Review diff" msgstr "Reviseu les diferències" #. TRANSLATORS: please do not translate the command names #. 'status', 'update', 'revert', etc. -#: git-add--interactive.perl:1718 +#: git-add--interactive.perl:1725 msgid "" "status - show paths with changes\n" "update - add working tree state to the staged set of changes\n" @@ -16863,18 +19804,18 @@ msgstr "" "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 -#: git-add--interactive.perl:1754 git-add--interactive.perl:1760 +#: git-add--interactive.perl:1742 git-add--interactive.perl:1747 +#: git-add--interactive.perl:1750 git-add--interactive.perl:1757 +#: git-add--interactive.perl:1761 git-add--interactive.perl:1767 msgid "missing --" msgstr "manca --" -#: git-add--interactive.perl:1756 +#: git-add--interactive.perl:1763 #, perl-format msgid "unknown --patch mode: %s" msgstr "desconegut --patch mode: %s" -#: git-add--interactive.perl:1762 git-add--interactive.perl:1768 +#: git-add--interactive.perl:1769 git-add--interactive.perl:1775 #, perl-format msgid "invalid argument %s, expecting --" msgstr "argument %s no vàlid, s'esperava --" @@ -17087,7 +20028,7 @@ msgstr "Què cal fer amb aquesta adreça? ([q]surt|[d]escarta|[e]dita): " msgid "CA path \"%s\" does not exist" msgstr "el camí CA \"%s\" no existeix" -#: git-send-email.perl:1395 +#: git-send-email.perl:1400 msgid "" " The Cc list above has been expanded by additional\n" " addresses found in the patch commit message. By default\n" @@ -17111,133 +20052,183 @@ msgstr "" " missatge, executeu 'git config --global sendemail.confirm auto'.\n" "\n" -#. TRANSLATORS: Make sure to include [y] [n] [q] [a] in your +#. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:1410 -msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): " +#: git-send-email.perl:1415 +#, fuzzy +msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): " msgstr "Voleu enviar aquest correu electrònic? ([y]sí|[n]o|[q]surt|[a]tot): " -#: git-send-email.perl:1413 +#: git-send-email.perl:1418 msgid "Send this email reply required" msgstr "Requereix resposta en enviar el correu" -#: git-send-email.perl:1439 +#: git-send-email.perl:1446 msgid "The required SMTP server is not properly defined." msgstr "El servidor SMTP requerit no està correctament definit." -#: git-send-email.perl:1486 +#: git-send-email.perl:1493 #, perl-format msgid "Server does not support STARTTLS! %s" msgstr "El servidor no admet STARTTLS! %s" -#: git-send-email.perl:1491 git-send-email.perl:1495 +#: git-send-email.perl:1498 git-send-email.perl:1502 #, perl-format msgid "STARTTLS failed! %s" msgstr "STARTTLS ha fallat! %s" -#: git-send-email.perl:1505 +#: git-send-email.perl:1511 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." -#: git-send-email.perl:1523 +#: git-send-email.perl:1529 #, perl-format msgid "Failed to send %s\n" msgstr "S'ha produït un error en enviar %s\n" -#: git-send-email.perl:1526 +#: git-send-email.perl:1532 #, perl-format msgid "Dry-Sent %s\n" msgstr "Simulació d'enviament %s\n" -#: git-send-email.perl:1526 +#: git-send-email.perl:1532 #, perl-format msgid "Sent %s\n" msgstr "Enviat %s\n" -#: git-send-email.perl:1528 +#: git-send-email.perl:1534 msgid "Dry-OK. Log says:\n" msgstr "Simulació de correcte. El registre diu:\n" -#: git-send-email.perl:1528 +#: git-send-email.perl:1534 msgid "OK. Log says:\n" msgstr "Correcte. El registre diu: \n" -#: git-send-email.perl:1540 +#: git-send-email.perl:1546 msgid "Result: " msgstr "Resultat: " -#: git-send-email.perl:1543 +#: git-send-email.perl:1549 msgid "Result: OK\n" msgstr "Resultat: correcte\n" -#: git-send-email.perl:1556 +#: git-send-email.perl:1567 #, perl-format msgid "can't open file %s" msgstr "no es pot obrir el fitxer %s" -#: git-send-email.perl:1603 git-send-email.perl:1623 +#: git-send-email.perl:1614 git-send-email.perl:1634 #, perl-format msgid "(mbox) Adding cc: %s from line '%s'\n" msgstr "(mbox) S'està afegint cc: %s des de la línia «%s»\n" -#: git-send-email.perl:1609 +#: git-send-email.perl:1620 #, perl-format msgid "(mbox) Adding to: %s from line '%s'\n" msgstr "(mbox) S'està afegint a: %s des de la línia «%s»\n" -#: git-send-email.perl:1657 +#: git-send-email.perl:1673 #, perl-format msgid "(non-mbox) Adding cc: %s from line '%s'\n" msgstr "(no mbox) S'està afegint cc: %s des de la línia «%s»\n" -#: git-send-email.perl:1682 +#: git-send-email.perl:1698 #, perl-format msgid "(body) Adding cc: %s from line '%s'\n" msgstr "(cos) S'està afegint cc: %s des de la línia «%s»\n" -#: git-send-email.perl:1788 +#: git-send-email.perl:1809 #, perl-format msgid "(%s) Could not execute '%s'" msgstr "(%s) no s'ha pogut executar «%s»" -#: git-send-email.perl:1795 +#: git-send-email.perl:1816 #, perl-format msgid "(%s) Adding %s: %s from: '%s'\n" msgstr "(%s) S'està afegint %s: %s des de: «%s»\n" -#: git-send-email.perl:1799 +#: git-send-email.perl:1820 #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "(%s) s'ha produït un error en tancar el conducte «%s»" -#: git-send-email.perl:1826 +#: git-send-email.perl:1850 msgid "cannot send message as 7bit" msgstr "no es pot enviar el missatge en 7 bits" -#: git-send-email.perl:1834 +#: git-send-email.perl:1858 msgid "invalid transfer encoding" msgstr "codificació de transferència no vàlida" -#: git-send-email.perl:1872 git-send-email.perl:1923 git-send-email.perl:1933 +#: git-send-email.perl:1899 git-send-email.perl:1951 git-send-email.perl:1961 #, perl-format msgid "unable to open %s: %s\n" msgstr "no s'ha pogut obrir %s: %s\n" -#: git-send-email.perl:1875 +#: git-send-email.perl:1902 #, perl-format msgid "%s: patch contains a line longer than 998 characters" msgstr "%s: el pedaç conté una línia més gran de 998 caràcters" -#: git-send-email.perl:1891 +#: git-send-email.perl:1919 #, perl-format msgid "Skipping %s with backup suffix '%s'.\n" msgstr "S'està ometent %s amb el sufix de còpia de seguretat «%s».\n" #. TRANSLATORS: please keep "[y|N]" as is. -#: git-send-email.perl:1895 +#: git-send-email.perl:1923 #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "Esteu segur que voleu enviar %s? [y|N]: " + +#~ msgid "Dirty index: cannot merge (dirty: %s)" +#~ msgstr "Índex brut: no es pot fusionar (bruts: %s)" + +#~ msgid "" +#~ "unexpected 1st line of squash message:\n" +#~ "\n" +#~ "\t%.*s" +#~ msgstr "" +#~ "Primera línia del missatge de «squash» no esperada:\n" +#~ "\n" +#~ "\t%.*s" + +#~ msgid "" +#~ "invalid 1st line of squash message:\n" +#~ "\n" +#~ "\t%.*s" +#~ msgstr "" +#~ "Primera línia del missatge de «squash» no vàlida:\n" +#~ "\n" +#~ "\t%.*s" + +#~ msgid "BUG: returned path string doesn't match cwd?" +#~ msgstr "ERRADA: la cadena del camí retornada no coincideix amb cwd?" + +#~ msgid "(+/-)x" +#~ msgstr "(+/-)x" + +#~ msgid "<command>" +#~ msgstr "<command>" + +#~ msgid "Everyday Git With 20 Commands Or So" +#~ msgstr "Git quotidià amb més o menys 20 ordres" + +#~ msgid "Error in object" +#~ msgstr "Error en objecte" + +#~ msgid "push|fetch" +#~ msgstr "push|fetch" + +#~ msgid "w[,i1[,i2]]" +#~ msgstr "w[,i1[,i2]]" + +#~ msgid "Entering '$displaypath'" +#~ msgstr "S'està entrant '$displaypath'" + +#~ msgid "Stopping at '$displaypath'; script returned non-zero status." +#~ msgstr "" +#~ "S'està aturant a '$displaypath'; l'script ha retornat un estat no zero." @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2018-05-31 23:32+0800\n" +"POT-Creation-Date: 2018-09-04 08:50+0800\n" "PO-Revision-Date: 2016-11-28 18:10+0100\n" "Last-Translator: Ralf Thielow <ralf.thielow@gmail.com>\n" "Language-Team: German <>\n" @@ -17,43 +17,43 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n!=1);\n" -#: advice.c:92 +#: advice.c:97 #, c-format msgid "%shint: %.*s%s\n" msgstr "%sHinweis: %.*s%s\n" -#: advice.c:137 +#: advice.c:150 msgid "Cherry-picking is not possible because you have unmerged files." msgstr "" "Cherry-Picken ist nicht möglich, weil Sie nicht zusammengeführte Dateien " "haben." -#: advice.c:139 +#: advice.c:152 msgid "Committing is not possible because you have unmerged files." msgstr "" "Committen ist nicht möglich, weil Sie nicht zusammengeführte Dateien haben." -#: advice.c:141 +#: advice.c:154 msgid "Merging is not possible because you have unmerged files." msgstr "" "Mergen ist nicht möglich, weil Sie nicht zusammengeführte Dateien haben." -#: advice.c:143 +#: advice.c:156 msgid "Pulling is not possible because you have unmerged files." msgstr "" "Pullen ist nicht möglich, weil Sie nicht zusammengeführte Dateien haben." -#: advice.c:145 +#: advice.c:158 msgid "Reverting is not possible because you have unmerged files." msgstr "" "Reverten ist nicht möglich, weil Sie nicht zusammengeführte Dateien haben." -#: advice.c:147 +#: advice.c:160 #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "%s ist nicht möglich, weil Sie nicht zusammengeführte Dateien haben." -#: advice.c:155 +#: advice.c:168 msgid "" "Fix them up in the work tree, and then use 'git add/rm <file>'\n" "as appropriate to mark resolution and make a commit." @@ -62,23 +62,23 @@ msgstr "" "dann 'git add/rm <Datei>', um die Auflösung entsprechend zu markieren\n" "und zu committen." -#: advice.c:163 +#: advice.c:176 msgid "Exiting because of an unresolved conflict." msgstr "Beende wegen unaufgelöstem Konflikt." -#: advice.c:168 builtin/merge.c:1249 +#: advice.c:181 builtin/merge.c:1286 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Sie haben Ihren Merge nicht abgeschlossen (MERGE_HEAD existiert)." -#: advice.c:170 +#: advice.c:183 msgid "Please, commit your changes before merging." msgstr "Bitte committen Sie Ihre Änderungen, bevor Sie mergen." -#: advice.c:171 +#: advice.c:184 msgid "Exiting because of unfinished merge." msgstr "Beende wegen nicht abgeschlossenem Merge." -#: advice.c:177 +#: advice.c:190 #, c-format msgid "" "Note: checking out '%s'.\n" @@ -109,99 +109,99 @@ msgstr "" " git checkout -b <neuer-Branchname>\n" "\n" -#: apply.c:58 +#: apply.c:59 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "nicht erkannte Whitespace-Option: '%s'" -#: apply.c:74 +#: apply.c:75 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "nicht erkannte Option zum Ignorieren von Whitespace: '%s'" -#: apply.c:122 +#: apply.c:125 msgid "--reject and --3way cannot be used together." msgstr "--reject und --3way können nicht gemeinsam verwendet werden." -#: apply.c:124 +#: apply.c:127 msgid "--cached and --3way cannot be used together." msgstr "--cached und --3way können nicht gemeinsam verwendet werden." -#: apply.c:127 +#: apply.c:130 msgid "--3way outside a repository" msgstr "" "Die Option --3way kann nicht außerhalb eines Repositories verwendet werden." -#: apply.c:138 +#: apply.c:141 msgid "--index outside a repository" msgstr "" "Die Option --index kann nicht außerhalb eines Repositories verwendet werden." -#: apply.c:141 +#: apply.c:144 msgid "--cached outside a repository" msgstr "" "Die Option --cached kann nicht außerhalb eines Repositories verwendet werden." -#: apply.c:821 +#: apply.c:826 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "Kann regulären Ausdruck für Zeitstempel %s nicht verarbeiten" -#: apply.c:830 +#: apply.c:835 #, c-format msgid "regexec returned %d for input: %s" msgstr "Ausführung des regulären Ausdrucks gab %d zurück. Eingabe: %s" -#: apply.c:904 +#: apply.c:909 #, c-format msgid "unable to find filename in patch at line %d" msgstr "Konnte keinen Dateinamen in Zeile %d des Patches finden." -#: apply.c:942 +#: apply.c:947 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "" "git apply: ungültiges 'git-diff' - erwartete /dev/null, erhielt %s in Zeile " "%d" -#: apply.c:948 +#: apply.c:953 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "" "git apply: ungültiges 'git-diff' - Inkonsistenter neuer Dateiname in Zeile %d" -#: apply.c:949 +#: apply.c:954 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "" "git apply: ungültiges 'git-diff' - Inkonsistenter alter Dateiname in Zeile %d" -#: apply.c:954 +#: apply.c:959 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "git apply: ungültiges 'git-diff' - erwartete /dev/null in Zeile %d" -#: apply.c:983 +#: apply.c:988 #, c-format msgid "invalid mode on line %d: %s" msgstr "Ungültiger Modus in Zeile %d: %s" -#: apply.c:1301 +#: apply.c:1306 #, c-format msgid "inconsistent header lines %d and %d" msgstr "Inkonsistente Kopfzeilen %d und %d." -#: apply.c:1473 +#: apply.c:1478 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recount: unerwartete Zeile: %.*s" -#: apply.c:1542 +#: apply.c:1547 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "Patch-Fragment ohne Kopfbereich bei Zeile %d: %.*s" -#: apply.c:1562 +#: apply.c:1567 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -216,72 +216,72 @@ msgstr[1] "" "Dem Kopfbereich von \"git diff\" fehlen Informationen zum Dateinamen, wenn " "%d vorangestellte Teile des Pfades entfernt werden (Zeile %d)" -#: apply.c:1575 +#: apply.c:1580 #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "" "Dem Kopfbereich von \"git diff\" fehlen Informationen zum Dateinamen (Zeile " "%d)" -#: apply.c:1763 +#: apply.c:1768 msgid "new file depends on old contents" msgstr "neue Datei hängt von alten Inhalten ab" -#: apply.c:1765 +#: apply.c:1770 msgid "deleted file still has contents" msgstr "entfernte Datei hat noch Inhalte" -#: apply.c:1799 +#: apply.c:1804 #, c-format msgid "corrupt patch at line %d" msgstr "fehlerhafter Patch bei Zeile %d" -#: apply.c:1836 +#: apply.c:1841 #, c-format msgid "new file %s depends on old contents" msgstr "neue Datei %s hängt von alten Inhalten ab" -#: apply.c:1838 +#: apply.c:1843 #, c-format msgid "deleted file %s still has contents" msgstr "entfernte Datei %s hat noch Inhalte" -#: apply.c:1841 +#: apply.c:1846 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** Warnung: Datei %s wird leer, aber nicht entfernt." -#: apply.c:1988 +#: apply.c:1993 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "fehlerhafter Binär-Patch bei Zeile %d: %.*s" -#: apply.c:2025 +#: apply.c:2030 #, c-format msgid "unrecognized binary patch at line %d" msgstr "nicht erkannter Binär-Patch bei Zeile %d" -#: apply.c:2185 +#: apply.c:2190 #, c-format msgid "patch with only garbage at line %d" msgstr "Patch mit nutzlosen Informationen bei Zeile %d" -#: apply.c:2271 +#: apply.c:2276 #, c-format msgid "unable to read symlink %s" msgstr "konnte symbolische Verknüpfung %s nicht lesen" -#: apply.c:2275 +#: apply.c:2280 #, c-format msgid "unable to open or read %s" msgstr "konnte %s nicht öffnen oder lesen" -#: apply.c:2934 +#: apply.c:2939 #, c-format msgid "invalid start of line: '%c'" msgstr "Ungültiger Zeilenanfang: '%c'" -#: apply.c:3055 +#: apply.c:3060 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." @@ -289,12 +289,12 @@ msgstr[0] "Patch-Bereich #%d erfolgreich angewendet bei %d (%d Zeile versetzt)" msgstr[1] "" "Patch-Bereich #%d erfolgreich angewendet bei %d (%d Zeilen versetzt)" -#: apply.c:3067 +#: apply.c:3072 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "Kontext reduziert zu (%ld/%ld), um Patch-Bereich bei %d anzuwenden" -#: apply.c:3073 +#: apply.c:3078 #, c-format msgid "" "while searching for:\n" @@ -303,25 +303,25 @@ msgstr "" "bei der Suche nach:\n" "%.*s" -#: apply.c:3095 +#: apply.c:3100 #, c-format msgid "missing binary patch data for '%s'" msgstr "keine Daten in Binär-Patch für '%s'" -#: apply.c:3103 +#: apply.c:3108 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "" "kann binären Patch nicht in umgekehrter Reihenfolge anwenden ohne einen\n" "umgekehrten Patch-Block auf '%s'" -#: apply.c:3149 +#: apply.c:3154 #, c-format msgid "cannot apply binary patch to '%s' without full index line" msgstr "" "kann binären Patch auf '%s' nicht ohne eine vollständige Index-Zeile anwenden" -#: apply.c:3159 +#: apply.c:3164 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." @@ -329,554 +329,608 @@ msgstr "" "der Patch wird angewendet auf '%s' (%s), was nicht den aktuellen Inhalten\n" "entspricht" -#: apply.c:3167 +#: apply.c:3172 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "der Patch wird auf ein leeres '%s' angewendet, was aber nicht leer ist" -#: apply.c:3185 +#: apply.c:3190 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "das erforderliche Postimage %s für '%s' kann nicht gelesen werden" -#: apply.c:3198 +#: apply.c:3203 #, c-format msgid "binary patch does not apply to '%s'" msgstr "Konnte Binär-Patch nicht auf '%s' anwenden" -#: apply.c:3204 +#: apply.c:3209 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" "Binär-Patch für '%s' erzeugt falsches Ergebnis (erwartete %s, bekam %s)" -#: apply.c:3225 +#: apply.c:3230 #, c-format msgid "patch failed: %s:%ld" msgstr "Anwendung des Patches fehlgeschlagen: %s:%ld" -#: apply.c:3347 +#: apply.c:3352 #, c-format msgid "cannot checkout %s" msgstr "kann %s nicht auschecken" -#: apply.c:3396 apply.c:3407 apply.c:3453 setup.c:278 +#: apply.c:3404 apply.c:3415 apply.c:3461 setup.c:278 #, c-format msgid "failed to read %s" msgstr "Fehler beim Lesen von %s" -#: apply.c:3404 +#: apply.c:3412 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "'%s' ist hinter einer symbolischen Verknüpfung" -#: apply.c:3433 apply.c:3673 +#: apply.c:3441 apply.c:3681 #, c-format msgid "path %s has been renamed/deleted" msgstr "Pfad %s wurde umbenannt/gelöscht" -#: apply.c:3516 apply.c:3687 +#: apply.c:3524 apply.c:3696 #, c-format msgid "%s: does not exist in index" msgstr "%s ist nicht im Index" -#: apply.c:3525 apply.c:3695 +#: apply.c:3533 apply.c:3704 #, c-format msgid "%s: does not match index" msgstr "%s entspricht nicht der Version im Index" -#: apply.c:3560 +#: apply.c:3568 msgid "repository lacks the necessary blob to fall back on 3-way merge." msgstr "" "Dem Repository fehlt der notwendige Blob, um auf einen 3-Wege-Merge\n" "zurückzufallen." -#: apply.c:3563 +#: apply.c:3571 #, c-format msgid "Falling back to three-way merge...\n" msgstr "Falle zurück auf 3-Wege-Merge ...\n" -#: apply.c:3579 apply.c:3583 +#: apply.c:3587 apply.c:3591 #, c-format msgid "cannot read the current contents of '%s'" msgstr "kann aktuelle Inhalte von '%s' nicht lesen" -#: apply.c:3595 +#: apply.c:3603 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "Fehler beim Zurückfallen auf 3-Wege-Merge...\n" -#: apply.c:3609 +#: apply.c:3617 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "Patch auf '%s' mit Konflikten angewendet.\n" -#: apply.c:3614 +#: apply.c:3622 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "Patch auf '%s' sauber angewendet.\n" -#: apply.c:3640 +#: apply.c:3648 msgid "removal patch leaves file contents" msgstr "Lösch-Patch hinterlässt Dateiinhalte" -#: apply.c:3712 +#: apply.c:3721 #, c-format msgid "%s: wrong type" msgstr "%s: falscher Typ" -#: apply.c:3714 +#: apply.c:3723 #, c-format msgid "%s has type %o, expected %o" msgstr "%s ist vom Typ %o, erwartete %o" -#: apply.c:3864 apply.c:3866 +#: apply.c:3874 apply.c:3876 #, c-format msgid "invalid path '%s'" msgstr "Ungültiger Pfad '%s'" -#: apply.c:3922 +#: apply.c:3932 #, c-format msgid "%s: already exists in index" msgstr "%s ist bereits bereitgestellt" -#: apply.c:3925 +#: apply.c:3935 #, c-format msgid "%s: already exists in working directory" msgstr "%s existiert bereits im Arbeitsverzeichnis" -#: apply.c:3945 +#: apply.c:3955 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "neuer Modus (%o) von %s entspricht nicht dem alten Modus (%o)" -#: apply.c:3950 +#: apply.c:3960 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "neuer Modus (%o) von %s entspricht nicht dem alten Modus (%o) von %s" -#: apply.c:3970 +#: apply.c:3980 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "betroffene Datei '%s' ist hinter einer symbolischen Verknüpfung" -#: apply.c:3974 +#: apply.c:3984 #, c-format msgid "%s: patch does not apply" msgstr "%s: Patch konnte nicht angewendet werden" -#: apply.c:3989 +#: apply.c:3999 #, c-format msgid "Checking patch %s..." msgstr "Prüfe Patch %s ..." -#: apply.c:4080 +#: apply.c:4091 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "SHA-1 Information fehlt oder ist unbrauchbar für Submodul %s" -#: apply.c:4087 +#: apply.c:4098 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "Modusänderung für %s, was sich nicht im aktuellen HEAD befindet" -#: apply.c:4090 +#: apply.c:4101 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "SHA-1 Information fehlt oder ist unbrauchbar (%s)." -#: apply.c:4095 builtin/checkout.c:235 builtin/reset.c:140 +#: apply.c:4106 builtin/checkout.c:237 builtin/reset.c:140 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "make_cache_entry für Pfad '%s' fehlgeschlagen" -#: apply.c:4099 +#: apply.c:4110 #, c-format msgid "could not add %s to temporary index" msgstr "konnte %s nicht zum temporären Index hinzufügen" -#: apply.c:4109 +#: apply.c:4120 #, c-format msgid "could not write temporary index to %s" msgstr "konnte temporären Index nicht nach %s schreiben" -#: apply.c:4247 +#: apply.c:4258 #, c-format msgid "unable to remove %s from index" msgstr "konnte %s nicht aus dem Index entfernen" -#: apply.c:4282 +#: apply.c:4292 #, c-format msgid "corrupt patch for submodule %s" msgstr "fehlerhafter Patch für Submodul %s" -#: apply.c:4288 +#: apply.c:4298 #, c-format msgid "unable to stat newly created file '%s'" msgstr "konnte neu erstellte Datei '%s' nicht lesen" -#: apply.c:4296 +#: apply.c:4306 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "kann internen Speicher für eben erstellte Datei %s nicht erzeugen" -#: apply.c:4302 apply.c:4446 +#: apply.c:4312 apply.c:4457 #, c-format msgid "unable to add cache entry for %s" msgstr "kann für %s keinen Eintrag in den Zwischenspeicher hinzufügen" -#: apply.c:4343 +#: apply.c:4355 #, c-format msgid "failed to write to '%s'" msgstr "Fehler beim Schreiben nach '%s'" -#: apply.c:4347 +#: apply.c:4359 #, c-format msgid "closing file '%s'" msgstr "schließe Datei '%s'" -#: apply.c:4417 +#: apply.c:4429 #, c-format msgid "unable to write file '%s' mode %o" msgstr "konnte Datei '%s' mit Modus %o nicht schreiben" -#: apply.c:4515 +#: apply.c:4527 #, c-format msgid "Applied patch %s cleanly." msgstr "Patch %s sauber angewendet" -#: apply.c:4523 +#: apply.c:4535 msgid "internal error" msgstr "interner Fehler" -#: apply.c:4526 +#: apply.c:4538 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "Wende Patch %%s mit %d Zurückweisung an..." msgstr[1] "Wende Patch %%s mit %d Zurückweisungen an..." -#: apply.c:4537 +#: apply.c:4549 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "Verkürze Name von .rej Datei zu %.*s.rej" -#: apply.c:4545 builtin/fetch.c:786 builtin/fetch.c:1036 +#: apply.c:4557 builtin/fetch.c:780 builtin/fetch.c:1048 #, c-format msgid "cannot open %s" msgstr "kann '%s' nicht öffnen" -#: apply.c:4559 +#: apply.c:4571 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Patch-Bereich #%d sauber angewendet." -#: apply.c:4563 +#: apply.c:4575 #, c-format msgid "Rejected hunk #%d." msgstr "Patch-Block #%d zurückgewiesen." -#: apply.c:4673 +#: apply.c:4685 #, c-format msgid "Skipped patch '%s'." msgstr "Patch '%s' ausgelassen." -#: apply.c:4681 +#: apply.c:4693 msgid "unrecognized input" msgstr "nicht erkannte Eingabe" -#: apply.c:4700 +#: apply.c:4712 msgid "unable to read index file" msgstr "Konnte Index-Datei nicht lesen" -#: apply.c:4837 +#: apply.c:4849 #, c-format msgid "can't open patch '%s': %s" msgstr "kann Patch '%s' nicht öffnen: %s" -#: apply.c:4864 +#: apply.c:4876 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "unterdrückte %d Whitespace-Fehler" msgstr[1] "unterdrückte %d Whitespace-Fehler" -#: apply.c:4870 apply.c:4885 +#: apply.c:4882 apply.c:4897 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "%d Zeile fügt Whitespace-Fehler hinzu." msgstr[1] "%d Zeilen fügen Whitespace-Fehler hinzu." -#: apply.c:4878 +#: apply.c:4890 #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." msgstr[0] "%d Zeile nach Behebung von Whitespace-Fehlern angewendet." msgstr[1] "%d Zeilen nach Behebung von Whitespace-Fehlern angewendet." -#: apply.c:4894 builtin/add.c:538 builtin/mv.c:300 builtin/rm.c:389 +#: apply.c:4906 builtin/add.c:539 builtin/mv.c:300 builtin/rm.c:389 msgid "Unable to write new index file" msgstr "Konnte neue Index-Datei nicht schreiben." -#: apply.c:4921 apply.c:4924 builtin/am.c:2254 builtin/am.c:2257 -#: builtin/clone.c:120 builtin/fetch.c:126 builtin/pull.c:198 -#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1210 -#: builtin/submodule--helper.c:1213 builtin/submodule--helper.c:1584 -#: builtin/submodule--helper.c:1587 builtin/submodule--helper.c:1807 -#: git-add--interactive.perl:197 +#: apply.c:4933 apply.c:4936 builtin/am.c:2254 builtin/am.c:2257 +#: builtin/clone.c:121 builtin/fetch.c:115 builtin/merge.c:260 +#: builtin/pull.c:198 builtin/submodule--helper.c:406 +#: builtin/submodule--helper.c:1355 builtin/submodule--helper.c:1358 +#: builtin/submodule--helper.c:1729 builtin/submodule--helper.c:1732 +#: builtin/submodule--helper.c:1952 git-add--interactive.perl:197 msgid "path" msgstr "Pfad" -#: apply.c:4922 +#: apply.c:4934 msgid "don't apply changes matching the given path" msgstr "keine Änderungen im angegebenen Pfad anwenden" -#: apply.c:4925 +#: apply.c:4937 msgid "apply changes matching the given path" msgstr "Änderungen nur im angegebenen Pfad anwenden" -#: apply.c:4927 builtin/am.c:2263 +#: apply.c:4939 builtin/am.c:2263 msgid "num" msgstr "Anzahl" -#: apply.c:4928 +#: apply.c:4940 msgid "remove <num> leading slashes from traditional diff paths" msgstr "" "<Anzahl> vorangestellte Schrägstriche von herkömmlichen Differenzpfaden " "entfernen" -#: apply.c:4931 +#: apply.c:4943 msgid "ignore additions made by the patch" msgstr "hinzugefügte Zeilen des Patches ignorieren" -#: apply.c:4933 +#: apply.c:4945 msgid "instead of applying the patch, output diffstat for the input" msgstr "" "anstatt der Anwendung des Patches, den \"diffstat\" für die Eingabe " "ausgegeben" -#: apply.c:4937 +#: apply.c:4949 msgid "show number of added and deleted lines in decimal notation" msgstr "" "die Anzahl von hinzugefügten/entfernten Zeilen in Dezimalnotation anzeigen" -#: apply.c:4939 +#: apply.c:4951 msgid "instead of applying the patch, output a summary for the input" msgstr "" "anstatt der Anwendung des Patches, eine Zusammenfassung für die Eingabe " "ausgeben" -#: apply.c:4941 +#: apply.c:4953 msgid "instead of applying the patch, see if the patch is applicable" msgstr "" "anstatt der Anwendung des Patches, zeige ob Patch angewendet werden kann" -#: apply.c:4943 +#: apply.c:4955 msgid "make sure the patch is applicable to the current index" msgstr "" "sicherstellen, dass der Patch mit dem aktuellen Index angewendet werden kann" -#: apply.c:4945 +#: apply.c:4957 +msgid "mark new files with `git add --intent-to-add`" +msgstr "neue Dateien mit `git add --intent-to-add` markieren" + +#: apply.c:4959 msgid "apply a patch without touching the working tree" msgstr "Patch anwenden, ohne Änderungen im Arbeitsverzeichnis vorzunehmen" -#: apply.c:4947 +#: apply.c:4961 msgid "accept a patch that touches outside the working area" msgstr "" "Patch anwenden, der Änderungen außerhalb des Arbeitsverzeichnisses vornimmt" -#: apply.c:4950 +#: apply.c:4964 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "Patch anwenden (Benutzung mit --stat/--summary/--check)" -#: apply.c:4952 +#: apply.c:4966 msgid "attempt three-way merge if a patch does not apply" msgstr "versuche 3-Wege-Merge, wenn der Patch nicht angewendet werden konnte" -#: apply.c:4954 +#: apply.c:4968 msgid "build a temporary index based on embedded index information" msgstr "" "einen temporären Index, basierend auf den integrierten Index-Informationen, " "erstellen" -#: apply.c:4957 builtin/checkout-index.c:168 builtin/ls-files.c:515 +#: apply.c:4971 builtin/checkout-index.c:168 builtin/ls-files.c:516 msgid "paths are separated with NUL character" msgstr "Pfade sind getrennt durch NUL Zeichen" -#: apply.c:4959 +#: apply.c:4973 msgid "ensure at least <n> lines of context match" msgstr "" "sicher stellen, dass mindestens <n> Zeilen des Kontextes übereinstimmen" -#: apply.c:4960 builtin/am.c:2242 builtin/interpret-trailers.c:95 +#: apply.c:4974 builtin/am.c:2242 builtin/interpret-trailers.c:95 #: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99 -#: builtin/pack-objects.c:3177 +#: builtin/pack-objects.c:3202 msgid "action" msgstr "Aktion" -#: apply.c:4961 +#: apply.c:4975 msgid "detect new or modified lines that have whitespace errors" msgstr "neue oder geänderte Zeilen, die Whitespace-Fehler haben, ermitteln" -#: apply.c:4964 apply.c:4967 +#: apply.c:4978 apply.c:4981 msgid "ignore changes in whitespace when finding context" msgstr "Änderungen im Whitespace bei der Suche des Kontextes ignorieren" -#: apply.c:4970 +#: apply.c:4984 msgid "apply the patch in reverse" msgstr "den Patch in umgekehrter Reihenfolge anwenden" -#: apply.c:4972 +#: apply.c:4986 msgid "don't expect at least one line of context" msgstr "keinen Kontext erwarten" -#: apply.c:4974 +#: apply.c:4988 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "" "zurückgewiesene Patch-Blöcke in entsprechenden *.rej Dateien hinterlassen" -#: apply.c:4976 +#: apply.c:4990 msgid "allow overlapping hunks" msgstr "sich überlappende Patch-Blöcke erlauben" -#: apply.c:4977 builtin/add.c:290 builtin/check-ignore.c:21 -#: builtin/commit.c:1301 builtin/count-objects.c:98 builtin/fsck.c:666 -#: builtin/log.c:1901 builtin/mv.c:122 builtin/read-tree.c:124 +#: apply.c:4991 builtin/add.c:290 builtin/check-ignore.c:21 +#: builtin/commit.c:1301 builtin/count-objects.c:98 builtin/fsck.c:671 +#: builtin/log.c:1914 builtin/mv.c:122 builtin/read-tree.c:124 msgid "be verbose" msgstr "erweiterte Ausgaben" -#: apply.c:4979 +#: apply.c:4993 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "fehlerhaft erkannten fehlenden Zeilenumbruch am Dateiende tolerieren" -#: apply.c:4982 +#: apply.c:4996 msgid "do not trust the line counts in the hunk headers" msgstr "den Zeilennummern im Kopf des Patch-Blocks nicht vertrauen" -#: apply.c:4984 builtin/am.c:2251 +#: apply.c:4998 builtin/am.c:2251 msgid "root" msgstr "Wurzelverzeichnis" -#: apply.c:4985 +#: apply.c:4999 msgid "prepend <root> to all filenames" msgstr "<Wurzelverzeichnis> vor alle Dateinamen stellen" -#: archive.c:13 +#: archive.c:14 msgid "git archive [<options>] <tree-ish> [<path>...]" msgstr "git archive [<Optionen>] <Commit-Referenz> [<Pfad>...]" -#: archive.c:14 +#: archive.c:15 msgid "git archive --list" msgstr "git archive --list" -#: archive.c:15 +#: archive.c:16 msgid "" "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]" msgstr "" "git archive --remote <Repository> [--exec <Programm>] [<Optionen>] <Commit-" "Referenz> [<Pfad>...]" -#: archive.c:16 +#: archive.c:17 msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <Repository> [--exec <Programm>] --list" -#: archive.c:351 builtin/add.c:176 builtin/add.c:514 builtin/rm.c:298 +#: archive.c:363 builtin/add.c:176 builtin/add.c:515 builtin/rm.c:298 #, c-format msgid "pathspec '%s' did not match any files" msgstr "Pfadspezifikation '%s' stimmt mit keinen Dateien überein" -#: archive.c:436 +#: archive.c:446 msgid "fmt" msgstr "Format" -#: archive.c:436 +#: archive.c:446 msgid "archive format" msgstr "Archivformat" -#: archive.c:437 builtin/log.c:1462 +#: archive.c:447 builtin/log.c:1473 msgid "prefix" msgstr "Präfix" -#: archive.c:438 +#: archive.c:448 msgid "prepend prefix to each pathname in the archive" msgstr "einen Präfix vor jeden Pfadnamen in dem Archiv stellen" -#: archive.c:439 builtin/blame.c:813 builtin/blame.c:814 builtin/config.c:127 -#: builtin/fast-export.c:1007 builtin/fast-export.c:1009 builtin/grep.c:869 -#: builtin/hash-object.c:103 builtin/ls-files.c:551 builtin/ls-files.c:554 -#: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:119 +#: archive.c:449 builtin/blame.c:816 builtin/blame.c:817 builtin/config.c:126 +#: builtin/fast-export.c:1013 builtin/fast-export.c:1015 builtin/grep.c:873 +#: builtin/hash-object.c:104 builtin/ls-files.c:552 builtin/ls-files.c:555 +#: builtin/notes.c:407 builtin/notes.c:570 builtin/read-tree.c:119 #: parse-options.h:165 msgid "file" msgstr "Datei" -#: archive.c:440 builtin/archive.c:89 +#: archive.c:450 builtin/archive.c:89 msgid "write the archive to this file" msgstr "das Archiv in diese Datei schreiben" -#: archive.c:442 +#: archive.c:452 msgid "read .gitattributes in working directory" msgstr ".gitattributes aus dem Arbeitsverzeichnis lesen" -#: archive.c:443 +#: archive.c:453 msgid "report archived files on stderr" msgstr "archivierte Dateien in der Standard-Fehlerausgabe ausgeben" -#: archive.c:444 +#: archive.c:454 msgid "store only" msgstr "nur speichern" -#: archive.c:445 +#: archive.c:455 msgid "compress faster" msgstr "schneller komprimieren" -#: archive.c:453 +#: archive.c:463 msgid "compress better" msgstr "besser komprimieren" -#: archive.c:456 +#: archive.c:466 msgid "list supported archive formats" msgstr "unterstützte Archivformate auflisten" -#: 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 +#: archive.c:468 builtin/archive.c:90 builtin/clone.c:111 builtin/clone.c:114 +#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1738 msgid "repo" msgstr "Repository" -#: archive.c:459 builtin/archive.c:91 +#: archive.c:469 builtin/archive.c:91 msgid "retrieve the archive from remote repository <repo>" msgstr "Archiv vom Remote-Repository <Repository> abrufen" -#: archive.c:460 builtin/archive.c:92 builtin/notes.c:489 +#: archive.c:470 builtin/archive.c:92 builtin/difftool.c:714 +#: builtin/notes.c:491 msgid "command" msgstr "Programm" -#: archive.c:461 builtin/archive.c:93 +#: archive.c:471 builtin/archive.c:93 msgid "path to the remote git-upload-archive command" msgstr "Pfad zum externen \"git-upload-archive\"-Programm" -#: archive.c:468 +#: archive.c:478 msgid "Unexpected option --remote" msgstr "Unerwartete Option --remote" -#: archive.c:470 +#: archive.c:480 msgid "Option --exec can only be used together with --remote" msgstr "Die Option --exec kann nur zusammen mit --remote verwendet werden." -#: archive.c:472 +#: archive.c:482 msgid "Unexpected option --output" msgstr "Unerwartete Option --output" -#: archive.c:494 +#: archive.c:504 #, c-format msgid "Unknown archive format '%s'" msgstr "Unbekanntes Archivformat '%s'" -#: archive.c:501 +#: archive.c:511 #, c-format msgid "Argument not supported for format '%s': -%d" msgstr "Argument für Format '%s' nicht unterstützt: -%d" +#: archive-tar.c:125 archive-zip.c:344 +#, c-format +msgid "cannot stream blob %s" +msgstr "Kann Blob %s nicht streamen." + +#: archive-tar.c:260 archive-zip.c:361 +#, c-format +msgid "unsupported file mode: 0%o (SHA1: %s)" +msgstr "Nicht unterstützter Dateimodus: 0%o (SHA1: %s)" + +#: archive-tar.c:287 archive-zip.c:352 +#, c-format +msgid "cannot read %s" +msgstr "Kann %s nicht lesen." + +#: archive-tar.c:458 +#, c-format +msgid "unable to start '%s' filter" +msgstr "Konnte '%s' Filter nicht starten." + +#: archive-tar.c:461 +msgid "unable to redirect descriptor" +msgstr "Konnte Descriptor nicht umleiten." + +#: archive-tar.c:468 +#, c-format +msgid "'%s' filter reported error" +msgstr "'%s' Filter meldete Fehler." + +#: archive-zip.c:313 +#, c-format +msgid "path is not valid UTF-8: %s" +msgstr "Pfad ist kein gültiges UTF-8: %s" + +#: archive-zip.c:317 +#, c-format +msgid "path too long (%d chars, SHA1: %s): %s" +msgstr "Pfad zu lang (%d Zeichen, SHA1: %s): %s" + +#: archive-zip.c:470 builtin/pack-objects.c:216 builtin/pack-objects.c:219 +#, c-format +msgid "deflate error (%d)" +msgstr "Fehler beim Komprimieren (%d)" + +#: archive-zip.c:605 +#, c-format +msgid "timestamp too large for this system: %<PRIuMAX>" +msgstr "Timestamp zu groß für dieses System: %<PRIuMAX>" + #: attr.c:218 #, c-format msgid "%.*s is not a valid attribute name" @@ -890,22 +944,22 @@ msgstr "" "Verneinende Muster werden in Git-Attributen ignoriert.\n" "Benutzen Sie '\\!' für führende Ausrufezeichen." -#: bisect.c:461 +#: bisect.c:467 #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "Ungültiger Inhalt bzgl. Anführungsstriche in Datei '%s': %s" -#: bisect.c:669 +#: bisect.c:675 #, c-format msgid "We cannot bisect more!\n" msgstr "Keine binäre Suche mehr möglich!\n" -#: bisect.c:723 +#: bisect.c:729 #, c-format msgid "Not a valid commit name %s" msgstr "%s ist kein gültiger Commit-Name" -#: bisect.c:747 +#: bisect.c:753 #, c-format msgid "" "The merge base %s is bad.\n" @@ -914,7 +968,7 @@ msgstr "" "Die Merge-Basis %s ist fehlerhaft.\n" "Das bedeutet, der Fehler wurde zwischen %s und [%s] behoben.\n" -#: bisect.c:752 +#: bisect.c:758 #, c-format msgid "" "The merge base %s is new.\n" @@ -923,7 +977,7 @@ msgstr "" "Die Merge-Basis %s ist neu.\n" "Das bedeutet, die Eigenschaft hat sich zwischen %s und [%s] geändert.\n" -#: bisect.c:757 +#: bisect.c:763 #, c-format msgid "" "The merge base %s is %s.\n" @@ -932,7 +986,7 @@ msgstr "" "Die Merge-Basis %s ist %s.\n" "Das bedeutet, der erste '%s' Commit befindet sich zwischen %s und [%s].\n" -#: bisect.c:765 +#: bisect.c:771 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -943,7 +997,7 @@ msgstr "" "git bisect kann in diesem Fall nicht richtig arbeiten.\n" "Vielleicht verwechselten Sie %s und %s Commits?\n" -#: bisect.c:778 +#: bisect.c:784 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -955,36 +1009,36 @@ msgstr "" "erste %s Commit zwischen %s und %s befindet.\n" "Es wird dennoch fortgesetzt." -#: bisect.c:811 +#: bisect.c:817 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "binäre Suche: eine Merge-Basis muss geprüft werden\n" -#: bisect.c:851 +#: bisect.c:857 #, c-format msgid "a %s revision is needed" msgstr "ein %s Commit wird benötigt" -#: bisect.c:870 builtin/notes.c:175 builtin/tag.c:236 +#: bisect.c:876 builtin/notes.c:177 builtin/tag.c:237 #, c-format msgid "could not create file '%s'" msgstr "konnte Datei '%s' nicht erstellen" -#: bisect.c:921 +#: bisect.c:927 builtin/merge.c:137 #, c-format msgid "could not read file '%s'" msgstr "Konnte Datei '%s' nicht lesen" -#: bisect.c:951 +#: bisect.c:957 msgid "reading bisect refs failed" msgstr "Lesen von Referenzen für binäre Suche fehlgeschlagen" -#: bisect.c:970 +#: bisect.c:976 #, c-format msgid "%s was both %s and %s\n" msgstr "%s war sowohl %s als auch %s\n" -#: bisect.c:978 +#: bisect.c:984 #, c-format msgid "" "No testable commit found.\n" @@ -993,7 +1047,7 @@ msgstr "" "Kein testbarer Commit gefunden.\n" "Vielleicht starteten Sie mit falschen Pfad-Parametern?\n" -#: bisect.c:997 +#: bisect.c:1003 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -1003,54 +1057,55 @@ msgstr[1] "(ungefähr %d Schritte)" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. -#: bisect.c:1003 +#: bisect.c:1009 #, c-format msgid "Bisecting: %d revision left to test after this %s\n" msgid_plural "Bisecting: %d revisions left to test after this %s\n" msgstr[0] "binäre Suche: danach noch %d Commit zum Testen übrig %s\n" msgstr[1] "binäre Suche: danach noch %d Commits zum Testen übrig %s\n" -#: blame.c:1756 +#: blame.c:1784 msgid "--contents and --reverse do not blend well." msgstr "--contents und --reverse funktionieren gemeinsam nicht." -#: blame.c:1767 +#: blame.c:1798 msgid "cannot use --contents with final commit object name" msgstr "" "kann --contents nicht mit endgültigem Namen des Commit-Objektes benutzen" -#: blame.c:1787 +#: blame.c:1819 msgid "--reverse and --first-parent together require specified latest commit" msgstr "" "--reverse und --first-parent zusammen erfordern die Angabe eines " "endgültigen\n" "Commits" -#: blame.c: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 +#: blame.c:1828 bundle.c:162 ref-filter.c:2154 sequencer.c:1874 +#: sequencer.c:3772 builtin/commit.c:994 builtin/log.c:372 builtin/log.c:926 +#: builtin/log.c:1381 builtin/log.c:1713 builtin/log.c:1963 builtin/merge.c:404 +#: builtin/pack-objects.c:3029 builtin/pack-objects.c:3044 #: builtin/shortlog.c:192 msgid "revision walk setup failed" msgstr "Einrichtung des Revisionsgangs fehlgeschlagen" -#: blame.c:1814 +#: blame.c:1846 msgid "" "--reverse --first-parent together require range along first-parent chain" msgstr "" "--reverse und --first-parent zusammen erfordern einen Bereich entlang der\n" "\"first-parent\"-Kette" -#: blame.c:1825 +#: blame.c:1857 #, c-format msgid "no such path %s in %s" msgstr "Pfad %s nicht in %s" -#: blame.c:1836 +#: blame.c:1868 #, c-format msgid "cannot read blob %s for path %s" msgstr "kann Blob %s für Pfad '%s' nicht lesen" -#: branch.c:54 +#: branch.c:52 #, c-format msgid "" "\n" @@ -1064,89 +1119,89 @@ msgstr "" "\"git branch --set-upstream-to=%s%s%s\"\n" "erneut setzen." -#: branch.c:68 +#: branch.c:66 #, c-format msgid "Not setting branch %s as its own upstream." msgstr "Branch %s kann nicht sein eigener Upstream-Branch sein." -#: branch.c:94 +#: branch.c:92 #, c-format msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing." msgstr "Branch '%s' folgt nun Remote-Branch '%s' von '%s' durch Rebase." -#: branch.c:95 +#: branch.c:93 #, c-format msgid "Branch '%s' set up to track remote branch '%s' from '%s'." msgstr "Branch '%s' folgt nun Remote-Branch '%s' von '%s'." -#: branch.c:99 +#: branch.c:97 #, c-format msgid "Branch '%s' set up to track local branch '%s' by rebasing." msgstr "Branch '%s' folgt nun lokalem Branch '%s' durch Rebase." -#: branch.c:100 +#: branch.c:98 #, c-format msgid "Branch '%s' set up to track local branch '%s'." msgstr "Branch '%s' folgt nun lokalem Branch '%s'." -#: branch.c:105 +#: branch.c:103 #, c-format msgid "Branch '%s' set up to track remote ref '%s' by rebasing." msgstr "Branch '%s' folgt nun Remote-Referenz '%s' durch Rebase." -#: branch.c:106 +#: branch.c:104 #, c-format msgid "Branch '%s' set up to track remote ref '%s'." msgstr "Branch '%s' folgt nun Remote-Referenz '%s'." -#: branch.c:110 +#: branch.c:108 #, c-format msgid "Branch '%s' set up to track local ref '%s' by rebasing." msgstr "Branch '%s' folgt nun lokaler Referenz '%s' durch Rebase." -#: branch.c:111 +#: branch.c:109 #, c-format msgid "Branch '%s' set up to track local ref '%s'." msgstr "Branch '%s' folgt nun lokaler Referenz '%s'." -#: branch.c:120 +#: branch.c:118 msgid "Unable to write upstream branch configuration" msgstr "Konnte Konfiguration zu Upstream-Branch nicht schreiben." -#: branch.c:157 +#: branch.c:155 #, c-format msgid "Not tracking: ambiguous information for ref %s" msgstr "" "Konfiguration zum Folgen von Branch nicht eingerichtet. Referenz %s ist " "mehrdeutig." -#: branch.c:190 +#: branch.c:188 #, c-format msgid "'%s' is not a valid branch name." msgstr "'%s' ist kein gültiger Branchname." -#: branch.c:209 +#: branch.c:207 #, c-format msgid "A branch named '%s' already exists." msgstr "Branch '%s' existiert bereits." -#: branch.c:214 +#: branch.c:212 msgid "Cannot force update the current branch." msgstr "Kann Aktualisierung des aktuellen Branches nicht erzwingen." -#: branch.c:234 +#: branch.c:232 #, c-format msgid "Cannot setup tracking information; starting point '%s' is not a branch." msgstr "" "Kann Tracking-Informationen nicht einrichten; Startpunkt '%s' ist kein " "Branch." -#: branch.c:236 +#: branch.c:234 #, c-format msgid "the requested upstream branch '%s' does not exist" msgstr "der angeforderte Upstream-Branch '%s' existiert nicht" -#: branch.c:238 +#: branch.c:236 msgid "" "\n" "If you are planning on basing your work on an upstream\n" @@ -1167,100 +1222,100 @@ msgstr "" "\"git push -u\" verwenden, um den Upstream-Branch beim \"push\"\n" "zu konfigurieren." -#: branch.c:281 +#: branch.c:279 #, c-format msgid "Not a valid object name: '%s'." msgstr "Ungültiger Objekt-Name: '%s'" -#: branch.c:301 +#: branch.c:299 #, c-format msgid "Ambiguous object name: '%s'." msgstr "mehrdeutiger Objekt-Name: '%s'" -#: branch.c:306 +#: branch.c:304 #, c-format msgid "Not a valid branch point: '%s'." msgstr "Ungültiger Branchpunkt: '%s'" -#: branch.c:360 +#: branch.c:358 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "'%s' ist bereits in '%s' ausgecheckt" -#: branch.c:383 +#: branch.c:381 #, c-format msgid "HEAD of working tree %s is not updated" msgstr "HEAD des Arbeitsverzeichnisses %s ist nicht aktualisiert." -#: bundle.c:34 +#: bundle.c:36 #, c-format msgid "'%s' does not look like a v2 bundle file" msgstr "'%s' sieht nicht wie eine v2 Paketdatei aus" -#: bundle.c:62 +#: bundle.c:64 #, c-format msgid "unrecognized header: %s%s (%d)" msgstr "nicht erkannter Kopfbereich: %s%s (%d)" -#: bundle.c:88 sequencer.c:2080 sequencer.c:2557 builtin/commit.c:755 +#: bundle.c:90 sequencer.c:2092 sequencer.c:2578 builtin/commit.c:768 #, c-format msgid "could not open '%s'" msgstr "Konnte '%s' nicht öffnen" -#: bundle.c:139 +#: bundle.c:141 msgid "Repository lacks these prerequisite commits:" msgstr "Dem Repository fehlen folgende vorausgesetzte Commits:" -#: bundle.c:190 +#: bundle.c:192 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" msgstr[0] "Das Paket enthält diese Referenz:" msgstr[1] "Das Paket enthält diese %d Referenzen:" -#: bundle.c:197 +#: bundle.c:199 msgid "The bundle records a complete history." msgstr "Das Paket speichert eine komplette Historie." -#: bundle.c:199 +#: bundle.c:201 #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" msgstr[0] "Das Paket benötigt diese Referenz:" msgstr[1] "Das Paket benötigt diese %d Referenzen:" -#: bundle.c:258 +#: bundle.c:260 msgid "Could not spawn pack-objects" msgstr "Konnte Paketobjekte nicht erstellen" -#: bundle.c:269 +#: bundle.c:271 msgid "pack-objects died" msgstr "Erstellung der Paketobjekte abgebrochen" -#: bundle.c:311 +#: bundle.c:313 msgid "rev-list died" msgstr "\"rev-list\" abgebrochen" -#: bundle.c:360 +#: bundle.c:362 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "Referenz '%s' wird durch \"rev-list\" Optionen ausgeschlossen" -#: bundle.c:450 builtin/log.c:183 builtin/log.c:1607 builtin/shortlog.c:303 +#: bundle.c:453 builtin/log.c:187 builtin/log.c:1618 builtin/shortlog.c:304 #, c-format msgid "unrecognized argument: %s" msgstr "nicht erkanntes Argument: %s" -#: bundle.c:458 +#: bundle.c:461 msgid "Refusing to create empty bundle." msgstr "Erstellung eines leeren Pakets zurückgewiesen." -#: bundle.c:470 +#: bundle.c:473 #, c-format msgid "cannot create '%s'" msgstr "kann '%s' nicht erstellen" -#: bundle.c:498 +#: bundle.c:501 msgid "index-pack died" msgstr "Erstellung der Paketindexdatei abgebrochen" @@ -1269,19 +1324,19 @@ msgstr "Erstellung der Paketindexdatei abgebrochen" msgid "invalid color value: %.*s" msgstr "Ungültiger Farbwert: %.*s" -#: 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 +#: commit.c:48 sequencer.c:2384 builtin/am.c:422 builtin/am.c:466 +#: builtin/am.c:1438 builtin/am.c:2072 builtin/replace.c:376 #: builtin/replace.c:448 #, c-format msgid "could not parse %s" msgstr "konnte %s nicht parsen" -#: commit.c:45 +#: commit.c:50 #, c-format msgid "%s %s is not a commit!" msgstr "%s %s ist kein Commit!" -#: commit.c:182 +#: commit.c:191 msgid "" "Support for <GIT_DIR>/info/grafts is deprecated\n" "and will be removed in a future Git version.\n" @@ -1302,7 +1357,7 @@ msgstr "" "Sie können diese Meldung unterdrücken, indem Sie\n" "\"git config advice.graftFileDeprecated false\" ausführen." -#: commit.c:1537 +#: commit.c:1629 msgid "" "Warning: commit message did not conform to UTF-8.\n" "You may want to amend it after fixing the message, or set the config\n" @@ -1314,201 +1369,408 @@ msgstr "" "Encoding,\n" "welches von ihrem Projekt verwendet wird.\n" -#: commit-graph.c:669 +#: commit-graph.c:83 +#, c-format +msgid "graph file %s is too small" +msgstr "Graph-Datei %s ist zu klein." + +#: commit-graph.c:90 +#, c-format +msgid "graph signature %X does not match signature %X" +msgstr "Graph-Signatur %X stimmt nicht mit Signatur %X überein." + +#: commit-graph.c:97 +#, c-format +msgid "graph version %X does not match version %X" +msgstr "Graph-Version %X stimmt nicht mit Version %X überein." + +#: commit-graph.c:104 +#, c-format +msgid "hash version %X does not match version %X" +msgstr "Hash-Version %X stimmt nicht mit Version %X überein." + +#: commit-graph.c:128 +#, c-format +msgid "improper chunk offset %08x%08x" +msgstr "Unzulässiger Chunk-Offset %08x%08x" + +#: commit-graph.c:164 +#, c-format +msgid "chunk id %08x appears multiple times" +msgstr "Chunk-Id %08x kommt mehrfach vor." + +#: commit-graph.c:261 +#, c-format +msgid "could not find commit %s" +msgstr "Konnte Commit %s nicht finden." + +#: commit-graph.c:565 builtin/pack-objects.c:2568 +#, c-format +msgid "unable to get type of object %s" +msgstr "Konnte Art von Objekt '%s' nicht bestimmen." + +#: commit-graph.c:730 +#, c-format +msgid "error adding pack %s" +msgstr "Fehler beim Hinzufügen von Paket %s." + +#: commit-graph.c:732 +#, c-format +msgid "error opening index for %s" +msgstr "Fehler beim Öffnen des Index für %s." + +#: commit-graph.c:773 #, c-format msgid "the commit graph format cannot write %d commits" msgstr "Das Commit-Graph Format kann nicht %d Commits schreiben." -#: commit-graph.c:696 +#: commit-graph.c:800 msgid "too many commits to write graph" msgstr "Zu viele Commits zum Schreiben des Graphen." -#: commit-graph.c:707 builtin/init-db.c:516 builtin/init-db.c:521 +#: commit-graph.c:806 #, c-format -msgid "cannot mkdir %s" -msgstr "kann Verzeichnis %s nicht erstellen" +msgid "unable to create leading directories of %s" +msgstr "Konnte führende Verzeichnisse von '%s' nicht erstellen." + +#: commit-graph.c:904 +msgid "the commit-graph file has incorrect checksum and is likely corrupt" +msgstr "Die Commit-Graph-Datei hat eine falsche Prüfsumme und ist wahrscheinlich beschädigt." #: compat/obstack.c:405 compat/obstack.c:407 msgid "memory exhausted" msgstr "Speicher verbraucht" -#: config.c:187 +#: config.c:123 +#, c-format +msgid "" +"exceeded maximum include depth (%d) while including\n" +"\t%s\n" +"from\n" +"\t%s\n" +"This might be due to circular includes." +msgstr "" +"Maximale Include-Tiefe (%d) beim Einbinden von\n" +"\t%s\n" +"von\n" +"\t%s\n" +"überschritten.\n" +"Das könnte durch zirkulare Includes entstanden sein." + +#: config.c:139 +#, c-format +msgid "could not expand include path '%s'" +msgstr "Konnte Include-Pfad '%s' nicht erweitern." + +#: config.c:150 +msgid "relative config includes must come from files" +msgstr "Relative Includes von Konfigurationen müssen aus Dateien kommen." + +#: config.c:190 msgid "relative config include conditionals must come from files" msgstr "" "Bedingungen für das Einbinden von Konfigurationen aus relativen Pfaden " "müssen\n" "aus Dateien kommen." -#: config.c:788 +#: config.c:348 +#, c-format +msgid "key does not contain a section: %s" +msgstr "Schlüssel enthält keine Sektion: %s" + +#: config.c:354 +#, c-format +msgid "key does not contain variable name: %s" +msgstr "Schlüssel enthält keinen Variablennamen: %s" + +#: config.c:378 sequencer.c:2206 +#, c-format +msgid "invalid key: %s" +msgstr "Ungültiger Schlüssel: %s" + +#: config.c:384 +#, c-format +msgid "invalid key (newline): %s" +msgstr "Ungültiger Schlüssel (neue Zeile): %s" + +#: config.c:420 config.c:432 +#, c-format +msgid "bogus config parameter: %s" +msgstr "Fehlerhafter Konfigurationsparameter: %s" + +#: config.c:467 +#, c-format +msgid "bogus format in %s" +msgstr "Fehlerhaftes Format in %s" + +#: config.c:793 #, c-format msgid "bad config line %d in blob %s" msgstr "Ungültige Konfigurationszeile %d in Blob %s" -#: config.c:792 +#: config.c:797 #, c-format msgid "bad config line %d in file %s" msgstr "Ungültige Konfigurationszeile %d in Datei %s" -#: config.c:796 +#: config.c:801 #, c-format msgid "bad config line %d in standard input" msgstr "Ungültige Konfigurationszeile %d in Standard-Eingabe" -#: config.c:800 +#: config.c:805 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "Ungültige Konfigurationszeile %d in Submodul-Blob %s" -#: config.c:804 +#: config.c:809 #, c-format msgid "bad config line %d in command line %s" msgstr "Ungültige Konfigurationszeile %d in Kommandozeile %s" -#: config.c:808 +#: config.c:813 #, c-format msgid "bad config line %d in %s" msgstr "Ungültige Konfigurationszeile %d in %s" -#: config.c:936 +#: config.c:952 msgid "out of range" msgstr "Außerhalb des Bereichs" -#: config.c:936 +#: config.c:952 msgid "invalid unit" msgstr "Ungültige Einheit" -#: config.c:942 +#: config.c:958 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "Ungültiger numerischer Wert '%s' für Konfiguration '%s': %s" -#: config.c:947 +#: config.c:963 #, c-format msgid "bad numeric config value '%s' for '%s' in blob %s: %s" msgstr "Ungültiger numerischer Wert '%s' für Konfiguration '%s' in Blob %s: %s" -#: config.c:950 +#: config.c:966 #, c-format msgid "bad numeric config value '%s' for '%s' in file %s: %s" msgstr "" "Ungültiger numerischer Wert '%s' für Konfiguration '%s' in Datei %s: %s" -#: config.c:953 +#: config.c:969 #, c-format msgid "bad numeric config value '%s' for '%s' in standard input: %s" msgstr "" "Ungültiger numerischer Wert '%s' für Konfiguration '%s' in Standard-Eingabe: " "%s" -#: config.c:956 +#: config.c:972 #, c-format msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" msgstr "" "Ungültiger numerischer Wert '%s' für Konfiguration '%s' in Submodul-Blob %s: " "%s" -#: config.c:959 +#: config.c:975 #, c-format msgid "bad numeric config value '%s' for '%s' in command line %s: %s" msgstr "" "Ungültiger numerischer Wert '%s' für Konfiguration '%s' in Befehlszeile %s: " "%s" -#: config.c:962 +#: config.c:978 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "Ungültiger numerischer Wert '%s' für Konfiguration '%s' in %s: %s" -#: config.c:1057 +#: config.c:1073 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "Fehler beim Erweitern des Nutzerverzeichnisses in: '%s'" -#: config.c:1066 +#: config.c:1082 #, c-format msgid "'%s' for '%s' is not a valid timestamp" msgstr "'%s' ist kein gültiger Zeitstempel für '%s'" -#: config.c:1171 config.c:1182 +#: config.c:1173 +#, c-format +msgid "abbrev length out of range: %d" +msgstr "Länge für Abkürzung von Commit-IDs außerhalb des Bereichs: %d" + +#: config.c:1187 config.c:1198 #, c-format msgid "bad zlib compression level %d" msgstr "ungültiger zlib Komprimierungsgrad %d" -#: config.c:1307 +#: config.c:1290 +msgid "core.commentChar should only be one character" +msgstr "core.commentChar sollte nur ein Zeichen sein" + +#: config.c:1323 #, c-format msgid "invalid mode for object creation: %s" msgstr "Ungültiger Modus für Objekterstellung: %s" -#: config.c:1473 +#: config.c:1403 +#, c-format +msgid "malformed value for %s" +msgstr "Ungültiger Wert für %s." + +#: config.c:1429 +#, c-format +msgid "malformed value for %s: %s" +msgstr "Ungültiger Wert für %s: %s" + +#: config.c:1430 +msgid "must be one of nothing, matching, simple, upstream or current" +msgstr "Muss einer von diesen sein: nothing, matching, simple, upstream, current" + +#: config.c:1489 builtin/pack-objects.c:3279 #, c-format msgid "bad pack compression level %d" msgstr "ungültiger Komprimierungsgrad (%d) für Paketierung" -#: config.c:1681 +#: config.c:1610 +#, c-format +msgid "unable to load config blob object '%s'" +msgstr "Konnte Blob-Objekt '%s' für Konfiguration nicht laden." + +#: config.c:1613 +#, c-format +msgid "reference '%s' does not point to a blob" +msgstr "Referenz '%s' zeigt auf keinen Blob." + +#: config.c:1630 +#, c-format +msgid "unable to resolve config blob '%s'" +msgstr "Konnte Blob '%s' für Konfiguration nicht auflösen." + +#: config.c:1660 +#, c-format +msgid "failed to parse %s" +msgstr "Fehler beim Parsen von %s." + +#: config.c:1700 msgid "unable to parse command-line config" msgstr "" "Konnte die über die Befehlszeile angegebene Konfiguration nicht parsen." -#: config.c:2013 +#: config.c:2032 msgid "unknown error occurred while reading the configuration files" msgstr "" "Es trat ein unbekannter Fehler beim Lesen der Konfigurationsdateien auf." -#: config.c:2200 +#: config.c:2202 #, c-format msgid "Invalid %s: '%s'" msgstr "Ungültiger %s: '%s'" -#: config.c:2243 +#: config.c:2245 #, c-format msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" msgstr "" "Unbekannter Wert '%s' in core.untrackedCache; benutze Standardwert 'keep'" -#: config.c:2269 +#: config.c:2271 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "" "Der Wert '%d' von splitIndex.maxPercentChange sollte zwischen 0 und 100 " "liegen." -#: config.c:2294 +#: config.c:2296 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "" "Konnte Wert '%s' aus der über die Befehlszeile angegebenen Konfiguration\n" "nicht parsen." -#: config.c:2296 +#: config.c:2298 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "ungültige Konfigurationsvariable '%s' in Datei '%s' bei Zeile %d" -#: config.c:2402 +#: config.c:2379 +#, c-format +msgid "invalid section name '%s'" +msgstr "Ungültiger Sektionsname '%s'" + +#: config.c:2411 #, c-format msgid "%s has multiple values" msgstr "%s hat mehrere Werte" -#: config.c:2766 config.c:3019 +#: config.c:2440 +#, c-format +msgid "failed to write new configuration file %s" +msgstr "Konnte neue Konfigurationsdatei '%s' nicht schreiben." + +#: config.c:2691 config.c:3015 +#, c-format +msgid "could not lock config file %s" +msgstr "Konnte Konfigurationsdatei '%s' nicht sperren." + +#: config.c:2702 +#, c-format +msgid "opening %s" +msgstr "Öffne %s" + +#: config.c:2737 builtin/config.c:324 +#, c-format +msgid "invalid pattern: %s" +msgstr "Ungültiges Muster: %s" + +#: config.c:2762 +#, c-format +msgid "invalid config file %s" +msgstr "Ungültige Konfigurationsdatei %s" + +#: config.c:2775 config.c:3028 #, c-format msgid "fstat on %s failed" msgstr "fstat auf %s fehlgeschlagen" -#: config.c:2905 +#: config.c:2786 +#, c-format +msgid "unable to mmap '%s'" +msgstr "mmap für '%s' fehlgeschlagen" + +#: config.c:2795 config.c:3033 +#, c-format +msgid "chmod on %s failed" +msgstr "chmod auf %s fehlgeschlagen" + +#: config.c:2880 config.c:3130 +#, c-format +msgid "could not write config file %s" +msgstr "Konnte Konfigurationsdatei %s nicht schreiben." + +#: config.c:2914 #, c-format msgid "could not set '%s' to '%s'" msgstr "Konnte '%s' nicht zu '%s' setzen." -#: config.c:2907 builtin/remote.c:779 +#: config.c:2916 builtin/remote.c:781 #, c-format msgid "could not unset '%s'" msgstr "Konnte '%s' nicht aufheben." -#: connect.c:60 -msgid "The remote end hung up upon initial contact" +#: config.c:3006 +#, c-format +msgid "invalid section name: %s" +msgstr "Ungültiger Sektionsname: %s" + +#: config.c:3173 +#, c-format +msgid "missing value for '%s'" +msgstr "Fehlender Wert für '%s'" + +#: connect.c:61 +msgid "the remote end hung up upon initial contact" msgstr "Die Gegenseite hat nach dem ersten Kontakt abgebrochen." -#: connect.c:62 +#: connect.c:63 msgid "" "Could not read from remote repository.\n" "\n" @@ -1521,58 +1783,211 @@ msgstr "" "bestehen\n" "und das Repository existiert." -#: connected.c:66 builtin/fsck.c:201 builtin/prune.c:145 +#: connect.c:81 +#, c-format +msgid "server doesn't support '%s'" +msgstr "Der Server unterstützt kein '%s'." + +#: connect.c:103 +#, c-format +msgid "server doesn't support feature '%s'" +msgstr "Der Server unterstützt das Feature '%s' nicht." + +#: connect.c:114 +msgid "expected flush after capabilities" +msgstr "Erwartete Flush nach Fähigkeiten." + +#: connect.c:233 +#, c-format +msgid "ignoring capabilities after first line '%s'" +msgstr "Ignoriere Fähigkeiten nach der ersten Zeile '%s'." + +#: connect.c:252 +msgid "protocol error: unexpected capabilities^{}" +msgstr "Protokollfehler: unerwartetes capabilities^{}" + +#: connect.c:273 +#, c-format +msgid "protocol error: expected shallow sha-1, got '%s'" +msgstr "Protokollfehler: shallow SHA-1 erwartet, '%s' bekommen" + +#: connect.c:275 +msgid "repository on the other end cannot be shallow" +msgstr "Repository auf der Gegenseite kann keine unvollständige Historie (shallow) enthalten" + +#: connect.c:310 fetch-pack.c:183 builtin/archive.c:63 +#, c-format +msgid "remote error: %s" +msgstr "Fehler am anderen Ende: %s" + +#: connect.c:316 +msgid "invalid packet" +msgstr "Ungültiges Paket." + +#: connect.c:336 +#, c-format +msgid "protocol error: unexpected '%s'" +msgstr "Protokollfehler: unerwartetes '%s'" + +#: connect.c:444 +#, c-format +msgid "invalid ls-refs response: %s" +msgstr "Ungültige ls-refs Antwort: %s" + +#: connect.c:448 +msgid "expected flush after ref listing" +msgstr "Erwartete Flush nach Auflistung der Referenzen." + +#: connect.c:547 +#, c-format +msgid "protocol '%s' is not supported" +msgstr "Protokoll '%s' wird nicht unterstützt." + +#: connect.c:598 +msgid "unable to set SO_KEEPALIVE on socket" +msgstr "Kann SO_KEEPALIVE bei Socket nicht setzen." + +#: connect.c:638 connect.c:701 +#, c-format +msgid "Looking up %s ... " +msgstr "Suche nach %s ..." + +#: connect.c:642 +#, c-format +msgid "unable to look up %s (port %s) (%s)" +msgstr "Fehler bei Suche nach %s (Port %s) (%s)." + +#. TRANSLATORS: this is the end of "Looking up %s ... " +#: connect.c:646 connect.c:717 +#, c-format +msgid "" +"done.\n" +"Connecting to %s (port %s) ... " +msgstr "" +"Fertig.\n" +"Verbinde nach %s (Port %s) ... " + +#: connect.c:668 connect.c:745 +#, c-format +msgid "" +"unable to connect to %s:\n" +"%s" +msgstr "" +"Konnte nicht nach %s verbinden:\n" +"%s" + +#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... " +#: connect.c:674 connect.c:751 +msgid "done." +msgstr "Fertig." + +#: connect.c:705 +#, c-format +msgid "unable to look up %s (%s)" +msgstr "Fehler bei der Suche nach %s (%s)" + +#: connect.c:711 +#, c-format +msgid "unknown port %s" +msgstr "Unbekannter Port %s" + +#: connect.c:848 connect.c:1174 +#, c-format +msgid "strange hostname '%s' blocked" +msgstr "Merkwürdigen Hostnamen '%s' blockiert." + +#: connect.c:850 +#, c-format +msgid "strange port '%s' blocked" +msgstr "Merkwürdigen Port '%s' blockiert." + +#: connect.c:860 +#, c-format +msgid "cannot start proxy %s" +msgstr "Kann Proxy %s nicht starten." + +#: connect.c:927 +msgid "no path specified; see 'git help pull' for valid url syntax" +msgstr "Kein Pfad angegeben; siehe 'git help pull' für eine gültige URL-Syntax." + +#: connect.c:1122 +msgid "ssh variant 'simple' does not support -4" +msgstr "SSH-Variante 'simple' unterstützt kein -4." + +#: connect.c:1134 +msgid "ssh variant 'simple' does not support -6" +msgstr "SSH-Variante 'simple' unterstützt kein -6." + +#: connect.c:1151 +msgid "ssh variant 'simple' does not support setting port" +msgstr "SSH-Variante 'simple' unterstützt nicht das Setzen eines Ports." + +#: connect.c:1262 +#, c-format +msgid "strange pathname '%s' blocked" +msgstr "Merkwürdigen Pfadnamen '%s' blockiert." + +#: connect.c:1307 +msgid "unable to fork" +msgstr "Kann Prozess nicht starten." + +#: connected.c:68 builtin/fsck.c:203 builtin/prune.c:146 msgid "Checking connectivity" msgstr "Prüfe Konnektivität" -#: connected.c:78 +#: connected.c:80 msgid "Could not run 'git rev-list'" msgstr "Konnte 'git rev-list' nicht ausführen" -#: connected.c:98 +#: connected.c:100 msgid "failed write to rev-list" msgstr "Fehler beim Schreiben nach rev-list" -#: connected.c:105 +#: connected.c:107 msgid "failed to close rev-list's stdin" msgstr "Fehler beim Schließen von rev-list's Standard-Eingabe" -#: convert.c:206 +#: convert.c:194 +#, c-format +msgid "illegal crlf_action %d" +msgstr "Unerlaubte crlf_action %d" + +#: convert.c:207 #, c-format -msgid "CRLF would be replaced by LF in %s." +msgid "CRLF would be replaced by LF in %s" msgstr "CRLF würde in %s durch LF ersetzt werden." -#: convert.c:208 +#: convert.c:209 #, c-format msgid "" "CRLF will be replaced by LF in %s.\n" -"The file will have its original line endings in your working directory." +"The file will have its original line endings in your working directory" msgstr "" "CRLF wird in %s durch LF ersetzt.\n" "Die Datei wird ihre ursprünglichen Zeilenenden im Arbeitsverzeichnis " "behalten." -#: convert.c:216 +#: convert.c:217 #, c-format msgid "LF would be replaced by CRLF in %s" msgstr "LF würde in %s durch CRLF ersetzt werden." -#: convert.c:218 +#: convert.c:219 #, c-format msgid "" "LF will be replaced by CRLF in %s.\n" -"The file will have its original line endings in your working directory." +"The file will have its original line endings in your working directory" msgstr "" "LF wird in %s durch CRLF ersetzt.\n" "Die Datei wird ihre ursprünglichen Zeilenenden im Arbeitsverzeichnis " "behalten." -#: convert.c:279 +#: convert.c:280 #, c-format msgid "BOM is prohibited in '%s' if encoded as %s" msgstr "BOM ist in '%s' unzulässig, wenn als %s codiert." -#: convert.c:286 +#: convert.c:287 #, c-format msgid "" "The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-" @@ -1581,12 +1996,12 @@ msgstr "" "Die Datei '%s' enthält ein Byte-Order-Mark (BOM). Bitte benutzen Sie UTF-%s\n" "als Codierung im Arbeitsverzeichnis." -#: convert.c:304 +#: convert.c:305 #, c-format msgid "BOM is required in '%s' if encoded as %s" msgstr "BOM ist erforderlich in '%s', wenn als %s codiert." -#: convert.c:306 +#: convert.c:307 #, c-format msgid "" "The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-" @@ -1596,20 +2011,70 @@ msgstr "" "oder UTF-%sLE (abhängig von der Byte-Reihenfolge) als Codierung im\n" "Arbeitsverzeichnis." -#: convert.c:424 +#: convert.c:425 convert.c:496 #, c-format msgid "failed to encode '%s' from %s to %s" msgstr "Fehler beim Codieren von '%s' von %s nach %s." -#: convert.c:467 +#: convert.c:468 #, c-format msgid "encoding '%s' from %s to %s and back is not the same" msgstr "Die Codierung '%s' von %s nach %s und zurück ist nicht dasselbe." -#: convert.c:1225 +#: convert.c:674 +#, c-format +msgid "cannot fork to run external filter '%s'" +msgstr "Kann externen Filter '%s' nicht starten." + +#: convert.c:694 +#, c-format +msgid "cannot feed the input to external filter '%s'" +msgstr "Kann Eingaben nicht an externen Filter '%s' übergeben." + +#: convert.c:701 +#, c-format +msgid "external filter '%s' failed %d" +msgstr "Externer Filter '%s' fehlgeschlagen %d" + +#: convert.c:736 convert.c:739 +#, c-format +msgid "read from external filter '%s' failed" +msgstr "Lesen von externem Filter '%s' fehlgeschlagen." + +#: convert.c:742 convert.c:796 +#, c-format +msgid "external filter '%s' failed" +msgstr "Externer Filter '%s' fehlgeschlagen." + +#: convert.c:844 +msgid "unexpected filter type" +msgstr "Unerwartete Filterart." + +#: convert.c:855 +msgid "path name too long for external filter" +msgstr "Pfadname zu lang für externen Filter." + +#: convert.c:929 +#, c-format +msgid "" +"external filter '%s' is not available anymore although not all paths have " +"been filtered" +msgstr "Externer Filter '%s' nicht mehr verfügbar. Nicht alle Pfade wurden gefiltert." + +#: convert.c:1228 msgid "true/false are no valid working-tree-encodings" msgstr "true/false sind keine gültigen Codierungen im Arbeitsverzeichnis." +#: convert.c:1402 convert.c:1436 +#, c-format +msgid "%s: clean filter '%s' failed" +msgstr "%s: clean-Filter '%s' fehlgeschlagen." + +#: convert.c:1480 +#, c-format +msgid "%s: smudge filter %s failed" +msgstr "%s: smudge-Filter '%s' fehlgeschlagen." + #: date.c:116 msgid "in the future" msgstr "in der Zukunft" @@ -1683,40 +2148,51 @@ msgstr[1] "vor %<PRIuMAX> Jahren" msgid "failed to read orderfile '%s'" msgstr "Fehler beim Lesen der Reihenfolgedatei '%s'." -#: diffcore-rename.c:535 +#: diffcore-rename.c:536 msgid "Performing inexact rename detection" msgstr "Führe Erkennung für ungenaue Umbenennung aus" -#: diff.c:74 +#: diff.c:108 #, c-format msgid "option '%s' requires a value" msgstr "Option '%s' erfordert einen Wert." -#: diff.c:152 +#: diff.c:158 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr "" " Fehler beim Parsen des abgeschnittenen \"dirstat\" Prozentsatzes '%s'\n" -#: diff.c:157 +#: diff.c:163 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr " Unbekannter \"dirstat\" Parameter '%s'\n" -#: diff.c:281 +#: diff.c:291 +msgid "" +"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', " +"'dimmed-zebra', 'plain'" +msgstr "\"color moved\"-Einstellung muss eines von diesen sein: 'no', 'default', 'blocks', 'zebra', 'dimmed_zebra', 'plain'" + +#: diff.c:316 +#, c-format +msgid "ignoring unknown color-moved-ws mode '%s'" +msgstr "Ignoriere unbekannten 'color-moved-ws'-Modus '%s'." + +#: diff.c:323 msgid "" -"color moved setting must be one of 'no', 'default', 'zebra', 'dimmed_zebra', " -"'plain'" +"color-moved-ws: allow-indentation-change cannot be combined with other white " +"space modes" msgstr "" -"\"color moved\"-Einstellung muss eines von diesen sein: 'no', 'default', " -"'zebra', 'dimmed_zebra', 'plain'" +"color-moved-ws: allow-indentation-change kann nicht mit anderen\n" +"Whitespace-Modi kombiniert werden." -#: diff.c:341 +#: diff.c:394 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "Unbekannter Wert in Konfigurationsvariable 'diff.dirstat': '%s'" -#: diff.c:401 +#: diff.c:454 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -1725,25 +2201,25 @@ msgstr "" "Fehler in 'diff.dirstat' Konfigurationsvariable gefunden:\n" "%s" -#: diff.c:3823 +#: diff.c:4096 #, c-format msgid "external diff died, stopping at %s" msgstr "externes Diff-Programm unerwartet beendet, angehalten bei %s" -#: diff.c:4153 +#: diff.c:4427 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "" "--name-only, --name-status, --check und -s schließen sich gegenseitig aus" -#: diff.c:4156 +#: diff.c:4430 msgid "-G, -S and --find-object are mutually exclusive" msgstr "-G, -S und --find-object schließen sich gegenseitig aus" -#: diff.c:4244 +#: diff.c:4508 msgid "--follow requires exactly one pathspec" msgstr "--follow erfordert genau eine Pfadspezifikation" -#: diff.c:4410 +#: diff.c:4674 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -1752,22 +2228,22 @@ msgstr "" "Fehler beim Parsen des --dirstat/-X Optionsparameters:\n" "%s" -#: diff.c:4424 +#: diff.c:4688 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "Fehler beim Parsen des --submodule Optionsparameters: '%s'" -#: diff.c:5500 +#: diff.c:5766 msgid "inexact rename detection was skipped due to too many files." msgstr "" "Ungenaue Erkennung für Umbenennungen wurde aufgrund zu vieler Dateien\n" "übersprungen." -#: diff.c:5503 +#: diff.c:5769 msgid "only found copies from modified paths due to too many files." msgstr "nur Kopien von geänderten Pfaden, aufgrund zu vieler Dateien, gefunden" -#: diff.c:5506 +#: diff.c:5772 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." @@ -1775,27 +2251,42 @@ msgstr "" "Sie könnten die Variable %s auf mindestens %d setzen und den Befehl\n" "erneut versuchen." -#: dir.c:1867 +#: dir.c:569 +#, c-format +msgid "pathspec '%s' did not match any file(s) known to git" +msgstr "Pfadspezifikation '%s' stimmt mit keinen git-bekannten Dateien überein." + +#: dir.c:958 +#, c-format +msgid "cannot use %s as an exclude file" +msgstr "Kann %s nicht als exclude-Filter benutzen." + +#: dir.c:1873 #, c-format msgid "could not open directory '%s'" msgstr "Konnte Verzeichnis '%s' nicht öffnen." -#: dir.c:2109 +#: dir.c:2115 msgid "failed to get kernel name and information" msgstr "Fehler beim Sammeln von Namen und Informationen zum Kernel" -#: dir.c:2233 -msgid "Untracked cache is disabled on this system or location." +#: dir.c:2239 +msgid "untracked cache is disabled on this system or location" msgstr "" "Cache für unversionierte Dateien ist auf diesem System oder\n" "für dieses Verzeichnis deaktiviert." -#: dir.c:3075 dir.c:3080 +#: dir.c:3037 +#, c-format +msgid "index file corrupt in repo %s" +msgstr "Index-Datei in Repository %s beschädigt." + +#: dir.c:3082 dir.c:3087 #, c-format msgid "could not create directories for %s" msgstr "Konnte Verzeichnisse für '%s' nicht erstellen." -#: dir.c:3109 +#: dir.c:3116 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "Konnte Git-Verzeichnis nicht von '%s' nach '%s' migrieren." @@ -1805,218 +2296,272 @@ msgstr "Konnte Git-Verzeichnis nicht von '%s' nach '%s' migrieren." msgid "hint: Waiting for your editor to close the file...%c" msgstr "Hinweis: Warte auf das Schließen der Datei durch Ihren Editor...%c" -#: entry.c:177 +#: entry.c:178 msgid "Filtering content" msgstr "Filtere Inhalt" -#: entry.c:435 +#: entry.c:437 #, c-format msgid "could not stat file '%s'" msgstr "Konnte Datei '%s' nicht lesen." +#: environment.c:150 +#, c-format +msgid "bad git namespace path \"%s\"" +msgstr "Ungültiger Git-Namespace-Pfad \"%s\"" + +#: environment.c:332 +#, c-format +msgid "could not set GIT_DIR to '%s'" +msgstr "Konnte GIT_DIR nicht zu '%s' setzen." + +#: exec-cmd.c:361 +#, c-format +msgid "too many args to run %s" +msgstr "Zu viele Argumente angegeben, um %s auszuführen." + #: fetch-object.c:17 msgid "Remote with no URL" msgstr "Remote-Repository ohne URL" -#: fetch-pack.c:254 +#: fetch-pack.c:152 msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack: erwartete shallow-Liste" -#: fetch-pack.c:266 +#: fetch-pack.c:164 msgid "git fetch-pack: expected ACK/NAK, got a flush packet" msgstr "git fetch-pack: ACK/NAK erwartet, Flush-Paket bekommen" -#: fetch-pack.c:285 builtin/archive.c:63 -#, c-format -msgid "remote error: %s" -msgstr "Fehler am anderen Ende: %s" - -#: fetch-pack.c:286 +#: fetch-pack.c:184 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "git fetch-pack: ACK/NAK erwartet, '%s' bekommen" -#: fetch-pack.c:338 +#: fetch-pack.c:254 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc benötigt multi_ack_detailed" -#: fetch-pack.c:429 fetch-pack.c:1310 +#: fetch-pack.c:342 fetch-pack.c:1257 #, c-format msgid "invalid shallow line: %s" msgstr "Ungültige shallow-Zeile: %s" -#: fetch-pack.c:435 fetch-pack.c:1316 +#: fetch-pack.c:348 fetch-pack.c:1263 #, c-format msgid "invalid unshallow line: %s" msgstr "Ungültige unshallow-Zeile: %s" -#: fetch-pack.c:437 fetch-pack.c:1318 +#: fetch-pack.c:350 fetch-pack.c:1265 #, c-format msgid "object not found: %s" msgstr "Objekt nicht gefunden: %s" -#: fetch-pack.c:440 fetch-pack.c:1321 +#: fetch-pack.c:353 fetch-pack.c:1268 #, c-format msgid "error in object: %s" msgstr "Fehler in Objekt: %s" -#: fetch-pack.c:442 fetch-pack.c:1323 +#: fetch-pack.c:355 fetch-pack.c:1270 #, c-format msgid "no shallow found: %s" msgstr "Kein shallow-Objekt gefunden: %s" -#: fetch-pack.c:445 fetch-pack.c:1326 +#: fetch-pack.c:358 fetch-pack.c:1273 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "shallow/unshallow erwartet, %s bekommen" -#: fetch-pack.c:486 +#: fetch-pack.c:399 #, c-format msgid "got %s %d %s" msgstr "%s %d %s bekommen" -#: fetch-pack.c:500 +#: fetch-pack.c:416 #, c-format msgid "invalid commit %s" msgstr "Ungültiger Commit %s" -#: fetch-pack.c:533 +#: fetch-pack.c:447 msgid "giving up" msgstr "Gebe auf" -#: fetch-pack.c:543 progress.c:229 +#: fetch-pack.c:459 progress.c:229 msgid "done" msgstr "Fertig" -#: fetch-pack.c:555 +#: fetch-pack.c:471 #, c-format msgid "got %s (%d) %s" msgstr "%s (%d) %s bekommen" -#: fetch-pack.c:601 +#: fetch-pack.c:517 #, c-format msgid "Marking %s as complete" msgstr "Markiere %s als vollständig" -#: fetch-pack.c:828 +#: fetch-pack.c:764 #, c-format msgid "already have %s (%s)" msgstr "habe %s (%s) bereits" -#: fetch-pack.c:869 +#: fetch-pack.c:803 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-pack: Fehler beim Starten des sideband demultiplexer" -#: fetch-pack.c:877 +#: fetch-pack.c:811 msgid "protocol error: bad pack header" msgstr "Protokollfehler: ungültiger Pack-Header" -#: fetch-pack.c:944 +#: fetch-pack.c:879 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-pack: konnte %s nicht starten" -#: fetch-pack.c:960 +#: fetch-pack.c:895 #, c-format msgid "%s failed" msgstr "%s fehlgeschlagen" -#: fetch-pack.c:962 +#: fetch-pack.c:897 msgid "error in sideband demultiplexer" msgstr "Fehler in sideband demultiplexer" -#: fetch-pack.c:989 +#: fetch-pack.c:926 msgid "Server does not support shallow clients" msgstr "Server unterstützt keine shallow-Clients" -#: fetch-pack.c:993 +#: fetch-pack.c:930 msgid "Server supports multi_ack_detailed" msgstr "Server unterstützt multi_ack_detailed" -#: fetch-pack.c:996 +#: fetch-pack.c:933 msgid "Server supports no-done" msgstr "Server unterstützt no-done" -#: fetch-pack.c:1002 +#: fetch-pack.c:939 msgid "Server supports multi_ack" msgstr "Server unterstützt multi_ack" -#: fetch-pack.c:1006 +#: fetch-pack.c:943 msgid "Server supports side-band-64k" msgstr "Server unterstützt side-band-64k" -#: fetch-pack.c:1010 +#: fetch-pack.c:947 msgid "Server supports side-band" msgstr "Server unterstützt side-band" -#: fetch-pack.c:1014 +#: fetch-pack.c:951 msgid "Server supports allow-tip-sha1-in-want" msgstr "Server unterstützt allow-tip-sha1-in-want" -#: fetch-pack.c:1018 +#: fetch-pack.c:955 msgid "Server supports allow-reachable-sha1-in-want" msgstr "Server unterstützt allow-reachable-sha1-in-want" -#: fetch-pack.c:1028 +#: fetch-pack.c:965 msgid "Server supports ofs-delta" msgstr "Server unterstützt ofs-delta" -#: fetch-pack.c:1034 fetch-pack.c:1204 +#: fetch-pack.c:971 fetch-pack.c:1150 msgid "Server supports filter" msgstr "Server unterstützt Filter" -#: fetch-pack.c:1042 +#: fetch-pack.c:979 #, c-format msgid "Server version is %.*s" msgstr "Server-Version ist %.*s" -#: fetch-pack.c:1048 +#: fetch-pack.c:985 msgid "Server does not support --shallow-since" msgstr "Server unterstützt kein --shallow-since" -#: fetch-pack.c:1052 +#: fetch-pack.c:989 msgid "Server does not support --shallow-exclude" msgstr "Server unterstützt kein --shallow-exclude" -#: fetch-pack.c:1054 +#: fetch-pack.c:991 msgid "Server does not support --deepen" msgstr "Server unterstützt kein --deepen" -#: fetch-pack.c:1065 +#: fetch-pack.c:1004 msgid "no common commits" msgstr "keine gemeinsamen Commits" -#: fetch-pack.c:1077 fetch-pack.c:1414 +#: fetch-pack.c:1016 fetch-pack.c:1393 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack: Abholen fehlgeschlagen." -#: fetch-pack.c:1199 +#: fetch-pack.c:1145 msgid "Server does not support shallow requests" msgstr "Server unterstützt keine shallow-Anfragen." -#: fetch-pack.c:1584 +#: fetch-pack.c:1191 +#, c-format +msgid "error reading section header '%s'" +msgstr "Fehler beim Lesen von Sektionskopf '%s'." + +#: fetch-pack.c:1197 +#, c-format +msgid "expected '%s', received '%s'" +msgstr "'%s' erwartet, '%s' empfangen" + +#: fetch-pack.c:1236 +#, c-format +msgid "unexpected acknowledgment line: '%s'" +msgstr "Unerwartete Acknowledgment-Zeile: '%s'" + +#: fetch-pack.c:1241 +#, c-format +msgid "error processing acks: %d" +msgstr "Fehler beim Verarbeiten von ACKS: %d" + +#: fetch-pack.c:1278 +#, c-format +msgid "error processing shallow info: %d" +msgstr "Fehler beim Verarbeiten von Shallow-Informationen: %d" + +#: fetch-pack.c:1294 +#, c-format +msgid "expected wanted-ref, got '%s'" +msgstr "wanted-ref erwartet, '%s' bekommen" + +#: fetch-pack.c:1304 +#, c-format +msgid "unexpected wanted-ref: '%s'" +msgstr "Unerwartetes wanted-ref: '%s'" + +#: fetch-pack.c:1308 +#, c-format +msgid "error processing wanted refs: %d" +msgstr "Fehler beim Verarbeiten von wanted-refs: %d" + +#: fetch-pack.c:1603 msgid "no matching remote head" msgstr "kein übereinstimmender Remote-Branch" -#: fetch-pack.c:1610 +#: fetch-pack.c:1621 builtin/clone.c:664 +msgid "remote did not send all necessary objects" +msgstr "Remote-Repository hat nicht alle erforderlichen Objekte gesendet." + +#: fetch-pack.c:1647 #, c-format msgid "no such remote ref %s" msgstr "keine solche Remote-Referenz %s" -#: fetch-pack.c:1613 +#: fetch-pack.c:1650 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "Der Server lehnt Anfrage nach nicht angebotenem Objekt %s ab." -#: gpg-interface.c:185 +#: gpg-interface.c:253 msgid "gpg failed to sign the data" msgstr "gpg beim Signieren der Daten fehlgeschlagen" -#: gpg-interface.c:210 +#: gpg-interface.c:279 msgid "could not create temporary file" msgstr "konnte temporäre Datei nicht erstellen" -#: gpg-interface.c:213 +#: gpg-interface.c:282 #, c-format msgid "failed writing detached signature to '%s'" msgstr "Fehler beim Schreiben der losgelösten Signatur nach '%s'" @@ -2026,36 +2571,97 @@ msgstr "Fehler beim Schreiben der losgelösten Signatur nach '%s'" msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "Ignoriere ungültige Farbe '%.*s' in log.graphColors" -#: grep.c:2020 +#: grep.c:2115 #, c-format msgid "'%s': unable to read %s" msgstr "'%s': konnte %s nicht lesen" -#: grep.c:2037 setup.c:164 builtin/clone.c:409 builtin/diff.c:81 +#: grep.c:2132 setup.c:164 builtin/clone.c:410 builtin/diff.c:81 #: builtin/rm.c:134 #, c-format msgid "failed to stat '%s'" msgstr "Konnte '%s' nicht lesen" -#: grep.c:2048 +#: grep.c:2143 #, c-format msgid "'%s': short read" msgstr "'%s': read() zu kurz" -#: help.c:179 +#: help.c:23 +msgid "start a working area (see also: git help tutorial)" +msgstr "Arbeitsverzeichnis anlegen (siehe auch: git help tutorial)" + +#: help.c:24 +msgid "work on the current change (see also: git help everyday)" +msgstr "an aktuellen Änderungen arbeiten (siehe auch: git help everyday)" + +#: help.c:25 +msgid "examine the history and state (see also: git help revisions)" +msgstr "Historie und Status untersuchen (siehe auch: git help revisions)" + +#: help.c:26 +msgid "grow, mark and tweak your common history" +msgstr "Historie erweitern und bearbeiten" + +#: help.c:27 +msgid "collaborate (see also: git help workflows)" +msgstr "mit anderen zusammenarbeiten (siehe auch: git help workflows)" + +#: help.c:31 +msgid "Main Porcelain Commands" +msgstr "Hauptbefehle" + +#: help.c:32 +msgid "Ancillary Commands / Manipulators" +msgstr "Nebenbefehle / Manipulationen" + +#: help.c:33 +msgid "Ancillary Commands / Interrogators" +msgstr "Nebenbefehle / Abfragen" + +#: help.c:34 +msgid "Interacting with Others" +msgstr "mit anderen interagieren" + +#: help.c:35 +msgid "Low-level Commands / Manipulators" +msgstr "Systembefehle / Manipulationen" + +#: help.c:36 +msgid "Low-level Commands / Interrogators" +msgstr "Systembefehle / Abfragen" + +#: help.c:37 +msgid "Low-level Commands / Synching Repositories" +msgstr "Systembefehle / Repositories synchronisieren" + +#: help.c:38 +msgid "Low-level Commands / Internal Helpers" +msgstr "Systembefehle / Interne Hilfsbefehle" + +#: help.c:293 #, c-format msgid "available git commands in '%s'" msgstr "Vorhandene Git-Befehle in '%s'" -#: help.c:186 +#: help.c:300 msgid "git commands available from elsewhere on your $PATH" msgstr "Vorhandene Git-Befehle anderswo in Ihrem $PATH" -#: help.c:217 +#: help.c:309 msgid "These are common Git commands used in various situations:" msgstr "Allgemeine Git-Befehle, verwendet in verschiedenen Situationen:" -#: help.c:281 +#: help.c:358 git.c:90 +#, c-format +msgid "unsupported command listing type '%s'" +msgstr "Nicht unterstützte Art zur Befehlsauflistung '%s'." + +#: help.c:405 +msgid "The common Git guides are:" +msgstr "Die allgemeinen Git-Anleitungen sind:" + +#: help.c:552 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" @@ -2064,32 +2670,32 @@ msgstr "" "'%s' scheint ein git-Befehl zu sein, konnte aber\n" "nicht ausgeführt werden. Vielleicht ist git-%s fehlerhaft?" -#: help.c:336 +#: help.c:611 msgid "Uh oh. Your system reports no Git commands at all." msgstr "Uh oh. Keine Git-Befehle auf Ihrem System vorhanden." -#: help.c:358 +#: help.c:633 #, c-format msgid "WARNING: You called a Git command named '%s', which does not exist." msgstr "" "WARNUNG: Sie haben Git-Befehl '%s' ausgeführt, welcher nicht existiert." -#: help.c:363 +#: help.c:638 #, c-format msgid "Continuing under the assumption that you meant '%s'." msgstr "Setze fort unter der Annahme, dass Sie '%s' meinten." -#: help.c:368 +#: help.c:643 #, c-format msgid "Continuing in %0.1f seconds, assuming that you meant '%s'." msgstr "Setze in %0.1f Sekunden fort unter der Annahme, dass Sie '%s' meinten." -#: help.c:376 +#: help.c:651 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "git: '%s' ist kein Git-Befehl. Siehe 'git --help'." -#: help.c:380 +#: help.c:655 msgid "" "\n" "The most similar command is" @@ -2103,16 +2709,16 @@ msgstr[1] "" "\n" "Die ähnlichsten Befehle sind" -#: help.c:395 +#: help.c:670 msgid "git version [<options>]" msgstr "git version [<Optionen>]" -#: help.c:462 +#: help.c:738 #, c-format msgid "%s: %s - %s" msgstr "%s: %s - %s" -#: help.c:466 +#: help.c:742 msgid "" "\n" "Did you mean this?" @@ -2180,7 +2786,7 @@ msgstr "Leerer Name in Identifikation (für <%s>) nicht erlaubt." msgid "name consists only of disallowed characters: %s" msgstr "Name besteht nur aus nicht erlaubten Zeichen: %s" -#: ident.c:416 builtin/commit.c:587 +#: ident.c:416 builtin/commit.c:600 #, c-format msgid "invalid date format: %s" msgstr "Ungültiges Datumsformat: %s" @@ -2218,119 +2824,121 @@ msgstr "" msgid "Unable to create '%s.lock': %s" msgstr "Konnte '%s.lock' nicht erstellen: %s" -#: merge.c:71 +#: merge.c:40 msgid "failed to read the cache" msgstr "Lesen des Zwischenspeichers fehlgeschlagen" -#: merge.c:136 builtin/am.c:1946 builtin/am.c:1980 builtin/checkout.c:378 -#: builtin/checkout.c:606 builtin/clone.c:761 +#: merge.c:105 builtin/am.c:1946 builtin/am.c:1980 builtin/checkout.c:380 +#: builtin/checkout.c:608 builtin/clone.c:763 msgid "unable to write new index file" msgstr "Konnte neue Index-Datei nicht schreiben." -#: merge-recursive.c:298 +#: merge-recursive.c:303 msgid "(bad commit)\n" msgstr "(ungültiger Commit)\n" -#: merge-recursive.c:320 +#: merge-recursive.c:325 #, c-format msgid "add_cacheinfo failed for path '%s'; merge aborting." msgstr "add_cacheinfo für Pfad '%s' fehlgeschlagen; Merge wird abgebrochen." -#: merge-recursive.c:328 +#: merge-recursive.c:333 #, c-format msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." msgstr "" "add_cacheinfo zur Aktualisierung für Pfad '%s' fehlgeschlagen;\n" "Merge wird abgebrochen." -#: merge-recursive.c:410 +#: merge-recursive.c:415 msgid "error building trees" msgstr "Fehler beim Erstellen der \"Tree\"-Objekte" -#: merge-recursive.c:881 +#: merge-recursive.c:886 #, c-format msgid "failed to create path '%s'%s" msgstr "Fehler beim Erstellen des Pfades '%s'%s" -#: merge-recursive.c:892 +#: merge-recursive.c:897 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "Entferne %s, um Platz für Unterverzeichnis zu schaffen\n" -#: merge-recursive.c:906 merge-recursive.c:925 +#: merge-recursive.c:911 merge-recursive.c:930 msgid ": perhaps a D/F conflict?" msgstr ": vielleicht ein Verzeichnis/Datei-Konflikt?" -#: merge-recursive.c:915 +#: merge-recursive.c:920 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "verweigere, da unversionierte Dateien in '%s' verloren gehen würden" -#: merge-recursive.c:957 builtin/cat-file.c:37 +#: merge-recursive.c:962 builtin/cat-file.c:39 #, c-format msgid "cannot read object %s '%s'" msgstr "kann Objekt %s '%s' nicht lesen" -#: merge-recursive.c:959 +#: merge-recursive.c:964 #, c-format msgid "blob expected for %s '%s'" msgstr "Blob erwartet für %s '%s'" -#: merge-recursive.c:983 +#: merge-recursive.c:988 #, c-format msgid "failed to open '%s': %s" msgstr "Fehler beim Öffnen von '%s': %s" -#: merge-recursive.c:994 +#: merge-recursive.c:999 #, c-format msgid "failed to symlink '%s': %s" msgstr "Fehler beim Erstellen einer symbolischen Verknüpfung für '%s': %s" -#: merge-recursive.c:999 +#: merge-recursive.c:1004 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "weiß nicht was mit %06o %s '%s' zu machen ist" -#: merge-recursive.c:1186 +#: merge-recursive.c:1191 #, c-format msgid "Failed to merge submodule %s (not checked out)" msgstr "Fehler beim Merge von Submodul %s (nicht ausgecheckt)." -#: merge-recursive.c:1193 +#: merge-recursive.c:1198 #, c-format msgid "Failed to merge submodule %s (commits not present)" msgstr "Fehler beim Merge von Submodul %s (Commits nicht vorhanden)." -#: merge-recursive.c:1200 +#: merge-recursive.c:1205 #, c-format msgid "Failed to merge submodule %s (commits don't follow merge-base)" msgstr "Fehler beim Merge von Submodul %s (Commits folgen keiner Merge-Basis)" -#: merge-recursive.c:1208 merge-recursive.c:1220 +#: merge-recursive.c:1213 merge-recursive.c:1225 #, c-format msgid "Fast-forwarding submodule %s to the following commit:" msgstr "Spule Submodul %s zu dem folgenden Commit vor:" -#: merge-recursive.c:1211 merge-recursive.c:1223 +#: merge-recursive.c:1216 merge-recursive.c:1228 #, c-format -msgid "Fast-forwarding submodule %s to %s" -msgstr "Spule Submodul %s vor zu %s" +msgid "Fast-forwarding submodule %s" +msgstr "Spule Submodul %s vor" -#: merge-recursive.c:1245 +#: merge-recursive.c:1250 #, c-format msgid "Failed to merge submodule %s (merge following commits not found)" -msgstr "Fehler beim Merge von Submodule %s (dem Merge nachfolgende Commits nicht gefunden)" +msgstr "" +"Fehler beim Merge von Submodule %s (dem Merge nachfolgende Commits nicht " +"gefunden)" -#: merge-recursive.c:1249 +#: merge-recursive.c:1254 #, c-format msgid "Failed to merge submodule %s (not fast-forward)" msgstr "Fehler beim Merge von Submodul %s (kein Vorspulen)" -#: merge-recursive.c:1250 +#: merge-recursive.c:1255 msgid "Found a possible merge resolution for the submodule:\n" msgstr "Mögliche Auflösung des Merges für Submodul gefunden:\n" -#: merge-recursive.c:1253 +#: merge-recursive.c:1258 #, c-format msgid "" "If this is correct simply add it to the index for example\n" @@ -2340,39 +2948,40 @@ msgid "" "\n" "which will accept this suggestion.\n" msgstr "" -"Falls das korrekt ist, fügen Sie es einfach der Staging-Area, zum Beispiel mit:\n" +"Falls das korrekt ist, fügen Sie es einfach der Staging-Area, zum Beispiel " +"mit:\n" "\n" " git update-index --cacheinfo 160000 %s \"%s\"\n" "\n" "hinzu, um diesen Vorschlag zu akzeptieren.\n" -#: merge-recursive.c:1262 +#: merge-recursive.c:1267 #, c-format msgid "Failed to merge submodule %s (multiple merges found)" msgstr "Fehler beim Merge von Submodul %s (mehrere Merges gefunden)" -#: merge-recursive.c:1321 +#: merge-recursive.c:1326 msgid "Failed to execute internal merge" msgstr "Fehler bei Ausführung des internen Merges" -#: merge-recursive.c:1326 +#: merge-recursive.c:1331 #, c-format msgid "Unable to add %s to database" msgstr "Konnte %s nicht zur Datenbank hinzufügen" -#: merge-recursive.c:1358 +#: merge-recursive.c:1363 #, c-format msgid "Auto-merging %s" msgstr "automatischer Merge von %s" -#: merge-recursive.c:1423 +#: merge-recursive.c:1434 #, c-format msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." msgstr "" "Fehler: Verweigere unversionierte Datei bei %s zu verlieren;\n" "schreibe stattdessen nach %s." -#: merge-recursive.c:1475 +#: merge-recursive.c:1501 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -2381,7 +2990,7 @@ msgstr "" "KONFLIKT (%s/löschen): %s gelöscht in %s und %s in %s. Stand %s von %s wurde " "im Arbeitsbereich gelassen." -#: merge-recursive.c:1480 +#: merge-recursive.c:1506 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -2390,7 +2999,7 @@ msgstr "" "KONFLIKT (%s/löschen): %s gelöscht in %s und %s nach %s in %s. Stand %s von " "%s wurde im Arbeitsbereich gelassen." -#: merge-recursive.c:1487 +#: merge-recursive.c:1513 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -2399,7 +3008,7 @@ msgstr "" "KONFLIKT (%s/löschen): %s gelöscht in %s und %s in %s. Stand %s von %s wurde " "im Arbeitsbereich bei %s gelassen." -#: merge-recursive.c:1492 +#: merge-recursive.c:1518 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -2408,31 +3017,33 @@ msgstr "" "KONFLIKT (%s/löschen): %s gelöscht in %s und %s nach %s in %s. Stand %s von " "%s wurde im Arbeitsbereich bei %s gelassen." -#: merge-recursive.c:1526 +#: merge-recursive.c:1552 msgid "rename" msgstr "umbenennen" -#: merge-recursive.c:1526 +#: merge-recursive.c:1552 msgid "renamed" msgstr "umbenannt" -#: merge-recursive.c:1580 merge-recursive.c:1736 merge-recursive.c:2368 -#: merge-recursive.c:3086 +#: merge-recursive.c:1606 merge-recursive.c:1762 merge-recursive.c:2394 +#: merge-recursive.c:3129 #, c-format msgid "Refusing to lose dirty file at %s" msgstr "Verweigere geänderte Datei bei %s zu verlieren." -#: merge-recursive.c:1594 +#: merge-recursive.c:1620 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s ist ein Verzeichnis in %s, füge es stattdessen als %s hinzu" -#: merge-recursive.c:1599 +#: merge-recursive.c:1625 #, c-format msgid "Refusing to lose untracked file at %s; adding as %s instead" -msgstr "Verweigere unversionierte Datei bei %s zu verlieren; füge stattdessen %s hinzu" +msgstr "" +"Verweigere unversionierte Datei bei %s zu verlieren; füge stattdessen %s " +"hinzu" -#: merge-recursive.c:1625 +#: merge-recursive.c:1651 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -2441,59 +3052,65 @@ msgstr "" "KONFLIKT (umbenennen/umbenennen): Benenne um \"%s\"->\"%s\" in Branch \"%s\" " "und \"%s\"->\"%s\" in Branch \"%s\"%s" -#: merge-recursive.c:1630 +#: merge-recursive.c:1656 msgid " (left unresolved)" msgstr " (bleibt unaufgelöst)" -#: merge-recursive.c:1694 +#: merge-recursive.c:1720 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" "KONFLIKT (umbenennen/umbenennen): Benenne um %s->%s in %s. Benenne um %s->%s " "in %s" -#: merge-recursive.c:1733 +#: merge-recursive.c:1759 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "Benenne stattdessen %s nach %s und %s nach %s um" -#: merge-recursive.c:1745 +#: merge-recursive.c:1771 #, c-format msgid "Refusing to lose untracked file at %s, even though it's in the way." -msgstr "Verweigere unversionierte Datei bei %s zu verlieren, auch wenn diese im Weg ist." +msgstr "" +"Verweigere unversionierte Datei bei %s zu verlieren, auch wenn diese im Weg " +"ist." -#: merge-recursive.c:1951 +#: merge-recursive.c:1977 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to place %s because " "directory %s was renamed to multiple other directories, with no destination " "getting a majority of the files." msgstr "" -"KONFLIKT (Aufteilung Verzeichnisumbenennung): Unklar, wo %s zu platzieren ist,\n" -"weil Verzeichnis %s zu mehreren anderen Verzeichnissen umbenannt wurde, wobei\n" +"KONFLIKT (Aufteilung Verzeichnisumbenennung): Unklar, wo %s zu platzieren " +"ist,\n" +"weil Verzeichnis %s zu mehreren anderen Verzeichnissen umbenannt wurde, " +"wobei\n" "keines dieser Ziele die Mehrheit der Dateien erhielt." -#: merge-recursive.c:1983 +#: merge-recursive.c:2009 #, c-format msgid "" "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " "implicit directory rename(s) putting the following path(s) there: %s." msgstr "" -"KONFLIKT (implizite Verzeichnisumbenennung): Existierende Datei/Pfad bei %s im\n" +"KONFLIKT (implizite Verzeichnisumbenennung): Existierende Datei/Pfad bei %s " +"im\n" "Weg von impliziter Verzeichnisumbenennung, die versucht, einen oder mehrere\n" "Pfade dahin zu setzen: %s." -#: merge-recursive.c:1993 +#: merge-recursive.c:2019 #, c-format msgid "" "CONFLICT (implicit dir rename): Cannot map more than one path to %s; " "implicit directory renames tried to put these paths there: %s" msgstr "" -"KONFLIKT (implizite Verzeichnisumbenennung): Kann nicht mehr als ein Pfad zu\n" +"KONFLIKT (implizite Verzeichnisumbenennung): Kann nicht mehr als ein Pfad " +"zu\n" "%s mappen; implizite Verzeichnisumbenennungen versuchten diese Pfade dahin\n" "zu setzen: %s" -#: merge-recursive.c:2085 +#: merge-recursive.c:2111 #, c-format msgid "" "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" @@ -2502,134 +3119,141 @@ msgstr "" "KONFLIKT (umbenennen/umbenennen): Benenne Verzeichnis um %s->%s in %s.\n" "Benenne Verzeichnis um %s->%s in %s" -#: merge-recursive.c:2330 +#: merge-recursive.c:2356 #, c-format msgid "" "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " "renamed." -msgstr "WARNUNG: Vermeide Umbenennung %s -> %s von %s, weil %s selbst umbenannt wurde." +msgstr "" +"WARNUNG: Vermeide Umbenennung %s -> %s von %s, weil %s selbst umbenannt " +"wurde." -#: merge-recursive.c:2736 +#: merge-recursive.c:2762 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" msgstr "" "KONFLIKT (umbenennen/hinzufügen): Benenne um %s->%s in %s. %s hinzugefügt in " "%s" -#: merge-recursive.c:2751 +#: merge-recursive.c:2777 #, c-format msgid "Adding merged %s" msgstr "Füge zusammengeführte Datei %s hinzu" -#: merge-recursive.c:2758 merge-recursive.c:3089 +#: merge-recursive.c:2784 merge-recursive.c:3132 #, c-format msgid "Adding as %s instead" msgstr "Füge stattdessen als %s hinzu" -#: merge-recursive.c:2914 +#: merge-recursive.c:2941 #, c-format msgid "cannot read object %s" msgstr "kann Objekt %s nicht lesen" -#: merge-recursive.c:2917 +#: merge-recursive.c:2944 #, c-format msgid "object %s is not a blob" msgstr "Objekt %s ist kein Blob" -#: merge-recursive.c:2986 +#: merge-recursive.c:3013 msgid "modify" msgstr "ändern" -#: merge-recursive.c:2986 +#: merge-recursive.c:3013 msgid "modified" msgstr "geändert" -#: merge-recursive.c:2997 +#: merge-recursive.c:3024 msgid "content" msgstr "Inhalt" -#: merge-recursive.c:3004 +#: merge-recursive.c:3031 msgid "add/add" msgstr "hinzufügen/hinzufügen" -#: merge-recursive.c:3046 +#: merge-recursive.c:3076 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "%s ausgelassen (Ergebnis des Merges existiert bereits)" -#: merge-recursive.c:3055 git-submodule.sh:895 +#: merge-recursive.c:3098 git-submodule.sh:865 msgid "submodule" msgstr "Submodul" -#: merge-recursive.c:3056 +#: merge-recursive.c:3099 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "KONFLIKT (%s): Merge-Konflikt in %s" -#: merge-recursive.c:3178 +#: merge-recursive.c:3221 #, c-format msgid "Removing %s" msgstr "Entferne %s" -#: merge-recursive.c:3204 +#: merge-recursive.c:3247 msgid "file/directory" msgstr "Datei/Verzeichnis" -#: merge-recursive.c:3210 +#: merge-recursive.c:3253 msgid "directory/file" msgstr "Verzeichnis/Datei" -#: merge-recursive.c:3217 +#: merge-recursive.c:3260 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" "KONFLIKT (%s): Es existiert bereits ein Verzeichnis %s in %s. Füge %s als %s " "hinzu." -#: merge-recursive.c:3226 +#: merge-recursive.c:3269 #, c-format msgid "Adding %s" msgstr "Füge %s hinzu" -#: merge-recursive.c:3267 +#: merge-recursive.c:3303 #, c-format -msgid "Dirty index: cannot merge (dirty: %s)" -msgstr "Geänderter Index: kann nicht mergen (geändert: %s)" +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +" %s" +msgstr "" +"Ihre lokalen Änderungen in den folgenden Dateien würden durch den Merge\n" +"überschrieben werden:\n" +" %s" -#: merge-recursive.c:3271 +#: merge-recursive.c:3314 msgid "Already up to date!" msgstr "Bereits aktuell!" -#: merge-recursive.c:3280 +#: merge-recursive.c:3323 #, c-format msgid "merging of trees %s and %s failed" msgstr "Zusammenführen der \"Tree\"-Objekte %s und %s fehlgeschlagen" -#: merge-recursive.c:3379 +#: merge-recursive.c:3422 msgid "Merging:" msgstr "Merge:" -#: merge-recursive.c:3392 +#: merge-recursive.c:3435 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "%u gemeinsamen Vorgänger-Commit gefunden" msgstr[1] "%u gemeinsame Vorgänger-Commits gefunden" -#: merge-recursive.c:3431 +#: merge-recursive.c:3474 msgid "merge returned no commit" msgstr "Merge hat keinen Commit zurückgegeben" -#: merge-recursive.c:3495 +#: merge-recursive.c:3540 #, c-format msgid "Could not parse object '%s'" msgstr "Konnte Objekt '%s' nicht parsen." -#: merge-recursive.c:3511 builtin/merge.c:658 builtin/merge.c:815 +#: merge-recursive.c:3556 builtin/merge.c:689 builtin/merge.c:846 msgid "Unable to write index." msgstr "Konnte Index nicht schreiben." -#: notes-merge.c:272 +#: notes-merge.c:274 #, c-format msgid "" "You have not concluded your previous notes merge (%s exists).\n" @@ -2644,22 +3268,22 @@ msgstr "" "Merge\n" "von Notizen beginnen." -#: notes-merge.c:279 +#: notes-merge.c:281 #, c-format msgid "You have not concluded your notes merge (%s exists)." msgstr "Sie haben Ihren Merge von Notizen nicht abgeschlossen (%s existiert)." -#: notes-utils.c:43 +#: notes-utils.c:45 msgid "Cannot commit uninitialized/unreferenced notes tree" msgstr "" "Kann uninitialisiertes/unreferenziertes Notiz-Verzeichnis nicht committen." -#: notes-utils.c:102 +#: notes-utils.c:104 #, c-format msgid "Bad notes.rewriteMode value: '%s'" msgstr "Ungültiger notes.rewriteMode Wert: '%s'" -#: notes-utils.c:112 +#: notes-utils.c:114 #, c-format msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" msgstr "" @@ -2669,35 +3293,55 @@ msgstr "" #. the environment variable, the second %s is #. its value. #. -#: notes-utils.c:142 +#: notes-utils.c:144 #, c-format msgid "Bad %s value: '%s'" msgstr "Ungültiger %s Wert: '%s'" -#: object.c:242 +#: object.c:54 +#, c-format +msgid "invalid object type \"%s\"" +msgstr "Ungültiger Objekttyp \"%s\"" + +#: object.c:173 +#, c-format +msgid "object %s is a %s, not a %s" +msgstr "Objekt %s ist ein %s, kein %s" + +#: object.c:233 +#, c-format +msgid "object %s has unknown type id %d" +msgstr "Objekt %s hat eine unbekannte Typ-Identifikation %d" + +#: object.c:246 #, c-format msgid "unable to parse object: %s" msgstr "Konnte Objekt '%s' nicht parsen." +#: object.c:266 object.c:277 +#, c-format +msgid "sha1 mismatch %s" +msgstr "SHA-1 passt nicht zu %s" + #: packfile.c:563 msgid "offset before end of packfile (broken .idx?)" msgstr "Offset vor Ende der Packdatei (fehlerhafte Indexdatei?)" -#: packfile.c:1742 +#: packfile.c:1745 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "Offset vor Beginn des Pack-Index für %s (beschädigter Index?)" -#: packfile.c:1746 +#: packfile.c:1749 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "Offset hinter Ende des Pack-Index für %s (abgeschnittener Index?)" -#: parse-options.c:621 +#: parse-options.c:672 msgid "..." msgstr "..." -#: parse-options.c:640 +#: parse-options.c:691 #, c-format msgid "usage: %s" msgstr "Verwendung: %s" @@ -2705,17 +3349,17 @@ msgstr "Verwendung: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c:646 +#: parse-options.c:697 #, c-format msgid " or: %s" msgstr " oder: %s" -#: parse-options.c:649 +#: parse-options.c:700 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:688 +#: parse-options.c:739 msgid "-NUM" msgstr "-NUM" @@ -2810,11 +3454,71 @@ msgstr "" msgid "pathspec '%s' is beyond a symbolic link" msgstr "Pfadspezifikation '%s' ist hinter einer symbolischen Verknüpfung" +#: pkt-line.c:104 +msgid "flush packet write failed" +msgstr "Flush beim Schreiben des Pakets fehlgeschlagen." + +#: pkt-line.c:142 pkt-line.c:228 +msgid "protocol error: impossibly long line" +msgstr "Protokollfehler: unmöglich lange Zeile" + +#: pkt-line.c:158 pkt-line.c:160 +msgid "packet write with format failed" +msgstr "Schreiben des Pakets mit Format fehlgeschlagen." + +#: pkt-line.c:192 +msgid "packet write failed - data exceeds max packet size" +msgstr "Schreiben des Pakets fehlgeschlagen - Daten überschreiten maximale Paketgröße" + +#: pkt-line.c:199 pkt-line.c:206 +msgid "packet write failed" +msgstr "Schreiben des Pakets fehlgeschlagen." + +#: pkt-line.c:291 +msgid "read error" +msgstr "Lesefehler" + +#: pkt-line.c:299 +msgid "the remote end hung up unexpectedly" +msgstr "Die Gegenseite hat unerwartet abgebrochen." + +#: pkt-line.c:327 +#, c-format +msgid "protocol error: bad line length character: %.4s" +msgstr "Protokollfehler: ungültiges Zeichen für Zeilenlänge: %.4s" + +#: pkt-line.c:337 pkt-line.c:342 +#, c-format +msgid "protocol error: bad line length %d" +msgstr "Protokollfehler: ungültige Zeilenlänge %d" + #: pretty.c:962 msgid "unable to parse --pretty format" msgstr "Konnte --pretty Format nicht parsen." -#: read-cache.c:1500 +#: range-diff.c:48 +msgid "could not start `log`" +msgstr "Konnte `log` nicht starten." + +#: range-diff.c:51 +msgid "could not read `log` output" +msgstr "Konnte Ausgabe von `log` nicht lesen." + +#: range-diff.c:66 sequencer.c:4540 +#, c-format +msgid "could not parse commit '%s'" +msgstr "Konnte Commit '%s' nicht parsen." + +#: range-diff.c:196 +msgid "failed to generate diff" +msgstr "Fehler beim Generieren des Diffs." + +#: range-diff.c:421 range-diff.c:423 +#, c-format +msgid "could not parse log for '%s'" +msgstr "Konnte Log für '%s' nicht parsen." + +#: read-cache.c:1579 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -2823,7 +3527,7 @@ msgstr "" "index.version gesetzt, aber Wert ungültig.\n" "Verwende Version %i" -#: read-cache.c:1510 +#: read-cache.c:1589 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -2832,229 +3536,331 @@ msgstr "" "GIT_INDEX_VERSION gesetzt, aber Wert ungültig.\n" "Verwende Version %i" -#: read-cache.c:2404 sequencer.c:4337 wrapper.c:658 builtin/merge.c:1047 +#: read-cache.c:2580 sequencer.c:4503 wrapper.c:658 builtin/merge.c:1083 #, c-format msgid "could not close '%s'" msgstr "Konnte '%s' nicht schließen" -#: read-cache.c:2477 sequencer.c:2101 sequencer.c:3233 +#: read-cache.c:2653 sequencer.c:2113 sequencer.c:3374 #, c-format msgid "could not stat '%s'" msgstr "Konnte '%s' nicht lesen." -#: read-cache.c:2490 +#: read-cache.c:2666 #, c-format msgid "unable to open git dir: %s" msgstr "konnte Git-Verzeichnis nicht öffnen: %s" -#: read-cache.c:2502 +#: read-cache.c:2678 #, c-format msgid "unable to unlink: %s" msgstr "Konnte '%s' nicht entfernen." -#: refs.c:732 sequencer.c:4333 sequencer.c:4392 wrapper.c:225 wrapper.c:395 -#: builtin/am.c:779 +#: refs.c:192 +#, c-format +msgid "%s does not point to a valid object!" +msgstr "%s zeigt auf kein gültiges Objekt!" + +#: refs.c:579 +#, c-format +msgid "ignoring dangling symref %s" +msgstr "Ignoriere unreferenzierte symbolische Referenz %s" + +#: refs.c:581 ref-filter.c:2067 +#, c-format +msgid "ignoring broken ref %s" +msgstr "Ignoriere fehlerhafte Referenz %s" + +#: refs.c:685 +#, c-format +msgid "could not open '%s' for writing: %s" +msgstr "Konnte '%s' nicht zum Schreiben öffnen: %s" + +#: refs.c:695 refs.c:746 +#, c-format +msgid "could not read ref '%s'" +msgstr "Konnte Referenz '%s' nicht lesen." + +#: refs.c:701 +#, c-format +msgid "ref '%s' already exists" +msgstr "Referenz '%s' existiert bereits." + +#: refs.c:706 +#, c-format +msgid "unexpected object ID when writing '%s'" +msgstr "Unerwartete Objekt-ID beim Schreiben von '%s'." + +#: refs.c:714 sequencer.c:385 sequencer.c:2366 sequencer.c:2492 +#: sequencer.c:2506 sequencer.c:2733 sequencer.c:4501 sequencer.c:4564 +#: wrapper.c:656 +#, c-format +msgid "could not write to '%s'" +msgstr "Konnte nicht nach '%s' schreiben." + +#: refs.c:741 sequencer.c:4499 sequencer.c:4558 wrapper.c:225 wrapper.c:395 +#: builtin/am.c:780 #, c-format msgid "could not open '%s' for writing" msgstr "Konnte '%s' nicht zum Schreiben öffnen." -#: refs.c:1880 +#: refs.c:748 +#, c-format +msgid "unexpected object ID when deleting '%s'" +msgstr "Unerwartete Objekt-ID beim Löschen von '%s'." + +#: refs.c:879 +#, c-format +msgid "log for ref %s has gap after %s" +msgstr "Log für Referenz %s hat eine Lücke nach %s." + +#: refs.c:885 +#, c-format +msgid "log for ref %s unexpectedly ended on %s" +msgstr "Log für Referenz %s unerwartet bei %s beendet." + +#: refs.c:943 +#, c-format +msgid "log for %s is empty" +msgstr "Log für %s ist leer." + +#: refs.c:1035 +#, c-format +msgid "refusing to update ref with bad name '%s'" +msgstr "Verweigere Aktualisierung einer Referenz mit fehlerhaftem Namen '%s'." + +#: refs.c:1111 +#, c-format +msgid "update_ref failed for ref '%s': %s" +msgstr "update_ref für Referenz '%s' fehlgeschlagen: %s" + +#: refs.c:1853 +#, c-format +msgid "multiple updates for ref '%s' not allowed" +msgstr "Mehrere Aktualisierungen für Referenz '%s' nicht erlaubt." + +#: refs.c:1885 msgid "ref updates forbidden inside quarantine environment" msgstr "" "Aktualisierungen von Referenzen ist innerhalb der Quarantäne-Umgebung " "verboten." +#: refs.c:1981 refs.c:2011 +#, c-format +msgid "'%s' exists; cannot create '%s'" +msgstr "'%s' existiert; kann '%s' nicht erstellen" + +#: refs.c:1987 refs.c:2022 +#, c-format +msgid "cannot process '%s' and '%s' at the same time" +msgstr "Kann '%s' und '%s' nicht zur selben Zeit verarbeiten." + #: refs/files-backend.c:1191 #, c-format msgid "could not remove reference %s" msgstr "Konnte Referenz %s nicht löschen" -#: refs/files-backend.c:1205 refs/packed-backend.c:1531 -#: refs/packed-backend.c:1541 +#: refs/files-backend.c:1205 refs/packed-backend.c:1532 +#: refs/packed-backend.c:1542 #, c-format msgid "could not delete reference %s: %s" msgstr "Konnte Referenz %s nicht entfernen: %s" -#: refs/files-backend.c:1208 refs/packed-backend.c:1544 +#: refs/files-backend.c:1208 refs/packed-backend.c:1545 #, c-format msgid "could not delete references: %s" msgstr "Konnte Referenzen nicht entfernen: %s" -#: ref-filter.c:35 wt-status.c:1850 +#: refspec.c:137 +#, c-format +msgid "invalid refspec '%s'" +msgstr "Ungültige Refspec '%s'" + +#: ref-filter.c:38 wt-status.c:1850 msgid "gone" msgstr "entfernt" -#: ref-filter.c:36 +#: ref-filter.c:39 #, c-format msgid "ahead %d" msgstr "%d voraus" -#: ref-filter.c:37 +#: ref-filter.c:40 #, c-format msgid "behind %d" msgstr "%d hinterher" -#: ref-filter.c:38 +#: ref-filter.c:41 #, c-format msgid "ahead %d, behind %d" msgstr "%d voraus, %d hinterher" -#: ref-filter.c:121 +#: ref-filter.c:137 #, c-format msgid "expected format: %%(color:<color>)" msgstr "Erwartetes Format: %%(color:<Farbe>)" -#: ref-filter.c:123 +#: ref-filter.c:139 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "nicht erkannte Farbe: %%(color:%s)" -#: ref-filter.c:145 +#: ref-filter.c:161 #, c-format msgid "Integer value expected refname:lstrip=%s" msgstr "Positiver Wert erwartet refname:lstrip=%s" -#: ref-filter.c:149 +#: ref-filter.c:165 #, c-format msgid "Integer value expected refname:rstrip=%s" msgstr "Positiver Wert erwartet refname:rstrip=%s" -#: ref-filter.c:151 +#: ref-filter.c:167 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "nicht erkanntes %%(%s) Argument: %s" -#: ref-filter.c:206 +#: ref-filter.c:222 +#, c-format +msgid "%%(objecttype) does not take arguments" +msgstr "%%(objecttype) akzeptiert keine Argumente" + +#: ref-filter.c:234 +#, c-format +msgid "%%(objectsize) does not take arguments" +msgstr "%%(objectsize) akzeptiert keine Argumente" + +#: ref-filter.c:246 #, c-format msgid "%%(body) does not take arguments" msgstr "%%(body) akzeptiert keine Argumente" -#: ref-filter.c:215 +#: ref-filter.c:255 #, c-format msgid "%%(subject) does not take arguments" msgstr "%%(subject) akzeptiert keine Argumente" -#: ref-filter.c:235 +#: ref-filter.c:275 #, c-format msgid "unknown %%(trailers) argument: %s" msgstr "unbekanntes %%(trailers) Argument: %s" -#: ref-filter.c:264 +#: ref-filter.c:304 #, c-format msgid "positive value expected contents:lines=%s" msgstr "Positiver Wert erwartet contents:lines=%s" -#: ref-filter.c:266 +#: ref-filter.c:306 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "nicht erkanntes %%(contents) Argument: %s" -#: ref-filter.c:281 +#: ref-filter.c:321 #, c-format msgid "positive value expected objectname:short=%s" msgstr "Positiver Wert erwartet objectname:short=%s" -#: ref-filter.c:285 +#: ref-filter.c:325 #, c-format msgid "unrecognized %%(objectname) argument: %s" msgstr "nicht erkanntes %%(objectname) Argument: %s" -#: ref-filter.c:315 +#: ref-filter.c:355 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "Erwartetes Format: %%(align:<Breite>,<Position>)" -#: ref-filter.c:327 +#: ref-filter.c:367 #, c-format msgid "unrecognized position:%s" msgstr "nicht erkannte Position:%s" -#: ref-filter.c:334 +#: ref-filter.c:374 #, c-format msgid "unrecognized width:%s" msgstr "nicht erkannte Breite:%s" -#: ref-filter.c:343 +#: ref-filter.c:383 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "nicht erkanntes %%(align) Argument: %s" -#: ref-filter.c:351 +#: ref-filter.c:391 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "Positive Breitenangabe für %%(align) erwartet" -#: ref-filter.c:369 +#: ref-filter.c:409 #, c-format msgid "unrecognized %%(if) argument: %s" msgstr "nicht erkanntes %%(if) Argument: %s" -#: ref-filter.c:464 +#: ref-filter.c:505 #, c-format msgid "malformed field name: %.*s" msgstr "Fehlerhafter Feldname: %.*s" -#: ref-filter.c:491 +#: ref-filter.c:532 #, c-format msgid "unknown field name: %.*s" msgstr "Unbekannter Feldname: %.*s" -#: ref-filter.c:608 +#: ref-filter.c:656 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "format: %%(if) Atom ohne ein %%(then) Atom verwendet" -#: ref-filter.c:671 +#: ref-filter.c:719 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "format: %%(then) Atom ohne ein %%(if) Atom verwendet" -#: ref-filter.c:673 +#: ref-filter.c:721 #, c-format msgid "format: %%(then) atom used more than once" msgstr "format: %%(then) Atom mehr als einmal verwendet" -#: ref-filter.c:675 +#: ref-filter.c:723 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "format: %%(then) Atom nach %%(else) verwendet" -#: ref-filter.c:703 +#: ref-filter.c:751 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "format: %%(else) Atom ohne ein %%(if) Atom verwendet" -#: ref-filter.c:705 +#: ref-filter.c:753 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "Format: %%(else) Atom ohne ein %%(then) Atom verwendet" -#: ref-filter.c:707 +#: ref-filter.c:755 #, c-format msgid "format: %%(else) atom used more than once" msgstr "Format: %%(end) Atom mehr als einmal verwendet" -#: ref-filter.c:722 +#: ref-filter.c:770 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "Format: %%(end) Atom ohne zugehöriges Atom verwendet" -#: ref-filter.c:779 +#: ref-filter.c:827 #, c-format msgid "malformed format string %s" msgstr "Fehlerhafter Formatierungsstring %s" -#: ref-filter.c:1387 +#: ref-filter.c:1416 #, c-format msgid "(no branch, rebasing %s)" msgstr "(kein Branch, Rebase von Branch %s im Gange)" -#: ref-filter.c:1390 +#: ref-filter.c:1419 #, c-format msgid "(no branch, rebasing detached HEAD %s)" msgstr "(kein Branch, Rebase von losgelöstem HEAD %s)" -#: ref-filter.c:1393 +#: ref-filter.c:1422 #, c-format msgid "(no branch, bisect started on %s)" msgstr "(kein Branch, binäre Suche begonnen bei %s)" @@ -3062,7 +3868,7 @@ msgstr "(kein Branch, binäre Suche begonnen bei %s)" #. TRANSLATORS: make sure this matches "HEAD #. detached at " in wt-status.c #. -#: ref-filter.c:1401 +#: ref-filter.c:1430 #, c-format msgid "(HEAD detached at %s)" msgstr "(HEAD losgelöst bei %s)" @@ -3070,150 +3876,145 @@ msgstr "(HEAD losgelöst bei %s)" #. TRANSLATORS: make sure this matches "HEAD #. detached from " in wt-status.c #. -#: ref-filter.c:1408 +#: ref-filter.c:1437 #, c-format msgid "(HEAD detached from %s)" msgstr "(HEAD losgelöst von %s)" -#: ref-filter.c:1412 +#: ref-filter.c:1441 msgid "(no branch)" msgstr "(kein Branch)" -#: ref-filter.c:1442 +#: ref-filter.c:1475 ref-filter.c:1623 #, c-format msgid "missing object %s for %s" msgstr "Objekt %s fehlt für %s" -#: ref-filter.c:1445 +#: ref-filter.c:1483 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "parse_object_buffer bei %s für %s fehlgeschlagen" -#: ref-filter.c:1902 +#: ref-filter.c:1980 #, c-format msgid "malformed object at '%s'" msgstr "fehlerhaftes Objekt bei '%s'" -#: ref-filter.c:1984 +#: ref-filter.c:2062 #, c-format msgid "ignoring ref with broken name %s" msgstr "Ignoriere Referenz mit fehlerhaftem Namen %s" -#: ref-filter.c:1989 -#, c-format -msgid "ignoring broken ref %s" -msgstr "Ignoriere fehlerhafte Referenz %s" - -#: ref-filter.c:2261 +#: ref-filter.c:2340 #, c-format msgid "format: %%(end) atom missing" msgstr "Format: %%(end) Atom fehlt" -#: ref-filter.c:2365 +#: ref-filter.c:2444 #, c-format msgid "malformed object name %s" msgstr "Missgebildeter Objektname %s" -#: remote.c:605 +#: remote.c:606 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "Kann 'fetch' nicht für sowohl %s als auch %s nach %s ausführen." -#: remote.c:609 +#: remote.c:610 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s folgt üblicherweise %s, nicht %s" -#: remote.c:613 +#: remote.c:614 #, c-format msgid "%s tracks both %s and %s" msgstr "%s folgt sowohl %s als auch %s" -#: remote.c:621 +#: remote.c:622 msgid "Internal error" msgstr "Interner Fehler" -#: remote.c:1534 remote.c:1635 +#: remote.c:1536 remote.c:1637 msgid "HEAD does not point to a branch" msgstr "HEAD zeigt auf keinen Branch" -#: remote.c:1543 +#: remote.c:1545 #, c-format msgid "no such branch: '%s'" msgstr "Kein solcher Branch: '%s'" -#: remote.c:1546 +#: remote.c:1548 #, c-format msgid "no upstream configured for branch '%s'" msgstr "Kein Upstream-Branch für Branch '%s' konfiguriert." -#: remote.c:1552 +#: remote.c:1554 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "Upstream-Branch '%s' nicht als Remote-Tracking-Branch gespeichert" -#: remote.c:1567 +#: remote.c:1569 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "" "Ziel für \"push\" '%s' auf Remote-Repository '%s' hat keinen lokal gefolgten " "Branch" -#: remote.c:1579 +#: remote.c:1581 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "Branch '%s' hat keinen Upstream-Branch gesetzt" -#: remote.c:1589 +#: remote.c:1591 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "Push-Refspecs für '%s' beinhalten nicht '%s'" -#: remote.c:1602 +#: remote.c:1604 msgid "push has no destination (push.default is 'nothing')" msgstr "kein Ziel für \"push\" (push.default ist 'nothing')" -#: remote.c:1624 +#: remote.c:1626 msgid "cannot resolve 'simple' push to a single destination" msgstr "kann einzelnes Ziel für \"push\" im Modus 'simple' nicht auflösen" -#: remote.c:1939 +#: remote.c:1951 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "" "Ihr Branch basiert auf '%s', aber der Upstream-Branch wurde entfernt.\n" -#: remote.c:1943 +#: remote.c:1955 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (benutzen Sie \"git branch --unset-upstream\" zum Beheben)\n" -#: remote.c:1946 +#: remote.c:1958 #, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "Ihr Branch ist auf demselben Stand wie '%s'.\n" -#: remote.c:1950 +#: remote.c:1962 #, c-format msgid "Your branch and '%s' refer to different commits.\n" msgstr "Ihr Branch und '%s' zeigen auf unterschiedliche Commits.\n" -#: remote.c:1953 +#: remote.c:1965 #, c-format msgid " (use \"%s\" for details)\n" msgstr " (benutzen Sie \"%s\" für Details)\n" -#: remote.c:1957 +#: remote.c:1969 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "Ihr Branch ist %2$d Commit vor '%1$s'.\n" msgstr[1] "Ihr Branch ist %2$d Commits vor '%1$s'.\n" -#: remote.c:1963 +#: remote.c:1975 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (benutzen Sie \"git push\", um lokale Commits zu publizieren)\n" -#: remote.c:1966 +#: remote.c:1978 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -3223,12 +4024,12 @@ msgstr[0] "" msgstr[1] "" "Ihr Branch ist %2$d Commits hinter '%1$s', und kann vorgespult werden.\n" -#: remote.c:1974 +#: remote.c:1986 msgid " (use \"git pull\" to update your local branch)\n" msgstr "" " (benutzen Sie \"git pull\", um Ihren lokalen Branch zu aktualisieren)\n" -#: remote.c:1977 +#: remote.c:1989 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -3243,22 +4044,37 @@ msgstr[1] "" "Ihr Branch und '%s' sind divergiert,\n" "und haben jeweils %d und %d unterschiedliche Commits.\n" -#: remote.c:1987 +#: remote.c:1999 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr "" " (benutzen Sie \"git pull\", um Ihren Branch mit dem Remote-Branch " "zusammenzuführen)\n" -#: revision.c:2289 +#: replace-object.c:20 +#, c-format +msgid "bad replace ref name: %s" +msgstr "ungültiger Name für ersetzende Referenz: %s" + +#: replace-object.c:29 +#, c-format +msgid "duplicate replace ref: %s" +msgstr "doppelte ersetzende Referenz: %s" + +#: replace-object.c:72 +#, c-format +msgid "replace depth too high for object %s" +msgstr "Ersetzungstiefe zu hoch für Objekt %s" + +#: revision.c:2305 msgid "your current branch appears to be broken" msgstr "Ihr aktueller Branch scheint fehlerhaft zu sein." -#: revision.c:2292 +#: revision.c:2308 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "Ihr aktueller Branch '%s' hat noch keine Commits." -#: revision.c:2489 +#: revision.c:2505 msgid "--first-parent is incompatible with --bisect" msgstr "Die Optionen --first-parent und --bisect sind inkompatibel." @@ -3276,30 +4092,30 @@ msgstr "" "Sie können diese Warnung mit `git config advice.ignoredHook false` " "deaktivieren." -#: send-pack.c:141 +#: send-pack.c:142 msgid "unexpected flush packet while reading remote unpack status" msgstr "Unerwartetes Flush-Paket beim Lesen des Remote-Unpack-Status." -#: send-pack.c:143 +#: send-pack.c:144 #, c-format msgid "unable to parse remote unpack status: %s" msgstr "Konnte Status des Entpackens der Gegenseite nicht parsen: %s" -#: send-pack.c:145 +#: send-pack.c:146 #, c-format msgid "remote unpack failed: %s" msgstr "Entpacken auf der Gegenseite fehlgeschlagen: %s" -#: send-pack.c:308 +#: send-pack.c:309 msgid "failed to sign the push certificate" msgstr "Fehler beim Signieren des \"push\"-Zertifikates" -#: send-pack.c:421 +#: send-pack.c:422 msgid "the receiving end does not support --signed push" msgstr "" "die Gegenseite unterstützt keinen signierten Versand (\"--signed push\")" -#: send-pack.c:423 +#: send-pack.c:424 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" @@ -3307,42 +4123,42 @@ msgstr "" "kein Versand des \"push\"-Zertifikates, da die Gegenseite keinen signierten\n" "Versand (\"--signed push\") unterstützt" -#: send-pack.c:435 +#: send-pack.c:436 msgid "the receiving end does not support --atomic push" msgstr "die Gegenseite unterstützt keinen atomaren Versand (\"--atomic push\")" -#: send-pack.c:440 +#: send-pack.c:441 msgid "the receiving end does not support push options" msgstr "die Gegenseite unterstützt keine Push-Optionen" -#: sequencer.c:174 +#: sequencer.c:177 #, c-format msgid "invalid commit message cleanup mode '%s'" msgstr "Ungültiger \"cleanup\"-Modus '%s' für Commit-Beschreibungen." -#: sequencer.c:274 +#: sequencer.c:278 #, c-format msgid "could not delete '%s'" msgstr "Konnte '%s' nicht löschen." -#: sequencer.c:300 +#: sequencer.c:304 msgid "revert" msgstr "Revert" -#: sequencer.c:302 +#: sequencer.c:306 msgid "cherry-pick" msgstr "Cherry-Pick" -#: sequencer.c:304 +#: sequencer.c:308 msgid "rebase -i" msgstr "interaktives Rebase" -#: sequencer.c:306 +#: sequencer.c:310 #, c-format -msgid "Unknown action: %d" +msgid "unknown action: %d" msgstr "Unbekannte Aktion: %d" -#: sequencer.c:363 +#: sequencer.c:367 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -3350,7 +4166,7 @@ msgstr "" "nach Auflösung der Konflikte markieren Sie die korrigierten Pfade\n" "mit 'git add <Pfade>' oder 'git rm <Pfade>'" -#: sequencer.c:366 +#: sequencer.c:370 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -3360,46 +4176,40 @@ msgstr "" "mit 'git add <Pfade>' oder 'git rm <Pfade>' und tragen Sie das Ergebnis mit\n" "'git commit' ein" -#: sequencer.c:379 sequencer.c:2467 +#: sequencer.c:383 sequencer.c:2488 #, c-format msgid "could not lock '%s'" msgstr "Konnte '%s' nicht sperren" -#: sequencer.c:381 sequencer.c:2345 sequencer.c:2471 sequencer.c:2485 -#: sequencer.c:2693 sequencer.c:4335 sequencer.c:4398 wrapper.c:656 -#, c-format -msgid "could not write to '%s'" -msgstr "Konnte nicht nach '%s' schreiben." - -#: sequencer.c:386 +#: sequencer.c:390 #, c-format msgid "could not write eol to '%s'" msgstr "Konnte EOL nicht nach '%s' schreiben." -#: sequencer.c:391 sequencer.c:2350 sequencer.c:2473 sequencer.c:2487 -#: sequencer.c:2701 +#: sequencer.c:395 sequencer.c:2371 sequencer.c:2494 sequencer.c:2508 +#: sequencer.c:2741 #, c-format msgid "failed to finalize '%s'" msgstr "Fehler beim Fertigstellen von '%s'." -#: 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 +#: sequencer.c:418 sequencer.c:816 sequencer.c:1505 sequencer.c:2391 +#: sequencer.c:2723 sequencer.c:2827 builtin/am.c:260 builtin/commit.c:740 +#: builtin/merge.c:1081 #, c-format msgid "could not read '%s'" msgstr "Konnte '%s' nicht lesen" -#: sequencer.c:440 +#: sequencer.c:444 #, c-format msgid "your local changes would be overwritten by %s." msgstr "Ihre lokalen Änderungen würden durch den %s überschrieben werden." -#: sequencer.c:444 +#: sequencer.c:448 msgid "commit your changes or stash them to proceed." msgstr "" "Committen Sie Ihre Änderungen oder benutzen Sie \"stash\", um fortzufahren." -#: sequencer.c:473 +#: sequencer.c:477 #, c-format msgid "%s: fast-forward" msgstr "%s: Vorspulen" @@ -3407,20 +4217,35 @@ msgstr "%s: Vorspulen" #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase -i". #. -#: sequencer.c:562 +#: sequencer.c:566 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: Konnte neue Index-Datei nicht schreiben" -#: sequencer.c:578 +#: sequencer.c:582 msgid "unable to update cache tree" msgstr "Konnte Cache-Verzeichnis nicht aktualisieren." -#: sequencer.c:591 +#: sequencer.c:595 msgid "could not resolve HEAD commit" msgstr "Konnte HEAD-Commit nicht auflösen." -#: sequencer.c:748 +#: sequencer.c:723 sequencer.c:740 +#, c-format +msgid "could not parse '%s' (looking for '%s')" +msgstr "Konnte '%s' nicht parsen (bei Suche nach '%s')." + +#: sequencer.c:731 +#, c-format +msgid "bad quoting on %s value in '%s'" +msgstr "Ungültiges Setzen von Anführungszeichen bei %s Wert in '%s'" + +#: sequencer.c:747 +#, c-format +msgid "invalid date format '%s' in '%s'" +msgstr "Ungültiges Datumsformat '%s' in '%s'" + +#: sequencer.c:761 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -3451,15 +4276,15 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:817 +#: sequencer.c:830 msgid "writing root commit" msgstr "Root-Commit schreiben" -#: sequencer.c:1042 +#: sequencer.c:1055 msgid "'prepare-commit-msg' hook failed" msgstr "'prepare-commit-msg' Hook fehlgeschlagen." -#: sequencer.c:1049 +#: 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" @@ -3487,7 +4312,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1062 +#: sequencer.c:1075 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -3513,315 +4338,344 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1102 +#: sequencer.c:1115 msgid "couldn't look up newly created commit" msgstr "Konnte neu erstellten Commit nicht nachschlagen." -#: sequencer.c:1104 +#: sequencer.c:1117 msgid "could not parse newly created commit" msgstr "Konnte neu erstellten Commit nicht analysieren." -#: sequencer.c:1150 +#: sequencer.c:1163 msgid "unable to resolve HEAD after creating commit" msgstr "Konnte HEAD nicht auflösen, nachdem der Commit erstellt wurde." -#: sequencer.c:1152 +#: sequencer.c:1165 msgid "detached HEAD" msgstr "losgelöster HEAD" -#: sequencer.c:1156 +#: sequencer.c:1169 msgid " (root-commit)" msgstr " (Basis-Commit)" -#: sequencer.c:1177 +#: sequencer.c:1190 msgid "could not parse HEAD" msgstr "Konnte HEAD nicht parsen." -#: sequencer.c:1179 +#: sequencer.c:1192 #, c-format msgid "HEAD %s is not a commit!" msgstr "HEAD %s ist kein Commit!" -#: sequencer.c:1183 builtin/commit.c:1528 +#: sequencer.c:1196 builtin/commit.c:1528 msgid "could not parse HEAD commit" msgstr "Konnte Commit von HEAD nicht analysieren." -#: sequencer.c:1234 sequencer.c:1831 +#: sequencer.c:1247 sequencer.c:1845 msgid "unable to parse commit author" msgstr "Konnte Commit-Autor nicht parsen." -#: sequencer.c:1244 builtin/am.c:1630 builtin/merge.c:644 +#: sequencer.c:1257 builtin/am.c:1632 builtin/merge.c:675 msgid "git write-tree failed to write a tree" msgstr "\"git write-tree\" schlug beim Schreiben eines \"Tree\"-Objektes fehl" -#: sequencer.c:1261 sequencer.c:1316 +#: sequencer.c:1274 sequencer.c:1329 #, c-format msgid "unable to read commit message from '%s'" msgstr "Konnte Commit-Beschreibung von '%s' nicht lesen." -#: sequencer.c:1283 builtin/am.c:1650 builtin/commit.c:1631 builtin/merge.c:824 -#: builtin/merge.c:849 +#: sequencer.c:1296 builtin/am.c:1653 builtin/commit.c:1631 builtin/merge.c:855 +#: builtin/merge.c:880 msgid "failed to write commit object" msgstr "Fehler beim Schreiben des Commit-Objektes." -#: sequencer.c:1343 +#: sequencer.c:1356 #, c-format msgid "could not parse commit %s" msgstr "Konnte Commit %s nicht parsen." -#: sequencer.c:1348 +#: sequencer.c:1361 #, c-format msgid "could not parse parent commit %s" msgstr "Konnte Eltern-Commit %s nicht parsen." -#: sequencer.c:1499 sequencer.c:1524 +#: sequencer.c:1457 sequencer.c:1565 +#, c-format +msgid "unknown command: %d" +msgstr "Unbekannter Befehl: %d" + +#: sequencer.c:1512 sequencer.c:1537 #, c-format msgid "This is a combination of %d commits." msgstr "Das ist eine Kombination aus %d Commits." -#: sequencer.c:1509 sequencer.c:4354 +#: sequencer.c:1522 sequencer.c:4520 msgid "need a HEAD to fixup" msgstr "benötige HEAD für fixup" -#: sequencer.c:1511 sequencer.c:2728 +#: sequencer.c:1524 sequencer.c:2768 msgid "could not read HEAD" msgstr "Konnte HEAD nicht lesen" -#: sequencer.c:1513 +#: sequencer.c:1526 msgid "could not read HEAD's commit message" msgstr "Konnte Commit-Beschreibung von HEAD nicht lesen" -#: sequencer.c:1519 +#: sequencer.c:1532 #, c-format msgid "cannot write '%s'" msgstr "kann '%s' nicht schreiben" -#: sequencer.c:1526 git-rebase--interactive.sh:457 +#: sequencer.c:1539 git-rebase--preserve-merges.sh:441 msgid "This is the 1st commit message:" msgstr "Das ist die erste Commit-Beschreibung:" -#: sequencer.c:1534 +#: sequencer.c:1547 #, c-format msgid "could not read commit message of %s" msgstr "Konnte Commit-Beschreibung von %s nicht lesen." -#: sequencer.c:1541 +#: sequencer.c:1554 #, c-format msgid "This is the commit message #%d:" msgstr "Das ist Commit-Beschreibung #%d:" -#: sequencer.c:1547 +#: sequencer.c:1560 #, c-format msgid "The commit message #%d will be skipped:" msgstr "Die Commit-Beschreibung #%d wird ausgelassen:" -#: sequencer.c:1552 -#, c-format -msgid "unknown command: %d" -msgstr "Unbekannter Befehl: %d" - -#: sequencer.c:1630 +#: sequencer.c:1643 msgid "your index file is unmerged." msgstr "Ihre Index-Datei ist nicht zusammengeführt." -#: sequencer.c:1637 +#: sequencer.c:1650 msgid "cannot fixup root commit" msgstr "kann fixup nicht auf Root-Commit anwenden" -#: sequencer.c:1656 +#: sequencer.c:1669 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "Commit %s ist ein Merge, aber die Option -m wurde nicht angegeben." -#: sequencer.c:1664 +#: sequencer.c:1677 #, c-format msgid "commit %s does not have parent %d" msgstr "Commit %s hat keinen Eltern-Commit %d" -#: sequencer.c:1668 +#: sequencer.c:1681 #, c-format msgid "mainline was specified but commit %s is not a merge." msgstr "Hauptlinie wurde spezifiziert, aber Commit %s ist kein Merge." -#: sequencer.c:1674 +#: sequencer.c:1687 #, c-format msgid "cannot get commit message for %s" msgstr "Kann keine Commit-Beschreibung für %s bekommen." #. TRANSLATORS: The first %s will be a "todo" command like #. "revert" or "pick", the second %s a SHA1. -#: sequencer.c:1693 +#: sequencer.c:1706 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: kann Eltern-Commit %s nicht parsen" -#: sequencer.c:1758 +#: sequencer.c:1771 #, c-format msgid "could not rename '%s' to '%s'" msgstr "Konnte '%s' nicht zu '%s' umbenennen." -#: sequencer.c:1812 +#: sequencer.c:1826 #, c-format msgid "could not revert %s... %s" msgstr "Konnte \"revert\" nicht auf %s... (%s) ausführen" -#: sequencer.c:1813 +#: sequencer.c:1827 #, c-format msgid "could not apply %s... %s" msgstr "Konnte %s... (%s) nicht anwenden" -#: sequencer.c:1863 -msgid "empty commit set passed" -msgstr "leere Menge von Commits übergeben" - -#: sequencer.c:1873 +#: sequencer.c:1885 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: Fehler beim Lesen des Index" -#: sequencer.c:1880 +#: sequencer.c:1892 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: Fehler beim Aktualisieren des Index" -#: sequencer.c:1960 +#: sequencer.c:1972 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "%s akzeptiert keine Argumente: '%s'" -#: sequencer.c:1969 +#: sequencer.c:1981 #, c-format msgid "missing arguments for %s" msgstr "Fehlende Argumente für %s." -#: sequencer.c:2028 +#: sequencer.c:2040 #, c-format msgid "invalid line %d: %.*s" msgstr "Ungültige Zeile %d: %.*s" -#: sequencer.c:2036 +#: sequencer.c:2048 #, c-format msgid "cannot '%s' without a previous commit" msgstr "Kann '%s' nicht ohne vorherigen Commit ausführen" -#: sequencer.c:2084 sequencer.c:4137 sequencer.c:4172 +#: sequencer.c:2096 sequencer.c:4277 sequencer.c:4333 #, c-format msgid "could not read '%s'." msgstr "Konnte '%s' nicht lesen." -#: sequencer.c:2107 +#: sequencer.c:2119 msgid "please fix this using 'git rebase --edit-todo'." msgstr "" "Bitte beheben Sie dieses, indem Sie 'git rebase --edit-todo' ausführen." -#: sequencer.c:2109 +#: sequencer.c:2121 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "Unbenutzbares Instruktionsblatt: '%s'" -#: sequencer.c:2114 +#: sequencer.c:2126 msgid "no commits parsed." msgstr "Keine Commits geparst." -#: sequencer.c:2125 +#: sequencer.c:2137 msgid "cannot cherry-pick during a revert." msgstr "Kann Cherry-Pick nicht während eines Reverts ausführen." -#: sequencer.c:2127 +#: sequencer.c:2139 msgid "cannot revert during a cherry-pick." msgstr "Kann Revert nicht während eines Cherry-Picks ausführen." -#: sequencer.c:2194 -#, c-format -msgid "invalid key: %s" -msgstr "Ungültiger Schlüssel: %s" - -#: sequencer.c:2197 +#: sequencer.c:2209 #, c-format msgid "invalid value for %s: %s" msgstr "Ungültiger Wert für %s: %s" -#: sequencer.c:2268 +#: sequencer.c:2285 msgid "unusable squash-onto" msgstr "Unbenutzbares squash-onto." -#: sequencer.c:2284 +#: sequencer.c:2301 #, c-format msgid "malformed options sheet: '%s'" msgstr "Fehlerhaftes Optionsblatt: '%s'" -#: sequencer.c:2322 +#: sequencer.c:2335 sequencer.c:3775 +msgid "empty commit set passed" +msgstr "leere Menge von Commits übergeben" + +#: sequencer.c:2343 msgid "a cherry-pick or revert is already in progress" msgstr "\"cherry-pick\" oder \"revert\" ist bereits im Gang" -#: sequencer.c:2323 +#: sequencer.c:2344 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "versuchen Sie \"git cherry-pick (--continue | --quit | --abort)\"" -#: sequencer.c:2326 +#: sequencer.c:2347 #, c-format msgid "could not create sequencer directory '%s'" msgstr "Konnte \"sequencer\"-Verzeichnis '%s' nicht erstellen." -#: sequencer.c:2340 +#: sequencer.c:2361 msgid "could not lock HEAD" msgstr "Konnte HEAD nicht sperren" -#: sequencer.c:2395 sequencer.c:3402 +#: sequencer.c:2416 sequencer.c:3543 msgid "no cherry-pick or revert in progress" msgstr "kein \"cherry-pick\" oder \"revert\" im Gang" -#: sequencer.c:2397 +#: sequencer.c:2418 msgid "cannot resolve HEAD" msgstr "kann HEAD nicht auflösen" -#: sequencer.c:2399 sequencer.c:2434 +#: sequencer.c:2420 sequencer.c:2455 msgid "cannot abort from a branch yet to be born" msgstr "kann nicht abbrechen: bin auf einem Branch, der noch nicht geboren ist" -#: sequencer.c:2420 builtin/grep.c:720 +#: sequencer.c:2441 builtin/grep.c:721 #, c-format msgid "cannot open '%s'" msgstr "kann '%s' nicht öffnen" -#: sequencer.c:2422 +#: sequencer.c:2443 #, c-format msgid "cannot read '%s': %s" msgstr "Kann '%s' nicht lesen: %s" -#: sequencer.c:2423 +#: sequencer.c:2444 msgid "unexpected end of file" msgstr "Unerwartetes Dateiende" -#: sequencer.c:2429 +#: sequencer.c:2450 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "gespeicherte \"pre-cherry-pick\" HEAD Datei '%s' ist beschädigt" -#: sequencer.c:2440 +#: sequencer.c:2461 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "" "Sie scheinen HEAD verändert zu haben. Keine Rückspulung, prüfen Sie HEAD." -#: sequencer.c:2544 sequencer.c:3320 +#: sequencer.c:2565 sequencer.c:3461 #, c-format msgid "could not update %s" msgstr "Konnte %s nicht aktualisieren." -#: sequencer.c:2582 sequencer.c:3300 +#: sequencer.c:2603 sequencer.c:3441 msgid "cannot read HEAD" msgstr "Kann HEAD nicht lesen" -#: sequencer.c:2617 sequencer.c:2621 builtin/difftool.c:639 +#: sequencer.c:2618 +#, c-format +msgid "unable to copy '%s' to '%s'" +msgstr "Konnte '%s' nicht nach '%s' kopieren." + +#: sequencer.c:2626 +#, c-format +msgid "" +"You can amend the commit now, with\n" +"\n" +" git commit --amend %s\n" +"\n" +"Once you are satisfied with your changes, run\n" +"\n" +" git rebase --continue\n" +msgstr "" +"Sie können den Commit nun nachbessern mit:\n" +"\n" +" git commit --amend %s\n" +"\n" +"Sobald Sie mit Ihren Änderungen zufrieden sind, führen Sie aus:\n" +"\n" +" git rebase --continue\n" + +#: sequencer.c:2636 +#, c-format +msgid "Could not apply %s... %.*s" +msgstr "Konnte %s... (%.*s) nicht anwenden" + +#: sequencer.c:2643 +#, c-format +msgid "Could not merge %.*s" +msgstr "Konnte \"%.*s\" nicht zusammenführen." + +#: sequencer.c:2654 sequencer.c:2658 builtin/difftool.c:640 #, c-format msgid "could not copy '%s' to '%s'" msgstr "Konnte '%s' nicht nach '%s' kopieren." -#: sequencer.c:2640 +#: sequencer.c:2680 sequencer.c:3095 msgid "could not read index" msgstr "Konnte den Index nicht lesen." -#: sequencer.c:2645 +#: sequencer.c:2685 #, c-format msgid "" "execution failed: %s\n" @@ -3837,11 +4691,11 @@ msgstr "" "\n" "ausführen.\n" -#: sequencer.c:2651 +#: sequencer.c:2691 msgid "and made changes to the index and/or the working tree\n" msgstr "Der Index und/oder das Arbeitsverzeichnis wurde geändert.\n" -#: sequencer.c:2657 +#: sequencer.c:2697 #, c-format msgid "" "execution succeeded: %s\n" @@ -3859,62 +4713,81 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:2770 +#: sequencer.c:2758 +#, c-format +msgid "illegal label name: '%.*s'" +msgstr "Unerlaubter Beschriftungsname: '%.*s'" + +#: sequencer.c:2810 msgid "writing fake root commit" msgstr "unechten Root-Commit schreiben" -#: sequencer.c:2775 +#: sequencer.c:2815 msgid "writing squash-onto" msgstr "squash-onto schreiben" -#: sequencer.c:2810 +#: sequencer.c:2850 #, c-format msgid "failed to find tree of %s" msgstr "Fehler beim Finden des \"Tree\"-Objektes von %s." -#: sequencer.c:2828 +#: sequencer.c:2868 msgid "could not write index" msgstr "Konnte Index nicht schreiben." -#: sequencer.c:2860 +#: sequencer.c:2895 +#, c-format +msgid "could not resolve '%s'" +msgstr "Konnte '%s' nicht auflösen." + +#: sequencer.c:2921 msgid "cannot merge without a current revision" msgstr "Kann nicht ohne einen aktuellen Commit mergen." -#: sequencer.c:2883 +#: sequencer.c:2943 #, c-format -msgid "could not resolve '%s'" -msgstr "Konnte '%s' nicht auflösen." +msgid "unable to parse '%.*s'" +msgstr "Konnte '%.*s' nicht parsen." -#: sequencer.c:2905 +#: sequencer.c:2952 +#, c-format +msgid "nothing to merge: '%.*s'" +msgstr "Nichts zum Zusammenführen: '%.*s'" + +#: sequencer.c:2964 +msgid "octopus merge cannot be executed on top of a [new root]" +msgstr "Octupus-Merge kann nicht auf Basis von [neuem Root-Commit] ausgeführt werden." + +#: sequencer.c:2979 #, c-format msgid "could not get commit message of '%s'" msgstr "Konnte keine Commit-Beschreibung von '%s' bekommen." -#: sequencer.c:2915 sequencer.c:2940 +#: sequencer.c:2989 sequencer.c:3015 #, c-format msgid "could not write '%s'" msgstr "Konnte '%s' nicht schreiben." -#: sequencer.c:3004 +#: sequencer.c:3127 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "Konnte nicht einmal versuchen '%.*s' zu mergen." -#: sequencer.c:3020 +#: sequencer.c:3143 msgid "merge: Unable to write new index file" msgstr "merge: Konnte neue Index-Datei nicht schreiben." -#: sequencer.c:3087 +#: sequencer.c:3211 #, c-format msgid "Applied autostash.\n" msgstr "Automatischen Stash angewendet.\n" -#: sequencer.c:3099 +#: sequencer.c:3223 #, c-format msgid "cannot store %s" msgstr "kann %s nicht speichern" -#: sequencer.c:3102 git-rebase.sh:188 +#: sequencer.c:3226 git-rebase.sh:188 #, c-format msgid "" "Applying autostash resulted in conflicts.\n" @@ -3925,7 +4798,7 @@ msgstr "" "Ihre Änderungen sind im Stash sicher.\n" "Sie können jederzeit \"git stash pop\" oder \"git stash drop\" ausführen.\n" -#: sequencer.c:3133 +#: sequencer.c:3257 #, c-format msgid "" "Could not execute the todo command\n" @@ -3940,56 +4813,57 @@ msgstr "" "Konnte TODO-Befehl nicht ausführen\n" "\n" " %.*s\n" -"Dieser wurde neu angesetzt; Um den Befehl zu bearbeiten, bevor fortgesetzt wird,\n" +"Dieser wurde neu angesetzt; Um den Befehl zu bearbeiten, bevor fortgesetzt " +"wird,\n" "bearbeiten Sie bitte zuerst die TODO-Liste:\n" "\n" " git rebase --edit-todo\n" " git rebase --continue\n" -#: sequencer.c:3201 +#: sequencer.c:3325 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "Angehalten bei %s... %.*s\n" -#: sequencer.c:3263 +#: sequencer.c:3404 #, c-format msgid "unknown command %d" msgstr "Unbekannter Befehl %d" -#: sequencer.c:3308 +#: sequencer.c:3449 msgid "could not read orig-head" msgstr "Konnte orig-head nicht lesen." -#: sequencer.c:3313 sequencer.c:4351 +#: sequencer.c:3454 sequencer.c:4517 msgid "could not read 'onto'" msgstr "Konnte 'onto' nicht lesen." -#: sequencer.c:3327 +#: sequencer.c:3468 #, c-format msgid "could not update HEAD to %s" msgstr "Konnte HEAD nicht auf %s aktualisieren." -#: sequencer.c:3413 +#: sequencer.c:3554 msgid "cannot rebase: You have unstaged changes." msgstr "" "Rebase nicht möglich: Sie haben Änderungen, die nicht zum Commit\n" "vorgemerkt sind." -#: sequencer.c:3422 +#: sequencer.c:3563 msgid "cannot amend non-existing commit" msgstr "Kann nicht existierenden Commit nicht nachbessern." -#: sequencer.c:3424 +#: sequencer.c:3565 #, c-format msgid "invalid file: '%s'" msgstr "Ungültige Datei: '%s'" -#: sequencer.c:3426 +#: sequencer.c:3567 #, c-format msgid "invalid contents: '%s'" msgstr "Ungültige Inhalte: '%s'" -#: sequencer.c:3429 +#: sequencer.c:3570 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -4000,47 +4874,47 @@ msgstr "" "committen Sie diese zuerst und führen Sie dann 'git rebase --continue'\n" "erneut aus." -#: sequencer.c:3454 sequencer.c:3492 +#: sequencer.c:3595 sequencer.c:3633 #, c-format msgid "could not write file: '%s'" msgstr "Konnte Datei nicht schreiben: '%s'" -#: sequencer.c:3507 +#: sequencer.c:3648 msgid "could not remove CHERRY_PICK_HEAD" msgstr "Konnte CHERRY_PICK_HEAD nicht löschen." -#: sequencer.c:3514 +#: sequencer.c:3655 msgid "could not commit staged changes." msgstr "Konnte Änderungen aus der Staging-Area nicht committen." -#: sequencer.c:3611 +#: sequencer.c:3752 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: %s kann nicht in \"cherry-pick\" benutzt werden" -#: sequencer.c:3615 +#: sequencer.c:3756 #, c-format msgid "%s: bad revision" msgstr "%s: ungültiger Commit" -#: sequencer.c:3648 +#: sequencer.c:3791 msgid "can't revert as initial commit" msgstr "Kann nicht als allerersten Commit einen Revert ausführen." -#: sequencer.c:4097 +#: sequencer.c:4238 msgid "make_script: unhandled options" msgstr "make_script: unbehandelte Optionen" -#: sequencer.c:4100 +#: sequencer.c:4241 msgid "make_script: error preparing revisions" msgstr "make_script: Fehler beim Vorbereiten der Commits" -#: sequencer.c:4141 sequencer.c:4176 +#: sequencer.c:4281 sequencer.c:4337 #, c-format msgid "unusable todo list: '%s'" msgstr "Unbenutzbare TODO-Liste: '%s'" -#: sequencer.c:4235 +#: sequencer.c:4396 #, c-format msgid "" "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." @@ -4048,7 +4922,7 @@ msgstr "" "Nicht erkannte Einstellung %s für Option rebase.missingCommitsCheck. " "Ignoriere." -#: sequencer.c:4301 +#: sequencer.c:4466 #, c-format msgid "" "Warning: some commits may have been dropped accidentally.\n" @@ -4057,7 +4931,7 @@ msgstr "" "Warnung: Einige Commits könnten aus Versehen entfernt worden sein.\n" "Entfernte Commits (neu zu alt):\n" -#: sequencer.c:4308 +#: sequencer.c:4473 #, c-format msgid "" "To avoid this message, use \"drop\" to explicitly remove a commit.\n" @@ -4074,7 +4948,7 @@ msgstr "" "Warnungen zu ändern.\n" "Die möglichen Verhaltensweisen sind: ignore, warn, error.\n" -#: sequencer.c:4320 +#: sequencer.c:4486 #, c-format msgid "" "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" @@ -4085,12 +4959,7 @@ msgstr "" "'git rebase --continue' aus.\n" "Oder Sie können den Rebase mit 'git rebase --abort' abbrechen.\n" -#: sequencer.c:4374 -#, c-format -msgid "could not parse commit '%s'" -msgstr "Konnte Commit '%s' nicht parsen." - -#: sequencer.c:4489 +#: sequencer.c:4660 msgid "the script was already rearranged." msgstr "Das Script wurde bereits umgeordnet." @@ -4255,6 +5124,38 @@ msgstr "fork fehlgeschlagen" msgid "setsid failed" msgstr "setsid fehlgeschlagen" +#: sha1-file.c:381 +#, c-format +msgid "object directory %s does not exist; check .git/objects/info/alternates" +msgstr "Objektverzeichnis %s existiert nicht; prüfe .git/objects/info/alternates" + +#: sha1-file.c:432 +#, c-format +msgid "unable to normalize alternate object path: %s" +msgstr "Konnte alternativen Objektpfad '%s' nicht normalisieren." + +#: sha1-file.c:503 +#, c-format +msgid "%s: ignoring alternate object stores, nesting too deep" +msgstr "%s: ignoriere alternative Objektspeicher - Verschachtelung zu tief" + +#: sha1-file.c:510 +#, c-format +msgid "unable to normalize object directory: %s" +msgstr "Konnte Objektverzeichnis '%s' nicht normalisieren." + +#: sha1-file.c:565 +msgid "unable to fdopen alternates lockfile" +msgstr "Konnte fdopen nicht auf Lock-Datei für \"alternates\" aufrufen." + +#: sha1-file.c:583 +msgid "unable to read alternates file" +msgstr "Konnte \"alternates\"-Datei nicht lesen." + +#: sha1-file.c:590 +msgid "unable to move new alternates file into place" +msgstr "Konnte neue \"alternates\"-Datei nicht übernehmen." + #: sha1-file.c:625 #, c-format msgid "path '%s' does not exist" @@ -4285,16 +5186,208 @@ msgstr "" "Referenziertes Repository '%s' ist mit künstlichen Vorgängern (\"grafts\") " "eingehängt." -#: sha1-name.c:442 +#: sha1-file.c:781 +#, c-format +msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" +msgstr "Versuche mmap %<PRIuMAX> über Limit %<PRIuMAX>." + +#: sha1-file.c:806 +msgid "mmap failed" +msgstr "mmap fehlgeschlagen" + +#: sha1-file.c:973 +#, c-format +msgid "object file %s is empty" +msgstr "Objektdatei %s ist leer." + +#: sha1-file.c:1093 sha1-file.c:2206 +#, c-format +msgid "corrupt loose object '%s'" +msgstr "Fehlerhaftes loses Objekt '%s'." + +#: sha1-file.c:1095 sha1-file.c:2210 +#, c-format +msgid "garbage at end of loose object '%s'" +msgstr "Nutzlose Daten am Ende von losem Objekt '%s'." + +#: sha1-file.c:1137 +msgid "invalid object type" +msgstr "ungültiger Objekt-Typ" + +#: sha1-file.c:1219 +#, c-format +msgid "unable to unpack %s header with --allow-unknown-type" +msgstr "Konnte %s Kopfbereich nicht mit --allow-unknown-type entpacken." + +#: sha1-file.c:1222 +#, c-format +msgid "unable to unpack %s header" +msgstr "Konnte %s Kopfbereich nicht entpacken." + +#: sha1-file.c:1228 +#, c-format +msgid "unable to parse %s header with --allow-unknown-type" +msgstr "Konnte %s Kopfbereich mit --allow-unknown-type nicht parsen." + +#: sha1-file.c:1231 +#, c-format +msgid "unable to parse %s header" +msgstr "Konnte %s Kopfbereich nicht parsen." + +#: sha1-file.c:1422 +#, c-format +msgid "failed to read object %s" +msgstr "Konnte Objekt %s nicht lesen." + +#: sha1-file.c:1426 +#, c-format +msgid "replacement %s not found for %s" +msgstr "Ersetzung %s für %s nicht gefunden." + +#: sha1-file.c:1430 +#, c-format +msgid "loose object %s (stored in %s) is corrupt" +msgstr "Loses Objekt %s (gespeichert in %s) ist beschädigt." + +#: sha1-file.c:1434 +#, c-format +msgid "packed object %s (stored in %s) is corrupt" +msgstr "Gepacktes Objekt %s (gespeichert in %s) ist beschädigt." + +#: sha1-file.c:1536 +#, c-format +msgid "unable to write sha1 filename %s" +msgstr "Konnte SHA1-Dateiname %s nicht schreiben." + +#: sha1-file.c:1543 +#, c-format +msgid "unable to set permission to '%s'" +msgstr "Konnte Zugriffsberechtigung auf '%s' nicht setzen." + +#: sha1-file.c:1550 +msgid "file write error" +msgstr "Fehler beim Schreiben einer Datei." + +#: sha1-file.c:1569 +msgid "error when closing sha1 file" +msgstr "Fehler beim Schließen der SHA1-Datei." + +#: sha1-file.c:1635 +#, c-format +msgid "insufficient permission for adding an object to repository database %s" +msgstr "Unzureichende Berechtigung zum Hinzufügen eines Objektes zur Repository-Datenbank %s" + +#: sha1-file.c:1637 +msgid "unable to create temporary file" +msgstr "Konnte temporäre Datei nicht erstellen." + +#: sha1-file.c:1661 +msgid "unable to write sha1 file" +msgstr "Konnte SHA1-Datei nicht schreiben." + +#: sha1-file.c:1667 +#, c-format +msgid "unable to deflate new object %s (%d)" +msgstr "Konnte neues Objekt %s (%d) nicht komprimieren." + +#: sha1-file.c:1671 +#, c-format +msgid "deflateEnd on object %s failed (%d)" +msgstr "deflateEnd auf Objekt %s fehlgeschlagen (%d)" + +#: sha1-file.c:1675 +#, c-format +msgid "confused by unstable object source data for %s" +msgstr "Fehler wegen instabilen Objektquelldaten für %s" + +#: sha1-file.c:1685 builtin/pack-objects.c:899 +#, c-format +msgid "failed utime() on %s" +msgstr "Fehler beim Aufruf von utime() auf '%s'." + +#: sha1-file.c:1760 +#, c-format +msgid "cannot read sha1_file for %s" +msgstr "Kann SHA1-Datei für %s nicht lesen." + +#: sha1-file.c:1805 +msgid "corrupt commit" +msgstr "fehlerhafter Commit" + +#: sha1-file.c:1813 +msgid "corrupt tag" +msgstr "fehlerhaftes Tag" + +#: sha1-file.c:1906 +#, c-format +msgid "read error while indexing %s" +msgstr "Lesefehler beim Indizieren von '%s'." + +#: sha1-file.c:1909 +#, c-format +msgid "short read while indexing %s" +msgstr "read() zu kurz beim Indizieren von '%s'." + +#: sha1-file.c:1980 sha1-file.c:1989 +#, c-format +msgid "%s: failed to insert into database" +msgstr "%s: Fehler beim Einfügen in die Datenbank" + +#: sha1-file.c:1995 +#, c-format +msgid "%s: unsupported file type" +msgstr "%s: nicht unterstützte Dateiart" + +#: sha1-file.c:2019 +#, c-format +msgid "%s is not a valid object" +msgstr "%s ist kein gültiges Objekt" + +#: sha1-file.c:2021 +#, c-format +msgid "%s is not a valid '%s' object" +msgstr "%s ist kein gültiges '%s' Objekt" + +#: sha1-file.c:2048 builtin/index-pack.c:158 +#, c-format +msgid "unable to open %s" +msgstr "kann %s nicht öffnen" + +#: sha1-file.c:2217 sha1-file.c:2269 +#, c-format +msgid "sha1 mismatch for %s (expected %s)" +msgstr "SHA-1 für %s passen nicht zusammen (%s erwartet)" + +#: sha1-file.c:2241 +#, c-format +msgid "unable to mmap %s" +msgstr "Konnte mmap nicht auf %s ausführen." + +#: sha1-file.c:2246 +#, c-format +msgid "unable to unpack header of %s" +msgstr "Konnte Kopfbereich von %s nicht entpacken." + +#: sha1-file.c:2252 +#, c-format +msgid "unable to parse header of %s" +msgstr "Konnte Kopfbereich von %s nicht parsen." + +#: sha1-file.c:2263 +#, c-format +msgid "unable to unpack contents of %s" +msgstr "Konnte Inhalt von %s nicht entpacken." + +#: sha1-name.c:444 #, c-format msgid "short SHA1 %s is ambiguous" msgstr "Kurzer SHA-1 %s ist mehrdeutig." -#: sha1-name.c:453 +#: sha1-name.c:455 msgid "The candidates are:" msgstr "Die Kandidaten sind:" -#: sha1-name.c:695 +#: sha1-name.c:699 msgid "" "Git normally never creates a ref that ends with 40 hex characters\n" "because it will be ignored when you just specify 40-hex. These refs\n" @@ -4354,36 +5447,46 @@ msgstr "In nicht ausgechecktem Submodul '%s'." msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "Pfadspezifikation '%s' befindet sich in Submodul '%.*s'" -#: submodule.c:837 +#: submodule.c:839 #, c-format msgid "submodule entry '%s' (%s) is a %s, not a commit" msgstr "Submodul-Eintrag '%s' (%s) ist ein %s, kein Commit." -#: submodule.c:1069 builtin/branch.c:651 builtin/submodule--helper.c:1743 +#: submodule.c:1071 builtin/branch.c:670 builtin/submodule--helper.c:1888 msgid "Failed to resolve HEAD as a valid ref." msgstr "Konnte HEAD nicht als gültige Referenz auflösen." -#: submodule.c:1373 +#: submodule.c:1377 #, c-format msgid "'%s' not recognized as a git repository" msgstr "'%s' nicht als Git-Repository erkannt" -#: submodule.c:1511 +#: submodule.c:1515 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "Konnte 'git status' in Submodul '%s' nicht starten." -#: submodule.c:1524 +#: submodule.c:1528 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "Konnte 'git status' in Submodul '%s' nicht ausführen." -#: submodule.c:1617 +#: submodule.c:1543 +#, c-format +msgid "Could not unset core.worktree setting in submodule '%s'" +msgstr "Konnte core.worktree Einstellung in Submodul '%s' nicht aufheben." + +#: submodule.c:1633 #, c-format msgid "submodule '%s' has dirty index" msgstr "Submodul '%s' hat einen geänderten Index." -#: submodule.c:1716 +#: submodule.c:1685 +#, c-format +msgid "Submodule '%s' could not be updated." +msgstr "Submodule '%s' konnte nicht aktualisiert werden." + +#: submodule.c:1734 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" @@ -4391,18 +5494,18 @@ msgstr "" "relocate_gitdir für Submodul '%s' mit mehr als einem Arbeitsverzeichnis\n" "wird nicht unterstützt" -#: submodule.c:1728 submodule.c:1784 +#: submodule.c:1746 submodule.c:1802 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "konnte Name für Submodul '%s' nicht nachschlagen" -#: submodule.c:1732 builtin/submodule--helper.c:1261 -#: builtin/submodule--helper.c:1271 +#: submodule.c:1750 builtin/submodule--helper.c:1406 +#: builtin/submodule--helper.c:1416 #, c-format msgid "could not create directory '%s'" msgstr "Konnte Verzeichnis '%s' nicht erstellen." -#: submodule.c:1735 +#: submodule.c:1753 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -4413,30 +5516,30 @@ msgstr "" "'%s' nach\n" "'%s'\n" -#: submodule.c:1819 +#: submodule.c:1837 #, c-format msgid "could not recurse into submodule '%s'" msgstr "Fehler bei Rekursion in Submodul-Pfad '%s'" -#: submodule.c:1863 +#: submodule.c:1881 msgid "could not start ls-files in .." msgstr "Konnte 'ls-files' nicht in .. starten" -#: submodule.c:1902 +#: submodule.c:1920 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree mit unerwartetem Rückgabewert %d beendet" -#: submodule-config.c:230 +#: submodule-config.c:231 #, c-format msgid "ignoring suspicious submodule name: %s" msgstr "Ignoriere verdächtigen Submodulnamen: %s" -#: submodule-config.c:294 +#: submodule-config.c:295 msgid "negative values not allowed for submodule.fetchjobs" msgstr "Negative Werte für submodule.fetchjobs nicht erlaubt." -#: submodule-config.c:467 +#: submodule-config.c:468 #, c-format msgid "invalid value for %s" msgstr "Ungültiger Wert für %s" @@ -4452,7 +5555,7 @@ msgstr "Ausführen des Anhang-Befehls '%s' fehlgeschlagen" msgid "unknown value '%s' for key '%s'" msgstr "unbekannter Wert '%s' für Schlüssel %s" -#: trailer.c:539 trailer.c:544 builtin/remote.c:293 +#: trailer.c:539 trailer.c:544 builtin/remote.c:294 #, c-format msgid "more than one %s" msgstr "mehr als ein %s" @@ -4471,7 +5574,7 @@ msgstr "Konnte Eingabe-Datei '%s' nicht lesen" msgid "could not read from stdin" msgstr "konnte nicht von der Standard-Eingabe lesen" -#: trailer.c:1008 builtin/am.c:46 +#: trailer.c:1008 builtin/am.c:47 #, c-format msgid "could not stat %s" msgstr "Konnte '%s' nicht lesen" @@ -4500,16 +5603,39 @@ msgstr "konnte temporäre Datei nicht zu %s umbenennen" msgid "Would set upstream of '%s' to '%s' of '%s'\n" msgstr "Würde Upstream-Branch von '%s' zu '%s' von '%s' setzen\n" +#: transport.c:142 +#, c-format +msgid "could not read bundle '%s'" +msgstr "Konnte Paket '%s' nicht lesen." + #: transport.c:208 #, c-format msgid "transport: invalid depth option '%s'" msgstr "transport: ungültige --depth Option '%s'" -#: transport.c:584 +#: transport.c:586 msgid "could not parse transport.color.* config" msgstr "Konnte transport.color.* Konfiguration nicht parsen." -#: transport.c:996 +#: transport.c:659 +msgid "support for protocol v2 not implemented yet" +msgstr "Unterstützung für Protokoll v2 noch nicht implementiert." + +#: transport.c:785 +#, c-format +msgid "unknown value for config '%s': %s" +msgstr "Unbekannter Wert für Konfiguration '%s': %s" + +#: transport.c:851 +#, c-format +msgid "transport '%s' not allowed" +msgstr "Übertragungsart '%s' nicht erlaubt." + +#: transport.c:903 +msgid "git-over-rsync is no longer supported" +msgstr "git-over-rsync wird nicht länger unterstützt." + +#: transport.c:998 #, c-format msgid "" "The following submodule paths contain changes that can\n" @@ -4518,7 +5644,7 @@ msgstr "" "Die folgenden Submodul-Pfade enthalten Änderungen, die in keinem\n" "Remote-Repository gefunden wurden:\n" -#: transport.c:1000 +#: transport.c:1002 #, c-format msgid "" "\n" @@ -4545,32 +5671,207 @@ msgstr "" "zum Versenden zu einem Remote-Repository.\n" "\n" -#: transport.c:1008 +#: transport.c:1010 msgid "Aborting." msgstr "Abbruch." -#: transport-helper.c:1087 +#: transport.c:1148 +msgid "failed to push all needed submodules" +msgstr "Fehler beim Versand aller erforderlichen Submodule." + +#: transport.c:1270 transport-helper.c:643 +msgid "operation not supported by protocol" +msgstr "Die Operation wird von dem Protokoll nicht unterstützt." + +#: transport.c:1352 +#, c-format +msgid "invalid line while parsing alternate refs: %s" +msgstr "Ungültige Zeile beim Parsen alternativer Referenzen: %s" + +#: transport-helper.c:51 transport-helper.c:80 +msgid "full write to remote helper failed" +msgstr "Vollständiges Schreiben zu Remote-Helper fehlgeschlagen." + +#: transport-helper.c:132 +#, c-format +msgid "unable to find remote helper for '%s'" +msgstr "Konnte Remote-Helper für '%s' nicht finden." + +#: transport-helper.c:148 transport-helper.c:557 +msgid "can't dup helper output fd" +msgstr "Konnte dup() auf Dateideskriptor für Ausgaben des Remote-Helpers nicht ausführen." + +#: transport-helper.c:199 +#, c-format +msgid "" +"unknown mandatory capability %s; this remote helper probably needs newer " +"version of Git" +msgstr "" +"Unbekannte erforderliche Fähigkeit %s; dieser Remote-Helper benötigt\n" +"wahrscheinlich eine neuere Version von Git." + +#: transport-helper.c:205 +msgid "this remote helper should implement refspec capability" +msgstr "Dieser Remote-Helper sollte die \"refspec\"-Fähigkeit implementieren." + +#: transport-helper.c:272 transport-helper.c:412 +#, c-format +msgid "%s unexpectedly said: '%s'" +msgstr "unerwartete Ausgabe von %s: '%s'" + +#: transport-helper.c:401 +#, c-format +msgid "%s also locked %s" +msgstr "%s sperrte auch %s" + +#: transport-helper.c:479 +msgid "couldn't run fast-import" +msgstr "Konnte \"fast-import\" nicht ausführen." + +#: transport-helper.c:502 +msgid "error while running fast-import" +msgstr "Fehler beim Ausführen von 'fast-import'." + +#: transport-helper.c:531 transport-helper.c:1091 #, c-format -msgid "Could not read ref %s" +msgid "could not read ref %s" msgstr "Konnte Referenz %s nicht lesen." -#: tree-walk.c:31 +#: transport-helper.c:576 +#, c-format +msgid "unknown response to connect: %s" +msgstr "Unbekannte Antwort auf 'connect': %s" + +#: transport-helper.c:598 +msgid "setting remote service path not supported by protocol" +msgstr "Setzen des Remote-Service Pfads wird von dem Protokoll nicht unterstützt." + +#: transport-helper.c:600 +msgid "invalid remote service path" +msgstr "Ungültiger Remote-Service Pfad." + +#: transport-helper.c:646 +#, c-format +msgid "can't connect to subservice %s" +msgstr "Kann keine Verbindung zu Subservice %s herstellen." + +#: transport-helper.c:713 +#, c-format +msgid "expected ok/error, helper said '%s'" +msgstr "Erwartete ok/error, Remote-Helper gab '%s' aus." + +#: transport-helper.c:766 +#, c-format +msgid "helper reported unexpected status of %s" +msgstr "Remote-Helper meldete unerwarteten Status von %s." + +#: transport-helper.c:827 +#, c-format +msgid "helper %s does not support dry-run" +msgstr "Remote-Helper %s unterstützt kein Trockenlauf." + +#: transport-helper.c:830 +#, c-format +msgid "helper %s does not support --signed" +msgstr "Remote-Helper %s unterstützt kein --signed." + +#: transport-helper.c:833 +#, c-format +msgid "helper %s does not support --signed=if-asked" +msgstr "Remote-Helper %s unterstützt kein --signed=if-asked." + +#: transport-helper.c:840 +#, c-format +msgid "helper %s does not support 'push-option'" +msgstr "Remote-Helper %s unterstützt nicht 'push-option'." + +#: transport-helper.c:932 +msgid "remote-helper doesn't support push; refspec needed" +msgstr "Remote-Helper unterstützt kein Push; Refspec benötigt" + +#: transport-helper.c:937 +#, c-format +msgid "helper %s does not support 'force'" +msgstr "Remote-Helper %s unterstützt kein 'force'." + +#: transport-helper.c:984 +msgid "couldn't run fast-export" +msgstr "Konnte \"fast-export\" nicht ausführen." + +#: transport-helper.c:989 +msgid "error while running fast-export" +msgstr "Fehler beim Ausführen von \"fast-export\"." + +#: transport-helper.c:1014 +#, c-format +msgid "" +"No refs in common and none specified; doing nothing.\n" +"Perhaps you should specify a branch such as 'master'.\n" +msgstr "" +"Keine gemeinsamen Referenzen und nichts spezifiziert; keine Ausführung.\n" +"Vielleicht sollten Sie einen Branch wie 'master' angeben.\n" + +#: transport-helper.c:1077 +#, c-format +msgid "malformed response in ref list: %s" +msgstr "Ungültige Antwort in Referenzliste: %s" + +#: transport-helper.c:1230 +#, c-format +msgid "read(%s) failed" +msgstr "Lesen von %s fehlgeschlagen." + +#: transport-helper.c:1257 +#, c-format +msgid "write(%s) failed" +msgstr "Schreiben von %s fehlgeschlagen." + +#: transport-helper.c:1306 +#, c-format +msgid "%s thread failed" +msgstr "Thread %s fehlgeschlagen." + +#: transport-helper.c:1310 +#, c-format +msgid "%s thread failed to join: %s" +msgstr "Fehler beim Beitreten zu Thread %s: %s" + +#: transport-helper.c:1329 transport-helper.c:1333 +#, c-format +msgid "can't start thread for copying data: %s" +msgstr "Kann Thread zum Kopieren von Daten nicht starten: %s" + +#: transport-helper.c:1370 +#, c-format +msgid "%s process failed to wait" +msgstr "Fehler beim Warten von Prozess %s." + +#: transport-helper.c:1374 +#, c-format +msgid "%s process failed" +msgstr "Prozess %s fehlgeschlagen" + +#: transport-helper.c:1392 transport-helper.c:1401 +msgid "can't start thread for copying data" +msgstr "Kann Thread zum Kopieren von Daten nicht starten." + +#: tree-walk.c:33 msgid "too-short tree object" msgstr "zu kurzes Tree-Objekt" -#: tree-walk.c:37 +#: tree-walk.c:39 msgid "malformed mode in tree entry" msgstr "fehlerhafter Modus in Tree-Eintrag" -#: tree-walk.c:41 +#: tree-walk.c:43 msgid "empty filename in tree entry" msgstr "leerer Dateiname in Tree-Eintrag" -#: tree-walk.c:113 +#: tree-walk.c:115 msgid "too-short tree file" msgstr "zu kurze Tree-Datei" -#: unpack-trees.c:111 +#: unpack-trees.c:112 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -4581,7 +5882,7 @@ msgstr "" "%%sBitte committen oder stashen Sie Ihre Änderungen, bevor Sie Branches\n" "wechseln." -#: unpack-trees.c:113 +#: unpack-trees.c:114 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -4591,7 +5892,7 @@ msgstr "" "überschrieben werden:\n" "%%s" -#: unpack-trees.c:116 +#: unpack-trees.c:117 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -4601,7 +5902,7 @@ msgstr "" "überschrieben werden:\n" "%%sBitte committen oder stashen Sie Ihre Änderungen, bevor Sie mergen." -#: unpack-trees.c:118 +#: unpack-trees.c:119 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -4611,7 +5912,7 @@ msgstr "" "überschrieben werden:\n" "%%s" -#: unpack-trees.c:121 +#: unpack-trees.c:122 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -4621,7 +5922,7 @@ msgstr "" "überschrieben werden:\n" "%%sBitte committen oder stashen Sie Ihre Änderungen, bevor Sie %s ausführen." -#: unpack-trees.c:123 +#: unpack-trees.c:124 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -4630,7 +5931,7 @@ msgstr "" "Ihre lokalen Änderungen würden durch %s überschrieben werden.\n" "%%s" -#: unpack-trees.c:128 +#: unpack-trees.c:129 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" @@ -4640,7 +5941,7 @@ msgstr "" "Dateien in diesen Verzeichnissen verloren gehen:\n" "%s" -#: unpack-trees.c:132 +#: unpack-trees.c:133 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -4650,7 +5951,7 @@ msgstr "" "den Checkout entfernt werden:\n" "%%sBitte verschieben oder entfernen Sie diese, bevor Sie Branches wechseln." -#: unpack-trees.c:134 +#: unpack-trees.c:135 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -4661,7 +5962,7 @@ msgstr "" "Checkout entfernt werden:\n" "%%s" -#: unpack-trees.c:137 +#: unpack-trees.c:138 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -4671,7 +5972,7 @@ msgstr "" "den Merge entfernt werden:\n" "%%sBitte verschieben oder entfernen Sie diese, bevor sie mergen." -#: unpack-trees.c:139 +#: unpack-trees.c:140 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -4682,7 +5983,7 @@ msgstr "" "Merge entfernt werden:\n" "%%s" -#: unpack-trees.c:142 +#: unpack-trees.c:143 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -4692,7 +5993,7 @@ msgstr "" "den %s entfernt werden:\n" "%%sBitte verschieben oder entfernen Sie diese, bevor sie %s ausführen." -#: unpack-trees.c:144 +#: unpack-trees.c:145 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -4702,7 +6003,7 @@ msgstr "" "den %s entfernt werden:\n" "%%s" -#: unpack-trees.c:150 +#: unpack-trees.c:151 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -4713,7 +6014,7 @@ msgstr "" "den Checkout überschrieben werden:\n" "%%sBitte verschieben oder entfernen Sie diese, bevor Sie Branches wechseln." -#: unpack-trees.c:152 +#: unpack-trees.c:153 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -4725,7 +6026,7 @@ msgstr "" "Checkout überschrieben werden:\n" "%%s" -#: unpack-trees.c:155 +#: unpack-trees.c:156 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -4735,7 +6036,7 @@ msgstr "" "den Merge überschrieben werden:\n" "%%sBitte verschieben oder entfernen Sie diese, bevor Sie mergen." -#: unpack-trees.c:157 +#: unpack-trees.c:158 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -4745,7 +6046,7 @@ msgstr "" "den Merge überschrieben werden:\n" "%%s" -#: unpack-trees.c:160 +#: unpack-trees.c:161 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -4755,7 +6056,7 @@ msgstr "" "den %s überschrieben werden:\n" "%%sBitte verschieben oder entfernen Sie diese, bevor sie %s ausführen." -#: unpack-trees.c:162 +#: unpack-trees.c:163 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -4766,12 +6067,12 @@ msgstr "" "%s überschrieben werden:\n" "%%s" -#: unpack-trees.c:170 +#: unpack-trees.c:171 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "Eintrag '%s' überschneidet sich mit '%s'. Kann nicht verbinden." -#: unpack-trees.c:173 +#: unpack-trees.c:174 #, c-format msgid "" "Cannot update sparse checkout: the following entries are not up to date:\n" @@ -4781,7 +6082,7 @@ msgstr "" "sind nicht aktuell:\n" "%s" -#: unpack-trees.c:175 +#: unpack-trees.c:176 #, c-format msgid "" "The following working tree files would be overwritten by sparse checkout " @@ -4792,7 +6093,7 @@ msgstr "" "über einen partiellen Checkout überschrieben werden:\n" "%s" -#: unpack-trees.c:177 +#: unpack-trees.c:178 #, c-format msgid "" "The following working tree files would be removed by sparse checkout " @@ -4803,7 +6104,7 @@ msgstr "" "über einen partiellen Checkout entfernt werden:\n" "%s" -#: unpack-trees.c:179 +#: unpack-trees.c:180 #, c-format msgid "" "Cannot update submodule:\n" @@ -4812,12 +6113,12 @@ msgstr "" "Kann Submodul nicht aktualisieren:\n" "%s" -#: unpack-trees.c:262 +#: unpack-trees.c:254 #, c-format msgid "Aborting\n" msgstr "Abbruch\n" -#: unpack-trees.c:344 +#: unpack-trees.c:336 msgid "Checking out files" msgstr "Checke Dateien aus" @@ -4885,8 +6186,8 @@ msgstr "'%s' zeigt nicht zurück auf '%s'" msgid "could not open '%s' for reading and writing" msgstr "Konnte '%s' nicht zum Lesen und Schreiben öffnen." -#: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:770 -#: builtin/am.c:862 builtin/merge.c:1042 +#: wrapper.c:227 wrapper.c:397 builtin/am.c:321 builtin/am.c:771 +#: builtin/am.c:863 builtin/merge.c:1078 #, c-format msgid "could not open '%s' for reading" msgstr "Konnte '%s' nicht zum Lesen öffnen." @@ -4935,7 +6236,7 @@ msgstr "" #: wt-status.c:202 wt-status.c:1015 msgid "Changes to be committed:" -msgstr "zum Commit vorgemerkte Änderungen:" +msgstr "Zum Commit vorgemerkte Änderungen:" #: wt-status.c:220 wt-status.c:1024 msgid "Changes not staged for commit:" @@ -5242,7 +6543,7 @@ msgstr "" #: wt-status.c:1379 #, c-format msgid "You are currently reverting commit %s." -msgstr "Sie sind gerade an einem Revert von Commit '%s'." +msgstr "Sie sind gerade beim Revert von Commit '%s'." #: wt-status.c:1384 msgid " (fix conflicts and run \"git revert --continue\")" @@ -5409,23 +6710,23 @@ msgid "ahead " msgstr "voraus " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2366 +#: wt-status.c:2376 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "" "%s nicht möglich: Sie haben Änderungen, die nicht zum Commit vorgemerkt sind." -#: wt-status.c:2372 +#: wt-status.c:2382 msgid "additionally, your index contains uncommitted changes." msgstr "Zusätzlich enthält die Staging-Area nicht committete Änderungen." -#: wt-status.c:2374 +#: wt-status.c:2384 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "" "%s nicht möglich: Die Staging-Area enthält nicht committete Änderungen." -#: compat/precompose_utf8.c:58 builtin/clone.c:442 +#: compat/precompose_utf8.c:58 builtin/clone.c:443 #, c-format msgid "failed to unlink '%s'" msgstr "Konnte '%s' nicht entfernen." @@ -5439,7 +6740,7 @@ msgstr "git add [<Optionen>] [--] <Pfadspezifikation>..." msgid "unexpected diff status %c" msgstr "unerwarteter Differenz-Status %c" -#: builtin/add.c:88 builtin/commit.c:266 +#: builtin/add.c:88 builtin/commit.c:279 msgid "updating files failed" msgstr "Aktualisierung der Dateien fehlgeschlagen" @@ -5453,7 +6754,7 @@ msgid "Unstaged changes after refreshing the index:" msgstr "" "Nicht zum Commit vorgemerkte Änderungen nach Aktualisierung der Staging-Area:" -#: builtin/add.c:233 builtin/rev-parse.c:888 +#: builtin/add.c:233 builtin/rev-parse.c:893 msgid "Could not read the index" msgstr "Konnte den Index nicht lesen" @@ -5490,9 +6791,9 @@ msgstr "" "Die folgenden Pfade werden durch eine Ihrer \".gitignore\" Dateien " "ignoriert:\n" -#: builtin/add.c:289 builtin/clean.c:911 builtin/fetch.c:145 builtin/mv.c:123 -#: builtin/prune-packed.c:55 builtin/pull.c:212 builtin/push.c:557 -#: builtin/remote.c:1342 builtin/rm.c:240 builtin/send-pack.c:165 +#: builtin/add.c:289 builtin/clean.c:906 builtin/fetch.c:134 builtin/mv.c:123 +#: builtin/prune-packed.c:56 builtin/pull.c:212 builtin/push.c:557 +#: builtin/remote.c:1344 builtin/rm.c:240 builtin/send-pack.c:165 msgid "dry run" msgstr "Probelauf" @@ -5500,7 +6801,7 @@ msgstr "Probelauf" msgid "interactive picking" msgstr "interaktives Auswählen" -#: builtin/add.c:293 builtin/checkout.c:1135 builtin/reset.c:302 +#: builtin/add.c:293 builtin/checkout.c:1144 builtin/reset.c:302 msgid "select hunks interactively" msgstr "Blöcke interaktiv auswählen" @@ -5549,19 +6850,15 @@ msgstr "" msgid "check if - even missing - files are ignored in dry run" msgstr "prüfen ob - auch fehlende - Dateien im Probelauf ignoriert werden" -#: builtin/add.c:307 builtin/update-index.c:974 -msgid "(+/-)x" -msgstr "(+/-)x" - -#: builtin/add.c:307 builtin/update-index.c:975 +#: builtin/add.c:308 builtin/update-index.c:973 msgid "override the executable bit of the listed files" msgstr "das \"ausführbar\"-Bit der aufgelisteten Dateien überschreiben" -#: builtin/add.c:309 +#: builtin/add.c:310 msgid "warn when adding an embedded repository" msgstr "warnen wenn eingebettetes Repository hinzugefügt wird" -#: builtin/add.c:324 +#: builtin/add.c:325 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -5595,159 +6892,159 @@ msgstr "" "\n" "Siehe \"git help submodule\" für weitere Informationen." -#: builtin/add.c:352 +#: builtin/add.c:353 #, c-format msgid "adding embedded git repository: %s" msgstr "Füge eingebettetes Repository hinzu: %s" -#: builtin/add.c:370 +#: builtin/add.c:371 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "Verwenden Sie -f wenn Sie diese wirklich hinzufügen möchten.\n" -#: builtin/add.c:378 +#: builtin/add.c:379 msgid "adding files failed" msgstr "Hinzufügen von Dateien fehlgeschlagen" -#: builtin/add.c:416 +#: builtin/add.c:417 msgid "-A and -u are mutually incompatible" msgstr "Die Optionen -A und -u sind zueinander inkompatibel." -#: builtin/add.c:423 +#: builtin/add.c:424 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "" "Die Option --ignore-missing kann nur zusammen mit --dry-run verwendet werden." -#: builtin/add.c:427 +#: builtin/add.c:428 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "--chmod Parameter '%s' muss entweder -x oder +x sein" -#: builtin/add.c:442 +#: builtin/add.c:443 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "Nichts spezifiziert, nichts hinzugefügt.\n" -#: builtin/add.c:443 +#: builtin/add.c:444 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Meinten Sie vielleicht 'git add .'?\n" -#: builtin/add.c:448 builtin/check-ignore.c:177 builtin/checkout.c:280 -#: builtin/checkout.c:483 builtin/clean.c:958 builtin/commit.c:325 -#: builtin/diff-tree.c:114 builtin/mv.c:144 builtin/reset.c:241 -#: builtin/rm.c:270 builtin/submodule--helper.c:328 +#: builtin/add.c:449 builtin/check-ignore.c:177 builtin/checkout.c:282 +#: builtin/checkout.c:485 builtin/clean.c:953 builtin/commit.c:338 +#: builtin/diff-tree.c:115 builtin/grep.c:492 builtin/mv.c:144 +#: builtin/reset.c:241 builtin/rm.c:270 builtin/submodule--helper.c:329 msgid "index file corrupt" msgstr "Index-Datei beschädigt" -#: builtin/am.c:414 +#: builtin/am.c:415 msgid "could not parse author script" msgstr "konnte Autor-Skript nicht parsen" -#: builtin/am.c:498 +#: builtin/am.c:499 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "'%s' wurde durch den applypatch-msg Hook entfernt" -#: builtin/am.c:539 +#: builtin/am.c:540 #, c-format msgid "Malformed input line: '%s'." msgstr "Fehlerhafte Eingabezeile: '%s'." -#: builtin/am.c:576 +#: builtin/am.c:577 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "Fehler beim Kopieren der Notizen von '%s' nach '%s'" -#: builtin/am.c:602 +#: builtin/am.c:603 msgid "fseek failed" msgstr "\"fseek\" fehlgeschlagen" -#: builtin/am.c:790 +#: builtin/am.c:791 #, c-format msgid "could not parse patch '%s'" msgstr "konnte Patch '%s' nicht parsen" -#: builtin/am.c:855 +#: builtin/am.c:856 msgid "Only one StGIT patch series can be applied at once" msgstr "Es kann nur eine StGIT Patch-Serie auf einmal angewendet werden." -#: builtin/am.c:903 +#: builtin/am.c:904 msgid "invalid timestamp" msgstr "ungültiger Zeitstempel" -#: builtin/am.c:908 builtin/am.c:920 +#: builtin/am.c:909 builtin/am.c:921 msgid "invalid Date line" msgstr "Ungültige \"Date\"-Zeile" -#: builtin/am.c:915 +#: builtin/am.c:916 msgid "invalid timezone offset" msgstr "Ungültiger Offset in der Zeitzone" -#: builtin/am.c:1008 +#: builtin/am.c:1009 msgid "Patch format detection failed." msgstr "Patch-Formaterkennung fehlgeschlagen." -#: builtin/am.c:1013 builtin/clone.c:407 +#: builtin/am.c:1014 builtin/clone.c:408 #, c-format msgid "failed to create directory '%s'" msgstr "Fehler beim Erstellen von Verzeichnis '%s'" -#: builtin/am.c:1018 +#: builtin/am.c:1019 msgid "Failed to split patches." msgstr "Fehler beim Aufteilen der Patches." -#: builtin/am.c:1148 builtin/commit.c:351 +#: builtin/am.c:1149 builtin/commit.c:364 msgid "unable to write index file" msgstr "Konnte Index-Datei nicht schreiben." -#: builtin/am.c:1162 +#: builtin/am.c:1163 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "" "Wenn Sie das Problem aufgelöst haben, führen Sie \"%s --continue\" aus." -#: builtin/am.c:1163 +#: builtin/am.c:1164 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "" "Falls Sie diesen Patch auslassen möchten, führen Sie stattdessen \"%s --skip" "\" aus." -#: builtin/am.c:1164 +#: builtin/am.c:1165 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "" "Um den ursprünglichen Branch wiederherzustellen und die Anwendung der " "Patches abzubrechen, führen Sie \"%s --abort\" aus." -#: builtin/am.c:1271 +#: builtin/am.c:1272 msgid "Patch is empty." msgstr "Patch ist leer." -#: builtin/am.c:1337 +#: builtin/am.c:1338 #, c-format msgid "invalid ident line: %.*s" msgstr "Ungültige Identifikationszeile: %.*s" -#: builtin/am.c:1359 +#: builtin/am.c:1360 #, c-format msgid "unable to parse commit %s" msgstr "Konnte Commit '%s' nicht parsen." -#: builtin/am.c:1554 +#: builtin/am.c:1556 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" "Dem Repository fehlen notwendige Blobs um auf einen 3-Wege-Merge " "zurückzufallen." -#: builtin/am.c:1556 +#: builtin/am.c:1558 msgid "Using index info to reconstruct a base tree..." msgstr "" "Verwende Informationen aus der Staging-Area, um ein Basisverzeichnis " "nachzustellen ..." -#: builtin/am.c:1575 +#: builtin/am.c:1577 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -5755,30 +7052,30 @@ msgstr "" "Haben Sie den Patch per Hand editiert?\n" "Er kann nicht auf die Blobs in seiner 'index' Zeile angewendet werden." -#: builtin/am.c:1581 +#: builtin/am.c:1583 msgid "Falling back to patching base and 3-way merge..." msgstr "Falle zurück zum Patchen der Basis und zum 3-Wege-Merge ..." -#: builtin/am.c:1606 +#: builtin/am.c:1608 msgid "Failed to merge in the changes." msgstr "Merge der Änderungen fehlgeschlagen." -#: builtin/am.c:1637 +#: builtin/am.c:1640 msgid "applying to an empty history" msgstr "auf leere Historie anwenden" -#: builtin/am.c:1683 builtin/am.c:1687 +#: builtin/am.c:1686 builtin/am.c:1690 #, c-format msgid "cannot resume: %s does not exist." msgstr "Kann nicht fortsetzen: %s existiert nicht" -#: builtin/am.c:1703 +#: builtin/am.c:1706 msgid "cannot be interactive without stdin connected to a terminal." msgstr "" "Kann nicht interaktiv sein, ohne dass die Standard-Eingabe mit einem " "Terminal verbunden ist." -#: builtin/am.c:1708 +#: builtin/am.c:1711 msgid "Commit Body is:" msgstr "Commit-Beschreibung ist:" @@ -5786,25 +7083,25 @@ msgstr "Commit-Beschreibung ist:" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1718 +#: builtin/am.c:1721 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "Anwenden? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " -#: builtin/am.c:1768 +#: builtin/am.c:1771 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Geänderter Index: kann Patches nicht anwenden (geändert: %s)" -#: builtin/am.c:1808 builtin/am.c:1879 +#: builtin/am.c:1811 builtin/am.c:1879 #, c-format msgid "Applying: %.*s" msgstr "Wende an: %.*s" -#: builtin/am.c:1824 +#: builtin/am.c:1828 msgid "No changes -- Patch already applied." msgstr "Keine Änderungen -- Patches bereits angewendet." -#: builtin/am.c:1832 +#: builtin/am.c:1834 #, c-format msgid "Patch failed at %s %.*s" msgstr "Anwendung des Patches fehlgeschlagen bei %s %.*s" @@ -5882,8 +7179,8 @@ msgstr "historische Option -- kein Effekt" msgid "allow fall back on 3way merging if needed" msgstr "erlaube, falls notwendig, das Zurückfallen auf einen 3-Wege-Merge" -#: builtin/am.c:2222 builtin/init-db.c:484 builtin/prune-packed.c:57 -#: builtin/repack.c:192 +#: builtin/am.c:2222 builtin/init-db.c:485 builtin/prune-packed.c:58 +#: builtin/repack.c:299 msgid "be quiet" msgstr "weniger Ausgaben" @@ -5925,17 +7222,17 @@ msgstr "alles vor einer Scheren-Zeile entfernen" msgid "pass it through git-apply" msgstr "an git-apply übergeben" -#: 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 +#: builtin/am.c:2260 builtin/commit.c:1332 builtin/fmt-merge-msg.c:670 +#: builtin/fmt-merge-msg.c:673 builtin/grep.c:857 builtin/merge.c:237 +#: builtin/pull.c:150 builtin/pull.c:208 builtin/repack.c:308 +#: builtin/repack.c:312 builtin/repack.c:314 builtin/show-branch.c:650 +#: builtin/show-ref.c:170 builtin/tag.c:384 parse-options.h:144 #: parse-options.h:146 parse-options.h:258 msgid "n" msgstr "Anzahl" -#: builtin/am.c:2266 builtin/branch.c:632 builtin/for-each-ref.c:38 -#: builtin/replace.c:543 builtin/tag.c:419 builtin/verify-tag.c:39 +#: builtin/am.c:2266 builtin/branch.c:651 builtin/for-each-ref.c:38 +#: builtin/replace.c:543 builtin/tag.c:420 builtin/verify-tag.c:39 msgid "format" msgstr "Format" @@ -5980,8 +7277,8 @@ msgstr "Autor-Datum als Commit-Datum verwenden" msgid "use current timestamp for author date" msgstr "aktuellen Zeitstempel als Autor-Datum verwenden" -#: builtin/am.c:2298 builtin/commit.c:1468 builtin/merge.c:238 -#: builtin/pull.c:183 builtin/revert.c:112 builtin/tag.c:399 +#: builtin/am.c:2298 builtin/commit.c:1468 builtin/merge.c:271 +#: builtin/pull.c:183 builtin/revert.c:113 builtin/tag.c:400 msgid "key-id" msgstr "GPG-Schlüsselkennung" @@ -6120,146 +7417,146 @@ msgstr "--write-terms benötigt zwei Argumente." msgid "--bisect-clean-state requires no arguments" msgstr "--bisect-clean-state erwartet keine Argumente." -#: builtin/blame.c:29 +#: builtin/blame.c:31 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "git blame [<Optionen>] [<rev-opts>] [<Commit>] [--] <Datei>" -#: builtin/blame.c:34 +#: builtin/blame.c:36 msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "<rev-opts> sind dokumentiert in git-rev-list(1)" -#: builtin/blame.c:404 +#: builtin/blame.c:406 #, c-format msgid "expecting a color: %s" msgstr "Erwarte eine Farbe: %s" -#: builtin/blame.c:411 +#: builtin/blame.c:413 msgid "must end with a color" msgstr "Muss mit einer Farbe enden." -#: builtin/blame.c:697 +#: builtin/blame.c:700 #, c-format msgid "invalid color '%s' in color.blame.repeatedLines" msgstr "Ungültige Farbe '%s' in color.blame.repeatedLines." -#: builtin/blame.c:715 +#: builtin/blame.c:718 msgid "invalid value for blame.coloring" msgstr "Ungültiger Wert für blame.coloring." -#: builtin/blame.c:786 +#: builtin/blame.c:789 msgid "Show blame entries as we find them, incrementally" msgstr "\"blame\"-Einträge schrittweise anzeigen, während wir sie generieren" -#: builtin/blame.c:787 +#: builtin/blame.c:790 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "leere SHA-1 für Grenz-Commits anzeigen (Standard: aus)" -#: builtin/blame.c:788 +#: builtin/blame.c:791 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "Root-Commits nicht als Grenzen behandeln (Standard: aus)" -#: builtin/blame.c:789 +#: builtin/blame.c:792 msgid "Show work cost statistics" msgstr "Statistiken zum Arbeitsaufwand anzeigen" -#: builtin/blame.c:790 +#: builtin/blame.c:793 msgid "Force progress reporting" msgstr "Fortschrittsanzeige erzwingen" -#: builtin/blame.c:791 +#: builtin/blame.c:794 msgid "Show output score for blame entries" msgstr "Ausgabebewertung für \"blame\"-Einträge anzeigen" -#: builtin/blame.c:792 +#: builtin/blame.c:795 msgid "Show original filename (Default: auto)" msgstr "ursprünglichen Dateinamen anzeigen (Standard: auto)" -#: builtin/blame.c:793 +#: builtin/blame.c:796 msgid "Show original linenumber (Default: off)" msgstr "ursprüngliche Zeilennummer anzeigen (Standard: aus)" -#: builtin/blame.c:794 +#: builtin/blame.c:797 msgid "Show in a format designed for machine consumption" msgstr "Anzeige in einem Format für maschinelle Auswertung" -#: builtin/blame.c:795 +#: builtin/blame.c:798 msgid "Show porcelain format with per-line commit information" msgstr "" "Anzeige in Format für Fremdprogramme mit Commit-Informationen pro Zeile" -#: builtin/blame.c:796 +#: builtin/blame.c:799 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "" "Den gleichen Ausgabemodus benutzen wie \"git-annotate\" (Standard: aus)" -#: builtin/blame.c:797 +#: builtin/blame.c:800 msgid "Show raw timestamp (Default: off)" msgstr "Unbearbeiteten Zeitstempel anzeigen (Standard: aus)" -#: builtin/blame.c:798 +#: builtin/blame.c:801 msgid "Show long commit SHA1 (Default: off)" msgstr "Langen Commit-SHA1 anzeigen (Standard: aus)" -#: builtin/blame.c:799 +#: builtin/blame.c:802 msgid "Suppress author name and timestamp (Default: off)" msgstr "Den Namen des Autors und den Zeitstempel unterdrücken (Standard: aus)" -#: builtin/blame.c:800 +#: builtin/blame.c:803 msgid "Show author email instead of name (Default: off)" msgstr "" "Anstatt des Namens die E-Mail-Adresse des Autors anzeigen (Standard: aus)" -#: builtin/blame.c:801 +#: builtin/blame.c:804 msgid "Ignore whitespace differences" msgstr "Unterschiede im Whitespace ignorieren" -#: builtin/blame.c:802 +#: builtin/blame.c:805 msgid "color redundant metadata from previous line differently" msgstr "redundante Metadaten der vorherigen Zeile unterschiedlich einfärben" -#: builtin/blame.c:803 +#: builtin/blame.c:806 msgid "color lines by age" msgstr "Zeilen nach Alter einfärben" -#: builtin/blame.c:810 +#: builtin/blame.c:813 msgid "Use an experimental heuristic to improve diffs" msgstr "" "eine experimentelle Heuristik zur Verbesserung der Darstellung\n" "von Unterschieden verwenden" -#: builtin/blame.c:812 +#: builtin/blame.c:815 msgid "Spend extra cycles to find better match" msgstr "Länger arbeiten, um bessere Übereinstimmungen zu finden" -#: builtin/blame.c:813 +#: builtin/blame.c:816 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "Commits von <Datei> benutzen, anstatt \"git-rev-list\" aufzurufen" -#: builtin/blame.c:814 +#: builtin/blame.c:817 msgid "Use <file>'s contents as the final image" msgstr "Inhalte der <Datei>en als endgültiges Abbild benutzen" -#: builtin/blame.c:815 builtin/blame.c:816 +#: builtin/blame.c:818 builtin/blame.c:819 msgid "score" msgstr "Bewertung" -#: builtin/blame.c:815 +#: builtin/blame.c:818 msgid "Find line copies within and across files" msgstr "kopierte Zeilen innerhalb oder zwischen Dateien finden" -#: builtin/blame.c:816 +#: builtin/blame.c:819 msgid "Find line movements within and across files" msgstr "verschobene Zeilen innerhalb oder zwischen Dateien finden" -#: builtin/blame.c:817 +#: builtin/blame.c:820 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:817 +#: builtin/blame.c:820 msgid "Process only line range n,m, counting from 1" msgstr "nur Zeilen im Bereich n,m verarbeiten, gezählt von 1" -#: builtin/blame.c:866 +#: builtin/blame.c:869 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "" "--progress kann nicht mit --incremental oder Formaten für Fremdprogramme\n" @@ -6273,50 +7570,50 @@ msgstr "" #. your language may need more or fewer display #. columns. #. -#: builtin/blame.c:917 +#: builtin/blame.c:920 msgid "4 years, 11 months ago" msgstr "vor 4 Jahren und 11 Monaten" -#: builtin/blame.c:1003 +#: builtin/blame.c:1007 #, c-format msgid "file %s has only %lu line" msgid_plural "file %s has only %lu lines" msgstr[0] "Datei %s hat nur %lu Zeile" msgstr[1] "Datei %s hat nur %lu Zeilen" -#: builtin/blame.c:1049 +#: builtin/blame.c:1053 msgid "Blaming lines" msgstr "Verarbeite Zeilen" -#: builtin/branch.c:27 +#: builtin/branch.c:28 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" msgstr "git branch [<Optionen>] [-r | -a] [--merged | --no-merged]" -#: builtin/branch.c:28 +#: builtin/branch.c:29 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" msgstr "git branch [<Optionen>] [-l] [-f] <Branchname> [<Startpunkt>]" -#: builtin/branch.c:29 +#: builtin/branch.c:30 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." msgstr "git branch [<Optionen>] [-r] (-d | -D) <Branchname>..." -#: builtin/branch.c:30 +#: builtin/branch.c:31 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" msgstr "git branch [<Optionen>] (-m | -M) [<alter-Branch>] <neuer-Branch>" -#: builtin/branch.c:31 +#: builtin/branch.c:32 msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>" msgstr "git branch [<Optionen>] (-c | -C) [<alter-Branch>] <neuer-Branch>" -#: builtin/branch.c:32 +#: builtin/branch.c:33 msgid "git branch [<options>] [-r | -a] [--points-at]" msgstr "git branch [<Optionen>] [-r | -a] [--points-at]" -#: builtin/branch.c:33 +#: builtin/branch.c:34 msgid "git branch [<options>] [-r | -a] [--format]" msgstr "git branch [<Optionen>] [-r | -a] [--format]" -#: builtin/branch.c:146 +#: builtin/branch.c:151 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" @@ -6325,7 +7622,7 @@ msgstr "" "entferne Branch '%s', der zusammengeführt wurde mit\n" " '%s', aber noch nicht mit HEAD zusammengeführt wurde." -#: builtin/branch.c:150 +#: builtin/branch.c:155 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" @@ -6334,12 +7631,12 @@ msgstr "" "entferne Branch '%s' nicht, der noch nicht zusammengeführt wurde mit\n" " '%s', obwohl er mit HEAD zusammengeführt wurde." -#: builtin/branch.c:164 +#: builtin/branch.c:169 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "Konnte Commit-Objekt für '%s' nicht nachschlagen." -#: builtin/branch.c:168 +#: builtin/branch.c:173 #, c-format msgid "" "The branch '%s' is not fully merged.\n" @@ -6349,119 +7646,119 @@ msgstr "" "Wenn Sie sicher sind diesen Branch zu entfernen, führen Sie 'git branch -D " "%s' aus." -#: builtin/branch.c:181 +#: builtin/branch.c:186 msgid "Update of config-file failed" msgstr "Aktualisierung der Konfigurationsdatei fehlgeschlagen." -#: builtin/branch.c:212 +#: builtin/branch.c:217 msgid "cannot use -a with -d" msgstr "kann -a nicht mit -d benutzen" -#: builtin/branch.c:218 +#: builtin/branch.c:223 msgid "Couldn't look up commit object for HEAD" msgstr "Konnte Commit-Objekt für HEAD nicht nachschlagen." -#: builtin/branch.c:232 +#: builtin/branch.c:237 #, c-format msgid "Cannot delete branch '%s' checked out at '%s'" msgstr "Kann Branch '%s' nicht entfernen, ausgecheckt in '%s'." -#: builtin/branch.c:247 +#: builtin/branch.c:252 #, c-format msgid "remote-tracking branch '%s' not found." msgstr "Remote-Tracking-Branch '%s' nicht gefunden" -#: builtin/branch.c:248 +#: builtin/branch.c:253 #, c-format msgid "branch '%s' not found." msgstr "Branch '%s' nicht gefunden." -#: builtin/branch.c:263 +#: builtin/branch.c:268 #, c-format msgid "Error deleting remote-tracking branch '%s'" msgstr "Fehler beim Entfernen des Remote-Tracking-Branches '%s'" -#: builtin/branch.c:264 +#: builtin/branch.c:269 #, c-format msgid "Error deleting branch '%s'" msgstr "Fehler beim Entfernen des Branches '%s'" -#: builtin/branch.c:271 +#: builtin/branch.c:276 #, c-format msgid "Deleted remote-tracking branch %s (was %s).\n" msgstr "Remote-Tracking-Branch %s entfernt (war %s).\n" -#: builtin/branch.c:272 +#: builtin/branch.c:277 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "Branch %s entfernt (war %s).\n" -#: builtin/branch.c:416 builtin/tag.c:58 +#: builtin/branch.c:421 builtin/tag.c:59 msgid "unable to parse format string" msgstr "Konnte Formatierungsstring nicht parsen." -#: builtin/branch.c:453 +#: builtin/branch.c:458 #, c-format msgid "Branch %s is being rebased at %s" msgstr "Branch %s wird auf %s umgesetzt" -#: builtin/branch.c:457 +#: builtin/branch.c:462 #, c-format msgid "Branch %s is being bisected at %s" msgstr "Binäre Suche von Branch %s zu %s im Gange" -#: builtin/branch.c:474 +#: builtin/branch.c:479 msgid "cannot copy the current branch while not on any." msgstr "" "Kann den aktuellen Branch nicht kopieren, solange Sie sich auf keinem " "befinden." -#: builtin/branch.c:476 +#: builtin/branch.c:481 msgid "cannot rename the current branch while not on any." msgstr "" "Kann aktuellen Branch nicht umbenennen, solange Sie sich auf keinem befinden." -#: builtin/branch.c:487 +#: builtin/branch.c:492 #, c-format msgid "Invalid branch name: '%s'" msgstr "Ungültiger Branchname: '%s'" -#: builtin/branch.c:514 +#: builtin/branch.c:519 msgid "Branch rename failed" msgstr "Umbenennung des Branches fehlgeschlagen" -#: builtin/branch.c:516 +#: builtin/branch.c:521 msgid "Branch copy failed" msgstr "Kopie des Branches fehlgeschlagen" -#: builtin/branch.c:520 +#: builtin/branch.c:525 #, c-format msgid "Created a copy of a misnamed branch '%s'" msgstr "Kopie eines falsch benannten Branches '%s' erstellt." -#: builtin/branch.c:523 +#: builtin/branch.c:528 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "falsch benannten Branch '%s' umbenannt" -#: builtin/branch.c:529 +#: builtin/branch.c:534 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "Branch umbenannt zu %s, aber HEAD ist nicht aktualisiert!" -#: builtin/branch.c:538 +#: builtin/branch.c:543 msgid "Branch is renamed, but update of config-file failed" msgstr "" "Branch ist umbenannt, aber die Aktualisierung der Konfigurationsdatei ist " "fehlgeschlagen." -#: builtin/branch.c:540 +#: builtin/branch.c:545 msgid "Branch is copied, but update of config-file failed" msgstr "" "Branch wurde kopiert, aber die Aktualisierung der Konfigurationsdatei ist\n" "fehlgeschlagen." -#: builtin/branch.c:556 +#: builtin/branch.c:561 #, c-format msgid "" "Please edit the description for the branch\n" @@ -6472,187 +7769,191 @@ msgstr "" " %s\n" "Zeilen, die mit '%c' beginnen, werden entfernt.\n" -#: builtin/branch.c:589 +#: builtin/branch.c:602 msgid "Generic options" msgstr "Allgemeine Optionen" -#: builtin/branch.c:591 +#: builtin/branch.c:604 msgid "show hash and subject, give twice for upstream branch" msgstr "Hash und Betreff anzeigen; -vv: zusätzlich Upstream-Branch" -#: builtin/branch.c:592 +#: builtin/branch.c:605 msgid "suppress informational messages" msgstr "Informationsmeldungen unterdrücken" -#: builtin/branch.c:593 +#: builtin/branch.c:606 msgid "set up tracking mode (see git-pull(1))" msgstr "Modus zum Folgen von Branches einstellen (siehe git-pull(1))" -#: builtin/branch.c:595 +#: builtin/branch.c:608 msgid "do not use" msgstr "nicht verwenden" -#: builtin/branch.c:597 +#: builtin/branch.c:610 msgid "upstream" msgstr "Upstream" -#: builtin/branch.c:597 +#: builtin/branch.c:610 msgid "change the upstream info" msgstr "Informationen zum Upstream-Branch ändern" -#: builtin/branch.c:598 +#: builtin/branch.c:611 msgid "Unset the upstream info" msgstr "Informationen zum Upstream-Branch entfernen" -#: builtin/branch.c:599 +#: builtin/branch.c:612 msgid "use colored output" msgstr "farbige Ausgaben verwenden" -#: builtin/branch.c:600 +#: builtin/branch.c:613 msgid "act on remote-tracking branches" msgstr "auf Remote-Tracking-Branches wirken" -#: builtin/branch.c:602 builtin/branch.c:604 +#: builtin/branch.c:615 builtin/branch.c:617 msgid "print only branches that contain the commit" msgstr "nur Branches ausgeben, die diesen Commit enthalten" -#: builtin/branch.c:603 builtin/branch.c:605 +#: builtin/branch.c:616 builtin/branch.c:618 msgid "print only branches that don't contain the commit" msgstr "nur Branches ausgeben, die diesen Commit nicht enthalten" -#: builtin/branch.c:608 +#: builtin/branch.c:621 msgid "Specific git-branch actions:" msgstr "spezifische Aktionen für \"git-branch\":" -#: builtin/branch.c:609 +#: builtin/branch.c:622 msgid "list both remote-tracking and local branches" msgstr "Remote-Tracking und lokale Branches auflisten" -#: builtin/branch.c:611 +#: builtin/branch.c:624 msgid "delete fully merged branch" msgstr "vollständig zusammengeführten Branch entfernen" -#: builtin/branch.c:612 +#: builtin/branch.c:625 msgid "delete branch (even if not merged)" msgstr "Branch löschen (auch wenn nicht zusammengeführt)" -#: builtin/branch.c:613 +#: builtin/branch.c:626 msgid "move/rename a branch and its reflog" msgstr "einen Branch und dessen Reflog verschieben/umbenennen" -#: builtin/branch.c:614 +#: builtin/branch.c:627 msgid "move/rename a branch, even if target exists" msgstr "" "einen Branch verschieben/umbenennen, auch wenn das Ziel bereits existiert" -#: builtin/branch.c:615 +#: builtin/branch.c:628 msgid "copy a branch and its reflog" msgstr "einen Branch und dessen Reflog kopieren" -#: builtin/branch.c:616 +#: builtin/branch.c:629 msgid "copy a branch, even if target exists" msgstr "einen Branch kopieren, auch wenn das Ziel bereits existiert" -#: builtin/branch.c:617 +#: builtin/branch.c:630 msgid "list branch names" msgstr "Branchnamen auflisten" -#: builtin/branch.c:618 +#: builtin/branch.c:631 msgid "create the branch's reflog" msgstr "das Reflog des Branches erzeugen" -#: builtin/branch.c:620 +#: builtin/branch.c:634 +msgid "deprecated synonym for --create-reflog" +msgstr "veraltetes Synonym für --create-reflog" + +#: builtin/branch.c:639 msgid "edit the description for the branch" msgstr "die Beschreibung für den Branch bearbeiten" -#: builtin/branch.c:621 +#: builtin/branch.c:640 msgid "force creation, move/rename, deletion" msgstr "Erstellung, Verschiebung/Umbenennung oder Löschung erzwingen" -#: builtin/branch.c:622 +#: builtin/branch.c:641 msgid "print only branches that are merged" msgstr "nur zusammengeführte Branches ausgeben" -#: builtin/branch.c:623 +#: builtin/branch.c:642 msgid "print only branches that are not merged" msgstr "nur nicht zusammengeführte Branches ausgeben" -#: builtin/branch.c:624 +#: builtin/branch.c:643 msgid "list branches in columns" msgstr "Branches in Spalten auflisten" -#: builtin/branch.c:625 builtin/for-each-ref.c:40 builtin/ls-remote.c:70 -#: builtin/tag.c:412 +#: builtin/branch.c:644 builtin/for-each-ref.c:40 builtin/ls-remote.c:70 +#: builtin/tag.c:413 msgid "key" msgstr "Schüssel" -#: builtin/branch.c:626 builtin/for-each-ref.c:41 builtin/ls-remote.c:71 -#: builtin/tag.c:413 +#: builtin/branch.c:645 builtin/for-each-ref.c:41 builtin/ls-remote.c:71 +#: builtin/tag.c:414 msgid "field name to sort on" msgstr "sortiere nach diesem Feld" -#: builtin/branch.c:628 builtin/for-each-ref.c:43 builtin/notes.c:408 -#: builtin/notes.c:411 builtin/notes.c:571 builtin/notes.c:574 -#: builtin/tag.c:415 +#: builtin/branch.c:647 builtin/for-each-ref.c:43 builtin/notes.c:410 +#: builtin/notes.c:413 builtin/notes.c:573 builtin/notes.c:576 +#: builtin/tag.c:416 msgid "object" msgstr "Objekt" -#: builtin/branch.c:629 +#: builtin/branch.c:648 msgid "print only branches of the object" msgstr "nur Branches von diesem Objekt ausgeben" -#: builtin/branch.c:631 builtin/for-each-ref.c:49 builtin/tag.c:422 +#: builtin/branch.c:650 builtin/for-each-ref.c:49 builtin/tag.c:423 msgid "sorting and filtering are case insensitive" msgstr "Sortierung und Filterung sind unabhängig von Groß- und Kleinschreibung" -#: builtin/branch.c:632 builtin/for-each-ref.c:38 builtin/tag.c:420 +#: builtin/branch.c:651 builtin/for-each-ref.c:38 builtin/tag.c:421 #: builtin/verify-tag.c:39 msgid "format to use for the output" msgstr "für die Ausgabe zu verwendendes Format" -#: builtin/branch.c:655 builtin/clone.c:737 +#: builtin/branch.c:674 builtin/clone.c:739 msgid "HEAD not found below refs/heads!" msgstr "HEAD wurde nicht unter \"refs/heads\" gefunden!" -#: builtin/branch.c:678 +#: builtin/branch.c:697 msgid "--column and --verbose are incompatible" msgstr "Die Optionen --column und --verbose sind inkompatibel." -#: builtin/branch.c:693 builtin/branch.c:745 builtin/branch.c:754 +#: builtin/branch.c:717 builtin/branch.c:769 builtin/branch.c:778 msgid "branch name required" msgstr "Branchname erforderlich" -#: builtin/branch.c:721 +#: builtin/branch.c:745 msgid "Cannot give description to detached HEAD" msgstr "zu losgelöstem HEAD kann keine Beschreibung hinterlegt werden" -#: builtin/branch.c:726 +#: builtin/branch.c:750 msgid "cannot edit description of more than one branch" msgstr "Beschreibung von mehr als einem Branch kann nicht bearbeitet werden" -#: builtin/branch.c:733 +#: builtin/branch.c:757 #, c-format msgid "No commit on branch '%s' yet." msgstr "Noch kein Commit in Branch '%s'." -#: builtin/branch.c:736 +#: builtin/branch.c:760 #, c-format msgid "No branch named '%s'." msgstr "Branch '%s' nicht vorhanden." -#: builtin/branch.c:751 +#: builtin/branch.c:775 msgid "too many branches for a copy operation" msgstr "zu viele Branches für eine Kopieroperation angegeben" -#: builtin/branch.c:760 +#: builtin/branch.c:784 msgid "too many arguments for a rename operation" msgstr "zu viele Argumente für eine Umbenennen-Operation angegeben" -#: builtin/branch.c:765 +#: builtin/branch.c:789 msgid "too many arguments to set new upstream" msgstr "zu viele Argumente angegeben, um Upstream-Branch zu setzen" -#: builtin/branch.c:769 +#: builtin/branch.c:793 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." @@ -6660,40 +7961,40 @@ msgstr "" "Konnte keinen neuen Upstream-Branch von HEAD zu %s setzen, da dieser auf\n" "keinen Branch zeigt." -#: builtin/branch.c:772 builtin/branch.c:794 builtin/branch.c:810 +#: builtin/branch.c:796 builtin/branch.c:818 builtin/branch.c:834 #, c-format msgid "no such branch '%s'" msgstr "Kein solcher Branch '%s'" -#: builtin/branch.c:776 +#: builtin/branch.c:800 #, c-format msgid "branch '%s' does not exist" msgstr "Branch '%s' existiert nicht" -#: builtin/branch.c:788 +#: builtin/branch.c:812 msgid "too many arguments to unset upstream" msgstr "" "zu viele Argumente angegeben, um Konfiguration zu Upstream-Branch zu " "entfernen" -#: builtin/branch.c:792 +#: builtin/branch.c:816 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" "Konnte Konfiguration zu Upstream-Branch von HEAD nicht entfernen, da dieser\n" "auf keinen Branch zeigt." -#: builtin/branch.c:798 +#: builtin/branch.c:822 #, c-format msgid "Branch '%s' has no upstream information" msgstr "Branch '%s' hat keinen Upstream-Branch gesetzt" -#: builtin/branch.c:813 +#: builtin/branch.c:837 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "" "Die Optionen -a und -r bei 'git branch' können nicht gemeimsam mit einem " "Branchnamen verwendet werden." -#: builtin/branch.c:816 +#: builtin/branch.c:840 msgid "" "the '--set-upstream' option is no longer supported. Please use '--track' or " "'--set-upstream-to' instead." @@ -6714,7 +8015,7 @@ msgstr "Um ein Paket zu erstellen wird ein Repository benötigt." msgid "Need a repository to unbundle." msgstr "Zum Entpacken wird ein Repository benötigt." -#: builtin/cat-file.c:525 +#: builtin/cat-file.c:577 msgid "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <type> | --textconv | --filters) [--path=<path>] <object>" @@ -6722,7 +8023,7 @@ msgstr "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <Art> | --textconv | --filters) [--path=<Pfad>] <Objekt>" -#: builtin/cat-file.c:526 +#: builtin/cat-file.c:578 msgid "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" @@ -6730,71 +8031,75 @@ msgstr "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" -#: builtin/cat-file.c:563 +#: builtin/cat-file.c:615 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<Art> kann sein: blob, tree, commit, tag" -#: builtin/cat-file.c:564 +#: builtin/cat-file.c:616 msgid "show object type" msgstr "Objektart anzeigen" -#: builtin/cat-file.c:565 +#: builtin/cat-file.c:617 msgid "show object size" msgstr "Objektgröße anzeigen" -#: builtin/cat-file.c:567 +#: builtin/cat-file.c:619 msgid "exit with zero when there's no error" msgstr "mit Rückgabewert 0 beenden, wenn kein Fehler aufgetreten ist" -#: builtin/cat-file.c:568 +#: builtin/cat-file.c:620 msgid "pretty-print object's content" msgstr "ansprechende Anzeige des Objektinhaltes" -#: builtin/cat-file.c:570 +#: builtin/cat-file.c:622 msgid "for blob objects, run textconv on object's content" msgstr "eine Textkonvertierung auf den Inhalt von Blob-Objekten ausführen" -#: builtin/cat-file.c:572 +#: builtin/cat-file.c:624 msgid "for blob objects, run filters on object's content" msgstr "für Blob-Objekte, Filter auf Objekt-Inhalte ausführen" -#: builtin/cat-file.c:573 git-submodule.sh:894 +#: builtin/cat-file.c:625 git-submodule.sh:864 msgid "blob" msgstr "Blob" -#: builtin/cat-file.c:574 +#: builtin/cat-file.c:626 msgid "use a specific path for --textconv/--filters" msgstr "einen bestimmten Pfad für --textconv/--filters verwenden" -#: builtin/cat-file.c:576 +#: builtin/cat-file.c:628 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "-s und -t mit beschädigten Objekten erlauben" -#: builtin/cat-file.c:577 +#: builtin/cat-file.c:629 msgid "buffer --batch output" msgstr "Ausgabe von --batch puffern" -#: builtin/cat-file.c:579 +#: builtin/cat-file.c:631 msgid "show info and content of objects fed from the standard input" msgstr "" "Anzeige von Informationen und Inhalt von Objekten, gelesen von der Standard-" "Eingabe" -#: builtin/cat-file.c:582 +#: builtin/cat-file.c:634 msgid "show info about objects fed from the standard input" msgstr "" "Anzeige von Informationen über Objekte, gelesen von der Standard-Eingabe" -#: builtin/cat-file.c:585 +#: builtin/cat-file.c:637 msgid "follow in-tree symlinks (used with --batch or --batch-check)" msgstr "" "symbolischen Verknüpfungen innerhalb des Repositories folgen (verwendet mit " "--batch oder --batch-check)" -#: builtin/cat-file.c:587 +#: builtin/cat-file.c:639 msgid "show all objects with --batch or --batch-check" msgstr "alle Objekte mit --batch oder --batch-check anzeigen" +#: builtin/cat-file.c:641 +msgid "do not order --batch-all-objects output" +msgstr "Ausgabe von --batch-all-objects nicht ordnen" + #: builtin/check-attr.c:12 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." msgstr "git check-attr [-a | --all | <Attribut>...] [--] <Pfadname>..." @@ -6811,7 +8116,7 @@ msgstr "alle Attribute einer Datei ausgeben" msgid "use .gitattributes only from the index" msgstr "nur .gitattributes vom Index verwenden" -#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:100 +#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:101 msgid "read file names from stdin" msgstr "Dateinamen von der Standard-Eingabe lesen" @@ -6819,7 +8124,8 @@ msgstr "Dateinamen von der Standard-Eingabe lesen" msgid "terminate input and output records by a NUL character" msgstr "Einträge von Ein- und Ausgabe mit NUL-Zeichen abschließen" -#: builtin/check-ignore.c:20 builtin/checkout.c:1113 builtin/gc.c:500 +#: builtin/check-ignore.c:20 builtin/checkout.c:1120 builtin/gc.c:503 +#: builtin/worktree.c:447 msgid "suppress progress reporting" msgstr "Fortschrittsanzeige unterdrücken" @@ -6912,9 +8218,9 @@ msgid "write the content to temporary files" msgstr "den Inhalt in temporäre Dateien schreiben" #: builtin/checkout-index.c:173 builtin/column.c:31 -#: builtin/submodule--helper.c:1216 builtin/submodule--helper.c:1219 -#: builtin/submodule--helper.c:1227 builtin/submodule--helper.c:1591 -#: builtin/worktree.c:610 +#: builtin/submodule--helper.c:1361 builtin/submodule--helper.c:1364 +#: builtin/submodule--helper.c:1372 builtin/submodule--helper.c:1736 +#: builtin/worktree.c:620 msgid "string" msgstr "Zeichenkette" @@ -6927,114 +8233,114 @@ msgstr "" msgid "copy out the files from named stage" msgstr "Dateien von dem benannten Stand kopieren" -#: builtin/checkout.c:27 +#: builtin/checkout.c:29 msgid "git checkout [<options>] <branch>" msgstr "git checkout [<Optionen>] <Branch>" -#: builtin/checkout.c:28 +#: builtin/checkout.c:30 msgid "git checkout [<options>] [<branch>] -- <file>..." msgstr "git checkout [<Optionen>] [<Branch>] -- <Datei>..." -#: builtin/checkout.c:136 builtin/checkout.c:169 +#: builtin/checkout.c:138 builtin/checkout.c:171 #, c-format msgid "path '%s' does not have our version" msgstr "Pfad '%s' hat nicht unsere Version." -#: builtin/checkout.c:138 builtin/checkout.c:171 +#: builtin/checkout.c:140 builtin/checkout.c:173 #, c-format msgid "path '%s' does not have their version" msgstr "Pfad '%s' hat nicht deren Version." -#: builtin/checkout.c:154 +#: builtin/checkout.c:156 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "Pfad '%s' hat nicht alle notwendigen Versionen." -#: builtin/checkout.c:198 +#: builtin/checkout.c:200 #, c-format msgid "path '%s' does not have necessary versions" msgstr "Pfad '%s' hat nicht die notwendigen Versionen." -#: builtin/checkout.c:215 +#: builtin/checkout.c:217 #, c-format msgid "path '%s': cannot merge" msgstr "Pfad '%s': kann nicht zusammenführen" -#: builtin/checkout.c:231 +#: builtin/checkout.c:233 #, c-format msgid "Unable to add merge result for '%s'" msgstr "Konnte Merge-Ergebnis von '%s' nicht hinzufügen." -#: builtin/checkout.c:253 builtin/checkout.c:256 builtin/checkout.c:259 -#: builtin/checkout.c:262 +#: builtin/checkout.c:255 builtin/checkout.c:258 builtin/checkout.c:261 +#: builtin/checkout.c:264 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "'%s' kann nicht mit der Aktualisierung von Pfaden verwendet werden" -#: builtin/checkout.c:265 builtin/checkout.c:268 +#: builtin/checkout.c:267 builtin/checkout.c:270 #, c-format msgid "'%s' cannot be used with %s" msgstr "'%s' kann nicht mit '%s' verwendet werden" -#: builtin/checkout.c:271 +#: builtin/checkout.c:273 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "" "Kann nicht gleichzeitig Pfade aktualisieren und zu Branch '%s' wechseln" -#: builtin/checkout.c:340 builtin/checkout.c:347 +#: builtin/checkout.c:342 builtin/checkout.c:349 #, c-format msgid "path '%s' is unmerged" msgstr "Pfad '%s' ist nicht zusammengeführt." -#: builtin/checkout.c:506 +#: builtin/checkout.c:508 msgid "you need to resolve your current index first" msgstr "Sie müssen zuerst die Konflikte in Ihrem aktuellen Index auflösen." -#: builtin/checkout.c:643 +#: builtin/checkout.c:645 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "Kann \"reflog\" für '%s' nicht durchführen: %s\n" -#: builtin/checkout.c:684 +#: builtin/checkout.c:686 msgid "HEAD is now at" msgstr "HEAD ist jetzt bei" -#: builtin/checkout.c:688 builtin/clone.c:691 +#: builtin/checkout.c:690 builtin/clone.c:692 msgid "unable to update HEAD" msgstr "Konnte HEAD nicht aktualisieren." -#: builtin/checkout.c:692 +#: builtin/checkout.c:694 #, c-format msgid "Reset branch '%s'\n" msgstr "Setze Branch '%s' neu\n" -#: builtin/checkout.c:695 +#: builtin/checkout.c:697 #, c-format msgid "Already on '%s'\n" msgstr "Bereits auf '%s'\n" -#: builtin/checkout.c:699 +#: builtin/checkout.c:701 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Zu umgesetztem Branch '%s' gewechselt\n" -#: builtin/checkout.c:701 builtin/checkout.c:1046 +#: builtin/checkout.c:703 builtin/checkout.c:1052 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Zu neuem Branch '%s' gewechselt\n" -#: builtin/checkout.c:703 +#: builtin/checkout.c:705 #, c-format msgid "Switched to branch '%s'\n" msgstr "Zu Branch '%s' gewechselt\n" -#: builtin/checkout.c:754 +#: builtin/checkout.c:756 #, c-format msgid " ... and %d more.\n" msgstr " ... und %d weitere.\n" -#: builtin/checkout.c:760 +#: builtin/checkout.c:762 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -7057,7 +8363,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:779 +#: builtin/checkout.c:781 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -7084,163 +8390,163 @@ msgstr[1] "" " git branch <neuer-Branchname> %s\n" "\n" -#: builtin/checkout.c:811 +#: builtin/checkout.c:813 msgid "internal error in revision walk" msgstr "interner Fehler im Revisionsgang" -#: builtin/checkout.c:815 +#: builtin/checkout.c:817 msgid "Previous HEAD position was" msgstr "Vorherige Position von HEAD war" -#: builtin/checkout.c:843 builtin/checkout.c:1041 +#: builtin/checkout.c:845 builtin/checkout.c:1047 msgid "You are on a branch yet to be born" msgstr "Sie sind auf einem Branch, der noch nicht geboren ist" -#: builtin/checkout.c:947 +#: builtin/checkout.c:952 #, c-format msgid "only one reference expected, %d given." msgstr "nur eine Referenz erwartet, %d gegeben." -#: builtin/checkout.c:987 builtin/worktree.c:240 builtin/worktree.c:389 +#: builtin/checkout.c:993 builtin/worktree.c:241 builtin/worktree.c:396 #, c-format msgid "invalid reference: %s" msgstr "Ungültige Referenz: %s" -#: builtin/checkout.c:1016 +#: builtin/checkout.c:1022 #, c-format msgid "reference is not a tree: %s" msgstr "Referenz ist kein \"Tree\"-Objekt: %s" -#: builtin/checkout.c:1055 +#: builtin/checkout.c:1061 msgid "paths cannot be used with switching branches" msgstr "Pfade können nicht beim Wechseln von Branches verwendet werden" -#: builtin/checkout.c:1058 builtin/checkout.c:1062 +#: builtin/checkout.c:1064 builtin/checkout.c:1068 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "'%s' kann nicht beim Wechseln von Branches verwendet werden" -#: builtin/checkout.c:1066 builtin/checkout.c:1069 builtin/checkout.c:1074 -#: builtin/checkout.c:1077 +#: builtin/checkout.c:1072 builtin/checkout.c:1075 builtin/checkout.c:1080 +#: builtin/checkout.c:1083 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' kann nicht mit '%s' verwendet werden" -#: builtin/checkout.c:1082 +#: builtin/checkout.c:1088 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "Kann Branch nicht zu Nicht-Commit '%s' wechseln" -#: 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 +#: builtin/checkout.c:1121 builtin/checkout.c:1123 builtin/clone.c:119 +#: builtin/remote.c:168 builtin/remote.c:170 builtin/worktree.c:440 +#: builtin/worktree.c:442 msgid "branch" msgstr "Branch" -#: builtin/checkout.c:1115 +#: builtin/checkout.c:1122 msgid "create and checkout a new branch" msgstr "einen neuen Branch erzeugen und auschecken" -#: builtin/checkout.c:1117 +#: builtin/checkout.c:1124 msgid "create/reset and checkout a branch" msgstr "einen Branch erstellen/umsetzen und auschecken" -#: builtin/checkout.c:1118 +#: builtin/checkout.c:1125 msgid "create reflog for new branch" msgstr "das Reflog für den neuen Branch erzeugen" -#: builtin/checkout.c:1119 builtin/worktree.c:437 +#: builtin/checkout.c:1126 builtin/worktree.c:444 msgid "detach HEAD at named commit" msgstr "HEAD bei benanntem Commit loslösen" -#: builtin/checkout.c:1120 +#: builtin/checkout.c:1127 msgid "set upstream info for new branch" msgstr "Informationen zum Upstream-Branch für den neuen Branch setzen" -#: builtin/checkout.c:1122 +#: builtin/checkout.c:1129 msgid "new-branch" msgstr "neuer Branch" -#: builtin/checkout.c:1122 +#: builtin/checkout.c:1129 msgid "new unparented branch" msgstr "neuer Branch ohne Eltern-Commit" -#: builtin/checkout.c:1123 +#: builtin/checkout.c:1131 msgid "checkout our version for unmerged files" msgstr "unsere Variante für nicht zusammengeführte Dateien auschecken" -#: builtin/checkout.c:1125 +#: builtin/checkout.c:1134 msgid "checkout their version for unmerged files" msgstr "ihre Variante für nicht zusammengeführte Dateien auschecken" -#: builtin/checkout.c:1127 +#: builtin/checkout.c:1136 msgid "force checkout (throw away local modifications)" msgstr "Auschecken erzwingen (verwirft lokale Änderungen)" -#: builtin/checkout.c:1129 +#: builtin/checkout.c:1138 msgid "perform a 3-way merge with the new branch" msgstr "einen 3-Wege-Merge mit dem neuen Branch ausführen" -#: builtin/checkout.c:1131 builtin/merge.c:240 +#: builtin/checkout.c:1140 builtin/merge.c:273 msgid "update ignored files (default)" msgstr "ignorierte Dateien aktualisieren (Standard)" -#: builtin/checkout.c:1133 builtin/log.c:1499 parse-options.h:264 +#: builtin/checkout.c:1142 builtin/log.c:1510 parse-options.h:264 msgid "style" msgstr "Stil" -#: builtin/checkout.c:1134 +#: builtin/checkout.c:1143 msgid "conflict style (merge or diff3)" msgstr "Konfliktstil (merge oder diff3)" -#: builtin/checkout.c:1137 +#: builtin/checkout.c:1146 msgid "do not limit pathspecs to sparse entries only" msgstr "keine Einschränkung bei Pfadspezifikationen zum partiellen Auschecken" -#: builtin/checkout.c:1139 +#: builtin/checkout.c:1148 msgid "second guess 'git checkout <no-such-branch>'" msgstr "second guess 'git checkout <no-such-branch>'" -#: builtin/checkout.c:1141 +#: builtin/checkout.c:1150 msgid "do not check if another worktree is holding the given ref" msgstr "" "Prüfung, ob die Referenz bereits in einem anderen Arbeitsverzeichnis " "ausgecheckt wurde, deaktivieren" -#: builtin/checkout.c:1145 builtin/clone.c:85 builtin/fetch.c:149 -#: builtin/merge.c:237 builtin/pull.c:128 builtin/push.c:572 +#: builtin/checkout.c:1154 builtin/clone.c:86 builtin/fetch.c:138 +#: builtin/merge.c:270 builtin/pull.c:128 builtin/push.c:572 #: builtin/send-pack.c:174 msgid "force progress reporting" msgstr "Fortschrittsanzeige erzwingen" -#: builtin/checkout.c:1175 +#: builtin/checkout.c:1184 msgid "-b, -B and --orphan are mutually exclusive" msgstr "Die Optionen -b, -B und --orphan schließen sich gegenseitig aus." -#: builtin/checkout.c:1192 +#: builtin/checkout.c:1201 msgid "--track needs a branch name" msgstr "Bei der Option --track muss ein Branchname angegeben werden." -#: builtin/checkout.c:1197 -msgid "Missing branch name; try -b" -msgstr "Vermisse Branchnamen; versuchen Sie -b" +#: builtin/checkout.c:1206 +msgid "missing branch name; try -b" +msgstr "Kein Branchname; versuchen Sie -b." -#: builtin/checkout.c:1233 +#: builtin/checkout.c:1243 msgid "invalid path specification" msgstr "ungültige Pfadspezifikation" -#: builtin/checkout.c:1240 +#: builtin/checkout.c:1250 #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "" "'%s' ist kein Commit und es kann kein Branch '%s' aus diesem erstellt werden." -#: builtin/checkout.c:1244 +#: builtin/checkout.c:1254 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: --detach nimmt kein Pfad-Argument '%s'" -#: builtin/checkout.c:1248 +#: builtin/checkout.c:1258 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -7248,38 +8554,68 @@ msgstr "" "git checkout: --ours/--theirs, --force und --merge sind inkompatibel wenn\n" "Sie aus dem Index auschecken." -#: builtin/clean.c:26 +#: builtin/checkout.c:1278 +#, c-format +msgid "" +"'%s' matched more than one remote tracking branch.\n" +"We found %d remotes with a reference that matched. So we fell back\n" +"on trying to resolve the argument as a path, but failed there too!\n" +"\n" +"If you meant to check out a remote tracking branch on, e.g. 'origin',\n" +"you can do so by fully qualifying the name with the --track option:\n" +"\n" +" git checkout --track origin/<name>\n" +"\n" +"If you'd like to always have checkouts of an ambiguous <name> prefer\n" +"one remote, e.g. the 'origin' remote, consider setting\n" +"checkout.defaultRemote=origin in your config." +msgstr "" +"'%s' entspricht mehr als einem Remote-Tracking-Branch.\n" +"Wir fanden %d Remote-Repositories mit einer entsprechenden Referenz, also\n" +"haben wir versucht, das Argument als Pfad aufzulösen, was auch schief ging!\n" +"\n" +"Falls Sie einen Remote-Tracking-Branch, z.B. von 'origin', auschecken wollten,\n" +"können Sie das tun, indem Sie den vollständig qualifizierten Namen mit der\n" +"--track Option angeben:\n" +"\n" +" git checkout --track origin/<Name>\n" +"\n" +"Falls Sie beim Auschecken mit mehrdeutigen <Namen> immer ein Remote-Repository\n" +"bevorzugen möchten, z.B. 'origin', könnten Sie die Einstellung\n" +"checkout.defaultRemote=origin in Ihrer Konfiguration setzen." + +#: builtin/clean.c:27 msgid "" "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." msgstr "" "git clean [-d] [-f] [-i] [-n] [-q] [-e <Muster>] [-x | -X] [--] <Pfade>..." -#: builtin/clean.c:30 +#: builtin/clean.c:31 #, c-format msgid "Removing %s\n" msgstr "Lösche %s\n" -#: builtin/clean.c:31 +#: builtin/clean.c:32 #, c-format msgid "Would remove %s\n" msgstr "Würde %s löschen\n" -#: builtin/clean.c:32 +#: builtin/clean.c:33 #, c-format msgid "Skipping repository %s\n" msgstr "Überspringe Repository %s\n" -#: builtin/clean.c:33 +#: builtin/clean.c:34 #, c-format msgid "Would skip repository %s\n" msgstr "Würde Repository %s überspringen\n" -#: builtin/clean.c:34 +#: builtin/clean.c:35 #, c-format msgid "failed to remove %s" msgstr "Fehler beim Löschen von %s" -#: builtin/clean.c:302 git-add--interactive.perl:579 +#: builtin/clean.c:297 git-add--interactive.perl:579 #, c-format msgid "" "Prompt help:\n" @@ -7292,7 +8628,7 @@ msgstr "" "foo - Element anhand eines eindeutigen Präfix auswählen\n" " - (leer) nichts auswählen\n" -#: builtin/clean.c:306 git-add--interactive.perl:588 +#: builtin/clean.c:301 git-add--interactive.perl:588 #, c-format msgid "" "Prompt help:\n" @@ -7313,38 +8649,38 @@ msgstr "" "* - alle Elemente auswählen\n" " - (leer) Auswahl beenden\n" -#: builtin/clean.c:522 git-add--interactive.perl:554 +#: builtin/clean.c:517 git-add--interactive.perl:554 #: git-add--interactive.perl:559 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "Wie bitte (%s)?\n" -#: builtin/clean.c:664 +#: builtin/clean.c:659 #, c-format msgid "Input ignore patterns>> " msgstr "Ignorier-Muster eingeben>> " -#: builtin/clean.c:701 +#: builtin/clean.c:696 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "WARNUNG: Kann keine Einträge finden die Muster entsprechen: %s" -#: builtin/clean.c:722 +#: builtin/clean.c:717 msgid "Select items to delete" msgstr "Wählen Sie Einträge zum Löschen" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:763 +#: builtin/clean.c:758 #, c-format msgid "Remove %s [y/N]? " msgstr "'%s' löschen [y/N]? " -#: builtin/clean.c:788 git-add--interactive.perl:1717 +#: builtin/clean.c:783 git-add--interactive.perl:1717 #, c-format msgid "Bye.\n" msgstr "Tschüss.\n" -#: builtin/clean.c:796 +#: builtin/clean.c:791 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -7362,64 +8698,64 @@ msgstr "" "help - diese Meldung anzeigen\n" "? - Hilfe zur Auswahl mittels Eingabe anzeigen" -#: builtin/clean.c:823 git-add--interactive.perl:1793 +#: builtin/clean.c:818 git-add--interactive.perl:1793 msgid "*** Commands ***" msgstr "*** Befehle ***" -#: builtin/clean.c:824 git-add--interactive.perl:1790 +#: builtin/clean.c:819 git-add--interactive.perl:1790 msgid "What now" msgstr "Was nun" -#: builtin/clean.c:832 +#: builtin/clean.c:827 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "Würde das folgende Element entfernen:" msgstr[1] "Würde die folgenden Elemente entfernen:" -#: builtin/clean.c:848 +#: builtin/clean.c:843 msgid "No more files to clean, exiting." msgstr "Keine Dateien mehr zum Löschen, beende." -#: builtin/clean.c:910 +#: builtin/clean.c:905 msgid "do not print names of files removed" msgstr "keine Namen von gelöschten Dateien ausgeben" -#: builtin/clean.c:912 +#: builtin/clean.c:907 msgid "force" msgstr "Aktion erzwingen" -#: builtin/clean.c:913 +#: builtin/clean.c:908 msgid "interactive cleaning" msgstr "interaktives Clean" -#: builtin/clean.c:915 +#: builtin/clean.c:910 msgid "remove whole directories" msgstr "ganze Verzeichnisse löschen" -#: builtin/clean.c:916 builtin/describe.c:533 builtin/describe.c:535 -#: builtin/grep.c:871 builtin/log.c:157 builtin/log.c:159 -#: builtin/ls-files.c:548 builtin/name-rev.c:397 builtin/name-rev.c:399 -#: builtin/show-ref.c:176 +#: builtin/clean.c:911 builtin/describe.c:545 builtin/describe.c:547 +#: builtin/grep.c:875 builtin/log.c:161 builtin/log.c:163 +#: builtin/ls-files.c:549 builtin/name-rev.c:415 builtin/name-rev.c:417 +#: builtin/show-ref.c:177 msgid "pattern" msgstr "Muster" -#: builtin/clean.c:917 +#: builtin/clean.c:912 msgid "add <pattern> to ignore rules" msgstr "<Muster> zu den Regeln für ignorierte Pfade hinzufügen" -#: builtin/clean.c:918 +#: builtin/clean.c:913 msgid "remove ignored files, too" msgstr "auch ignorierte Dateien löschen" -#: builtin/clean.c:920 +#: builtin/clean.c:915 msgid "remove only ignored files" msgstr "nur ignorierte Dateien löschen" -#: builtin/clean.c:938 +#: builtin/clean.c:933 msgid "-x and -X cannot be used together" msgstr "Die Optionen -x und -X können nicht gemeinsam verwendet werden." -#: builtin/clean.c:942 +#: builtin/clean.c:937 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" @@ -7427,7 +8763,7 @@ msgstr "" "clean.requireForce auf \"true\" gesetzt und weder -i, -n noch -f gegeben; " "\"clean\" verweigert" -#: builtin/clean.c:945 +#: builtin/clean.c:940 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -7435,152 +8771,152 @@ msgstr "" "clean.requireForce standardmäßig auf \"true\" gesetzt und weder -i, -n noch -" "f gegeben; \"clean\" verweigert" -#: builtin/clone.c:42 +#: builtin/clone.c:43 msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<Optionen>] [--] <Repository> [<Verzeichnis>]" -#: builtin/clone.c:87 +#: builtin/clone.c:88 msgid "don't create a checkout" msgstr "kein Auschecken" -#: builtin/clone.c:88 builtin/clone.c:90 builtin/init-db.c:479 +#: builtin/clone.c:89 builtin/clone.c:91 builtin/init-db.c:480 msgid "create a bare repository" msgstr "ein Bare-Repository erstellen" -#: builtin/clone.c:92 +#: builtin/clone.c:93 msgid "create a mirror repository (implies bare)" msgstr "ein Spiegelarchiv erstellen (impliziert --bare)" -#: builtin/clone.c:94 +#: builtin/clone.c:95 msgid "to clone from a local repository" msgstr "von einem lokalen Repository klonen" -#: builtin/clone.c:96 +#: builtin/clone.c:97 msgid "don't use local hardlinks, always copy" msgstr "lokal keine harten Verweise verwenden, immer Kopien" -#: builtin/clone.c:98 +#: builtin/clone.c:99 msgid "setup as shared repository" msgstr "als verteiltes Repository einrichten" -#: builtin/clone.c:100 builtin/clone.c:104 +#: builtin/clone.c:101 builtin/clone.c:105 msgid "pathspec" msgstr "Pfadspezifikation" -#: builtin/clone.c:100 builtin/clone.c:104 +#: builtin/clone.c:101 builtin/clone.c:105 msgid "initialize submodules in the clone" msgstr "Submodule im Klon initialisieren" -#: builtin/clone.c:107 +#: builtin/clone.c:108 msgid "number of submodules cloned in parallel" msgstr "Anzahl der parallel zu klonenden Submodule" -#: builtin/clone.c:108 builtin/init-db.c:476 +#: builtin/clone.c:109 builtin/init-db.c:477 msgid "template-directory" msgstr "Vorlagenverzeichnis" -#: builtin/clone.c:109 builtin/init-db.c:477 +#: builtin/clone.c:110 builtin/init-db.c:478 msgid "directory from which templates will be used" msgstr "Verzeichnis, von welchem die Vorlagen verwendet werden" -#: builtin/clone.c:111 builtin/clone.c:113 builtin/submodule--helper.c:1223 -#: builtin/submodule--helper.c:1594 +#: builtin/clone.c:112 builtin/clone.c:114 builtin/submodule--helper.c:1368 +#: builtin/submodule--helper.c:1739 msgid "reference repository" msgstr "Repository referenzieren" -#: builtin/clone.c:115 builtin/submodule--helper.c:1225 -#: builtin/submodule--helper.c:1596 +#: builtin/clone.c:116 builtin/submodule--helper.c:1370 +#: builtin/submodule--helper.c:1741 msgid "use --reference only while cloning" msgstr "--reference nur während des Klonens benutzen" -#: builtin/clone.c:116 builtin/column.c:27 builtin/merge-file.c:44 -#: builtin/pack-objects.c:3166 builtin/repack.c:213 +#: builtin/clone.c:117 builtin/column.c:27 builtin/merge-file.c:44 +#: builtin/pack-objects.c:3191 builtin/repack.c:320 msgid "name" msgstr "Name" -#: builtin/clone.c:117 +#: builtin/clone.c:118 msgid "use <name> instead of 'origin' to track upstream" msgstr "<Name> statt 'origin' für Upstream-Repository verwenden" -#: builtin/clone.c:119 +#: builtin/clone.c:120 msgid "checkout <branch> instead of the remote's HEAD" msgstr "<Branch> auschecken, anstatt HEAD des Remote-Repositories" -#: builtin/clone.c:121 +#: builtin/clone.c:122 msgid "path to git-upload-pack on the remote" msgstr "Pfad zu \"git-upload-pack\" auf der Gegenseite" -#: builtin/clone.c:122 builtin/fetch.c:150 builtin/grep.c:813 +#: builtin/clone.c:123 builtin/fetch.c:139 builtin/grep.c:814 #: builtin/pull.c:216 msgid "depth" msgstr "Tiefe" -#: builtin/clone.c:123 +#: builtin/clone.c:124 msgid "create a shallow clone of that depth" msgstr "" "einen Klon mit unvollständiger Historie (shallow) in dieser Tiefe erstellen" -#: builtin/clone.c:124 builtin/fetch.c:152 builtin/pack-objects.c:3157 +#: builtin/clone.c:125 builtin/fetch.c:141 builtin/pack-objects.c:3182 #: parse-options.h:154 msgid "time" msgstr "Zeit" -#: builtin/clone.c:125 +#: builtin/clone.c:126 msgid "create a shallow clone since a specific time" msgstr "" "einen Klon mit unvollständiger Historie (shallow) seit einer bestimmten " "Zeit\n" "erstellen" -#: builtin/clone.c:126 builtin/fetch.c:154 +#: builtin/clone.c:127 builtin/fetch.c:143 builtin/fetch.c:166 msgid "revision" msgstr "Commit" -#: builtin/clone.c:127 builtin/fetch.c:155 +#: builtin/clone.c:128 builtin/fetch.c:144 msgid "deepen history of shallow clone, excluding rev" msgstr "" "die Historie eines Klons mit unvollständiger Historie (shallow) mittels\n" "Ausschluss eines Commits vertiefen" -#: builtin/clone.c:129 +#: builtin/clone.c:130 msgid "clone only one branch, HEAD or --branch" msgstr "nur einen Branch klonen, HEAD oder --branch" -#: builtin/clone.c:131 +#: builtin/clone.c:132 msgid "don't clone any tags, and make later fetches not to follow them" msgstr "keine Tags klonen, und auch bei späteren Abrufen nicht beachten" -#: builtin/clone.c:133 +#: builtin/clone.c:134 msgid "any cloned submodules will be shallow" msgstr "jedes geklonte Submodul mit unvollständiger Historie (shallow)" -#: builtin/clone.c:134 builtin/init-db.c:485 +#: builtin/clone.c:135 builtin/init-db.c:486 msgid "gitdir" msgstr ".git-Verzeichnis" -#: builtin/clone.c:135 builtin/init-db.c:486 +#: builtin/clone.c:136 builtin/init-db.c:487 msgid "separate git dir from working tree" msgstr "Git-Verzeichnis vom Arbeitsverzeichnis separieren" -#: builtin/clone.c:136 +#: builtin/clone.c:137 msgid "key=value" msgstr "Schlüssel=Wert" -#: builtin/clone.c:137 +#: builtin/clone.c:138 msgid "set config inside the new repository" msgstr "Konfiguration innerhalb des neuen Repositories setzen" -#: builtin/clone.c:138 builtin/fetch.c:173 builtin/pull.c:229 +#: builtin/clone.c:139 builtin/fetch.c:162 builtin/pull.c:229 #: builtin/push.c:583 msgid "use IPv4 addresses only" msgstr "nur IPv4-Adressen benutzen" -#: builtin/clone.c:140 builtin/fetch.c:175 builtin/pull.c:232 +#: builtin/clone.c:141 builtin/fetch.c:164 builtin/pull.c:232 #: builtin/push.c:585 msgid "use IPv6 addresses only" msgstr "nur IPv6-Adressen benutzen" -#: builtin/clone.c:278 +#: builtin/clone.c:279 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -7588,42 +8924,42 @@ msgstr "" "Konnte keinen Verzeichnisnamen erraten.\n" "Bitte geben Sie ein Verzeichnis auf der Befehlszeile an." -#: builtin/clone.c:331 +#: builtin/clone.c:332 #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "info: Konnte Alternative für '%s' nicht hinzufügen: %s\n" -#: builtin/clone.c:403 +#: builtin/clone.c:404 #, c-format msgid "failed to open '%s'" msgstr "Fehler beim Öffnen von '%s'" -#: builtin/clone.c:411 +#: builtin/clone.c:412 #, c-format msgid "%s exists and is not a directory" msgstr "%s existiert und ist kein Verzeichnis" -#: builtin/clone.c:425 +#: builtin/clone.c:426 #, c-format msgid "failed to stat %s\n" msgstr "Konnte %s nicht lesen\n" -#: builtin/clone.c:447 +#: builtin/clone.c:448 #, c-format msgid "failed to create link '%s'" msgstr "Konnte Verweis '%s' nicht erstellen" -#: builtin/clone.c:451 +#: builtin/clone.c:452 #, c-format msgid "failed to copy file to '%s'" msgstr "Konnte Datei nicht nach '%s' kopieren" -#: builtin/clone.c:477 +#: builtin/clone.c:478 #, c-format msgid "done.\n" msgstr "Fertig.\n" -#: builtin/clone.c:491 +#: builtin/clone.c:492 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -7633,101 +8969,97 @@ msgstr "" "Sie können mit 'git status' prüfen, was ausgecheckt worden ist\n" "und das Auschecken mit 'git checkout -f HEAD' erneut versuchen.\n" -#: builtin/clone.c:568 +#: builtin/clone.c:569 #, c-format msgid "Could not find remote branch %s to clone." msgstr "Konnte zu klonenden Remote-Branch %s nicht finden." -#: builtin/clone.c:663 -msgid "remote did not send all necessary objects" -msgstr "Remote-Repository hat nicht alle erforderlichen Objekte gesendet." - -#: builtin/clone.c:679 +#: builtin/clone.c:680 #, c-format msgid "unable to update %s" msgstr "kann %s nicht aktualisieren" -#: builtin/clone.c:728 +#: builtin/clone.c:730 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" "Externer HEAD bezieht sich auf eine nicht existierende Referenz und kann " "nicht ausgecheckt werden.\n" -#: builtin/clone.c:758 +#: builtin/clone.c:760 msgid "unable to checkout working tree" msgstr "Arbeitsverzeichnis konnte nicht ausgecheckt werden" -#: builtin/clone.c:803 +#: builtin/clone.c:805 msgid "unable to write parameters to config file" msgstr "konnte Parameter nicht in Konfigurationsdatei schreiben" -#: builtin/clone.c:866 +#: builtin/clone.c:868 msgid "cannot repack to clean up" msgstr "Kann \"repack\" zum Aufräumen nicht aufrufen" -#: builtin/clone.c:868 +#: builtin/clone.c:870 msgid "cannot unlink temporary alternates file" msgstr "Kann temporäre \"alternates\"-Datei nicht entfernen" -#: builtin/clone.c:907 builtin/receive-pack.c:1947 +#: builtin/clone.c:910 builtin/receive-pack.c:1935 msgid "Too many arguments." msgstr "Zu viele Argumente." -#: builtin/clone.c:911 +#: builtin/clone.c:914 msgid "You must specify a repository to clone." msgstr "Sie müssen ein Repository zum Klonen angeben." -#: builtin/clone.c:924 +#: builtin/clone.c:927 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "Die Optionen --bare und --origin %s sind inkompatibel." -#: builtin/clone.c:927 +#: builtin/clone.c:930 msgid "--bare and --separate-git-dir are incompatible." msgstr "Die Optionen --bare und --separate-git-dir sind inkompatibel." -#: builtin/clone.c:940 +#: builtin/clone.c:943 #, c-format msgid "repository '%s' does not exist" msgstr "Repository '%s' existiert nicht." -#: builtin/clone.c:946 builtin/fetch.c:1460 +#: builtin/clone.c:949 builtin/fetch.c:1512 #, c-format msgid "depth %s is not a positive number" msgstr "Tiefe %s ist keine positive Zahl" -#: builtin/clone.c:956 +#: builtin/clone.c:959 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "Zielpfad '%s' existiert bereits und ist kein leeres Verzeichnis." -#: builtin/clone.c:966 +#: builtin/clone.c:969 #, c-format msgid "working tree '%s' already exists." msgstr "Arbeitsverzeichnis '%s' existiert bereits." -#: builtin/clone.c:981 builtin/clone.c:1002 builtin/difftool.c:270 -#: builtin/worktree.c:246 builtin/worktree.c:276 +#: builtin/clone.c:984 builtin/clone.c:1005 builtin/difftool.c:271 +#: builtin/worktree.c:247 builtin/worktree.c:277 #, c-format msgid "could not create leading directories of '%s'" msgstr "Konnte führende Verzeichnisse von '%s' nicht erstellen." -#: builtin/clone.c:986 +#: builtin/clone.c:989 #, c-format msgid "could not create work tree dir '%s'" msgstr "Konnte Arbeitsverzeichnis '%s' nicht erstellen" -#: builtin/clone.c:1006 +#: builtin/clone.c:1009 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Klone in Bare-Repository '%s' ...\n" -#: builtin/clone.c:1008 +#: builtin/clone.c:1011 #, c-format msgid "Cloning into '%s'...\n" msgstr "Klone nach '%s' ...\n" -#: builtin/clone.c:1032 +#: builtin/clone.c:1035 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" @@ -7735,45 +9067,45 @@ msgstr "" "'clone --recursive' ist nicht kompatibel mit --reference und --reference-if-" "able" -#: builtin/clone.c:1093 +#: builtin/clone.c:1096 msgid "--depth is ignored in local clones; use file:// instead." msgstr "" "Die Option --depth wird in lokalen Klonen ignoriert; benutzen Sie " "stattdessen file://" -#: builtin/clone.c:1095 +#: builtin/clone.c:1098 msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "" "--shallow-since wird in lokalen Klonen ignoriert; benutzen Sie stattdessen " "file://" -#: builtin/clone.c:1097 +#: builtin/clone.c:1100 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "" "--shallow-exclude wird in lokalen Klonen ignoriert; benutzen Sie stattdessen " "file://" -#: builtin/clone.c:1099 +#: builtin/clone.c:1102 msgid "--filter is ignored in local clones; use file:// instead." msgstr "" "--filter wird in lokalen Klonen ignoriert; benutzen Sie stattdessen file://" -#: builtin/clone.c:1102 +#: builtin/clone.c:1105 msgid "source repository is shallow, ignoring --local" msgstr "" "Quelle ist ein Repository mit unvollständiger Historie (shallow),\n" "ignoriere --local" -#: builtin/clone.c:1107 +#: builtin/clone.c:1110 msgid "--local is ignored" msgstr "--local wird ignoriert" -#: builtin/clone.c:1169 builtin/clone.c:1177 +#: builtin/clone.c:1180 builtin/clone.c:1188 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Remote-Branch %s nicht im Upstream-Repository %s gefunden" -#: builtin/clone.c:1180 +#: builtin/clone.c:1191 msgid "You appear to have cloned an empty repository." msgstr "Sie scheinen ein leeres Repository geklont zu haben." @@ -7809,15 +9141,15 @@ msgstr "Abstand zwischen Spalten" msgid "--command must be the first argument" msgstr "Die Option --command muss an erster Stelle stehen." -#: builtin/commit.c:37 +#: builtin/commit.c:38 msgid "git commit [<options>] [--] <pathspec>..." msgstr "git commit [<Optionen>] [--] <Pfadspezifikation>..." -#: builtin/commit.c:42 +#: builtin/commit.c:43 msgid "git status [<options>] [--] <pathspec>..." msgstr "git status [<Optionen>] [--] <Pfadspezifikation>..." -#: builtin/commit.c:47 +#: builtin/commit.c:48 msgid "" "You asked to amend the most recent commit, but doing so would make\n" "it empty. You can repeat your command with --allow-empty, or you can\n" @@ -7827,7 +9159,7 @@ msgstr "" "machen. Sie können Ihren Befehl mit --allow-empty wiederholen, oder diesen\n" "Commit mit \"git reset HEAD^\" vollständig entfernen.\n" -#: builtin/commit.c:52 +#: builtin/commit.c:53 msgid "" "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" "If you wish to commit it anyway, use:\n" @@ -7842,11 +9174,11 @@ msgstr "" " git commit --allow-empty\n" "\n" -#: builtin/commit.c:59 +#: builtin/commit.c:60 msgid "Otherwise, please use 'git reset'\n" msgstr "Andernfalls benutzen Sie bitte 'git reset'\n" -#: builtin/commit.c:62 +#: builtin/commit.c:63 msgid "" "If you wish to skip this commit, use:\n" "\n" @@ -7862,62 +9194,62 @@ msgstr "" "Benutzen Sie anschließend \"git cherry-pick --continue\", um die\n" "Cherry-Pick-Operation mit den verbleibenden Commits fortzusetzen.\n" -#: builtin/commit.c:293 +#: builtin/commit.c:306 msgid "failed to unpack HEAD tree object" msgstr "Fehler beim Entpacken des \"Tree\"-Objektes von HEAD." -#: builtin/commit.c:334 +#: builtin/commit.c:347 msgid "unable to create temporary index" msgstr "Konnte temporären Index nicht erstellen." -#: builtin/commit.c:340 +#: builtin/commit.c:353 msgid "interactive add failed" msgstr "interaktives Hinzufügen fehlgeschlagen" -#: builtin/commit.c:353 +#: builtin/commit.c:366 msgid "unable to update temporary index" msgstr "Konnte temporären Index nicht aktualisieren." -#: builtin/commit.c:355 +#: builtin/commit.c:368 msgid "Failed to update main cache tree" msgstr "Konnte Haupt-Cache-Verzeichnis nicht aktualisieren" -#: builtin/commit.c:380 builtin/commit.c:403 builtin/commit.c:449 +#: builtin/commit.c:393 builtin/commit.c:416 builtin/commit.c:462 msgid "unable to write new_index file" msgstr "Konnte new_index Datei nicht schreiben" -#: builtin/commit.c:432 +#: builtin/commit.c:445 msgid "cannot do a partial commit during a merge." msgstr "Kann keinen Teil-Commit durchführen, während ein Merge im Gange ist." -#: builtin/commit.c:434 +#: builtin/commit.c:447 msgid "cannot do a partial commit during a cherry-pick." msgstr "" "Kann keinen Teil-Commit durchführen, während \"cherry-pick\" im Gange ist." -#: builtin/commit.c:442 +#: builtin/commit.c:455 msgid "cannot read the index" msgstr "Kann Index nicht lesen" -#: builtin/commit.c:461 +#: builtin/commit.c:474 msgid "unable to write temporary index file" msgstr "Konnte temporäre Index-Datei nicht schreiben." -#: builtin/commit.c:558 +#: builtin/commit.c:571 #, c-format msgid "commit '%s' lacks author header" msgstr "Commit '%s' fehlt Autor-Kopfbereich" -#: builtin/commit.c:560 +#: builtin/commit.c:573 #, c-format msgid "commit '%s' has malformed author line" msgstr "Commit '%s' hat fehlerhafte Autor-Zeile" -#: builtin/commit.c:579 +#: builtin/commit.c:592 msgid "malformed --author parameter" msgstr "Fehlerhafter --author Parameter" -#: builtin/commit.c:631 +#: builtin/commit.c:644 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -7925,38 +9257,38 @@ msgstr "" "Konnte kein Kommentar-Zeichen auswählen, das nicht in\n" "der aktuellen Commit-Beschreibung verwendet wird." -#: builtin/commit.c:668 builtin/commit.c:701 builtin/commit.c:1029 +#: builtin/commit.c:681 builtin/commit.c:714 builtin/commit.c:1042 #, c-format msgid "could not lookup commit %s" msgstr "Konnte Commit %s nicht nachschlagen" -#: builtin/commit.c:680 builtin/shortlog.c:316 +#: builtin/commit.c:693 builtin/shortlog.c:317 #, c-format msgid "(reading log message from standard input)\n" msgstr "(lese Log-Nachricht von Standard-Eingabe)\n" -#: builtin/commit.c:682 +#: builtin/commit.c:695 msgid "could not read log from standard input" msgstr "Konnte Log nicht von Standard-Eingabe lesen." -#: builtin/commit.c:686 +#: builtin/commit.c:699 #, c-format msgid "could not read log file '%s'" msgstr "Konnte Log-Datei '%s' nicht lesen" -#: builtin/commit.c:715 builtin/commit.c:723 +#: builtin/commit.c:728 builtin/commit.c:736 msgid "could not read SQUASH_MSG" msgstr "Konnte SQUASH_MSG nicht lesen" -#: builtin/commit.c:720 +#: builtin/commit.c:733 msgid "could not read MERGE_MSG" msgstr "Konnte MERGE_MSG nicht lesen" -#: builtin/commit.c:774 +#: builtin/commit.c:787 msgid "could not write commit template" msgstr "Konnte Commit-Vorlage nicht schreiben" -#: builtin/commit.c:792 +#: builtin/commit.c:805 #, c-format msgid "" "\n" @@ -7971,7 +9303,7 @@ msgstr "" "\t%s\n" "und versuchen Sie es erneut.\n" -#: builtin/commit.c:797 +#: builtin/commit.c:810 #, c-format msgid "" "\n" @@ -7986,7 +9318,7 @@ msgstr "" "\t%s\n" "und versuchen Sie es erneut.\n" -#: builtin/commit.c:810 +#: builtin/commit.c:823 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -7996,7 +9328,7 @@ msgstr "" "die mit '%c' beginnen, werden ignoriert, und eine leere Beschreibung\n" "bricht den Commit ab.\n" -#: builtin/commit.c:818 +#: builtin/commit.c:831 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -8009,110 +9341,110 @@ msgstr "" "entfernen.\n" "Eine leere Beschreibung bricht den Commit ab.\n" -#: builtin/commit.c:835 +#: builtin/commit.c:848 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sAutor: %.*s <%.*s>" -#: builtin/commit.c:843 +#: builtin/commit.c:856 #, c-format msgid "%sDate: %s" msgstr "%sDatum: %s" -#: builtin/commit.c:850 +#: builtin/commit.c:863 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sCommit-Ersteller: %.*s <%.*s>" -#: builtin/commit.c:867 +#: builtin/commit.c:880 msgid "Cannot read index" msgstr "Kann Index nicht lesen" -#: builtin/commit.c:933 +#: builtin/commit.c:946 msgid "Error building trees" msgstr "Fehler beim Erzeugen der \"Tree\"-Objekte" -#: builtin/commit.c:947 builtin/tag.c:257 +#: builtin/commit.c:960 builtin/tag.c:258 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "" "Bitte liefern Sie eine Beschreibung entweder mit der Option -m oder -F.\n" -#: builtin/commit.c:991 +#: builtin/commit.c:1004 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "" "--author '%s' ist nicht im Format 'Name <E-Mail>' und stimmt mit keinem " "vorhandenen Autor überein" -#: builtin/commit.c:1005 +#: builtin/commit.c:1018 #, c-format msgid "Invalid ignored mode '%s'" msgstr "Ungültiger ignored-Modus '%s'." -#: builtin/commit.c:1019 builtin/commit.c:1269 +#: builtin/commit.c:1032 builtin/commit.c:1269 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Ungültiger Modus '%s' für unversionierte Dateien" -#: builtin/commit.c:1057 +#: builtin/commit.c:1070 msgid "--long and -z are incompatible" msgstr "Die Optionen --long und -z sind inkompatibel." -#: builtin/commit.c:1090 +#: builtin/commit.c:1103 msgid "Using both --reset-author and --author does not make sense" msgstr "" "Die Optionen --reset-author und --author können nicht gemeinsam verwendet " "werden." -#: builtin/commit.c:1099 +#: builtin/commit.c:1112 msgid "You have nothing to amend." msgstr "Sie haben nichts für \"--amend\"." -#: builtin/commit.c:1102 +#: builtin/commit.c:1115 msgid "You are in the middle of a merge -- cannot amend." msgstr "Ein Merge ist im Gange -- kann \"--amend\" nicht ausführen." -#: builtin/commit.c:1104 +#: builtin/commit.c:1117 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "\"cherry-pick\" ist im Gange -- kann \"--amend\" nicht ausführen." -#: builtin/commit.c:1107 +#: builtin/commit.c:1120 msgid "Options --squash and --fixup cannot be used together" msgstr "" "Die Optionen --squash und --fixup können nicht gemeinsam verwendet werden." -#: builtin/commit.c:1117 +#: builtin/commit.c:1130 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "Es kann nur eine Option von -c/-C/-F/--fixup verwendet werden." -#: builtin/commit.c:1119 +#: builtin/commit.c:1132 msgid "Option -m cannot be combined with -c/-C/-F." msgstr "Die Option -m kann nicht mit -c/-C/-F kombiniert werden." -#: builtin/commit.c:1127 +#: builtin/commit.c:1140 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "" "Die Option --reset--author kann nur mit -C, -c oder --amend verwendet werden." -#: builtin/commit.c:1144 +#: builtin/commit.c:1157 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" "Es kann nur eine Option von --include/--only/--all/--interactive/--patch " "verwendet werden." -#: builtin/commit.c:1146 +#: builtin/commit.c:1159 msgid "No paths with --include/--only does not make sense." msgstr "" "Die Optionen --include und --only können nur mit der Angabe von Pfaden " "verwendet werden." -#: builtin/commit.c:1160 builtin/tag.c:543 +#: builtin/commit.c:1173 builtin/tag.c:544 #, c-format msgid "Invalid cleanup mode %s" msgstr "Ungültiger \"cleanup\" Modus %s" -#: builtin/commit.c:1165 +#: builtin/commit.c:1178 msgid "Paths with -a does not make sense." msgstr "Die Option -a kann nicht mit der Angabe von Pfaden verwendet werden." @@ -8137,7 +9469,7 @@ msgid "version" msgstr "Version" #: builtin/commit.c:1311 builtin/commit.c:1486 builtin/push.c:558 -#: builtin/worktree.c:581 +#: builtin/worktree.c:591 msgid "machine-readable output" msgstr "maschinenlesbare Ausgabe" @@ -8150,7 +9482,7 @@ msgid "terminate entries with NUL" msgstr "Einträge mit NUL-Zeichen abschließen" #: builtin/commit.c:1319 builtin/commit.c:1323 builtin/commit.c:1494 -#: builtin/fast-export.c:1001 builtin/fast-export.c:1004 builtin/tag.c:397 +#: builtin/fast-export.c:1007 builtin/fast-export.c:1010 builtin/tag.c:398 msgid "mode" msgstr "Modus" @@ -8209,7 +9541,7 @@ msgstr "Unterschiede in Commit-Beschreibungsvorlage anzeigen" msgid "Commit message options" msgstr "Optionen für Commit-Beschreibung" -#: builtin/commit.c:1454 builtin/tag.c:394 +#: builtin/commit.c:1454 builtin/merge.c:261 builtin/tag.c:395 msgid "read message from file" msgstr "Beschreibung von Datei lesen" @@ -8221,7 +9553,7 @@ msgstr "Autor" msgid "override author for commit" msgstr "Autor eines Commits überschreiben" -#: builtin/commit.c:1456 builtin/gc.c:501 +#: builtin/commit.c:1456 builtin/gc.c:504 msgid "date" msgstr "Datum" @@ -8229,8 +9561,8 @@ msgstr "Datum" msgid "override date for commit" msgstr "Datum eines Commits überschreiben" -#: builtin/commit.c:1457 builtin/merge.c:227 builtin/notes.c:402 -#: builtin/notes.c:565 builtin/tag.c:392 +#: builtin/commit.c:1457 builtin/merge.c:257 builtin/notes.c:404 +#: builtin/notes.c:567 builtin/tag.c:393 msgid "message" msgstr "Beschreibung" @@ -8267,8 +9599,8 @@ msgstr "" msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "Sie als Autor des Commits setzen (verwendet mit -C/-c/--amend)" -#: builtin/commit.c:1463 builtin/log.c:1446 builtin/merge.c:241 -#: builtin/pull.c:154 builtin/revert.c:105 +#: builtin/commit.c:1463 builtin/log.c:1457 builtin/merge.c:274 +#: builtin/pull.c:154 builtin/revert.c:106 msgid "add Signed-off-by:" msgstr "'Signed-off-by:'-Zeile hinzufügen" @@ -8284,7 +9616,7 @@ msgstr "Bearbeitung des Commits erzwingen" msgid "default" msgstr "Standard" -#: builtin/commit.c:1466 builtin/tag.c:398 +#: builtin/commit.c:1466 builtin/tag.c:399 msgid "how to strip spaces and #comments from message" msgstr "" "wie Leerzeichen und #Kommentare von der Beschreibung getrennt werden sollen" @@ -8293,8 +9625,8 @@ msgstr "" msgid "include status in commit message template" msgstr "Status in die Commit-Beschreibungsvorlage einfügen" -#: builtin/commit.c:1469 builtin/merge.c:239 builtin/pull.c:184 -#: builtin/revert.c:113 +#: builtin/commit.c:1469 builtin/merge.c:272 builtin/pull.c:184 +#: builtin/revert.c:114 msgid "GPG sign commit" msgstr "Commit mit GPG signieren" @@ -8372,7 +9704,7 @@ msgstr "Commit abgebrochen; Sie haben die Beschreibung nicht editiert.\n" #: builtin/commit.c:1650 msgid "" -"Repository has been updated, but unable to write\n" +"repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" "not exceeded, and then \"git reset HEAD\" to recover." msgstr "" @@ -8381,45 +9713,56 @@ msgstr "" "voll und Ihr Kontingent nicht aufgebraucht ist und führen Sie\n" "anschließend \"git reset HEAD\" zu Wiederherstellung aus." -#: builtin/commit-graph.c:9 +#: builtin/commit-graph.c:10 msgid "git commit-graph [--object-dir <objdir>]" msgstr "git commit-graph [--object-dir <Objektverzeichnis>]" -#: builtin/commit-graph.c:10 builtin/commit-graph.c:16 +#: builtin/commit-graph.c:11 builtin/commit-graph.c:23 msgid "git commit-graph read [--object-dir <objdir>]" msgstr "git commit-graph read [--object-dir <Objektverzeichnis>]" -#: builtin/commit-graph.c:11 builtin/commit-graph.c:21 +#: builtin/commit-graph.c:12 builtin/commit-graph.c:18 +msgid "git commit-graph verify [--object-dir <objdir>]" +msgstr "git commit-graph verify [--object-dir <Objektverzeichnis>]" + +#: builtin/commit-graph.c:13 builtin/commit-graph.c:28 msgid "" -"git commit-graph write [--object-dir <objdir>] [--append] [--stdin-packs|--" -"stdin-commits]" -msgstr "git commit-graph write [--object-dir <Objektverzeichnis>] [--append] [--stdin-packs|--stdin-commits]" +"git commit-graph write [--object-dir <objdir>] [--append] [--reachable|--" +"stdin-packs|--stdin-commits]" +msgstr "git commit-graph write [--object-dir <Objektverzeichnis>] [--append] [--reachable|--stdin-packs|--stdin-commits]" -#: builtin/commit-graph.c:39 builtin/commit-graph.c:92 -#: builtin/commit-graph.c:147 builtin/fetch.c:161 builtin/log.c:1466 +#: builtin/commit-graph.c:48 builtin/commit-graph.c:77 +#: builtin/commit-graph.c:131 builtin/commit-graph.c:184 builtin/fetch.c:150 +#: builtin/log.c:1477 msgid "dir" msgstr "Verzeichnis" -#: builtin/commit-graph.c:40 builtin/commit-graph.c:93 -#: builtin/commit-graph.c:148 +#: builtin/commit-graph.c:49 builtin/commit-graph.c:78 +#: builtin/commit-graph.c:132 builtin/commit-graph.c:185 msgid "The object directory to store the graph" msgstr "Das Objektverzeichnis zum Speichern des Graphen." -#: builtin/commit-graph.c:95 +#: builtin/commit-graph.c:134 +msgid "start walk at all refs" +msgstr "Durchlauf auf allen Referenzen beginnen" + +#: builtin/commit-graph.c:136 msgid "scan pack-indexes listed by stdin for commits" msgstr "durch Standard-Eingabe gelistete Pack-Indexe nach Commits scannen" -#: builtin/commit-graph.c:97 +#: builtin/commit-graph.c:138 msgid "start walk at commits listed by stdin" msgstr "Lauf bei Commits beginnen, die über die Standard-Eingabe gelistet sind" -#: builtin/commit-graph.c:99 +#: builtin/commit-graph.c:140 msgid "include all commits already in the commit-graph file" -msgstr "alle Commits einschließen, die sich bereits in der Commit-Graph-Datei befinden" +msgstr "" +"alle Commits einschließen, die sich bereits in der Commit-Graph-Datei " +"befinden" -#: builtin/commit-graph.c:108 -msgid "cannot use both --stdin-commits and --stdin-packs" -msgstr "Kann nicht --stdin-commits und --stdin-packs benutzen." +#: builtin/commit-graph.c:149 +msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" +msgstr "Benutzen Sie mindestens eins von --reachable, --stdin-commits, oder --stdin-packs." #: builtin/config.c:10 msgid "git config [<options>]" @@ -8430,162 +9773,198 @@ msgstr "git config [<Optionen>]" msgid "unrecognized --type argument, %s" msgstr "nicht erkanntes --type Argument, %s" -#: builtin/config.c:123 +#: builtin/config.c:113 +msgid "only one type at a time" +msgstr "nur ein Typ erlaubt" + +#: builtin/config.c:122 msgid "Config file location" msgstr "Ort der Konfigurationsdatei" -#: builtin/config.c:124 +#: builtin/config.c:123 msgid "use global config file" msgstr "globale Konfigurationsdatei verwenden" -#: builtin/config.c:125 +#: builtin/config.c:124 msgid "use system config file" msgstr "systemweite Konfigurationsdatei verwenden" -#: builtin/config.c:126 +#: builtin/config.c:125 msgid "use repository config file" msgstr "Konfigurationsdatei des Repositories verwenden" -#: builtin/config.c:127 +#: builtin/config.c:126 msgid "use given config file" msgstr "die angegebene Konfigurationsdatei verwenden" -#: builtin/config.c:128 +#: builtin/config.c:127 msgid "blob-id" msgstr "Blob-Id" -#: builtin/config.c:128 +#: builtin/config.c:127 msgid "read config from given blob object" msgstr "Konfiguration von angegebenem Blob-Objekt lesen" -#: builtin/config.c:129 +#: builtin/config.c:128 msgid "Action" msgstr "Aktion" -#: builtin/config.c:130 +#: builtin/config.c:129 msgid "get value: name [value-regex]" msgstr "Wert zurückgeben: Name [Wert-regex]" -#: builtin/config.c:131 +#: builtin/config.c:130 msgid "get all values: key [value-regex]" msgstr "alle Werte zurückgeben: Schlüssel [Wert-regex]" -#: builtin/config.c:132 +#: builtin/config.c:131 msgid "get values for regexp: name-regex [value-regex]" msgstr "Werte für den regulären Ausdruck zurückgeben: Name-regex [Wert-regex]" -#: builtin/config.c:133 +#: builtin/config.c:132 msgid "get value specific for the URL: section[.var] URL" msgstr "Wert spezifisch für eine URL zurückgeben: section[.var] URL" -#: builtin/config.c:134 +#: builtin/config.c:133 msgid "replace all matching variables: name value [value_regex]" msgstr "alle passenden Variablen ersetzen: Name Wert [Wert-regex] " -#: builtin/config.c:135 +#: builtin/config.c:134 msgid "add a new variable: name value" msgstr "neue Variable hinzufügen: Name Wert" -#: builtin/config.c:136 +#: builtin/config.c:135 msgid "remove a variable: name [value-regex]" msgstr "eine Variable entfernen: Name [Wert-regex]" -#: builtin/config.c:137 +#: builtin/config.c:136 msgid "remove all matches: name [value-regex]" msgstr "alle Übereinstimmungen entfernen: Name [Wert-regex]" -#: builtin/config.c:138 +#: builtin/config.c:137 msgid "rename section: old-name new-name" msgstr "eine Sektion umbenennen: alter-Name neuer-Name" -#: builtin/config.c:139 +#: builtin/config.c:138 msgid "remove a section: name" msgstr "eine Sektion entfernen: Name" -#: builtin/config.c:140 +#: builtin/config.c:139 msgid "list all" msgstr "alles auflisten" -#: builtin/config.c:141 +#: builtin/config.c:140 msgid "open an editor" msgstr "einen Editor öffnen" -#: builtin/config.c:142 +#: builtin/config.c:141 msgid "find the color configured: slot [default]" msgstr "die konfigurierte Farbe finden: Slot [Standard]" -#: builtin/config.c:143 +#: builtin/config.c:142 msgid "find the color setting: slot [stdout-is-tty]" msgstr "die Farbeinstellung finden: Slot [Standard-Ausgabe-ist-Terminal]" -#: builtin/config.c:144 +#: builtin/config.c:143 msgid "Type" msgstr "Typ" -#: builtin/config.c:145 +#: builtin/config.c:144 msgid "value is given this type" msgstr "Wert ist mit diesem Typ angegeben" -#: builtin/config.c:146 +#: builtin/config.c:145 msgid "value is \"true\" or \"false\"" msgstr "Wert ist \"true\" oder \"false\"" -#: builtin/config.c:147 +#: builtin/config.c:146 msgid "value is decimal number" msgstr "Wert ist eine Dezimalzahl" -#: builtin/config.c:148 +#: builtin/config.c:147 msgid "value is --bool or --int" msgstr "Wert ist --bool oder --int" -#: builtin/config.c:149 +#: builtin/config.c:148 msgid "value is a path (file or directory name)" msgstr "Wert ist ein Pfad (Datei oder Verzeichnisname)" -#: builtin/config.c:150 +#: builtin/config.c:149 msgid "value is an expiry date" msgstr "Wert ist ein Verfallsdatum" -#: builtin/config.c:151 +#: builtin/config.c:150 msgid "Other" msgstr "Sonstiges" -#: builtin/config.c:152 +#: builtin/config.c:151 msgid "terminate values with NUL byte" msgstr "schließt Werte mit NUL-Byte ab" -#: builtin/config.c:153 +#: builtin/config.c:152 msgid "show variable names only" msgstr "nur Variablennamen anzeigen" -#: builtin/config.c:154 +#: builtin/config.c:153 msgid "respect include directives on lookup" msgstr "beachtet \"include\"-Direktiven beim Nachschlagen" -#: builtin/config.c:155 +#: builtin/config.c:154 msgid "show origin of config (file, standard input, blob, command line)" msgstr "" "Ursprung der Konfiguration anzeigen (Datei, Standard-Eingabe, Blob, " "Befehlszeile)" -#: builtin/config.c:156 +#: builtin/config.c:155 msgid "value" msgstr "Wert" -#: builtin/config.c:156 +#: builtin/config.c:155 msgid "with --get, use default value when missing entry" msgstr "mit --get, benutze den Standardwert, wenn der Eintrag fehlt" -#: builtin/config.c:332 +#: builtin/config.c:168 +#, c-format +msgid "wrong number of arguments, should be %d" +msgstr "Falsche Anzahl von Argumenten - sollte %d sein." + +#: builtin/config.c:170 +#, c-format +msgid "wrong number of arguments, should be from %d to %d" +msgstr "Falsche Anzahl von Argumenten - sollte zwischen %d und %d sein." + +#: builtin/config.c:304 +#, c-format +msgid "invalid key pattern: %s" +msgstr "Ungültiges Schlüsselmuster: %s" + +#: builtin/config.c:340 #, c-format msgid "failed to format default config value: %s" msgstr "Fehler beim Formatieren des Standardkonfigurationswertes: %s" -#: builtin/config.c:431 +#: builtin/config.c:397 +#, c-format +msgid "cannot parse color '%s'" +msgstr "Kann Farbe '%s' nicht parsen." + +#: builtin/config.c:439 msgid "unable to parse default color value" msgstr "konnte Standard-Farbwert nicht parsen" -#: builtin/config.c:575 +#: builtin/config.c:492 builtin/config.c:724 +msgid "not in a git directory" +msgstr "Nicht in einem Git-Repository." + +#: builtin/config.c:495 +msgid "writing to stdin is not supported" +msgstr "Das Schreiben in die Standard-Eingabe wird nicht unterstützt." + +#: builtin/config.c:498 +msgid "writing config blobs is not supported" +msgstr "Das Schreiben von Blob-Objekten für Konfigurationen wird nicht unterstützt." + +#: builtin/config.c:583 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -8600,20 +9979,67 @@ msgstr "" "#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c:603 +#: builtin/config.c:606 +msgid "only one config file at a time" +msgstr "Nur eine Konfigurationsdatei zu einer Zeit möglich." + +#: builtin/config.c:611 msgid "--local can only be used inside a git repository" msgstr "--local kann nur innerhalb eines Git-Repositories verwendet werden." -#: builtin/config.c:606 +#: builtin/config.c:614 msgid "--blob can only be used inside a git repository" msgstr "--blob kann nur innerhalb eines Git-Repositories verwendet werden." -#: builtin/config.c:735 +#: builtin/config.c:633 +msgid "$HOME not set" +msgstr "$HOME nicht gesetzt." + +#: builtin/config.c:670 +msgid "--get-color and variable type are incoherent" +msgstr "Angabe von --get-color und Variablentyp sind ungültig." + +#: builtin/config.c:675 +msgid "only one action at a time" +msgstr "Nur eine Aktion erlaubt." + +#: builtin/config.c:688 +msgid "--name-only is only applicable to --list or --get-regexp" +msgstr "--name-only ist nur anwendbar auf --list oder --get-regexp" + +#: builtin/config.c:694 +msgid "" +"--show-origin is only applicable to --get, --get-all, --get-regexp, and --" +"list" +msgstr "--show-origin ist nur anwendbar auf --get, --get-all, --get-regexp und --list" + +#: builtin/config.c:700 +msgid "--default is only applicable to --get" +msgstr "--default ist nur anwendbar auf --get" + +#: builtin/config.c:713 +#, c-format +msgid "unable to read config file '%s'" +msgstr "Konnte Konfigurationsdatei '%s' nicht lesen." + +#: builtin/config.c:716 +msgid "error processing config file(s)" +msgstr "Fehler beim Verarbeiten der Konfigurationsdatei(en)." + +#: builtin/config.c:726 +msgid "editing stdin is not supported" +msgstr "Das Bearbeiten der Standard-Eingabe wird nicht unterstützt." + +#: builtin/config.c:728 +msgid "editing blobs is not supported" +msgstr "Das Bearbeiten von Blobs wird nicht unterstützt." + +#: builtin/config.c:742 #, c-format msgid "cannot create configuration file %s" msgstr "Konnte Konfigurationsdatei '%s' nicht erstellen." -#: builtin/config.c:748 +#: builtin/config.c:755 #, c-format msgid "" "cannot overwrite multiple values with a single value\n" @@ -8623,6 +10049,11 @@ msgstr "" " Benutzen Sie einen regulären Ausdruck, --add oder --replace, um %s\n" " zu ändern." +#: builtin/config.c:829 builtin/config.c:840 +#, c-format +msgid "no such section: %s" +msgstr "Keine solche Sektion: %s" + #: builtin/count-objects.c:90 msgid "git count-objects [-v] [-H | --human-readable]" msgstr "git count-objects [-v] [-H | --human-readable]" @@ -8631,59 +10062,59 @@ msgstr "git count-objects [-v] [-H | --human-readable]" msgid "print sizes in human readable format" msgstr "gibt Größenangaben in menschenlesbaren Format aus" -#: builtin/describe.c:22 +#: builtin/describe.c:26 msgid "git describe [<options>] [<commit-ish>...]" msgstr "git describe [<Optionen>] [<Commit-Angabe>...]" -#: builtin/describe.c:23 +#: builtin/describe.c:27 msgid "git describe [<options>] --dirty" msgstr "git describe [<Optionen>] --dirty" -#: builtin/describe.c:57 +#: builtin/describe.c:62 msgid "head" msgstr "Branch" -#: builtin/describe.c:57 +#: builtin/describe.c:62 msgid "lightweight" msgstr "nicht-annotiert" -#: builtin/describe.c:57 +#: builtin/describe.c:62 msgid "annotated" msgstr "annotiert" -#: builtin/describe.c:267 +#: builtin/describe.c:272 #, c-format msgid "annotated tag %s not available" msgstr "annotiertes Tag %s ist nicht verfügbar" -#: builtin/describe.c:271 +#: builtin/describe.c:276 #, c-format msgid "annotated tag %s has no embedded name" msgstr "annotiertes Tag %s hat keinen eingebetteten Namen" -#: builtin/describe.c:273 +#: builtin/describe.c:278 #, c-format msgid "tag '%s' is really '%s' here" msgstr "Tag '%s' ist eigentlich '%s' hier" -#: builtin/describe.c:317 +#: builtin/describe.c:322 #, c-format msgid "no tag exactly matches '%s'" msgstr "kein Tag entspricht exakt '%s'" -#: builtin/describe.c:319 +#: builtin/describe.c:324 #, c-format msgid "No exact match on refs or tags, searching to describe\n" msgstr "" "Keine exakte Übereinstimmung bei Referenzen oder Tags, Suche zum " "Beschreiben\n" -#: builtin/describe.c:366 +#: builtin/describe.c:378 #, c-format msgid "finished search at %s\n" msgstr "beendete Suche bei %s\n" -#: builtin/describe.c:392 +#: builtin/describe.c:404 #, c-format msgid "" "No annotated tags can describe '%s'.\n" @@ -8692,7 +10123,7 @@ msgstr "" "Keine annotierten Tags können '%s' beschreiben.\n" "Jedoch gab es nicht-annotierte Tags: versuchen Sie --tags." -#: builtin/describe.c:396 +#: builtin/describe.c:408 #, c-format msgid "" "No tags can describe '%s'.\n" @@ -8701,12 +10132,12 @@ msgstr "" "Keine Tags können '%s' beschreiben.\n" "Versuchen Sie --always oder erstellen Sie einige Tags." -#: builtin/describe.c:426 +#: builtin/describe.c:438 #, c-format msgid "traversed %lu commits\n" msgstr "%lu Commits durchlaufen\n" -#: builtin/describe.c:429 +#: builtin/describe.c:441 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" @@ -8715,94 +10146,94 @@ msgstr "" "mehr als %i Tags gefunden; führe die ersten %i auf\n" "Suche bei %s aufgegeben\n" -#: builtin/describe.c:497 +#: builtin/describe.c:509 #, c-format msgid "describe %s\n" msgstr "Beschreibe %s\n" -#: builtin/describe.c:500 builtin/log.c:502 +#: builtin/describe.c:512 builtin/log.c:508 #, c-format msgid "Not a valid object name %s" msgstr "%s ist kein gültiger Objekt-Name" -#: builtin/describe.c:508 +#: builtin/describe.c:520 #, c-format msgid "%s is neither a commit nor blob" msgstr "%s ist weder ein Commit, noch ein Blob." -#: builtin/describe.c:522 +#: builtin/describe.c:534 msgid "find the tag that comes after the commit" msgstr "das Tag finden, das nach dem Commit kommt" -#: builtin/describe.c:523 +#: builtin/describe.c:535 msgid "debug search strategy on stderr" msgstr "die Suchstrategie in der Standard-Fehlerausgabe protokollieren" -#: builtin/describe.c:524 +#: builtin/describe.c:536 msgid "use any ref" msgstr "alle Referenzen verwenden" -#: builtin/describe.c:525 +#: builtin/describe.c:537 msgid "use any tag, even unannotated" msgstr "jedes Tag verwenden, auch nicht-annotierte" -#: builtin/describe.c:526 +#: builtin/describe.c:538 msgid "always use long format" msgstr "immer langes Format verwenden" -#: builtin/describe.c:527 +#: builtin/describe.c:539 msgid "only follow first parent" msgstr "nur erstem Elternteil folgen" -#: builtin/describe.c:530 +#: builtin/describe.c:542 msgid "only output exact matches" msgstr "nur exakte Übereinstimmungen ausgeben" -#: builtin/describe.c:532 +#: builtin/describe.c:544 msgid "consider <n> most recent tags (default: 10)" msgstr "die jüngsten <n> Tags betrachten (Standard: 10)" -#: builtin/describe.c:534 +#: builtin/describe.c:546 msgid "only consider tags matching <pattern>" msgstr "nur Tags, die <Muster> entsprechen, betrachten" -#: builtin/describe.c:536 +#: builtin/describe.c:548 msgid "do not consider tags matching <pattern>" msgstr "keine Tags betrachten, die <Muster> entsprechen" -#: builtin/describe.c:538 builtin/name-rev.c:406 +#: builtin/describe.c:550 builtin/name-rev.c:424 msgid "show abbreviated commit object as fallback" msgstr "gekürztes Commit-Objekt anzeigen, wenn sonst nichts zutrifft" -#: builtin/describe.c:539 builtin/describe.c:542 +#: builtin/describe.c:551 builtin/describe.c:554 msgid "mark" msgstr "Kennzeichen" -#: builtin/describe.c:540 +#: builtin/describe.c:552 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "" "<Kennzeichen> bei geändertem Arbeitsverzeichnis anhängen (Standard: \"-dirty" "\")" -#: builtin/describe.c:543 +#: builtin/describe.c:555 msgid "append <mark> on broken working tree (default: \"-broken\")" msgstr "" "<Kennzeichen> bei defektem Arbeitsverzeichnis anhängen (Standard: \"-broken" "\")" -#: builtin/describe.c:561 +#: builtin/describe.c:573 msgid "--long is incompatible with --abbrev=0" msgstr "Die Optionen --long und --abbrev=0 sind inkompatibel." -#: builtin/describe.c:590 +#: builtin/describe.c:602 msgid "No names found, cannot describe anything." msgstr "Keine Namen gefunden, kann nichts beschreiben." -#: builtin/describe.c:640 +#: builtin/describe.c:652 msgid "--dirty is incompatible with commit-ishes" msgstr "Die Option --dirty kann nicht mit Commits verwendet werden." -#: builtin/describe.c:642 +#: builtin/describe.c:654 msgid "--broken is incompatible with commit-ishes" msgstr "Die Option --broken kann nicht mit Commits verwendet werden." @@ -8816,50 +10247,50 @@ msgstr "'%s': keine reguläre Datei oder symbolische Verknüpfung" msgid "invalid option: %s" msgstr "Ungültige Option: %s" -#: builtin/diff.c:356 +#: builtin/diff.c:363 msgid "Not a git repository" msgstr "Kein Git-Repository" -#: builtin/diff.c:399 +#: builtin/diff.c:407 #, c-format msgid "invalid object '%s' given." msgstr "Objekt '%s' ist ungültig." -#: builtin/diff.c:408 +#: builtin/diff.c:416 #, c-format msgid "more than two blobs given: '%s'" msgstr "Mehr als zwei Blobs angegeben: '%s'" -#: builtin/diff.c:413 +#: builtin/diff.c:421 #, c-format msgid "unhandled object '%s' given." msgstr "unbehandeltes Objekt '%s' angegeben" -#: builtin/difftool.c:29 +#: builtin/difftool.c:30 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" msgstr "git difftool [<Optionen>] [<Commit> [<Commit>]] [--] [<Pfad>...]" -#: builtin/difftool.c:259 +#: builtin/difftool.c:260 #, c-format msgid "failed: %d" msgstr "fehlgeschlagen: %d" -#: builtin/difftool.c:301 +#: builtin/difftool.c:302 #, c-format msgid "could not read symlink %s" msgstr "konnte symbolische Verknüpfung %s nicht lesen" -#: builtin/difftool.c:303 +#: builtin/difftool.c:304 #, c-format msgid "could not read symlink file %s" msgstr "Konnte Datei von symbolischer Verknüpfung '%s' nicht lesen." -#: builtin/difftool.c:311 +#: builtin/difftool.c:312 #, c-format msgid "could not read object %s for symlink %s" msgstr "Konnte Objekt '%s' für symbolische Verknüpfung '%s' nicht lesen." -#: builtin/difftool.c:412 +#: builtin/difftool.c:413 msgid "" "combined diff formats('-c' and '--cc') are not supported in\n" "directory diff mode('-d' and '--dir-diff')." @@ -8867,33 +10298,33 @@ msgstr "" "Kombinierte Diff-Formate('-c' und '--cc') werden im Verzeichnis-\n" "Diff-Modus('-d' und '--dir-diff') nicht unterstützt." -#: builtin/difftool.c:632 +#: builtin/difftool.c:633 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "beide Dateien geändert: '%s' und '%s'." -#: builtin/difftool.c:634 +#: builtin/difftool.c:635 msgid "working tree file has been left." msgstr "Datei im Arbeitsverzeichnis belassen." -#: builtin/difftool.c:645 +#: builtin/difftool.c:646 #, c-format msgid "temporary files exist in '%s'." msgstr "Es existieren temporäre Dateien in '%s'." -#: builtin/difftool.c:646 +#: builtin/difftool.c:647 msgid "you may want to cleanup or recover these." msgstr "Sie könnten diese aufräumen oder wiederherstellen." -#: builtin/difftool.c:695 +#: builtin/difftool.c:696 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "`diff.guitool` anstatt `diff.tool` benutzen" -#: builtin/difftool.c:697 +#: builtin/difftool.c:698 msgid "perform a full-directory diff" msgstr "Diff über ganzes Verzeichnis ausführen" -#: builtin/difftool.c:699 +#: builtin/difftool.c:700 msgid "do not prompt before launching a diff tool" msgstr "keine Eingabeaufforderung vor Ausführung eines Diff-Tools" @@ -8902,8 +10333,8 @@ msgid "use symlinks in dir-diff mode" msgstr "symbolische Verknüpfungen im dir-diff Modus verwenden" #: builtin/difftool.c:706 -msgid "<tool>" -msgstr "<Tool>" +msgid "tool" +msgstr "Tool" #: builtin/difftool.c:707 msgid "use the specified diff tool" @@ -8923,10 +10354,6 @@ msgstr "" "Rückkehrwert\n" "verschieden 0 ausgeführt wurde" -#: builtin/difftool.c:714 -msgid "<command>" -msgstr "<Programm>" - #: builtin/difftool.c:715 msgid "specify a custom command for viewing diffs" msgstr "eigenen Befehl zur Anzeige von Unterschieden angeben" @@ -8939,155 +10366,155 @@ msgstr "kein <Tool> für --tool=<Tool> angegeben" msgid "no <cmd> given for --extcmd=<cmd>" msgstr "kein <Programm> für --extcmd=<Programm> angegeben" -#: builtin/fast-export.c:27 +#: builtin/fast-export.c:29 msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [rev-list-opts]" -#: builtin/fast-export.c:1000 +#: builtin/fast-export.c:1006 msgid "show progress after <n> objects" msgstr "Fortschritt nach <n> Objekten anzeigen" -#: builtin/fast-export.c:1002 +#: builtin/fast-export.c:1008 msgid "select handling of signed tags" msgstr "Behandlung von signierten Tags wählen" -#: builtin/fast-export.c:1005 +#: builtin/fast-export.c:1011 msgid "select handling of tags that tag filtered objects" msgstr "Behandlung von Tags wählen, die gefilterte Objekte markieren" -#: builtin/fast-export.c:1008 +#: builtin/fast-export.c:1014 msgid "Dump marks to this file" msgstr "Kennzeichen in diese Datei schreiben" -#: builtin/fast-export.c:1010 +#: builtin/fast-export.c:1016 msgid "Import marks from this file" msgstr "Kennzeichen von dieser Datei importieren" -#: builtin/fast-export.c:1012 +#: builtin/fast-export.c:1018 msgid "Fake a tagger when tags lack one" msgstr "künstlich einen Tag-Ersteller erzeugen, wenn das Tag keinen hat" -#: builtin/fast-export.c:1014 +#: builtin/fast-export.c:1020 msgid "Output full tree for each commit" msgstr "für jeden Commit das gesamte Verzeichnis ausgeben" -#: builtin/fast-export.c:1016 +#: builtin/fast-export.c:1022 msgid "Use the done feature to terminate the stream" msgstr "die \"done\"-Funktion benutzen, um den Datenstrom abzuschließen" -#: builtin/fast-export.c:1017 +#: builtin/fast-export.c:1023 msgid "Skip output of blob data" msgstr "Ausgabe von Blob-Daten überspringen" -#: builtin/fast-export.c:1018 +#: builtin/fast-export.c:1024 msgid "refspec" msgstr "Refspec" -#: builtin/fast-export.c:1019 +#: builtin/fast-export.c:1025 msgid "Apply refspec to exported refs" msgstr "Refspec auf exportierte Referenzen anwenden" -#: builtin/fast-export.c:1020 +#: builtin/fast-export.c:1026 msgid "anonymize output" msgstr "Ausgabe anonymisieren" -#: builtin/fetch.c:26 +#: builtin/fetch.c:27 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [<Optionen>] [<Repository> [<Refspec>...]]" -#: builtin/fetch.c:27 +#: builtin/fetch.c:28 msgid "git fetch [<options>] <group>" msgstr "git fetch [<Optionen>] <Gruppe>" -#: builtin/fetch.c:28 +#: builtin/fetch.c:29 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [<Optionen>] [(<Repository> | <Gruppe>)...]" -#: builtin/fetch.c:29 +#: builtin/fetch.c:30 msgid "git fetch --all [<options>]" msgstr "git fetch --all [<Optionen>]" -#: builtin/fetch.c:123 builtin/pull.c:193 +#: builtin/fetch.c:112 builtin/pull.c:193 msgid "fetch from all remotes" msgstr "fordert von allen Remote-Repositories an" -#: builtin/fetch.c:125 builtin/pull.c:196 +#: builtin/fetch.c:114 builtin/pull.c:196 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "an .git/FETCH_HEAD anhängen, anstatt zu überschreiben" -#: builtin/fetch.c:127 builtin/pull.c:199 +#: builtin/fetch.c:116 builtin/pull.c:199 msgid "path to upload pack on remote end" msgstr "Pfad des Programms zum Hochladen von Paketen auf der Gegenseite" -#: builtin/fetch.c:128 builtin/pull.c:201 +#: builtin/fetch.c:117 builtin/pull.c:201 msgid "force overwrite of local branch" msgstr "das Überschreiben von lokalen Branches erzwingen" -#: builtin/fetch.c:130 +#: builtin/fetch.c:119 msgid "fetch from multiple remotes" msgstr "von mehreren Remote-Repositories anfordern" -#: builtin/fetch.c:132 builtin/pull.c:203 +#: builtin/fetch.c:121 builtin/pull.c:203 msgid "fetch all tags and associated objects" msgstr "alle Tags und verbundene Objekte anfordern" -#: builtin/fetch.c:134 +#: builtin/fetch.c:123 msgid "do not fetch all tags (--no-tags)" msgstr "nicht alle Tags anfordern (--no-tags)" -#: builtin/fetch.c:136 +#: builtin/fetch.c:125 msgid "number of submodules fetched in parallel" msgstr "Anzahl der parallel anzufordernden Submodule" -#: builtin/fetch.c:138 builtin/pull.c:206 +#: builtin/fetch.c:127 builtin/pull.c:206 msgid "prune remote-tracking branches no longer on remote" msgstr "" "Remote-Tracking-Branches entfernen, die sich nicht mehr im Remote-Repository " "befinden" -#: builtin/fetch.c:140 +#: builtin/fetch.c:129 msgid "prune local tags no longer on remote and clobber changed tags" msgstr "" "lokale Tags entfernen, die sich nicht mehr im Remote-Repository befinden, " "und geänderte Tags aktualisieren" -#: builtin/fetch.c:141 builtin/fetch.c:164 builtin/pull.c:131 +#: builtin/fetch.c:130 builtin/fetch.c:153 builtin/pull.c:131 msgid "on-demand" msgstr "bei-Bedarf" -#: builtin/fetch.c:142 +#: builtin/fetch.c:131 msgid "control recursive fetching of submodules" msgstr "rekursive Anforderungen von Submodulen kontrollieren" -#: builtin/fetch.c:146 builtin/pull.c:214 +#: builtin/fetch.c:135 builtin/pull.c:214 msgid "keep downloaded pack" msgstr "heruntergeladenes Paket behalten" -#: builtin/fetch.c:148 +#: builtin/fetch.c:137 msgid "allow updating of HEAD ref" msgstr "Aktualisierung der \"HEAD\"-Referenz erlauben" -#: builtin/fetch.c:151 builtin/fetch.c:157 builtin/pull.c:217 +#: builtin/fetch.c:140 builtin/fetch.c:146 builtin/pull.c:217 msgid "deepen history of shallow clone" msgstr "" "die Historie eines Klons mit unvollständiger Historie (shallow) vertiefen" -#: builtin/fetch.c:153 +#: builtin/fetch.c:142 msgid "deepen history of shallow repository based on time" msgstr "" "die Historie eines Klons mit unvollständiger Historie (shallow) auf " "Zeitbasis\n" "vertiefen" -#: builtin/fetch.c:159 builtin/pull.c:220 +#: builtin/fetch.c:148 builtin/pull.c:220 msgid "convert to a complete repository" msgstr "zu einem vollständigen Repository konvertieren" -#: builtin/fetch.c:162 +#: builtin/fetch.c:151 msgid "prepend this to submodule path output" msgstr "dies an die Ausgabe der Submodul-Pfade voranstellen" -#: builtin/fetch.c:165 +#: builtin/fetch.c:154 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" @@ -9095,101 +10522,106 @@ msgstr "" "Standard für die rekursive Anforderung von Submodulen (geringere Priorität\n" "als Konfigurationsdateien)" -#: builtin/fetch.c:169 builtin/pull.c:223 +#: builtin/fetch.c:158 builtin/pull.c:223 msgid "accept refs that update .git/shallow" msgstr "Referenzen, die .git/shallow aktualisieren, akzeptieren" -#: builtin/fetch.c:170 builtin/pull.c:225 +#: builtin/fetch.c:159 builtin/pull.c:225 msgid "refmap" msgstr "Refmap" -#: builtin/fetch.c:171 builtin/pull.c:226 +#: builtin/fetch.c:160 builtin/pull.c:226 msgid "specify fetch refmap" msgstr "Refmap für 'fetch' angeben" -#: builtin/fetch.c:172 builtin/ls-remote.c:77 builtin/push.c:582 +#: builtin/fetch.c:161 builtin/ls-remote.c:77 builtin/push.c:582 #: builtin/send-pack.c:172 msgid "server-specific" msgstr "serverspezifisch" -#: builtin/fetch.c:172 builtin/ls-remote.c:77 builtin/push.c:582 +#: builtin/fetch.c:161 builtin/ls-remote.c:77 builtin/push.c:582 #: builtin/send-pack.c:173 msgid "option to transmit" msgstr "Option übertragen" -#: builtin/fetch.c:442 +#: builtin/fetch.c:167 +msgid "report that we have only objects reachable from this object" +msgstr "ausgeben, dass wir nur Objekte haben, die von diesem Objekt aus erreichbar sind" + +#: builtin/fetch.c:418 msgid "Couldn't find remote ref HEAD" msgstr "Konnte Remote-Referenz von HEAD nicht finden." -#: builtin/fetch.c:560 +#: builtin/fetch.c:552 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "Konfiguration fetch.output enthält ungültigen Wert %s" -#: builtin/fetch.c:653 +#: builtin/fetch.c:645 #, c-format msgid "object %s not found" msgstr "Objekt %s nicht gefunden" -#: builtin/fetch.c:657 +#: builtin/fetch.c:649 msgid "[up to date]" msgstr "[aktuell]" -#: builtin/fetch.c:670 builtin/fetch.c:750 +#: builtin/fetch.c:662 builtin/fetch.c:744 msgid "[rejected]" msgstr "[zurückgewiesen]" -#: builtin/fetch.c:671 +#: builtin/fetch.c:663 msgid "can't fetch in current branch" msgstr "kann \"fetch\" im aktuellen Branch nicht ausführen" -#: builtin/fetch.c:680 +#: builtin/fetch.c:672 msgid "[tag update]" msgstr "[Tag Aktualisierung]" -#: builtin/fetch.c:681 builtin/fetch.c:714 builtin/fetch.c:730 -#: builtin/fetch.c:745 +#: builtin/fetch.c:673 builtin/fetch.c:708 builtin/fetch.c:724 +#: builtin/fetch.c:739 msgid "unable to update local ref" msgstr "kann lokale Referenz nicht aktualisieren" -#: builtin/fetch.c:700 +#: builtin/fetch.c:694 msgid "[new tag]" msgstr "[neues Tag]" -#: builtin/fetch.c:703 +#: builtin/fetch.c:697 msgid "[new branch]" msgstr "[neuer Branch]" -#: builtin/fetch.c:706 +#: builtin/fetch.c:700 msgid "[new ref]" msgstr "[neue Referenz]" -#: builtin/fetch.c:745 +#: builtin/fetch.c:739 msgid "forced update" msgstr "Aktualisierung erzwungen" -#: builtin/fetch.c:750 +#: builtin/fetch.c:744 msgid "non-fast-forward" msgstr "kein Vorspulen" -#: builtin/fetch.c:795 +#: builtin/fetch.c:790 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s hat nicht alle erforderlichen Objekte gesendet\n" -#: builtin/fetch.c:815 +#: builtin/fetch.c:811 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "" -"%s wurde zurückgewiesen, da Root-Commits von Repositories mit unvollständiger\n" +"%s wurde zurückgewiesen, da Root-Commits von Repositories mit " +"unvollständiger\n" "Historie (shallow) nicht aktualisiert werden dürfen." -#: builtin/fetch.c:903 builtin/fetch.c:999 +#: builtin/fetch.c:900 builtin/fetch.c:1011 #, c-format msgid "From %.*s\n" msgstr "Von %.*s\n" -#: builtin/fetch.c:914 +#: builtin/fetch.c:911 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -9198,59 +10630,59 @@ msgstr "" "Einige lokale Referenzen konnten nicht aktualisiert werden; versuchen Sie\n" "'git remote prune %s', um jeden älteren, widersprüchlichen Branch zu löschen." -#: builtin/fetch.c:969 +#: builtin/fetch.c:981 #, c-format msgid " (%s will become dangling)" msgstr " (%s wird unreferenziert)" -#: builtin/fetch.c:970 +#: builtin/fetch.c:982 #, c-format msgid " (%s has become dangling)" msgstr " (%s wurde unreferenziert)" -#: builtin/fetch.c:1002 +#: builtin/fetch.c:1014 msgid "[deleted]" msgstr "[gelöscht]" -#: builtin/fetch.c:1003 builtin/remote.c:1033 +#: builtin/fetch.c:1015 builtin/remote.c:1035 msgid "(none)" msgstr "(nichts)" -#: builtin/fetch.c:1026 +#: builtin/fetch.c:1038 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "" "Der \"fetch\" in den aktuellen Branch %s von einem Nicht-Bare-Repository " "wurde verweigert." -#: builtin/fetch.c:1045 +#: builtin/fetch.c:1057 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "Option \"%s\" Wert \"%s\" ist nicht gültig für %s" -#: builtin/fetch.c:1048 +#: builtin/fetch.c:1060 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "Option \"%s\" wird ignoriert für %s\n" -#: builtin/fetch.c:1287 +#: builtin/fetch.c:1339 #, c-format msgid "Fetching %s\n" msgstr "Fordere an von %s\n" -#: builtin/fetch.c:1289 builtin/remote.c:98 +#: builtin/fetch.c:1341 builtin/remote.c:99 #, c-format msgid "Could not fetch %s" msgstr "Konnte nicht von %s anfordern" -#: builtin/fetch.c:1335 builtin/fetch.c:1503 +#: builtin/fetch.c:1387 builtin/fetch.c:1555 msgid "" "--filter can only be used with the remote configured in core.partialClone" msgstr "" "--filter kann nur mit den Remote-Repositories verwendet werden,\n" "die in core.partialClone konfiguriert sind." -#: builtin/fetch.c:1358 +#: builtin/fetch.c:1410 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -9259,72 +10691,72 @@ msgstr "" "oder den Namen des Remote-Repositories an, von welchem neue\n" "Commits angefordert werden sollen." -#: builtin/fetch.c:1395 +#: builtin/fetch.c:1447 msgid "You need to specify a tag name." msgstr "Sie müssen den Namen des Tags angeben." -#: builtin/fetch.c:1444 +#: builtin/fetch.c:1496 msgid "Negative depth in --deepen is not supported" msgstr "Negative Tiefe wird von --deepen nicht unterstützt." -#: builtin/fetch.c:1446 +#: builtin/fetch.c:1498 msgid "--deepen and --depth are mutually exclusive" msgstr "--deepen und --depth schließen sich gegenseitig aus" -#: builtin/fetch.c:1451 +#: builtin/fetch.c:1503 msgid "--depth and --unshallow cannot be used together" msgstr "" "Die Optionen --depth und --unshallow können nicht gemeinsam verwendet werden." -#: builtin/fetch.c:1453 +#: builtin/fetch.c:1505 msgid "--unshallow on a complete repository does not make sense" msgstr "" "Die Option --unshallow kann nicht in einem Repository mit unvollständiger " "Historie verwendet werden." -#: builtin/fetch.c:1469 +#: builtin/fetch.c:1521 msgid "fetch --all does not take a repository argument" msgstr "fetch --all akzeptiert kein Repository als Argument" -#: builtin/fetch.c:1471 +#: builtin/fetch.c:1523 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all kann nicht mit Refspecs verwendet werden." -#: builtin/fetch.c:1480 +#: builtin/fetch.c:1532 #, c-format msgid "No such remote or remote group: %s" msgstr "Kein Remote-Repository (einzeln oder Gruppe): %s" -#: builtin/fetch.c:1487 +#: builtin/fetch.c:1539 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "" "Das Abholen einer Gruppe von Remote-Repositories kann nicht mit der Angabe\n" "von Refspecs verwendet werden." -#: builtin/fmt-merge-msg.c:15 +#: builtin/fmt-merge-msg.c:17 msgid "" "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" msgstr "" "git fmt-merge-msg [-m <Beschreibung>] [--log[=<n>] | --no-log] [--file " "<Datei>]" -#: builtin/fmt-merge-msg.c:666 +#: builtin/fmt-merge-msg.c:671 msgid "populate log with at most <n> entries from shortlog" msgstr "Historie mit höchstens <n> Einträgen von \"shortlog\" hinzufügen" -#: builtin/fmt-merge-msg.c:669 +#: builtin/fmt-merge-msg.c:674 msgid "alias for --log (deprecated)" msgstr "Alias für --log (veraltet)" -#: builtin/fmt-merge-msg.c:672 +#: builtin/fmt-merge-msg.c:677 msgid "text" msgstr "Text" -#: builtin/fmt-merge-msg.c:673 +#: builtin/fmt-merge-msg.c:678 msgid "use <text> as start of message" msgstr "<Text> als Beschreibungsanfang verwenden" -#: builtin/fmt-merge-msg.c:674 +#: builtin/fmt-merge-msg.c:679 msgid "file to read from" msgstr "Datei zum Einlesen" @@ -9364,7 +10796,7 @@ msgstr "Platzhalter als Tcl-String formatieren" msgid "show only <n> matched refs" msgstr "nur <n> passende Referenzen anzeigen" -#: builtin/for-each-ref.c:39 builtin/tag.c:421 +#: builtin/for-each-ref.c:39 builtin/tag.c:422 msgid "respect format colors" msgstr "Formatfarben beachten" @@ -9388,81 +10820,81 @@ msgstr "nur Referenzen ausgeben, die diesen Commit enthalten" msgid "print only refs which don't contain the commit" msgstr "nur Referenzen ausgeben, die diesen Commit nicht enthalten" -#: builtin/fsck.c:569 +#: builtin/fsck.c:574 msgid "Checking object directories" msgstr "Prüfe Objekt-Verzeichnisse" -#: builtin/fsck.c:661 +#: builtin/fsck.c:666 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<Optionen>] [<Objekt>...]" -#: builtin/fsck.c:667 +#: builtin/fsck.c:672 msgid "show unreachable objects" msgstr "unerreichbare Objekte anzeigen" -#: builtin/fsck.c:668 +#: builtin/fsck.c:673 msgid "show dangling objects" msgstr "unreferenzierte Objekte anzeigen" -#: builtin/fsck.c:669 +#: builtin/fsck.c:674 msgid "report tags" msgstr "Tags melden" -#: builtin/fsck.c:670 +#: builtin/fsck.c:675 msgid "report root nodes" msgstr "Hauptwurzeln melden" -#: builtin/fsck.c:671 +#: builtin/fsck.c:676 msgid "make index objects head nodes" msgstr "Index-Objekte in Erreichbarkeitsprüfung einbeziehen" -#: builtin/fsck.c:672 +#: builtin/fsck.c:677 msgid "make reflogs head nodes (default)" msgstr "Reflogs in Erreichbarkeitsprüfung einbeziehen (Standard)" -#: builtin/fsck.c:673 +#: builtin/fsck.c:678 msgid "also consider packs and alternate objects" msgstr "ebenso Pakete und alternative Objekte betrachten" -#: builtin/fsck.c:674 +#: builtin/fsck.c:679 msgid "check only connectivity" msgstr "nur Konnektivität prüfen" -#: builtin/fsck.c:675 +#: builtin/fsck.c:680 msgid "enable more strict checking" msgstr "genauere Prüfung aktivieren" -#: builtin/fsck.c:677 +#: builtin/fsck.c:682 msgid "write dangling objects in .git/lost-found" msgstr "unreferenzierte Objekte nach .git/lost-found schreiben" -#: builtin/fsck.c:678 builtin/prune.c:109 +#: builtin/fsck.c:683 builtin/prune.c:110 msgid "show progress" msgstr "Fortschrittsanzeige anzeigen" -#: builtin/fsck.c:679 +#: builtin/fsck.c:684 msgid "show verbose names for reachable objects" msgstr "ausführliche Namen für erreichbare Objekte anzeigen" -#: builtin/fsck.c:745 +#: builtin/fsck.c:750 msgid "Checking objects" msgstr "Prüfe Objekte" -#: builtin/gc.c:33 +#: builtin/gc.c:34 msgid "git gc [<options>]" msgstr "git gc [<Optionen>]" -#: builtin/gc.c:88 +#: builtin/gc.c:90 #, c-format msgid "Failed to fstat %s: %s" msgstr "Konnte '%s' nicht lesen: %s" -#: builtin/gc.c:452 +#: builtin/gc.c:455 #, c-format msgid "Can't stat %s" msgstr "Kann '%s' nicht lesen." -#: builtin/gc.c:461 +#: builtin/gc.c:464 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -9478,58 +10910,58 @@ msgstr "" "\n" "%s" -#: builtin/gc.c:502 +#: builtin/gc.c:505 msgid "prune unreferenced objects" msgstr "unreferenzierte Objekte entfernen" -#: builtin/gc.c:504 +#: builtin/gc.c:507 msgid "be more thorough (increased runtime)" msgstr "mehr Gründlichkeit (erhöht Laufzeit)" -#: builtin/gc.c:505 +#: builtin/gc.c:508 msgid "enable auto-gc mode" msgstr "\"auto-gc\" Modus aktivieren" -#: builtin/gc.c:508 +#: builtin/gc.c:511 msgid "force running gc even if there may be another gc running" msgstr "" "Ausführung von \"git gc\" erzwingen, selbst wenn ein anderes\n" "\"git gc\" bereits ausgeführt wird" -#: builtin/gc.c:511 +#: builtin/gc.c:514 msgid "repack all other packs except the largest pack" msgstr "alle anderen Pakete, außer das größte Paket, neu packen" -#: builtin/gc.c:528 +#: builtin/gc.c:531 #, c-format msgid "failed to parse gc.logexpiry value %s" msgstr "Fehler beim Parsen des Wertes '%s' von gc.logexpiry." -#: builtin/gc.c:539 +#: builtin/gc.c:542 #, c-format msgid "failed to parse prune expiry value %s" msgstr "Fehler beim Parsen des \"prune expiry\" Wertes %s" -#: builtin/gc.c:559 +#: builtin/gc.c:562 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "" "Die Datenbank des Repositories wird für eine optimale Performance im\n" "Hintergrund komprimiert.\n" -#: builtin/gc.c:561 +#: builtin/gc.c:564 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "" "Die Datenbank des Projektarchivs wird für eine optimale Performance " "komprimiert.\n" -#: builtin/gc.c:562 +#: builtin/gc.c:565 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "Siehe \"git help gc\" für manuelles Aufräumen.\n" -#: builtin/gc.c:598 +#: builtin/gc.c:601 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" @@ -9537,7 +10969,7 @@ msgstr "" "\"git gc\" wird bereits auf Maschine '%s' pid %<PRIuMAX> ausgeführt\n" "(benutzen Sie --force falls nicht)" -#: builtin/gc.c:645 +#: builtin/gc.c:652 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" @@ -9562,7 +10994,8 @@ msgstr "ungültige Anzahl von Threads (%d) für %s angegeben" #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c:293 builtin/index-pack.c:1531 builtin/index-pack.c:1723 +#: builtin/grep.c:293 builtin/index-pack.c:1536 builtin/index-pack.c:1728 +#: builtin/pack-objects.c:2636 #, c-format msgid "no threads support, ignoring %s" msgstr "keine Unterstützung von Threads, '%s' wird ignoriert" @@ -9577,240 +11010,244 @@ msgstr "konnte \"Tree\"-Objekt (%s) nicht lesen" msgid "unable to grep from object of type %s" msgstr "kann \"grep\" nicht mit Objekten des Typs %s durchführen" -#: builtin/grep.c:703 +#: builtin/grep.c:704 #, c-format msgid "switch `%c' expects a numerical value" msgstr "Schalter '%c' erwartet einen numerischen Wert" -#: builtin/grep.c:790 +#: builtin/grep.c:791 msgid "search in index instead of in the work tree" msgstr "im Index anstatt im Arbeitsverzeichnis suchen" -#: builtin/grep.c:792 +#: builtin/grep.c:793 msgid "find in contents not managed by git" msgstr "auch in Inhalten finden, die nicht von Git verwaltet werden" -#: builtin/grep.c:794 +#: builtin/grep.c:795 msgid "search in both tracked and untracked files" msgstr "in versionierten und unversionierten Dateien suchen" -#: builtin/grep.c:796 +#: builtin/grep.c:797 msgid "ignore files specified via '.gitignore'" msgstr "Dateien, die über '.gitignore' angegeben sind, ignorieren" -#: builtin/grep.c:798 +#: builtin/grep.c:799 msgid "recursively search in each submodule" msgstr "rekursive Suche in jedem Submodul" -#: builtin/grep.c:801 +#: builtin/grep.c:802 msgid "show non-matching lines" msgstr "Zeilen ohne Übereinstimmungen anzeigen" -#: builtin/grep.c:803 +#: builtin/grep.c:804 msgid "case insensitive matching" msgstr "Übereinstimmungen unabhängig von Groß- und Kleinschreibung finden" -#: builtin/grep.c:805 +#: builtin/grep.c:806 msgid "match patterns only at word boundaries" msgstr "nur ganze Wörter suchen" -#: builtin/grep.c:807 +#: builtin/grep.c:808 msgid "process binary files as text" msgstr "binäre Dateien als Text verarbeiten" -#: builtin/grep.c:809 +#: builtin/grep.c:810 msgid "don't match patterns in binary files" msgstr "keine Muster in Binärdateien finden" -#: builtin/grep.c:812 +#: builtin/grep.c:813 msgid "process binary files with textconv filters" msgstr "binäre Dateien mit \"textconv\"-Filtern verarbeiten" -#: builtin/grep.c:814 +#: builtin/grep.c:815 msgid "descend at most <depth> levels" msgstr "höchstens <Tiefe> Ebenen durchlaufen" -#: builtin/grep.c:818 +#: builtin/grep.c:819 msgid "use extended POSIX regular expressions" msgstr "erweiterte reguläre Ausdrücke aus POSIX verwenden" -#: builtin/grep.c:821 +#: builtin/grep.c:822 msgid "use basic POSIX regular expressions (default)" msgstr "grundlegende reguläre Ausdrücke aus POSIX verwenden (Standard)" -#: builtin/grep.c:824 +#: builtin/grep.c:825 msgid "interpret patterns as fixed strings" msgstr "Muster als feste Zeichenketten interpretieren" -#: builtin/grep.c:827 +#: builtin/grep.c:828 msgid "use Perl-compatible regular expressions" msgstr "Perl-kompatible reguläre Ausdrücke verwenden" -#: builtin/grep.c:830 +#: builtin/grep.c:831 msgid "show line numbers" msgstr "Zeilennummern anzeigen" -#: builtin/grep.c:831 +#: builtin/grep.c:832 +msgid "show column number of first match" +msgstr "Nummer der Spalte des ersten Treffers anzeigen" + +#: builtin/grep.c:833 msgid "don't show filenames" msgstr "keine Dateinamen anzeigen" -#: builtin/grep.c:832 +#: builtin/grep.c:834 msgid "show filenames" msgstr "Dateinamen anzeigen" -#: builtin/grep.c:834 +#: builtin/grep.c:836 msgid "show filenames relative to top directory" msgstr "Dateinamen relativ zum Projektverzeichnis anzeigen" -#: builtin/grep.c:836 +#: builtin/grep.c:838 msgid "show only filenames instead of matching lines" msgstr "nur Dateinamen anzeigen anstatt übereinstimmende Zeilen" -#: builtin/grep.c:838 +#: builtin/grep.c:840 msgid "synonym for --files-with-matches" msgstr "Synonym für --files-with-matches" -#: builtin/grep.c:841 +#: builtin/grep.c:843 msgid "show only the names of files without match" msgstr "nur die Dateinamen ohne Übereinstimmungen anzeigen" -#: builtin/grep.c:843 +#: builtin/grep.c:845 msgid "print NUL after filenames" msgstr "NUL-Zeichen nach Dateinamen ausgeben" -#: builtin/grep.c:846 +#: builtin/grep.c:848 +msgid "show only matching parts of a line" +msgstr "nur übereinstimmende Teile der Zeile anzeigen" + +#: builtin/grep.c:850 msgid "show the number of matches instead of matching lines" msgstr "anstatt der Zeilen, die Anzahl der übereinstimmenden Zeilen anzeigen" -#: builtin/grep.c:847 +#: builtin/grep.c:851 msgid "highlight matches" msgstr "Übereinstimmungen hervorheben" -#: builtin/grep.c:849 +#: builtin/grep.c:853 msgid "print empty line between matches from different files" msgstr "" "eine Leerzeile zwischen Übereinstimmungen in verschiedenen Dateien ausgeben" -#: builtin/grep.c:851 +#: builtin/grep.c:855 msgid "show filename only once above matches from same file" msgstr "" "den Dateinamen nur einmal oberhalb der Übereinstimmungen aus dieser Datei " "anzeigen" -#: builtin/grep.c:854 +#: builtin/grep.c:858 msgid "show <n> context lines before and after matches" msgstr "<n> Zeilen vor und nach den Übereinstimmungen anzeigen" -#: builtin/grep.c:857 +#: builtin/grep.c:861 msgid "show <n> context lines before matches" msgstr "<n> Zeilen vor den Übereinstimmungen anzeigen" -#: builtin/grep.c:859 +#: builtin/grep.c:863 msgid "show <n> context lines after matches" msgstr "<n> Zeilen nach den Übereinstimmungen anzeigen" -#: builtin/grep.c:861 +#: builtin/grep.c:865 msgid "use <n> worker threads" msgstr "<n> Threads benutzen" -#: builtin/grep.c:862 +#: builtin/grep.c:866 msgid "shortcut for -C NUM" msgstr "Kurzform für -C NUM" -#: builtin/grep.c:865 +#: builtin/grep.c:869 msgid "show a line with the function name before matches" msgstr "eine Zeile mit dem Funktionsnamen vor Übereinstimmungen anzeigen" -#: builtin/grep.c:867 +#: builtin/grep.c:871 msgid "show the surrounding function" msgstr "die umgebende Funktion anzeigen" -#: builtin/grep.c:870 +#: builtin/grep.c:874 msgid "read patterns from file" msgstr "Muster von einer Datei lesen" -#: builtin/grep.c:872 +#: builtin/grep.c:876 msgid "match <pattern>" msgstr "<Muster> finden" -#: builtin/grep.c:874 +#: builtin/grep.c:878 msgid "combine patterns specified with -e" msgstr "Muster kombinieren, die mit -e angegeben wurden" -#: builtin/grep.c:886 +#: builtin/grep.c:890 msgid "indicate hit with exit status without output" msgstr "Übereinstimmungen nur durch Beendigungsstatus anzeigen" -#: builtin/grep.c:888 +#: builtin/grep.c:892 msgid "show only matches from files that match all patterns" msgstr "" "nur Übereinstimmungen von Dateien anzeigen, die allen Mustern entsprechen" -#: builtin/grep.c:890 +#: builtin/grep.c:894 msgid "show parse tree for grep expression" msgstr "geparstes Verzeichnis für \"grep\"-Ausdruck anzeigen" -#: builtin/grep.c:894 +#: builtin/grep.c:898 msgid "pager" msgstr "Anzeigeprogramm" -#: builtin/grep.c:894 +#: builtin/grep.c:898 msgid "show matching files in the pager" msgstr "Dateien mit Übereinstimmungen im Anzeigeprogramm anzeigen" -#: builtin/grep.c:898 +#: builtin/grep.c:902 msgid "allow calling of grep(1) (ignored by this build)" msgstr "den Aufruf von grep(1) erlauben (von dieser Programmversion ignoriert)" -#: builtin/grep.c:962 -msgid "no pattern given." -msgstr "keine Muster angegeben" +#: builtin/grep.c:966 +msgid "no pattern given" +msgstr "Kein Muster angegeben." -#: builtin/grep.c:994 +#: builtin/grep.c:1002 msgid "--no-index or --untracked cannot be used with revs" msgstr "--no-index oder --untracked können nicht mit Commits verwendet werden" -#: builtin/grep.c:1001 +#: builtin/grep.c:1009 #, c-format msgid "unable to resolve revision: %s" msgstr "Konnte Commit nicht auflösen: %s" -#: builtin/grep.c:1036 builtin/index-pack.c:1527 +#: builtin/grep.c:1044 builtin/index-pack.c:1532 builtin/pack-objects.c:2632 #, c-format msgid "invalid number of threads specified (%d)" msgstr "ungültige Anzahl von Threads angegeben (%d)" -#: builtin/grep.c:1041 +#: builtin/grep.c:1049 builtin/pack-objects.c:3286 msgid "no threads support, ignoring --threads" msgstr "keine Unterstützung von Threads, --threads wird ignoriert" -#: builtin/grep.c:1065 +#: builtin/grep.c:1073 msgid "--open-files-in-pager only works on the worktree" msgstr "" "Die Option --open-files-in-pager kann nur innerhalb des " "Arbeitsverzeichnisses verwendet werden." -#: builtin/grep.c:1088 -msgid "option not supported with --recurse-submodules." -msgstr "Option wird mit --recurse-submodules nicht unterstützt." - -#: builtin/grep.c:1094 -msgid "--cached or --untracked cannot be used with --no-index." -msgstr "" -"Die Optionen --cached und --untracked können nicht mit --no-index verwendet " -"werden." +#: builtin/grep.c:1096 +msgid "option not supported with --recurse-submodules" +msgstr "Die Option wird mit --recurse-submodules nicht unterstützt." -#: builtin/grep.c:1100 -msgid "--[no-]exclude-standard cannot be used for tracked contents." -msgstr "" -"Die Option --[no-]exclude-standard kann nicht mit versionierten Inhalten " -"verwendet werden." +#: builtin/grep.c:1102 +msgid "--cached or --untracked cannot be used with --no-index" +msgstr "--cached und --untracked können nicht mit --no-index verwendet werden." #: builtin/grep.c:1108 -msgid "both --cached and trees are given." -msgstr "Die Option --cached kann nicht mit \"Tree\"-Objekten verwendet werden." +msgid "--[no-]exclude-standard cannot be used for tracked contents" +msgstr "--[no-]exclude-standard kann nicht mit versionierten Inhalten verwendet werden." -#: builtin/hash-object.c:83 +#: builtin/grep.c:1116 +msgid "both --cached and trees are given" +msgstr "--cached und \"Tree\"-Objekte angegeben" + +#: builtin/hash-object.c:84 msgid "" "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " "[--] <file>..." @@ -9818,93 +11255,101 @@ msgstr "" "git hash-object [-t <Art>] [-w] [--path=<Datei> | --no-filters] [--stdin] " "[--] <Datei>..." -#: builtin/hash-object.c:84 +#: builtin/hash-object.c:85 msgid "git hash-object --stdin-paths" msgstr "git hash-object --stdin-paths" -#: builtin/hash-object.c:96 +#: builtin/hash-object.c:97 msgid "type" msgstr "Art" -#: builtin/hash-object.c:96 +#: builtin/hash-object.c:97 msgid "object type" msgstr "Art des Objektes" -#: builtin/hash-object.c:97 +#: builtin/hash-object.c:98 msgid "write the object into the object database" msgstr "das Objekt in die Objektdatenbank schreiben" -#: builtin/hash-object.c:99 +#: builtin/hash-object.c:100 msgid "read the object from stdin" msgstr "das Objekt von der Standard-Eingabe lesen" -#: builtin/hash-object.c:101 +#: builtin/hash-object.c:102 msgid "store file as is without filters" msgstr "Datei wie sie ist speichern, ohne Filter" -#: builtin/hash-object.c:102 +#: builtin/hash-object.c:103 msgid "" "just hash any random garbage to create corrupt objects for debugging Git" msgstr "" "Hash über zufällige Daten, zur Erzeugung von beschädigten Objekten zur\n" "Fehlersuche in Git, erzeugen" -#: builtin/hash-object.c:103 +#: builtin/hash-object.c:104 msgid "process file as it were from this path" msgstr "Datei verarbeiten, als ob sie von diesem Pfad wäre" -#: builtin/help.c:43 +#: builtin/help.c:46 msgid "print all available commands" msgstr "alle vorhandenen Befehle anzeigen" -#: builtin/help.c:44 +#: builtin/help.c:47 msgid "exclude guides" msgstr "Anleitungen ausschließen" -#: builtin/help.c:45 +#: builtin/help.c:48 msgid "print list of useful guides" msgstr "Liste von allgemein verwendeten Anleitungen anzeigen" -#: builtin/help.c:46 +#: builtin/help.c:49 +msgid "print all configuration variable names" +msgstr "alle Namen der Konfigurationsvariablen ausgeben" + +#: builtin/help.c:51 msgid "show man page" msgstr "Handbuch anzeigen" -#: builtin/help.c:47 +#: builtin/help.c:52 msgid "show manual in web browser" msgstr "Handbuch in einem Webbrowser anzeigen" -#: builtin/help.c:49 +#: builtin/help.c:54 msgid "show info page" msgstr "Info-Seite anzeigen" -#: builtin/help.c:55 +#: builtin/help.c:56 +msgid "print command description" +msgstr "Beschreibung des Befehls ausgeben" + +#: builtin/help.c:61 msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" msgstr "git help [--all] [--guides] [--man | --web | --info] [<Befehl>]" -#: builtin/help.c:67 +#: builtin/help.c:73 #, c-format msgid "unrecognized help format '%s'" msgstr "nicht erkanntes Hilfeformat: %s" -#: builtin/help.c:94 +#: builtin/help.c:100 msgid "Failed to start emacsclient." msgstr "Konnte emacsclient nicht starten." -#: builtin/help.c:107 +#: builtin/help.c:113 msgid "Failed to parse emacsclient version." msgstr "Konnte Version des emacsclient nicht parsen." -#: builtin/help.c:115 +#: builtin/help.c:121 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "Version des emacsclient '%d' ist zu alt (< 22)." -#: builtin/help.c:133 builtin/help.c:155 builtin/help.c:165 builtin/help.c:173 +#: builtin/help.c:139 builtin/help.c:161 builtin/help.c:171 builtin/help.c:179 #, c-format msgid "failed to exec '%s'" msgstr "Fehler beim Ausführen von '%s'" -#: builtin/help.c:211 +#: builtin/help.c:217 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" @@ -9913,7 +11358,7 @@ msgstr "" "'%s': Pfad für nicht unterstützten Handbuchbetrachter.\n" "Sie könnten stattdessen 'man.<Werkzeug>.cmd' benutzen." -#: builtin/help.c:223 +#: builtin/help.c:229 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" @@ -9922,69 +11367,32 @@ msgstr "" "'%s': Programm für unterstützten Handbuchbetrachter.\n" "Sie könnten stattdessen 'man.<Werkzeug>.path' benutzen." -#: builtin/help.c:340 +#: builtin/help.c:346 #, c-format msgid "'%s': unknown man viewer." msgstr "'%s': unbekannter Handbuch-Betrachter." -#: builtin/help.c:357 +#: builtin/help.c:363 msgid "no man viewer handled the request" msgstr "kein Handbuch-Betrachter konnte mit dieser Anfrage umgehen" -#: builtin/help.c:365 +#: builtin/help.c:371 msgid "no info viewer handled the request" msgstr "kein Informations-Betrachter konnte mit dieser Anfrage umgehen" -#: builtin/help.c:407 -msgid "Defining attributes per path" -msgstr "Definition von Attributen pro Pfad" - -#: builtin/help.c:408 -msgid "Everyday Git With 20 Commands Or So" -msgstr "Tägliche Benutzung von Git mit ungefähr 20 Befehlen" - -#: builtin/help.c:409 -msgid "A Git glossary" -msgstr "Ein Git-Glossar" - -#: builtin/help.c:410 -msgid "Specifies intentionally untracked files to ignore" -msgstr "Spezifikation von bewusst ignorierten, unversionierten Dateien" - -#: builtin/help.c:411 -msgid "Defining submodule properties" -msgstr "Definition von Submodul-Eigenschaften" - -#: builtin/help.c:412 -msgid "Specifying revisions and ranges for Git" -msgstr "Spezifikation von Commits und Bereichen für Git" - -#: builtin/help.c:413 -msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" -msgstr "Eine einführende Anleitung zu Git (für Version 1.5.1 oder neuer)" - -#: builtin/help.c:414 -msgid "An overview of recommended workflows with Git" -msgstr "Eine Übersicht über empfohlene Arbeitsabläufe mit Git" - -#: builtin/help.c:426 -msgid "The common Git guides are:\n" -msgstr "Die allgemein verwendeten Git-Anleitungen sind:\n" - -#: builtin/help.c:444 +#: builtin/help.c:418 #, c-format msgid "'%s' is aliased to '%s'" msgstr "Für '%s' wurde der Alias '%s' angelegt." -#: builtin/help.c:466 builtin/help.c:483 +#: builtin/help.c:445 builtin/help.c:475 #, c-format msgid "usage: %s%s" msgstr "Verwendung: %s%s" -#: builtin/index-pack.c:158 -#, c-format -msgid "unable to open %s" -msgstr "kann %s nicht öffnen" +#: builtin/help.c:459 +msgid "'git help config' for more information" +msgstr "'git help config' für weitere Informationen" #: builtin/index-pack.c:208 #, c-format @@ -10020,11 +11428,11 @@ msgstr "Fehler beim Lesen der Eingabe" msgid "used more bytes than were available" msgstr "verwendete mehr Bytes als verfügbar waren" -#: builtin/index-pack.c:303 +#: builtin/index-pack.c:303 builtin/pack-objects.c:590 msgid "pack too large for current definition of off_t" msgstr "Paket ist zu groß für die aktuelle Definition von off_t" -#: builtin/index-pack.c:306 builtin/unpack-objects.c:93 +#: builtin/index-pack.c:306 builtin/unpack-objects.c:94 msgid "pack exceeds maximum allowed size" msgstr "Paket überschreitet die maximal erlaubte Größe" @@ -10092,8 +11500,8 @@ msgstr "ernsthafte Inkonsistenz nach Dekomprimierung" msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "SHA1 KOLLISION MIT %s GEFUNDEN !" -#: builtin/index-pack.c:754 builtin/pack-objects.c:198 -#: builtin/pack-objects.c:292 +#: builtin/index-pack.c:754 builtin/pack-objects.c:143 +#: builtin/pack-objects.c:203 builtin/pack-objects.c:297 #, c-format msgid "unable to read %s" msgstr "kann %s nicht lesen" @@ -10113,169 +11521,169 @@ msgstr "Kann existierendes Objekt %s nicht lesen." msgid "invalid blob object %s" msgstr "ungültiges Blob-Objekt %s" -#: builtin/index-pack.c:842 builtin/index-pack.c:860 +#: builtin/index-pack.c:842 builtin/index-pack.c:861 msgid "fsck error in packed object" msgstr "fsck Fehler in gepacktem Objekt" -#: builtin/index-pack.c:857 +#: builtin/index-pack.c:858 #, c-format msgid "invalid %s" msgstr "Ungültiger Objekt-Typ %s" -#: builtin/index-pack.c:862 +#: builtin/index-pack.c:863 #, c-format msgid "Not all child objects of %s are reachable" msgstr "Nicht alle Kind-Objekte von %s sind erreichbar" -#: builtin/index-pack.c:934 builtin/index-pack.c:965 +#: builtin/index-pack.c:935 builtin/index-pack.c:966 msgid "failed to apply delta" msgstr "Konnte Dateiunterschied nicht anwenden" -#: builtin/index-pack.c:1135 +#: builtin/index-pack.c:1136 msgid "Receiving objects" msgstr "Empfange Objekte" -#: builtin/index-pack.c:1135 +#: builtin/index-pack.c:1136 msgid "Indexing objects" msgstr "Indiziere Objekte" -#: builtin/index-pack.c:1169 +#: builtin/index-pack.c:1170 msgid "pack is corrupted (SHA1 mismatch)" msgstr "Paket ist beschädigt (SHA1 unterschiedlich)" -#: builtin/index-pack.c:1174 +#: builtin/index-pack.c:1175 msgid "cannot fstat packfile" msgstr "kann Paketdatei nicht lesen" -#: builtin/index-pack.c:1177 +#: builtin/index-pack.c:1178 msgid "pack has junk at the end" msgstr "Paketende enthält nicht verwendbaren Inhalt" -#: builtin/index-pack.c:1189 +#: builtin/index-pack.c:1190 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "Fehler beim Ausführen von \"parse_pack_objects()\"" -#: builtin/index-pack.c:1212 +#: builtin/index-pack.c:1213 msgid "Resolving deltas" msgstr "Löse Unterschiede auf" -#: builtin/index-pack.c:1223 +#: builtin/index-pack.c:1224 builtin/pack-objects.c:2407 #, c-format msgid "unable to create thread: %s" msgstr "kann Thread nicht erzeugen: %s" -#: builtin/index-pack.c:1265 +#: builtin/index-pack.c:1266 msgid "confusion beyond insanity" msgstr "Fehler beim Auflösen der Unterschiede" -#: builtin/index-pack.c:1271 +#: builtin/index-pack.c:1272 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" msgstr[0] "abgeschlossen mit %d lokalem Objekt" msgstr[1] "abgeschlossen mit %d lokalen Objekten" -#: builtin/index-pack.c:1283 +#: builtin/index-pack.c:1284 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "Unerwartete Prüfsumme für %s (Festplattenfehler?)" -#: builtin/index-pack.c:1287 +#: builtin/index-pack.c:1288 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "Paket hat %d unaufgelöste Unterschied" msgstr[1] "Paket hat %d unaufgelöste Unterschiede" -#: builtin/index-pack.c:1311 +#: builtin/index-pack.c:1312 #, c-format msgid "unable to deflate appended object (%d)" msgstr "Konnte angehängtes Objekt (%d) nicht komprimieren" -#: builtin/index-pack.c:1388 +#: builtin/index-pack.c:1389 #, c-format msgid "local object %s is corrupt" msgstr "lokales Objekt %s ist beschädigt" -#: builtin/index-pack.c:1402 +#: builtin/index-pack.c:1403 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "Name der Paketdatei '%s' endet nicht mit '.pack'" -#: builtin/index-pack.c:1427 +#: builtin/index-pack.c:1428 #, c-format msgid "cannot write %s file '%s'" msgstr "Kann %s Datei '%s' nicht schreiben." -#: builtin/index-pack.c:1435 +#: builtin/index-pack.c:1436 #, c-format msgid "cannot close written %s file '%s'" msgstr "Kann eben geschriebene %s Datei '%s' nicht schließen." -#: builtin/index-pack.c:1459 +#: builtin/index-pack.c:1460 msgid "error while closing pack file" msgstr "Fehler beim Schließen der Paketdatei" -#: builtin/index-pack.c:1473 +#: builtin/index-pack.c:1474 msgid "cannot store pack file" msgstr "Kann Paketdatei nicht speichern" -#: builtin/index-pack.c:1481 +#: builtin/index-pack.c:1482 msgid "cannot store index file" msgstr "Kann Indexdatei nicht speichern" -#: builtin/index-pack.c:1521 +#: builtin/index-pack.c:1526 builtin/pack-objects.c:2645 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "\"pack.indexversion=%<PRIu32>\" ist ungültig" -#: builtin/index-pack.c:1590 +#: builtin/index-pack.c:1595 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Kann existierende Paketdatei '%s' nicht öffnen" -#: builtin/index-pack.c:1592 +#: builtin/index-pack.c:1597 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "Kann existierende Indexdatei für Paket '%s' nicht öffnen" -#: builtin/index-pack.c:1640 +#: builtin/index-pack.c:1645 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "kein Unterschied: %d Objekt" msgstr[1] "kein Unterschied: %d Objekte" -#: builtin/index-pack.c:1647 +#: builtin/index-pack.c:1652 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "Länge der Objekt-Liste = %d: %lu Objekt" msgstr[1] "Länge der Objekt-Liste = %d: %lu Objekte" -#: builtin/index-pack.c:1684 +#: builtin/index-pack.c:1689 msgid "Cannot come back to cwd" msgstr "Kann nicht zurück zum Arbeitsverzeichnis wechseln" -#: builtin/index-pack.c:1735 builtin/index-pack.c:1738 -#: builtin/index-pack.c:1754 builtin/index-pack.c:1758 +#: builtin/index-pack.c:1740 builtin/index-pack.c:1743 +#: builtin/index-pack.c:1759 builtin/index-pack.c:1763 #, c-format msgid "bad %s" msgstr "%s ist ungültig" -#: builtin/index-pack.c:1774 +#: builtin/index-pack.c:1779 msgid "--fix-thin cannot be used without --stdin" msgstr "Die Option --fix-thin kann nicht ohne --stdin verwendet werden." -#: builtin/index-pack.c:1776 +#: builtin/index-pack.c:1781 msgid "--stdin requires a git repository" msgstr "--stdin erfordert ein Git-Repository" -#: builtin/index-pack.c:1782 +#: builtin/index-pack.c:1787 msgid "--verify with no packfile name given" msgstr "Die Option --verify wurde ohne Namen der Paketdatei angegeben." -#: builtin/index-pack.c:1832 builtin/unpack-objects.c:578 +#: builtin/index-pack.c:1837 builtin/unpack-objects.c:580 msgid "fsck error in pack objects" msgstr "fsck Fehler beim Packen von Objekten" @@ -10294,72 +11702,72 @@ msgstr "kann Vorlage '%s' nicht lesen" msgid "cannot opendir '%s'" msgstr "kann Verzeichnis '%s' nicht öffnen" -#: builtin/init-db.c:77 +#: builtin/init-db.c:78 #, c-format msgid "cannot readlink '%s'" msgstr "kann Verweis '%s' nicht lesen" -#: builtin/init-db.c:79 +#: builtin/init-db.c:80 #, c-format msgid "cannot symlink '%s' '%s'" msgstr "kann symbolische Verknüpfung '%s' auf '%s' nicht erstellen" -#: builtin/init-db.c:85 +#: builtin/init-db.c:86 #, c-format msgid "cannot copy '%s' to '%s'" msgstr "kann '%s' nicht nach '%s' kopieren" -#: builtin/init-db.c:89 +#: builtin/init-db.c:90 #, c-format msgid "ignoring template %s" msgstr "ignoriere Vorlage %s" -#: builtin/init-db.c:120 +#: builtin/init-db.c:121 #, c-format -msgid "templates not found %s" -msgstr "keine Vorlagen in '%s' gefunden" +msgid "templates not found in %s" +msgstr "Keine Vorlagen in %s gefunden." -#: builtin/init-db.c:135 +#: builtin/init-db.c:136 #, c-format msgid "not copying templates from '%s': %s" msgstr "kopiere keine Vorlagen von '%s': %s" -#: builtin/init-db.c:328 +#: builtin/init-db.c:329 #, c-format msgid "unable to handle file type %d" msgstr "kann nicht mit Dateityp %d umgehen" -#: builtin/init-db.c:331 +#: builtin/init-db.c:332 #, c-format msgid "unable to move %s to %s" msgstr "Konnte %s nicht nach %s verschieben" -#: builtin/init-db.c:348 builtin/init-db.c:351 +#: builtin/init-db.c:349 builtin/init-db.c:352 #, c-format msgid "%s already exists" msgstr "%s existiert bereits" -#: builtin/init-db.c:404 +#: builtin/init-db.c:405 #, c-format msgid "Reinitialized existing shared Git repository in %s%s\n" msgstr "Bestehendes verteiltes Git-Repository in %s%s neuinitialisiert\n" -#: builtin/init-db.c:405 +#: builtin/init-db.c:406 #, c-format msgid "Reinitialized existing Git repository in %s%s\n" msgstr "Bestehendes Git-Repository in %s%s neuinitialisiert\n" -#: builtin/init-db.c:409 +#: builtin/init-db.c:410 #, c-format msgid "Initialized empty shared Git repository in %s%s\n" msgstr "Leeres verteiltes Git-Repository in %s%s initialisiert\n" -#: builtin/init-db.c:410 +#: builtin/init-db.c:411 #, c-format msgid "Initialized empty Git repository in %s%s\n" msgstr "Leeres Git-Repository in %s%s initialisiert\n" -#: builtin/init-db.c:458 +#: builtin/init-db.c:459 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" @@ -10367,20 +11775,25 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=<Vorlagenverzeichnis>] [--" "shared[=<Berechtigungen>]] [<Verzeichnis>]" -#: builtin/init-db.c:481 +#: builtin/init-db.c:482 msgid "permissions" msgstr "Berechtigungen" -#: builtin/init-db.c:482 +#: builtin/init-db.c:483 msgid "specify that the git repository is to be shared amongst several users" msgstr "angeben, dass das Git-Repository mit mehreren Benutzern geteilt wird" -#: builtin/init-db.c:525 +#: builtin/init-db.c:517 builtin/init-db.c:522 +#, c-format +msgid "cannot mkdir %s" +msgstr "kann Verzeichnis %s nicht erstellen" + +#: builtin/init-db.c:526 #, c-format msgid "cannot chdir to %s" msgstr "kann nicht in Verzeichnis %s wechseln" -#: builtin/init-db.c:546 +#: builtin/init-db.c:547 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" @@ -10389,7 +11802,7 @@ msgstr "" "%s (oder --work-tree=<Verzeichnis>) nicht erlaubt ohne Spezifizierung von %s " "(oder --git-dir=<Verzeichnis>)" -#: builtin/init-db.c:574 +#: builtin/init-db.c:575 #, c-format msgid "Cannot access work tree '%s'" msgstr "Kann nicht auf Arbeitsverzeichnis '%s' zugreifen." @@ -10456,120 +11869,120 @@ msgstr "" msgid "no input file given for in-place editing" msgstr "keine Datei zur direkten Bearbeitung angegeben" -#: builtin/log.c:48 +#: builtin/log.c:51 msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "git log [<Optionen>] [<Commitbereich>] [[--] <Pfad>...]" -#: builtin/log.c:49 +#: builtin/log.c:52 msgid "git show [<options>] <object>..." msgstr "git show [<Optionen>] <Objekt>..." -#: builtin/log.c:93 +#: builtin/log.c:96 #, c-format msgid "invalid --decorate option: %s" msgstr "Ungültige Option für --decorate: %s" -#: builtin/log.c:153 +#: builtin/log.c:157 msgid "suppress diff output" msgstr "Ausgabe der Unterschiede unterdrücken" -#: builtin/log.c:154 +#: builtin/log.c:158 msgid "show source" msgstr "Quelle anzeigen" -#: builtin/log.c:155 +#: builtin/log.c:159 msgid "Use mail map file" msgstr "\"mailmap\"-Datei verwenden" -#: builtin/log.c:157 +#: builtin/log.c:161 msgid "only decorate refs that match <pattern>" msgstr "\"decorate\" nur bei Referenzen anwenden, die <Muster> entsprechen" -#: builtin/log.c:159 +#: builtin/log.c:163 msgid "do not decorate refs that match <pattern>" msgstr "\"decorate\" nicht bei Referenzen anwenden, die <Muster> entsprechen" -#: builtin/log.c:160 +#: builtin/log.c:164 msgid "decorate options" msgstr "decorate-Optionen" -#: builtin/log.c:163 +#: builtin/log.c:167 msgid "Process line range n,m in file, counting from 1" msgstr "Verarbeitet nur Zeilen im Bereich n,m in der Datei, gezählt von 1" -#: builtin/log.c:259 +#: builtin/log.c:265 #, c-format msgid "Final output: %d %s\n" msgstr "letzte Ausgabe: %d %s\n" -#: builtin/log.c:510 +#: builtin/log.c:516 #, c-format msgid "git show %s: bad file" msgstr "git show %s: ungültige Datei" -#: builtin/log.c:525 builtin/log.c:619 +#: builtin/log.c:531 builtin/log.c:625 #, c-format msgid "Could not read object %s" msgstr "Kann Objekt %s nicht lesen." -#: builtin/log.c:643 +#: builtin/log.c:649 #, c-format msgid "Unknown type: %d" msgstr "Unbekannter Typ: %d" -#: builtin/log.c:764 +#: builtin/log.c:770 msgid "format.headers without value" msgstr "format.headers ohne Wert" -#: builtin/log.c:865 +#: builtin/log.c:871 msgid "name of output directory is too long" msgstr "Name des Ausgabeverzeichnisses ist zu lang." -#: builtin/log.c:881 +#: builtin/log.c:887 #, c-format msgid "Cannot open patch file %s" msgstr "Kann Patch-Datei %s nicht öffnen" -#: builtin/log.c:898 +#: builtin/log.c:904 msgid "Need exactly one range." msgstr "Brauche genau einen Commit-Bereich." -#: builtin/log.c:908 +#: builtin/log.c:914 msgid "Not a range." msgstr "Kein Commit-Bereich." -#: builtin/log.c:1014 +#: builtin/log.c:1020 msgid "Cover letter needs email format" msgstr "Anschreiben benötigt E-Mail-Format" -#: builtin/log.c:1095 +#: builtin/log.c:1101 #, c-format msgid "insane in-reply-to: %s" msgstr "ungültiges in-reply-to: %s" -#: builtin/log.c:1122 +#: builtin/log.c:1128 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<Optionen>] [<seit> | <Commitbereich>]" -#: builtin/log.c:1172 +#: builtin/log.c:1178 msgid "Two output directories?" msgstr "Zwei Ausgabeverzeichnisse?" -#: builtin/log.c:1279 builtin/log.c:1932 builtin/log.c:1934 builtin/log.c:1946 +#: builtin/log.c:1285 builtin/log.c:1945 builtin/log.c:1947 builtin/log.c:1959 #, c-format msgid "Unknown commit %s" msgstr "Unbekannter Commit %s" -#: builtin/log.c:1289 builtin/notes.c:887 builtin/tag.c:523 +#: builtin/log.c:1295 builtin/notes.c:889 builtin/tag.c:524 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "Konnte '%s' nicht als gültige Referenz auflösen." -#: builtin/log.c:1294 +#: builtin/log.c:1300 msgid "Could not find exact merge base." msgstr "Konnte keine exakte Merge-Basis finden." -#: builtin/log.c:1298 +#: builtin/log.c:1304 msgid "" "Failed to get upstream, if you want to record base commit automatically,\n" "please use git branch --set-upstream-to to track a remote branch.\n" @@ -10580,229 +11993,229 @@ msgstr "" "'git branch --set-upstream-to', um einem Remote-Branch zu folgen.\n" "Oder geben Sie den Basis-Commit mit '--base=<Basis-Commit-Id>' manuell an." -#: builtin/log.c:1318 +#: builtin/log.c:1324 msgid "Failed to find exact merge base" msgstr "Fehler beim Finden einer exakten Merge-Basis." -#: builtin/log.c:1329 +#: builtin/log.c:1335 msgid "base commit should be the ancestor of revision list" msgstr "Basis-Commit sollte der Vorgänger der Revisionsliste sein." -#: builtin/log.c:1333 +#: builtin/log.c:1339 msgid "base commit shouldn't be in revision list" msgstr "Basis-Commit sollte nicht in der Revisionsliste enthalten sein." -#: builtin/log.c:1382 +#: builtin/log.c:1392 msgid "cannot get patch id" msgstr "kann Patch-Id nicht lesen" -#: builtin/log.c:1441 +#: builtin/log.c:1452 msgid "use [PATCH n/m] even with a single patch" msgstr "[PATCH n/m] auch mit einzelnem Patch verwenden" -#: builtin/log.c:1444 +#: builtin/log.c:1455 msgid "use [PATCH] even with multiple patches" msgstr "[PATCH] auch mit mehreren Patches verwenden" -#: builtin/log.c:1448 +#: builtin/log.c:1459 msgid "print patches to standard out" msgstr "Ausgabe der Patches in Standard-Ausgabe" -#: builtin/log.c:1450 +#: builtin/log.c:1461 msgid "generate a cover letter" msgstr "ein Deckblatt erzeugen" -#: builtin/log.c:1452 +#: builtin/log.c:1463 msgid "use simple number sequence for output file names" msgstr "einfache Nummernfolge für die Namen der Ausgabedateien verwenden" -#: builtin/log.c:1453 +#: builtin/log.c:1464 msgid "sfx" msgstr "Dateiendung" -#: builtin/log.c:1454 +#: builtin/log.c:1465 msgid "use <sfx> instead of '.patch'" msgstr "<Dateiendung> anstatt '.patch' verwenden" -#: builtin/log.c:1456 +#: builtin/log.c:1467 msgid "start numbering patches at <n> instead of 1" msgstr "die Nummerierung der Patches bei <n> anstatt bei 1 beginnen" -#: builtin/log.c:1458 +#: builtin/log.c:1469 msgid "mark the series as Nth re-roll" msgstr "die Serie als n-te Fassung kennzeichnen" -#: builtin/log.c:1460 +#: builtin/log.c:1471 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "[RFC PATCH] anstatt [PATCH] verwenden" -#: builtin/log.c:1463 +#: builtin/log.c:1474 msgid "Use [<prefix>] instead of [PATCH]" msgstr "[<Präfix>] anstatt [PATCH] verwenden" -#: builtin/log.c:1466 +#: builtin/log.c:1477 msgid "store resulting files in <dir>" msgstr "erzeugte Dateien in <Verzeichnis> speichern" -#: builtin/log.c:1469 +#: builtin/log.c:1480 msgid "don't strip/add [PATCH]" msgstr "[PATCH] nicht entfernen/hinzufügen" -#: builtin/log.c:1472 +#: builtin/log.c:1483 msgid "don't output binary diffs" msgstr "keine binären Unterschiede ausgeben" -#: builtin/log.c:1474 +#: builtin/log.c:1485 msgid "output all-zero hash in From header" msgstr "Hash mit Nullen in \"From\"-Header ausgeben" -#: builtin/log.c:1476 +#: builtin/log.c:1487 msgid "don't include a patch matching a commit upstream" msgstr "" "keine Patches einschließen, die einem Commit im Upstream-Branch entsprechen" -#: builtin/log.c:1478 +#: builtin/log.c:1489 msgid "show patch format instead of default (patch + stat)" msgstr "Patchformat anstatt des Standards anzeigen (Patch + Zusammenfassung)" -#: builtin/log.c:1480 +#: builtin/log.c:1491 msgid "Messaging" msgstr "E-Mail-Einstellungen" -#: builtin/log.c:1481 +#: builtin/log.c:1492 msgid "header" msgstr "Header" -#: builtin/log.c:1482 +#: builtin/log.c:1493 msgid "add email header" msgstr "E-Mail-Header hinzufügen" -#: builtin/log.c:1483 builtin/log.c:1485 +#: builtin/log.c:1494 builtin/log.c:1496 msgid "email" msgstr "E-Mail" -#: builtin/log.c:1483 +#: builtin/log.c:1494 msgid "add To: header" msgstr "\"To:\"-Header hinzufügen" -#: builtin/log.c:1485 +#: builtin/log.c:1496 msgid "add Cc: header" msgstr "\"Cc:\"-Header hinzufügen" -#: builtin/log.c:1487 +#: builtin/log.c:1498 msgid "ident" msgstr "Ident" -#: builtin/log.c:1488 +#: builtin/log.c:1499 msgid "set From address to <ident> (or committer ident if absent)" msgstr "" "\"From\"-Adresse auf <Ident> setzen (oder Ident des Commit-Erstellers, wenn " "fehlend)" -#: builtin/log.c:1490 +#: builtin/log.c:1501 msgid "message-id" msgstr "message-id" -#: builtin/log.c:1491 +#: builtin/log.c:1502 msgid "make first mail a reply to <message-id>" msgstr "aus erster E-Mail eine Antwort zu <message-id> machen" -#: builtin/log.c:1492 builtin/log.c:1495 +#: builtin/log.c:1503 builtin/log.c:1506 msgid "boundary" msgstr "Grenze" -#: builtin/log.c:1493 +#: builtin/log.c:1504 msgid "attach the patch" msgstr "den Patch anhängen" -#: builtin/log.c:1496 +#: builtin/log.c:1507 msgid "inline the patch" msgstr "den Patch direkt in die Nachricht einfügen" -#: builtin/log.c:1500 +#: builtin/log.c:1511 msgid "enable message threading, styles: shallow, deep" msgstr "Nachrichtenverkettung aktivieren, Stile: shallow, deep" -#: builtin/log.c:1502 +#: builtin/log.c:1513 msgid "signature" msgstr "Signatur" -#: builtin/log.c:1503 +#: builtin/log.c:1514 msgid "add a signature" msgstr "eine Signatur hinzufügen" -#: builtin/log.c:1504 +#: builtin/log.c:1515 msgid "base-commit" msgstr "Basis-Commit" -#: builtin/log.c:1505 +#: builtin/log.c:1516 msgid "add prerequisite tree info to the patch series" msgstr "erforderliche Revisions-Informationen der Patch-Serie hinzufügen" -#: builtin/log.c:1507 +#: builtin/log.c:1518 msgid "add a signature from a file" msgstr "eine Signatur aus einer Datei hinzufügen" -#: builtin/log.c:1508 +#: builtin/log.c:1519 msgid "don't print the patch filenames" msgstr "keine Dateinamen der Patches anzeigen" -#: builtin/log.c:1510 +#: builtin/log.c:1521 msgid "show progress while generating patches" msgstr "Forschrittsanzeige während der Erzeugung der Patches" -#: builtin/log.c:1585 +#: builtin/log.c:1596 #, c-format msgid "invalid ident line: %s" msgstr "Ungültige Identifikationszeile: %s" -#: builtin/log.c:1600 -msgid "-n and -k are mutually exclusive." -msgstr "Die Optionen -n und -k schließen sich gegenseitig aus." +#: builtin/log.c:1611 +msgid "-n and -k are mutually exclusive" +msgstr "-n und -k schließen sich gegenseitig aus." -#: builtin/log.c:1602 -msgid "--subject-prefix/--rfc and -k are mutually exclusive." +#: builtin/log.c:1613 +msgid "--subject-prefix/--rfc and -k are mutually exclusive" msgstr "--subject-prefix/--rfc und -k schließen sich gegenseitig aus." -#: builtin/log.c:1610 +#: builtin/log.c:1621 msgid "--name-only does not make sense" msgstr "Die Option --name-only kann nicht verwendet werden." -#: builtin/log.c:1612 +#: builtin/log.c:1623 msgid "--name-status does not make sense" msgstr "Die Option --name-status kann nicht verwendet werden." -#: builtin/log.c:1614 +#: builtin/log.c:1625 msgid "--check does not make sense" msgstr "Die Option --check kann nicht verwendet werden." -#: builtin/log.c:1646 +#: builtin/log.c:1657 msgid "standard output, or directory, which one?" msgstr "Standard-Ausgabe oder Verzeichnis, welches von beidem?" -#: builtin/log.c:1648 +#: builtin/log.c:1659 #, c-format msgid "Could not create directory '%s'" msgstr "Konnte Verzeichnis '%s' nicht erstellen." -#: builtin/log.c:1741 +#: builtin/log.c:1752 #, c-format msgid "unable to read signature file '%s'" msgstr "Konnte Signatur-Datei '%s' nicht lesen" -#: builtin/log.c:1773 +#: builtin/log.c:1785 msgid "Generating patches" msgstr "Erzeuge Patches" -#: builtin/log.c:1817 +#: builtin/log.c:1829 msgid "Failed to create output files" msgstr "Fehler beim Erstellen der Ausgabedateien." -#: builtin/log.c:1867 +#: builtin/log.c:1880 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<Upstream> [<Branch> [<Limit>]]]" -#: builtin/log.c:1921 +#: builtin/log.c:1934 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -10810,112 +12223,112 @@ msgstr "" "Konnte gefolgten Remote-Branch nicht finden, bitte geben Sie <Upstream> " "manuell an.\n" -#: builtin/ls-files.c:468 +#: builtin/ls-files.c:469 msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<Optionen>] [<Datei>...]" -#: builtin/ls-files.c:517 +#: builtin/ls-files.c:518 msgid "identify the file status with tags" msgstr "den Dateistatus mit Tags anzeigen" -#: builtin/ls-files.c:519 +#: builtin/ls-files.c:520 msgid "use lowercase letters for 'assume unchanged' files" msgstr "" "Kleinbuchstaben für Dateien mit 'assume unchanged' Markierung verwenden" -#: builtin/ls-files.c:521 +#: builtin/ls-files.c:522 msgid "use lowercase letters for 'fsmonitor clean' files" msgstr "Kleinbuchstaben für 'fsmonitor clean' Dateien verwenden" -#: builtin/ls-files.c:523 +#: builtin/ls-files.c:524 msgid "show cached files in the output (default)" msgstr "zwischengespeicherte Dateien in der Ausgabe anzeigen (Standard)" -#: builtin/ls-files.c:525 +#: builtin/ls-files.c:526 msgid "show deleted files in the output" msgstr "entfernte Dateien in der Ausgabe anzeigen" -#: builtin/ls-files.c:527 +#: builtin/ls-files.c:528 msgid "show modified files in the output" msgstr "geänderte Dateien in der Ausgabe anzeigen" -#: builtin/ls-files.c:529 +#: builtin/ls-files.c:530 msgid "show other files in the output" msgstr "sonstige Dateien in der Ausgabe anzeigen" -#: builtin/ls-files.c:531 +#: builtin/ls-files.c:532 msgid "show ignored files in the output" msgstr "ignorierte Dateien in der Ausgabe anzeigen" -#: builtin/ls-files.c:534 +#: builtin/ls-files.c:535 msgid "show staged contents' object name in the output" msgstr "" "Objektnamen von Inhalten, die zum Commit vorgemerkt sind, in der Ausgabe " "anzeigen" -#: builtin/ls-files.c:536 +#: builtin/ls-files.c:537 msgid "show files on the filesystem that need to be removed" msgstr "Dateien im Dateisystem, die gelöscht werden müssen, anzeigen" -#: builtin/ls-files.c:538 +#: builtin/ls-files.c:539 msgid "show 'other' directories' names only" msgstr "nur Namen von 'sonstigen' Verzeichnissen anzeigen" -#: builtin/ls-files.c:540 +#: builtin/ls-files.c:541 msgid "show line endings of files" msgstr "Zeilenenden von Dateien anzeigen" -#: builtin/ls-files.c:542 +#: builtin/ls-files.c:543 msgid "don't show empty directories" msgstr "keine leeren Verzeichnisse anzeigen" -#: builtin/ls-files.c:545 +#: builtin/ls-files.c:546 msgid "show unmerged files in the output" msgstr "nicht zusammengeführte Dateien in der Ausgabe anzeigen" -#: builtin/ls-files.c:547 +#: builtin/ls-files.c:548 msgid "show resolve-undo information" msgstr "'resolve-undo' Informationen anzeigen" -#: builtin/ls-files.c:549 +#: builtin/ls-files.c:550 msgid "skip files matching pattern" msgstr "Dateien auslassen, die einem Muster entsprechen" -#: builtin/ls-files.c:552 +#: builtin/ls-files.c:553 msgid "exclude patterns are read from <file>" msgstr "Muster, gelesen von <Datei>, ausschließen" -#: builtin/ls-files.c:555 +#: builtin/ls-files.c:556 msgid "read additional per-directory exclude patterns in <file>" msgstr "zusätzliche pro-Verzeichnis Auschlussmuster aus <Datei> auslesen" -#: builtin/ls-files.c:557 +#: builtin/ls-files.c:558 msgid "add the standard git exclusions" msgstr "die standardmäßigen Git-Ausschlüsse hinzufügen" -#: builtin/ls-files.c:560 +#: builtin/ls-files.c:561 msgid "make the output relative to the project top directory" msgstr "Ausgabe relativ zum Projektverzeichnis" -#: builtin/ls-files.c:563 +#: builtin/ls-files.c:564 msgid "recurse through submodules" msgstr "Rekursion in Submodulen durchführen" -#: builtin/ls-files.c:565 +#: builtin/ls-files.c:566 msgid "if any <file> is not in the index, treat this as an error" msgstr "als Fehler behandeln, wenn sich eine <Datei> nicht im Index befindet" -#: builtin/ls-files.c:566 +#: builtin/ls-files.c:567 msgid "tree-ish" msgstr "Commit-Referenz" -#: builtin/ls-files.c:567 +#: builtin/ls-files.c:568 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "" "vorgeben, dass Pfade, die seit <Commit-Referenz> gelöscht wurden, immer noch " "vorhanden sind" -#: builtin/ls-files.c:569 +#: builtin/ls-files.c:570 msgid "show debugging data" msgstr "Ausgaben zur Fehlersuche anzeigen" @@ -10967,39 +12380,39 @@ msgstr "" msgid "show underlying ref in addition to the object pointed by it" msgstr "zusätzlich zum Objekt die darauf verweisenden Referenzen anzeigen" -#: builtin/ls-tree.c:29 +#: builtin/ls-tree.c:30 msgid "git ls-tree [<options>] <tree-ish> [<path>...]" msgstr "git ls-tree [<Optionen>] <Commit-Referenz> [<Pfad>...]" -#: builtin/ls-tree.c:127 +#: builtin/ls-tree.c:128 msgid "only show trees" msgstr "nur Verzeichnisse anzeigen" -#: builtin/ls-tree.c:129 +#: builtin/ls-tree.c:130 msgid "recurse into subtrees" msgstr "Rekursion in Unterverzeichnissen durchführen" -#: builtin/ls-tree.c:131 +#: builtin/ls-tree.c:132 msgid "show trees when recursing" msgstr "Verzeichnisse bei Rekursion anzeigen" -#: builtin/ls-tree.c:134 +#: builtin/ls-tree.c:135 msgid "terminate entries with NUL byte" msgstr "Einträge mit NUL-Byte abschließen" -#: builtin/ls-tree.c:135 +#: builtin/ls-tree.c:136 msgid "include object size" msgstr "Objektgröße einschließen" -#: builtin/ls-tree.c:137 builtin/ls-tree.c:139 +#: builtin/ls-tree.c:138 builtin/ls-tree.c:140 msgid "list only filenames" msgstr "nur Dateinamen auflisten" -#: builtin/ls-tree.c:142 +#: builtin/ls-tree.c:143 msgid "use full path names" msgstr "vollständige Pfadnamen verwenden" -#: builtin/ls-tree.c:144 +#: builtin/ls-tree.c:145 msgid "list entire tree; not just current directory (implies --full-name)" msgstr "" "das gesamte Verzeichnis auflisten; nicht nur das aktuelle Verzeichnis " @@ -11010,185 +12423,185 @@ msgstr "" msgid "empty mbox: '%s'" msgstr "Leere mbox: '%s'" -#: builtin/merge.c:50 +#: builtin/merge.c:51 msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<Optionen>] [<Commit>...]" -#: builtin/merge.c:51 +#: builtin/merge.c:52 msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:52 +#: builtin/merge.c:53 msgid "git merge --continue" msgstr "git merge --continue" -#: builtin/merge.c:109 +#: builtin/merge.c:110 msgid "switch `m' requires a value" msgstr "Schalter 'm' erfordert einen Wert." -#: builtin/merge.c:146 +#: builtin/merge.c:176 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "Konnte Merge-Strategie '%s' nicht finden.\n" -#: builtin/merge.c:147 +#: builtin/merge.c:177 #, c-format msgid "Available strategies are:" msgstr "Verfügbare Strategien sind:" -#: builtin/merge.c:152 +#: builtin/merge.c:182 #, c-format msgid "Available custom strategies are:" msgstr "Verfügbare benutzerdefinierte Strategien sind:" -#: builtin/merge.c:202 builtin/pull.c:142 +#: builtin/merge.c:232 builtin/pull.c:142 msgid "do not show a diffstat at the end of the merge" msgstr "keine Zusammenfassung der Unterschiede am Schluss des Merges anzeigen" -#: builtin/merge.c:205 builtin/pull.c:145 +#: builtin/merge.c:235 builtin/pull.c:145 msgid "show a diffstat at the end of the merge" msgstr "eine Zusammenfassung der Unterschiede am Schluss des Merges anzeigen" -#: builtin/merge.c:206 builtin/pull.c:148 +#: builtin/merge.c:236 builtin/pull.c:148 msgid "(synonym to --stat)" msgstr "(Synonym für --stat)" -#: builtin/merge.c:208 builtin/pull.c:151 +#: builtin/merge.c:238 builtin/pull.c:151 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" "(höchstens <n>) Einträge von \"shortlog\" zur Beschreibung des Merge-Commits " "hinzufügen" -#: builtin/merge.c:211 builtin/pull.c:157 +#: builtin/merge.c:241 builtin/pull.c:157 msgid "create a single commit instead of doing a merge" msgstr "einen einzelnen Commit anstatt eines Merges erzeugen" -#: builtin/merge.c:213 builtin/pull.c:160 +#: builtin/merge.c:243 builtin/pull.c:160 msgid "perform a commit if the merge succeeds (default)" msgstr "einen Commit durchführen, wenn der Merge erfolgreich war (Standard)" -#: builtin/merge.c:215 builtin/pull.c:163 +#: builtin/merge.c:245 builtin/pull.c:163 msgid "edit message before committing" msgstr "Bearbeitung der Beschreibung vor dem Commit" -#: builtin/merge.c:216 +#: builtin/merge.c:246 msgid "allow fast-forward (default)" msgstr "Vorspulen erlauben (Standard)" -#: builtin/merge.c:218 builtin/pull.c:169 +#: builtin/merge.c:248 builtin/pull.c:169 msgid "abort if fast-forward is not possible" msgstr "abbrechen, wenn kein Vorspulen möglich ist" -#: builtin/merge.c:222 builtin/pull.c:172 +#: builtin/merge.c:252 builtin/pull.c:172 msgid "verify that the named commit has a valid GPG signature" msgstr "den genannten Commit auf eine gültige GPG-Signatur überprüfen" -#: builtin/merge.c:223 builtin/notes.c:777 builtin/pull.c:176 -#: builtin/revert.c:109 +#: builtin/merge.c:253 builtin/notes.c:779 builtin/pull.c:176 +#: builtin/revert.c:110 msgid "strategy" msgstr "Strategie" -#: builtin/merge.c:224 builtin/pull.c:177 +#: builtin/merge.c:254 builtin/pull.c:177 msgid "merge strategy to use" msgstr "zu verwendende Merge-Strategie" -#: builtin/merge.c:225 builtin/pull.c:180 +#: builtin/merge.c:255 builtin/pull.c:180 msgid "option=value" msgstr "Option=Wert" -#: builtin/merge.c:226 builtin/pull.c:181 +#: builtin/merge.c:256 builtin/pull.c:181 msgid "option for selected merge strategy" msgstr "Option für ausgewählte Merge-Strategie" -#: builtin/merge.c:228 +#: builtin/merge.c:258 msgid "merge commit message (for a non-fast-forward merge)" msgstr "" "Commit-Beschreibung zusammenführen (für einen Merge, der kein Vorspulen war)" -#: builtin/merge.c:232 +#: builtin/merge.c:265 msgid "abort the current in-progress merge" msgstr "den sich im Gange befindlichen Merge abbrechen" -#: builtin/merge.c:234 +#: builtin/merge.c:267 msgid "continue the current in-progress merge" msgstr "den sich im Gange befindlichen Merge fortsetzen" -#: builtin/merge.c:236 builtin/pull.c:188 +#: builtin/merge.c:269 builtin/pull.c:188 msgid "allow merging unrelated histories" msgstr "erlaube das Zusammenführen von nicht zusammenhängenden Historien" -#: builtin/merge.c:242 +#: builtin/merge.c:275 msgid "verify commit-msg hook" msgstr "commit-msg Hook überprüfen" -#: builtin/merge.c:267 +#: builtin/merge.c:300 msgid "could not run stash." msgstr "Konnte \"stash\" nicht ausführen." -#: builtin/merge.c:272 +#: builtin/merge.c:305 msgid "stash failed" msgstr "\"stash\" fehlgeschlagen" -#: builtin/merge.c:277 +#: builtin/merge.c:310 #, c-format msgid "not a valid object: %s" msgstr "kein gültiges Objekt: %s" -#: builtin/merge.c:299 builtin/merge.c:316 +#: builtin/merge.c:332 builtin/merge.c:349 msgid "read-tree failed" msgstr "read-tree fehlgeschlagen" -#: builtin/merge.c:346 +#: builtin/merge.c:379 msgid " (nothing to squash)" msgstr " (nichts zu quetschen)" -#: builtin/merge.c:357 +#: builtin/merge.c:390 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Quetsche Commit -- HEAD wird nicht aktualisiert\n" -#: builtin/merge.c:407 +#: builtin/merge.c:440 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "Keine Merge-Commit-Beschreibung -- HEAD wird nicht aktualisiert\n" -#: builtin/merge.c:457 +#: builtin/merge.c:491 #, c-format msgid "'%s' does not point to a commit" msgstr "'%s' zeigt auf keinen Commit" -#: builtin/merge.c:547 +#: builtin/merge.c:578 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Ungültiger branch.%s.mergeoptions String: %s" -#: builtin/merge.c:668 +#: builtin/merge.c:699 msgid "Not handling anything other than two heads merge." msgstr "Es wird nur der Merge von zwei Branches behandelt." -#: builtin/merge.c:682 +#: builtin/merge.c:713 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Unbekannte Option für merge-recursive: -X%s" -#: builtin/merge.c:697 +#: builtin/merge.c:728 #, c-format msgid "unable to write %s" msgstr "konnte %s nicht schreiben" -#: builtin/merge.c:748 +#: builtin/merge.c:779 #, c-format msgid "Could not read from '%s'" msgstr "konnte nicht von '%s' lesen" -#: builtin/merge.c:757 +#: builtin/merge.c:788 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" "Merge wurde nicht committet; benutzen Sie 'git commit', um den Merge " "abzuschließen.\n" -#: builtin/merge.c:763 +#: builtin/merge.c:794 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -11204,71 +12617,71 @@ msgstr "" "Zeilen beginnend mit '%c' werden ignoriert, und eine leere Beschreibung\n" "bricht den Commit ab.\n" -#: builtin/merge.c:799 +#: builtin/merge.c:830 msgid "Empty commit message." msgstr "Leere Commit-Beschreibung" -#: builtin/merge.c:818 +#: builtin/merge.c:849 #, c-format msgid "Wonderful.\n" msgstr "Wunderbar.\n" -#: builtin/merge.c:871 +#: builtin/merge.c:902 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" "Automatischer Merge fehlgeschlagen; beheben Sie die Konflikte und committen " "Sie dann das Ergebnis.\n" -#: builtin/merge.c:910 +#: builtin/merge.c:941 msgid "No current branch." msgstr "Sie befinden sich auf keinem Branch." -#: builtin/merge.c:912 +#: builtin/merge.c:943 msgid "No remote for the current branch." msgstr "Kein Remote-Repository für den aktuellen Branch." -#: builtin/merge.c:914 +#: builtin/merge.c:945 msgid "No default upstream defined for the current branch." msgstr "" "Es ist kein Standard-Upstream-Branch für den aktuellen Branch definiert." -#: builtin/merge.c:919 +#: builtin/merge.c:950 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "Kein Remote-Tracking-Branch für %s von %s" -#: builtin/merge.c:972 +#: builtin/merge.c:1007 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Fehlerhafter Wert '%s' in Umgebungsvariable '%s'" -#: builtin/merge.c:1074 +#: builtin/merge.c:1110 #, c-format msgid "not something we can merge in %s: %s" msgstr "nichts was wir in %s zusammenführen können: %s" -#: builtin/merge.c:1108 +#: builtin/merge.c:1144 msgid "not something we can merge" msgstr "nichts was wir zusammenführen können" -#: builtin/merge.c:1210 +#: builtin/merge.c:1247 msgid "--abort expects no arguments" msgstr "--abort akzeptiert keine Argumente" -#: builtin/merge.c:1214 +#: builtin/merge.c:1251 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "Es gibt keinen Merge abzubrechen (MERGE_HEAD fehlt)" -#: builtin/merge.c:1226 +#: builtin/merge.c:1263 msgid "--continue expects no arguments" msgstr "--continue erwartet keine Argumente" -#: builtin/merge.c:1230 +#: builtin/merge.c:1267 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "Es ist kein Merge im Gange (MERGE_HEAD fehlt)." -#: builtin/merge.c:1246 +#: builtin/merge.c:1283 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -11276,7 +12689,7 @@ msgstr "" "Sie haben Ihren Merge nicht abgeschlossen (MERGE_HEAD existiert).\n" "Bitte committen Sie Ihre Änderungen, bevor Sie den Merge ausführen." -#: builtin/merge.c:1253 +#: builtin/merge.c:1290 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -11284,159 +12697,159 @@ msgstr "" "Sie haben \"cherry-pick\" nicht abgeschlossen (CHERRY_PICK_HEAD existiert).\n" "Bitte committen Sie Ihre Änderungen, bevor Sie den Merge ausführen." -#: builtin/merge.c:1256 +#: builtin/merge.c:1293 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "" "Sie haben \"cherry-pick\" nicht abgeschlossen (CHERRY_PICK_HEAD existiert)." -#: builtin/merge.c:1265 +#: builtin/merge.c:1302 msgid "You cannot combine --squash with --no-ff." msgstr "Sie können --squash nicht mit --no-ff kombinieren." -#: builtin/merge.c:1273 +#: builtin/merge.c:1310 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "Kein Commit angegeben und merge.defaultToUpstream ist nicht gesetzt." -#: builtin/merge.c:1290 +#: builtin/merge.c:1327 msgid "Squash commit into empty head not supported yet" msgstr "" "Bin auf einem Commit, der noch geboren wird; kann \"squash\" nicht ausführen." -#: builtin/merge.c:1292 +#: builtin/merge.c:1329 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "" "Nicht vorzuspulender Commit kann nicht in einem leeren Branch verwendet " "werden." -#: builtin/merge.c:1297 +#: builtin/merge.c:1334 #, c-format msgid "%s - not something we can merge" msgstr "%s - nichts was wir zusammenführen können" -#: builtin/merge.c:1299 +#: builtin/merge.c:1336 msgid "Can merge only exactly one commit into empty head" msgstr "Kann nur exakt einen Commit in einem leeren Branch zusammenführen." -#: builtin/merge.c:1333 +#: builtin/merge.c:1370 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "" "Commit %s hat eine nicht vertrauenswürdige GPG-Signatur, angeblich von %s." -#: builtin/merge.c:1336 +#: builtin/merge.c:1373 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "Commit %s hat eine ungültige GPG-Signatur, angeblich von %s." -#: builtin/merge.c:1339 +#: builtin/merge.c:1376 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "Commit %s hat keine GPG-Signatur." -#: builtin/merge.c:1342 +#: builtin/merge.c:1379 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "Commit %s hat eine gültige GPG-Signatur von %s\n" -#: builtin/merge.c:1401 +#: builtin/merge.c:1438 msgid "refusing to merge unrelated histories" msgstr "Verweigere den Merge von nicht zusammenhängenden Historien." -#: builtin/merge.c:1410 +#: builtin/merge.c:1447 msgid "Already up to date." msgstr "Bereits aktuell." -#: builtin/merge.c:1420 +#: builtin/merge.c:1457 #, c-format msgid "Updating %s..%s\n" msgstr "Aktualisiere %s..%s\n" -#: builtin/merge.c:1461 +#: builtin/merge.c:1498 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Probiere wirklich trivialen \"in-index\"-Merge ...\n" -#: builtin/merge.c:1468 +#: builtin/merge.c:1505 #, c-format msgid "Nope.\n" msgstr "Nein.\n" -#: builtin/merge.c:1493 +#: builtin/merge.c:1530 msgid "Already up to date. Yeeah!" msgstr "Bereits aktuell." -#: builtin/merge.c:1499 +#: builtin/merge.c:1536 msgid "Not possible to fast-forward, aborting." msgstr "Vorspulen nicht möglich, breche ab." -#: builtin/merge.c:1522 builtin/merge.c:1601 +#: builtin/merge.c:1559 builtin/merge.c:1638 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Rücklauf des Verzeichnisses bis zum Ursprung ...\n" -#: builtin/merge.c:1526 +#: builtin/merge.c:1563 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Probiere Merge-Strategie %s ...\n" -#: builtin/merge.c:1592 +#: builtin/merge.c:1629 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Keine Merge-Strategie behandelt diesen Merge.\n" -#: builtin/merge.c:1594 +#: builtin/merge.c:1631 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Merge mit Strategie %s fehlgeschlagen.\n" -#: builtin/merge.c:1603 +#: builtin/merge.c:1640 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "Benutzen Sie \"%s\", um die Auflösung per Hand vorzubereiten.\n" -#: builtin/merge.c:1615 +#: builtin/merge.c:1652 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" "Automatischer Merge abgeschlossen; halte, wie gewünscht, vor dem Commit an\n" -#: builtin/merge-base.c:30 +#: builtin/merge-base.c:31 msgid "git merge-base [-a | --all] <commit> <commit>..." msgstr "git merge-base [-a | --all] <Commit> <Commit>..." -#: builtin/merge-base.c:31 +#: builtin/merge-base.c:32 msgid "git merge-base [-a | --all] --octopus <commit>..." msgstr "git merge-base [-a | --all] --octopus <Commit>..." -#: builtin/merge-base.c:32 +#: builtin/merge-base.c:33 msgid "git merge-base --independent <commit>..." msgstr "git merge-base --independent <Commit>..." -#: builtin/merge-base.c:33 +#: builtin/merge-base.c:34 msgid "git merge-base --is-ancestor <commit> <commit>" msgstr "git merge-base --is-ancestor <Commit> <Commit>" -#: builtin/merge-base.c:34 +#: builtin/merge-base.c:35 msgid "git merge-base --fork-point <ref> [<commit>]" msgstr "git merge-base --fork-point <Referenz> [<Commit>]" -#: builtin/merge-base.c:220 +#: builtin/merge-base.c:221 msgid "output all common ancestors" msgstr "Ausgabe aller gemeinsamen Vorgänger-Commits" -#: builtin/merge-base.c:222 +#: builtin/merge-base.c:223 msgid "find ancestors for a single n-way merge" msgstr "Vorgänger-Commits für einen einzelnen n-Wege-Merge finden" -#: builtin/merge-base.c:224 +#: builtin/merge-base.c:225 msgid "list revs not reachable from others" msgstr "Commits auflisten, die nicht durch Andere erreichbar sind" -#: builtin/merge-base.c:226 +#: builtin/merge-base.c:227 msgid "is the first one ancestor of the other?" msgstr "ist der Erste ein Vorgänger-Commit des Anderen?" -#: builtin/merge-base.c:228 +#: builtin/merge-base.c:229 msgid "find where <commit> forked from reflog of <ref>" msgstr "<Commit> finden, von wo Reflog von <Referenz> abgespalten wurde" @@ -11511,19 +12924,19 @@ msgstr "Konnte Referenz '%s' nicht auflösen" msgid "Merging %s with %s\n" msgstr "Führe %s mit %s zusammen\n" -#: builtin/mktree.c:65 +#: builtin/mktree.c:66 msgid "git mktree [-z] [--missing] [--batch]" msgstr "git mktree [-z] [--missing] [--batch]" -#: builtin/mktree.c:153 +#: builtin/mktree.c:154 msgid "input is NUL terminated" msgstr "Eingabe ist durch NUL-Zeichen abgeschlossen" -#: builtin/mktree.c:154 builtin/write-tree.c:25 +#: builtin/mktree.c:155 builtin/write-tree.c:25 msgid "allow missing objects" msgstr "fehlende Objekte erlauben" -#: builtin/mktree.c:155 +#: builtin/mktree.c:156 msgid "allow creation of more than one tree" msgstr "die Erstellung von mehr als einem \"Tree\"-Objekt erlauben" @@ -11536,7 +12949,7 @@ msgstr "git mv [<Optionen>] <Quelle>... <Ziel>" msgid "Directory %s is in index and no submodule?" msgstr "Verzeichnis %s ist zum Commit vorgemerkt und kein Submodul?" -#: builtin/mv.c:84 builtin/rm.c:288 +#: builtin/mv.c:84 msgid "Please stage your changes to .gitmodules or stash them to proceed" msgstr "" "Bitte merken Sie Ihre Änderungen in .gitmodules zum Commit vor oder " @@ -11617,60 +13030,60 @@ msgstr "%s, Quelle=%s, Ziel=%s" msgid "Renaming %s to %s\n" msgstr "Benenne %s nach %s um\n" -#: builtin/mv.c:276 builtin/remote.c:715 builtin/repack.c:409 +#: builtin/mv.c:276 builtin/remote.c:716 builtin/repack.c:494 #, c-format msgid "renaming '%s' failed" msgstr "Umbenennung von '%s' fehlgeschlagen" -#: builtin/name-rev.c:338 +#: builtin/name-rev.c:355 msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [<Optionen>] <Commit>..." -#: builtin/name-rev.c:339 +#: builtin/name-rev.c:356 msgid "git name-rev [<options>] --all" msgstr "git name-rev [<Optionen>] --all" -#: builtin/name-rev.c:340 +#: builtin/name-rev.c:357 msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [<Optionen>] --stdin" -#: builtin/name-rev.c:395 +#: builtin/name-rev.c:413 msgid "print only names (no SHA-1)" msgstr "nur Namen anzeigen (keine SHA-1)" -#: builtin/name-rev.c:396 +#: builtin/name-rev.c:414 msgid "only use tags to name the commits" msgstr "nur Tags verwenden, um die Commits zu benennen" -#: builtin/name-rev.c:398 +#: builtin/name-rev.c:416 msgid "only use refs matching <pattern>" msgstr "nur Referenzen verwenden, die <Muster> entsprechen" -#: builtin/name-rev.c:400 +#: builtin/name-rev.c:418 msgid "ignore refs matching <pattern>" msgstr "ignoriere Referenzen die <Muster> entsprechen" -#: builtin/name-rev.c:402 +#: builtin/name-rev.c:420 msgid "list all commits reachable from all refs" msgstr "alle Commits auflisten, die von allen Referenzen erreichbar sind" -#: builtin/name-rev.c:403 +#: builtin/name-rev.c:421 msgid "read from stdin" msgstr "von der Standard-Eingabe lesen" -#: builtin/name-rev.c:404 +#: builtin/name-rev.c:422 msgid "allow to print `undefined` names (default)" msgstr "Ausgabe von `undefinierten` Namen erlauben (Standard)" -#: builtin/name-rev.c:410 +#: builtin/name-rev.c:428 msgid "dereference tags in the input (internal use)" msgstr "Tags in der Eingabe dereferenzieren (interne Verwendung)" -#: builtin/notes.c:26 +#: builtin/notes.c:28 msgid "git notes [--ref <notes-ref>] [list [<object>]]" msgstr "git notes [--ref <Notiz-Referenz>] [list [<Objekt>]]" -#: builtin/notes.c:27 +#: builtin/notes.c:29 msgid "" "git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> " "| (-c | -C) <object>] [<object>]" @@ -11678,12 +13091,12 @@ msgstr "" "git notes [--ref <Notiz-Referenz>] add [-f] [--allow-empty] [-m " "<Beschreibung> | -F <Datei> | (-c | -C) <Objekt>] [<Objekt>]" -#: builtin/notes.c:28 +#: builtin/notes.c:30 msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>" msgstr "" "git notes [--ref <Notiz-Referenz>] copy [-f] <von-Objekt> <nach-Objekt>" -#: builtin/notes.c:29 +#: builtin/notes.c:31 msgid "" "git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | " "(-c | -C) <object>] [<object>]" @@ -11691,158 +13104,158 @@ msgstr "" "git notes [--ref <Notiz-Referenz>] append [--allow-empty] [-m <Beschreibung> " "| -F <Datei> | (-c | -C) <Objekt>] [<Objekt>]" -#: builtin/notes.c:30 +#: builtin/notes.c:32 msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]" msgstr "git notes [--ref <Notiz-Referenz>] edit [--allow-empty] [<Objekt>]" -#: builtin/notes.c:31 +#: builtin/notes.c:33 msgid "git notes [--ref <notes-ref>] show [<object>]" msgstr "git notes [--ref <Notiz-Referenz>] show [<Objekt>]" -#: builtin/notes.c:32 +#: builtin/notes.c:34 msgid "" "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>" msgstr "" "git notes [--ref <Notiz-Referenz>] merge [-v | -q] [-s <Strategie>] <Notiz-" "Referenz>" -#: builtin/notes.c:33 +#: builtin/notes.c:35 msgid "git notes merge --commit [-v | -q]" msgstr "git notes merge --commit [-v | -q]" -#: builtin/notes.c:34 +#: builtin/notes.c:36 msgid "git notes merge --abort [-v | -q]" msgstr "git notes merge --abort [-v | -q]" -#: builtin/notes.c:35 +#: builtin/notes.c:37 msgid "git notes [--ref <notes-ref>] remove [<object>...]" msgstr "git notes [--ref <Notiz-Referenz>] remove [<Objekt>...]" -#: builtin/notes.c:36 +#: builtin/notes.c:38 msgid "git notes [--ref <notes-ref>] prune [-n] [-v]" msgstr "git notes [--ref <Notiz-Referenz>] prune [-n] [-v]" -#: builtin/notes.c:37 +#: builtin/notes.c:39 msgid "git notes [--ref <notes-ref>] get-ref" msgstr "git notes [--ref <Notiz-Referenz>] get-ref" -#: builtin/notes.c:42 +#: builtin/notes.c:44 msgid "git notes [list [<object>]]" msgstr "git notes [list [<Objekt>]]" -#: builtin/notes.c:47 +#: builtin/notes.c:49 msgid "git notes add [<options>] [<object>]" msgstr "git notes add [<Optionen>] [<Objekt>]" -#: builtin/notes.c:52 +#: builtin/notes.c:54 msgid "git notes copy [<options>] <from-object> <to-object>" msgstr "git notes copy [<Optionen>] <von-Objekt> <nach-Objekt>" -#: builtin/notes.c:53 +#: builtin/notes.c:55 msgid "git notes copy --stdin [<from-object> <to-object>]..." msgstr "git notes copy --stdin [<von-Objekt> <nach-Objekt>]..." -#: builtin/notes.c:58 +#: builtin/notes.c:60 msgid "git notes append [<options>] [<object>]" msgstr "git notes append [<Optionen>] [<Objekt>]" -#: builtin/notes.c:63 +#: builtin/notes.c:65 msgid "git notes edit [<object>]" msgstr "git notes edit [<Objekt>]" -#: builtin/notes.c:68 +#: builtin/notes.c:70 msgid "git notes show [<object>]" msgstr "git notes show [<Objekt>]" -#: builtin/notes.c:73 +#: builtin/notes.c:75 msgid "git notes merge [<options>] <notes-ref>" msgstr "git notes merge [<Optionen>] <Notiz-Referenz>" -#: builtin/notes.c:74 +#: builtin/notes.c:76 msgid "git notes merge --commit [<options>]" msgstr "git notes merge --commit [<Optionen>]" -#: builtin/notes.c:75 +#: builtin/notes.c:77 msgid "git notes merge --abort [<options>]" msgstr "git notes merge --abort [<Optionen>]" -#: builtin/notes.c:80 +#: builtin/notes.c:82 msgid "git notes remove [<object>]" msgstr "git notes remove [<Objekt>]" -#: builtin/notes.c:85 +#: builtin/notes.c:87 msgid "git notes prune [<options>]" msgstr "git notes prune [<Optionen>]" -#: builtin/notes.c:90 +#: builtin/notes.c:92 msgid "git notes get-ref" msgstr "git notes get-ref" -#: builtin/notes.c:95 +#: builtin/notes.c:97 msgid "Write/edit the notes for the following object:" msgstr "Schreiben/Bearbeiten der Notizen für das folgende Objekt:" -#: builtin/notes.c:148 +#: builtin/notes.c:150 #, c-format msgid "unable to start 'show' for object '%s'" msgstr "konnte 'show' für Objekt '%s' nicht starten" -#: builtin/notes.c:152 +#: builtin/notes.c:154 msgid "could not read 'show' output" msgstr "Konnte Ausgabe von 'show' nicht lesen." -#: builtin/notes.c:160 +#: builtin/notes.c:162 #, c-format msgid "failed to finish 'show' for object '%s'" msgstr "konnte 'show' für Objekt '%s' nicht abschließen" -#: builtin/notes.c:195 +#: builtin/notes.c:197 msgid "please supply the note contents using either -m or -F option" msgstr "" "Bitte liefern Sie die Notiz-Inhalte unter Verwendung der Option -m oder -F." -#: builtin/notes.c:204 +#: builtin/notes.c:206 msgid "unable to write note object" msgstr "Konnte Notiz-Objekt nicht schreiben" -#: builtin/notes.c:206 +#: builtin/notes.c:208 #, c-format msgid "the note contents have been left in %s" msgstr "Die Notiz-Inhalte wurden in %s belassen." -#: builtin/notes.c:234 builtin/tag.c:507 +#: builtin/notes.c:236 builtin/tag.c:508 #, c-format msgid "cannot read '%s'" msgstr "kann '%s' nicht lesen" -#: builtin/notes.c:236 builtin/tag.c:510 +#: builtin/notes.c:238 builtin/tag.c:511 #, c-format msgid "could not open or read '%s'" msgstr "konnte '%s' nicht öffnen oder lesen" -#: builtin/notes.c:255 builtin/notes.c:306 builtin/notes.c:308 -#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:517 -#: builtin/notes.c:522 builtin/notes.c:600 builtin/notes.c:662 +#: builtin/notes.c:257 builtin/notes.c:308 builtin/notes.c:310 +#: builtin/notes.c:378 builtin/notes.c:433 builtin/notes.c:519 +#: builtin/notes.c:524 builtin/notes.c:602 builtin/notes.c:664 #, c-format msgid "failed to resolve '%s' as a valid ref." msgstr "Konnte '%s' nicht als gültige Referenz auflösen." -#: builtin/notes.c:258 +#: builtin/notes.c:260 #, c-format msgid "failed to read object '%s'." msgstr "Fehler beim Lesen des Objektes '%s'." -#: builtin/notes.c:262 +#: builtin/notes.c:264 #, c-format msgid "cannot read note data from non-blob object '%s'." msgstr "Kann Notiz-Daten nicht von Nicht-Blob Objekt '%s' lesen." -#: builtin/notes.c:302 +#: builtin/notes.c:304 #, c-format msgid "malformed input line: '%s'." msgstr "Fehlerhafte Eingabezeile: '%s'." -#: builtin/notes.c:317 +#: builtin/notes.c:319 #, c-format msgid "failed to copy notes from '%s' to '%s'" msgstr "Fehler beim Kopieren der Notizen von '%s' nach '%s'" @@ -11850,49 +13263,49 @@ msgstr "Fehler beim Kopieren der Notizen von '%s' nach '%s'" #. TRANSLATORS: the first %s will be replaced by a git #. notes command: 'add', 'merge', 'remove', etc. #. -#: builtin/notes.c:349 +#: builtin/notes.c:351 #, c-format msgid "refusing to %s notes in %s (outside of refs/notes/)" msgstr "" "Ausführung von %s auf Notizen in %s (außerhalb von refs/notes/) " "zurückgewiesen" -#: builtin/notes.c:369 builtin/notes.c:424 builtin/notes.c:500 -#: builtin/notes.c:512 builtin/notes.c:588 builtin/notes.c:655 -#: builtin/notes.c:805 builtin/notes.c:952 builtin/notes.c:973 +#: builtin/notes.c:371 builtin/notes.c:426 builtin/notes.c:502 +#: builtin/notes.c:514 builtin/notes.c:590 builtin/notes.c:657 +#: builtin/notes.c:807 builtin/notes.c:954 builtin/notes.c:975 msgid "too many parameters" msgstr "zu viele Parameter" -#: builtin/notes.c:382 builtin/notes.c:668 +#: builtin/notes.c:384 builtin/notes.c:670 #, c-format msgid "no note found for object %s." msgstr "Keine Notiz für Objekt %s gefunden." -#: builtin/notes.c:403 builtin/notes.c:566 +#: builtin/notes.c:405 builtin/notes.c:568 msgid "note contents as a string" msgstr "Notizinhalte als Zeichenkette" -#: builtin/notes.c:406 builtin/notes.c:569 +#: builtin/notes.c:408 builtin/notes.c:571 msgid "note contents in a file" msgstr "Notizinhalte in einer Datei" -#: builtin/notes.c:409 builtin/notes.c:572 +#: builtin/notes.c:411 builtin/notes.c:574 msgid "reuse and edit specified note object" msgstr "Wiederverwendung und Bearbeitung des angegebenen Notiz-Objektes" -#: builtin/notes.c:412 builtin/notes.c:575 +#: builtin/notes.c:414 builtin/notes.c:577 msgid "reuse specified note object" msgstr "Wiederverwendung des angegebenen Notiz-Objektes" -#: builtin/notes.c:415 builtin/notes.c:578 +#: builtin/notes.c:417 builtin/notes.c:580 msgid "allow storing empty note" msgstr "Speichern leerer Notiz erlauben" -#: builtin/notes.c:416 builtin/notes.c:487 +#: builtin/notes.c:418 builtin/notes.c:489 msgid "replace existing notes" msgstr "existierende Notizen ersetzen" -#: builtin/notes.c:441 +#: builtin/notes.c:443 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -11901,31 +13314,31 @@ msgstr "" "Konnte Notizen nicht hinzufügen. Existierende Notizen für Objekt %s " "gefunden. Verwenden Sie '-f', um die existierenden Notizen zu überschreiben." -#: builtin/notes.c:456 builtin/notes.c:535 +#: builtin/notes.c:458 builtin/notes.c:537 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "Überschreibe existierende Notizen für Objekt %s\n" -#: builtin/notes.c:467 builtin/notes.c:627 builtin/notes.c:892 +#: builtin/notes.c:469 builtin/notes.c:629 builtin/notes.c:894 #, c-format msgid "Removing note for object %s\n" msgstr "Entferne Notiz für Objekt %s\n" -#: builtin/notes.c:488 +#: builtin/notes.c:490 msgid "read objects from stdin" msgstr "Objekte von der Standard-Eingabe lesen" -#: builtin/notes.c:490 +#: builtin/notes.c:492 msgid "load rewriting config for <command> (implies --stdin)" msgstr "" "Konfiguration für <Befehl> zum Umschreiben von Commits laden (impliziert --" "stdin)" -#: builtin/notes.c:508 +#: builtin/notes.c:510 msgid "too few parameters" msgstr "zu wenig Parameter" -#: builtin/notes.c:529 +#: builtin/notes.c:531 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -11934,12 +13347,12 @@ msgstr "" "Kann Notizen nicht kopieren. Existierende Notizen für Objekt %s gefunden. " "Verwenden Sie '-f', um die existierenden Notizen zu überschreiben." -#: builtin/notes.c:541 +#: builtin/notes.c:543 #, c-format msgid "missing notes on source object %s. Cannot copy." msgstr "Keine Notizen für Quell-Objekt %s. Kopie nicht möglich." -#: builtin/notes.c:593 +#: builtin/notes.c:595 #, c-format msgid "" "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" @@ -11948,52 +13361,52 @@ msgstr "" "Die Optionen -m/-F/-c/-C sind für den Unterbefehl 'edit' veraltet.\n" "Bitte benutzen Sie stattdessen 'git notes add -f -m/-F/-c/-C'.\n" -#: builtin/notes.c:688 +#: builtin/notes.c:690 msgid "failed to delete ref NOTES_MERGE_PARTIAL" msgstr "Fehler beim Löschen der Referenz NOTES_MERGE_PARTIAL" -#: builtin/notes.c:690 +#: builtin/notes.c:692 msgid "failed to delete ref NOTES_MERGE_REF" msgstr "Fehler beim Löschen der Referenz NOTES_MERGE_REF" -#: builtin/notes.c:692 +#: builtin/notes.c:694 msgid "failed to remove 'git notes merge' worktree" msgstr "Fehler beim Löschen des Arbeitsverzeichnisses von 'git notes merge'." -#: builtin/notes.c:712 +#: builtin/notes.c:714 msgid "failed to read ref NOTES_MERGE_PARTIAL" msgstr "Fehler beim Lesen der Referenz NOTES_MERGE_PARTIAL" -#: builtin/notes.c:714 +#: builtin/notes.c:716 msgid "could not find commit from NOTES_MERGE_PARTIAL." msgstr "Konnte Commit von NOTES_MERGE_PARTIAL nicht finden." -#: builtin/notes.c:716 +#: builtin/notes.c:718 msgid "could not parse commit from NOTES_MERGE_PARTIAL." msgstr "Konnte Commit von NOTES_MERGE_PARTIAL nicht parsen." -#: builtin/notes.c:729 +#: builtin/notes.c:731 msgid "failed to resolve NOTES_MERGE_REF" msgstr "Fehler beim Auflösen von NOTES_MERGE_REF" -#: builtin/notes.c:732 +#: builtin/notes.c:734 msgid "failed to finalize notes merge" msgstr "Fehler beim Abschließen der Zusammenführung der Notizen." -#: builtin/notes.c:758 +#: builtin/notes.c:760 #, c-format msgid "unknown notes merge strategy %s" msgstr "unbekannte Merge-Strategie '%s' für Notizen" -#: builtin/notes.c:774 +#: builtin/notes.c:776 msgid "General options" msgstr "Allgemeine Optionen" -#: builtin/notes.c:776 +#: builtin/notes.c:778 msgid "Merge options" msgstr "Merge-Optionen" -#: builtin/notes.c:778 +#: builtin/notes.c:780 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" @@ -12001,49 +13414,49 @@ msgstr "" "löst Konflikte bei Notizen mit der angegebenen Strategie auf (manual/ours/" "theirs/union/cat_sort_uniq)" -#: builtin/notes.c:780 +#: builtin/notes.c:782 msgid "Committing unmerged notes" msgstr "nicht zusammengeführte Notizen eintragen" -#: builtin/notes.c:782 +#: builtin/notes.c:784 msgid "finalize notes merge by committing unmerged notes" msgstr "" "Merge von Notizen abschließen, in dem nicht zusammengeführte Notizen " "committet werden" -#: builtin/notes.c:784 +#: builtin/notes.c:786 msgid "Aborting notes merge resolution" msgstr "Konfliktauflösung beim Merge von Notizen abbrechen" -#: builtin/notes.c:786 +#: builtin/notes.c:788 msgid "abort notes merge" msgstr "Merge von Notizen abbrechen" -#: builtin/notes.c:797 +#: builtin/notes.c:799 msgid "cannot mix --commit, --abort or -s/--strategy" msgstr "Kann --commit, --abort oder -s/--strategy nicht kombinieren." -#: builtin/notes.c:802 +#: builtin/notes.c:804 msgid "must specify a notes ref to merge" msgstr "Sie müssen eine Notiz-Referenz zum Mergen angeben." -#: builtin/notes.c:826 +#: builtin/notes.c:828 #, c-format msgid "unknown -s/--strategy: %s" msgstr "Unbekannter Wert für -s/--strategy: %s" -#: builtin/notes.c:863 +#: builtin/notes.c:865 #, c-format msgid "a notes merge into %s is already in-progress at %s" msgstr "Ein Merge von Notizen nach %s ist bereits im Gange bei %s" -#: builtin/notes.c:866 +#: builtin/notes.c:868 #, c-format msgid "failed to store link to current notes ref (%s)" msgstr "" "Fehler beim Speichern der Verknüpfung zur aktuellen Notes-Referenz (%s)" -#: builtin/notes.c:868 +#: builtin/notes.c:870 #, c-format msgid "" "Automatic notes merge failed. Fix conflicts in %s and commit the result with " @@ -12055,36 +13468,36 @@ msgstr "" "commit',\n" "oder brechen Sie den Merge mit 'git notes merge --abort' ab.\n" -#: builtin/notes.c:890 +#: builtin/notes.c:892 #, c-format msgid "Object %s has no note\n" msgstr "Objekt %s hat keine Notiz\n" -#: builtin/notes.c:902 +#: builtin/notes.c:904 msgid "attempt to remove non-existent note is not an error" msgstr "der Versuch, eine nicht existierende Notiz zu löschen, ist kein Fehler" -#: builtin/notes.c:905 +#: builtin/notes.c:907 msgid "read object names from the standard input" msgstr "Objektnamen von der Standard-Eingabe lesen" -#: builtin/notes.c:943 builtin/prune.c:107 builtin/worktree.c:151 +#: builtin/notes.c:945 builtin/prune.c:108 builtin/worktree.c:152 msgid "do not remove, show only" msgstr "nicht löschen, nur anzeigen" -#: builtin/notes.c:944 +#: builtin/notes.c:946 msgid "report pruned notes" msgstr "gelöschte Notizen melden" -#: builtin/notes.c:986 +#: builtin/notes.c:988 msgid "notes-ref" msgstr "Notiz-Referenz" -#: builtin/notes.c:987 +#: builtin/notes.c:989 msgid "use notes from <notes-ref>" msgstr "Notizen von <Notiz-Referenz> verwenden" -#: builtin/notes.c:1022 +#: builtin/notes.c:1024 #, c-format msgid "unknown subcommand: %s" msgstr "Unbekannter Unterbefehl: %s" @@ -12103,232 +13516,386 @@ msgstr "" "git pack-objects [<Optionen>...] <Basis-Name> [< <Referenzliste> | < " "<Objektliste>]" -#: builtin/pack-objects.c:211 builtin/pack-objects.c:214 +#: builtin/pack-objects.c:414 #, c-format -msgid "deflate error (%d)" -msgstr "Fehler beim Komprimieren (%d)" +msgid "bad packed object CRC for %s" +msgstr "Ungültiges CRC für gepacktes Objekt %s." + +#: builtin/pack-objects.c:425 +#, c-format +msgid "corrupt packed object for %s" +msgstr "Fehlerhaftes gepacktes Objekt für %s." + +#: builtin/pack-objects.c:556 +#, c-format +msgid "recursive delta detected for object %s" +msgstr "Rekursiver Unterschied für Objekt %s festgestellt." -#: builtin/pack-objects.c:810 +#: builtin/pack-objects.c:756 +#, c-format +msgid "ordered %u objects, expected %<PRIu32>" +msgstr "%u Objekte geordnet, %<PRIu32> erwartet." + +#: builtin/pack-objects.c:769 +#, c-format +msgid "packfile is invalid: %s" +msgstr "Packdatei ist ungültig: %s" + +#: builtin/pack-objects.c:773 +#, c-format +msgid "unable to open packfile for reuse: %s" +msgstr "Konnte Packdatei nicht zur Wiederverwendung öffnen: %s" + +#: builtin/pack-objects.c:777 +msgid "unable to seek in reused packfile" +msgstr "Konnte \"seek\" nicht in wiederverwendeter Packdatei ausführen." + +#: builtin/pack-objects.c:788 +msgid "unable to read from reused packfile" +msgstr "Konnte nicht von wiederverwendeter Packdatei lesen." + +#: builtin/pack-objects.c:816 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "" "Deaktiviere Schreiben der Bitmap, Pakete wurden durch pack.packSizeLimit\n" "aufgetrennt." -#: builtin/pack-objects.c:823 +#: builtin/pack-objects.c:829 msgid "Writing objects" msgstr "Schreibe Objekte" -#: builtin/pack-objects.c:1106 +#: builtin/pack-objects.c:891 builtin/update-index.c:88 +#, c-format +msgid "failed to stat %s" +msgstr "Konnte '%s' nicht lesen" + +#: builtin/pack-objects.c:944 +#, c-format +msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" +msgstr "Schrieb %<PRIu32> Objekte während %<PRIu32> erwartet waren." + +#: builtin/pack-objects.c:1112 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" "Deaktiviere Schreiben der Bitmap, da einige Objekte nicht in eine Pack-" "Datei\n" "geschrieben wurden." -#: builtin/pack-objects.c:1765 +#: builtin/pack-objects.c:1489 +#, c-format +msgid "delta base offset overflow in pack for %s" +msgstr "\"delta base offset\" Überlauf in Paket für %s" + +#: builtin/pack-objects.c:1498 +#, c-format +msgid "delta base offset out of bound for %s" +msgstr "\"delta base offset\" liegt außerhalb des gültigen Bereichs für %s" + +#: builtin/pack-objects.c:1771 msgid "Counting objects" msgstr "Zähle Objekte" -#: builtin/pack-objects.c:1895 +#: builtin/pack-objects.c:1913 #, c-format msgid "unable to get size of %s" msgstr "Konnte Größe von %s nicht bestimmen." -#: builtin/pack-objects.c:1910 +#: builtin/pack-objects.c:1928 #, c-format msgid "unable to parse object header of %s" msgstr "Konnte Kopfbereich von Objekt '%s' nicht parsen." -#: builtin/pack-objects.c:2564 +#: builtin/pack-objects.c:1995 builtin/pack-objects.c:2011 +#: builtin/pack-objects.c:2021 +#, c-format +msgid "object %s cannot be read" +msgstr "Objekt %s kann nicht gelesen werden." + +#: builtin/pack-objects.c:1998 builtin/pack-objects.c:2025 +#, c-format +msgid "object %s inconsistent object length (%lu vs %lu)" +msgstr "Inkonsistente Objektlänge bei Objekt %s (%lu vs. %lu)" + +#: builtin/pack-objects.c:2035 +msgid "suboptimal pack - out of memory" +msgstr "ungünstiges Packet - Speicher voll" + +#: builtin/pack-objects.c:2366 +#, c-format +msgid "Delta compression using up to %d threads" +msgstr "Delta-Kompression verwendet bis zu %d Threads." + +#: builtin/pack-objects.c:2502 +#, c-format +msgid "unable to pack objects reachable from tag %s" +msgstr "Konnte keine Objekte packen, die von Tag %s erreichbar sind." + +#: builtin/pack-objects.c:2586 msgid "Compressing objects" msgstr "Komprimiere Objekte" -#: builtin/pack-objects.c:2735 +#: builtin/pack-objects.c:2592 +msgid "inconsistency with delta count" +msgstr "Inkonsistenz mit der Anzahl von Deltas" + +#: builtin/pack-objects.c:2671 +#, c-format +msgid "" +"expected edge object ID, got garbage:\n" +" %s" +msgstr "" +"Erwartete Randobjekt-ID, erhielt nutzlose Daten:\n" +" %s" + +#: builtin/pack-objects.c:2677 +#, c-format +msgid "" +"expected object ID, got garbage:\n" +" %s" +msgstr "" +"Erwartete Objekt-ID, erhielt nutzlose Daten:\n" +" %s" + +#: builtin/pack-objects.c:2757 msgid "invalid value for --missing" msgstr "Ungültiger Wert für --missing." -#: builtin/pack-objects.c:3067 +#: builtin/pack-objects.c:2816 builtin/pack-objects.c:2924 +msgid "cannot open pack index" +msgstr "Kann Paketindex nicht öffnen." + +#: builtin/pack-objects.c:2847 +#, c-format +msgid "loose object at %s could not be examined" +msgstr "Loses Objekt bei %s konnte nicht untersucht werden." + +#: builtin/pack-objects.c:2932 +msgid "unable to force loose object" +msgstr "Konnte loses Objekt nicht erzwingen." + +#: builtin/pack-objects.c:3019 +#, c-format +msgid "not a rev '%s'" +msgstr "'%s' ist kein Commit." + +#: builtin/pack-objects.c:3022 +#, c-format +msgid "bad revision '%s'" +msgstr "Ungültiger Commit '%s'." + +#: builtin/pack-objects.c:3042 +msgid "unable to add recent objects" +msgstr "Konnte jüngste Objekte nicht hinzufügen." + +#: builtin/pack-objects.c:3092 #, c-format msgid "unsupported index version %s" msgstr "Nicht unterstützte Index-Version %s" -#: builtin/pack-objects.c:3071 +#: builtin/pack-objects.c:3096 #, c-format msgid "bad index version '%s'" msgstr "Ungültige Index-Version '%s'" -#: builtin/pack-objects.c:3102 +#: builtin/pack-objects.c:3127 msgid "do not show progress meter" msgstr "keine Fortschrittsanzeige anzeigen" -#: builtin/pack-objects.c:3104 +#: builtin/pack-objects.c:3129 msgid "show progress meter" msgstr "Fortschrittsanzeige anzeigen" -#: builtin/pack-objects.c:3106 +#: builtin/pack-objects.c:3131 msgid "show progress meter during object writing phase" msgstr "Forschrittsanzeige während des Schreibens von Objekten anzeigen" -#: builtin/pack-objects.c:3109 +#: builtin/pack-objects.c:3134 msgid "similar to --all-progress when progress meter is shown" msgstr "ähnlich zu --all-progress wenn Fortschrittsanzeige darstellt wird" -#: builtin/pack-objects.c:3110 -msgid "version[,offset]" -msgstr "version[,offset]" +#: builtin/pack-objects.c:3135 +msgid "<version>[,<offset>]" +msgstr "<Version>[,<Offset>]" -#: builtin/pack-objects.c:3111 +#: builtin/pack-objects.c:3136 msgid "write the pack index file in the specified idx format version" msgstr "" "die Index-Datei des Paketes in der angegebenen Indexformat-Version schreiben" -#: builtin/pack-objects.c:3114 +#: builtin/pack-objects.c:3139 msgid "maximum size of each output pack file" msgstr "maximale Größe für jede ausgegebene Paketdatei" -#: builtin/pack-objects.c:3116 +#: builtin/pack-objects.c:3141 msgid "ignore borrowed objects from alternate object store" msgstr "geliehene Objekte von alternativem Objektspeicher ignorieren" -#: builtin/pack-objects.c:3118 +#: builtin/pack-objects.c:3143 msgid "ignore packed objects" msgstr "gepackte Objekte ignorieren" -#: builtin/pack-objects.c:3120 +#: builtin/pack-objects.c:3145 msgid "limit pack window by objects" msgstr "Paketfenster durch Objekte begrenzen" -#: builtin/pack-objects.c:3122 +#: builtin/pack-objects.c:3147 msgid "limit pack window by memory in addition to object limit" msgstr "" "Paketfenster, zusätzlich zur Objektbegrenzung, durch Speicher begrenzen" -#: builtin/pack-objects.c:3124 +#: builtin/pack-objects.c:3149 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "" "maximale Länge der erlaubten Differenzverkettung im resultierenden Paket" -#: builtin/pack-objects.c:3126 +#: builtin/pack-objects.c:3151 msgid "reuse existing deltas" msgstr "existierende Unterschiede wiederverwenden" -#: builtin/pack-objects.c:3128 +#: builtin/pack-objects.c:3153 msgid "reuse existing objects" msgstr "existierende Objekte wiederverwenden" -#: builtin/pack-objects.c:3130 +#: builtin/pack-objects.c:3155 msgid "use OFS_DELTA objects" msgstr "OFS_DELTA Objekte verwenden" -#: builtin/pack-objects.c:3132 +#: builtin/pack-objects.c:3157 msgid "use threads when searching for best delta matches" msgstr "" "Threads bei der Suche nach den besten Übereinstimmungen bei Unterschieden " "verwenden" -#: builtin/pack-objects.c:3134 +#: builtin/pack-objects.c:3159 msgid "do not create an empty pack output" msgstr "keine leeren Pakete erzeugen" -#: builtin/pack-objects.c:3136 +#: builtin/pack-objects.c:3161 msgid "read revision arguments from standard input" msgstr "Argumente bezüglich Commits von der Standard-Eingabe lesen" -#: builtin/pack-objects.c:3138 +#: builtin/pack-objects.c:3163 msgid "limit the objects to those that are not yet packed" msgstr "die Objekte zu solchen, die noch nicht gepackt wurden, begrenzen" -#: builtin/pack-objects.c:3141 +#: builtin/pack-objects.c:3166 msgid "include objects reachable from any reference" msgstr "Objekte einschließen, die von jeder Referenz erreichbar sind" -#: builtin/pack-objects.c:3144 +#: builtin/pack-objects.c:3169 msgid "include objects referred by reflog entries" msgstr "" "Objekte einschließen, die von Einträgen des Reflogs referenziert werden" -#: builtin/pack-objects.c:3147 +#: builtin/pack-objects.c:3172 msgid "include objects referred to by the index" msgstr "Objekte einschließen, die vom Index referenziert werden" -#: builtin/pack-objects.c:3150 +#: builtin/pack-objects.c:3175 msgid "output pack to stdout" msgstr "Paket in die Standard-Ausgabe schreiben" -#: builtin/pack-objects.c:3152 +#: builtin/pack-objects.c:3177 msgid "include tag objects that refer to objects to be packed" msgstr "Tag-Objekte einschließen, die auf gepackte Objekte referenzieren" -#: builtin/pack-objects.c:3154 +#: builtin/pack-objects.c:3179 msgid "keep unreachable objects" msgstr "nicht erreichbare Objekte behalten" -#: builtin/pack-objects.c:3156 +#: builtin/pack-objects.c:3181 msgid "pack loose unreachable objects" msgstr "nicht erreichbare lose Objekte packen" -#: builtin/pack-objects.c:3158 +#: builtin/pack-objects.c:3183 msgid "unpack unreachable objects newer than <time>" msgstr "nicht erreichbare Objekte entpacken, die neuer als <Zeit> sind" -#: builtin/pack-objects.c:3161 +#: builtin/pack-objects.c:3186 msgid "create thin packs" msgstr "dünnere Pakete erzeugen" -#: builtin/pack-objects.c:3163 +#: builtin/pack-objects.c:3188 msgid "create packs suitable for shallow fetches" msgstr "" "Pakete geeignet für Abholung mit unvollständiger Historie (shallow) erzeugen" -#: builtin/pack-objects.c:3165 +#: builtin/pack-objects.c:3190 msgid "ignore packs that have companion .keep file" msgstr "Pakete ignorieren, die .keep Dateien haben" -#: builtin/pack-objects.c:3167 +#: builtin/pack-objects.c:3192 msgid "ignore this pack" msgstr "dieses Paket ignorieren" -#: builtin/pack-objects.c:3169 +#: builtin/pack-objects.c:3194 msgid "pack compression level" msgstr "Komprimierungsgrad für Paketierung" -#: builtin/pack-objects.c:3171 +#: builtin/pack-objects.c:3196 msgid "do not hide commits by grafts" msgstr "keine künstlichen Vorgänger-Commits (\"grafts\") verbergen" -#: builtin/pack-objects.c:3173 +#: builtin/pack-objects.c:3198 msgid "use a bitmap index if available to speed up counting objects" msgstr "" "Bitmap-Index (falls verfügbar) zur Optimierung der Objektzählung benutzen" -#: builtin/pack-objects.c:3175 +#: builtin/pack-objects.c:3200 msgid "write a bitmap index together with the pack index" msgstr "Bitmap-Index zusammen mit Pack-Index schreiben" -#: builtin/pack-objects.c:3178 +#: builtin/pack-objects.c:3203 msgid "handling for missing objects" msgstr "Behandlung für fehlende Objekte" -#: builtin/pack-objects.c:3181 +#: builtin/pack-objects.c:3206 msgid "do not pack objects in promisor packfiles" msgstr "" "keine Objekte aus Packdateien von partiell geklonten Remote-Repositories " "packen" -#: builtin/pack-objects.c:3205 +#: builtin/pack-objects.c:3230 #, c-format msgid "delta chain depth %d is too deep, forcing %d" msgstr "Tiefe für Verkettung von Unterschieden %d ist zu tief, erzwinge %d" -#: builtin/pack-objects.c:3210 +#: builtin/pack-objects.c:3235 #, c-format msgid "pack.deltaCacheLimit is too high, forcing %d" msgstr "pack.deltaCacheLimit ist zu hoch, erzwinge %d" -#: builtin/pack-objects.c:3338 +#: builtin/pack-objects.c:3291 +msgid "--max-pack-size cannot be used to build a pack for transfer" +msgstr "" +"--max-pack-size kann nicht für die Erstellung eines Pakets für eine Übertragung\n" +"benutzt werden." + +#: builtin/pack-objects.c:3293 +msgid "minimum pack size limit is 1 MiB" +msgstr "Minimales Limit für die Paketgröße ist 1 MiB." + +#: builtin/pack-objects.c:3298 +msgid "--thin cannot be used to build an indexable pack" +msgstr "--thin kann nicht benutzt werden, um ein indizierbares Paket zu erstellen." + +#: builtin/pack-objects.c:3301 +msgid "--keep-unreachable and --unpack-unreachable are incompatible" +msgstr "--keep-unreachable und --unpack-unreachable sind inkompatibel" + +#: builtin/pack-objects.c:3307 +msgid "cannot use --filter without --stdout" +msgstr "Kann --filter nicht ohne --stdout benutzen." + +#: builtin/pack-objects.c:3363 msgid "Enumerating objects" msgstr "Objekte aufzählen" +#: builtin/pack-objects.c:3382 +#, c-format +msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)" +msgstr "Gesamt %<PRIu32> (Delta %<PRIu32>), Wiederverwendet %<PRIu32> (Delta %<PRIu32>)" + #: builtin/pack-refs.c:7 msgid "git pack-refs [<options>]" msgstr "git pack-refs [<Optionen>]" @@ -12341,33 +13908,33 @@ msgstr "alles packen" msgid "prune loose refs (default)" msgstr "lose Referenzen entfernen (Standard)" -#: builtin/prune-packed.c:8 +#: builtin/prune-packed.c:9 msgid "git prune-packed [-n | --dry-run] [-q | --quiet]" msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]" -#: builtin/prune-packed.c:41 +#: builtin/prune-packed.c:42 msgid "Removing duplicate objects" msgstr "Lösche doppelte Objekte" -#: builtin/prune.c:11 +#: builtin/prune.c:12 msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--progress] [--expire <Zeit>] [--] [<Branch>...]" -#: builtin/prune.c:108 +#: builtin/prune.c:109 msgid "report pruned objects" msgstr "gelöschte Objekte melden" -#: builtin/prune.c:111 +#: builtin/prune.c:112 msgid "expire objects older than <time>" msgstr "Objekte älter als <Zeit> verfallen lassen" -#: builtin/prune.c:113 +#: builtin/prune.c:114 msgid "limit traversal to objects outside promisor packfiles" msgstr "" "Traversierung auf Objekte außerhalb von Packdateien aus partiell geklonten " "Remote-Repositories einschränken" -#: builtin/prune.c:127 +#: builtin/prune.c:128 msgid "cannot prune in a precious-objects repo" msgstr "kann \"prune\" in precious-objects Repository nicht ausführen" @@ -12392,7 +13959,7 @@ msgstr "Optionen bezogen auf Merge" msgid "incorporate changes by rebasing rather than merging" msgstr "Integration von Änderungen durch Rebase statt Merge" -#: builtin/pull.c:166 builtin/rebase--helper.c:23 builtin/revert.c:121 +#: builtin/pull.c:166 builtin/rebase--helper.c:23 builtin/revert.c:122 msgid "allow fast-forward" msgstr "Vorspulen erlauben" @@ -12471,7 +14038,7 @@ msgstr "Siehe git-pull(1) für weitere Details." msgid "<remote>" msgstr "<Remote-Repository>" -#: builtin/pull.c:438 builtin/pull.c:453 builtin/pull.c:458 git-rebase.sh:523 +#: builtin/pull.c:438 builtin/pull.c:453 builtin/pull.c:458 git-rebase.sh:576 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "<Branch>" @@ -12498,29 +14065,29 @@ msgstr "" "des Remote-Repositories durchzuführen, aber diese Referenz\n" "wurde nicht angefordert." -#: builtin/pull.c:826 +#: builtin/pull.c:829 msgid "ignoring --verify-signatures for rebase" msgstr "Ignoriere --verify-signatures für Rebase" -#: builtin/pull.c:874 +#: builtin/pull.c:877 msgid "--[no-]autostash option is only valid with --rebase." msgstr "--[no-]autostash ist nur mit --rebase zulässig." -#: builtin/pull.c:882 +#: builtin/pull.c:885 msgid "Updating an unborn branch with changes added to the index." msgstr "" "Aktualisiere einen ungeborenen Branch mit Änderungen, die zum Commit " "vorgemerkt sind." -#: builtin/pull.c:885 +#: builtin/pull.c:888 msgid "pull with rebase" msgstr "Pull mit Rebase" -#: builtin/pull.c:886 +#: builtin/pull.c:889 msgid "please commit or stash them." msgstr "Bitte committen Sie die Änderungen oder benutzen Sie \"stash\"." -#: builtin/pull.c:911 +#: builtin/pull.c:914 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -12530,7 +14097,7 @@ msgstr "" "\"fetch\" aktualisierte die Spitze des aktuellen Branches.\n" "Spule Ihr Arbeitsverzeichnis von Commit %s vor." -#: builtin/pull.c:916 +#: builtin/pull.c:919 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -12547,15 +14114,15 @@ msgstr "" "$ git reset --hard\n" "zur Wiederherstellung aus." -#: builtin/pull.c:931 +#: builtin/pull.c:934 msgid "Cannot merge multiple branches into empty head." msgstr "Kann nicht mehrere Branches in einen leeren Branch zusammenführen." -#: builtin/pull.c:935 +#: builtin/pull.c:938 msgid "Cannot rebase onto multiple branches." msgstr "Kann Rebase nicht auf mehrere Branches ausführen." -#: builtin/pull.c:942 +#: builtin/pull.c:945 msgid "cannot rebase with locally recorded submodule modifications" msgstr "" "Kann Rebase nicht mit lokal aufgezeichneten Änderungen in Submodulen " @@ -12786,8 +14353,8 @@ msgid "force updates" msgstr "Aktualisierung erzwingen" #: builtin/push.c:561 builtin/send-pack.c:181 -msgid "refname>:<expect" -msgstr "Referenzname>:<Erwartungswert" +msgid "<refname>:<expect>" +msgstr "<Referenzname>:<Erwartungswert>" #: builtin/push.c:562 builtin/send-pack.c:182 msgid "require old value of ref to be at this value" @@ -12862,6 +14429,39 @@ msgstr "Die Optionen --all und --mirror sind inkompatibel." msgid "push options must not have new line characters" msgstr "Push-Optionen dürfen keine Zeilenvorschubzeichen haben" +#: builtin/range-diff.c:8 +msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>" +msgstr "git range-diff [<Optionen>] <alte-Basis>..<alte-Spitze> <neue-Basis>..<neue-Spitze>" + +#: builtin/range-diff.c:9 +msgid "git range-diff [<options>] <old-tip>...<new-tip>" +msgstr "git range-diff [<Optionen>] <alte-Spitze>...<neue-Spitze>" + +#: builtin/range-diff.c:10 +msgid "git range-diff [<options>] <base> <old-tip> <new-tip>" +msgstr "git range-diff [<Optionen>] <Basis> <alte-Spitze> <neue-Spitze>" + +#: builtin/range-diff.c:26 +msgid "Percentage by which creation is weighted" +msgstr "Prozentsatz mit welchem Erzeugung gewichtet wird" + +#: builtin/range-diff.c:28 +msgid "use simple diff colors" +msgstr "einfache Diff-Farben benutzen" + +#: builtin/range-diff.c:75 builtin/range-diff.c:79 +#, c-format +msgid "no .. in range: '%s'" +msgstr "Kein .. im Bereich: '%s'" + +#: builtin/range-diff.c:89 +msgid "single arg format must be symmetric range" +msgstr "Format mit einfachem Argument muss symmetrischer Bereich sein." + +#: builtin/range-diff.c:104 +msgid "need two commit ranges" +msgstr "Benötige zwei Commit-Bereiche." + #: builtin/read-tree.c:40 msgid "" "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) " @@ -12945,7 +14545,7 @@ msgstr "git rebase--helper [<Optionen>]" msgid "keep empty commits" msgstr "leere Commits behalten" -#: builtin/rebase--helper.c:26 builtin/revert.c:123 +#: builtin/rebase--helper.c:26 builtin/revert.c:124 msgid "allow commits with empty messages" msgstr "Commits mit leerer Beschreibung erlauben" @@ -12997,11 +14597,11 @@ msgstr "\"exec\"-Befehle in TODO-Liste einfügen" msgid "--[no-]rebase-cousins has no effect without --rebase-merges" msgstr "--[no-]rebase-cousins hat ohne --rebase-merges keine Auswirkung" -#: builtin/receive-pack.c:31 +#: builtin/receive-pack.c:32 msgid "git receive-pack <git-dir>" msgstr "git receive-pack <Git-Verzeichnis>" -#: builtin/receive-pack.c:842 +#: builtin/receive-pack.c:830 msgid "" "By default, updating the current branch in a non-bare repository\n" "is denied, because it will make the index and work tree inconsistent\n" @@ -13033,7 +14633,7 @@ msgstr "" "setzen Sie die Konfigurationsvariable 'receive.denyCurrentBranch' auf\n" "'refuse'." -#: builtin/receive-pack.c:862 +#: builtin/receive-pack.c:850 msgid "" "By default, deleting the current branch is denied, because the next\n" "'git clone' won't result in any file checked out, causing confusion.\n" @@ -13054,24 +14654,24 @@ msgstr "" "\n" "Um diese Meldung zu unterdrücken, setzen Sie die Variable auf 'refuse'." -#: builtin/receive-pack.c:1935 +#: builtin/receive-pack.c:1923 msgid "quiet" msgstr "weniger Ausgaben" -#: builtin/receive-pack.c:1949 +#: builtin/receive-pack.c:1937 msgid "You must specify a directory." msgstr "Sie müssen ein Repository angeben." -#: builtin/reflog.c:532 builtin/reflog.c:537 +#: builtin/reflog.c:536 builtin/reflog.c:541 #, c-format msgid "'%s' is not a valid timestamp" msgstr "'%s' ist kein gültiger Zeitstempel" -#: builtin/remote.c:14 +#: builtin/remote.c:15 msgid "git remote [-v | --verbose]" msgstr "git remote [-v | --verbose]" -#: builtin/remote.c:15 +#: builtin/remote.c:16 msgid "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <name> <url>" @@ -13079,82 +14679,82 @@ msgstr "" "git remote add [-t <Branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <Name> <URL>" -#: builtin/remote.c:16 builtin/remote.c:36 +#: builtin/remote.c:17 builtin/remote.c:37 msgid "git remote rename <old> <new>" msgstr "git remote rename <alt> <neu>" -#: builtin/remote.c:17 builtin/remote.c:41 +#: builtin/remote.c:18 builtin/remote.c:42 msgid "git remote remove <name>" msgstr "git remote remove <Name>" -#: builtin/remote.c:18 builtin/remote.c:46 +#: builtin/remote.c:19 builtin/remote.c:47 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" msgstr "git remote set-head <Name> (-a | --auto | -d | --delete | <Branch>)" -#: builtin/remote.c:19 +#: builtin/remote.c:20 msgid "git remote [-v | --verbose] show [-n] <name>" msgstr "git remote [-v | --verbose] show [-n] <Name>" -#: builtin/remote.c:20 +#: builtin/remote.c:21 msgid "git remote prune [-n | --dry-run] <name>" msgstr "git remote prune [-n | --dry-run] <Name>" -#: builtin/remote.c:21 +#: builtin/remote.c:22 msgid "" "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" msgstr "" "git remote [-v | --verbose] update [-p | --prune] [(<Gruppe> | <Remote>)...]" -#: builtin/remote.c:22 +#: builtin/remote.c:23 msgid "git remote set-branches [--add] <name> <branch>..." msgstr "git remote set-branches [--add] <Name> <Branch>..." -#: builtin/remote.c:23 builtin/remote.c:72 +#: builtin/remote.c:24 builtin/remote.c:73 msgid "git remote get-url [--push] [--all] <name>" msgstr "git remote get-url [--push] [--all] <Name>" -#: builtin/remote.c:24 builtin/remote.c:77 +#: builtin/remote.c:25 builtin/remote.c:78 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" msgstr "git remote set-url [--push] <Name> <neueURL> [<alteURL>]" -#: builtin/remote.c:25 builtin/remote.c:78 +#: builtin/remote.c:26 builtin/remote.c:79 msgid "git remote set-url --add <name> <newurl>" msgstr "git remote set-url --add <Name> <neueURL>" -#: builtin/remote.c:26 builtin/remote.c:79 +#: builtin/remote.c:27 builtin/remote.c:80 msgid "git remote set-url --delete <name> <url>" msgstr "git remote set-url --delete <Name> <URL>" -#: builtin/remote.c:31 +#: builtin/remote.c:32 msgid "git remote add [<options>] <name> <url>" msgstr "git remote add [<Optionen>] <Name> <URL>" -#: builtin/remote.c:51 +#: builtin/remote.c:52 msgid "git remote set-branches <name> <branch>..." msgstr "git remote set-branches <Name> <Branch>..." -#: builtin/remote.c:52 +#: builtin/remote.c:53 msgid "git remote set-branches --add <name> <branch>..." msgstr "git remote set-branches --add <Name> <Branch>..." -#: builtin/remote.c:57 +#: builtin/remote.c:58 msgid "git remote show [<options>] <name>" msgstr "git remote show [<Optionen>] <Name>" -#: builtin/remote.c:62 +#: builtin/remote.c:63 msgid "git remote prune [<options>] <name>" msgstr "git remote prune [<Optionen>] <Name>" -#: builtin/remote.c:67 +#: builtin/remote.c:68 msgid "git remote update [<options>] [<group> | <remote>]..." msgstr "git remote update [<Optionen>] [<Gruppe> | <externesRepository>]..." -#: builtin/remote.c:96 +#: builtin/remote.c:97 #, c-format msgid "Updating %s" msgstr "Aktualisiere %s" -#: builtin/remote.c:128 +#: builtin/remote.c:129 msgid "" "--mirror is dangerous and deprecated; please\n" "\t use --mirror=fetch or --mirror=push instead" @@ -13162,92 +14762,88 @@ msgstr "" "--mirror ist gefährlich und veraltet; bitte\n" "\t benutzen Sie stattdessen --mirror=fetch oder --mirror=push" -#: builtin/remote.c:145 +#: builtin/remote.c:146 #, c-format msgid "unknown mirror argument: %s" msgstr "unbekanntes Argument für Option --mirror: %s" -#: builtin/remote.c:161 +#: builtin/remote.c:162 msgid "fetch the remote branches" msgstr "die Remote-Branches anfordern" -#: builtin/remote.c:163 +#: builtin/remote.c:164 msgid "import all tags and associated objects when fetching" msgstr "alle Tags und verbundene Objekte beim Anfordern importieren" -#: builtin/remote.c:166 +#: builtin/remote.c:167 msgid "or do not fetch any tag at all (--no-tags)" msgstr "oder fordere gar keine Tags an (--no-tags)" -#: builtin/remote.c:168 +#: builtin/remote.c:169 msgid "branch(es) to track" msgstr "Branch(es) zur Übernahme" -#: builtin/remote.c:169 +#: builtin/remote.c:170 msgid "master branch" msgstr "Hauptbranch" -#: builtin/remote.c:170 -msgid "push|fetch" -msgstr "push|fetch" - -#: builtin/remote.c:171 +#: builtin/remote.c:172 msgid "set up remote as a mirror to push to or fetch from" msgstr "" "Aufsetzen des Remote-Repositories als Spiegel-Repository für \"push\" und " "\"fetch\"" -#: builtin/remote.c:183 +#: builtin/remote.c:184 msgid "specifying a master branch makes no sense with --mirror" msgstr "" "Die Option --mirror kann nicht mit der Angabe eines Hauptbranches verwendet " "werden." -#: builtin/remote.c:185 +#: builtin/remote.c:186 msgid "specifying branches to track makes sense only with fetch mirrors" msgstr "" "Die Angabe von zu folgenden Branches kann nur mit dem Anfordern von " "Spiegelarchiven verwendet werden." -#: builtin/remote.c:192 builtin/remote.c:634 +#: builtin/remote.c:193 builtin/remote.c:635 #, c-format msgid "remote %s already exists." msgstr "externes Repository %s existiert bereits" -#: builtin/remote.c:196 builtin/remote.c:638 +#: builtin/remote.c:197 builtin/remote.c:639 #, c-format msgid "'%s' is not a valid remote name" msgstr "'%s' ist kein gültiger Name für ein Remote-Repository" -#: builtin/remote.c:236 +#: builtin/remote.c:237 #, c-format msgid "Could not setup master '%s'" msgstr "Konnte symbolische Referenz für Hauptbranch von '%s' nicht einrichten" -#: builtin/remote.c:342 +#: builtin/remote.c:343 #, c-format msgid "Could not get fetch map for refspec %s" msgstr "Konnte Fetch-Map für Refspec %s nicht bekommen" -#: builtin/remote.c:441 builtin/remote.c:449 +#: builtin/remote.c:442 builtin/remote.c:450 msgid "(matching)" msgstr "(übereinstimmend)" -#: builtin/remote.c:453 +#: builtin/remote.c:454 msgid "(delete)" msgstr "(lösche)" -#: builtin/remote.c:627 builtin/remote.c:762 builtin/remote.c:861 +#: builtin/remote.c:628 builtin/remote.c:764 builtin/remote.c:863 #, c-format msgid "No such remote: %s" msgstr "Kein solches Remote-Repository: %s" -#: builtin/remote.c:644 +#: builtin/remote.c:645 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "Konnte Sektion '%s' in Konfiguration nicht nach '%s' umbenennen" -#: builtin/remote.c:664 +#: builtin/remote.c:665 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -13258,17 +14854,17 @@ msgstr "" "\t%s\n" "\tBitte aktualisieren Sie, falls notwendig, die Konfiguration manuell." -#: builtin/remote.c:700 +#: builtin/remote.c:701 #, c-format msgid "deleting '%s' failed" msgstr "Konnte '%s' nicht löschen" -#: builtin/remote.c:734 +#: builtin/remote.c:735 #, c-format msgid "creating '%s' failed" msgstr "Konnte '%s' nicht erstellen" -#: builtin/remote.c:799 +#: builtin/remote.c:801 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -13284,118 +14880,118 @@ msgstr[1] "" "entfernt;\n" "um diese zu entfernen, benutzen Sie:" -#: builtin/remote.c:813 +#: builtin/remote.c:815 #, c-format msgid "Could not remove config section '%s'" msgstr "Konnte Sektion '%s' nicht aus Konfiguration entfernen" -#: builtin/remote.c:914 +#: builtin/remote.c:916 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " neu (wird bei nächstem \"fetch\" in remotes/%s gespeichert)" -#: builtin/remote.c:917 +#: builtin/remote.c:919 msgid " tracked" msgstr " gefolgt" -#: builtin/remote.c:919 +#: builtin/remote.c:921 msgid " stale (use 'git remote prune' to remove)" msgstr " veraltet (benutzen Sie 'git remote prune' zum Löschen)" -#: builtin/remote.c:921 +#: builtin/remote.c:923 msgid " ???" msgstr " ???" -#: builtin/remote.c:962 +#: builtin/remote.c:964 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "ungültiges branch.%s.merge; kann Rebase nicht auf > 1 Branch ausführen" -#: builtin/remote.c:971 +#: builtin/remote.c:973 #, c-format msgid "rebases interactively onto remote %s" msgstr "interaktiver Rebase auf Remote-Branch %s" -#: builtin/remote.c:973 +#: builtin/remote.c:975 #, c-format msgid "rebases interactively (with merges) onto remote %s" msgstr "interaktiver Rebase (mit Merges) auf Remote-Branch %s" -#: builtin/remote.c:976 +#: builtin/remote.c:978 #, c-format msgid "rebases onto remote %s" msgstr "Rebase auf Remote-Branch %s" -#: builtin/remote.c:980 +#: builtin/remote.c:982 #, c-format msgid " merges with remote %s" msgstr " führt mit Remote-Branch %s zusammen" -#: builtin/remote.c:983 +#: builtin/remote.c:985 #, c-format msgid "merges with remote %s" msgstr "führt mit Remote-Branch %s zusammen" -#: builtin/remote.c:986 +#: builtin/remote.c:988 #, c-format msgid "%-*s and with remote %s\n" msgstr "%-*s und mit Remote-Branch %s\n" -#: builtin/remote.c:1029 +#: builtin/remote.c:1031 msgid "create" msgstr "erstellt" -#: builtin/remote.c:1032 +#: builtin/remote.c:1034 msgid "delete" msgstr "gelöscht" -#: builtin/remote.c:1036 +#: builtin/remote.c:1038 msgid "up to date" msgstr "aktuell" -#: builtin/remote.c:1039 +#: builtin/remote.c:1041 msgid "fast-forwardable" msgstr "vorspulbar" -#: builtin/remote.c:1042 +#: builtin/remote.c:1044 msgid "local out of date" msgstr "lokal nicht aktuell" -#: builtin/remote.c:1049 +#: builtin/remote.c:1051 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s erzwingt Versandt nach %-*s (%s)" -#: builtin/remote.c:1052 +#: builtin/remote.c:1054 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s versendet nach %-*s (%s)" -#: builtin/remote.c:1056 +#: builtin/remote.c:1058 #, c-format msgid " %-*s forces to %s" msgstr " %-*s erzwingt Versand nach %s" -#: builtin/remote.c:1059 +#: builtin/remote.c:1061 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s versendet nach %s" -#: builtin/remote.c:1127 +#: builtin/remote.c:1129 msgid "do not query remotes" msgstr "keine Abfrage von Remote-Repositories" -#: builtin/remote.c:1154 +#: builtin/remote.c:1156 #, c-format msgid "* remote %s" msgstr "* Remote-Repository %s" -#: builtin/remote.c:1155 +#: builtin/remote.c:1157 #, c-format msgid " Fetch URL: %s" msgstr " URL zum Abholen: %s" -#: builtin/remote.c:1156 builtin/remote.c:1172 builtin/remote.c:1311 +#: builtin/remote.c:1158 builtin/remote.c:1174 builtin/remote.c:1313 msgid "(no URL)" msgstr "(keine URL)" @@ -13403,25 +14999,25 @@ msgstr "(keine URL)" #. with the one in " Fetch URL: %s" #. translation. #. -#: builtin/remote.c:1170 builtin/remote.c:1172 +#: builtin/remote.c:1172 builtin/remote.c:1174 #, c-format msgid " Push URL: %s" msgstr " URL zum Versenden: %s" -#: builtin/remote.c:1174 builtin/remote.c:1176 builtin/remote.c:1178 +#: builtin/remote.c:1176 builtin/remote.c:1178 builtin/remote.c:1180 #, c-format msgid " HEAD branch: %s" msgstr " Hauptbranch: %s" -#: builtin/remote.c:1174 +#: builtin/remote.c:1176 msgid "(not queried)" msgstr "(nicht abgefragt)" -#: builtin/remote.c:1176 +#: builtin/remote.c:1178 msgid "(unknown)" msgstr "(unbekannt)" -#: builtin/remote.c:1180 +#: builtin/remote.c:1182 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" @@ -13429,172 +15025,172 @@ msgstr "" " Hauptbranch (externer HEAD ist mehrdeutig, könnte einer der folgenden " "sein):\n" -#: builtin/remote.c:1192 +#: builtin/remote.c:1194 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " Remote-Branch:%s" msgstr[1] " Remote-Branches:%s" -#: builtin/remote.c:1195 builtin/remote.c:1221 +#: builtin/remote.c:1197 builtin/remote.c:1223 msgid " (status not queried)" msgstr " (Zustand nicht abgefragt)" -#: builtin/remote.c:1204 +#: builtin/remote.c:1206 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] " Lokaler Branch konfiguriert für 'git pull':" msgstr[1] " Lokale Branches konfiguriert für 'git pull':" -#: builtin/remote.c:1212 +#: builtin/remote.c:1214 msgid " Local refs will be mirrored by 'git push'" msgstr " Lokale Referenzen werden von 'git push' gespiegelt" -#: builtin/remote.c:1218 +#: builtin/remote.c:1220 #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" msgstr[0] " Lokale Referenz konfiguriert für 'git push'%s:" msgstr[1] " Lokale Referenzen konfiguriert für 'git push'%s:" -#: builtin/remote.c:1239 +#: builtin/remote.c:1241 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "setzt refs/remotes/<Name>/HEAD gemäß dem Remote-Repository" -#: builtin/remote.c:1241 +#: builtin/remote.c:1243 msgid "delete refs/remotes/<name>/HEAD" msgstr "entfernt refs/remotes/<Name>/HEAD" -#: builtin/remote.c:1256 +#: builtin/remote.c:1258 msgid "Cannot determine remote HEAD" msgstr "Kann HEAD des Remote-Repositories nicht bestimmen" -#: builtin/remote.c:1258 +#: builtin/remote.c:1260 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "" "Mehrere Hauptbranches im Remote-Repository. Bitte wählen Sie explizit einen " "aus mit:" -#: builtin/remote.c:1268 +#: builtin/remote.c:1270 #, c-format msgid "Could not delete %s" msgstr "Konnte %s nicht entfernen" -#: builtin/remote.c:1276 +#: builtin/remote.c:1278 #, c-format msgid "Not a valid ref: %s" msgstr "keine gültige Referenz: %s" -#: builtin/remote.c:1278 +#: builtin/remote.c:1280 #, c-format msgid "Could not setup %s" msgstr "Konnte %s nicht einrichten" -#: builtin/remote.c:1296 +#: builtin/remote.c:1298 #, c-format msgid " %s will become dangling!" msgstr " %s wird unreferenziert!" -#: builtin/remote.c:1297 +#: builtin/remote.c:1299 #, c-format msgid " %s has become dangling!" msgstr " %s wurde unreferenziert!" -#: builtin/remote.c:1307 +#: builtin/remote.c:1309 #, c-format msgid "Pruning %s" msgstr "entferne veraltete Branches von %s" -#: builtin/remote.c:1308 +#: builtin/remote.c:1310 #, c-format msgid "URL: %s" msgstr "URL: %s" -#: builtin/remote.c:1324 +#: builtin/remote.c:1326 #, c-format msgid " * [would prune] %s" msgstr " * [würde veralteten Branch entfernen] %s" -#: builtin/remote.c:1327 +#: builtin/remote.c:1329 #, c-format msgid " * [pruned] %s" msgstr "* [veralteten Branch entfernt] %s" -#: builtin/remote.c:1372 +#: builtin/remote.c:1374 msgid "prune remotes after fetching" msgstr "entferne veraltete Branches im Remote-Repository nach \"fetch\"" -#: builtin/remote.c:1435 builtin/remote.c:1489 builtin/remote.c:1557 +#: builtin/remote.c:1437 builtin/remote.c:1491 builtin/remote.c:1559 #, c-format msgid "No such remote '%s'" msgstr "Kein solches Remote-Repository '%s'" -#: builtin/remote.c:1451 +#: builtin/remote.c:1453 msgid "add branch" msgstr "Branch hinzufügen" -#: builtin/remote.c:1458 +#: builtin/remote.c:1460 msgid "no remote specified" msgstr "kein Remote-Repository angegeben" -#: builtin/remote.c:1475 +#: builtin/remote.c:1477 msgid "query push URLs rather than fetch URLs" msgstr "nur URLs für Push ausgeben" -#: builtin/remote.c:1477 +#: builtin/remote.c:1479 msgid "return all URLs" msgstr "alle URLs ausgeben" -#: builtin/remote.c:1505 +#: builtin/remote.c:1507 #, c-format msgid "no URLs configured for remote '%s'" msgstr "Keine URLs für Remote-Repository '%s' konfiguriert." -#: builtin/remote.c:1531 +#: builtin/remote.c:1533 msgid "manipulate push URLs" msgstr "URLs für \"push\" manipulieren" -#: builtin/remote.c:1533 +#: builtin/remote.c:1535 msgid "add URL" msgstr "URL hinzufügen" -#: builtin/remote.c:1535 +#: builtin/remote.c:1537 msgid "delete URLs" msgstr "URLs löschen" -#: builtin/remote.c:1542 +#: builtin/remote.c:1544 msgid "--add --delete doesn't make sense" msgstr "" "Die Optionen --add und --delete können nicht gemeinsam verwendet werden." -#: builtin/remote.c:1581 +#: builtin/remote.c:1583 #, c-format msgid "Invalid old URL pattern: %s" msgstr "ungültiges altes URL Format: %s" -#: builtin/remote.c:1589 +#: builtin/remote.c:1591 #, c-format msgid "No such URL found: %s" msgstr "Keine solche URL gefunden: %s" -#: builtin/remote.c:1591 +#: builtin/remote.c:1593 msgid "Will not delete all non-push URLs" msgstr "Werde keine URLs entfernen, die nicht für \"push\" bestimmt sind" -#: builtin/remote.c:1607 +#: builtin/remote.c:1609 msgid "be verbose; must be placed before a subcommand" msgstr "erweiterte Ausgaben; muss vor einem Unterbefehl angegeben werden" -#: builtin/remote.c:1638 +#: builtin/remote.c:1640 #, c-format msgid "Unknown subcommand: %s" msgstr "Unbekannter Unterbefehl: %s" -#: builtin/repack.c:18 +#: builtin/repack.c:20 msgid "git repack [<options>]" msgstr "git repack [<Optionen>]" -#: builtin/repack.c:23 +#: builtin/repack.c:25 msgid "" "Incremental repacks are incompatible with bitmap indexes. Use\n" "--no-write-bitmap-index or disable the pack.writebitmaps configuration." @@ -13603,94 +15199,94 @@ msgstr "" "--no-write-bitmap-index oder deaktivieren Sie die pack.writebitmaps\n" "Konfiguration." -#: builtin/repack.c:180 +#: builtin/repack.c:287 msgid "pack everything in a single pack" msgstr "alles in eine einzige Pack-Datei packen" -#: builtin/repack.c:182 +#: builtin/repack.c:289 msgid "same as -a, and turn unreachable objects loose" msgstr "genau wie -a, unerreichbare Objekte werden aber nicht gelöscht" -#: builtin/repack.c:185 +#: builtin/repack.c:292 msgid "remove redundant packs, and run git-prune-packed" msgstr "redundante Pakete entfernen und \"git-prune-packed\" ausführen" -#: builtin/repack.c:187 +#: builtin/repack.c:294 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "--no-reuse-delta an git-pack-objects übergeben" -#: builtin/repack.c:189 +#: builtin/repack.c:296 msgid "pass --no-reuse-object to git-pack-objects" msgstr "--no-reuse-object an git-pack-objects übergeben" -#: builtin/repack.c:191 +#: builtin/repack.c:298 msgid "do not run git-update-server-info" msgstr "git-update-server-info nicht ausführen" -#: builtin/repack.c:194 +#: builtin/repack.c:301 msgid "pass --local to git-pack-objects" msgstr "--local an git-pack-objects übergeben" -#: builtin/repack.c:196 +#: builtin/repack.c:303 msgid "write bitmap index" msgstr "Bitmap-Index schreiben" -#: builtin/repack.c:197 +#: builtin/repack.c:304 msgid "approxidate" msgstr "Datumsangabe" -#: builtin/repack.c:198 +#: builtin/repack.c:305 msgid "with -A, do not loosen objects older than this" msgstr "mit -A, keine Objekte älter als dieses Datum löschen" -#: builtin/repack.c:200 +#: builtin/repack.c:307 msgid "with -a, repack unreachable objects" msgstr "mit -a, nicht erreichbare Objekte neu packen" -#: builtin/repack.c:202 +#: builtin/repack.c:309 msgid "size of the window used for delta compression" msgstr "Größe des Fensters für die Delta-Kompression" -#: builtin/repack.c:203 builtin/repack.c:209 +#: builtin/repack.c:310 builtin/repack.c:316 msgid "bytes" msgstr "Bytes" -#: builtin/repack.c:204 +#: builtin/repack.c:311 msgid "same as the above, but limit memory size instead of entries count" msgstr "" "gleiches wie oben, aber die Speichergröße anstatt der\n" "Anzahl der Einträge limitieren" -#: builtin/repack.c:206 +#: builtin/repack.c:313 msgid "limits the maximum delta depth" msgstr "die maximale Delta-Tiefe limitieren" -#: builtin/repack.c:208 +#: builtin/repack.c:315 msgid "limits the maximum number of threads" msgstr "maximale Anzahl von Threads limitieren" -#: builtin/repack.c:210 +#: builtin/repack.c:317 msgid "maximum size of each packfile" msgstr "maximale Größe für jede Paketdatei" -#: builtin/repack.c:212 +#: builtin/repack.c:319 msgid "repack objects in packs marked with .keep" msgstr "" "Objekte umpacken, die sich in mit .keep markierten Pack-Dateien befinden" -#: builtin/repack.c:214 +#: builtin/repack.c:321 msgid "do not repack this pack" msgstr "dieses Paket nicht neu packen" -#: builtin/repack.c:224 +#: builtin/repack.c:331 msgid "cannot delete packs in a precious-objects repo" msgstr "kann Pack-Dateien in precious-objects Repository nicht löschen" -#: builtin/repack.c:228 +#: builtin/repack.c:335 msgid "--keep-unreachable and -A are incompatible" msgstr "--keep-unreachable und -A sind inkompatibel" -#: builtin/repack.c:425 builtin/worktree.c:139 +#: builtin/repack.c:510 builtin/worktree.c:140 #, c-format msgid "failed to remove '%s'" msgstr "Fehler beim Löschen von '%s'" @@ -13719,10 +15315,110 @@ msgstr "git replace -d <Objekt>..." msgid "git replace [--format=<format>] [-l [<pattern>]]" msgstr "git replace [--format=<Format>] [-l [<Muster>]]" -#: builtin/replace.c:371 builtin/replace.c:415 builtin/replace.c:445 +#: builtin/replace.c:57 builtin/replace.c:203 builtin/replace.c:206 #, c-format -msgid "Not a valid object name: '%s'" -msgstr "Ungültiger Objekt-Name: '%s'" +msgid "failed to resolve '%s' as a valid ref" +msgstr "Konnte '%s' nicht als gültige Referenz auflösen." + +#: builtin/replace.c:86 +#, c-format +msgid "" +"invalid replace format '%s'\n" +"valid formats are 'short', 'medium' and 'long'" +msgstr "" +"Ungültiges Ersetzungsformat '%s'\n" +"Gültige Formate sind 'short', 'medium' und 'long'." + +#: builtin/replace.c:121 +#, c-format +msgid "replace ref '%s' not found" +msgstr "Ersetzende Referenz '%s' nicht gefunden." + +#: builtin/replace.c:137 +#, c-format +msgid "Deleted replace ref '%s'" +msgstr "Ersetzende Referenz '%s' gelöscht." + +#: builtin/replace.c:149 +#, c-format +msgid "'%s' is not a valid ref name" +msgstr "'%s' ist kein gültiger Referenzname." + +#: builtin/replace.c:154 +#, c-format +msgid "replace ref '%s' already exists" +msgstr "Ersetzende Referenz '%s' existiert bereits." + +#: builtin/replace.c:174 +#, c-format +msgid "" +"Objects must be of the same type.\n" +"'%s' points to a replaced object of type '%s'\n" +"while '%s' points to a replacement object of type '%s'." +msgstr "" +"Objekte müssen vom selben Typ sein.\n" +"'%s' zeigt auf ein ersetztes Objekt vom Typ '%s'\n" +"während '%s' auf ein ersetzendes Objekt vom Typ '%s'\n" +"zeigt." + +#: builtin/replace.c:225 +#, c-format +msgid "unable to open %s for writing" +msgstr "Konnte '%s' nicht zum Schreiben öffnen." + +#: builtin/replace.c:238 +msgid "cat-file reported failure" +msgstr "cat-file meldete Fehler." + +#: builtin/replace.c:254 +#, c-format +msgid "unable to open %s for reading" +msgstr "Konnte '%s' nicht zum Lesen öffnen." + +#: builtin/replace.c:268 +msgid "unable to spawn mktree" +msgstr "Konnte mktree nicht ausführen." + +#: builtin/replace.c:272 +msgid "unable to read from mktree" +msgstr "Konnte nicht von mktree lesen." + +#: builtin/replace.c:281 +msgid "mktree reported failure" +msgstr "mktree meldete Fehler." + +#: builtin/replace.c:285 +msgid "mktree did not return an object name" +msgstr "mktree lieferte keinen Objektnamen zurück." + +#: builtin/replace.c:294 +#, c-format +msgid "unable to fstat %s" +msgstr "Kann fstat auf %s nicht ausführen." + +#: builtin/replace.c:299 +msgid "unable to write object to database" +msgstr "Konnte Objekt nicht in Datenbank schreiben." + +#: builtin/replace.c:318 builtin/replace.c:371 builtin/replace.c:415 +#: builtin/replace.c:445 +#, c-format +msgid "not a valid object name: '%s'" +msgstr "Kein gültiger Objektname: '%s'" + +#: builtin/replace.c:322 +#, c-format +msgid "unable to get object type for %s" +msgstr "Konnte Objektart von %s nicht bestimmten." + +#: builtin/replace.c:338 +msgid "editing object file failed" +msgstr "Bearbeiten von Objektdatei fehlgeschlagen." + +#: builtin/replace.c:347 +#, c-format +msgid "new object is the same as the old one: '%s'" +msgstr "Neues Objekt ist dasselbe wie das alte: '%s'" #: builtin/replace.c:407 #, c-format @@ -13745,8 +15441,8 @@ msgstr "" #: builtin/replace.c:460 #, c-format -msgid "the original commit '%s' has a gpg signature." -msgstr "Der ursprüngliche Commit '%s' hat eine GPG-Signatur." +msgid "the original commit '%s' has a gpg signature" +msgstr "Der originale Commit '%s' hat eine GPG-Signatur." #: builtin/replace.c:461 msgid "the signature will be removed in the replacement commit!" @@ -13757,6 +15453,16 @@ msgstr "Die Signatur wird in dem Ersetzungs-Commit entfernt!" msgid "could not write replacement commit for: '%s'" msgstr "Konnte Ersetzungs-Commit für '%s' nicht schreiben" +#: builtin/replace.c:479 +#, c-format +msgid "graft for '%s' unnecessary" +msgstr "Künstlicher Vorgänger (\"graft\") für '%s' nicht notwendig." + +#: builtin/replace.c:482 +#, c-format +msgid "new commit is the same as the old one: '%s'" +msgstr "Neuer Commit ist derselbe wie der alte: '%s'" + #: builtin/replace.c:514 #, c-format msgid "" @@ -13798,6 +15504,42 @@ msgstr "keine ansprechende Anzeige des Objektinhaltes für --edit" msgid "use this format" msgstr "das angegebene Format benutzen" +#: builtin/replace.c:556 +msgid "--format cannot be used when not listing" +msgstr "--format kann nicht beim Auflisten verwendet werden." + +#: builtin/replace.c:564 +msgid "-f only makes sense when writing a replacement" +msgstr "-f macht nur beim Schreiben einer Ersetzung Sinn." + +#: builtin/replace.c:568 +msgid "--raw only makes sense with --edit" +msgstr "--raw macht nur mit --edit Sinn." + +#: builtin/replace.c:574 +msgid "-d needs at least one argument" +msgstr "-d benötigt mindestens ein Argument." + +#: builtin/replace.c:580 +msgid "bad number of arguments" +msgstr "Ungültige Anzahl von Argumenten." + +#: builtin/replace.c:586 +msgid "-e needs exactly one argument" +msgstr "-e benötigt genau ein Argument." + +#: builtin/replace.c:592 +msgid "-g needs at least one argument" +msgstr "-g benötigt mindestens ein Argument." + +#: builtin/replace.c:598 +msgid "--convert-graft-file takes no argument" +msgstr "--convert-graft-file erwartet keine Argumente" + +#: builtin/replace.c:604 +msgid "only one pattern can be given with -l" +msgstr "Mit -l kann nur ein Muster angegeben werden." + #: builtin/rerere.c:13 msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]" msgstr "git rerere [clean | forget <Pfad>... | status | remaining | diff | gc]" @@ -13934,47 +15676,47 @@ msgstr "Konnte Index-Datei nicht zu Commit '%s' setzen." msgid "Could not write new index file." msgstr "Konnte neue Index-Datei nicht schreiben." -#: builtin/rev-list.c:397 +#: builtin/rev-list.c:399 msgid "cannot combine --exclude-promisor-objects and --missing" msgstr "" "--exclude-promisor-objects und --missing können nicht kombiniert werden." -#: builtin/rev-list.c:455 +#: builtin/rev-list.c:457 msgid "object filtering requires --objects" msgstr "Das Filtern von Objekten erfordert --objects." -#: builtin/rev-list.c:458 +#: builtin/rev-list.c:460 #, c-format msgid "invalid sparse value '%s'" msgstr "Ungültiger \"sparse\"-Wert '%s'." -#: builtin/rev-list.c:499 +#: builtin/rev-list.c:501 msgid "rev-list does not support display of notes" msgstr "rev-list unterstützt keine Anzeige von Notizen" -#: builtin/rev-list.c:502 +#: builtin/rev-list.c:504 msgid "cannot combine --use-bitmap-index with object filtering" msgstr "" "--use-bitmap-index kann nicht mit dem Filtern von Objekten kombiniert werden." -#: builtin/rev-parse.c:402 +#: builtin/rev-parse.c:406 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" msgstr "git rev-parse --parseopt [<Optionen>] -- [<Argumente>...]" -#: builtin/rev-parse.c:407 +#: builtin/rev-parse.c:411 msgid "keep the `--` passed as an arg" msgstr "`--` als Argument lassen" -#: builtin/rev-parse.c:409 +#: builtin/rev-parse.c:413 msgid "stop parsing after the first non-option argument" msgstr "das Parsen nach dem ersten Argument, was keine Option ist, stoppen" -#: builtin/rev-parse.c:412 +#: builtin/rev-parse.c:416 msgid "output in stuck long form" msgstr "" "Ausgabe in Langform mit Argumenten an den Optionen (getrennt durch '=')" -#: builtin/rev-parse.c:545 +#: builtin/rev-parse.c:549 msgid "" "git rev-parse --parseopt [<options>] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" @@ -13989,84 +15731,84 @@ msgstr "" "Führen Sie \"git rev-parse --parseopt -h\" für weitere Informationen bei " "erster Verwendung aus." -#: builtin/revert.c:23 +#: builtin/revert.c:24 msgid "git revert [<options>] <commit-ish>..." msgstr "git revert [<Optionen>] <Commit-Angabe>..." -#: builtin/revert.c:24 +#: builtin/revert.c:25 msgid "git revert <subcommand>" msgstr "git revert <Unterbefehl>" -#: builtin/revert.c:29 +#: builtin/revert.c:30 msgid "git cherry-pick [<options>] <commit-ish>..." msgstr "git cherry-pick [<Optionen>] <Commit-Angabe>..." -#: builtin/revert.c:30 +#: builtin/revert.c:31 msgid "git cherry-pick <subcommand>" msgstr "git cherry-pick <Unterbefehl>" -#: builtin/revert.c:90 +#: builtin/revert.c:91 #, c-format msgid "%s: %s cannot be used with %s" msgstr "%s: %s kann nicht mit %s verwendet werden" -#: builtin/revert.c:99 +#: builtin/revert.c:100 msgid "end revert or cherry-pick sequence" msgstr "\"revert\" oder \"cherry-pick\" Ablauf beenden" -#: builtin/revert.c:100 +#: builtin/revert.c:101 msgid "resume revert or cherry-pick sequence" msgstr "\"revert\" oder \"cherry-pick\" Ablauf fortsetzen" -#: builtin/revert.c:101 +#: builtin/revert.c:102 msgid "cancel revert or cherry-pick sequence" msgstr "\"revert\" oder \"cherry-pick\" Ablauf abbrechen" -#: builtin/revert.c:102 +#: builtin/revert.c:103 msgid "don't automatically commit" msgstr "nicht automatisch committen" -#: builtin/revert.c:103 +#: builtin/revert.c:104 msgid "edit the commit message" msgstr "Commit-Beschreibung bearbeiten" -#: builtin/revert.c:106 +#: builtin/revert.c:107 msgid "parent-number" msgstr "Nummer des Elternteils" -#: builtin/revert.c:107 +#: builtin/revert.c:108 msgid "select mainline parent" msgstr "Elternteil der Hauptlinie auswählen" -#: builtin/revert.c:109 +#: builtin/revert.c:110 msgid "merge strategy" msgstr "Merge-Strategie" -#: builtin/revert.c:110 +#: builtin/revert.c:111 msgid "option" msgstr "Option" -#: builtin/revert.c:111 +#: builtin/revert.c:112 msgid "option for merge strategy" msgstr "Option für Merge-Strategie" -#: builtin/revert.c:120 +#: builtin/revert.c:121 msgid "append commit name" msgstr "Commit-Namen anhängen" -#: builtin/revert.c:122 +#: builtin/revert.c:123 msgid "preserve initially empty commits" msgstr "ursprüngliche, leere Commits erhalten" -#: builtin/revert.c:124 +#: builtin/revert.c:125 msgid "keep redundant, empty commits" msgstr "redundante, leere Commits behalten" -#: builtin/revert.c:214 +#: builtin/revert.c:219 msgid "revert failed" msgstr "\"revert\" fehlgeschlagen" -#: builtin/revert.c:227 +#: builtin/revert.c:232 msgid "cherry-pick failed" msgstr "\"cherry-pick\" fehlgeschlagen" @@ -14138,6 +15880,12 @@ msgstr "rekursives Entfernen erlauben" msgid "exit with a zero status even if nothing matched" msgstr "mit Rückgabewert 0 beenden, wenn keine Übereinstimmung gefunden wurde" +#: builtin/rm.c:288 +msgid "please stage your changes to .gitmodules or stash them to proceed" +msgstr "" +"Bitte merken Sie Ihre Änderungen in .gitmodules zum Commit vor oder\n" +"benutzen Sie \"stash\", um fortzufahren." + #: builtin/rm.c:306 #, c-format msgid "not removing '%s' recursively without -r" @@ -14219,18 +15967,18 @@ msgid "Show the email address of each author" msgstr "die E-Mail-Adresse von jedem Autor anzeigen" #: builtin/shortlog.c:271 -msgid "w[,i1[,i2]]" -msgstr "w[,i1[,i2]]" +msgid "<w>[,<i1>[,<i2>]]" +msgstr "<w>[,<i1>[,<i2>]]" #: builtin/shortlog.c:272 msgid "Linewrap output" msgstr "Ausgabe mit Zeilenumbrüchen" -#: builtin/shortlog.c:298 +#: builtin/shortlog.c:299 msgid "too many arguments given outside repository" msgstr "zu viele Argumente außerhalb des Repositories angegeben" -#: builtin/show-branch.c:12 +#: builtin/show-branch.c:13 msgid "" "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" "\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n" @@ -14242,132 +15990,132 @@ msgstr "" "\t\t[--more=<n> | --list | --independent | --merge-base]\n" "\t\t[--no-name | --sha1-name] [--topics] [(<Commit> | <glob>)...]" -#: builtin/show-branch.c:16 +#: builtin/show-branch.c:17 msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" msgstr "git show-branch (-g | --reflog)[=<n>[,<Basis>]] [--list] [<Referenz>]" -#: builtin/show-branch.c:376 +#: builtin/show-branch.c:395 #, c-format msgid "ignoring %s; cannot handle more than %d ref" msgid_plural "ignoring %s; cannot handle more than %d refs" msgstr[0] "ignoriere %s; kann nicht mehr als %d Referenz behandeln" msgstr[1] "ignoriere %s; kann nicht mehr als %d Referenzen behandeln" -#: builtin/show-branch.c:530 +#: builtin/show-branch.c:549 #, c-format msgid "no matching refs with %s" msgstr "keine übereinstimmenden Referenzen mit %s" -#: builtin/show-branch.c:626 +#: builtin/show-branch.c:645 msgid "show remote-tracking and local branches" msgstr "Remote-Tracking und lokale Branches anzeigen" -#: builtin/show-branch.c:628 +#: builtin/show-branch.c:647 msgid "show remote-tracking branches" msgstr "Remote-Tracking-Branches anzeigen" -#: builtin/show-branch.c:630 +#: builtin/show-branch.c:649 msgid "color '*!+-' corresponding to the branch" msgstr "'*!+-' entsprechend des Branches einfärben" -#: builtin/show-branch.c:632 +#: builtin/show-branch.c:651 msgid "show <n> more commits after the common ancestor" msgstr "<n> weitere Commits nach dem gemeinsamen Vorgänger-Commit anzeigen" -#: builtin/show-branch.c:634 +#: builtin/show-branch.c:653 msgid "synonym to more=-1" msgstr "Synonym für more=-1" -#: builtin/show-branch.c:635 +#: builtin/show-branch.c:654 msgid "suppress naming strings" msgstr "Namen unterdrücken" -#: builtin/show-branch.c:637 +#: builtin/show-branch.c:656 msgid "include the current branch" msgstr "den aktuellen Branch einbeziehen" -#: builtin/show-branch.c:639 +#: builtin/show-branch.c:658 msgid "name commits with their object names" msgstr "Commits nach ihren Objektnamen benennen" -#: builtin/show-branch.c:641 +#: builtin/show-branch.c:660 msgid "show possible merge bases" msgstr "mögliche Merge-Basen anzeigen" -#: builtin/show-branch.c:643 +#: builtin/show-branch.c:662 msgid "show refs unreachable from any other ref" msgstr "" "Referenzen, die unerreichbar von allen anderen Referenzen sind, anzeigen" -#: builtin/show-branch.c:645 +#: builtin/show-branch.c:664 msgid "show commits in topological order" msgstr "Commits in topologischer Ordnung anzeigen" -#: builtin/show-branch.c:648 +#: builtin/show-branch.c:667 msgid "show only commits not on the first branch" msgstr "nur Commits anzeigen, die sich nicht im ersten Branch befinden" -#: builtin/show-branch.c:650 +#: builtin/show-branch.c:669 msgid "show merges reachable from only one tip" msgstr "Merges anzeigen, die nur von einem Branch aus erreichbar sind" -#: builtin/show-branch.c:652 +#: builtin/show-branch.c:671 msgid "topologically sort, maintaining date order where possible" msgstr "topologische Sortierung, Beibehaltung Datumsordnung wo möglich" -#: builtin/show-branch.c:655 +#: builtin/show-branch.c:674 msgid "<n>[,<base>]" msgstr "<n>[,<Basis>]" -#: builtin/show-branch.c:656 +#: builtin/show-branch.c:675 msgid "show <n> most recent ref-log entries starting at base" msgstr "die <n> jüngsten Einträge im Reflog, beginnend an der Basis, anzeigen" -#: builtin/show-branch.c:690 +#: builtin/show-branch.c:711 msgid "" "--reflog is incompatible with --all, --remotes, --independent or --merge-base" msgstr "" "--reflog ist inkompatibel mit --all, --remotes, --independent oder --merge-" "base" -#: builtin/show-branch.c:714 +#: builtin/show-branch.c:735 msgid "no branches given, and HEAD is not valid" msgstr "keine Branches angegeben, und HEAD ist ungültig" -#: builtin/show-branch.c:717 +#: builtin/show-branch.c:738 msgid "--reflog option needs one branch name" msgstr "Die Option --reflog benötigt einen Branchnamen." -#: builtin/show-branch.c:720 +#: builtin/show-branch.c:741 #, c-format msgid "only %d entry can be shown at one time." msgid_plural "only %d entries can be shown at one time." msgstr[0] "nur %d Eintrag kann zur selben Zeit angezeigt werden" msgstr[1] "nur %d Einträge können zur selben Zeit angezeigt werden" -#: builtin/show-branch.c:724 +#: builtin/show-branch.c:745 #, c-format msgid "no such ref %s" msgstr "Referenz nicht gefunden: %s" -#: builtin/show-branch.c:808 +#: builtin/show-branch.c:829 #, c-format msgid "cannot handle more than %d rev." msgid_plural "cannot handle more than %d revs." msgstr[0] "Kann nicht mehr als %d Commit behandeln." msgstr[1] "Kann nicht mehr als %d Commits behandeln." -#: builtin/show-branch.c:812 +#: builtin/show-branch.c:833 #, c-format msgid "'%s' is not a valid ref." msgstr "'%s' ist keine gültige Referenz." -#: builtin/show-branch.c:815 +#: builtin/show-branch.c:836 #, c-format msgid "cannot find commit %s (%s)" msgstr "kann Commit %s (%s) nicht finden" -#: builtin/show-ref.c:10 +#: builtin/show-ref.c:11 msgid "" "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]" @@ -14375,41 +16123,41 @@ msgstr "" "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<Muster>...] " -#: builtin/show-ref.c:11 +#: builtin/show-ref.c:12 msgid "git show-ref --exclude-existing[=<pattern>]" msgstr "git show-ref --exclude-existing[=<Muster>]" -#: builtin/show-ref.c:159 +#: builtin/show-ref.c:160 msgid "only show tags (can be combined with heads)" msgstr "nur Tags anzeigen (kann mit \"heads\" kombiniert werden)" -#: builtin/show-ref.c:160 +#: builtin/show-ref.c:161 msgid "only show heads (can be combined with tags)" msgstr "nur Branches anzeigen (kann mit \"tags\" kombiniert werden)" -#: builtin/show-ref.c:161 +#: builtin/show-ref.c:162 msgid "stricter reference checking, requires exact ref path" msgstr "strengere Referenzprüfung, erfordert exakten Referenzpfad" -#: builtin/show-ref.c:164 builtin/show-ref.c:166 +#: builtin/show-ref.c:165 builtin/show-ref.c:167 msgid "show the HEAD reference, even if it would be filtered out" msgstr "" "die HEAD-Referenz anzeigen, selbst wenn diese ausgefiltert werden würde" -#: builtin/show-ref.c:168 +#: builtin/show-ref.c:169 msgid "dereference tags into object IDs" msgstr "Tags in Objekt-Identifikationen dereferenzieren" -#: builtin/show-ref.c:170 +#: builtin/show-ref.c:171 msgid "only show SHA1 hash using <n> digits" msgstr "nur SHA1 Hash mit <n> Ziffern anzeigen" -#: builtin/show-ref.c:174 +#: builtin/show-ref.c:175 msgid "do not print results to stdout (useful with --verify)" msgstr "" "keine Ausgabe der Ergebnisse in die Standard-Ausgabe (nützlich mit --verify)" -#: builtin/show-ref.c:176 +#: builtin/show-ref.c:177 msgid "show refs from stdin that aren't in local repository" msgstr "" "Referenzen von der Standard-Eingabe anzeigen, die sich nicht im lokalen " @@ -14433,12 +16181,12 @@ msgstr "" msgid "prepend comment character and space to each line" msgstr "Kommentarzeichen mit Leerzeichen an jede Zeile voranstellen" -#: builtin/submodule--helper.c:37 builtin/submodule--helper.c:1688 +#: builtin/submodule--helper.c:37 builtin/submodule--helper.c:1833 #, c-format msgid "No such ref: %s" msgstr "Referenz nicht gefunden: %s" -#: builtin/submodule--helper.c:44 builtin/submodule--helper.c:1697 +#: builtin/submodule--helper.c:44 builtin/submodule--helper.c:1842 #, c-format msgid "Expecting a full ref name, got %s" msgstr "Vollständiger Referenzname erwartet, %s erhalten" @@ -14447,25 +16195,63 @@ msgstr "Vollständiger Referenzname erwartet, %s erhalten" msgid "submodule--helper print-default-remote takes no arguments" msgstr "'submodule--helper print-default-remote' erwartet keine Argumente." -#: builtin/submodule--helper.c:98 +#: builtin/submodule--helper.c:99 #, c-format msgid "cannot strip one component off url '%s'" msgstr "Kann eine Komponente von URL '%s' nicht extrahieren" -#: builtin/submodule--helper.c:406 builtin/submodule--helper.c:1211 +#: builtin/submodule--helper.c:407 builtin/submodule--helper.c:1356 msgid "alternative anchor for relative paths" msgstr "Alternativer Anker für relative Pfade" -#: builtin/submodule--helper.c:411 +#: builtin/submodule--helper.c:412 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<Pfad>] [<Pfad>...]" -#: builtin/submodule--helper.c:462 builtin/submodule--helper.c:485 +#: builtin/submodule--helper.c:469 builtin/submodule--helper.c:606 +#: builtin/submodule--helper.c:629 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "Keine URL für Submodul-Pfad '%s' in .gitmodules gefunden" -#: builtin/submodule--helper.c:500 +#: builtin/submodule--helper.c:521 +#, c-format +msgid "Entering '%s'\n" +msgstr "Betrete '%s'\n" + +#: builtin/submodule--helper.c:524 +#, c-format +msgid "" +"run_command returned non-zero status for %s\n" +"." +msgstr "" +"run_command gab nicht-Null Status für '%s' zurück.\n" +"." + +#: builtin/submodule--helper.c:545 +#, c-format +msgid "" +"run_command returned non-zero status while recursing in the nested " +"submodules of %s\n" +"." +msgstr "" +"run_command gab während der Rekursion in verschachtelte Submodule von %s einen\n" +"nicht-Null Status zurück.\n" +"." + +#: builtin/submodule--helper.c:561 +msgid "Suppress output of entering each submodule command" +msgstr "Ausgaben beim Betreten und der Befehlsausführung in einem Submodul unterdrücken" + +#: builtin/submodule--helper.c:563 builtin/submodule--helper.c:1040 +msgid "Recurse into nested submodules" +msgstr "Rekursion in verschachtelte Submodule durchführen" + +#: builtin/submodule--helper.c:568 +msgid "git submodule--helper foreach [--quiet] [--recursive] <command>" +msgstr "git submodule--helper foreach [--quiet] [--recursive] <Befehl>" + +#: builtin/submodule--helper.c:644 #, c-format msgid "" "could not lookup configuration '%s'. Assuming this repository is its own " @@ -14475,108 +16261,104 @@ msgstr "" "Repository\n" "sein eigenes verbindliches Upstream-Repository ist." -#: builtin/submodule--helper.c:511 +#: builtin/submodule--helper.c:655 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "" "Fehler beim Eintragen der URL für Submodul-Pfad '%s' in die Konfiguration." -#: builtin/submodule--helper.c:515 +#: builtin/submodule--helper.c:659 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "Submodul '%s' (%s) für Pfad '%s' in die Konfiguration eingetragen.\n" -#: builtin/submodule--helper.c:525 +#: builtin/submodule--helper.c:669 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" msgstr "Warnung: 'update'-Modus für Submodul '%s' vorgeschlagen\n" -#: builtin/submodule--helper.c:532 +#: builtin/submodule--helper.c:676 #, c-format msgid "Failed to register update mode for submodule path '%s'" msgstr "" "Fehler bei Änderung des Aktualisierungsmodus für Submodul-Pfad '%s' in der\n" "Konfiguration." -#: builtin/submodule--helper.c:554 +#: builtin/submodule--helper.c:698 msgid "Suppress output for initializing a submodule" msgstr "Ausgaben bei Initialisierung eines Submoduls unterdrücken" -#: builtin/submodule--helper.c:559 +#: builtin/submodule--helper.c:703 msgid "git submodule--helper init [<path>]" msgstr "git submodule--helper init [<Pfad>]" -#: builtin/submodule--helper.c:631 builtin/submodule--helper.c:757 +#: builtin/submodule--helper.c:775 builtin/submodule--helper.c:901 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "Keine Submodul-Zuordnung in .gitmodules für Pfad '%s' gefunden" -#: builtin/submodule--helper.c:670 +#: builtin/submodule--helper.c:814 #, c-format msgid "could not resolve HEAD ref inside the submodule '%s'" msgstr "Konnte HEAD-Referenz nicht innerhalb des Submodul-Pfads '%s' auflösen." -#: builtin/submodule--helper.c:697 builtin/submodule--helper.c:866 +#: builtin/submodule--helper.c:841 builtin/submodule--helper.c:1010 #, c-format msgid "failed to recurse into submodule '%s'" msgstr "Fehler bei Rekursion in Submodul '%s'." -#: builtin/submodule--helper.c:721 builtin/submodule--helper.c:1031 +#: builtin/submodule--helper.c:865 builtin/submodule--helper.c:1176 msgid "Suppress submodule status output" msgstr "Ausgabe über Submodul-Status unterdrücken" -#: builtin/submodule--helper.c:722 +#: builtin/submodule--helper.c:866 msgid "" "Use commit stored in the index instead of the one stored in the submodule " "HEAD" msgstr "" "Benutze den Commit, der im Index gespeichert ist, statt den im Submodul HEAD" -#: builtin/submodule--helper.c:723 +#: builtin/submodule--helper.c:867 msgid "recurse into nested submodules" msgstr "Rekursion in verschachtelte Submodule durchführen" -#: builtin/submodule--helper.c:728 +#: builtin/submodule--helper.c:872 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" msgstr "git submodule status [--quiet] [--cached] [--recursive] [<Pfad>...]" -#: builtin/submodule--helper.c:752 +#: builtin/submodule--helper.c:896 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name <Pfad>" -#: builtin/submodule--helper.c:816 +#: builtin/submodule--helper.c:960 #, c-format msgid "Synchronizing submodule url for '%s'\n" msgstr "Synchronisiere Submodul-URL für '%s'\n" -#: builtin/submodule--helper.c:822 +#: builtin/submodule--helper.c:966 #, c-format msgid "failed to register url for submodule path '%s'" msgstr "Fehler beim Registrieren der URL für Submodul-Pfad '%s'." -#: builtin/submodule--helper.c:836 +#: builtin/submodule--helper.c:980 #, c-format msgid "failed to get the default remote for submodule '%s'" msgstr "Fehler beim Lesen des Standard-Remote-Repositories für Submodul '%s'." -#: builtin/submodule--helper.c:847 +#: builtin/submodule--helper.c:991 #, c-format msgid "failed to update remote for submodule '%s'" msgstr "Fehler beim Aktualisieren des Remote-Repositories für Submodul '%s'." -#: builtin/submodule--helper.c:895 +#: builtin/submodule--helper.c:1038 msgid "Suppress output of synchronizing submodule url" msgstr "Ausgaben bei der Synchronisierung der Submodul-URLs unterdrücken" -#: builtin/submodule--helper.c:897 -msgid "Recurse into nested submodules" -msgstr "Rekursion in verschachtelte Submodule durchführen" - -#: builtin/submodule--helper.c:902 +#: builtin/submodule--helper.c:1045 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" msgstr "git submodule--helper sync [--quiet] [--recursive] [<Pfad>]" -#: builtin/submodule--helper.c:956 +#: builtin/submodule--helper.c:1099 #, c-format msgid "" "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " @@ -14586,7 +16368,7 @@ msgstr "" "(benutzen Sie 'rm -rf', wenn Sie dieses wirklich mitsamt seiner Historie\n" "löschen möchten)" -#: builtin/submodule--helper.c:968 +#: builtin/submodule--helper.c:1111 #, c-format msgid "" "Submodule work tree '%s' contains local modifications; use '-f' to discard " @@ -14595,84 +16377,84 @@ msgstr "" "Arbeitsverzeichnis von Submodul in '%s' enthält lokale Änderungen;\n" "verwenden Sie '-f', um diese zu verwerfen." -#: builtin/submodule--helper.c:976 +#: builtin/submodule--helper.c:1119 #, c-format msgid "Cleared directory '%s'\n" msgstr "Verzeichnis '%s' bereinigt.\n" -#: builtin/submodule--helper.c:978 +#: builtin/submodule--helper.c:1121 #, c-format msgid "Could not remove submodule work tree '%s'\n" msgstr "Konnte Arbeitsverzeichnis des Submoduls in '%s' nicht löschen.\n" -#: builtin/submodule--helper.c:987 +#: builtin/submodule--helper.c:1132 #, c-format msgid "could not create empty submodule directory %s" msgstr "Konnte kein leeres Verzeichnis für Submodul in '%s' erstellen." -#: builtin/submodule--helper.c:1003 +#: builtin/submodule--helper.c:1148 #, c-format msgid "Submodule '%s' (%s) unregistered for path '%s'\n" msgstr "Submodul '%s' (%s) für Pfad '%s' ausgetragen.\n" -#: builtin/submodule--helper.c:1032 +#: builtin/submodule--helper.c:1177 msgid "Remove submodule working trees even if they contain local changes" msgstr "" "Arbeitsverzeichnisse von Submodulen löschen, auch wenn lokale Änderungen " "vorliegen" -#: builtin/submodule--helper.c:1033 +#: builtin/submodule--helper.c:1178 msgid "Unregister all submodules" msgstr "alle Submodule austragen" -#: builtin/submodule--helper.c:1038 +#: builtin/submodule--helper.c:1183 msgid "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" msgstr "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<Pfad>...]]" -#: builtin/submodule--helper.c:1052 +#: builtin/submodule--helper.c:1197 msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "" "Verwenden Sie '--all', wenn Sie wirklich alle Submodule deinitialisieren\n" "möchten." -#: builtin/submodule--helper.c:1145 builtin/submodule--helper.c:1148 +#: builtin/submodule--helper.c:1290 builtin/submodule--helper.c:1293 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "Submodul '%s' kann Alternative nicht hinzufügen: %s" -#: builtin/submodule--helper.c:1184 +#: builtin/submodule--helper.c:1329 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "Wert '%s' für submodule.alternateErrorStrategy wird nicht erkannt" -#: builtin/submodule--helper.c:1191 +#: builtin/submodule--helper.c:1336 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "Wert '%s' für submodule.alternateLocation wird nicht erkannt." -#: builtin/submodule--helper.c:1214 +#: builtin/submodule--helper.c:1359 msgid "where the new submodule will be cloned to" msgstr "Pfad für neues Submodul" -#: builtin/submodule--helper.c:1217 +#: builtin/submodule--helper.c:1362 msgid "name of the new submodule" msgstr "Name des neuen Submoduls" -#: builtin/submodule--helper.c:1220 +#: builtin/submodule--helper.c:1365 msgid "url where to clone the submodule from" msgstr "URL von der das Submodul geklont wird" -#: builtin/submodule--helper.c:1228 +#: builtin/submodule--helper.c:1373 msgid "depth for shallow clones" msgstr "Tiefe des Klons mit unvollständiger Historie (shallow)" -#: builtin/submodule--helper.c:1231 builtin/submodule--helper.c:1606 +#: builtin/submodule--helper.c:1376 builtin/submodule--helper.c:1751 msgid "force cloning progress" msgstr "Fortschrittsanzeige beim Klonen erzwingen" -#: builtin/submodule--helper.c:1236 +#: builtin/submodule--helper.c:1381 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" @@ -14681,88 +16463,88 @@ msgstr "" "<Repository>] [--name <Name>] [--url <URL>] [--name <Name>] [--depth " "<Tiefe>] --url <URL> --path <Pfad>" -#: builtin/submodule--helper.c:1267 +#: builtin/submodule--helper.c:1412 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "Klonen von '%s' in Submodul-Pfad '%s' fehlgeschlagen" -#: builtin/submodule--helper.c:1281 +#: builtin/submodule--helper.c:1426 #, c-format msgid "could not get submodule directory for '%s'" msgstr "Konnte Submodul-Verzeichnis '%s' nicht finden." -#: builtin/submodule--helper.c:1347 +#: builtin/submodule--helper.c:1492 #, c-format msgid "Submodule path '%s' not initialized" msgstr "Submodul-Pfad '%s' nicht initialisiert" -#: builtin/submodule--helper.c:1351 +#: builtin/submodule--helper.c:1496 msgid "Maybe you want to use 'update --init'?" msgstr "Meinten Sie vielleicht 'update --init'?" -#: builtin/submodule--helper.c:1380 +#: builtin/submodule--helper.c:1525 #, c-format msgid "Skipping unmerged submodule %s" msgstr "Überspringe nicht zusammengeführtes Submodul %s" -#: builtin/submodule--helper.c:1409 +#: builtin/submodule--helper.c:1554 #, c-format msgid "Skipping submodule '%s'" msgstr "Überspringe Submodul '%s'" -#: builtin/submodule--helper.c:1544 +#: builtin/submodule--helper.c:1689 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "Fehler beim Klonen von '%s'. Weiterer Versuch geplant" -#: builtin/submodule--helper.c:1555 +#: builtin/submodule--helper.c:1700 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "Zweiter Versuch '%s' zu klonen fehlgeschlagen, breche ab." -#: builtin/submodule--helper.c:1585 builtin/submodule--helper.c:1808 +#: builtin/submodule--helper.c:1730 builtin/submodule--helper.c:1953 msgid "path into the working tree" msgstr "Pfad zum Arbeitsverzeichnis" -#: builtin/submodule--helper.c:1588 +#: builtin/submodule--helper.c:1733 msgid "path into the working tree, across nested submodule boundaries" msgstr "" "Pfad zum Arbeitsverzeichnis, über verschachtelte Submodul-Grenzen hinweg" -#: builtin/submodule--helper.c:1592 +#: builtin/submodule--helper.c:1737 msgid "rebase, merge, checkout or none" msgstr "rebase, merge, checkout oder none" -#: builtin/submodule--helper.c:1598 +#: builtin/submodule--helper.c:1743 msgid "Create a shallow clone truncated to the specified number of revisions" msgstr "" "Erstellung eines Klons mit unvollständiger Historie (shallow), abgeschnitten " "bei\n" "der angegebenen Anzahl von Commits." -#: builtin/submodule--helper.c:1601 +#: builtin/submodule--helper.c:1746 msgid "parallel jobs" msgstr "Parallele Ausführungen" -#: builtin/submodule--helper.c:1603 +#: builtin/submodule--helper.c:1748 msgid "whether the initial clone should follow the shallow recommendation" msgstr "" "ob das initiale Klonen den Empfehlungen für eine unvollständige\n" "Historie (shallow) folgen soll" -#: builtin/submodule--helper.c:1604 +#: builtin/submodule--helper.c:1749 msgid "don't print cloning progress" msgstr "keine Fortschrittsanzeige beim Klonen" -#: builtin/submodule--helper.c:1611 +#: builtin/submodule--helper.c:1756 msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" msgstr "git submodule--helper update_clone [--prefix=<Pfad>] [<Pfad>...]" -#: builtin/submodule--helper.c:1624 +#: builtin/submodule--helper.c:1769 msgid "bad value for update parameter" msgstr "Fehlerhafter Wert für --update Parameter" -#: builtin/submodule--helper.c:1692 +#: builtin/submodule--helper.c:1837 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " @@ -14771,20 +16553,20 @@ msgstr "" "Branch von Submodul (%s) ist konfiguriert, den Branch des Hauptprojektes\n" "zu erben, aber das Hauptprojekt befindet sich auf keinem Branch." -#: builtin/submodule--helper.c:1809 +#: builtin/submodule--helper.c:1954 msgid "recurse into submodules" msgstr "Rekursion in Submodule durchführen" -#: builtin/submodule--helper.c:1815 +#: builtin/submodule--helper.c:1960 msgid "git submodule--helper embed-git-dir [<path>...]" msgstr "git submodule--helper embed-git-dir [<Pfad>...]" -#: builtin/submodule--helper.c:1901 +#: builtin/submodule--helper.c:2071 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s unterstützt kein --super-prefix" -#: builtin/submodule--helper.c:1907 +#: builtin/submodule--helper.c:2077 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "'%s' ist kein gültiger Unterbefehl von submodule--helper" @@ -14810,15 +16592,15 @@ msgstr "symbolische Referenzen löschen" msgid "shorten ref output" msgstr "verkürzte Ausgabe der Referenzen" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363 msgid "reason" msgstr "Grund" -#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363 msgid "reason of the update" msgstr "Grund für die Aktualisierung" -#: builtin/tag.c:24 +#: builtin/tag.c:25 msgid "" "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> " "[<head>]" @@ -14826,11 +16608,11 @@ msgstr "" "git tag [-a | -s | -u <Schlüssel-id>] [-f] [-m <Beschreibung> | -F <Datei>] " "<Tagname> [<Commit>]" -#: builtin/tag.c:25 +#: builtin/tag.c:26 msgid "git tag -d <tagname>..." msgstr "git tag -d <Tagname>..." -#: builtin/tag.c:26 +#: builtin/tag.c:27 msgid "" "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--" "points-at <object>]\n" @@ -14840,21 +16622,21 @@ msgstr "" "points-at <Objekt>]\n" "\t\t[--format=<Muster>] [--[no-]merged [<Commit>]] [<Muster>...]" -#: builtin/tag.c:28 +#: builtin/tag.c:29 msgid "git tag -v [--format=<format>] <tagname>..." msgstr "git tag -v [--format=<Format>] <Tagname>..." -#: builtin/tag.c:86 +#: builtin/tag.c:87 #, c-format msgid "tag '%s' not found." msgstr "Tag '%s' nicht gefunden." -#: builtin/tag.c:102 +#: builtin/tag.c:103 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "Tag '%s' gelöscht (war %s)\n" -#: builtin/tag.c:132 +#: builtin/tag.c:133 #, c-format msgid "" "\n" @@ -14867,7 +16649,7 @@ msgstr "" " %s\n" "ein. Zeilen, die mit '%c' beginnen, werden ignoriert.\n" -#: builtin/tag.c:136 +#: builtin/tag.c:137 #, c-format msgid "" "\n" @@ -14882,151 +16664,151 @@ msgstr "" "ein. Zeilen, die mit '%c' beginnen, werden behalten; Sie dürfen diese\n" "selbst entfernen wenn Sie möchten.\n" -#: builtin/tag.c:190 +#: builtin/tag.c:191 msgid "unable to sign the tag" msgstr "konnte Tag nicht signieren" -#: builtin/tag.c:192 +#: builtin/tag.c:193 msgid "unable to write tag file" msgstr "konnte Tag-Datei nicht schreiben" -#: builtin/tag.c:217 +#: builtin/tag.c:218 msgid "bad object type." msgstr "ungültiger Objekt-Typ" -#: builtin/tag.c:266 +#: builtin/tag.c:267 msgid "no tag message?" msgstr "keine Tag-Beschreibung?" -#: builtin/tag.c:273 +#: builtin/tag.c:274 #, c-format msgid "The tag message has been left in %s\n" msgstr "Die Tag-Beschreibung wurde gelassen in %s\n" -#: builtin/tag.c:382 +#: builtin/tag.c:383 msgid "list tag names" msgstr "Tagnamen auflisten" -#: builtin/tag.c:384 +#: builtin/tag.c:385 msgid "print <n> lines of each tag message" msgstr "<n> Zeilen jeder Tag-Beschreibung anzeigen" -#: builtin/tag.c:386 +#: builtin/tag.c:387 msgid "delete tags" msgstr "Tags löschen" -#: builtin/tag.c:387 +#: builtin/tag.c:388 msgid "verify tags" msgstr "Tags überprüfen" -#: builtin/tag.c:389 +#: builtin/tag.c:390 msgid "Tag creation options" msgstr "Optionen für Erstellung von Tags" -#: builtin/tag.c:391 +#: builtin/tag.c:392 msgid "annotated tag, needs a message" msgstr "annotiertes Tag, benötigt eine Beschreibung" -#: builtin/tag.c:393 +#: builtin/tag.c:394 msgid "tag message" msgstr "Tag-Beschreibung" -#: builtin/tag.c:395 +#: builtin/tag.c:396 msgid "force edit of tag message" msgstr "Bearbeitung der Tag-Beschreibung erzwingen" -#: builtin/tag.c:396 +#: builtin/tag.c:397 msgid "annotated and GPG-signed tag" msgstr "annotiertes und GPG-signiertes Tag" -#: builtin/tag.c:400 +#: builtin/tag.c:401 msgid "use another key to sign the tag" msgstr "einen anderen Schlüssel verwenden, um das Tag zu signieren" -#: builtin/tag.c:401 +#: builtin/tag.c:402 msgid "replace the tag if exists" msgstr "das Tag ersetzen, wenn es existiert" -#: builtin/tag.c:402 builtin/update-ref.c:368 +#: builtin/tag.c:403 builtin/update-ref.c:369 msgid "create a reflog" msgstr "Reflog erstellen" -#: builtin/tag.c:404 +#: builtin/tag.c:405 msgid "Tag listing options" msgstr "Optionen für Auflistung der Tags" -#: builtin/tag.c:405 +#: builtin/tag.c:406 msgid "show tag list in columns" msgstr "Liste der Tags in Spalten anzeigen" -#: builtin/tag.c:406 builtin/tag.c:408 +#: builtin/tag.c:407 builtin/tag.c:409 msgid "print only tags that contain the commit" msgstr "nur Tags ausgeben, die diesen Commit beinhalten" -#: builtin/tag.c:407 builtin/tag.c:409 +#: builtin/tag.c:408 builtin/tag.c:410 msgid "print only tags that don't contain the commit" msgstr "nur Tags ausgeben, die diesen Commit nicht enthalten" -#: builtin/tag.c:410 +#: builtin/tag.c:411 msgid "print only tags that are merged" msgstr "nur Tags ausgeben, die gemerged wurden" -#: builtin/tag.c:411 +#: builtin/tag.c:412 msgid "print only tags that are not merged" msgstr "nur Tags ausgeben, die nicht gemerged wurden" -#: builtin/tag.c:416 +#: builtin/tag.c:417 msgid "print only tags of the object" msgstr "nur Tags von dem Objekt ausgeben" -#: builtin/tag.c:460 +#: builtin/tag.c:461 msgid "--column and -n are incompatible" msgstr "--column und -n sind inkompatibel" -#: builtin/tag.c:482 +#: builtin/tag.c:483 msgid "-n option is only allowed in list mode" msgstr "Die Option -n ist nur im Listenmodus erlaubt." -#: builtin/tag.c:484 +#: builtin/tag.c:485 msgid "--contains option is only allowed in list mode" msgstr "Die Option --contains ist nur im Listenmodus erlaubt." -#: builtin/tag.c:486 +#: builtin/tag.c:487 msgid "--no-contains option is only allowed in list mode" msgstr "Die Option --no-contains ist nur im Listenmodus erlaubt." -#: builtin/tag.c:488 +#: builtin/tag.c:489 msgid "--points-at option is only allowed in list mode" msgstr "Die Option --points-at ist nur im Listenmodus erlaubt." -#: builtin/tag.c:490 +#: builtin/tag.c:491 msgid "--merged and --no-merged options are only allowed in list mode" msgstr "Die Optionen --merged und --no-merged sind nur im Listenmodus erlaubt." -#: builtin/tag.c:501 +#: builtin/tag.c:502 msgid "only one -F or -m option is allowed." msgstr "nur eine -F oder -m Option ist erlaubt." -#: builtin/tag.c:520 +#: builtin/tag.c:521 msgid "too many params" msgstr "zu viele Parameter" -#: builtin/tag.c:526 +#: builtin/tag.c:527 #, c-format msgid "'%s' is not a valid tag name." msgstr "'%s' ist kein gültiger Tagname." -#: builtin/tag.c:531 +#: builtin/tag.c:532 #, c-format msgid "tag '%s' already exists" msgstr "Tag '%s' existiert bereits" -#: builtin/tag.c:562 +#: builtin/tag.c:563 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "Tag '%s' aktualisiert (war %s)\n" -#: builtin/unpack-objects.c:498 +#: builtin/unpack-objects.c:500 msgid "Unpacking objects" msgstr "Entpacke Objekte" @@ -15035,11 +16817,6 @@ msgstr "Entpacke Objekte" msgid "failed to create directory %s" msgstr "Fehler beim Erstellen von Verzeichnis '%s'" -#: builtin/update-index.c:88 -#, c-format -msgid "failed to stat %s" -msgstr "Konnte '%s' nicht lesen" - #: builtin/update-index.c:98 #, c-format msgid "failed to create file %s" @@ -15099,151 +16876,151 @@ msgstr "" msgid " OK" msgstr " OK" -#: builtin/update-index.c:589 +#: builtin/update-index.c:588 msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [<Optionen>] [--] [<Datei>...]" -#: builtin/update-index.c:946 +#: builtin/update-index.c:944 msgid "continue refresh even when index needs update" msgstr "" "Aktualisierung fortsetzen, auch wenn der Index aktualisiert werden muss" -#: builtin/update-index.c:949 +#: builtin/update-index.c:947 msgid "refresh: ignore submodules" msgstr "Aktualisierung: ignoriert Submodule" -#: builtin/update-index.c:952 +#: builtin/update-index.c:950 msgid "do not ignore new files" msgstr "keine neuen Dateien ignorieren" -#: builtin/update-index.c:954 +#: builtin/update-index.c:952 msgid "let files replace directories and vice-versa" msgstr "Dateien Verzeichnisse ersetzen lassen, und umgedreht" -#: builtin/update-index.c:956 +#: builtin/update-index.c:954 msgid "notice files missing from worktree" msgstr "fehlende Dateien im Arbeitsverzeichnis beachten" -#: builtin/update-index.c:958 +#: builtin/update-index.c:956 msgid "refresh even if index contains unmerged entries" msgstr "" "aktualisieren, auch wenn der Index nicht zusammengeführte Einträge beinhaltet" -#: builtin/update-index.c:961 +#: builtin/update-index.c:959 msgid "refresh stat information" msgstr "Dateiinformationen aktualisieren" -#: builtin/update-index.c:965 +#: builtin/update-index.c:963 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "wie --refresh, ignoriert aber \"assume-unchanged\" Einstellung" -#: builtin/update-index.c:969 +#: builtin/update-index.c:967 msgid "<mode>,<object>,<path>" msgstr "<Modus>,<Objekt>,<Pfad>" -#: builtin/update-index.c:970 +#: builtin/update-index.c:968 msgid "add the specified entry to the index" msgstr "den angegebenen Eintrag zum Commit vormerken" -#: builtin/update-index.c:979 +#: builtin/update-index.c:977 msgid "mark files as \"not changing\"" msgstr "diese Datei immer als unverändert betrachten" -#: builtin/update-index.c:982 +#: builtin/update-index.c:980 msgid "clear assumed-unchanged bit" msgstr "\"assumed-unchanged\"-Bit löschen" -#: builtin/update-index.c:985 +#: builtin/update-index.c:983 msgid "mark files as \"index-only\"" msgstr "Dateien als \"index-only\" markieren" -#: builtin/update-index.c:988 +#: builtin/update-index.c:986 msgid "clear skip-worktree bit" msgstr "\"skip-worktree\"-Bit löschen" -#: builtin/update-index.c:991 +#: builtin/update-index.c:989 msgid "add to index only; do not add content to object database" msgstr "" "die Änderungen nur zum Commit vormerken; Inhalt wird nicht der Objekt-" "Datenbank hinzugefügt" -#: builtin/update-index.c:993 +#: builtin/update-index.c:991 msgid "remove named paths even if present in worktree" msgstr "" "benannte Pfade löschen, auch wenn sie sich im Arbeitsverzeichnis befinden" -#: builtin/update-index.c:995 +#: builtin/update-index.c:993 msgid "with --stdin: input lines are terminated by null bytes" msgstr "mit --stdin: eingegebene Zeilen sind durch NUL-Bytes abgeschlossen" -#: builtin/update-index.c:997 +#: builtin/update-index.c:995 msgid "read list of paths to be updated from standard input" msgstr "Liste der zu aktualisierenden Pfade von der Standard-Eingabe lesen" -#: builtin/update-index.c:1001 +#: builtin/update-index.c:999 msgid "add entries from standard input to the index" msgstr "Einträge von der Standard-Eingabe zum Commit vormerken" -#: builtin/update-index.c:1005 +#: builtin/update-index.c:1003 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "" "wiederholtes Einpflegen der Zustände #2 und #3 für die aufgelisteten Pfade" -#: builtin/update-index.c:1009 +#: builtin/update-index.c:1007 msgid "only update entries that differ from HEAD" msgstr "nur Einträge aktualisieren, die unterschiedlich zu HEAD sind" -#: builtin/update-index.c:1013 +#: builtin/update-index.c:1011 msgid "ignore files missing from worktree" msgstr "fehlende Dateien im Arbeitsverzeichnis ignorieren" -#: builtin/update-index.c:1016 +#: builtin/update-index.c:1014 msgid "report actions to standard output" msgstr "die Aktionen in der Standard-Ausgabe ausgeben" -#: builtin/update-index.c:1018 +#: builtin/update-index.c:1016 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(für Fremdprogramme) keine gespeicherten, nicht aufgelöste Konflikte" -#: builtin/update-index.c:1022 +#: builtin/update-index.c:1020 msgid "write index in this format" msgstr "Index-Datei in diesem Format schreiben" -#: builtin/update-index.c:1024 +#: builtin/update-index.c:1022 msgid "enable or disable split index" msgstr "Splitting des Index aktivieren oder deaktivieren" -#: builtin/update-index.c:1026 +#: builtin/update-index.c:1024 msgid "enable/disable untracked cache" msgstr "Cache für unversionierte Dateien aktivieren oder deaktivieren" -#: builtin/update-index.c:1028 +#: builtin/update-index.c:1026 msgid "test if the filesystem supports untracked cache" msgstr "" "prüfen, ob das Dateisystem einen Cache für unversionierte Dateien unterstützt" -#: builtin/update-index.c:1030 +#: builtin/update-index.c:1028 msgid "enable untracked cache without testing the filesystem" msgstr "" "Cache für unversionierte Dateien ohne Prüfung des Dateisystems aktivieren" -#: builtin/update-index.c:1032 +#: builtin/update-index.c:1030 msgid "write out the index even if is not flagged as changed" msgstr "Index rausschreiben, auch wenn dieser nicht als geändert markiert ist" -#: builtin/update-index.c:1034 +#: builtin/update-index.c:1032 msgid "enable or disable file system monitor" msgstr "Dateisystem-Monitor aktivieren oder deaktivieren" -#: builtin/update-index.c:1036 +#: builtin/update-index.c:1034 msgid "mark files as fsmonitor valid" msgstr "Dateien als \"fsmonitor valid\" markieren" -#: builtin/update-index.c:1039 +#: builtin/update-index.c:1037 msgid "clear fsmonitor valid bit" msgstr "\"fsmonitor valid\"-Bit löschen" -#: builtin/update-index.c:1138 +#: builtin/update-index.c:1136 msgid "" "core.splitIndex is set to false; remove or change it, if you really want to " "enable split index" @@ -15251,7 +17028,7 @@ msgstr "" "core.splitIndex ist auf 'false' gesetzt. Entfernen oder ändern Sie dies,\n" "wenn sie wirklich das Splitting des Index aktivieren möchten." -#: builtin/update-index.c:1147 +#: builtin/update-index.c:1145 msgid "" "core.splitIndex is set to true; remove or change it, if you really want to " "disable split index" @@ -15259,7 +17036,7 @@ msgstr "" "core.splitIndex ist auf 'true' gesetzt. Entfernen oder ändern Sie dies,\n" "wenn Sie wirklich das Splitting des Index deaktivieren möchten." -#: builtin/update-index.c:1158 +#: builtin/update-index.c:1156 msgid "" "core.untrackedCache is set to true; remove or change it, if you really want " "to disable the untracked cache" @@ -15267,11 +17044,11 @@ msgstr "" "core.untrackedCache ist auf 'true' gesetzt. Entfernen oder ändern Sie dies,\n" "wenn Sie wirklich den Cache für unversionierte Dateien deaktivieren möchten." -#: builtin/update-index.c:1162 +#: builtin/update-index.c:1160 msgid "Untracked cache disabled" msgstr "Cache für unversionierte Dateien deaktiviert" -#: builtin/update-index.c:1170 +#: builtin/update-index.c:1168 msgid "" "core.untrackedCache is set to false; remove or change it, if you really want " "to enable the untracked cache" @@ -15280,23 +17057,23 @@ msgstr "" "dies,\n" "wenn sie wirklich den Cache für unversionierte Dateien aktivieren möchten." -#: builtin/update-index.c:1174 +#: builtin/update-index.c:1172 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "Cache für unversionierte Dateien für '%s' aktiviert" -#: builtin/update-index.c:1182 +#: builtin/update-index.c:1180 msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor" msgstr "" "core.fsmonitor nicht gesetzt. Setzen Sie es, wenn Sie den Dateisystem-" "Monitor\n" "wirklich aktivieren möchten." -#: builtin/update-index.c:1186 +#: builtin/update-index.c:1184 msgid "fsmonitor enabled" msgstr "Dateisystem-Monitor aktiviert" -#: builtin/update-index.c:1189 +#: builtin/update-index.c:1187 msgid "" "core.fsmonitor is set; remove it if you really want to disable fsmonitor" msgstr "" @@ -15304,7 +17081,7 @@ msgstr "" "Monitor\n" "wirklich deaktivieren möchten." -#: builtin/update-index.c:1193 +#: builtin/update-index.c:1191 msgid "fsmonitor disabled" msgstr "Dateisystem-Monitor deaktiviert" @@ -15321,19 +17098,19 @@ msgstr "" msgid "git update-ref [<options>] --stdin [-z]" msgstr "git update-ref [<Optionen>] --stdin [-z]" -#: builtin/update-ref.c:363 +#: builtin/update-ref.c:364 msgid "delete the reference" msgstr "diese Referenz löschen" -#: builtin/update-ref.c:365 +#: builtin/update-ref.c:366 msgid "update <refname> not the one it points to" msgstr "<Referenzname> aktualisieren, nicht den Verweis" -#: builtin/update-ref.c:366 +#: builtin/update-ref.c:367 msgid "stdin has NUL-terminated arguments" msgstr "Standard-Eingabe hat durch NUL-Zeichen abgeschlossene Argumente" -#: builtin/update-ref.c:367 +#: builtin/update-ref.c:368 msgid "read updates from stdin" msgstr "Aktualisierungen von der Standard-Eingabe lesen" @@ -15363,15 +17140,15 @@ msgstr "" msgid "interrupt transfer after <n> seconds of inactivity" msgstr "Übertragung nach <n> Sekunden Inaktivität unterbrechen" -#: builtin/verify-commit.c:18 +#: builtin/verify-commit.c:20 msgid "git verify-commit [-v | --verbose] <commit>..." msgstr "git verify-commit [-v | --verbose] <Commit>..." -#: builtin/verify-commit.c:73 +#: builtin/verify-commit.c:76 msgid "print commit contents" msgstr "Commit-Inhalte ausgeben" -#: builtin/verify-commit.c:74 builtin/verify-tag.c:38 +#: builtin/verify-commit.c:77 builtin/verify-tag.c:38 msgid "print raw gpg status output" msgstr "unbearbeitete Ausgabe des Status von gpg ausgeben" @@ -15423,22 +17200,22 @@ msgstr "git worktree remove [<Optionen>] <Arbeitsverzeichnis>" msgid "git worktree unlock <path>" msgstr "git worktree unlock <Pfad>" -#: builtin/worktree.c:58 +#: builtin/worktree.c:59 #, c-format msgid "Removing worktrees/%s: not a valid directory" msgstr "Lösche worktrees/%s: kein gültiges Verzeichnis" -#: builtin/worktree.c:64 +#: builtin/worktree.c:65 #, c-format msgid "Removing worktrees/%s: gitdir file does not exist" msgstr "Lösche worktrees/%s: gitdir-Datei existiert nicht" -#: builtin/worktree.c:69 builtin/worktree.c:78 +#: builtin/worktree.c:70 builtin/worktree.c:79 #, c-format msgid "Removing worktrees/%s: unable to read gitdir file (%s)" msgstr "Lösche worktrees/%s: konnte gitdir-Datei (%s) nicht lesen" -#: builtin/worktree.c:88 +#: builtin/worktree.c:89 #, c-format msgid "" "Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read " @@ -15447,198 +17224,198 @@ msgstr "" "Lösche worktrees/%s: read() zu kurz (%<PRIuMAX> Bytes erwartet, %<PRIuMAX> " "gelesen)" -#: builtin/worktree.c:96 +#: builtin/worktree.c:97 #, c-format msgid "Removing worktrees/%s: invalid gitdir file" msgstr "Lösche worktrees/%s: ungültige gitdir-Datei" -#: builtin/worktree.c:105 +#: builtin/worktree.c:106 #, c-format msgid "Removing worktrees/%s: gitdir file points to non-existent location" msgstr "Lösche worktrees/%s: gitdir-Datei verweist auf nicht existierenden Ort" -#: builtin/worktree.c:152 +#: builtin/worktree.c:153 msgid "report pruned working trees" msgstr "entfernte Arbeitsverzeichnisse ausgeben" -#: builtin/worktree.c:154 +#: builtin/worktree.c:155 msgid "expire working trees older than <time>" msgstr "Arbeitsverzeichnisse älter als <Zeit> verfallen lassen" -#: builtin/worktree.c:229 +#: builtin/worktree.c:230 #, c-format msgid "'%s' already exists" msgstr "'%s' existiert bereits" -#: builtin/worktree.c:260 +#: builtin/worktree.c:261 #, c-format msgid "could not create directory of '%s'" msgstr "Konnte Verzeichnis '%s' nicht erstellen." -#: builtin/worktree.c:373 builtin/worktree.c:379 +#: builtin/worktree.c:380 builtin/worktree.c:386 #, c-format msgid "Preparing worktree (new branch '%s')" msgstr "Bereite Arbeitsverzeichnis vor (neuer Branch '%s')" -#: builtin/worktree.c:375 +#: builtin/worktree.c:382 #, c-format msgid "Preparing worktree (resetting branch '%s'; was at %s)" msgstr "Bereite Arbeitsverzeichnis vor (setze Branch '%s' um; war bei %s)" -#: builtin/worktree.c:384 +#: builtin/worktree.c:391 #, c-format msgid "Preparing worktree (checking out '%s')" msgstr "Bereite Arbeitsverzeichnis vor (checke '%s' aus)" -#: builtin/worktree.c:390 +#: builtin/worktree.c:397 #, c-format msgid "Preparing worktree (detached HEAD %s)" msgstr "Bereite Arbeitsverzeichnis vor (losgelöster HEAD %s)" -#: builtin/worktree.c:431 +#: builtin/worktree.c:438 msgid "checkout <branch> even if already checked out in other worktree" msgstr "" "<Branch> auschecken, auch wenn dieser bereits in einem anderen " "Arbeitsverzeichnis ausgecheckt ist" -#: builtin/worktree.c:434 +#: builtin/worktree.c:441 msgid "create a new branch" msgstr "neuen Branch erstellen" -#: builtin/worktree.c:436 +#: builtin/worktree.c:443 msgid "create or reset a branch" msgstr "Branch erstellen oder umsetzen" -#: builtin/worktree.c:438 +#: builtin/worktree.c:445 msgid "populate the new working tree" msgstr "das neue Arbeitsverzeichnis auschecken" -#: builtin/worktree.c:439 +#: builtin/worktree.c:446 msgid "keep the new working tree locked" msgstr "das neue Arbeitsverzeichnis gesperrt lassen" -#: builtin/worktree.c:441 +#: builtin/worktree.c:449 msgid "set up tracking mode (see git-branch(1))" msgstr "Modus zum Folgen von Branches einstellen (siehe git-branch(1))" -#: builtin/worktree.c:444 +#: builtin/worktree.c:452 msgid "try to match the new branch name with a remote-tracking branch" msgstr "" "versuchen, eine Übereinstimmung des Branch-Namens mit einem\n" "Remote-Tracking-Branch herzustellen" -#: builtin/worktree.c:452 +#: builtin/worktree.c:460 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b, -B und --detach schließen sich gegenseitig aus" -#: builtin/worktree.c:511 +#: builtin/worktree.c:521 msgid "--[no-]track can only be used if a new branch is created" msgstr "" "--[no]-track kann nur verwendet werden, wenn ein neuer Branch erstellt wird." -#: builtin/worktree.c:611 +#: builtin/worktree.c:621 msgid "reason for locking" msgstr "Sperrgrund" -#: builtin/worktree.c:623 builtin/worktree.c:656 builtin/worktree.c:710 -#: builtin/worktree.c:850 +#: builtin/worktree.c:633 builtin/worktree.c:666 builtin/worktree.c:720 +#: builtin/worktree.c:860 #, c-format msgid "'%s' is not a working tree" msgstr "'%s' ist kein Arbeitsverzeichnis" -#: builtin/worktree.c:625 builtin/worktree.c:658 +#: builtin/worktree.c:635 builtin/worktree.c:668 msgid "The main working tree cannot be locked or unlocked" msgstr "Das Hauptarbeitsverzeichnis kann nicht gesperrt oder entsperrt werden." -#: builtin/worktree.c:630 +#: builtin/worktree.c:640 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "'%s' ist bereits gesperrt, Grund: %s" -#: builtin/worktree.c:632 +#: builtin/worktree.c:642 #, c-format msgid "'%s' is already locked" msgstr "'%s' ist bereits gesperrt" -#: builtin/worktree.c:660 +#: builtin/worktree.c:670 #, c-format msgid "'%s' is not locked" msgstr "'%s' ist nicht gesperrt" -#: builtin/worktree.c:685 +#: builtin/worktree.c:695 msgid "working trees containing submodules cannot be moved or removed" msgstr "" "Arbeitsverzeichnisse, die Submodule enthalten, können nicht verschoben oder\n" "entfernt werden." -#: builtin/worktree.c:712 builtin/worktree.c:852 +#: builtin/worktree.c:722 builtin/worktree.c:862 #, c-format msgid "'%s' is a main working tree" msgstr "'%s' ist ein Hauptarbeitsverzeichnis" -#: builtin/worktree.c:717 +#: builtin/worktree.c:727 #, c-format msgid "could not figure out destination name from '%s'" msgstr "Konnte Zielname aus '%s' nicht bestimmen." -#: builtin/worktree.c:723 +#: builtin/worktree.c:733 #, c-format msgid "target '%s' already exists" msgstr "Ziel '%s' existiert bereits." -#: builtin/worktree.c:730 +#: builtin/worktree.c:740 #, c-format msgid "cannot move a locked working tree, lock reason: %s" msgstr "Kann gesperrtes Arbeitsverzeichnis nicht verschieben, Sperrgrund: %s" -#: builtin/worktree.c:732 +#: builtin/worktree.c:742 msgid "cannot move a locked working tree" msgstr "Kann gesperrtes Arbeitsverzeichnis nicht verschieben." -#: builtin/worktree.c:735 +#: builtin/worktree.c:745 #, c-format msgid "validation failed, cannot move working tree: %s" msgstr "Validierung fehlgeschlagen, kann Arbeitszeichnis nicht verschieben: %s" -#: builtin/worktree.c:740 +#: builtin/worktree.c:750 #, c-format msgid "failed to move '%s' to '%s'" msgstr "Fehler beim Verschieben von '%s' nach '%s'" -#: builtin/worktree.c:788 +#: builtin/worktree.c:798 #, c-format msgid "failed to run 'git status' on '%s'" msgstr "Fehler beim Ausführen von 'git status' auf '%s'" -#: builtin/worktree.c:792 +#: builtin/worktree.c:802 #, c-format msgid "'%s' is dirty, use --force to delete it" msgstr "'%s' ist verändert, benutzen Sie --force zum Löschen" -#: builtin/worktree.c:797 +#: builtin/worktree.c:807 #, c-format msgid "failed to run 'git status' on '%s', code %d" msgstr "Fehler beim Ausführen von 'git status' auf '%s'. Code: %d" -#: builtin/worktree.c:808 builtin/worktree.c:822 +#: builtin/worktree.c:818 builtin/worktree.c:832 #, c-format msgid "failed to delete '%s'" msgstr "Fehler beim Löschen von '%s'" -#: builtin/worktree.c:834 +#: builtin/worktree.c:844 msgid "force removing even if the worktree is dirty" msgstr "Löschen erzwingen, auch wenn das Arbeitsverzeichnis geändert wurde" -#: builtin/worktree.c:856 +#: builtin/worktree.c:866 #, c-format msgid "cannot remove a locked working tree, lock reason: %s" msgstr "Kann gesperrtes Arbeitsverzeichnis nicht löschen, Sperrgrund: %s" -#: builtin/worktree.c:858 +#: builtin/worktree.c:868 msgid "cannot remove a locked working tree" msgstr "Kann gesperrtes Arbeitsverzeichnis nicht löschen." -#: builtin/worktree.c:861 +#: builtin/worktree.c:871 #, c-format msgid "validation failed, cannot remove working tree: %s" msgstr "Validierung fehlgeschlagen, kann Arbeitsverzeichnis nicht löschen: %s" @@ -15655,7 +17432,7 @@ msgstr "<Präfix>/" msgid "write tree object for a subdirectory <prefix>" msgstr "das \"Tree\"-Objekt für ein Unterverzeichnis <Präfix> schreiben" -#: builtin/write-tree.c:31 +#: builtin/write-tree.c:30 msgid "only useful for debugging" msgstr "nur nützlich für Fehlersuche" @@ -15679,7 +17456,7 @@ msgstr "" msgid "print debugging messages to stderr" msgstr "Meldungen zur Fehlersuche in Standard-Fehlerausgabe ausgeben" -#: git.c:26 +#: git.c:27 msgid "" "git [--version] [--help] [-C <path>] [-c <name>=<value>]\n" " [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n" @@ -15690,11 +17467,12 @@ msgid "" msgstr "" "git [--version] [--help] [-C <Pfad>] [-c <Name>=<Wert>]\n" " [--exec-path[=<Pfad>]] [--html-path] [--man-path] [--info-path]\n" -" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--bare]\n" +" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--" +"bare]\n" " [--git-dir=<Pfad>] [--work-tree=<Pfad>] [--namespace=<Name>]\n" " <Befehl> [<Argumente>]" -#: git.c:33 +#: git.c:34 msgid "" "'git help -a' and 'git help -g' list available subcommands and some\n" "concept guides. See 'git help <command>' or 'git help <concept>'\n" @@ -15705,47 +17483,47 @@ msgstr "" "oder 'git help <Konzept>', um mehr über einen spezifischen Befehl oder\n" "Konzept zu erfahren." -#: git.c:113 +#: git.c:173 #, c-format msgid "no directory given for --git-dir\n" msgstr "Kein Verzeichnis für --git-dir angegeben.\n" -#: git.c:127 +#: git.c:187 #, c-format msgid "no namespace given for --namespace\n" msgstr "Kein Namespace für --namespace angegeben.\n" -#: git.c:141 +#: git.c:201 #, c-format msgid "no directory given for --work-tree\n" msgstr "Kein Verzeichnis für --work-tree angegeben.\n" -#: git.c:155 +#: git.c:215 #, c-format msgid "no prefix given for --super-prefix\n" msgstr "Kein Präfix für --super-prefix angegeben.\n" -#: git.c:177 +#: git.c:237 #, c-format msgid "-c expects a configuration string\n" msgstr "-c erwartet einen Konfigurationsstring.\n" -#: git.c:215 +#: git.c:275 #, c-format msgid "no directory given for -C\n" msgstr "Kein Verzeichnis für -C angegeben.\n" -#: git.c:233 +#: git.c:300 #, c-format msgid "unknown option: %s\n" msgstr "Unbekannte Option: %s\n" -#: git.c:698 +#: git.c:770 #, c-format msgid "expansion of alias '%s' failed; '%s' is not a git command\n" msgstr "Erweiterung von Alias '%s' fehlgeschlagen; '%s' ist kein Git-Befehl.\n" -#: git.c:710 +#: git.c:782 #, c-format msgid "failed to run command '%s': %s\n" msgstr "Fehler beim Ausführen von Befehl '%s': %s\n" @@ -15789,139 +17567,671 @@ msgstr "Argumente" msgid "object filtering" msgstr "Filtern nach Objekten" -#: common-cmds.h:9 -msgid "start a working area (see also: git help tutorial)" -msgstr "Arbeitsverzeichnis anlegen (siehe auch: git help tutorial)" +#: parse-options.h:157 +msgid "expiry-date" +msgstr "Verfallsdatum" -#: common-cmds.h:10 -msgid "work on the current change (see also: git help everyday)" -msgstr "an aktuellen Änderungen arbeiten (siehe auch: git help everyday)" +#: parse-options.h:172 +msgid "no-op (backward compatibility)" +msgstr "Kein Effekt (Rückwärtskompatibilität)" -#: common-cmds.h:11 -msgid "examine the history and state (see also: git help revisions)" -msgstr "Historie und Status untersuchen (siehe auch: git help revisions)" +#: parse-options.h:251 +msgid "be more verbose" +msgstr "erweiterte Ausgaben" -#: common-cmds.h:12 -msgid "grow, mark and tweak your common history" -msgstr "Historie erweitern und bearbeiten" +#: parse-options.h:253 +msgid "be more quiet" +msgstr "weniger Ausgaben" -#: common-cmds.h:13 -msgid "collaborate (see also: git help workflows)" -msgstr "mit anderen zusammenarbeiten (siehe auch: git help workflows)" +#: parse-options.h:259 +msgid "use <n> digits to display SHA-1s" +msgstr "benutze <n> Ziffern zur Anzeige von SHA-1s" -#: common-cmds.h:17 +#: command-list.h:50 msgid "Add file contents to the index" msgstr "Dateiinhalte zum Commit vormerken" -#: common-cmds.h:18 +#: command-list.h:51 +msgid "Apply a series of patches from a mailbox" +msgstr "eine Serie von Patches von einer Mailbox anwenden" + +#: command-list.h:52 +msgid "Annotate file lines with commit information" +msgstr "Zeilen der Datei mit Commit-Informationen versehen und anzeigen" + +#: command-list.h:53 +msgid "Apply a patch to files and/or to the index" +msgstr "einen Patch auf Dateien und/oder den Index anwenden" + +#: command-list.h:54 +msgid "Import an Arch repository into Git" +msgstr "ein Arch Repository in Git importieren" + +#: command-list.h:55 +msgid "Create an archive of files from a named tree" +msgstr "Dateiarchiv von angegebenem Verzeichnis erstellen" + +#: command-list.h:56 msgid "Use binary search to find the commit that introduced a bug" msgstr "" "Binärsuche verwenden, um den Commit zu finden, der einen Fehler verursacht " "hat" -#: common-cmds.h:19 +#: command-list.h:57 +msgid "Show what revision and author last modified each line of a file" +msgstr "" +"Anzeigen, durch welchen Commit und Autor die jeweiligen Zeilen\n" +"einer Datei zuletzt geändert wurden" + +#: command-list.h:58 msgid "List, create, or delete branches" msgstr "Branches anzeigen, erstellen oder entfernen" -#: common-cmds.h:20 +#: command-list.h:59 +msgid "Move objects and refs by archive" +msgstr "Objekte und Referenzen über ein Archiv verteilen" + +#: command-list.h:60 +msgid "Provide content or type and size information for repository objects" +msgstr "Inhalt oder Informationen zu Typ und Größe für Repository-Objekte bereitstellen" + +#: command-list.h:61 +msgid "Display gitattributes information" +msgstr "gitattributes Informationen darstellen" + +#: command-list.h:62 +msgid "Debug gitignore / exclude files" +msgstr "Fehlersuche in gitignore / exclude Dateien" + +#: command-list.h:63 +msgid "Show canonical names and email addresses of contacts" +msgstr "Name und E-Mail-Adresse von Kontakten anzeigen" + +#: command-list.h:64 msgid "Switch branches or restore working tree files" msgstr "Branches wechseln oder Dateien im Arbeitsverzeichnis wiederherstellen" -#: common-cmds.h:21 +#: command-list.h:65 +msgid "Copy files from the index to the working tree" +msgstr "Dateien von dem Index ins Arbeitsverzeichnis kopieren" + +#: command-list.h:66 +msgid "Ensures that a reference name is well formed" +msgstr "Sicherstellen, dass ein Referenzname wohlgeformt ist" + +#: command-list.h:67 +msgid "Find commits yet to be applied to upstream" +msgstr "Commits finden, die noch auf dem Upstream-Branch angewendet werden müssen" + +#: command-list.h:68 +msgid "Apply the changes introduced by some existing commits" +msgstr "Änderungen eines existierenden Commits anwenden" + +#: command-list.h:69 +msgid "Graphical alternative to git-commit" +msgstr "grafische Alternative zu git-commit" + +#: command-list.h:70 +msgid "Remove untracked files from the working tree" +msgstr "unversionierte Dateien vom Arbeitsverzeichnis entfernen" + +#: command-list.h:71 msgid "Clone a repository into a new directory" msgstr "ein Repository in einem neuen Verzeichnis klonen" -#: common-cmds.h:22 +#: command-list.h:72 +msgid "Display data in columns" +msgstr "Daten in Spalten anzeigen" + +#: command-list.h:73 msgid "Record changes to the repository" msgstr "Änderungen in das Repository eintragen" -#: common-cmds.h:23 +#: command-list.h:74 +msgid "Write and verify Git commit graph files" +msgstr "Git Commit Graph-Dateien schreiben und überprüfen" + +#: command-list.h:75 +msgid "Create a new commit object" +msgstr "ein neues Commit-Objekt erstellen" + +#: command-list.h:76 +msgid "Get and set repository or global options" +msgstr "repositoryweite oder globale Optionen lesen oder setzen" + +#: command-list.h:77 +msgid "Count unpacked number of objects and their disk consumption" +msgstr "Anzahl und Speicherverbrauch ungepackter Objekte zählen" + +#: command-list.h:78 +msgid "Retrieve and store user credentials" +msgstr "Zugangsdaten des Benutzers empfangen und speichern" + +#: command-list.h:79 +msgid "Helper to temporarily store passwords in memory" +msgstr "Hilfsprogramm zum temporären Speichern von Zugangsdaten im Hauptspeicher" + +#: command-list.h:80 +msgid "Helper to store credentials on disk" +msgstr "Hilfsprogramm zum Speichern von Zugangsdaten auf der Festplatte" + +#: command-list.h:81 +msgid "Export a single commit to a CVS checkout" +msgstr "einzelnen Commit zu einem ausgecheckten CSV-Repository exportieren" + +#: command-list.h:82 +msgid "Salvage your data out of another SCM people love to hate" +msgstr "Ihre Daten aus einem anderen SCM übernehmen" + +#: command-list.h:83 +msgid "A CVS server emulator for Git" +msgstr "ein CSV Server Emulator für Git" + +#: command-list.h:84 +msgid "A really simple server for Git repositories" +msgstr "ein wirklich einfacher Server für Git Repositories" + +#: command-list.h:85 +msgid "Give an object a human readable name based on an available ref" +msgstr "" +"einem Objekt einen für Menschen lesbaren Namen basierend auf\n" +"einer verfügbaren Referenz geben" + +#: command-list.h:86 msgid "Show changes between commits, commit and working tree, etc" msgstr "" "Änderungen zwischen Commits, Commit und Arbeitsverzeichnis, etc. anzeigen" -#: common-cmds.h:24 +#: command-list.h:87 +msgid "Compares files in the working tree and the index" +msgstr "Dateien von dem Arbeitsverzeichnis und dem Index vergleichen" + +#: command-list.h:88 +msgid "Compare a tree to the working tree or index" +msgstr "ein Verzeichnis von dem Arbeitsverzeichnis und dem Index vergleichen" + +#: command-list.h:89 +msgid "Compares the content and mode of blobs found via two tree objects" +msgstr "den Inhalt und Modus von Blobs aus zwei Verzeichnisobjekten vergleichen" + +#: command-list.h:90 +msgid "Show changes using common diff tools" +msgstr "Änderungen mittels den allgemeinen Diff-Tools anzeigen" + +#: command-list.h:91 +msgid "Git data exporter" +msgstr "Export Tool für Git Daten" + +#: command-list.h:92 +msgid "Backend for fast Git data importers" +msgstr "Backend für schnelle Git Daten Import Tools" + +#: command-list.h:93 msgid "Download objects and refs from another repository" msgstr "Objekte und Referenzen von einem anderen Repository herunterladen" -#: common-cmds.h:25 +#: command-list.h:94 +msgid "Receive missing objects from another repository" +msgstr "fehlende Objekte von einem anderen Repository empfangen" + +#: command-list.h:95 +msgid "Rewrite branches" +msgstr "Branches umschreiben" + +#: command-list.h:96 +msgid "Produce a merge commit message" +msgstr "Beschreibung eines Merge-Commits erzeugen" + +#: command-list.h:97 +msgid "Output information on each ref" +msgstr "Informationen für jede Referenz ausgeben" + +#: command-list.h:98 +msgid "Prepare patches for e-mail submission" +msgstr "Patches für E-Mail-Versand vorbereiten" + +#: command-list.h:99 +msgid "Verifies the connectivity and validity of the objects in the database" +msgstr "stellt die Verbundenheit und Gültigkeit der Objekte in der Datenbank sicher" + +#: command-list.h:100 +msgid "Cleanup unnecessary files and optimize the local repository" +msgstr "nicht benötigte Dateien entfernen und das lokale Repository optimieren" + +#: command-list.h:101 +msgid "Extract commit ID from an archive created using git-archive" +msgstr "Commit-ID eines Archivs extrahieren, welches mit git-archive erstellt wurde" + +#: command-list.h:102 msgid "Print lines matching a pattern" msgstr "Zeilen darstellen, die einem Muster entsprechen" -#: common-cmds.h:26 +#: command-list.h:103 +msgid "A portable graphical interface to Git" +msgstr "eine portable grafische Schnittstelle zu Git" + +#: command-list.h:104 +msgid "Compute object ID and optionally creates a blob from a file" +msgstr "von einer Datei die Objekt-ID berechnen und optional ein Blob erstellen" + +#: command-list.h:105 +msgid "Display help information about Git" +msgstr "Hilfsinformationen über Git anzeigen" + +#: command-list.h:106 +msgid "Server side implementation of Git over HTTP" +msgstr "serverseitige Implementierung von Git über HTTP" + +#: command-list.h:107 +msgid "Download from a remote Git repository via HTTP" +msgstr "von einem Remote-Git-Repository über HTTP herunterladen" + +#: command-list.h:108 +msgid "Push objects over HTTP/DAV to another repository" +msgstr "Objekte über HTTP/DAV zu einem anderen Repository übertragen" + +#: command-list.h:109 +msgid "Send a collection of patches from stdin to an IMAP folder" +msgstr "eine Sammlung von Patches von der Standard-Eingabe zu einem IMAP-Ordner senden" + +#: command-list.h:110 +msgid "Build pack index file for an existing packed archive" +msgstr "Pack-Index-Datei für ein existierendes gepacktes Archiv erzeugen" + +#: command-list.h:111 msgid "Create an empty Git repository or reinitialize an existing one" msgstr "" "ein leeres Git-Repository erstellen oder ein bestehendes neuinitialisieren" -#: common-cmds.h:27 +#: command-list.h:112 +msgid "Instantly browse your working repository in gitweb" +msgstr "Ihr aktuelles Repository sofort in gitweb betrachten" + +#: command-list.h:113 +msgid "add or parse structured information in commit messages" +msgstr "strukturierte Informationen in Commit-Beschreibungen hinzufügen oder parsen" + +#: command-list.h:114 +msgid "The Git repository browser" +msgstr "der Git-Repository-Browser" + +#: command-list.h:115 msgid "Show commit logs" msgstr "Commit-Historie anzeigen" -#: common-cmds.h:28 +#: command-list.h:116 +msgid "Show information about files in the index and the working tree" +msgstr "Informationen über Dateien in dem Index und im Arbeitsverzeichnis anzeigen" + +#: command-list.h:117 +msgid "List references in a remote repository" +msgstr "Referenzen in einem Remote-Repository auflisten" + +#: command-list.h:118 +msgid "List the contents of a tree object" +msgstr "Inhalte eines Tree-Objektes auflisten" + +#: command-list.h:119 +msgid "Extracts patch and authorship from a single e-mail message" +msgstr "Patch und Urheberschaft von einer einzelnen E-Mail-Nachricht extrahieren" + +#: command-list.h:120 +msgid "Simple UNIX mbox splitter program" +msgstr "einfaches UNIX mbox Splitter-Programm" + +#: command-list.h:121 msgid "Join two or more development histories together" msgstr "zwei oder mehr Entwicklungszweige zusammenführen" -#: common-cmds.h:29 +#: command-list.h:122 +msgid "Find as good common ancestors as possible for a merge" +msgstr "möglichst besten gemeinsamen Vorgänger-Commit für einen Merge finden" + +#: command-list.h:123 +msgid "Run a three-way file merge" +msgstr "einen 3-Wege-Datei-Merge ausführen" + +#: command-list.h:124 +msgid "Run a merge for files needing merging" +msgstr "einen Merge für zusammenzuführende Dateien ausführen" + +#: command-list.h:125 +msgid "The standard helper program to use with git-merge-index" +msgstr "das Standard-Hilfsprogramm für die Verwendung mit git-merge-index" + +#: command-list.h:126 +msgid "Run merge conflict resolution tools to resolve merge conflicts" +msgstr "Ausführen von Tools zur Auflösung von Merge-Konflikten zur Behebung dieser" + +#: command-list.h:127 +msgid "Show three-way merge without touching index" +msgstr "3-Wege-Merge anzeigen ohne den Index zu verändern" + +#: command-list.h:128 +msgid "Creates a tag object" +msgstr "ein Tag-Objekt erstellen" + +#: command-list.h:129 +msgid "Build a tree-object from ls-tree formatted text" +msgstr "Tree-Objekt aus ls-tree formattiertem Text erzeugen" + +#: command-list.h:130 msgid "Move or rename a file, a directory, or a symlink" msgstr "" "eine Datei, ein Verzeichnis, oder eine symbolische Verknüpfung verschieben " "oder umbenennen" -#: common-cmds.h:30 +#: command-list.h:131 +msgid "Find symbolic names for given revs" +msgstr "symbolische Namen für die gegebenen Commits finden" + +#: command-list.h:132 +msgid "Add or inspect object notes" +msgstr "Objekt-Notizen hinzufügen oder überprüfen" + +#: command-list.h:133 +msgid "Import from and submit to Perforce repositories" +msgstr "von Perforce Repositories importieren und nach diese senden" + +#: command-list.h:134 +msgid "Create a packed archive of objects" +msgstr "ein gepacktes Archiv von Objekten erstellen" + +#: command-list.h:135 +msgid "Find redundant pack files" +msgstr "redundante Paketdateien finden" + +#: command-list.h:136 +msgid "Pack heads and tags for efficient repository access" +msgstr "Branches und Tags für effizienten Zugriff auf das Repository packen" + +#: command-list.h:137 +msgid "Routines to help parsing remote repository access parameters" +msgstr "Routinen als Hilfe zum Parsen von Zugriffsparametern von Remote-Repositories" + +#: command-list.h:138 +msgid "Compute unique ID for a patch" +msgstr "eindeutige ID für einen Patch berechnen" + +#: command-list.h:139 +msgid "Prune all unreachable objects from the object database" +msgstr "alle nicht erreichbaren Objekte von der Objektdatenbank entfernen" + +#: command-list.h:140 +msgid "Remove extra objects that are already in pack files" +msgstr "zusätzliche Objekte, die sich bereits in Paketdateien befinden, entfernen" + +#: command-list.h:141 msgid "Fetch from and integrate with another repository or a local branch" msgstr "" "Objekte von einem externen Repository anfordern und sie mit einem anderen " "Repository oder einem lokalen Branch zusammenführen" -#: common-cmds.h:31 +#: command-list.h:142 msgid "Update remote refs along with associated objects" msgstr "Remote-Referenzen mitsamt den verbundenen Objekten aktualisieren" -#: common-cmds.h:32 +#: command-list.h:143 +msgid "Applies a quilt patchset onto the current branch" +msgstr "Patches aus quilt auf aktuellen Branch anwenden" + +#: command-list.h:144 +msgid "Compare two commit ranges (e.g. two versions of a branch)" +msgstr "zwei Commit-Bereiche vergleichen (zwei Versionen eines Branches)" + +#: command-list.h:145 +msgid "Reads tree information into the index" +msgstr "Verzeichnisinformationen in den Index einlesen" + +#: command-list.h:146 msgid "Reapply commits on top of another base tip" msgstr "Wiederholtes Anwenden von Commits auf anderem Basis-Commit" -#: common-cmds.h:33 +#: command-list.h:147 +msgid "Receive what is pushed into the repository" +msgstr "Empfangen was in das Repository übertragen wurde" + +#: command-list.h:148 +msgid "Manage reflog information" +msgstr "Reflog Informationen verwalten" + +#: command-list.h:149 +msgid "Manage set of tracked repositories" +msgstr "Menge von hinterlegten Repositories verwalten" + +#: command-list.h:150 +msgid "Pack unpacked objects in a repository" +msgstr "ungepackte Objekte in einem Repository packen" + +#: command-list.h:151 +msgid "Create, list, delete refs to replace objects" +msgstr "Referenzen für ersetzende Objekte erstellen, auflisten, löschen" + +#: command-list.h:152 +msgid "Generates a summary of pending changes" +msgstr "eine Übersicht über ausstehende Änderungen generieren" + +#: command-list.h:153 +msgid "Reuse recorded resolution of conflicted merges" +msgstr "aufgezeichnete Auflösung von Merge-Konflikten wiederverwenden" + +#: command-list.h:154 msgid "Reset current HEAD to the specified state" msgstr "aktuellen HEAD zu einem spezifizierten Zustand setzen" -#: common-cmds.h:34 +#: command-list.h:155 +msgid "Revert some existing commits" +msgstr "einige bestehende Commits rückgängig machen" + +#: command-list.h:156 +msgid "Lists commit objects in reverse chronological order" +msgstr "Commit-Objekte in umgekehrter chronologischer Ordnung auflisten" + +#: command-list.h:157 +msgid "Pick out and massage parameters" +msgstr "Parameter herauspicken und ändern" + +#: command-list.h:158 msgid "Remove files from the working tree and from the index" msgstr "Dateien im Arbeitsverzeichnis und vom Index löschen" -#: common-cmds.h:35 +#: command-list.h:159 +msgid "Send a collection of patches as emails" +msgstr "eine Sammlung von Patches als E-Mails versenden" + +#: command-list.h:160 +msgid "Push objects over Git protocol to another repository" +msgstr "Objekte über das Git Protokoll zu einem anderen Repository übertragen" + +#: command-list.h:161 +msgid "Restricted login shell for Git-only SSH access" +msgstr "Login-Shell beschränkt für Nur-Git SSH-Zugriff" + +#: command-list.h:162 +msgid "Summarize 'git log' output" +msgstr "Ausgabe von 'git log' zusammenfassen" + +#: command-list.h:163 msgid "Show various types of objects" msgstr "verschiedene Arten von Objekten anzeigen" -#: common-cmds.h:36 +#: command-list.h:164 +msgid "Show branches and their commits" +msgstr "Branches und ihre Commits ausgeben" + +#: command-list.h:165 +msgid "Show packed archive index" +msgstr "gepackten Archiv-Index anzeigen" + +#: command-list.h:166 +msgid "List references in a local repository" +msgstr "Referenzen in einem lokales Repository auflisten" + +#: command-list.h:167 +msgid "Git's i18n setup code for shell scripts" +msgstr "Git's i18n-Konfigurationscode für Shell-Skripte" + +#: command-list.h:168 +msgid "Common Git shell script setup code" +msgstr "allgemeiner Git Shell-Skript Konfigurationscode" + +#: command-list.h:169 +msgid "Stash the changes in a dirty working directory away" +msgstr "Änderungen in einem Arbeitsverzeichnis aufbewahren" + +#: command-list.h:170 +msgid "Add file contents to the staging area" +msgstr "Dateiinhalte der Staging-Area hinzufügen" + +#: command-list.h:171 msgid "Show the working tree status" msgstr "den Zustand des Arbeitsverzeichnisses anzeigen" -#: common-cmds.h:37 +#: command-list.h:172 +msgid "Remove unnecessary whitespace" +msgstr "nicht erforderlichen Whitespace entfernen" + +#: command-list.h:173 +msgid "Initialize, update or inspect submodules" +msgstr "Submodule initialisieren, aktualisieren oder inspizieren" + +#: command-list.h:174 +msgid "Bidirectional operation between a Subversion repository and Git" +msgstr "Bidirektionale Operationen zwischen einem Subversion Repository und Git" + +#: command-list.h:175 +msgid "Read, modify and delete symbolic refs" +msgstr "symbolische Referenzen lesen, ändern und löschen" + +#: command-list.h:176 msgid "Create, list, delete or verify a tag object signed with GPG" msgstr "" "ein mit GPG signiertes Tag-Objekt erzeugen, auflisten, löschen oder " "verifizieren." -#: parse-options.h:157 -msgid "expiry-date" -msgstr "Verfallsdatum" +#: command-list.h:177 +msgid "Creates a temporary file with a blob's contents" +msgstr "eine temporäre Datei mit den Inhalten eines Blobs erstellen" -#: parse-options.h:172 -msgid "no-op (backward compatibility)" -msgstr "Kein Effekt (Rückwärtskompatibilität)" +#: command-list.h:178 +msgid "Unpack objects from a packed archive" +msgstr "Objekte von einem gepackten Archiv entpacken" -#: parse-options.h:251 -msgid "be more verbose" -msgstr "erweiterte Ausgaben" +#: command-list.h:179 +msgid "Register file contents in the working tree to the index" +msgstr "Dateiinhalte aus dem Arbeitsverzeichnis im Index registrieren" -#: parse-options.h:253 -msgid "be more quiet" -msgstr "weniger Ausgaben" +#: command-list.h:180 +msgid "Update the object name stored in a ref safely" +msgstr "den Objektnamen, der in einer Referenz gespeichert ist, sicher aktualisieren" -#: parse-options.h:259 -msgid "use <n> digits to display SHA-1s" -msgstr "benutze <n> Ziffern zur Anzeige von SHA-1s" +#: command-list.h:181 +msgid "Update auxiliary info file to help dumb servers" +msgstr "Hilfsinformationsdatei zur Hilfe von einfachen Servern aktualisieren" + +#: command-list.h:182 +msgid "Send archive back to git-archive" +msgstr "Archiv zurück zu git-archive senden" + +#: command-list.h:183 +msgid "Send objects packed back to git-fetch-pack" +msgstr "Objekte gepackt zurück an git-fetch-pack senden" + +#: command-list.h:184 +msgid "Show a Git logical variable" +msgstr "eine logische Variable von Git anzeigen" + +#: command-list.h:185 +msgid "Check the GPG signature of commits" +msgstr "die GPG-Signatur von Commits prüfen" + +#: command-list.h:186 +msgid "Validate packed Git archive files" +msgstr "gepackte Git-Archivdateien validieren" + +#: command-list.h:187 +msgid "Check the GPG signature of tags" +msgstr "die GPG-Signatur von Tags prüfen" + +#: command-list.h:188 +msgid "Git web interface (web frontend to Git repositories)" +msgstr "Git Web Interface (Web-Frontend für Git-Repositories)" + +#: command-list.h:189 +msgid "Show logs with difference each commit introduces" +msgstr "Logs mit dem Unterschied, den jeder Commit einführt, anzeigen" + +#: command-list.h:190 +msgid "Manage multiple working trees" +msgstr "mehrere Arbeitsverzeichnisse verwalten" + +#: command-list.h:191 +msgid "Create a tree object from the current index" +msgstr "Tree-Objekt vom aktuellen Index erstellen" + +#: command-list.h:192 +msgid "Defining attributes per path" +msgstr "Definition von Attributen pro Pfad" + +#: command-list.h:193 +msgid "Git command-line interface and conventions" +msgstr "Git Kommandozeilenschnittstelle und Konventionen" + +#: command-list.h:194 +msgid "A Git core tutorial for developers" +msgstr "eine Git Anleitung für Entwickler" + +#: command-list.h:195 +msgid "Git for CVS users" +msgstr "Git für CVS Benutzer" + +#: command-list.h:196 +msgid "Tweaking diff output" +msgstr "Diff-Ausgabe optimieren" + +#: command-list.h:197 +msgid "A useful minimum set of commands for Everyday Git" +msgstr "ein kleine, nützliche Menge von Befehlen für die tägliche Verwendung von Git" + +#: command-list.h:198 +msgid "A Git Glossary" +msgstr "ein Git-Glossar" + +#: command-list.h:199 +msgid "Hooks used by Git" +msgstr "von Git verwendete Hooks" + +#: command-list.h:200 +msgid "Specifies intentionally untracked files to ignore" +msgstr "Spezifikation von bewusst ignorierten, unversionierten Dateien" + +#: command-list.h:201 +msgid "Defining submodule properties" +msgstr "Definition von Submodul-Eigenschaften" + +#: command-list.h:202 +msgid "Git namespaces" +msgstr "Git Namensbereiche" + +#: command-list.h:203 +msgid "Git Repository Layout" +msgstr "Git Repository Aufbau" + +#: command-list.h:204 +msgid "Specifying revisions and ranges for Git" +msgstr "Spezifikation von Commits und Bereichen für Git" + +#: command-list.h:205 +msgid "A tutorial introduction to Git: part two" +msgstr "eine einführende Anleitung zu Git: Teil zwei" + +#: command-list.h:206 +msgid "A tutorial introduction to Git" +msgstr "eine einführende Anleitung zu Git" + +#: command-list.h:207 +msgid "An overview of recommended workflows with Git" +msgstr "Eine Übersicht über empfohlene Arbeitsabläufe mit Git" #: rerere.h:40 msgid "update the index with reused conflict resolution if possible" @@ -16174,7 +18484,7 @@ msgstr "" "Um abzubrechen und zurück zum Zustand vor \"git rebase\" zu gelangen,\n" "führen Sie \"git rebase --abort\" aus." -#: git-rebase.sh:173 git-rebase.sh:442 +#: git-rebase.sh:173 git-rebase.sh:454 #, sh-format msgid "Could not move back to $head_name" msgstr "Konnte nicht zu $head_name zurückgehen" @@ -16188,29 +18498,29 @@ msgstr "Automatischen Stash angewendet." msgid "Cannot store $stash_sha1" msgstr "Kann $stash_sha1 nicht speichern." -#: git-rebase.sh:229 +#: git-rebase.sh:236 msgid "The pre-rebase hook refused to rebase." msgstr "Der \"pre-rebase hook\" hat den Rebase zurückgewiesen." -#: git-rebase.sh:234 +#: git-rebase.sh:241 msgid "It looks like 'git am' is in progress. Cannot rebase." msgstr "'git-am' scheint im Gange zu sein. Kann Rebase nicht durchführen." -#: git-rebase.sh:403 +#: git-rebase.sh:415 msgid "No rebase in progress?" msgstr "Kein Rebase im Gange?" -#: git-rebase.sh:414 +#: git-rebase.sh:426 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "" "Die --edit-todo Aktion kann nur während eines interaktiven Rebase verwendet " "werden." -#: git-rebase.sh:421 +#: git-rebase.sh:433 msgid "Cannot read HEAD" msgstr "Kann HEAD nicht lesen" -#: git-rebase.sh:424 +#: git-rebase.sh:436 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -16218,7 +18528,7 @@ msgstr "" "Sie müssen alle Merge-Konflikte editieren und diese dann\n" "mittels \"git add\" als aufgelöst markieren" -#: git-rebase.sh:468 +#: git-rebase.sh:480 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" @@ -16239,81 +18549,94 @@ msgstr "" "und führen Sie diesen Befehl nochmal aus. Es wird angehalten, falls noch\n" "etwas Schützenswertes vorhanden ist." -#: git-rebase.sh:509 +#: git-rebase.sh:545 msgid "error: cannot combine '--signoff' with '--preserve-merges'" -msgstr "Fehler: '--signoff' und '--preserve-merges' können nicht kombiniert werden." +msgstr "" +"Fehler: '--signoff' und '--preserve-merges' können nicht kombiniert werden." + +#: git-rebase.sh:556 +msgid "error: cannot combine '--preserve_merges' with '--rebase-merges'" +msgstr "Fehler: '--preserve-merges' und '--rebase-merges' können nicht kombiniert werden." + +#: git-rebase.sh:562 +msgid "error: cannot combine '--rebase_merges' with '--strategy-option'" +msgstr "Fehler: '--rebase-merges' und '--strategy-option' können nicht kombiniert werden." + +#: git-rebase.sh:564 +msgid "error: cannot combine '--rebase_merges' with '--strategy'" +msgstr "Fehler: '--rebase-merges' und '--strategy' können nicht kombiniert werden." -#: git-rebase.sh:537 +#: git-rebase.sh:590 #, sh-format msgid "invalid upstream '$upstream_name'" msgstr "Ungültiger Upstream-Branch '$upstream_name'." -#: git-rebase.sh:561 +#: git-rebase.sh:614 #, sh-format msgid "$onto_name: there are more than one merge bases" msgstr "$onto_name: es gibt mehr als eine Merge-Basis" -#: git-rebase.sh:564 git-rebase.sh:568 +#: git-rebase.sh:617 git-rebase.sh:621 #, sh-format msgid "$onto_name: there is no merge base" msgstr "$onto_name: es gibt keine Merge-Basis" -#: git-rebase.sh:573 +#: git-rebase.sh:626 #, sh-format msgid "Does not point to a valid commit: $onto_name" msgstr "$onto_name zeigt auf keinen gültigen Commit" -#: git-rebase.sh:599 +#: git-rebase.sh:652 #, sh-format msgid "fatal: no such branch/commit '$branch_name'" msgstr "fatal: Branch/Commit '$branch_name' nicht gefunden" -#: git-rebase.sh:632 +#: git-rebase.sh:685 msgid "Cannot autostash" msgstr "Kann automatischen Stash nicht erzeugen." -#: git-rebase.sh:637 +#: git-rebase.sh:690 #, sh-format msgid "Created autostash: $stash_abbrev" msgstr "Automatischen Stash erzeugt: $stash_abbrev" -#: git-rebase.sh:641 +#: git-rebase.sh:694 msgid "Please commit or stash them." msgstr "Bitte committen Sie die Änderungen oder benutzen Sie \"stash\"." -#: git-rebase.sh:664 +#: git-rebase.sh:717 #, sh-format msgid "HEAD is up to date." msgstr "HEAD ist aktuell." -#: git-rebase.sh:666 +#: git-rebase.sh:719 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "Aktueller Branch $branch_name ist auf dem neuesten Stand." -#: git-rebase.sh:674 +#: git-rebase.sh:727 #, sh-format msgid "HEAD is up to date, rebase forced." msgstr "HEAD ist aktuell, Rebase erzwungen." -#: git-rebase.sh:676 +#: git-rebase.sh:729 #, sh-format msgid "Current branch $branch_name is up to date, rebase forced." msgstr "" "Aktueller Branch $branch_name ist auf dem neuesten Stand, Rebase erzwungen." -#: git-rebase.sh:688 +#: git-rebase.sh:741 #, sh-format msgid "Changes from $mb to $onto:" msgstr "Änderungen von $mb zu $onto:" -#: git-rebase.sh:697 +#: git-rebase.sh:750 msgid "First, rewinding head to replay your work on top of it..." msgstr "" "Zunächst wird der Branch zurückgespult, um Ihre Änderungen\n" "darauf neu anzuwenden ..." -#: git-rebase.sh:707 +#: git-rebase.sh:760 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "$branch_name zu $onto_name vorgespult." @@ -16555,27 +18878,17 @@ msgstr "Hinzufügen von Submodul '$sm_path' fehlgeschlagen" msgid "Failed to register submodule '$sm_path'" msgstr "Fehler beim Eintragen von Submodul '$sm_path' in die Konfiguration." -#: git-submodule.sh:354 -#, sh-format -msgid "Entering '$displaypath'" -msgstr "Betrete '$displaypath'" - -#: git-submodule.sh:374 -#, sh-format -msgid "Stopping at '$displaypath'; script returned non-zero status." -msgstr "Stoppe bei '$displaypath'; Skript gab nicht-Null Status zurück." - -#: git-submodule.sh:600 +#: git-submodule.sh:565 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "Konnte aktuellen Commit in Submodul-Pfad '$displaypath' nicht finden." -#: git-submodule.sh:610 +#: git-submodule.sh:575 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "Konnte \"fetch\" in Submodul-Pfad '$sm_path' nicht ausführen" -#: git-submodule.sh:615 +#: git-submodule.sh:580 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " @@ -16584,12 +18897,12 @@ msgstr "" "Konnte aktuellen Commit von ${remote_name}/${branch} in Submodul-Pfad\n" "'$sm_path' nicht finden." -#: git-submodule.sh:633 +#: git-submodule.sh:603 #, sh-format msgid "Unable to fetch in submodule path '$displaypath'" msgstr "Konnte \"fetch\" in Submodul-Pfad '$displaypath' nicht ausführen" -#: git-submodule.sh:639 +#: git-submodule.sh:609 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " @@ -16598,74 +18911,74 @@ msgstr "" "\"fetch\" in Submodul-Pfad '$displaypath' ausgeführt, aber $sha1 nicht\n" "enthalten. Direktes Anfordern dieses Commits ist fehlgeschlagen." -#: git-submodule.sh:646 +#: git-submodule.sh:616 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "Konnte '$sha1' in Submodul-Pfad '$displaypath' nicht auschecken." -#: git-submodule.sh:647 +#: git-submodule.sh:617 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "Submodul-Pfad: '$displaypath': '$sha1' ausgecheckt" -#: git-submodule.sh:651 +#: git-submodule.sh:621 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "Rebase auf '$sha1' in Submodul-Pfad '$displaypath' nicht möglich" -#: git-submodule.sh:652 +#: git-submodule.sh:622 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "Submodul-Pfad '$displaypath': Rebase auf '$sha1'" -#: git-submodule.sh:657 +#: git-submodule.sh:627 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "Merge von '$sha1' in Submodul-Pfad '$displaypath' fehlgeschlagen" -#: git-submodule.sh:658 +#: git-submodule.sh:628 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "Submodul-Pfad '$displaypath': zusammengeführt in '$sha1'" -#: git-submodule.sh:663 +#: git-submodule.sh:633 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "" "Ausführung von '$command $sha1' in Submodul-Pfad '$displaypath' " "fehlgeschlagen" -#: git-submodule.sh:664 +#: git-submodule.sh:634 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "Submodul-Pfad '$displaypath': '$command $sha1'" -#: git-submodule.sh:695 +#: git-submodule.sh:665 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "Fehler bei Rekursion in Submodul-Pfad '$displaypath'" -#: git-submodule.sh:791 +#: git-submodule.sh:761 msgid "The --cached option cannot be used with the --files option" msgstr "" "Die Optionen --cached und --files können nicht gemeinsam verwendet werden." -#: git-submodule.sh:843 +#: git-submodule.sh:813 #, sh-format msgid "unexpected mode $mod_dst" msgstr "unerwarteter Modus $mod_dst" -#: git-submodule.sh:863 +#: git-submodule.sh:833 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr " Warnung: $display_name beinhaltet nicht Commit $sha1_src" -#: git-submodule.sh:866 +#: git-submodule.sh:836 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr " Warnung: $display_name beinhaltet nicht Commit $sha1_dst" -#: git-submodule.sh:869 +#: git-submodule.sh:839 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr "" @@ -16676,12 +18989,7 @@ msgstr "" msgid "See git-${cmd}(1) for details." msgstr "Siehe git-${cmd}(1) für weitere Details." -#: git-rebase--interactive.sh:142 -#, sh-format -msgid "Rebasing ($new_count/$total)" -msgstr "Führe Rebase aus ($new_count/$total)" - -#: git-rebase--interactive.sh:158 +#: git-rebase--interactive.sh:43 msgid "" "\n" "Commands:\n" @@ -16690,7 +18998,7 @@ msgid "" "e, edit <commit> = use commit, but stop for amending\n" "s, squash <commit> = use commit, but meld into previous commit\n" "f, fixup <commit> = like \"squash\", but discard this commit's log message\n" -"x, exec <commit> = run command (the rest of the line) using shell\n" +"x, exec <command> = run command (the rest of the line) using shell\n" "d, drop <commit> = remove commit\n" "l, label <label> = label current HEAD with a name\n" "t, reset <label> = reset HEAD to a label\n" @@ -16721,7 +19029,7 @@ msgstr "" "Diese Zeilen können umsortiert werden; Sie werden von oben nach unten\n" "ausgeführt.\n" -#: git-rebase--interactive.sh:179 +#: git-rebase--interactive.sh:64 git-rebase--preserve-merges.sh:173 msgid "" "\n" "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" @@ -16730,7 +19038,7 @@ msgstr "" "Keine Zeile entfernen. Benutzen Sie 'drop', um explizit einen Commit zu\n" "entfernen.\n" -#: git-rebase--interactive.sh:183 +#: git-rebase--interactive.sh:68 git-rebase--preserve-merges.sh:177 msgid "" "\n" "If you remove a line here THAT COMMIT WILL BE LOST.\n" @@ -16738,7 +19046,122 @@ msgstr "" "\n" "Wenn Sie hier eine Zeile entfernen, wird DIESER COMMIT VERLOREN GEHEN.\n" -#: git-rebase--interactive.sh:221 +#: git-rebase--interactive.sh:108 git-rebase--preserve-merges.sh:724 +msgid "could not detach HEAD" +msgstr "Konnte HEAD nicht loslösen" + +#: git-rebase--interactive.sh:147 git-rebase--preserve-merges.sh:816 +msgid "" +"\n" +"You are editing the todo file of an ongoing interactive rebase.\n" +"To continue rebase after editing, run:\n" +" git rebase --continue\n" +"\n" +msgstr "" +"\n" +"Sie bearbeiten gerade die TODO-Datei eines laufenden interaktiven Rebase.\n" +"Um den Rebase nach dem Editieren fortzusetzen, führen Sie aus:\n" +" git rebase --continue\n" +"\n" + +#: git-rebase--interactive.sh:155 git-rebase--interactive.sh:241 +#: git-rebase--preserve-merges.sh:824 git-rebase--preserve-merges.sh:910 +msgid "Could not execute editor" +msgstr "Konnte Editor nicht ausführen." + +#: git-rebase--interactive.sh:176 git-rebase--preserve-merges.sh:845 +#, sh-format +msgid "Could not checkout $switch_to" +msgstr "Konnte $switch_to nicht auschecken." + +#: git-rebase--interactive.sh:183 git-rebase--preserve-merges.sh:852 +msgid "No HEAD?" +msgstr "Kein HEAD?" + +#: git-rebase--interactive.sh:184 git-rebase--preserve-merges.sh:853 +#, sh-format +msgid "Could not create temporary $state_dir" +msgstr "Konnte temporäres Verzeichnis $state_dir nicht erstellen." + +#: git-rebase--interactive.sh:187 git-rebase--preserve-merges.sh:856 +msgid "Could not mark as interactive" +msgstr "Konnte nicht als interaktiven Rebase markieren." + +#: git-rebase--interactive.sh:219 git-rebase--preserve-merges.sh:888 +#, sh-format +msgid "Rebase $shortrevisions onto $shortonto ($todocount command)" +msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" +msgstr[0] "Rebase von $shortrevisions auf $shortonto ($todocount Kommando)" +msgstr[1] "Rebase von $shortrevisions auf $shortonto ($todocount Kommandos)" + +#: git-rebase--interactive.sh:224 +msgid "" +"\n" +"\tHowever, if you remove everything, the rebase will be aborted.\n" +"\n" +"\t" +msgstr "" +"\n" +"\tWenn Sie jedoch alles löschen, wird der Rebase abgebrochen.\n" +"\n" +"\t" + +#: git-rebase--interactive.sh:231 git-rebase--preserve-merges.sh:900 +msgid "Note that empty commits are commented out" +msgstr "Leere Commits sind auskommentiert." + +#: git-rebase--interactive.sh:280 +msgid "Could not generate todo list" +msgstr "Konnte TODO-Liste nicht erzeugen." + +#: git-rebase--preserve-merges.sh:136 +#, sh-format +msgid "Rebasing ($new_count/$total)" +msgstr "Führe Rebase aus ($new_count/$total)" + +#: git-rebase--preserve-merges.sh:152 +msgid "" +"\n" +"Commands:\n" +"p, pick <commit> = use commit\n" +"r, reword <commit> = use commit, but edit the commit message\n" +"e, edit <commit> = use commit, but stop for amending\n" +"s, squash <commit> = use commit, but meld into previous commit\n" +"f, fixup <commit> = like \"squash\", but discard this commit's log message\n" +"x, exec <commit> = run command (the rest of the line) using shell\n" +"d, drop <commit> = remove commit\n" +"l, label <label> = label current HEAD with a name\n" +"t, reset <label> = reset HEAD to a label\n" +"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n" +". create a merge commit using the original merge commit's\n" +". message (or the oneline, if no original merge commit was\n" +". specified). Use -c <commit> to reword the commit message.\n" +"\n" +"These lines can be re-ordered; they are executed from top to bottom.\n" +msgstr "" +"\n" +"Befehle:\n" +"p, pick <Commit> = Commit verwenden\n" +"r, reword <Commit> = Commit verwenden, aber Commit-Beschreibung bearbeiten\n" +"e, edit <Commit> = Commit verwenden, aber zum Nachbessern anhalten\n" +"s, squash <Commit> = Commit verwenden, aber mit vorherigem Commit vereinen\n" +"f, fixup <Commit> = wie \"squash\", aber diese Commit-Beschreibung " +"verwerfen\n" +"x, exec <Commit> = Befehl (Rest der Zeile) mittels Shell ausführen\n" +"d, drop <Commit> = Commit entfernen\n" +"l, label <Label> = aktuellen HEAD mit Label versehen\n" +"t, reset <Label> = HEAD zu einem Label umsetzen\n" +"m, merge [-C <Commit> | -c <Commit>] <Label> [# <eineZeile>]\n" +". Merge-Commit mit der originalen Merge-Commit-Beschreibung erstellen\n" +". (oder die eine Zeile, wenn keine originale Merge-Commit-" +"Beschreibung\n" +". spezifiziert ist). Benutzen Sie -c <Commit> zum Bearbeiten der\n" +". Commit-Beschreibung.\n" +"\n" +"Diese Zeilen können umsortiert werden; Sie werden von oben nach unten\n" +"ausgeführt.\n" + +#: git-rebase--preserve-merges.sh:215 #, sh-format msgid "" "You can amend the commit now, with\n" @@ -16757,83 +19180,83 @@ msgstr "" "\n" "\tgit rebase --continue" -#: git-rebase--interactive.sh:246 +#: git-rebase--preserve-merges.sh:240 #, sh-format msgid "$sha1: not a commit that can be picked" msgstr "$sha1: kein Commit der gepickt werden kann" -#: git-rebase--interactive.sh:285 +#: git-rebase--preserve-merges.sh:279 #, sh-format msgid "Invalid commit name: $sha1" msgstr "Ungültiger Commit-Name: $sha1" -#: git-rebase--interactive.sh:325 +#: git-rebase--preserve-merges.sh:309 msgid "Cannot write current commit's replacement sha1" msgstr "Kann ersetzenden SHA-1 des aktuellen Commits nicht schreiben" -#: git-rebase--interactive.sh:376 +#: git-rebase--preserve-merges.sh:360 #, sh-format msgid "Fast-forward to $sha1" msgstr "Spule vor zu $sha1" -#: git-rebase--interactive.sh:378 +#: git-rebase--preserve-merges.sh:362 #, sh-format msgid "Cannot fast-forward to $sha1" msgstr "Kann nicht zu $sha1 vorspulen" -#: git-rebase--interactive.sh:387 +#: git-rebase--preserve-merges.sh:371 #, sh-format msgid "Cannot move HEAD to $first_parent" msgstr "Kann HEAD nicht auf $first_parent setzen" -#: git-rebase--interactive.sh:392 +#: git-rebase--preserve-merges.sh:376 #, sh-format msgid "Refusing to squash a merge: $sha1" msgstr "\"squash\" eines Merges ($sha1) zurückgewiesen." -#: git-rebase--interactive.sh:410 +#: git-rebase--preserve-merges.sh:394 #, sh-format msgid "Error redoing merge $sha1" msgstr "Fehler beim Wiederholen des Merges von $sha1" -#: git-rebase--interactive.sh:419 +#: git-rebase--preserve-merges.sh:403 #, sh-format msgid "Could not pick $sha1" msgstr "Konnte $sha1 nicht picken" -#: git-rebase--interactive.sh:428 +#: git-rebase--preserve-merges.sh:412 #, sh-format msgid "This is the commit message #${n}:" msgstr "Das ist Commit-Beschreibung #${n}:" -#: git-rebase--interactive.sh:433 +#: git-rebase--preserve-merges.sh:417 #, sh-format msgid "The commit message #${n} will be skipped:" msgstr "Commit-Beschreibung #${n} wird ausgelassen:" -#: git-rebase--interactive.sh:444 +#: git-rebase--preserve-merges.sh:428 #, sh-format msgid "This is a combination of $count commit." msgid_plural "This is a combination of $count commits." msgstr[0] "Das ist eine Kombination aus $count Commit." msgstr[1] "Das ist eine Kombination aus $count Commits." -#: git-rebase--interactive.sh:453 +#: git-rebase--preserve-merges.sh:437 #, sh-format msgid "Cannot write $fixup_msg" msgstr "Kann $fixup_msg nicht schreiben" -#: git-rebase--interactive.sh:456 +#: git-rebase--preserve-merges.sh:440 msgid "This is a combination of 2 commits." msgstr "Das ist eine Kombination aus 2 Commits." -#: git-rebase--interactive.sh:497 git-rebase--interactive.sh:540 -#: git-rebase--interactive.sh:543 +#: git-rebase--preserve-merges.sh:481 git-rebase--preserve-merges.sh:524 +#: git-rebase--preserve-merges.sh:527 #, sh-format msgid "Could not apply $sha1... $rest" msgstr "Konnte $sha1... ($rest) nicht anwenden" -#: git-rebase--interactive.sh:572 +#: git-rebase--preserve-merges.sh:556 #, sh-format msgid "" "Could not amend commit after successfully picking $sha1... $rest\n" @@ -16850,31 +19273,31 @@ msgstr "" "sollten Sie das Problem beheben, bevor Sie die Commit-Beschreibung ändern " "können." -#: git-rebase--interactive.sh:587 +#: git-rebase--preserve-merges.sh:571 #, sh-format msgid "Stopped at $sha1_abbrev... $rest" msgstr "Angehalten bei $sha1_abbrev... $rest" -#: git-rebase--interactive.sh:602 +#: git-rebase--preserve-merges.sh:586 #, sh-format msgid "Cannot '$squash_style' without a previous commit" msgstr "Kann nicht '$squash_style' ohne vorherigen Commit" -#: git-rebase--interactive.sh:644 +#: git-rebase--preserve-merges.sh:628 #, sh-format msgid "Executing: $rest" msgstr "Führe aus: $rest" -#: git-rebase--interactive.sh:652 +#: git-rebase--preserve-merges.sh:636 #, sh-format msgid "Execution failed: $rest" msgstr "Ausführung fehlgeschlagen: $rest" -#: git-rebase--interactive.sh:654 +#: git-rebase--preserve-merges.sh:638 msgid "and made changes to the index and/or the working tree" msgstr "Der Index und/oder das Arbeitsverzeichnis wurde geändert." -#: git-rebase--interactive.sh:656 +#: git-rebase--preserve-merges.sh:640 msgid "" "You can fix the problem, and then run\n" "\n" @@ -16887,7 +19310,7 @@ msgstr "" "ausführen." #. TRANSLATORS: after these lines is a command to be issued by the user -#: git-rebase--interactive.sh:669 +#: git-rebase--preserve-merges.sh:653 #, sh-format msgid "" "Execution succeeded: $rest\n" @@ -16903,29 +19326,25 @@ msgstr "" "\n" "\tgit rebase --continue" -#: git-rebase--interactive.sh:680 +#: git-rebase--preserve-merges.sh:664 #, sh-format msgid "Unknown command: $command $sha1 $rest" msgstr "Unbekannter Befehl: $command $sha1 $rest" -#: git-rebase--interactive.sh:681 +#: git-rebase--preserve-merges.sh:665 msgid "Please fix this using 'git rebase --edit-todo'." msgstr "Bitte beheben Sie das, indem Sie 'git rebase --edit-todo' ausführen." -#: git-rebase--interactive.sh:716 +#: git-rebase--preserve-merges.sh:700 #, sh-format msgid "Successfully rebased and updated $head_name." msgstr "Erfolgreich Rebase ausgeführt und $head_name aktualisiert." -#: git-rebase--interactive.sh:740 -msgid "could not detach HEAD" -msgstr "Konnte HEAD nicht loslösen" - -#: git-rebase--interactive.sh:778 +#: git-rebase--preserve-merges.sh:757 msgid "Could not remove CHERRY_PICK_HEAD" msgstr "Konnte CHERRY_PICK_HEAD nicht löschen" -#: git-rebase--interactive.sh:783 +#: git-rebase--preserve-merges.sh:762 #, sh-format msgid "" "You have staged changes in your working tree.\n" @@ -16957,13 +19376,13 @@ msgstr "" "\n" " git rebase --continue\n" -#: git-rebase--interactive.sh:800 +#: git-rebase--preserve-merges.sh:779 msgid "Error trying to find the author identity to amend commit" msgstr "" "Fehler beim Versuch die Identität des Authors zum Verbessern des Commits zu\n" "finden" -#: git-rebase--interactive.sh:805 +#: git-rebase--preserve-merges.sh:784 msgid "" "You have uncommitted changes in your working tree. Please commit them\n" "first and then run 'git rebase --continue' again." @@ -16973,74 +19392,18 @@ msgstr "" "erneut\n" "aus." -#: git-rebase--interactive.sh:810 git-rebase--interactive.sh:814 +#: git-rebase--preserve-merges.sh:789 git-rebase--preserve-merges.sh:793 msgid "Could not commit staged changes." msgstr "Konnte Änderungen aus der Staging-Area nicht committen." -#: git-rebase--interactive.sh:843 -msgid "" -"\n" -"You are editing the todo file of an ongoing interactive rebase.\n" -"To continue rebase after editing, run:\n" -" git rebase --continue\n" -"\n" -msgstr "" -"\n" -"Sie bearbeiten gerade die TODO-Datei eines laufenden interaktiven Rebase.\n" -"Um den Rebase nach dem Editieren fortzusetzen, führen Sie aus:\n" -" git rebase --continue\n" -"\n" - -#: git-rebase--interactive.sh:851 git-rebase--interactive.sh:937 -msgid "Could not execute editor" -msgstr "Konnte Editor nicht ausführen." - -#: git-rebase--interactive.sh:872 -#, sh-format -msgid "Could not checkout $switch_to" -msgstr "Konnte $switch_to nicht auschecken." - -#: git-rebase--interactive.sh:879 -msgid "No HEAD?" -msgstr "Kein HEAD?" - -#: git-rebase--interactive.sh:880 -#, sh-format -msgid "Could not create temporary $state_dir" -msgstr "Konnte temporäres Verzeichnis $state_dir nicht erstellen." - -#: git-rebase--interactive.sh:883 -msgid "Could not mark as interactive" -msgstr "Konnte nicht als interaktiven Rebase markieren." - -#: git-rebase--interactive.sh:915 -#, sh-format -msgid "Rebase $shortrevisions onto $shortonto ($todocount command)" -msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" -msgstr[0] "Rebase von $shortrevisions auf $shortonto ($todocount Kommando)" -msgstr[1] "Rebase von $shortrevisions auf $shortonto ($todocount Kommandos)" - -#: git-rebase--interactive.sh:920 +#: git-rebase--preserve-merges.sh:893 msgid "" "\n" -"\tHowever, if you remove everything, the rebase will be aborted.\n" -"\n" -"\t" -msgstr "" -"\n" -"\tWenn Sie jedoch alles löschen, wird der Rebase abgebrochen.\n" +"However, if you remove everything, the rebase will be aborted.\n" "\n" -"\t" - -#: git-rebase--interactive.sh:927 -msgid "Note that empty commits are commented out" -msgstr "Leere Commits sind auskommentiert." - -#: git-rebase--interactive.sh:980 -msgid "Could not generate todo list" -msgstr "Konnte TODO-Liste nicht erzeugen." +msgstr "\nWenn Sie jedoch alles löschen, wird der Rebase abgebrochen.\n\n" -#: git-rebase--interactive.sh:1001 git-rebase--interactive.sh:1006 +#: git-rebase--preserve-merges.sh:942 git-rebase--preserve-merges.sh:947 msgid "Could not init rewritten commits" msgstr "Konnte neu geschriebene Commits nicht initialisieren." @@ -17924,7 +20287,9 @@ msgstr "" #. at this point. #: git-send-email.perl:1415 msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): " -msgstr "Diese E-Mail versenden? (Ja [y]|Nein [n]|Bearbeiten [e]|Beenden [q]|Alle [a]): " +msgstr "" +"Diese E-Mail versenden? (Ja [y]|Nein [n]|Bearbeiten [e]|Beenden [q]|Alle " +"[a]): " #: git-send-email.perl:1418 msgid "Send this email reply required" @@ -17944,113 +20309,137 @@ msgstr "Server unterstützt kein STARTTLS! %s" msgid "STARTTLS failed! %s" msgstr "STARTTLS fehlgeschlagen! %s" -#: git-send-email.perl:1512 +#: git-send-email.perl:1511 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." msgstr "" "Konnte SMTP nicht korrekt initialisieren. Bitte prüfen Sie Ihre " "Konfiguration\n" "und benutzen Sie --smtp-debug." -#: git-send-email.perl:1530 +#: git-send-email.perl:1529 #, perl-format msgid "Failed to send %s\n" msgstr "Fehler beim Senden %s\n" -#: git-send-email.perl:1533 +#: git-send-email.perl:1532 #, perl-format msgid "Dry-Sent %s\n" msgstr "Probeversand %s\n" -#: git-send-email.perl:1533 +#: git-send-email.perl:1532 #, perl-format msgid "Sent %s\n" msgstr "%s gesendet\n" -#: git-send-email.perl:1535 +#: git-send-email.perl:1534 msgid "Dry-OK. Log says:\n" msgstr "Probeversand OK. Log enthält:\n" -#: git-send-email.perl:1535 +#: git-send-email.perl:1534 msgid "OK. Log says:\n" msgstr "OK. Log enthält:\n" -#: git-send-email.perl:1547 +#: git-send-email.perl:1546 msgid "Result: " msgstr "Ergebnis: " -#: git-send-email.perl:1550 +#: git-send-email.perl:1549 msgid "Result: OK\n" msgstr "Ergebnis: OK\n" -#: git-send-email.perl:1568 +#: git-send-email.perl:1567 #, perl-format msgid "can't open file %s" msgstr "Kann Datei %s nicht öffnen" -#: git-send-email.perl:1615 git-send-email.perl:1635 +#: git-send-email.perl:1614 git-send-email.perl:1634 #, perl-format msgid "(mbox) Adding cc: %s from line '%s'\n" msgstr "(mbox) Füge cc: hinzu: %s von Zeile '%s'\n" -#: git-send-email.perl:1621 +#: git-send-email.perl:1620 #, perl-format msgid "(mbox) Adding to: %s from line '%s'\n" msgstr "(mbox) Füge to: hinzu: %s von Zeile '%s'\n" -#: git-send-email.perl:1674 +#: git-send-email.perl:1673 #, perl-format msgid "(non-mbox) Adding cc: %s from line '%s'\n" msgstr "(non-mbox) Füge cc: hinzu: %s von Zeile '%s'\n" -#: git-send-email.perl:1699 +#: git-send-email.perl:1698 #, perl-format msgid "(body) Adding cc: %s from line '%s'\n" msgstr "(body) Füge cc: hinzu: %s von Zeile '%s'\n" -#: git-send-email.perl:1817 +#: git-send-email.perl:1809 #, perl-format msgid "(%s) Could not execute '%s'" msgstr "(%s) Konnte '%s' nicht ausführen" -#: git-send-email.perl:1824 +#: git-send-email.perl:1816 #, perl-format msgid "(%s) Adding %s: %s from: '%s'\n" msgstr "(%s) Füge %s: %s hinzu von: '%s'\n" -#: git-send-email.perl:1828 +#: git-send-email.perl:1820 #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "(%s) Fehler beim Schließen der Pipe nach '%s'" -#: git-send-email.perl:1855 +#: git-send-email.perl:1850 msgid "cannot send message as 7bit" msgstr "Kann Nachricht nicht als 7bit versenden." -#: git-send-email.perl:1863 +#: git-send-email.perl:1858 msgid "invalid transfer encoding" msgstr "Ungültiges Transfer-Encoding" -#: git-send-email.perl:1901 git-send-email.perl:1952 git-send-email.perl:1962 +#: git-send-email.perl:1899 git-send-email.perl:1951 git-send-email.perl:1961 #, perl-format msgid "unable to open %s: %s\n" msgstr "konnte %s nicht öffnen: %s\n" -#: git-send-email.perl:1904 +#: git-send-email.perl:1902 #, perl-format msgid "%s: patch contains a line longer than 998 characters" msgstr "%s: Patch enthält eine Zeile, die länger als 998 Zeichen ist" -#: git-send-email.perl:1920 +#: git-send-email.perl:1919 #, perl-format msgid "Skipping %s with backup suffix '%s'.\n" msgstr "Lasse %s mit Backup-Suffix '%s' aus.\n" #. TRANSLATORS: please keep "[y|N]" as is. -#: git-send-email.perl:1924 +#: git-send-email.perl:1923 #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "Wollen Sie %s wirklich versenden? [y|N]: " +#~ msgid "Dirty index: cannot merge (dirty: %s)" +#~ msgstr "Geänderter Index: kann nicht mergen (geändert: %s)" + +#~ msgid "(+/-)x" +#~ msgstr "(+/-)x" + +#~ msgid "<command>" +#~ msgstr "<Programm>" + +#~ msgid "Everyday Git With 20 Commands Or So" +#~ msgstr "Tägliche Benutzung von Git mit ungefähr 20 Befehlen" + +#~ msgid "push|fetch" +#~ msgstr "push|fetch" + +#~ msgid "w[,i1[,i2]]" +#~ msgstr "w[,i1[,i2]]" + +#~ msgid "Entering '$displaypath'" +#~ msgstr "Betrete '$displaypath'" + +#~ msgid "Stopping at '$displaypath'; script returned non-zero status." +#~ msgstr "Stoppe bei '$displaypath'; Skript gab nicht-Null Status zurück." + #~ msgid "Could not open '%s' for writing" #~ msgstr "Konnte '%s' nicht zum Schreiben öffnen." @@ -18107,9 +20496,6 @@ msgstr "Wollen Sie %s wirklich versenden? [y|N]: " #~ "ungültig.\n" #~ "Bitte benutzen Sie stattdessen . wenn Sie alle Pfade meinen." -#~ msgid "unable to open '%s' for writing" -#~ msgstr "Konnte '%s' nicht zum Schreiben öffnen." - #~ msgid "could not truncate '%s'" #~ msgstr "Konnte '%s' nicht abschneiden." @@ -18134,9 +20520,6 @@ msgstr "Wollen Sie %s wirklich versenden? [y|N]: " #~ msgid "show ignored files" #~ msgstr "ignorierte Dateien anzeigen" -#~ msgid "%s is not a valid '%s' object" -#~ msgstr "%s ist kein gültiges '%s' Objekt" - #~ msgid "Don't know how to fetch from %s" #~ msgstr "Weiß nicht wie von %s angefordert wird." @@ -18239,9 +20622,6 @@ msgstr "Wollen Sie %s wirklich versenden? [y|N]: " #~ msgid "tag: tagging " #~ msgstr "tag: tagge " -#~ msgid "object of unknown type" -#~ msgstr "Art des Objektes unbekannt" - #~ msgid "commit object" #~ msgstr "Commit-Objekt" @@ -18251,9 +20631,6 @@ msgstr "Wollen Sie %s wirklich versenden? [y|N]: " #~ msgid "blob object" #~ msgstr "Blob-Objekt" -#~ msgid "other tag object" -#~ msgstr "anderes Tag-Objekt" - #, fuzzy #~ msgid "Submodule '%s' cannot checkout new HEAD" #~ msgstr "Submodul '%s' kann Alternative nicht hinzufügen: %s" @@ -18315,12 +20692,6 @@ msgstr "Wollen Sie %s wirklich versenden? [y|N]: " #~ msgid "git merge [<options>] <msg> HEAD <commit>" #~ msgstr "git merge [<Optionen>] <Beschreibung> HEAD <Commit>" -#~ msgid "cannot open file '%s'" -#~ msgstr "Kann Datei '%s' nicht öffnen" - -#~ msgid "could not close file %s" -#~ msgstr "Konnte Datei '%s' nicht schließen." - #~ msgid "Use an experimental blank-line-based heuristic to improve diffs" #~ msgstr "" #~ "eine experimentelle, auf Leerzeilen basierende Heuristik zur " @@ -18369,9 +20740,6 @@ msgstr "Wollen Sie %s wirklich versenden? [y|N]: " #~ msgid "Could not open %s" #~ msgstr "Konnte %s nicht öffnen" -#~ msgid "Could not read %s." -#~ msgstr "Konnte %s nicht lesen." - #~ msgid "Could not format %s." #~ msgstr "Konnte %s nicht formatieren." @@ -13663,7 +13663,7 @@ msgstr "Đánh số các đối tượng" #: builtin/pack-objects.c:3382 #, c-format msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)" -msgstr "Tỏng %<PRIu32> (delta %<PRIu32>), dùng lại %<PRIu32> (delta %<PRIu32>)" +msgstr "Tổng %<PRIu32> (delta %<PRIu32>), dùng lại %<PRIu32> (delta %<PRIu32>)" #: builtin/pack-refs.c:7 msgid "git pack-refs [<options>]" diff --git a/po/zh_CN.po b/po/zh_CN.po index 3419643..eabd4d1 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -46,7 +46,7 @@ # conflict | 冲突 # core Git | 核心 Git 工具 # DAG | 有向无环图 -# dangling object | 摇摆对象 +# dangling object | 悬空对象 # detached HEAD | 分离头指针 # directory | 目录 # dirty | 脏（的工作区） @@ -438,7 +438,7 @@ msgstr "补丁应用到空文件 '%s'，但其并非空文件" #: apply.c:3190 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" -msgstr "无法读取 '%2$s' 必须的目标文件 %1$s" +msgstr "无法读取 '%2$s' 必需的目标文件 %1$s" #: apply.c:3203 #, c-format @@ -968,12 +968,12 @@ msgstr "参数不支持此格式 '%s'：-%d" #: archive-tar.c:125 archive-zip.c:344 #, c-format msgid "cannot stream blob %s" -msgstr "不能为数据对象 %s 打开流" +msgstr "不能打开数据对象 %s" #: archive-tar.c:260 archive-zip.c:361 #, c-format msgid "unsupported file mode: 0%o (SHA1: %s)" -msgstr "不支持的文件属性：0%o (SHA1: %s)" +msgstr "不支持的文件模式：0%o (SHA1: %s)" #: archive-tar.c:287 archive-zip.c:352 #, c-format @@ -992,7 +992,7 @@ msgstr "无法重定向描述符" #: archive-tar.c:468 #, c-format msgid "'%s' filter reported error" -msgstr "'%s' 过滤器报告错误" +msgstr "'%s' 过滤器报告了错误" #: archive-zip.c:313 #, c-format @@ -1012,7 +1012,7 @@ msgstr "压缩错误 (%d)" #: archive-zip.c:605 #, c-format msgid "timestamp too large for this system: %<PRIuMAX>" -msgstr "对于本系统时间戳太长：%<PRIuMAX>" +msgstr "对于本系统时间戳太大：%<PRIuMAX>" #: attr.c:218 #, c-format @@ -1499,7 +1499,7 @@ msgstr "不能为 %s 创建先导目录" #: commit-graph.c:904 msgid "the commit-graph file has incorrect checksum and is likely corrupt" -msgstr "提交图形文件的校验码错误，好像已经损坏" +msgstr "提交图形文件的校验码错误，可能已经损坏" #: compat/obstack.c:405 compat/obstack.c:407 msgid "memory exhausted" @@ -1514,11 +1514,11 @@ msgid "" "\t%s\n" "This might be due to circular includes." msgstr "" -"超过了最大引用深度（%1$d），当从\n" +"超过了最大包含深度（%1$d），当从\n" "\t%3$s\n" "包含\n" "\t%2$s\n" -"这可能是因为循环引用。" +"这可能是因为循环包含。" #: config.c:139 #, c-format @@ -1844,7 +1844,7 @@ msgstr "在能力之后应为一个 flush 包" #: connect.c:233 #, c-format msgid "ignoring capabilities after first line '%s'" -msgstr "忽略第一行 '%s' 之后的功能字段" +msgstr "忽略第一行 '%s' 之后的能力字段" #: connect.c:252 msgid "protocol error: unexpected capabilities^{}" @@ -1964,7 +1964,7 @@ msgstr "ssh 变体 'simple' 不支持 -6" #: connect.c:1151 msgid "ssh variant 'simple' does not support setting port" -msgstr "'simple' 类型的 ssh 不支持设置端口" +msgstr "ssh 变体 'simple' 不支持设置端口" #: connect.c:1262 #, c-format @@ -2063,17 +2063,17 @@ msgstr "将'%s' 的编码从 %s 到 %s 来回转换不一致" #: convert.c:674 #, c-format msgid "cannot fork to run external filter '%s'" -msgstr "不能 fork 以执行外部过滤程序 '%s'" +msgstr "不能 fork 以执行外部过滤器 '%s'" #: convert.c:694 #, c-format msgid "cannot feed the input to external filter '%s'" -msgstr "不能将标准输入传递给外部过滤器 '%s'" +msgstr "不能将输入传递给外部过滤器 '%s'" #: convert.c:701 #, c-format msgid "external filter '%s' failed %d" -msgstr "外部过滤程序 '%s' 失败码 %d" +msgstr "外部过滤器 '%s' 失败码 %d" #: convert.c:736 convert.c:739 #, c-format @@ -2341,7 +2341,7 @@ msgstr "不能对文件 '%s' 调用 stat" #: environment.c:150 #, c-format msgid "bad git namespace path \"%s\"" -msgstr "糟糕的 git 名字空间路径 \"%s\"" +msgstr "错误的 git 名字空间路径 \"%s\"" #: environment.c:332 #, c-format @@ -2574,7 +2574,7 @@ msgstr "没有匹配的远程分支" #: fetch-pack.c:1621 builtin/clone.c:664 msgid "remote did not send all necessary objects" -msgstr "远程没有发送所有必须的对象" +msgstr "远程没有发送所有必需的对象" #: fetch-pack.c:1647 #, c-format @@ -3558,7 +3558,7 @@ msgstr "%s 没有指向一个有效的对象！" #: refs.c:579 #, c-format msgid "ignoring dangling symref %s" -msgstr "忽略摇摆符号引用 %s" +msgstr "忽略悬空符号引用 %s" #: refs.c:581 ref-filter.c:2067 #, c-format @@ -5771,7 +5771,7 @@ msgstr "%s 线程失败" #: transport-helper.c:1310 #, c-format msgid "%s thread failed to join: %s" -msgstr "%s 加入线程失败：%s" +msgstr "%s 线程等待失败：%s" #: transport-helper.c:1329 transport-helper.c:1333 #, c-format @@ -8084,12 +8084,12 @@ msgstr "路径 '%s' 没有他们的版本" #: builtin/checkout.c:156 #, c-format msgid "path '%s' does not have all necessary versions" -msgstr "路径 '%s' 没有全部必须的版本" +msgstr "路径 '%s' 没有全部必需的版本" #: builtin/checkout.c:200 #, c-format msgid "path '%s' does not have necessary versions" -msgstr "路径 '%s' 没有必须的版本" +msgstr "路径 '%s' 没有必需的版本" #: builtin/checkout.c:217 #, c-format @@ -10355,7 +10355,7 @@ msgstr "非快进" #: builtin/fetch.c:790 #, c-format msgid "%s did not send all necessary objects\n" -msgstr "%s 未发送所有必须的对象\n" +msgstr "%s 未发送所有必需的对象\n" #: builtin/fetch.c:811 #, c-format @@ -10380,13 +10380,13 @@ msgstr "" #: builtin/fetch.c:981 #, c-format msgid " (%s will become dangling)" -msgstr " （%s 将成为摇摆状态）" +msgstr " （%s 将成为悬空状态）" # 译者：注意保持前导空格 #: builtin/fetch.c:982 #, c-format msgid " (%s has become dangling)" -msgstr " （%s 已成为摇摆状态）" +msgstr " （%s 已成为悬空状态）" #: builtin/fetch.c:1014 msgid "[deleted]" @@ -10568,7 +10568,7 @@ msgstr "显示不可达的对象" #: builtin/fsck.c:673 msgid "show dangling objects" -msgstr "显示摇摆的对象" +msgstr "显示悬空的对象" #: builtin/fsck.c:674 msgid "report tags" @@ -10600,7 +10600,7 @@ msgstr "启用更严格的检查" #: builtin/fsck.c:682 msgid "write dangling objects in .git/lost-found" -msgstr "将摇摆对象写入 .git/lost-found 中" +msgstr "将悬空对象写入 .git/lost-found 中" #: builtin/fsck.c:683 builtin/prune.c:110 msgid "show progress" @@ -13512,7 +13512,7 @@ msgstr "不能使用 --max-pack-size 来构建传输用的包文件" #: builtin/pack-objects.c:3293 msgid "minimum pack size limit is 1 MiB" -msgstr "最小的包文件大小是 1 MB" +msgstr "最小的包文件大小是 1 MiB" #: builtin/pack-objects.c:3298 msgid "--thin cannot be used to build an indexable pack" @@ -13524,7 +13524,7 @@ msgstr "--keep-unreachable 和 --unpack-unreachable 不兼容" #: builtin/pack-objects.c:3307 msgid "cannot use --filter without --stdout" -msgstr "不能使用 --filter 而没有 --stdout" +msgstr "不能在没有 --stdout 的情况下使用 --filter" #: builtin/pack-objects.c:3363 msgid "Enumerating objects" @@ -14660,13 +14660,13 @@ msgstr "不能设置 %s" #: builtin/remote.c:1298 #, c-format msgid " %s will become dangling!" -msgstr " %s 将成为摇摆状态！" +msgstr " %s 将成为悬空状态！" # 译者：注意保持前导空格 #: builtin/remote.c:1299 #, c-format msgid " %s has become dangling!" -msgstr " %s 已成为摇摆状态！" +msgstr " %s 已成为悬空状态！" #: builtin/remote.c:1309 #, c-format @@ -14904,7 +14904,7 @@ msgstr "未发现替换引用 '%s'" #: builtin/replace.c:137 #, c-format msgid "Deleted replace ref '%s'" -msgstr "删除替换引用 '%s'" +msgstr "已删除替换引用 '%s'" #: builtin/replace.c:149 #, c-format @@ -15070,7 +15070,7 @@ msgstr "使用此格式" #: builtin/replace.c:556 msgid "--format cannot be used when not listing" -msgstr "不列示时不能使用 --format" +msgstr "不列出时不能使用 --format" #: builtin/replace.c:564 msgid "-f only makes sense when writing a replacement" @@ -15090,7 +15090,7 @@ msgstr "错误的参数个数" #: builtin/replace.c:586 msgid "-e needs exactly one argument" -msgstr "-e 只需要一个参数" +msgstr "-e 需要且仅需要一个参数" #: builtin/replace.c:592 msgid "-g needs at least one argument" @@ -15490,7 +15490,7 @@ msgstr "在一次单独的请求/响应之后退出" #: builtin/serve.c:19 msgid "exit immediately after advertising capabilities" -msgstr "在广告功能后立即退出" +msgstr "对能力广告之后立即退出" #: builtin/shortlog.c:14 msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]" |